From ab7298f13f021bfce60ab00fe2a7348224d458a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=B9=E7=A3=8A?= <294531121@qq.com> Date: Mon, 27 Sep 2021 18:20:51 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-59952&REPORT-60057&REPORT-60139=20?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=89=93=E5=BC=80=E7=A9=BA=E7=99=BD=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E5=92=8C=E5=B8=83=E5=B1=80=E6=A8=A1=E6=9D=BF=E6=9C=89?= =?UTF-8?q?=E5=B7=AE=E5=BC=82=E7=9A=84=E4=B8=80=E7=B1=BB=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/widget/ui/designer/NewFormPane.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/NewFormPane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/NewFormPane.java index 2f0b446e3..4d9359e4d 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/NewFormPane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/NewFormPane.java @@ -15,6 +15,7 @@ import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.JTemplate; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.form.main.Form; +import com.fr.form.ui.container.WBorderLayout; import com.fr.general.ComparatorUtils; import com.fr.log.FineLoggerFactory; import com.fr.stable.StringUtils; @@ -264,13 +265,12 @@ public class NewFormPane extends BasicPane { private void newForm(String path) { BaseJForm jForm; try { + Form form = new Form(new WBorderLayout("form")); if (StringUtils.isNotEmpty(path)) { - Form form = new Form(); form.readStream(NewFormPane.class.getResourceAsStream(path)); - jForm = StableFactory.getMarkedInstanceObjectFromClass(BaseJForm.XML_TAG, new Object[]{form}, BaseJForm.class); - } else { - jForm = StableFactory.getMarkedInstanceObjectFromClass(BaseJForm.XML_TAG, BaseJForm.class); + form = (Form) form.cloneAsLayoutTemplate(); } + jForm = StableFactory.getMarkedInstanceObjectFromClass(BaseJForm.XML_TAG, new Object[]{form}, BaseJForm.class); DesignerContext.getDesignerFrame().addAndActivateJTemplate((JTemplate) jForm); } catch (Exception e) { FineLoggerFactory.getLogger().error(e.getMessage(), e);