From 5f6c301db71885ec4ec740193bd26d7ccfebb473 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=B9=E7=A3=8A?= <294531121@qq.com>
Date: Fri, 24 Sep 2021 15:10:52 +0800
Subject: [PATCH 1/3] =?UTF-8?q?REPORT-59905&REPORT-59952=20=E8=8B=A5?=
=?UTF-8?q?=E5=B9=B2bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../fr/design/widget/ui/designer/NewFormPane.java | 13 +++++++++++--
.../com/fr/design/form/layouts/templates/2-4/1.frm | 3 ---
.../com/fr/design/form/layouts/templates/2-4/2.frm | 3 ---
.../com/fr/design/form/layouts/templates/2-4/3.frm | 3 ---
.../com/fr/design/form/layouts/templates/2-4/4.frm | 3 ---
.../com/fr/design/form/layouts/templates/2-4/5.frm | 3 ---
.../com/fr/design/form/layouts/templates/2-4/6.frm | 3 ---
.../com/fr/design/form/layouts/templates/5-7/1.frm | 3 ---
.../com/fr/design/form/layouts/templates/5-7/2.frm | 3 ---
.../com/fr/design/form/layouts/templates/5-7/3.frm | 3 ---
.../com/fr/design/form/layouts/templates/5-7/4.frm | 3 ---
.../com/fr/design/form/layouts/templates/5-7/5.frm | 3 ---
.../com/fr/design/form/layouts/templates/5-7/6.frm | 3 ---
.../fr/design/form/layouts/templates/multi/1.frm | 3 ---
.../fr/design/form/layouts/templates/multi/2.frm | 3 ---
.../fr/design/form/layouts/templates/multi/3.frm | 3 ---
.../fr/design/form/layouts/templates/multi/4.frm | 3 ---
.../fr/design/form/layouts/templates/multi/5.frm | 3 ---
.../fr/design/form/layouts/templates/multi/6.frm | 3 ---
19 files changed, 11 insertions(+), 56 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 f4e977ae6..c73f2f235 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
@@ -32,6 +32,7 @@ import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import java.awt.BorderLayout;
import java.awt.Color;
+import java.awt.Component;
import java.awt.Dimension;
import java.awt.GridLayout;
import java.awt.event.MouseAdapter;
@@ -84,6 +85,7 @@ public class NewFormPane extends BasicPane {
});
dialog.setSize(new Dimension(900, 600));
GUICoreUtils.centerWindow(dialog);
+ dialog.setTitle(this.title4PopupWindow());
dialog.setResizable(false);
dialog.setVisible(true);
}
@@ -93,7 +95,14 @@ public class NewFormPane extends BasicPane {
list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
list.setModel(initListModel());
list.setSelectedIndex(0);
- list.setCellRenderer(new DefaultListCellRenderer());
+ list.setCellRenderer(new DefaultListCellRenderer() {
+ @Override
+ public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
+ super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
+ this.setBorder(BorderFactory.createEmptyBorder(0, 8, 0, 0));
+ return this;
+ }
+ });
list.addListSelectionListener(new ListSelectionListener() {
@Override
public void valueChanged(ListSelectionEvent e) {
@@ -257,7 +266,7 @@ public class NewFormPane extends BasicPane {
try {
if (StringUtils.isNotEmpty(path)) {
Form form = new Form();
- form.readStream(NewFormPane.class.getResourceAsStream(path));
+ form.readStream(NewFormPane.class.getResourceAsStream(path), true);
jForm = StableFactory.getMarkedInstanceObjectFromClass(BaseJForm.XML_TAG, new Object[]{form}, BaseJForm.class);
} else {
jForm = StableFactory.getMarkedInstanceObjectFromClass(BaseJForm.XML_TAG, BaseJForm.class);
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 941abbbb1..2e049900d 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,7 +113,4 @@
-
-
-
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 0b04d5e7d..568302e17 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,7 +122,4 @@
-
-
-
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 43cc0b93b..51c1663dd 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,7 +131,4 @@
-
-
-
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 d6b0ba42b..9d9287f98 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,7 +131,4 @@
-
-
-
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 167db8fd2..80aecc1ac 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,7 +131,4 @@
-
-
-
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 504bfbd12..e536bcec9 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,7 +131,4 @@
-
-
-
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 24df43d5c..a7881cd9f 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,7 +140,4 @@
-
-
-
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 e7f9d76d0..bd56aaa15 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,7 +140,4 @@
-
-
-
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 1b1f1e1a4..62729e1d0 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,7 +149,4 @@
-
-
-
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 dcd003aa1..44f8964ca 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,7 +149,4 @@
-
-
-
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 98a3ac6f9..7a0906d07 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,7 +158,4 @@
-
-
-
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 34d579ed5..93db94740 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,7 +158,4 @@
-
-
-
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 710ccc3bd..b68f35f2e 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,7 +167,4 @@
-
-
-
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 2bfe6c198..2033e2f70 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,7 +176,4 @@
-
-
-
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 e80cd4303..741cc8044 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,7 +176,4 @@
-
-
-
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 21eac8ae6..9784af2ff 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,7 +176,4 @@
-
-
-
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 5dde2178e..a10a18e3c 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,7 +176,4 @@
-
-
-
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 3644ecff8..f37a18830 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,7 +185,4 @@
-
-
-
From 9b73a2fab61c8e854421e16415eb9d55aab96183 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=B9=E7=A3=8A?= <294531121@qq.com>
Date: Sun, 26 Sep 2021 16:52:12 +0800
Subject: [PATCH 2/3] =?UTF-8?q?REPORT-59952&=E6=97=A0JIRA=E4=BB=BB?=
=?UTF-8?q?=E5=8A=A1=20=E8=BF=98=E5=8E=9F=E4=BB=A3=E7=A0=81&click=E4=BA=8B?=
=?UTF-8?q?=E4=BB=B6=E6=84=9F=E8=A7=89=E7=94=A8=E8=B5=B7=E6=9D=A5=E4=B8=8D?=
=?UTF-8?q?=E8=88=92=E6=9C=8D=EF=BC=8C=E9=BC=A0=E6=A0=87=E7=82=B9=E4=B8=8B?=
=?UTF-8?q?=E9=87=8A=E6=94=BE=E4=BD=8D=E7=BD=AE=E5=81=8F=E7=A6=BB=E4=B8=80?=
=?UTF-8?q?=E7=82=B9=E7=82=B9=E5=B0=B1=E5=A4=B1=E7=81=B5=E4=BA=86=EF=BC=8C?=
=?UTF-8?q?=E6=94=B9=E6=88=90press=E4=BA=8B=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/fr/design/widget/ui/designer/NewFormPane.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 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 c73f2f235..fa56280e8 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
@@ -151,9 +151,9 @@ public class NewFormPane extends BasicPane {
private JPanel createNewTemplatePane() {
EmptyLayoutPane jPanel = new EmptyLayoutPane();
- jPanel.addClickListener(new MouseAdapter() {
+ jPanel.addMouseListener(new MouseAdapter() {
@Override
- public void mouseClicked(MouseEvent e) {
+ public void mousePressed(MouseEvent e) {
setSelectedLayoutPane(jPanel);
dialog.setButtonEnabled(true);
}
@@ -238,9 +238,9 @@ public class NewFormPane extends BasicPane {
layoutPaneMap.put(moduleName, module);
for (PredefinedLayout layout : layouts) {
PredefinedLayoutPane predefinedLayoutPane = new PredefinedLayoutPane(layout);
- predefinedLayoutPane.addClickListener(new MouseAdapter() {
+ predefinedLayoutPane.addMouseListener(new MouseAdapter() {
@Override
- public void mouseClicked(MouseEvent e) {
+ public void mousePressed(MouseEvent e) {
setSelectedLayoutPane(predefinedLayoutPane);
dialog.setButtonEnabled(true);
}
@@ -266,7 +266,7 @@ public class NewFormPane extends BasicPane {
try {
if (StringUtils.isNotEmpty(path)) {
Form form = new Form();
- form.readStream(NewFormPane.class.getResourceAsStream(path), true);
+ 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);
From c971e997fb1e2d2dff3367a435b1aa19faac0321 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=B9=E7=A3=8A?= <294531121@qq.com>
Date: Sun, 26 Sep 2021 17:03:51 +0800
Subject: [PATCH 3/3] =?UTF-8?q?REPORT-59952=20=E8=BF=98=E5=8E=9F=E4=BB=A3?=
=?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../resources/com/fr/design/form/layouts/templates/2-4/1.frm | 3 +++
.../resources/com/fr/design/form/layouts/templates/2-4/2.frm | 3 +++
.../resources/com/fr/design/form/layouts/templates/2-4/3.frm | 3 +++
.../resources/com/fr/design/form/layouts/templates/2-4/4.frm | 3 +++
.../resources/com/fr/design/form/layouts/templates/2-4/5.frm | 3 +++
.../resources/com/fr/design/form/layouts/templates/2-4/6.frm | 3 +++
.../resources/com/fr/design/form/layouts/templates/5-7/1.frm | 3 +++
.../resources/com/fr/design/form/layouts/templates/5-7/2.frm | 3 +++
.../resources/com/fr/design/form/layouts/templates/5-7/3.frm | 3 +++
.../resources/com/fr/design/form/layouts/templates/5-7/4.frm | 3 +++
.../resources/com/fr/design/form/layouts/templates/5-7/5.frm | 3 +++
.../resources/com/fr/design/form/layouts/templates/5-7/6.frm | 3 +++
.../resources/com/fr/design/form/layouts/templates/multi/1.frm | 3 +++
.../resources/com/fr/design/form/layouts/templates/multi/2.frm | 3 +++
.../resources/com/fr/design/form/layouts/templates/multi/3.frm | 3 +++
.../resources/com/fr/design/form/layouts/templates/multi/4.frm | 3 +++
.../resources/com/fr/design/form/layouts/templates/multi/5.frm | 3 +++
.../resources/com/fr/design/form/layouts/templates/multi/6.frm | 3 +++
18 files changed, 54 insertions(+)
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 2e049900d..941abbbb1 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,4 +113,7 @@
+
+
+
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 568302e17..0b04d5e7d 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,4 +122,7 @@
+
+
+
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 51c1663dd..43cc0b93b 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,4 +131,7 @@
+
+
+
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 9d9287f98..d6b0ba42b 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,4 +131,7 @@
+
+
+
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 80aecc1ac..167db8fd2 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,4 +131,7 @@
+
+
+
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 e536bcec9..504bfbd12 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,4 +131,7 @@
+
+
+
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 a7881cd9f..24df43d5c 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,4 +140,7 @@
+
+
+
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 bd56aaa15..e7f9d76d0 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,4 +140,7 @@
+
+
+
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 62729e1d0..1b1f1e1a4 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,4 +149,7 @@
+
+
+
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 44f8964ca..dcd003aa1 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,4 +149,7 @@
+
+
+
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 7a0906d07..98a3ac6f9 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,4 +158,7 @@
+
+
+
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 93db94740..34d579ed5 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,4 +158,7 @@
+
+
+
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 b68f35f2e..710ccc3bd 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,4 +167,7 @@
+
+
+
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 2033e2f70..2bfe6c198 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,4 +176,7 @@
+
+
+
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 741cc8044..e80cd4303 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,4 +176,7 @@
+
+
+
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 9784af2ff..21eac8ae6 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,4 +176,7 @@
+
+
+
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 a10a18e3c..5dde2178e 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,4 +176,7 @@
+
+
+
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 f37a18830..3644ecff8 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,4 +185,7 @@
+
+
+