From 72768e5c1de104bb90f8c02121eb54383454cba2 Mon Sep 17 00:00:00 2001
From: kerry <kerry@finereport.com>
Date: Wed, 9 Aug 2017 17:31:42 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-3293=20=E8=B0=83=E6=95=B4border=20?=
 =?UTF-8?q?=E6=BC=8F=E4=BA=86=E4=B8=80=E4=B8=AA=E5=9C=B0=E6=96=B9=E6=B2=A1?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 designer_base/src/com/fr/design/gui/frpane/RegPane.java  | 9 +++++----
 .../design/widget/ui/designer/FieldEditorDefinePane.java | 1 -
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/designer_base/src/com/fr/design/gui/frpane/RegPane.java b/designer_base/src/com/fr/design/gui/frpane/RegPane.java
index efa8b435e5..c6e16bbe96 100644
--- a/designer_base/src/com/fr/design/gui/frpane/RegPane.java
+++ b/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();
diff --git a/designer_form/src/com/fr/design/widget/ui/designer/FieldEditorDefinePane.java b/designer_form/src/com/fr/design/widget/ui/designer/FieldEditorDefinePane.java
index af0366a6ba..2bf1df46ec 100644
--- a/designer_form/src/com/fr/design/widget/ui/designer/FieldEditorDefinePane.java
+++ b/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() {