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 @@
-
-
-