From 9ccbf778ec5a2f2890357978d396b8ac9d7c3baf Mon Sep 17 00:00:00 2001 From: kerry Date: Wed, 23 Jun 2021 20:08:17 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-54361=20=E7=BB=84=E4=BB=B6=E5=A4=8D?= =?UTF-8?q?=E7=94=A8-=E5=90=88=E5=85=A5=E4=B8=BB=E7=89=88=E6=9C=AC-?= =?UTF-8?q?=E6=8E=A5=E8=A7=A6=E7=82=B9=E4=BC=98=E5=8C=96-MarkReadMap?= =?UTF-8?q?=E4=B8=BAtrue&&clickedWidgetLib=E4=B8=BAfalse=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E7=82=B9=E5=A5=97=E7=94=A8=E7=BB=84=E4=BB=B6=E5=85=A5=E5=8F=A3?= =?UTF-8?q?=EF=BC=8C=E6=B2=A1=E5=BC=B9=E5=87=BA=E5=B7=B2=E5=90=88=E5=85=A5?= =?UTF-8?q?=E4=B8=BB=E7=89=88=E6=9C=AC=E7=9A=84=E6=8F=90=E7=A4=BA=EF=BC=9B?= =?UTF-8?q?=E7=82=B9=E7=BB=84=E4=BB=B6=E5=BA=93=EF=BC=8C=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E5=BC=B9=E5=87=BA@kerry?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/mainframe/ComponentReuseNotifyUtil.java | 4 ++-- .../java/com/fr/design/mainframe/EastRegionContainerPane.java | 2 +- .../java/com/fr/design/mainframe/FormWidgetDetailPane.java | 2 +- 3 files changed, 4 insertions(+), 4 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 4ab10194c..2175804dc 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(boolean needValidRead) { + public static void enterWidgetLibExtraAction() { if (ComponentReuseNotificationInfo.getInstance().isClickedWidgetLib()) { return; } @@ -28,7 +28,7 @@ public class ComponentReuseNotifyUtil { return COMPONENT_SNAP_CHAT_KEY; } }); - if (snapChat.hasRead() && needValidRead) { + if (snapChat.hasRead()) { DesignerToastMsgUtil.toastPrompt(Toolkit.i18nText("Fine-Design_Component_Reuse_Merge_Prompt")); } ComponentReuseNotificationInfo.getInstance().setClickedWidgetLib(true); 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 3047ca99c..847a2dcba 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 @@ -315,7 +315,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer { @Override public void actionPerformed(ActionEvent e) { ComponentCollector.getInstance().collectCmpBoardClick(); - ComponentReuseNotifyUtil.enterWidgetLibExtraAction(true); + ComponentReuseNotifyUtil.enterWidgetLibExtraAction(); } }); // 权限编辑 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 8fbc4d06d..5339807ee 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 @@ -107,8 +107,8 @@ public class FormWidgetDetailPane extends FormDockView{ public void enterWidgetLib() { + ComponentReuseNotifyUtil.enterWidgetLibExtraAction(); EastRegionContainerPane.getInstance().switchTabTo(EastRegionContainerPane.KEY_WIDGET_LIB); - ComponentReuseNotifyUtil.enterWidgetLibExtraAction(false); } /**