Merge pull request #1310 in BA/design from ~KERRY/design:release/9.0 to release/9.0

* commit 'fdb804802cccd9e26f6b6de5dbd0d927944fc39c':
  漏传
  REPORT-4683 [9.0二轮回归]复选框控件控件值第二次点击绑定字段时，设计器卡死
  误删
  REPORT-4602 9.0设计器属性面板文本框下拉框文字缩进不统一

designer/src/com/fr/design/widget/ui/BasicWidgetPropertySettingPane.java

@@ -1,6 +1,6 @@
 package com.fr.design.widget.ui;
 
-import com.fr.design.constants.LayoutConstants;
+import com.fr.design.designer.IntervalConstants;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.dialog.BasicPane;
@@ -11,8 +11,11 @@ import com.fr.form.ui.Widget;
 import com.fr.general.Inter;
 import com.fr.design.utils.gui.GUICoreUtils;
 
-import javax.swing.*;
+import javax.swing.BorderFactory;
-import java.awt.*;
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
+import java.awt.Component;
+
 
 public class BasicWidgetPropertySettingPane extends BasicPane {
 	private ParameterTreeComboBox widgetNameComboBox;
@@ -28,20 +31,17 @@ public class BasicWidgetPropertySettingPane extends BasicPane {
 		visibleCheckBox.setBorder(BorderFactory.createEmptyBorder(0,0,0,0));
 		widgetNameComboBox = new ParameterTreeComboBox();
 		widgetNameComboBox.refreshTree();
-		JPanel widgetNamePane = new JPanel(new BorderLayout());
-		widgetNamePane.add(widgetNameComboBox, BorderLayout.CENTER);
-		widgetNamePane.setBorder(BorderFactory.createEmptyBorder(0,20,0,0));
 		double f = TableLayout.FILL;
 		double p = TableLayout.PREFERRED;
 		Component[][] components = new Component[][]{
-				new Component[]{new UILabel(Inter.getLocText("FR-Designer_Form-Widget_Name")), widgetNamePane},
+				new Component[]{new UILabel(Inter.getLocText("FR-Designer_Form-Widget_Name")), widgetNameComboBox},
 				new Component[]{enableCheckBox, null},
 				new Component[]{visibleCheckBox, null},
 		};
 		double[] rowSize = {p, p, p};
 		double[] columnSize = {p, f};
 		int[][] rowCount = {{1, 1},{1, 1},{1, 1},{1, 1}};
-		JPanel pane = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_LARGE, LayoutConstants.VGAP_LARGE);
+		JPanel pane = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W2, IntervalConstants.INTERVAL_L1);
 		pane.setBorder(BorderFactory.createEmptyBorder(10,0,10,0));
 
 		this.add(pane, BorderLayout.CENTER);

designer/src/com/fr/design/widget/ui/ButtonGroupDictPane.java

@@ -5,6 +5,7 @@ import java.awt.*;
 import java.awt.event.ActionEvent;
 
 import com.fr.data.Dictionary;
+import com.fr.design.designer.IntervalConstants;
 import com.fr.design.gui.ispinner.UIBasicSpinner;
 import java.awt.event.ActionListener;
 
@@ -57,8 +58,7 @@ public class ButtonGroupDictPane extends JPanel {
 				{new UILabel(Inter.getLocText("FR-Designer_DS-Dictionary")), dictPane, null},
 				{adaptiveCheckbox, columnLabel, columnSpinner}
 		};
-		JPanel panel = TableLayoutHelper.createGapTableLayoutPane(n_components, rowSize, columnSize, 16, 8);
+		JPanel panel = TableLayoutHelper.createGapTableLayoutPane(n_components, rowSize, columnSize, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
-		panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
 		this.add(panel);
 
 

designer/src/com/fr/design/widget/ui/CheckBoxDefinePane.java

@@ -1,6 +1,7 @@
 package com.fr.design.widget.ui;
 
 import com.fr.design.constants.LayoutConstants;
+import com.fr.design.designer.IntervalConstants;
 import com.fr.design.foldablepane.UIExpandablePane;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itextfield.UITextField;
@@ -17,28 +18,24 @@ public class CheckBoxDefinePane extends AbstractDataModify<CheckBox> {
     private UITextField text;
 
     public CheckBoxDefinePane() {
-        this.iniComoponents();
+        this.iniComponents();
     }
 
-    private void iniComoponents() {
+    private void iniComponents() {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
         text = new UITextField();
-        JPanel panel = new JPanel(new BorderLayout());
-        panel.add(text, BorderLayout.CENTER);
-        panel.setBorder(BorderFactory.createEmptyBorder(0, 35, 0, 0));
-
         double f = TableLayout.FILL;
         double p = TableLayout.PREFERRED;
         Component[][] components = new Component[][]{
-                new Component[]{new UILabel(Inter.getLocText("FR-Designer_Text")), panel},
+                new Component[]{new UILabel(Inter.getLocText("FR-Designer_Text")), text},
         };
         double[] rowSize = {p};
         double[] columnSize = {p, f};
         int[][] rowCount = {{1, 1}};
-        JPanel pane = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_LARGE, LayoutConstants.VGAP_LARGE);
+        JPanel pane = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount,  IntervalConstants.INTERVAL_W3, IntervalConstants.INTERVAL_L1);
 
         UIExpandablePane uiExpandablePane = new UIExpandablePane(Inter.getLocText("FR-Designer_Advanced"), 280, 24, pane);
-        pane.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 15));
+        pane.setBorder(BorderFactory.createEmptyBorder(10, 5, 10, 0));
 
         this.add(uiExpandablePane);
     }

designer/src/com/fr/design/widget/ui/ComboBoxDefinePane.java

@@ -4,6 +4,7 @@ import javax.swing.*;
 
 import com.fr.data.Dictionary;
 import com.fr.design.data.DataCreatorUI;
+import com.fr.design.designer.IntervalConstants;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.widget.accessibles.AccessibleDictionaryEditor;
@@ -26,8 +27,9 @@ public class ComboBoxDefinePane extends CustomWritableRepeatEditorPane<ComboBox>
 
 	protected JPanel setForthContentPane () {
 		dictPane = new AccessibleDictionaryEditor();
-		JPanel jPanel =  TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{new UILabel(Inter.getLocText("FR-Designer_DS-Dictionary")), dictPane}}, TableLayoutHelper.FILL_LASTCOLUMN, 18, 7);
+		JPanel jPanel =  TableLayoutHelper.createGapTableLayoutPane(
-		jPanel.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
+				new Component[][]{new Component[]{new UILabel(Inter.getLocText("FR-Designer_DS-Dictionary")), dictPane}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
+		jPanel.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
 		return jPanel;
 	}
 

designer/src/com/fr/design/widget/ui/ComboCheckBoxDefinePane.java

@@ -2,6 +2,7 @@ package com.fr.design.widget.ui;
 
 import com.fr.data.Dictionary;
 import com.fr.design.data.DataCreatorUI;
+import com.fr.design.designer.IntervalConstants;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.FRGUIPaneFactory;
@@ -42,7 +43,7 @@ public class ComboCheckBoxDefinePane extends CustomWritableRepeatEditorPane<Comb
 		double[] rowSize = {p, p, p, p};
 		double[] columnSize = {p, f};
 		int[][] rowCount = {{1, 1},{1, 1},{1,1},{1,1}};
-		JPanel panel =  TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, 10, 7);
+		JPanel panel =  TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
 		panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
 		advancePane.add(panel);
 		return advancePane;

designer/src/com/fr/design/widget/ui/DateEditorDefinePane.java

@@ -3,6 +3,7 @@ package com.fr.design.widget.ui;
 import com.fr.base.FRContext;
 import com.fr.base.Formula;
 import com.fr.data.core.FormatField;
+import com.fr.design.designer.IntervalConstants;
 import com.fr.design.gui.ibutton.UIButtonGroup;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.ilable.UILabel;
@@ -58,17 +59,16 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane<DateEditor
 		double f = TableLayout.FILL;
 		double p = TableLayout.PREFERRED;
 		Component[][] components = new Component[][]{
-				new Component[]{new UILabel(Inter.getLocText("FR-Engine_Format") + ":"), formatHead},
+				new Component[]{new UILabel(Inter.getLocText("FR-Engine_Format")), formatHead},
-				new Component[]{new UILabel(Inter.getLocText("FS_Start_Date") + ":"), startDv},
+				new Component[]{new UILabel(Inter.getLocText("FS_Start_Date")), startDv},
-				new Component[]{new UILabel(Inter.getLocText("FS_End_Date") + ":"), endDv},
+				new Component[]{new UILabel(Inter.getLocText("FS_End_Date")), endDv},
 				new Component[]{waterMarkDictPane, null},
-				new Component[]{new UILabel(Inter.getLocText("Widget-Date_Selector_Return_Type") + ":"), returnTypeComboBox }
+				new Component[]{new UILabel(Inter.getLocText("Widget-Date_Selector_Return_Type")), returnTypeComboBox }
 		};
 		double[] rowSize = {p, p, p, p, p, p, p};
 		double[] columnSize = {p, f};
 		int[][] rowCount = {{1, 3},{1, 1},{1, 1},{1, 1},{1, 1}};
