Pull request #3382: REPORT-46971 release->final

Merge in DESIGN/design from ~HENRY.WANG/design:final/10.0 to final/10.0

* commit '143a711fed50f03aa2456b8be0c09221d00119d5':
  REPORT-46971 release->final

designer-form/src/main/java/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java

@@ -14,13 +14,16 @@ import com.fr.design.designer.creator.XWTitleLayout;
 import com.fr.design.designer.creator.cardlayout.XWCardTagLayout;
 import com.fr.design.dialog.AttrScrollPane;
 import com.fr.design.dialog.BasicScrollPane;
+import com.fr.design.file.HistoryTemplateListCache;
 import com.fr.design.foldablepane.UIExpandablePane;
 import com.fr.design.gui.frpane.AbstractAttrNoScrollPane;
 import com.fr.design.gui.frpane.AttributeChangeListener;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.mainframe.EastRegionContainerPane;
 import com.fr.design.mainframe.FormDesigner;
+import com.fr.design.mainframe.JForm;
 import com.fr.design.widget.DataModify;
 import com.fr.design.widget.FormWidgetDefinePaneFactoryBase;
 import com.fr.design.widget.Operator;
@@ -147,6 +150,7 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane {
             }
         };
 
+        freshPropertyMode(innerCreator);
         if (isExtraWidget) {
             return;
         }
@@ -159,6 +163,16 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane {
 
     }
 
+    private static void freshPropertyMode(XCreator xCreator) {
+        if (!(HistoryTemplateListCache.getInstance().getCurrentEditingTemplate() instanceof JForm)) {
+            if (xCreator instanceof XWParameterLayout) {
+                EastRegionContainerPane.getInstance().switchMode(EastRegionContainerPane.PropertyMode.REPORT_PARA);
+            } else {
+                EastRegionContainerPane.getInstance().switchMode(EastRegionContainerPane.PropertyMode.REPORT_PARA_WIDGET);
+            }
+        }
+    }
+
     private void initDefinePane() {
         currentEditorDefinePane = null;
         XCreator creator = getXCreatorDedicated();

designer-form/src/main/java/com/fr/design/mainframe/widget/ui/WidgetBasicPropertyPaneFactory.java

@@ -1,10 +1,6 @@
 package com.fr.design.mainframe.widget.ui;
 
 import com.fr.design.designer.creator.XCreator;
-import com.fr.design.designer.creator.XWParameterLayout;
-import com.fr.design.file.HistoryTemplateListCache;
-import com.fr.design.mainframe.EastRegionContainerPane;
-import com.fr.design.mainframe.JForm;
 
 /**
  * Created by kerry on 2017/9/30.
@@ -12,7 +8,6 @@ import com.fr.design.mainframe.JForm;
 public class WidgetBasicPropertyPaneFactory {
 
     public static FormBasicPropertyPane createBasicPropertyPane(XCreator xCreator) {
-        freshPropertyMode(xCreator);
         if (xCreator.supportSetVisible() && xCreator.supportSetEnable()) {
             return new FormBasicWidgetPropertyPane();
         }
@@ -23,15 +18,4 @@ public class WidgetBasicPropertyPaneFactory {
         }
 
     }
-
-    private static void freshPropertyMode(XCreator xCreator) {
-        if (!(HistoryTemplateListCache.getInstance().getCurrentEditingTemplate() instanceof JForm)) {
-            if (xCreator instanceof XWParameterLayout) {
-                EastRegionContainerPane.getInstance().switchMode(EastRegionContainerPane.PropertyMode.REPORT_PARA);
-            } else {
-                EastRegionContainerPane.getInstance().switchMode(EastRegionContainerPane.PropertyMode.REPORT_PARA_WIDGET);
-            }
-        }
-    }
-
 }