Merge branch 'release/11.0' of ssh://code.fineres.com:7999/~kerry/design_10.0 into release/11.0

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);
     }