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

* commit 'd911e7969216b40e817e961410d47527e722a7a9':
  REPORT-3293 调整border 漏了一个地方没改

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

@@ -73,13 +73,13 @@ public class RegPane extends BasicPane {
 
     private void initComponents(){
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
-        this.setBorder(BorderFactory.createEmptyBorder(0, 0, 10, 0));
+        this.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
         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);
         this.add(contentPane, BorderLayout.NORTH);
-
+        JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         regErrorMsgPane = new RegErrorMsgPane();
         final JPanel cardPane = FRGUIPaneFactory.createCardLayout_S_Pane();
         detailedCardLayout = new CardLayout();
@@ -88,8 +88,9 @@ public class RegPane extends BasicPane {
         cardPane.add((regLengthPane = new RegLengthPane()), "Length");
         cardPane.add((regPhonePane = new RegPhonePane()), "Phone");
         cardPane.add((customRegRexPane = new CustomRegRexPane()), "Custom");
-        this.add(cardPane, BorderLayout.CENTER);
-        this.add(regErrorMsgPane, BorderLayout.SOUTH);
+        centerPane.add(cardPane, BorderLayout.NORTH);
+        centerPane.add(regErrorMsgPane, BorderLayout.CENTER);
+        this.add(centerPane, BorderLayout.CENTER);
         regComboBox.addActionListener(new ActionListener(){
             public void actionPerformed(ActionEvent e) {
                 RegExp regExp = (RegExp)regComboBox.getSelectedItem();

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

@@ -84,7 +84,6 @@ public abstract class FieldEditorDefinePane<T extends FieldEditor> extends Abstr
 
     protected void addValidatePane() {
         validatePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        validatePane.setLayout(new BorderLayout(0, 5));
 
         final UILabel uiLabel = new UILabel(Inter.getLocText("FR-Designer_Widget_Error_Tip"));
         allowBlankCheckBox.addItemListener(new ItemListener() {