-		JPanel panel =  TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, 10, 7);
+		JPanel panel =  TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_L2, IntervalConstants.INTERVAL_L1);
-		panel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
 
 
 		return panel;

designer/src/com/fr/design/widget/ui/FieldEditorDefinePane.java

@@ -32,8 +32,11 @@ public abstract class FieldEditorDefinePane<T extends FieldEditor> extends Abstr
     protected void initComponents() {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
         JPanel contentPane = this.setFirstContentPane();
+        JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        jPanel.add(contentPane, BorderLayout.CENTER);
+        contentPane.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
         if (contentPane != null) {
-            UIExpandablePane uiExpandablePane = new UIExpandablePane(Inter.getLocText("FR-Designer_Advanced"), 280, 24, contentPane);
+            UIExpandablePane uiExpandablePane = new UIExpandablePane(Inter.getLocText("FR-Designer_Advanced"), 280, 24, jPanel);
             this.add(uiExpandablePane, BorderLayout.NORTH);
         }
         this.addValidatePane();

designer/src/com/fr/design/widget/ui/IframeEditorDefinePane.java

@@ -2,6 +2,7 @@ package com.fr.design.widget.ui;
 
 import com.fr.base.FRContext;
 import com.fr.design.constants.LayoutConstants;
+import com.fr.design.designer.IntervalConstants;
 import com.fr.design.dialog.DialogActionListener;
 import com.fr.design.dialog.UIDialog;
 import com.fr.design.foldablepane.UIExpandablePane;
@@ -57,14 +58,15 @@ public class IframeEditorDefinePane extends AbstractDataModify<IframeEditor> {
         parameterViewPaneButton = new UIButton(Inter.getLocText("FR-Designer_Edit"));
         parameterViewPaneButton.addActionListener(parameterListener);
         parameterViewPane = new ReportletParameterViewPane();
-
+        horizontalCheck.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
+        verticalCheck.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
         java.awt.Component[][] coms = {
                 {horizontalCheck, null},
                 {verticalCheck, null},
                 {new UILabel(Inter.getLocText("Form-Url")), srcTextField = new UITextField()},
                 {new UILabel(Inter.getLocText("FR-Designer_Parameters")), parameterViewPaneButton}};
         int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}, {1, 1}};
-        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(coms, rowSize, columnSize, rowCount, 45, LayoutConstants.VGAP_LARGE);
+        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(coms, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W3, IntervalConstants.INTERVAL_L1);
 
 
         contentPane.add(panel);

designer/src/com/fr/design/widget/ui/ListEditorDefinePane.java

@@ -34,12 +34,12 @@ public class ListEditorDefinePane extends WriteUnableRepeatEditorPane<ListEditor
 
 	@Override
 	protected JPanel setThirdContentPane() {
-		JPanel contenter = FRGUIPaneFactory.createMediumHGapFlowInnerContainer_M_Pane_First0();
+		JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
-		JPanel centerPane = FRGUIPaneFactory.createMediumHGapFlowInnerContainer_M_Pane_First0();
+		needHeadCheckBox = new UICheckBox(Inter.getLocText("List-Need_Head"));
-		centerPane.add(needHeadCheckBox = new UICheckBox(Inter.getLocText("List-Need_Head")));
 		needHeadCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
-		contenter.add(centerPane);
+		jPanel.add(needHeadCheckBox, BorderLayout.CENTER);
-		return contenter;
+		jPanel.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
+		return jPanel;
 	}
 	
 	@Override

designer/src/com/fr/design/widget/ui/MultiFileEditorPane.java

@@ -1,5 +1,6 @@
 package com.fr.design.widget.ui;
 
+import com.fr.design.designer.IntervalConstants;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.icombobox.DictionaryComboBox;
 import com.fr.design.gui.icombobox.DictionaryConstants;
@@ -55,9 +56,7 @@ public class MultiFileEditorPane extends FieldEditorDefinePane<MultiFileEditor>
         double[] rowSize = {p, p, p};
         double[] columnSize = {p, f};
         int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}};
-        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, 22, 10);
+        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
-
-        panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 00));
         contenter.add(panel, BorderLayout.CENTER);
 
         return contenter;

designer/src/com/fr/design/widget/ui/NumberEditorDefinePane.java

@@ -29,7 +29,6 @@ public class NumberEditorDefinePane extends FieldEditorDefinePane<NumberEditor>
     protected JPanel setFirstContentPane() {
         JPanel content = FRGUIPaneFactory.createBorderLayout_S_Pane();
         waterMarkDictPane = new WaterMarkDictPane();
-        waterMarkDictPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 10, 0));
         content.add(waterMarkDictPane, BorderLayout.CENTER);
         return content;
     }

designer/src/com/fr/design/widget/ui/TextFieldEditorDefinePane.java

@@ -51,9 +51,7 @@ public class TextFieldEditorDefinePane extends FieldEditorDefinePane<TextEditor>
             }
         });
         JPanel content = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        waterMarkDictPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 10, 0));
         content.add(waterMarkDictPane, BorderLayout.CENTER);
-
         return content;
     }
 

designer/src/com/fr/design/widget/ui/TreeComboBoxEditorDefinePane.java

@@ -7,6 +7,7 @@ import javax.swing.JPanel;
 
 import com.fr.data.Dictionary;
 import com.fr.design.data.DataCreatorUI;
+import com.fr.design.designer.IntervalConstants;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itree.refreshabletree.TreeRootPane;
 import com.fr.design.layout.FRGUIPaneFactory;
@@ -38,8 +39,9 @@ public class TreeComboBoxEditorDefinePane extends CustomWritableRepeatEditorPane
 	protected JPanel setFirstContentPane() {
 		treeSettingPane = new AccessibleTreeModelEditor();
 		JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
-		JPanel north = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{new UILabel(Inter.getLocText("FR-Designer_Create_Tree")), treeSettingPane}}, TableLayoutHelper.FILL_LASTCOLUMN, 18, 7);
+		JPanel north = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{
-		north.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
+				new Component[]{new UILabel(Inter.getLocText("FR-Designer_Create_Tree")), treeSettingPane}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W2, IntervalConstants.INTERVAL_L1);
+		north.setBorder(BorderFactory.createEmptyBorder(0, 0, 10, 0));
 		JPanel center = super.setFirstContentPane();
 		jPanel.add(north, BorderLayout.NORTH);
 		jPanel.add(center, BorderLayout.CENTER);

designer/src/com/fr/design/widget/ui/TreeEditorDefinePane.java

@@ -2,6 +2,7 @@ package com.fr.design.widget.ui;
 
 import com.fr.data.Dictionary;
 import com.fr.design.data.DataCreatorUI;
+import com.fr.design.designer.IntervalConstants;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itree.refreshabletree.TreeRootPane;
@@ -55,8 +56,9 @@ public class TreeEditorDefinePane extends FieldEditorDefinePane<TreeEditor> {
 
 	protected JPanel setSecondContentPane() {
 		accessibleTreeModelEditor = new AccessibleTreeModelEditor();
-		JPanel createTree = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{new UILabel(Inter.getLocText("FR-Designer_Create_Tree")), accessibleTreeModelEditor}}, TableLayoutHelper.FILL_LASTCOLUMN, 18, 7);
+		JPanel createTree = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{
-		createTree.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
+				new Component[]{new UILabel(Inter.getLocText("FR-Designer_Create_Tree")), accessibleTreeModelEditor}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W2, IntervalConstants.INTERVAL_L1);
+		createTree.setBorder(BorderFactory.createEmptyBorder(0, 0, 10, 0));
 		JPanel contentPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
 		JPanel contenter = FRGUIPaneFactory.createBorderLayout_S_Pane();
 

designer/src/com/fr/design/widget/ui/WaterMarkDictPane.java

@@ -1,5 +1,6 @@
 package com.fr.design.widget.ui;
 
+import com.fr.design.designer.IntervalConstants;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.layout.TableLayout;
@@ -28,8 +29,8 @@ public class WaterMarkDictPane extends JPanel {
         double[] rowSize = {p};
         double[] columnSize = {p, f};
         int[][] rowCount = {{1, 1}};
-        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, 18, 7);
+        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount,  IntervalConstants.INTERVAL_W3, IntervalConstants.INTERVAL_L1);
-        panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
+//        panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
         this.add(panel, BorderLayout.CENTER);
     }
 

designer/src/com/fr/design/widget/ui/WriteUnableRepeatEditorPane.java

