From 8efb51bcdde6f07feb238c97f6a596bb74ab056b Mon Sep 17 00:00:00 2001 From: kerry Date: Tue, 25 May 2021 19:11:39 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-52843=20&&=20REPORT-52844=20=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E5=A4=8D=E7=94=A8-=E5=90=88=E5=85=A5=E4=B8=BB?= =?UTF-8?q?=E7=89=88=E6=9C=AC-read=E5=92=8Cclicked=E9=83=BD=E6=98=AFfalse?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E7=82=B9=E5=87=BB=E6=8F=90=E7=A4=BA=E7=9A=84?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=A4=8D=E7=94=A8=E8=93=9D=E5=AD=97=EF=BC=8C?= =?UTF-8?q?=E5=BC=B9=E5=87=BA=E6=96=B0=E6=89=8B=E5=BC=95=E5=AF=BC=EF=BC=8C?= =?UTF-8?q?=E5=85=B3=E9=97=AD=E5=BC=95=E5=AF=BC=E5=90=8E=EF=BC=8C=E5=BC=B9?= =?UTF-8?q?=E5=87=BA=E4=BA=86=E5=B7=B2=E5=90=88=E5=85=A5=E4=B8=BB=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E7=9A=84=E6=8F=90=E7=A4=BA;=20=20=20=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E5=A4=8D=E7=94=A8-=E5=90=88=E5=85=A5=E4=B8=BB?= =?UTF-8?q?=E7=89=88=E6=9C=AC-=E9=BC=A0=E6=A0=87=E6=82=AC=E6=B5=AE?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=E6=A0=8F=E5=A5=97=E7=94=A8=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E6=97=B6=EF=BC=8Ctooltip=E6=98=BE=E7=A4=BA=E2=80=9C=E5=A5=97?= =?UTF-8?q?=E7=94=A8=E7=BB=84=E4=BB=B6=E2=80=9D=EF=BC=8C=E4=BA=A4=E4=BA=92?= =?UTF-8?q?=E6=96=87=E6=A1=A3=E4=BB=A5=E5=8F=8A=E5=92=8C=E4=BA=A4=E4=BA=92?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E4=BA=86=E4=B8=8B=EF=BC=8C=E5=BA=94=E8=AF=A5?= =?UTF-8?q?=E6=98=AF=E2=80=9C=E5=A4=8D=E7=94=A8=E7=BB=84=E4=BB=B6=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/mainframe/ComponentReuseNotifyUtil.java | 5 +++-- .../com/fr/design/mainframe/EastRegionContainerPane.java | 2 +- .../java/com/fr/design/mainframe/FormParaWidgetPane.java | 2 +- .../java/com/fr/design/mainframe/FormWidgetDetailPane.java | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/mainframe/ComponentReuseNotifyUtil.java b/designer-base/src/main/java/com/fr/design/mainframe/ComponentReuseNotifyUtil.java index abad05eb1..4ab10194c 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/ComponentReuseNotifyUtil.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/ComponentReuseNotifyUtil.java @@ -18,7 +18,7 @@ public class ComponentReuseNotifyUtil { } - public static void enterWidgetLibExtraAction() { + public static void enterWidgetLibExtraAction(boolean needValidRead) { if (ComponentReuseNotificationInfo.getInstance().isClickedWidgetLib()) { return; } @@ -28,11 +28,12 @@ public class ComponentReuseNotifyUtil { return COMPONENT_SNAP_CHAT_KEY; } }); - if (snapChat.hasRead()) { + if (snapChat.hasRead() && needValidRead) { DesignerToastMsgUtil.toastPrompt(Toolkit.i18nText("Fine-Design_Component_Reuse_Merge_Prompt")); } ComponentReuseNotificationInfo.getInstance().setClickedWidgetLib(true); DesignerEnvManager.getEnvManager().saveXMLFile(); } + } diff --git a/designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java b/designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java index 94d79b2d1..1bffe0842 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java @@ -313,7 +313,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer { new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - ComponentReuseNotifyUtil.enterWidgetLibExtraAction(); + ComponentReuseNotifyUtil.enterWidgetLibExtraAction(true); } }); // 权限编辑 diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java b/designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java index 81b4e7b61..b8f3ff638 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java @@ -277,7 +277,7 @@ public class FormParaWidgetPane extends JPanel { jPanel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); jPanel.add(uiLabel, BorderLayout.NORTH); jPanel.add(new UILabel(Toolkit.i18nText("Fine-Design_Component_Reuse_Apply_Widget")), BorderLayout.CENTER); - jPanel.setToolTipText(Toolkit.i18nText("Fine-Design_Component_Reuse_Apply_Widget")); + jPanel.setToolTipText(Toolkit.i18nText("Fine-Design_Share_Component")); return jPanel; } diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormWidgetDetailPane.java b/designer-form/src/main/java/com/fr/design/mainframe/FormWidgetDetailPane.java index dd0cce25b..f77e68e15 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormWidgetDetailPane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormWidgetDetailPane.java @@ -108,7 +108,7 @@ public class FormWidgetDetailPane extends FormDockView{ public void enterWidgetLib() { EastRegionContainerPane.getInstance().switchTabTo(EastRegionContainerPane.KEY_WIDGET_LIB); headGroup.setSelectedIndex(ONLINE_TAB); - ComponentReuseNotifyUtil.enterWidgetLibExtraAction(); + ComponentReuseNotifyUtil.enterWidgetLibExtraAction(false); } /**