From 5f56d3db18284a71c66cebc135a59e64d5f648eb Mon Sep 17 00:00:00 2001
From: kerry <kerry@finereport.com>
Date: Fri, 5 Aug 2016 11:12:45 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=9C=80=E6=B1=82=E5=89=A9=E4=B8=8B=E7=9A=84?=
 =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E6=95=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/widget/CellWidgetCardPane.java  |  2 +-
 .../fr/design/widget/ui/ButtonDefinePane.java |  2 +-
 .../design/widget/ui/CheckBoxDefinePane.java  |  5 +-
 .../widget/ui/CheckBoxGroupDefinePane.java    |  5 +-
 .../ui/CustomWritableRepeatEditorPane.java    |  2 +-
 .../widget/ui/DateEditorDefinePane.java       | 92 +++++++++++--------
 .../ui/DirectWriteEditorDefinePane.java       | 13 ++-
 .../widget/ui/FieldEditorDefinePane.java      | 42 ++++-----
 .../widget/ui/IframeEditorDefinePane.java     | 15 ++-
 .../design/widget/ui/MultiFileEditorPane.java | 17 ++--
 .../widget/ui/NumberEditorDefinePane.java     | 24 ++---
 .../widget/ui/RadioGroupDefinePane.java       |  5 +-
 .../widget/ui/TextFieldEditorDefinePane.java  | 23 +----
 .../widget/ui/TreeEditorDefinePane.java       |  4 +-
 .../widget/ui/WritableRepeatEditorPane.java   |  2 -
 .../ui/WriteUnableRepeatEditorPane.java       |  4 +-
 .../btn/TreeNodeToogleButtonDefinePane.java   |  6 +-
 .../btn/ButtonWithHotkeysDetailPane.java      | 21 +++--
 .../fr/design/designer/creator/XPassword.java | 56 ++++++-----
 .../fr/design/designer/creator/XTextArea.java | 72 ++++++++-------
 20 files changed, 225 insertions(+), 187 deletions(-)

diff --git a/designer/src/com/fr/design/widget/CellWidgetCardPane.java b/designer/src/com/fr/design/widget/CellWidgetCardPane.java
index 4e8682f1ce..d1c81d53a4 100644
--- a/designer/src/com/fr/design/widget/CellWidgetCardPane.java
+++ b/designer/src/com/fr/design/widget/CellWidgetCardPane.java
@@ -87,7 +87,7 @@ public class CellWidgetCardPane extends BasicPane {
         attriPane.remove(widgetPropertyPane);
         widgetPropertyPane = new BasicWidgetPropertySettingPane();
         JPanel northPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        northPane.setBorder(BorderFactory.createEmptyBorder(10, 8, 5, 8));
+        northPane.setBorder(BorderFactory.createEmptyBorder(5, 8, 0, 8));
         JPanel basic = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("Form-Basic_Properties"));
         northPane.add(basic);
         basic.add(widgetPropertyPane);
diff --git a/designer/src/com/fr/design/widget/ui/ButtonDefinePane.java b/designer/src/com/fr/design/widget/ui/ButtonDefinePane.java
index b7dd0fdf58..5d5c8d2fad 100644
--- a/designer/src/com/fr/design/widget/ui/ButtonDefinePane.java
+++ b/designer/src/com/fr/design/widget/ui/ButtonDefinePane.java
@@ -24,7 +24,7 @@ public class ButtonDefinePane extends AbstractDataModify<Button> {
 
     private void initComponent() {
         setLayout(FRGUIPaneFactory.createBorderLayout());
-        setBorder(BorderFactory.createEmptyBorder(0, 13, 0, 0));
+        setBorder(BorderFactory.createEmptyBorder(0, 8, 0, 8));
     }
 
     @Override
diff --git a/designer/src/com/fr/design/widget/ui/CheckBoxDefinePane.java b/designer/src/com/fr/design/widget/ui/CheckBoxDefinePane.java
index 0e0e8c2e00..5849bf0f6b 100644
--- a/designer/src/com/fr/design/widget/ui/CheckBoxDefinePane.java
+++ b/designer/src/com/fr/design/widget/ui/CheckBoxDefinePane.java
@@ -32,12 +32,15 @@ public class CheckBoxDefinePane extends AbstractDataModify<CheckBox> {
 //
 //		this.add(infoLabel, BorderLayout.CENTER);
 		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));
+		JPanel advancedPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("Advanced"));
+		advancedPane.add(textPane);
 		textPane.add(new UILabel(Inter.getLocText("Text") + ":"));
 		text = new UITextField(8);
 		textPane.add(text);
-		this.add(textPane);
+		this.add(advancedPane);
 	}
 	
 	@Override
diff --git a/designer/src/com/fr/design/widget/ui/CheckBoxGroupDefinePane.java b/designer/src/com/fr/design/widget/ui/CheckBoxGroupDefinePane.java
index efcda9dc3c..56401e00f3 100644
--- a/designer/src/com/fr/design/widget/ui/CheckBoxGroupDefinePane.java
+++ b/designer/src/com/fr/design/widget/ui/CheckBoxGroupDefinePane.java
@@ -41,7 +41,8 @@ public class CheckBoxGroupDefinePane extends FieldEditorDefinePane<CheckBoxGroup
 	protected JPanel setFirstContentPane() {
 		JPanel attrPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
 		attrPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
-
+		JPanel advancedPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("Advanced"));
+		advancedPane.add(attrPane);
 //		JPanel northPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
 //		checkBoxDictPane = new CheckBoxDictPane();
 //		northPane.add(checkBoxDictPane);
@@ -67,7 +68,7 @@ public class CheckBoxGroupDefinePane extends FieldEditorDefinePane<CheckBoxGroup
 		centerPane.add(buttonGroupDictPane);
 		attrPane.add(centerPane, BorderLayout.CENTER);
 
-		return attrPane;
+		return advancedPane;
 	}
 	
 	@Override
diff --git a/designer/src/com/fr/design/widget/ui/CustomWritableRepeatEditorPane.java b/designer/src/com/fr/design/widget/ui/CustomWritableRepeatEditorPane.java
index a5597aa686..6a165f8741 100644
--- a/designer/src/com/fr/design/widget/ui/CustomWritableRepeatEditorPane.java
+++ b/designer/src/com/fr/design/widget/ui/CustomWritableRepeatEditorPane.java
@@ -1 +1 @@
-package com.fr.design.widget.ui;

import com.fr.design.gui.icheckbox.UICheckBox;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.form.ui.CustomWriteAbleRepeatEditor;
import com.fr.general.Inter;

import javax.swing.*;
import java.awt.*;

/**
 * Author : Shockway
 * Date: 13-9-18
 * Time: 下午2:17
 */
public abstract class CustomWritableRepeatEditorPane<T extends CustomWriteAbleRepeatEditor> extends WritableRepeatEditorPane<T> {

	private UICheckBox customDataCheckBox;

	public CustomWritableRepeatEditorPane() {
		this.initComponents();
	}

	@Override
	protected JPanel setThirdContentPane() {
		JPanel contentPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
		contentPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
		JPanel contenter = FRGUIPaneFactory.createMediumHGapFlowInnerContainer_M_Pane();
		contentPane.add(contenter, BorderLayout.NORTH);
		this.customDataCheckBox = new UICheckBox(Inter.getLocText("Form-Allow_CustomData"), false);
		contenter.add(this.customDataCheckBox);
		JPanel otherContentPane = this.setForthContentPane();
		if (otherContentPane != null) {
			contentPane.add(otherContentPane,BorderLayout.CENTER);
		}
		return contentPane;
	}

	protected abstract JPanel setForthContentPane();

	protected void populateSubWritableRepeatEditorBean(T e) {
		this.customDataCheckBox.setSelected(e.isCustomData());
		populateSubCustomWritableRepeatEditorBean(e);
	}

	protected abstract void populateSubCustomWritableRepeatEditorBean(T e);

	protected T updateSubWritableRepeatEditorBean() {
		T e = updateSubCustomWritableRepeatEditorBean();
		e.setCustomData(this.customDataCheckBox.isSelected());
		return e;
	}

	protected abstract T updateSubCustomWritableRepeatEditorBean();

}
\ No newline at end of file
+package com.fr.design.widget.ui;

import com.fr.design.gui.icheckbox.UICheckBox;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.form.ui.CustomWriteAbleRepeatEditor;
import com.fr.general.Inter;

import javax.swing.*;
import java.awt.*;

/**
 * Author : Shockway
 * Date: 13-9-18
 * Time: 下午2:17
 */
public abstract class CustomWritableRepeatEditorPane<T extends CustomWriteAbleRepeatEditor> extends WritableRepeatEditorPane<T> {

	private UICheckBox customDataCheckBox;

	public CustomWritableRepeatEditorPane() {
		this.initComponents();
	}

	@Override
	protected JPanel setThirdContentPane() {
		JPanel contentPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
		contentPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
		this.customDataCheckBox = new UICheckBox(Inter.getLocText("Form-Allow_CustomData"), false);
		this.customDataCheckBox.setPreferredSize(new Dimension(100, 30));
		getValidatePane().add(GUICoreUtils.createFlowPane(new JComponent[]{this.customDataCheckBox}, FlowLayout.LEFT, 5));
		JPanel otherContentPane = this.setForthContentPane();
		if (otherContentPane != null) {
			contentPane.add(otherContentPane,BorderLayout.CENTER);
		}
		return contentPane;
	}

	protected abstract JPanel setForthContentPane();

	protected void populateSubWritableRepeatEditorBean(T e) {
		this.customDataCheckBox.setSelected(e.isCustomData());
		populateSubCustomWritableRepeatEditorBean(e);
	}

	protected abstract void populateSubCustomWritableRepeatEditorBean(T e);

	protected T updateSubWritableRepeatEditorBean() {
		T e = updateSubCustomWritableRepeatEditorBean();
		e.setCustomData(this.customDataCheckBox.isSelected());
		return e;
	}

	protected abstract T updateSubCustomWritableRepeatEditorBean();

}
\ No newline at end of file
diff --git a/designer/src/com/fr/design/widget/ui/DateEditorDefinePane.java b/designer/src/com/fr/design/widget/ui/DateEditorDefinePane.java
index 5bfe0f0ff7..7ad0c411c9 100644
--- a/designer/src/com/fr/design/widget/ui/DateEditorDefinePane.java
+++ b/designer/src/com/fr/design/widget/ui/DateEditorDefinePane.java
@@ -9,6 +9,8 @@ import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.editor.ValueEditorPane;
 import com.fr.design.editor.ValueEditorPaneFactory;
+import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.form.ui.ComboBox;
 import com.fr.form.ui.DateEditor;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.DateUtils;
@@ -24,6 +26,8 @@ import javax.swing.event.DocumentListener;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
@@ -32,7 +36,7 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane<DateEditor
 	private UILabel sampleLabel;// preview
 	// content
 	private UITextField patternTextField = null;
-	private JList patternList = null;
+//	private JList patternList = null;
 
 	private ValueEditorPane startDv;
 	private ValueEditorPane endDv;