@@ -5,6 +5,7 @@ import java.awt.*;
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 
+import com.fr.design.designer.IntervalConstants;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
@@ -36,8 +37,7 @@ public abstract class WriteUnableRepeatEditorPane<E extends WriteUnableRepeatEdi
 		double[] rowSize = {p, p};
 		double[] columnSize = {p, f};
 		int[][] rowCount = {{1,1},{1,1}};
-		JPanel panel =  TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, 10, 7);
+		JPanel panel =  TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
-		panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
 		contentPane.add(panel);
 		JPanel otherContentPane = this.setThirdContentPane();
 		if (otherContentPane != null)

designer/src/com/fr/design/widget/ui/btn/DefineAppendColumnRowPane.java

@@ -3,6 +3,8 @@ package com.fr.design.widget.ui.btn;
 import java.awt.Component;
 
 import javax.swing.BorderFactory;
+
+import com.fr.design.designer.IntervalConstants;
 import com.fr.design.gui.ilable.UILabel;
 import javax.swing.JPanel;
 
@@ -43,7 +45,7 @@ public class DefineAppendColumnRowPane extends BasicPane {
 		lpane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
 		lpane.add(new UILabel(Inter.getLocText("Append_Delete_Row_Message")));
 		Component[][] components = { { new UILabel(Inter.getLocText(new String[]{"Specify", "Cell"})), crEditor }, { rowCountLable, jNumberEditor } ,{lpane,null}};
-		JPanel contentPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
+		JPanel contentPane = TableLayoutHelper.createGapTableLayoutPane(components, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L2, IntervalConstants.INTERVAL_L1);
 		contentPane.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
 
 		this.setLayout(FRGUIPaneFactory.createBorderLayout());

designer/src/com/fr/design/widget/ui/btn/DefineDeleteColumnRowPane.java

@@ -2,6 +2,7 @@ package com.fr.design.widget.ui.btn;
 
 import javax.swing.*;
 
+import com.fr.design.designer.IntervalConstants;
 import com.fr.design.gui.ilable.UILabel;
 
 import com.fr.design.layout.FRGUIPaneFactory;
@@ -38,7 +39,7 @@ public class DefineDeleteColumnRowPane extends BasicPane {
 		Component[][] components = {
 				{ new UILabel(Inter.getLocText(new String[]{"Specify", "Cell"})), crEditor },
 				{ messageLabel, null}};
-		JPanel contentPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
+		JPanel contentPane = TableLayoutHelper.createGapTableLayoutPane(components, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L2, IntervalConstants.INTERVAL_L1);
 		contentPane.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
 		setLayout(FRGUIPaneFactory.createBorderLayout());
 

designer_base/src/com/fr/design/designer/IntervalConstants.java

@@ -7,7 +7,7 @@ public class IntervalConstants {
 
     public static final int INTERVAL_L1 = 10;
 
-    public static final int INTERVAL_L2 = 15;
+    public static final int INTERVAL_L2 = 13;
 
     public static final int INTERVAL_L3 = 155;
 
@@ -19,4 +19,12 @@ public class IntervalConstants {
 
     public static final int INTERVAL_L7 = 8;
 
+    public static final int INTERVAL_W0 = 3;
+
+    public static final int INTERVAL_W1 = 25;
+
+    public static final int INTERVAL_W2 = 37;
+
+    public static final int INTERVAL_W3 = 49;
+
 }

designer_base/src/com/fr/design/gui/frpane/RegPane.java

@@ -75,7 +75,8 @@ public class RegPane extends BasicPane {
         regComboBox = new UIComboBox(regType);
         regComboBox.setRenderer(listCellRender);
 
-        JPanel contentPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{new UILabel(Inter.getLocText("FR-Designer_Input_Rule")), regComboBox}}, TableLayoutHelper.FILL_LASTCOLUMN, 18, 7);
+        JPanel contentPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{
+                new Component[]{new UILabel(Inter.getLocText("FR-Designer_Input_Rule")), regComboBox}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
         JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
 
         jPanel.add(contentPane, BorderLayout.NORTH);

designer_base/src/com/fr/design/gui/icombobox/LazyComboBox.java

@@ -175,8 +175,10 @@ public abstract class LazyComboBox extends UIComboBox implements PopupMenuListen
 			this.item = item;
 
 			this.setting = true;
+			textField.setSetting(true);
 			String newText = (item == null) ? "" : item.toString();
 			textField.setText(newText);
+			textField.setSetting(false);
 			this.setting = false;
 		}
 

designer_base/src/com/fr/design/gui/itextfield/UITextField.java

@@ -26,6 +26,9 @@ public class UITextField extends JTextField implements UIObserver, GlobalNameObs
     private GlobalNameListener globalNameListener = null;
     private Dimension preferredSize = null;
 
+    //有些情况下setText的时候不希望触发attributeChange，添加一个属性标识
+    private boolean isSetting = false;
+
     public UITextField() {
         super();
         InputEventBaseOnOS.addBasicEditInputMap(this);
@@ -78,6 +81,13 @@ public class UITextField extends JTextField implements UIObserver, GlobalNameObs
         }
     }
 
+    public boolean isSetting() {
+        return isSetting;
+    }
+
+    public void setSetting(boolean setting) {
+        isSetting = setting;
+    }
 
     public void setPreferredSize(Dimension preferredSize) {
         this.preferredSize = preferredSize;
@@ -88,6 +98,9 @@ public class UITextField extends JTextField implements UIObserver, GlobalNameObs
     }
 
     protected void attributeChange() {
+        if(isSetting){
+            return;
+        }
         if (globalNameListener != null && shouldResponseNameListener()) {
             globalNameListener.setGlobalName(textFeildName);
         }

designer_base/src/com/fr/design/mainframe/widget/BasicPropertyPane.java

@@ -1,5 +1,6 @@
 package com.fr.design.mainframe.widget;
 
+import com.fr.design.designer.IntervalConstants;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itextfield.UITextField;
@@ -36,7 +37,7 @@ public class BasicPropertyPane extends BasicPane {
         Component[][] components = new Component[][]{
                 new Component[]{new UILabel(Inter.getLocText("FR-Designer_Widget_Name")), widgetName},
         };
-        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, 20, 7);
+        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
         panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
         this.add(panel, BorderLayout.NORTH);
     }

designer_base/src/com/fr/design/widget/WidgetBoundsPaneFactory.java

@@ -1,5 +1,6 @@
 package com.fr.design.widget;
 
+import com.fr.design.designer.IntervalConstants;
 import com.fr.design.foldablepane.UIExpandablePane;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ispinner.UISpinner;
@@ -21,32 +22,43 @@ public class WidgetBoundsPaneFactory {
         double f = TableLayout.FILL;
         double p = TableLayout.PREFERRED;
         Component[][] components = new Component[][]{
-                new Component[]{new UILabel(Inter.getLocText("FR-Designer-Widget_Size")), width, height},
+                new Component[]{new UILabel(Inter.getLocText("FR-Designer-Widget_Size")), createRightPane(width, height)},
-                new Component[]{null, new UILabel(Inter.getLocText("FR-Designer-Tree_Width"), SwingConstants.CENTER), new UILabel(Inter.getLocText("FR-Designer-Tree_Height"), SwingConstants.CENTER)},
+                new Component[]{null, createRightPane(new UILabel(Inter.getLocText("FR-Designer-Tree_Width"), SwingConstants.CENTER), new UILabel(Inter.getLocText("FR-Designer-Tree_Height"), SwingConstants.CENTER))},
         };
         double[] rowSize = {p, p};
-        double[] columnSize = {p, f, f};
+        double[] columnSize = {p, f};
-        int[][] rowCount = {{1, 1, 1}, {1, 1, 1}};
+        int[][] rowCount = {{1, 1}, {1, 1}};
-        final JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, 8, 10);
+        final JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
         panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
         boundsPane.add(panel);
         return new UIExpandablePane(Inter.getLocText("FR-Designer_Coords_And_Size"), 280, 24, boundsPane);
     }
