Merge pull request #1043 in BA/design from ~MOMEAK/design9.0:9.0 to 9.0

* commit 'db9ca2ee21f62fadab9aed9c861e848a9d8847b0':
  REPORT-2897 9.0设计器修改 修改命名
  REPORT-2897 9.0设计器修改 视觉优化
  rm button group border
  hzzzz
  REPORT-2897 9.0设计器修改 视觉优化
  hzzzzzzzzzz
  REPORT-2897 9.0设计器修改 视觉优化

designer/src/com/fr/design/present/BarCodePane.java

@@ -85,7 +85,7 @@ public class BarCodePane extends FurtherBasicBeanPane<BarcodePresent> {
         RCodesizespinner = new UIBasicSpinner(new SpinnerNumberModel(2, 1, 6, 1));
         RCodeVersionComboBox = new UIComboBox();
         RCodeErrorCorrectComboBox = new UIComboBox();
-        typeSetLabel = new UILabel(Inter.getLocText("Type_Set") + ":", UILabel.RIGHT);
+        typeSetLabel = new UILabel(Inter.getLocText("Type_Set"), UILabel.RIGHT);
         initVersionComboBox();
         initErrorCorrectComboBox();
 

designer/src/com/fr/design/present/CurrencyLinePane.java

@@ -72,11 +72,11 @@ public class CurrencyLinePane extends FurtherBasicBeanPane<CurrencyLinePresent>
     protected void initComponents() {
         // 整数位选择
         intPartSpinner = new UIBasicSpinner(new SpinnerNumberModel(9, 1, 20, 1));
-        intPartSpinner.setPreferredSize(new Dimension(135, 20));
+        intPartSpinner.setPreferredSize(new Dimension(158, 20));
 
         // 小数位选择
         deciPartSpinner = new UIBasicSpinner(new SpinnerNumberModel(2, 1, 10, 1));
-        deciPartSpinner.setPreferredSize(new Dimension(135, 20));
+        deciPartSpinner.setPreferredSize(new Dimension(158, 20));
         // 预览区域
         textField = new UITextField(10);
 

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

@@ -1,6 +1,7 @@
 package com.fr.design.widget.ui;
 
 
+import java.awt.*;
 import java.awt.event.ActionEvent;
 import com.fr.design.gui.ispinner.UIBasicSpinner;
 import java.awt.event.ActionListener;
@@ -28,7 +29,8 @@ public class ButtonGroupDictPane extends JPanel {
     *
      */
 	public void initComponents() {
-		this.setLayout(FRGUIPaneFactory.createLabelFlowLayout());
+		this.setLayout(new FlowLayout(0));
+		JPanel pane = new JPanel(new FlowLayout());
 		adaptiveCheckbox = new UICheckBox(Inter.getLocText("Adaptive"), true);
 		adaptiveCheckbox.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent e) {
@@ -36,12 +38,14 @@ public class ButtonGroupDictPane extends JPanel {
 				columnLabel.setVisible(!adaptiveCheckbox.isSelected());
 			}
 		});
-		this.add(adaptiveCheckbox);
 
-		this.columnLabel = new UILabel(Inter.getLocText("Button-Group-Display-Columns") + ":");
+		this.columnLabel = new UILabel(Inter.getLocText("Button-Group-Display-Columns"));
-		this.add(columnLabel);
 		columnSpinner = new UIBasicSpinner(new SpinnerNumberModel(0, 0, Integer.MAX_VALUE, 1));
-		this.add(columnSpinner);
+        pane.add(adaptiveCheckbox);
+        pane.add(columnLabel);
+        pane.add(columnSpinner);
+
+		this.add(pane);
 	}
 
 	public void populate(ButtonGroup buttonGroup) {

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

@@ -1,15 +1,18 @@
 package com.fr.design.widget.ui;
 
+import com.fr.design.constants.LayoutConstants;
 import com.fr.design.foldablepane.UIExpandablePane;
 import com.fr.design.gui.ilable.UILabel;
-
-import javax.swing.*;
-
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.layout.TableLayout;
+import com.fr.design.layout.TableLayoutHelper;
 import com.fr.form.ui.CheckBox;
 import com.fr.general.Inter;
 
+import javax.swing.*;
+import java.awt.*;
+
 public class CheckBoxDefinePane extends AbstractDataModify<CheckBox> {
     private UITextField text;
 
@@ -19,13 +22,24 @@ public class CheckBoxDefinePane extends AbstractDataModify<CheckBox> {
 
     private void iniComoponents() {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
-		this.setBorder(BorderFactory.createEmptyBorder(0, 8, 0, 8));
-		JPanel textPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
-		textPane.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 0));
-		UIExpandablePane uiExpandablePane = new UIExpandablePane(Inter.getLocText("FR-Designer_Advanced"), 280, 20, textPane);
-		textPane.add(new UILabel(Inter.getLocText("Text") + ":"));
         text = new UITextField(8);
-		textPane.add(text);
+        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},
+        };
+        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);
+
+        UIExpandablePane uiExpandablePane = new UIExpandablePane(Inter.getLocText("FR-Designer_Advanced"), 280, 24, pane);
+        pane.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 15));
+
         this.add(uiExpandablePane);
     }
 

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

