Merge branch 'release/10.0' of ssh://cloud.finedevelop.com:7999/~lanlan/design into release/10.0

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

@@ -24,6 +24,7 @@ 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.mainframe.JTemplate;
 import com.fr.design.widget.DataModify;
 import com.fr.design.widget.FormWidgetDefinePaneFactoryBase;
 import com.fr.design.widget.Operator;
@@ -164,7 +165,8 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane {
     }
 
     private static void freshPropertyMode(XCreator xCreator) {
-        if (!(HistoryTemplateListCache.getInstance().getCurrentEditingTemplate() instanceof JForm)) {
+        JTemplate jTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
+        if (!(jTemplate instanceof JForm) && jTemplate.isUpMode()) {
             if (xCreator instanceof XWParameterLayout) {
                 EastRegionContainerPane.getInstance().switchMode(EastRegionContainerPane.PropertyMode.REPORT_PARA);
             } else {