+    public static JPanel createRightPane(Component com1, Component com2){
+        double f = TableLayout.FILL;
+        double p = TableLayout.PREFERRED;
+        double[] rowSize = {p};
+        double[] columnSize = {f, f};
+        int[][] rowCount = {{1, 1}};
+        Component[][] components = new Component[][]{
+                new Component[]{com1, com2}
+        };
+        return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_L6, IntervalConstants.INTERVAL_L1);
+    }
 
     public static UIExpandablePane createAbsoluteBoundsPane(UISpinner x, UISpinner y, UISpinner width, UISpinner height) {
         double f = TableLayout.FILL;
         double p = TableLayout.PREFERRED;
 
         Component[][] components = new Component[][]{
-                new Component[]{new UILabel(Inter.getLocText("FR-Designer_Widget_Position")), x, y},
+                new Component[]{new UILabel(Inter.getLocText("FR-Designer_Widget_Position")), createRightPane(x, y)},
-                new Component[]{null, new UILabel(Inter.getLocText("FR-Designer_X_Coordinate"), SwingConstants.CENTER), new UILabel(Inter.getLocText("FR-Designer_Y_Coordinate"), SwingConstants.CENTER)},
+                new Component[]{null, createRightPane(new UILabel(Inter.getLocText("FR-Designer_X_Coordinate"), SwingConstants.CENTER), new UILabel(Inter.getLocText("FR-Designer_Y_Coordinate"), SwingConstants.CENTER))},
-                new Component[]{new UILabel(Inter.getLocText("FR-Designer-Widget_Size")), width, height},
+                new Component[]{new UILabel(Inter.getLocText("FR-Designer-Widget_Size")), createRightPane(width, height)},
-                new Component[]{null, new UILabel(Inter.getLocText("FR-Designer-Tree_Width"), SwingConstants.CENTER), new UILabel(Inter.getLocText("FR-Designer-Tree_Height"), SwingConstants.CENTER)},
+                new Component[]{null, createRightPane(new UILabel(Inter.getLocText("FR-Designer-Tree_Width"), SwingConstants.CENTER), new UILabel(Inter.getLocText("FR-Designer-Tree_Height"), SwingConstants.CENTER))},
         };
         double[] rowSize = {p, p, p, p};
-        double[] columnSize = {p, f, f};
+        double[] columnSize = {p, f};
-        int[][] rowCount = {{1, 1, 1}, {1, 1, 1}, {1, 1, 1}, {1, 1, 1}};
+        int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}, {1, 1}};
-        final JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, 8, 10);
+        final JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
         JPanel boundsPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
         boundsPane.add(panel);

designer_base/src/com/fr/design/widget/btn/ButtonWithHotkeysDetailPane.java

@@ -49,7 +49,7 @@ public abstract class ButtonWithHotkeysDetailPane<T extends Button> extends Butt
                 {new UILabel(Inter.getLocText("FR-Designer_Button-Hotkeys")), hotkeysTextField = new UITextField()},
         };
         hotkeysTextField.setToolTipText(StableUtils.join(ButtonConstants.HOTKEYS, ","));
-        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(n_components, rowSize, columnSize, IntervalConstants.INTERVAL_L2, IntervalConstants.INTERVAL_L1);
+        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(n_components, rowSize, columnSize, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
         panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
         advancePane.add(panel, BorderLayout.NORTH);
         Component comp = createCenterPane();

designer_base/src/com/fr/design/widget/component/BackgroundCompPane.java

@@ -32,7 +32,6 @@ public abstract class BackgroundCompPane<T extends Widget> extends BasicPane {
     public void initComponent() {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
         UILabel headLabel = createUILable();
-        headLabel.setPreferredSize(new Dimension(50, 20));
         initalBackgroundEditor = new AccessibleImgBackgroundEditor();
         overBackgroundEditor = new AccessibleImgBackgroundEditor();
         clickBackgroundEditor = new AccessibleImgBackgroundEditor();
@@ -48,10 +47,11 @@ public abstract class BackgroundCompPane<T extends Widget> extends BasicPane {
                 new Component[]{new UILabel(Inter.getLocText("FR-Designer_Background-Over")), overBackgroundEditor},
                 new Component[]{new UILabel(Inter.getLocText("FR-Designer_Background-Click")), clickBackgroundEditor},
         };
-        panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_L2, IntervalConstants.INTERVAL_L1);
+        panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W0, IntervalConstants.INTERVAL_L1);
         panel.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L6, IntervalConstants.INTERVAL_L5, 0, 0));
         backgroundHead = new UIButtonGroup(titles);
-        JPanel headPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{headLabel, backgroundHead}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L2, 7);
+        JPanel headPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{
+                new Component[]{headLabel, backgroundHead}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W3, IntervalConstants.INTERVAL_L1);
 
         this.add(headPane, BorderLayout.NORTH);
         this.add(panel, BorderLayout.CENTER);

designer_base/src/com/fr/design/widget/component/CheckBoxDictPane.java

@@ -35,11 +35,11 @@ public class CheckBoxDictPane extends JPanel {
 		endComboBox = new DictionaryComboBox(DictionaryConstants.symbols, DictionaryConstants.symbolDisplays);
 		endComboBox.setEditable(true);
 		Component[][] components = new Component[][]{
-				new Component[]{new UILabel(Inter.getLocText("Form-Delimiter") + ":"), delimiterComboBox},
+				new Component[]{new UILabel(Inter.getLocText("Form-Delimiter")), delimiterComboBox},
-				new Component[]{new UILabel(Inter.getLocText("ComboCheckBox-Start_Symbol") + ":"),startComboBox},
+				new Component[]{new UILabel(Inter.getLocText("ComboCheckBox-Start_Symbol")),startComboBox},
-				new Component[]{new UILabel(Inter.getLocText("ComboCheckBox-End_Symbol") + ":"),endComboBox}
+				new Component[]{new UILabel(Inter.getLocText("ComboCheckBox-End_Symbol")),endComboBox}
 		};
-		returnStringPane = TableLayoutHelper.createGapTableLayoutPane(components, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L2, IntervalConstants.INTERVAL_L1);
+		returnStringPane = TableLayoutHelper.createGapTableLayoutPane(components, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W2, IntervalConstants.INTERVAL_L1);
 
 		returnTypeComboBox = new UIButtonGroup(new String[]{Inter.getLocText("Widget-Array"), Inter.getLocText("String")});
 		returnTypeComboBox.addActionListener(new ActionListener() {
@@ -48,7 +48,8 @@ public class CheckBoxDictPane extends JPanel {
 				checkVisible(returnTypeComboBox.getSelectedIndex());
 			}
 		});
-		JPanel headPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{new UILabel(Inter.getLocText("Widget-Date_Selector_Return_Type") + ":"), returnTypeComboBox}}, TableLayoutHelper.FILL_LASTCOLUMN, 18, 7);
+		JPanel headPane = TableLayoutHelper.createGapTableLayoutPane(
+				new Component[][]{new Component[]{new UILabel(Inter.getLocText("Widget-Date_Selector_Return_Type")), returnTypeComboBox}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L2, IntervalConstants.INTERVAL_L1);
 		JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
 		jPanel.add(headPane, BorderLayout.NORTH);
 		jPanel.add(returnStringPane, BorderLayout.CENTER);

designer_form/src/com/fr/design/mainframe/widget/ui/FormBasicWidgetPropertyPane.java

@@ -21,10 +21,12 @@ public class FormBasicWidgetPropertyPane extends FormBasicPropertyPane {
 
     protected void initOtherPane() {
         JPanel pane2 = FRGUIPaneFactory.createY_AXISBoxInnerContainer_M_Pane();
-        pane2.setBorder(BorderFactory.createEmptyBorder(0,0,10,0));
+        pane2.setBorder(BorderFactory.createEmptyBorder(0, 0, 10, 0));
         enableCheckBox = new UICheckBox(Inter.getLocText("Enabled"), true);
+        enableCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
         pane2.add(enableCheckBox);
         visibleCheckBox = new UICheckBox(Inter.getLocText("Widget-Visible"), true);
+        visibleCheckBox.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
         pane2.add(visibleCheckBox);
         this.add(pane2, BorderLayout.CENTER);
     }

designer_form/src/com/fr/design/parameter/RootDesignDefinePane.java

@@ -66,7 +66,7 @@ public class RootDesignDefinePane extends AbstractDataModify<WParameterLayout> {
         Component[][] components = new Component[][]{
                 new Component[]{new UILabel(Inter.getLocText("Form-Desin_Width")), designerWidth},
         };
-        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_L2, IntervalConstants.INTERVAL_L1);
+        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
         JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
         panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
         jPanel.add(panel);
@@ -98,7 +98,7 @@ public class RootDesignDefinePane extends AbstractDataModify<WParameterLayout> {
                 new Component[]{useParamsTemplate, null},
                 new Component[]{new UILabel(Inter.getLocText("FR-Designer_WidgetDisplyPosition")), hAlignmentPane}
         };
-        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_L2, IntervalConstants.INTERVAL_L1);
+        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W0, IntervalConstants.INTERVAL_L1);
         panel.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L1, 0, IntervalConstants.INTERVAL_L1, 0));
         jPanel.add(panel);
         return jPanel;

designer_form/src/com/fr/design/widget/ui/designer/ButtonDefinePane.java

@@ -1,5 +1,6 @@
 package com.fr.design.widget.ui.designer;
 
+import com.fr.design.designer.IntervalConstants;
 import com.fr.design.designer.creator.XCreator;
 import com.fr.design.foldablepane.UIExpandablePane;
 import com.fr.design.gui.ilable.UILabel;
