From 76b1cc1e02ccf6e042d65b4872ddac265e1a1660 Mon Sep 17 00:00:00 2001
From: kerry <kerry@fanruan.com>
Date: Thu, 25 Nov 2021 15:43:32 +0800
Subject: [PATCH 1/2] =?UTF-8?q?REPORT-63308=E3=80=90=E6=8E=A5=E8=A7=A6?=
 =?UTF-8?q?=E7=82=B9=E4=BC=98=E5=8C=96=E3=80=91=E8=BD=AE=E6=92=AD=E6=9C=9F?=
 =?UTF-8?q?=E9=97=B4=E5=9C=A8=E7=BB=84=E4=BB=B6=E4=B8=8A=E5=8F=B3=E9=94=AE?=
 =?UTF-8?q?=E7=9A=84=E4=BA=A4=E4=BA=92=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mainframe/share/ui/block/AbstractOnlineWidgetBlock.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/designer-form/src/main/java/com/fr/design/mainframe/share/ui/block/AbstractOnlineWidgetBlock.java b/designer-form/src/main/java/com/fr/design/mainframe/share/ui/block/AbstractOnlineWidgetBlock.java
index 864e5cdda..5c1620ab4 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/share/ui/block/AbstractOnlineWidgetBlock.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/share/ui/block/AbstractOnlineWidgetBlock.java
@@ -114,7 +114,7 @@ public abstract class AbstractOnlineWidgetBlock extends PreviewWidgetBlock<Onlin
     public void mouseClicked(MouseEvent e) {
         super.mouseClicked(e);
         if (e.getButton() == MouseEvent.BUTTON3) {
-            CarouselStateManger.getInstance().suspend(CarouselStateManger.MOUSE_HOVER);
+            CarouselStateManger.getInstance().suspend(CarouselStateManger.RIGHT_CLICK);
             this.parentPane.hidePreviewPane();
             JPopupMenu rightClickPopupMenu = getRightClickPopupMenu();
             GUICoreUtils.showPopupMenu(rightClickPopupMenu, this, e.getX(), e.getY());

From ddd7b9fb4aa88bd75cc4f35c737d894dc52d41e5 Mon Sep 17 00:00:00 2001
From: kerry <kerry@fanruan.com>
Date: Thu, 25 Nov 2021 17:21:25 +0800
Subject: [PATCH 2/2] =?UTF-8?q?REPORT-62672=E3=80=90=E6=8E=A5=E8=A7=A6?=
 =?UTF-8?q?=E7=82=B9=E4=BC=98=E5=8C=96=E3=80=91=E9=83=A8=E5=88=86=E5=9F=8B?=
 =?UTF-8?q?=E7=82=B9=E6=97=A0=E6=B3=95=E6=A8=A1=E6=8B=9F=E5=AF=B9=E5=BA=94?=
 =?UTF-8?q?=E5=9F=8B=E7=82=B9=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../share/collect/ComponentCollector.java     | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/mainframe/share/collect/ComponentCollector.java b/designer-base/src/main/java/com/fr/design/mainframe/share/collect/ComponentCollector.java
index d65f6af9a..477673978 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/share/collect/ComponentCollector.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/share/collect/ComponentCollector.java
@@ -343,18 +343,12 @@ public class ComponentCollector implements XMLable {
     }
 
     public void clickComponentSetting() {
-        boolean changed = false;
         int firstShowReact = ComponentReuseNotificationInfo.getInstance().isWidgetLibHasRefreshed() ? 2 : -1;
         if (this.firstShowReact != firstShowReact) {
-            this.firstShowReact = firstShowReact;
-            changed = true;
+            collectFirstShowReact(firstShowReact);
         }
         if (this.embededFilterReact == 0 && ComponentReuseNotificationInfo.getInstance().isWidgetLibHasRefreshed()) {
-            this.embededFilterReact = -1;
-            changed = true;
-        }
-        if (changed) {
-            saveInfo();
+            collectEmbededFilterReact(-1);
         }
     }
 
@@ -371,11 +365,16 @@ public class ComponentCollector implements XMLable {
             return;
         }
         if (System.currentTimeMillis() - ComponentReuseNotificationInfo.getInstance().getFirstDragEndTime() <= ONE_MINUTE) {
-            this.dynamicEffectReact = 1;
-            saveInfo();
+            collectDynamicEffectReactFlag(1);
         }
     }
 
+    public void collectDynamicEffectReactFlag(int flag) {
+        this.dynamicEffectReact = flag;
+        saveInfo();
+    }
+
+
     public void clearSortType() {
         sortType = JSONFactory.createJSON(JSON.ARRAY);
     }