@@ -53,43 +57,59 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane<DateEditor
 	@Override
 	protected JPanel setSecondContentPane() {
 		JPanel otherContentPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
-
+		otherContentPane.setBorder(BorderFactory.createEmptyBorder(5, 0, 0, 0));
 		JPanel returnTypePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
 		returnTypePane.add(new UILabel(Inter.getLocText("Widget-Date_Selector_Return_Type") + ":"), BorderLayout.WEST);
 		returnTypeComboBox = new UIComboBox(new String[] { Inter.getLocText("String"), Inter.getLocText("Date") });
+		returnTypeComboBox.setPreferredSize(new Dimension(70, 20));
 		returnTypePane.add(returnTypeComboBox, BorderLayout.CENTER);
-		otherContentPane.add(returnTypePane);
+		JPanel firstPanel = GUICoreUtils.createFlowPane(new JComponent[]{returnTypePane}, FlowLayout.LEFT, 5);
+		firstPanel.setPreferredSize(new Dimension(141,30));
+		otherContentPane.add(firstPanel);
 
 		// sample pane
-		JPanel samplePane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("StyleFormat-Sample"));
-		otherContentPane.add(samplePane, BorderLayout.NORTH);
+//		JPanel samplePane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("StyleFormat-Sample"));
+//		otherContentPane.add(samplePane, BorderLayout.NORTH);
 
 		sampleLabel = new UILabel("");
-		samplePane.add(sampleLabel, BorderLayout.CENTER);
+//		samplePane.add(sampleLabel, BorderLayout.CENTER);
 		sampleLabel.setBorder(BorderFactory.createEmptyBorder(2, 4, 4, 4));
 		sampleLabel.setHorizontalAlignment(SwingConstants.CENTER);
 		sampleLabel.setFont(FRContext.getDefaultValues().getFRFont());
 
 		// content pane
-		JPanel contentPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-		otherContentPane.add(contentPane, BorderLayout.CENTER);
-		contentPane.setBorder(BorderFactory.createEmptyBorder(4, 0, 2, 0));
+//		JPanel contentPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+//		contentPane.setPreferredSize(new Dimension(400,100));
+//		otherContentPane.add(contentPane, BorderLayout.CENTER);
+//		contentPane.setBorder(BorderFactory.createEmptyBorder(4, 0, 2, 0));
 
 		patternTextField = new UITextField();
-		contentPane.add(patternTextField, BorderLayout.NORTH);
+//		contentPane.add(patternTextField, BorderLayout.NORTH);
 		patternTextField.getDocument().addDocumentListener(patternTextDocumentListener);
 
-		patternList = new JList(new DefaultListModel());
-		DefaultListModel model = (DefaultListModel) patternList.getModel();
-		model.removeAllElements();
+//		patternList = new JList(new DefaultListModel());
+//		DefaultListModel model = (DefaultListModel) patternList.getModel();
+//		model.removeAllElements();
         String[] arr = getDateFormateArray();
-		for (int i = 0; i < arr.length; i++) {
-			model.addElement(arr[i]);
-		}
-		JScrollPane pScrollPane = new JScrollPane(patternList);
-		pScrollPane.setPreferredSize(new Dimension(100, 120));
-		contentPane.add(pScrollPane, BorderLayout.CENTER);
-		patternList.addListSelectionListener(patternListSelectionListener);
+//		for (int i = 0; i < arr.length; i++) {
+//			model.addElement(arr[i]);
+//		}
+//		JScrollPane pScrollPane = new JScrollPane(patternList);
+//		pScrollPane.setPreferredSize(new Dimension(100, 120));
+//		contentPane.add(pScrollPane, BorderLayout.CENTER);
+
+		UIComboBox comboBox = new UIComboBox(arr);
+		comboBox.setPreferredSize(new Dimension(150,20));
+		comboBox.addActionListener(new ActionListener(){
+			public void actionPerformed(ActionEvent e){
+				patternTextField.setText( (String)comboBox.getSelectedItem());
+			}
+
+		});
+		JPanel secondPanel = GUICoreUtils.createFlowPane(new JComponent[]{new UILabel(Inter.getLocText("FR-Engine_Format") + ":"),comboBox,sampleLabel}, FlowLayout.LEFT, 5);
+		secondPanel.setPreferredSize(new Dimension(220,30));
+		otherContentPane.add(secondPanel);
+//		patternList.addListSelectionListener(patternListSelectionListener);
 		otherContentPane.add(initStartEndDatePane(), BorderLayout.SOUTH);
 		return otherContentPane;
 	}
@@ -146,11 +166,11 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane<DateEditor
 		}
 	}
 
-	private ListSelectionListener patternListSelectionListener = new ListSelectionListener() {
-		public void valueChanged(ListSelectionEvent evt) {
-			patternTextField.setText((String) patternList.getSelectedValue());
-		}
-	};
+//	private ListSelectionListener patternListSelectionListener = new ListSelectionListener() {
+//		public void valueChanged(ListSelectionEvent evt) {
+//			patternTextField.setText((String) patternList.getSelectedValue());
+//		}
+//	};
 
 	@Override
 	protected void populateSubDirectWriteEditorBean(DateEditor e) {
@@ -161,17 +181,17 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane<DateEditor
 
 		populateStartEnd(e);
 
-		DefaultListModel patternModel = (DefaultListModel) patternList.getModel();
-		if ((formatText == null || formatText.length() <= 0)) {
-			patternList.setSelectedIndex(0);
-		} else {
-			for (int i = 0; i < patternModel.size(); i++) {
-				if (ComparatorUtils.equals(patternModel.getElementAt(i).toString(), formatText)) {
-					patternList.setSelectedIndex(i);
-					return;
-				}
-			}
-		}
+//		DefaultListModel patternModel = (DefaultListModel) patternList.getModel();
+//		if ((formatText == null || formatText.length() <= 0)) {
+//			patternList.setSelectedIndex(0);
+//		} else {
+//			for (int i = 0; i < patternModel.size(); i++) {
+//				if (ComparatorUtils.equals(patternModel.getElementAt(i).toString(), formatText)) {
+//					patternList.setSelectedIndex(i);
+//					return;
+//				}
+//			}
+//		}
 	};
 
 	@Override
diff --git a/designer/src/com/fr/design/widget/ui/DirectWriteEditorDefinePane.java b/designer/src/com/fr/design/widget/ui/DirectWriteEditorDefinePane.java
index e0ca17f55a..bee4df92e3 100644
--- a/designer/src/com/fr/design/widget/ui/DirectWriteEditorDefinePane.java
+++ b/designer/src/com/fr/design/widget/ui/DirectWriteEditorDefinePane.java
@@ -2,10 +2,12 @@ package com.fr.design.widget.ui;
 
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.form.ui.DirectWriteEditor;
 import com.fr.general.Inter;
 
 import javax.swing.*;
+import java.awt.*;
 
 //richer:需要提供能否直接编辑的控件设置面板——下拉框、复选框、时间、日期、下拉树
 public abstract class DirectWriteEditorDefinePane<T extends DirectWriteEditor> extends FieldEditorDefinePane<T> {
@@ -21,17 +23,18 @@ public abstract class DirectWriteEditorDefinePane<T extends DirectWriteEditor> e
 	protected JPanel setFirstContentPane() {
 		JPanel contentPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
 		contentPane.setBorder(BorderFactory.createEmptyBorder(0, 2, 0, 0));
-		JPanel contenter = FRGUIPaneFactory.createMediumHGapFlowInnerContainer_M_Pane();
-		contentPane.add(contenter);
 		directWriteCheckBox = new UICheckBox(Inter.getLocText("Form-Allow_Edit"), false);
-		contenter.add(directWriteCheckBox);
+		directWriteCheckBox.setPreferredSize(new Dimension(100, 30));
+		getValidatePane().add(GUICoreUtils.createFlowPane(new JComponent[]{directWriteCheckBox}, FlowLayout.LEFT, 5));
+		JPanel advancedPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("Advanced"));
 		waterMarkDictPane = new WaterMarkDictPane();
-		contenter.add(waterMarkDictPane);
+		advancedPane.add(contentPane);
+		contentPane.add(waterMarkDictPane);
 		JPanel otherContentPane = this.setSecondContentPane();
 		if (otherContentPane != null) {
 			contentPane.add(otherContentPane);
 		}
-		return contentPane;
+		return advancedPane;
 	}
 
 	protected abstract JPanel setSecondContentPane();
diff --git a/designer/src/com/fr/design/widget/ui/FieldEditorDefinePane.java b/designer/src/com/fr/design/widget/ui/FieldEditorDefinePane.java
index fb82682083..e5498adebe 100644
--- a/designer/src/com/fr/design/widget/ui/FieldEditorDefinePane.java
+++ b/designer/src/com/fr/design/widget/ui/FieldEditorDefinePane.java
@@ -1,20 +1,20 @@
 package com.fr.design.widget.ui;
 
-import java.awt.BorderLayout;
+import java.awt.*;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 
-import javax.swing.BorderFactory;
+import javax.swing.*;
 
 import com.fr.design.gui.ilable.UILabel;
 
-import javax.swing.JPanel;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.form.ui.FieldEditor;
 import com.fr.general.Inter;
 
@@ -23,6 +23,7 @@ public abstract class FieldEditorDefinePane<T extends FieldEditor> extends Abstr
     // richer:错误信息，是所有控件共有的属性，所以放到这里来
     private UITextField errorMsgTextField;
     private UITextField regErrorMsgTextField;