@@ -52,7 +53,7 @@ public abstract class ButtonDefinePane<T extends Button> extends AbstractDataMod
                 {new UILabel(Inter.getLocText("FR-Designer_Button-Hotkeys")), hotkeysTextField}
         };
         hotkeysTextField.setToolTipText(StableUtils.join(ButtonConstants.HOTKEYS, ","));
-        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(n_components, rowSize, columnSize, rowCount, 10, 10);
+        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(n_components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
         JPanel boundsPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
         boundsPane.add(panel);

designer_form/src/com/fr/design/widget/ui/designer/CheckBoxDefinePane.java

@@ -1,5 +1,6 @@
 package com.fr.design.widget.ui.designer;
 
+import com.fr.design.designer.IntervalConstants;
 import com.fr.design.designer.creator.XCreator;
 import com.fr.design.foldablepane.UIExpandablePane;
 import com.fr.design.gui.ilable.UILabel;
@@ -43,7 +44,7 @@ public class CheckBoxDefinePane extends AbstractDataModify<CheckBox> {
 		double[] rowSize = {p, p, p, p, p, p};
 		double[] columnSize = {p, f};
 		int[][] rowCount = {{1, 1},{1, 1}, {1, 3},{1, 1}};
-		JPanel panel =  TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, 10, 7);
+		JPanel panel =  TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
 		JPanel boundsPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
 		panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
 		boundsPane.add(panel);

designer_form/src/com/fr/design/widget/ui/designer/CheckBoxGroupDefinePane.java

@@ -1,6 +1,7 @@
 package com.fr.design.widget.ui.designer;
 
 import com.fr.design.data.DataCreatorUI;
+import com.fr.design.designer.IntervalConstants;
 import com.fr.design.designer.creator.XCreator;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.layout.TableLayout;
@@ -50,8 +51,7 @@ public class CheckBoxGroupDefinePane extends ButtonGroupDefinePane<CheckBoxGroup
 		double[] rowSize = {p, p};
 		double[] columnSize = {p, f};
 		int[][] rowCount = {{1, 1},{1, 1}};
-		JPanel panel =  TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, 10, 7);
+		JPanel panel =  TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_L2, IntervalConstants.INTERVAL_L1);
-		panel.setBorder(BorderFactory.createEmptyBorder(0, 0, 10, 0));
 		return panel;
 	}
 

designer_form/src/com/fr/design/widget/ui/designer/ComboCheckBoxDefinePane.java

@@ -1,6 +1,7 @@
 package com.fr.design.widget.ui.designer;
 
 import com.fr.design.data.DataCreatorUI;
+import com.fr.design.designer.IntervalConstants;
 import com.fr.design.designer.creator.XCreator;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.ilable.UILabel;
@@ -38,6 +39,7 @@ public class ComboCheckBoxDefinePane extends DictEditorDefinePane<ComboCheckBox>
 
 	public JPanel createOtherPane(){
 		supportTagCheckBox = new UICheckBox(Inter.getLocText("Form-SupportTag"), true);
+		supportTagCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
 		checkBoxDictPane = new CheckBoxDictPane();
 
 		double f = TableLayout.FILL;
@@ -49,8 +51,7 @@ public class ComboCheckBoxDefinePane extends DictEditorDefinePane<ComboCheckBox>
 		double[] rowSize = {p, p};
 		double[] columnSize = {p, f};
 		int[][] rowCount = {{1, 1},{1, 1}};
-		JPanel panel =  TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, 10, 7);
+		JPanel panel =  TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_L2, IntervalConstants.INTERVAL_L1);
-		panel.setBorder(BorderFactory.createEmptyBorder(0, 0, 10, 0));
 		return panel;
 	}
 

designer_form/src/com/fr/design/widget/ui/designer/CustomWritableRepeatEditorPane.java

@@ -1,6 +1,5 @@
 package com.fr.design.widget.ui.designer;
 
-import com.fr.base.GraphHelper;
 import com.fr.design.designer.creator.XCreator;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.utils.gui.GUICoreUtils;
@@ -18,8 +17,6 @@ import java.awt.*;
 public abstract class CustomWritableRepeatEditorPane<T extends CustomWriteAbleRepeatEditor> extends WritableRepeatEditorPane<T> {
 
 	private UICheckBox customDataCheckBox;
-	private static final int CUSTOM_DATA_CHECK_BOX_WIDTH = GraphHelper.getLocTextWidth("Form-Allow_CustomData") + 30;
-	private static final int CUSTOM_DATA_CHECK_BOX_HEIGHT = 30;
 
 	public CustomWritableRepeatEditorPane(XCreator xCreator) {
 		super(xCreator);
@@ -28,9 +25,7 @@ public abstract class CustomWritableRepeatEditorPane<T extends CustomWriteAbleRe
 
 	public  JPanel setValidatePane(){
 		this.customDataCheckBox = new UICheckBox(Inter.getLocText("Form-Allow_CustomData"), false);
-		this.customDataCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
+		this.customDataCheckBox.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
-		this.customDataCheckBox.setPreferredSize(
-				new Dimension(CUSTOM_DATA_CHECK_BOX_WIDTH, CUSTOM_DATA_CHECK_BOX_HEIGHT));
 		JPanel otherContentPane = super.setValidatePane();
 		otherContentPane.add(GUICoreUtils.createFlowPane(new JComponent[]{customDataCheckBox}, FlowLayout.LEFT, 0));
 		return otherContentPane;

designer_form/src/com/fr/design/widget/ui/designer/DateEditorDefinePane.java

@@ -3,6 +3,7 @@ package com.fr.design.widget.ui.designer;
 import com.fr.base.FRContext;
 import com.fr.base.Formula;
 import com.fr.data.core.FormatField;
+import com.fr.design.designer.IntervalConstants;
 import com.fr.design.designer.creator.XCreator;
 import com.fr.design.gui.ibutton.UIButtonGroup;
 import com.fr.design.gui.icombobox.UIComboBox;
@@ -56,8 +57,6 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane<DateEditor
     protected JPanel setFirstContentPane() {
         waterMarkDictPane = new WaterMarkDictPane();
         formWidgetValuePane = new FormWidgetValuePane(creator.toData(), false);
-        JPanel returnTypePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        returnTypePane.add(new UILabel(Inter.getLocText("Widget-Date_Selector_Return_Type") + ":"), BorderLayout.WEST);
         returnTypeComboBox = new UIButtonGroup<>(new String[] {Inter.getLocText("Date") ,  Inter.getLocText("String")});
         JPanel formatHead =  createFormatHead();
         startDv = new DateValuePane();
@@ -78,9 +77,8 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane<DateEditor
         double[] rowSize = {p, p, p, p, p, p, p, p, p, p};
         double[] columnSize = {p, f};
         int[][] rowCount = {{1, 1}, {1, 3}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}};
-        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, 10, 10);
+        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_L2, IntervalConstants.INTERVAL_L1);
         JPanel boundsPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
         boundsPane.add(panel);
         return boundsPane;
     }

designer_form/src/com/fr/design/widget/ui/designer/DirectWriteEditorDefinePane.java

@@ -1,5 +1,6 @@
 package com.fr.design.widget.ui.designer;
 
+import com.fr.design.designer.IntervalConstants;
 import com.fr.design.designer.creator.XCreator;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.ilable.UILabel;
@@ -44,8 +45,8 @@ public abstract class DirectWriteEditorDefinePane<T extends DirectWriteEditor> e
 		double[] rowSize = {p, p, p, p, p, p, p, p};
 		double[] columnSize = {p, f};
 		int[][] rowCount = {{1, 1},{1, 3},{1, 1},{1, 1},{1,1},{1,1}};
-		JPanel panel =  TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, 10, 7);
+		JPanel panel =  TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
-		panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
+//		panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
 		advancePane.add(panel, BorderLayout.NORTH);
 		JPanel otherPane = createOtherPane();
 		if(otherPane != null){
@@ -75,9 +76,8 @@ public abstract class DirectWriteEditorDefinePane<T extends DirectWriteEditor> e
         directWriteCheckBox = new UICheckBox(Inter.getLocText("Form-Allow_Edit"), false);
 		directWriteCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
         JPanel otherContentPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane();
-        otherContentPane.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
+        otherContentPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 10, 0));
         JPanel jPanel = GUICoreUtils.createFlowPane(new JComponent[]{directWriteCheckBox}, FlowLayout.LEFT, 0);
-        jPanel.setPreferredSize(new Dimension(220, 30));
 		otherContentPane.add(jPanel);
 		return otherContentPane;
 	}

designer_form/src/com/fr/design/widget/ui/designer/FieldEditorDefinePane.java

@@ -43,8 +43,11 @@ public abstract class FieldEditorDefinePane<T extends FieldEditor> extends Abstr
         fontSizePane = new UISpinner(0, 20, 1, 0);
         errorMsgTextField = new UITextField();
         JPanel contentPane = this.setFirstContentPane();
