REPORT-58525 将打开内置布局模板所用的NewForm对象换成BaseForm对象，删除内置布局模板里面的NewFormAttrMark标识

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

@@ -6,7 +6,6 @@ import com.fr.design.designer.beans.models.NewFormModel;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.dialog.DialogActionListener;
 import com.fr.design.dialog.UIDialog;
-import com.fr.design.fit.NewJForm;
 import com.fr.design.gui.ibutton.UIButtonGroup;
 import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.design.i18n.Toolkit;
@@ -254,26 +253,21 @@ public class NewFormPane extends BasicPane {
     }
 
     private void newForm(String path) {
-        if (StringUtils.isEmpty(path)) {
+        BaseJForm jForm;
-            newEmptyForm();
-            return;
-        }
-
         try {
+            if (StringUtils.isNotEmpty(path)) {
                 Form form = new Form();
                 form.readStream(NewFormPane.class.getResourceAsStream(path));
-            NewJForm newJForm = new NewJForm(form);
+                jForm = StableFactory.getMarkedInstanceObjectFromClass(BaseJForm.XML_TAG, new Object[]{form}, BaseJForm.class);
-            DesignerContext.getDesignerFrame().addAndActivateJTemplate(newJForm);
+            } else {
+                jForm = StableFactory.getMarkedInstanceObjectFromClass(BaseJForm.XML_TAG, BaseJForm.class);
+            }
+            DesignerContext.getDesignerFrame().addAndActivateJTemplate((JTemplate<?, ?>) jForm);
         } catch (Exception e) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
     }
 