+    private JPanel validatePane;
 
     public FieldEditorDefinePane() {
         this.initComponents();
@@ -30,6 +31,7 @@ public abstract class FieldEditorDefinePane<T extends FieldEditor> extends Abstr
 
     protected void initComponents() {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
+        this.setBorder(BorderFactory.createEmptyBorder(0, 8, 0, 8));
         regErrorMsgTextField = new UITextField(16);
         regErrorMsgTextField.getDocument().addDocumentListener(new DocumentListener() {
             public void changedUpdate(DocumentEvent e) {
@@ -47,7 +49,7 @@ public abstract class FieldEditorDefinePane<T extends FieldEditor> extends Abstr
 
         //JPanel firstPanel = FRGUIPaneFactory.createBorderLayout_M_Pane();
         allowBlankCheckBox = new UICheckBox(Inter.getLocText("Allow_Blank"));
-
+        allowBlankCheckBox.setPreferredSize(new Dimension(75, 30));
         allowBlankCheckBox.addItemListener(new ItemListener() {
 
             @Override
@@ -58,8 +60,6 @@ public abstract class FieldEditorDefinePane<T extends FieldEditor> extends Abstr
 
         // 错误信息
         JPanel errorMsgPane = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane();
-        //目前只整改了文本、密码、文本域和数字四个控件
-        this.addAllowBlankPane(allowBlankCheckBox, errorMsgPane);
         errorMsgPane.add(new UILabel(Inter.getLocText(new String[]{"Error", "Tooltips"}) + ":"));
         errorMsgTextField = new UITextField(16);
         errorMsgPane.add(errorMsgTextField);
@@ -79,10 +79,11 @@ public abstract class FieldEditorDefinePane<T extends FieldEditor> extends Abstr
                 errorMsgTextField.setToolTipText(errorMsgTextField.getText());
             }
         });
+        this.addAllowBlankPane(allowBlankCheckBox);
         JPanel contentPane = this.setFirstContentPane();
         if (contentPane != null) {
             //contentPane.add(firstPanel);
-            this.add(contentPane, BorderLayout.CENTER);
+            this.add(contentPane, BorderLayout.NORTH);
         } else {
             //this.add(firstPanel, BorderLayout.CENTER);
         }
@@ -118,22 +119,21 @@ public abstract class FieldEditorDefinePane<T extends FieldEditor> extends Abstr
 
     }
 
-    public void addAllowBlankPane(UICheckBox allowBlankCheckBox, JPanel errorMsgPane) {
-        JPanel northPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
-        this.add(northPane, BorderLayout.NORTH);
-        JPanel firstPanel = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
-        firstPanel.setBorder(BorderFactory.createEmptyBorder(0, -2, 0, 0));
-        firstPanel.add(allowBlankCheckBox);
-        firstPanel.add(errorMsgPane);
-        northPane.add(firstPanel);
-    }
-
-    public UICheckBox getAllowBlankCheckBox() {
-        return allowBlankCheckBox;
+    public void addAllowBlankPane(UICheckBox allowBlankCheckBox) {
+        JPanel northPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Designer_Validate"));
+        validatePane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
+        validatePane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
+        northPane.add(validatePane);
+        this.add(northPane, BorderLayout.CENTER);
+        JPanel firstPane = GUICoreUtils.createFlowPane(new JComponent[]{allowBlankCheckBox}, FlowLayout.LEFT, 5);
+        validatePane.add(firstPane);
+        JPanel secondPane = GUICoreUtils.createFlowPane(new JComponent[]{new UILabel(Inter.getLocText(new String[]{"Error", "Tooltips"}) + ":"), errorMsgTextField}, FlowLayout.LEFT, 24);
+        secondPane.setPreferredSize(new Dimension(310, 23));
+        validatePane.add(secondPane);
     }
 
-    public UITextField getErrorMsgTextField() {
-        return errorMsgTextField;
+    public JPanel getValidatePane() {
+        return validatePane;
     }
 
     public UITextField getRegErrorMsgTextField() {
diff --git a/designer/src/com/fr/design/widget/ui/IframeEditorDefinePane.java b/designer/src/com/fr/design/widget/ui/IframeEditorDefinePane.java
index da3ef3138c..001f5d2e76 100644
--- a/designer/src/com/fr/design/widget/ui/IframeEditorDefinePane.java
+++ b/designer/src/com/fr/design/widget/ui/IframeEditorDefinePane.java
@@ -1,7 +1,6 @@
 package com.fr.design.widget.ui;
 
-import java.awt.BorderLayout;
-import java.awt.Dimension;
+import java.awt.*;
 import java.util.List;
 
 import javax.swing.BorderFactory;
@@ -18,6 +17,7 @@ import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.present.dict.DictionaryPane;
+import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.form.ui.IframeEditor;
 import com.fr.general.Inter;
 import com.fr.stable.ParameterProvider;
@@ -36,6 +36,7 @@ public class IframeEditorDefinePane extends AbstractDataModify<IframeEditor> {
 	
 	private void initComponents() {
 		this.setLayout(FRGUIPaneFactory.createBorderLayout());
+		this.setBorder(BorderFactory.createEmptyBorder(0, 8, 0, 8));
 		JPanel contentPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
 		contentPane.setBorder(BorderFactory.createEmptyBorder(0, 2, 0, 0));
 		JPanel attr = FRGUIPaneFactory.createNormalFlowInnerContainer_M_Pane();
@@ -51,9 +52,15 @@ public class IframeEditorDefinePane extends AbstractDataModify<IframeEditor> {
 				{ new UILabel(Inter.getLocText("Form-Url") + ":"), srcTextField = new UITextField() },
 				{ new UILabel(Inter.getLocText("Parameter") + ":"), parameterViewPane = new ReportletParameterViewPane() } };
 		parameterViewPane.setPreferredSize(new Dimension(400, 256));
-		JPanel centerPane = TableLayoutHelper.createTableLayoutPane(coms, rowSize, columnSize);
+		JPanel centerPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
+		centerPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
+		centerPane.add(GUICoreUtils.createFlowPane(new UILabel(Inter.getLocText("Form-Url") + ":"), srcTextField = new UITextField(16), FlowLayout.LEFT));
+		centerPane.add(GUICoreUtils.createFlowPane( new UILabel(Inter.getLocText("Parameter") + ":"), parameterViewPane = new ReportletParameterViewPane(), FlowLayout.LEFT));
+		parameterViewPane.setPreferredSize(new Dimension(540, 235));
+		JPanel advancedPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("Advanced"));
+		advancedPane.add(contentPane);
 		contentPane.add(centerPane);
-		this.add(contentPane, BorderLayout.CENTER);
+		this.add(advancedPane, BorderLayout.CENTER);
 	}
 
 
diff --git a/designer/src/com/fr/design/widget/ui/MultiFileEditorPane.java b/designer/src/com/fr/design/widget/ui/MultiFileEditorPane.java
index 7bf594a5d3..38da354307 100644
--- a/designer/src/com/fr/design/widget/ui/MultiFileEditorPane.java
+++ b/designer/src/com/fr/design/widget/ui/MultiFileEditorPane.java
@@ -1,16 +1,17 @@
 package com.fr.design.widget.ui;
 
-import java.awt.BorderLayout;
-import java.awt.Dimension;
+import java.awt.*;
 
 import com.fr.design.gui.ilable.UILabel;
-import javax.swing.JPanel;
+
+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.layout.FRGUIPaneFactory;
+import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.form.ui.MultiFileEditor;
 import com.fr.general.Inter;
 
@@ -32,7 +33,7 @@ public class MultiFileEditorPane extends FieldEditorDefinePane<MultiFileEditor>
 	@Override
 	protected JPanel setFirstContentPane() {
 		acceptType = new DictionaryComboBox(DictionaryConstants.acceptTypes, DictionaryConstants.fileTypeDisplays);
-		acceptType.setPreferredSize(new Dimension(400, 18));
+		acceptType.setPreferredSize(new Dimension(200, 18));
 		singleFileCheckBox = new UICheckBox(Inter.getLocText("SINGLE_FILE_UPLOAD"));
 		fileSizeField = new UINumberField();
 		fileSizeField.setPreferredSize(new Dimension(80, 18));
@@ -40,20 +41,22 @@ public class MultiFileEditorPane extends FieldEditorDefinePane<MultiFileEditor>
 		JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
 
 		JPanel singleFilePane = FRGUIPaneFactory.createNormalFlowInnerContainer_M_Pane();
+		singleFilePane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
 		singleFilePane.add(singleFileCheckBox);
-		centerPane.add(singleFilePane, BorderLayout.NORTH);
+		getValidatePane().add(GUICoreUtils.createFlowPane(new JComponent[]{singleFilePane}, FlowLayout.LEFT,0));
 
 		JPanel allowTypePane = FRGUIPaneFactory.createNormalFlowInnerContainer_M_Pane();
 		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);
-		centerPane.add(allowTypePane, BorderLayout.CENTER);
+		getValidatePane().add(GUICoreUtils.createFlowPane(new JComponent[]{allowTypePane}, FlowLayout.LEFT,5));
 
 		JPanel fileSizePane = FRGUIPaneFactory.createNormalFlowInnerContainer_M_Pane();
 		fileSizePane.add(new UILabel(" " + Inter.getLocText("File-File_Size_Limit") + ":"));
 		fileSizePane.add(fileSizeField);
 		fileSizePane.add(new UILabel(" KB"));
-		allowTypePane.add(fileSizePane);
+		getValidatePane().add(GUICoreUtils.createFlowPane(new JComponent[]{fileSizePane}, FlowLayout.LEFT,11));
 
 		return centerPane;
 	}
diff --git a/designer/src/com/fr/design/widget/ui/NumberEditorDefinePane.java b/designer/src/com/fr/design/widget/ui/NumberEditorDefinePane.java
index 85f09bb5b0..424e94e225 100644
--- a/designer/src/com/fr/design/widget/ui/NumberEditorDefinePane.java
+++ b/designer/src/com/fr/design/widget/ui/NumberEditorDefinePane.java
@@ -153,7 +153,7 @@ public class NumberEditorDefinePane extends FieldEditorDefinePane<NumberEditor>
     @Override
     protected JPanel setFirstContentPane() {
         JPanel content = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
-        content.setBorder(BorderFactory.createEmptyBorder(0, 8, 0, 8));
+        content.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
         content.setLayout(FRGUIPaneFactory.createBorderLayout());
         // richer:数字的允许直接编辑没有意义
 
@@ -162,25 +162,17 @@ public class NumberEditorDefinePane extends FieldEditorDefinePane<NumberEditor>
 
         waterMarkDictPane = new WaterMarkDictPane();
         northPane.add(waterMarkDictPane);
-        JPanel centerPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Designer_Validate"));
-        JPanel validatePane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
-        validatePane.setPreferredSize(new Dimension(400, 200));
-        centerPane.add(validatePane);
         content.add(northPane, BorderLayout.NORTH);
-        content.add(centerPane, BorderLayout.CENTER);
-        validatePane.add(GUICoreUtils.createFlowPane(getAllowBlankCheckBox(), FlowLayout.LEFT));
-        validatePane.add(GUICoreUtils.createFlowPane(new JComponent[]{new UILabel(Inter.getLocText(new String[]{"Error", "Tooltips"}) + ":"), getErrorMsgTextField()}, FlowLayout.LEFT, 24));
-
         this.allowDecimalsCheckBox = new UICheckBox(Inter.getLocText("Allow_Decimals"));
         this.decimalLength = new com.fr.design.editor.editor.IntegerEditor();
         this.decimalLength.setColumns(4);
         limitNumberPane = GUICoreUtils.createFlowPane(new JComponent[]{new UILabel(Inter.getLocText(new String[]{"Double", "Numbers"}) + ":"), this.decimalLength},
                 FlowLayout.LEFT, 4);
-        validatePane.add(GUICoreUtils.createFlowPane(new JComponent[]{this.allowDecimalsCheckBox, limitNumberPane}, FlowLayout.LEFT, 4));
+        getValidatePane().add(GUICoreUtils.createFlowPane(new JComponent[]{this.allowDecimalsCheckBox, limitNumberPane}, FlowLayout.LEFT, 4));
         this.allowDecimalsCheckBox.addActionListener(actionListener1);
 
         this.allowNegativeCheckBox = new UICheckBox(Inter.getLocText("Allow_Negative"));
-        validatePane.add(GUICoreUtils.createFlowPane(new JComponent[]{this.allowNegativeCheckBox}, FlowLayout.LEFT, 4));
+        getValidatePane().add(GUICoreUtils.createFlowPane(new JComponent[]{this.allowNegativeCheckBox}, FlowLayout.LEFT, 4));
         this.allowNegativeCheckBox.addActionListener(actionListener2);
 
         this.setMaxValueCheckBox = new UICheckBox(Inter.getLocText("Need_Max_Value"), false);
@@ -188,7 +180,7 @@ public class NumberEditorDefinePane extends FieldEditorDefinePane<NumberEditor>
         this.maxValueSpinner = new UIBasicSpinner(maxValueModel = new SpinnerNumberModel(0D, -Double.MAX_VALUE, Double.MAX_VALUE, 1D));
         maxValueSpinner.setPreferredSize(new Dimension(120, 20));
         setNotAllowsInvalid(this.maxValueSpinner);
-        validatePane.add(GUICoreUtils.createFlowPane(new JComponent[]{this.setMaxValueCheckBox, this.maxValueSpinner}, FlowLayout.LEFT, 4));
+        getValidatePane().add(GUICoreUtils.createFlowPane(new JComponent[]{this.setMaxValueCheckBox, this.maxValueSpinner}, FlowLayout.LEFT, 4));
         this.maxValueSpinner.setVisible(false);
         this.setMaxValueCheckBox.addActionListener(actionListener3);
         this.maxValueSpinner.addChangeListener(changeListener1);
@@ -197,11 +189,11 @@ public class NumberEditorDefinePane extends FieldEditorDefinePane<NumberEditor>
         this.minValueSpinner = new UIBasicSpinner(minValueModel = new SpinnerNumberModel(0D, -Double.MAX_VALUE, Double.MAX_VALUE, 1D));
         minValueSpinner.setPreferredSize(new Dimension(120, 20));
         setNotAllowsInvalid(this.minValueSpinner);
-        validatePane.add(GUICoreUtils.createFlowPane(new JComponent[]{this.setMinValueCheckBox, this.minValueSpinner}, FlowLayout.LEFT, 4));
+        getValidatePane().add(GUICoreUtils.createFlowPane(new JComponent[]{this.setMinValueCheckBox, this.minValueSpinner}, FlowLayout.LEFT, 4));
         this.minValueSpinner.setVisible(false);
         this.setMinValueCheckBox.addActionListener(actionListener4);
         this.minValueSpinner.addChangeListener(changeListener2);
-        validatePane.add(GUICoreUtils.createFlowPane(new JComponent[]{new UILabel(Inter.getLocText(new String[]{"Error", "Tooltips"}) + ":"), getRegErrorMsgTextField()}, FlowLayout.LEFT, 24));
+        getValidatePane().add(GUICoreUtils.createFlowPane(new JComponent[]{new UILabel(Inter.getLocText(new String[]{"Error", "Tooltips"}) + ":"), getRegErrorMsgTextField()}, FlowLayout.LEFT, 24));
 
         return content;
     }
@@ -295,8 +287,4 @@ public class NumberEditorDefinePane extends FieldEditorDefinePane<NumberEditor>
         }
     }
 
-    @Override
-    public void addAllowBlankPane(UICheckBox allowBlankCheckBox, JPanel errorMsgPane) {
-    }
-
 }
\ No newline at end of file
diff --git a/designer/src/com/fr/design/widget/ui/RadioGroupDefinePane.java b/designer/src/com/fr/design/widget/ui/RadioGroupDefinePane.java
index 15f22d6e14..1d5410f058 100644
--- a/designer/src/com/fr/design/widget/ui/RadioGroupDefinePane.java
+++ b/designer/src/com/fr/design/widget/ui/RadioGroupDefinePane.java
@@ -10,6 +10,7 @@ import com.fr.design.data.DataCreatorUI;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.present.dict.DictionaryPane;
 import com.fr.form.ui.RadioGroup;
+import com.fr.general.Inter;
 
 public class RadioGroupDefinePane extends FieldEditorDefinePane<RadioGroup> {
 	private DictionaryPane dictPane;
@@ -34,8 +35,10 @@ public class RadioGroupDefinePane extends FieldEditorDefinePane<RadioGroup> {
 		JPanel centerPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
 		buttonGroupDictPane = new ButtonGroupDictPane();
 		buttonGroupDictPane.setLayout(new FlowLayout(FlowLayout.LEFT, 5, 0));
+		JPanel advancedPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("Advanced"));
 		centerPane.add(buttonGroupDictPane);
-		attrPane.add(centerPane, BorderLayout.CENTER);
+		advancedPane.add(centerPane);
+		attrPane.add(advancedPane, BorderLayout.CENTER);
 		return attrPane;
 	}
 
diff --git a/designer/src/com/fr/design/widget/ui/TextFieldEditorDefinePane.java b/designer/src/com/fr/design/widget/ui/TextFieldEditorDefinePane.java
index 6055de0831..fa579d2464 100644
--- a/designer/src/com/fr/design/widget/ui/TextFieldEditorDefinePane.java
+++ b/designer/src/com/fr/design/widget/ui/TextFieldEditorDefinePane.java
@@ -1,7 +1,6 @@
 package com.fr.design.widget.ui;
 
 import com.fr.design.gui.frpane.RegPane;
-import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.utils.gui.GUICoreUtils;
@@ -28,10 +27,6 @@ public class TextFieldEditorDefinePane extends FieldEditorDefinePane<TextEditor>
     @Override
     protected JPanel setFirstContentPane() {
         JPanel attrPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        attrPane.setBorder(BorderFactory.createEmptyBorder(0, 4, 0, 4));
-        JPanel contenter = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        contenter.setBorder(BorderFactory.createEmptyBorder(0, 4, 0, 4));
-        attrPane.add(contenter);
         regPane = createRegPane();
         final RegPane.RegChangeListener rl = new RegPane.RegChangeListener() {
 
@@ -51,14 +46,8 @@ public class TextFieldEditorDefinePane extends FieldEditorDefinePane<TextEditor>
             }
         };
         regPane.addPhoneRegListener(pl);
-        JPanel basicPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Designer_Validate"));
-        JPanel validateContent = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
-        getAllowBlankCheckBox().setPreferredSize(new Dimension(444, 40));
-        validateContent.add(GUICoreUtils.createFlowPane(getAllowBlankCheckBox(), FlowLayout.LEFT));
-        validateContent.add(GUICoreUtils.createFlowPane(new JComponent[]{new UILabel(Inter.getLocText(new String[]{"Error", "Tooltips"}) + ":"), getErrorMsgTextField()}, FlowLayout.LEFT, 24));
-        validateContent.add(GUICoreUtils.createFlowPane(regPane, FlowLayout.LEFT));
-        validateContent.add(GUICoreUtils.createFlowPane(new JComponent[]{new UILabel(Inter.getLocText(new String[]{"Error", "Tooltips"}) + ":"), getRegErrorMsgTextField()}, FlowLayout.LEFT, 24));
-        basicPane.add(validateContent);
+        getValidatePane().add(GUICoreUtils.createFlowPane(regPane, FlowLayout.LEFT));
+        getValidatePane().add(GUICoreUtils.createFlowPane(new JComponent[]{new UILabel(Inter.getLocText(new String[]{"Error", "Tooltips"}) + ":"), getRegErrorMsgTextField()}, FlowLayout.LEFT, 24));
         JPanel advancedPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("Advanced"));
         waterMarkDictPane = new WaterMarkDictPane();
         waterMarkDictPane.addInputKeyListener(new KeyAdapter() {
@@ -81,8 +70,7 @@ public class TextFieldEditorDefinePane extends FieldEditorDefinePane<TextEditor>
             }
         });
         advancedPane.add(waterMarkDictPane);