@@ -22,7 +22,7 @@ public abstract class DirectWriteEditorDefinePane<T extends DirectWriteEditor> e
 	@Override
 	protected JPanel setFirstContentPane() {
 		JPanel contentPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
-		contentPane.setBorder(BorderFactory.createEmptyBorder(0, 2, 0, 0));
+		contentPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
 		directWriteCheckBox = new UICheckBox(Inter.getLocText("Form-Allow_Edit"), false);
 		directWriteCheckBox.setPreferredSize(new Dimension(100, 30));
 

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

@@ -25,8 +25,8 @@ public class ListEditorDefinePane extends WriteUnableRepeatEditorPane<ListEditor
 
 	@Override
 	protected JPanel setThirdContentPane() {
-		JPanel contenter = FRGUIPaneFactory.createBorderLayout_S_Pane();
+		JPanel contenter = FRGUIPaneFactory.createMediumHGapFlowInnerContainer_M_Pane_First0();
-		JPanel centerPane = FRGUIPaneFactory.createMediumHGapFlowInnerContainer_M_Pane();
+		JPanel centerPane = FRGUIPaneFactory.createMediumHGapFlowInnerContainer_M_Pane_First0();
 		centerPane.add(needHeadCheckBox = new UICheckBox(Inter.getLocText("List-Need_Head")));
 		contenter.add(centerPane);
 		return contenter;

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

@@ -1,26 +1,22 @@
 package com.fr.design.widget.ui;
 
-import java.awt.*;
-
-import com.fr.design.constants.LayoutConstants;
-import com.fr.design.gui.ilable.UILabel;
-
-import javax.swing.*;
-
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.icombobox.DictionaryComboBox;
 import com.fr.design.gui.icombobox.DictionaryConstants;
-import com.fr.design.gui.itextfield.UINumberField;
+import com.fr.design.gui.ilable.UILabel;
-import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.gui.ispinner.UISpinner;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.form.ui.MultiFileEditor;
 import com.fr.general.Inter;
 
+import javax.swing.*;
+import java.awt.*;
+
 public class MultiFileEditorPane extends FieldEditorDefinePane<MultiFileEditor> {
     private DictionaryComboBox acceptType;
     private UICheckBox singleFileCheckBox;
-	private UINumberField fileSizeField;
+    private UISpinner fileSizeField;
 
     public MultiFileEditorPane() {
         this.initComponents();
@@ -34,42 +30,36 @@ public class MultiFileEditorPane extends FieldEditorDefinePane<MultiFileEditor>
 
     @Override
     protected JPanel setFirstContentPane() {
-		acceptType = new DictionaryComboBox(DictionaryConstants.acceptTypes, DictionaryConstants.fileTypeDisplays);
+        JPanel contenter = new JPanel(new BorderLayout());
-		acceptType.setPreferredSize(new Dimension(200, 18));
-		singleFileCheckBox = new UICheckBox(Inter.getLocText("SINGLE_FILE_UPLOAD"));
-		fileSizeField = new UINumberField();
-		fileSizeField.setPreferredSize(new Dimension(80, 18));
 
+        singleFileCheckBox = new UICheckBox(Inter.getLocText("SINGLE_FILE_UPLOAD"));
+        acceptType = new DictionaryComboBox(DictionaryConstants.acceptTypes, DictionaryConstants.fileTypeDisplays);
+//		acceptType.setPreferredSize(new Dimension(100, 20));
+        fileSizeField = new UISpinner(0, Integer.MAX_VALUE, 1, -1);
+        fileSizeField.setPreferredSize(new Dimension(140, 20));
 
-		JPanel singleFilePane = FRGUIPaneFactory.createNormalFlowInnerContainer_M_Pane();
+        JPanel fileSizePane = new JPanel(new BorderLayout());
-		singleFilePane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
+        UILabel fileTypeLabel = new UILabel(Inter.getLocText("Utils-File_type"));
-		singleFilePane.add(singleFileCheckBox);
+        UILabel fileSizeLabel = new UILabel(Inter.getLocText("FR-Designer_Size_Limit"));
-
+        fileSizePane.add(fileSizeField, BorderLayout.CENTER);
-		JPanel allowTypePane = FRGUIPaneFactory.createNormalFlowInnerContainer_M_Pane();
+        fileSizePane.add(new UILabel(" KB"), BorderLayout.EAST);
-		allowTypePane.setLayout(FRGUIPaneFactory.createLabelFlowLayout());
-		allowTypePane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
-		allowTypePane.add(new UILabel("   " + Inter.getLocText("File-Allow_Upload_Files") + ":"));
-		allowTypePane.add(acceptType);
-
-		JPanel fileSizePane = FRGUIPaneFactory.createNormalFlowInnerContainer_M_Pane();
-		fileSizePane.add(new UILabel(" " + Inter.getLocText("File-File_Size_Limit") + ":"));
-		fileSizePane.add(fileSizeField);
-		fileSizePane.add(new UILabel(" KB"));
 
         double f = TableLayout.FILL;
         double p = TableLayout.PREFERRED;
         Component[][] components = new Component[][]{
-				new Component[]{singleFileCheckBox, null },
+                new Component[]{singleFileCheckBox, null},
-				new Component[]{new UILabel("   " + Inter.getLocText("File-Allow_Upload_Files") + ":"), acceptType},
+                new Component[]{fileTypeLabel, acceptType},
-				new Component[]{new UILabel(" " + Inter.getLocText("File-File_Size_Limit") + ":"), fileSizeField},
+                new Component[]{fileSizeLabel, fileSizePane},
         };
-		double[] rowSize = {p, p,p};
+        double[] rowSize = {p, p, p};
-		double[] columnSize = {p,f};
+        double[] columnSize = {p, f};
-		int[][] rowCount = {{1, 1},{1, 1},{1, 1}};
+        int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}};
-		JPanel panel =  TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_SMALL, 5);
+        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, 22, 10);
 
+        panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 00));
+        contenter.add(panel, BorderLayout.CENTER);
 
