From 560f6cfe380a1fc29dbb9365a1e04a47dfd2dcb3 Mon Sep 17 00:00:00 2001 From: Zhanying <2446962908@qq.com> Date: Mon, 7 Apr 2025 17:26:03 +0800 Subject: [PATCH 1/5] =?UTF-8?q?feat:=20FRM=E6=94=AF=E6=8C=81=E5=B1=8F?= =?UTF-8?q?=E8=94=BD=E5=9C=A8=E7=BA=BF=E8=B5=84=E6=BA=90=20REPORT-151746?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mainframe/share/ComponentShareConfig.java | 37 +++++++++++++++++++ .../mainframe/share/ComponentShareUtil.java | 4 ++ 2 files changed, 41 insertions(+) create mode 100644 designer-base/src/main/java/com/fr/design/mainframe/share/ComponentShareConfig.java diff --git a/designer-base/src/main/java/com/fr/design/mainframe/share/ComponentShareConfig.java b/designer-base/src/main/java/com/fr/design/mainframe/share/ComponentShareConfig.java new file mode 100644 index 0000000000..6ed1b3b1e6 --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/mainframe/share/ComponentShareConfig.java @@ -0,0 +1,37 @@ +package com.fr.design.mainframe.share; + +import com.fr.config.ConfigContext; +import com.fr.config.DefaultConfiguration; +import com.fr.config.Identifier; +import com.fr.config.holder.Conf; +import com.fr.config.holder.factory.Holders; + +/** + * @author Zhanying + * @since 11.0 + * Created on 2025/4/7 + */ +public class ComponentShareConfig extends DefaultConfiguration { + private static ComponentShareConfig config = null; + + public static ComponentShareConfig getInstance() { + if (config == null) { + config = ConfigContext.getConfigInstance(ComponentShareConfig.class); + } + return config; + } + + /** + * 是否显示在线组件 + */ + @Identifier("showOnlineWidget") + private Conf showOnlineWidget = Holders.simple(true); + + public boolean isShowOnlineWidget() { + return showOnlineWidget.get(); + } + + public void setShowOnlineWidget(boolean showOnlineWidget) { + this.showOnlineWidget.set(showOnlineWidget); + } +} diff --git a/designer-base/src/main/java/com/fr/design/mainframe/share/ComponentShareUtil.java b/designer-base/src/main/java/com/fr/design/mainframe/share/ComponentShareUtil.java index 2445826128..e7ea320c23 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/share/ComponentShareUtil.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/share/ComponentShareUtil.java @@ -30,6 +30,10 @@ public class ComponentShareUtil { } public static boolean isShowOnlineWidgetRepoPane() { + // 先读一下全局配置 + if (!ComponentShareConfig.getInstance().isShowOnlineWidget()) { + return false; + } LocaleMark localeMark = LocaleCenter.getMark(ShowOnlineWidgetMark.class); return localeMark.getValue(); } From e0b5f092fb397effbc8bf479091e4f7f7d43489c Mon Sep 17 00:00:00 2001 From: Zhanying <2446962908@qq.com> Date: Mon, 7 Apr 2025 18:17:20 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B4=A8=E9=87=8F?= =?UTF-8?q?=E6=A3=80=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/mainframe/share/ComponentShareConfig.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/designer-base/src/main/java/com/fr/design/mainframe/share/ComponentShareConfig.java b/designer-base/src/main/java/com/fr/design/mainframe/share/ComponentShareConfig.java index 6ed1b3b1e6..0776a101d3 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/share/ComponentShareConfig.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/share/ComponentShareConfig.java @@ -7,6 +7,8 @@ import com.fr.config.holder.Conf; import com.fr.config.holder.factory.Holders; /** + * ComponentShare 全局配置 + * * @author Zhanying * @since 11.0 * Created on 2025/4/7 From 4cb8fb6b1d317125ced0c1aedb26c9647fadb9d9 Mon Sep 17 00:00:00 2001 From: Zhanying <2446962908@qq.com> Date: Mon, 7 Apr 2025 18:47:17 +0800 Subject: [PATCH 3/5] =?UTF-8?q?feat:=20frm=E4=B8=ADfvs=E5=BC=95=E5=AF=BC?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=85=8D=E7=BD=AE=E5=B1=8F=E8=94=BD=E8=B6=85?= =?UTF-8?q?=E9=93=BE=E8=B7=B3=E8=BD=AC=20#REPORT-150676?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mainframe/guide/FvsGuideConfig.java | 39 +++++++++++++++++++ .../design/mainframe/guide/FvsGuidePane.java | 10 +++-- 2 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 designer-form/src/main/java/com/fr/design/mainframe/guide/FvsGuideConfig.java diff --git a/designer-form/src/main/java/com/fr/design/mainframe/guide/FvsGuideConfig.java b/designer-form/src/main/java/com/fr/design/mainframe/guide/FvsGuideConfig.java new file mode 100644 index 0000000000..9fc3bb2bb9 --- /dev/null +++ b/designer-form/src/main/java/com/fr/design/mainframe/guide/FvsGuideConfig.java @@ -0,0 +1,39 @@ +package com.fr.design.mainframe.guide; + +import com.fr.config.ConfigContext; +import com.fr.config.DefaultConfiguration; +import com.fr.config.Identifier; +import com.fr.config.holder.Conf; +import com.fr.config.holder.factory.Holders; + +/** + * FvsGuide 全局配置 + * + * @author Zhanying + * @since 11.0 + * Created on 2025/4/7 + */ +public class FvsGuideConfig extends DefaultConfiguration { + private static FvsGuideConfig config = null; + + public static FvsGuideConfig getInstance() { + if (config == null) { + config = ConfigContext.getConfigInstance(FvsGuideConfig.class); + } + return config; + } + + /** + * 是否显示超链跳转 + */ + @Identifier("showGuideLink") + private Conf showGuideLink = Holders.simple(true); + + public boolean isShowGuideLink() { + return showGuideLink.get(); + } + + public void setShowGuideLink(boolean showGuideLink) { + this.showGuideLink.set(showGuideLink); + } +} diff --git a/designer-form/src/main/java/com/fr/design/mainframe/guide/FvsGuidePane.java b/designer-form/src/main/java/com/fr/design/mainframe/guide/FvsGuidePane.java index a401cb251d..21be225d08 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/guide/FvsGuidePane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/guide/FvsGuidePane.java @@ -196,9 +196,11 @@ public class FvsGuidePane extends JPanel { // 计算省略号的长度 int omitLength = getStringWidth(OMIT_TEXT, fontMetrics); - String linkContent = linkContent(); + boolean showGuideLink = FvsGuideConfig.getInstance().isShowGuideLink(); + + String linkContent = showGuideLink ? linkContent() : StringUtils.EMPTY; // 计算超链的长度 - int linkLength = getStringWidth(linkContent, fontMetrics); + int linkLength = showGuideLink ? getStringWidth(linkContent, fontMetrics) : 0; String tipContent = tipContent(); @@ -236,7 +238,9 @@ public class FvsGuidePane extends JPanel { htmlBuilder.append(chars[i]); } } - htmlBuilder.append("").append(linkContent).append(""); + if (showGuideLink) { + htmlBuilder.append("").append(linkContent).append(""); + } return htmlBuilder.toString(); } From 6b69c62f85304c914c130afb085e4ee990ecc2be Mon Sep 17 00:00:00 2001 From: Zhanying <2446962908@qq.com> Date: Tue, 8 Apr 2025 09:38:18 +0800 Subject: [PATCH 4/5] =?UTF-8?q?feat:=20=E5=A7=8B=E7=BB=88=E6=94=BE?= =?UTF-8?q?=E5=9C=A8=E6=9C=80=E5=90=8E=E6=8B=BC=E6=8E=A5=20#REPORT-150676?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/design/mainframe/guide/FvsGuidePane.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/designer-form/src/main/java/com/fr/design/mainframe/guide/FvsGuidePane.java b/designer-form/src/main/java/com/fr/design/mainframe/guide/FvsGuidePane.java index 21be225d08..aefd96187b 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/guide/FvsGuidePane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/guide/FvsGuidePane.java @@ -239,8 +239,9 @@ public class FvsGuidePane extends JPanel { } } if (showGuideLink) { - htmlBuilder.append("").append(linkContent).append(""); + htmlBuilder.append("").append(linkContent).append(""); } + htmlBuilder.append(""); return htmlBuilder.toString(); } From 3aa10edb79c73881fed87c75cf840403d1b6325e Mon Sep 17 00:00:00 2001 From: Zhanying <2446962908@qq.com> Date: Tue, 8 Apr 2025 09:44:36 +0800 Subject: [PATCH 5/5] =?UTF-8?q?feat:=20showGuideLink=E6=94=BE=E5=88=B0?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E7=9A=84=E6=97=B6=E5=80=99=E8=B5=8B?= =?UTF-8?q?=E5=80=BC=20#REPORT-150676?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/mainframe/guide/FvsGuidePane.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/designer-form/src/main/java/com/fr/design/mainframe/guide/FvsGuidePane.java b/designer-form/src/main/java/com/fr/design/mainframe/guide/FvsGuidePane.java index aefd96187b..7ab1fd3212 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/guide/FvsGuidePane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/guide/FvsGuidePane.java @@ -51,10 +51,13 @@ public class FvsGuidePane extends JPanel { private static final String CONTENT_FORMAT = "\n\n %s\n\n"; private final JComponent parent; private JTextPane textPane; + // 是否显示超链跳转 + private final boolean showGuideLink; public FvsGuidePane(JComponent parent) { super(); this.parent = parent; + showGuideLink = FvsGuideConfig.getInstance().isShowGuideLink(); initUI(); } @@ -196,8 +199,6 @@ public class FvsGuidePane extends JPanel { // 计算省略号的长度 int omitLength = getStringWidth(OMIT_TEXT, fontMetrics); - boolean showGuideLink = FvsGuideConfig.getInstance().isShowGuideLink(); - String linkContent = showGuideLink ? linkContent() : StringUtils.EMPTY; // 计算超链的长度 int linkLength = showGuideLink ? getStringWidth(linkContent, fontMetrics) : 0;