-        contenter.add(advancedPane, BorderLayout.NORTH);
-        contenter.add(basicPane, BorderLayout.CENTER);
+        attrPane.add(advancedPane, BorderLayout.NORTH);
         return attrPane;
     }
 
@@ -116,9 +104,4 @@ public class TextFieldEditorDefinePane extends FieldEditorDefinePane<TextEditor>
         return new TextEditor();
     }
 
-    @Override
-    public void addAllowBlankPane(UICheckBox allowBlankCheckBox, JPanel errorMsgPane) {
-    }
-
-
 }
\ No newline at end of file
diff --git a/designer/src/com/fr/design/widget/ui/TreeEditorDefinePane.java b/designer/src/com/fr/design/widget/ui/TreeEditorDefinePane.java
index 3e21807774..60b2f1e40f 100644
--- a/designer/src/com/fr/design/widget/ui/TreeEditorDefinePane.java
+++ b/designer/src/com/fr/design/widget/ui/TreeEditorDefinePane.java
@@ -46,7 +46,9 @@ public class TreeEditorDefinePane extends FieldEditorDefinePane<TreeEditor> {
 	}
 
 	protected JPanel setSecondContentPane() {
+		JPanel advancedPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("Advanced"));
 		JPanel contentPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
+		advancedPane.add(contentPane);
 		contentPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
 		JPanel contenter = FRGUIPaneFactory.createMediumHGapFlowInnerContainer_M_Pane();
 		contentPane.add(contenter,BorderLayout.NORTH);
@@ -56,7 +58,7 @@ public class TreeEditorDefinePane extends FieldEditorDefinePane<TreeEditor> {
 		if (otherContentPane != null) {
 			contentPane.add(otherContentPane,BorderLayout.CENTER);
 		}
-		return contentPane;
+		return advancedPane;
 	}
 
 	protected JPanel setThirdContentPane() {
diff --git a/designer/src/com/fr/design/widget/ui/WritableRepeatEditorPane.java b/designer/src/com/fr/design/widget/ui/WritableRepeatEditorPane.java
index a12a7249f6..c13577393a 100644
--- a/designer/src/com/fr/design/widget/ui/WritableRepeatEditorPane.java
+++ b/designer/src/com/fr/design/widget/ui/WritableRepeatEditorPane.java
@@ -17,8 +17,6 @@ public abstract class WritableRepeatEditorPane<E extends WriteAbleRepeatEditor>
 	protected JPanel setSecondContentPane() {
 		JPanel contentPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
 		contentPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
-		JPanel contenter = FRGUIPaneFactory.createMediumHGapFlowInnerContainer_M_Pane();
-		contentPane.add(contenter,BorderLayout.NORTH);
 		JPanel otherContentPane = this.setThirdContentPane();
 		if (otherContentPane != null) {
 			contentPane.add(otherContentPane,BorderLayout.CENTER);
diff --git a/designer/src/com/fr/design/widget/ui/WriteUnableRepeatEditorPane.java b/designer/src/com/fr/design/widget/ui/WriteUnableRepeatEditorPane.java
index 633572e0fc..dcc13e44f4 100644
--- a/designer/src/com/fr/design/widget/ui/WriteUnableRepeatEditorPane.java
+++ b/designer/src/com/fr/design/widget/ui/WriteUnableRepeatEditorPane.java
@@ -20,7 +20,9 @@ public abstract class WriteUnableRepeatEditorPane<E extends WriteUnableRepeatEdi
 	
 	@Override
 	protected JPanel setFirstContentPane() {
+		JPanel advancedPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("Advanced"));
 		JPanel contentPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
+		advancedPane.add(contentPane);
 		contentPane.setBorder(BorderFactory.createEmptyBorder(0, 2, 0, 0));
 		JPanel contenter=FRGUIPaneFactory.createMediumHGapFlowInnerContainer_M_Pane();
 		removeRepeatCheckBox = new UICheckBox(Inter.getLocText("Form-Remove_Repeat_Data"), false);
@@ -29,7 +31,7 @@ public abstract class WriteUnableRepeatEditorPane<E extends WriteUnableRepeatEdi
 		JPanel otherContentPane = this.setThirdContentPane();
 		if (otherContentPane != null)
 			contentPane.add(otherContentPane,BorderLayout.CENTER);
-		return contentPane;
+		return advancedPane;
 	}
 	protected abstract JPanel setThirdContentPane();
 	@Override
diff --git a/designer/src/com/fr/design/widget/ui/btn/TreeNodeToogleButtonDefinePane.java b/designer/src/com/fr/design/widget/ui/btn/TreeNodeToogleButtonDefinePane.java
index 24d8841dc2..b275695d5d 100644
--- a/designer/src/com/fr/design/widget/ui/btn/TreeNodeToogleButtonDefinePane.java
+++ b/designer/src/com/fr/design/widget/ui/btn/TreeNodeToogleButtonDefinePane.java
@@ -29,12 +29,14 @@ public class TreeNodeToogleButtonDefinePane<T extends TreeNodeToggleButton> exte
         setLayout(FRGUIPaneFactory.createBorderLayout());
         double p = TableLayout.PREFERRED;
         double rowSize[] = {p};
-        double columnSize[] = {p, 300};
+        double columnSize[] = {p, 184};
         Component[][] n_components = {
                 {new UILabel(Inter.getLocText(new String[]{"Form-Button", "Type"}) + ":"), createButtonTypeComboBox()}
         };
         JPanel northPane = TableLayoutHelper.createTableLayoutPane(n_components, rowSize, columnSize);
-        add(northPane, BorderLayout.CENTER);
+        JPanel advancedPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("Advanced"));
+        advancedPane.add(northPane);
+        add(advancedPane, BorderLayout.CENTER);
     }
 
     @Override