+        JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        jPanel.add(contentPane, BorderLayout.CENTER);
+        contentPane.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
         if (contentPane != null) {
-            UIExpandablePane uiExpandablePane = new UIExpandablePane(Inter.getLocText("FR-Designer_Advanced"), 280, 20, contentPane);
+            UIExpandablePane uiExpandablePane = new UIExpandablePane(Inter.getLocText("FR-Designer_Advanced"), 280, 20, jPanel);
             this.add(uiExpandablePane, BorderLayout.NORTH);
         }
         this.addValidatePane();
@@ -110,7 +113,7 @@ public abstract class FieldEditorDefinePane<T extends FieldEditor> extends Abstr
         final UILabel uiLabel = new UILabel(Inter.getLocText("FR-Designer_Widget_Error_Tip"));
         JPanel borderPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         final JPanel errorTipPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{uiLabel, errorMsgTextField}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L1, LayoutConstants.VGAP_MEDIUM);
-        errorTipPane.setBorder(BorderFactory.createEmptyBorder(0, IntervalConstants.INTERVAL_L5, 0, 0));
+        errorTipPane.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L6, IntervalConstants.INTERVAL_L5, 0, 0));
         borderPane.add(errorTipPane, BorderLayout.CENTER);
         allowBlankCheckBox.addItemListener(new ItemListener() {
             @Override
@@ -124,7 +127,7 @@ public abstract class FieldEditorDefinePane<T extends FieldEditor> extends Abstr
                 new Component[]{allowBlankCheckBox},
                 new Component[]{borderPane},
         };
-        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L6, IntervalConstants.INTERVAL_L6);
+        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L6, 0);
         panel.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L1, 0, IntervalConstants.INTERVAL_L1, 0));
         validatePane.add(panel, BorderLayout.NORTH);
         JPanel contentPane = this.setValidatePane();

designer_form/src/com/fr/design/widget/ui/designer/LabelDefinePane.java

@@ -1,6 +1,7 @@
 package com.fr.design.widget.ui.designer;
 
 import com.fr.base.BaseUtils;
+import com.fr.design.designer.IntervalConstants;
 import com.fr.design.designer.creator.XCreator;
 import com.fr.design.foldablepane.UIExpandablePane;
 import com.fr.design.gui.ibutton.UIButtonGroup;
@@ -44,7 +45,10 @@ public class LabelDefinePane extends AbstractDataModify<Label> {
     public JPanel createAdvancePane() {
         formWidgetValuePane = new FormWidgetValuePane(creator.toData(), false);
         isPageSetupVertically = new UICheckBox(Inter.getLocText("FR-Designer_PageSetup-Vertically"));
+        isPageSetupVertically.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
+
         isStyleAlignmentWrapText = new UICheckBox(Inter.getLocText("FR-Designer_StyleAlignment-Wrap_Text"));
+        isStyleAlignmentWrapText.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
         Icon[] hAlignmentIconArray = {BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_left_normal.png"),
                 BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_center_normal.png"),
                 BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_right_normal.png"),};
@@ -67,7 +71,7 @@ public class LabelDefinePane extends AbstractDataModify<Label> {
                 new Component[]{new UILabel(Inter.getLocText("FR-Designer_Widget_Display_Position")), hAlignmentPane},
                 new Component[]{fontLabel, frFontPane},
         };
-        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, 20, 7);
+        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
         JPanel boundsPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
         boundsPane.add(panel);

designer_form/src/com/fr/design/widget/ui/designer/MultiFileEditorPane.java

@@ -1,5 +1,6 @@
 package com.fr.design.widget.ui.designer;
 
+import com.fr.design.designer.IntervalConstants;
 import com.fr.design.designer.creator.XCreator;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.icombobox.DictionaryComboBox;
@@ -59,16 +60,15 @@ public class MultiFileEditorPane extends FieldEditorDefinePane<MultiFileEditor>
 		double p = TableLayout.PREFERRED;
 		Component[][] components = new Component[][]{
 				new Component[]{singleFileCheckBox, null },
-				new Component[]{new UILabel(Inter.getLocText("File-Allow_Upload_Files") + ":"), acceptType},
+				new Component[]{new UILabel(Inter.getLocText("File-Allow_Upload_Files")), acceptType},
-				new Component[]{new UILabel( Inter.getLocText("File-File_Size_Limit") + ":"), fileSizeField},
+				new Component[]{new UILabel( Inter.getLocText("File-File_Size_Limit")), fileSizeField},
 				new Component[]{new UILabel( Inter.getLocText("FR-Designer_Font-Size")), fontSizeField}
 		};
-		double[] rowSize = {p, p,p,p};
+		double[] rowSize = {p, p, p, p};
 		double[] columnSize = {p,f};
 		int[][] rowCount = {{1, 1},{1, 1},{1, 1},{1, 1}};
-		JPanel panel =  TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, 10, 7);
+		JPanel panel =  TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W0, IntervalConstants.INTERVAL_L1);
 		JPanel boundsPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-		panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
 		boundsPane.add(panel);
 
 		return boundsPane;

designer_form/src/com/fr/design/widget/ui/designer/NumberEditorDefinePane.java

@@ -1,5 +1,6 @@
 package com.fr.design.widget.ui.designer;
 
+import com.fr.design.designer.IntervalConstants;
 import com.fr.design.designer.creator.XCreator;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ispinner.UIBasicSpinner;
@@ -49,9 +50,8 @@ public class NumberEditorDefinePane extends FieldEditorDefinePane<NumberEditor>
         double[] rowSize = {p, p, p, p, p, p};
         double[] columnSize = {p,f};
         int[][] rowCount = {{1, 1}, {1, 3},{1, 1},{1, 1}};
-        JPanel advancePane =  TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, 10, 7);
+        JPanel advancePane =  TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
         JPanel boundsPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        advancePane.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
         boundsPane.add(advancePane);
         return boundsPane;
     }

designer_form/src/com/fr/design/widget/ui/designer/TextFieldEditorDefinePane.java

@@ -1,5 +1,6 @@
 package com.fr.design.widget.ui.designer;
 
+import com.fr.design.designer.IntervalConstants;
 import com.fr.design.designer.creator.XCreator;
 import com.fr.design.gui.frpane.RegFieldPane;
 import com.fr.design.gui.frpane.RegPane;
@@ -69,9 +70,8 @@ public class TextFieldEditorDefinePane extends FieldEditorDefinePane<TextEditor>
         double[] rowSize = {p, p, p, p, p, p};
         double[] columnSize = {p,f};
         int[][] rowCount = {{1, 1},{1, 3},{1, 1},{1, 1}};
-        final JPanel panel =  TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, 10, 10);
+        final JPanel panel =  TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
         JPanel boundsPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
         boundsPane.add(panel);
         return boundsPane;
     }

designer_form/src/com/fr/design/widget/ui/designer/TreeEditorDefinePane.java

@@ -1,7 +1,7 @@
 package com.fr.design.widget.ui.designer;
 
-import com.fr.data.Dictionary;
 import com.fr.design.data.DataCreatorUI;
+import com.fr.design.designer.IntervalConstants;
 import com.fr.design.designer.creator.XCreator;
 import com.fr.design.gui.icheckbox.UICheckBox;
 
@@ -38,9 +38,17 @@ public class TreeEditorDefinePane extends CustomWritableRepeatEditorPane<TreeEdi
 
     public JPanel createOtherPane() {
         mutiSelect = new UICheckBox(Inter.getLocText("Tree-Mutiple_Selection_Or_Not"));
+        mutiSelect.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
+
         loadAsync = new UICheckBox(Inter.getLocText("Widget-Load_By_Async"));
+        loadAsync.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
+
         returnLeaf = new UICheckBox(Inter.getLocText("FR-Designer_Widget_Return_Leaf"));
+        returnLeaf.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
+
         returnPath = new UICheckBox(Inter.getLocText("FR-Designer_Widget_Return_Path"));
+        returnPath.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
+
         double f = TableLayout.FILL;
         double p = TableLayout.PREFERRED;
         Component[][] components = new Component[][]{
@@ -51,8 +59,7 @@ public class TreeEditorDefinePane extends CustomWritableRepeatEditorPane<TreeEdi
         };
         double[] rowSize = {p, p, p, p};
         double[] columnSize = {p};
-        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 10, 7);
+        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, IntervalConstants.INTERVAL_L2, IntervalConstants.INTERVAL_L1);
-        panel.setBorder(BorderFactory.createEmptyBorder(0, 0, 10, 0));
         return panel;
     }
 

designer_form/src/com/fr/design/widget/ui/designer/btn/ButtonGroupDefinePane.java

@@ -1,6 +1,7 @@
 package com.fr.design.widget.ui.designer.btn;
 
 import com.fr.data.Dictionary;
