From 7154e33994df1c81af087607e2b750657b33b5d8 Mon Sep 17 00:00:00 2001
From: kerry <kerry@finereport.com>
Date: Wed, 6 Sep 2017 11:46:58 +0800
Subject: [PATCH 01/24] =?UTF-8?q?REPORT-4393=20&&=20REPORT-4028=20&&=20REP?=
 =?UTF-8?q?ORT-4192=20=E5=8F=82=E6=95=B0=E9=9D=A2=E6=9D=BF=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E6=8E=A7=E4=BB=B6=E6=8E=A7=E4=BB=B6=E5=80=BC=E8=81=94?=
 =?UTF-8?q?=E5=8A=A8=E5=A4=B1=E6=95=88=20=E6=8E=A7=E4=BB=B6=E5=90=8D?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E4=BF=AE=E6=94=B9=20=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E4=B8=8D=E8=87=AA=E5=8A=A8=E6=8D=A2=E8=A1=8C?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=97=A0=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/com/fr/design/designer/creator/XCreator.java     | 8 ++++++++
 .../src/com/fr/design/designer/creator/XDateEditor.java  | 9 ++++++++-
 .../com/fr/design/designer/creator/XWScaleLayout.java    | 8 ++++++++
 .../design/mainframe/widget/ui/FormWidgetCardPane.java   | 8 ++++++--
 .../com/fr/design/parameter/RootDesignDefinePane.java    | 4 ++--
 .../fr/design/widget/ui/designer/LabelDefinePane.java    | 4 ++--
 6 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/designer_form/src/com/fr/design/designer/creator/XCreator.java b/designer_form/src/com/fr/design/designer/creator/XCreator.java
index 1e7058f52..2daf303de 100644
--- a/designer_form/src/com/fr/design/designer/creator/XCreator.java
+++ b/designer_form/src/com/fr/design/designer/creator/XCreator.java
@@ -642,4 +642,12 @@ public abstract class XCreator extends JPanel implements XComponent, XCreatorToo
 		this.data = data;
 	}
 
+	/**
+	 * 属性改变触发
+	 *
+	 */
+	public void firePropertyChange(){
+
+	}
+
 }
\ No newline at end of file
diff --git a/designer_form/src/com/fr/design/designer/creator/XDateEditor.java b/designer_form/src/com/fr/design/designer/creator/XDateEditor.java
index 2a8f6aedd..fa0450fd9 100644
--- a/designer_form/src/com/fr/design/designer/creator/XDateEditor.java
+++ b/designer_form/src/com/fr/design/designer/creator/XDateEditor.java
@@ -174,5 +174,12 @@ public class XDateEditor extends XDirectWriteEditor {
 	public boolean shouldScaleCreator() {
 		return true;
 	}
-	
+
+	/**
+	 * 触发其他操作
+	 *
+	 */
+	public void firePropertyChange(){
+		initFieldText();
+	}
 }
\ No newline at end of file
diff --git a/designer_form/src/com/fr/design/designer/creator/XWScaleLayout.java b/designer_form/src/com/fr/design/designer/creator/XWScaleLayout.java
index a8ae49ddc..8aaf3e830 100644
--- a/designer_form/src/com/fr/design/designer/creator/XWScaleLayout.java
+++ b/designer_form/src/com/fr/design/designer/creator/XWScaleLayout.java
@@ -161,4 +161,12 @@ public class XWScaleLayout extends DedicateLayoutContainer {
 	public boolean supportSetVisibleOrEnable(){
 		return true;
 	}
+
+	/**
+	 * 更新组件及子组件的UI
+	 */
+	public void firePropertyChange(){
+		XCreator child = getXCreator(INDEX);
+		child.firePropertyChange();
+	}
 }
\ No newline at end of file
diff --git a/designer_form/src/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java b/designer_form/src/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java
index 7fdb11e66..95e09ec25 100644
--- a/designer_form/src/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java
+++ b/designer_form/src/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java
@@ -1,6 +1,7 @@
 package com.fr.design.mainframe.widget.ui;
 
 import com.fr.design.data.DataCreatorUI;
+import com.fr.design.designer.beans.events.DesignerEvent;
 import com.fr.design.designer.creator.*;
 import com.fr.design.dialog.BasicScrollPane;
 import com.fr.design.foldablepane.UIExpandablePane;
@@ -205,6 +206,8 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane {
         if (widgetBoundPane != null) {
             widgetBoundPane.update();
         }
+        xCreator.resetCreatorName(widget.getWidgetName());
+        designer.getEditListenerTable().fireCreatorModified(xCreator, DesignerEvent.CREATOR_RENAMED);
         fireValueChanged();
     }
 
@@ -218,8 +221,9 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane {
     }
 
     public void fireValueChanged() {
-        designer.repaint();
-        DesignerContext.getDesignerFrame().getSelectedJTemplate().fireTargetModified();
+        xCreator.firePropertyChange();
+        designer.fireTargetModified();
+        designer.refreshDesignerUI();
     }
 
     public String getIconPath() {
diff --git a/designer_form/src/com/fr/design/parameter/RootDesignDefinePane.java b/designer_form/src/com/fr/design/parameter/RootDesignDefinePane.java
index 85b84588b..250a7e5c5 100644
--- a/designer_form/src/com/fr/design/parameter/RootDesignDefinePane.java
+++ b/designer_form/src/com/fr/design/parameter/RootDesignDefinePane.java
@@ -115,7 +115,7 @@ public class RootDesignDefinePane extends AbstractDataModify<WParameterLayout> {
         displayReport.setSelected(ob.isDelayDisplayContent());
         useParamsTemplate.setSelected(ob.isUseParamsTemplate());
         designerWidth.setValue(ob.getDesignWidth());
-        hAlignmentPane.setSelectedIndex(ob.getPosition());
+        hAlignmentPane.setSelectedItem(ob.getPosition());
     }
 
 
@@ -129,7 +129,7 @@ public class RootDesignDefinePane extends AbstractDataModify<WParameterLayout> {
         JTemplate jTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
         jTemplate.needAddTemplateId(useParamsTemplate.isSelected());
         wParameterLayout.setBackground((Background) background.getValue());
-        wParameterLayout.setPosition(hAlignmentPane.getSelectedIndex());
+        wParameterLayout.setPosition((int)hAlignmentPane.getSelectedItem());
         return wParameterLayout;
     }
 
diff --git a/designer_form/src/com/fr/design/widget/ui/designer/LabelDefinePane.java b/designer_form/src/com/fr/design/widget/ui/designer/LabelDefinePane.java
index 50c8c15b6..56393bcb4 100644
--- a/designer_form/src/com/fr/design/widget/ui/designer/LabelDefinePane.java
+++ b/designer_form/src/com/fr/design/widget/ui/designer/LabelDefinePane.java
@@ -84,7 +84,7 @@ public class LabelDefinePane extends AbstractDataModify<Label> {
         formWidgetValuePane.populate(ob);
         isStyleAlignmentWrapText.setSelected(ob.isAutoLine());
         isPageSetupVertically.setSelected(ob.isVerticalCenter());
-        hAlignmentPane.setSelectedIndex(ob.getTextalign());
+        hAlignmentPane.setSelectedItem(ob.getTextalign());
         frFontPane.populateBean(ob.getFont());
     }
 
@@ -95,7 +95,7 @@ public class LabelDefinePane extends AbstractDataModify<Label> {
         formWidgetValuePane.update(layout);
         layout.setAutoLine(isStyleAlignmentWrapText.isSelected());
         layout.setVerticalCenter(isPageSetupVertically.isSelected());
-        layout.setTextalign(hAlignmentPane.getSelectedIndex());
+        layout.setTextalign((int)hAlignmentPane.getSelectedItem());
         layout.setFont(frFontPane.update(layout.getFont()));
         return layout;
     }

From e550b5528c057f9c00d462678136dc2cb08d41d7 Mon Sep 17 00:00:00 2001
From: kerry <kerry@finereport.com>
Date: Wed, 6 Sep 2017 11:49:47 +0800
Subject: [PATCH 02/24] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 designer_form/src/com/fr/design/designer/creator/XCreator.java | 2 +-
 .../src/com/fr/design/designer/creator/XDateEditor.java        | 2 +-
 .../src/com/fr/design/designer/creator/XWScaleLayout.java      | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/designer_form/src/com/fr/design/designer/creator/XCreator.java b/designer_form/src/com/fr/design/designer/creator/XCreator.java
index 2daf303de..c4e11180a 100644
--- a/designer_form/src/com/fr/design/designer/creator/XCreator.java
+++ b/designer_form/src/com/fr/design/designer/creator/XCreator.java
@@ -643,7 +643,7 @@ public abstract class XCreator extends JPanel implements XComponent, XCreatorToo
 	}
 
 	/**
-	 * 属性改变触发
+	 * data属性改变触发其他操作
 	 *
 	 */
 	public void firePropertyChange(){
diff --git a/designer_form/src/com/fr/design/designer/creator/XDateEditor.java b/designer_form/src/com/fr/design/designer/creator/XDateEditor.java
index fa0450fd9..a39fdb934 100644
--- a/designer_form/src/com/fr/design/designer/creator/XDateEditor.java
+++ b/designer_form/src/com/fr/design/designer/creator/XDateEditor.java
@@ -176,7 +176,7 @@ public class XDateEditor extends XDirectWriteEditor {
 	}
 
 	/**
-	 * 触发其他操作
+	 * data属性改变触发其他操作
 	 *
 	 */
 	public void firePropertyChange(){
diff --git a/designer_form/src/com/fr/design/designer/creator/XWScaleLayout.java b/designer_form/src/com/fr/design/designer/creator/XWScaleLayout.java
index 8aaf3e830..97a12e80b 100644
--- a/designer_form/src/com/fr/design/designer/creator/XWScaleLayout.java
+++ b/designer_form/src/com/fr/design/designer/creator/XWScaleLayout.java
@@ -163,7 +163,8 @@ public class XWScaleLayout extends DedicateLayoutContainer {
 	}
 
 	/**
-	 * 更新组件及子组件的UI
+	 * data属性改变触发其他操作
+	 *
 	 */
 	public void firePropertyChange(){
 		XCreator child = getXCreator(INDEX);

From b610efc4a3d4c0555a10fa8624160a7474264908 Mon Sep 17 00:00:00 2001
From: kerry <kerry@finereport.com>
Date: Wed, 6 Sep 2017 14:28:54 +0800
Subject: [PATCH 03/24] =?UTF-8?q?=E4=BF=AE=E6=94=B9PMD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/designer/creator/XCreator.java  |  10 +-
 .../design/designer/creator/XDateEditor.java  | 233 +++++++++---------
 .../widget/ui/FormWidgetCardPane.java         |  18 +-
 .../parameter/RootDesignDefinePane.java       |   2 +-
 .../widget/ui/designer/LabelDefinePane.java   |   2 +-
 5 files changed, 125 insertions(+), 140 deletions(-)

diff --git a/designer_form/src/com/fr/design/designer/creator/XCreator.java b/designer_form/src/com/fr/design/designer/creator/XCreator.java
index c4e11180a..87f3e532e 100644
--- a/designer_form/src/com/fr/design/designer/creator/XCreator.java
+++ b/designer_form/src/com/fr/design/designer/creator/XCreator.java
@@ -227,7 +227,7 @@ public abstract class XCreator extends JPanel implements XComponent, XCreatorToo
 	}
 
 	protected String getIconName() {
-        return "";
+        return StringUtils.EMPTY;
     }
 
 	public String getIconPath() {
@@ -472,11 +472,9 @@ public abstract class XCreator extends JPanel implements XComponent, XCreatorToo
 			selectionModel.selectACreatorAtMouseEvent(e);
 		}
 
-		if (editingMouseListener.stopEditing()) {
-			if (this != designer.getRootComponent()) {
-				ComponentAdapter adapter = AdapterBus.getComponentAdapter(designer, this);
-				editingMouseListener.startEditing(this, adapter.getDesignerEditor(), adapter);
-			}
+		if (editingMouseListener.stopEditing() && this != designer.getRootComponent()) {
+			ComponentAdapter adapter = AdapterBus.getComponentAdapter(designer, this);
+			editingMouseListener.startEditing(this, adapter.getDesignerEditor(), adapter);
 		}
 	}
 
diff --git a/designer_form/src/com/fr/design/designer/creator/XDateEditor.java b/designer_form/src/com/fr/design/designer/creator/XDateEditor.java
index a39fdb934..42e8e031d 100644
--- a/designer_form/src/com/fr/design/designer/creator/XDateEditor.java
+++ b/designer_form/src/com/fr/design/designer/creator/XDateEditor.java
@@ -31,94 +31,95 @@ import com.fr.stable.core.PropertyChangeAdapter;
  * @since 6.5.3
  */
 public class XDateEditor extends XDirectWriteEditor {
-	
-	private UITextField textField;
-	private LimpidButton btn;
+
+    private UITextField textField;
+    private LimpidButton btn;
 
     public XDateEditor(DateEditor widget, Dimension initSize) {
         super(widget, initSize);
     }
-    
+
     /**
      * 控件的属性列表
+     *
      * @return 此控件所用的属性列表
      * @throws IntrospectionException 异常
      */
     @Override
-	public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
-		CRPropertyDescriptor [] tempt=(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").setPropertyChangeListener(new PropertyChangeAdapter() {
-
-							@Override
-							public void propertyChange() {
-								initFieldText();
-							}
-						})},super.supportedDescriptor());
-		return (CRPropertyDescriptor[]) ArrayUtils.addAll(tempt,
-				new CRPropertyDescriptor[] {
-						new CRPropertyDescriptor("formatText", this.data.getClass()).setI18NName(
-								Inter.getLocText("FR-Engine_Format")).setEditorClass(formatClass()).setRendererClass(
-								DateCellRenderer.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
-						new CRPropertyDescriptor("startDate", this.data.getClass()).setI18NName(
-								Inter.getLocText("FR-Designer_Start-Date")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY,
-								"Advanced").setEditorClass(DateRangeEditor.class),
-						new CRPropertyDescriptor("endDate", this.data.getClass()).setI18NName(
-								Inter.getLocText("FR-Designer_End-Date")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY,
-								"Advanced").setEditorClass(DateRangeEditor.class),
-						new CRPropertyDescriptor("waterMark", this.data.getClass()).setI18NName(
-								Inter.getLocText("FR-Designer_WaterMark")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY,
-								"Advanced"),
-						new CRPropertyDescriptor("returnDate", this.data.getClass()).setI18NName(
-								Inter.getLocText("FR-Designer_Return-Date")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY,
-								"Advanced")
-				});
-	}
-    
+    public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
+        CRPropertyDescriptor[] tempt = (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").setPropertyChangeListener(new PropertyChangeAdapter() {
+
+                            @Override
+                            public void propertyChange() {
+                                initFieldText();
+                            }
+                        })}, super.supportedDescriptor());
+        return (CRPropertyDescriptor[]) ArrayUtils.addAll(tempt,
+                new CRPropertyDescriptor[]{
+                        new CRPropertyDescriptor("formatText", this.data.getClass()).setI18NName(
+                                Inter.getLocText("FR-Engine_Format")).setEditorClass(formatClass()).setRendererClass(
+                                DateCellRenderer.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
+                        new CRPropertyDescriptor("startDate", this.data.getClass()).setI18NName(
+                                Inter.getLocText("FR-Designer_Start-Date")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY,
+                                "Advanced").setEditorClass(DateRangeEditor.class),
+                        new CRPropertyDescriptor("endDate", this.data.getClass()).setI18NName(
+                                Inter.getLocText("FR-Designer_End-Date")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY,
+                                "Advanced").setEditorClass(DateRangeEditor.class),
+                        new CRPropertyDescriptor("waterMark", this.data.getClass()).setI18NName(
+                                Inter.getLocText("FR-Designer_WaterMark")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY,
+                                "Advanced"),
+                        new CRPropertyDescriptor("returnDate", this.data.getClass()).setI18NName(
+                                Inter.getLocText("FR-Designer_Return-Date")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY,
+                                "Advanced")
+                });
+    }
+
     protected Class formatClass() {
-    	return DateFormatEditor.class;
+        return DateFormatEditor.class;
+    }
+
+    private void initFieldText() {
+        DateEditor dateEditor = (DateEditor) data;
+        if (dateEditor.getWidgetValue() != null) {
+            WidgetValue widgetValue = dateEditor.getWidgetValue();
+            //控件值.toString
+            String valueStr = widgetValue.toString();
+            //控件值
+            Object value = widgetValue.getValue();
+            //格式
+            String format = dateEditor.getFormatText();
+
+            if (value instanceof Date) {
+                valueStr = DateUtils.getDate2Str(format, (Date) value);
+            }
+
+            //日期控件默认值
+            if (StringUtils.isEmpty(valueStr)) {
+                valueStr = DateUtils.getDate2Str(format, new Date());
+                dateEditor.setWidgetValue(new WidgetValue(new Date()));
+            }
+
+            textField.setText(valueStr);
+        }
+    }
+
+    @Override
+    protected void initXCreatorProperties() {
+        super.initXCreatorProperties();
+        initFieldText();
     }
-    
-	private void initFieldText() {
-		DateEditor dateEditor = (DateEditor) data;
-		if (dateEditor.getWidgetValue() != null) {
-			WidgetValue widgetValue = dateEditor.getWidgetValue();
-			//控件值.toString
-			String valueStr = widgetValue.toString();
-			//控件值
-			Object value = widgetValue.getValue();
-			//格式
-			String format = dateEditor.getFormatText();
-			
-			if(value instanceof Date){
-				valueStr = DateUtils.getDate2Str(format, (Date) value);
-			} 
-			
-			//日期控件默认值
-			if(StringUtils.isEmpty(valueStr)){
-				valueStr = DateUtils.getDate2Str(format, new Date());
-				dateEditor.setWidgetValue(new WidgetValue(new Date()));
-			}
-			
-			textField.setText(valueStr);
-		}
-	}
-
-	@Override
-	protected void initXCreatorProperties() {
-		super.initXCreatorProperties();
-		initFieldText();
-	}
 
     @Override
     protected JComponent initEditor() {
         if (editor == null) {
             editor = FRGUIPaneFactory.createBorderLayout_S_Pane();
             editor.add(textField = new UITextField(5), BorderLayout.CENTER);
-			btn = new LimpidButton("", this.getIconPath(), toData().isVisible() ? FULL_OPACITY : HALF_OPACITY);
+            btn = new LimpidButton("", this.getIconPath(), toData().isVisible() ? FULL_OPACITY : HALF_OPACITY);
             btn.setPreferredSize(new Dimension(21, 21));
             editor.add(btn, BorderLayout.EAST);
             textField.setOpaque(false);
@@ -132,54 +133,46 @@ public class XDateEditor extends XDirectWriteEditor {
         return "date_16.png";
     }
 
-	protected void makeVisible(boolean visible) {
-		btn.makeVisible(visible);
-	}
-	
-	/**
-	 * 获取当前XCreator的一个封装父容器
-	 * 
-	 * @param widgetName 当前组件名
-	 * 
-	 * @return 封装的父容器
-	 * 
-	 *
-	 * @date 2014-11-25-下午4:47:23
-	 * 
-	 */
-	protected XLayoutContainer getCreatorWrapper(String widgetName){
-		return new XWScaleLayout();
-	}
-	
-	/**
-	 * 将当前对象添加到父容器中
-	 * 
-	 * @param parentPanel 父容器组件
-	 * 
-	 *
-	 * @date 2014-11-25-下午4:57:55
-	 * 
-	 */
-	protected void addToWrapper(XLayoutContainer parentPanel, int width, int minHeight){			
-		this.setSize(width, minHeight);
-		parentPanel.add(this);
-	}
-	
-	/**
-	 * 此控件在自适应布局要保持原样高度
-	 * 
-	 * @return 是则返回true
-	 */
-	@Override
-	public boolean shouldScaleCreator() {
-		return true;
-	}
-
-	/**
-	 * data属性改变触发其他操作
-	 *
-	 */
-	public void firePropertyChange(){
-		initFieldText();
-	}
+    protected void makeVisible(boolean visible) {
+        btn.makeVisible(visible);
+    }
+
+    /**
+     * 获取当前XCreator的一个封装父容器
+     *
+     * @param widgetName 当前组件名
+     * @return 封装的父容器
+     * @date 2014-11-25-下午4:47:23
+     */
+    protected XLayoutContainer getCreatorWrapper(String widgetName) {
+        return new XWScaleLayout();
+    }
+
+    /**
+     * 将当前对象添加到父容器中
+     *
+     * @param parentPanel 父容器组件
+     * @date 2014-11-25-下午4:57:55
+     */
+    protected void addToWrapper(XLayoutContainer parentPanel, int width, int minHeight) {
+        this.setSize(width, minHeight);
+        parentPanel.add(this);
+    }
+
+    /**
+     * 此控件在自适应布局要保持原样高度
+     *
+     * @return 是则返回true
+     */
+    @Override
+    public boolean shouldScaleCreator() {
+        return true;
+    }
+
+    /**
+     * data属性改变触发其他操作
+     */
+    public void firePropertyChange() {
+        initFieldText();
+    }
 }
\ No newline at end of file
diff --git a/designer_form/src/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java b/designer_form/src/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java
index 95e09ec25..408165e3b 100644
--- a/designer_form/src/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java
+++ b/designer_form/src/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java
@@ -20,6 +20,7 @@ import com.fr.form.ui.container.WScaleLayout;
 import com.fr.form.ui.container.WTitleLayout;
 import com.fr.form.ui.widget.CRBoundsWidget;
 import com.fr.general.Inter;
+import com.fr.stable.StringUtils;
 
 import javax.swing.*;
 import java.awt.*;
@@ -149,19 +150,12 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane {
 
     private void initDefinePane() {
         currentEditorDefinePane = null;
-        XCreator creator = xCreator;
-        if (xCreator.acceptType(XWScaleLayout.class)) {
-            if (xCreator.getComponentCount() > 0 && ((XCreator) xCreator.getComponent(0)).shouldScaleCreator()) {
-                creator = (XCreator) xCreator.getComponent(0);
-            }
-        }
-        if(xCreator.acceptType(XWTitleLayout.class)){
-            creator = (XCreator) xCreator.getComponent(0);
-        }
+        boolean dedicateLayout = xCreator.acceptType(XWScaleLayout.class) && xCreator.getComponentCount() > 0 && ((XCreator) xCreator.getComponent(0)).shouldScaleCreator() || xCreator.acceptType(XWTitleLayout.class);
+        XCreator creator = dedicateLayout ? (XCreator) xCreator.getComponent(0) : xCreator;
         FormWidgetDefinePaneFactoryBase.RN rn = FormWidgetDefinePaneFactoryBase.createWidgetDefinePane(creator, creator.toData(), new Operator() {
             @Override
             public void did(DataCreatorUI ui, String cardName) {
-
+                //todo
             }
         });
         DataModify<Widget> definePane = rn.getDefinePane();
@@ -189,7 +183,7 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane {
         if (cellWidget.acceptType(WScaleLayout.class)) {
             Widget crBoundsWidget = ((WScaleLayout) cellWidget).getBoundsWidget();
             innerWidget = ((CRBoundsWidget) crBoundsWidget).getWidget();
-        } else if(cellWidget.acceptType(WTitleLayout.class)){
+        } else if (cellWidget.acceptType(WTitleLayout.class)) {
             CRBoundsWidget crBoundsWidget = ((WTitleLayout) cellWidget).getBodyBoundsWidget();
             innerWidget = crBoundsWidget.getWidget();
         }
@@ -227,7 +221,7 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane {
     }
 
     public String getIconPath() {
-        return "";
+        return StringUtils.EMPTY;
     }
 
 
diff --git a/designer_form/src/com/fr/design/parameter/RootDesignDefinePane.java b/designer_form/src/com/fr/design/parameter/RootDesignDefinePane.java
index 250a7e5c5..71012c879 100644
--- a/designer_form/src/com/fr/design/parameter/RootDesignDefinePane.java
+++ b/designer_form/src/com/fr/design/parameter/RootDesignDefinePane.java
@@ -51,7 +51,7 @@ public class RootDesignDefinePane extends AbstractDataModify<WParameterLayout> {
         UIExpandablePane advanceExpandablePane = new UIExpandablePane(Inter.getLocText("FR-Designer_Advanced"), 280, 20, advancePane);
         this.add(advanceExpandablePane, BorderLayout.NORTH);
         JPanel layoutPane = createBoundsPane();
-        UIExpandablePane layoutExpandablePane = new UIExpandablePane(Inter.getLocText("Size"), 280, 20, layoutPane);
+        UIExpandablePane layoutExpandablePane = new UIExpandablePane(Inter.getLocText("FR-Designer_Size"), 280, 20, layoutPane);
         this.add(layoutExpandablePane, BorderLayout.CENTER);
 
     }
diff --git a/designer_form/src/com/fr/design/widget/ui/designer/LabelDefinePane.java b/designer_form/src/com/fr/design/widget/ui/designer/LabelDefinePane.java
index 56393bcb4..cb988f24f 100644
--- a/designer_form/src/com/fr/design/widget/ui/designer/LabelDefinePane.java
+++ b/designer_form/src/com/fr/design/widget/ui/designer/LabelDefinePane.java
@@ -95,7 +95,7 @@ public class LabelDefinePane extends AbstractDataModify<Label> {
         formWidgetValuePane.update(layout);
         layout.setAutoLine(isStyleAlignmentWrapText.isSelected());
         layout.setVerticalCenter(isPageSetupVertically.isSelected());
-        layout.setTextalign((int)hAlignmentPane.getSelectedItem());
+        layout.setTextalign((int) hAlignmentPane.getSelectedItem());
         layout.setFont(frFontPane.update(layout.getFont()));
         return layout;
     }

From c594ec98cb581d9d97180d58b0830a527d329848 Mon Sep 17 00:00:00 2001
From: mengao <283296419@qq.com>
Date: Thu, 7 Sep 2017 10:42:19 +0800
Subject: [PATCH 04/24] =?UTF-8?q?=E4=BF=AE=E6=94=B99.0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PlotSeries/MapGroupExtensionPane.java     |  2 +-
 .../impl/ChartHyperPopAttrPane.java           |  2 +-
 .../impl/ChartHyperPoplinkPane.java           |  2 +-
 .../mainframe/chart/gui/UIEditLabel.java      | 10 ++++--
 .../chart/gui/other/ChartInteractivePane.java | 31 ++++++++++++++++---
 .../gui/style/ChartDatapointLabelPane.java    | 16 +++++++---
 .../component/VanChartHyperLinkPane.java      |  1 +
 .../designer/AbstractVanChartScrollPane.java  |  1 +
 .../VanChartFormatPaneWithCheckBox.java       |  2 +-
 .../chart/designer/other/AutoRefreshPane.java | 22 ++++++++++---
 .../other/AutoRefreshPaneWithoutTooltip.java  |  7 ++---
 11 files changed, 71 insertions(+), 25 deletions(-)

diff --git a/designer_chart/src/com/fr/design/chart/series/PlotSeries/MapGroupExtensionPane.java b/designer_chart/src/com/fr/design/chart/series/PlotSeries/MapGroupExtensionPane.java
index 1d749d6f3..c4a5cea5c 100644
--- a/designer_chart/src/com/fr/design/chart/series/PlotSeries/MapGroupExtensionPane.java
+++ b/designer_chart/src/com/fr/design/chart/series/PlotSeries/MapGroupExtensionPane.java
@@ -1 +1 @@
-package com.fr.design.chart.series.PlotSeries;

import com.fr.base.BaseUtils;
import com.fr.base.FRContext;
import com.fr.base.MapHelper;
import com.fr.base.MapXMLHelper;
import com.fr.base.Utils;
import com.fr.chart.base.MapSvgAttr;
import com.fr.chart.base.MapSvgXMLHelper;
import com.fr.chart.chartattr.MapPlot;
import com.fr.chart.chartglyph.MapShapeValue;
import com.fr.design.DesignerEnvManager;
import com.fr.design.constants.UIConstants;
import com.fr.design.dialog.BasicDialog;
import com.fr.design.dialog.BasicPane;
import com.fr.design.dialog.DialogActionAdapter;
import com.fr.design.event.ChangeEvent;
import com.fr.design.event.ChangeListener;
import com.fr.design.event.UIObserver;
import com.fr.design.event.UIObserverListener;
import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.mainframe.DesignerContext;
import com.fr.design.mainframe.DesignerFrame;
import com.fr.general.ComparatorUtils;
import com.fr.general.FRLogger;
import com.fr.general.Inter;
import com.fr.stable.CoreConstants;
import com.fr.stable.StableUtils;
import com.fr.stable.StringUtils;
import com.fr.stable.SvgProvider;

import javax.swing.*;
import javax.swing.event.ListSelectionEvent;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseEvent;
import java.awt.geom.RoundRectangle2D;
import java.util.ArrayList;

/**
 * Created by IntelliJ IDEA.
 * Author : Richer
 * Version: 7.0.3
 * Date: 12-12-29
 * Time: 下午2:41
 */
public class MapGroupExtensionPane extends BasicPane implements UIObserver {
	private static final String[] TYPE_NAMES = new String[]{
			Inter.getLocText("FR-Chart-World_Map"),
			Inter.getLocText("FR-Chart-State_Map"),
			Inter.getLocText("FR-Chart-Province_Map"),
			Inter.getLocText("FR-Chart-Custom_Map")};
	private static final int WORD = 0;
	private static final int NATION = 1;
	private static final int STATE = 2;
	private static final int USER = 3;
	private static final int OFFSET_X = 800;
	private static final int OFFSET_Y = 280;

	private UIGroupExtensionPane groupExtensionPane;
	private UIButton addButton;
	private JPopupMenu popupMenu;
	private ArrayList<javax.swing.event.ChangeListener> changeListeners = new ArrayList<javax.swing.event.ChangeListener>();
    private boolean hasPopulated = false;

	@Override
	protected String title4PopupWindow() {
		return "Map";
	}

	public MapGroupExtensionPane() {
		setLayout(new BorderLayout());
		groupExtensionPane = new UIGroupExtensionPane(TYPE_NAMES){

			/**
			 * 新添加的数据的序号
			 * @param data 数据
			 */
			protected void dealNewAddedDataIndex(Object data){
				String newName = (String)data;
				MapSvgXMLHelper helper =  MapSvgXMLHelper.getInstance();
				if(helper.getNewMapAttr(newName) != null){
					return;
				}
				MapSvgAttr attr = new MapSvgAttr();
				attr.setFilePath(MapSvgXMLHelper.customMapPath() + CoreConstants.SEPARATOR + newName + ".svg");
				helper.addNewSvgMaps(attr.getName(), attr);
			}


			/**
			 * 一次鼠标的点击会有两次事件响应（按下和释放）。前者的事件属性中getValueIsAdjusting()=true，后者是false。
			 * 是否响应list值改变
			 * @return 鼠标按下时不响应，先响应mousePress事件，在鼠标释放是再响应list值改编的事件,并且点击删除不触发更新,并且populate后触发更新
			 */
			protected boolean isRespondToValueChange(ListSelectionEvent e){
				return !e.getValueIsAdjusting() && !this.isPressOnDelete() && hasPopulated;
			}
		};
		groupExtensionPane.addSelectionChangeListener(new ChangeListener() {
			@Override
			public void fireChanged(ChangeEvent event) {
				fireStateChange();
			}
		});
		groupExtensionPane.addItemEditListener(new ChangeListener() {
			@Override
			public void fireChanged(ChangeEvent event) {
				doEdit(event);
			}
		});
		groupExtensionPane.addDeleteListener(new ChangeListener() {
			@Override
			public void fireChanged(ChangeEvent event) {
                //这么写有点问题
                String oldName = Utils.objectToString(groupExtensionPane.getSelectedObject());
				saveMapInfo(oldName);
			}
		});
		setPreferredSize(new Dimension(400, 210));
		add(groupExtensionPane, BorderLayout.CENTER);

		addButton = new UIButton(BaseUtils.readIcon("/com/fr/design/images/buttonicon/add.png")) {
			@Override
			protected void paintBorder(Graphics g) {
				Graphics2D g2d = (Graphics2D) g;
				g2d.setStroke(UIConstants.BS);
				Shape shape = new RoundRectangle2D.Float(0.5f, 0.5f, getWidth() - 1, getHeight() - 1, UIConstants.ARC, UIConstants.ARC);
				g2d.setColor(UIConstants.LINE_COLOR);
				g2d.draw(shape);
			}
		};
		addButton.addActionListener(new ActionListener() {
			@Override
			public void actionPerformed(ActionEvent e) {
				popupMenu.show(MapGroupExtensionPane.this, addButton.getX() + 1, addButton.getY() + addButton.getHeight());
			}
		});
		add(addButton, BorderLayout.SOUTH);
		initPopupMenu();
	}

	private void initPopupMenu() {
		popupMenu = new JPopupMenu() {
			@Override
			public Dimension getPreferredSize() {
				Dimension dimension = new Dimension();
				dimension.height = super.getPreferredSize().height;
				dimension.width = addButton.getWidth() - 2;
				return dimension;
			}
		};
		JMenuItem worldMap = new JMenuItem(TYPE_NAMES[WORD]);
		popupMenu.add(worldMap);
		worldMap.addActionListener(new ActionListener() {
			public void actionPerformed(ActionEvent e) {
				groupExtensionPane.addData(TYPE_NAMES[WORD], TYPE_NAMES[WORD], true);
			}
		});

		JMenuItem countMap = new JMenuItem(TYPE_NAMES[NATION]);
		popupMenu.add(countMap);
		countMap.addActionListener(new ActionListener() {
			public void actionPerformed(ActionEvent e) {
				groupExtensionPane.addData(TYPE_NAMES[NATION],
						TYPE_NAMES[NATION], true);
			}
		});

		JMenuItem proMap = new JMenuItem(TYPE_NAMES[STATE]);
		popupMenu.add(proMap);
		proMap.addActionListener(new ActionListener() {
			public void actionPerformed(ActionEvent e) {
				groupExtensionPane.addData(TYPE_NAMES[STATE],
						TYPE_NAMES[STATE], true);
			}
		});

		JMenuItem menu = new JMenuItem(TYPE_NAMES[USER]);
		popupMenu.add(menu);
		menu.addActionListener(new ActionListener() {
			public void actionPerformed(ActionEvent e) {
				groupExtensionPane.addData(TYPE_NAMES[USER],
						TYPE_NAMES[USER], true);
			}
		});
	}

	private void doEdit(ChangeEvent e) {
		MouseEvent event = (MouseEvent) e.getSource();
		JPopupMenu editPopMenu = new JPopupMenu();

		final String oldName = Utils.objectToString(groupExtensionPane.getSelectedObject());
		editPopMenu.add(createAreaItem(oldName));
		editPopMenu.add(createMarkerItem(oldName));
		editPopMenu.add(createLayerItem(oldName));
		editPopMenu.add(createRenameItem());

		editPopMenu.show(MapGroupExtensionPane.this, event.getXOnScreen() - OFFSET_X, event.getYOnScreen() - OFFSET_Y);
	}

	private void mapCheckBeforeEdit(String name){
		if(MapSvgXMLHelper.getInstance().containsMapName(name) || MapSvgXMLHelper.getInstance().getNewMapAttr(name)!=null){
			return;
		}
		MapSvgAttr attr = new MapSvgAttr();
        attr.setFilePath(MapSvgXMLHelper.customMapPath() + CoreConstants.SEPARATOR + name + ".svg");
		MapSvgXMLHelper.getInstance().addNewSvgMaps(name,attr);
	}

	private JMenuItem createAreaItem(final String oldName) {
		JMenuItem editFileItem = new JMenuItem(Inter.getLocText(new String[]{"Edit", "Image", "Filed"}));
		editFileItem.addActionListener(new ActionListener() {
			public void actionPerformed(ActionEvent e) {
				final MapCustomPane image = new MapCustomPane();
				image.setImageSelectType(MapShapeValue.AREA);
				image.populateBean(oldName);
                image.setTypeNameAndMapName(groupExtensionPane.getSelectedType(), Utils.objectToString(groupExtensionPane.getSelectedObject()));
				mapCheckBeforeEdit(oldName);
				final Image oldImage = getMapImage(oldName);
				BasicDialog dialog = image.showMediumWindow(SwingUtilities.getWindowAncestor(MapGroupExtensionPane.this), new DialogActionAdapter() {
					public void doOk() {
						image.updateBean(); // 比较两个前后的名字是否相同,  是图片  如果图片不同, 则直接比较
						
						Image newImage = getMapImage(oldName);
						if(!ComparatorUtils.equals(oldImage, newImage)) {
							fireStateChange();
						}

                        //versionID递增
                        MapSvgAttr old = MapSvgXMLHelper.getInstance().getMapAttr(oldName);
                        if(old != null) {
                            old.addVersionID();
                        }

						saveMapInfo(oldName);
						refresh();
					}
				});
				dialog.setVisible(true);
			}
		});
		return editFileItem;
	}

    //根据地图的名字返回地图的图片
	private Image getMapImage(String mapName) {
		if (MapSvgXMLHelper.getInstance().containsMapName(mapName)) {
			MapSvgAttr mapAttr =  MapSvgXMLHelper.getInstance().getMapAttr(mapName);
			if(mapAttr == null) {
				return null;
			}
			return mapAttr.getMapImage();
		}
		
		return null;
	}

	private JMenuItem createMarkerItem(final String oldName) {
		JMenuItem editMarkerItem = new JMenuItem(Inter.getLocText(new String[]{"Edit", "Image", "Marker"}));
		editMarkerItem.addActionListener(new ActionListener() {
			public void actionPerformed(ActionEvent e) {
				final MapCustomPane image = new MapCustomPane();
				image.setImageSelectType(MapShapeValue.POINT);
				image.populateBean(oldName);
				mapCheckBeforeEdit(oldName);
				final Image oldImage = getMapImage(oldName);
				BasicDialog dialog = image.showMediumWindow(SwingUtilities.getWindowAncestor(image), new DialogActionAdapter() {
					public void doOk() {
						image.updateBean();
						
						Image newImage = getMapImage(oldName);
						if(!ComparatorUtils.equals(oldImage, newImage)) {
							fireStateChange();
						}

                        //versionID递增
                        MapSvgAttr old = MapSvgXMLHelper.getInstance().getMapAttr(oldName);
                        if(old != null) {
                            old.addVersionID();
                        }

						saveMapInfo(oldName);
						refresh();
					}
				});
				dialog.setVisible(true);
			}
		});
		return editMarkerItem;
	}

	private JMenuItem createLayerItem(final String oldName) {
		JMenuItem corrItem = new JMenuItem(Inter.getLocText(new String[]{"Filed", "Corresponding_Fields"}));
		corrItem.addActionListener(new ActionListener() {
			public void actionPerformed(ActionEvent e) {
				final MapDefiAreaNamePane namedPane = new MapDefiAreaNamePane();
				namedPane.populateBean(oldName);
				mapCheckBeforeEdit(oldName);
				BasicDialog dialog = namedPane.showMediumWindow(SwingUtilities.getWindowAncestor(namedPane), new DialogActionAdapter() {
					public void doOk() {
						namedPane.updateBean();// 地图的名称 value对应情况

                        MapSvgAttr old = MapSvgXMLHelper.getInstance().getMapAttr(oldName);
                        if(old != null) {
                            old.addVersionID();
                        }

						saveMapInfo(oldName);
					}
				});
				dialog.setVisible(true);
				refresh();
			}
		});

		return corrItem;
	}

	private void showRenameWaring(String newName){
		JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), "\"" + newName + "\"" + Inter.getLocText("Utils-has_been_existed")
          + "!", Inter.getLocText("FR-Designer_Alert"), JOptionPane.WARNING_MESSAGE);
	}

	private JMenuItem createRenameItem() {
		JMenuItem renameItem = new JMenuItem(Inter.getLocText("FR-Chart-Map_Rename"));
		renameItem.addActionListener(new ActionListener() {
			public void actionPerformed(ActionEvent e) {
				String newName = JOptionPane.showInputDialog(DesignerContext.getDesignerFrame().getContentPane(), 
						Inter.getLocText("FR-Chart-Map_Rename"), groupExtensionPane.getSelectedObject());
				if (StringUtils.isNotBlank(newName)) {
					String oldName = Utils.objectToString(groupExtensionPane.getSelectedObject());
					if(ComparatorUtils.equals(oldName, newName)){
						return;
					}
					//本地在看看临时的helper里面有没有
					if(MapSvgXMLHelper.getInstance().getNewMapAttr(newName) != null){
						showRenameWaring(newName);
						return;
					}
					try{//提醒名字已存在
						if(FRContext.getCurrentEnv().fileExists(StableUtils.pathJoin(
								new String[]{MapSvgXMLHelper.relativeDefaultMapPath(),newName+SvgProvider.EXTENSION}))){
							showRenameWaring(newName);
							return;
						}
						if(FRContext.getCurrentEnv().fileExists(StableUtils.pathJoin(
								new String[]{MapSvgXMLHelper.relativeCustomMapPath(), newName + SvgProvider.EXTENSION}))){
							showRenameWaring(newName);
							return;
						}
						MapSvgAttr editingAttr = MapSvgXMLHelper.getInstance().getMapAttr(oldName);
						if(editingAttr == null){
							editingAttr = MapSvgXMLHelper.getInstance().getNewMapAttr(oldName);
						}
						if( editingAttr == null) {
							return;
						}
						editingAttr.renameMap(newName);
						groupExtensionPane.setValueAtCurrentSelectIndex(newName);
						fireStateChange();
						saveMapInfo(newName);
						FRContext.getCurrentEnv().deleteFile(
								StableUtils.pathJoin(new String[]{MapSvgXMLHelper.relativeDefaultMapPath(),oldName+SvgProvider.EXTENSION}));
						FRContext.getCurrentEnv().deleteFile(
								StableUtils.pathJoin(new String[]{MapSvgXMLHelper.relativeCustomMapPath(),oldName+SvgProvider.EXTENSION}));
						refresh();
					}catch (Exception exp){
						FRLogger.getLogger().error(exp.getMessage());
					}
				}
			}
		});
		return renameItem;
	}

	private void refresh() {
		this.validate();
		this.repaint();
		
		DesignerFrame frame = DesignerContext.getDesignerFrame();
		if(frame != null) {
			frame.repaint();//kunsnat: 图表属性没变, 只是读取时 内容变化.
		}
	}

    //保存修改过的地图信息
	private void saveMapInfo(final String mapName) {
		SwingWorker worker = new SwingWorker<Integer, Void>() {
			@Override
			protected Integer doInBackground() throws Exception {
				MapSvgAttr attr = MapSvgXMLHelper.getInstance().getMapAttr(mapName);// 只有在编辑地图时才需要储存相关数据 @kuns
                if(attr != null){
                    attr.writeBack(mapName);
                }
				return 0;
			}

			@Override
			protected void done() {
				FRLogger.getLogger().info(Inter.getLocText("FR-Chart-Map_Saved")); // 地图已经保存.
			}

		};
		worker.execute();
		DesignerEnvManager.addWorkers(worker);
	}

	private void fireStateChange() {
		for (int i = changeListeners.size(); i > 0; i--) {
			changeListeners.get(i - 1).stateChanged(new javax.swing.event.ChangeEvent(this));
		}
	}

    /**
     * 更新地图属性
     * @return 返回地图名称.
     */
	public String updateBean(MapPlot plot) {
        if(!hasPopulated){
            this.populateBean(plot);
            hasPopulated = true;
        }

        MapHelper helper = plot.isSvgMap() ? MapSvgXMLHelper.getInstance() : MapXMLHelper.getInstance();

        helper.clearCateNames();
        for (String type : TYPE_NAMES) {
            Object[] datas = groupExtensionPane.getData(type);
            for (Object name : datas) {
                helper.addCateNames(type, name);
            }
        }

        return Utils.objectToString(groupExtensionPane.getSelectedObject());
	}

    /**
     * 更新地图名称
     * @param mapPlot 地图
     */
	public void populateBean(MapPlot mapPlot) {
        hasPopulated = false;
		groupExtensionPane.clearData();

		for (String type : TYPE_NAMES) {
            MapHelper helper = mapPlot.isSvgMap() ? MapSvgXMLHelper.getInstance() : MapXMLHelper.getInstance();
			java.util.List list = helper.getNamesListWithCateName(type);
			for (Object name : list) {
				groupExtensionPane.addData(name, type);
			}
		}

		groupExtensionPane.setSelectedObject(mapPlot.getMapName());

        hasPopulated = true;
	}

	/**
	 * 给组件登记一个观察者监听事件
	 *
	 * @param listener 观察者监听事件
	 */
	public void registerChangeListener(final UIObserverListener listener) {
		changeListeners.add(new javax.swing.event.ChangeListener() {
			public void stateChanged(javax.swing.event.ChangeEvent e) {
				listener.doChange();
			}
		});
	}

	/**
	 * 组件是否需要响应添加的观察者事件
	 *
	 * @return 如果需要响应观察者事件则返回true，否则返回false
	 */
	public boolean shouldResponseChangeListener() {
		return true;
	}

    public void setEnabled(boolean isEnabled){
        super.setEnabled(isEnabled);
        addButton.setEnabled(isEnabled);
        popupMenu.setEnabled(isEnabled);
        groupExtensionPane.setEnabled(isEnabled);
    }
}
\ No newline at end of file
+package com.fr.design.chart.series.PlotSeries;

import com.fr.base.BaseUtils;
import com.fr.base.FRContext;
import com.fr.base.MapHelper;
import com.fr.base.MapXMLHelper;
import com.fr.base.Utils;
import com.fr.chart.base.MapSvgAttr;
import com.fr.chart.base.MapSvgXMLHelper;
import com.fr.chart.chartattr.MapPlot;
import com.fr.chart.chartglyph.MapShapeValue;
import com.fr.design.DesignerEnvManager;
import com.fr.design.constants.UIConstants;
import com.fr.design.dialog.BasicDialog;
import com.fr.design.dialog.BasicPane;
import com.fr.design.dialog.DialogActionAdapter;
import com.fr.design.event.ChangeEvent;
import com.fr.design.event.ChangeListener;
import com.fr.design.event.UIObserver;
import com.fr.design.event.UIObserverListener;
import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.mainframe.DesignerContext;
import com.fr.design.mainframe.DesignerFrame;
import com.fr.general.ComparatorUtils;
import com.fr.general.FRLogger;
import com.fr.general.Inter;
import com.fr.stable.CoreConstants;
import com.fr.stable.StableUtils;
import com.fr.stable.StringUtils;
import com.fr.stable.SvgProvider;

import javax.swing.*;
import javax.swing.event.ListSelectionEvent;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseEvent;
import java.awt.geom.RoundRectangle2D;
import java.util.ArrayList;

/**
 * Created by IntelliJ IDEA.
 * Author : Richer
 * Version: 7.0.3
 * Date: 12-12-29
 * Time: 下午2:41
 */
public class MapGroupExtensionPane extends BasicPane implements UIObserver {
	private static final String[] TYPE_NAMES = new String[]{
			Inter.getLocText("FR-Chart-World_Map"),
			Inter.getLocText("FR-Chart-State_Map"),
			Inter.getLocText("FR-Chart-Province_Map"),
			Inter.getLocText("FR-Chart-Custom_Map")};
	private static final int WORD = 0;
	private static final int NATION = 1;
	private static final int STATE = 2;
	private static final int USER = 3;
	private static final int OFFSET_X = 800;
	private static final int OFFSET_Y = 250;

	private UIGroupExtensionPane groupExtensionPane;
	private UIButton addButton;
	private JPopupMenu popupMenu;
	private ArrayList<javax.swing.event.ChangeListener> changeListeners = new ArrayList<javax.swing.event.ChangeListener>();
    private boolean hasPopulated = false;

	@Override
	protected String title4PopupWindow() {
		return "Map";
	}

	public MapGroupExtensionPane() {
		setLayout(new BorderLayout());
		groupExtensionPane = new UIGroupExtensionPane(TYPE_NAMES){

			/**
			 * 新添加的数据的序号
			 * @param data 数据
			 */
			protected void dealNewAddedDataIndex(Object data){
				String newName = (String)data;
				MapSvgXMLHelper helper =  MapSvgXMLHelper.getInstance();
				if(helper.getNewMapAttr(newName) != null){
					return;
				}
				MapSvgAttr attr = new MapSvgAttr();
				attr.setFilePath(MapSvgXMLHelper.customMapPath() + CoreConstants.SEPARATOR + newName + ".svg");
				helper.addNewSvgMaps(attr.getName(), attr);
			}


			/**
			 * 一次鼠标的点击会有两次事件响应（按下和释放）。前者的事件属性中getValueIsAdjusting()=true，后者是false。
			 * 是否响应list值改变
			 * @return 鼠标按下时不响应，先响应mousePress事件，在鼠标释放是再响应list值改编的事件,并且点击删除不触发更新,并且populate后触发更新
			 */
			protected boolean isRespondToValueChange(ListSelectionEvent e){
				return !e.getValueIsAdjusting() && !this.isPressOnDelete() && hasPopulated;
			}
		};
		groupExtensionPane.addSelectionChangeListener(new ChangeListener() {
			@Override
			public void fireChanged(ChangeEvent event) {
				fireStateChange();
			}
		});
		groupExtensionPane.addItemEditListener(new ChangeListener() {
			@Override
			public void fireChanged(ChangeEvent event) {
				doEdit(event);
			}
		});
		groupExtensionPane.addDeleteListener(new ChangeListener() {
			@Override
			public void fireChanged(ChangeEvent event) {
                //这么写有点问题
                String oldName = Utils.objectToString(groupExtensionPane.getSelectedObject());
				saveMapInfo(oldName);
			}
		});
		setPreferredSize(new Dimension(400, 210));
		add(groupExtensionPane, BorderLayout.CENTER);

		addButton = new UIButton(BaseUtils.readIcon("/com/fr/design/images/buttonicon/add.png")) {
			@Override
			protected void paintBorder(Graphics g) {
				Graphics2D g2d = (Graphics2D) g;
				g2d.setStroke(UIConstants.BS);
				Shape shape = new RoundRectangle2D.Float(0.5f, 0.5f, getWidth() - 1, getHeight() - 1, UIConstants.ARC, UIConstants.ARC);
				g2d.setColor(UIConstants.LINE_COLOR);
				g2d.draw(shape);
			}
		};
		addButton.addActionListener(new ActionListener() {
			@Override
			public void actionPerformed(ActionEvent e) {
				popupMenu.show(MapGroupExtensionPane.this, addButton.getX() + 1, addButton.getY() + addButton.getHeight());
			}
		});
		add(addButton, BorderLayout.SOUTH);
		initPopupMenu();
	}

	private void initPopupMenu() {
		popupMenu = new JPopupMenu() {
			@Override
			public Dimension getPreferredSize() {
				Dimension dimension = new Dimension();
				dimension.height = super.getPreferredSize().height;
				dimension.width = addButton.getWidth() - 2;
				return dimension;
			}
		};
		JMenuItem worldMap = new JMenuItem(TYPE_NAMES[WORD]);
		popupMenu.add(worldMap);
		worldMap.addActionListener(new ActionListener() {
			public void actionPerformed(ActionEvent e) {
				groupExtensionPane.addData(TYPE_NAMES[WORD], TYPE_NAMES[WORD], true);
			}
		});

		JMenuItem countMap = new JMenuItem(TYPE_NAMES[NATION]);
		popupMenu.add(countMap);
		countMap.addActionListener(new ActionListener() {
			public void actionPerformed(ActionEvent e) {
				groupExtensionPane.addData(TYPE_NAMES[NATION],
						TYPE_NAMES[NATION], true);
			}
		});

		JMenuItem proMap = new JMenuItem(TYPE_NAMES[STATE]);
		popupMenu.add(proMap);
		proMap.addActionListener(new ActionListener() {
			public void actionPerformed(ActionEvent e) {
				groupExtensionPane.addData(TYPE_NAMES[STATE],
						TYPE_NAMES[STATE], true);
			}
		});

		JMenuItem menu = new JMenuItem(TYPE_NAMES[USER]);
		popupMenu.add(menu);
		menu.addActionListener(new ActionListener() {
			public void actionPerformed(ActionEvent e) {
				groupExtensionPane.addData(TYPE_NAMES[USER],
						TYPE_NAMES[USER], true);
			}
		});
	}

	private void doEdit(ChangeEvent e) {
		MouseEvent event = (MouseEvent) e.getSource();
		JPopupMenu editPopMenu = new JPopupMenu();

		final String oldName = Utils.objectToString(groupExtensionPane.getSelectedObject());
		editPopMenu.add(createAreaItem(oldName));
		editPopMenu.add(createMarkerItem(oldName));
		editPopMenu.add(createLayerItem(oldName));
		editPopMenu.add(createRenameItem());

		editPopMenu.show(MapGroupExtensionPane.this, event.getXOnScreen() - OFFSET_X, event.getYOnScreen() - OFFSET_Y);
	}

	private void mapCheckBeforeEdit(String name){
		if(MapSvgXMLHelper.getInstance().containsMapName(name) || MapSvgXMLHelper.getInstance().getNewMapAttr(name)!=null){
			return;
		}
		MapSvgAttr attr = new MapSvgAttr();
        attr.setFilePath(MapSvgXMLHelper.customMapPath() + CoreConstants.SEPARATOR + name + ".svg");
		MapSvgXMLHelper.getInstance().addNewSvgMaps(name,attr);
	}

	private JMenuItem createAreaItem(final String oldName) {
		JMenuItem editFileItem = new JMenuItem(Inter.getLocText(new String[]{"Edit", "Image", "Filed"}));
		editFileItem.addActionListener(new ActionListener() {
			public void actionPerformed(ActionEvent e) {
				final MapCustomPane image = new MapCustomPane();
				image.setImageSelectType(MapShapeValue.AREA);
				image.populateBean(oldName);
                image.setTypeNameAndMapName(groupExtensionPane.getSelectedType(), Utils.objectToString(groupExtensionPane.getSelectedObject()));
				mapCheckBeforeEdit(oldName);
				final Image oldImage = getMapImage(oldName);
				BasicDialog dialog = image.showMediumWindow(SwingUtilities.getWindowAncestor(MapGroupExtensionPane.this), new DialogActionAdapter() {
					public void doOk() {
						image.updateBean(); // 比较两个前后的名字是否相同,  是图片  如果图片不同, 则直接比较
						
						Image newImage = getMapImage(oldName);
						if(!ComparatorUtils.equals(oldImage, newImage)) {
							fireStateChange();
						}

                        //versionID递增
                        MapSvgAttr old = MapSvgXMLHelper.getInstance().getMapAttr(oldName);
                        if(old != null) {
                            old.addVersionID();
                        }

						saveMapInfo(oldName);
						refresh();
					}
				});
				dialog.setVisible(true);
			}
		});
		return editFileItem;
	}

    //根据地图的名字返回地图的图片
	private Image getMapImage(String mapName) {
		if (MapSvgXMLHelper.getInstance().containsMapName(mapName)) {
			MapSvgAttr mapAttr =  MapSvgXMLHelper.getInstance().getMapAttr(mapName);
			if(mapAttr == null) {
				return null;
			}
			return mapAttr.getMapImage();
		}
		
		return null;
	}

	private JMenuItem createMarkerItem(final String oldName) {
		JMenuItem editMarkerItem = new JMenuItem(Inter.getLocText(new String[]{"Edit", "Image", "Marker"}));
		editMarkerItem.addActionListener(new ActionListener() {
			public void actionPerformed(ActionEvent e) {
				final MapCustomPane image = new MapCustomPane();
				image.setImageSelectType(MapShapeValue.POINT);
				image.populateBean(oldName);
				mapCheckBeforeEdit(oldName);
				final Image oldImage = getMapImage(oldName);
				BasicDialog dialog = image.showMediumWindow(SwingUtilities.getWindowAncestor(image), new DialogActionAdapter() {
					public void doOk() {
						image.updateBean();
						
						Image newImage = getMapImage(oldName);
						if(!ComparatorUtils.equals(oldImage, newImage)) {
							fireStateChange();
						}

                        //versionID递增
                        MapSvgAttr old = MapSvgXMLHelper.getInstance().getMapAttr(oldName);
                        if(old != null) {
                            old.addVersionID();
                        }

						saveMapInfo(oldName);
						refresh();
					}
				});
				dialog.setVisible(true);
			}
		});
		return editMarkerItem;
	}

	private JMenuItem createLayerItem(final String oldName) {
		JMenuItem corrItem = new JMenuItem(Inter.getLocText(new String[]{"Filed", "Corresponding_Fields"}));
		corrItem.addActionListener(new ActionListener() {
			public void actionPerformed(ActionEvent e) {
				final MapDefiAreaNamePane namedPane = new MapDefiAreaNamePane();
				namedPane.populateBean(oldName);
				mapCheckBeforeEdit(oldName);
				BasicDialog dialog = namedPane.showMediumWindow(SwingUtilities.getWindowAncestor(namedPane), new DialogActionAdapter() {
					public void doOk() {
						namedPane.updateBean();// 地图的名称 value对应情况

                        MapSvgAttr old = MapSvgXMLHelper.getInstance().getMapAttr(oldName);
                        if(old != null) {
                            old.addVersionID();
                        }

						saveMapInfo(oldName);
					}
				});
				dialog.setVisible(true);
				refresh();
			}
		});

		return corrItem;
	}

	private void showRenameWaring(String newName){
		JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), "\"" + newName + "\"" + Inter.getLocText("Utils-has_been_existed")
          + "!", Inter.getLocText("FR-Designer_Alert"), JOptionPane.WARNING_MESSAGE);
	}

	private JMenuItem createRenameItem() {
		JMenuItem renameItem = new JMenuItem(Inter.getLocText("FR-Chart-Map_Rename"));
		renameItem.addActionListener(new ActionListener() {
			public void actionPerformed(ActionEvent e) {
				String newName = JOptionPane.showInputDialog(DesignerContext.getDesignerFrame().getContentPane(), 
						Inter.getLocText("FR-Chart-Map_Rename"), groupExtensionPane.getSelectedObject());
				if (StringUtils.isNotBlank(newName)) {
					String oldName = Utils.objectToString(groupExtensionPane.getSelectedObject());
					if(ComparatorUtils.equals(oldName, newName)){
						return;
					}
					//本地在看看临时的helper里面有没有
					if(MapSvgXMLHelper.getInstance().getNewMapAttr(newName) != null){
						showRenameWaring(newName);
						return;
					}
					try{//提醒名字已存在
						if(FRContext.getCurrentEnv().fileExists(StableUtils.pathJoin(
								new String[]{MapSvgXMLHelper.relativeDefaultMapPath(),newName+SvgProvider.EXTENSION}))){
							showRenameWaring(newName);
							return;
						}
						if(FRContext.getCurrentEnv().fileExists(StableUtils.pathJoin(
								new String[]{MapSvgXMLHelper.relativeCustomMapPath(), newName + SvgProvider.EXTENSION}))){
							showRenameWaring(newName);
							return;
						}
						MapSvgAttr editingAttr = MapSvgXMLHelper.getInstance().getMapAttr(oldName);
						if(editingAttr == null){
							editingAttr = MapSvgXMLHelper.getInstance().getNewMapAttr(oldName);
						}
						if( editingAttr == null) {
							return;
						}
						editingAttr.renameMap(newName);
						groupExtensionPane.setValueAtCurrentSelectIndex(newName);
						fireStateChange();
						saveMapInfo(newName);
						FRContext.getCurrentEnv().deleteFile(
								StableUtils.pathJoin(new String[]{MapSvgXMLHelper.relativeDefaultMapPath(),oldName+SvgProvider.EXTENSION}));
						FRContext.getCurrentEnv().deleteFile(
								StableUtils.pathJoin(new String[]{MapSvgXMLHelper.relativeCustomMapPath(),oldName+SvgProvider.EXTENSION}));
						refresh();
					}catch (Exception exp){
						FRLogger.getLogger().error(exp.getMessage());
					}
				}
			}
		});
		return renameItem;
	}

	private void refresh() {
		this.validate();
		this.repaint();
		
		DesignerFrame frame = DesignerContext.getDesignerFrame();
		if(frame != null) {
			frame.repaint();//kunsnat: 图表属性没变, 只是读取时 内容变化.
		}
	}

    //保存修改过的地图信息
	private void saveMapInfo(final String mapName) {
		SwingWorker worker = new SwingWorker<Integer, Void>() {
			@Override
			protected Integer doInBackground() throws Exception {
				MapSvgAttr attr = MapSvgXMLHelper.getInstance().getMapAttr(mapName);// 只有在编辑地图时才需要储存相关数据 @kuns
                if(attr != null){
                    attr.writeBack(mapName);
                }
				return 0;
			}

			@Override
			protected void done() {
				FRLogger.getLogger().info(Inter.getLocText("FR-Chart-Map_Saved")); // 地图已经保存.
			}

		};
		worker.execute();
		DesignerEnvManager.addWorkers(worker);
	}

	private void fireStateChange() {
		for (int i = changeListeners.size(); i > 0; i--) {
			changeListeners.get(i - 1).stateChanged(new javax.swing.event.ChangeEvent(this));
		}
	}

    /**
     * 更新地图属性
     * @return 返回地图名称.
     */
	public String updateBean(MapPlot plot) {
        if(!hasPopulated){
            this.populateBean(plot);
            hasPopulated = true;
        }

        MapHelper helper = plot.isSvgMap() ? MapSvgXMLHelper.getInstance() : MapXMLHelper.getInstance();

        helper.clearCateNames();
        for (String type : TYPE_NAMES) {
            Object[] datas = groupExtensionPane.getData(type);
            for (Object name : datas) {
                helper.addCateNames(type, name);
            }
        }

        return Utils.objectToString(groupExtensionPane.getSelectedObject());
	}

    /**
     * 更新地图名称
     * @param mapPlot 地图
     */
	public void populateBean(MapPlot mapPlot) {
        hasPopulated = false;
		groupExtensionPane.clearData();

		for (String type : TYPE_NAMES) {
            MapHelper helper = mapPlot.isSvgMap() ? MapSvgXMLHelper.getInstance() : MapXMLHelper.getInstance();
			java.util.List list = helper.getNamesListWithCateName(type);
			for (Object name : list) {
				groupExtensionPane.addData(name, type);
			}
		}

		groupExtensionPane.setSelectedObject(mapPlot.getMapName());

        hasPopulated = true;
	}

	/**
	 * 给组件登记一个观察者监听事件
	 *
	 * @param listener 观察者监听事件
	 */
	public void registerChangeListener(final UIObserverListener listener) {
		changeListeners.add(new javax.swing.event.ChangeListener() {
			public void stateChanged(javax.swing.event.ChangeEvent e) {
				listener.doChange();
			}
		});
	}

	/**
	 * 组件是否需要响应添加的观察者事件
	 *
	 * @return 如果需要响应观察者事件则返回true，否则返回false
	 */
	public boolean shouldResponseChangeListener() {
		return true;
	}

    public void setEnabled(boolean isEnabled){
        super.setEnabled(isEnabled);
        addButton.setEnabled(isEnabled);
        popupMenu.setEnabled(isEnabled);
        groupExtensionPane.setEnabled(isEnabled);
    }
}
\ No newline at end of file
diff --git a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPopAttrPane.java b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPopAttrPane.java
index 92b7149cb..caa1ab85d 100644
--- a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPopAttrPane.java
+++ b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPopAttrPane.java
@@ -147,7 +147,7 @@ public class ChartHyperPopAttrPane extends AbstractChartAttrPane {
      * @return 标题
      */
 	public String title4PopupWindow() {
-		return Inter.getLocText("FR-Hyperlink_ChartHyperlink");
+		return Inter.getLocText("Plugin-ChartF_Hyperlink");
 	}
 
 }
\ No newline at end of file
diff --git a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java
index 1a68ad5e5..cd449d0db 100644
--- a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java
+++ b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java
@@ -45,7 +45,7 @@ public class ChartHyperPoplinkPane extends BasicBeanPane<ChartHyperPoplink> {
         ChartCollection cc = createChartCollection();
 		
 		chartComponent = new ChartComponent();
-		chartComponent.setPreferredSize(new Dimension(200, 170));// 在单元格弹出时 需要调整保证属性表的大小.
+		chartComponent.setPreferredSize(new Dimension(300, 170));// 在单元格弹出时 需要调整保证属性表的大小.
 		chartComponent.setSupportEdit(false);
 		chartComponent.populate(cc);
 		
diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/UIEditLabel.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/UIEditLabel.java
index c7c3c51c7..8351f2738 100644
--- a/designer_chart/src/com/fr/design/mainframe/chart/gui/UIEditLabel.java
+++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/UIEditLabel.java
@@ -16,7 +16,11 @@ import javax.swing.*;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 import java.awt.*;
-import java.awt.event.*;
+import java.awt.event.AWTEventListener;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
 
 /**
  * Created by IntelliJ IDEA.
@@ -126,7 +130,7 @@ public class UIEditLabel extends JPanel implements UIObserver{
              */
             public void mouseExited(MouseEvent e) {
                 showLabel.setToolTipText(getTooltip());
-                UIEditLabel.this.setBackground(UIConstants.NORMAL_BACKGROUND);
+                UIEditLabel.this.setBackground(UIConstants.SELECT_TAB);
             }
 
         });
@@ -149,7 +153,7 @@ public class UIEditLabel extends JPanel implements UIObserver{
      * 设置成正常的背景
      */
     public void resetNomalrBackground(){
-        UIEditLabel.this.setBackground(UIConstants.NORMAL_BACKGROUND);
+        UIEditLabel.this.setBackground(UIConstants.SELECT_TAB);
     }
 
     private String getTooltip(){
diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/other/ChartInteractivePane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/other/ChartInteractivePane.java
index f8b002bcf..a56468c73 100644
--- a/designer_chart/src/com/fr/design/mainframe/chart/gui/other/ChartInteractivePane.java
+++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/other/ChartInteractivePane.java
@@ -6,7 +6,16 @@ import com.fr.base.chart.chartdata.TopDefinitionProvider;
 import com.fr.chart.base.AttrContents;
 import com.fr.chart.base.ChartConstants;
 import com.fr.chart.base.TimeSwitchAttr;
-import com.fr.chart.chartattr.*;
+import com.fr.chart.chartattr.BubblePlot;
+import com.fr.chart.chartattr.Chart;
+import com.fr.chart.chartattr.GanttPlot;
+import com.fr.chart.chartattr.GisMapPlot;
+import com.fr.chart.chartattr.MapPlot;
+import com.fr.chart.chartattr.MeterPlot;
+import com.fr.chart.chartattr.PiePlot;
+import com.fr.chart.chartattr.Plot;
+import com.fr.chart.chartattr.StockPlot;
+import com.fr.chart.chartattr.XYScatterPlot;
 import com.fr.chart.chartdata.GisMapReportDefinition;
 import com.fr.chart.chartdata.GisMapTableDefinition;
 import com.fr.chart.web.ChartHyperPoplink;
@@ -39,7 +48,16 @@ import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.chart.gui.ChartOtherPane;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.Inter;
-import com.fr.js.*;
+import com.fr.js.EmailJavaScript;
+import com.fr.js.FormHyperlinkProvider;
+import com.fr.js.JavaScript;
+import com.fr.js.JavaScriptImpl;
+import com.fr.js.NameJavaScript;
+import com.fr.js.NameJavaScriptGroup;
+import com.fr.js.ParameterJavaScript;
+import com.fr.js.ReportletHyperlink;
+import com.fr.js.WebHyperlink;
+import com.fr.plugin.chart.designer.component.format.FormatPaneWithOutFont;
 import com.fr.stable.Constants;
 import com.fr.stable.StringUtils;
 import com.fr.stable.bridge.StableFactory;
@@ -48,7 +66,12 @@ import com.fr.third.org.hsqldb.lib.Iterator;
 
 import javax.swing.*;
 import java.awt.*;
-import java.awt.event.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
 import java.text.DecimalFormat;
 import java.text.Format;
 import java.util.ArrayList;
@@ -215,7 +238,7 @@ public class ChartInteractivePane extends BasicScrollPane<Chart> implements UIOb
             @Override
             public void mouseClicked(MouseEvent e) {
                 if (percentFormatPane == null) {
-                    percentFormatPane = new FormatPane();
+                    percentFormatPane = new FormatPaneWithOutFont();
                 }
 
                 DecimalFormat defaultFormat = new CoreDecimalFormat(new DecimalFormat(), "#.##%");
diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/style/ChartDatapointLabelPane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/style/ChartDatapointLabelPane.java
index 6afc7b7d7..1b9c89e02 100644
--- a/designer_chart/src/com/fr/design/mainframe/chart/gui/style/ChartDatapointLabelPane.java
+++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/style/ChartDatapointLabelPane.java
@@ -9,6 +9,7 @@ import com.fr.chart.base.ChartConstants;
 import com.fr.chart.base.DataSeriesCondition;
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.constants.LayoutConstants;
+import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.frpane.UIBubbleFloatPane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icheckbox.UICheckBox;
@@ -18,15 +19,20 @@ import com.fr.design.gui.style.FormatPane;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.chart.gui.ChartStylePane;
-import com.fr.design.dialog.BasicPane;
 import com.fr.general.FRFont;
 import com.fr.general.Inter;
+import com.fr.plugin.chart.designer.component.format.FormatPaneWithOutFont;
 import com.fr.stable.Constants;
 import com.fr.stable.StringUtils;
 
 import javax.swing.*;
 import java.awt.*;
-import java.awt.event.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
 import java.text.DecimalFormat;
 import java.text.Format;
 import java.util.HashMap;
@@ -226,7 +232,7 @@ public class ChartDatapointLabelPane extends BasicPane{
                     }
 
                     if(valueFormatPane == null) {
-                        valueFormatPane =  new FormatPane();
+                        valueFormatPane =  new FormatPaneWithOutFont();
                     }
                     Point comPoint = valueFormatButton.getLocationOnScreen();
                     Point arrowPoint = new Point(comPoint.x + valueFormatButton.getWidth(), comPoint.y + valueFormatButton.getHeight());
@@ -255,7 +261,7 @@ public class ChartDatapointLabelPane extends BasicPane{
                     }
 
                     if(percentFormatPane == null) {
-                        percentFormatPane =  new FormatPane();
+                        percentFormatPane =  new FormatPaneWithOutFont();
                     }
                     Point comPoint = valuePercentFormatButton.getLocationOnScreen();
                     Point arrowPoint = new Point(comPoint.x + valuePercentFormatButton.getWidth(), comPoint.y + valuePercentFormatButton.getHeight());
@@ -429,7 +435,7 @@ public class ChartDatapointLabelPane extends BasicPane{
 	protected void updatePercentFormatpane(){
 		if(isValuePercent!= null && isValuePercent.isSelected()){
             if(this.percentFormatPane == null){
-                this.percentFormatPane = new FormatPane();
+                this.percentFormatPane = new FormatPaneWithOutFont();
             }
             if(this.percentFormat == null){
                 DecimalFormat defaultFormat = new CoreDecimalFormat(new DecimalFormat("#.##%"), "#.##%");
diff --git a/designer_chart/src/com/fr/plugin/chart/custom/component/VanChartHyperLinkPane.java b/designer_chart/src/com/fr/plugin/chart/custom/component/VanChartHyperLinkPane.java
index 10fef883d..03296ad97 100644
--- a/designer_chart/src/com/fr/plugin/chart/custom/component/VanChartHyperLinkPane.java
+++ b/designer_chart/src/com/fr/plugin/chart/custom/component/VanChartHyperLinkPane.java
@@ -121,6 +121,7 @@ public class VanChartHyperLinkPane extends UIListControlPane {
             return;
         }
         update((VanChartPlot) plot);
+        DesignerContext.getDesignerFrame().getSelectedJTemplate().fireTargetModified();
     }
 
     public void populate(Plot plot) {
diff --git a/designer_chart/src/com/fr/plugin/chart/designer/AbstractVanChartScrollPane.java b/designer_chart/src/com/fr/plugin/chart/designer/AbstractVanChartScrollPane.java
index f05028672..d96250799 100644
--- a/designer_chart/src/com/fr/plugin/chart/designer/AbstractVanChartScrollPane.java
+++ b/designer_chart/src/com/fr/plugin/chart/designer/AbstractVanChartScrollPane.java
@@ -27,6 +27,7 @@ public abstract class AbstractVanChartScrollPane<T> extends BasicScrollPane<T> {
 
         } else {
             leftcontentPane.setBounds(0, 0, width, height);
+            leftcontentPane.setBorder(BorderFactory.createMatteBorder(0, 5, 0, 10, original));
         }
     }
     public void reloaPane(JPanel pane){
diff --git a/designer_chart/src/com/fr/plugin/chart/designer/component/format/VanChartFormatPaneWithCheckBox.java b/designer_chart/src/com/fr/plugin/chart/designer/component/format/VanChartFormatPaneWithCheckBox.java
index 2319956f1..1ac6a7a27 100644
--- a/designer_chart/src/com/fr/plugin/chart/designer/component/format/VanChartFormatPaneWithCheckBox.java
+++ b/designer_chart/src/com/fr/plugin/chart/designer/component/format/VanChartFormatPaneWithCheckBox.java
@@ -92,7 +92,7 @@ public abstract class VanChartFormatPaneWithCheckBox extends JPanel{
                         formatPane =  createFormatPane();
                     }
                     Point comPoint = formatButton.getLocationOnScreen();
-                    Point arrowPoint = new Point(comPoint.x + formatButton.getWidth(), comPoint.y + formatButton.getHeight());
+                    Point arrowPoint = new Point(comPoint.x, comPoint.y + formatButton.getHeight());
                     UIBubbleFloatPane<Style> pane = new UIBubbleFloatPane(Constants.LEFT, arrowPoint, formatPane, 258, 209) {
 
                         @Override
diff --git a/designer_chart/src/com/fr/plugin/chart/designer/other/AutoRefreshPane.java b/designer_chart/src/com/fr/plugin/chart/designer/other/AutoRefreshPane.java
index 3bd6f9b4d..b47ff08a2 100644
--- a/designer_chart/src/com/fr/plugin/chart/designer/other/AutoRefreshPane.java
+++ b/designer_chart/src/com/fr/plugin/chart/designer/other/AutoRefreshPane.java
@@ -10,7 +10,6 @@ import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ispinner.UISpinner;
 import com.fr.design.layout.TableLayout;
-import com.fr.design.layout.TableLayoutHelper;
 import com.fr.general.Inter;
 import com.fr.plugin.chart.attr.plot.VanChartPlot;
 import com.fr.plugin.chart.base.RefreshMoreLabel;
@@ -86,11 +85,19 @@ public class AutoRefreshPane extends BasicBeanPane<RefreshMoreLabel> {
         double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
         double[] columnSize = {p, f, 20};
-        double[] rowSize = {p, p};
+        double[] column = {f, 20};
+        double[] rowSize = {p};
 
         Component[][] components = initComponent(jPanel);
-        contentPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
-        contentPane.setBorder(BorderFactory.createEmptyBorder(0,12,0,0));
+        JPanel panel1 = TableLayout4VanChartHelper.createGapTableLayoutPane(components, rowSize, columnSize);
+        contentPane = new JPanel(new BorderLayout());
+        contentPane.add(panel1, BorderLayout.CENTER);
+
+        Component[][] AutoTooltipComponent = initAutoTooltipComponent();
+        JPanel panel2 = TableLayout4VanChartHelper.createGapTableLayoutPane(AutoTooltipComponent, rowSize, column);
+        panel2.setBorder(BorderFactory.createEmptyBorder(10, 0,0,0));
+        contentPane.add(panel2, BorderLayout.SOUTH);
+        contentPane.setBorder(BorderFactory.createEmptyBorder(0, 72,0,0));
         content.add(moreLabelPane, BorderLayout.NORTH);
         content.add(contentPane, BorderLayout.CENTER);
         return content;
@@ -105,6 +112,13 @@ public class AutoRefreshPane extends BasicBeanPane<RefreshMoreLabel> {
 
     }
 
+    protected Component[][] initAutoTooltipComponent () {
+
+        return new Component[][]{
+                new Component[]{autoTooltip, tooltipSet},
+        };
+    }
+
     private void initTooltipSet() {
         tooltipSet = new UIButton(BaseUtils.readIcon("/com/fr/design/images/buttonicon/config.png"));
         tooltipSet.setPreferredSize(new Dimension(20, 20));
diff --git a/designer_chart/src/com/fr/plugin/chart/designer/other/AutoRefreshPaneWithoutTooltip.java b/designer_chart/src/com/fr/plugin/chart/designer/other/AutoRefreshPaneWithoutTooltip.java
index a74af70ee..38ba64111 100644
--- a/designer_chart/src/com/fr/plugin/chart/designer/other/AutoRefreshPaneWithoutTooltip.java
+++ b/designer_chart/src/com/fr/plugin/chart/designer/other/AutoRefreshPaneWithoutTooltip.java
@@ -1,11 +1,8 @@
 package com.fr.plugin.chart.designer.other;
 
-import com.fr.design.gui.ilable.UILabel;
-import com.fr.general.Inter;
 import com.fr.plugin.chart.base.RefreshMoreLabel;
 import com.fr.plugin.chart.vanchart.VanChart;
 
-import javax.swing.*;
 import java.awt.*;
 
 /**
@@ -17,9 +14,9 @@ public class AutoRefreshPaneWithoutTooltip extends AutoRefreshPane {
         super(chart, isLargeModel);
     }
 
-    protected Component[][] initComponent(JPanel autoTooltipPane){
+    protected Component[][] initAutoTooltipComponent () {
         return new Component[][]{
-                new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Time_Interval")), getAutoRefreshTime(),new UILabel(Inter.getLocText("Chart-Time_Seconds"))}
+                new Component[]{null, null},
         };
     }
 

From cf8d180a16e737e3fac6112e12cd901ab64dd32e Mon Sep 17 00:00:00 2001
From: mengao <283296419@qq.com>
Date: Thu, 7 Sep 2017 11:17:37 +0800
Subject: [PATCH 05/24] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8D=A2=E8=A1=8C?=
 =?UTF-8?q?=E7=AC=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PlotSeries/MapGroupExtensionPane.java     | 489 +++++++++++++++++-
 1 file changed, 488 insertions(+), 1 deletion(-)

diff --git a/designer_chart/src/com/fr/design/chart/series/PlotSeries/MapGroupExtensionPane.java b/designer_chart/src/com/fr/design/chart/series/PlotSeries/MapGroupExtensionPane.java
index c4a5cea5c..47b76a578 100644
--- a/designer_chart/src/com/fr/design/chart/series/PlotSeries/MapGroupExtensionPane.java
+++ b/designer_chart/src/com/fr/design/chart/series/PlotSeries/MapGroupExtensionPane.java
@@ -1 +1,488 @@
-package com.fr.design.chart.series.PlotSeries;

import com.fr.base.BaseUtils;
import com.fr.base.FRContext;
import com.fr.base.MapHelper;
import com.fr.base.MapXMLHelper;
import com.fr.base.Utils;
import com.fr.chart.base.MapSvgAttr;
import com.fr.chart.base.MapSvgXMLHelper;
import com.fr.chart.chartattr.MapPlot;
import com.fr.chart.chartglyph.MapShapeValue;
import com.fr.design.DesignerEnvManager;
import com.fr.design.constants.UIConstants;
import com.fr.design.dialog.BasicDialog;
import com.fr.design.dialog.BasicPane;
import com.fr.design.dialog.DialogActionAdapter;
import com.fr.design.event.ChangeEvent;
import com.fr.design.event.ChangeListener;
import com.fr.design.event.UIObserver;
import com.fr.design.event.UIObserverListener;
import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.mainframe.DesignerContext;
import com.fr.design.mainframe.DesignerFrame;
import com.fr.general.ComparatorUtils;
import com.fr.general.FRLogger;
import com.fr.general.Inter;
import com.fr.stable.CoreConstants;
import com.fr.stable.StableUtils;
import com.fr.stable.StringUtils;
import com.fr.stable.SvgProvider;

import javax.swing.*;
import javax.swing.event.ListSelectionEvent;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseEvent;
import java.awt.geom.RoundRectangle2D;
import java.util.ArrayList;

/**
 * Created by IntelliJ IDEA.
 * Author : Richer
 * Version: 7.0.3
 * Date: 12-12-29
 * Time: 下午2:41
 */
public class MapGroupExtensionPane extends BasicPane implements UIObserver {
	private static final String[] TYPE_NAMES = new String[]{
			Inter.getLocText("FR-Chart-World_Map"),
			Inter.getLocText("FR-Chart-State_Map"),
			Inter.getLocText("FR-Chart-Province_Map"),
			Inter.getLocText("FR-Chart-Custom_Map")};
	private static final int WORD = 0;
	private static final int NATION = 1;
	private static final int STATE = 2;
	private static final int USER = 3;
	private static final int OFFSET_X = 800;
	private static final int OFFSET_Y = 250;

	private UIGroupExtensionPane groupExtensionPane;
	private UIButton addButton;
	private JPopupMenu popupMenu;
	private ArrayList<javax.swing.event.ChangeListener> changeListeners = new ArrayList<javax.swing.event.ChangeListener>();
    private boolean hasPopulated = false;

	@Override
	protected String title4PopupWindow() {
		return "Map";
	}

	public MapGroupExtensionPane() {
		setLayout(new BorderLayout());
		groupExtensionPane = new UIGroupExtensionPane(TYPE_NAMES){

			/**
			 * 新添加的数据的序号
			 * @param data 数据
			 */
			protected void dealNewAddedDataIndex(Object data){
				String newName = (String)data;
				MapSvgXMLHelper helper =  MapSvgXMLHelper.getInstance();
				if(helper.getNewMapAttr(newName) != null){
					return;
				}
				MapSvgAttr attr = new MapSvgAttr();
				attr.setFilePath(MapSvgXMLHelper.customMapPath() + CoreConstants.SEPARATOR + newName + ".svg");
				helper.addNewSvgMaps(attr.getName(), attr);
			}


			/**
			 * 一次鼠标的点击会有两次事件响应（按下和释放）。前者的事件属性中getValueIsAdjusting()=true，后者是false。
			 * 是否响应list值改变
			 * @return 鼠标按下时不响应，先响应mousePress事件，在鼠标释放是再响应list值改编的事件,并且点击删除不触发更新,并且populate后触发更新
			 */
			protected boolean isRespondToValueChange(ListSelectionEvent e){
				return !e.getValueIsAdjusting() && !this.isPressOnDelete() && hasPopulated;
			}
		};
		groupExtensionPane.addSelectionChangeListener(new ChangeListener() {
			@Override
			public void fireChanged(ChangeEvent event) {
				fireStateChange();
			}
		});
		groupExtensionPane.addItemEditListener(new ChangeListener() {
			@Override
			public void fireChanged(ChangeEvent event) {
				doEdit(event);
			}
		});
		groupExtensionPane.addDeleteListener(new ChangeListener() {
			@Override
			public void fireChanged(ChangeEvent event) {
                //这么写有点问题
                String oldName = Utils.objectToString(groupExtensionPane.getSelectedObject());
				saveMapInfo(oldName);
			}
		});
		setPreferredSize(new Dimension(400, 210));
		add(groupExtensionPane, BorderLayout.CENTER);

		addButton = new UIButton(BaseUtils.readIcon("/com/fr/design/images/buttonicon/add.png")) {
			@Override
			protected void paintBorder(Graphics g) {
				Graphics2D g2d = (Graphics2D) g;
				g2d.setStroke(UIConstants.BS);
				Shape shape = new RoundRectangle2D.Float(0.5f, 0.5f, getWidth() - 1, getHeight() - 1, UIConstants.ARC, UIConstants.ARC);
				g2d.setColor(UIConstants.LINE_COLOR);
				g2d.draw(shape);
			}
		};
		addButton.addActionListener(new ActionListener() {
			@Override
			public void actionPerformed(ActionEvent e) {
				popupMenu.show(MapGroupExtensionPane.this, addButton.getX() + 1, addButton.getY() + addButton.getHeight());
			}
		});
		add(addButton, BorderLayout.SOUTH);
		initPopupMenu();
	}

	private void initPopupMenu() {
		popupMenu = new JPopupMenu() {
			@Override
			public Dimension getPreferredSize() {
				Dimension dimension = new Dimension();
				dimension.height = super.getPreferredSize().height;
				dimension.width = addButton.getWidth() - 2;
				return dimension;
			}
		};
		JMenuItem worldMap = new JMenuItem(TYPE_NAMES[WORD]);
		popupMenu.add(worldMap);
		worldMap.addActionListener(new ActionListener() {
			public void actionPerformed(ActionEvent e) {
				groupExtensionPane.addData(TYPE_NAMES[WORD], TYPE_NAMES[WORD], true);
			}
		});

		JMenuItem countMap = new JMenuItem(TYPE_NAMES[NATION]);
		popupMenu.add(countMap);
		countMap.addActionListener(new ActionListener() {
			public void actionPerformed(ActionEvent e) {
				groupExtensionPane.addData(TYPE_NAMES[NATION],
						TYPE_NAMES[NATION], true);
			}
		});

		JMenuItem proMap = new JMenuItem(TYPE_NAMES[STATE]);
		popupMenu.add(proMap);
		proMap.addActionListener(new ActionListener() {
			public void actionPerformed(ActionEvent e) {
				groupExtensionPane.addData(TYPE_NAMES[STATE],
						TYPE_NAMES[STATE], true);
			}
		});

		JMenuItem menu = new JMenuItem(TYPE_NAMES[USER]);
		popupMenu.add(menu);
		menu.addActionListener(new ActionListener() {
			public void actionPerformed(ActionEvent e) {
				groupExtensionPane.addData(TYPE_NAMES[USER],
						TYPE_NAMES[USER], true);
			}
		});
	}

	private void doEdit(ChangeEvent e) {
		MouseEvent event = (MouseEvent) e.getSource();
		JPopupMenu editPopMenu = new JPopupMenu();

		final String oldName = Utils.objectToString(groupExtensionPane.getSelectedObject());
		editPopMenu.add(createAreaItem(oldName));
		editPopMenu.add(createMarkerItem(oldName));
		editPopMenu.add(createLayerItem(oldName));
		editPopMenu.add(createRenameItem());

		editPopMenu.show(MapGroupExtensionPane.this, event.getXOnScreen() - OFFSET_X, event.getYOnScreen() - OFFSET_Y);
	}

	private void mapCheckBeforeEdit(String name){
		if(MapSvgXMLHelper.getInstance().containsMapName(name) || MapSvgXMLHelper.getInstance().getNewMapAttr(name)!=null){
			return;
		}
		MapSvgAttr attr = new MapSvgAttr();
        attr.setFilePath(MapSvgXMLHelper.customMapPath() + CoreConstants.SEPARATOR + name + ".svg");
		MapSvgXMLHelper.getInstance().addNewSvgMaps(name,attr);
	}

	private JMenuItem createAreaItem(final String oldName) {
		JMenuItem editFileItem = new JMenuItem(Inter.getLocText(new String[]{"Edit", "Image", "Filed"}));
		editFileItem.addActionListener(new ActionListener() {
			public void actionPerformed(ActionEvent e) {
				final MapCustomPane image = new MapCustomPane();
				image.setImageSelectType(MapShapeValue.AREA);
				image.populateBean(oldName);
                image.setTypeNameAndMapName(groupExtensionPane.getSelectedType(), Utils.objectToString(groupExtensionPane.getSelectedObject()));
				mapCheckBeforeEdit(oldName);
				final Image oldImage = getMapImage(oldName);
				BasicDialog dialog = image.showMediumWindow(SwingUtilities.getWindowAncestor(MapGroupExtensionPane.this), new DialogActionAdapter() {
					public void doOk() {
						image.updateBean(); // 比较两个前后的名字是否相同,  是图片  如果图片不同, 则直接比较
						
						Image newImage = getMapImage(oldName);
						if(!ComparatorUtils.equals(oldImage, newImage)) {
							fireStateChange();
						}

                        //versionID递增
                        MapSvgAttr old = MapSvgXMLHelper.getInstance().getMapAttr(oldName);
                        if(old != null) {
                            old.addVersionID();
                        }

						saveMapInfo(oldName);
						refresh();
					}
				});
				dialog.setVisible(true);
			}
		});
		return editFileItem;
	}

    //根据地图的名字返回地图的图片
	private Image getMapImage(String mapName) {
		if (MapSvgXMLHelper.getInstance().containsMapName(mapName)) {
			MapSvgAttr mapAttr =  MapSvgXMLHelper.getInstance().getMapAttr(mapName);
			if(mapAttr == null) {
				return null;
			}
			return mapAttr.getMapImage();
		}
		
		return null;
	}

	private JMenuItem createMarkerItem(final String oldName) {
		JMenuItem editMarkerItem = new JMenuItem(Inter.getLocText(new String[]{"Edit", "Image", "Marker"}));
		editMarkerItem.addActionListener(new ActionListener() {
			public void actionPerformed(ActionEvent e) {
				final MapCustomPane image = new MapCustomPane();
				image.setImageSelectType(MapShapeValue.POINT);
				image.populateBean(oldName);
				mapCheckBeforeEdit(oldName);
				final Image oldImage = getMapImage(oldName);
				BasicDialog dialog = image.showMediumWindow(SwingUtilities.getWindowAncestor(image), new DialogActionAdapter() {
					public void doOk() {
						image.updateBean();
						
						Image newImage = getMapImage(oldName);
						if(!ComparatorUtils.equals(oldImage, newImage)) {
							fireStateChange();
						}

                        //versionID递增
                        MapSvgAttr old = MapSvgXMLHelper.getInstance().getMapAttr(oldName);
                        if(old != null) {
                            old.addVersionID();
                        }

						saveMapInfo(oldName);
						refresh();
					}
				});
				dialog.setVisible(true);
			}
		});
		return editMarkerItem;
	}

	private JMenuItem createLayerItem(final String oldName) {
		JMenuItem corrItem = new JMenuItem(Inter.getLocText(new String[]{"Filed", "Corresponding_Fields"}));
		corrItem.addActionListener(new ActionListener() {
			public void actionPerformed(ActionEvent e) {
				final MapDefiAreaNamePane namedPane = new MapDefiAreaNamePane();
				namedPane.populateBean(oldName);
				mapCheckBeforeEdit(oldName);
				BasicDialog dialog = namedPane.showMediumWindow(SwingUtilities.getWindowAncestor(namedPane), new DialogActionAdapter() {
					public void doOk() {
						namedPane.updateBean();// 地图的名称 value对应情况

                        MapSvgAttr old = MapSvgXMLHelper.getInstance().getMapAttr(oldName);
                        if(old != null) {
                            old.addVersionID();
                        }

						saveMapInfo(oldName);
					}
				});
				dialog.setVisible(true);
				refresh();
			}
		});

		return corrItem;
	}

	private void showRenameWaring(String newName){
		JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), "\"" + newName + "\"" + Inter.getLocText("Utils-has_been_existed")
          + "!", Inter.getLocText("FR-Designer_Alert"), JOptionPane.WARNING_MESSAGE);
	}

	private JMenuItem createRenameItem() {
		JMenuItem renameItem = new JMenuItem(Inter.getLocText("FR-Chart-Map_Rename"));
		renameItem.addActionListener(new ActionListener() {
			public void actionPerformed(ActionEvent e) {
				String newName = JOptionPane.showInputDialog(DesignerContext.getDesignerFrame().getContentPane(), 
						Inter.getLocText("FR-Chart-Map_Rename"), groupExtensionPane.getSelectedObject());
				if (StringUtils.isNotBlank(newName)) {
					String oldName = Utils.objectToString(groupExtensionPane.getSelectedObject());
					if(ComparatorUtils.equals(oldName, newName)){
						return;
					}
					//本地在看看临时的helper里面有没有
					if(MapSvgXMLHelper.getInstance().getNewMapAttr(newName) != null){
						showRenameWaring(newName);
						return;
					}
					try{//提醒名字已存在
						if(FRContext.getCurrentEnv().fileExists(StableUtils.pathJoin(
								new String[]{MapSvgXMLHelper.relativeDefaultMapPath(),newName+SvgProvider.EXTENSION}))){
							showRenameWaring(newName);
							return;
						}
						if(FRContext.getCurrentEnv().fileExists(StableUtils.pathJoin(
								new String[]{MapSvgXMLHelper.relativeCustomMapPath(), newName + SvgProvider.EXTENSION}))){
							showRenameWaring(newName);
							return;
						}
						MapSvgAttr editingAttr = MapSvgXMLHelper.getInstance().getMapAttr(oldName);
						if(editingAttr == null){
							editingAttr = MapSvgXMLHelper.getInstance().getNewMapAttr(oldName);
						}
						if( editingAttr == null) {
							return;
						}
						editingAttr.renameMap(newName);
						groupExtensionPane.setValueAtCurrentSelectIndex(newName);
						fireStateChange();
						saveMapInfo(newName);
						FRContext.getCurrentEnv().deleteFile(
								StableUtils.pathJoin(new String[]{MapSvgXMLHelper.relativeDefaultMapPath(),oldName+SvgProvider.EXTENSION}));
						FRContext.getCurrentEnv().deleteFile(
								StableUtils.pathJoin(new String[]{MapSvgXMLHelper.relativeCustomMapPath(),oldName+SvgProvider.EXTENSION}));
						refresh();
					}catch (Exception exp){
						FRLogger.getLogger().error(exp.getMessage());
					}
				}
			}
		});
		return renameItem;
	}

	private void refresh() {
		this.validate();
		this.repaint();
		
		DesignerFrame frame = DesignerContext.getDesignerFrame();
		if(frame != null) {
			frame.repaint();//kunsnat: 图表属性没变, 只是读取时 内容变化.
		}
	}

    //保存修改过的地图信息
	private void saveMapInfo(final String mapName) {
		SwingWorker worker = new SwingWorker<Integer, Void>() {
			@Override
			protected Integer doInBackground() throws Exception {
				MapSvgAttr attr = MapSvgXMLHelper.getInstance().getMapAttr(mapName);// 只有在编辑地图时才需要储存相关数据 @kuns
                if(attr != null){
                    attr.writeBack(mapName);
                }
				return 0;
			}

			@Override
			protected void done() {
				FRLogger.getLogger().info(Inter.getLocText("FR-Chart-Map_Saved")); // 地图已经保存.
			}

		};
		worker.execute();
		DesignerEnvManager.addWorkers(worker);
	}

	private void fireStateChange() {
		for (int i = changeListeners.size(); i > 0; i--) {
			changeListeners.get(i - 1).stateChanged(new javax.swing.event.ChangeEvent(this));
		}
	}

    /**
     * 更新地图属性
     * @return 返回地图名称.
     */
	public String updateBean(MapPlot plot) {
        if(!hasPopulated){
            this.populateBean(plot);
            hasPopulated = true;
        }

        MapHelper helper = plot.isSvgMap() ? MapSvgXMLHelper.getInstance() : MapXMLHelper.getInstance();

        helper.clearCateNames();
        for (String type : TYPE_NAMES) {
            Object[] datas = groupExtensionPane.getData(type);
            for (Object name : datas) {
                helper.addCateNames(type, name);
            }
        }

        return Utils.objectToString(groupExtensionPane.getSelectedObject());
	}

    /**
     * 更新地图名称
     * @param mapPlot 地图
     */
	public void populateBean(MapPlot mapPlot) {
        hasPopulated = false;
		groupExtensionPane.clearData();

		for (String type : TYPE_NAMES) {
            MapHelper helper = mapPlot.isSvgMap() ? MapSvgXMLHelper.getInstance() : MapXMLHelper.getInstance();
			java.util.List list = helper.getNamesListWithCateName(type);
			for (Object name : list) {
				groupExtensionPane.addData(name, type);
			}
		}

		groupExtensionPane.setSelectedObject(mapPlot.getMapName());

        hasPopulated = true;
	}

	/**
	 * 给组件登记一个观察者监听事件
	 *
	 * @param listener 观察者监听事件
	 */
	public void registerChangeListener(final UIObserverListener listener) {
		changeListeners.add(new javax.swing.event.ChangeListener() {
			public void stateChanged(javax.swing.event.ChangeEvent e) {
				listener.doChange();
			}
		});
	}

	/**
	 * 组件是否需要响应添加的观察者事件
	 *
	 * @return 如果需要响应观察者事件则返回true，否则返回false
	 */
	public boolean shouldResponseChangeListener() {
		return true;
	}

    public void setEnabled(boolean isEnabled){
        super.setEnabled(isEnabled);
        addButton.setEnabled(isEnabled);
        popupMenu.setEnabled(isEnabled);
        groupExtensionPane.setEnabled(isEnabled);
    }
}
\ No newline at end of file
+package com.fr.design.chart.series.PlotSeries;
+
+import com.fr.base.BaseUtils;
+import com.fr.base.FRContext;
+import com.fr.base.MapHelper;
+import com.fr.base.MapXMLHelper;
+import com.fr.base.Utils;
+import com.fr.chart.base.MapSvgAttr;
+import com.fr.chart.base.MapSvgXMLHelper;
+import com.fr.chart.chartattr.MapPlot;
+import com.fr.chart.chartglyph.MapShapeValue;
+import com.fr.design.DesignerEnvManager;
+import com.fr.design.constants.UIConstants;
+import com.fr.design.dialog.BasicDialog;
+import com.fr.design.dialog.BasicPane;
+import com.fr.design.dialog.DialogActionAdapter;
+import com.fr.design.event.ChangeEvent;
+import com.fr.design.event.ChangeListener;
+import com.fr.design.event.UIObserver;
+import com.fr.design.event.UIObserverListener;
+import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.mainframe.DesignerFrame;
+import com.fr.general.ComparatorUtils;
+import com.fr.general.FRLogger;
+import com.fr.general.Inter;
+import com.fr.stable.CoreConstants;
+import com.fr.stable.StableUtils;
+import com.fr.stable.StringUtils;
+import com.fr.stable.SvgProvider;
+
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseEvent;
+import java.awt.geom.RoundRectangle2D;
+import java.util.ArrayList;
+
+/**
+ * Created by IntelliJ IDEA.
+ * Author : Richer
+ * Version: 7.0.3
+ * Date: 12-12-29
+ * Time: 下午2:41
+ */
+public class MapGroupExtensionPane extends BasicPane implements UIObserver {
+	private static final String[] TYPE_NAMES = new String[]{
+			Inter.getLocText("FR-Chart-World_Map"),
+			Inter.getLocText("FR-Chart-State_Map"),
+			Inter.getLocText("FR-Chart-Province_Map"),
+			Inter.getLocText("FR-Chart-Custom_Map")};
+	private static final int WORD = 0;
+	private static final int NATION = 1;
+	private static final int STATE = 2;
+	private static final int USER = 3;
+	private static final int OFFSET_X = 800;
+	private static final int OFFSET_Y = 250;
+
+	private UIGroupExtensionPane groupExtensionPane;
+	private UIButton addButton;
+	private JPopupMenu popupMenu;
+	private ArrayList<javax.swing.event.ChangeListener> changeListeners = new ArrayList<javax.swing.event.ChangeListener>();
+    private boolean hasPopulated = false;
+
+	@Override
+	protected String title4PopupWindow() {
+		return "Map";
+	}
+
+	public MapGroupExtensionPane() {
+		setLayout(new BorderLayout());
+		groupExtensionPane = new UIGroupExtensionPane(TYPE_NAMES){
+
+			/**
+			 * 新添加的数据的序号
+			 * @param data 数据
+			 */
+			protected void dealNewAddedDataIndex(Object data){
+				String newName = (String)data;
+				MapSvgXMLHelper helper =  MapSvgXMLHelper.getInstance();
+				if(helper.getNewMapAttr(newName) != null){
+					return;
+				}
+				MapSvgAttr attr = new MapSvgAttr();
+				attr.setFilePath(MapSvgXMLHelper.customMapPath() + CoreConstants.SEPARATOR + newName + ".svg");
+				helper.addNewSvgMaps(attr.getName(), attr);
+			}
+
+
+			/**
+			 * 一次鼠标的点击会有两次事件响应（按下和释放）。前者的事件属性中getValueIsAdjusting()=true，后者是false。
+			 * 是否响应list值改变
+			 * @return 鼠标按下时不响应，先响应mousePress事件，在鼠标释放是再响应list值改编的事件,并且点击删除不触发更新,并且populate后触发更新
+			 */
+			protected boolean isRespondToValueChange(ListSelectionEvent e){
+				return !e.getValueIsAdjusting() && !this.isPressOnDelete() && hasPopulated;
+			}
+		};
+		groupExtensionPane.addSelectionChangeListener(new ChangeListener() {
+			@Override
+			public void fireChanged(ChangeEvent event) {
+				fireStateChange();
+			}
+		});
+		groupExtensionPane.addItemEditListener(new ChangeListener() {
+			@Override
+			public void fireChanged(ChangeEvent event) {
+				doEdit(event);
+			}
+		});
+		groupExtensionPane.addDeleteListener(new ChangeListener() {
+			@Override
+			public void fireChanged(ChangeEvent event) {
+                //这么写有点问题
+                String oldName = Utils.objectToString(groupExtensionPane.getSelectedObject());
+				saveMapInfo(oldName);
+			}
+		});
+		setPreferredSize(new Dimension(400, 210));
+		add(groupExtensionPane, BorderLayout.CENTER);
+
+		addButton = new UIButton(BaseUtils.readIcon("/com/fr/design/images/buttonicon/add.png")) {
+			@Override
+			protected void paintBorder(Graphics g) {
+				Graphics2D g2d = (Graphics2D) g;
+				g2d.setStroke(UIConstants.BS);
+				Shape shape = new RoundRectangle2D.Float(0.5f, 0.5f, getWidth() - 1, getHeight() - 1, UIConstants.ARC, UIConstants.ARC);
+				g2d.setColor(UIConstants.LINE_COLOR);
+				g2d.draw(shape);
+			}
+		};
+		addButton.addActionListener(new ActionListener() {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				popupMenu.show(MapGroupExtensionPane.this, addButton.getX() + 1, addButton.getY() + addButton.getHeight());
+			}
+		});
+		add(addButton, BorderLayout.SOUTH);
+		initPopupMenu();
+	}
+
+	private void initPopupMenu() {
+		popupMenu = new JPopupMenu() {
+			@Override
+			public Dimension getPreferredSize() {
+				Dimension dimension = new Dimension();
+				dimension.height = super.getPreferredSize().height;
+				dimension.width = addButton.getWidth() - 2;
+				return dimension;
+			}
+		};
+		JMenuItem worldMap = new JMenuItem(TYPE_NAMES[WORD]);
+		popupMenu.add(worldMap);
+		worldMap.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				groupExtensionPane.addData(TYPE_NAMES[WORD], TYPE_NAMES[WORD], true);
+			}
+		});
+
+		JMenuItem countMap = new JMenuItem(TYPE_NAMES[NATION]);
+		popupMenu.add(countMap);
+		countMap.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				groupExtensionPane.addData(TYPE_NAMES[NATION],
+						TYPE_NAMES[NATION], true);
+			}
+		});
+
+		JMenuItem proMap = new JMenuItem(TYPE_NAMES[STATE]);
+		popupMenu.add(proMap);
+		proMap.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				groupExtensionPane.addData(TYPE_NAMES[STATE],
+						TYPE_NAMES[STATE], true);
+			}
+		});
+
+		JMenuItem menu = new JMenuItem(TYPE_NAMES[USER]);
+		popupMenu.add(menu);
+		menu.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				groupExtensionPane.addData(TYPE_NAMES[USER],
+						TYPE_NAMES[USER], true);
+			}
+		});
+	}
+
+	private void doEdit(ChangeEvent e) {
+		MouseEvent event = (MouseEvent) e.getSource();
+		JPopupMenu editPopMenu = new JPopupMenu();
+
+		final String oldName = Utils.objectToString(groupExtensionPane.getSelectedObject());
+		editPopMenu.add(createAreaItem(oldName));
+		editPopMenu.add(createMarkerItem(oldName));
+		editPopMenu.add(createLayerItem(oldName));
+		editPopMenu.add(createRenameItem());
+
+		editPopMenu.show(MapGroupExtensionPane.this, event.getXOnScreen() - OFFSET_X, event.getYOnScreen() - OFFSET_Y);
+	}
+
+	private void mapCheckBeforeEdit(String name){
+		if(MapSvgXMLHelper.getInstance().containsMapName(name) || MapSvgXMLHelper.getInstance().getNewMapAttr(name)!=null){
+			return;
+		}
+		MapSvgAttr attr = new MapSvgAttr();
+        attr.setFilePath(MapSvgXMLHelper.customMapPath() + CoreConstants.SEPARATOR + name + ".svg");
+		MapSvgXMLHelper.getInstance().addNewSvgMaps(name,attr);
+	}
+
+	private JMenuItem createAreaItem(final String oldName) {
+		JMenuItem editFileItem = new JMenuItem(Inter.getLocText(new String[]{"Edit", "Image", "Filed"}));
+		editFileItem.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				final MapCustomPane image = new MapCustomPane();
+				image.setImageSelectType(MapShapeValue.AREA);
+				image.populateBean(oldName);
+                image.setTypeNameAndMapName(groupExtensionPane.getSelectedType(), Utils.objectToString(groupExtensionPane.getSelectedObject()));
+				mapCheckBeforeEdit(oldName);
+				final Image oldImage = getMapImage(oldName);
+				BasicDialog dialog = image.showMediumWindow(SwingUtilities.getWindowAncestor(MapGroupExtensionPane.this), new DialogActionAdapter() {
+					public void doOk() {
+						image.updateBean(); // 比较两个前后的名字是否相同,  是图片  如果图片不同, 则直接比较
+						
+						Image newImage = getMapImage(oldName);
+						if(!ComparatorUtils.equals(oldImage, newImage)) {
+							fireStateChange();
+						}
+
+                        //versionID递增
+                        MapSvgAttr old = MapSvgXMLHelper.getInstance().getMapAttr(oldName);
+                        if(old != null) {
+                            old.addVersionID();
+                        }
+
+						saveMapInfo(oldName);
+						refresh();
+					}
+				});
+				dialog.setVisible(true);
+			}
+		});
+		return editFileItem;
+	}
+
+    //根据地图的名字返回地图的图片
+	private Image getMapImage(String mapName) {
+		if (MapSvgXMLHelper.getInstance().containsMapName(mapName)) {
+			MapSvgAttr mapAttr =  MapSvgXMLHelper.getInstance().getMapAttr(mapName);
+			if(mapAttr == null) {
+				return null;
+			}
+			return mapAttr.getMapImage();
+		}
+		
+		return null;
+	}
+
+	private JMenuItem createMarkerItem(final String oldName) {
+		JMenuItem editMarkerItem = new JMenuItem(Inter.getLocText(new String[]{"Edit", "Image", "Marker"}));
+		editMarkerItem.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				final MapCustomPane image = new MapCustomPane();
+				image.setImageSelectType(MapShapeValue.POINT);
+				image.populateBean(oldName);
+				mapCheckBeforeEdit(oldName);
+				final Image oldImage = getMapImage(oldName);
+				BasicDialog dialog = image.showMediumWindow(SwingUtilities.getWindowAncestor(image), new DialogActionAdapter() {
+					public void doOk() {
+						image.updateBean();
+						
+						Image newImage = getMapImage(oldName);
+						if(!ComparatorUtils.equals(oldImage, newImage)) {
+							fireStateChange();
+						}
+
+                        //versionID递增
+                        MapSvgAttr old = MapSvgXMLHelper.getInstance().getMapAttr(oldName);
+                        if(old != null) {
+                            old.addVersionID();
+                        }
+
+						saveMapInfo(oldName);
+						refresh();
+					}
+				});
+				dialog.setVisible(true);
+			}
+		});
+		return editMarkerItem;
+	}
+
+	private JMenuItem createLayerItem(final String oldName) {
+		JMenuItem corrItem = new JMenuItem(Inter.getLocText(new String[]{"Filed", "Corresponding_Fields"}));
+		corrItem.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				final MapDefiAreaNamePane namedPane = new MapDefiAreaNamePane();
+				namedPane.populateBean(oldName);
+				mapCheckBeforeEdit(oldName);
+				BasicDialog dialog = namedPane.showMediumWindow(SwingUtilities.getWindowAncestor(namedPane), new DialogActionAdapter() {
+					public void doOk() {
+						namedPane.updateBean();// 地图的名称 value对应情况
+
+                        MapSvgAttr old = MapSvgXMLHelper.getInstance().getMapAttr(oldName);
+                        if(old != null) {
+                            old.addVersionID();
+                        }
+
+						saveMapInfo(oldName);
+					}
+				});
+				dialog.setVisible(true);
+				refresh();
+			}
+		});
+
+		return corrItem;
+	}
+
+	private void showRenameWaring(String newName){
+		JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), "\"" + newName + "\"" + Inter.getLocText("Utils-has_been_existed")
+          + "!", Inter.getLocText("FR-Designer_Alert"), JOptionPane.WARNING_MESSAGE);
+	}
+
+	private JMenuItem createRenameItem() {
+		JMenuItem renameItem = new JMenuItem(Inter.getLocText("FR-Chart-Map_Rename"));
+		renameItem.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				String newName = JOptionPane.showInputDialog(DesignerContext.getDesignerFrame().getContentPane(), 
+						Inter.getLocText("FR-Chart-Map_Rename"), groupExtensionPane.getSelectedObject());
+				if (StringUtils.isNotBlank(newName)) {
+					String oldName = Utils.objectToString(groupExtensionPane.getSelectedObject());
+					if(ComparatorUtils.equals(oldName, newName)){
+						return;
+					}
+					//本地在看看临时的helper里面有没有
+					if(MapSvgXMLHelper.getInstance().getNewMapAttr(newName) != null){
+						showRenameWaring(newName);
+						return;
+					}
+					try{//提醒名字已存在
+						if(FRContext.getCurrentEnv().fileExists(StableUtils.pathJoin(
+								new String[]{MapSvgXMLHelper.relativeDefaultMapPath(),newName+SvgProvider.EXTENSION}))){
+							showRenameWaring(newName);
+							return;
+						}
+						if(FRContext.getCurrentEnv().fileExists(StableUtils.pathJoin(
+								new String[]{MapSvgXMLHelper.relativeCustomMapPath(), newName + SvgProvider.EXTENSION}))){
+							showRenameWaring(newName);
+							return;
+						}
+						MapSvgAttr editingAttr = MapSvgXMLHelper.getInstance().getMapAttr(oldName);
+						if(editingAttr == null){
+							editingAttr = MapSvgXMLHelper.getInstance().getNewMapAttr(oldName);
+						}
+						if( editingAttr == null) {
+							return;
+						}
+						editingAttr.renameMap(newName);
+						groupExtensionPane.setValueAtCurrentSelectIndex(newName);
+						fireStateChange();
+						saveMapInfo(newName);
+						FRContext.getCurrentEnv().deleteFile(
+								StableUtils.pathJoin(new String[]{MapSvgXMLHelper.relativeDefaultMapPath(),oldName+SvgProvider.EXTENSION}));
+						FRContext.getCurrentEnv().deleteFile(
+								StableUtils.pathJoin(new String[]{MapSvgXMLHelper.relativeCustomMapPath(),oldName+SvgProvider.EXTENSION}));
+						refresh();
+					}catch (Exception exp){
+						FRLogger.getLogger().error(exp.getMessage());
+					}
+				}
+			}
+		});
+		return renameItem;
+	}
+
+	private void refresh() {
+		this.validate();
+		this.repaint();
+		
+		DesignerFrame frame = DesignerContext.getDesignerFrame();
+		if(frame != null) {
+			frame.repaint();//kunsnat: 图表属性没变, 只是读取时 内容变化.
+		}
+	}
+
+    //保存修改过的地图信息
+	private void saveMapInfo(final String mapName) {
+		SwingWorker worker = new SwingWorker<Integer, Void>() {
+			@Override
+			protected Integer doInBackground() throws Exception {
+				MapSvgAttr attr = MapSvgXMLHelper.getInstance().getMapAttr(mapName);// 只有在编辑地图时才需要储存相关数据 @kuns
+                if(attr != null){
+                    attr.writeBack(mapName);
+                }
+				return 0;
+			}
+
+			@Override
+			protected void done() {
+				FRLogger.getLogger().info(Inter.getLocText("FR-Chart-Map_Saved")); // 地图已经保存.
+			}
+
+		};
+		worker.execute();
+		DesignerEnvManager.addWorkers(worker);
+	}
+
+	private void fireStateChange() {
+		for (int i = changeListeners.size(); i > 0; i--) {
+			changeListeners.get(i - 1).stateChanged(new javax.swing.event.ChangeEvent(this));
+		}
+	}
+
+    /**
+     * 更新地图属性
+     * @return 返回地图名称.
+     */
+	public String updateBean(MapPlot plot) {
+        if(!hasPopulated){
+            this.populateBean(plot);
+            hasPopulated = true;
+        }
+
+        MapHelper helper = plot.isSvgMap() ? MapSvgXMLHelper.getInstance() : MapXMLHelper.getInstance();
+
+        helper.clearCateNames();
+        for (String type : TYPE_NAMES) {
+            Object[] datas = groupExtensionPane.getData(type);
+            for (Object name : datas) {
+                helper.addCateNames(type, name);
+            }
+        }
+
+        return Utils.objectToString(groupExtensionPane.getSelectedObject());
+	}
+
+    /**
+     * 更新地图名称
+     * @param mapPlot 地图
+     */
+	public void populateBean(MapPlot mapPlot) {
+        hasPopulated = false;
+		groupExtensionPane.clearData();
+
+		for (String type : TYPE_NAMES) {
+            MapHelper helper = mapPlot.isSvgMap() ? MapSvgXMLHelper.getInstance() : MapXMLHelper.getInstance();
+			java.util.List list = helper.getNamesListWithCateName(type);
+			for (Object name : list) {
+				groupExtensionPane.addData(name, type);
+			}
+		}
+
+		groupExtensionPane.setSelectedObject(mapPlot.getMapName());
+
+        hasPopulated = true;
+	}
+
+	/**
+	 * 给组件登记一个观察者监听事件
+	 *
+	 * @param listener 观察者监听事件
+	 */
+	public void registerChangeListener(final UIObserverListener listener) {
+		changeListeners.add(new javax.swing.event.ChangeListener() {
+			public void stateChanged(javax.swing.event.ChangeEvent e) {
+				listener.doChange();
+			}
+		});
+	}
+
+	/**
+	 * 组件是否需要响应添加的观察者事件
+	 *
+	 * @return 如果需要响应观察者事件则返回true，否则返回false
+	 */
+	public boolean shouldResponseChangeListener() {
+		return true;
+	}
+
+    public void setEnabled(boolean isEnabled){
+        super.setEnabled(isEnabled);
+        addButton.setEnabled(isEnabled);
+        popupMenu.setEnabled(isEnabled);
+        groupExtensionPane.setEnabled(isEnabled);
+    }
+}
\ No newline at end of file

From 349f2412b1144233a1cae7150a0f0993a0c9140d Mon Sep 17 00:00:00 2001
From: mengao <283296419@qq.com>
Date: Thu, 7 Sep 2017 13:50:21 +0800
Subject: [PATCH 06/24] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E7=B1=BB=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../designer/other/VanChartConditionAttrContentPane.java     | 2 +-
 ...ontrolPane.java => VanChartConditionListControlPane.java} | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)
 rename designer_chart/src/com/fr/plugin/chart/designer/other/{VanChartListControlPane.java => VanChartConditionListControlPane.java} (93%)

diff --git a/designer_chart/src/com/fr/plugin/chart/designer/other/VanChartConditionAttrContentPane.java b/designer_chart/src/com/fr/plugin/chart/designer/other/VanChartConditionAttrContentPane.java
index c65c6a579..117f3fa00 100644
--- a/designer_chart/src/com/fr/plugin/chart/designer/other/VanChartConditionAttrContentPane.java
+++ b/designer_chart/src/com/fr/plugin/chart/designer/other/VanChartConditionAttrContentPane.java
@@ -30,7 +30,7 @@ public class VanChartConditionAttrContentPane extends AbstractConditionAttrConte
     public void populateBean(Plot plot, ConditionCollection collection,  Class<? extends ConditionAttributesPane> showPane){
 
         if (conditionPane == null) {
-            conditionPane = new VanChartListControlPane(plot);
+            conditionPane = new VanChartConditionListControlPane(plot);
         }
 
         this.setLayout(new BorderLayout());
diff --git a/designer_chart/src/com/fr/plugin/chart/designer/other/VanChartListControlPane.java b/designer_chart/src/com/fr/plugin/chart/designer/other/VanChartConditionListControlPane.java
similarity index 93%
rename from designer_chart/src/com/fr/plugin/chart/designer/other/VanChartListControlPane.java
rename to designer_chart/src/com/fr/plugin/chart/designer/other/VanChartConditionListControlPane.java
index 0d357d966..8d67089f8 100644
--- a/designer_chart/src/com/fr/plugin/chart/designer/other/VanChartListControlPane.java
+++ b/designer_chart/src/com/fr/plugin/chart/designer/other/VanChartConditionListControlPane.java
@@ -20,10 +20,11 @@ import java.lang.reflect.InvocationTargetException;
 
 /**
  * Created by mengao on 2017/8/18.
+ * 条件属性ListControlPane，弹出条件属性设置面板
  */
-public class VanChartListControlPane extends UIListControlPane {
+public class VanChartConditionListControlPane extends UIListControlPane {
 
-    public VanChartListControlPane(BasePlot plot) {
+    public VanChartConditionListControlPane(BasePlot plot) {
         super(plot);
     }
 

From 2cd4a4b91b9dd4ebebebe36e9bd4b6d632c0e9a1 Mon Sep 17 00:00:00 2001
From: mengao <283296419@qq.com>
Date: Thu, 7 Sep 2017 16:18:26 +0800
Subject: [PATCH 07/24] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=84=E5=90=88?=
 =?UTF-8?q?=E5=9B=BE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chart/area/VanChartAreaSeriesPane.java    |  5 -----
 .../style/VanChartCustomSeriesPane.java       |  5 +----
 .../VanChartAbstractPlotSeriesPane.java       | 20 +++++++++----------
 .../style/VanChartFunnelSeriesPane.java       |  4 +++-
 4 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/designer_chart/src/com/fr/plugin/chart/area/VanChartAreaSeriesPane.java b/designer_chart/src/com/fr/plugin/chart/area/VanChartAreaSeriesPane.java
index d590de46c..bbb30b888 100644
--- a/designer_chart/src/com/fr/plugin/chart/area/VanChartAreaSeriesPane.java
+++ b/designer_chart/src/com/fr/plugin/chart/area/VanChartAreaSeriesPane.java
@@ -40,11 +40,6 @@ public class VanChartAreaSeriesPane extends VanChartLineSeriesPane{
         return contentPane;
     }
 
-    //设置色彩面板内容
-    protected void setColorPaneContent (JPanel panel) {
-        panel.add(createStylePane(), BorderLayout.CENTER);
-    }
-
     protected Class<? extends BasicBeanPane> getStackAndAxisPaneClass() {
         return VanChartCustomStackAndAxisConditionPane.class;
     }
diff --git a/designer_chart/src/com/fr/plugin/chart/custom/style/VanChartCustomSeriesPane.java b/designer_chart/src/com/fr/plugin/chart/custom/style/VanChartCustomSeriesPane.java
index 3af0a3642..cc1007002 100644
--- a/designer_chart/src/com/fr/plugin/chart/custom/style/VanChartCustomSeriesPane.java
+++ b/designer_chart/src/com/fr/plugin/chart/custom/style/VanChartCustomSeriesPane.java
@@ -6,10 +6,8 @@ import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.chart.gui.ChartStylePane;
 import com.fr.design.mainframe.chart.gui.style.ChartFillStylePane;
 import com.fr.design.mainframe.chart.gui.style.series.ChartSeriesPane;
-import com.fr.general.Inter;
 import com.fr.plugin.chart.attr.plot.VanChartPlot;
 import com.fr.plugin.chart.custom.VanChartCustomPlot;
-import com.fr.plugin.chart.designer.TableLayout4VanChartHelper;
 import com.fr.plugin.chart.designer.component.VanChartBeautyPane;
 import com.fr.plugin.chart.designer.component.VanChartFillStylePane;
 
@@ -81,9 +79,8 @@ public class VanChartCustomSeriesPane extends ChartSeriesPane {
         };
 
         JPanel panel = TableLayoutHelper.createTableLayoutPane(components, row, col);
-        JPanel colorPane =  TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_Color"),panel);
         panel.setBorder(BorderFactory.createEmptyBorder(10,10,0,15));
-        return colorPane;
+        return panel;
     }
 
     /**
diff --git a/designer_chart/src/com/fr/plugin/chart/designer/style/series/VanChartAbstractPlotSeriesPane.java b/designer_chart/src/com/fr/plugin/chart/designer/style/series/VanChartAbstractPlotSeriesPane.java
index 7e02cbddf..60b14c0c8 100644
--- a/designer_chart/src/com/fr/plugin/chart/designer/style/series/VanChartAbstractPlotSeriesPane.java
+++ b/designer_chart/src/com/fr/plugin/chart/designer/style/series/VanChartAbstractPlotSeriesPane.java
@@ -29,7 +29,6 @@ import com.fr.plugin.chart.custom.style.VanChartCustomStylePane;
 import com.fr.plugin.chart.designer.TableLayout4VanChartHelper;
 import com.fr.plugin.chart.designer.component.VanChartAreaSeriesFillColorPane;
 import com.fr.plugin.chart.designer.component.VanChartBeautyPane;
-import com.fr.plugin.chart.designer.component.VanChartFillStylePane;
 import com.fr.plugin.chart.designer.component.VanChartLineTypePane;
 import com.fr.plugin.chart.designer.component.VanChartMarkerPane;
 import com.fr.plugin.chart.designer.component.VanChartTrendLinePane;
@@ -96,31 +95,30 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP
      * 返回 填充界面.
      */
     protected ChartFillStylePane getFillStylePane() {
-        return new VanChartFillStylePane();
+        //如果是自定義組合圖，則不創建填充界面
+        return parentPane instanceof VanChartCustomStylePane ? null : new ChartFillStylePane();
     }
 
     //风格
     protected VanChartBeautyPane createStylePane() {
-        stylePane = new VanChartBeautyPane();
-        return stylePane;
+        return parentPane instanceof VanChartCustomStylePane ? null : new VanChartBeautyPane();
     }
 
-    //获取色彩面板
+    //获取颜色面板
     protected JPanel getColorPane () {
-        //如果是自定義組合圖，則不創建色彩界面
-        if (parentPane instanceof VanChartCustomStylePane) {
-        return null;
-        }
         JPanel panel = new JPanel(new BorderLayout());
+        stylePane = createStylePane();
         setColorPaneContent(panel);
         JPanel colorPane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_Color"), panel);
         panel.setBorder(BorderFactory.createEmptyBorder(10,5,0,0));
-        return colorPane;
+        return panel.getComponentCount() == 0 ? null : colorPane;
     }
 
     //设置色彩面板内容
     protected void setColorPaneContent (JPanel panel) {
-        panel.add(createStylePane(), BorderLayout.CENTER);
+        if (stylePane != null) {
+            panel.add(stylePane, BorderLayout.CENTER);
+        }
     }
 
     //趋势线
diff --git a/designer_chart/src/com/fr/plugin/chart/funnel/designer/style/VanChartFunnelSeriesPane.java b/designer_chart/src/com/fr/plugin/chart/funnel/designer/style/VanChartFunnelSeriesPane.java
index e8beea2fb..13b93daba 100644
--- a/designer_chart/src/com/fr/plugin/chart/funnel/designer/style/VanChartFunnelSeriesPane.java
+++ b/designer_chart/src/com/fr/plugin/chart/funnel/designer/style/VanChartFunnelSeriesPane.java
@@ -42,7 +42,9 @@ public class VanChartFunnelSeriesPane extends VanChartAbstractPlotSeriesPane {
 
     //设置色彩面板内容
     protected void setColorPaneContent (JPanel panel) {
-        panel.add(createStylePane(), BorderLayout.CENTER);
+        if (stylePane != null) {
+            panel.add(createStylePane(), BorderLayout.CENTER);
+        }
         panel.add(createAlphaPane(), BorderLayout.SOUTH);
     }
 

From a461ce1b139570a2e18b2bad381c3278210ce174 Mon Sep 17 00:00:00 2001
From: mengao <283296419@qq.com>
Date: Thu, 7 Sep 2017 19:10:24 +0800
Subject: [PATCH 08/24] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=96=B0=E5=9B=BE?=
 =?UTF-8?q?=E8=A1=A8=E8=B6=85=E9=93=BE=E4=B8=AD=E5=90=8D=E5=AD=97=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chart/javascript/ChartEmailPane.java      |  28 +-
 .../component/VanChartHyperLinkPane.java      |   3 +-
 .../designer/other/HyperlinkMapFactory.java   | 338 +++++++++++-------
 3 files changed, 230 insertions(+), 139 deletions(-)

diff --git a/designer_chart/src/com/fr/design/chart/javascript/ChartEmailPane.java b/designer_chart/src/com/fr/design/chart/javascript/ChartEmailPane.java
index 040a24fed..61189db24 100644
--- a/designer_chart/src/com/fr/design/chart/javascript/ChartEmailPane.java
+++ b/designer_chart/src/com/fr/design/chart/javascript/ChartEmailPane.java
@@ -1,9 +1,5 @@
 package com.fr.design.chart.javascript;
 
-import javax.swing.JComponent;
-import javax.swing.JScrollPane;
-import javax.swing.SwingConstants;
-
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itextfield.UITextField;
@@ -14,6 +10,9 @@ import com.fr.design.mainframe.JTemplate;
 import com.fr.general.Inter;
 import com.fr.js.EmailJavaScript;
 
+import javax.swing.*;
+import java.awt.*;
+
 /**
  * 
  * @author jim
@@ -30,11 +29,11 @@ public class ChartEmailPane extends EmailPane{
 		JTemplate jTemplate = DesignerContext.getDesignerFrame().getSelectedJTemplate();
 		// 是否支持导出控制图表的超链邮件是否显示showTplContent
 		boolean supportExport = jTemplate.isJWorkBook();
+		JPanel contentPane;
 		if (supportExport) {
-			double[] rSizes = { preferred, preferred, preferred, preferred, preferred, preferred, fill, preferred, preferred};
+			double[] rSizes = { preferred, preferred, preferred, preferred, preferred, fill, preferred, preferred};
 			showTplContent = new UICheckBox(Inter.getLocText("Email-Can_Preview_Report_Content"));
-			centerPane = TableLayoutHelper.createCommonTableLayoutPane(new JComponent[][]{
-					{new UILabel(Inter.getLocText("Name") + ":", SwingConstants.RIGHT), itemNameTextField},
+			contentPane = TableLayoutHelper.createCommonTableLayoutPane(new JComponent[][]{
 					{new UILabel(), tipsPane1},
 					createLinePane(Inter.getLocText("HJS-Mail_to"), maitoEditor = new UITextField()),
 					createLinePane(Inter.getLocText("HJS-CC_to"), ccEditor = new UITextField()),
@@ -44,8 +43,8 @@ public class ChartEmailPane extends EmailPane{
 					{new UILabel(), showTplContent},
 					{new UILabel(), tipsPane2}},rSizes, columnSize, 6);
 		} else {
-			double[] rSizes = { preferred, preferred, preferred, preferred, preferred, preferred, fill, preferred};
-			centerPane = TableLayoutHelper.createCommonTableLayoutPane(new JComponent[][]{
+			double[] rSizes = { preferred, preferred, preferred, preferred, preferred, fill, preferred};
+			contentPane = TableLayoutHelper.createCommonTableLayoutPane(new JComponent[][]{
                     {new UILabel(Inter.getLocText("Name") + ":", SwingConstants.RIGHT), itemNameTextField},
                     {new UILabel(), tipsPane1},
                     createLinePane(Inter.getLocText("HJS-Mail_to"), maitoEditor = new UITextField()),
@@ -55,6 +54,17 @@ public class ChartEmailPane extends EmailPane{
                     {mainTextLabel, scrollPane},
                     {new UILabel(), tipsPane2}},rSizes, columnSize, 8);
 		}
+		centerPane = new JPanel(new BorderLayout());
+		if (needRenamePane()) {
+			JPanel namePane = TableLayoutHelper.createCommonTableLayoutPane(new JComponent[][]{{new UILabel(Inter.getLocText("Name") + ":", SwingConstants.RIGHT), itemNameTextField},},
+					new double[] {preferred}, columnSize, 6);
+			centerPane.add(namePane, BorderLayout.NORTH);
+		}
+		centerPane.add(contentPane, BorderLayout.CENTER);
+	}
+
+	protected boolean needRenamePane() {
+		return true;
 	}
 	
 	protected void checkEmailConfig(boolean valid) {
diff --git a/designer_chart/src/com/fr/plugin/chart/custom/component/VanChartHyperLinkPane.java b/designer_chart/src/com/fr/plugin/chart/custom/component/VanChartHyperLinkPane.java
index 03296ad97..7404662a6 100644
--- a/designer_chart/src/com/fr/plugin/chart/custom/component/VanChartHyperLinkPane.java
+++ b/designer_chart/src/com/fr/plugin/chart/custom/component/VanChartHyperLinkPane.java
@@ -6,7 +6,6 @@ import com.fr.chart.web.ChartHyperRelateCellLink;
 import com.fr.chart.web.ChartHyperRelateFloatLink;
 import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.beans.BasicBeanPane;
-import com.fr.design.chart.javascript.ChartEmailPane;
 import com.fr.design.designer.TargetComponent;
 import com.fr.design.fun.HyperlinkProvider;
 import com.fr.design.gui.controlpane.NameObjectCreator;
@@ -208,7 +207,7 @@ public class VanChartHyperLinkPane extends UIListControlPane {
 
         list.add(new UIMenuNameableCreator(Inter.getLocText("Chart-Link_Reportlet"),
                 new ReportletHyperlink(), getUseMap(map, ReportletHyperlink.class)));
-        list.add(new UIMenuNameableCreator(Inter.getLocText("Chart-Link_Mail"), new EmailJavaScript(), ChartEmailPane.class));
+        list.add(new UIMenuNameableCreator(Inter.getLocText("Chart-Link_Mail"), new EmailJavaScript(), HyperlinkMapFactory.VanChartEmailPane.class));
         list.add(new UIMenuNameableCreator(Inter.getLocText("Chart-Link_Web"),
                 new WebHyperlink(), getUseMap(map, WebHyperlink.class)));
         list.add(new UIMenuNameableCreator(Inter.getLocText("Chart-Link_Dynamic_Parameters"),
diff --git a/designer_chart/src/com/fr/plugin/chart/designer/other/HyperlinkMapFactory.java b/designer_chart/src/com/fr/plugin/chart/designer/other/HyperlinkMapFactory.java
index 4f0a79d57..170962f02 100644
--- a/designer_chart/src/com/fr/plugin/chart/designer/other/HyperlinkMapFactory.java
+++ b/designer_chart/src/com/fr/plugin/chart/designer/other/HyperlinkMapFactory.java
@@ -116,28 +116,28 @@ public class HyperlinkMapFactory {
 
     public static HashMap getHyperlinkMap(Plot plot) {
         String plotType = plotTypeMap.get(plot.getClass().getName() + plot.getDetailType());
-        if(plotType == null){
+        if (plotType == null) {
             plotType = plotTypeMap.get(plot.getClass().getName());
-            if(plotType == null) {
+            if (plotType == null) {
                 plotType = NORMAL;
             }
         }
         return getHyperlinkMapWithType(plotType);
     }
 
-    public static HashMap getDrillUpLinkMap(){
+    public static HashMap getDrillUpLinkMap() {
         return getHyperlinkMapWithType(DIRLLMAPCATALOG);
     }
 
-    public static HashMap getLineMapHyperLinkMap(){
+    public static HashMap getLineMapHyperLinkMap() {
         return getHyperlinkMapWithType(LINEMAP);
     }
 
-    private static HashMap getHyperlinkMapWithType(String plotType){
+    private static HashMap getHyperlinkMapWithType(String plotType) {
         HashMap<Class, Class> map = new HashMap<Class, Class>();
 
         map.put(ReportletHyperlink.class, getClassWithPrefix(HyperlinkMapFactory.Report.class, plotType));
-        map.put(EmailJavaScript.class, ChartEmailPane.class);
+        map.put(EmailJavaScript.class, VanChartEmailPane.class);
         map.put(WebHyperlink.class, getClassWithPrefix(HyperlinkMapFactory.Web.class, plotType));
         map.put(ParameterJavaScript.class, getClassWithPrefix(HyperlinkMapFactory.Para.class, plotType));
 
@@ -150,9 +150,9 @@ public class HyperlinkMapFactory {
         return map;
     }
 
-    private static Class getClassWithPrefix(Class superClass, String plotType){
+    private static Class getClassWithPrefix(Class superClass, String plotType) {
         String wholeClassString = superClass.getName() + plotType;
-        try{
+        try {
             return Class.forName(wholeClassString);
         } catch (Exception e) {
             return superClass;
@@ -386,78 +386,97 @@ public class HyperlinkMapFactory {
         return ValueEditorPaneFactory.createValueEditorPane(addBasicEditors(list));
     }
 
+
+    public static class VanChartEmailPane extends ChartEmailPane {
+        @Override
+        protected boolean needRenamePane() {
+            return false;
+        }
+    }
+
     //网络报表
-    public static class Report{
-        public static class VAN_CHART extends ReportletHyperlinkPane.CHART{
+    public static class Report {
+        public static class VAN_CHART extends ReportletHyperlinkPane.CHART {
+
+            @Override
+            protected boolean needRenamePane() {
+                return false;
+            }
+
         }
 
-        public static class VAN_CHART_MULTICATEGORY extends ReportletHyperlinkPane.CHART{
+        public static class VAN_CHART_MULTICATEGORY extends Report.VAN_CHART {
             @Override
             protected ValueEditorPane getValueEditorPane() {
                 return getMultiCategoryEditorPane();
             }
         }
 
-        public static class VAN_CHART_SCATTER extends ReportletHyperlinkPane.CHART{
+        public static class VAN_CHART_SCATTER extends Report.VAN_CHART {
             @Override
             protected ValueEditorPane getValueEditorPane() {
-               return getScatterValueEditorPane();
+                return getScatterValueEditorPane();
             }
         }
 
-        public static class VAN_CHART_GANNT extends ReportletHyperlinkPane.CHART{
+        public static class VAN_CHART_GANNT extends Report.VAN_CHART {
             @Override
-            protected ValueEditorPane getValueEditorPane(){
+            protected ValueEditorPane getValueEditorPane() {
                 return getGanntValueEditorPane();
             }
         }
 
-        public static class VAN_CHART_MULTIPIE extends ReportletHyperlinkPane.CHART{
+        public static class VAN_CHART_MULTIPIE extends Report.VAN_CHART {
             @Override
             protected ValueEditorPane getValueEditorPane() {
                 return getMultiPieValueEditorPane();
             }
         }
 
-        public static class VAN_CHART_GAUGE extends ReportletHyperlinkPane.CHART_METER{
+        public static class VAN_CHART_GAUGE extends ReportletHyperlinkPane.CHART_METER {
+
+            @Override
+            protected boolean needRenamePane() {
+                return false;
+            }
         }
 
-        public static class VAN_CHART_MAP extends ReportletHyperlinkPane.CHART{
+        public static class VAN_CHART_MAP extends Report.VAN_CHART {
             @Override
             protected ValueEditorPane getValueEditorPane() {
                 return getMapValueEditorPane();
             }
         }
 
-        public static class VAN_CHART_LINE_MAP extends ReportletHyperlinkPane.CHART{
+        public static class VAN_CHART_LINE_MAP extends Report.VAN_CHART {
             @Override
             protected ValueEditorPane getValueEditorPane() {
                 return getLineMapValueEditorPane();
             }
         }
 
-        public static class VAN_CHART_DRILLMAPCATALOG extends ReportletHyperlinkPane.CHART{
+        public static class VAN_CHART_DRILLMAPCATALOG extends Report.VAN_CHART {
             @Override
             protected ValueEditorPane getValueEditorPane() {
                 return getDrillMapCatalogValueEditorPane();
             }
         }
 
-        public static class VAN_CHART_FUNNEL extends ReportletHyperlinkPane.CHART{
+        public static class VAN_CHART_FUNNEL extends Report.VAN_CHART {
             @Override
             protected ValueEditorPane getValueEditorPane() {
                 return getFunnelValueEditorPane();
             }
         }
 
-        public static class VAN_CHART_WORDCLOUD extends ReportletHyperlinkPane.CHART{
+        public static class VAN_CHART_WORDCLOUD extends Report.VAN_CHART {
             @Override
             protected ValueEditorPane getValueEditorPane() {
                 return getWordCloudValueEditorPane();
             }
         }
 
-        public static class VAN_CHART_STRUCTURE extends ReportletHyperlinkPane.CHART{
+        public static class VAN_CHART_STRUCTURE extends Report.VAN_CHART {
             @Override
             protected ValueEditorPane getValueEditorPane() {
                 return getStructureValueEditorPane();
@@ -466,41 +485,52 @@ public class HyperlinkMapFactory {
     }
 
     //网页链接
-    public static class Web{
-        public static class VAN_CHART extends WebHyperlinkPane.CHART{
+    public static class Web {
+        public static class VAN_CHART extends WebHyperlinkPane.CHART {
+
+            @Override
+            protected boolean needRenamePane() {
+                return false;
+            }
         }
 
-        public static class VAN_CHART_MULTICATEGORY extends WebHyperlinkPane.CHART{
+        public static class VAN_CHART_MULTICATEGORY extends Web.VAN_CHART {
             @Override
             protected ValueEditorPane getValueEditorPane() {
                 return getMultiCategoryEditorPane();
             }
         }
 
-        public static class VAN_CHART_SCATTER extends WebHyperlinkPane.CHART{
+        public static class VAN_CHART_SCATTER extends Web.VAN_CHART {
             @Override
             protected ValueEditorPane getValueEditorPane() {
                 return getScatterValueEditorPane();
             }
         }
-        public static class VAN_CHART_GANNT extends WebHyperlinkPane.CHART{
+
+        public static class VAN_CHART_GANNT extends Web.VAN_CHART {
             @Override
-            protected ValueEditorPane getValueEditorPane(){
+            protected ValueEditorPane getValueEditorPane() {
                 return getGanntValueEditorPane();
             }
         }
 
-        public static class VAN_CHART_GAUGE extends WebHyperlinkPane.CHART_METER{
+        public static class VAN_CHART_GAUGE extends WebHyperlinkPane.CHART_METER {
+
+            @Override
+            protected boolean needRenamePane() {
+                return false;
+            }
         }
 
-        public static class VAN_CHART_MAP extends WebHyperlinkPane.CHART{
+        public static class VAN_CHART_MAP extends Web.VAN_CHART {
             @Override
             protected ValueEditorPane getValueEditorPane() {
                 return getMapValueEditorPane();
             }
         }
 
-        public static class VAN_CHART_LINE_MAP extends WebHyperlinkPane.CHART{
+        public static class VAN_CHART_LINE_MAP extends Web.VAN_CHART {
             @Override
             protected ValueEditorPane getValueEditorPane() {
                 return getLineMapValueEditorPane();
@@ -508,34 +538,34 @@ public class HyperlinkMapFactory {
         }
 
 
-        public static class VAN_CHART_DRILLMAPCATALOG extends WebHyperlinkPane.CHART{
+        public static class VAN_CHART_DRILLMAPCATALOG extends Web.VAN_CHART {
             @Override
-            protected ValueEditorPane getValueEditorPane(){
+            protected ValueEditorPane getValueEditorPane() {
                 return getDrillMapCatalogValueEditorPane();
             }
         }
 
-        public static class VAN_CHART_MULTIPIE extends WebHyperlinkPane.CHART{
+        public static class VAN_CHART_MULTIPIE extends Web.VAN_CHART {
             protected ValueEditorPane getValueEditorPane() {
                 return getMultiPieValueEditorPane();
             }
         }
 
-        public static class VAN_CHART_FUNNEL extends WebHyperlinkPane.CHART{
+        public static class VAN_CHART_FUNNEL extends Web.VAN_CHART {
             @Override
             protected ValueEditorPane getValueEditorPane() {
                 return getFunnelValueEditorPane();
             }
         }
 
-        public static class VAN_CHART_WORDCLOUD extends WebHyperlinkPane.CHART{
+        public static class VAN_CHART_WORDCLOUD extends Web.VAN_CHART {
             @Override
             protected ValueEditorPane getValueEditorPane() {
                 return getWordCloudValueEditorPane();
             }
         }
 
-        public static class VAN_CHART_STRUCTURE extends WebHyperlinkPane.CHART{
+        public static class VAN_CHART_STRUCTURE extends Web.VAN_CHART {
             @Override
             protected ValueEditorPane getValueEditorPane() {
                 return getStructureValueEditorPane();
@@ -544,42 +574,52 @@ public class HyperlinkMapFactory {
     }
 
     //动态参数
-    public static class Para{
-        public static class VAN_CHART extends ParameterJavaScriptPane.CHART{
+    public static class Para {
+        public static class VAN_CHART extends ParameterJavaScriptPane.CHART {
+
+            @Override
+            protected boolean needRenamePane() {
+                return false;
+            }
         }
 
-        public static class VAN_CHART_MULTICATEGORY extends ParameterJavaScriptPane.CHART{
+        public static class VAN_CHART_MULTICATEGORY extends Para.VAN_CHART {
             @Override
             protected ValueEditorPane getValueEditorPane() {
                 return getMultiCategoryEditorPane();
             }
         }
 
-        public static class VAN_CHART_SCATTER extends ParameterJavaScriptPane.CHART{
+        public static class VAN_CHART_SCATTER extends Para.VAN_CHART {
             @Override
             protected ValueEditorPane getValueEditorPane() {
                 return getScatterValueEditorPane();
             }
         }
 
-        public static class VAN_CHART_GANNT extends ParameterJavaScriptPane.CHART{
+        public static class VAN_CHART_GANNT extends Para.VAN_CHART {
             @Override
-            protected ValueEditorPane getValueEditorPane(){
+            protected ValueEditorPane getValueEditorPane() {
                 return getGanntValueEditorPane();
             }
         }
 
-        public static class VAN_CHART_GAUGE extends ParameterJavaScriptPane.CHART_METER{
+        public static class VAN_CHART_GAUGE extends ParameterJavaScriptPane.CHART_METER {
+
+            @Override
+            protected boolean needRenamePane() {
+                return false;
+            }
         }
 
-        public static class VAN_CHART_MAP extends ParameterJavaScriptPane.CHART{
+        public static class VAN_CHART_MAP extends Para.VAN_CHART {
             @Override
             protected ValueEditorPane getValueEditorPane() {
                 return getMapValueEditorPane();
             }
         }
 
-        public static class VAN_CHART_LINE_MAP extends ParameterJavaScriptPane.CHART{
+        public static class VAN_CHART_LINE_MAP extends Para.VAN_CHART {
             @Override
             protected ValueEditorPane getValueEditorPane() {
                 return getLineMapValueEditorPane();
@@ -587,34 +627,34 @@ public class HyperlinkMapFactory {
         }
 
 
-        public static class VAN_CHART_DRILLMAPCATALOG extends ParameterJavaScriptPane.CHART{
+        public static class VAN_CHART_DRILLMAPCATALOG extends Para.VAN_CHART {
             @Override
-            protected ValueEditorPane getValueEditorPane(){
+            protected ValueEditorPane getValueEditorPane() {
                 return getDrillMapCatalogValueEditorPane();
             }
         }
 
-        public static class VAN_CHART_MULTIPIE extends ParameterJavaScriptPane.CHART{
+        public static class VAN_CHART_MULTIPIE extends Para.VAN_CHART {
             protected ValueEditorPane getValueEditorPane() {
                 return getMultiPieValueEditorPane();
             }
         }
 
-        public static class VAN_CHART_FUNNEL extends ParameterJavaScriptPane.CHART{
+        public static class VAN_CHART_FUNNEL extends Para.VAN_CHART {
             @Override
             protected ValueEditorPane getValueEditorPane() {
                 return getFunnelValueEditorPane();
             }
         }
 
-        public static class VAN_CHART_WORDCLOUD extends ParameterJavaScriptPane.CHART{
+        public static class VAN_CHART_WORDCLOUD extends Para.VAN_CHART {
             @Override
             protected ValueEditorPane getValueEditorPane() {
                 return getWordCloudValueEditorPane();
             }
         }
 
-        public static class VAN_CHART_STRUCTURE extends ParameterJavaScriptPane.CHART{
+        public static class VAN_CHART_STRUCTURE extends Para.VAN_CHART {
             @Override
             protected ValueEditorPane getValueEditorPane() {
                 return getStructureValueEditorPane();
@@ -623,76 +663,86 @@ public class HyperlinkMapFactory {
     }
 
     //js超链
-    public static class Js{
-        public static class VAN_CHART extends JavaScriptImplPane.CHART{
+    public static class Js {
+        public static class VAN_CHART extends JavaScriptImplPane.CHART {
+
+            @Override
+            protected boolean needRenamePane() {
+                return false;
+            }
         }
 
-        public static class VAN_CHART_MULTICATEGORY extends JavaScriptImplPane.CHART{
+        public static class VAN_CHART_MULTICATEGORY extends Js.VAN_CHART {
             @Override
             protected ValueEditorPane getValueEditorPane() {
                 return getMultiCategoryEditorPane();
             }
         }
 
-        public static class VAN_CHART_SCATTER extends JavaScriptImplPane.CHART{
+        public static class VAN_CHART_SCATTER extends Js.VAN_CHART {
             @Override
             protected ValueEditorPane getValueEditorPane() {
                 return getScatterValueEditorPane();
             }
         }
 
-        public static class VAN_CHART_GANNT extends JavaScriptImplPane.CHART{
+        public static class VAN_CHART_GANNT extends Js.VAN_CHART {
             @Override
-            protected ValueEditorPane getValueEditorPane(){
+            protected ValueEditorPane getValueEditorPane() {
                 return getGanntValueEditorPane();
             }
         }
 
-        public static class VAN_CHART_GAUGE extends JavaScriptImplPane.CHART_METER{
+        public static class VAN_CHART_GAUGE extends Js.VAN_CHART {
+
+            @Override
+            protected boolean needRenamePane() {
+                return false;
+            }
         }
 
-        public static class VAN_CHART_MAP extends JavaScriptImplPane.CHART{
+        public static class VAN_CHART_MAP extends Js.VAN_CHART {
             @Override
             protected ValueEditorPane getValueEditorPane() {
                 return getMapValueEditorPane();
             }
         }
 
-        public static class VAN_CHART_LINE_MAP extends JavaScriptImplPane.CHART{
+        public static class VAN_CHART_LINE_MAP extends Js.VAN_CHART {
             @Override
             protected ValueEditorPane getValueEditorPane() {
                 return getLineMapValueEditorPane();
             }
         }
 
-        public static class VAN_CHART_DRILLMAPCATALOG extends JavaScriptImplPane.CHART{
+        public static class VAN_CHART_DRILLMAPCATALOG extends Js.VAN_CHART {
             @Override
-            protected ValueEditorPane getValueEditorPane(){
+            protected ValueEditorPane getValueEditorPane() {
                 return getDrillMapCatalogValueEditorPane();
             }
         }
 
-        public static class VAN_CHART_MULTIPIE extends JavaScriptImplPane.CHART{
+        public static class VAN_CHART_MULTIPIE extends Js.VAN_CHART {
             protected ValueEditorPane getValueEditorPane() {
                 return getMultiPieValueEditorPane();
             }
         }
 
-        public static class VAN_CHART_FUNNEL extends JavaScriptImplPane.CHART{
+        public static class VAN_CHART_FUNNEL extends Js.VAN_CHART {
             @Override
             protected ValueEditorPane getValueEditorPane() {
                 return getFunnelValueEditorPane();
             }
         }
 
-        public static class VAN_CHART_WORDCLOUD extends JavaScriptImplPane.CHART{
+        public static class VAN_CHART_WORDCLOUD extends Js.VAN_CHART {
             @Override
             protected ValueEditorPane getValueEditorPane() {
                 return getWordCloudValueEditorPane();
             }
         }
 
-        public static class VAN_CHART_STRUCTURE extends JavaScriptImplPane.CHART{
+        public static class VAN_CHART_STRUCTURE extends Js.VAN_CHART {
             @Override
             protected ValueEditorPane getValueEditorPane() {
                 return getStructureValueEditorPane();
@@ -701,76 +751,84 @@ public class HyperlinkMapFactory {
     }
 
     //图表超链-悬浮窗图表
-    public static class Chart_Chart{
-        public static class VAN_CHART extends ChartHyperPoplinkPane{
+    public static class Chart_Chart {
+        public static class VAN_CHART extends ChartHyperPoplinkPane {
+            @Override
+            protected boolean needRenamePane() {
+                return false;
+            }
         }
 
-        public static class VAN_CHART_MULTICATEGORY extends ChartHyperPoplinkPane{
+        public static class VAN_CHART_MULTICATEGORY extends Chart_Chart.VAN_CHART {
             @Override
             protected ValueEditorPane getValueEditorPane() {
                 return getMultiCategoryEditorPane();
             }
         }
 
-        public static class VAN_CHART_SCATTER extends ChartHyperPoplinkPane{
+        public static class VAN_CHART_SCATTER extends Chart_Chart.VAN_CHART {
             @Override
             protected ValueEditorPane getValueEditorPane() {
                 return getScatterValueEditorPane();
             }
         }
 
-        public static class VAN_CHART_GANNT extends ChartHyperPoplinkPane{
+        public static class VAN_CHART_GANNT extends Chart_Chart.VAN_CHART {
             @Override
-            protected ValueEditorPane getValueEditorPane(){
+            protected ValueEditorPane getValueEditorPane() {
                 return getGanntValueEditorPane();
             }
         }
 
-        public static class VAN_CHART_GAUGE extends ChartHyperPoplinkPane.CHART_METER{
+        public static class VAN_CHART_GAUGE extends ChartHyperPoplinkPane.CHART_METER {
+            @Override
+            protected boolean needRenamePane() {
+                return false;
+            }
         }
 
-        public static class VAN_CHART_MAP extends ChartHyperPoplinkPane{
+        public static class VAN_CHART_MAP extends Chart_Chart.VAN_CHART {
             @Override
             protected ValueEditorPane getValueEditorPane() {
                 return getMapValueEditorPane();
             }
         }
 
-        public static class VAN_CHART_LINE_MAP extends ChartHyperPoplinkPane{
+        public static class VAN_CHART_LINE_MAP extends Chart_Chart.VAN_CHART {
             @Override
             protected ValueEditorPane getValueEditorPane() {
                 return getLineMapValueEditorPane();
             }
         }
 
-        public static class VAN_CHART_DRILLMAPCATALOG extends ChartHyperPoplinkPane{
+        public static class VAN_CHART_DRILLMAPCATALOG extends Chart_Chart.VAN_CHART {
             @Override
-            protected ValueEditorPane getValueEditorPane(){
+            protected ValueEditorPane getValueEditorPane() {
                 return getDrillMapCatalogValueEditorPane();
             }
         }
 
-        public static class VAN_CHART_MULTIPIE extends ChartHyperPoplinkPane{
+        public static class VAN_CHART_MULTIPIE extends Chart_Chart.VAN_CHART {
             protected ValueEditorPane getValueEditorPane() {
                 return getMultiPieValueEditorPane();
             }
         }
 
-        public static class VAN_CHART_FUNNEL extends ChartHyperPoplinkPane{
+        public static class VAN_CHART_FUNNEL extends Chart_Chart.VAN_CHART {
             @Override
             protected ValueEditorPane getValueEditorPane() {
                 return getFunnelValueEditorPane();
             }
         }
 
-        public static class VAN_CHART_WORDCLOUD extends ChartHyperPoplinkPane{
+        public static class VAN_CHART_WORDCLOUD extends Chart_Chart.VAN_CHART {
             @Override
             protected ValueEditorPane getValueEditorPane() {
                 return getWordCloudValueEditorPane();
             }
         }
 
-        public static class VAN_CHART_STRUCTURE extends ChartHyperPoplinkPane{
+        public static class VAN_CHART_STRUCTURE extends Chart_Chart.VAN_CHART {
             @Override
             protected ValueEditorPane getValueEditorPane() {
                 return getStructureValueEditorPane();
@@ -779,76 +837,84 @@ public class HyperlinkMapFactory {
     }
 
     //图表超链-联动单元格
-    public static class Chart_Cell{
-        public static class VAN_CHART extends ChartHyperRelateCellLinkPane{
+    public static class Chart_Cell {
+        public static class VAN_CHART extends ChartHyperRelateCellLinkPane {
+            @Override
+            protected boolean needRenamePane() {
+                return false;
+            }
         }
 
-        public static class VAN_CHART_MULTICATEGORY extends ChartHyperRelateCellLinkPane{
+        public static class VAN_CHART_MULTICATEGORY extends Chart_Cell.VAN_CHART {
             @Override
             protected ValueEditorPane getValueEditorPane() {
                 return getMultiCategoryEditorPane();
             }
         }
 
-        public static class VAN_CHART_SCATTER extends ChartHyperRelateCellLinkPane{
+        public static class VAN_CHART_SCATTER extends Chart_Cell.VAN_CHART {
             @Override
             protected ValueEditorPane getValueEditorPane() {
                 return getScatterValueEditorPane();
             }
         }
 
-        public static class VAN_CHART_GANNT extends ChartHyperRelateCellLinkPane{
+        public static class VAN_CHART_GANNT extends Chart_Cell.VAN_CHART {
             @Override
-            protected ValueEditorPane getValueEditorPane(){
+            protected ValueEditorPane getValueEditorPane() {
                 return getGanntValueEditorPane();
             }
         }
 
-        public static class VAN_CHART_GAUGE extends ChartHyperRelateCellLinkPane.CHART_METER{
+        public static class VAN_CHART_GAUGE extends ChartHyperRelateCellLinkPane.CHART_METER {
+            @Override
+            protected boolean needRenamePane() {
+                return false;
+            }
         }
 
-        public static class VAN_CHART_MAP extends ChartHyperRelateCellLinkPane{
+        public static class VAN_CHART_MAP extends Chart_Cell.VAN_CHART {
             @Override
             protected ValueEditorPane getValueEditorPane() {
                 return getMapValueEditorPane();
             }
         }
 
-        public static class VAN_CHART_LINE_MAP extends ChartHyperRelateCellLinkPane{
+        public static class VAN_CHART_LINE_MAP extends Chart_Cell.VAN_CHART {
             @Override
             protected ValueEditorPane getValueEditorPane() {
                 return getLineMapValueEditorPane();
             }
         }
 
-        public static class VAN_CHART_DRILLMAPCATALOG extends ChartHyperRelateCellLinkPane{
+        public static class VAN_CHART_DRILLMAPCATALOG extends Chart_Cell.VAN_CHART {
             @Override
-            protected ValueEditorPane getValueEditorPane(){
+            protected ValueEditorPane getValueEditorPane() {
                 return getDrillMapCatalogValueEditorPane();
             }
         }
 
-        public static class VAN_CHART_MULTIPIE extends ChartHyperRelateCellLinkPane{
+        public static class VAN_CHART_MULTIPIE extends Chart_Cell.VAN_CHART {
             protected ValueEditorPane getValueEditorPane() {
                 return getMultiPieValueEditorPane();
             }
         }
 
-        public static class VAN_CHART_FUNNEL extends ChartHyperRelateCellLinkPane{
+        public static class VAN_CHART_FUNNEL extends Chart_Cell.VAN_CHART {
             @Override
             protected ValueEditorPane getValueEditorPane() {
                 return getFunnelValueEditorPane();
             }
         }
 
-        public static class VAN_CHART_WORDCLOUD extends ChartHyperRelateCellLinkPane{
+        public static class VAN_CHART_WORDCLOUD extends Chart_Cell.VAN_CHART {
             @Override
             protected ValueEditorPane getValueEditorPane() {
                 return getWordCloudValueEditorPane();
             }
         }
 
-        public static class VAN_CHART_STRUCTURE extends ChartHyperRelateCellLinkPane{
+        public static class VAN_CHART_STRUCTURE extends Chart_Cell.VAN_CHART {
             @Override
             protected ValueEditorPane getValueEditorPane() {
                 return getStructureValueEditorPane();
@@ -857,76 +923,84 @@ public class HyperlinkMapFactory {
     }
 
     //图表超链-悬浮元素
-    public static class Chart_Float{
-        public static class VAN_CHART extends ChartHyperRelateFloatLinkPane{
+    public static class Chart_Float {
+        public static class VAN_CHART extends ChartHyperRelateFloatLinkPane {
+            @Override
+            protected boolean needRenamePane() {
+                return false;
+            }
         }
 
-        public static class VAN_CHART_MULTICATEGORY extends ChartHyperRelateFloatLinkPane{
+        public static class VAN_CHART_MULTICATEGORY extends Chart_Float.VAN_CHART {
             @Override
             protected ValueEditorPane getValueEditorPane() {
                 return getMultiCategoryEditorPane();
             }
         }
 
-        public static class VAN_CHART_SCATTER extends ChartHyperRelateFloatLinkPane{
+        public static class VAN_CHART_SCATTER extends Chart_Float.VAN_CHART {
             @Override
             protected ValueEditorPane getValueEditorPane() {
                 return getScatterValueEditorPane();
             }
         }
 
-        public static class VAN_CHART_GANNT extends ChartHyperRelateFloatLinkPane{
+        public static class VAN_CHART_GANNT extends Chart_Float.VAN_CHART {
             @Override
-            protected ValueEditorPane getValueEditorPane(){
+            protected ValueEditorPane getValueEditorPane() {
                 return getGanntValueEditorPane();
             }
         }
 
-        public static class VAN_CHART_GAUGE extends ChartHyperRelateFloatLinkPane.CHART_METER{
+        public static class VAN_CHART_GAUGE extends ChartHyperRelateFloatLinkPane.CHART_METER {
+            @Override
+            protected boolean needRenamePane() {
+                return false;
+            }
         }
 
-        public static class VAN_CHART_MAP extends ChartHyperRelateFloatLinkPane{
+        public static class VAN_CHART_MAP extends Chart_Float.VAN_CHART {
             @Override
             protected ValueEditorPane getValueEditorPane() {
                 return getMapValueEditorPane();
             }
         }
 
-        public static class VAN_CHART_LINE_MAP extends ChartHyperRelateFloatLinkPane{
+        public static class VAN_CHART_LINE_MAP extends Chart_Float.VAN_CHART {
             @Override
             protected ValueEditorPane getValueEditorPane() {
                 return getLineMapValueEditorPane();
             }
         }
 
-        public static class VAN_CHART_DRILLMAPCATALOG extends ChartHyperRelateFloatLinkPane{
+        public static class VAN_CHART_DRILLMAPCATALOG extends Chart_Float.VAN_CHART {
             @Override
-            protected ValueEditorPane getValueEditorPane(){
+            protected ValueEditorPane getValueEditorPane() {
                 return getDrillMapCatalogValueEditorPane();
             }
         }
 
-        public static class VAN_CHART_MULTIPIE extends ChartHyperRelateFloatLinkPane{
+        public static class VAN_CHART_MULTIPIE extends Chart_Float.VAN_CHART {
             protected ValueEditorPane getValueEditorPane() {
                 return getMultiPieValueEditorPane();
             }
         }
 
-        public static class VAN_CHART_FUNNEL extends ChartHyperRelateFloatLinkPane{
+        public static class VAN_CHART_FUNNEL extends Chart_Float.VAN_CHART {
             @Override
             protected ValueEditorPane getValueEditorPane() {
                 return getFunnelValueEditorPane();
             }
         }
 
-        public static class VAN_CHART_WORDCLOUD extends ChartHyperRelateFloatLinkPane{
+        public static class VAN_CHART_WORDCLOUD extends Chart_Float.VAN_CHART {
             @Override
             protected ValueEditorPane getValueEditorPane() {
                 return getWordCloudValueEditorPane();
             }
         }
 
-        public static class VAN_CHART_STRUCTURE extends ChartHyperRelateFloatLinkPane{
+        public static class VAN_CHART_STRUCTURE extends Chart_Float.VAN_CHART {
             @Override
             protected ValueEditorPane getValueEditorPane() {
                 return getStructureValueEditorPane();
@@ -935,42 +1009,50 @@ public class HyperlinkMapFactory {
     }
 
     //当前表单对象
-    public static class Form{
-        public static class VAN_CHART extends FormHyperlinkPane.CHART{
+    public static class Form {
+        public static class VAN_CHART extends FormHyperlinkPane.CHART {
+            @Override
+            protected boolean needRenamePane() {
+                return false;
+            }
         }
 
-        public static class VAN_CHART_MULTICATEGORY extends FormHyperlinkPane.CHART{
+        public static class VAN_CHART_MULTICATEGORY extends Form.VAN_CHART {
             @Override
             protected ValueEditorPane getValueEditorPane() {
                 return getMultiCategoryEditorPane();
             }
         }
 
-        public static class VAN_CHART_SCATTER extends FormHyperlinkPane.CHART{
+        public static class VAN_CHART_SCATTER extends Form.VAN_CHART {
             @Override
             protected ValueEditorPane getValueEditorPane() {
                 return getScatterValueEditorPane();
             }
         }
 
-        public static class VAN_CHART_GANNT extends FormHyperlinkPane.CHART{
+        public static class VAN_CHART_GANNT extends Form.VAN_CHART {
             @Override
-            protected ValueEditorPane getValueEditorPane(){
+            protected ValueEditorPane getValueEditorPane() {
                 return getGanntValueEditorPane();
             }
         }
 
-        public static class VAN_CHART_GAUGE extends FormHyperlinkPane.CHART_METER{
+        public static class VAN_CHART_GAUGE extends FormHyperlinkPane.CHART_METER {
+            @Override
+            protected boolean needRenamePane() {
+                return false;
+            }
         }
 
-        public static class VAN_CHART_MAP extends FormHyperlinkPane.CHART{
+        public static class VAN_CHART_MAP extends Form.VAN_CHART {
             @Override
             protected ValueEditorPane getValueEditorPane() {
                 return getMapValueEditorPane();
             }
         }
 
-        public static class VAN_CHART_LINE_MAP extends FormHyperlinkPane.CHART{
+        public static class VAN_CHART_LINE_MAP extends Form.VAN_CHART {
             @Override
             protected ValueEditorPane getValueEditorPane() {
                 return getLineMapValueEditorPane();
@@ -978,34 +1060,34 @@ public class HyperlinkMapFactory {
         }
 
 
-        public static class VAN_CHART_DRILLMAPCATALOG extends FormHyperlinkPane.CHART{
+        public static class VAN_CHART_DRILLMAPCATALOG extends Form.VAN_CHART {
             @Override
-            protected ValueEditorPane getValueEditorPane(){
+            protected ValueEditorPane getValueEditorPane() {
                 return getDrillMapCatalogValueEditorPane();
             }
         }
 
-        public static class VAN_CHART_MULTIPIE extends FormHyperlinkPane.CHART{
+        public static class VAN_CHART_MULTIPIE extends Form.VAN_CHART {
             protected ValueEditorPane getValueEditorPane() {
                 return getMultiPieValueEditorPane();
             }
         }
 
-        public static class VAN_CHART_FUNNEL extends FormHyperlinkPane.CHART{
+        public static class VAN_CHART_FUNNEL extends Form.VAN_CHART {
             @Override
             protected ValueEditorPane getValueEditorPane() {
                 return getFunnelValueEditorPane();
             }
         }
 
-        public static class VAN_CHART_WORDCLOUD extends FormHyperlinkPane.CHART{
+        public static class VAN_CHART_WORDCLOUD extends Form.VAN_CHART {
             @Override
             protected ValueEditorPane getValueEditorPane() {
                 return getWordCloudValueEditorPane();
             }
         }
 
-        public static class VAN_CHART_STRUCTURE extends FormHyperlinkPane.CHART{
+        public static class VAN_CHART_STRUCTURE extends Form.VAN_CHART {
             @Override
             protected ValueEditorPane getValueEditorPane() {
                 return getStructureValueEditorPane();

From 97f17a26fcab3ee388ebb8183d84f095085f9270 Mon Sep 17 00:00:00 2001
From: mengao <283296419@qq.com>
Date: Thu, 7 Sep 2017 19:15:03 +0800
Subject: [PATCH 09/24] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=96=B0=E5=9B=BE?=
 =?UTF-8?q?=E8=A1=A8=E8=B6=85=E9=93=BE=E4=B8=AD=E5=90=8D=E5=AD=97=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chart/designer/other/HyperlinkMapFactory.java | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/designer_chart/src/com/fr/plugin/chart/designer/other/HyperlinkMapFactory.java b/designer_chart/src/com/fr/plugin/chart/designer/other/HyperlinkMapFactory.java
index 170962f02..d8fd27b1e 100644
--- a/designer_chart/src/com/fr/plugin/chart/designer/other/HyperlinkMapFactory.java
+++ b/designer_chart/src/com/fr/plugin/chart/designer/other/HyperlinkMapFactory.java
@@ -387,13 +387,6 @@ public class HyperlinkMapFactory {
     }
 
 
-    public static class VanChartEmailPane extends ChartEmailPane {
-        @Override
-        protected boolean needRenamePane() {
-            return false;
-        }
-    }
-
     //网络报表
     public static class Report {
         public static class VAN_CHART extends ReportletHyperlinkPane.CHART {
@@ -484,6 +477,14 @@ public class HyperlinkMapFactory {
         }
     }
 
+    //邮箱
+    public static class VanChartEmailPane extends ChartEmailPane {
+        @Override
+        protected boolean needRenamePane() {
+            return false;
+        }
+    }
+
     //网页链接
     public static class Web {
         public static class VAN_CHART extends WebHyperlinkPane.CHART {

From 3b1fe49d8ef3f6cf8a10e945ea05530185744969 Mon Sep 17 00:00:00 2001
From: mengao <283296419@qq.com>
Date: Fri, 8 Sep 2017 11:12:55 +0800
Subject: [PATCH 10/24] =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=EF=BC=8C=E8=B6=85=E9=93=BE=E7=AD=89=E5=BC=B9=E5=87=BA=E9=9D=A2?=
 =?UTF-8?q?=E6=9D=BF=E6=95=B4=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../component/VanChartHyperLinkPane.java      | 109 +-------------
 .../component/VanChartUIListControlPane.java  | 133 ++++++++++++++++++
 .../VanChartConditionListControlPane.java     |  17 +--
 .../background/AlertLineListControlPane.java  |  16 +--
 .../background/BackgroundListControlPane.java |  21 ++-
 5 files changed, 149 insertions(+), 147 deletions(-)
 create mode 100644 designer_chart/src/com/fr/plugin/chart/designer/component/VanChartUIListControlPane.java

diff --git a/designer_chart/src/com/fr/plugin/chart/custom/component/VanChartHyperLinkPane.java b/designer_chart/src/com/fr/plugin/chart/custom/component/VanChartHyperLinkPane.java
index 7404662a6..277c212de 100644
--- a/designer_chart/src/com/fr/plugin/chart/custom/component/VanChartHyperLinkPane.java
+++ b/designer_chart/src/com/fr/plugin/chart/custom/component/VanChartHyperLinkPane.java
@@ -10,13 +10,8 @@ import com.fr.design.designer.TargetComponent;
 import com.fr.design.fun.HyperlinkProvider;
 import com.fr.design.gui.controlpane.NameObjectCreator;
 import com.fr.design.gui.controlpane.NameableCreator;
-import com.fr.design.gui.controlpane.UIListControlPane;
-import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.imenutable.UIMenuNameableCreator;
-import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.module.DesignModuleFactory;
-import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.Inter;
 import com.fr.general.NameObject;
 import com.fr.js.EmailJavaScript;
@@ -28,16 +23,12 @@ import com.fr.js.NameJavaScriptGroup;
 import com.fr.js.ParameterJavaScript;
 import com.fr.js.ReportletHyperlink;
 import com.fr.js.WebHyperlink;
-import com.fr.plugin.chart.attr.plot.VanChartPlot;
+import com.fr.plugin.chart.designer.component.VanChartUIListControlPane;
 import com.fr.plugin.chart.designer.other.HyperlinkMapFactory;
 import com.fr.stable.ListMap;
 import com.fr.stable.Nameable;
 import com.fr.stable.bridge.StableFactory;
 
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
@@ -46,7 +37,7 @@ import java.util.Set;
 /**
  * Created by Fangjie on 2016/4/28.
  */
-public class VanChartHyperLinkPane extends UIListControlPane {
+public class VanChartHyperLinkPane extends VanChartUIListControlPane {
 
     public VanChartHyperLinkPane() {
         super();
@@ -114,20 +105,7 @@ public class VanChartHyperLinkPane extends UIListControlPane {
         return new NameJavaScriptGroup(res_array);
     }
 
-    @Override
-    public void saveSettings() {
-        if (isPopulating) {
-            return;
-        }
-        update((VanChartPlot) plot);
-        DesignerContext.getDesignerFrame().getSelectedJTemplate().fireTargetModified();
-    }
-
     public void populate(Plot plot) {
-        //特殊处理，使用instanceof判断，处理连续弹窗问题
-        if (SwingUtilities.getWindowAncestor(this) instanceof JDialog) {
-            popupEditDialog = new HyperDialog(cardPane);
-        }
         this.plot = plot;
         HashMap paneMap = getHyperlinkMap(plot);
 
@@ -240,87 +218,4 @@ public class VanChartHyperLinkPane extends UIListControlPane {
         }
         return null;
     }
-
-
-    protected void popupEditDialog(Point mousePos) {
-        //特殊处理，处理连续弹窗情况
-        if (SwingUtilities.getWindowAncestor(this) instanceof JDialog) {
-            GUICoreUtils.centerWindow(popupEditDialog);
-            popupEditDialog.setVisible(true);
-            return;
-        }
-        super.popupEditDialog(mousePos);
-    }
-
-
-
-    // 点击"编辑"按钮，弹出面板
-    protected class HyperDialog extends JDialog {
-        private JComponent editPane;
-        private static final int WIDTH = 570;
-        private static final int HEIGHT = 490;
-
-        private UIButton okButton, cancelButton;
-
-
-        HyperDialog(JComponent pane) {
-            super(DesignerContext.getDesignerFrame(), true);
-            pane.setBorder(BorderFactory.createEmptyBorder(20, 10, 10, 10));
-            this.editPane = pane;
-            JPanel editPaneWrapper = new JPanel(new BorderLayout());
-            editPaneWrapper.add(editPane, BorderLayout.CENTER);
-            this.getContentPane().add(editPaneWrapper, BorderLayout.CENTER);
-            this.getContentPane().add(createControlButtonPane(), BorderLayout.SOUTH);
-            setSize(WIDTH, HEIGHT);
-            this.setVisible(false);
-        }
-
-        private JPanel createControlButtonPane() {
-            JPanel controlPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-
-            JPanel buttonsPane = new JPanel(new FlowLayout(FlowLayout.LEFT, 10, 0));
-            controlPane.add(buttonsPane, BorderLayout.EAST);
-
-            //确定
-            addOkButton(buttonsPane);
-            //取消
-            addCancelButton(buttonsPane);
-
-            controlPane.setBorder(BorderFactory.createEmptyBorder(10,0,10,0));
-
-            return controlPane;
-        }
-
-        private void addCancelButton(JPanel buttonsPane) {
-            cancelButton = new UIButton(Inter.getLocText("Cancel"));
-            buttonsPane.add(cancelButton);
-            cancelButton.addActionListener(new ActionListener() {
-
-                public void actionPerformed(ActionEvent evt) {
-                    doCancel();
-                }
-            });
-        }
-
-        private void addOkButton(JPanel buttonsPane) {
-            okButton = new UIButton(Inter.getLocText("OK"));
-            buttonsPane.add(okButton);
-            okButton.addActionListener(new ActionListener() {
-
-                public void actionPerformed(ActionEvent evt) {
-                    doOK();
-                }
-            });
-        }
-
-        public void doOK() {
-            saveSettings();
-            setVisible(false);
-        }
-
-        public void doCancel() {
-            setVisible(false);
-        }
-    }
-
 }
diff --git a/designer_chart/src/com/fr/plugin/chart/designer/component/VanChartUIListControlPane.java b/designer_chart/src/com/fr/plugin/chart/designer/component/VanChartUIListControlPane.java
new file mode 100644
index 000000000..5da2a0461
--- /dev/null
+++ b/designer_chart/src/com/fr/plugin/chart/designer/component/VanChartUIListControlPane.java
@@ -0,0 +1,133 @@
+package com.fr.plugin.chart.designer.component;
+
+import com.fr.base.chart.BasePlot;
+import com.fr.chart.chartattr.Plot;
+import com.fr.design.gui.controlpane.UIListControlPane;
+import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.general.Inter;
+import com.fr.stable.Nameable;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+/**
+ * Created by mengao on 2017/9/8.
+ * 新图表UIListControlPane，基础面板。
+ */
+public abstract class VanChartUIListControlPane extends UIListControlPane {
+
+    public VanChartUIListControlPane() {
+        super();
+    }
+
+    public VanChartUIListControlPane(BasePlot plot) {
+        super(plot);
+    }
+
+    @Override
+    public void saveSettings() {
+        if (isPopulating) {
+            return;
+        }
+        update((Plot) plot);
+        DesignerContext.getDesignerFrame().getSelectedJTemplate().fireTargetModified();
+    }
+
+    protected abstract void update(Plot plot);
+
+
+    //-------------------连续弹窗问题  start-------------------//
+
+    public void populate (Nameable[] nameableArray) {
+        //特殊处理，使用instanceof判断，弹出不同的面板
+        if (SwingUtilities.getWindowAncestor(this) instanceof JDialog) {
+            popupEditDialog = new HyperDialog(cardPane);
+        }
+        super.populate(nameableArray);
+    }
+
+    protected void popupEditDialog(Point mousePos) {
+        //特殊处理，处理连续弹窗情况，弹出面板定为方式不同
+        if (SwingUtilities.getWindowAncestor(this) instanceof JDialog) {
+            GUICoreUtils.centerWindow(popupEditDialog);
+            popupEditDialog.setVisible(true);
+            return;
+        }
+        super.popupEditDialog(mousePos);
+    }
+
+    // 点击"编辑"按钮，弹出面板（这个面板是弹窗里面的弹窗）
+    protected class HyperDialog extends JDialog {
+        private JComponent editPane;
+        private static final int WIDTH = 570;
+        private static final int HEIGHT = 490;
+
+        private UIButton okButton, cancelButton;
+
+
+        HyperDialog(JComponent pane) {
+            super(DesignerContext.getDesignerFrame(), true);
+            pane.setBorder(BorderFactory.createEmptyBorder(20, 10, 10, 10));
+            this.editPane = pane;
+            JPanel editPaneWrapper = new JPanel(new BorderLayout());
+            editPaneWrapper.add(editPane, BorderLayout.CENTER);
+            this.getContentPane().add(editPaneWrapper, BorderLayout.CENTER);
+            this.getContentPane().add(createControlButtonPane(), BorderLayout.SOUTH);
+            setSize(WIDTH, HEIGHT);
+            this.setVisible(false);
+        }
+
+        private JPanel createControlButtonPane() {
+            JPanel controlPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+
+            JPanel buttonsPane = new JPanel(new FlowLayout(FlowLayout.LEFT, 10, 0));
+            controlPane.add(buttonsPane, BorderLayout.EAST);
+
+            //确定
+            addOkButton(buttonsPane);
+            //取消
+            addCancelButton(buttonsPane);
+
+            controlPane.setBorder(BorderFactory.createEmptyBorder(10,0,10,0));
+
+            return controlPane;
+        }
+
+        private void addCancelButton(JPanel buttonsPane) {
+            cancelButton = new UIButton(Inter.getLocText("Cancel"));
+            buttonsPane.add(cancelButton);
+            cancelButton.addActionListener(new ActionListener() {
+
+                public void actionPerformed(ActionEvent evt) {
+                    doCancel();
+                }
+            });
+        }
+
+        private void addOkButton(JPanel buttonsPane) {
+            okButton = new UIButton(Inter.getLocText("OK"));
+            buttonsPane.add(okButton);
+            okButton.addActionListener(new ActionListener() {
+
+                public void actionPerformed(ActionEvent evt) {
+                    doOK();
+                }
+            });
+        }
+
+        public void doOK() {
+            saveSettings();
+            setVisible(false);
+        }
+
+        public void doCancel() {
+            setVisible(false);
+        }
+    }
+
+}
diff --git a/designer_chart/src/com/fr/plugin/chart/designer/other/VanChartConditionListControlPane.java b/designer_chart/src/com/fr/plugin/chart/designer/other/VanChartConditionListControlPane.java
index 8d67089f8..4c3a7a7f5 100644
--- a/designer_chart/src/com/fr/plugin/chart/designer/other/VanChartConditionListControlPane.java
+++ b/designer_chart/src/com/fr/plugin/chart/designer/other/VanChartConditionListControlPane.java
@@ -8,11 +8,9 @@ import com.fr.design.ChartTypeInterfaceManager;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.gui.controlpane.NameObjectCreator;
 import com.fr.design.gui.controlpane.NameableCreator;
-import com.fr.design.gui.controlpane.UIListControlPane;
-import com.fr.design.mainframe.DesignerContext;
 import com.fr.general.Inter;
 import com.fr.general.NameObject;
-import com.fr.plugin.chart.attr.plot.VanChartPlot;
+import com.fr.plugin.chart.designer.component.VanChartUIListControlPane;
 import com.fr.stable.Nameable;
 
 import java.lang.reflect.Constructor;
@@ -22,7 +20,7 @@ import java.lang.reflect.InvocationTargetException;
  * Created by mengao on 2017/8/18.
  * 条件属性ListControlPane，弹出条件属性设置面板
  */
-public class VanChartConditionListControlPane extends UIListControlPane {
+public class VanChartConditionListControlPane extends VanChartUIListControlPane {
 
     public VanChartConditionListControlPane(BasePlot plot) {
         super(plot);
@@ -58,14 +56,6 @@ public class VanChartConditionListControlPane extends UIListControlPane {
         return null;
     }
 
-    @Override
-    public void saveSettings() {
-        if (isPopulating) {
-            return;
-        }
-        updateConditionCollection(((VanChartPlot) plot).getConditionCollection());
-        DesignerContext.getDesignerFrame().getSelectedJTemplate().fireTargetModified();
-    }
 
     @Override
     public String getAddItemText() {
@@ -81,7 +71,8 @@ public class VanChartConditionListControlPane extends UIListControlPane {
     /**
      * Update.
      */
-    public void updateConditionCollection(ConditionCollection cc) {
+    protected void update(Plot plot) {
+        ConditionCollection cc = plot.getConditionCollection();
         Nameable[] nameables = this.update();
 
         cc.clearConditionAttr();
diff --git a/designer_chart/src/com/fr/plugin/chart/designer/style/background/AlertLineListControlPane.java b/designer_chart/src/com/fr/plugin/chart/designer/style/background/AlertLineListControlPane.java
index 7a61e232e..3dfb4f430 100644
--- a/designer_chart/src/com/fr/plugin/chart/designer/style/background/AlertLineListControlPane.java
+++ b/designer_chart/src/com/fr/plugin/chart/designer/style/background/AlertLineListControlPane.java
@@ -3,16 +3,14 @@ package com.fr.plugin.chart.designer.style.background;
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.gui.controlpane.NameableCreator;
 import com.fr.design.gui.controlpane.ShortCut4JControlPane;
-import com.fr.design.gui.controlpane.UIListControlPane;
-import com.fr.design.mainframe.DesignerContext;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.Inter;
 import com.fr.general.NameObject;
 import com.fr.plugin.chart.attr.DefaultAxisHelper;
 import com.fr.plugin.chart.attr.axis.VanChartAlertValue;
 import com.fr.plugin.chart.attr.axis.VanChartAxis;
-import com.fr.plugin.chart.attr.plot.VanChartPlot;
 import com.fr.plugin.chart.attr.plot.VanChartRectanglePlot;
+import com.fr.plugin.chart.designer.component.VanChartUIListControlPane;
 import com.fr.stable.Nameable;
 
 import java.util.ArrayList;
@@ -22,17 +20,7 @@ import java.util.List;
  * Created by mengao on 2017/8/22.
  * 自定义警戒线列表面板
  */
-public class AlertLineListControlPane extends UIListControlPane {
-
-
-    @Override
-    public void saveSettings() {
-        if (isPopulating) {
-            return;
-        }
-        update((VanChartPlot) plot);
-        DesignerContext.getDesignerFrame().getSelectedJTemplate().fireTargetModified();
-    }
+public class AlertLineListControlPane extends VanChartUIListControlPane {
 
     @Override
     public NameableCreator[] createNameableCreators() {
diff --git a/designer_chart/src/com/fr/plugin/chart/designer/style/background/BackgroundListControlPane.java b/designer_chart/src/com/fr/plugin/chart/designer/style/background/BackgroundListControlPane.java
index 1214b3356..de8a35d53 100644
--- a/designer_chart/src/com/fr/plugin/chart/designer/style/background/BackgroundListControlPane.java
+++ b/designer_chart/src/com/fr/plugin/chart/designer/style/background/BackgroundListControlPane.java
@@ -3,8 +3,6 @@ package com.fr.plugin.chart.designer.style.background;
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.gui.controlpane.NameableCreator;
 import com.fr.design.gui.controlpane.ShortCut4JControlPane;
-import com.fr.design.gui.controlpane.UIListControlPane;
-import com.fr.design.mainframe.DesignerContext;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.Inter;
 import com.fr.general.NameObject;
@@ -12,8 +10,8 @@ import com.fr.plugin.chart.attr.DefaultAxisHelper;
 import com.fr.plugin.chart.attr.axis.VanChartAlertValue;
 import com.fr.plugin.chart.attr.axis.VanChartAxis;
 import com.fr.plugin.chart.attr.axis.VanChartCustomIntervalBackground;
-import com.fr.plugin.chart.attr.plot.VanChartPlot;
 import com.fr.plugin.chart.attr.plot.VanChartRectanglePlot;
+import com.fr.plugin.chart.designer.component.VanChartUIListControlPane;
 import com.fr.stable.Nameable;
 
 import java.util.ArrayList;
@@ -23,16 +21,7 @@ import java.util.List;
  * Created by mengao on 2017/8/22.
  * 自定义间隔背景列表面板
  */
-public class BackgroundListControlPane extends UIListControlPane {
-
-    @Override
-    public void saveSettings() {
-        if (isPopulating) {
-            return;
-        }
-        update((VanChartPlot) plot, false);
-        DesignerContext.getDesignerFrame().getSelectedJTemplate().fireTargetModified();
-    }
+public class BackgroundListControlPane extends VanChartUIListControlPane {
 
     @Override
     public NameableCreator[] createNameableCreators() {
@@ -93,6 +82,12 @@ public class BackgroundListControlPane extends UIListControlPane {
         doLayout();
     }
 
+
+    @Override
+    protected void update(Plot plot) {
+        update(plot, false);
+    }
+
     public void update(Plot plot, boolean isDefaultIntervalBackground) {
 
         Nameable[] nameables = this.update();

From 01f94cea09f42dc3ca228a75ec3f2a1d0277fefa Mon Sep 17 00:00:00 2001
From: mengao <283296419@qq.com>
Date: Fri, 8 Sep 2017 11:23:12 +0800
Subject: [PATCH 11/24] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=97=B4=E9=9A=94?=
 =?UTF-8?q?=E8=83=8C=E6=99=AFbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../style/background/VanChartCustomIntervalBackgroundPane.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/designer_chart/src/com/fr/plugin/chart/designer/style/background/VanChartCustomIntervalBackgroundPane.java b/designer_chart/src/com/fr/plugin/chart/designer/style/background/VanChartCustomIntervalBackgroundPane.java
index 5c9ab759c..b67f11529 100644
--- a/designer_chart/src/com/fr/plugin/chart/designer/style/background/VanChartCustomIntervalBackgroundPane.java
+++ b/designer_chart/src/com/fr/plugin/chart/designer/style/background/VanChartCustomIntervalBackgroundPane.java
@@ -38,6 +38,7 @@ public class VanChartCustomIntervalBackgroundPane extends BasicBeanPane<VanChart
         this.setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
         //
         JPanel top = FRGUIPaneFactory.createBorderLayout_L_Pane();
+        this.removeAll();
         this.add(top);
         top.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("Plugin-ChartF_CustomIntervalBackground") + ":", null));
         top.add(createContentPane());

From 520d43e38cf4d1630787991857fdd993d85707b0 Mon Sep 17 00:00:00 2001
From: kerry <kerry@finereport.com>
Date: Sun, 10 Sep 2017 17:28:53 +0800
Subject: [PATCH 12/24] 
 REPORT-3958&&REPORT-4373&&REPORT-4377&&REPORT-4372&&REPORT-4398&&REPORT-4393&&REPORT-4028&&REPORT-4192

---
 .../fr/design/widget/CellWidgetCardPane.java  |   5 +-
 .../widget/ui/CheckBoxGroupDefinePane.java    |   4 +-
 .../widget/ui/ComboCheckBoxDefinePane.java    |   1 +
 .../widget/ui/DateEditorDefinePane.java       |  28 +-
 .../ui/DirectWriteEditorDefinePane.java       |   2 +-
 .../widget/ui/FieldEditorDefinePane.java      |  36 +--
 .../widget/ui/NumberEditorDefinePane.java     | 257 +--------------
 .../ui/btn/DefineAppendColumnRowPane.java     |   4 +-
 .../ui/btn/DefineDeleteColumnRowPane.java     |   5 +-
 .../btn/TreeNodeToogleButtonDefinePane.java   |  28 +-
 .../fr/design/designer/IntervalConstants.java |  22 ++
 .../design/gui/columnrow/ColumnRowPane.java   |   3 +-
 .../fr/design/gui/frpane/RegFieldPane.java    |   9 +-
 .../src/com/fr/design/gui/frpane/RegPane.java |  25 +-
 .../AccessibleImgBackgroundEditor.java        |  68 ++--
 .../btn/ButtonWithHotkeysDetailPane.java      |  11 +-
 .../widget/component/BackgroundCompPane.java  |  29 +-
 .../widget/component}/CheckBoxDictPane.java   | 168 +++++-----
 .../widget/component/DateValuePane.java       |  18 +-
 .../component/NumberEditorValidatePane.java   | 303 ++++++++++++++++++
 .../creator/CRPropertyDescriptorPane.java     |  92 ++++++
 .../designer/creator/PropertyGroupPane.java   |  70 ++++
 .../design/designer/creator/XDateEditor.java  |   2 +-
 .../design/designer/creator/XElementCase.java |  18 +-
 .../creator/cardlayout/XWTabFitLayout.java    |  18 ++
 .../widget/ui/FormWidgetCardPane.java         |   2 +
 .../parameter/RootDesignDefinePane.java       |   7 +-
 .../widget/ui/designer/ButtonDefinePane.java  |   6 +-
 .../widget/ui/designer/CheckBoxDictPane.java  |  93 ------
 .../ui/designer/DateEditorDefinePane.java     |  18 +-
 .../ui/designer/FieldEditorDefinePane.java    |  32 +-
 .../ui/designer/FreeButtonDefinePane.java     |  30 +-
 .../ui/designer/NumberEditorDefinePane.java   | 252 +--------------
 .../designer/component/PaddingBoundPane.java  |   3 +-
 .../component/TabFitLayoutBackgroundPane.java |   6 +
 .../layout/ElementEditorDefinePane.java       |  35 +-
 .../FRAbsoluteBodyLayoutDefinePane.java       |  46 ++-
 .../layout/FRAbsoluteLayoutDefinePane.java    |  23 +-
 .../layout/FRFitLayoutDefinePane.java         |  17 +-
 .../layout/WCardLayoutDefinePane.java         |   9 +-
 .../layout/WTabFitLayoutDefinePane.java       |  21 +-
 41 files changed, 909 insertions(+), 917 deletions(-)
 create mode 100644 designer_base/src/com/fr/design/designer/IntervalConstants.java
 rename {designer_form => designer_base}/src/com/fr/design/mainframe/widget/accessibles/AccessibleImgBackgroundEditor.java (97%)
 rename {designer/src/com/fr/design/widget/ui => designer_base/src/com/fr/design/widget/component}/CheckBoxDictPane.java (60%)
 create mode 100644 designer_base/src/com/fr/design/widget/component/NumberEditorValidatePane.java
 create mode 100644 designer_form/src/com/fr/design/designer/creator/CRPropertyDescriptorPane.java
 create mode 100644 designer_form/src/com/fr/design/designer/creator/PropertyGroupPane.java
 delete mode 100644 designer_form/src/com/fr/design/widget/ui/designer/CheckBoxDictPane.java

diff --git a/designer/src/com/fr/design/widget/CellWidgetCardPane.java b/designer/src/com/fr/design/widget/CellWidgetCardPane.java
index 3d135d34c..737946453 100644
--- a/designer/src/com/fr/design/widget/CellWidgetCardPane.java
+++ b/designer/src/com/fr/design/widget/CellWidgetCardPane.java
@@ -73,8 +73,9 @@ public class CellWidgetCardPane extends BasicPane {
         tabbedPane = new CardLayout();
         center = new JPanel(tabbedPane);
         jPanel.add(center, BorderLayout.CENTER);
-
+        jPanel.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 0));
         attriTabPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+//        attriTabPane.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
         eventTabPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         initPaneList();
         eventPane = initWidgetEventPane(pane);
@@ -91,7 +92,7 @@ public class CellWidgetCardPane extends BasicPane {
             }
         };
         tabsHeaderIconPane.setNeedLeftRightOutLine(false);
-        jPanel.add(tabsHeaderIconPane, BorderLayout.NORTH);
+        this.add(tabsHeaderIconPane, BorderLayout.NORTH);
 
         widgetPropertyPane = new BasicWidgetPropertySettingPane();
 
diff --git a/designer/src/com/fr/design/widget/ui/CheckBoxGroupDefinePane.java b/designer/src/com/fr/design/widget/ui/CheckBoxGroupDefinePane.java
index 710d566b8..5a1c24072 100644
--- a/designer/src/com/fr/design/widget/ui/CheckBoxGroupDefinePane.java
+++ b/designer/src/com/fr/design/widget/ui/CheckBoxGroupDefinePane.java
@@ -9,6 +9,7 @@ import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.widget.component.CheckBoxDictPane;
 import com.fr.form.ui.CheckBoxGroup;
 import com.fr.general.Inter;
 
@@ -36,7 +37,7 @@ public class CheckBoxGroupDefinePane extends FieldEditorDefinePane<CheckBoxGroup
 	@Override
 	protected JPanel setFirstContentPane() {
 		JPanel advancePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-		checkbox = new UICheckBox(Inter.getLocText("FR-Designer_Advanced"));
+		checkbox = new UICheckBox(Inter.getLocText(new String[]{"Provide", "Choose_All"}));
 		checkbox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
 		buttonGroupDictPane = new ButtonGroupDictPane();
 		checkBoxDictPane = new CheckBoxDictPane();
@@ -52,7 +53,6 @@ public class CheckBoxGroupDefinePane extends FieldEditorDefinePane<CheckBoxGroup
 		double[] columnSize = {p, f};
 		int[][] rowCount = {{1, 1},{1, 1},{1,1},{1,1}};
 		JPanel panel =  TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, 10, 7);
-//		panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
 		advancePane.add(panel);
 		return advancePane;
 
diff --git a/designer/src/com/fr/design/widget/ui/ComboCheckBoxDefinePane.java b/designer/src/com/fr/design/widget/ui/ComboCheckBoxDefinePane.java
index 1d1bb9b46..b8922ad55 100644
--- a/designer/src/com/fr/design/widget/ui/ComboCheckBoxDefinePane.java
+++ b/designer/src/com/fr/design/widget/ui/ComboCheckBoxDefinePane.java
@@ -8,6 +8,7 @@ import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.widget.accessibles.AccessibleDictionaryEditor;
+import com.fr.design.widget.component.CheckBoxDictPane;
 import com.fr.form.ui.ComboCheckBox;
 import com.fr.general.Inter;
 
diff --git a/designer/src/com/fr/design/widget/ui/DateEditorDefinePane.java b/designer/src/com/fr/design/widget/ui/DateEditorDefinePane.java
index 9adb2f14f..26cc0f439 100644
--- a/designer/src/com/fr/design/widget/ui/DateEditorDefinePane.java
+++ b/designer/src/com/fr/design/widget/ui/DateEditorDefinePane.java
@@ -3,13 +3,12 @@ package com.fr.design.widget.ui;
 import com.fr.base.FRContext;
 import com.fr.base.Formula;
 import com.fr.data.core.FormatField;
-import com.fr.design.gui.ibutton.UIHeadGroup;
+import com.fr.design.gui.ibutton.UIButtonGroup;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
-import com.fr.design.mainframe.CellWidgetPropertyPane;
 import com.fr.design.widget.component.DateValuePane;
 import com.fr.form.ui.DateEditor;
 import com.fr.general.DateUtils;
@@ -19,6 +18,8 @@ import com.fr.stable.ArrayUtils;
 import com.fr.stable.UtilEvalError;
 
 import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -26,14 +27,14 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 
 public class DateEditorDefinePane extends DirectWriteEditorDefinePane<DateEditor> {
-	private UIHeadGroup returnTypeComboBox;
+	private UIButtonGroup returnTypeComboBox;
 
 	private DateValuePane startDv;
 	private DateValuePane endDv;
 
 	private UIComboBox currentFormatComboBox;
 	private UILabel currentSamplelabel;
-	private UIHeadGroup fomatHeadGroup;
+	private UIButtonGroup fomatHeadGroup;
 
 
 
@@ -47,12 +48,7 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane<DateEditor
 
 	@Override
 	protected JPanel setSecondContentPane() {
-			returnTypeComboBox = new UIHeadGroup(new String[] {Inter.getLocText("Date") ,  Inter.getLocText("String")}){
-				protected void tabChanged(int newSelectedIndex) {
-					//todo
-				}
-			};
-
+		returnTypeComboBox = new UIButtonGroup<>(new String[] {Inter.getLocText("Date") ,  Inter.getLocText("String")});
 		JPanel formatHead =  createFormatHead();
 
 		startDv = new DateValuePane();
@@ -118,8 +114,11 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane<DateEditor
 		customPane.add(dateFormatPane, Inter.getLocText("StyleFormat-Date"));
 		customPane.add(timeFormatPane, Inter.getLocText("StyleFormat-Time"));
 		final String[] tabTitles = new String[]{Inter.getLocText("StyleFormat-Date"), Inter.getLocText("StyleFormat-Time")};
-		fomatHeadGroup = new UIHeadGroup(new String[]{Inter.getLocText("StyleFormat-Date"), Inter.getLocText("StyleFormat-Time")}){
-			protected void tabChanged(int newSelectedIndex) {
+		fomatHeadGroup = new UIButtonGroup(new String[]{Inter.getLocText("StyleFormat-Date"), Inter.getLocText("StyleFormat-Time")});
+		fomatHeadGroup.addChangeListener(new ChangeListener() {
+			@Override
+			public void stateChanged(ChangeEvent e) {
+				int newSelectedIndex = fomatHeadGroup.getSelectedIndex();
 				cardLayout.show(customPane, tabTitles[newSelectedIndex]);
 				if(newSelectedIndex == 0){
 					currentFormatComboBox = dateFormatComboBox;
@@ -130,12 +129,14 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane<DateEditor
 				}
 				refreshPreviewLabel();
 			}
-		};
+		});
 		fomatHeadPane.add(fomatHeadGroup, BorderLayout.NORTH);
 		fomatHeadPane.add(customPane, BorderLayout.CENTER);
 		return fomatHeadPane;
 	}
 
+
+
 	private void refreshPreviewLabel() {
 		String text = (String) currentFormatComboBox.getSelectedItem();
 		if (text != null && text.length() > 0) {
@@ -175,6 +176,7 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane<DateEditor
 	protected void populateSubDirectWriteEditorBean(DateEditor e) {
 		String formatText = e.getFormatText();
 		fomatHeadGroup.setSelectedIndex(getDateType(e));
+		fomatHeadGroup.populateBean();
 		currentFormatComboBox.setSelectedItem(formatText);
 
 		returnTypeComboBox.setSelectedIndex(e.isReturnDate() ? 0 : 1);
diff --git a/designer/src/com/fr/design/widget/ui/DirectWriteEditorDefinePane.java b/designer/src/com/fr/design/widget/ui/DirectWriteEditorDefinePane.java
index 2cdc0bc84..2a827e0d1 100644
--- a/designer/src/com/fr/design/widget/ui/DirectWriteEditorDefinePane.java
+++ b/designer/src/com/fr/design/widget/ui/DirectWriteEditorDefinePane.java
@@ -15,7 +15,7 @@ public abstract class DirectWriteEditorDefinePane<T extends DirectWriteEditor> e
 	protected WaterMarkDictPane waterMarkDictPane;
 
 	public DirectWriteEditorDefinePane() {
-		this.initComponents();
+		super();
 	}
 
 
diff --git a/designer/src/com/fr/design/widget/ui/FieldEditorDefinePane.java b/designer/src/com/fr/design/widget/ui/FieldEditorDefinePane.java
index 054380b4d..15ad11fd5 100644
--- a/designer/src/com/fr/design/widget/ui/FieldEditorDefinePane.java
+++ b/designer/src/com/fr/design/widget/ui/FieldEditorDefinePane.java
@@ -1,7 +1,7 @@
 package com.fr.design.widget.ui;
 
-import com.fr.base.GraphHelper;
 import com.fr.design.constants.LayoutConstants;
+import com.fr.design.designer.IntervalConstants;
 import com.fr.design.foldablepane.UIExpandablePane;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.ilable.UILabel;
@@ -20,8 +20,6 @@ import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 
 public abstract class FieldEditorDefinePane<T extends FieldEditor> extends AbstractDataModify<T> {
-    private static final int ALLOW_BLANK_CHECK_BOX_WIDTH = GraphHelper.getLocTextWidth("FR-Designer_Allow_Null") + 30;
-    private static final int ALLOW_BLANK_CHECK_BOX_HEIGHT = 30;
     protected UICheckBox allowBlankCheckBox;
     // richer:错误信息，是所有控件共有的属性，所以放到这里来
     protected UITextField errorMsgTextField;
@@ -95,39 +93,29 @@ public abstract class FieldEditorDefinePane<T extends FieldEditor> extends Abstr
 
     protected void addValidatePane() {
         validatePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        final UILabel uiLabel = new UILabel(Inter.getLocText(new String[]{"FR-Designer_Error", "FR-Designer_Tooltips"}));
+        final UILabel uiLabel = new UILabel(Inter.getLocText("FR-Designer_Widget_Error_Tip"));
         initErrorMsgPane();
         allowBlankCheckBox = new UICheckBox(Inter.getLocText("FR-Designer_Allow_Null"));
         allowBlankCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
-        allowBlankCheckBox.setPreferredSize(new Dimension(ALLOW_BLANK_CHECK_BOX_WIDTH, ALLOW_BLANK_CHECK_BOX_HEIGHT));
+        JPanel borderPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        final JPanel errorTipPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{uiLabel, errorMsgTextField}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L1, LayoutConstants.VGAP_MEDIUM);
+        errorTipPane.setBorder(BorderFactory.createEmptyBorder(0, IntervalConstants.INTERVAL_L5, 0, 0));
+        borderPane.add(errorTipPane, BorderLayout.CENTER);
         allowBlankCheckBox.addItemListener(new ItemListener() {
-
             @Override
             public void itemStateChanged(ItemEvent e) {
                 boolean isSelected = allowBlankCheckBox.isSelected();
-                uiLabel.setVisible(!isSelected);
-                errorMsgTextField.setVisible(!isSelected);
-                if (isSelected) {
-                    uiLabel.setPreferredSize(new Dimension(0, 0));
-                    errorMsgTextField.setPreferredSize(new Dimension(0, 0));
-                } else {
-                    uiLabel.setPreferredSize(new Dimension(66, 20));
-                    errorMsgTextField.setPreferredSize(new Dimension(150, 20));
-                }
+                errorTipPane.setVisible(!isSelected);
             }
         });
 
-
-        double f = TableLayout.FILL;
-        double p = TableLayout.PREFERRED;
+        errorTipPane.setBorder(BorderFactory.createEmptyBorder(0, IntervalConstants.INTERVAL_L5, 0, 0));
         Component[][] components = new Component[][]{
-                new Component[]{allowBlankCheckBox, null},
-                new Component[]{uiLabel, errorMsgTextField},
+                new Component[]{allowBlankCheckBox},
+                new Component[]{borderPane},
         };
-        double[] rowSize = {p, p};
-        double[] columnSize = {p, f};
-        int[][] rowCount = {{1, 1}, {1, 1}};
-        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_SMALL, 1);
+        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components,TableLayoutHelper.FILL_LASTCOLUMN, 5, 5);
+        panel.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L1, 0, IntervalConstants.INTERVAL_L6, 0));
         validatePane.add(panel, BorderLayout.NORTH);
 
         JPanel contentPane = this.setValidatePane();
diff --git a/designer/src/com/fr/design/widget/ui/NumberEditorDefinePane.java b/designer/src/com/fr/design/widget/ui/NumberEditorDefinePane.java
index b47355143..122441b81 100644
--- a/designer/src/com/fr/design/widget/ui/NumberEditorDefinePane.java
+++ b/designer/src/com/fr/design/widget/ui/NumberEditorDefinePane.java
@@ -1,60 +1,20 @@
 package com.fr.design.widget.ui;
 
 import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-
 import javax.swing.BorderFactory;
-import javax.swing.JComponent;
-import javax.swing.JFormattedTextField;
-
-import com.fr.design.constants.LayoutConstants;
-import com.fr.design.gui.ilable.UILabel;
-
 import javax.swing.JPanel;
-import javax.swing.SpinnerNumberModel;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-import javax.swing.text.DefaultFormatter;
-
-import com.fr.design.gui.icheckbox.UICheckBox;
-import com.fr.design.gui.ispinner.UIBasicSpinner;
-import com.fr.design.gui.ispinner.UISpinner;
 import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.layout.TableLayout;
-import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.widget.component.NumberEditorValidatePane;
 import com.fr.form.ui.NumberEditor;
-import com.fr.general.Inter;
 
 public class NumberEditorDefinePane extends FieldEditorDefinePane<NumberEditor> {
     /**
      * FieldEditorDefinePane
      */
     private static final long serialVersionUID = 8011242951911686805L;
-    private UICheckBox allowDecimalsCheckBox;
-    private UICheckBox allowNegativeCheckBox;
-    private UICheckBox setMaxValueCheckBox;
-    private UICheckBox setMinValueCheckBox;
-    private UIBasicSpinner maxValueSpinner;
-    private SpinnerNumberModel maxValueModel;
-    private UIBasicSpinner minValueSpinner;
-    private SpinnerNumberModel minValueModel;
-    private UISpinner decimalLength;
-    private JPanel limitNumberPane;
-    private WaterMarkDictPane waterMarkDictPane;
-
-    private ActionListener allowDecimalsListener;
-
-    private ActionListener allowNegativeListener ;
-
-    public ActionListener setMaxListener;
-
-    private ActionListener setMinListener;
-
-    private ChangeListener maxValueChangeListener;
 
-    private ChangeListener minValueChangeListener;
+    private WaterMarkDictPane waterMarkDictPane;
+    private NumberEditorValidatePane numberEditorValidatePane;
 
     public NumberEditorDefinePane() {
     }
@@ -75,226 +35,23 @@ public class NumberEditorDefinePane extends FieldEditorDefinePane<NumberEditor>
     }
 
     public JPanel setValidatePane() {
-        initListeners();
-
-        this.allowDecimalsCheckBox = new UICheckBox(Inter.getLocText("FR-Designer_Allow_Decimals"));
-        allowDecimalsCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
-        this.decimalLength = new UISpinner(0, Integer.MAX_VALUE, 1, 16);
-        this.allowDecimalsCheckBox.addActionListener(allowDecimalsListener);
-
-        this.allowNegativeCheckBox = new UICheckBox(Inter.getLocText("FR-Designer_Allow_Negative"));
-        this.allowNegativeCheckBox.addActionListener(allowNegativeListener);
-        allowNegativeCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
-
-        this.setMaxValueCheckBox = new UICheckBox(Inter.getLocText("FR-Designer_Max_Value"), false);
-        setMaxValueCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
-        this.maxValueSpinner = new UIBasicSpinner(maxValueModel = new SpinnerNumberModel(0D, -Double.MAX_VALUE, Double.MAX_VALUE, 1D));
-        setNotAllowsInvalid(this.maxValueSpinner);
-        this.setMaxValueCheckBox.addActionListener(setMaxListener);
-        this.maxValueSpinner.addChangeListener(maxValueChangeListener);
-
-        this.setMinValueCheckBox = new UICheckBox(Inter.getLocText("FR-Designer_Min_Value"), false);
-        setMinValueCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
-        this.minValueSpinner = new UIBasicSpinner(minValueModel = new SpinnerNumberModel(0D, -Double.MAX_VALUE, Double.MAX_VALUE, 1D));
-        setNotAllowsInvalid(this.minValueSpinner);
-        this.setMinValueCheckBox.addActionListener(setMinListener);
-        this.minValueSpinner.addChangeListener(minValueChangeListener);
-
-        UILabel numberLabel = new UILabel(Inter.getLocText("FR-Designer_Decimal_Places"));
-        limitNumberPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{numberLabel, decimalLength}}, TableLayoutHelper.FILL_LASTCOLUMN, 18, 7);
-        double f = TableLayout.FILL;
-        double p = TableLayout.PREFERRED;
-        Component[][] components = new Component[][]{
-                new Component[]{allowDecimalsCheckBox, null},
-                new Component[]{limitNumberPane, null},
-                new Component[]{allowNegativeCheckBox, null},
-                new Component[]{setMaxValueCheckBox, maxValueSpinner},
-                new Component[]{setMinValueCheckBox, minValueSpinner},
-        };
-        double[] rowSize = {p, p, p, p, p};
-        double[] columnSize = {p, f};
-        int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}};
-        JPanel pane = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_MEDIUM, LayoutConstants.VGAP_MEDIUM);
-        pane.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
-        return pane;
+        numberEditorValidatePane = new NumberEditorValidatePane();
+        return numberEditorValidatePane;
     }
 
-
     @Override
     protected void populateSubFieldEditorBean(NumberEditor e) {
-        allowDecimalsCheckBox.setSelected(e.isAllowDecimals());
-        if (e.isAllowDecimals()) {
-            this.decimalLength.setValue(e.getMaxDecimalLength());
-        } else {
-            this.limitNumberPane.setVisible(false);
-            this.limitNumberPane.setPreferredSize(new Dimension(0,0));
-        }
-
-        allowNegativeCheckBox.setSelected(e.isAllowNegative());
-        if (e.getMaxValue() == Double.MAX_VALUE) {
-            setMaxValueCheckBox.setSelected(false);
-            maxValueSpinner.setValue(new Double(Double.MAX_VALUE));
-            maxValueSpinner.setEnabled(false);
-        } else {
-            setMaxValueCheckBox.setSelected(true);
-            maxValueSpinner.setEnabled(true);
-            maxValueSpinner.setValue(new Double(e.getMaxValue()));
-        }
-
-        if (e.getMinValue() == -Double.MAX_VALUE) {
-            setMinValueCheckBox.setSelected(false);
-            minValueSpinner.setValue(new Double(-Double.MAX_VALUE));
-            minValueSpinner.setEnabled(false);
-
-        } else {
-            minValueSpinner.setEnabled(true);
-            setMinValueCheckBox.setSelected(true);
-            minValueSpinner.setValue(new Double(e.getMinValue()));
-        }
+        this.numberEditorValidatePane.populate(e);
         this.waterMarkDictPane.populate(e);
     }
 
     @Override
     protected NumberEditor updateSubFieldEditorBean() {
-
         NumberEditor ob = new NumberEditor();
-        ob.setAllowDecimals(allowDecimalsCheckBox.isSelected());
-        if (allowDecimalsCheckBox.isSelected()) {
-            ob.setMaxDecimalLength((int)this.decimalLength.getValue());
-        }
-
-        ob.setAllowNegative(allowNegativeCheckBox.isSelected());
-        if (setMaxValueCheckBox.isSelected()) {
-            ob.setMaxValue(Double.parseDouble("" + maxValueSpinner.getValue()));
-        } else {
-            ob.setMaxValue(Double.MAX_VALUE);
-        }
-
-        if (setMinValueCheckBox.isSelected()) {
-            ob.setMinValue(Double.parseDouble("" + minValueSpinner.getValue()));
-        } else {
-            ob.setMinValue(-Double.MAX_VALUE);
-        }
-
+        this.numberEditorValidatePane.update(ob);
         this.waterMarkDictPane.update(ob);
-
-
         return ob;
     }
 
 
-    private void initListeners(){      allowDecimalsListener = new ActionListener() {
-        public void actionPerformed(ActionEvent e) {
-            if (allowDecimalsCheckBox.isSelected()) {
-                limitNumberPane.setVisible(true);
-                limitNumberPane.setPreferredSize(new Dimension(215,20));
-            } else {
-                limitNumberPane.setVisible(false);
-                limitNumberPane.setPreferredSize(new Dimension(0,0));
-            }
-        }
-    };
-
-        allowNegativeListener = new ActionListener() {
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                if (allowNegativeCheckBox.isSelected()) {
-                    minValueModel.setMinimum(-Double.MAX_VALUE);
-                    if (!setMinValueCheckBox.isSelected()) {
-                        maxValueModel.setMinimum(-Double.MAX_VALUE);
-                    }
-                } else {
-                    minValueModel.setMinimum(0.0);
-                    if (!setMinValueCheckBox.isSelected()) {
-                        maxValueModel.setMinimum(0.0);
-                    }
-                    Double minValue = Double.parseDouble("" + minValueSpinner.getValue());
-                    Double maxValue = Double.parseDouble("" + maxValueSpinner.getValue());
-                    if (minValue < 0.0) {
-                        minValueSpinner.setValue(0.0);
-                    }
-                    if (maxValue < 0.0) {
-                        maxValueSpinner.setValue(0.0);
-                    }
-                }
-            }
-        };
-
-
-        setMaxListener = new ActionListener() {
-            public void actionPerformed(ActionEvent e) {
-                if (setMaxValueCheckBox.isSelected()) {
-                    maxValueSpinner.setEnabled(true);
-                    Double value = new Double(0);
-                    if (setMinValueCheckBox.isSelected()) {
-                        Double minValue = Double.parseDouble("" + minValueSpinner.getValue());
-                        if (minValue > value) {
-                            value = minValue;
-                        }
-                    }
-                    maxValueSpinner.setValue(value);
-                } else {
-                    maxValueSpinner.setEnabled(false);
-                    minValueModel.setMaximum(Double.MAX_VALUE);
-                }
-            }
-        };
-
-
-        setMinListener = new ActionListener() {
-            public void actionPerformed(ActionEvent e) {
-                if (setMinValueCheckBox.isSelected()) {
-                    minValueSpinner.setEnabled(true);
-                    Double value = new Double(0);
-                    if (setMaxValueCheckBox.isSelected()) {
-                        Double maxValue = Double.parseDouble("" + maxValueSpinner.getValue());
-                        if (maxValue < value) {
-                            value = maxValue;
-                        }
-                    }
-                    minValueSpinner.setValue(value);
-                } else {
-                    minValueSpinner.setEnabled(false);
-                    maxValueModel.setMinimum(allowNegativeCheckBox.isSelected() ? (-Double.MAX_VALUE) : new Double(0));
-                }
-            }
-        };
-
-        maxValueChangeListener = new ChangeListener() {
-
-            @Override
-            public void stateChanged(ChangeEvent e) {
-                if (setMaxValueCheckBox.isSelected()) {
-                    if (setMinValueCheckBox.isSelected()) {
-                        minValueModel.setMaximum(Double.parseDouble("" + maxValueSpinner.getValue()));
-                    }
-                }
-            }
-        };
-
-        minValueChangeListener = new ChangeListener() {
-
-            @Override
-            public void stateChanged(ChangeEvent e) {
-                if (setMinValueCheckBox.isSelected()) {
-                    if (setMaxValueCheckBox.isSelected()) {
-                        maxValueModel.setMinimum(Double.parseDouble("" + minValueSpinner.getValue()));
-                    }
-                }
-            }
-        };
-    }
-
-    private void setNotAllowsInvalid(UIBasicSpinner jspinner) {
-        JComponent editor = jspinner.getEditor();
-        if (editor instanceof UIBasicSpinner.DefaultEditor) {
-            JFormattedTextField ftf = ((UIBasicSpinner.DefaultEditor) editor).getTextField();
-            ftf.setColumns(10);
-            JFormattedTextField.AbstractFormatter formatter = ftf.getFormatter();
-            DefaultFormatter df = (DefaultFormatter) formatter;
-            df.setAllowsInvalid(false);
-        }
-    }
-
 }
\ No newline at end of file
diff --git a/designer/src/com/fr/design/widget/ui/btn/DefineAppendColumnRowPane.java b/designer/src/com/fr/design/widget/ui/btn/DefineAppendColumnRowPane.java
index bc965f29d..da3d173f3 100644
--- a/designer/src/com/fr/design/widget/ui/btn/DefineAppendColumnRowPane.java
+++ b/designer/src/com/fr/design/widget/ui/btn/DefineAppendColumnRowPane.java
@@ -38,11 +38,11 @@ public class DefineAppendColumnRowPane extends BasicPane {
 		crEditor = new ColumnRowEditor();
 		jNumberEditor = new UISpinner(0, 100 , 1, 0);
 
-		rowCountLable = new UILabel(Inter.getLocText("Edit-Row_Count") + ":");
+		rowCountLable = new UILabel(Inter.getLocText("Edit-Row_Count"));
 		JPanel lpane = FRGUIPaneFactory.createBorderLayout_S_Pane();
 		lpane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
 		lpane.add(new UILabel(Inter.getLocText("Append_Delete_Row_Message")));
-		Component[][] components = { { new UILabel(Inter.getLocText(new String[]{"Specify", "Cell"}) + ":"), crEditor }, { rowCountLable, jNumberEditor } ,{lpane,null}};
+		Component[][] components = { { new UILabel(Inter.getLocText(new String[]{"Specify", "Cell"})), crEditor }, { rowCountLable, jNumberEditor } ,{lpane,null}};
 		JPanel contentPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
 		contentPane.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
 
diff --git a/designer/src/com/fr/design/widget/ui/btn/DefineDeleteColumnRowPane.java b/designer/src/com/fr/design/widget/ui/btn/DefineDeleteColumnRowPane.java
index 2b190afc8..e4b9d3c3b 100644
--- a/designer/src/com/fr/design/widget/ui/btn/DefineDeleteColumnRowPane.java
+++ b/designer/src/com/fr/design/widget/ui/btn/DefineDeleteColumnRowPane.java
@@ -34,9 +34,10 @@ public class DefineDeleteColumnRowPane extends BasicPane {
 		double rowSize[] = { p, p};
 		double columnSize[] = { p, f};
 		crEditor = new ColumnRowEditor();
+		UILabel messageLabel = new UILabel(Inter.getLocText("Append_Delete_Row_Message"));
 		Component[][] components = {
-				{ new UILabel(Inter.getLocText(new String[]{"Specify", "Cell"}) + ":"), crEditor },
-				{new UILabel(Inter.getLocText("Append_Delete_Row_Message")),null}};
+				{ new UILabel(Inter.getLocText(new String[]{"Specify", "Cell"})), crEditor },
+				{ messageLabel, null}};
 		JPanel contentPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
 		contentPane.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
 		setLayout(FRGUIPaneFactory.createBorderLayout());
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 d28b505de..0f3778652 100644
--- a/designer/src/com/fr/design/widget/ui/btn/TreeNodeToogleButtonDefinePane.java
+++ b/designer/src/com/fr/design/widget/ui/btn/TreeNodeToogleButtonDefinePane.java
@@ -1,5 +1,6 @@
 package com.fr.design.widget.ui.btn;
 
+import com.fr.design.designer.IntervalConstants;
 import com.fr.design.foldablepane.UIExpandablePane;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.FRGUIPaneFactory;
@@ -27,34 +28,21 @@ public class TreeNodeToogleButtonDefinePane<T extends TreeNodeToggleButton> exte
     }
 
     protected void initComponents() {
-        setLayout(FRGUIPaneFactory.createBorderLayout());
-        JPanel attrPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        attrPane.setBorder(BorderFactory.createEmptyBorder(0, 4, 0, 4));
+        this.setLayout(FRGUIPaneFactory.createBorderLayout());
         double f = TableLayout.FILL;
         double p = TableLayout.PREFERRED;
         double rowSize[] = {p};
         double columnSize[] = {p, f};
         Component[][] n_components = {
-                {new UILabel(Inter.getLocText("FR-Designer_Button-Type") + ":"), createButtonTypeComboBox()},
+                {new UILabel(Inter.getLocText("FR-Designer_Button-Type")), createButtonTypeComboBox()},
         };
-        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(n_components, rowSize, columnSize, 0, 8);
-        UIExpandablePane advancedPane = new UIExpandablePane("高级", 280, 20, panel);
+        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(n_components, rowSize, columnSize, IntervalConstants.INTERVAL_L2, 8);
+        JPanel borderPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        borderPanel.add(panel, BorderLayout.CENTER);
+        panel.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L1, 0, 0, 0));
+        UIExpandablePane advancedPane = new UIExpandablePane(Inter.getLocText("FR-Designer_Advanced"), 280, 20, borderPanel);
         this.add(advancedPane);
 
-
-
-
-//        setLayout(FRGUIPaneFactory.createBorderLayout());
-//        double p = TableLayout.PREFERRED;
-//        double rowSize[] = {p};
-//        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);
-//        JPanel advancedPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Designer_Advanced"));
-////        advancedPane.add(northPane);
-//        add(northPane);
     }
 
     @Override
diff --git a/designer_base/src/com/fr/design/designer/IntervalConstants.java b/designer_base/src/com/fr/design/designer/IntervalConstants.java
new file mode 100644
index 000000000..0f4256c4e
--- /dev/null
+++ b/designer_base/src/com/fr/design/designer/IntervalConstants.java
@@ -0,0 +1,22 @@
+package com.fr.design.designer;
+
+/**
+ * Created by kerry on 2017/9/8.
+ */
+public class IntervalConstants {
+
+    public static final int INTERVAL_L1 = 10;
+
+    public static final int INTERVAL_L2 = 15;
+
+    public static final int INTERVAL_L3 = 155;
+
+    public static final int INTERVAL_L4 = 10;
+
+    public static final int INTERVAL_L5 = 12;
+
+    public static final int INTERVAL_L6 = 5;
+
+    public static final int INTERVAL_L7 = 8;
+
+}
diff --git a/designer_base/src/com/fr/design/gui/columnrow/ColumnRowPane.java b/designer_base/src/com/fr/design/gui/columnrow/ColumnRowPane.java
index f0622bf85..997220801 100644
--- a/designer_base/src/com/fr/design/gui/columnrow/ColumnRowPane.java
+++ b/designer_base/src/com/fr/design/gui/columnrow/ColumnRowPane.java
@@ -17,6 +17,7 @@ import javax.swing.text.AttributeSet;
 import javax.swing.text.BadLocationException;
 import javax.swing.text.DocumentFilter;
 
+import com.fr.design.designer.IntervalConstants;
 import com.fr.design.event.UIObserver;
 import com.fr.design.event.UIObserverListener;
 import com.fr.design.gui.itextfield.UITextField;
@@ -96,7 +97,7 @@ public class ColumnRowPane extends JPanel implements UIObserver {
 	 * 初始化元素
 	 */
 	public void initComponents() {
-		this.setLayout(new GridLayout(0, 2, 0, 0));
+		this.setLayout(new GridLayout(0, 2, IntervalConstants.INTERVAL_L6, 0));
 		initColSpinner();
 		this.add(columnSpinner, BorderLayout.WEST);
 		initRowSpinner();
diff --git a/designer_base/src/com/fr/design/gui/frpane/RegFieldPane.java b/designer_base/src/com/fr/design/gui/frpane/RegFieldPane.java
index 6768d0dfd..25bef67e9 100644
--- a/designer_base/src/com/fr/design/gui/frpane/RegFieldPane.java
+++ b/designer_base/src/com/fr/design/gui/frpane/RegFieldPane.java
@@ -1,5 +1,7 @@
 package com.fr.design.gui.frpane;
 
+import com.fr.design.constants.LayoutConstants;
+import com.fr.design.designer.IntervalConstants;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itextfield.UITextField;
@@ -31,6 +33,7 @@ public class RegFieldPane extends RegPane {
     }
 
     public void initComponents() {
+        this.setBorder(BorderFactory.createEmptyBorder(0, 0, IntervalConstants.INTERVAL_L1, 0));
         regErrorMsgPane = new RegErrorMsgPane();
         final RegChangeListener regChangeListener = new RegChangeListener() {
 
@@ -68,9 +71,11 @@ public class RegFieldPane extends RegPane {
 
         public RegErrorMsgPane() {
             this.setLayout(FRGUIPaneFactory.createBorderLayout());
-            this.setBorder(BorderFactory.createEmptyBorder(5, 0, 0, 0));
+            this.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L6, IntervalConstants.INTERVAL_L5, 0, 0));
             initRegErrorMsgField();
-            JPanel panel = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{new UILabel(Inter.getLocText("FR-Designer_Widget_Error_Tip")), regErrorMsgField}}, TableLayoutHelper.FILL_LASTCOLUMN, 18, 7);
+            UILabel tipLabel = new UILabel(Inter.getLocText("FR-Designer_Widget_Error_Tip"));
+            tipLabel.setPreferredSize(new Dimension(60, 20));
+            JPanel panel = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{tipLabel, regErrorMsgField}}, TableLayoutHelper.FILL_LASTCOLUMN, 10, LayoutConstants.VGAP_MEDIUM);
             this.add(panel);
         }
 
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 84201cdef..c992147f5 100644
--- a/designer_base/src/com/fr/design/gui/frpane/RegPane.java
+++ b/designer_base/src/com/fr/design/gui/frpane/RegPane.java
@@ -1,6 +1,7 @@
 package com.fr.design.gui.frpane;
 
 import com.fr.design.constants.LayoutConstants;
+import com.fr.design.designer.IntervalConstants;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.icombobox.UIComboBoxRenderer;
@@ -70,7 +71,7 @@ public class RegPane extends BasicPane {
 
     private void initComponents(){
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
-        this.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
+        this.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
         regComboBox = new UIComboBox(regType);
         regComboBox.setRenderer(listCellRender);
 
@@ -331,11 +332,13 @@ public class RegPane extends BasicPane {
         private final String[] dataType = {EMB_REG1, EMB_REG2, EMB_REG3, Inter.getLocText("FR-Designer_Custom")};
         DefaultComboBoxModel DefaultComboBoxModel= new DefaultComboBoxModel(dataType);
         public RegPhonePane() {
-            this.setBorder(BorderFactory.createEmptyBorder(5, 10, 5, 5));
+            this.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L6, IntervalConstants.INTERVAL_L5, 0, 0));
             this.setLayout(FRGUIPaneFactory.createBorderLayout());
             dataTypeComboBox = new UIComboBox(DefaultComboBoxModel);
             JTextField editFiled = (JTextField)(dataTypeComboBox.getEditor().getEditorComponent());
-            JPanel panel = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{new UILabel(Inter.getLocText("FR-Designer_Data_Type")), dataTypeComboBox}}, TableLayoutHelper.FILL_LASTCOLUMN, 18, 7);
+            UILabel dataTypeLable = new UILabel(Inter.getLocText("FR-Designer_Data_Type"));
+            dataTypeLable.setPreferredSize(new Dimension(60, 20));
+            JPanel panel = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{dataTypeLable, dataTypeComboBox}}, TableLayoutHelper.FILL_LASTCOLUMN, 10, 0);
             this.add(panel);
             editFiled.setDocument(new LimitedDocument(LIMIT_LENGTH, REG_PATTERN));
             dataTypeComboBox.addItemListener(new ItemListener() {
@@ -393,20 +396,24 @@ public class RegPane extends BasicPane {
 
         public RegLengthPane(){
             this.setLayout(FRGUIPaneFactory.createBorderLayout());
-            this.setBorder(BorderFactory.createEmptyBorder(5, 10, 5, 5));
+            this.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L6, IntervalConstants.INTERVAL_L5, 0, 0));
             this.setPreferredSize(new Dimension(210, 56));
             minLenSpinner = new UISpinner(0, Integer.MAX_VALUE, 1, 0);
             maxLenSpinner = new UISpinner(0, Integer.MAX_VALUE, 1, 0);
+            UILabel minLabel = new UILabel(Inter.getLocText("FR-Designer_Reg_Min_Length"));
+            UILabel maxLabel = new UILabel(Inter.getLocText("FR-Designer_Reg_Max_Length"));
+            minLabel.setPreferredSize(new Dimension(60, 20));
+            maxLabel.setPreferredSize(new Dimension(60, 20));
             double f = TableLayout.FILL;
             double p = TableLayout.PREFERRED;
             Component[][] components = new Component[][]{
-                    new Component[]{new UILabel(Inter.getLocText("FR-Designer_Reg_Min_Length") + ":"), minLenSpinner },
-                    new Component[]{new UILabel(Inter.getLocText("FR-Designer_Reg_Max_Length") + ":"), maxLenSpinner},
+                    new Component[]{minLabel, minLenSpinner },
+                    new Component[]{maxLabel, maxLenSpinner},
             };
             double[] rowSize = {p, p};
             double[] columnSize = {p,f};
             int[][] rowCount = {{1, 1},{1, 1}};
-            JPanel panel =  TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_SMALL, LayoutConstants.VGAP_MEDIUM);
+            JPanel panel =  TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, 10, LayoutConstants.VGAP_MEDIUM);
             this.add(panel);
 
 
@@ -446,9 +453,9 @@ public class RegPane extends BasicPane {
 
         public CustomRegRexPane(){
             this.setLayout(FRGUIPaneFactory.createBorderLayout());
-            this.setBorder(BorderFactory.createEmptyBorder(5, 10, 5, 5));
+            this.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L6, IntervalConstants.INTERVAL_L5, 0, 0));
             regTextField = new UITextField();
-            JPanel panel = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{new UILabel(Inter.getLocText("FR-Designer_Reg_Expressions")), regTextField}}, TableLayoutHelper.FILL_LASTCOLUMN, 18, 7);
+            JPanel panel = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{new UILabel(Inter.getLocText("FR-Designer_Reg_Expressions")), regTextField}}, TableLayoutHelper.FILL_LASTCOLUMN, 10, LayoutConstants.VGAP_MEDIUM);
             this.add(panel);
         }
 
diff --git a/designer_form/src/com/fr/design/mainframe/widget/accessibles/AccessibleImgBackgroundEditor.java b/designer_base/src/com/fr/design/mainframe/widget/accessibles/AccessibleImgBackgroundEditor.java
similarity index 97%
rename from designer_form/src/com/fr/design/mainframe/widget/accessibles/AccessibleImgBackgroundEditor.java
rename to designer_base/src/com/fr/design/mainframe/widget/accessibles/AccessibleImgBackgroundEditor.java
index cbead6204..931793aab 100644
--- a/designer_form/src/com/fr/design/mainframe/widget/accessibles/AccessibleImgBackgroundEditor.java
+++ b/designer_base/src/com/fr/design/mainframe/widget/accessibles/AccessibleImgBackgroundEditor.java
@@ -1,35 +1,35 @@
-package com.fr.design.mainframe.widget.accessibles;
-
-import java.awt.Dimension;
-import javax.swing.SwingUtilities;
-import com.fr.base.background.ColorBackground;
-import com.fr.design.mainframe.widget.wrappers.BackgroundWrapper;
-import com.fr.design.dialog.BasicDialog;
-import com.fr.design.dialog.DialogActionAdapter;
-import com.fr.design.style.background.BackgroundButtonPane;
-import com.fr.general.Background;
-
-public class AccessibleImgBackgroundEditor extends UneditableAccessibleEditor {
-	private BackgroundButtonPane choosePane;
-	
-	public AccessibleImgBackgroundEditor() {
-		super(new BackgroundWrapper());
-	}
-	
-	@Override
-	protected void showEditorPane() {
-		choosePane = new BackgroundButtonPane();
-		choosePane.setPreferredSize(new Dimension(600, 400));
-		BasicDialog dlg = choosePane.showWindow(SwingUtilities.getWindowAncestor(this));
-		dlg.addDialogActionListener(new DialogActionAdapter() {
-
-			@Override
-			public void doOk() {
-				setValue(choosePane.update());
-				fireStateChanged();
-			}
-		});
-		choosePane.populate(getValue() instanceof Background ? (Background) getValue() : new ColorBackground());
-		dlg.setVisible(true);
-	}
+package com.fr.design.mainframe.widget.accessibles;
+
+import java.awt.Dimension;
+import javax.swing.SwingUtilities;
+import com.fr.base.background.ColorBackground;
+import com.fr.design.mainframe.widget.wrappers.BackgroundWrapper;
+import com.fr.design.dialog.BasicDialog;
+import com.fr.design.dialog.DialogActionAdapter;
+import com.fr.design.style.background.BackgroundButtonPane;
+import com.fr.general.Background;
+
+public class AccessibleImgBackgroundEditor extends UneditableAccessibleEditor {
+	private BackgroundButtonPane choosePane;
+	
+	public AccessibleImgBackgroundEditor() {
+		super(new BackgroundWrapper());
+	}
+	
+	@Override
+	protected void showEditorPane() {
+		choosePane = new BackgroundButtonPane();
+		choosePane.setPreferredSize(new Dimension(600, 400));
+		BasicDialog dlg = choosePane.showWindow(SwingUtilities.getWindowAncestor(this));
+		dlg.addDialogActionListener(new DialogActionAdapter() {
+
+			@Override
+			public void doOk() {
+				setValue(choosePane.update());
+				fireStateChanged();
+			}
+		});
+		choosePane.populate(getValue() instanceof Background ? (Background) getValue() : new ColorBackground());
+		dlg.setVisible(true);
+	}
 }
\ No newline at end of file
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 3244a962e..767fb57f5 100644
--- a/designer_base/src/com/fr/design/widget/btn/ButtonWithHotkeysDetailPane.java
+++ b/designer_base/src/com/fr/design/widget/btn/ButtonWithHotkeysDetailPane.java
@@ -4,6 +4,7 @@ import java.awt.*;
 
 import javax.swing.*;
 
+import com.fr.design.designer.IntervalConstants;
 import com.fr.design.foldablepane.UIExpandablePane;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itextfield.UITextField;
@@ -42,13 +43,13 @@ public abstract class ButtonWithHotkeysDetailPane<T extends Button> extends Butt
         iconPane = new AccessibleIconEditor();
         labelPane.add(iconPane);
         Component[][] n_components = {
-                {new UILabel(Inter.getLocText("FR-Designer_Button-Type") + ":"), createButtonTypeComboBox()},
-                {new UILabel(Inter.getLocText("FR-Designer_Button-Name") + ":"), buttonNameTextField = new UITextField()},
-                {new UILabel(Inter.getLocText("FR-Designer_Button-Icon") + ":"), iconPane},
-                {new UILabel(Inter.getLocText("FR-Designer_Button-Hotkeys") + ":"), hotkeysTextField = new UITextField()},
+                {new UILabel(Inter.getLocText("FR-Designer_Button-Type")), createButtonTypeComboBox()},
+                {new UILabel(Inter.getLocText("FR-Designer_Button-Name")), buttonNameTextField = new UITextField()},
+                {new UILabel(Inter.getLocText("FR-Designer_Button-Icon")), iconPane},
+                {new UILabel(Inter.getLocText("FR-Designer_Button-Hotkeys")), hotkeysTextField = new UITextField()},
         };
         hotkeysTextField.setToolTipText(StableUtils.join(ButtonConstants.HOTKEYS, ","));
-        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(n_components, rowSize, columnSize, 16, 8);
+        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(n_components, rowSize, columnSize, IntervalConstants.INTERVAL_L2, 8);
         panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
         advancePane.add(panel, BorderLayout.NORTH);
         Component comp = createCenterPane();
diff --git a/designer_base/src/com/fr/design/widget/component/BackgroundCompPane.java b/designer_base/src/com/fr/design/widget/component/BackgroundCompPane.java
index 49a931a6b..945e306ea 100644
--- a/designer_base/src/com/fr/design/widget/component/BackgroundCompPane.java
+++ b/designer_base/src/com/fr/design/widget/component/BackgroundCompPane.java
@@ -1,14 +1,16 @@
 package com.fr.design.widget.component;
 
+import com.fr.design.designer.IntervalConstants;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.ibutton.UIButtonGroup;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
-import com.fr.design.mainframe.widget.accessibles.AccessibleBackgroundEditor;
+import com.fr.design.mainframe.widget.accessibles.AccessibleImgBackgroundEditor;
 import com.fr.form.ui.Widget;
 import com.fr.general.Inter;
+import com.vividsolutions.jts.index.bintree.Interval;
 
 import javax.swing.*;
 import java.awt.*;
@@ -18,9 +20,9 @@ import java.awt.*;
  */
 public abstract class BackgroundCompPane<T extends Widget> extends BasicPane {
     protected UIButtonGroup backgroundHead;
-    protected AccessibleBackgroundEditor initalBackgroundEditor;
-    protected AccessibleBackgroundEditor overBackgroundEditor;
-    protected AccessibleBackgroundEditor clickBackgroundEditor;
+    protected AccessibleImgBackgroundEditor initalBackgroundEditor;
+    protected AccessibleImgBackgroundEditor overBackgroundEditor;
+    protected AccessibleImgBackgroundEditor clickBackgroundEditor;
     private JPanel panel;
 
     public BackgroundCompPane() {
@@ -29,9 +31,11 @@ public abstract class BackgroundCompPane<T extends Widget> extends BasicPane {
 
     public void initComponent() {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
-        initalBackgroundEditor = new AccessibleBackgroundEditor();
-        overBackgroundEditor = new AccessibleBackgroundEditor();
-        clickBackgroundEditor = new AccessibleBackgroundEditor();
+        UILabel headLabel = createUILable();
+        headLabel.setPreferredSize(new Dimension(50, 20));
+        initalBackgroundEditor = new AccessibleImgBackgroundEditor();
+        overBackgroundEditor = new AccessibleImgBackgroundEditor();
+        clickBackgroundEditor = new AccessibleImgBackgroundEditor();
         String [] titles = new String[]{Inter.getLocText("FR-Designer_DEFAULT"), Inter.getLocText("FR-Designer_Custom")};
 
         double f = TableLayout.FILL;
@@ -44,14 +48,19 @@ public abstract class BackgroundCompPane<T extends Widget> extends BasicPane {
                 new Component[]{new UILabel(Inter.getLocText("FR-Designer_Background-Over")), overBackgroundEditor},
                 new Component[]{new UILabel(Inter.getLocText("FR-Designer_Background-Click")), clickBackgroundEditor},
         };
-        panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, 7, 7);
-        panel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
+        panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_L2, 7);
+        panel.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L6, IntervalConstants.INTERVAL_L5, 0, 0));
         backgroundHead = new UIButtonGroup(titles);
-        this.add(backgroundHead, BorderLayout.NORTH);
+        JPanel headPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{headLabel, backgroundHead}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L2, 7);
+
+        this.add(headPane, BorderLayout.NORTH);
         this.add(panel, BorderLayout.CENTER);
 
     }
 
+    protected UILabel createUILable(){
+        return new UILabel(Inter.getLocText("FR-Designer_Background"));
+    }
 
     public void update(T e){
     }
diff --git a/designer/src/com/fr/design/widget/ui/CheckBoxDictPane.java b/designer_base/src/com/fr/design/widget/component/CheckBoxDictPane.java
similarity index 60%
rename from designer/src/com/fr/design/widget/ui/CheckBoxDictPane.java
rename to designer_base/src/com/fr/design/widget/component/CheckBoxDictPane.java
index 355cb7508..506de5805 100644
--- a/designer/src/com/fr/design/widget/ui/CheckBoxDictPane.java
+++ b/designer_base/src/com/fr/design/widget/component/CheckBoxDictPane.java
@@ -1,84 +1,86 @@
-package com.fr.design.widget.ui;
-
-import java.awt.*;
-
-import com.fr.design.gui.ibutton.UIButtonGroup;
-import com.fr.design.gui.ilable.UILabel;
-import javax.swing.JPanel;
-
-import com.fr.design.gui.icombobox.DictionaryComboBox;
-import com.fr.design.gui.icombobox.DictionaryConstants;
-import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.layout.TableLayoutHelper;
-import com.fr.form.ui.CheckBoxGroup;
-import com.fr.form.ui.ComboCheckBox;
-import com.fr.general.Inter;
-
-public class CheckBoxDictPane extends JPanel {
-	
-	private DictionaryComboBox delimiterComboBox;
-	private UIButtonGroup returnTypeComboBox;
-	private DictionaryComboBox startComboBox;
-	private DictionaryComboBox endComboBox;
-	
-	private JPanel delimiterPane;
-	private JPanel startPane;
-	private JPanel endPane;
-	
-	public CheckBoxDictPane() {
-		this.setLayout(FRGUIPaneFactory.createBorderLayout());
-		JPanel returnTypePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-		delimiterPane =FRGUIPaneFactory.createBorderLayout_S_Pane();
-		UILabel label = new UILabel(Inter.getLocText("Form-Delimiter") + ":");
-		delimiterPane.add(label, BorderLayout.WEST);
-		delimiterPane.add(delimiterComboBox = new DictionaryComboBox(DictionaryConstants.delimiters, DictionaryConstants.delimiterDisplays), BorderLayout.CENTER);
-		delimiterComboBox.setEditable(true);
-
-		startPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-		startPane.add(new UILabel(Inter.getLocText("ComboCheckBox-Start_Symbol") + ":"), BorderLayout.WEST);
-		startPane.add(startComboBox = new DictionaryComboBox(DictionaryConstants.symbols, DictionaryConstants.symbolDisplays), BorderLayout.CENTER);
-		startComboBox.setEditable(true);
-
-		endPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-		endPane.add(new UILabel(Inter.getLocText("ComboCheckBox-End_Symbol") + ":"), BorderLayout.WEST);
-		endPane.add(endComboBox = new DictionaryComboBox(DictionaryConstants.symbols, DictionaryConstants.symbolDisplays), BorderLayout.CENTER);
-		endComboBox.setEditable(true);
-		returnTypeComboBox = new UIButtonGroup(new String[]{Inter.getLocText("Widget-Array"), Inter.getLocText("String")});
-		returnTypePane.add(returnTypeComboBox, BorderLayout.CENTER);
-		JPanel jPanel = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{new UILabel(Inter.getLocText("Widget-Date_Selector_Return_Type") + ":"), returnTypePane}}, TableLayoutHelper.FILL_LASTCOLUMN, 18, 7);
-		this.add(jPanel);
-	}
-	
-	private void checkVisible(int selectIndex){
-		delimiterPane.setVisible(selectIndex == 1);
-		startPane.setVisible(selectIndex == 1);
-		endPane.setVisible(selectIndex == 1);
-	}
-	
-	public void populate(ComboCheckBox comboCheckBox) {
-		this.delimiterComboBox.setSelectedItem(comboCheckBox.getDelimiter());
-		this.returnTypeComboBox.setSelectedIndex(comboCheckBox.isReturnString() ? 1 : 0);
-		this.startComboBox.setSelectedItem(comboCheckBox.getStartSymbol());
-		this.endComboBox.setSelectedItem(comboCheckBox.getEndSymbol());
-		checkVisible(this.returnTypeComboBox.getSelectedIndex());
-	}
-	public void update(ComboCheckBox comboCheckBox) {
-		comboCheckBox.setDelimiter((String)this.delimiterComboBox.getSelectedItem());
-		comboCheckBox.setReturnString(this.returnTypeComboBox.getSelectedIndex() != 0);
-		comboCheckBox.setStartSymbol((String)this.startComboBox.getSelectedItem());
-		comboCheckBox.setEndSymbol((String)this.endComboBox.getSelectedItem());
-	}
-	public void populate(CheckBoxGroup checkBoxGroup) {
-		this.delimiterComboBox.setSelectedItem(checkBoxGroup.getDelimiter());
-		this.returnTypeComboBox.setSelectedIndex(checkBoxGroup.isReturnString() ? 1 : 0);
-		this.startComboBox.setSelectedItem(checkBoxGroup.getStartSymbol());
-		this.endComboBox.setSelectedItem(checkBoxGroup.getEndSymbol());
-		checkVisible(this.returnTypeComboBox.getSelectedIndex());
-	}
-	public void update(CheckBoxGroup checkBoxGroup) {
-		checkBoxGroup.setDelimiter((String)this.delimiterComboBox.getSelectedItem());
-		checkBoxGroup.setReturnString(this.returnTypeComboBox.getSelectedIndex() != 0);
-		checkBoxGroup.setStartSymbol((String)this.startComboBox.getSelectedItem());
-		checkBoxGroup.setEndSymbol((String)this.endComboBox.getSelectedItem());
-	}
+package com.fr.design.widget.component;
+
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import com.fr.design.gui.ibutton.UIButtonGroup;
+import com.fr.design.gui.ilable.UILabel;
+import javax.swing.JPanel;
+
+import com.fr.design.gui.icombobox.DictionaryComboBox;
+import com.fr.design.gui.icombobox.DictionaryConstants;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.layout.TableLayoutHelper;
+import com.fr.form.ui.CheckBoxGroup;
+import com.fr.form.ui.ComboCheckBox;
+import com.fr.general.Inter;
+
+public class CheckBoxDictPane extends JPanel {
+	
+	private DictionaryComboBox delimiterComboBox;
+	private UIButtonGroup returnTypeComboBox;
+	private DictionaryComboBox startComboBox;
+	private DictionaryComboBox endComboBox;
+	private JPanel returnStringPane;
+	
+	public CheckBoxDictPane() {
+		this.setLayout(FRGUIPaneFactory.createBorderLayout());
+		delimiterComboBox = new DictionaryComboBox(DictionaryConstants.delimiters, DictionaryConstants.delimiterDisplays);
+		delimiterComboBox.setEditable(true);
+		startComboBox = new DictionaryComboBox(DictionaryConstants.symbols, DictionaryConstants.symbolDisplays);
+		startComboBox.setEditable(true);
+		endComboBox = new DictionaryComboBox(DictionaryConstants.symbols, DictionaryConstants.symbolDisplays);
+		endComboBox.setEditable(true);
+		Component[][] components = new Component[][]{
+				new Component[]{new UILabel(Inter.getLocText("Form-Delimiter") + ":"), delimiterComboBox},
+				new Component[]{new UILabel(Inter.getLocText("ComboCheckBox-Start_Symbol") + ":"),startComboBox},
+				new Component[]{new UILabel(Inter.getLocText("ComboCheckBox-End_Symbol") + ":"),endComboBox}
+		};
+		returnStringPane = TableLayoutHelper.createGapTableLayoutPane(components, TableLayoutHelper.FILL_LASTCOLUMN, 18, 7);
+
+		returnTypeComboBox = new UIButtonGroup(new String[]{Inter.getLocText("Widget-Array"), Inter.getLocText("String")});
+		returnTypeComboBox.addActionListener(new ActionListener() {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				checkVisible(returnTypeComboBox.getSelectedIndex());
+			}
+		});
+		JPanel headPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{new UILabel(Inter.getLocText("Widget-Date_Selector_Return_Type") + ":"), returnTypeComboBox}}, TableLayoutHelper.FILL_LASTCOLUMN, 18, 7);
+		JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
+		jPanel.add(headPane, BorderLayout.NORTH);
+		jPanel.add(returnStringPane, BorderLayout.CENTER);
+		this.add(jPanel);
+	}
+
+	public void checkVisible(int selectIndex){
+		returnStringPane.setVisible(selectIndex == 1);
+	}
+
+	public void populate(ComboCheckBox comboCheckBox) {
+		this.delimiterComboBox.setSelectedItem(comboCheckBox.getDelimiter());
+		this.returnTypeComboBox.setSelectedIndex(comboCheckBox.isReturnString() ? 1 : 0);
+		this.startComboBox.setSelectedItem(comboCheckBox.getStartSymbol());
+		this.endComboBox.setSelectedItem(comboCheckBox.getEndSymbol());
+		checkVisible(this.returnTypeComboBox.getSelectedIndex());
+	}
+	public void update(ComboCheckBox comboCheckBox) {
+		comboCheckBox.setDelimiter((String)this.delimiterComboBox.getSelectedItem());
+		comboCheckBox.setReturnString(this.returnTypeComboBox.getSelectedIndex() != 0);
+		comboCheckBox.setStartSymbol((String)this.startComboBox.getSelectedItem());
+		comboCheckBox.setEndSymbol((String)this.endComboBox.getSelectedItem());
+	}
+	public void populate(CheckBoxGroup checkBoxGroup) {
+		this.delimiterComboBox.setSelectedItem(checkBoxGroup.getDelimiter());
+		this.returnTypeComboBox.setSelectedIndex(checkBoxGroup.isReturnString() ? 1 : 0);
+		this.startComboBox.setSelectedItem(checkBoxGroup.getStartSymbol());
+		this.endComboBox.setSelectedItem(checkBoxGroup.getEndSymbol());
+		checkVisible(this.returnTypeComboBox.getSelectedIndex());
+	}
+	public void update(CheckBoxGroup checkBoxGroup) {
+		checkBoxGroup.setDelimiter((String)this.delimiterComboBox.getSelectedItem());
+		checkBoxGroup.setReturnString(this.returnTypeComboBox.getSelectedIndex() != 0);
+		checkBoxGroup.setStartSymbol((String)this.startComboBox.getSelectedItem());
+		checkBoxGroup.setEndSymbol((String)this.endComboBox.getSelectedItem());
+	}
 }
\ No newline at end of file
diff --git a/designer_base/src/com/fr/design/widget/component/DateValuePane.java b/designer_base/src/com/fr/design/widget/component/DateValuePane.java
index edc11b313..6ea7d056e 100644
--- a/designer_base/src/com/fr/design/widget/component/DateValuePane.java
+++ b/designer_base/src/com/fr/design/widget/component/DateValuePane.java
@@ -2,18 +2,20 @@ package com.fr.design.widget.component;
 
 import com.fr.design.constants.LayoutConstants;
 import com.fr.design.editor.editor.*;
-import com.fr.design.gui.ibutton.UIHeadGroup;
+import com.fr.design.gui.ibutton.UIButtonGroup;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.Inter;
 
 import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
 import java.awt.*;
 
 /**
  * Created by ibm on 2017/8/8.
  */
 public class DateValuePane extends JPanel {
-    private UIHeadGroup widgetValueHead;
+    private UIButtonGroup widgetValueHead;
     private Editor[] editor;
 
 
@@ -31,9 +33,11 @@ public class DateValuePane extends JPanel {
             customPane.add(editor[i], editor[i].getName());
             tabTitles[i] = editor[i].getName();
         }
-        widgetValueHead = new UIHeadGroup(tabTitles) {
+        widgetValueHead = new UIButtonGroup(tabTitles);
+        widgetValueHead.addChangeListener(new ChangeListener() {
             @Override
-            public void tabChanged(int index) {
+            public void stateChanged(ChangeEvent e) {
+                int index = widgetValueHead.getSelectedIndex();
                 if (ComparatorUtils.equals(tabTitles[index], Inter.getLocText("None"))) {
                     customPane.setVisible(false);
                 } else {
@@ -41,7 +45,7 @@ public class DateValuePane extends JPanel {
                 }
                 cardLayout.show(customPane, tabTitles[index]);
             }
-        };
+        });
         this.add(widgetValueHead, BorderLayout.NORTH);
         this.add(customPane, BorderLayout.CENTER);
 
@@ -56,6 +60,9 @@ public class DateValuePane extends JPanel {
     }
 
     public void populate(Object ob) {
+        if(ob == null){
+            setCardValue(0, ob);
+        }
         for (int i = 0; i < editor.length; i++) {
             if (editor[i].accept(ob)) {
                 setCardValue(i, ob);
@@ -66,6 +73,7 @@ public class DateValuePane extends JPanel {
 
     private void setCardValue(int i, Object object) {
         widgetValueHead.setSelectedIndex(i);
+        widgetValueHead.populateBean();
         editor[i].setValue(object);
         // kunsnat: bug7861 所有的Editor值都要跟随改变, 因为populate的editor 从""
         // 一定是最后的Editor哦.
diff --git a/designer_base/src/com/fr/design/widget/component/NumberEditorValidatePane.java b/designer_base/src/com/fr/design/widget/component/NumberEditorValidatePane.java
new file mode 100644
index 000000000..63b297925
--- /dev/null
+++ b/designer_base/src/com/fr/design/widget/component/NumberEditorValidatePane.java
@@ -0,0 +1,303 @@
+package com.fr.design.widget.component;
+
+import com.fr.design.designer.IntervalConstants;
+import com.fr.design.dialog.BasicPane;
+import com.fr.design.gui.icheckbox.UICheckBox;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.gui.ispinner.UIBasicSpinner;
+import com.fr.design.gui.ispinner.UISpinner;
+import com.fr.design.gui.itextfield.UITextField;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.layout.TableLayout;
+import com.fr.design.layout.TableLayoutHelper;
+import com.fr.form.ui.NumberEditor;
+import com.fr.general.Inter;
+
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import javax.swing.text.DefaultFormatter;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+/**
+ * Created by kerry on 2017/9/10.
+ */
+public class NumberEditorValidatePane extends JPanel {
+    private UICheckBox allowDecimalsCheckBox;
+    private UICheckBox allowNegativeCheckBox;
+    private UICheckBox setMaxValueCheckBox;
+    private UICheckBox setMinValueCheckBox;
+    private UIBasicSpinner maxValueSpinner;
+    private SpinnerNumberModel maxValueModel;
+    private UIBasicSpinner minValueSpinner;
+    private SpinnerNumberModel minValueModel;
+    private UISpinner decimalLength;
+    private JPanel limitNumberPane;
+    private UITextField maxValueErrorTextField;
+    private UITextField minValueErrorTextField;
+    private JPanel maxValueFieldPane;
+    private JPanel minValueFieldPane;
+
+    private ActionListener allowDecimalsListener;
+
+    private ActionListener allowNegativeListener;
+
+    public ActionListener setMaxListener;
+
+    private ActionListener setMinListener;
+
+    private ChangeListener maxValueChangeListener;
+
+    private ChangeListener minValueChangeListener;
+
+    public NumberEditorValidatePane() {
+        this.setLayout(FRGUIPaneFactory.createBorderLayout());
+        initComponent();
+    }
+
+    private void initComponent() {
+        initListeners();
+        this.allowDecimalsCheckBox = new UICheckBox(Inter.getLocText("Allow_Decimals"));
+        allowDecimalsCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
+        this.allowDecimalsCheckBox.addActionListener(allowDecimalsListener);
+        this.decimalLength = new UISpinner(0, Integer.MAX_VALUE, 1, 16);
+        this.allowNegativeCheckBox = new UICheckBox(Inter.getLocText("Allow_Negative"));
+        this.allowNegativeCheckBox.addActionListener(allowNegativeListener);
+        allowNegativeCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
+        this.setMaxValueCheckBox = new UICheckBox(Inter.getLocText("Need_Max_Value"), false);
+        setMaxValueCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
+        this.maxValueSpinner = new UIBasicSpinner(maxValueModel = new SpinnerNumberModel(0D, -Double.MAX_VALUE, Double.MAX_VALUE, 1D));
+        setNotAllowsInvalid(this.maxValueSpinner);
+        this.setMaxValueCheckBox.addActionListener(setMaxListener);
+        this.maxValueSpinner.addChangeListener(maxValueChangeListener);
+        this.setMinValueCheckBox = new UICheckBox(Inter.getLocText("Need_Min_Value"), false);
+        this.minValueSpinner = new UIBasicSpinner(minValueModel = new SpinnerNumberModel(0D, -Double.MAX_VALUE, Double.MAX_VALUE, 1D));
+        setNotAllowsInvalid(this.minValueSpinner);
+        minValueSpinner.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
+        this.setMinValueCheckBox.addActionListener(setMinListener);
+        this.minValueSpinner.addChangeListener(minValueChangeListener);
+        setMinValueCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
+        initMaxMinValueFieldPane();
+        JPanel maxValueBorderPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        maxValueBorderPane.setBorder(BorderFactory.createEmptyBorder(0, IntervalConstants.INTERVAL_L5, 0, 0));
+        maxValueBorderPane.add(maxValueFieldPane, BorderLayout.CENTER);
+        JPanel minValueBorderPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        minValueBorderPane.setBorder(BorderFactory.createEmptyBorder(0, IntervalConstants.INTERVAL_L5, IntervalConstants.INTERVAL_L1, 0));
+        minValueBorderPane.add(minValueFieldPane, BorderLayout.CENTER);
+        UILabel numberLabel = new UILabel(Inter.getLocText(new String[]{"FR-Designer_Double", "Numbers"}));
+        limitNumberPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{numberLabel, decimalLength}}, TableLayoutHelper.FILL_LASTCOLUMN, 18, 7);
+        limitNumberPane.setBorder(BorderFactory.createEmptyBorder(0, IntervalConstants.INTERVAL_L5, 0, 0));
+        double f = TableLayout.FILL;
+        double p = TableLayout.PREFERRED;
+        Component[][] components = new Component[][]{
+                new Component[]{allowDecimalsCheckBox, null},
+                new Component[]{limitNumberPane, null},
+                new Component[]{allowNegativeCheckBox, null},
+                new Component[]{setMaxValueCheckBox, maxValueSpinner},
+                new Component[]{maxValueBorderPane, null},
+                new Component[]{setMinValueCheckBox, minValueSpinner},
+                new Component[]{minValueBorderPane, null},
+        };
+        double[] rowSize = {p, p, p, p, p, p, p};
+        double[] columnSize = {p, f};
+        int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}};
+        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, 10, 7);
+        this.add(panel);
+    }
+
+    private void initMaxMinValueFieldPane() {
+        maxValueErrorTextField = new UITextField();
+        minValueErrorTextField = new UITextField();
+
+        maxValueFieldPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{new UILabel(Inter.getLocText("FR-Designer_Widget_Error_Tip")), maxValueErrorTextField}}, TableLayoutHelper.FILL_LASTCOLUMN, 18, 7);
+        setMaxValueCheckBox.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                maxValueFieldPane.setVisible(setMaxValueCheckBox.isSelected());
+            }
+        });
+
+        minValueFieldPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{new UILabel(Inter.getLocText("FR-Designer_Widget_Error_Tip")), minValueErrorTextField}}, TableLayoutHelper.FILL_LASTCOLUMN, 18, 7);
+        setMinValueCheckBox.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                minValueFieldPane.setVisible(setMinValueCheckBox.isSelected());
+            }
+        });
+
+    }
+
+
+    private void initListeners() {
+        allowDecimalsListener = new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                if (allowDecimalsCheckBox.isSelected()) {
+                    limitNumberPane.setVisible(true);
+                    limitNumberPane.setPreferredSize(new Dimension(215, 20));
+                } else {
+                    limitNumberPane.setVisible(false);
+                    limitNumberPane.setPreferredSize(new Dimension(0, 0));
+                }
+            }
+        };
+
+        allowNegativeListener = new ActionListener() {
+
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                if (allowNegativeCheckBox.isSelected()) {
+                    minValueModel.setMinimum(-Double.MAX_VALUE);
+                    if (!setMinValueCheckBox.isSelected()) {
+                        maxValueModel.setMinimum(-Double.MAX_VALUE);
+                    }
+                } else {
+                    minValueModel.setMinimum(0.0);
+                    if (!setMinValueCheckBox.isSelected()) {
+                        maxValueModel.setMinimum(0.0);
+                    }
+                    Double minValue = Double.parseDouble("" + minValueSpinner.getValue());
+                    Double maxValue = Double.parseDouble("" + maxValueSpinner.getValue());
+                    if (minValue < 0.0) {
+                        minValueSpinner.setValue(0.0);
+                    }
+                    if (maxValue < 0.0) {
+                        maxValueSpinner.setValue(0.0);
+                    }
+                }
+            }
+        };
+
+
+        setMaxListener = new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                if (setMaxValueCheckBox.isSelected()) {
+                    maxValueSpinner.setEnabled(true);
+                    Double value = new Double(0);
+                    if (setMinValueCheckBox.isSelected()) {
+                        Double minValue = Double.parseDouble("" + minValueSpinner.getValue());
+                        if (minValue > value) {
+                            value = minValue;
+                        }
+                    }
+                    maxValueSpinner.setValue(value);
+                } else {
+                    maxValueSpinner.setEnabled(false);
+                    minValueModel.setMaximum(Double.MAX_VALUE);
+                }
+            }
+        };
+
+
+        setMinListener = new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                if (setMinValueCheckBox.isSelected()) {
+                    minValueSpinner.setEnabled(true);
+                    Double value = new Double(0);
+                    if (setMaxValueCheckBox.isSelected()) {
+                        Double maxValue = Double.parseDouble("" + maxValueSpinner.getValue());
+                        if (maxValue < value) {
+                            value = maxValue;
+                        }
+                    }
+                    minValueSpinner.setValue(value);
+                } else {
+                    minValueSpinner.setEnabled(false);
+                    maxValueModel.setMinimum(allowNegativeCheckBox.isSelected() ? (-Double.MAX_VALUE) : new Double(0));
+                }
+            }
+        };
+
+        maxValueChangeListener = new ChangeListener() {
+
+            @Override
+            public void stateChanged(ChangeEvent e) {
+                if (setMaxValueCheckBox.isSelected()) {
+                    if (setMinValueCheckBox.isSelected()) {
+                        minValueModel.setMaximum(Double.parseDouble("" + maxValueSpinner.getValue()));
+                    }
+                }
+            }
+        };
+
+        minValueChangeListener = new ChangeListener() {
+
+            @Override
+            public void stateChanged(ChangeEvent e) {
+                if (setMinValueCheckBox.isSelected()) {
+                    if (setMaxValueCheckBox.isSelected()) {
+                        maxValueModel.setMinimum(Double.parseDouble("" + minValueSpinner.getValue()));
+                    }
+                }
+            }
+        };
+    }
+
+    private void setNotAllowsInvalid(UIBasicSpinner jspinner) {
+        JComponent editor = jspinner.getEditor();
+        if (editor instanceof UIBasicSpinner.DefaultEditor) {
+            JFormattedTextField ftf = ((UIBasicSpinner.DefaultEditor) editor).getTextField();
+            ftf.setColumns(10);
+            JFormattedTextField.AbstractFormatter formatter = ftf.getFormatter();
+            DefaultFormatter df = (DefaultFormatter) formatter;
+            df.setAllowsInvalid(false);
+        }
+    }
+
+
+    public void populate(NumberEditor e) {
+        allowDecimalsCheckBox.setSelected(e.isAllowDecimals());
+        if (e.isAllowDecimals()) {
+            this.decimalLength.setValue(e.getMaxDecimalLength());
+        } else {
+            this.limitNumberPane.setVisible(false);
+        }
+
+        allowNegativeCheckBox.setSelected(e.isAllowNegative());
+        if (e.getMaxValue() == Double.MAX_VALUE) {
+            setMaxValueCheckBox.setSelected(false);
+            maxValueFieldPane.setVisible(false);
+            maxValueSpinner.setValue(new Double(Double.MAX_VALUE));
+            maxValueSpinner.setEnabled(false);
+        } else {
+            setMaxValueCheckBox.setSelected(true);
+            maxValueSpinner.setEnabled(true);
+            maxValueFieldPane.setVisible(true);
+            maxValueSpinner.setValue(new Double(e.getMaxValue()));
+        }
+
+        if (e.getMinValue() == -Double.MAX_VALUE) {
+            setMinValueCheckBox.setSelected(false);
+            minValueFieldPane.setVisible(false);
+            minValueSpinner.setValue(new Double(-Double.MAX_VALUE));
+            minValueSpinner.setEnabled(false);
+
+        } else {
+            setMinValueCheckBox.setSelected(true);
+            minValueFieldPane.setVisible(true);
+            minValueSpinner.setEnabled(true);
+            minValueSpinner.setValue(new Double(e.getMinValue()));
+        }
+    }
+
+    public void update(NumberEditor ob) {
+        ob.setAllowDecimals(allowDecimalsCheckBox.isSelected());
+        if (allowDecimalsCheckBox.isSelected()) {
+            ob.setMaxDecimalLength((int) this.decimalLength.getValue());
+        }
+
+        ob.setAllowNegative(allowNegativeCheckBox.isSelected());
+        if (setMaxValueCheckBox.isSelected()) {
+            ob.setMaxValue(Double.parseDouble("" + maxValueSpinner.getValue()));
+        } else {
+            ob.setMaxValue(Double.MAX_VALUE);
+        }
+
+        if (setMinValueCheckBox.isSelected()) {
+            ob.setMinValue(Double.parseDouble("" + minValueSpinner.getValue()));
+        } else {
+            ob.setMinValue(-Double.MAX_VALUE);
+        }
+    }
+}
diff --git a/designer_form/src/com/fr/design/designer/creator/CRPropertyDescriptorPane.java b/designer_form/src/com/fr/design/designer/creator/CRPropertyDescriptorPane.java
new file mode 100644
index 000000000..5940291b4
--- /dev/null
+++ b/designer_form/src/com/fr/design/designer/creator/CRPropertyDescriptorPane.java
@@ -0,0 +1,92 @@
+package com.fr.design.designer.creator;
+
+import com.fr.base.FRContext;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.gui.xtable.TableUtils;
+import com.fr.design.mainframe.widget.editors.ExtendedPropertyEditor;
+import com.fr.design.mainframe.widget.editors.StringEditor;
+import com.fr.form.ui.Widget;
+
+import java.awt.*;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyEditor;
+import java.lang.reflect.Method;
+
+/**
+ * Created by kerry on 2017/9/6.
+ */
+public class CRPropertyDescriptorPane {
+    private CRPropertyDescriptor crPropertyDescriptor;
+    private XCreator xCreator;
+    private PropertyEditor propertyEditor;
+
+    public CRPropertyDescriptorPane(CRPropertyDescriptor crPropertyDescriptor, XCreator xCreator) {
+        this.crPropertyDescriptor = crPropertyDescriptor;
+        this.xCreator = xCreator;
+    }
+
+    public Component[] createTableLayoutComponent() {
+        return new Component[]{new UILabel(crPropertyDescriptor.getDisplayName()), initEditorComponent(crPropertyDescriptor, xCreator)};
+    }
+
+    private Component initEditorComponent(CRPropertyDescriptor crPropertyDescriptor, final XCreator xCreator) {
+        Component component = null;
+        try {
+            // 如果已有的编辑器就生成对应的component
+            Class<?> editorClass = crPropertyDescriptor.getPropertyEditorClass();
+            if (editorClass != null) {
+                propertyEditor = initExtendEditor(crPropertyDescriptor, xCreator);
+                component = propertyEditor.getCustomEditor();
+            } else {
+                Class propType = crPropertyDescriptor.getPropertyType();
+                Class<? extends PropertyEditor> defaultEditorClass = TableUtils.getPropertyEditorClass(propType);
+                if (defaultEditorClass == null) {
+                    defaultEditorClass = StringEditor.class;
+                }
+                propertyEditor = defaultEditorClass.newInstance();
+                component = propertyEditor.getCustomEditor();
+            }
+            propertyEditor.addPropertyChangeListener(new PropertyChangeListener() {
+                @Override
+                public void propertyChange(PropertyChangeEvent evt) {
+                    update(xCreator.toData());
+                }
+            });
+        } catch (Exception e) {
+            FRContext.getLogger().error(e.getMessage());
+        }
+        return component;
+    }
+
+    private PropertyEditor initExtendEditor(CRPropertyDescriptor crPropertyDescriptor, XCreator xCreator) throws Exception {
+        ExtendedPropertyEditor editor = (ExtendedPropertyEditor) crPropertyDescriptor.createPropertyEditor(xCreator.toData());
+        if (editor == null) {
+            Class propType = crPropertyDescriptor.getPropertyType();
+            editor = TableUtils.getPropertyEditorClass(propType).newInstance();
+        }
+
+        return editor;
+    }
+
+    public void populate(Widget widget) {
+        try {
+            Method m = crPropertyDescriptor.getReadMethod();
+            Object value = m.invoke(widget);
+            propertyEditor.setValue(value);
+        } catch (Exception e) {
+
+        }
+
+    }
+
+    public void update(Widget widget) {
+        try {
+            Method m = crPropertyDescriptor.getWriteMethod();
+            m.invoke(widget, propertyEditor.getValue());
+        } catch (Exception e) {
+
+        }
+    }
+
+}
diff --git a/designer_form/src/com/fr/design/designer/creator/PropertyGroupPane.java b/designer_form/src/com/fr/design/designer/creator/PropertyGroupPane.java
new file mode 100644
index 000000000..998881981
--- /dev/null
+++ b/designer_form/src/com/fr/design/designer/creator/PropertyGroupPane.java
@@ -0,0 +1,70 @@
+package com.fr.design.designer.creator;
+
+import com.fr.base.FRContext;
+import com.fr.design.dialog.BasicPane;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.layout.TableLayoutHelper;
+import com.fr.form.ui.FreeButton;
+import com.fr.form.ui.Widget;
+
+import javax.swing.*;
+import java.awt.*;
+
+/**
+ * Created by kerry on 2017/9/7.
+ */
+public class PropertyGroupPane extends BasicPane {
+    private CRPropertyDescriptor[] crPropertyDescriptors;
+    private CRPropertyDescriptorPane[] crPropertyDescriptorPanes;
+    private XCreator xCreator;
+
+    public PropertyGroupPane(CRPropertyDescriptor[] crPropertyDescriptors, XCreator xCreator) {
+        this.crPropertyDescriptors = crPropertyDescriptors;
+        this.xCreator = xCreator;
+        this.setLayout(FRGUIPaneFactory.createBorderLayout());
+        initComponent();
+    }
+
+    public void initComponent() {
+        int count = crPropertyDescriptors.length;
+        crPropertyDescriptorPanes = new CRPropertyDescriptorPane[count];
+        Component[][] components = new Component[count][];
+        for (int i = 0; i < count; i++) {
+            crPropertyDescriptorPanes[i] = new CRPropertyDescriptorPane(crPropertyDescriptors[i], xCreator);
+            components[i] = crPropertyDescriptorPanes[i].createTableLayoutComponent();
+        }
+
+        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, TableLayoutHelper.FILL_LASTCOLUMN, 20, 10);
+        panel.setBorder(BorderFactory.createEmptyBorder(5, 0, 10, 0));
+        this.add(panel, BorderLayout.CENTER);
+    }
+
+    public void populate(Widget widget){
+        for(int i = 0; i< crPropertyDescriptorPanes.length; i++){
+            crPropertyDescriptorPanes[i].populate(widget);
+        }
+    }
+
+    @Override
+    protected String title4PopupWindow() {
+        return "PropertyGroupPane";
+    }
+
+    public static void main(String[] args) {
+      try{
+          XCreator xCreator = new XButton(new FreeButton(),new Dimension(100, 100));
+          PropertyGroupPane propertyGroupPane = new PropertyGroupPane(xCreator.supportedDescriptor(), xCreator);
+          JFrame jf = new JFrame("jFrame");
+          jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+          JPanel content = (JPanel) jf.getContentPane();
+          content.setLayout(new BorderLayout());
+          content.add(propertyGroupPane, BorderLayout.CENTER);
+          jf.setSize(439, 400);
+          jf.setVisible(true);
+      }catch (Exception e){
+          FRContext.getLogger().error(e.getMessage());
+      }
+
+    }
+
+}
diff --git a/designer_form/src/com/fr/design/designer/creator/XDateEditor.java b/designer_form/src/com/fr/design/designer/creator/XDateEditor.java
index 42e8e031d..769a6adb1 100644
--- a/designer_form/src/com/fr/design/designer/creator/XDateEditor.java
+++ b/designer_form/src/com/fr/design/designer/creator/XDateEditor.java
@@ -119,7 +119,7 @@ public class XDateEditor extends XDirectWriteEditor {
         if (editor == null) {
             editor = FRGUIPaneFactory.createBorderLayout_S_Pane();
             editor.add(textField = new UITextField(5), BorderLayout.CENTER);
-            btn = new LimpidButton("", this.getIconPath(), toData().isVisible() ? FULL_OPACITY : HALF_OPACITY);
+            btn = new LimpidButton(StringUtils.EMPTY, this.getIconPath(), toData().isVisible() ? FULL_OPACITY : HALF_OPACITY);
             btn.setPreferredSize(new Dimension(21, 21));
             editor.add(btn, BorderLayout.EAST);
             textField.setOpaque(false);
diff --git a/designer_form/src/com/fr/design/designer/creator/XElementCase.java b/designer_form/src/com/fr/design/designer/creator/XElementCase.java
index a23733f9d..c58ba60ef 100644
--- a/designer_form/src/com/fr/design/designer/creator/XElementCase.java
+++ b/designer_form/src/com/fr/design/designer/creator/XElementCase.java
@@ -104,10 +104,15 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
 						.setI18NName(Inter.getLocText("Form-EC_toolbar"))
 						.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")
 		};
-		propertyTableEditor = resolveCompatible(propertyTableEditor);
+		CRPropertyDescriptor[] extraTableEditor = getExtraTableEditor();
+		return  (CRPropertyDescriptor[]) ArrayUtils.addAll(propertyTableEditor, extraTableEditor);
+	}
+
+	public CRPropertyDescriptor[] getExtraTableEditor(){
+		CRPropertyDescriptor[] extraTableEditor = resolveCompatible();
 		FormElementCaseEditorProcessor processor = ExtraDesignClassManager.getInstance().getSingle(FormElementCaseEditorProcessor.MARK_STRING);
 		if (processor == null) {
-			return propertyTableEditor;
+			return extraTableEditor;
 		}
 		this.designer = WidgetPropertyPane.getInstance().getEditingFormDesigner();
 		FitProvider wbTpl = (FitProvider) designer.getTarget();
@@ -122,11 +127,12 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
 		if (editor.getReportFitAttr() == null) {
 			editor.setReportFitInPc(processor.getFitStateInPC(fitAttr));
 		}
-		return  (CRPropertyDescriptor[]) ArrayUtils.addAll(propertyTableEditor, extraEditor);
+		return (CRPropertyDescriptor[]) ArrayUtils.addAll(extraTableEditor, extraEditor);
 	}
 
 
-	private CRPropertyDescriptor[] resolveCompatible (CRPropertyDescriptor[] propertyTableEditor) {
+	private CRPropertyDescriptor[] resolveCompatible() {
+		CRPropertyDescriptor[] extraProperty = new CRPropertyDescriptor[0];
 		//这边有个插件兼容问题,之后还是要改回process才行
 		Set<FormElementCaseEditorProvider> set = ExtraDesignClassManager.getInstance().getArray(AbstractFormElementCaseEditorProvider.MARK_STRING);
 		for (FormElementCaseEditorProvider provider : set) {
@@ -137,9 +143,9 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
 			FormProvider formProvider = designer.getTarget();
 			ElementCaseEditorProvider elementCaseEditorProvider = this.toData();
 			PropertyDescriptor[] extraEditor = provider.createPropertyDescriptor(this.data.getClass(), formProvider, elementCaseEditorProvider);
-			propertyTableEditor = (CRPropertyDescriptor[]) ArrayUtils.addAll(propertyTableEditor, extraEditor);
+			extraProperty = (CRPropertyDescriptor[]) ArrayUtils.addAll(extraProperty, extraEditor);
 		}
-		return propertyTableEditor;
+		return extraProperty;
 	}
 
 	@Override
diff --git a/designer_form/src/com/fr/design/designer/creator/cardlayout/XWTabFitLayout.java b/designer_form/src/com/fr/design/designer/creator/cardlayout/XWTabFitLayout.java
index fcf1e503c..42011c306 100644
--- a/designer_form/src/com/fr/design/designer/creator/cardlayout/XWTabFitLayout.java
+++ b/designer_form/src/com/fr/design/designer/creator/cardlayout/XWTabFitLayout.java
@@ -536,4 +536,22 @@ public class XWTabFitLayout extends XWFitLayout {
 	public WidgetPropertyUIProvider[] getWidgetPropertyUIProviders() {
 		return new WidgetPropertyUIProvider[0];
 	}
+
+	public void firePropertyChange(){
+		checkButonType();
+		initialBackground = ((WTabFitLayout) data).getInitialBackground();
+		overBackground = ((WTabFitLayout) data).getOverBackground();
+		clickBackground = ((WTabFitLayout)data).getClickBackground();
+		CardSwitchButton cardSwitchButton = (CardSwitchButton) xCardSwitchButton.toData();
+		if(initialBackground != null){
+			xCardSwitchButton.setSelectBackground(initialBackground);
+			cardSwitchButton.setInitialBackground(initialBackground);
+		}
+		if(overBackground != null){
+			cardSwitchButton.setOverBackground(overBackground);
+		}
+		if(clickBackground != null){
+			cardSwitchButton.setClickBackground(clickBackground);
+		}
+	}
 }
\ No newline at end of file
diff --git a/designer_form/src/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java b/designer_form/src/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java
index 408165e3b..60f8cbe05 100644
--- a/designer_form/src/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java
+++ b/designer_form/src/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java
@@ -137,6 +137,8 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane {
 
         attriCardPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
 
+        jPanel.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 0));
+
         jPanel.add(attriCardPane, BorderLayout.CENTER);
 
         this.listener = new AttributeChangeListener() {
diff --git a/designer_form/src/com/fr/design/parameter/RootDesignDefinePane.java b/designer_form/src/com/fr/design/parameter/RootDesignDefinePane.java
index 71012c879..3e454b19e 100644
--- a/designer_form/src/com/fr/design/parameter/RootDesignDefinePane.java
+++ b/designer_form/src/com/fr/design/parameter/RootDesignDefinePane.java
@@ -2,6 +2,7 @@ package com.fr.design.parameter;
 
 import com.fr.base.BaseUtils;
 import com.fr.design.data.DataCreatorUI;
+import com.fr.design.designer.IntervalConstants;
 import com.fr.design.designer.creator.XCreator;
 import com.fr.design.designer.creator.XWParameterLayout;
 import com.fr.design.file.HistoryTemplateListPane;
@@ -65,7 +66,7 @@ public class RootDesignDefinePane extends AbstractDataModify<WParameterLayout> {
         Component[][] components = new Component[][]{
                 new Component[]{new UILabel(Inter.getLocText("Form-Desin_Width")), designerWidth},
         };
-        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, 20, 10);
+        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_L2, IntervalConstants.INTERVAL_L1);
         JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
         panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
         jPanel.add(panel);
@@ -97,8 +98,8 @@ public class RootDesignDefinePane extends AbstractDataModify<WParameterLayout> {
                 new Component[]{useParamsTemplate, null},
                 new Component[]{new UILabel(Inter.getLocText("FR-Designer_WidgetDisplyPosition")), hAlignmentPane}
         };
-        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, 20, 10);
-        panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
+        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_L2, IntervalConstants.INTERVAL_L1);
+        panel.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L1, 0, IntervalConstants.INTERVAL_L1, 0));
         jPanel.add(panel);
         return jPanel;
     }
diff --git a/designer_form/src/com/fr/design/widget/ui/designer/ButtonDefinePane.java b/designer_form/src/com/fr/design/widget/ui/designer/ButtonDefinePane.java
index ede1d7d29..5d5d093b1 100644
--- a/designer_form/src/com/fr/design/widget/ui/designer/ButtonDefinePane.java
+++ b/designer_form/src/com/fr/design/widget/ui/designer/ButtonDefinePane.java
@@ -44,12 +44,12 @@ public abstract class ButtonDefinePane<T extends Button> extends AbstractDataMod
         UILabel backgroundLabel = new UILabel(Inter.getLocText("FR-Designer_Background"));
         backgroundLabel.setVerticalAlignment(SwingConstants.TOP);
         Component[][] n_components = {
-                {new UILabel(Inter.getLocText("FR-Designer_Button-Name") + ":"), buttonNameTextField},
+                {new UILabel(Inter.getLocText("FR-Designer_Button-Name")), buttonNameTextField},
                 {new UILabel(Inter.getLocText("FR-Designer_Label_Name")), labelNameTextField},
                 backgroundCompPane,
                 frFont,
-                {new UILabel(Inter.getLocText("FR-Designer_Icon") + ":"), iconPane},
-                {new UILabel(Inter.getLocText("FR-Designer_Button-Hotkeys") + ":"), hotkeysTextField}
+                {new UILabel(Inter.getLocText("FR-Designer_Icon")), iconPane},
+                {new UILabel(Inter.getLocText("FR-Designer_Button-Hotkeys")), hotkeysTextField}
         };
         hotkeysTextField.setToolTipText(StableUtils.join(ButtonConstants.HOTKEYS, ","));
         JPanel panel = TableLayoutHelper.createGapTableLayoutPane(n_components, rowSize, columnSize, rowCount, 10, 10);
diff --git a/designer_form/src/com/fr/design/widget/ui/designer/CheckBoxDictPane.java b/designer_form/src/com/fr/design/widget/ui/designer/CheckBoxDictPane.java
deleted file mode 100644
index 7ee87b1bf..000000000
--- a/designer_form/src/com/fr/design/widget/ui/designer/CheckBoxDictPane.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package com.fr.design.widget.ui.designer;
-
-import com.fr.design.gui.icombobox.DictionaryComboBox;
-import com.fr.design.gui.icombobox.DictionaryConstants;
-import com.fr.design.gui.icombobox.UIComboBox;
-import com.fr.design.gui.ilable.UILabel;
-import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.form.ui.CheckBoxGroup;
-import com.fr.form.ui.ComboCheckBox;
-import com.fr.general.Inter;
-
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-public class CheckBoxDictPane extends JPanel {
-	
-	private DictionaryComboBox delimiterComboBox;
-	private UIComboBox returnTypeComboBox;
-	private DictionaryComboBox startComboBox;
-	private DictionaryComboBox endComboBox;
-	
-	private JPanel delimiterPane;
-	private JPanel startPane;
-	private JPanel endPane;
-	
-	public CheckBoxDictPane() {
-		JPanel returnTypePane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
-		returnTypePane.add(new UILabel(Inter.getLocText("Widget-Date_Selector_Return_Type") + ":"), BorderLayout.WEST);
-		returnTypeComboBox = new UIComboBox(new String[]{Inter.getLocText("Widget-Array"), Inter.getLocText("String")});
-		returnTypePane.add(returnTypeComboBox, BorderLayout.CENTER);			
-		this.add(returnTypePane);
-	
-		delimiterPane =FRGUIPaneFactory.createBorderLayout_S_Pane();
-		UILabel label = new UILabel(Inter.getLocText("Form-Delimiter") + ":");
-		delimiterPane.add(label, BorderLayout.WEST);
-		delimiterPane.add(delimiterComboBox = new DictionaryComboBox(DictionaryConstants.delimiters, DictionaryConstants.delimiterDisplays), BorderLayout.CENTER);
-		delimiterComboBox.setEditable(true);
-        this.add(delimiterPane);
-		
-		startPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-		startPane.add(new UILabel(Inter.getLocText("ComboCheckBox-Start_Symbol") + ":"), BorderLayout.WEST);
-		startPane.add(startComboBox = new DictionaryComboBox(DictionaryConstants.symbols, DictionaryConstants.symbolDisplays), BorderLayout.CENTER);
-		startComboBox.setEditable(true);
-        this.add(startPane);
-		
-		endPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-		endPane.add(new UILabel(Inter.getLocText("ComboCheckBox-End_Symbol") + ":"), BorderLayout.WEST);
-		endPane.add(endComboBox = new DictionaryComboBox(DictionaryConstants.symbols, DictionaryConstants.symbolDisplays), BorderLayout.CENTER);
-		endComboBox.setEditable(true);
-        this.add(endPane);
-		
-		returnTypeComboBox.addActionListener(new ActionListener(){
-			public void actionPerformed(ActionEvent e) {
-				checkVisible();
-			}				
-		});
-	}
-	
-	private void checkVisible(){
-		delimiterPane.setVisible(returnTypeComboBox.getSelectedIndex() == 1);
-		startPane.setVisible(returnTypeComboBox.getSelectedIndex() == 1);
-		endPane.setVisible(returnTypeComboBox.getSelectedIndex() == 1);
-	}
-	
-	public void populate(ComboCheckBox comboCheckBox) {
-		this.delimiterComboBox.setSelectedItem(comboCheckBox.getDelimiter());
-		this.returnTypeComboBox.setSelectedIndex(comboCheckBox.isReturnString() ? 1 : 0);
-		this.startComboBox.setSelectedItem(comboCheckBox.getStartSymbol());
-		this.endComboBox.setSelectedItem(comboCheckBox.getEndSymbol());
-		checkVisible();
-	}
-	public void update(ComboCheckBox comboCheckBox) {
-		comboCheckBox.setDelimiter((String)this.delimiterComboBox.getSelectedItem());
-		comboCheckBox.setReturnString(this.returnTypeComboBox.getSelectedIndex() != 0);
-		comboCheckBox.setStartSymbol((String)this.startComboBox.getSelectedItem());
-		comboCheckBox.setEndSymbol((String)this.endComboBox.getSelectedItem());
-	}
-	public void populate(CheckBoxGroup checkBoxGroup) {
-		this.delimiterComboBox.setSelectedItem(checkBoxGroup.getDelimiter());
-		this.returnTypeComboBox.setSelectedIndex(checkBoxGroup.isReturnString() ? 1 : 0);
-		this.startComboBox.setSelectedItem(checkBoxGroup.getStartSymbol());
-		this.endComboBox.setSelectedItem(checkBoxGroup.getEndSymbol());
-		checkVisible();
-	}
-	public void update(CheckBoxGroup checkBoxGroup) {
-		checkBoxGroup.setDelimiter((String)this.delimiterComboBox.getSelectedItem());
-		checkBoxGroup.setReturnString(this.returnTypeComboBox.getSelectedIndex() != 0);
-		checkBoxGroup.setStartSymbol((String)this.startComboBox.getSelectedItem());
-		checkBoxGroup.setEndSymbol((String)this.endComboBox.getSelectedItem());
-	}
-}
\ No newline at end of file
diff --git a/designer_form/src/com/fr/design/widget/ui/designer/DateEditorDefinePane.java b/designer_form/src/com/fr/design/widget/ui/designer/DateEditorDefinePane.java
index 5cbaafdf9..f6954e1db 100644
--- a/designer_form/src/com/fr/design/widget/ui/designer/DateEditorDefinePane.java
+++ b/designer_form/src/com/fr/design/widget/ui/designer/DateEditorDefinePane.java
@@ -5,10 +5,8 @@ import com.fr.base.Formula;
 import com.fr.data.core.FormatField;
 import com.fr.design.designer.creator.XCreator;
 import com.fr.design.gui.ibutton.UIButtonGroup;
-import com.fr.design.gui.ibutton.UIHeadGroup;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.ilable.UILabel;
-import com.fr.design.gui.ispinner.UISpinner;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
@@ -22,6 +20,8 @@ import com.fr.stable.ArrayUtils;
 import com.fr.stable.UtilEvalError;
 
 import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -34,10 +34,9 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane<DateEditor
     private DateValuePane endDv;
     private WaterMarkDictPane waterMarkDictPane;
     private FormWidgetValuePane formWidgetValuePane;
-    private UISpinner fontSizePane;
     private UIComboBox currentFormatComboBox;
     private UILabel currentSamplelabel;
-    private UIHeadGroup fomatHeadGroup;
+    private UIButtonGroup fomatHeadGroup;
 
     public DateEditorDefinePane(XCreator xCreator) {
         super(xCreator);
@@ -53,7 +52,6 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane<DateEditor
     protected JPanel setFirstContentPane() {
         waterMarkDictPane = new WaterMarkDictPane();
         formWidgetValuePane = new FormWidgetValuePane(creator.toData(), false);
-        fontSizePane = new UISpinner(0, 20, 1, 0);
         JPanel returnTypePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         returnTypePane.add(new UILabel(Inter.getLocText("Widget-Date_Selector_Return_Type") + ":"), BorderLayout.WEST);
         returnTypeComboBox = new UIButtonGroup<>(new String[] {Inter.getLocText("Date") ,  Inter.getLocText("String")});
@@ -125,8 +123,11 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane<DateEditor
         customPane.add(dateFormatPane, Inter.getLocText("StyleFormat-Date"));
         customPane.add(timeFormatPane, Inter.getLocText("StyleFormat-Time"));
         final String[] tabTitles = new String[]{Inter.getLocText("StyleFormat-Date"), Inter.getLocText("StyleFormat-Time")};
-        fomatHeadGroup = new UIHeadGroup(new String[]{Inter.getLocText("StyleFormat-Date"), Inter.getLocText("StyleFormat-Time")}){
-            protected void tabChanged(int newSelectedIndex) {
+        fomatHeadGroup = new UIButtonGroup(new String[]{Inter.getLocText("StyleFormat-Date"), Inter.getLocText("StyleFormat-Time")});
+        fomatHeadGroup.addChangeListener(new ChangeListener() {
+            @Override
+            public void stateChanged(ChangeEvent e) {
+                int newSelectedIndex = fomatHeadGroup.getSelectedIndex();
                 cardLayout.show(customPane, tabTitles[newSelectedIndex]);
                 if(newSelectedIndex == 0){
                     currentFormatComboBox = dateFormatComboBox;
@@ -137,7 +138,7 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane<DateEditor
                 }
                 refreshPreviewLabel();
             }
-        };
+        });
         fomatHeadPane.add(fomatHeadGroup, BorderLayout.NORTH);
         fomatHeadPane.add(customPane, BorderLayout.CENTER);
         return fomatHeadPane;
@@ -172,6 +173,7 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane<DateEditor
     protected void populateSubDirectWriteEditorBean(DateEditor e) {
         String formatText = e.getFormatText();
         fomatHeadGroup.setSelectedIndex(getDateType(e));
+        fomatHeadGroup.populateBean();
         currentFormatComboBox.setSelectedItem(formatText);
         waterMarkDictPane.populate(e);
 		returnTypeComboBox.setSelectedIndex(e.isReturnDate() ? 0 : 1);
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 a1d51d0eb..f6eac1df8 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
@@ -1,5 +1,7 @@
 package com.fr.design.widget.ui.designer;
 
+import com.fr.design.constants.LayoutConstants;
+import com.fr.design.designer.IntervalConstants;
 import com.fr.design.designer.creator.*;
 import com.fr.design.foldablepane.UIExpandablePane;
 import com.fr.design.gui.icheckbox.UICheckBox;
@@ -105,37 +107,25 @@ public abstract class FieldEditorDefinePane<T extends FieldEditor> extends Abstr
     protected void addValidatePane() {
         initErrorMsgPane();
         validatePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-
         final UILabel uiLabel = new UILabel(Inter.getLocText("FR-Designer_Widget_Error_Tip"));
+        JPanel borderPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        final JPanel errorTipPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{uiLabel, errorMsgTextField}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L1, LayoutConstants.VGAP_MEDIUM);
+        errorTipPane.setBorder(BorderFactory.createEmptyBorder(0, IntervalConstants.INTERVAL_L5, 0, 0));
+        borderPane.add(errorTipPane, BorderLayout.CENTER);
         allowBlankCheckBox.addItemListener(new ItemListener() {
-
             @Override
             public void itemStateChanged(ItemEvent e) {
                 boolean isSelected = allowBlankCheckBox.isSelected();
-                uiLabel.setVisible(!isSelected);
-                errorMsgTextField.setVisible(!isSelected);
-                if (isSelected) {
-                    uiLabel.setPreferredSize(new Dimension(0, 0));
-                    errorMsgTextField.setPreferredSize(new Dimension(0, 0));
-                } else {
-                    uiLabel.setPreferredSize(new Dimension(66, 20));
-                    errorMsgTextField.setPreferredSize(new Dimension(150, 20));
-                }
+                errorTipPane.setVisible(!isSelected);
             }
         });
 
-
-        double f = TableLayout.FILL;
-        double p = TableLayout.PREFERRED;
         Component[][] components = new Component[][]{
-                new Component[]{allowBlankCheckBox, null},
-                new Component[]{uiLabel, errorMsgTextField},
+                new Component[]{allowBlankCheckBox},
+                new Component[]{borderPane},
         };
-        double[] rowSize = {p, p};
-        double[] columnSize = {p, f};
-        int[][] rowCount = {{1, 1}, {1, 1}};
-        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, 5, 5);
-        panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
+        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L6, IntervalConstants.INTERVAL_L6);
+        panel.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L1, 0, IntervalConstants.INTERVAL_L1, 0));
         validatePane.add(panel, BorderLayout.NORTH);
         JPanel contentPane = this.setValidatePane();
         if (contentPane != null) {
diff --git a/designer_form/src/com/fr/design/widget/ui/designer/FreeButtonDefinePane.java b/designer_form/src/com/fr/design/widget/ui/designer/FreeButtonDefinePane.java
index db6635453..1c470394d 100644
--- a/designer_form/src/com/fr/design/widget/ui/designer/FreeButtonDefinePane.java
+++ b/designer_form/src/com/fr/design/widget/ui/designer/FreeButtonDefinePane.java
@@ -3,6 +3,7 @@ package com.fr.design.widget.ui.designer;
 import com.fr.design.designer.creator.XCreator;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.style.FRFontPane;
+import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.widget.component.ButtonBackgroundPane;
 import com.fr.form.ui.FreeButton;
 import com.fr.general.FRFont;
@@ -17,6 +18,7 @@ import java.awt.*;
 public class FreeButtonDefinePane extends ButtonDefinePane<FreeButton> {
     private ButtonBackgroundPane backgroundCompPane;
     private FRFontPane frFontPane;
+    private UILabel fontLabel;
 
     public FreeButtonDefinePane(XCreator xcreator) {
         super(xcreator);
@@ -24,29 +26,41 @@ public class FreeButtonDefinePane extends ButtonDefinePane<FreeButton> {
 
     public Component[] createBackgroundComp() {
         backgroundCompPane = new ButtonBackgroundPane();
-        return new Component[]{new UILabel(Inter.getLocText("FR-Designer_Background") + ":"), backgroundCompPane};
+        return new Component[]{backgroundCompPane,null};
     }
 
     public Component[] createFontPane() {
-        UILabel fontLabel = new UILabel(Inter.getLocText("FR-Designer_Font"));
+        JPanel fontLabelPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        fontLabel = new UILabel(Inter.getLocText("FR-Designer_Font"));
+        fontLabelPanel.add(fontLabel, BorderLayout.CENTER);
         fontLabel.setVerticalAlignment(SwingConstants.TOP);
         frFontPane = new FRFontPane();
-        return new Component[]{fontLabel, frFontPane};
+        JPanel fontPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        fontPanel.add(frFontPane, BorderLayout.CENTER);
+        return new Component[]{fontLabelPanel, fontPanel};
     }
 
     public void populateSubButtonPane(FreeButton e) {
         backgroundCompPane.populate(e);
-        FRFont frFont = e.getFont();
-        if (frFont != null) {
-            frFontPane.populateBean(e.getFont());
+        frFontPane.setVisible(e.isCustomStyle());
+        fontLabel.setVisible(e.isCustomStyle());
+        if(e.isCustomStyle()){
+            FRFont frFont = e.getFont();
+            if (frFont != null) {
+                frFontPane.populateBean(e.getFont());
+            }
         }
     }
 
     public FreeButton updateSubButtonPane() {
         FreeButton freeButton = (FreeButton) creator.toData();
         backgroundCompPane.update(freeButton);
-        FRFont frFont = freeButton.getFont() == null ? FRFont.getInstance() : freeButton.getFont();
-        freeButton.setFont(frFontPane.update(frFont));
+        frFontPane.setVisible(freeButton.isCustomStyle());
+        fontLabel.setVisible(freeButton.isCustomStyle());
+        if(freeButton.isCustomStyle()){
+            FRFont frFont = freeButton.getFont() == null ? FRFont.getInstance() : freeButton.getFont();
+            freeButton.setFont(frFontPane.update(frFont));
+        }
         return freeButton;
     }
 }
diff --git a/designer_form/src/com/fr/design/widget/ui/designer/NumberEditorDefinePane.java b/designer_form/src/com/fr/design/widget/ui/designer/NumberEditorDefinePane.java
index 9387df85c..0b1b5f82b 100644
--- a/designer_form/src/com/fr/design/widget/ui/designer/NumberEditorDefinePane.java
+++ b/designer_form/src/com/fr/design/widget/ui/designer/NumberEditorDefinePane.java
@@ -1,58 +1,30 @@
 package com.fr.design.widget.ui.designer;
 
 import com.fr.design.designer.creator.XCreator;
-import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ispinner.UIBasicSpinner;
-import com.fr.design.gui.ispinner.UISpinner;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.widget.component.NumberEditorValidatePane;
 import com.fr.design.widget.ui.designer.component.FormWidgetValuePane;
 import com.fr.form.ui.NumberEditor;
 import com.fr.general.Inter;
 
 import javax.swing.*;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-import javax.swing.text.DefaultFormatter;
 import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 
 public class NumberEditorDefinePane extends FieldEditorDefinePane<NumberEditor> {
     public NumberEditorDefinePane(XCreator xCreator){
         super(xCreator);
     }
-
-    private FormWidgetValuePane formWidgetValuePane;
     /**
      *
      */
     private static final long serialVersionUID = 8011242951911686805L;
-    private UICheckBox allowDecimalsCheckBox;
-    private UICheckBox allowNegativeCheckBox;
-    private UICheckBox setMaxValueCheckBox;
-    private UICheckBox setMinValueCheckBox;
-    private UIBasicSpinner maxValueSpinner;
-    private SpinnerNumberModel maxValueModel;
-    private UIBasicSpinner minValueSpinner;
-    private SpinnerNumberModel minValueModel;
-    private UISpinner decimalLength;
-    private JPanel limitNumberPane;
     private WaterMarkDictPane waterMarkDictPane;
-
-    private ActionListener allowDecimalsListener;
-
-    private ActionListener allowNegativeListener ;
-
-    public ActionListener setMaxListener;
-
-    private ActionListener setMinListener;
-
-    private ChangeListener maxValueChangeListener;
-
-    private ChangeListener minValueChangeListener;
+    private FormWidgetValuePane formWidgetValuePane;
+    private NumberEditorValidatePane numberEditorValidatePane;
 
 
 
@@ -84,237 +56,27 @@ public class NumberEditorDefinePane extends FieldEditorDefinePane<NumberEditor>
         return boundsPane;
     }
 
-    private void initListeners(){
-        allowDecimalsListener = new ActionListener() {
-            public void actionPerformed(ActionEvent e) {
-                if (allowDecimalsCheckBox.isSelected()) {
-                    limitNumberPane.setVisible(true);
-                    limitNumberPane.setPreferredSize(new Dimension(215,20));
-                } else {
-                    limitNumberPane.setVisible(false);
-                    limitNumberPane.setPreferredSize(new Dimension(0,0));
-                }
-            }
-        };
-
-        allowNegativeListener = new ActionListener() {
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                if (allowNegativeCheckBox.isSelected()) {
-                    minValueModel.setMinimum(-Double.MAX_VALUE);
-                    if (!setMinValueCheckBox.isSelected()) {
-                        maxValueModel.setMinimum(-Double.MAX_VALUE);
-                    }
-                } else {
-                    minValueModel.setMinimum(0.0);
-                    if (!setMinValueCheckBox.isSelected()) {
-                        maxValueModel.setMinimum(0.0);
-                    }
-                    Double minValue = Double.parseDouble("" + minValueSpinner.getValue());
-                    Double maxValue = Double.parseDouble("" + maxValueSpinner.getValue());
-                    if (minValue < 0.0) {
-                        minValueSpinner.setValue(0.0);
-                    }
-                    if (maxValue < 0.0) {
-                        maxValueSpinner.setValue(0.0);
-                    }
-                }
-            }
-        };
-
-
-        setMaxListener = new ActionListener() {
-            public void actionPerformed(ActionEvent e) {
-                if (setMaxValueCheckBox.isSelected()) {
-                    maxValueSpinner.setEnabled(true);
-                    Double value = new Double(0);
-                    if (setMinValueCheckBox.isSelected()) {
-                        Double minValue = Double.parseDouble("" + minValueSpinner.getValue());
-                        if (minValue > value) {
-                            value = minValue;
-                        }
-                    }
-                    maxValueSpinner.setValue(value);
-                } else {
-                    maxValueSpinner.setEnabled(false);
-                    minValueModel.setMaximum(Double.MAX_VALUE);
-                }
-            }
-        };
-
-
-        setMinListener = new ActionListener() {
-            public void actionPerformed(ActionEvent e) {
-                if (setMinValueCheckBox.isSelected()) {
-                    minValueSpinner.setEnabled(true);
-                    Double value = new Double(0);
-                    if (setMaxValueCheckBox.isSelected()) {
-                        Double maxValue = Double.parseDouble("" + maxValueSpinner.getValue());
-                        if (maxValue < value) {
-                            value = maxValue;
-                        }
-                    }
-                    minValueSpinner.setValue(value);
-                } else {
-                    minValueSpinner.setEnabled(false);
-                    maxValueModel.setMinimum(allowNegativeCheckBox.isSelected() ? (-Double.MAX_VALUE) : new Double(0));
-                }
-            }
-        };
-
-        maxValueChangeListener = new ChangeListener() {
-
-            @Override
-            public void stateChanged(ChangeEvent e) {
-                if (setMaxValueCheckBox.isSelected()) {
-                    if (setMinValueCheckBox.isSelected()) {
-                        minValueModel.setMaximum(Double.parseDouble("" + maxValueSpinner.getValue()));
-                    }
-                }
-            }
-        };
-
-        minValueChangeListener = new ChangeListener() {
-
-            @Override
-            public void stateChanged(ChangeEvent e) {
-                if (setMinValueCheckBox.isSelected()) {
-                    if (setMaxValueCheckBox.isSelected()) {
-                        maxValueModel.setMinimum(Double.parseDouble("" + minValueSpinner.getValue()));
-                    }
-                }
-            }
-        };
-    }
-
     public JPanel setValidatePane() {
-        initListeners();
-        this.allowDecimalsCheckBox = new UICheckBox(Inter.getLocText("Allow_Decimals"));
-        this.decimalLength = new UISpinner(0, Integer.MAX_VALUE, 1, 16);
-        allowDecimalsCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
-        this.allowDecimalsCheckBox.addActionListener(allowDecimalsListener);
-
-        this.allowNegativeCheckBox = new UICheckBox(Inter.getLocText("Allow_Negative"));
-        this.allowNegativeCheckBox.addActionListener(allowNegativeListener);
-        allowNegativeCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
-
-        this.setMaxValueCheckBox = new UICheckBox(Inter.getLocText("Need_Max_Value"), false);
-        setMaxValueCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
-
-        this.maxValueSpinner = new UIBasicSpinner(maxValueModel = new SpinnerNumberModel(0D, -Double.MAX_VALUE, Double.MAX_VALUE, 1D));
-
-        setNotAllowsInvalid(this.maxValueSpinner);
-
-        this.setMaxValueCheckBox.addActionListener(setMaxListener);
-        this.maxValueSpinner.addChangeListener(maxValueChangeListener);
-
-        this.setMinValueCheckBox = new UICheckBox(Inter.getLocText("Need_Min_Value"), false);
-        this.minValueSpinner = new UIBasicSpinner(minValueModel = new SpinnerNumberModel(0D, -Double.MAX_VALUE, Double.MAX_VALUE, 1D));
-        setNotAllowsInvalid(this.minValueSpinner);
-        minValueSpinner.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
-        this.setMinValueCheckBox.addActionListener(setMinListener);
-        this.minValueSpinner.addChangeListener(minValueChangeListener);
-        setMinValueCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
-
-        UILabel numberLabel = new UILabel(Inter.getLocText(new String[]{"FR-Designer_Double", "Numbers"}));
-        limitNumberPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{numberLabel, decimalLength}}, TableLayoutHelper.FILL_LASTCOLUMN, 18, 7);
-
-
-        double f = TableLayout.FILL;
-        double p = TableLayout.PREFERRED;
-        Component[][] components = new Component[][]{
-                new Component[]{allowDecimalsCheckBox, null },
-                new Component[]{limitNumberPane, null},
-                new Component[]{allowNegativeCheckBox, null},
-                new Component[]{setMaxValueCheckBox, maxValueSpinner},
-                new Component[]{setMinValueCheckBox, minValueSpinner},
-        };
-        double[] rowSize = {p, p, p, p, p};
-        double[] columnSize = {p,f};
-        int[][] rowCount = {{1, 1},{1, 1},{1, 1},{1, 1},{1, 1}};
-        JPanel panel =  TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, 10, 7);
-        panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
-        return panel;
-
+        numberEditorValidatePane = new NumberEditorValidatePane();
+        return numberEditorValidatePane;
     }
 
-
     @Override
     protected void populateSubFieldEditorBean(NumberEditor e) {
-        allowDecimalsCheckBox.setSelected(e.isAllowDecimals());
-        if (e.isAllowDecimals()) {
-            this.decimalLength.setValue(e.getMaxDecimalLength());
-        } else {
-            this.limitNumberPane.setVisible(false);
-        }
-
-        allowNegativeCheckBox.setSelected(e.isAllowNegative());
-        if (e.getMaxValue() == Double.MAX_VALUE) {
-            setMaxValueCheckBox.setSelected(false);
-            maxValueSpinner.setValue(new Double(Double.MAX_VALUE));
-            maxValueSpinner.setEnabled(false);
-
-        } else {
-            setMaxValueCheckBox.setSelected(true);
-            maxValueSpinner.setEnabled(true);
-            maxValueSpinner.setValue(new Double(e.getMaxValue()));
-        }
-
-        if (e.getMinValue() == -Double.MAX_VALUE) {
-            setMinValueCheckBox.setSelected(false);
-            minValueSpinner.setValue(new Double(-Double.MAX_VALUE));
-            minValueSpinner.setEnabled(false);
-
-        } else {
-            setMinValueCheckBox.setSelected(true);
-            minValueSpinner.setEnabled(true);
-            minValueSpinner.setValue(new Double(e.getMinValue()));
-        }
         formWidgetValuePane.populate(e);
         this.waterMarkDictPane.populate(e);
+        numberEditorValidatePane.populate(e);
     }
 
     @Override
     protected NumberEditor updateSubFieldEditorBean() {
-
         NumberEditor ob = (NumberEditor)creator.toData();
         formWidgetValuePane.update(ob);
-        ob.setAllowDecimals(allowDecimalsCheckBox.isSelected());
-        if (allowDecimalsCheckBox.isSelected()) {
-            ob.setMaxDecimalLength((int)this.decimalLength.getValue());
-        }
-
-        ob.setAllowNegative(allowNegativeCheckBox.isSelected());
-        if (setMaxValueCheckBox.isSelected()) {
-            ob.setMaxValue(Double.parseDouble("" + maxValueSpinner.getValue()));
-        } else {
-            ob.setMaxValue(Double.MAX_VALUE);
-        }
-
-        if (setMinValueCheckBox.isSelected()) {
-            ob.setMinValue(Double.parseDouble("" + minValueSpinner.getValue()));
-        } else {
-            ob.setMinValue(-Double.MAX_VALUE);
-        }
-
         this.waterMarkDictPane.update(ob);
-
-
+        numberEditorValidatePane.update(ob);
         return ob;
     }
 
-    private void setNotAllowsInvalid(UIBasicSpinner jspinner) {
-        JComponent editor = jspinner.getEditor();
-        if (editor instanceof UIBasicSpinner.DefaultEditor) {
-            JFormattedTextField ftf = ((UIBasicSpinner.DefaultEditor) editor).getTextField();
-            ftf.setColumns(10);
-            JFormattedTextField.AbstractFormatter formatter = ftf.getFormatter();
-            DefaultFormatter df = (DefaultFormatter) formatter;
-            df.setAllowsInvalid(false);
-        }
-    }
-
     public Object getValue(UIBasicSpinner jspinner){
         JComponent editor = jspinner.getEditor();
         if (editor instanceof UIBasicSpinner.DefaultEditor) {
diff --git a/designer_form/src/com/fr/design/widget/ui/designer/component/PaddingBoundPane.java b/designer_form/src/com/fr/design/widget/ui/designer/component/PaddingBoundPane.java
index 32d840f72..1b1dbf861 100644
--- a/designer_form/src/com/fr/design/widget/ui/designer/component/PaddingBoundPane.java
+++ b/designer_form/src/com/fr/design/widget/ui/designer/component/PaddingBoundPane.java
@@ -1,5 +1,6 @@
 package com.fr.design.widget.ui.designer.component;
 
+import com.fr.design.designer.IntervalConstants;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ispinner.UISpinner;
@@ -43,7 +44,7 @@ public class PaddingBoundPane extends BasicPane {
                 new Component[]{null, left, right},
                 new Component[]{null, new UILabel(Inter.getLocText("FR-Designer_Left"), SwingConstants.CENTER), new UILabel(Inter.getLocText("FR-Designer_Right"), SwingConstants.CENTER)},
         };
-        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, 7, 7);
+        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_L2, IntervalConstants.INTERVAL_L1);
         panel.setBorder(BorderFactory.createEmptyBorder(5, 0, 10, 0));
         this.add(panel);
 
diff --git a/designer_form/src/com/fr/design/widget/ui/designer/component/TabFitLayoutBackgroundPane.java b/designer_form/src/com/fr/design/widget/ui/designer/component/TabFitLayoutBackgroundPane.java
index b52069b57..b2c79c922 100644
--- a/designer_form/src/com/fr/design/widget/ui/designer/component/TabFitLayoutBackgroundPane.java
+++ b/designer_form/src/com/fr/design/widget/ui/designer/component/TabFitLayoutBackgroundPane.java
@@ -1,8 +1,10 @@
 package com.fr.design.widget.ui.designer.component;
 
+import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.widget.component.BackgroundCompPane;
 import com.fr.form.ui.container.cardlayout.WTabFitLayout;
 import com.fr.general.Background;
+import com.fr.general.Inter;
 
 /**
  * Created by ibm on 2017/8/8.
@@ -44,6 +46,10 @@ public class TabFitLayoutBackgroundPane extends BackgroundCompPane<WTabFitLayout
         switchCard();
     }
 
+    protected UILabel createUILable(){
+        return new UILabel(Inter.getLocText("FR-Designer_Style"));
+    }
+
     protected  String title4PopupWindow() {
         return "tabFitBackground";
     }
diff --git a/designer_form/src/com/fr/design/widget/ui/designer/layout/ElementEditorDefinePane.java b/designer_form/src/com/fr/design/widget/ui/designer/layout/ElementEditorDefinePane.java
index 10bed92ff..49b83a47c 100644
--- a/designer_form/src/com/fr/design/widget/ui/designer/layout/ElementEditorDefinePane.java
+++ b/designer_form/src/com/fr/design/widget/ui/designer/layout/ElementEditorDefinePane.java
@@ -1,9 +1,8 @@
 package com.fr.design.widget.ui.designer.layout;
 
-import com.fr.design.designer.creator.XCreator;
-import com.fr.design.gui.icheckbox.UICheckBox;
+import com.fr.design.designer.creator.*;
 import com.fr.design.gui.ilable.UILabel;
-import com.fr.design.layout.TableLayout;
+import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.widget.accessibles.AccessibleElementCaseToolBarEditor;
 import com.fr.design.widget.ui.designer.component.PaddingBoundPane;
@@ -20,39 +19,41 @@ import java.awt.*;
 public class ElementEditorDefinePane extends WTitleLayoutDefinePane<ElementCaseEditor> {
     private PaddingBoundPane paddingBoundPane;
     private AccessibleElementCaseToolBarEditor elementCaseToolBarEditor;
+    private PropertyGroupPane extraPropertyGroupPane;
 
-    public ElementEditorDefinePane(XCreator xCreator){
+    public ElementEditorDefinePane(XCreator xCreator) {
         super(xCreator);
 
     }
 
-    protected JPanel createCenterPane(){
+    protected JPanel createCenterPane() {
+        JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         paddingBoundPane = new PaddingBoundPane();
         elementCaseToolBarEditor = new AccessibleElementCaseToolBarEditor();
-        double f = TableLayout.FILL;
-        double p = TableLayout.PREFERRED;
-        double[] rowSize = {p, p};
-        double[] columnSize = {p, f};
-        int[][] rowCount = {{1, 1}, {1, 1}};
         Component[][] components = new Component[][]{
                 new Component[]{paddingBoundPane, null},
-                new Component[]{new UILabel("报表块工具栏"), elementCaseToolBarEditor}
+                new Component[]{new UILabel(Inter.getLocText("Form-EC_toolbar")), elementCaseToolBarEditor},
         };
-        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, 20, 10);
+        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, TableLayoutHelper.FILL_LASTCOLUMN, 20, 10);
         panel.setBorder(BorderFactory.createEmptyBorder(5, 0, 10, 0));
-        return panel;
+        CRPropertyDescriptor[] extraTableEditor = ((XElementCase)creator).getExtraTableEditor();
+        extraPropertyGroupPane = new PropertyGroupPane(extraTableEditor, creator);
+        centerPane.add(panel, BorderLayout.NORTH);
+        centerPane.add(extraPropertyGroupPane, BorderLayout.CENTER);
+        return centerPane;
     }
 
-    protected  ElementCaseEditor updateSubBean(){
-        ElementCaseEditor elementCaseEditor = (ElementCaseEditor)creator.toData();
+    protected ElementCaseEditor updateSubBean() {
+        ElementCaseEditor elementCaseEditor = (ElementCaseEditor) creator.toData();
         paddingBoundPane.update(elementCaseEditor);
-        elementCaseEditor.setToolBars((FormToolBarManager[])elementCaseToolBarEditor.getValue());
+        elementCaseEditor.setToolBars((FormToolBarManager[]) elementCaseToolBarEditor.getValue());
         return elementCaseEditor;
     }
 
-    protected  void populateSubBean(ElementCaseEditor ob){
+    protected void populateSubBean(ElementCaseEditor ob) {
         paddingBoundPane.populate(ob);
         elementCaseToolBarEditor.setValue(ob.getToolBars());
+        extraPropertyGroupPane.populate(ob);
     }
 
 }
diff --git a/designer_form/src/com/fr/design/widget/ui/designer/layout/FRAbsoluteBodyLayoutDefinePane.java b/designer_form/src/com/fr/design/widget/ui/designer/layout/FRAbsoluteBodyLayoutDefinePane.java
index deab5eaaf..53b24dbbb 100644
--- a/designer_form/src/com/fr/design/widget/ui/designer/layout/FRAbsoluteBodyLayoutDefinePane.java
+++ b/designer_form/src/com/fr/design/widget/ui/designer/layout/FRAbsoluteBodyLayoutDefinePane.java
@@ -1,16 +1,22 @@
 package com.fr.design.widget.ui.designer.layout;
 
 import com.fr.design.data.DataCreatorUI;
+import com.fr.design.designer.IntervalConstants;
 import com.fr.design.designer.creator.*;
 import com.fr.design.designer.creator.cardlayout.XWCardMainBorderLayout;
 import com.fr.design.designer.properties.items.FRLayoutTypeItems;
 import com.fr.design.designer.properties.items.Item;
+import com.fr.design.foldablepane.UIExpandablePane;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.FormDesigner;
 import com.fr.design.mainframe.WidgetPropertyPane;
+import com.fr.design.mainframe.widget.accessibles.AccessibleWLayoutBorderStyleEditor;
+import com.fr.design.widget.ui.designer.component.WidgetBoundPane;
+import com.fr.form.ui.LayoutBorderStyle;
 import com.fr.form.ui.container.WAbsoluteBodyLayout;
 import com.fr.form.ui.container.WAbsoluteLayout;
 import com.fr.form.ui.container.WBodyLayoutType;
@@ -26,33 +32,38 @@ import java.util.Comparator;
  * Created by ibm on 2017/8/2.
  */
 public class FRAbsoluteBodyLayoutDefinePane extends FRAbsoluteLayoutDefinePane {
-    private XWAbsoluteBodyLayout xwAbsoluteBodyLayout;
-    private WAbsoluteBodyLayout wAbsoluteBodyLayout;
+    private AccessibleWLayoutBorderStyleEditor borderStyleEditor;
+
     private UIComboBox layoutCombox;
     private WBodyLayoutType layoutType = WBodyLayoutType.ABSOLUTE;
     private static final int EACH_ROW_COUNT = 4;
 
     public FRAbsoluteBodyLayoutDefinePane(XCreator xCreator) {
         super(xCreator);
-        this.xwAbsoluteBodyLayout = (XWAbsoluteBodyLayout) xCreator;
-        wAbsoluteBodyLayout = xwAbsoluteBodyLayout.toData();
     }
 
 
+    public void initComponent() {
+        super.initComponent();
+        borderStyleEditor = new AccessibleWLayoutBorderStyleEditor();
+        JPanel jPanel = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{new UILabel(Inter.getLocText("FR-Designer-Widget_Style")), borderStyleEditor}}, TableLayoutHelper.FILL_LASTCOLUMN, 18, 7);
+        JPanel borderPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        jPanel.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
+        borderPane.add(jPanel, BorderLayout.CENTER);
+        UIExpandablePane advancedPane = new UIExpandablePane(Inter.getLocText("FR-Designer_Advanced"), 280, 20, borderPane );
+        this.add(advancedPane, BorderLayout.NORTH);
+    }
+
     public JPanel createThirdPane() {
         initLayoutComboBox();
-        double f = TableLayout.FILL;
-        double p = TableLayout.PREFERRED;
-        double[] rowSize = {p, p};
-        double[] columnSize = {p, f};
-        int[][] rowCount = {{1, 1}, {1, 1}};
-        Component[][] components = new Component[][]{
-                new Component[]{new UILabel(Inter.getLocText("FR-Designer_Attr_Layout_Type")), layoutCombox},
-                new Component[]{new UILabel(Inter.getLocText("FR-Designer-Widget_Scaling_Mode")), comboBox},
-        };
-        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, 20, 10);
-        panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
-        return panel;
+        JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        JPanel northPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{new UILabel(Inter.getLocText("FR-Designer_Attr_Layout_Type")), layoutCombox}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L2, 7);
+        JPanel centerPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{new UILabel(Inter.getLocText("FR-Designer-Widget_Scaling_Mode")), comboBox}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L2, 7);
+        jPanel.add(northPane, BorderLayout.NORTH);
+        jPanel.add(centerPane, BorderLayout.CENTER);
+        northPane.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L1, 0, 0, 0));
+        centerPane.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L1, IntervalConstants.INTERVAL_L5, 0, 0));
+        return jPanel;
 
     }
 
@@ -72,8 +83,8 @@ public class FRAbsoluteBodyLayoutDefinePane extends FRAbsoluteLayoutDefinePane {
     }
 
     public void populateSubPane(WAbsoluteLayout ob) {
-//        WAbsoluteBodyLayout layout = (WAbsoluteBodyLayout) ob;
         layoutCombox.setSelectedIndex(1);
+        borderStyleEditor.setValue(ob.getBorderStyle());
     }
 
     public WAbsoluteBodyLayout updateSubPane() {
@@ -90,6 +101,7 @@ public class FRAbsoluteBodyLayoutDefinePane extends FRAbsoluteLayoutDefinePane {
                 switch2FitBodyLayout();
             }
         }
+        layout.setBorderStyle((LayoutBorderStyle) borderStyleEditor.getValue());
         return layout;
     }
 
diff --git a/designer_form/src/com/fr/design/widget/ui/designer/layout/FRAbsoluteLayoutDefinePane.java b/designer_form/src/com/fr/design/widget/ui/designer/layout/FRAbsoluteLayoutDefinePane.java
index 05b0e2636..d3a117ec6 100644
--- a/designer_form/src/com/fr/design/widget/ui/designer/layout/FRAbsoluteLayoutDefinePane.java
+++ b/designer_form/src/com/fr/design/widget/ui/designer/layout/FRAbsoluteLayoutDefinePane.java
@@ -24,32 +24,27 @@ import java.awt.*;
  * Created by ibm on 2017/8/2.
  */
 public class FRAbsoluteLayoutDefinePane extends AbstractDataModify<WAbsoluteLayout> {
-    private XWAbsoluteLayout xwAbsoluteLayout;
-    private WAbsoluteLayout wAbsoluteLayout;
     protected UIComboBox comboBox;
-    private WBodyLayoutType layoutType = WBodyLayoutType.ABSOLUTE;
     private WidgetBoundPane boundPane;
 
     public FRAbsoluteLayoutDefinePane(XCreator xCreator) {
         super(xCreator);
-        this.xwAbsoluteLayout = (XWAbsoluteLayout) xCreator;
-        wAbsoluteLayout = xwAbsoluteLayout.toData();
         initComponent();
-
     }
 
 
     public void initComponent() {
-        boundPane = new WidgetBoundPane(creator);
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
-        this.add(boundPane, BorderLayout.NORTH);
+        JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        boundPane = new WidgetBoundPane(creator);
+        centerPane.add(boundPane, BorderLayout.NORTH);
         initUIComboBox();
-        JPanel thirdPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        thirdPane.add(createThirdPane(), BorderLayout.CENTER);
-        thirdPane.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
-        UIExpandablePane layoutExpandablePane = new UIExpandablePane(Inter.getLocText("FR-Designer-Widget_Area_Scaling"), 280, 20,thirdPane );
-
-        this.add(layoutExpandablePane, BorderLayout.CENTER);
+//        JPanel thirdPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+//        thirdPane.add(, BorderLayout.CENTER);
+//        thirdPane.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
+        UIExpandablePane layoutExpandablePane = new UIExpandablePane(Inter.getLocText("FR-Designer-Widget_Area_Scaling"), 280, 20,createThirdPane() );
+        centerPane.add(layoutExpandablePane, BorderLayout.CENTER);
+        this.add(centerPane, BorderLayout.CENTER);
     }
 
     public JPanel createThirdPane() {
diff --git a/designer_form/src/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java b/designer_form/src/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java
index 66aac8864..7f45a1f98 100644
--- a/designer_form/src/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java
+++ b/designer_form/src/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java
@@ -1,6 +1,7 @@
 package com.fr.design.widget.ui.designer.layout;
 
 import com.fr.design.data.DataCreatorUI;
+import com.fr.design.designer.IntervalConstants;
 import com.fr.design.designer.creator.XCreator;
 import com.fr.design.designer.creator.XWAbsoluteBodyLayout;
 import com.fr.design.designer.creator.XWFitLayout;
@@ -80,18 +81,20 @@ public class FRFitLayoutDefinePane extends AbstractDataModify<WFitLayout> {
         componentIntervel = new UISpinner(0, 100, 1, 0);
         double f = TableLayout.FILL;
         double p = TableLayout.PREFERRED;
-        double[] rowSize = {p, p, p};
+        double[] rowSize = {p, p};
         double[] columnSize = {p, f};
-        int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}};
+        int[][] rowCount = {{1, 1}, {1, 1}};
+        JPanel northPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{new UILabel(Inter.getLocText("FR-Designer_Attr_Layout_Type")), layoutComboBox}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L2, 7);
+        northPane.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L1, 0, 0, 0));
+
         Component[][] components = new Component[][]{
-                new Component[]{new UILabel(Inter.getLocText("FR-Designer_Attr_Layout_Type")), layoutComboBox},
                 new Component[]{new UILabel(Inter.getLocText("FR-Designer_Component_Scale")), adaptComboBox},
                 new Component[]{new UILabel(Inter.getLocText("FR-Designer_Component_Interval")), componentIntervel}
         };
-        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, 20, 10);
-        panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
-        jPanel.add(panel, BorderLayout.CENTER);
-
+        JPanel centerPane = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_L2, 7);
+        centerPane.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L1, IntervalConstants.INTERVAL_L5, 0, 0));
+        jPanel.add(northPane, BorderLayout.NORTH);
+        jPanel.add(centerPane, BorderLayout.CENTER);
         return jPanel;
     }
 
diff --git a/designer_form/src/com/fr/design/widget/ui/designer/layout/WCardLayoutDefinePane.java b/designer_form/src/com/fr/design/widget/ui/designer/layout/WCardLayoutDefinePane.java
index 72a4d0b57..03608ce36 100644
--- a/designer_form/src/com/fr/design/widget/ui/designer/layout/WCardLayoutDefinePane.java
+++ b/designer_form/src/com/fr/design/widget/ui/designer/layout/WCardLayoutDefinePane.java
@@ -33,18 +33,17 @@ public class WCardLayoutDefinePane extends AbstractDataModify<WCardLayout> {
     }
 
     public void initComponent() {
+        this.setLayout(FRGUIPaneFactory.createBorderLayout());
         carouselInterval = new UISpinner(0, 20, 1, 0);
         accessibleCardTagWLayoutBorderStyleEditor = new AccessibleCardTagWLayoutBorderStyleEditor();
-        accessibleCardTagWLayoutBorderStyleEditor.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
         JPanel accessibleCardlayout = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        accessibleCardlayout.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
-        accessibleCardlayout.add(accessibleCardTagWLayoutBorderStyleEditor, BorderLayout.CENTER);
-        this.setLayout(FRGUIPaneFactory.createBorderLayout());
+        JPanel stylePane =  TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{new UILabel(Inter.getLocText("FR-Designer-Widget_Style")), accessibleCardTagWLayoutBorderStyleEditor}}, TableLayoutHelper.FILL_LASTCOLUMN, 18, 7);
+        stylePane.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
+        accessibleCardlayout.add(stylePane, BorderLayout.CENTER);
         UIExpandablePane advanceExpandablePane = new UIExpandablePane(Inter.getLocText("FR-Designer_Advanced"), 280, 20, accessibleCardlayout);
         final JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
         jPanel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
         setCarousel = new UICheckBox(Inter.getLocText("FR-Designer_setCarousel"));
-
         IntervalPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{new UILabel(Inter.getLocText("FR-Designer_carouselInterval")), carouselInterval}}, TableLayoutHelper.FILL_LASTCOLUMN, 18, 7);
         IntervalPane.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
         jPanel.add(setCarousel, BorderLayout.NORTH);
diff --git a/designer_form/src/com/fr/design/widget/ui/designer/layout/WTabFitLayoutDefinePane.java b/designer_form/src/com/fr/design/widget/ui/designer/layout/WTabFitLayoutDefinePane.java
index 8802aad9b..82ea84af0 100644
--- a/designer_form/src/com/fr/design/widget/ui/designer/layout/WTabFitLayoutDefinePane.java
+++ b/designer_form/src/com/fr/design/widget/ui/designer/layout/WTabFitLayoutDefinePane.java
@@ -1,9 +1,11 @@
 package com.fr.design.widget.ui.designer.layout;
 
+import com.fr.design.designer.IntervalConstants;
 import com.fr.design.designer.creator.XCreator;
 import com.fr.design.foldablepane.UIExpandablePane;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ispinner.UISpinner;
+import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.widget.ui.designer.AbstractDataModify;
@@ -22,6 +24,7 @@ public class WTabFitLayoutDefinePane extends AbstractDataModify<WTabFitLayout> {
     private PaddingBoundPane paddingBoundPane;
     private TabFitLayoutBackgroundPane borderStyle;
     private UISpinner componentInterval;
+    private UITextField titleField;
 
     public WTabFitLayoutDefinePane(XCreator xCreator) {
         super(xCreator);
@@ -32,7 +35,8 @@ public class WTabFitLayoutDefinePane extends AbstractDataModify<WTabFitLayout> {
         JPanel advancePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         paddingBoundPane = new PaddingBoundPane();
         borderStyle = new TabFitLayoutBackgroundPane();
-        JPanel jPanel = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{new UILabel(Inter.getLocText("FR-Designer_Style")), borderStyle}}, TableLayoutHelper.FILL_LASTCOLUMN, 18, 7);
+        JPanel jPanel = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{borderStyle, null}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L2, IntervalConstants.INTERVAL_L1);
+        jPanel.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L1, 0, 0, 0));
         advancePane.add(jPanel, BorderLayout.NORTH);
         advancePane.add(paddingBoundPane, BorderLayout.CENTER);
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
@@ -43,8 +47,17 @@ public class WTabFitLayoutDefinePane extends AbstractDataModify<WTabFitLayout> {
 
     public void initLayoutComponent(){
         componentInterval = new UISpinner(0, 100, 1, 0);
-        JPanel jPanel = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{new UILabel(Inter.getLocText("FR-Designer_Component_Interval")), componentInterval}}, TableLayoutHelper.FILL_LASTCOLUMN, 18, 7);
-        this.add(jPanel, BorderLayout.CENTER);
+        titleField = new UITextField();
+        Component[][] components = new Component[][]{
+                new Component[]{new UILabel(Inter.getLocText("FR-Designer_Component_Interval")), componentInterval},
+                new Component[]{new UILabel(Inter.getLocText("FR-Designer_Title")), titleField}
+        };
+        JPanel borderPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        JPanel jPanel = TableLayoutHelper.createGapTableLayoutPane(components, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L2, IntervalConstants.INTERVAL_L1);
+        jPanel.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L1, 0, 0, 0));
+        borderPane.add(jPanel, BorderLayout.CENTER);
+        UIExpandablePane currentEditTab = new UIExpandablePane(Inter.getLocText("FR-Designer_Current_tab"), 280, 20, borderPane);
+        this.add(currentEditTab, BorderLayout.CENTER);
     }
 
     @Override
@@ -57,6 +70,7 @@ public class WTabFitLayoutDefinePane extends AbstractDataModify<WTabFitLayout> {
         borderStyle.populate(ob);
         paddingBoundPane.populate(ob);
         componentInterval.setValue(ob.getCompInterval());
+        titleField.setText(ob.getCurrentCard().getText());
     }
 
 
@@ -66,6 +80,7 @@ public class WTabFitLayoutDefinePane extends AbstractDataModify<WTabFitLayout> {
         borderStyle.update(layout);
         paddingBoundPane.update(layout);
         layout.setCompInterval((int)componentInterval.getValue());
+        layout.getCurrentCard().setText(titleField.getText());
         return layout;
     }
 }

From 62031be855f150a48d8c1f5daff97b52d67587c8 Mon Sep 17 00:00:00 2001
From: kerry <kerry@finereport.com>
Date: Sun, 10 Sep 2017 17:34:45 +0800
Subject: [PATCH 13/24] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 designer/src/com/fr/design/widget/CellWidgetCardPane.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/designer/src/com/fr/design/widget/CellWidgetCardPane.java b/designer/src/com/fr/design/widget/CellWidgetCardPane.java
index 737946453..b3f5fef11 100644
--- a/designer/src/com/fr/design/widget/CellWidgetCardPane.java
+++ b/designer/src/com/fr/design/widget/CellWidgetCardPane.java
@@ -1,6 +1,7 @@
 package com.fr.design.widget;
 
 import com.fr.design.data.DataCreatorUI;
+import com.fr.design.designer.IntervalConstants;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.dialog.BasicScrollPane;
 import com.fr.design.foldablepane.UIExpandablePane;
@@ -73,9 +74,8 @@ public class CellWidgetCardPane extends BasicPane {
         tabbedPane = new CardLayout();
         center = new JPanel(tabbedPane);
         jPanel.add(center, BorderLayout.CENTER);
-        jPanel.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 0));
+        jPanel.setBorder(BorderFactory.createEmptyBorder(0, IntervalConstants.INTERVAL_L6, 0, 0));
         attriTabPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-//        attriTabPane.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
         eventTabPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         initPaneList();
         eventPane = initWidgetEventPane(pane);

From fb9a9fb59c2cd62381a3813201614fa1ba6ed450 Mon Sep 17 00:00:00 2001
From: kerry <kerry@finereport.com>
Date: Sun, 10 Sep 2017 17:39:36 +0800
Subject: [PATCH 14/24] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=B4=E8=B7=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/widget/btn/ButtonWithHotkeysDetailPane.java  | 2 +-
 .../src/com/fr/design/widget/component/BackgroundCompPane.java | 2 +-
 .../src/com/fr/design/widget/component/CheckBoxDictPane.java   | 3 ++-
 .../src/com/fr/design/designer/creator/PropertyGroupPane.java  | 3 ++-
 4 files changed, 6 insertions(+), 4 deletions(-)

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 767fb57f5..763ab5d29 100644
--- a/designer_base/src/com/fr/design/widget/btn/ButtonWithHotkeysDetailPane.java
+++ b/designer_base/src/com/fr/design/widget/btn/ButtonWithHotkeysDetailPane.java
@@ -49,7 +49,7 @@ public abstract class ButtonWithHotkeysDetailPane<T extends Button> extends Butt
                 {new UILabel(Inter.getLocText("FR-Designer_Button-Hotkeys")), hotkeysTextField = new UITextField()},
         };
         hotkeysTextField.setToolTipText(StableUtils.join(ButtonConstants.HOTKEYS, ","));
-        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(n_components, rowSize, columnSize, IntervalConstants.INTERVAL_L2, 8);
+        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(n_components, rowSize, columnSize, IntervalConstants.INTERVAL_L2, IntervalConstants.INTERVAL_L1);
         panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
         advancePane.add(panel, BorderLayout.NORTH);
         Component comp = createCenterPane();
diff --git a/designer_base/src/com/fr/design/widget/component/BackgroundCompPane.java b/designer_base/src/com/fr/design/widget/component/BackgroundCompPane.java
index 945e306ea..fef58a2ac 100644
--- a/designer_base/src/com/fr/design/widget/component/BackgroundCompPane.java
+++ b/designer_base/src/com/fr/design/widget/component/BackgroundCompPane.java
@@ -48,7 +48,7 @@ public abstract class BackgroundCompPane<T extends Widget> extends BasicPane {
                 new Component[]{new UILabel(Inter.getLocText("FR-Designer_Background-Over")), overBackgroundEditor},
                 new Component[]{new UILabel(Inter.getLocText("FR-Designer_Background-Click")), clickBackgroundEditor},
         };
-        panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_L2, 7);
+        panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_L2, IntervalConstants.INTERVAL_L1);
         panel.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L6, IntervalConstants.INTERVAL_L5, 0, 0));
         backgroundHead = new UIButtonGroup(titles);
         JPanel headPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{headLabel, backgroundHead}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L2, 7);
diff --git a/designer_base/src/com/fr/design/widget/component/CheckBoxDictPane.java b/designer_base/src/com/fr/design/widget/component/CheckBoxDictPane.java
index 506de5805..079ca29c2 100644
--- a/designer_base/src/com/fr/design/widget/component/CheckBoxDictPane.java
+++ b/designer_base/src/com/fr/design/widget/component/CheckBoxDictPane.java
@@ -4,6 +4,7 @@ import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
+import com.fr.design.designer.IntervalConstants;
 import com.fr.design.gui.ibutton.UIButtonGroup;
 import com.fr.design.gui.ilable.UILabel;
 import javax.swing.JPanel;
@@ -37,7 +38,7 @@ public class CheckBoxDictPane extends JPanel {
 				new Component[]{new UILabel(Inter.getLocText("ComboCheckBox-Start_Symbol") + ":"),startComboBox},
 				new Component[]{new UILabel(Inter.getLocText("ComboCheckBox-End_Symbol") + ":"),endComboBox}
 		};
-		returnStringPane = TableLayoutHelper.createGapTableLayoutPane(components, TableLayoutHelper.FILL_LASTCOLUMN, 18, 7);
+		returnStringPane = TableLayoutHelper.createGapTableLayoutPane(components, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L2, IntervalConstants.INTERVAL_L1);
 
 		returnTypeComboBox = new UIButtonGroup(new String[]{Inter.getLocText("Widget-Array"), Inter.getLocText("String")});
 		returnTypeComboBox.addActionListener(new ActionListener() {
diff --git a/designer_form/src/com/fr/design/designer/creator/PropertyGroupPane.java b/designer_form/src/com/fr/design/designer/creator/PropertyGroupPane.java
index 998881981..903342695 100644
--- a/designer_form/src/com/fr/design/designer/creator/PropertyGroupPane.java
+++ b/designer_form/src/com/fr/design/designer/creator/PropertyGroupPane.java
@@ -1,6 +1,7 @@
 package com.fr.design.designer.creator;
 
 import com.fr.base.FRContext;
+import com.fr.design.designer.IntervalConstants;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayoutHelper;
@@ -34,7 +35,7 @@ public class PropertyGroupPane extends BasicPane {
             components[i] = crPropertyDescriptorPanes[i].createTableLayoutComponent();
         }
 
-        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, TableLayoutHelper.FILL_LASTCOLUMN, 20, 10);
+        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L2, IntervalConstants.INTERVAL_L1);
         panel.setBorder(BorderFactory.createEmptyBorder(5, 0, 10, 0));
         this.add(panel, BorderLayout.CENTER);
     }

From b70e83ab0d0fd41abc47f021eee8bac073af4e8b Mon Sep 17 00:00:00 2001
From: vito <vito@finereport.com>
Date: Mon, 11 Sep 2017 10:50:06 +0800
Subject: [PATCH 15/24] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1=20?=
 =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=B8=A2=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 designer_base/src/com/fr/start/StartServer.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/designer_base/src/com/fr/start/StartServer.java b/designer_base/src/com/fr/start/StartServer.java
index 0d87dfb3e..27f89e1e4 100644
--- a/designer_base/src/com/fr/start/StartServer.java
+++ b/designer_base/src/com/fr/start/StartServer.java
@@ -14,10 +14,7 @@ import com.fr.env.SignIn;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.GeneralContext;
 import com.fr.general.Inter;
-import com.fr.stable.EnvChangedListener;
-import com.fr.stable.ProductConstants;
-import com.fr.stable.StableUtils;
-import com.fr.stable.StringUtils;
+import com.fr.stable.*;
 import com.fr.stable.project.ProjectConstants;
 import com.fr.start.server.JettyHost;
 

From 4a8407499bd226b42e337d11b2a184ac7f27b242 Mon Sep 17 00:00:00 2001
From: XiaXiang <xiaoxia@finereport.com>
Date: Mon, 11 Sep 2017 14:39:49 +0800
Subject: [PATCH 16/24] =?UTF-8?q?REPORT-4492=20alphafine=20=E6=96=87?=
 =?UTF-8?q?=E6=A1=A3=E9=A2=84=E8=A7=88=E7=95=8C=E9=9D=A2=E6=9C=89=E5=A4=9A?=
 =?UTF-8?q?=E4=BD=99=E7=9A=84=E8=BE=B9=E6=A1=86=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../preview/DocumentPreviewPane.java          | 31 ++++---------
 .../fr/design/gui/itextarea/UITextArea.java   | 44 ++++++++++---------
 2 files changed, 32 insertions(+), 43 deletions(-)

diff --git a/designer/src/com/fr/design/mainframe/alphafine/preview/DocumentPreviewPane.java b/designer/src/com/fr/design/mainframe/alphafine/preview/DocumentPreviewPane.java
index ed96fbed9..0fbfe4a2d 100644
--- a/designer/src/com/fr/design/mainframe/alphafine/preview/DocumentPreviewPane.java
+++ b/designer/src/com/fr/design/mainframe/alphafine/preview/DocumentPreviewPane.java
@@ -3,7 +3,6 @@ package com.fr.design.mainframe.alphafine.preview;
 
 import com.fr.design.gui.itextarea.UITextArea;
 import com.fr.design.mainframe.alphafine.AlphaFineConstants;
-import com.fr.design.utils.gui.GUICoreUtils;
 
 import javax.swing.*;
 import java.awt.*;
@@ -15,31 +14,19 @@ public class DocumentPreviewPane extends JPanel {
 
     public DocumentPreviewPane(String title, String summary) {
         this.setLayout(new BorderLayout());
-        this.setBackground(Color.WHITE);
+        this.setPreferredSize(new Dimension(AlphaFineConstants.RIGHT_WIDTH, AlphaFineConstants.CONTENT_HEIGHT));
+        this.setBackground(Color.white);
         UITextArea titleArea = new UITextArea(title);
-        UITextArea contentArea = new UITextArea(summary);
-        titleArea.setOpaque(false);
-        contentArea.setOpaque(false);
-        titleArea.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
+        titleArea.setBorder(null);
+        titleArea.setEditable(false);
         titleArea.setForeground(AlphaFineConstants.BLUE);
-        contentArea.setForeground(AlphaFineConstants.BLACK);
-        titleArea.setPreferredSize(new Dimension(360, 30));
         titleArea.setFont(AlphaFineConstants.LARGE_FONT);
-        contentArea.setFont(AlphaFineConstants.MEDIUM_FONT);
         add(titleArea, BorderLayout.NORTH);
+        UITextArea contentArea = new UITextArea(summary);
+        contentArea.setEditable(false);
+        contentArea.setBorder(null);
+        contentArea.setForeground(AlphaFineConstants.BLACK);
+        contentArea.setFont(AlphaFineConstants.MEDIUM_FONT);
         add(contentArea, BorderLayout.CENTER);
     }
-
-
-    public static void main(String[] args) {
-        JFrame jf = new JFrame("test");
-        jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-        JPanel content = (JPanel) jf.getContentPane();
-        content.setLayout(null);
-
-        content.add(new DocumentPreviewPane("test", "ababababaabbababab"));
-        GUICoreUtils.centerWindow(jf);
-        jf.setSize(400, 400);
-        jf.setVisible(true);
-    }
 }
diff --git a/designer_base/src/com/fr/design/gui/itextarea/UITextArea.java b/designer_base/src/com/fr/design/gui/itextarea/UITextArea.java
index 94ecdc3d7..ede8be593 100644
--- a/designer_base/src/com/fr/design/gui/itextarea/UITextArea.java
+++ b/designer_base/src/com/fr/design/gui/itextarea/UITextArea.java
@@ -20,11 +20,6 @@ public class UITextArea extends JTextArea implements UIObserver {
         initComponents();
     }
 
-    @Override
-    public Insets getInsets() {
-        return new Insets(5, 5, 5, 5);
-    }
-
     public UITextArea() {
         super();
         InputEventBaseOnOS.addBasicEditInputMap(this);
@@ -37,6 +32,26 @@ public class UITextArea extends JTextArea implements UIObserver {
         initComponents();
     }
 
+    /**
+     * @param args
+     */
+    public static void main(String... args) {
+//        JFrame jf = new JFrame("test");
+//        jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+//        JPanel content = (JPanel) jf.getContentPane();
+//        content.setLayout(new BorderLayout());
+//        UITextArea bb = new UITextArea("123455weoijweio reiwj kewl jfejkfljds kl jfldk jfk jdskfjkdsfklj dkl jfsdjf");
+//        content.add(bb, BorderLayout.CENTER);
+//        GUICoreUtils.centerWindow(jf);
+//        jf.setSize(400, 400);
+//        jf.setVisible(true);
+    }
+
+    @Override
+    public Insets getInsets() {
+        return new Insets(5, 5, 5, 5);
+    }
+
     private void initComponents() {
         setLineWrap(true);
         setWrapStyleWord(true);
@@ -100,7 +115,9 @@ public class UITextArea extends JTextArea implements UIObserver {
 
     @Override
     protected void paintBorder(Graphics g) {
-        getUI().paintBorder((Graphics2D) g, getWidth(), getHeight(), true, Constants.NULL);
+        if (getBorder() != null) {
+            getUI().paintBorder((Graphics2D) g, getWidth(), getHeight(), true, Constants.NULL);
+        }
     }
 
     @Override
@@ -117,19 +134,4 @@ public class UITextArea extends JTextArea implements UIObserver {
     public boolean shouldResponseChangeListener() {
         return true;
     }
-
-    /**
-     * @param args
-     */
-    public static void main(String... args) {
-//        JFrame jf = new JFrame("test");
-//        jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-//        JPanel content = (JPanel) jf.getContentPane();
-//        content.setLayout(new BorderLayout());
-//        UITextArea bb = new UITextArea("123455weoijweio reiwj kewl jfejkfljds kl jfldk jfk jdskfjkdsfklj dkl jfsdjf");
-//        content.add(bb, BorderLayout.CENTER);
-//        GUICoreUtils.centerWindow(jf);
-//        jf.setSize(400, 400);
-//        jf.setVisible(true);
-    }
 }
\ No newline at end of file

From 04da144da2636371dabf7e591aa0a66bec58632b Mon Sep 17 00:00:00 2001
From: XiaXiang <xiaoxia@finereport.com>
Date: Mon, 11 Sep 2017 14:42:15 +0800
Subject: [PATCH 17/24] rt

---
 .../preview/DocumentPreviewPane.java          |  2 +-
 .../fr/design/gui/itextarea/UITextArea.java   | 40 +++++++++----------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/designer/src/com/fr/design/mainframe/alphafine/preview/DocumentPreviewPane.java b/designer/src/com/fr/design/mainframe/alphafine/preview/DocumentPreviewPane.java
index 0fbfe4a2d..6aa46f1a6 100644
--- a/designer/src/com/fr/design/mainframe/alphafine/preview/DocumentPreviewPane.java
+++ b/designer/src/com/fr/design/mainframe/alphafine/preview/DocumentPreviewPane.java
@@ -14,8 +14,8 @@ public class DocumentPreviewPane extends JPanel {
 
     public DocumentPreviewPane(String title, String summary) {
         this.setLayout(new BorderLayout());
+        this.setBackground(Color.WHITE);
         this.setPreferredSize(new Dimension(AlphaFineConstants.RIGHT_WIDTH, AlphaFineConstants.CONTENT_HEIGHT));
-        this.setBackground(Color.white);
         UITextArea titleArea = new UITextArea(title);
         titleArea.setBorder(null);
         titleArea.setEditable(false);
diff --git a/designer_base/src/com/fr/design/gui/itextarea/UITextArea.java b/designer_base/src/com/fr/design/gui/itextarea/UITextArea.java
index ede8be593..9f6010f4a 100644
--- a/designer_base/src/com/fr/design/gui/itextarea/UITextArea.java
+++ b/designer_base/src/com/fr/design/gui/itextarea/UITextArea.java
@@ -20,6 +20,11 @@ public class UITextArea extends JTextArea implements UIObserver {
         initComponents();
     }
 
+    @Override
+    public Insets getInsets() {
+        return new Insets(5, 5, 5, 5);
+    }
+
     public UITextArea() {
         super();
         InputEventBaseOnOS.addBasicEditInputMap(this);
@@ -32,26 +37,6 @@ public class UITextArea extends JTextArea implements UIObserver {
         initComponents();
     }
 
-    /**
-     * @param args
-     */
-    public static void main(String... args) {
-//        JFrame jf = new JFrame("test");
-//        jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-//        JPanel content = (JPanel) jf.getContentPane();
-//        content.setLayout(new BorderLayout());
-//        UITextArea bb = new UITextArea("123455weoijweio reiwj kewl jfejkfljds kl jfldk jfk jdskfjkdsfklj dkl jfsdjf");
-//        content.add(bb, BorderLayout.CENTER);
-//        GUICoreUtils.centerWindow(jf);
-//        jf.setSize(400, 400);
-//        jf.setVisible(true);
-    }
-
-    @Override
-    public Insets getInsets() {
-        return new Insets(5, 5, 5, 5);
-    }
-
     private void initComponents() {
         setLineWrap(true);
         setWrapStyleWord(true);
@@ -134,4 +119,19 @@ public class UITextArea extends JTextArea implements UIObserver {
     public boolean shouldResponseChangeListener() {
         return true;
     }
+
+    /**
+     * @param args
+     */
+    public static void main(String... args) {
+//        JFrame jf = new JFrame("test");
+//        jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+//        JPanel content = (JPanel) jf.getContentPane();
+//        content.setLayout(new BorderLayout());
+//        UITextArea bb = new UITextArea("123455weoijweio reiwj kewl jfejkfljds kl jfldk jfk jdskfjkdsfklj dkl jfsdjf");
+//        content.add(bb, BorderLayout.CENTER);
+//        GUICoreUtils.centerWindow(jf);
+//        jf.setSize(400, 400);
+//        jf.setVisible(true);
+    }
 }
\ No newline at end of file

From 3a1d7edc02ae5ea2c83ec850cb5e4cba2d92e852 Mon Sep 17 00:00:00 2001
From: XiaXiang <xiaoxia@finereport.com>
Date: Mon, 11 Sep 2017 14:44:15 +0800
Subject: [PATCH 18/24] rt

---
 designer_base/src/com/fr/design/gui/itextarea/UITextAreaUI.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/designer_base/src/com/fr/design/gui/itextarea/UITextAreaUI.java b/designer_base/src/com/fr/design/gui/itextarea/UITextAreaUI.java
index 6e3f717dc..926a78708 100644
--- a/designer_base/src/com/fr/design/gui/itextarea/UITextAreaUI.java
+++ b/designer_base/src/com/fr/design/gui/itextarea/UITextAreaUI.java
@@ -32,7 +32,7 @@ public class UITextAreaUI extends BasicTextAreaUI {
     }
 
     public void paintBorder(Graphics2D g2d, int width, int height, boolean isRound, int rectDirection) {
-        if (isRollOver && textField.isEnabled()) {
+        if (isRollOver && textField.isEnabled() && ((UITextArea)textField).isEditable()) {
             g2d.setColor(UIConstants.TEXT_FILED_BORDER_SELECTED);
             g2d.drawRect(0, 0, width - 1, height - 1);
         } else {

From c0488d7e014d052c640d3bde660e8734c15dff1f Mon Sep 17 00:00:00 2001
From: kerry <kerry@finereport.com>
Date: Mon, 11 Sep 2017 14:47:39 +0800
Subject: [PATCH 19/24] =?UTF-8?q?REPORT-4366=20=E8=A1=A8=E5=8D=95=E7=BB=9D?=
 =?UTF-8?q?=E5=AF=B9=E5=B8=83=E5=B1=80=EF=BC=8Cbody=E8=83=8C=E6=99=AF?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=97=AE=E9=A2=98=EF=BC=88=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=B8=8B=E5=91=BD=E5=90=8D=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/designer/layout/FRFitLayoutDefinePane.java      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/designer_form/src/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java b/designer_form/src/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java
index 7f45a1f98..4b8b89d83 100644
--- a/designer_form/src/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java
+++ b/designer_form/src/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java
@@ -44,7 +44,7 @@ public class FRFitLayoutDefinePane extends AbstractDataModify<WFitLayout> {
     private UIComboBox adaptComboBox;
     private UISpinner componentIntervel;
     private PaddingBoundPane paddingBound;
-    private AccessibleWLayoutBorderStyleEditor background;
+    private AccessibleWLayoutBorderStyleEditor stylePane;
 
     public FRFitLayoutDefinePane(XCreator xCreator) {
         super(xCreator);
@@ -65,9 +65,9 @@ public class FRFitLayoutDefinePane extends AbstractDataModify<WFitLayout> {
 
     public JPanel createAdvancePane() {
         JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        background = new AccessibleWLayoutBorderStyleEditor();
+        stylePane = new AccessibleWLayoutBorderStyleEditor();
         paddingBound = new PaddingBoundPane();
-        JPanel jp2 = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{new UILabel(Inter.getLocText("FR-Designer_Background")), background}}, TableLayoutHelper.FILL_LASTCOLUMN, 18, 7);
+        JPanel jp2 = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{new UILabel(Inter.getLocText("FR-Designer-Widget_Style")), stylePane}}, TableLayoutHelper.FILL_LASTCOLUMN, 18, 7);
         jp2.setBorder(BorderFactory.createEmptyBorder(10, 0, 5, 0));
         jPanel.add(paddingBound, BorderLayout.CENTER);
         jPanel.add(jp2, BorderLayout.NORTH);
@@ -119,7 +119,7 @@ public class FRFitLayoutDefinePane extends AbstractDataModify<WFitLayout> {
         layoutComboBox.setSelectedIndex(ob.getBodyLayoutType().getTypeValue());
         adaptComboBox.setSelectedIndex(ob.getCompState());
         componentIntervel.setValue(ob.getCompInterval());
-        background.setValue(ob.getBorderStyle());
+        stylePane.setValue(ob.getBorderStyle());
     }
 
 
@@ -127,7 +127,7 @@ public class FRFitLayoutDefinePane extends AbstractDataModify<WFitLayout> {
     public WFitLayout updateBean() {
         WFitLayout layout = (WFitLayout) creator.toData();
         paddingBound.update(layout);
-        LayoutBorderStyle borderStyle =  (LayoutBorderStyle) background.getValue();
+        LayoutBorderStyle borderStyle =  (LayoutBorderStyle) stylePane.getValue();
         if(borderStyle != null){
             layout.setBorderStyle(borderStyle);
         }

From b86851405b41058ea432711be68016eb36a1c343 Mon Sep 17 00:00:00 2001
From: XiaXiang <xiaoxia@finereport.com>
Date: Mon, 11 Sep 2017 14:55:24 +0800
Subject: [PATCH 20/24] RT

---
 .../design/mainframe/alphafine/component/AlphaFineDialog.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java b/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java
index e35d0c056..b5daed04e 100644
--- a/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java
+++ b/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java
@@ -684,7 +684,7 @@ public class AlphaFineDialog extends UIDialog {
                 } else {
                     try {
                         Thread.sleep(10);
-                        doSearch(searchTextField.getText());
+                        doSearch(searchTextField.getText().toLowerCase());
                     } catch (InterruptedException e1) {
                         FRLogger.getLogger().error(e1.getMessage());
                     }

From bb11bc1bed0316495638dea5533c1b870a4b0ead Mon Sep 17 00:00:00 2001
From: vito <vito@finereport.com>
Date: Mon, 11 Sep 2017 16:28:01 +0800
Subject: [PATCH 21/24] pmd

---
 designer_base/src/com/fr/start/StartServer.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/designer_base/src/com/fr/start/StartServer.java b/designer_base/src/com/fr/start/StartServer.java
index 27f89e1e4..56cc557aa 100644
--- a/designer_base/src/com/fr/start/StartServer.java
+++ b/designer_base/src/com/fr/start/StartServer.java
@@ -14,7 +14,11 @@ import com.fr.env.SignIn;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.GeneralContext;
 import com.fr.general.Inter;
-import com.fr.stable.*;
+import com.fr.stable.EnvChangedListener;
+import com.fr.stable.ProductConstants;
+import com.fr.stable.StableUtils;
+import com.fr.stable.StringUtils;
+import com.fr.stable.OperatingSystem;
 import com.fr.stable.project.ProjectConstants;
 import com.fr.start.server.JettyHost;
 

From 0a7464278805bee324ccecbe3a4b38cd0cbb2d1a Mon Sep 17 00:00:00 2001
From: kerry <kerry@finereport.com>
Date: Mon, 11 Sep 2017 17:23:17 +0800
Subject: [PATCH 22/24] =?UTF-8?q?REPORT-4494=20&&=20REPORT-4373=20?=
 =?UTF-8?q?=E5=8C=BA=E5=88=86=E6=8C=89=E9=92=AE=E6=8E=A7=E4=BB=B6=E5=88=9D?=
 =?UTF-8?q?=E5=A7=8B=E5=8C=96=E5=92=8C=E9=87=8D=E6=96=B0=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/com/fr/design/widget/WidgetPane.java    |  4 +++-
 .../fr/design/widget/ui/ButtonDefinePane.java   | 10 +++++++---
 .../widget/component/CheckBoxDictPane.java      |  4 +++-
 .../ui/designer/CheckBoxGroupDefinePane.java    | 17 ++++++-----------
 .../ui/designer/ComboCheckBoxDefinePane.java    | 14 ++++++--------
 5 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/designer/src/com/fr/design/widget/WidgetPane.java b/designer/src/com/fr/design/widget/WidgetPane.java
index 61e79acb8..36f99491f 100644
--- a/designer/src/com/fr/design/widget/WidgetPane.java
+++ b/designer/src/com/fr/design/widget/WidgetPane.java
@@ -92,7 +92,9 @@ public class WidgetPane extends AbstractAttrNoScrollPane implements ItemListener
     AttributeChangeListener listener = new AttributeChangeListener() {
         @Override
         public void attributeChange() {
-            CellWidgetPropertyPane.getInstance().update();
+            if(shouldFireSelectedEvent){
+                CellWidgetPropertyPane.getInstance().update();
+            }
         }
     };
 
diff --git a/designer/src/com/fr/design/widget/ui/ButtonDefinePane.java b/designer/src/com/fr/design/widget/ui/ButtonDefinePane.java
index 59a5b62bb..e8ae05c31 100644
--- a/designer/src/com/fr/design/widget/ui/ButtonDefinePane.java
+++ b/designer/src/com/fr/design/widget/ui/ButtonDefinePane.java
@@ -28,6 +28,12 @@ public class ButtonDefinePane extends AbstractDataModify<Button> {
     }
 
     private void resetDetailPane(Button btn, Class cls) {
+        initDetailPane(btn, cls);
+        CellWidgetPropertyPane.getInstance().reInitAllListener();
+        CellWidgetPropertyPane.getInstance().update();
+    }
+
+    public void initDetailPane(Button btn, Class cls){
         if (detailPane != null) {
             remove(detailPane);
         }
@@ -40,13 +46,11 @@ public class ButtonDefinePane extends AbstractDataModify<Button> {
             }
         });
         this.updateUI();
-        CellWidgetPropertyPane.getInstance().reInitAllListener();
-        CellWidgetPropertyPane.getInstance().update();
     }
 
     @Override
     public void populateBean(Button btn) {
-        resetDetailPane(btn, btn instanceof FreeButton && !((FreeButton) btn).isCustomStyle() ? Button.class : null);
+        initDetailPane(btn, btn instanceof FreeButton && !((FreeButton) btn).isCustomStyle() ? Button.class : null);
     }
 
     @Override
diff --git a/designer_base/src/com/fr/design/widget/component/CheckBoxDictPane.java b/designer_base/src/com/fr/design/widget/component/CheckBoxDictPane.java
index 079ca29c2..506b637e9 100644
--- a/designer_base/src/com/fr/design/widget/component/CheckBoxDictPane.java
+++ b/designer_base/src/com/fr/design/widget/component/CheckBoxDictPane.java
@@ -7,7 +7,8 @@ import java.awt.event.ActionListener;
 import com.fr.design.designer.IntervalConstants;
 import com.fr.design.gui.ibutton.UIButtonGroup;
 import com.fr.design.gui.ilable.UILabel;
-import javax.swing.JPanel;
+
+import javax.swing.*;
 
 import com.fr.design.gui.icombobox.DictionaryComboBox;
 import com.fr.design.gui.icombobox.DictionaryConstants;
@@ -51,6 +52,7 @@ public class CheckBoxDictPane extends JPanel {
 		JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
 		jPanel.add(headPane, BorderLayout.NORTH);
 		jPanel.add(returnStringPane, BorderLayout.CENTER);
+		returnStringPane.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L1, IntervalConstants.INTERVAL_L5, 0, 0));
 		this.add(jPanel);
 	}
 
diff --git a/designer_form/src/com/fr/design/widget/ui/designer/CheckBoxGroupDefinePane.java b/designer_form/src/com/fr/design/widget/ui/designer/CheckBoxGroupDefinePane.java
index 708a6dffa..15ed7b104 100644
--- a/designer_form/src/com/fr/design/widget/ui/designer/CheckBoxGroupDefinePane.java
+++ b/designer_form/src/com/fr/design/widget/ui/designer/CheckBoxGroupDefinePane.java
@@ -2,13 +2,11 @@ package com.fr.design.widget.ui.designer;
 
 import com.fr.design.data.DataCreatorUI;
 import com.fr.design.designer.creator.XCreator;
-import com.fr.design.gui.ibutton.UIButtonGroup;
-import com.fr.design.gui.ibutton.UIHeadGroup;
 import com.fr.design.gui.icheckbox.UICheckBox;
-import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.present.dict.DictionaryPane;
+import com.fr.design.widget.component.CheckBoxDictPane;
 import com.fr.design.widget.ui.designer.btn.ButtonGroupDefinePane;
 import com.fr.form.ui.CheckBoxGroup;
 import com.fr.general.Inter;
@@ -18,7 +16,7 @@ import java.awt.*;
 
 public class CheckBoxGroupDefinePane extends ButtonGroupDefinePane<CheckBoxGroup> {
 	private DictionaryPane dictPane;
-	private UIButtonGroup returnType;
+	private CheckBoxDictPane checkBoxDictPane;
 	private UICheckBox checkbox;
 
 	public CheckBoxGroupDefinePane(XCreator xCreator) {
@@ -42,15 +40,12 @@ public class CheckBoxGroupDefinePane extends ButtonGroupDefinePane<CheckBoxGroup
 	public JPanel createOtherPane(){
 		checkbox = new UICheckBox(Inter.getLocText(new String[]{"Provide", "Choose_All"}));
 		checkbox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
-		final String[] tabTitles = new String[]{Inter.getLocText("Widget-Array"), Inter.getLocText("String")};
-		returnType = new UIButtonGroup(tabTitles);
-
-
+		checkBoxDictPane = new CheckBoxDictPane();
 		double f = TableLayout.FILL;
 		double p = TableLayout.PREFERRED;
 		Component[][] components = new Component[][]{
 				new Component[]{checkbox,  null },
-				new Component[]{new UILabel(Inter.getLocText("Widget-Date_Selector_Return_Type")), returnType},
+				new Component[]{checkBoxDictPane, null},
 		};
 		double[] rowSize = {p, p};
 		double[] columnSize = {p, f};
@@ -62,7 +57,7 @@ public class CheckBoxGroupDefinePane extends ButtonGroupDefinePane<CheckBoxGroup
 
 	@Override
 	protected void populateSubButtonGroupBean(CheckBoxGroup ob) {
-		returnType.setSelectedIndex(ob.isReturnString() ? 1 : 0);
+		this.checkBoxDictPane.populate(ob);
 		this.dictPane.populateBean(ob.getDictionary());
 		checkbox.setSelected(ob.isChooseAll());
 	}
@@ -72,7 +67,7 @@ public class CheckBoxGroupDefinePane extends ButtonGroupDefinePane<CheckBoxGroup
 	@Override
 	protected CheckBoxGroup updateSubButtonGroupBean() {
 		CheckBoxGroup ob = (CheckBoxGroup) creator.toData();
-		ob.setReturnString(returnType.getSelectedIndex() == 1);
+		checkBoxDictPane.update(ob);
 		ob.setDictionary(this.dictPane.updateBean());
 		ob.setChooseAll(checkbox.isSelected());
 		return ob;
diff --git a/designer_form/src/com/fr/design/widget/ui/designer/ComboCheckBoxDefinePane.java b/designer_form/src/com/fr/design/widget/ui/designer/ComboCheckBoxDefinePane.java
index 8bff98936..11e35881f 100644
--- a/designer_form/src/com/fr/design/widget/ui/designer/ComboCheckBoxDefinePane.java
+++ b/designer_form/src/com/fr/design/widget/ui/designer/ComboCheckBoxDefinePane.java
@@ -2,12 +2,12 @@ package com.fr.design.widget.ui.designer;
 
 import com.fr.design.data.DataCreatorUI;
 import com.fr.design.designer.creator.XCreator;
-import com.fr.design.gui.ibutton.UIButtonGroup;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.widget.component.CheckBoxDictPane;
 import com.fr.form.ui.ComboCheckBox;
 import com.fr.general.Inter;
 
@@ -16,7 +16,7 @@ import java.awt.*;
 
 public class ComboCheckBoxDefinePane extends DictEditorDefinePane<ComboCheckBox> {
     private UICheckBox supportTagCheckBox;
-    private UIButtonGroup returnType;
+	private CheckBoxDictPane checkBoxDictPane;
     private UITextField waterMarkDictPane;
     private UICheckBox removeRepeatCheckBox;
 
@@ -38,15 +38,13 @@ public class ComboCheckBoxDefinePane extends DictEditorDefinePane<ComboCheckBox>
 
 	public JPanel createOtherPane(){
 		supportTagCheckBox = new UICheckBox(Inter.getLocText("Form-SupportTag"), true);
-
-		final String[] tabTitles = new String[]{Inter.getLocText("Widget-Array"), Inter.getLocText("String")};
-		returnType = new UIButtonGroup(tabTitles) ;
+		checkBoxDictPane = new CheckBoxDictPane();
 
 		double f = TableLayout.FILL;
 		double p = TableLayout.PREFERRED;
 		Component[][] components = new Component[][]{
 				new Component[]{supportTagCheckBox,  null },
-				new Component[]{new UILabel(Inter.getLocText("Widget-Date_Selector_Return_Type")), returnType},
+				new Component[]{checkBoxDictPane, null},
 		};
 		double[] rowSize = {p, p};
 		double[] columnSize = {p, f};
@@ -57,7 +55,7 @@ public class ComboCheckBoxDefinePane extends DictEditorDefinePane<ComboCheckBox>
 	}
 
 	protected  void populateSubDictionaryEditorBean(ComboCheckBox ob){
-		returnType.setSelectedIndex(ob.isReturnString() ? 1 : 0);
+		this.checkBoxDictPane.populate(ob);
 		waterMarkDictPane.setText(ob.getWaterMark());
 		formWidgetValuePane.populate(ob);
 		this.supportTagCheckBox.setSelected(ob.isSupportTag());
@@ -66,7 +64,7 @@ public class ComboCheckBoxDefinePane extends DictEditorDefinePane<ComboCheckBox>
 
 	protected  ComboCheckBox updateSubDictionaryEditorBean(){
 		ComboCheckBox combo = (ComboCheckBox) creator.toData();
-		combo.setReturnString(returnType.getSelectedIndex() == 1);
+		checkBoxDictPane.update(combo);
 		formWidgetValuePane.update(combo);
 		combo.setWaterMark(waterMarkDictPane.getText());
 		combo.setSupportTag(this.supportTagCheckBox.isSelected());

From 6671ca142741a54462c99ea086f924d64a350f74 Mon Sep 17 00:00:00 2001
From: vito <vito@finereport.com>
Date: Tue, 12 Sep 2017 09:06:44 +0800
Subject: [PATCH 23/24] pmd

---
 designer_base/src/com/fr/start/StartServer.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/designer_base/src/com/fr/start/StartServer.java b/designer_base/src/com/fr/start/StartServer.java
index 56cc557aa..c235c4f68 100644
--- a/designer_base/src/com/fr/start/StartServer.java
+++ b/designer_base/src/com/fr/start/StartServer.java
@@ -180,10 +180,16 @@ public class StartServer {
 
     private static class InformationPane extends BasicPane {
         private static final long serialVersionUID = 1L;
+        private final int FREE_STYLE_TOP = 15;
+        private final int FREE_STYLE_OTHER = 5;
 
         public InformationPane(String message) {
+            init(message);
+        }
+
+        private void init(String message) {
             this.setLayout(new BorderLayout(10, 10));
-            this.setBorder(BorderFactory.createEmptyBorder(15, 5, 5, 5));
+            this.setBorder(BorderFactory.createEmptyBorder(FREE_STYLE_TOP, FREE_STYLE_OTHER, FREE_STYLE_OTHER, FREE_STYLE_OTHER));
             String text;
             if (!ComparatorUtils.equals(message, Inter.getLocText(new String[]{"Default", "Utils-Report_Runtime_Env"}))) {
                 text = new StringBuffer(Inter.getLocText("FR-Designer_Open"))

From 0a35cc2864dd3738e9e18c2ae6a4ab6c607e1c24 Mon Sep 17 00:00:00 2001
From: vito <vito@finereport.com>
Date: Tue, 12 Sep 2017 09:08:03 +0800
Subject: [PATCH 24/24] pmd

---
 designer_base/src/com/fr/start/StartServer.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/designer_base/src/com/fr/start/StartServer.java b/designer_base/src/com/fr/start/StartServer.java
index c235c4f68..ee06ede80 100644
--- a/designer_base/src/com/fr/start/StartServer.java
+++ b/designer_base/src/com/fr/start/StartServer.java
@@ -180,8 +180,8 @@ public class StartServer {
 
     private static class InformationPane extends BasicPane {
         private static final long serialVersionUID = 1L;
-        private final int FREE_STYLE_TOP = 15;
-        private final int FREE_STYLE_OTHER = 5;
+        private static final int FREE_STYLE_TOP = 15;
+        private static final int FREE_STYLE_OTHER = 5;
 
         public InformationPane(String message) {
             init(message);