diff --git a/designer_base/src/com/fr/design/widget/btn/ButtonWithHotkeysDetailPane.java b/designer_base/src/com/fr/design/widget/btn/ButtonWithHotkeysDetailPane.java
index 6391280917..d975f28294 100644
--- a/designer_base/src/com/fr/design/widget/btn/ButtonWithHotkeysDetailPane.java
+++ b/designer_base/src/com/fr/design/widget/btn/ButtonWithHotkeysDetailPane.java
@@ -1,9 +1,8 @@
 package com.fr.design.widget.btn;
 
-import java.awt.BorderLayout;
-import java.awt.Component;
+import java.awt.*;
 
-import javax.swing.JPanel;
+import javax.swing.*;
 
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itextfield.UITextField;
@@ -32,7 +31,11 @@ public abstract class ButtonWithHotkeysDetailPane<T extends Button> extends Butt
     }
 
 	private void initComponents() {
-		this.setLayout(new BorderLayout());
+        JPanel advancedPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("Advanced"));
+        advancedPane.setPreferredSize(new Dimension(600,300));
+        JPanel attrPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        attrPane.setBorder(BorderFactory.createEmptyBorder(0, 4, 0, 4));
+        this.add(advancedPane);
 		double p = TableLayout.PREFERRED;
         double rowSize[] = {p, p, p, p};
         double columnSize[] = {p, p};
@@ -40,17 +43,17 @@ public abstract class ButtonWithHotkeysDetailPane<T extends Button> extends Butt
 		iconPane = new IconDefinePane();
         labelPane.add(iconPane);
     	Component[][] n_components = {
-        		{new UILabel(Inter.getLocText("FR-Designer_Button-Name") + ":"), buttonNameTextField = new UITextField(20)},
+        		{new UILabel(Inter.getLocText("FR-Designer_Button-Name") + ":"), buttonNameTextField = new UITextField(16)},
         		{new UILabel(Inter.getLocText("FR-Designer_Button-Icon") + ":"), labelPane},
         		{new UILabel(Inter.getLocText("FR-Designer_Button-Type") + ":"), createButtonTypeComboBox()},
-        		{new UILabel(Inter.getLocText("FR-Designer_Button-Hotkeys") + ":"), hotkeysTextField = new UITextField(40)}
+        		{new UILabel(Inter.getLocText("FR-Designer_Button-Hotkeys") + ":"), hotkeysTextField = new UITextField(16)}
         };
     	hotkeysTextField.setToolTipText(StableUtils.join(ButtonConstants.HOTKEYS, ","));
-		JPanel panel = TableLayoutHelper.createGapTableLayoutPane(n_components, rowSize, columnSize, 0, 4);
-		add(panel,BorderLayout.NORTH);
+		JPanel panel = TableLayoutHelper.createGapTableLayoutPane(n_components, rowSize, columnSize, 0, 8);
+		advancedPane.add(panel,BorderLayout.NORTH);
 		Component comp = createCenterPane();
 		if(comp != null	) {
-			add(comp,BorderLayout.CENTER);
+			advancedPane.add(comp,BorderLayout.CENTER);
 		}
 	}
 
diff --git a/designer_form/src/com/fr/design/designer/creator/XPassword.java b/designer_form/src/com/fr/design/designer/creator/XPassword.java
index b42c171f0f..f4c882afb7 100644
--- a/designer_form/src/com/fr/design/designer/creator/XPassword.java
+++ b/designer_form/src/com/fr/design/designer/creator/XPassword.java
@@ -14,8 +14,11 @@ import com.fr.design.mainframe.widget.editors.RegexEditor;
 import com.fr.design.mainframe.widget.editors.WidgetValueEditor;
 import com.fr.design.mainframe.widget.renderer.RegexCellRencerer;
 import com.fr.form.ui.Password;
+import com.fr.form.ui.TextEditor;
+import com.fr.form.ui.reg.RegExp;
 import com.fr.general.Inter;
 import com.fr.stable.ArrayUtils;
+import com.fr.stable.StringUtils;
 
 /**
  * @author richer
@@ -26,7 +29,7 @@ public class XPassword extends XWrapperedFieldEditor {
     public XPassword(Password widget, Dimension initSize) {
         super(widget, initSize);
     }
-    
+
     @Override
     protected JComponent initEditor() {
         if (editor == null) {
@@ -39,31 +42,38 @@ public class XPassword extends XWrapperedFieldEditor {
     protected String getIconName() {
         return "password_field_16.png";
     }
-    
+
     /**
      * 控件的属性列表
+     *
      * @return 此控件所用的属性列表
      * @throws IntrospectionException 异常
      */