-		return panel;
+        return contenter;
     }
 
     @Override

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

@@ -3,11 +3,15 @@ package com.fr.design.widget.ui;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
 
 import javax.swing.BorderFactory;
 import javax.swing.JComponent;
 import javax.swing.JFormattedTextField;
 
+import com.fr.design.constants.LayoutConstants;
+import com.fr.design.constants.UIConstants;
 import com.fr.design.gui.ilable.UILabel;
 
 import javax.swing.JPanel;
@@ -26,7 +30,7 @@ import com.fr.general.Inter;
 
 public class NumberEditorDefinePane extends FieldEditorDefinePane<NumberEditor> {
     /**
-     *
+     * FieldEditorDefinePane
      */
     private static final long serialVersionUID = 8011242951911686805L;
     private UICheckBox allowDecimalsCheckBox;
@@ -37,7 +41,7 @@ public class NumberEditorDefinePane extends FieldEditorDefinePane<NumberEditor>
     private SpinnerNumberModel maxValueModel;
     private UIBasicSpinner minValueSpinner;
     private SpinnerNumberModel minValueModel;
-    private com.fr.design.editor.editor.IntegerEditor decimalLength;
+    private UIBasicSpinner decimalLength;
     private JPanel limitNumberPane;
     private WaterMarkDictPane waterMarkDictPane;
 
@@ -78,7 +82,7 @@ public class NumberEditorDefinePane extends FieldEditorDefinePane<NumberEditor>
     };
 
 
-    private ActionListener actionListener3 = new ActionListener() {
+    public ActionListener actionListener3 = new ActionListener() {
         public void actionPerformed(ActionEvent e) {
             if (setMaxValueCheckBox.isSelected()) {
                 maxValueSpinner.setVisible(true);
@@ -142,7 +146,8 @@ public class NumberEditorDefinePane extends FieldEditorDefinePane<NumberEditor>
     };
 
     public NumberEditorDefinePane() {
-        super();
+//        super();
+        this.initComponents();
     }
 
 
@@ -166,46 +171,60 @@ public class NumberEditorDefinePane extends FieldEditorDefinePane<NumberEditor>
 
     public JPanel setValidatePane() {
 
-        this.allowDecimalsCheckBox = new UICheckBox(Inter.getLocText("Allow_Decimals"));
+        this.allowDecimalsCheckBox = new UICheckBox(Inter.getLocText("FR-Designer_Allow_Decimals"));
-        this.decimalLength = new com.fr.design.editor.editor.IntegerEditor();
+        this.decimalLength = new UIBasicSpinner(new SpinnerNumberModel(16, 0, Integer.MAX_VALUE, 1));
-        this.decimalLength.setColumns(4);
+        this.decimalLength.setPreferredSize(new Dimension(155, 20));
+
         this.allowDecimalsCheckBox.addActionListener(actionListener1);
 
-        this.allowNegativeCheckBox = new UICheckBox(Inter.getLocText("Allow_Negative"));
+        this.allowNegativeCheckBox = new UICheckBox(Inter.getLocText("FR-Designer_Allow_Negative"));
         this.allowNegativeCheckBox.addActionListener(actionListener2);
 
-        this.setMaxValueCheckBox = new UICheckBox(Inter.getLocText("Need_Max_Value"), false);
+        this.setMaxValueCheckBox = new UICheckBox(Inter.getLocText("FR-Designer_Max_Value"), false);
 
         this.maxValueSpinner = new UIBasicSpinner(maxValueModel = new SpinnerNumberModel(0D, -Double.MAX_VALUE, Double.MAX_VALUE, 1D));
-        maxValueSpinner.setPreferredSize(new Dimension(120, 20));
+        maxValueSpinner.setPreferredSize(new Dimension(155, 20));
         setNotAllowsInvalid(this.maxValueSpinner);
         this.maxValueSpinner.setVisible(false);
         this.setMaxValueCheckBox.addActionListener(actionListener3);
         this.maxValueSpinner.addChangeListener(changeListener1);
 
-        this.setMinValueCheckBox = new UICheckBox(Inter.getLocText("Need_Min_Value"), false);
+        this.setMinValueCheckBox = new UICheckBox(Inter.getLocText("FR-Designer_Min_Value"), false);
         this.minValueSpinner = new UIBasicSpinner(minValueModel = new SpinnerNumberModel(0D, -Double.MAX_VALUE, Double.MAX_VALUE, 1D));
-        minValueSpinner.setPreferredSize(new Dimension(120, 20));
+        minValueSpinner.setPreferredSize(new Dimension(155, 20));
         setNotAllowsInvalid(this.minValueSpinner);
         this.minValueSpinner.setVisible(false);
         this.setMinValueCheckBox.addActionListener(actionListener4);
         this.minValueSpinner.addChangeListener(changeListener2);
 
+        UILabel numberLabel = new UILabel(Inter.getLocText(new String[]{"FR-Designer_Double", "Numbers"}));
+        numberLabel.setBorder(BorderFactory.createEmptyBorder(0, 12, 0, 0));
+
+        JPanel decimalPane = new JPanel(new BorderLayout());
+        decimalPane.add(decimalLength, BorderLayout.CENTER);
+        decimalPane.setBorder(BorderFactory.createEmptyBorder(0, 12, 0, 0));
+        JPanel maxValueSpinnerPane = new JPanel(new BorderLayout());
+        maxValueSpinnerPane.add(maxValueSpinner, BorderLayout.CENTER);
+        maxValueSpinnerPane.setBorder(BorderFactory.createEmptyBorder(0, 12, 0, 0));
+        JPanel minValueSpinnerPane = new JPanel(new BorderLayout());
+        minValueSpinnerPane.add(minValueSpinner, BorderLayout.CENTER);
+        minValueSpinnerPane.setBorder(BorderFactory.createEmptyBorder(0, 12, 0, 0));
 
         double f = TableLayout.FILL;
         double p = TableLayout.PREFERRED;
         Component[][] components = new Component[][]{
-                new Component[]{allowDecimalsCheckBox, null },
+                new Component[]{allowDecimalsCheckBox, null},
-                new Component[]{new UILabel(Inter.getLocText(new String[]{"Double", "Numbers"})), decimalLength },
+                new Component[]{numberLabel, decimalPane},
                 new Component[]{allowNegativeCheckBox, null},
-                new Component[]{setMaxValueCheckBox, maxValueSpinner},
+                new Component[]{setMaxValueCheckBox, maxValueSpinnerPane},
-                new Component[]{setMinValueCheckBox, minValueSpinner},
+                new Component[]{setMinValueCheckBox, minValueSpinnerPane},
         };
         double[] rowSize = {p, p, p, p, p};
-        double[] columnSize = {p,f};
+        double[] columnSize = {p, f};
-        int[][] rowCount = {{1, 1},{1, 1},{1, 1},{1, 1},{1, 1}};
+        int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}};
-        JPanel panel =  TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, 10, 1);
+        JPanel pane = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_MEDIUM, LayoutConstants.VGAP_MEDIUM);
-        return panel;
+        pane.setBorder(BorderFactory.createEmptyBorder(0, 1, 0, 0));
+        return pane;
 
     }
 
