From 98fee785ceed321579df4890bdfabba608a4e29f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=B9=E7=A3=8A?= <294531121@qq.com>
Date: Wed, 22 Sep 2021 11:42:02 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-58525=20=20=E5=B0=86=E6=89=93=E5=BC=80?=
=?UTF-8?q?=E5=86=85=E7=BD=AE=E5=B8=83=E5=B1=80=E6=A8=A1=E6=9D=BF=E6=89=80?=
=?UTF-8?q?=E7=94=A8=E7=9A=84NewForm=E5=AF=B9=E8=B1=A1=E6=8D=A2=E6=88=90Ba?=
=?UTF-8?q?seForm=E5=AF=B9=E8=B1=A1=EF=BC=8C=E5=88=A0=E9=99=A4=E5=86=85?=
=?UTF-8?q?=E7=BD=AE=E5=B8=83=E5=B1=80=E6=A8=A1=E6=9D=BF=E9=87=8C=E9=9D=A2?=
=?UTF-8?q?=E7=9A=84NewFormAttrMark=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../widget/ui/designer/NewFormPane.java | 24 +++++++------------
.../design/form/layouts/templates/2-4/1.frm | 3 ---
.../design/form/layouts/templates/2-4/2.frm | 3 ---
.../design/form/layouts/templates/2-4/3.frm | 3 ---
.../design/form/layouts/templates/2-4/4.frm | 3 ---
.../design/form/layouts/templates/2-4/5.frm | 3 ---
.../design/form/layouts/templates/2-4/6.frm | 3 ---
.../design/form/layouts/templates/5-7/1.frm | 3 ---
.../design/form/layouts/templates/5-7/2.frm | 3 ---
.../design/form/layouts/templates/5-7/3.frm | 3 ---
.../design/form/layouts/templates/5-7/4.frm | 3 ---
.../design/form/layouts/templates/5-7/5.frm | 3 ---
.../design/form/layouts/templates/5-7/6.frm | 3 ---
.../design/form/layouts/templates/multi/1.frm | 3 ---
.../design/form/layouts/templates/multi/2.frm | 3 ---
.../design/form/layouts/templates/multi/3.frm | 3 ---
.../design/form/layouts/templates/multi/4.frm | 3 ---
.../design/form/layouts/templates/multi/5.frm | 3 ---
.../design/form/layouts/templates/multi/6.frm | 3 ---
19 files changed, 9 insertions(+), 69 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 5dba01933f..f4e977ae65 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
@@ -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)) {
- newEmptyForm();
- return;
- }
-
+ BaseJForm jForm;
try {
- Form form = new Form();
- form.readStream(NewFormPane.class.getResourceAsStream(path));
- NewJForm newJForm = new NewJForm(form);
- DesignerContext.getDesignerFrame().addAndActivateJTemplate(newJForm);
+ 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);
+ }
+ 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) {
diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/1.frm b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/1.frm
index 118e32e3d5..941abbbb17 100644
--- a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/1.frm
+++ b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/1.frm
@@ -113,9 +113,6 @@
-
-
-
diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/2.frm b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/2.frm
index 23415a67ad..0b04d5e7d4 100644
--- a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/2.frm
+++ b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/2.frm
@@ -122,9 +122,6 @@
-
-
-
diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/3.frm b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/3.frm
index 0839a1b3f0..43cc0b93b5 100644
--- a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/3.frm
+++ b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/3.frm
@@ -131,9 +131,6 @@
-
-
-
diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/4.frm b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/4.frm
index 9ed053b7ce..d6b0ba42b1 100644
--- a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/4.frm
+++ b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/4.frm
@@ -131,9 +131,6 @@
-
-
-
diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/5.frm b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/5.frm
index ed870dc10a..167db8fd20 100644
--- a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/5.frm
+++ b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/5.frm
@@ -131,9 +131,6 @@
-
-
-
diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/6.frm b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/6.frm
index 738b364d9f..504bfbd124 100644
--- a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/6.frm
+++ b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/6.frm
@@ -131,9 +131,6 @@
-
-
-
diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/5-7/1.frm b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/5-7/1.frm
index 168e5524a4..24df43d5c7 100644
--- a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/5-7/1.frm
+++ b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/5-7/1.frm
@@ -140,9 +140,6 @@
-
-
-
diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/5-7/2.frm b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/5-7/2.frm
index 7d094db3f5..e7f9d76d02 100644
--- a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/5-7/2.frm
+++ b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/5-7/2.frm
@@ -140,9 +140,6 @@
-
-
-
diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/5-7/3.frm b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/5-7/3.frm
index 4256655db3..1b1f1e1a4a 100644
--- a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/5-7/3.frm
+++ b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/5-7/3.frm
@@ -149,9 +149,6 @@
-
-
-
diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/5-7/4.frm b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/5-7/4.frm
index 1480313dee..dcd003aa1c 100644
--- a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/5-7/4.frm
+++ b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/5-7/4.frm
@@ -149,9 +149,6 @@
-
-
-
diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/5-7/5.frm b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/5-7/5.frm
index 338b4aac25..98a3ac6f9a 100644
--- a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/5-7/5.frm
+++ b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/5-7/5.frm
@@ -158,9 +158,6 @@
-
-
-
diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/5-7/6.frm b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/5-7/6.frm
index 5eb0738c4a..34d579ed58 100644
--- a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/5-7/6.frm
+++ b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/5-7/6.frm
@@ -158,9 +158,6 @@
-
-
-
diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/1.frm b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/1.frm
index a7ebf6bd78..710ccc3bda 100644
--- a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/1.frm
+++ b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/1.frm
@@ -167,9 +167,6 @@
-
-
-
diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/2.frm b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/2.frm
index aa05cb8eb4..2bfe6c1987 100644
--- a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/2.frm
+++ b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/2.frm
@@ -176,9 +176,6 @@
-
-
-
diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/3.frm b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/3.frm
index 20bbb64db4..e80cd4303f 100644
--- a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/3.frm
+++ b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/3.frm
@@ -176,9 +176,6 @@
-
-
-
diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/4.frm b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/4.frm
index 6edc573edd..21eac8ae6d 100644
--- a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/4.frm
+++ b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/4.frm
@@ -176,9 +176,6 @@
-
-
-
diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/5.frm b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/5.frm
index 3bf72c8320..5dde2178ec 100644
--- a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/5.frm
+++ b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/5.frm
@@ -176,9 +176,6 @@
-
-
-
diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/6.frm b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/6.frm
index 689230bc2f..3644ecff85 100644
--- a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/6.frm
+++ b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/6.frm
@@ -185,9 +185,6 @@
-
-
-