+import com.fr.design.designer.IntervalConstants;
 import com.fr.design.designer.creator.*;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.FRGUIPaneFactory;
@@ -47,8 +48,7 @@ public abstract class ButtonGroupDefinePane<T extends ButtonGroup> extends Field
         double[] rowSize = {p, p, p, p, p, p, p};
         double[] columnSize = {p, f};
         int[][] rowCount = {{1, 1}, {1, 3},{1, 1},{1, 1},{1, 1}};
-        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, 10, 7);
+        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
-        panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
         advancePane.add(panel, BorderLayout.NORTH);
         JPanel otherPane = createOtherPane();
         if (otherPane != null) {

designer_form/src/com/fr/design/widget/ui/designer/component/PaddingBoundPane.java

@@ -43,26 +43,38 @@ public class PaddingBoundPane extends BasicPane{
         double f = TableLayout.FILL;
         double p = TableLayout.PREFERRED;
         double[] rowSize = {p, p, p, p};
-        double[] columnSize = {p, f, f};
+        double[] columnSize = {p, f};
-        int[][] rowCount = {{1, 1, 1}, {1, 1, 1}, {1, 1, 1}, {1, 1, 1}};
+        int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}, {1, 1}};
         Component[][] components = new Component[][]{
-                new Component[]{new UILabel(Inter.getLocText("FR-Designer_Layout-Padding")), top, bottom},
+                new Component[]{new UILabel(Inter.getLocText("FR-Designer_Layout-Padding")), createRightPane(top, bottom)},
-                new Component[]{null, new UILabel(Inter.getLocText("FR-Designer_Top"), SwingConstants.CENTER), new UILabel(Inter.getLocText("FR-Designer_Bottom"), SwingConstants.CENTER)},
+                new Component[]{null, createRightPane(new UILabel(Inter.getLocText("FR-Designer_Top"), SwingConstants.CENTER), new UILabel(Inter.getLocText("FR-Designer_Bottom"), SwingConstants.CENTER))},
-                new Component[]{null, left, right},
+                new Component[]{null, createRightPane(left, right)},
-                new Component[]{null, new UILabel(Inter.getLocText("FR-Designer_Left"), SwingConstants.CENTER), new UILabel(Inter.getLocText("FR-Designer_Right"), SwingConstants.CENTER)},
+                new Component[]{null, createRightPane(new UILabel(Inter.getLocText("FR-Designer_Left"), SwingConstants.CENTER), new UILabel(Inter.getLocText("FR-Designer_Right"), SwingConstants.CENTER))},
         };
-        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_L2, IntervalConstants.INTERVAL_L1);
+        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W2, IntervalConstants.INTERVAL_L1);
-        panel.setBorder(BorderFactory.createEmptyBorder(5, 0, 10, 0));
+        panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
         this.add(panel);
     }
 
+    public JPanel createRightPane(Component com1, Component com2){
+        double f = TableLayout.FILL;
+        double p = TableLayout.PREFERRED;
+        double[] rowSize = {p};
+        double[] columnSize = {f, f};
+        int[][] rowCount = {{1, 1}};
+        Component[][] components = new Component[][]{
+                new Component[]{com1, com2}
+        };
+        return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_L6, IntervalConstants.INTERVAL_L1);
+    }
+
 
     public void update(AbstractMarginWidget marginWidget) {
         marginWidget.setMargin(new PaddingMargin((int)top.getValue(), (int)left.getValue(), (int)bottom.getValue(), (int)right.getValue() ));
     }
 
     protected String title4PopupWindow() {
-        return "";
+        return "PaddingBoundPane";
     }
 
     public void populate(AbstractMarginWidget marginWidget) {

designer_form/src/com/fr/design/widget/ui/designer/component/WidgetAbsoluteBoundPane.java

@@ -56,8 +56,6 @@ public class WidgetAbsoluteBoundPane extends WidgetBoundPane {
     }
 
 
-
-
     protected String title4PopupWindow() {
         return "absoluteBound";
     }

designer_form/src/com/fr/design/widget/ui/designer/layout/BorderStyleWidgetDefinePane.java

@@ -1,6 +1,7 @@
 package com.fr.design.widget.ui.designer.layout;
 
 import com.fr.design.data.DataCreatorUI;
+import com.fr.design.designer.IntervalConstants;
 import com.fr.design.designer.creator.XCreator;
 import com.fr.design.foldablepane.UIExpandablePane;
 import com.fr.design.gui.ilable.UILabel;
@@ -31,7 +32,8 @@ public class BorderStyleWidgetDefinePane extends AbstractDataModify<AbstractBord
         borderStyleEditor = new AccessibleWLayoutBorderStyleEditor();
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
         JPanel advancePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        JPanel jPanel = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{new UILabel(Inter.getLocText("FR-Designer-Widget_Style")), borderStyleEditor}}, TableLayoutHelper.FILL_LASTCOLUMN, 18, 7);
+        JPanel jPanel = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{
+                new Component[]{new UILabel(Inter.getLocText("FR-Designer-Widget_Style")), borderStyleEditor}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W3, IntervalConstants.INTERVAL_L1);
         jPanel.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
         advancePane.add(jPanel, BorderLayout.CENTER);
 

designer_form/src/com/fr/design/widget/ui/designer/layout/ElementEditorDefinePane.java

@@ -1,5 +1,6 @@
 package com.fr.design.widget.ui.designer.layout;
 
+import com.fr.design.designer.IntervalConstants;
 import com.fr.design.designer.creator.*;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.FRGUIPaneFactory;
@@ -37,7 +38,7 @@ public class ElementEditorDefinePane extends WTitleLayoutDefinePane<ElementCaseE
                 new Component[]{paddingBoundPane, null},
                 new Component[]{new UILabel(Inter.getLocText("Form-EC_toolbar")), elementCaseToolBarEditor},
         };
-        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, TableLayoutHelper.FILL_LASTCOLUMN, 20, 10);
+        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W0, IntervalConstants.INTERVAL_L1);
         panel.setBorder(BorderFactory.createEmptyBorder(5, 0, 10, 0));
         CRPropertyDescriptor[] extraTableEditor = ((XElementCase)creator).getExtraTableEditor();
         extraPropertyGroupPane = new PropertyGroupPane(extraTableEditor, creator);

designer_form/src/com/fr/design/widget/ui/designer/layout/FRAbsoluteBodyLayoutDefinePane.java

@@ -46,7 +46,8 @@ public class FRAbsoluteBodyLayoutDefinePane extends FRAbsoluteLayoutDefinePane {
     public void initComponent() {
         super.initComponent();
         borderStyleEditor = new AccessibleWLayoutBorderStyleEditor();
-        JPanel jPanel = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{new UILabel(Inter.getLocText("FR-Designer-Widget_Style")), borderStyleEditor}}, TableLayoutHelper.FILL_LASTCOLUMN, 18, 7);
+        JPanel jPanel = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{
+                new Component[]{new UILabel(Inter.getLocText("FR-Designer-Widget_Style")), borderStyleEditor}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W3, IntervalConstants.INTERVAL_L1);
         JPanel borderPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         jPanel.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
         borderPane.add(jPanel, BorderLayout.CENTER);
@@ -57,11 +58,13 @@ public class FRAbsoluteBodyLayoutDefinePane extends FRAbsoluteLayoutDefinePane {
     public JPanel createThirdPane() {
         initLayoutComboBox();
         JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        JPanel northPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{new UILabel(Inter.getLocText("FR-Designer_Attr_Layout_Type")), layoutCombox}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L2, 7);
+        JPanel northPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{
-        JPanel centerPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{new UILabel(Inter.getLocText("FR-Designer-Widget_Scaling_Mode")), comboBox}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L2, 7);
+                new Component[]{new UILabel(Inter.getLocText("FR-Designer_Attr_Layout_Type")), layoutCombox}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
+        JPanel centerPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{
+                new Component[]{new UILabel(Inter.getLocText("FR-Designer-Widget_Scaling_Mode")), comboBox}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
         jPanel.add(northPane, BorderLayout.NORTH);
         jPanel.add(centerPane, BorderLayout.CENTER);
-        northPane.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L1, 0, 0, 0));
+//        northPane.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L1, 0, 0, 0));
         centerPane.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L1, IntervalConstants.INTERVAL_L5, 0, 0));
         return jPanel;
 

designer_form/src/com/fr/design/widget/ui/designer/layout/FRAbsoluteLayoutDefinePane.java

@@ -1,8 +1,8 @@
 package com.fr.design.widget.ui.designer.layout;
 
 import com.fr.design.data.DataCreatorUI;
+import com.fr.design.designer.IntervalConstants;
 import com.fr.design.designer.creator.XCreator;