-    private void newEmptyForm() {
-        BaseJForm jform = StableFactory.getMarkedInstanceObjectFromClass(BaseJForm.XML_TAG, BaseJForm.class);
-        DesignerContext.getDesignerFrame().addAndActivateJTemplate((JTemplate<?, ?>) jform);
-    }
-
     private void setSelectedLayoutPane(PredefinedLayoutPane layoutPane) {
         if (selectedLayoutPane != layoutPane) {
             if (selectedLayoutPane != null) {

designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/1.frm

@@ -113,9 +113,6 @@
 <TemplateLayoutIdAttrMark class="com.fr.base.iofile.attr.TemplateLayoutIdAttrMark">
 <TemplateLayoutIdAttrMark LayoutId="6d7c5955-a13c-4b43-a4b3-0838d5880853"/>
 </TemplateLayoutIdAttrMark>
-<NewFormMarkAttr class="com.fr.form.fit.NewFormMarkAttr">
-<NewFormMarkAttr type="1" tabPreload="true" bodyHeight="540" bodyWidth="960"/>
-</NewFormMarkAttr>
 <TemplateIdAttMark class="com.fr.base.iofile.attr.TemplateIdAttrMark">
 <TemplateIdAttMark TemplateId="745f4ee6-689f-4410-8045-f5ec7f0f8b94"/>
 </TemplateIdAttMark>

designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/2.frm

@@ -122,9 +122,6 @@
 <TemplateLayoutIdAttrMark class="com.fr.base.iofile.attr.TemplateLayoutIdAttrMark">
 <TemplateLayoutIdAttrMark LayoutId="37539138-ee94-4aec-89ee-3c4e568daab7"/>
 </TemplateLayoutIdAttrMark>
-<NewFormMarkAttr class="com.fr.form.fit.NewFormMarkAttr">
-<NewFormMarkAttr type="1" tabPreload="true" bodyHeight="540" bodyWidth="960"/>
-</NewFormMarkAttr>
 <TemplateIdAttMark class="com.fr.base.iofile.attr.TemplateIdAttrMark">
 <TemplateIdAttMark TemplateId="f3725b46-5eba-4cb0-91ac-2eed78cdbbb6"/>
 </TemplateIdAttMark>

designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/3.frm

@@ -131,9 +131,6 @@
 <TemplateLayoutIdAttrMark class="com.fr.base.iofile.attr.TemplateLayoutIdAttrMark">
 <TemplateLayoutIdAttrMark LayoutId="c2351389-1876-4ebb-9822-82a1999084c7"/>
 </TemplateLayoutIdAttrMark>
-<NewFormMarkAttr class="com.fr.form.fit.NewFormMarkAttr">
-<NewFormMarkAttr type="1" tabPreload="true" bodyHeight="540" bodyWidth="960"/>
-</NewFormMarkAttr>
 <TemplateIdAttMark class="com.fr.base.iofile.attr.TemplateIdAttrMark">
 <TemplateIdAttMark TemplateId="ba461650-7fe2-4ed2-9bb0-6207a58988eb"/>
 </TemplateIdAttMark>

designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/4.frm

@@ -131,9 +131,6 @@
 <TemplateLayoutIdAttrMark class="com.fr.base.iofile.attr.TemplateLayoutIdAttrMark">
 <TemplateLayoutIdAttrMark LayoutId="ed972ed4-76d3-4a02-ace2-f67d4f4dd2ef"/>
 </TemplateLayoutIdAttrMark>
-<NewFormMarkAttr class="com.fr.form.fit.NewFormMarkAttr">
-<NewFormMarkAttr type="1" tabPreload="true" bodyHeight="540" bodyWidth="960"/>
-</NewFormMarkAttr>
 <TemplateIdAttMark class="com.fr.base.iofile.attr.TemplateIdAttrMark">
 <TemplateIdAttMark TemplateId="f06c354b-6d5e-40e5-b855-f74808b0d94f"/>
 </TemplateIdAttMark>

designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/5.frm

@@ -131,9 +131,6 @@
 <TemplateLayoutIdAttrMark class="com.fr.base.iofile.attr.TemplateLayoutIdAttrMark">
 <TemplateLayoutIdAttrMark LayoutId="fcbeb8e9-e709-45cc-8826-36b519776098"/>
 </TemplateLayoutIdAttrMark>
-<NewFormMarkAttr class="com.fr.form.fit.NewFormMarkAttr">
-<NewFormMarkAttr type="1" tabPreload="true" bodyHeight="540" bodyWidth="960"/>
-</NewFormMarkAttr>
 <TemplateIdAttMark class="com.fr.base.iofile.attr.TemplateIdAttrMark">
 <TemplateIdAttMark TemplateId="1b495536-b042-45db-a6be-768b472fe7b5"/>
 </TemplateIdAttMark>

designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/6.frm

@@ -131,9 +131,6 @@
 <TemplateLayoutIdAttrMark class="com.fr.base.iofile.attr.TemplateLayoutIdAttrMark">
 <TemplateLayoutIdAttrMark LayoutId="fcbeb8e9-e709-45cc-8826-36b519776098"/>
 </TemplateLayoutIdAttrMark>
-<NewFormMarkAttr class="com.fr.form.fit.NewFormMarkAttr">
-<NewFormMarkAttr type="1" tabPreload="true" bodyHeight="540" bodyWidth="960"/>
-</NewFormMarkAttr>
 <TemplateIdAttMark class="com.fr.base.iofile.attr.TemplateIdAttrMark">
 <TemplateIdAttMark TemplateId="13b65e55-e7da-43b2-b0e4-3521d500829a"/>
 </TemplateIdAttMark>

designer-form/src/main/resources/com/fr/design/form/layouts/templates/5-7/1.frm

@@ -140,9 +140,6 @@
 <TemplateLayoutIdAttrMark class="com.fr.base.iofile.attr.TemplateLayoutIdAttrMark">
 <TemplateLayoutIdAttrMark LayoutId="b682cfc7-eb2d-4040-9a3d-0ff8f5e9890f"/>
 </TemplateLayoutIdAttrMark>
-<NewFormMarkAttr class="com.fr.form.fit.NewFormMarkAttr">
-<NewFormMarkAttr type="1" tabPreload="true" bodyHeight="540" bodyWidth="960"/>
-</NewFormMarkAttr>
 <TemplateIdAttMark class="com.fr.base.iofile.attr.TemplateIdAttrMark">
 <TemplateIdAttMark TemplateId="7caf8b9a-eaa4-4f5a-bf6e-d1a7309c8d98"/>
 </TemplateIdAttMark>

designer-form/src/main/resources/com/fr/design/form/layouts/templates/5-7/2.frm

@@ -140,9 +140,6 @@
 <TemplateLayoutIdAttrMark class="com.fr.base.iofile.attr.TemplateLayoutIdAttrMark">
 <TemplateLayoutIdAttrMark LayoutId="fcbeb8e9-e709-45cc-8826-36b519776098"/>
 </TemplateLayoutIdAttrMark>
-<NewFormMarkAttr class="com.fr.form.fit.NewFormMarkAttr">
-<NewFormMarkAttr type="1" tabPreload="true" bodyHeight="540" bodyWidth="960"/>
-</NewFormMarkAttr>
 <TemplateIdAttMark class="com.fr.base.iofile.attr.TemplateIdAttrMark">
 <TemplateIdAttMark TemplateId="75a803de-4022-4a58-953a-3db28c1a7aeb"/>
 </TemplateIdAttMark>

designer-form/src/main/resources/com/fr/design/form/layouts/templates/5-7/3.frm

@@ -149,9 +149,6 @@
 <TemplateLayoutIdAttrMark class="com.fr.base.iofile.attr.TemplateLayoutIdAttrMark">
 <TemplateLayoutIdAttrMark LayoutId="2b44b92c-b5f4-42c6-98ee-2afb64d5eeb4"/>
 </TemplateLayoutIdAttrMark>
-<NewFormMarkAttr class="com.fr.form.fit.NewFormMarkAttr">
-<NewFormMarkAttr type="1" tabPreload="true" bodyHeight="540" bodyWidth="960"/>
-</NewFormMarkAttr>
 <TemplateIdAttMark class="com.fr.base.iofile.attr.TemplateIdAttrMark">
 <TemplateIdAttMark TemplateId="3816e8ee-6ec7-4771-930c-c7ed38f3e58e"/>
 </TemplateIdAttMark>

designer-form/src/main/resources/com/fr/design/form/layouts/templates/5-7/4.frm

@@ -149,9 +149,6 @@
 <TemplateLayoutIdAttrMark class="com.fr.base.iofile.attr.TemplateLayoutIdAttrMark">
 <TemplateLayoutIdAttrMark LayoutId="0012b06c-d563-4a7e-a1df-d985e4b5105a"/>
 </TemplateLayoutIdAttrMark>
-<NewFormMarkAttr class="com.fr.form.fit.NewFormMarkAttr">
-<NewFormMarkAttr type="1" tabPreload="true" bodyHeight="540" bodyWidth="960"/>
-</NewFormMarkAttr>
 <TemplateIdAttMark class="com.fr.base.iofile.attr.TemplateIdAttrMark">
 <TemplateIdAttMark TemplateId="ca4b9a6a-0f99-4e80-8fd7-44f5e33984de"/>
 </TemplateIdAttMark>

designer-form/src/main/resources/com/fr/design/form/layouts/templates/5-7/5.frm

@@ -158,9 +158,6 @@
 <TemplateLayoutIdAttrMark class="com.fr.base.iofile.attr.TemplateLayoutIdAttrMark">
 <TemplateLayoutIdAttrMark LayoutId="cd854b01-b7d4-4854-a3cc-c3b08334abaf"/>
 </TemplateLayoutIdAttrMark>
-<NewFormMarkAttr class="com.fr.form.fit.NewFormMarkAttr">
-<NewFormMarkAttr type="1" tabPreload="true" bodyHeight="540" bodyWidth="960"/>
-</NewFormMarkAttr>
 <TemplateIdAttMark class="com.fr.base.iofile.attr.TemplateIdAttrMark">
 <TemplateIdAttMark TemplateId="1a591c85-55db-4f8e-8748-49e4f1ccebf2"/>
 </TemplateIdAttMark>

designer-form/src/main/resources/com/fr/design/form/layouts/templates/5-7/6.frm

@@ -158,9 +158,6 @@
 <TemplateLayoutIdAttrMark class="com.fr.base.iofile.attr.TemplateLayoutIdAttrMark">
 <TemplateLayoutIdAttrMark LayoutId="277ccdaf-9abf-4846-9e7a-efabab70f169"/>
 </TemplateLayoutIdAttrMark>
-<NewFormMarkAttr class="com.fr.form.fit.NewFormMarkAttr">
-<NewFormMarkAttr type="1" tabPreload="true" bodyHeight="540" bodyWidth="960"/>
-</NewFormMarkAttr>
 <TemplateIdAttMark class="com.fr.base.iofile.attr.TemplateIdAttrMark">
 <TemplateIdAttMark TemplateId="d93ee4bd-f42f-4361-a3d3-160dc24eb82c"/>
 </TemplateIdAttMark>

designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/1.frm

@@ -167,9 +167,6 @@
 <TemplateLayoutIdAttrMark class="com.fr.base.iofile.attr.TemplateLayoutIdAttrMark">
 <TemplateLayoutIdAttrMark LayoutId="7f199be0-de2c-4b36-9242-2e4f0cc41254"/>
 </TemplateLayoutIdAttrMark>
-<NewFormMarkAttr class="com.fr.form.fit.NewFormMarkAttr">
-<NewFormMarkAttr type="1" tabPreload="true" bodyHeight="540" bodyWidth="960"/>
-</NewFormMarkAttr>
 <TemplateIdAttMark class="com.fr.base.iofile.attr.TemplateIdAttrMark">
 <TemplateIdAttMark TemplateId="434d170d-dd81-4b3f-b5f4-8aae17b77f6c"/>
 </TemplateIdAttMark>

designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/2.frm

@@ -176,9 +176,6 @@
 <TemplateLayoutIdAttrMark class="com.fr.base.iofile.attr.TemplateLayoutIdAttrMark">
 <TemplateLayoutIdAttrMark LayoutId="ecdeebb7-d19e-4451-935b-43f51dea1bc6"/>
 </TemplateLayoutIdAttrMark>
-<NewFormMarkAttr class="com.fr.form.fit.NewFormMarkAttr">
-<NewFormMarkAttr type="1" tabPreload="true" bodyHeight="540" bodyWidth="960"/>
-</NewFormMarkAttr>
 <TemplateIdAttMark class="com.fr.base.iofile.attr.TemplateIdAttrMark">
 <TemplateIdAttMark TemplateId="2cea5867-b3b6-4406-bcef-a2c5389413e1"/>
 </TemplateIdAttMark>

designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/3.frm

@@ -176,9 +176,6 @@
 <TemplateLayoutIdAttrMark class="com.fr.base.iofile.attr.TemplateLayoutIdAttrMark">
 <TemplateLayoutIdAttrMark LayoutId="5f9b8ea5-3ce7-4b44-b4f3-b064c64dde06"/>
 </TemplateLayoutIdAttrMark>
-<NewFormMarkAttr class="com.fr.form.fit.NewFormMarkAttr">
-<NewFormMarkAttr type="1" tabPreload="true" bodyHeight="540" bodyWidth="960"/>
-</NewFormMarkAttr>
 <TemplateIdAttMark class="com.fr.base.iofile.attr.TemplateIdAttrMark">
 <TemplateIdAttMark TemplateId="05aeb1ad-f2af-4c60-9f05-1b2b90689901"/>
 </TemplateIdAttMark>

designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/4.frm

@@ -176,9 +176,6 @@
 <TemplateLayoutIdAttrMark class="com.fr.base.iofile.attr.TemplateLayoutIdAttrMark">
 <TemplateLayoutIdAttrMark LayoutId="fcbeb8e9-e709-45cc-8826-36b519776098"/>
 </TemplateLayoutIdAttrMark>
-<NewFormMarkAttr class="com.fr.form.fit.NewFormMarkAttr">
-<NewFormMarkAttr type="1" tabPreload="true" bodyHeight="540" bodyWidth="960"/>
-</NewFormMarkAttr>
 <TemplateIdAttMark class="com.fr.base.iofile.attr.TemplateIdAttrMark">
 <TemplateIdAttMark TemplateId="1de9e6a0-7e9f-49cb-8874-34d8f540fe1d"/>
 </TemplateIdAttMark>

designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/5.frm

@@ -176,9 +176,6 @@
 <TemplateLayoutIdAttrMark class="com.fr.base.iofile.attr.TemplateLayoutIdAttrMark">
 <TemplateLayoutIdAttrMark LayoutId="19b23045-6069-4f9f-9d5e-6213efc55ab7"/>
 </TemplateLayoutIdAttrMark>
-<NewFormMarkAttr class="com.fr.form.fit.NewFormMarkAttr">
-<NewFormMarkAttr type="1" tabPreload="true" bodyHeight="540" bodyWidth="960"/>
-</NewFormMarkAttr>
 <TemplateIdAttMark class="com.fr.base.iofile.attr.TemplateIdAttrMark">
 <TemplateIdAttMark TemplateId="53899c37-aa4b-4e99-89dd-00f944ae8752"/>
 </TemplateIdAttMark>

designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/6.frm

@@ -185,9 +185,6 @@
 <TemplateLayoutIdAttrMark class="com.fr.base.iofile.attr.TemplateLayoutIdAttrMark">
 <TemplateLayoutIdAttrMark LayoutId="014cd79f-271d-4972-8c71-3207ba46a91f"/>
 </TemplateLayoutIdAttrMark>
-<NewFormMarkAttr class="com.fr.form.fit.NewFormMarkAttr">
-<NewFormMarkAttr type="1" tabPreload="true" bodyHeight="540" bodyWidth="960"/>
-</NewFormMarkAttr>
 <TemplateIdAttMark class="com.fr.base.iofile.attr.TemplateIdAttrMark">
 <TemplateIdAttMark TemplateId="2155cc4b-23d6-45e9-a160-d63933bbc4a0"/>
 </TemplateIdAttMark>