@@ -250,7 +269,7 @@ public class NumberEditorDefinePane extends FieldEditorDefinePane<NumberEditor>
         NumberEditor ob = new NumberEditor();
         ob.setAllowDecimals(allowDecimalsCheckBox.isSelected());
         if (allowDecimalsCheckBox.isSelected()) {
-            ob.setMaxDecimalLength(this.decimalLength.getValue());
+            ob.setMaxDecimalLength((Integer) this.decimalLength.getValue());
         }
 
         ob.setAllowNegative(allowNegativeCheckBox.isSelected());

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

@@ -28,9 +28,9 @@ public class RadioGroupDefinePane extends FieldEditorDefinePane<RadioGroup> {
 	@Override
 	protected JPanel setFirstContentPane() {
 
-		JPanel centerPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
+		JPanel centerPane = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane();
 		buttonGroupDictPane = new ButtonGroupDictPane();
-		buttonGroupDictPane.setLayout(new FlowLayout(FlowLayout.LEFT, 5, 0));
+		buttonGroupDictPane.setLayout(new FlowLayout(FlowLayout.LEFT, 0, 0));
 		centerPane.add(buttonGroupDictPane);
 		return centerPane;
 	}

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

@@ -5,6 +5,9 @@ import com.fr.design.gui.frpane.TreeSettingPane;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.itree.refreshabletree.TreeRootPane;
 import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.layout.FRLeftFlowLayout;
+import com.fr.design.layout.TableLayout;
+import com.fr.design.layout.TableLayoutHelper;
 import com.fr.form.ui.TreeEditor;
 import com.fr.general.Inter;
 
@@ -52,7 +55,8 @@ public class TreeEditorDefinePane extends FieldEditorDefinePane<TreeEditor> {
 	protected JPanel setSecondContentPane() {
 		JPanel contentPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
 		contentPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
-		JPanel contenter = FRGUIPaneFactory.createMediumHGapFlowInnerContainer_M_Pane();
+		JPanel contenter = FRGUIPaneFactory.createMediumHGapFlowInnerContainer_M_Pane_First0();
+
 		contentPane.add(contenter,BorderLayout.NORTH);
 		removeRepeatCheckBox = new UICheckBox(Inter.getLocText("Form-Remove_Repeat_Data"), false);
 		contenter.add(removeRepeatCheckBox);

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

@@ -39,7 +39,7 @@ public class WaterMarkDictPane extends JPanel {
         int[][] rowCount = {{1, 1}};
         JPanel panel = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
 //		JPanel panel =  TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_LARGE, LayoutConstants.VGAP_MEDIUM);
-        panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 5, 0));
+        panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
         this.add(panel, BorderLayout.CENTER);
     }
 

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

@@ -15,7 +15,7 @@ public abstract class WritableRepeatEditorPane<E extends WriteAbleRepeatEditor>
 
 	@Override
 	protected JPanel setSecondContentPane() {
-		JPanel contentPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
+		JPanel contentPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane_First0();
 		contentPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
 		JPanel otherContentPane = this.setThirdContentPane();
 		if (otherContentPane != null) {

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

@@ -20,9 +20,8 @@ public abstract class WriteUnableRepeatEditorPane<E extends WriteUnableRepeatEdi
 	
 	@Override
 	protected JPanel setFirstContentPane() {
-		JPanel contentPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
+		JPanel contentPane = FRGUIPaneFactory.createYBoxEmptyBorderPane();
-		contentPane.setBorder(BorderFactory.createEmptyBorder(0, 2, 0, 0));
+		JPanel contenter=FRGUIPaneFactory.createMediumHGapFlowInnerContainer_M_Pane_First0();
-		JPanel contenter=FRGUIPaneFactory.createMediumHGapFlowInnerContainer_M_Pane();
 		removeRepeatCheckBox = new UICheckBox(Inter.getLocText("Form-Remove_Repeat_Data"), false);
 		contentPane.add(contenter);
 		contenter.add(removeRepeatCheckBox);

designer_base/src/com/fr/design/constants/UIConstants.java

@@ -154,7 +154,7 @@ public interface UIConstants {
     public static final Color BARNOMAL = new Color(232, 232, 233);
     public static final Color COMPONENT_BACKGROUND_COLOR = new Color(237,237,238);
     public static final int ARC = 0;
-    public static final int BUTTON_GROUP_ARC = 6;
+    public static final int BUTTON_GROUP_ARC = 0;
     public static final int LARGEARC = 6;
     public static final Stroke BS = new BasicStroke(1f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_ROUND, 2f, new float[]{3, 1}, 0);
     public static final Icon PREVIEW_DOWN = BaseUtils.readIcon("com/fr/design/images/buttonicon/prevew_down_icon.png");

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

@@ -52,6 +52,7 @@ public class TreeSettingPane extends BasicPane implements DataCreatorUI {
 	private void initComponents(boolean isEditor) {
 		this.setLayout(FRGUIPaneFactory.createBorderLayout());
 		JPanel buildWayPanel= FRGUIPaneFactory.createMediumHGapFlowInnerContainer_M_Pane();
+		buildWayPanel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
 		UILabel buildWayLabel = new UILabel(Inter.getLocText("FR-Designer_Build-Way") + " ：");
 		buildWayPanel.add(buildWayLabel);
 		buildBox = new UIComboBox(buildWay);

designer_base/src/com/fr/design/gui/ibutton/UIButtonGroup.java

@@ -153,14 +153,13 @@ public class UIButtonGroup<T> extends JPanel implements GlobalNameObserver {
     }
 
     protected void initButton(UIToggleButton labelButton) {
-        labelButton.setRoundBorder(true);
         labelButton.setBorderPainted(false);
         labelButtonList.add(labelButton);
         this.add(labelButton);
     }
 
     protected Border getGroupBorder() {
-        return BorderFactory.createEmptyBorder(1, 1, 1, 1);
+        return BorderFactory.createEmptyBorder(0, 0, 0, 0);
     }
 
     protected LayoutManager getGridLayout(int number) {

designer_base/src/com/fr/design/gui/itree/refreshabletree/TreeRootPane.java

@@ -9,7 +9,6 @@ import javax.swing.JPanel;
 
 import com.fr.data.impl.TreeAttr;
 import com.fr.design.gui.icheckbox.UICheckBox;
-import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.dialog.BasicPane;
 import com.fr.general.Inter;
@@ -18,10 +17,10 @@ public class TreeRootPane extends BasicPane {
 	
 	// 是否支持多选(checkBoxTree)
 	//private JCheckBox multipleSelection;
-	private UIComboBox checkTypeComboBox;
+	private UICheckBox checkTypeCheckBox;
 	
 	// richer:加载的方式，支持异步加载和完全加载
-	private UIComboBox loadTypeComboBox;
+	private UICheckBox loadTypeCheckBox;
 	
 	private UICheckBox layerTypeCheckBox;
 
@@ -30,30 +29,25 @@ public class TreeRootPane extends BasicPane {
 	public TreeRootPane() {
 		this.setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
 
-		JPanel checkTypePane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
+		JPanel checkTypePane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane_First0();
-		checkTypePane.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 0));
+		checkTypePane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
-		checkTypePane.add(new UILabel(Inter.getLocText("Tree-Mutiple_Selection_Or_Not") + ":"));
+		checkTypeCheckBox = new UICheckBox(Inter.getLocText("Tree-Mutiple_Selection_Or_Not"));
-		checkTypeComboBox = new UIComboBox(new String[] {Inter.getLocText("Yes"), Inter.getLocText("No")});
+		checkTypePane.add(checkTypeCheckBox);
-		checkTypePane.add(checkTypeComboBox);
 		this.add(checkTypePane);
 
-		JPanel loadTypePane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
+		JPanel loadTypePane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane_First0();
-		loadTypePane.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 0));
+		checkTypePane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
-		loadTypePane.add(new UILabel(Inter.getLocText("Widget-Load_Type") + ":"));
+		loadTypeCheckBox = new UICheckBox(Inter.getLocText("Widget-Load_By_Async"));
-		loadTypeComboBox = new UIComboBox(new String[]{Inter.getLocText("Widget-Load_By_Async"), Inter.getLocText("Widget-Load_By_Complete")});
+		loadTypePane.add(loadTypeCheckBox);
-		loadTypePane.add(loadTypeComboBox);
 		this.add(loadTypePane);
 
-		JPanel leafSelectPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
+		JPanel leafSelectPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane_First0();
-		leafSelectPane.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 0));
+		checkTypePane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
 		leafSelectPane.add(layerTypeCheckBox = new UICheckBox(Inter.getLocText("Tree-Select_Leaf_Only")));
-		UILabel tips = new UILabel(Inter.getLocText("Tree-Select_Leaf_Only_Tips"));
-		tips.setForeground(new Color(147, 178, 233));
-		leafSelectPane.add(tips);
 		this.add(leafSelectPane);
 
-        JPanel returnFullPathPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
+        JPanel returnFullPathPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane_First0();
-        returnFullPathPane.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 0));
+		checkTypePane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
 		returnFullPathPane.add(returnFullPathCheckBox = new UICheckBox(Inter.getLocText("Tree-Return_Full_Path")));
         this.add(returnFullPathPane);
 
@@ -65,16 +59,16 @@ public class TreeRootPane extends BasicPane {
 	}
 	
 	public void populate(TreeAttr treeAttr) {
-		checkTypeComboBox.setSelectedIndex(treeAttr.isMultipleSelection() ? 0 : 1);
+		checkTypeCheckBox.setSelected(treeAttr.isMultipleSelection());
-		loadTypeComboBox.setSelectedIndex(treeAttr.isAjax() ? 0 : 1);
+		loadTypeCheckBox.setSelected(treeAttr.isAjax());
 		layerTypeCheckBox.setSelected(treeAttr.isSelectLeafOnly());
         returnFullPathCheckBox.setSelected(treeAttr.isReturnFullPath());
 	}
 
 	public TreeAttr update() {
 		TreeAttr treeAttr = new TreeAttr();
-		treeAttr.setMultipleSelection(checkTypeComboBox.getSelectedIndex() == 0);
+		treeAttr.setMultipleSelection(checkTypeCheckBox.isSelected());
-		treeAttr.setAjax(loadTypeComboBox.getSelectedIndex() == 0);
+		treeAttr.setAjax(loadTypeCheckBox.isSelected());
 		treeAttr.setSelectLeafOnly(layerTypeCheckBox.isSelected());
         treeAttr.setReturnFullPath(returnFullPathCheckBox.isSelected());
 

designer_base/src/com/fr/design/layout/FRGUIPaneFactory.java

@@ -1,19 +1,10 @@
 package com.fr.design.layout;
 
-import java.awt.BorderLayout;
+import com.fr.design.border.UITitledBorder;
-import java.awt.CardLayout;
-import java.awt.Color;
-import java.awt.FlowLayout;
-import java.awt.LayoutManager;
-
-import javax.swing.BorderFactory;
-import javax.swing.BoxLayout;
-import javax.swing.Icon;
 import com.fr.design.gui.ilable.UILabel;
-import javax.swing.JPanel;
-import javax.swing.JRadioButton;
 
-import com.fr.design.border.UITitledBorder;
+import javax.swing.*;
+import java.awt.*;
 
 public class FRGUIPaneFactory {
     private FRGUIPaneFactory() {
@@ -29,6 +20,7 @@ public class FRGUIPaneFactory {
 
     /**
      * 创建一个靠右靠左的水平间隙为2的流式布局
+     *
      * @return FlowLayout对象
      */
     public static LayoutManager createBoxFlowLayout() { // createBoxFlowLayout 图表用到的比较多
@@ -37,6 +29,7 @@ public class FRGUIPaneFactory {
 
     /**
      * 创建一个靠左的布局
+     *
      * @return FlowLayout对象
      */
     public static LayoutManager createLeftZeroLayout() {
@@ -45,6 +38,7 @@ public class FRGUIPaneFactory {
 
     /**
      * 创建一个靠左的水平和垂直间隙均为5的流式布局
+     *
      * @return FlowLayout对象
      */
     public static LayoutManager createLabelFlowLayout() { // createLabelFlowLayout
@@ -53,6 +47,7 @@ public class FRGUIPaneFactory {
 
     /**
      * 创建一个靠左流式布局，间距10,10
+     *
      * @return FlowLayout对象
      */
     public static LayoutManager createL_FlowLayout() {
@@ -61,6 +56,7 @@ public class FRGUIPaneFactory {
 
     /**
      * 创建一个居中流式布局
+     *
      * @return FlowLayout对象
      */
     public static LayoutManager createCenterFlowLayout() {
@@ -69,6 +65,7 @@ public class FRGUIPaneFactory {
 
     /**
      * 创建一个靠右流式布局
+     *
      * @return FlowLayout对象
      */
     public static LayoutManager createRightFlowLayout() {
@@ -77,6 +74,7 @@ public class FRGUIPaneFactory {
 
     /**
      * 创建一个边框布局
+     *
      * @return BorderLayout对象
      */
     public static LayoutManager createBorderLayout() {
@@ -85,16 +83,18 @@ public class FRGUIPaneFactory {
 
     /**
      * 创建一个边框布局，间距4,4
+     *
      * @return BorderLayout对象
      */
     public static LayoutManager createM_BorderLayout() {
-		return new   BorderLayout(4,4);
+        return new BorderLayout(4, 4);
     }
 
     // TODO 删掉
 
     /**
      * 创建一个1列的网格布局
+     *
      * @return FRGridLayout对象
      */
     public static LayoutManager create1ColumnGridLayout() {
@@ -103,6 +103,7 @@ public class FRGUIPaneFactory {
 
     /**
      * 创建一个2列的网格布局
+     *
      * @return FRGridLayout对象
      */
     public static LayoutManager create2ColumnGridLayout() {
@@ -111,6 +112,7 @@ public class FRGUIPaneFactory {
 
     /**
      * 创建一个n列的网格布局
+     *
      * @param nColumn 列数
      * @return FRGridLayout对象
      */
@@ -120,6 +122,7 @@ public class FRGUIPaneFactory {
 
     /**
      * 创建一个带标题边框面板
+     *
      * @param string 边框标题
      * @return JPanel对象
      */
@@ -133,6 +136,7 @@ public class FRGUIPaneFactory {
 
     /**
      * 创建一个带标题边框面板并且居中显示
+     *
      * @param borderTitle 边框标题
      * @return JPanel对象
      */
@@ -146,6 +150,7 @@ public class FRGUIPaneFactory {
 
     /**
      * 创建一个靠左空边框布局，间隔大
+     *
      * @return JPanel对象
      */
     public static JPanel createBigHGapFlowInnerContainer_M_Pane() {
@@ -157,6 +162,7 @@ public class FRGUIPaneFactory {
 
     /**
      * 创建一个靠左空边框面板，间隔中等
+     *
      * @return JPanel对象
      */
     public static JPanel createMediumHGapFlowInnerContainer_M_Pane() {
@@ -166,8 +172,21 @@ public class FRGUIPaneFactory {
         return jp;
     }
 
+    /**
+     * 创建一个靠左空边框面板，间隔中等，firsthgap 为0
+     *
+     * @return JPanel对象
+     */
+    public static JPanel createMediumHGapFlowInnerContainer_M_Pane_First0() {
+        JPanel jp = new JPanel();
+        jp.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
+        jp.setLayout(new FRLeftFlowLayout(0, 20, 5));
+        return jp;
+    }
+
     /**
      * 创建一个靠左空边框面板，间隔中等
+     *
      * @return JPanel对象
      */
     public static JPanel createMediumHGapHighTopFlowInnerContainer_M_Pane() {
@@ -179,6 +198,7 @@ public class FRGUIPaneFactory {
 
     /**
      * 创建一个正常靠左空边框面板
+     *
      * @return JPanel对象
      */
     public static JPanel createNormalFlowInnerContainer_M_Pane() {
@@ -190,6 +210,7 @@ public class FRGUIPaneFactory {
 
     /**
      * 创建一个靠左0间距边框面板
+     *
      * @return JPanel对象
      */
     public static JPanel createLeftFlowZeroGapBorderPane() {
@@ -201,6 +222,7 @@ public class FRGUIPaneFactory {
 
     /**
      * 创建一个靠左流式布局，正常流式内嵌
+     *
      * @return JPanel对象
      */
     public static JPanel createNormalFlowInnerContainer_S_Pane() {
@@ -211,6 +233,7 @@ public class FRGUIPaneFactory {
 
     /**
      * 创建一个靠左流式布局，流式内嵌
+     *
      * @return JPanel对象
      */
     public static JPanel createBoxFlowInnerContainer_S_Pane() {
@@ -219,8 +242,20 @@ public class FRGUIPaneFactory {
         return jp;
     }
 
+    /**
+     * 创建一个靠左流式布局，流式内嵌，首元素距离左边0
+     *
+     * @return JPanel对象
+     */
+    public static JPanel createBoxFlowInnerContainer_S_Pane_First0() {
+        JPanel jp = new JPanel();
+        jp.setLayout(new FRLeftFlowLayout(0, 0, 5));
+        return jp;
+    }
+
     /**
      * 创建一个靠右面板
+     *
      * @return JPanel对象
      */
     public static JPanel createRightFlowInnerContainer_S_Pane() {
@@ -231,6 +266,7 @@ public class FRGUIPaneFactory {
 
     /**
      * 创建一个居中面板
+     *
      * @return JPanel对象
      */
     public static JPanel createCenterFlowInnerContainer_S_Pane() {
@@ -241,6 +277,7 @@ public class FRGUIPaneFactory {
 
     /**
      * 创建一个居中0间距面板
+     *
      * @return JPanel对象
      */
     public static JPanel createCenterFlowZeroGapBorderPane() {
@@ -252,6 +289,7 @@ public class FRGUIPaneFactory {
 
     /**
      * 创建纵向排列面板
+     *
      * @return JPanel对象
      */
     public static JPanel createY_AXISBoxInnerContainer_L_Pane() {
@@ -263,6 +301,7 @@ public class FRGUIPaneFactory {
 
     /**
      * 创建纵向边框面板
+     *
      * @return JPanel对象
      */
     public static JPanel createYBoxEmptyBorderPane() {
@@ -274,6 +313,7 @@ public class FRGUIPaneFactory {
 
     /**
      * 创建横向面板
+     *
      * @return JPanel对象
      */
     public static JPanel createX_AXISBoxInnerContainer_L_Pane() {
@@ -285,6 +325,7 @@ public class FRGUIPaneFactory {
 
     /**
      * 创建纵向面板M
+     *
      * @return JPanel对象
      */
     public static JPanel createY_AXISBoxInnerContainer_M_Pane() {
@@ -296,6 +337,7 @@ public class FRGUIPaneFactory {
 
     /**
      * 创建横向内置boxlayout的面板
+     *
      * @return JPanel对象
      */
     public static JPanel createX_AXISBoxInnerContainer_M_Pane() {
@@ -307,6 +349,7 @@ public class FRGUIPaneFactory {
 
     /**
      * 创建纵向内置boxlayout的面板
+     *
      * @return JPanel对象
      */
     public static JPanel createY_AXISBoxInnerContainer_S_Pane() {
@@ -317,6 +360,7 @@ public class FRGUIPaneFactory {
 
     /**
      * 创建横向内置boxlayout的面板
+     *
      * @return JPanel对象
      */
     public static JPanel createX_AXISBoxInnerContainer_S_Pane() {
@@ -327,6 +371,7 @@ public class FRGUIPaneFactory {
 
     /**
      * 创建n列网格面板
+     *
      * @param nColumn 列数
      * @return JPanel对象
      */
@@ -338,6 +383,7 @@ public class FRGUIPaneFactory {
 
     /**
      * 创建n列网格面板
+     *
      * @param nColumn 列数
      * @param h       水平间距
      * @param v       垂直间距
@@ -351,6 +397,7 @@ public class FRGUIPaneFactory {
 
     /**
      * 创建顶格n列网格面板
+     *
      * @param nColumn 列数
      * @return JPanel对象
      */
@@ -362,6 +409,7 @@ public class FRGUIPaneFactory {
 
     /**
      * 创建边框面板L
+     *
      * @return JPanel对象
      */
     public static JPanel createBorderLayout_L_Pane() {
@@ -373,6 +421,7 @@ public class FRGUIPaneFactory {
 
     /**
      * 创建边框面板M
+     *
      * @return JPanel对象
      */
     public static JPanel createBorderLayout_M_Pane() {
@@ -384,6 +433,7 @@ public class FRGUIPaneFactory {
 
     /**
      * 创建边框面板S
+     *
      * @return JPanel对象
      */
     public static JPanel createBorderLayout_S_Pane() {
@@ -394,6 +444,7 @@ public class FRGUIPaneFactory {
 
     /**
      * 创建卡片式布局
+     *
      * @return JPanel对象
      */
     public static JPanel createCardLayout_S_Pane() {
@@ -404,6 +455,7 @@ public class FRGUIPaneFactory {
 
     /**
      * 创建图标IconRadio面板
+     *
      * @param icon      图标
      * @param jradiobtn 按钮
      * @return JPanel对象
@@ -423,6 +475,7 @@ public class FRGUIPaneFactory {
 
     /**
      * 计算宽度
+     *
      * @param width 宽度输入值
      * @return w 宽度输出值
      */
@@ -443,6 +496,7 @@ public class FRGUIPaneFactory {
 
     /**
      * 计算高度
+     *
      * @param height 高度输入值
      * @return 高度输出值
      */

designer_base/src/com/fr/design/locale/designer.properties

@@ -2116,5 +2116,6 @@ FR-Designer_Widget_Error_Tip=error tip
 FR-Designer_Widget_Return_Leaf=return leaf
 FR-Designer_Widget_Return_Path=return path
 FR-Designer_Widget_Display_Position=Display Position
+FR-Designer_Size_Limit=Size_Limit
 FR-Designer_Widget_Name=Widget Name
 FR-Designer_Coords_And_Size=Coords & Size

designer_base/src/com/fr/design/locale/designer_en_US.properties

@@ -2112,5 +2112,6 @@ FR-Designer_Widget_Error_Tip=error tip
 FR-Designer_Widget_Return_Leaf=return leaf
 FR-Designer_Widget_Return_Path=return path
 FR-Designer_Widget_Display_Position=Display Position
+FR-Designer_Size_Limit=Size_Limit
 FR-Designer_Widget_Name=Widget Name
 FR-Designer_Coords_And_Size=Coords & Size

designer_base/src/com/fr/design/locale/designer_ja_JP.properties

@@ -2115,5 +2115,6 @@ FR-Designer_Widget_Error_Tip=
 FR-Designer_Widget_Return_Leaf=
 FR-Designer_Widget_Return_Path=
 FR-Designer_Widget_Display_Position=
+FR-Designer_Size_Limit=
 FR-Designer_Widget_Name=
 FR-Designer_Coords_And_Size=

designer_base/src/com/fr/design/locale/designer_ko_KR.properties

@@ -2115,5 +2115,6 @@ FR-Designer_Widget_Error_Tip=
 FR-Designer_Widget_Return_Leaf=
 FR-Designer_Widget_Return_Path=
 FR-Designer_Widget_Display_Position=
+FR-Designer_Size_Limit=
 FR-Designer_Widget_Name=
 FR-Designer_Coords_And_Size=

designer_base/src/com/fr/design/locale/designer_zh_CN.properties

@@ -2123,5 +2123,6 @@ FR-Designer_Widget_Error_Tip=\u9519\u8BEF\u63D0\u793A
 FR-Designer_Widget_Return_Leaf=\u7ED3\u679C\u8FD4\u56DE\u53F6\u5B50\u8282\u70B9
 FR-Designer_Widget_Return_Path=\u7ED3\u679C\u8FD4\u56DE\u5B8C\u6574\u5C42\u6B21\u8DEF\u5F84
 FR-Designer_Widget_Display_Position=\u663E\u793A\u4F4D\u7F6E
+FR-Designer_Size_Limit=\u5927\u5C0F\u9650\u5236
 FR-Designer_Widget_Name=\u63A7\u4EF6\u540D\u79F0
 FR-Designer_Coords_And_Size=\u5750\u6807\u00B7\u5C3A\u5BF8

designer_base/src/com/fr/design/locale/designer_zh_TW.properties

@@ -2115,5 +2115,6 @@ FR-Designer_Widget_Error_Tip=
 FR-Designer_Widget_Return_Leaf=
 FR-Designer_Widget_Return_Path=
 FR-Designer_Widget_Display_Position=
+FR-Designer_Size_Limit=
 FR-Designer_Widget_Name=
 FR-Designer_Coords_And_Size=