Pull request #5330: REPORT-56679 新自适应2月份合入主 jar后在插件中修复的 bug 同步到 FR11

Merge in DESIGN/design from ~HENRY.WANG/design:release/11.0 to release/11.0

* commit '2836fd2074b04c1f7190207b7d1a940d978769a3':
  REPORT-56679 新自适应2月份合入主 jar后在插件中修复的 bug 同步到 FR11
  REPORT-56679 新自适应2月份合入主 jar后在插件中修复的 bug 同步到 FR11

designer-form/src/main/java/com/fr/design/fit/NewJForm.java

@@ -1,6 +1,7 @@
 package com.fr.design.fit;
 
 import com.fr.base.DynamicUnitList;
+import com.fr.base.Parameter;
 import com.fr.design.actions.TemplateParameterAction;
 import com.fr.design.designer.beans.AdapterBus;
 import com.fr.design.designer.beans.LayoutAdapter;
@@ -52,6 +53,10 @@ public class NewJForm extends JForm {
         changePaneSize();
     }
 
+    public NewJForm(Form form, FILE file, Parameter[] parameters) {
+        this(form, file);
+    }
+
     public NewJForm(Form form, FILE file) {
         super(form, file);
         if (DesignerUIModeConfig.getInstance().newUIMode()) {

designer-form/src/main/java/com/fr/design/fit/common/AdaptiveSwitchUtil.java

@@ -1,5 +1,7 @@
 package com.fr.design.fit.common;
 
+import com.fr.decision.ExtraDecisionClassManager;
+import com.fr.decision.fun.EmailSendProvider;
 import com.fr.design.data.DesignTableDataManager;
 import com.fr.design.fit.DesignerUIModeConfig;
 import com.fr.design.fit.NewJForm;
@@ -23,6 +25,8 @@ import com.fr.design.widget.ui.designer.layout.FRAbsoluteLayoutDefinePane;
 import com.fr.design.widget.ui.designer.layout.FRFitLayoutDefinePane;
 import com.fr.file.FILE;
 import com.fr.file.MemFILE;
+import com.fr.form.fit.NewFormMarkAttr;
+import com.fr.form.main.Form;
 import com.fr.form.ui.ElementCaseEditor;
 import com.fr.form.ui.Widget;
 import com.fr.form.ui.container.WAbsoluteBodyLayout;
@@ -34,6 +38,7 @@ import com.fr.log.FineLoggerFactory;
 import com.fr.report.fit.ReportFitAttr;
 
 import javax.swing.SwingUtilities;
+import java.util.Set;
 
 /**
  * Created by kerry on 2020-06-02
@@ -167,7 +172,16 @@ public class AdaptiveSwitchUtil {
             }
             TemplateTool.saveForm(old);
         }
-        return JTemplateFactory.createJTemplate(old.getEditingFILE());
+        if (old.getTarget() instanceof Form) {
+            try {
+                return new NewJForm((Form) (old.getTarget()).clone(), old.getEditingFILE());
+            } catch (Exception e) {
+                FineLoggerFactory.getLogger().error(e, e.getMessage());
+                return null;
+            }
+        } else {
+            return null;
+        }
     }
 
     /**

designer-form/src/main/java/com/fr/design/fit/common/TemplateTool.java

@@ -12,6 +12,7 @@ import com.fr.design.fit.NewJForm;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.FormArea;
 import com.fr.design.mainframe.FormDesigner;
+import com.fr.design.mainframe.JForm;
 import com.fr.design.mainframe.JTemplate;
 import com.fr.event.Event;
 import com.fr.event.Listener;

designer-form/src/main/java/com/fr/design/fit/menupane/BrowserFitAttrPane.java

@@ -181,7 +181,7 @@ public class BrowserFitAttrPane extends BasicBeanPane<ReportFitAttr> {
                 boolean isLocalConfig = !globalCheck.isSelected();
                 //勾选全局时，采用全局保存的自适应属性更新界面
                 if (!isLocalConfig) {
-                    ReportFitAttr attr = globalFitAttr;
+                    ReportFitAttr attr = jFormType.obtainFitAttr();
                     populateAttrPane(attr);
                     remove(BrowserFitAttrPane.this.borderPane);
                     initBorderPane(Toolkit.i18nText("Fine-Designer_Fit-Global"));