Merge remote-tracking branch 'origin/9.0' into 9.0

7 years ago · 882025d0c4
131 changed files with 3101 additions and 2117 deletions
--- a/designer/src/com/fr/design/actions/columnrow/DSColumnConditionAction.java
+++ b/designer/src/com/fr/design/actions/columnrow/DSColumnConditionAction.java
@ -1,19 +1,16 @@
 package com.fr.design.actions.columnrow;

 import com.fr.base.BaseUtils;
-import com.fr.design.data.DesignTableDataManager;
 import com.fr.design.actions.cell.AbstractCellElementAction;
-import com.fr.design.dscolumn.DSColumnConditionsPane;
+import com.fr.design.data.DesignTableDataManager;
 import com.fr.design.dialog.BasicPane;
-import com.fr.general.Inter;
+import com.fr.design.dscolumn.DSColumnConditionsPane;
 import com.fr.design.mainframe.ElementCasePane;
+import com.fr.general.Inter;
 import com.fr.report.cell.TemplateCellElement;

 public class DSColumnConditionAction extends AbstractCellElementAction {

-    private boolean returnValue = false;
-    private TemplateCellElement editCellElement;
-
    public DSColumnConditionAction(ElementCasePane t) {
        super(t);

--- a/designer/src/com/fr/design/dscolumn/DSColumnAdvancedEditorPane.java
+++ b/designer/src/com/fr/design/dscolumn/DSColumnAdvancedEditorPane.java
@ -1,38 +0,0 @@
-package com.fr.design.dscolumn;
-
-import com.fr.design.mainframe.cell.CellEditorPane;
-import com.fr.report.cell.TemplateCellElement;
-
-
-/**
- * 单元格元素 数据列 基本设置内容面板
- *
- * @author yaoh.wu
- * @version 2017年7月25日
- * @since 9.0
- */
-public class DSColumnAdvancedEditorPane extends CellEditorPane {
-
-
-    @Override
-    public String getIconPath() {
-        return "Advanced";
-    }
-
-    @Override
-    public String title4PopupWindow() {
-        return "Advanced";
-    }
-
-
-    @Override
-    public void update() {
-
-    }
-
-    @Override
-    public void populate(TemplateCellElement cellElement) {
-
-    }
-
-}
--- a/designer/src/com/fr/design/dscolumn/DSColumnBasicEditorPane.java
+++ b/designer/src/com/fr/design/dscolumn/DSColumnBasicEditorPane.java
@ -1,84 +0,0 @@
-package com.fr.design.dscolumn;
-
-import com.fr.design.layout.TableLayout;
-import com.fr.design.layout.TableLayoutHelper;
-import com.fr.design.mainframe.cell.CellEditorPane;
-import com.fr.report.cell.TemplateCellElement;
-
-import javax.swing.*;
-import java.awt.*;
-
-/**
- * 单元格元素 数据列 高级设置内容面板
- *
- * @author yaoh.wu
- * @version 2017年7月25日
- * @since 9.0
- */
-public class DSColumnBasicEditorPane extends CellEditorPane {
-
-    //数据集和数据列
-    private SelectedDataColumnPane dataPane;
-    //数据分组设置
-    private ResultSetGroupDockingPane groupPane;
-    //当前编辑的单元格
-    private TemplateCellElement cellElement;
-    //条件过滤按钮面板
-    private JPanel conditionPane;
-
-    public DSColumnBasicEditorPane(TemplateCellElement cellElement, SelectedDataColumnPane dataPane, ResultSetGroupDockingPane groupPane, JPanel conditionPane) {
-        this.setLayout(new BorderLayout());
-        this.cellElement = cellElement;
-        this.dataPane = dataPane;
-        this.groupPane = groupPane;
-        this.conditionPane = conditionPane;
-        this.add(this.createContentPane(), BorderLayout.CENTER);
-    }
-
-
-    @Override
-    public String getIconPath() {
-        return "Basic";
-    }
-
-    @Override
-    public String title4PopupWindow() {
-        return "Basic";
-    }
-
-
-    @Override
-    public void update() {
-        dataPane.update(this.cellElement);
-        groupPane.update();
-    }
-
-    @Override
-    public void populate(TemplateCellElement cellElement) {
-        this.cellElement = cellElement;
-        dataPane.populate(null, cellElement);
-        groupPane.populate(cellElement);
-    }
-
-
-    /**
-     * 创建有内容的面板显示信息
-     *
-     * @return content JPanel
-     */
-    private JPanel createContentPane() {
-        double p = TableLayout.PREFERRED;
-        double f = TableLayout.FILL;
-        double[] columnSize = {f};
-        double[] rowSize = {p, p, p};
-        Component[][] components = new Component[][]{
-                //数据集列选择
-                new Component[]{this.dataPane},
-                //数据分组设置
-                new Component[]{this.groupPane},
-                //条件过滤
-                new Component[]{this.conditionPane}
-        };
-        return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
-    }
-}
--- a/designer/src/com/fr/design/dscolumn/DSColumnBasicPane.java
+++ b/designer/src/com/fr/design/dscolumn/DSColumnBasicPane.java
@ -1,25 +1,23 @@
 package com.fr.design.dscolumn;

-import java.awt.BorderLayout;
-import java.awt.Component;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import javax.swing.BorderFactory;
-
 import com.fr.data.TableDataSource;
+import com.fr.design.dialog.BasicPane;
 import com.fr.design.expand.ConditionParentPane;
 import com.fr.design.expand.ExpandDirectionPane;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
-import com.fr.design.dialog.BasicPane;
-import com.fr.general.Inter;
 import com.fr.design.mainframe.ElementCasePane;
+import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.general.Inter;
 import com.fr.report.cell.CellElement;
 import com.fr.report.cell.TemplateCellElement;
 import com.fr.report.cell.cellattr.CellExpandAttr;
-import com.fr.design.utils.gui.GUICoreUtils;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;

 public class DSColumnBasicPane extends BasicPane {

@ -135,6 +133,7 @@ public class DSColumnBasicPane extends BasicPane {
        }
        resultSetGroupPane.update();
    }
+
    ActionListener summary_direction_ActionListener = new ActionListener() {

        public void actionPerformed(ActionEvent evt) {
@ -157,14 +156,16 @@ public class DSColumnBasicPane extends BasicPane {
            selectDataColumnPane.update(cellElement);
        }
    };
-    public void putElementcase(ElementCasePane t){
+
+    public void putElementcase(ElementCasePane t) {
        if (conditionParentPane != null) {
            conditionParentPane.putElementcase(t);
        }
    }
-	public void putCellElement(TemplateCellElement tplEC2) {
+
+    public void putCellElement(TemplateCellElement tplCE) {
        if (conditionParentPane != null) {
-			conditionParentPane.putCellElement(tplEC2);
+            conditionParentPane.putCellElement(tplCE);
        }
    }
 }
--- a/designer/src/com/fr/design/dscolumn/DSColumnPane.java
+++ b/designer/src/com/fr/design/dscolumn/DSColumnPane.java
@ -148,7 +148,7 @@ public class DSColumnPane extends BasicPane {
    	basicPane.putElementcase(t);
    }

-	public void putCellElement(TemplateCellElement tplEC2) {
-		basicPane.putCellElement(tplEC2);
+	public void putCellElement(TemplateCellElement tplCE) {
+		basicPane.putCellElement(tplCE);
 	}
 }
--- a/designer/src/com/fr/design/dscolumn/ResultSetGroupDockingPane.java
+++ b/designer/src/com/fr/design/dscolumn/ResultSetGroupDockingPane.java
@ -1,35 +1,31 @@
 package com.fr.design.dscolumn;

-import java.awt.*;
-import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
-
-import com.fr.design.gui.ilable.UILabel;
-import javax.swing.JPanel;
-
-
 import com.fr.design.gui.ibutton.UIButton;
-import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.icombobox.FunctionComboBox;
+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.general.Inter;
 import com.fr.design.mainframe.ElementCasePane;
+import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.general.Inter;
 import com.fr.report.cell.TemplateCellElement;
 import com.fr.report.cell.cellattr.CellExpandAttr;
-import com.fr.report.cell.cellattr.core.group.CustomGrouper;
-import com.fr.report.cell.cellattr.core.group.DSColumn;
-import com.fr.report.cell.cellattr.core.group.FunctionGrouper;
-import com.fr.report.cell.cellattr.core.group.RecordGrouper;
-import com.fr.report.cell.cellattr.core.group.SummaryGrouper;
+import com.fr.report.cell.cellattr.core.group.*;
 import com.fr.stable.Constants;
-import com.fr.design.utils.gui.GUICoreUtils;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;

 /**
 * 这个pane是选中数据列后，在上方QuickRegion处显示的pane
 *
- * @author zhou
+ * @author zhou, yaoh.wu
+ * @version 2017年8月2日14点55分
+ * @since 8.0
 */
 public class ResultSetGroupDockingPane extends ResultSetGroupPane {
    private static final int BIND_GROUP = 0;
@ -42,7 +38,7 @@ public class ResultSetGroupDockingPane extends ResultSetGroupPane {
    private CardLayout cardLayout;
    private UIComboBox goBox;

-    ItemListener l;
+    private ItemListener listener;

    public ResultSetGroupDockingPane(ElementCasePane ePane) {
        super();
@ -58,15 +54,14 @@ public class ResultSetGroupDockingPane extends ResultSetGroupPane {
    }

    private JPanel layoutPane() {
-        double vs = 4;
-        double vg = 6;
        double p = TableLayout.PREFERRED;
        double f = TableLayout.FILL;
-
+        UILabel dataSetLabel = new UILabel(Inter.getLocText("Data_Setting"));
+        dataSetLabel.setPreferredSize(new Dimension(60, 20));
        Component[][] components = new Component[][]
                {
-                        new Component[]{new UILabel(Inter.getLocText("Data_Setting")), goBox},
-                        new Component[]{cardPane, null}
+                        new Component[]{dataSetLabel, goBox},
+                        new Component[]{null, cardPane}
                };
        goBox.addItemListener(new ItemListener() {
            public void itemStateChanged(ItemEvent ee) {
@ -74,10 +69,13 @@ public class ResultSetGroupDockingPane extends ResultSetGroupPane {
                int i = goBox.getSelectedIndex();
                if (i == BIND_GROUP) {
                    cardLayout.show(cardPane, "groupPane");
+                    cardPane.setPreferredSize(new Dimension(155, 20));
                } else if (i == BIND_SELECTED) {
                    cardLayout.show(cardPane, "listPane");
+                    cardPane.setPreferredSize(new Dimension(0, 0));
                } else if (i == BIND_SUMMARY) {
                    cardLayout.show(cardPane, "summaryPane");
+                    cardPane.setPreferredSize(new Dimension(155, 20));
                    CellExpandAttr cellExpandAttr = cellElement.getCellExpandAttr();
                    cellExpandAttr.setDirection(Constants.NONE);
                }
@ -86,7 +84,7 @@ public class ResultSetGroupDockingPane extends ResultSetGroupPane {

        double[] columnSize = {p, f};
        double[] rowSize = {p, p};
-        return TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize);
+        return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
    }

    private void initCardPane() {
@ -190,15 +188,15 @@ public class ResultSetGroupDockingPane extends ResultSetGroupPane {
        }
    }

-    public void addListener(ItemListener l) {
-        goBox.addItemListener(l);
-        groupComboBox.addItemListener(l);
-        functionComboBox.addItemListener(l);
-        this.l = l;
+    public void addListener(ItemListener listener) {
+        goBox.addItemListener(listener);
+        groupComboBox.addItemListener(listener);
+        functionComboBox.addItemListener(listener);
+        this.listener = listener;
    }

    void fireTargetChanged() {
-        l.itemStateChanged(null);
+        listener.itemStateChanged(null);
    }

    @Override
--- a/designer/src/com/fr/design/dscolumn/SelectedConfirmedDataColumnPane.java
+++ b/designer/src/com/fr/design/dscolumn/SelectedConfirmedDataColumnPane.java
@ -1,19 +1,19 @@
 package com.fr.design.dscolumn;

-import java.awt.Dimension;
-import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
-import java.util.Iterator;
-
 import com.fr.data.TableDataSource;
 import com.fr.design.data.datapane.TableDataComboBox;
 import com.fr.design.data.tabledata.wrapper.TemplateTableDataWrapper;
 import com.fr.main.impl.WorkBook;
 import com.fr.report.cell.TemplateCellElement;

+import java.awt.*;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.util.Iterator;
+
 public class SelectedConfirmedDataColumnPane extends SelectedDataColumnPane {

-	public SelectedConfirmedDataColumnPane () {
+    public SelectedConfirmedDataColumnPane() {
        super(false);
    }

@ -35,7 +35,7 @@ public class SelectedConfirmedDataColumnPane extends SelectedDataColumnPane {
        super.populate(source, cell);
        try {
            Iterator it = source.getTableDataNameIterator();
-			String name = (String)it.next();
+            String name = (String) it.next();
            TemplateTableDataWrapper wrapper = new TemplateTableDataWrapper(source.getTableData(name), name);
            tableNameComboBox.setSelectedItem(wrapper);
            tableNameComboBox.getModel().setSelectedItem(wrapper);
--- a/designer/src/com/fr/design/dscolumn/SelectedDataColumnPane.java
+++ b/designer/src/com/fr/design/dscolumn/SelectedDataColumnPane.java
@ -17,6 +17,7 @@ import com.fr.design.gui.itableeditorpane.UITableEditorPane;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.mainframe.ElementCasePane;
 import com.fr.general.Inter;
 import com.fr.general.data.TableDataColumn;
 import com.fr.report.cell.CellElement;
@ -39,8 +40,8 @@ import java.util.regex.Pattern;
 * 数据集列动态参数设置组件
 *
 * @author yaoh.wu
- * @version 2017年7月26日
- * 9.0设计器更新，修改动态参数注入按钮部分,使其显示动态参数按钮时能在右侧边栏正常显示
+ * @version 2017年8月3日
+ * 复用对话框代码，保留对话框原始布局
 * @since 8.0
 */
 public class SelectedDataColumnPane extends BasicPane {
@ -54,12 +55,21 @@ public class SelectedDataColumnPane extends BasicPane {
    private UIButton paramButton;

    public SelectedDataColumnPane() {
-        this(true);
+        this(true, false, null, null);
    }

-    SelectedDataColumnPane(boolean showParameterButton) {
+
+    public SelectedDataColumnPane(boolean showParameterButton) {
+        this(showParameterButton, false, null, null);
+    }
+
+    public SelectedDataColumnPane(boolean showParameterButton, boolean verticalLayout, ElementCasePane casePane, TemplateCellElement cellElement) {
+        if (verticalLayout) {
+            initComponentVerticalLayout(casePane, cellElement);
+        } else {
            initComponent(showParameterButton);
        }
+    }

    /**
     * 初始化组件
@ -72,33 +82,32 @@ public class SelectedDataColumnPane extends BasicPane {
            initWithParameterButton();
        }
        columnNameComboBox = new LazyComboBox() {
+
            @Override
            public Object[] load() {
                List<String> l = calculateColumnNameList();
                return l.toArray(new String[l.size()]);
            }
+
        };
        columnNameComboBox.setEditable(true);
-        double f = TableLayout.FILL;
        double p = TableLayout.PREFERRED;
-        UILabel label1 = new UILabel(Inter.getLocText("TableData"));
-        UILabel label3 = new UILabel(Inter.getLocText("DataColumn"));
+        UILabel dsLabel = new UILabel(Inter.getLocText("TableData") + ":");
+        UILabel dcLabel = new UILabel(Inter.getLocText("DataColumn") + ":");
        if (showParameterButton) {
-            //todo 国际化
-            UILabel label2 = new UILabel("param");
-            Component[][] components = {
-                    {label1, tableNameComboBox},
-                    {label2, paramButton},
-                    {label3, columnNameComboBox}
-            };
-            this.setLayout(new BorderLayout());
-            this.add(TableLayoutHelper.createTableLayoutPane(components, new double[]{p, p, p}, new double[]{p, f}));
+            dsLabel.setPreferredSize(new Dimension(200, 25));
+            dcLabel.setPreferredSize(new Dimension(200, 25));
+        }
+        if (showParameterButton) {
+            Component[][] comps = {{dsLabel, null, dcLabel}, {tableNameComboBox, paramButton, columnNameComboBox}};
+            this.add(TableLayoutHelper.createTableLayoutPane(comps, new double[]{p, p}, new double[]{p, p, p}));
        } else {
+            double f = TableLayout.FILL;
            double[] columnSize = {p, f};
            double[] rowSize = {p, p};
            Component[][] components = new Component[][]{
-                    new Component[]{label1, tableNameComboBox},
-                    new Component[]{label3, columnNameComboBox}
+                    new Component[]{dsLabel, tableNameComboBox},
+                    new Component[]{dcLabel, columnNameComboBox}
            };
            JPanel jPanel = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
            this.setLayout(new BorderLayout());
@ -107,6 +116,39 @@ public class SelectedDataColumnPane extends BasicPane {
    }


+    /**
+     * 初始化竖直布局的组件
+     */
+    public void initComponentVerticalLayout(ElementCasePane casePane, TemplateCellElement cellElement) {
+        initTableNameComboBox();
+        initWithParameterButton(casePane, cellElement);
+        columnNameComboBox = new LazyComboBox() {
+            @Override
+            public Object[] load() {
+                List<String> l = calculateColumnNameList();
+                return l.toArray(new String[l.size()]);
+            }
+        };
+        columnNameComboBox.setEditable(true);
+        double f = TableLayout.FILL;
+        double p = TableLayout.PREFERRED;
+        UILabel dsLabel = new UILabel(Inter.getLocText("TableData"));
+        UILabel dpLabel = new UILabel(Inter.getLocText("FR-Designer_Dynamic_Parameter"));
+        UILabel dcLabel = new UILabel(Inter.getLocText("DataColumn"));
+        dsLabel.setPreferredSize(new Dimension(60, 20));
+        dpLabel.setPreferredSize(new Dimension(60, 20));
+        dcLabel.setPreferredSize(new Dimension(60, 20));
+        Component[][] components = {
+                {dsLabel, tableNameComboBox},
+                {dpLabel, paramButton},
+                {dcLabel, columnNameComboBox}
+        };
+        this.setLayout(new BorderLayout());
+        this.add(TableLayoutHelper.createTableLayoutPane(components, new double[]{p, p, p}, new double[]{p, f}));
+
+    }
+
+
    public void populate(TableDataSource source, TemplateCellElement cellElement) {
        if (cellElement == null) {
            return;
@ -237,6 +279,27 @@ public class SelectedDataColumnPane extends BasicPane {
        });
    }

+    private void initWithParameterButton(ElementCasePane casePane, TemplateCellElement cellElement) {
+        SelectedDataColumnPane that = this;
+        editorPane = new UITableEditorPane<ParameterProvider>(new ParameterTableModel());
+        paramButton = new UIButton(Inter.getLocText("TableData_Dynamic_Parameter_Setting"));
+        paramButton.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                BasicDialog paramDialog = editorPane.showSmallWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() {
+                    @Override
+                    public void doOk() {
+                        List<ParameterProvider> parameterList = editorPane.update();
+                        ps = parameterList.toArray(new Parameter[parameterList.size()]);
+                        that.update(cellElement);
+                        casePane.fireTargetModified();
+                    }
+                });
+                editorPane.populate(ps == null ? new Parameter[0] : ps);
+                paramDialog.setVisible(true);
+            }
+        });
+    }
+

    private boolean isColumnName(String columnExp) {
        return StringUtils.isNotBlank(columnExp) && (columnExp.length() > 0 && columnExp.charAt(0) == '#') && !columnExp.endsWith("#");
--- a/designer/src/com/fr/design/mainframe/cell/CellEditorPane.java
+++ b/designer/src/com/fr/design/mainframe/cell/CellEditorPane.java
@ -1,7 +1,6 @@
 package com.fr.design.mainframe.cell;

 import com.fr.design.dialog.BasicPane;
-import com.fr.report.cell.TemplateCellElement;

 /**
 * 右侧单元格元素面板抽象类
@ -24,7 +23,6 @@ public abstract class CellEditorPane extends BasicPane {
    /**
     * 更新面板数据
     *
-     * @param cellElement 单元格
     */
-    public abstract void populate(TemplateCellElement cellElement);
+    public abstract void populate();
 }
--- a/designer/src/com/fr/design/module/DesignerModule.java
+++ b/designer/src/com/fr/design/module/DesignerModule.java
@ -111,7 +111,7 @@ public class DesignerModule extends DesignModule {
    private void registerCellEditor() {
        ActionFactory.registerCellEditor(String.class, CellStringQuickEditor.class);
        ActionFactory.registerCellEditor(Number.class, CellStringQuickEditor.class);
-        ActionFactory.registerCellEditor(Formula.class, CellStringQuickEditor.class);
+        ActionFactory.registerCellEditor(Formula.class, CellFormulaQuickEditor.class);
        ActionFactory.registerCellEditor(SubReport.class, CellSubReportEditor.class);
        ActionFactory.registerCellEditor(RichText.class, CellRichTextEditor.class);
        ActionFactory.registerCellEditor(DSColumn.class, CellDSColumnEditor.class);
@ -385,7 +385,7 @@ public class DesignerModule extends DesignModule {
    }

    public Class<?>[] actionsForInsertCellElement() {
-        return (Class<?>[])ArrayUtils.addAll(new Class<?>[]{
+        return (Class<?>[]) ArrayUtils.addAll(new Class<?>[]{
                DSColumnCellAction.class,
                GeneralCellAction.class,
                RichTextCellAction.class,
--- a/designer/src/com/fr/design/present/BarCodePane.java
+++ b/designer/src/com/fr/design/present/BarCodePane.java
@ -85,7 +85,7 @@ public class BarCodePane extends FurtherBasicBeanPane<BarcodePresent> {
        RCodesizespinner = new UIBasicSpinner(new SpinnerNumberModel(2, 1, 6, 1));
        RCodeVersionComboBox = new UIComboBox();
        RCodeErrorCorrectComboBox = new UIComboBox();
-        typeSetLabel = new UILabel(Inter.getLocText("Type_Set") + ":", UILabel.RIGHT);
+        typeSetLabel = new UILabel(Inter.getLocText("Type_Set"), UILabel.RIGHT);
        initVersionComboBox();
        initErrorCorrectComboBox();

--- a/designer/src/com/fr/design/present/CurrencyLinePane.java
+++ b/designer/src/com/fr/design/present/CurrencyLinePane.java
@ -72,11 +72,11 @@ public class CurrencyLinePane extends FurtherBasicBeanPane<CurrencyLinePresent>
    protected void initComponents() {
        // 整数位选择
        intPartSpinner = new UIBasicSpinner(new SpinnerNumberModel(9, 1, 20, 1));
-        intPartSpinner.setPreferredSize(new Dimension(135, 20));
+        intPartSpinner.setPreferredSize(new Dimension(158, 20));

        // 小数位选择
        deciPartSpinner = new UIBasicSpinner(new SpinnerNumberModel(2, 1, 10, 1));
-        deciPartSpinner.setPreferredSize(new Dimension(135, 20));
+        deciPartSpinner.setPreferredSize(new Dimension(158, 20));
        // 预览区域
        textField = new UITextField(10);

--- a/designer/src/com/fr/design/widget/DataModify.java
+++ b/designer/src/com/fr/design/widget/DataModify.java
@ -1,21 +0,0 @@
-package com.fr.design.widget;
-
-import com.fr.design.data.DataCreatorUI;
-import com.fr.design.gui.frpane.TreeSettingPane;
-import com.fr.design.present.dict.DictionaryPane;
-import com.fr.form.ui.Widget;
-
-import javax.swing.*;
-
-public interface DataModify<T> {
-
-    void populateBean(T ob);
-
-    T updateBean();
-
-    void checkValid() throws Exception;
-
-    DataCreatorUI dataUI();
-
-    JComponent toSwingComponent();
-}
--- a/designer/src/com/fr/design/widget/Operator.java
+++ b/designer/src/com/fr/design/widget/Operator.java
@ -1,11 +0,0 @@
-package com.fr.design.widget;
-
-import com.fr.design.data.DataCreatorUI;
-
-/**
- * Created by richie on 15/11/16.
- */
-public interface Operator {
-
-    void did(DataCreatorUI ui, String cardName);
-}
--- a/designer/src/com/fr/design/widget/ui/ButtonGroupDictPane.java
+++ b/designer/src/com/fr/design/widget/ui/ButtonGroupDictPane.java
@ -1,6 +1,7 @@
 package com.fr.design.widget.ui;


+import java.awt.*;
 import java.awt.event.ActionEvent;
 import com.fr.design.gui.ispinner.UIBasicSpinner;
 import java.awt.event.ActionListener;
@ -28,7 +29,8 @@ public class ButtonGroupDictPane extends JPanel {
    *
     */
 	public void initComponents() {
-		this.setLayout(FRGUIPaneFactory.createLabelFlowLayout());
+		this.setLayout(new FlowLayout(0));
+		JPanel pane = new JPanel(new FlowLayout());
 		adaptiveCheckbox = new UICheckBox(Inter.getLocText("Adaptive"), true);
 		adaptiveCheckbox.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent e) {
@ -36,12 +38,14 @@ public class ButtonGroupDictPane extends JPanel {
 				columnLabel.setVisible(!adaptiveCheckbox.isSelected());
 			}
 		});
-		this.add(adaptiveCheckbox);

-		this.columnLabel = new UILabel(Inter.getLocText("Button-Group-Display-Columns") + ":");
-		this.add(columnLabel);
+		this.columnLabel = new UILabel(Inter.getLocText("Button-Group-Display-Columns"));
 		columnSpinner = new UIBasicSpinner(new SpinnerNumberModel(0, 0, Integer.MAX_VALUE, 1));
-		this.add(columnSpinner);
+        pane.add(adaptiveCheckbox);
+        pane.add(columnLabel);
+        pane.add(columnSpinner);
+
+		this.add(pane);
 	}

 	public void populate(ButtonGroup buttonGroup) {
--- a/designer/src/com/fr/design/widget/ui/CheckBoxDefinePane.java
+++ b/designer/src/com/fr/design/widget/ui/CheckBoxDefinePane.java
@ -1,15 +1,18 @@
 package com.fr.design.widget.ui;

+import com.fr.design.constants.LayoutConstants;
 import com.fr.design.foldablepane.UIExpandablePane;
 import com.fr.design.gui.ilable.UILabel;
-
-import javax.swing.*;
-
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.layout.TableLayout;
+import com.fr.design.layout.TableLayoutHelper;
 import com.fr.form.ui.CheckBox;
 import com.fr.general.Inter;

+import javax.swing.*;
+import java.awt.*;
+
 public class CheckBoxDefinePane extends AbstractDataModify<CheckBox> {
    private UITextField text;

@ -19,13 +22,24 @@ public class CheckBoxDefinePane extends AbstractDataModify<CheckBox> {

    private void iniComoponents() {
        this.setLayout(FRGUIPaneFactory.createBorderLayout());
-		this.setBorder(BorderFactory.createEmptyBorder(0, 8, 0, 8));
-		JPanel textPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
-		textPane.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 0));
-		UIExpandablePane uiExpandablePane = new UIExpandablePane(Inter.getLocText("FR-Designer_Advanced"), 280, 20, textPane);
-		textPane.add(new UILabel(Inter.getLocText("Text") + ":"));
        text = new UITextField(8);
-		textPane.add(text);
+        JPanel panel = new JPanel(new BorderLayout());
+        panel.add(text, BorderLayout.CENTER);
+        panel.setBorder(BorderFactory.createEmptyBorder(0, 35, 0, 0));
+
+        double f = TableLayout.FILL;
+        double p = TableLayout.PREFERRED;
+        Component[][] components = new Component[][]{
+                new Component[]{new UILabel(Inter.getLocText("FR-Designer_Text")), panel},
+        };
+        double[] rowSize = {p};
+        double[] columnSize = {p, f};
+        int[][] rowCount = {{1, 1}};
+        JPanel pane = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_LARGE, LayoutConstants.VGAP_LARGE);
+
+        UIExpandablePane uiExpandablePane = new UIExpandablePane(Inter.getLocText("FR-Designer_Advanced"), 280, 24, pane);
+        pane.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 15));
+
        this.add(uiExpandablePane);
    }

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

--- a/designer/src/com/fr/design/widget/ui/IframeEditorDefinePane.java
+++ b/designer/src/com/fr/design/widget/ui/IframeEditorDefinePane.java
@ -1,17 +1,13 @@
 package com.fr.design.widget.ui;

-import java.awt.*;
-import java.util.List;
-
-import javax.swing.BorderFactory;
-
 import com.fr.design.constants.LayoutConstants;
+import com.fr.design.dialog.DialogActionListener;
+import com.fr.design.dialog.UIDialog;
 import com.fr.design.foldablepane.UIExpandablePane;
-import com.fr.design.gui.ilable.UILabel;
-import javax.swing.JPanel;
-
 import com.fr.design.gui.frpane.ReportletParameterViewPane;
+import com.fr.design.gui.ibutton.UIButton;
 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.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
@ -20,11 +16,24 @@ import com.fr.form.ui.IframeEditor;
 import com.fr.general.Inter;
 import com.fr.stable.ParameterProvider;

+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.List;
+
 public class IframeEditorDefinePane extends AbstractDataModify<IframeEditor> {
+
+    private static final int P_W = 610;
+    private static final int P_H = 580;
    private UITextField srcTextField;
    private ReportletParameterViewPane parameterViewPane;
    private UICheckBox horizontalCheck;
    private UICheckBox verticalCheck;
+    private UIButton parameterViewPaneButton;
+    private List<ParameterProvider> list;
+

    public IframeEditorDefinePane() {
        this.initComponents();
@ -41,25 +50,58 @@ public class IframeEditorDefinePane extends AbstractDataModify<IframeEditor> {
        contentPane.add(attr);
        double p = TableLayout.PREFERRED;
        double f = TableLayout.FILL;
-		double[] rowSize = { p, p, p, p };
-		double[] columnSize = { p, f };
+        double[] rowSize = {p, p, p, p};
+        double[] columnSize = {p, f};
+
+        parameterViewPaneButton = new UIButton(Inter.getLocText("FR-Designer_Edit"));
+        parameterViewPaneButton.addActionListener(parameterListener);
+        parameterViewPane = new ReportletParameterViewPane();

        java.awt.Component[][] coms = {
-				{ horizontalCheck, null },
-				{ verticalCheck, null },
-				{ new UILabel(Inter.getLocText("Form-Url") + ":"), srcTextField = new UITextField() },
-				{ new UILabel(Inter.getLocText("Parameter") + ":"), parameterViewPane = new ReportletParameterViewPane() } };
-		int[][] rowCount = {{1, 1},{1, 1},{1, 1}, {1, 1}};
-		JPanel panel =  TableLayoutHelper.createGapTableLayoutPane(coms, rowSize, columnSize, rowCount, LayoutConstants.VGAP_SMALL, 5);
+                {horizontalCheck, null},
+                {verticalCheck, null},
+                {new UILabel(Inter.getLocText("Form-Url")), srcTextField = new UITextField()},
+                {new UILabel(Inter.getLocText("FR-Designer_Parameters")), parameterViewPaneButton}};
+        int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}, {1, 1}};
+        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(coms, rowSize, columnSize, rowCount, 45, LayoutConstants.VGAP_LARGE);


        contentPane.add(panel);

-		UIExpandablePane uiExpandablePane = new UIExpandablePane(Inter.getLocText("FR-Designer_Advanced"), 280, 20, contentPane);
+        UIExpandablePane uiExpandablePane = new UIExpandablePane(Inter.getLocText("FR-Designer_Advanced"), 280, 24, contentPane);
        this.add(uiExpandablePane, BorderLayout.NORTH);

    }

+    ActionListener parameterListener = new ActionListener() {
+        @Override
+        public void actionPerformed(ActionEvent e) {
+            List<ParameterProvider> paraList = parameterViewPane.update();
+            list = new ArrayList<ParameterProvider>();
+            ParameterProvider pr = null;
+            for (ParameterProvider parameterProvider : paraList) {
+                try {
+                    pr = (ParameterProvider) parameterProvider.clone();
+                } catch (CloneNotSupportedException e1) {
+                    e1.printStackTrace();
+                }
+                list.add(pr);
+            }
+
+            UIDialog dialog = parameterViewPane.showUnsizedWindow(SwingUtilities.getWindowAncestor(new JPanel()), new DialogActionListener() {
+                @Override
+                public void doOk() {
+                }
+
+                @Override
+                public void doCancel() {
+                    parameterViewPane.update(list);
+                }
+            });
+            dialog.setSize(P_W, P_H);
+            dialog.setVisible(true);
+        }
+    };

    @Override
    protected String title4PopupWindow() {
--- a/designer/src/com/fr/design/widget/ui/ListEditorDefinePane.java
+++ b/designer/src/com/fr/design/widget/ui/ListEditorDefinePane.java
@ -25,8 +25,8 @@ public class ListEditorDefinePane extends WriteUnableRepeatEditorPane<ListEditor

 	@Override
 	protected JPanel setThirdContentPane() {
-		JPanel contenter = FRGUIPaneFactory.createBorderLayout_S_Pane();
-		JPanel centerPane = FRGUIPaneFactory.createMediumHGapFlowInnerContainer_M_Pane();
+		JPanel contenter = FRGUIPaneFactory.createMediumHGapFlowInnerContainer_M_Pane_First0();
+		JPanel centerPane = FRGUIPaneFactory.createMediumHGapFlowInnerContainer_M_Pane_First0();
 		centerPane.add(needHeadCheckBox = new UICheckBox(Inter.getLocText("List-Need_Head")));
 		contenter.add(centerPane);
 		return contenter;
--- a/designer/src/com/fr/design/widget/ui/MultiFileEditorPane.java
+++ b/designer/src/com/fr/design/widget/ui/MultiFileEditorPane.java
@ -1,26 +1,22 @@
 package com.fr.design.widget.ui;

-import java.awt.*;
-
-import com.fr.design.constants.LayoutConstants;
-import com.fr.design.gui.ilable.UILabel;
-
-import javax.swing.*;
-
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.icombobox.DictionaryComboBox;
 import com.fr.design.gui.icombobox.DictionaryConstants;
-import com.fr.design.gui.itextfield.UINumberField;
-import com.fr.design.layout.FRGUIPaneFactory;
+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.form.ui.MultiFileEditor;
 import com.fr.general.Inter;

+import javax.swing.*;
+import java.awt.*;
+
 public class MultiFileEditorPane extends FieldEditorDefinePane<MultiFileEditor> {
    private DictionaryComboBox acceptType;
    private UICheckBox singleFileCheckBox;
-	private UINumberField fileSizeField;
+    private UISpinner fileSizeField;

    public MultiFileEditorPane() {
        this.initComponents();
@ -34,42 +30,36 @@ public class MultiFileEditorPane extends FieldEditorDefinePane<MultiFileEditor>

    @Override
    protected JPanel setFirstContentPane() {
-		acceptType = new DictionaryComboBox(DictionaryConstants.acceptTypes, DictionaryConstants.fileTypeDisplays);
-		acceptType.setPreferredSize(new Dimension(200, 18));
-		singleFileCheckBox = new UICheckBox(Inter.getLocText("SINGLE_FILE_UPLOAD"));
-		fileSizeField = new UINumberField();
-		fileSizeField.setPreferredSize(new Dimension(80, 18));
+        JPanel contenter = new JPanel(new BorderLayout());

+        singleFileCheckBox = new UICheckBox(Inter.getLocText("SINGLE_FILE_UPLOAD"));
+        acceptType = new DictionaryComboBox(DictionaryConstants.acceptTypes, DictionaryConstants.fileTypeDisplays);
+//		acceptType.setPreferredSize(new Dimension(100, 20));
+        fileSizeField = new UISpinner(0, Integer.MAX_VALUE, 1, -1);
+        fileSizeField.setPreferredSize(new Dimension(140, 20));

-		JPanel singleFilePane = FRGUIPaneFactory.createNormalFlowInnerContainer_M_Pane();
-		singleFilePane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
-		singleFilePane.add(singleFileCheckBox);
-
-		JPanel allowTypePane = FRGUIPaneFactory.createNormalFlowInnerContainer_M_Pane();
-		allowTypePane.setLayout(FRGUIPaneFactory.createLabelFlowLayout());
-		allowTypePane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
-		allowTypePane.add(new UILabel("   " + Inter.getLocText("File-Allow_Upload_Files") + ":"));
-		allowTypePane.add(acceptType);
-
-		JPanel fileSizePane = FRGUIPaneFactory.createNormalFlowInnerContainer_M_Pane();
-		fileSizePane.add(new UILabel(" " + Inter.getLocText("File-File_Size_Limit") + ":"));
-		fileSizePane.add(fileSizeField);
-		fileSizePane.add(new UILabel(" KB"));
+        JPanel fileSizePane = new JPanel(new BorderLayout());
+        UILabel fileTypeLabel = new UILabel(Inter.getLocText("Utils-File_type"));
+        UILabel fileSizeLabel = new UILabel(Inter.getLocText("FR-Designer_Size_Limit"));
+        fileSizePane.add(fileSizeField, BorderLayout.CENTER);
+        fileSizePane.add(new UILabel(" KB"), BorderLayout.EAST);

        double f = TableLayout.FILL;
        double p = TableLayout.PREFERRED;
        Component[][] components = new Component[][]{
-				new Component[]{singleFileCheckBox, null },
-				new Component[]{new UILabel("   " + Inter.getLocText("File-Allow_Upload_Files") + ":"), acceptType},
-				new Component[]{new UILabel(" " + Inter.getLocText("File-File_Size_Limit") + ":"), fileSizeField},
+                new Component[]{singleFileCheckBox, null},
+                new Component[]{fileTypeLabel, acceptType},
+                new Component[]{fileSizeLabel, fileSizePane},
        };
-		double[] rowSize = {p, p,p};
-		double[] columnSize = {p,f};
-		int[][] rowCount = {{1, 1},{1, 1},{1, 1}};
-		JPanel panel =  TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_SMALL, 5);
+        double[] rowSize = {p, p, p};
+        double[] columnSize = {p, f};
+        int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}};
+        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, 22, 10);

+        panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 00));
+        contenter.add(panel, BorderLayout.CENTER);

-		return panel;
+        return contenter;
    }

    @Override
--- a/designer/src/com/fr/design/widget/ui/NumberEditorDefinePane.java
+++ b/designer/src/com/fr/design/widget/ui/NumberEditorDefinePane.java
@ -3,11 +3,15 @@ package com.fr.design.widget.ui;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;

 import javax.swing.BorderFactory;
 import javax.swing.JComponent;
 import javax.swing.JFormattedTextField;

+import com.fr.design.constants.LayoutConstants;
+import com.fr.design.constants.UIConstants;
 import com.fr.design.gui.ilable.UILabel;

 import javax.swing.JPanel;
@ -26,7 +30,7 @@ import com.fr.general.Inter;

 public class NumberEditorDefinePane extends FieldEditorDefinePane<NumberEditor> {
    /**
-     *
+     * FieldEditorDefinePane
     */
    private static final long serialVersionUID = 8011242951911686805L;
    private UICheckBox allowDecimalsCheckBox;
@ -37,7 +41,7 @@ public class NumberEditorDefinePane extends FieldEditorDefinePane<NumberEditor>
    private SpinnerNumberModel maxValueModel;
    private UIBasicSpinner minValueSpinner;
    private SpinnerNumberModel minValueModel;
-    private com.fr.design.editor.editor.IntegerEditor decimalLength;
+    private UIBasicSpinner decimalLength;
    private JPanel limitNumberPane;
    private WaterMarkDictPane waterMarkDictPane;

@ -78,7 +82,7 @@ public class NumberEditorDefinePane extends FieldEditorDefinePane<NumberEditor>
    };


-    private ActionListener actionListener3 = new ActionListener() {
+    public ActionListener actionListener3 = new ActionListener() {
        public void actionPerformed(ActionEvent e) {
            if (setMaxValueCheckBox.isSelected()) {
                maxValueSpinner.setVisible(true);
@ -142,7 +146,8 @@ public class NumberEditorDefinePane extends FieldEditorDefinePane<NumberEditor>
    };

    public NumberEditorDefinePane() {
-        super();
+//        super();
+        this.initComponents();
    }


@ -166,46 +171,60 @@ public class NumberEditorDefinePane extends FieldEditorDefinePane<NumberEditor>

    public JPanel setValidatePane() {

-        this.allowDecimalsCheckBox = new UICheckBox(Inter.getLocText("Allow_Decimals"));
-        this.decimalLength = new com.fr.design.editor.editor.IntegerEditor();
-        this.decimalLength.setColumns(4);
+        this.allowDecimalsCheckBox = new UICheckBox(Inter.getLocText("FR-Designer_Allow_Decimals"));
+        this.decimalLength = new UIBasicSpinner(new SpinnerNumberModel(16, 0, Integer.MAX_VALUE, 1));
+        this.decimalLength.setPreferredSize(new Dimension(155, 20));
+
        this.allowDecimalsCheckBox.addActionListener(actionListener1);

-        this.allowNegativeCheckBox = new UICheckBox(Inter.getLocText("Allow_Negative"));
+        this.allowNegativeCheckBox = new UICheckBox(Inter.getLocText("FR-Designer_Allow_Negative"));
        this.allowNegativeCheckBox.addActionListener(actionListener2);

-        this.setMaxValueCheckBox = new UICheckBox(Inter.getLocText("Need_Max_Value"), false);
+        this.setMaxValueCheckBox = new UICheckBox(Inter.getLocText("FR-Designer_Max_Value"), false);

        this.maxValueSpinner = new UIBasicSpinner(maxValueModel = new SpinnerNumberModel(0D, -Double.MAX_VALUE, Double.MAX_VALUE, 1D));
-        maxValueSpinner.setPreferredSize(new Dimension(120, 20));
+        maxValueSpinner.setPreferredSize(new Dimension(155, 20));
        setNotAllowsInvalid(this.maxValueSpinner);
        this.maxValueSpinner.setVisible(false);
        this.setMaxValueCheckBox.addActionListener(actionListener3);
        this.maxValueSpinner.addChangeListener(changeListener1);

-        this.setMinValueCheckBox = new UICheckBox(Inter.getLocText("Need_Min_Value"), false);
+        this.setMinValueCheckBox = new UICheckBox(Inter.getLocText("FR-Designer_Min_Value"), false);
        this.minValueSpinner = new UIBasicSpinner(minValueModel = new SpinnerNumberModel(0D, -Double.MAX_VALUE, Double.MAX_VALUE, 1D));
-        minValueSpinner.setPreferredSize(new Dimension(120, 20));
+        minValueSpinner.setPreferredSize(new Dimension(155, 20));
        setNotAllowsInvalid(this.minValueSpinner);
        this.minValueSpinner.setVisible(false);
        this.setMinValueCheckBox.addActionListener(actionListener4);
        this.minValueSpinner.addChangeListener(changeListener2);

+        UILabel numberLabel = new UILabel(Inter.getLocText(new String[]{"FR-Designer_Double", "Numbers"}));
+        numberLabel.setBorder(BorderFactory.createEmptyBorder(0, 12, 0, 0));
+
+        JPanel decimalPane = new JPanel(new BorderLayout());
+        decimalPane.add(decimalLength, BorderLayout.CENTER);
+        decimalPane.setBorder(BorderFactory.createEmptyBorder(0, 12, 0, 0));
+        JPanel maxValueSpinnerPane = new JPanel(new BorderLayout());
+        maxValueSpinnerPane.add(maxValueSpinner, BorderLayout.CENTER);
+        maxValueSpinnerPane.setBorder(BorderFactory.createEmptyBorder(0, 12, 0, 0));
+        JPanel minValueSpinnerPane = new JPanel(new BorderLayout());
+        minValueSpinnerPane.add(minValueSpinner, BorderLayout.CENTER);
+        minValueSpinnerPane.setBorder(BorderFactory.createEmptyBorder(0, 12, 0, 0));

        double f = TableLayout.FILL;
        double p = TableLayout.PREFERRED;
        Component[][] components = new Component[][]{
-                new Component[]{allowDecimalsCheckBox, null },
-                new Component[]{new UILabel(Inter.getLocText(new String[]{"Double", "Numbers"})), decimalLength },
+                new Component[]{allowDecimalsCheckBox, null},
+                new Component[]{numberLabel, decimalPane},
                new Component[]{allowNegativeCheckBox, null},
-                new Component[]{setMaxValueCheckBox, maxValueSpinner},
-                new Component[]{setMinValueCheckBox, minValueSpinner},
+                new Component[]{setMaxValueCheckBox, maxValueSpinnerPane},
+                new Component[]{setMinValueCheckBox, minValueSpinnerPane},
        };
        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, 1);
-        return panel;
+        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(0, 1, 0, 0));
+        return pane;

    }

@ -250,7 +269,7 @@ public class NumberEditorDefinePane extends FieldEditorDefinePane<NumberEditor>
        NumberEditor ob = new NumberEditor();
        ob.setAllowDecimals(allowDecimalsCheckBox.isSelected());
        if (allowDecimalsCheckBox.isSelected()) {
-            ob.setMaxDecimalLength(this.decimalLength.getValue());
+            ob.setMaxDecimalLength((Integer) this.decimalLength.getValue());
        }

        ob.setAllowNegative(allowNegativeCheckBox.isSelected());
--- a/designer/src/com/fr/design/widget/ui/RadioGroupDefinePane.java
+++ b/designer/src/com/fr/design/widget/ui/RadioGroupDefinePane.java
@ -28,9 +28,9 @@ public class RadioGroupDefinePane extends FieldEditorDefinePane<RadioGroup> {
 	@Override
 	protected JPanel setFirstContentPane() {

-		JPanel centerPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
+		JPanel centerPane = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane();
 		buttonGroupDictPane = new ButtonGroupDictPane();
-		buttonGroupDictPane.setLayout(new FlowLayout(FlowLayout.LEFT, 5, 0));
+		buttonGroupDictPane.setLayout(new FlowLayout(FlowLayout.LEFT, 0, 0));
 		centerPane.add(buttonGroupDictPane);
 		return centerPane;
 	}
--- a/designer/src/com/fr/design/widget/ui/TreeEditorDefinePane.java
+++ b/designer/src/com/fr/design/widget/ui/TreeEditorDefinePane.java
@ -5,6 +5,9 @@ import com.fr.design.gui.frpane.TreeSettingPane;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.itree.refreshabletree.TreeRootPane;
 import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.layout.FRLeftFlowLayout;
+import com.fr.design.layout.TableLayout;
+import com.fr.design.layout.TableLayoutHelper;
 import com.fr.form.ui.TreeEditor;
 import com.fr.general.Inter;

@ -52,7 +55,8 @@ public class TreeEditorDefinePane extends FieldEditorDefinePane<TreeEditor> {
 	protected JPanel setSecondContentPane() {
 		JPanel contentPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
 		contentPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
-		JPanel contenter = FRGUIPaneFactory.createMediumHGapFlowInnerContainer_M_Pane();
+		JPanel contenter = FRGUIPaneFactory.createMediumHGapFlowInnerContainer_M_Pane_First0();
+
 		contentPane.add(contenter,BorderLayout.NORTH);
 		removeRepeatCheckBox = new UICheckBox(Inter.getLocText("Form-Remove_Repeat_Data"), false);
 		contenter.add(removeRepeatCheckBox);
--- a/designer/src/com/fr/design/widget/ui/WaterMarkDictPane.java
+++ b/designer/src/com/fr/design/widget/ui/WaterMarkDictPane.java
@ -39,7 +39,7 @@ public class WaterMarkDictPane extends JPanel {
        int[][] rowCount = {{1, 1}};
        JPanel panel = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
 //		JPanel panel =  TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_LARGE, LayoutConstants.VGAP_MEDIUM);
-        panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 5, 0));
+        panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
        this.add(panel, BorderLayout.CENTER);
    }

--- a/designer/src/com/fr/design/widget/ui/WritableRepeatEditorPane.java
+++ b/designer/src/com/fr/design/widget/ui/WritableRepeatEditorPane.java
@ -15,7 +15,7 @@ public abstract class WritableRepeatEditorPane<E extends WriteAbleRepeatEditor>

 	@Override
 	protected JPanel setSecondContentPane() {
-		JPanel contentPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
+		JPanel contentPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane_First0();
 		contentPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
 		JPanel otherContentPane = this.setThirdContentPane();
 		if (otherContentPane != null) {
--- a/designer/src/com/fr/design/widget/ui/WriteUnableRepeatEditorPane.java
+++ b/designer/src/com/fr/design/widget/ui/WriteUnableRepeatEditorPane.java
@ -20,9 +20,8 @@ public abstract class WriteUnableRepeatEditorPane<E extends WriteUnableRepeatEdi
 	
 	@Override
 	protected JPanel setFirstContentPane() {
-		JPanel contentPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
-		contentPane.setBorder(BorderFactory.createEmptyBorder(0, 2, 0, 0));
-		JPanel contenter=FRGUIPaneFactory.createMediumHGapFlowInnerContainer_M_Pane();
+		JPanel contentPane = FRGUIPaneFactory.createYBoxEmptyBorderPane();
+		JPanel contenter=FRGUIPaneFactory.createMediumHGapFlowInnerContainer_M_Pane_First0();
 		removeRepeatCheckBox = new UICheckBox(Inter.getLocText("Form-Remove_Repeat_Data"), false);
 		contentPane.add(contenter);
 		contenter.add(removeRepeatCheckBox);
--- a/designer/src/com/fr/quickeditor/CellQuickEditor.java
+++ b/designer/src/com/fr/quickeditor/CellQuickEditor.java
@ -1,6 +1,5 @@
 package com.fr.quickeditor;

-import com.fr.base.BaseUtils;
 import com.fr.design.actions.utils.DeprecatedActionManager;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ilable.UILabel;
@ -11,6 +10,7 @@ import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.ElementCasePane;
 import com.fr.design.selection.QuickEditor;
 import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.general.IOUtils;
 import com.fr.general.Inter;
 import com.fr.grid.selection.CellSelection;
 import com.fr.report.cell.TemplateCellElement;
@ -24,31 +24,51 @@ import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;

 /**
- * @author zhou
- * @since 2012-7-23下午5:16:53
+ * @author zhou, yaoh.wu
+ * @version 2017年8月7日16点54分
+ * @since 1.0
 */
 public abstract class CellQuickEditor extends QuickEditor<ElementCasePane> {

    protected UITextField columnRowTextField;
-    private UIButton cellElementEditButton;
    protected TemplateCellElement cellElement;

    public CellQuickEditor() {
        double p = TableLayout.PREFERRED;
        double f = TableLayout.FILL;
        double[] columnSize = {p, f};
-        double[] rowSize = {p, p, p};
+        double[] rowSize = {p, p};
        Component[][] components = new Component[][]{
-                new Component[]{new UILabel("  " + Inter.getLocText("Cell")), columnRowTextField = initColumnRowTextField()},
-                new Component[]{new UILabel(Inter.getLocText("HF-Insert_Content") + " "), cellElementEditButton = initCellElementEditButton()},
+                new Component[]{initTopContent(), null},
                new Component[]{createCenterBody(), null}
        };
        JPanel panel = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
        this.setLayout(new BorderLayout());
-        this.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
+        this.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
        this.add(panel, BorderLayout.CENTER);
    }

+
+    private JPanel initTopContent() {
+        double p = TableLayout.PREFERRED;
+        double f = TableLayout.FILL;
+        double[] columnSize = {p, f};
+        double[] rowSize = {p, p};
+        UILabel cellLabel = new UILabel(Inter.getLocText("Cell"));
+        cellLabel.setPreferredSize(new Dimension(60, 20));
+        UILabel insertContentLabel = new UILabel(Inter.getLocText("HF-Insert_Content"));
+        insertContentLabel.setPreferredSize(new Dimension(60, 20));
+        UIButton cellElementEditButton = initCellElementEditButton();
+        Component[][] components = new Component[][]{
+                new Component[]{cellLabel, columnRowTextField = initColumnRowTextField()},
+                new Component[]{insertContentLabel, cellElementEditButton},
+        };
+        JPanel topContent = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
+        topContent.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 15));
+        return topContent;
+    }
+
+
    /**
     * 初始化添加按钮
     * TODO 9.0 换成下拉菜单后原来的快捷键不好处理，先跳过。
@ -56,7 +76,7 @@ public abstract class CellQuickEditor extends QuickEditor<ElementCasePane> {
     * @return UIButton
     */
    private UIButton initCellElementEditButton() {
-        final UIButton cellElementEditButton = new UIButton(BaseUtils.readIcon("/com/fr/design/images/buttonicon/add.png"));
+        final UIButton cellElementEditButton = new UIButton(IOUtils.readIcon("/com/fr/design/images/buttonicon/add.png"));
        cellElementEditButton.addMouseListener(new MouseAdapter() {

            @Override
--- a/designer/src/com/fr/quickeditor/cellquick/CellBiasTextPainterEditor.java
+++ b/designer/src/com/fr/quickeditor/cellquick/CellBiasTextPainterEditor.java
@ -1,39 +1,39 @@
 package com.fr.quickeditor.cellquick;

-import com.fr.base.BaseUtils;
 import com.fr.design.cell.editor.BiasTextPainterCellEditor.BiasTextPainterPane;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.general.ComparatorUtils;
+import com.fr.general.IOUtils;
 import com.fr.general.Inter;
 import com.fr.quickeditor.CellQuickEditor;
 import com.fr.report.cell.painter.BiasTextPainter;

 import javax.swing.*;
+import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;

 /**
 * 单元格元素斜线编辑器
- * TODO 9.0 大体没有改动
 */
 public class CellBiasTextPainterEditor extends CellQuickEditor {

    @Override
    public JComponent createCenterBody() {
-        UIButton editbutton = new UIButton(Inter.getLocText("Edit"), BaseUtils.readIcon("/com/fr/design/images/m_insert/bias.png"));
-        editbutton.addActionListener(new ActionListener() {
-
+        JPanel content = new JPanel(new BorderLayout());
+        content.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 15));
+        UIButton editButton = new UIButton(Inter.getLocText("Edit"), IOUtils.readIcon("/com/fr/design/images/m_insert/bias.png"));
+        editButton.addActionListener(new ActionListener() {
            @Override
            public void actionPerformed(ActionEvent e) {
                showEditingDialog();
            }
        });
-        editbutton.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 0));
-        editbutton.setMargin(null);
-        editbutton.setOpaque(false);
-        return editbutton;
+        editButton.setOpaque(false);
+        content.add(editButton, BorderLayout.CENTER);
+        return content;
    }

    private void showEditingDialog() {
@ -56,8 +56,6 @@ public class CellBiasTextPainterEditor extends CellQuickEditor {

    @Override
    protected void refreshDetails() {
-        // TODO Auto-generated method stub
-
    }

 }
--- a/designer/src/com/fr/quickeditor/cellquick/CellDSColumnEditor.java
+++ b/designer/src/com/fr/quickeditor/cellquick/CellDSColumnEditor.java
--- a/designer/src/com/fr/quickeditor/cellquick/CellFormulaQuickEditor.java
+++ b/designer/src/com/fr/quickeditor/cellquick/CellFormulaQuickEditor.java
@ -0,0 +1,152 @@
+package com.fr.quickeditor.cellquick;
+
+import com.fr.base.Formula;
+import com.fr.base.Style;
+import com.fr.base.TextFormat;
+import com.fr.design.gui.itextfield.UITextField;
+import com.fr.grid.selection.CellSelection;
+import com.fr.quickeditor.CellQuickEditor;
+import com.fr.report.ReportHelper;
+import com.fr.report.cell.DefaultTemplateCellElement;
+import com.fr.stable.ColumnRow;
+import com.fr.stable.StringUtils;
+
+import javax.swing.*;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+import java.awt.*;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+
+/**
+ * 公式快速编辑面板，同文本数字编辑拆分
+ *
+ * @author yaoh.wu
+ * @version 2017年8月7日10点44分
+ * @since 9.0
+ */
+public class CellFormulaQuickEditor extends CellQuickEditor {
+    //文本域
+    private UITextField stringTextField;
+    //编辑状态
+    private boolean isEditing = false;
+
+    //编辑的是公式,要保留公式里的这些属性,不然在公式和字符串转化时,就会丢失这些属性设置。
+    private boolean reserveInResult = false;
+    private boolean reserveOnWriteOrAnaly = true;
+
+    private DocumentListener documentListener = new DocumentListener() {
+        @Override
+        public void insertUpdate(DocumentEvent e) {
+            changeReportPaneCell(stringTextField.getText().trim());
+        }
+
+        @Override
+        public void removeUpdate(DocumentEvent e) {
+            changeReportPaneCell(stringTextField.getText().trim());
+        }
+
+        @Override
+        public void changedUpdate(DocumentEvent e) {
+            changeReportPaneCell(stringTextField.getText().trim());
+        }
+
+    };
+
+    private CellFormulaQuickEditor() {
+        super();
+    }
+
+    /**
+     * 详细信息面板
+     */
+    @Override
+    public JComponent createCenterBody() {
+        JPanel content = new JPanel(new BorderLayout());
+        content.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 15));
+        stringTextField = new UITextField();
+        stringTextField.addKeyListener(new KeyAdapter() {
+            @Override
+            public void keyReleased(KeyEvent e) {
+                if (tc != null) {
+                    tc.getGrid().dispatchEvent(e);
+                }
+            }
+        });
+        content.add(stringTextField, BorderLayout.CENTER);
+        return content;
+    }
+
+
+    private void changeReportPaneCell(String tmpText) {
+        isEditing = true;
+        //refresh一下，如果单元格内有新添加的控件，此时并不知道
+        CellSelection cs1 = (CellSelection) tc.getSelection();
+        ColumnRow columnRow = ColumnRow.valueOf(cs1.getColumn(), cs1.getRow());
+        columnRowTextField.setText(columnRow.toString());
+        cellElement = tc.getEditingElementCase().getTemplateCellElement(cs1.getColumn(), cs1.getRow());
+
+        if (cellElement == null) {
+            CellSelection cs = (CellSelection) tc.getSelection();
+            cellElement = new DefaultTemplateCellElement(cs.getColumn(), cs.getRow());
+            tc.getEditingElementCase().addCellElement(cellElement, false);
+        }
+        if (tmpText != null && (tmpText.length() > 0 && tmpText.charAt(0) == '=')) {
+            Formula textFormula = new Formula(tmpText);
+            textFormula.setReserveInResult(reserveInResult);
+            textFormula.setReserveOnWriteOrAnaly(reserveOnWriteOrAnaly);
+            cellElement.setValue(textFormula);
+        } else {
+            Style style = cellElement.getStyle();
+            if (style != null && style.getFormat() != null && style.getFormat() == TextFormat.getInstance()) {
+                cellElement.setValue(tmpText);
+            } else {
+                cellElement.setValue(ReportHelper.convertGeneralStringAccordingToExcel(tmpText));
+            }
+        }
+        fireTargetModified();
+        stringTextField.requestFocus();
+        isEditing = false;
+    }
+
+    /**
+     * 刷新详细内容
+     */
+    @Override
+    protected void refreshDetails() {
+        String str;
+        if (cellElement == null) {
+            str = StringUtils.EMPTY;
+        } else {
+            Object value = cellElement.getValue();
+            if (value == null) {
+                str = StringUtils.EMPTY;
+            } else if (value instanceof Formula) {
+                Formula formula = (Formula) value;
+                str = formula.getContent();
+                reserveInResult = formula.isReserveInResult();
+                reserveOnWriteOrAnaly = formula.isReserveOnWriteOrAnaly();
+            } else {
+                str = value.toString();
+            }
+        }
+        showText(str);
+        stringTextField.setEditable(tc.isSelectedOneCell());
+    }
+
+    /**
+     * 显示文本
+     *
+     * @param str 文本
+     */
+    public void showText(String str) {
+        // 正在编辑时不处理
+        if (isEditing) {
+            return;
+        }
+        stringTextField.getDocument().removeDocumentListener(documentListener);
+        stringTextField.setText(str);
+        stringTextField.getDocument().addDocumentListener(documentListener);
+    }
+
+}
--- a/designer/src/com/fr/quickeditor/cellquick/CellImageQuickEditor.java
+++ b/designer/src/com/fr/quickeditor/cellquick/CellImageQuickEditor.java
@ -1,33 +1,28 @@
 package com.fr.quickeditor.cellquick;

-import com.fr.base.BaseUtils;
 import com.fr.base.Style;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.report.SelectImagePane;
 import com.fr.general.ComparatorUtils;
+import com.fr.general.IOUtils;
 import com.fr.general.Inter;
 import com.fr.quickeditor.CellQuickEditor;
 import com.fr.report.cell.cellattr.CellImage;

 import javax.swing.*;
+import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;

 /**
 * 单元格元素图片编辑器
- * TODO 9.0大体上没有改动
+ *
+ * @author yaoh.wu
+ * @version 2017年8月7日10点53分
 */
 public class CellImageQuickEditor extends CellQuickEditor {
-    private static CellImageQuickEditor THIS;
-
-    public static final CellImageQuickEditor getInstance() {
-        if (THIS == null) {
-            THIS = new CellImageQuickEditor();
-        }
-        return THIS;
-    }

    private CellImageQuickEditor() {
        super();
@ -35,27 +30,27 @@ public class CellImageQuickEditor extends CellQuickEditor {

    @Override
    public JComponent createCenterBody() {
-        UIButton editbutton = new UIButton(Inter.getLocText("Edit"), BaseUtils.readIcon("/com/fr/design/images/m_insert/image.png"));
-        editbutton.addActionListener(new ActionListener() {
-
+        JPanel content = new JPanel(new BorderLayout());
+        content.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 15));
+        UIButton editButton = new UIButton(Inter.getLocText("Edit"), IOUtils.readIcon("/com/fr/design/images/m_insert/image.png"));
+        editButton.addActionListener(new ActionListener() {
            @Override
            public void actionPerformed(ActionEvent e) {
                showEditingDialog();
            }
        });
-        editbutton.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 0));
-        editbutton.setMargin(null);
-        editbutton.setOpaque(false);
-        return editbutton;
+        editButton.setOpaque(false);
+        content.add(editButton, BorderLayout.CENTER);
+        return content;
    }

+    @SuppressWarnings("Duplicates")
    private void showEditingDialog() {
        final SelectImagePane imageEditorPane = new SelectImagePane();
        imageEditorPane.populate(cellElement);
        final Object oldValue = cellElement.getValue();
        final Style oldStyle = cellElement.getStyle();
        imageEditorPane.showWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() {
-
            @Override
            public void doOk() {
                CellImage cellImage = imageEditorPane.update();
@ -65,7 +60,6 @@ public class CellImageQuickEditor extends CellQuickEditor {
                    fireTargetModified();
                }
            }
-
        }).setVisible(true);
    }

--- a/designer/src/com/fr/quickeditor/cellquick/CellRichTextEditor.java
+++ b/designer/src/com/fr/quickeditor/cellquick/CellRichTextEditor.java
@ -6,45 +6,37 @@ import com.fr.general.Inter;
 import com.fr.quickeditor.CellQuickEditor;

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

 /**
 * 单元格元素富文本编辑器
- * TODO 9.0 大体上没有改动
+ *
+ * @author yaoh.wu
+ * @version 2017年8月7日10点53分
 */
 public class CellRichTextEditor extends CellQuickEditor {
-    private UIButton subReportButton;
-    private static CellRichTextEditor THIS;
-
-    public static final CellRichTextEditor getInstance() {
-        if (THIS == null) {
-            THIS = new CellRichTextEditor();
-        }
-        return THIS;
-    }
+    private UIButton richTextButton;

    private CellRichTextEditor() {
        super();
    }

-    /**
-     * 创建界面上中间的部分
-     *
-     * @return 界面元素
-     * @date 2014-12-7-下午9:41:52
-     */
+    @SuppressWarnings("Duplicates")
+    @Override
    public JComponent createCenterBody() {
-        subReportButton = new UIButton();
-        subReportButton.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 0));
-        subReportButton.setMargin(null);
-        subReportButton.setOpaque(false);
-        return subReportButton;
+        JPanel content = new JPanel(new BorderLayout());
+        content.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 15));
+        richTextButton = new UIButton();
+        richTextButton.setOpaque(false);
+        content.add(richTextButton, BorderLayout.CENTER);
+        return content;
    }

    @Override
    protected void refreshDetails() {
        RichTextCellAction subReportCellAction = new RichTextCellAction(tc);
        subReportCellAction.setName(Inter.getLocText("FR-Designer_RichTextEditor"));
-        subReportButton.setAction(subReportCellAction);
+        richTextButton.setAction(subReportCellAction);
    }

 }
--- a/designer/src/com/fr/quickeditor/cellquick/CellStringQuickEditor.java
+++ b/designer/src/com/fr/quickeditor/cellquick/CellStringQuickEditor.java
@ -14,6 +14,7 @@ import com.fr.stable.StringUtils;
 import javax.swing.*;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
+import java.awt.*;
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;

@ -21,20 +22,12 @@ import java.awt.event.KeyEvent;
 *
 */
 public class CellStringQuickEditor extends CellQuickEditor {
-    //instance
-    private static CellStringQuickEditor THIS;
    //文本域
    //TODO 9.0 文本域要根据具体文本数量自适应大小，比较难搞，先跳过。
    private UITextField stringTextField;
    //编辑状态
    private boolean isEditing = false;

-    public static CellStringQuickEditor getInstance() {
-        if (THIS == null) {
-            THIS = new CellStringQuickEditor();
-        }
-        return THIS;
-    }

    //august：如果是原来编辑的是公式,要保留公式里的这些属性,不然在公式和字符串转化时,就会丢失这些属性设置。
    private boolean reserveInResult = false;
@ -64,10 +57,12 @@ public class CellStringQuickEditor extends CellQuickEditor {

    /**
     * 详细信息面板
-     * todo 文本框可自适应大小，公式编辑也是在这边，如果是公式那么要加一个公式编辑器的触发按钮
+     * todo 文本框可自适应大小，公式编辑新写一个
     */
    @Override
    public JComponent createCenterBody() {
+        JPanel content = new JPanel(new BorderLayout());
+        content.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 15));
        stringTextField = new UITextField();
        stringTextField.addKeyListener(new KeyAdapter() {
            @Override
@ -77,7 +72,8 @@ public class CellStringQuickEditor extends CellQuickEditor {
                }
            }
        });
-        return stringTextField;
+        content.add(stringTextField, BorderLayout.CENTER);
+        return content;
    }


--- a/designer/src/com/fr/quickeditor/cellquick/CellSubReportEditor.java
+++ b/designer/src/com/fr/quickeditor/cellquick/CellSubReportEditor.java
@ -6,33 +6,31 @@ import com.fr.general.Inter;
 import com.fr.quickeditor.CellQuickEditor;

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

 /**
 * 单元格元素子报表编辑器
- * TODO 9.0大体上没有改动
+ *
+ * @author yaoh.wu
+ * @version 2017年8月7日10点53分
 */
 public class CellSubReportEditor extends CellQuickEditor {
    private UIButton subReportButton;
-    private static CellSubReportEditor THIS;

-    public static final CellSubReportEditor getInstance() {
-        if (THIS == null) {
-            THIS = new CellSubReportEditor();
-        }
-        return THIS;
-    }

    private CellSubReportEditor() {
        super();
    }

+    @SuppressWarnings("Duplicates")
    @Override
    public JComponent createCenterBody() {
+        JPanel content = new JPanel(new BorderLayout());
+        content.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 15));
        subReportButton = new UIButton();
-        subReportButton.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 0));
-        subReportButton.setMargin(null);
        subReportButton.setOpaque(false);
-        return subReportButton;
+        content.add(subReportButton, BorderLayout.CENTER);
+        return content;
    }

    @Override
--- a/designer_base/src/com/fr/design/constants/UIConstants.java
+++ b/designer_base/src/com/fr/design/constants/UIConstants.java
@ -154,7 +154,7 @@ public interface UIConstants {
    public static final Color BARNOMAL = new Color(232, 232, 233);
    public static final Color COMPONENT_BACKGROUND_COLOR = new Color(237,237,238);
    public static final int ARC = 0;
-    public static final int BUTTON_GROUP_ARC = 6;
+    public static final int BUTTON_GROUP_ARC = 0;
    public static final int LARGEARC = 6;
    public static final Stroke BS = new BasicStroke(1f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_ROUND, 2f, new float[]{3, 1}, 0);
    public static final Icon PREVIEW_DOWN = BaseUtils.readIcon("com/fr/design/images/buttonicon/prevew_down_icon.png");
--- a/designer_base/src/com/fr/design/gui/frpane/ReportletParameterViewPane.java
+++ b/designer_base/src/com/fr/design/gui/frpane/ReportletParameterViewPane.java
@ -23,6 +23,7 @@ import java.util.List;
 /**
 * Defin hyperlink.
 * in fact,this is a TablEditorPane
+ *
 * @editor zhou
 * @since 2012-3-23下午3:48:10
 */
@ -53,6 +54,7 @@ public class ReportletParameterViewPane extends BasicPane {

    /**
     * 初始化组件
+     *
     * @param actions     Chart的热点链接actions
     * @param useParaType 类型
     */
@ -63,8 +65,8 @@ public class ReportletParameterViewPane extends BasicPane {
            ParameterTableModel model = new ParameterTableModel(valueEditorPane, valueRenderPane, this) {
                @Override
                public UITableEditAction[] createAction() {
-					UITableEditAction[] tableEditActions = new UITableEditAction[] { new AddChartParameterAction(), new DeleteAction(this.component),
-							new MoveUpAction(), new MoveDownAction() };
+                    UITableEditAction[] tableEditActions = new UITableEditAction[]{new AddChartParameterAction(), new DeleteAction(this.component),
+                            new MoveUpAction(), new MoveDownAction()};
                    return (UITableEditAction[]) ArrayUtils.addAll(tableEditActions, actions);
                }
            };
@ -84,6 +86,7 @@ public class ReportletParameterViewPane extends BasicPane {

    /**
     * 增加事件监听
+     *
     * @param l 加的东东
     */
    public void addTableEditorListener(TableModelListener l) {
@ -117,8 +120,14 @@ public class ReportletParameterViewPane extends BasicPane {
        return editorPane.update();
    }

+    public void update(List list) {
+        editorPane.update(list);
+    }
+
+
    /**
     * 更新
+     *
     * @return 数组
     */
    public KV[] updateKV() {
@ -128,7 +137,7 @@ public class ReportletParameterViewPane extends BasicPane {
        for (int i = 0; i < length; i++) {
            kv[i] = new KV();
            kv[i].setKey(list.get(i).getName());
-			kv[i].setValue( list.get(i).getValue());
+            kv[i].setValue(list.get(i).getValue());
        }
        return kv;
    }
--- a/designer_base/src/com/fr/design/gui/frpane/TreeSettingPane.java
+++ b/designer_base/src/com/fr/design/gui/frpane/TreeSettingPane.java
@ -52,6 +52,7 @@ public class TreeSettingPane extends BasicPane implements DataCreatorUI {
 	private void initComponents(boolean isEditor) {
 		this.setLayout(FRGUIPaneFactory.createBorderLayout());
 		JPanel buildWayPanel= FRGUIPaneFactory.createMediumHGapFlowInnerContainer_M_Pane();
+		buildWayPanel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
 		UILabel buildWayLabel = new UILabel(Inter.getLocText("FR-Designer_Build-Way") + " ：");
 		buildWayPanel.add(buildWayLabel);
 		buildBox = new UIComboBox(buildWay);
--- a/designer_base/src/com/fr/design/gui/ibutton/UIButtonGroup.java
+++ b/designer_base/src/com/fr/design/gui/ibutton/UIButtonGroup.java
@ -153,14 +153,13 @@ public class UIButtonGroup<T> extends JPanel implements GlobalNameObserver {
    }

    protected void initButton(UIToggleButton labelButton) {
-        labelButton.setRoundBorder(true);
        labelButton.setBorderPainted(false);
        labelButtonList.add(labelButton);
        this.add(labelButton);
    }

    protected Border getGroupBorder() {
-        return BorderFactory.createEmptyBorder(1, 1, 1, 1);
+        return BorderFactory.createEmptyBorder(0, 0, 0, 0);
    }

    protected LayoutManager getGridLayout(int number) {
--- a/designer_base/src/com/fr/design/gui/itableeditorpane/UITableEditorPane.java
+++ b/designer_base/src/com/fr/design/gui/itableeditorpane/UITableEditorPane.java
@ -1,12 +1,12 @@
 package com.fr.design.gui.itableeditorpane;

-import com.fr.design.constants.UIConstants;
 import com.fr.design.border.UIRoundedBorder;
+import com.fr.design.constants.UIConstants;
+import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.dialog.BasicPane;
 import com.fr.general.Inter;

 import javax.swing.*;
@ -61,11 +61,11 @@ public class UITableEditorPane<T> extends BasicPane {

    }

-    public  UITableModelAdapter<T> getTableModel(){
+    public UITableModelAdapter<T> getTableModel() {
        return tableModel;
    }

-    private void initbuttonPane(UITableEditAction[] action){
+    private void initbuttonPane(UITableEditAction[] action) {
        buttonPane = new JPanel();

        if (action != null) {
@ -87,6 +87,7 @@ public class UITableEditorPane<T> extends BasicPane {

    /**
     * 增加事件监听
+     *
     * @param l 加的东东
     */
    public void addTableListener(TableModelListener l) {
@ -95,6 +96,7 @@ public class UITableEditorPane<T> extends BasicPane {

    /**
     * 移除事件监听
+     *
     * @param l 去的东东
     */
    public void removeTableListener(TableModelListener l) {
@ -108,7 +110,7 @@ public class UITableEditorPane<T> extends BasicPane {

    public void populate(T[] objs) {
        tableModel.clear();
-		if(objs==null){
+        if (objs == null) {
            return;
        }
        for (T obj : objs) {
@ -126,6 +128,11 @@ public class UITableEditorPane<T> extends BasicPane {
        return tableModel.getList();
    }

+    public void update(List list) {
+        tableModel.stopCellEditing();
+        tableModel.setList(list);
+    }
+
    public int getSelectedRow() {
        return this.editTable.getSelectedRow();
    }
@ -134,7 +141,7 @@ public class UITableEditorPane<T> extends BasicPane {
        return this.editTable.getSelectedColumn();
    }

-    public JPanel getbuttonPane(){
+    public JPanel getbuttonPane() {
        return buttonPane;
    }

--- a/designer_base/src/com/fr/design/gui/itree/refreshabletree/TreeRootPane.java
+++ b/designer_base/src/com/fr/design/gui/itree/refreshabletree/TreeRootPane.java
@ -9,7 +9,6 @@ import javax.swing.JPanel;

 import com.fr.data.impl.TreeAttr;
 import com.fr.design.gui.icheckbox.UICheckBox;
-import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.dialog.BasicPane;
 import com.fr.general.Inter;
@ -18,10 +17,10 @@ public class TreeRootPane extends BasicPane {
 	
 	// 是否支持多选(checkBoxTree)
 	//private JCheckBox multipleSelection;
-	private UIComboBox checkTypeComboBox;
+	private UICheckBox checkTypeCheckBox;
 	
 	// richer:加载的方式，支持异步加载和完全加载
-	private UIComboBox loadTypeComboBox;
+	private UICheckBox loadTypeCheckBox;
 	
 	private UICheckBox layerTypeCheckBox;

@ -30,30 +29,25 @@ public class TreeRootPane extends BasicPane {
 	public TreeRootPane() {
 		this.setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));

-		JPanel checkTypePane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
-		checkTypePane.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 0));
-		checkTypePane.add(new UILabel(Inter.getLocText("Tree-Mutiple_Selection_Or_Not") + ":"));
-		checkTypeComboBox = new UIComboBox(new String[] {Inter.getLocText("Yes"), Inter.getLocText("No")});
-		checkTypePane.add(checkTypeComboBox);
+		JPanel checkTypePane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane_First0();
+		checkTypePane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
+		checkTypeCheckBox = new UICheckBox(Inter.getLocText("Tree-Mutiple_Selection_Or_Not"));
+		checkTypePane.add(checkTypeCheckBox);
 		this.add(checkTypePane);

-		JPanel loadTypePane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
-		loadTypePane.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 0));
-		loadTypePane.add(new UILabel(Inter.getLocText("Widget-Load_Type") + ":"));
-		loadTypeComboBox = new UIComboBox(new String[]{Inter.getLocText("Widget-Load_By_Async"), Inter.getLocText("Widget-Load_By_Complete")});
-		loadTypePane.add(loadTypeComboBox);
+		JPanel loadTypePane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane_First0();
+		checkTypePane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
+		loadTypeCheckBox = new UICheckBox(Inter.getLocText("Widget-Load_By_Async"));
+		loadTypePane.add(loadTypeCheckBox);
 		this.add(loadTypePane);

-		JPanel leafSelectPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
-		leafSelectPane.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 0));
+		JPanel leafSelectPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane_First0();
+		checkTypePane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
 		leafSelectPane.add(layerTypeCheckBox = new UICheckBox(Inter.getLocText("Tree-Select_Leaf_Only")));
-		UILabel tips = new UILabel(Inter.getLocText("Tree-Select_Leaf_Only_Tips"));
-		tips.setForeground(new Color(147, 178, 233));
-		leafSelectPane.add(tips);
 		this.add(leafSelectPane);

-        JPanel returnFullPathPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
-        returnFullPathPane.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 0));
+        JPanel returnFullPathPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane_First0();
+		checkTypePane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
 		returnFullPathPane.add(returnFullPathCheckBox = new UICheckBox(Inter.getLocText("Tree-Return_Full_Path")));
        this.add(returnFullPathPane);

@ -65,16 +59,16 @@ public class TreeRootPane extends BasicPane {
 	}
 	
 	public void populate(TreeAttr treeAttr) {
-		checkTypeComboBox.setSelectedIndex(treeAttr.isMultipleSelection() ? 0 : 1);
-		loadTypeComboBox.setSelectedIndex(treeAttr.isAjax() ? 0 : 1);
+		checkTypeCheckBox.setSelected(treeAttr.isMultipleSelection());
+		loadTypeCheckBox.setSelected(treeAttr.isAjax());
 		layerTypeCheckBox.setSelected(treeAttr.isSelectLeafOnly());
        returnFullPathCheckBox.setSelected(treeAttr.isReturnFullPath());
 	}

 	public TreeAttr update() {
 		TreeAttr treeAttr = new TreeAttr();
-		treeAttr.setMultipleSelection(checkTypeComboBox.getSelectedIndex() == 0);
-		treeAttr.setAjax(loadTypeComboBox.getSelectedIndex() == 0);
+		treeAttr.setMultipleSelection(checkTypeCheckBox.isSelected());
+		treeAttr.setAjax(loadTypeCheckBox.isSelected());
 		treeAttr.setSelectLeafOnly(layerTypeCheckBox.isSelected());
        treeAttr.setReturnFullPath(returnFullPathCheckBox.isSelected());

--- a/designer_base/src/com/fr/design/images/arrow/arrow_down.png
+++ b/designer_base/src/com/fr/design/images/arrow/arrow_down.png
--- a/designer_base/src/com/fr/design/images/arrow/arrow_up.png
+++ b/designer_base/src/com/fr/design/images/arrow/arrow_up.png
--- a/designer_base/src/com/fr/design/images/buttonicon/add.png
+++ b/designer_base/src/com/fr/design/images/buttonicon/add.png
--- a/designer_base/src/com/fr/design/images/buttonicon/add_press.png
+++ b/designer_base/src/com/fr/design/images/buttonicon/add_press.png
--- a/designer_base/src/com/fr/design/images/buttonicon/addicon.png
+++ b/designer_base/src/com/fr/design/images/buttonicon/addicon.png
--- a/designer_base/src/com/fr/design/images/buttonicon/cube.png
+++ b/designer_base/src/com/fr/design/images/buttonicon/cube.png
--- a/designer_base/src/com/fr/design/images/buttonicon/editp.png
+++ b/designer_base/src/com/fr/design/images/buttonicon/editp.png
--- a/designer_base/src/com/fr/design/images/buttonicon/hiden.png
+++ b/designer_base/src/com/fr/design/images/buttonicon/hiden.png
--- a/designer_base/src/com/fr/design/images/buttonicon/hidep.png
+++ b/designer_base/src/com/fr/design/images/buttonicon/hidep.png
--- a/designer_base/src/com/fr/design/images/buttonicon/minus.png
+++ b/designer_base/src/com/fr/design/images/buttonicon/minus.png
--- a/designer_base/src/com/fr/design/images/buttonicon/newcpts.png
+++ b/designer_base/src/com/fr/design/images/buttonicon/newcpts.png
--- a/designer_base/src/com/fr/design/images/buttonicon/open.png
+++ b/designer_base/src/com/fr/design/images/buttonicon/open.png
--- a/designer_base/src/com/fr/design/images/buttonicon/pageb24.png
+++ b/designer_base/src/com/fr/design/images/buttonicon/pageb24.png
--- a/designer_base/src/com/fr/design/images/buttonicon/pages.png
+++ b/designer_base/src/com/fr/design/images/buttonicon/pages.png
--- a/designer_base/src/com/fr/design/images/buttonicon/plus.png
+++ b/designer_base/src/com/fr/design/images/buttonicon/plus.png
--- a/designer_base/src/com/fr/design/images/buttonicon/redo.png
+++ b/designer_base/src/com/fr/design/images/buttonicon/redo.png
--- a/designer_base/src/com/fr/design/images/buttonicon/refresh.png
+++ b/designer_base/src/com/fr/design/images/buttonicon/refresh.png
--- a/designer_base/src/com/fr/design/images/buttonicon/run24.png
+++ b/designer_base/src/com/fr/design/images/buttonicon/run24.png
--- a/designer_base/src/com/fr/design/images/buttonicon/undo.png
+++ b/designer_base/src/com/fr/design/images/buttonicon/undo.png
--- a/designer_base/src/com/fr/design/images/buttonicon/writeb24.png
+++ b/designer_base/src/com/fr/design/images/buttonicon/writeb24.png
--- a/designer_base/src/com/fr/design/images/buttonicon/writes.png
+++ b/designer_base/src/com/fr/design/images/buttonicon/writes.png
--- a/designer_base/src/com/fr/design/images/chart/ChartStyle.png
+++ b/designer_base/src/com/fr/design/images/chart/ChartStyle.png
--- a/designer_base/src/com/fr/design/images/chart/ChartType.png
+++ b/designer_base/src/com/fr/design/images/chart/ChartType.png
--- a/designer_base/src/com/fr/design/images/chart/InterAttr.png
+++ b/designer_base/src/com/fr/design/images/chart/InterAttr.png
--- a/designer_base/src/com/fr/design/images/control/addPopup.png
+++ b/designer_base/src/com/fr/design/images/control/addPopup.png
--- a/designer_base/src/com/fr/design/images/control/bar.png
+++ b/designer_base/src/com/fr/design/images/control/bar.png
--- a/designer_base/src/com/fr/design/images/control/copy.png
+++ b/designer_base/src/com/fr/design/images/control/copy.png
--- a/designer_base/src/com/fr/design/images/control/edit.png
+++ b/designer_base/src/com/fr/design/images/control/edit.png
--- a/designer_base/src/com/fr/design/images/control/remove.png
+++ b/designer_base/src/com/fr/design/images/control/remove.png
--- a/designer_base/src/com/fr/design/images/dashboard/files.png
+++ b/designer_base/src/com/fr/design/images/dashboard/files.png
--- a/designer_base/src/com/fr/design/images/data/bind/distanceconnect.png
+++ b/designer_base/src/com/fr/design/images/data/bind/distanceconnect.png
--- a/designer_base/src/com/fr/design/images/data/bind/localconnect.png
+++ b/designer_base/src/com/fr/design/images/data/bind/localconnect.png
--- a/designer_base/src/com/fr/design/images/data/dataDictionary.png
+++ b/designer_base/src/com/fr/design/images/data/dataDictionary.png
--- a/designer_base/src/com/fr/design/images/data/dataTable.png
+++ b/designer_base/src/com/fr/design/images/data/dataTable.png
--- a/designer_base/src/com/fr/design/images/data/dock/serverdatabase.png
+++ b/designer_base/src/com/fr/design/images/data/dock/serverdatabase.png
--- a/designer_base/src/com/fr/design/images/data/multi.png
+++ b/designer_base/src/com/fr/design/images/data/multi.png
--- a/designer_base/src/com/fr/design/images/data/source/rename.png
+++ b/designer_base/src/com/fr/design/images/data/source/rename.png
--- a/designer_base/src/com/fr/design/images/file/fold.png
+++ b/designer_base/src/com/fr/design/images/file/fold.png
--- a/designer_base/src/com/fr/design/images/file/newfolder.png
+++ b/designer_base/src/com/fr/design/images/file/newfolder.png
--- a/designer_base/src/com/fr/design/images/form/toolbar/ec_frozen.png
+++ b/designer_base/src/com/fr/design/images/form/toolbar/ec_frozen.png
--- a/designer_base/src/com/fr/design/images/gui/color/background.png
+++ b/designer_base/src/com/fr/design/images/gui/color/background.png
--- a/designer_base/src/com/fr/design/images/lookandfeel/ErrorIcon.png
+++ b/designer_base/src/com/fr/design/images/lookandfeel/ErrorIcon.png
--- a/designer_base/src/com/fr/design/images/lookandfeel/InformationIcon.png
+++ b/designer_base/src/com/fr/design/images/lookandfeel/InformationIcon.png
--- a/designer_base/src/com/fr/design/images/lookandfeel/QuestionIcon.png
+++ b/designer_base/src/com/fr/design/images/lookandfeel/QuestionIcon.png
--- a/designer_base/src/com/fr/design/images/lookandfeel/TreeFolderOpenedIcon.png
+++ b/designer_base/src/com/fr/design/images/lookandfeel/TreeFolderOpenedIcon.png
--- a/designer_base/src/com/fr/design/images/lookandfeel/WarningIcon.png
+++ b/designer_base/src/com/fr/design/images/lookandfeel/WarningIcon.png
--- a/designer_base/src/com/fr/design/images/m_edit/copy.png
+++ b/designer_base/src/com/fr/design/images/m_edit/copy.png
--- a/designer_base/src/com/fr/design/images/m_edit/cut.png
+++ b/designer_base/src/com/fr/design/images/m_edit/cut.png
--- a/designer_base/src/com/fr/design/images/m_edit/formatBrush.png
+++ b/designer_base/src/com/fr/design/images/m_edit/formatBrush.png
--- a/designer_base/src/com/fr/design/images/m_edit/merge.png
+++ b/designer_base/src/com/fr/design/images/m_edit/merge.png
--- a/designer_base/src/com/fr/design/images/m_edit/unmerge.png
+++ b/designer_base/src/com/fr/design/images/m_edit/unmerge.png
--- a/designer_base/src/com/fr/design/images/m_file/formExport.png
+++ b/designer_base/src/com/fr/design/images/m_file/formExport.png
--- a/designer_base/src/com/fr/design/images/m_file/pdf.png
+++ b/designer_base/src/com/fr/design/images/m_file/pdf.png
--- a/designer_base/src/com/fr/design/images/m_file/preview.png
+++ b/designer_base/src/com/fr/design/images/m_file/preview.png
--- a/designer_base/src/com/fr/design/images/m_file/saveAs.png
+++ b/designer_base/src/com/fr/design/images/m_file/saveAs.png
--- a/designer_base/src/com/fr/design/images/m_file/switch.png
+++ b/designer_base/src/com/fr/design/images/m_file/switch.png
--- a/designer_base/src/com/fr/design/images/m_file/text.png
+++ b/designer_base/src/com/fr/design/images/m_file/text.png
--- a/designer_base/src/com/fr/design/images/m_file/view_folder.png
+++ b/designer_base/src/com/fr/design/images/m_file/view_folder.png
--- a/designer_base/src/com/fr/design/images/m_file/word.png
+++ b/designer_base/src/com/fr/design/images/m_file/word.png
--- a/designer_base/src/com/fr/design/images/m_format/cellstyle/bold.png
+++ b/designer_base/src/com/fr/design/images/m_format/cellstyle/bold.png
--- a/Show More
+++ b/Show More