-import com.fr.design.designer.creator.XWAbsoluteLayout;
 import com.fr.design.designer.properties.items.FRAbsoluteConstraintsItems;
 import com.fr.design.designer.properties.items.Item;
 import com.fr.design.foldablepane.UIExpandablePane;
@@ -14,7 +14,6 @@ import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.widget.ui.designer.AbstractDataModify;
 import com.fr.design.widget.ui.designer.component.WidgetBoundPane;
 import com.fr.form.ui.container.WAbsoluteLayout;
-import com.fr.form.ui.container.WBodyLayoutType;
 import com.fr.general.Inter;
 
 import javax.swing.*;
@@ -39,10 +38,11 @@ public class FRAbsoluteLayoutDefinePane extends AbstractDataModify<WAbsoluteLayo
         boundPane = new WidgetBoundPane(creator);
         centerPane.add(boundPane, BorderLayout.NORTH);
         initUIComboBox();
-//        JPanel thirdPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        JPanel thirdPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-//        thirdPane.add(, BorderLayout.CENTER);
+        JPanel jPanel = createThirdPane();
-//        thirdPane.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
+        jPanel.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
-        UIExpandablePane layoutExpandablePane = new UIExpandablePane(Inter.getLocText("FR-Designer-Widget_Area_Scaling"), 280, 20,createThirdPane() );
+        thirdPane.add(jPanel, BorderLayout.CENTER);
+        UIExpandablePane layoutExpandablePane = new UIExpandablePane(Inter.getLocText("FR-Designer-Widget_Area_Scaling"), 280, 20, thirdPane);
         centerPane.add(layoutExpandablePane, BorderLayout.CENTER);
         this.add(centerPane, BorderLayout.CENTER);
     }
@@ -56,8 +56,8 @@ public class FRAbsoluteLayoutDefinePane extends AbstractDataModify<WAbsoluteLayo
         Component[][] components = new Component[][]{
                 new Component[]{new UILabel(Inter.getLocText("FR-Designer-Widget_Scaling_Mode")), comboBox},
         };
-        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, 20, 7);
+        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
-        panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
+//        panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
         return panel;
     }
 

designer_form/src/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java

@@ -67,8 +67,9 @@ public class FRFitLayoutDefinePane extends AbstractDataModify<WFitLayout> {
         JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
         stylePane = new AccessibleWLayoutBorderStyleEditor();
         paddingBound = new PaddingBoundPane();
-        JPanel jp2 = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{new UILabel(Inter.getLocText("FR-Designer-Widget_Style")), stylePane}}, TableLayoutHelper.FILL_LASTCOLUMN, 18, 7);
+        JPanel jp2 = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{
-        jp2.setBorder(BorderFactory.createEmptyBorder(10, 0, 5, 0));
+                new Component[]{new UILabel(Inter.getLocText("FR-Designer-Widget_Style")), stylePane}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W3, IntervalConstants.INTERVAL_L1);
+        jp2.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
         jPanel.add(paddingBound, BorderLayout.CENTER);
         jPanel.add(jp2, BorderLayout.NORTH);
         return jPanel;
@@ -84,14 +85,15 @@ public class FRFitLayoutDefinePane extends AbstractDataModify<WFitLayout> {
         double[] rowSize = {p, p};
         double[] columnSize = {p, f};
         int[][] rowCount = {{1, 1}, {1, 1}};
-        JPanel northPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{new UILabel(Inter.getLocText("FR-Designer_Attr_Layout_Type")), layoutComboBox}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L2, 7);
+        JPanel northPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{
+                new Component[]{new UILabel(Inter.getLocText("FR-Designer_Attr_Layout_Type")), layoutComboBox}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
         northPane.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L1, 0, 0, 0));
 
         Component[][] components = new Component[][]{
                 new Component[]{new UILabel(Inter.getLocText("FR-Designer_Component_Scale")), adaptComboBox},
                 new Component[]{new UILabel(Inter.getLocText("FR-Designer_Component_Interval")), componentIntervel}
         };
-        JPanel centerPane = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_L2, 7);
+        JPanel centerPane = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
         centerPane.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L1, IntervalConstants.INTERVAL_L5, 0, 0));
         jPanel.add(northPane, BorderLayout.NORTH);
         jPanel.add(centerPane, BorderLayout.CENTER);

designer_form/src/com/fr/design/widget/ui/designer/layout/WCardLayoutDefinePane.java

@@ -1,5 +1,6 @@
 package com.fr.design.widget.ui.designer.layout;
 
+import com.fr.design.designer.IntervalConstants;
 import com.fr.design.designer.creator.XCreator;
 import com.fr.design.foldablepane.UIExpandablePane;
 import com.fr.design.gui.icheckbox.UICheckBox;
@@ -37,14 +38,16 @@ public class WCardLayoutDefinePane extends AbstractDataModify<WCardLayout> {
         carouselInterval = new UISpinner(0, 20, 1, 0);
         accessibleCardTagWLayoutBorderStyleEditor = new AccessibleCardTagWLayoutBorderStyleEditor();
         JPanel accessibleCardlayout = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        JPanel stylePane =  TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{new UILabel(Inter.getLocText("FR-Designer-Widget_Style")), accessibleCardTagWLayoutBorderStyleEditor}}, TableLayoutHelper.FILL_LASTCOLUMN, 18, 7);
+        JPanel stylePane =  TableLayoutHelper.createGapTableLayoutPane(new Component[][]{
+                new Component[]{new UILabel(Inter.getLocText("FR-Designer-Widget_Style")), accessibleCardTagWLayoutBorderStyleEditor}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W3, IntervalConstants.INTERVAL_L1);
         stylePane.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
         accessibleCardlayout.add(stylePane, BorderLayout.CENTER);
         UIExpandablePane advanceExpandablePane = new UIExpandablePane(Inter.getLocText("FR-Designer_Advanced"), 280, 20, accessibleCardlayout);
         final JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
         jPanel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
         setCarousel = new UICheckBox(Inter.getLocText("FR-Designer_setCarousel"));
-        IntervalPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{new UILabel(Inter.getLocText("FR-Designer_carouselInterval")), carouselInterval}}, TableLayoutHelper.FILL_LASTCOLUMN, 18, 7);
+        IntervalPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{
+                new UILabel(Inter.getLocText("FR-Designer_carouselInterval")), carouselInterval}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
         IntervalPane.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
         jPanel.add(setCarousel, BorderLayout.NORTH);
         jPanel.add(IntervalPane, BorderLayout.CENTER);

designer_form/src/com/fr/design/widget/ui/designer/layout/WTabFitLayoutDefinePane.java

@@ -44,7 +44,8 @@ public class WTabFitLayoutDefinePane extends AbstractDataModify<WTabFitLayout> {
         JPanel advancePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         paddingBoundPane = new PaddingBoundPane();
         borderStyle = new TabFitLayoutBackgroundPane();
-        JPanel jPanel = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{borderStyle, null}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L2, IntervalConstants.INTERVAL_L1);
+        JPanel jPanel = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{
+                new Component[]{borderStyle, null}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L2, IntervalConstants.INTERVAL_L1);
         jPanel.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L1, 0, 0, 0));
         advancePane.add(jPanel, BorderLayout.NORTH);
         advancePane.add(paddingBoundPane, BorderLayout.CENTER);
@@ -62,7 +63,7 @@ public class WTabFitLayoutDefinePane extends AbstractDataModify<WTabFitLayout> {
                 new Component[]{new UILabel(Inter.getLocText("FR-Designer_Title")), titleField}
         };
         JPanel borderPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        JPanel jPanel = TableLayoutHelper.createGapTableLayoutPane(components, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L2, IntervalConstants.INTERVAL_L1);
+        JPanel jPanel = TableLayoutHelper.createGapTableLayoutPane(components, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
         jPanel.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L1, 0, 0, 0));
         borderPane.add(jPanel, BorderLayout.CENTER);
         UIExpandablePane currentEditTab = new UIExpandablePane(Inter.getLocText("FR-Designer_Current_tab"), 280, 20, borderPane);

designer_form/src/com/fr/design/widget/ui/designer/layout/WTitleLayoutDefinePane.java

@@ -1,5 +1,6 @@
 package com.fr.design.widget.ui.designer.layout;
 
+import com.fr.design.designer.IntervalConstants;
 import com.fr.design.designer.creator.XCreator;
 import com.fr.design.foldablepane.UIExpandablePane;
 import com.fr.design.gui.ilable.UILabel;
@@ -42,7 +43,7 @@ public abstract class WTitleLayoutDefinePane<T extends AbstractBorderStyleWidget
         Component[][] components = new Component[][]{
                 new Component[]{new UILabel(Inter.getLocText("FR-Designer_Style")), borderStyleEditor}
         };
-        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, 20, 7);
+        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W3, IntervalConstants.INTERVAL_L1);
         panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
         advancePane.add(panel, BorderLayout.NORTH);
         JPanel centerPane = createCenterPane();