-	@Override
-	public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
-		CRPropertyDescriptor[] sup = (CRPropertyDescriptor[]) ArrayUtils.addAll(
-				new CRPropertyDescriptor[] {
-						new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName(
-								Inter.getLocText(new String[]{"Widget", "Value"})).setEditorClass(
-								WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")}
-							, super.supportedDescriptor());
-		return (CRPropertyDescriptor[]) ArrayUtils.addAll(sup,
-				new CRPropertyDescriptor[] {
-						new CRPropertyDescriptor("regex", this.data.getClass())
-								.setI18NName(Inter.getLocText("FR-Designer_Input_Rule"))
-								.setEditorClass(RegexEditor.RegexEditor4TextArea.class)
-								.putKeyValue("renderer", RegexCellRencerer.class)
-								.putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"),
-						new CRPropertyDescriptor("waterMark", this.data.getClass())
-								.setI18NName(Inter.getLocText("FR-Designer_WaterMark"))
-								.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")
-				});
-	}
-	
+    @Override
+    public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
+        CRPropertyDescriptor[] sup = (CRPropertyDescriptor[]) ArrayUtils.addAll(
+                new CRPropertyDescriptor[]{
+                        new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName(
+                                Inter.getLocText(new String[]{"Widget", "Value"})).setEditorClass(
+                                WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")}
+                , super.supportedDescriptor());
+        CRPropertyDescriptor regex = new CRPropertyDescriptor("regex", this.data.getClass())
+                .setI18NName(Inter.getLocText("FR-Designer_Input_Rule"))
+                .setEditorClass(RegexEditor.RegexEditor4TextArea.class)
+                .putKeyValue("renderer", RegexCellRencerer.class)
+                .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate");
+        CRPropertyDescriptor regErrorMessage = new CRPropertyDescriptor("regErrorMessage", this.data.getClass()).setI18NName(
+                Inter.getLocText("Verify-Message")).putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate");
+        CRPropertyDescriptor waterMark = new CRPropertyDescriptor("waterMark", this.data.getClass())
+                .setI18NName(Inter.getLocText("FR-Designer_WaterMark"))
+                .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced");
+        Boolean displayRegField = true;
+        RegExp reg = ((TextEditor) toData()).getRegex();
+        if (reg == null || !StringUtils.isNotEmpty(reg.toRegText())) {
+            displayRegField = false;
+        }
+        return displayRegField ? (CRPropertyDescriptor[]) ArrayUtils.addAll(sup, new CRPropertyDescriptor[]{regex, regErrorMessage, waterMark}) :
+                (CRPropertyDescriptor[]) ArrayUtils.addAll(sup, new CRPropertyDescriptor[]{regex, waterMark});
+    }
+
 }
\ No newline at end of file
diff --git a/designer_form/src/com/fr/design/designer/creator/XTextArea.java b/designer_form/src/com/fr/design/designer/creator/XTextArea.java
index d91bb97bd9..3c711d4deb 100644
--- a/designer_form/src/com/fr/design/designer/creator/XTextArea.java
+++ b/designer_form/src/com/fr/design/designer/creator/XTextArea.java
@@ -19,10 +19,13 @@ import com.fr.design.mainframe.widget.editors.WidgetValueEditor;
 import com.fr.design.mainframe.widget.renderer.RegexCellRencerer;
 import com.fr.form.ui.TextArea;
 import com.fr.design.form.util.XCreatorConstants;
+import com.fr.form.ui.TextEditor;
+import com.fr.form.ui.reg.RegExp;
 import com.fr.general.FRFont;
 import com.fr.general.Inter;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.Constants;
+import com.fr.stable.StringUtils;
 
 /**
  * @author richer
@@ -34,42 +37,49 @@ public class XTextArea extends XFieldEditor {
         super(widget, initSize);
     }
 
-	@Override
-	public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
-		CRPropertyDescriptor[] sup=(CRPropertyDescriptor[]) ArrayUtils.addAll(
-				new CRPropertyDescriptor[] {
-				new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName(
-						Inter.getLocText(new String[]{"Widget", "Value"})).setEditorClass(
-						WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")},super.supportedDescriptor());
-		return (CRPropertyDescriptor[]) ArrayUtils.addAll(sup,
-				new CRPropertyDescriptor[] {
-						new CRPropertyDescriptor("regex", this.data.getClass()).setI18NName(
-								Inter.getLocText("Input_Rule")).setEditorClass(RegexEditor.RegexEditor4TextArea.class)
-								.putKeyValue("renderer", RegexCellRencerer.class).putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"),
-						new CRPropertyDescriptor("waterMark", this.data.getClass()).setI18NName(
-								Inter.getLocText("WaterMark")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY,
-								"Advanced"), });
-	}
-	
-	@Override
-	protected void paintComponent(Graphics g) {
-		super.paintComponent(g);
-		TextArea area = (TextArea) data;
-		if (area.getWidgetValue() != null) {
-			Graphics2D g2d = (Graphics2D) g.create();
-			BaseUtils.drawStringStyleInRotation(g2d, this.getWidth(), this.getHeight(), area.getWidgetValue()
-					.toString(), Style.getInstance(FRFont.getInstance()).deriveHorizontalAlignment(Constants.LEFT)
-					.deriveVerticalAlignment(SwingConstants.TOP)
-					.deriveTextStyle(Style.TEXTSTYLE_WRAPTEXT), ScreenResolution.getScreenResolution());
-		}
-	}
+    @Override
+    public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
+        CRPropertyDescriptor[] sup = (CRPropertyDescriptor[]) ArrayUtils.addAll(
+                new CRPropertyDescriptor[]{
+                        new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName(
+                                Inter.getLocText(new String[]{"Widget", "Value"})).setEditorClass(
+                                WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")}, super.supportedDescriptor());
+        CRPropertyDescriptor regex = new CRPropertyDescriptor("regex", this.data.getClass()).setI18NName(
+                Inter.getLocText("Input_Rule")).setEditorClass(RegexEditor.RegexEditor4TextArea.class)
+                .putKeyValue("renderer", RegexCellRencerer.class).putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate");
+        CRPropertyDescriptor regErrorMessage = new CRPropertyDescriptor("regErrorMessage", this.data.getClass()).setI18NName(
+                Inter.getLocText("Verify-Message")).putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate");
+        CRPropertyDescriptor waterMark = new CRPropertyDescriptor("waterMark", this.data.getClass()).setI18NName(
+                Inter.getLocText("WaterMark")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY,
+                "Advanced");
+        Boolean displayRegField = true;
+        RegExp reg = ((TextEditor) toData()).getRegex();
+        if (reg == null || !StringUtils.isNotEmpty(reg.toRegText())) {
+            displayRegField = false;
+        }
+        return displayRegField ? (CRPropertyDescriptor[]) ArrayUtils.addAll(sup, new CRPropertyDescriptor[]{regex, regErrorMessage, waterMark}) :
+                (CRPropertyDescriptor[]) ArrayUtils.addAll(sup, new CRPropertyDescriptor[]{regex, waterMark});
+    }
+
+    @Override
+    protected void paintComponent(Graphics g) {
+        super.paintComponent(g);
+        TextArea area = (TextArea) data;
+        if (area.getWidgetValue() != null) {
+            Graphics2D g2d = (Graphics2D) g.create();
+            BaseUtils.drawStringStyleInRotation(g2d, this.getWidth(), this.getHeight(), area.getWidgetValue()
+                    .toString(), Style.getInstance(FRFont.getInstance()).deriveHorizontalAlignment(Constants.LEFT)
+                    .deriveVerticalAlignment(SwingConstants.TOP)
+                    .deriveTextStyle(Style.TEXTSTYLE_WRAPTEXT), ScreenResolution.getScreenResolution());
+        }
+    }
 
     @Override
     protected JComponent initEditor() {
-    	setBorder(FIELDBORDER);
+        setBorder(FIELDBORDER);
         return this;
     }
-    
+
     @Override
     public Dimension initEditorSize() {
         return BIG_PREFERRED_SIZE;

From e0f10af32b636ed98f322d38a823fa1ac29b0141 Mon Sep 17 00:00:00 2001
From: kerry <kerry@finereport.com>
Date: Fri, 5 Aug 2016 12:15:50 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=85=B6=E4=BD=99=E6=8E=A7=E4=BB=B6=E6=95=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/widget/ui/CheckBoxDefinePane.java  | 10 -----
 .../widget/ui/CheckBoxGroupDefinePane.java    |  7 ----
 .../widget/ui/DateEditorDefinePane.java       | 40 -------------------
 .../design/designer/creator/XFieldEditor.java | 12 ++++++
 .../fr/design/designer/creator/XPassword.java |  8 +---
 .../fr/design/designer/creator/XTextArea.java |  8 +---
 .../design/designer/creator/XTextEditor.java  |  8 +---
 7 files changed, 15 insertions(+), 78 deletions(-)

diff --git a/designer/src/com/fr/design/widget/ui/CheckBoxDefinePane.java b/designer/src/com/fr/design/widget/ui/CheckBoxDefinePane.java
index 5849bf0f6b..3032e7e5cb 100644
--- a/designer/src/com/fr/design/widget/ui/CheckBoxDefinePane.java
+++ b/designer/src/com/fr/design/widget/ui/CheckBoxDefinePane.java
@@ -21,16 +21,6 @@ public class CheckBoxDefinePane extends AbstractDataModify<CheckBox> {
 	}
 	
 	private void iniComoponents() {
-//		this.setLayout(FRGUIPaneFactory.createBorderLayout());
-//
-//		UILabel infoLabel = new UILabel();
-//        FRFont frFont = FRContext.getDefaultValues().getFRFont();
-//        infoLabel.setFont(new Font(frFont.getFamily(), Font.BOLD, 24));
-//	    infoLabel.setText(Inter.getLocText(
-//				"No_Editor_Property_Definition") + ".");
-//	    infoLabel.setHorizontalAlignment(SwingConstants.CENTER);
-//
-//		this.add(infoLabel, BorderLayout.CENTER);
 		this.setLayout(FRGUIPaneFactory.createBorderLayout());
 		this.setBorder(BorderFactory.createEmptyBorder(0, 8, 0, 8));
 		JPanel textPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
diff --git a/designer/src/com/fr/design/widget/ui/CheckBoxGroupDefinePane.java b/designer/src/com/fr/design/widget/ui/CheckBoxGroupDefinePane.java
index 56401e00f3..a20e3cfa0f 100644
--- a/designer/src/com/fr/design/widget/ui/CheckBoxGroupDefinePane.java
+++ b/designer/src/com/fr/design/widget/ui/CheckBoxGroupDefinePane.java
@@ -43,13 +43,6 @@ public class CheckBoxGroupDefinePane extends FieldEditorDefinePane<CheckBoxGroup
 		attrPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
 		JPanel advancedPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("Advanced"));
 		advancedPane.add(attrPane);
-//		JPanel northPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
-//		checkBoxDictPane = new CheckBoxDictPane();
-//		northPane.add(checkBoxDictPane);
-//		checkbox = new UICheckBox(Inter.getLocText(new String[]{"Provide", "Choose_All"}));
-//		northPane.add(checkbox);
-//		attrPane.add(northPane, BorderLayout.NORTH);
-
 		JPanel northPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
 		northPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
 		checkBoxDictPane = new CheckBoxDictPane();
diff --git a/designer/src/com/fr/design/widget/ui/DateEditorDefinePane.java b/designer/src/com/fr/design/widget/ui/DateEditorDefinePane.java
index 7ad0c411c9..4751dc7815 100644
--- a/designer/src/com/fr/design/widget/ui/DateEditorDefinePane.java
+++ b/designer/src/com/fr/design/widget/ui/DateEditorDefinePane.java
@@ -36,8 +36,6 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane<DateEditor
 	private UILabel sampleLabel;// preview
 	// content
 	private UITextField patternTextField = null;
-//	private JList patternList = null;
-
 	private ValueEditorPane startDv;
 	private ValueEditorPane endDv;
 
@@ -68,9 +66,6 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane<DateEditor
 		otherContentPane.add(firstPanel);
 
 		// sample pane
-//		JPanel samplePane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("StyleFormat-Sample"));
-//		otherContentPane.add(samplePane, BorderLayout.NORTH);
-
 		sampleLabel = new UILabel("");
 //		samplePane.add(sampleLabel, BorderLayout.CENTER);
 		sampleLabel.setBorder(BorderFactory.createEmptyBorder(2, 4, 4, 4));
@@ -78,26 +73,10 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane<DateEditor
 		sampleLabel.setFont(FRContext.getDefaultValues().getFRFont());
 
 		// content pane
-//		JPanel contentPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-//		contentPane.setPreferredSize(new Dimension(400,100));
-//		otherContentPane.add(contentPane, BorderLayout.CENTER);
-//		contentPane.setBorder(BorderFactory.createEmptyBorder(4, 0, 2, 0));
-
 		patternTextField = new UITextField();
-//		contentPane.add(patternTextField, BorderLayout.NORTH);
 		patternTextField.getDocument().addDocumentListener(patternTextDocumentListener);
 
-//		patternList = new JList(new DefaultListModel());
-//		DefaultListModel model = (DefaultListModel) patternList.getModel();
-//		model.removeAllElements();
         String[] arr = getDateFormateArray();
-//		for (int i = 0; i < arr.length; i++) {
-//			model.addElement(arr[i]);
-//		}
-//		JScrollPane pScrollPane = new JScrollPane(patternList);
-//		pScrollPane.setPreferredSize(new Dimension(100, 120));
-//		contentPane.add(pScrollPane, BorderLayout.CENTER);
-
 		UIComboBox comboBox = new UIComboBox(arr);
 		comboBox.setPreferredSize(new Dimension(150,20));
 		comboBox.addActionListener(new ActionListener(){
@@ -109,7 +88,6 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane<DateEditor
 		JPanel secondPanel = GUICoreUtils.createFlowPane(new JComponent[]{new UILabel(Inter.getLocText("FR-Engine_Format") + ":"),comboBox,sampleLabel}, FlowLayout.LEFT, 5);
 		secondPanel.setPreferredSize(new Dimension(220,30));
 		otherContentPane.add(secondPanel);
-//		patternList.addListSelectionListener(patternListSelectionListener);
 		otherContentPane.add(initStartEndDatePane(), BorderLayout.SOUTH);
 		return otherContentPane;
 	}
@@ -166,12 +144,6 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane<DateEditor
 		}
 	}
 
-//	private ListSelectionListener patternListSelectionListener = new ListSelectionListener() {
-//		public void valueChanged(ListSelectionEvent evt) {
-//			patternTextField.setText((String) patternList.getSelectedValue());
-//		}
-//	};
-
 	@Override
 	protected void populateSubDirectWriteEditorBean(DateEditor e) {
 		String formatText = e.getFormatText();
@@ -180,18 +152,6 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane<DateEditor
 		returnTypeComboBox.setSelectedIndex(e.isReturnDate() ? 1 : 0);
 
 		populateStartEnd(e);
-
-//		DefaultListModel patternModel = (DefaultListModel) patternList.getModel();
-//		if ((formatText == null || formatText.length() <= 0)) {
-//			patternList.setSelectedIndex(0);
-//		} else {
-//			for (int i = 0; i < patternModel.size(); i++) {
-//				if (ComparatorUtils.equals(patternModel.getElementAt(i).toString(), formatText)) {
-//					patternList.setSelectedIndex(i);
-//					return;
-//				}
-//			}
-//		}
 	};
 
 	@Override
diff --git a/designer_form/src/com/fr/design/designer/creator/XFieldEditor.java b/designer_form/src/com/fr/design/designer/creator/XFieldEditor.java
index 4cd6b57f99..fd363311c5 100644
--- a/designer_form/src/com/fr/design/designer/creator/XFieldEditor.java
+++ b/designer_form/src/com/fr/design/designer/creator/XFieldEditor.java
@@ -13,8 +13,11 @@ import javax.swing.border.Border;
 import com.fr.design.mainframe.widget.editors.InChangeBooleanEditor;
 import com.fr.form.ui.FieldEditor;
 import com.fr.design.form.util.XCreatorConstants;
+import com.fr.form.ui.TextEditor;
+import com.fr.form.ui.reg.RegExp;
 import com.fr.general.Inter;
 import com.fr.stable.ArrayUtils;
+import com.fr.stable.StringUtils;
 
 /**
  * @author richer
@@ -49,4 +52,13 @@ public abstract class XFieldEditor extends XWidgetCreator {
                 new CRPropertyDescriptor[]{allowBlank, blankErrorMsg, fontSize}
                 : new CRPropertyDescriptor[]{allowBlank, fontSize};
     }
+
+    public Boolean isDisplayRegField(Boolean displayRegField) {
+        RegExp reg = ((TextEditor) toData()).getRegex();
+        if (reg == null || !StringUtils.isNotEmpty(reg.toRegText())) {
+
+            displayRegField = false;
+        }
+        return displayRegField;
+    }
 }
\ No newline at end of file
diff --git a/designer_form/src/com/fr/design/designer/creator/XPassword.java b/designer_form/src/com/fr/design/designer/creator/XPassword.java
index f4c882afb7..cfa630358b 100644
--- a/designer_form/src/com/fr/design/designer/creator/XPassword.java
+++ b/designer_form/src/com/fr/design/designer/creator/XPassword.java
@@ -14,11 +14,8 @@ import com.fr.design.mainframe.widget.editors.RegexEditor;
 import com.fr.design.mainframe.widget.editors.WidgetValueEditor;
 import com.fr.design.mainframe.widget.renderer.RegexCellRencerer;
 import com.fr.form.ui.Password;
-import com.fr.form.ui.TextEditor;
-import com.fr.form.ui.reg.RegExp;
 import com.fr.general.Inter;
 import com.fr.stable.ArrayUtils;
-import com.fr.stable.StringUtils;
 
 /**
  * @author richer
@@ -68,10 +65,7 @@ public class XPassword extends XWrapperedFieldEditor {
                 .setI18NName(Inter.getLocText("FR-Designer_WaterMark"))
                 .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced");
         Boolean displayRegField = true;
-        RegExp reg = ((TextEditor) toData()).getRegex();
-        if (reg == null || !StringUtils.isNotEmpty(reg.toRegText())) {
-            displayRegField = false;
-        }
+        displayRegField = isDisplayRegField(displayRegField);
         return displayRegField ? (CRPropertyDescriptor[]) ArrayUtils.addAll(sup, new CRPropertyDescriptor[]{regex, regErrorMessage, waterMark}) :
                 (CRPropertyDescriptor[]) ArrayUtils.addAll(sup, new CRPropertyDescriptor[]{regex, waterMark});
     }
diff --git a/designer_form/src/com/fr/design/designer/creator/XTextArea.java b/designer_form/src/com/fr/design/designer/creator/XTextArea.java
index 3c711d4deb..8622bb5add 100644
--- a/designer_form/src/com/fr/design/designer/creator/XTextArea.java
+++ b/designer_form/src/com/fr/design/designer/creator/XTextArea.java
@@ -19,13 +19,10 @@ import com.fr.design.mainframe.widget.editors.WidgetValueEditor;
 import com.fr.design.mainframe.widget.renderer.RegexCellRencerer;
 import com.fr.form.ui.TextArea;
 import com.fr.design.form.util.XCreatorConstants;
-import com.fr.form.ui.TextEditor;
-import com.fr.form.ui.reg.RegExp;
 import com.fr.general.FRFont;
 import com.fr.general.Inter;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.Constants;
-import com.fr.stable.StringUtils;
 
 /**
  * @author richer
@@ -53,10 +50,7 @@ public class XTextArea extends XFieldEditor {
                 Inter.getLocText("WaterMark")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY,
                 "Advanced");
         Boolean displayRegField = true;
-        RegExp reg = ((TextEditor) toData()).getRegex();
-        if (reg == null || !StringUtils.isNotEmpty(reg.toRegText())) {
-            displayRegField = false;
-        }
+        displayRegField = isDisplayRegField(displayRegField);
         return displayRegField ? (CRPropertyDescriptor[]) ArrayUtils.addAll(sup, new CRPropertyDescriptor[]{regex, regErrorMessage, waterMark}) :
                 (CRPropertyDescriptor[]) ArrayUtils.addAll(sup, new CRPropertyDescriptor[]{regex, waterMark});
     }
diff --git a/designer_form/src/com/fr/design/designer/creator/XTextEditor.java b/designer_form/src/com/fr/design/designer/creator/XTextEditor.java
index ee0f4d03c4..a13e1b0059 100644
--- a/designer_form/src/com/fr/design/designer/creator/XTextEditor.java
+++ b/designer_form/src/com/fr/design/designer/creator/XTextEditor.java
@@ -18,12 +18,10 @@ import com.fr.design.mainframe.widget.editors.RegexEditor;
 import com.fr.design.mainframe.widget.editors.WidgetValueEditor;
 import com.fr.design.mainframe.widget.renderer.RegexCellRencerer;
 import com.fr.form.ui.TextEditor;
-import com.fr.form.ui.reg.RegExp;
 import com.fr.general.FRFont;
 import com.fr.general.Inter;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.Constants;
-import com.fr.stable.StringUtils;
 
 /**
  * @author richer
@@ -56,11 +54,7 @@ public class XTextEditor extends XWrapperedFieldEditor {
                 "Advanced");
         CRPropertyDescriptor[] sup = (CRPropertyDescriptor[]) ArrayUtils.addAll(new CRPropertyDescriptor[]{widgetValue}, super.supportedDescriptor());
         Boolean displayRegField = true;
-        RegExp reg = ((TextEditor) toData()).getRegex();
-        if (reg == null || !StringUtils.isNotEmpty(reg.toRegText())) {
-
-            displayRegField = false;
-        }
+        displayRegField = isDisplayRegField(displayRegField);
         return displayRegField ? (CRPropertyDescriptor[]) ArrayUtils.addAll(sup,
                 new CRPropertyDescriptor[]{regex, regErrorMessage, waterMark}) :
                 (CRPropertyDescriptor[]) ArrayUtils.addAll(sup, new CRPropertyDescriptor[]{regex, waterMark});

From 2bed1df3f79237c67577b447e4a3b06ee9da08fd Mon Sep 17 00:00:00 2001
From: kerry <kerry@finereport.com>
Date: Fri, 5 Aug 2016 15:23:00 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E5=89=A9=E4=BD=99=E6=8E=A7=E4=BB=B6=E6=95=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/com/fr/design/widget/ui/CheckBoxGroupDefinePane.java  | 2 +-
 .../src/com/fr/design/widget/ui/DateEditorDefinePane.java     | 4 ----
 .../com/fr/design/widget/ui/DirectWriteEditorDefinePane.java  | 2 +-
 .../src/com/fr/design/widget/ui/IframeEditorDefinePane.java   | 2 +-
 .../src/com/fr/design/widget/ui/NumberEditorDefinePane.java   | 2 +-
 .../src/com/fr/design/widget/ui/RadioGroupDefinePane.java     | 2 +-
 .../com/fr/design/widget/ui/TextFieldEditorDefinePane.java    | 2 +-
 .../src/com/fr/design/widget/ui/TreeEditorDefinePane.java     | 2 +-
 .../com/fr/design/widget/ui/WriteUnableRepeatEditorPane.java  | 2 +-
 .../design/widget/ui/btn/TreeNodeToogleButtonDefinePane.java  | 2 +-
 .../com/fr/design/widget/btn/ButtonWithHotkeysDetailPane.java | 2 +-
 .../src/com/fr/design/designer/creator/XFieldEditor.java      | 2 +-
 .../src/com/fr/design/designer/creator/XPassword.java         | 2 +-
 .../src/com/fr/design/designer/creator/XTextArea.java         | 2 +-
 .../src/com/fr/design/designer/creator/XTextEditor.java       | 2 +-
 .../src/com/fr/design/form/util/XCreatorConstants.java        | 2 +-
 16 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/designer/src/com/fr/design/widget/ui/CheckBoxGroupDefinePane.java b/designer/src/com/fr/design/widget/ui/CheckBoxGroupDefinePane.java
index a20e3cfa0f..e625c2490a 100644
--- a/designer/src/com/fr/design/widget/ui/CheckBoxGroupDefinePane.java
+++ b/designer/src/com/fr/design/widget/ui/CheckBoxGroupDefinePane.java
@@ -41,7 +41,7 @@ public class CheckBoxGroupDefinePane extends FieldEditorDefinePane<CheckBoxGroup
 	protected JPanel setFirstContentPane() {
 		JPanel attrPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
 		attrPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
-		JPanel advancedPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("Advanced"));
+		JPanel advancedPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Designer_Advanced"));
 		advancedPane.add(attrPane);
 		JPanel northPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
 		northPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
diff --git a/designer/src/com/fr/design/widget/ui/DateEditorDefinePane.java b/designer/src/com/fr/design/widget/ui/DateEditorDefinePane.java
index 4751dc7815..bb6c116e77 100644
--- a/designer/src/com/fr/design/widget/ui/DateEditorDefinePane.java
+++ b/designer/src/com/fr/design/widget/ui/DateEditorDefinePane.java
@@ -10,9 +10,7 @@ import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.editor.ValueEditorPane;
 import com.fr.design.editor.ValueEditorPaneFactory;
 import com.fr.design.utils.gui.GUICoreUtils;
-import com.fr.form.ui.ComboBox;
 import com.fr.form.ui.DateEditor;
-import com.fr.general.ComparatorUtils;
 import com.fr.general.DateUtils;
 import com.fr.general.Inter;
 import com.fr.script.Calculator;
@@ -23,8 +21,6 @@ import com.fr.stable.UtilEvalError;
 import javax.swing.*;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
diff --git a/designer/src/com/fr/design/widget/ui/DirectWriteEditorDefinePane.java b/designer/src/com/fr/design/widget/ui/DirectWriteEditorDefinePane.java
index bee4df92e3..d97bae7f25 100644
--- a/designer/src/com/fr/design/widget/ui/DirectWriteEditorDefinePane.java
+++ b/designer/src/com/fr/design/widget/ui/DirectWriteEditorDefinePane.java
@@ -26,7 +26,7 @@ public abstract class DirectWriteEditorDefinePane<T extends DirectWriteEditor> e
 		directWriteCheckBox = new UICheckBox(Inter.getLocText("Form-Allow_Edit"), false);
 		directWriteCheckBox.setPreferredSize(new Dimension(100, 30));
 		getValidatePane().add(GUICoreUtils.createFlowPane(new JComponent[]{directWriteCheckBox}, FlowLayout.LEFT, 5));
-		JPanel advancedPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("Advanced"));
+		JPanel advancedPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Designer_Advanced"));
 		waterMarkDictPane = new WaterMarkDictPane();
 		advancedPane.add(contentPane);
 		contentPane.add(waterMarkDictPane);
diff --git a/designer/src/com/fr/design/widget/ui/IframeEditorDefinePane.java b/designer/src/com/fr/design/widget/ui/IframeEditorDefinePane.java
index 001f5d2e76..b536c927e4 100644
--- a/designer/src/com/fr/design/widget/ui/IframeEditorDefinePane.java
+++ b/designer/src/com/fr/design/widget/ui/IframeEditorDefinePane.java
@@ -57,7 +57,7 @@ public class IframeEditorDefinePane extends AbstractDataModify<IframeEditor> {
 		centerPane.add(GUICoreUtils.createFlowPane(new UILabel(Inter.getLocText("Form-Url") + ":"), srcTextField = new UITextField(16), FlowLayout.LEFT));
 		centerPane.add(GUICoreUtils.createFlowPane( new UILabel(Inter.getLocText("Parameter") + ":"), parameterViewPane = new ReportletParameterViewPane(), FlowLayout.LEFT));
 		parameterViewPane.setPreferredSize(new Dimension(540, 235));
-		JPanel advancedPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("Advanced"));
+		JPanel advancedPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Designer_Advanced"));
 		advancedPane.add(contentPane);
 		contentPane.add(centerPane);
 		this.add(advancedPane, BorderLayout.CENTER);
diff --git a/designer/src/com/fr/design/widget/ui/NumberEditorDefinePane.java b/designer/src/com/fr/design/widget/ui/NumberEditorDefinePane.java
index 424e94e225..2bd2956cba 100644
--- a/designer/src/com/fr/design/widget/ui/NumberEditorDefinePane.java
+++ b/designer/src/com/fr/design/widget/ui/NumberEditorDefinePane.java
@@ -157,7 +157,7 @@ public class NumberEditorDefinePane extends FieldEditorDefinePane<NumberEditor>
         content.setLayout(FRGUIPaneFactory.createBorderLayout());
         // richer:数字的允许直接编辑没有意义
 
-        JPanel northPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("Advanced"));
+        JPanel northPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Designer_Advanced"));
         content.add(northPane, BorderLayout.NORTH);
 
         waterMarkDictPane = new WaterMarkDictPane();
diff --git a/designer/src/com/fr/design/widget/ui/RadioGroupDefinePane.java b/designer/src/com/fr/design/widget/ui/RadioGroupDefinePane.java
index 1d5410f058..d9c7ca8651 100644
--- a/designer/src/com/fr/design/widget/ui/RadioGroupDefinePane.java
+++ b/designer/src/com/fr/design/widget/ui/RadioGroupDefinePane.java
@@ -35,7 +35,7 @@ public class RadioGroupDefinePane extends FieldEditorDefinePane<RadioGroup> {
 		JPanel centerPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
 		buttonGroupDictPane = new ButtonGroupDictPane();
 		buttonGroupDictPane.setLayout(new FlowLayout(FlowLayout.LEFT, 5, 0));
-		JPanel advancedPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("Advanced"));
+		JPanel advancedPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Designer_Advanced"));
 		centerPane.add(buttonGroupDictPane);
 		advancedPane.add(centerPane);
 		attrPane.add(advancedPane, BorderLayout.CENTER);
diff --git a/designer/src/com/fr/design/widget/ui/TextFieldEditorDefinePane.java b/designer/src/com/fr/design/widget/ui/TextFieldEditorDefinePane.java
index fa579d2464..1c11aad2e4 100644
--- a/designer/src/com/fr/design/widget/ui/TextFieldEditorDefinePane.java
+++ b/designer/src/com/fr/design/widget/ui/TextFieldEditorDefinePane.java
@@ -48,7 +48,7 @@ public class TextFieldEditorDefinePane extends FieldEditorDefinePane<TextEditor>
         regPane.addPhoneRegListener(pl);
         getValidatePane().add(GUICoreUtils.createFlowPane(regPane, FlowLayout.LEFT));
         getValidatePane().add(GUICoreUtils.createFlowPane(new JComponent[]{new UILabel(Inter.getLocText(new String[]{"Error", "Tooltips"}) + ":"), getRegErrorMsgTextField()}, FlowLayout.LEFT, 24));
-        JPanel advancedPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("Advanced"));
+        JPanel advancedPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Designer_Advanced"));
         waterMarkDictPane = new WaterMarkDictPane();
         waterMarkDictPane.addInputKeyListener(new KeyAdapter() {
             public void keyTyped(KeyEvent e) {
diff --git a/designer/src/com/fr/design/widget/ui/TreeEditorDefinePane.java b/designer/src/com/fr/design/widget/ui/TreeEditorDefinePane.java
index 60b2f1e40f..f099983250 100644
--- a/designer/src/com/fr/design/widget/ui/TreeEditorDefinePane.java
+++ b/designer/src/com/fr/design/widget/ui/TreeEditorDefinePane.java
@@ -46,7 +46,7 @@ public class TreeEditorDefinePane extends FieldEditorDefinePane<TreeEditor> {
 	}
 
 	protected JPanel setSecondContentPane() {
-		JPanel advancedPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("Advanced"));
+		JPanel advancedPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Designer_Advanced"));
 		JPanel contentPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
 		advancedPane.add(contentPane);
 		contentPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
diff --git a/designer/src/com/fr/design/widget/ui/WriteUnableRepeatEditorPane.java b/designer/src/com/fr/design/widget/ui/WriteUnableRepeatEditorPane.java
index dcc13e44f4..2e4a839a92 100644
--- a/designer/src/com/fr/design/widget/ui/WriteUnableRepeatEditorPane.java
+++ b/designer/src/com/fr/design/widget/ui/WriteUnableRepeatEditorPane.java
@@ -20,7 +20,7 @@ public abstract class WriteUnableRepeatEditorPane<E extends WriteUnableRepeatEdi
 	
 	@Override
 	protected JPanel setFirstContentPane() {
-		JPanel advancedPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("Advanced"));
+		JPanel advancedPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Designer_Advanced"));
 		JPanel contentPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
 		advancedPane.add(contentPane);
 		contentPane.setBorder(BorderFactory.createEmptyBorder(0, 2, 0, 0));
diff --git a/designer/src/com/fr/design/widget/ui/btn/TreeNodeToogleButtonDefinePane.java b/designer/src/com/fr/design/widget/ui/btn/TreeNodeToogleButtonDefinePane.java
index b275695d5d..c7700f7e7f 100644
--- a/designer/src/com/fr/design/widget/ui/btn/TreeNodeToogleButtonDefinePane.java
+++ b/designer/src/com/fr/design/widget/ui/btn/TreeNodeToogleButtonDefinePane.java
@@ -34,7 +34,7 @@ public class TreeNodeToogleButtonDefinePane<T extends TreeNodeToggleButton> exte
                 {new UILabel(Inter.getLocText(new String[]{"Form-Button", "Type"}) + ":"), createButtonTypeComboBox()}
         };
         JPanel northPane = TableLayoutHelper.createTableLayoutPane(n_components, rowSize, columnSize);
-        JPanel advancedPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("Advanced"));
+        JPanel advancedPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Designer_Advanced"));
         advancedPane.add(northPane);
         add(advancedPane, BorderLayout.CENTER);
     }
diff --git a/designer_base/src/com/fr/design/widget/btn/ButtonWithHotkeysDetailPane.java b/designer_base/src/com/fr/design/widget/btn/ButtonWithHotkeysDetailPane.java
index d975f28294..46245560ac 100644
--- a/designer_base/src/com/fr/design/widget/btn/ButtonWithHotkeysDetailPane.java
+++ b/designer_base/src/com/fr/design/widget/btn/ButtonWithHotkeysDetailPane.java
@@ -31,7 +31,7 @@ public abstract class ButtonWithHotkeysDetailPane<T extends Button> extends Butt
     }
 
 	private void initComponents() {
-        JPanel advancedPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("Advanced"));
+        JPanel advancedPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Designer_Advanced"));
         advancedPane.setPreferredSize(new Dimension(600,300));
         JPanel attrPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         attrPane.setBorder(BorderFactory.createEmptyBorder(0, 4, 0, 4));
diff --git a/designer_form/src/com/fr/design/designer/creator/XFieldEditor.java b/designer_form/src/com/fr/design/designer/creator/XFieldEditor.java
index fd363311c5..42ae055e4d 100644
--- a/designer_form/src/com/fr/design/designer/creator/XFieldEditor.java
+++ b/designer_form/src/com/fr/design/designer/creator/XFieldEditor.java
@@ -53,7 +53,7 @@ public abstract class XFieldEditor extends XWidgetCreator {
                 : new CRPropertyDescriptor[]{allowBlank, fontSize};
     }
 
-    public Boolean isDisplayRegField(Boolean displayRegField) {
+    public boolean isDisplayRegField(boolean displayRegField) {
         RegExp reg = ((TextEditor) toData()).getRegex();
         if (reg == null || !StringUtils.isNotEmpty(reg.toRegText())) {
 
diff --git a/designer_form/src/com/fr/design/designer/creator/XPassword.java b/designer_form/src/com/fr/design/designer/creator/XPassword.java
index cfa630358b..1a9b4493df 100644
--- a/designer_form/src/com/fr/design/designer/creator/XPassword.java
+++ b/designer_form/src/com/fr/design/designer/creator/XPassword.java
@@ -64,7 +64,7 @@ public class XPassword extends XWrapperedFieldEditor {
         CRPropertyDescriptor waterMark = new CRPropertyDescriptor("waterMark", this.data.getClass())
                 .setI18NName(Inter.getLocText("FR-Designer_WaterMark"))
                 .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced");
-        Boolean displayRegField = true;
+        boolean displayRegField = true;
         displayRegField = isDisplayRegField(displayRegField);
         return displayRegField ? (CRPropertyDescriptor[]) ArrayUtils.addAll(sup, new CRPropertyDescriptor[]{regex, regErrorMessage, waterMark}) :
                 (CRPropertyDescriptor[]) ArrayUtils.addAll(sup, new CRPropertyDescriptor[]{regex, waterMark});
diff --git a/designer_form/src/com/fr/design/designer/creator/XTextArea.java b/designer_form/src/com/fr/design/designer/creator/XTextArea.java
index 8622bb5add..3b7f0e6f15 100644
--- a/designer_form/src/com/fr/design/designer/creator/XTextArea.java
+++ b/designer_form/src/com/fr/design/designer/creator/XTextArea.java
@@ -49,7 +49,7 @@ public class XTextArea extends XFieldEditor {
         CRPropertyDescriptor waterMark = new CRPropertyDescriptor("waterMark", this.data.getClass()).setI18NName(
                 Inter.getLocText("WaterMark")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY,
                 "Advanced");
-        Boolean displayRegField = true;
+        boolean displayRegField = true;
         displayRegField = isDisplayRegField(displayRegField);
         return displayRegField ? (CRPropertyDescriptor[]) ArrayUtils.addAll(sup, new CRPropertyDescriptor[]{regex, regErrorMessage, waterMark}) :
                 (CRPropertyDescriptor[]) ArrayUtils.addAll(sup, new CRPropertyDescriptor[]{regex, waterMark});
diff --git a/designer_form/src/com/fr/design/designer/creator/XTextEditor.java b/designer_form/src/com/fr/design/designer/creator/XTextEditor.java
index a13e1b0059..31b7d0f48e 100644
--- a/designer_form/src/com/fr/design/designer/creator/XTextEditor.java
+++ b/designer_form/src/com/fr/design/designer/creator/XTextEditor.java
@@ -53,7 +53,7 @@ public class XTextEditor extends XWrapperedFieldEditor {
                 Inter.getLocText("FR-Designer_WaterMark")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY,
                 "Advanced");
         CRPropertyDescriptor[] sup = (CRPropertyDescriptor[]) ArrayUtils.addAll(new CRPropertyDescriptor[]{widgetValue}, super.supportedDescriptor());
-        Boolean displayRegField = true;
+        boolean displayRegField = true;
         displayRegField = isDisplayRegField(displayRegField);
         return displayRegField ? (CRPropertyDescriptor[]) ArrayUtils.addAll(sup,
                 new CRPropertyDescriptor[]{regex, regErrorMessage, waterMark}) :
diff --git a/designer_form/src/com/fr/design/form/util/XCreatorConstants.java b/designer_form/src/com/fr/design/form/util/XCreatorConstants.java
index acbb520d51..126f4a9a3d 100644
--- a/designer_form/src/com/fr/design/form/util/XCreatorConstants.java
+++ b/designer_form/src/com/fr/design/form/util/XCreatorConstants.java
@@ -21,7 +21,7 @@ public class XCreatorConstants {
     // 描述属性的分类
     public static final String PROPERTY_CATEGORY = "category";
     public static final String DEFAULT_GROUP_NAME = "Form-Basic_Properties";
-    public static final String PROPERTY_VALIDATE = "validate";
+    public static final String PROPERTY_VALIDATE = "FR-Designer_Validate";
     public static final Color FORM_BG = new Color(252, 252, 254);
     // 拖拽标识块的大小
     public static final int RESIZE_BOX_SIZ = 5;