Merge branch 'release/9.0' of http://www.finedevelop.com:2015/scm/~kerry/design into release/9.0

designer/src/com/fr/design/actions/file/export/AbstractExportAction.java

@@ -72,7 +72,7 @@ public abstract class AbstractExportAction extends JWorkBookAction {
         }
 
         // Choose a file name....
-        FILEChooserPane fileChooserPane = FILEChooserPane.getInstance(true, true);
+        FILEChooserPane fileChooserPane = FILEChooserPane.getInstance(false, true);
         fileChooserPane.setFILEFilter(this.getChooseFileFilter());
 
         // 打开文件后输出文件名修改，eg：w.cpt.doc / w.svg.doc，去掉中间的后缀名~~ w.doc

designer/src/com/fr/design/mainframe/CellWidgetPropertyPane.java

@@ -97,7 +97,6 @@ public class CellWidgetPropertyPane extends BasicPane {
         TemplateCellElement editCellElement = tplEC.getTemplateCellElement(cs.getColumn(), cs.getRow());
         if (editCellElement == null) {
             editCellElement = new DefaultTemplateCellElement(cs.getColumn(), cs.getRow());
-            tplEC.addCellElement(editCellElement);
         }
         this.cellElement = editCellElement;
         this.populate(editCellElement);

designer/src/com/fr/design/mainframe/SheetNameTabPane.java

@@ -554,10 +554,12 @@ public class SheetNameTabPane extends JComponent implements MouseListener, Mouse
         for (int i = scrollIndex; i <= lastOneIndex; i++) {
             int textWidth = widthArray[i];
             if (evtX >= textX && evtX < textX + textWidth) {
-                if (getSelectedIndex() != i) {
+                boolean needRefreshPropertiesPane = getSelectedIndex() != i;
+                setSelectedIndex(i);
+                if (needRefreshPropertiesPane) {
                     HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().refreshEastPropertiesPane();
                 }
-                setSelectedIndex(i);
+
                 isBlank = false;
                 reportComposite.setComposite();
                 if (isAuthorityEditing) {

designer/src/com/fr/design/mainframe/cell/CellEditorPane.java

@@ -1,6 +1,15 @@
 package com.fr.design.mainframe.cell;
 
-import com.fr.design.dialog.BasicPane;
+import com.fr.design.gui.iscrollbar.UIScrollBar;
+import com.fr.design.mainframe.CellElementPropertyPane;
+import com.fr.quickeditor.cellquick.CellElementBarLayout;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.AdjustmentEvent;
+import java.awt.event.AdjustmentListener;
+import java.awt.event.MouseWheelEvent;
+import java.awt.event.MouseWheelListener;
 
 /**
  * 右侧单元格元素面板抽象类
@@ -9,7 +18,20 @@ import com.fr.design.dialog.BasicPane;
  * @version 2017年7月25日
  * @since 9.0
  */
-public abstract class CellEditorPane extends BasicPane {
+public abstract class CellEditorPane extends JPanel {
+
+    /*滚动条相关配置*/
+    private static final int MAXVALUE = 100;
+    private static final int TITLE_HEIGHT = 95;
+    private static final int CONTENT_PANE_WIDTH_GAP = 3;
+    private static final int SCROLLBAR_WIDTH = 7;
+    private static final int MOUSE_WHEEL_SPEED = 5;
+    private int maxHeight = 280;
+
+    private JPanel leftContentPane;
+    private UIScrollBar scrollBar;
+
+    protected abstract JPanel createContentPane();
 
     public abstract String getIconPath();
 
@@ -22,7 +44,76 @@ public abstract class CellEditorPane extends BasicPane {
 
     /**
      * 更新面板数据
-     *
      */
     public abstract void populate();
+
+    protected void createScrollPane() {
+        leftContentPane = this.createContentPane();
+        this.prepareScrollBar();
+        leftContentPane.setBorder(BorderFactory.createMatteBorder(10, 10, 0, 0, this.getBackground()));
+
+        this.setLayout(new CellElementBarLayout(leftContentPane) {
+            @Override
+            public void layoutContainer(Container parent) {
+                maxHeight = CellElementPropertyPane.getInstance().getHeight() - TITLE_HEIGHT;
+                int beginY;
+                if ((MAXVALUE - scrollBar.getVisibleAmount()) == 0) {
+                    beginY = 0;
+                } else {
+                    int preferredHeight = leftContentPane.getPreferredSize().height;
+                    int value = scrollBar.getValue();
+                    beginY = value * (preferredHeight - maxHeight) / (MAXVALUE - scrollBar.getVisibleAmount());
+                }
+                int width = parent.getWidth();
+                int height = parent.getHeight();
+                if (leftContentPane.getPreferredSize().height > maxHeight) {
+                    leftContentPane.setBounds(0, -beginY, width - SCROLLBAR_WIDTH - CONTENT_PANE_WIDTH_GAP, height + beginY);
+                    scrollBar.setBounds(width - SCROLLBAR_WIDTH - CONTENT_PANE_WIDTH_GAP, 0, SCROLLBAR_WIDTH + CONTENT_PANE_WIDTH_GAP, height);
+                } else {
+                    leftContentPane.setBounds(0, 0, width - SCROLLBAR_WIDTH - CONTENT_PANE_WIDTH_GAP, height);
+                }
+            }
+        });
+        this.add(scrollBar);
+        this.add(leftContentPane);
+    }
+
+
+    private void prepareScrollBar() {
+        scrollBar = new UIScrollBar(UIScrollBar.VERTICAL) {
+            @Override
+            public int getVisibleAmount() {
+                int preferredHeight = leftContentPane.getPreferredSize().height;
+                int e = MAXVALUE * (maxHeight) / preferredHeight;
+                setVisibleAmount(e);
+                return e;
+            }
+
+            @Override
+            public int getMaximum() {
+                return MAXVALUE;
+            }
+        };
+
+        scrollBar.addAdjustmentListener(new AdjustmentListener() {
+
+            @Override
+            public void adjustmentValueChanged(AdjustmentEvent e) {
+                doLayout();
+            }
+        });
+        this.addMouseWheelListener(new MouseWheelListener() {
+
+            @Override
+            public void mouseWheelMoved(MouseWheelEvent e) {
+                int value = scrollBar.getValue();
+                value += MOUSE_WHEEL_SPEED * e.getWheelRotation();
+                scrollBar.setValue(value);
+                doLayout();
+            }
+        });
+        scrollBar.setPreferredSize(new Dimension(SCROLLBAR_WIDTH + CONTENT_PANE_WIDTH_GAP, this.getHeight()));
+        scrollBar.setBlockIncrement(SCROLLBAR_WIDTH + CONTENT_PANE_WIDTH_GAP);
+        scrollBar.setBorder(BorderFactory.createMatteBorder(0, CONTENT_PANE_WIDTH_GAP, 0, 0, this.getBackground()));
+    }
 }

designer/src/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java

@@ -82,7 +82,7 @@ public class CellOtherSetPane extends AbstractCellAttrPane {
         JPanel downPane = new JPanel(new BorderLayout());
         downPane.add(new UIExpandablePane(Inter.getLocText("FR-Designer_Advanced"), HEAD_WDITH, HEAD_HEIGTH, seniorPane()), BorderLayout.NORTH);
         downPane.add(new UIExpandablePane(Inter.getLocText("FR-Designer_Pagination"), HEAD_WDITH, HEAD_HEIGTH, pagePane()), BorderLayout.CENTER);
-        JPanel contentPane = new JPanel(new BorderLayout(0, 10));
+        JPanel contentPane = new JPanel(new BorderLayout(0, 0));
         contentPane.add(new UIExpandablePane(Inter.getLocText("FR-Designer_Basic"), HEAD_WDITH, HEAD_HEIGTH, basicPane()), BorderLayout.NORTH);
         contentPane.add(downPane, BorderLayout.CENTER);
         initAllNames();
@@ -96,13 +96,14 @@ public class CellOtherSetPane extends AbstractCellAttrPane {
         autoHeightCheckBox.setBorder(UIConstants.CELL_ATTR_ZEROBORDER);
         autoWidthCheckBox.setBorder(UIConstants.CELL_ATTR_ZEROBORDER);
         double p = TableLayout.PREFERRED;
-        double[] rowSize = {p, p, p};
+        double[] rowSize = {p, p, p, p};
         double[] columnSize = {p};
-        int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}};
+        int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}, {1, 1}};
         Component[][] components = new Component[][]{
                 new Component[]{null},
                 new Component[]{autoHeightCheckBox},
                 new Component[]{autoWidthCheckBox},
+                new Component[]{null},
         };
         return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_MEDIUM, LayoutConstants.VGAP_LARGE);
 

designer/src/com/fr/design/present/ConditionAttributesGroupPane.java

@@ -80,7 +80,6 @@ public class ConditionAttributesGroupPane extends UIListControlPane {
         editCellElement = tplEC.getTemplateCellElement(cs.getColumn(), cs.getRow());
         if (editCellElement == null) {
             editCellElement = new DefaultTemplateCellElement(cs.getColumn(), cs.getRow());
-            tplEC.addCellElement(editCellElement);
         }
 
         SheetUtils.calculateDefaultParent(tplEC);  // 不知道这行代码的作用，怕去掉之后会出问题，先放在这里

designer/src/com/fr/quickeditor/CellQuickEditor.java

@@ -18,6 +18,7 @@ import com.fr.design.menu.ShortCut;
 import com.fr.design.selection.QuickEditor;
 import com.fr.general.Inter;
 import com.fr.grid.selection.CellSelection;
+import com.fr.quickeditor.cellquick.CellElementBarLayout;
 import com.fr.report.cell.TemplateCellElement;
 import com.fr.stable.ColumnRow;
 
@@ -33,34 +34,145 @@ import java.util.ArrayList;
  */
 public abstract class CellQuickEditor extends QuickEditor<ElementCasePane> {
 
+
+    /*面板配置*/
+    protected UITextField columnRowTextField;
+    protected TemplateCellElement cellElement;
+    /*占位label*/
+    protected static final Dimension LABEL_DIMENSION = new Dimension(60, 20);
+    protected static final UILabel EMPTY_LABEL = new UILabel();
+    protected static final int VGAP = 10, HGAP = 8, VGAP_INNER = 3;
+
+    static {
+        EMPTY_LABEL.setPreferredSize(LABEL_DIMENSION);
+    }
+
     /*滚动条相关配置*/
     private static final int MAXVALUE = 100;
-    private static final int TITLE_HEIGHT = 50;
+    private static final int CONTENT_PANE_WIDTH_GAP = 3;
     private static final int MOUSE_WHEEL_SPEED = 5;
-    private static final int CONTENT_PANE_WIDTH_GAP = 4;
+    private static final int SCROLLBAR_WIDTH = 7;
-    private static final int SCROLLBAR_WIDTH = 8;
     private int maxHeight = 280;
-    /*面板配置*/
+    private static final int TITLE_HEIGHT = 50;
-    protected UITextField columnRowTextField;
+
-    protected TemplateCellElement cellElement;
     private UIComboBox comboBox;
     private UpdateAction[] cellInsertActions;
     private int selectedIndex;
+    private int currentSelectedIndex;
     private JPanel leftContentPane;
     private UIScrollBar scrollBar;
-    /*占位label*/
-    protected static UILabel emptyLabel = new UILabel();
 
-    private int currentSelectedIndex;
+    public CellQuickEditor() {
+        double p = TableLayout.PREFERRED;
+        double f = TableLayout.FILL;
+        double[] columnSize = {p, f};
+        double[] rowSize = {p, p};
+        JComponent centerBody = createCenterBody();
+        JPanel topContent = initTopContent();
+        if (isScrollAll()) {
+            prepareScrollBar();
+            topContent.setBorder(BorderFactory.createMatteBorder(10, 10, 0, 0, this.getBackground()));
+            centerBody.setBorder(BorderFactory.createMatteBorder(0, 10, 0, 0, this.getBackground()));
+            Component[][] components = new Component[][]{
+                    new Component[]{topContent, null},
+                    new Component[]{centerBody, null}
+            };
+            leftContentPane = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, HGAP, VGAP);
+            this.setLayout(new CellElementBarLayout(leftContentPane) {
+                @Override
+                public void layoutContainer(Container parent) {
+                    maxHeight = CellElementPropertyPane.getInstance().getHeight() - TITLE_HEIGHT;
+                    int beginY;
+                    if ((MAXVALUE - scrollBar.getVisibleAmount()) == 0) {
+                        beginY = 0;
+                    } else {
+                        int preferredHeight = leftContentPane.getPreferredSize().height;
+                        int value = scrollBar.getValue();
+                        beginY = value * (preferredHeight - maxHeight) / (MAXVALUE - scrollBar.getVisibleAmount());
+                    }
+                    int width = parent.getWidth();
+                    int height = parent.getHeight();
+                    if (leftContentPane.getPreferredSize().height > maxHeight) {
+                        leftContentPane.setBounds(0, -beginY, width - SCROLLBAR_WIDTH - CONTENT_PANE_WIDTH_GAP, height + beginY);
+                        scrollBar.setBounds(width - SCROLLBAR_WIDTH - CONTENT_PANE_WIDTH_GAP, 0, SCROLLBAR_WIDTH + CONTENT_PANE_WIDTH_GAP, height);
+                    } else {
+                        leftContentPane.setBounds(0, 0, width - SCROLLBAR_WIDTH - CONTENT_PANE_WIDTH_GAP, height);
+                    }
+                    leftContentPane.validate();
+                }
+            });
+            this.add(scrollBar);
+            this.add(leftContentPane);
+        } else {
+            topContent.setBorder(BorderFactory.createMatteBorder(10, 10, 0, 10, this.getBackground()));
+            centerBody.setBorder(BorderFactory.createMatteBorder(0, 0, 0, 0, this.getBackground()));
+            Component[][] components = new Component[][]{
+                    new Component[]{topContent, null},
+                    new Component[]{centerBody, null}
+            };
+            this.setLayout(new BorderLayout());
+            this.add(TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, HGAP, VGAP), BorderLayout.CENTER);
+        }
+    }
 
-    static {
+    /**
-        emptyLabel.setPreferredSize(new Dimension(60, 20));
+     * 初始化详细信息面板
+     *
+     * @return JComponent 待显示的详细信息面板
+     */
+    public abstract JComponent createCenterBody();
+
+    /**
+     * 是否全局具有滚动条
+     *
+     * @return boolean 是否全局具有滚动条
+     */
+    public abstract boolean isScrollAll();
+
+
+    /**
+     * 初始化下拉框中的类型
+     *
+     * @return JComponent 待显示的详细信息面板
+     */
+    public abstract Object getComboBoxSelected();
+
+    /**
+     * 刷新
+     */
+    @Override
+    protected void refresh() {
+        CellSelection cs = (CellSelection) tc.getSelection();
+        ColumnRow columnRow = ColumnRow.valueOf(cs.getColumn(), cs.getRow());
+        columnRowTextField.setText(columnRow.toString());
+        cellElement = tc.getEditingElementCase().getTemplateCellElement(cs.getColumn(), cs.getRow());
+        refreshDetails();
     }
 
-    protected static final int VGAP = 10, HGAP = 8, VGAP_INNER = 3;
+    /**
+     * 刷新详细信息
+     */
+    protected abstract void refreshDetails();
 
-    public CellQuickEditor() {
 
+    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("FR-Designer_Cell"));
+        cellLabel.setPreferredSize(LABEL_DIMENSION);
+        UILabel insertContentLabel = new UILabel(Inter.getLocText("FR-Designer_Insert_Cell_Element"));
+        insertContentLabel.setPreferredSize(LABEL_DIMENSION);
+        UIComboBox cellElementEditComboBox = initCellElementEditComboBox();
+        Component[][] components = new Component[][]{
+                new Component[]{cellLabel, columnRowTextField = initColumnRowTextField()},
+                new Component[]{insertContentLabel, cellElementEditComboBox},
+        };
+        return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, HGAP, VGAP);
+    }
+
+    private void prepareScrollBar() {
         scrollBar = new UIScrollBar(UIScrollBar.VERTICAL) {
             @Override
             public int getVisibleAmount() {
@@ -74,7 +186,6 @@ public abstract class CellQuickEditor extends QuickEditor<ElementCasePane> {
             public int getMaximum() {
                 return MAXVALUE;
             }
-
         };
 
         scrollBar.addAdjustmentListener(new AdjustmentListener() {
@@ -95,43 +206,11 @@ public abstract class CellQuickEditor extends QuickEditor<ElementCasePane> {
             }
         });
 
-        double p = TableLayout.PREFERRED;
+        scrollBar.setPreferredSize(new Dimension(SCROLLBAR_WIDTH + CONTENT_PANE_WIDTH_GAP, this.getHeight()));
-        double f = TableLayout.FILL;
+        scrollBar.setBlockIncrement(SCROLLBAR_WIDTH + CONTENT_PANE_WIDTH_GAP);
-        double[] columnSize = {p, f};
+        scrollBar.setBorder(BorderFactory.createMatteBorder(0, CONTENT_PANE_WIDTH_GAP, 0, 0, this.getBackground()));
-        double[] rowSize = {p, p};
-        JComponent centerBody = createCenterBody();
-        centerBody.setBorder(BorderFactory.createMatteBorder(0, 10, 0, 0, this.getBackground()));
-        Component[][] components = new Component[][]{
-                new Component[]{initTopContent(), null},
-                new Component[]{centerBody, null}
-        };
-        leftContentPane = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, HGAP, VGAP);
-        this.setLayout(new BarLayout());
-        this.add(scrollBar);
-        this.add(leftContentPane);
-    }
-
-
-    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));
-        UIComboBox cellElementEditComboBox = initCellElementEditComboBox();
-        Component[][] components = new Component[][]{
-                new Component[]{cellLabel, columnRowTextField = initColumnRowTextField()},
-                new Component[]{insertContentLabel, cellElementEditComboBox},
-        };
-        JPanel topContent = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, HGAP, VGAP);
-        topContent.setBorder(BorderFactory.createEmptyBorder(10, 10, 0, 0));
-        return topContent;
     }
 
-
     /**
      * 初始化添加按钮
      *
@@ -206,88 +285,4 @@ public abstract class CellQuickEditor extends QuickEditor<ElementCasePane> {
         });
         return columnRowTextField;
     }
-
-
-    /**
-     * 初始化详细信息面板
-     *
-     * @return JComponent 待显示的详细信息面板
-     */
-    public abstract JComponent createCenterBody();
-
-
-    /**
-     * 初始化下拉框中的类型
-     *
-     * @return JComponent 待显示的详细信息面板
-     */
-    public abstract Object getComboBoxSelected();
-
-    /**
-     * 刷新
-     */
-    @Override
-    protected void refresh() {
-        CellSelection cs = (CellSelection) tc.getSelection();
-        ColumnRow columnRow = ColumnRow.valueOf(cs.getColumn(), cs.getRow());
-        columnRowTextField.setText(columnRow.toString());
-        cellElement = tc.getEditingElementCase().getTemplateCellElement(cs.getColumn(), cs.getRow());
-        refreshDetails();
-    }
-
-    /**
-     * 刷新详细信息
-     */
-    protected abstract void refreshDetails();
-
-    /**
-     * 属性面板的滚动条和内容区域的布局管理类
-     * yaoh.wu 由于这边不能继承{@link com.fr.design.mainframe.AbstractAttrPane.BarLayout}，所以冗余了一份滚动条代码进来
-     *
-     * @see com.fr.design.mainframe.AbstractAttrPane.BarLayout
-     */
-    protected class BarLayout implements LayoutManager {
-
-        @Override
-        public void addLayoutComponent(String name, Component comp) {
-
-        }
-
-        @Override
-        public void removeLayoutComponent(Component comp) {
-
-        }
-
-        @Override
-        public Dimension preferredLayoutSize(Container parent) {
-            return leftContentPane.getPreferredSize();
-        }
-
-        @Override
-        public Dimension minimumLayoutSize(Container parent) {
-            return leftContentPane.getMinimumSize();
-        }
-
-        @Override
-        public void layoutContainer(Container parent) {
-            maxHeight = CellElementPropertyPane.getInstance().getHeight() - TITLE_HEIGHT;
-            int beginY;
-            if ((MAXVALUE - scrollBar.getVisibleAmount()) == 0) {
-                beginY = 0;
-            } else {
-                int preferredHeight = leftContentPane.getPreferredSize().height;
-                int value = scrollBar.getValue();
-                beginY = value * (preferredHeight - maxHeight) / (MAXVALUE - scrollBar.getVisibleAmount());
-            }
-            int width = parent.getWidth();
-            int height = parent.getHeight();
-            if (leftContentPane.getPreferredSize().height > maxHeight) {
-                leftContentPane.setBounds(0, -beginY, width - scrollBar.getWidth() - CONTENT_PANE_WIDTH_GAP, height + beginY);
-                scrollBar.setBounds(width - scrollBar.getWidth() - 1, 0, scrollBar.getWidth(), height);
-            } else {
-                leftContentPane.setBounds(0, 0, width - SCROLLBAR_WIDTH - CONTENT_PANE_WIDTH_GAP, height);
-            }
-            leftContentPane.validate();
-        }
-    }
 }

designer/src/com/fr/quickeditor/cellquick/CellBiasTextPainterEditor.java

@@ -35,7 +35,7 @@ public class CellBiasTextPainterEditor extends CellQuickEditor {
         });
         editButton.setOpaque(false);
         content.add(TableLayoutHelper.createGapTableLayoutPane(new Component[][]{
-                        new Component[]{emptyLabel, editButton}},
+                        new Component[]{EMPTY_LABEL, editButton}},
                 new double[]{TableLayout.PREFERRED},
                 new double[]{TableLayout.PREFERRED, TableLayout.FILL}, HGAP, VGAP), BorderLayout.CENTER);
         return content;
@@ -68,4 +68,9 @@ public class CellBiasTextPainterEditor extends CellQuickEditor {
     protected void refreshDetails() {
     }
 
+    @Override
+    public boolean isScrollAll() {
+        return true;
+    }
+
 }

designer/src/com/fr/quickeditor/cellquick/CellDSColumnEditor.java

@@ -98,6 +98,11 @@ public class CellDSColumnEditor extends CellQuickEditor {
         return centerPane;
     }
 
+    @Override
+    public boolean isScrollAll() {
+        return false;
+    }
+
     /**
      * 内容全部重新动态生成，不然容易出错
      * 刷新详细信息面板
@@ -158,9 +163,11 @@ public class CellDSColumnEditor extends CellQuickEditor {
         paneList = new ArrayList<>();
         /*基本设置面板*/
         DSColumnBasicEditorPane cellDSColumnBasicPane = new DSColumnBasicEditorPane();
+
         paneList.add(cellDSColumnBasicPane);
         /*高级设置面板*/
         cellDSColumnAdvancedPane = new DSColumnAdvancedEditorPane();
+
         paneList.add(cellDSColumnAdvancedPane);
     }
 
@@ -209,7 +216,6 @@ public class CellDSColumnEditor extends CellQuickEditor {
         };
 
         DSColumnBasicEditorPane() {
-            this.setLayout(new BorderLayout());
             dataPane = new SelectedDataColumnPane(true, true, tc, cellElement);
             groupPane = new ResultSetGroupDockingPane(tc);
             dataPane.addListener(dataListener);
@@ -217,7 +223,7 @@ public class CellDSColumnEditor extends CellQuickEditor {
 
             double[] rowSize = {P}, columnSize = {P, F};
             UILabel uiLabel = new UILabel(Inter.getLocText("FR-Designer_Filter_Conditions"));
-            uiLabel.setPreferredSize(new Dimension(60, 20));
+            uiLabel.setPreferredSize(LABEL_DIMENSION);
             UIButton uiButton = new UIButton();
             if (tc != null) {
                 //第一次初始化时tc为空，会引发NullPointerException
@@ -231,8 +237,9 @@ public class CellDSColumnEditor extends CellQuickEditor {
                     new Component[]{uiLabel, uiButton}
             };
             conditionPane = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, HGAP, VGAP);
-            this.add(this.createContentPane(), BorderLayout.CENTER);
+            this.createScrollPane();
             this.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
+
         }
 
 
@@ -265,7 +272,7 @@ public class CellDSColumnEditor extends CellQuickEditor {
          *
          * @return content JPanel
          */
-        private JPanel createContentPane() {
+        protected JPanel createContentPane() {
 
             double[] columnSize = {F};
             double[] rowSize = {P, P, P};
@@ -303,9 +310,8 @@ public class CellDSColumnEditor extends CellQuickEditor {
 
 
         public DSColumnAdvancedEditorPane() {
-            this.setLayout(new BorderLayout());
-            this.add(this.createContentPane(), BorderLayout.CENTER);
             this.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
+            this.createScrollPane();
         }
 
 
@@ -415,7 +421,7 @@ public class CellDSColumnEditor extends CellQuickEditor {
          *
          * @return 内容面板
          */
-        private JPanel createContentPane() {
+        protected JPanel createContentPane() {
             this.setLayout(FRGUIPaneFactory.createBorderLayout());
             //结果集排序
             sortPane = new ResultSetSortConfigPane();
@@ -481,14 +487,13 @@ public class CellDSColumnEditor extends CellQuickEditor {
             multiNumSpinner = new UISpinner(1, 10000, 1, 1);
             //数据倍数
             UILabel multipleLabel = new UILabel(Inter.getLocText("Column_Multiple"));
-            multipleLabel.setPreferredSize(new Dimension(60, 20));
             multiPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{
                             new Component[]{
                                     multipleLabel, multiNumSpinner
                             }
                     }, new double[]{P}, new double[]{P, F}, HGAP, VGAP
             );
-            multiPane.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
+            multiPane.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 0));
             multiNumPane.add(multiPane);
             useMultiplyNumCheckBox.addActionListener(new ActionListener() {
                 public void actionPerformed(ActionEvent e) {
@@ -563,7 +568,7 @@ public class CellDSColumnEditor extends CellQuickEditor {
                 centerPane.add(new JPanel(), "none");
                 centerPane.add(formulaField, "content");
                 UILabel sortLabel = new UILabel(Inter.getLocText("Sort-Sort_Order"));
-                sortLabel.setPreferredSize(new Dimension(60, 20));
+                sortLabel.setPreferredSize(LABEL_DIMENSION);
                 sortTypePane.addChangeListener(new ChangeListener() {
                     @Override
                     public void stateChanged(ChangeEvent e) {
@@ -982,7 +987,7 @@ public class CellDSColumnEditor extends CellQuickEditor {
             public CustomValuePane() {
                 this.setLayout(new BorderLayout());
                 UILabel customValueLabel = new UILabel(Inter.getLocText("FR-Designer_Display_Value"));
-                customValueLabel.setPreferredSize(new Dimension(60, 20));
+                customValueLabel.setPreferredSize(LABEL_DIMENSION);
                 formulaField = new JFormulaField(DEFAULT_VALUE);
                 this.add(TableLayoutHelper.createGapTableLayoutPane(new Component[][]{
                         new Component[]{customValueLabel, formulaField},
@@ -994,14 +999,13 @@ public class CellDSColumnEditor extends CellQuickEditor {
                     Object value = cellElement.getValue();
                     if (value != null && value instanceof DSColumn) {
                         DSColumn dSColumn = (DSColumn) value;
-
                         //formula
                         String valueFormula = dSColumn.getResult();
-                        if (valueFormula == null) {
+                        if (valueFormula != null) {
-                            valueFormula = DEFAULT_VALUE;
+                            formulaField.populate(valueFormula);
                         }
                         formulaField.populateElement(cellElement);
-                        formulaField.populate(valueFormula);
+
                     }
                 }
             }

designer/src/com/fr/quickeditor/cellquick/CellElementBarLayout.java

@@ -0,0 +1,41 @@
+package com.fr.quickeditor.cellquick;
+
+import javax.swing.*;
+import java.awt.*;
+
+/**
+ * 单元格元素面板的滚动条
+ *
+ * @see com.fr.design.mainframe.AbstractAttrPane.BarLayout
+ */
+public abstract class CellElementBarLayout implements LayoutManager {
+
+    private JPanel leftContentPane;
+
+    protected CellElementBarLayout(JPanel leftContentPane) {
+        this.leftContentPane = leftContentPane;
+    }
+
+    @Override
+    public void addLayoutComponent(String name, Component comp) {
+
+    }
+
+    @Override
+    public void removeLayoutComponent(Component comp) {
+
+    }
+
+    @Override
+    public Dimension preferredLayoutSize(Container parent) {
+        return leftContentPane.getPreferredSize();
+    }
+
+    @Override
+    public Dimension minimumLayoutSize(Container parent) {
+        return leftContentPane.getMinimumSize();
+    }
+
+    @Override
+    public abstract void layoutContainer(Container parent);
+}

designer/src/com/fr/quickeditor/cellquick/CellFormulaQuickEditor.java

@@ -121,7 +121,7 @@ public class CellFormulaQuickEditor extends CellQuickEditor {
 
         content.add(pane, BorderLayout.NORTH);
         return TableLayoutHelper.createGapTableLayoutPane(new Component[][]{
-                        new Component[]{emptyLabel, content}},
+                        new Component[]{EMPTY_LABEL, content}},
                 new double[]{TableLayout.PREFERRED},
                 new double[]{TableLayout.PREFERRED, TableLayout.FILL}, HGAP, VGAP);
     }
@@ -203,4 +203,9 @@ public class CellFormulaQuickEditor extends CellQuickEditor {
         formulaTextField.getDocument().addDocumentListener(documentListener);
     }
 
+    @Override
+    public boolean isScrollAll() {
+        return true;
+    }
+
 }

designer/src/com/fr/quickeditor/cellquick/CellImageQuickEditor.java

@@ -43,7 +43,7 @@ public class CellImageQuickEditor extends CellQuickEditor {
         });
         editButton.setOpaque(false);
         content.add(TableLayoutHelper.createGapTableLayoutPane(new Component[][]{
-                        new Component[]{emptyLabel, editButton}},
+                        new Component[]{EMPTY_LABEL, editButton}},
                 new double[]{TableLayout.PREFERRED},
                 new double[]{TableLayout.PREFERRED, TableLayout.FILL}, HGAP, VGAP), BorderLayout.CENTER);
         return content;
@@ -72,6 +72,11 @@ public class CellImageQuickEditor extends CellQuickEditor {
 
     }
 
+    @Override
+    public boolean isScrollAll() {
+        return true;
+    }
+
     @Override
     public Object getComboBoxSelected() {
         return ActionFactory.createAction(ImageCellAction.class);

designer/src/com/fr/quickeditor/cellquick/CellRichTextEditor.java

@@ -30,7 +30,7 @@ public class CellRichTextEditor extends CellQuickEditor {
         richTextButton = new UIButton();
         richTextButton.setOpaque(false);
         content.add(TableLayoutHelper.createGapTableLayoutPane(new Component[][]{
-                        new Component[]{emptyLabel, richTextButton}},
+                        new Component[]{EMPTY_LABEL, richTextButton}},
                 new double[]{TableLayout.PREFERRED},
                 new double[]{TableLayout.PREFERRED, TableLayout.FILL}, HGAP, VGAP), BorderLayout.CENTER);
         return content;
@@ -49,4 +49,9 @@ public class CellRichTextEditor extends CellQuickEditor {
         richTextButton.setAction(subReportCellAction);
     }
 
+    @Override
+    public boolean isScrollAll() {
+        return true;
+    }
+
 }

designer/src/com/fr/quickeditor/cellquick/CellStringQuickEditor.java

@@ -90,6 +90,11 @@ public class CellStringQuickEditor extends CellQuickEditor {
         return content;
     }
 
+    @Override
+    public boolean isScrollAll() {
+        return true;
+    }
+
 
     private void changeReportPaneCell(String tmpText) {
         isEditing = true;

designer/src/com/fr/quickeditor/cellquick/CellSubReportEditor.java

@@ -31,7 +31,7 @@ public class CellSubReportEditor extends CellQuickEditor {
         subReportButton = new UIButton();
         subReportButton.setOpaque(false);
         content.add(TableLayoutHelper.createGapTableLayoutPane(new Component[][]{
-                        new Component[]{emptyLabel, subReportButton}},
+                        new Component[]{EMPTY_LABEL, subReportButton}},
                 new double[]{TableLayout.PREFERRED},
                 new double[]{TableLayout.PREFERRED, TableLayout.FILL}, HGAP, VGAP), BorderLayout.CENTER);
         return content;
@@ -50,4 +50,8 @@ public class CellSubReportEditor extends CellQuickEditor {
         return ActionFactory.createAction(SubReportCellAction.class);
     }
 
+    @Override
+    public boolean isScrollAll() {
+        return true;
+    }
 }

designer_base/src/com/fr/design/gui/style/BorderPane.java

@@ -8,6 +8,8 @@ import com.fr.base.BaseUtils;
 import com.fr.base.CellBorderStyle;
 import com.fr.base.Style;
 import com.fr.design.constants.LayoutConstants;
+import com.fr.design.event.GlobalNameListener;
+import com.fr.design.event.GlobalNameObserver;
 import com.fr.design.foldablepane.UIExpandablePane;
 import com.fr.design.gui.ibutton.UIToggleButton;
 import com.fr.design.gui.icombobox.LineComboBox;
@@ -16,6 +18,7 @@ import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.style.color.NewColorSelectBox;
 import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.general.ComparatorUtils;
 import com.fr.general.Inter;
 import com.fr.stable.Constants;
 import com.fr.stable.CoreConstants;
@@ -24,12 +27,17 @@ import javax.swing.*;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import java.awt.*;
+import java.util.Arrays;
+import java.util.HashSet;
 
 /**
  * @author zhou
  * @since 2012-5-28下午6:22:04
  */
-public class BorderPane extends AbstractBasicStylePane {
+public class BorderPane extends AbstractBasicStylePane implements GlobalNameObserver {
+
+    private static final String[] BORDERARRAY = {"currentLineCombo", "currentLineColorPane", "outerToggleButton", "topToggleButton",
+            "leftToggleButton", "bottomToggleButton", "rightToggleButton", "innerToggleButton", "horizontalToggleButton", "verticalToggleButton"};
     private boolean insideMode = false;
 
     private UIToggleButton topToggleButton;
@@ -48,6 +56,7 @@ public class BorderPane extends AbstractBasicStylePane {
     private JPanel borderPanel;
     private JPanel backgroundPanel;
     private BackgroundPane backgroundPane;
+    private GlobalNameListener globalNameListener = null;
 
     public BorderPane() {
         this.initComponents();
@@ -55,7 +64,7 @@ public class BorderPane extends AbstractBasicStylePane {
 
     protected void initComponents() {
         initButtonsWithIcon();
-        this.setLayout(new BorderLayout(0, 6));
+        this.setLayout(new BorderLayout(0, 0));
         JPanel externalPane = new JPanel(new GridLayout(0, 4));
         externalPane.add(topToggleButton);
         externalPane.add(leftToggleButton);
@@ -89,7 +98,7 @@ public class BorderPane extends AbstractBasicStylePane {
         backgroundPane = new BackgroundPane();
         backgroundPanel = new UIExpandablePane(Inter.getLocText("FR-Designer_Background"), 280, 24, backgroundPane);
         this.add(backgroundPanel, BorderLayout.CENTER);
-
+        initAllNames();
         outerToggleButton.addChangeListener(outerToggleButtonChangeListener);
         innerToggleButton.addChangeListener(innerToggleButtonChangeListener);
     }
@@ -125,6 +134,19 @@ public class BorderPane extends AbstractBasicStylePane {
         this.currentLineColorPane = new NewColorSelectBox(100);
     }
 
+    private void initAllNames() {
+        currentLineCombo.setGlobalName("currentLineCombo");
+        currentLineColorPane.setGlobalName("currentLineColorPane");
+        outerToggleButton.setGlobalName("outerToggleButton");
+        topToggleButton.setGlobalName("topToggleButton");
+        leftToggleButton.setGlobalName("leftToggleButton");
+        bottomToggleButton.setGlobalName("bottomToggleButton");
+        rightToggleButton.setGlobalName("rightToggleButton");
+        innerToggleButton.setGlobalName("innerToggleButton");
+        horizontalToggleButton.setGlobalName("horizontalToggleButton");
+        verticalToggleButton.setGlobalName("verticalToggleButton");
+    }
+
     @Override
     public String title4PopupWindow() {
         return Inter.getLocText("FR-Designer_Cell");
@@ -179,10 +201,13 @@ public class BorderPane extends AbstractBasicStylePane {
         }
 
         CellBorderStyle cellBorderStyle = this.update();
-
+        HashSet<String> borderSet = new HashSet<String>(Arrays.asList(BORDERARRAY));
-        style = style.deriveBorder(cellBorderStyle.getTopStyle(), cellBorderStyle.getTopColor(), cellBorderStyle.getBottomStyle(), cellBorderStyle.getBottomColor(),
+        if (borderSet.contains(globalNameListener.getGlobalName())) {
-                cellBorderStyle.getLeftStyle(), cellBorderStyle.getLeftColor(), cellBorderStyle.getRightStyle(), cellBorderStyle.getRightColor());
+            style = style.deriveBorder(cellBorderStyle.getTopStyle(), cellBorderStyle.getTopColor(), cellBorderStyle.getBottomStyle(), cellBorderStyle.getBottomColor(),
-        style = style.deriveBackground(backgroundPane.update());
+                    cellBorderStyle.getLeftStyle(), cellBorderStyle.getLeftColor(), cellBorderStyle.getRightStyle(), cellBorderStyle.getRightColor());
+        } else {
+            style = style.deriveBackground(backgroundPane.update());
+        }
         return style;
     }
 
@@ -204,4 +229,19 @@ public class BorderPane extends AbstractBasicStylePane {
         cellBorderStyle.setHorizontalStyle(horizontalToggleButton.isSelected() ? lineStyle : Constants.LINE_NONE);
         return cellBorderStyle;
     }
+
+    @Override
+    public void registerNameListener(GlobalNameListener listener) {
+        globalNameListener = listener;
+    }
+
+    @Override
+    public boolean shouldResponseNameListener() {
+        return false;
+    }
+
+    @Override
+    public void setGlobalName(String name) {
+
+    }
 }

designer_base/src/com/fr/design/locale/designer.properties

@@ -71,7 +71,7 @@ FR-Designer_Button-Icon=
 FR-Designer_Button-Name=
 FR-Designer_Button-Type=
 FR-Designer_CardLayout=
-FR-Designer_Cell=
+FR-Designer_Cell=Cell
 FR-Designer_Chart_Cell=
 FR-Designer_Chart_Float=
 FR-Designer_Chart_Float_chart=
@@ -2131,4 +2131,5 @@ FR-Designer-Download_Online_Sources=
 FR-Designer_Select_Color=Select Color
 FR-Designer-Basic_Dynamic_Parameter_Injection=Injection
 FR-Designer_Label=
-FR-Designer_Widgetname=Widget Name
+FR-Designer_Widgetname=Widget Name
+FR-Designer_Insert_Cell_Element=Insert Cell Element

designer_base/src/com/fr/design/locale/designer_en_US.properties

@@ -71,7 +71,7 @@ FR-Designer_Button-Icon=Button Icon
 FR-Designer_Button-Name=Button Name 
 FR-Designer_Button-Type=Button Type
 FR-Designer_CardLayout=TabLayout
-FR-Designer_Cell=cell
+FR-Designer_Cell=Cell
 FR-Designer_Chart_Cell=Chart Hyperlink-Link Cell
 FR-Designer_Chart_Float=Chart Hyperlink-Floating Element
 FR-Designer_Chart_Float_chart=Chart Hyperlink-Floating Chart
@@ -2127,4 +2127,5 @@ FR-Designer-Download_Online_Sources=
 FR-Designer_Select_Color=Select Color
 FR-Designer-Basic_Dynamic_Parameter_Injection=Injection
 FR-Designer_Label=Label
-FR-Designer_Widgetname=Widget Name
+FR-Designer_Widgetname=Widget Name
+FR-Designer_Insert_Cell_Element=Insert Cell Element

designer_base/src/com/fr/design/locale/designer_ja_JP.properties

@@ -2126,3 +2126,4 @@ FR-Designer_Select_Color=
 FR-Designer-Basic_Dynamic_Parameter_Injection=\ 
 FR-Designer_Label=\u30E9\u30D9\u30EBa
 FR-Designer_Widgetname=\u30B3\u30F3\u30C8\u30ED\u30FC\u30EB\u540D
+FR-Designer_Insert_Cell_Element=\ 

designer_base/src/com/fr/design/locale/designer_ko_KR.properties

@@ -2126,4 +2126,5 @@ FR-Designer-Download_Online_Sources=
 FR-Designer_Select_Color=
 FR-Designer-Basic_Dynamic_Parameter_Injection=
 FR-Designer_Label=\uB808\uC774\uBE14
-FR-Designer_Widgetname=\uC18C\uD504\uD2B8\uC6E8\uC5B4\uC81C\uC5B4\uC774\uB984
+FR-Designer_Widgetname=\uC18C\uD504\uD2B8\uC6E8\uC5B4\uC81C\uC5B4\uC774\uB984
+FR-Designer_Insert_Cell_Element=\ 

designer_base/src/com/fr/design/locale/designer_zh_CN.properties

@@ -2139,4 +2139,5 @@ FR-Designer-Download_Online_Sources=\u56FE\u8868\u9700\u8981\u4E0B\u8F7D\u6700\u
 FR-Designer_Select_Color=\u9009\u62E9\u989C\u8272
 FR-Designer-Basic_Dynamic_Parameter_Injection=\u6CE8\u5165
 FR-Designer_Label=\u6807\u7B7E
-FR-Designer_Widgetname=\u63A7\u4EF6\u540D
+FR-Designer_Widgetname=\u63A7\u4EF6\u540D
+FR-Designer_Insert_Cell_Element=\u63D2\u5165\u5143\u7D20

designer_base/src/com/fr/design/locale/designer_zh_TW.properties

@@ -2131,3 +2131,4 @@ FR-Designer_Select_Color=
 FR-Designer-Basic_Dynamic_Parameter_Injection=\u6CE8\u5165
 FR-Designer_Label=\u6A19\u7C3D
 FR-Designer_Widgetname=\u63A7\u5236\u9805\u540D
+FR-Designer_Insert_Cell_Element=\u63D2\u5165\u5143\u7D20

designer_base/src/com/fr/design/mainframe/JFormSliderPane.java

@@ -91,7 +91,7 @@ public class JFormSliderPane extends JPanel {
         initShowValButton();
         initUIRadioButton();
         initPane();
-        JPanel panel = new JPanel(new FlowLayout(1, 5, 0));
+        JPanel panel = new JPanel(new FlowLayout(1, 0, 0));
         panel.add(downButton);
         panel.add(slider);
         panel.add(upButton);
@@ -392,14 +392,14 @@ public class JFormSliderPane extends JPanel {
             dialog = new FormPopupPane(upButton, dialogContentPanel);
             if (upButtonX == 0) {
                 upButtonX = btnCoords.x;
-                GUICoreUtils.showPopupMenu(dialog, upButton, -DIALOG_WIDTH + upButton.getWidth() + SHOWVALBUTTON_WIDTH + SLIDER_GAP, -DIALOG_HEIGHT);
+                GUICoreUtils.showPopupMenu(dialog, upButton, -DIALOG_WIDTH + upButton.getWidth() + SHOWVALBUTTON_WIDTH, -DIALOG_HEIGHT);
             }
         } else {
             if (upButtonX == 0) {
                 upButtonX = btnCoords.x;
-                GUICoreUtils.showPopupMenu(dialog, upButton, -DIALOG_WIDTH + upButton.getWidth() + SHOWVALBUTTON_WIDTH + SLIDER_GAP, -DIALOG_HEIGHT);
+                GUICoreUtils.showPopupMenu(dialog, upButton, -DIALOG_WIDTH + upButton.getWidth() + SHOWVALBUTTON_WIDTH, -DIALOG_HEIGHT);
             } else {
-                GUICoreUtils.showPopupMenu(dialog, upButton, -DIALOG_WIDTH + upButton.getWidth() + SHOWVALBUTTON_WIDTH + SLIDER_GAP, -DIALOG_HEIGHT);
+                GUICoreUtils.showPopupMenu(dialog, upButton, -DIALOG_WIDTH + upButton.getWidth() + SHOWVALBUTTON_WIDTH, -DIALOG_HEIGHT);
             }
         }
     }

designer_base/src/com/fr/design/mainframe/JSliderPane.java

@@ -94,7 +94,7 @@ public class JSliderPane extends JPanel {
         initShowValButton();
         initUIRadioButton();
         initPane();
-        JPanel panel = new JPanel(new FlowLayout(1, 5, 0));
+        JPanel panel = new JPanel(new FlowLayout(1, 0, 0));
         panel.add(downButton);
         panel.add(slider);
         panel.add(upButton);
@@ -399,14 +399,14 @@ public class JSliderPane extends JPanel {
             dialog = new PopupPane(upButton, dialogContentPanel);
             if (upButtonX == 0) {
                 upButtonX = btnCoords.x;
-                GUICoreUtils.showPopupMenu(dialog, upButton, -DIALOG_WIDTH + upButton.getWidth() + SHOWVALBUTTON_WIDTH + SLIDER_GAP * 2, -DIALOG_HEIGHT);
+                GUICoreUtils.showPopupMenu(dialog, upButton, -DIALOG_WIDTH + upButton.getWidth() + SHOWVALBUTTON_WIDTH, -DIALOG_HEIGHT);
             }
         } else {
             if (upButtonX == 0) {
                 upButtonX = btnCoords.x;
-                GUICoreUtils.showPopupMenu(dialog, upButton, -DIALOG_WIDTH + upButton.getWidth() + SHOWVALBUTTON_WIDTH + SLIDER_GAP * 2, -DIALOG_HEIGHT);
+                GUICoreUtils.showPopupMenu(dialog, upButton, -DIALOG_WIDTH + upButton.getWidth() + SHOWVALBUTTON_WIDTH, -DIALOG_HEIGHT);
             } else {
-                GUICoreUtils.showPopupMenu(dialog, upButton, -DIALOG_WIDTH + upButton.getWidth() + SHOWVALBUTTON_WIDTH + SLIDER_GAP * 2, -DIALOG_HEIGHT);
+                GUICoreUtils.showPopupMenu(dialog, upButton, -DIALOG_WIDTH + upButton.getWidth() + SHOWVALBUTTON_WIDTH, -DIALOG_HEIGHT);
             }
         }
     }

designer_base/src/com/fr/design/style/color/NewColorSelectBox.java

@@ -7,6 +7,8 @@ import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 
 import com.fr.base.background.ColorBackground;
+import com.fr.design.event.GlobalNameListener;
+import com.fr.design.event.GlobalNameObserver;
 import com.fr.design.event.UIObserver;
 import com.fr.design.event.UIObserverListener;
 import com.fr.design.style.AbstractSelectBox;
@@ -14,12 +16,14 @@ import com.fr.design.style.AbstractSelectBox;
 /**
  * Color select pane.
  */
-public class NewColorSelectBox extends AbstractSelectBox<Color> implements UIObserver {
+public class NewColorSelectBox extends AbstractSelectBox<Color> implements UIObserver, GlobalNameObserver {
     private static final long serialVersionUID = 2782150678943960557L;
-    
+
     private Color color;
     private NewColorSelectPane colorPane = new NewColorSelectPane();
     private UIObserverListener uiObserverListener;
+    private String newColorSelectBoxName = "";
+    private GlobalNameListener globalNameListener = null;
 
     public NewColorSelectBox(int preferredWidth) {
     	initBox(preferredWidth);
@@ -34,6 +38,9 @@ public class NewColorSelectBox extends AbstractSelectBox<Color> implements UIObs
                     if(uiObserverListener == null){
                         return;
                     }
+                    if (globalNameListener != null && shouldResponseNameListener()){
+                        globalNameListener.setGlobalName(newColorSelectBoxName);
+                    }
                     uiObserverListener.doChange();
                 }
             });
@@ -93,4 +100,19 @@ public class NewColorSelectBox extends AbstractSelectBox<Color> implements UIObs
     public boolean shouldResponseChangeListener() {
         return true;
     }
+
+    @Override
+    public void registerNameListener(GlobalNameListener listener) {
+        globalNameListener = listener;
+    }
+
+    @Override
+    public boolean shouldResponseNameListener() {
+        return true;
+    }
+
+    @Override
+    public void setGlobalName(String name) {
+        newColorSelectBoxName = name;
+    }
 }

designer_base/src/com/fr/file/FILEChooserPane.java

@@ -16,6 +16,7 @@ import com.fr.design.gui.itextfield.UIAutoCompletionField;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.mainframe.DesignerFrame;
 import com.fr.design.mainframe.JTemplate;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.file.filetree.FileNode;
@@ -474,8 +475,7 @@ public class FILEChooserPane extends BasicPane {
         this.type = type;
         this.suffix = suffix;
 
-
+        dialog = showWindow(parent instanceof DesignerFrame ? (Window) parent : SwingUtilities.getWindowAncestor(parent), false);
-        dialog = showWindow((Window) parent, false);
         JPanel contentPane = (JPanel) dialog.getContentPane();
         contentPane.setLayout(FRGUIPaneFactory.createM_BorderLayout());
         contentPane.add(this, BorderLayout.CENTER);

designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/AbstractReportDataContentPane.java

@@ -16,6 +16,7 @@ import com.fr.design.layout.TableLayout;
 import com.fr.stable.StableUtils;
 
 import javax.swing.*;
+import javax.swing.border.Border;
 import javax.swing.event.ChangeEvent;
 import java.awt.*;
 import java.util.ArrayList;
@@ -200,4 +201,11 @@ public abstract class AbstractReportDataContentPane extends BasicBeanPane<ChartC
 		return jSeparator;
 	}
 
+	protected Border getSidesBorder() {
+		return BorderFactory.createEmptyBorder(0,5,0,5);
+	}
+	protected Border getFilterPaneBorder() {
+		return BorderFactory.createEmptyBorder(10,5,0,5);
+	}
+
 }

designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/BubblePlotReportDataContentPane.java

@@ -27,7 +27,8 @@ public class BubblePlotReportDataContentPane extends AbstractReportDataContentPa
 		initEveryPane();
 		filterPane = new ChartDataFilterPane(new BubblePlot(), parent);
 		JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("FR-Chart-Data_Filter"),filterPane);
-		filterPane.setBorder(BorderFactory.createEmptyBorder(10,10,0,15));
+		panel.setBorder(getSidesBorder());
+		filterPane.setBorder(getFilterPaneBorder());
 		this.add(panel, "0,6,2,4");
 	}
 	

designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/CategoryPlotMoreCateReportDataContentPane.java

@@ -66,7 +66,8 @@ public class CategoryPlotMoreCateReportDataContentPane extends CategoryPlotRepor
         this.add(catePane, "0,0,2,0");
 		filterPane = new ChartDataFilterPane(new Bar2DPlot(), parent);
 		JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("FR-Chart-Data_Filter"),filterPane);
-		filterPane.setBorder(BorderFactory.createEmptyBorder(10,10,0,15));
+		panel.setBorder(getSidesBorder());
+		filterPane.setBorder(getFilterPaneBorder());
 		this.add(panel, "0,6,2,4");
         
         addButton.addActionListener(new ActionListener() {

designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/CategoryPlotReportDataContentPane.java

@@ -38,7 +38,8 @@ public class CategoryPlotReportDataContentPane extends AbstractReportDataContent
         this.add(categoryName, "0,0,2,0");
         filterPane = new ChartDataFilterPane(new Bar2DPlot(), parent);
         JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("FR-Chart-Data_Filter"),filterPane);
-        filterPane.setBorder(BorderFactory.createEmptyBorder(10,10,0,15));
+        panel.setBorder(getSidesBorder());
+        filterPane.setBorder(getFilterPaneBorder());
         this.add(panel, "0,6,2,4");    }
     
 	protected TinyFormulaPane initCategoryBox(final String leftLabel) {

designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/MeterPlotReportDataContentPane.java

@@ -58,7 +58,8 @@ public class MeterPlotReportDataContentPane extends AbstractReportDataContentPan
 		this.add(panel, BorderLayout.NORTH);
 		filterPane = new ChartDataFilterPane(new MeterPlot(), parent);
 		JPanel pane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("FR-Chart-Data_Filter"),filterPane);
-		filterPane.setBorder(BorderFactory.createEmptyBorder(10,10,0,15));
+		pane.setBorder(getSidesBorder());
+		filterPane.setBorder(getFilterPaneBorder());
 
 		this.add(pane, BorderLayout.CENTER);
 	}

designer_chart/src/com/fr/design/mainframe/chart/gui/data/table/SeriesTypeUseComboxPane.java

@@ -57,7 +57,8 @@ public class SeriesTypeUseComboxPane extends UIComboBoxPane<ChartCollection> {
         this.add(cardPane, BorderLayout.CENTER);
         dataScreeningPane =  new ChartDataFilterPane(this.initplot, parent);
         JPanel panel = new UIExpandablePane(Inter.getLocText("FR-Chart-Data_Filter"), 290, 24, dataScreeningPane);
-        dataScreeningPane.setBorder(BorderFactory.createEmptyBorder(10,10,0,15));
+        panel.setBorder(BorderFactory.createEmptyBorder(0,5,0,5));
+        dataScreeningPane.setBorder(BorderFactory.createEmptyBorder(10,5,0,5));
         this.add(panel, BorderLayout.SOUTH);
     }
 

designer_chart/src/com/fr/design/mainframe/chart/gui/style/series/UIColorPickerPane.java

@@ -94,14 +94,9 @@ public class UIColorPickerPane extends BasicPane implements UIObserver {
 			}
 		};
 
-		double p = TableLayout.PREFERRED;
-		double f = TableLayout.FILL;
-		double[] columnSize = {p, f};
-
 		Component[][] components = createComponents();
 
-		upControlPane = TableLayoutHelper.createTableLayoutPane(components, getRowSIze (), columnSize);
+		upControlPane = getUpControlPane (components);
-
 		this.textFieldList = this.getTextFieldList();
 		this.textGroup = new TextFieldGroupPane();
 		this.colorGroup = new ColorGroupPane();
@@ -113,6 +108,14 @@ public class UIColorPickerPane extends BasicPane implements UIObserver {
 		refreshGroupPane(colors, getValueArray(number));
 	}
 
+	protected JPanel getUpControlPane (Component[][] components) {
+		double p = TableLayout.PREFERRED;
+		double f = TableLayout.FILL;
+		double[] columnSize = {p, f};
+		return TableLayoutHelper.createTableLayoutPane(components, getRowSIze (), columnSize);
+	}
+
+
 	protected double[] getRowSIze () {
 		double p = TableLayout.PREFERRED;
 		return new double[]{p, p, p};

designer_chart/src/com/fr/plugin/chart/area/VanChartAreaSeriesPane.java

@@ -42,7 +42,6 @@ public class VanChartAreaSeriesPane extends VanChartLineSeriesPane{
 
     //设置色彩面板内容
     protected void setColorPaneContent (JPanel panel) {
-        panel.add(getFillStylePane(), BorderLayout.NORTH);
         panel.add(createStylePane(), BorderLayout.CENTER);
     }
 

designer_chart/src/com/fr/plugin/chart/bubble/VanChartBubbleSeriesPane.java

@@ -50,7 +50,6 @@ public class VanChartBubbleSeriesPane extends VanChartAbstractPlotSeriesPane {
     //设置色彩面板内容
     @Override
     protected void setColorPaneContent (JPanel panel) {
-        panel.add(getFillStylePane(), BorderLayout.NORTH);
         panel.add(createAlphaPane(), BorderLayout.CENTER);
     }
 

designer_chart/src/com/fr/plugin/chart/bubble/data/VanChartBubblePlotTableDataContentPane.java

@@ -64,7 +64,8 @@ public class VanChartBubblePlotTableDataContentPane extends AbstractTableDataCon
         JPanel north = TableLayout4VanChartHelper.createGapTableLayoutPane(components_north,rowSize_north,columnSize_north);
         north.setBorder(BorderFactory.createEmptyBorder(10, 24, 10, 15));
         JPanel filterPane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("FR-Chart-Data_Filter"),dataScreeningPane);
-        dataScreeningPane.setBorder(BorderFactory.createEmptyBorder(10,10,0,15));
+        dataScreeningPane.setBorder(BorderFactory.createEmptyBorder(10,5,0,5));
+        filterPane.setBorder(BorderFactory.createEmptyBorder(0,5,0,5));
 
 
         this.setLayout(new BorderLayout());

designer_chart/src/com/fr/plugin/chart/designer/component/VanChartAreaSeriesFillColorPane.java

@@ -4,7 +4,6 @@ import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.frpane.UINumberDragPane;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.TableLayout;
-import com.fr.design.layout.TableLayoutHelper;
 import com.fr.general.Inter;
 import com.fr.plugin.chart.VanChartAttrHelper;
 import com.fr.plugin.chart.base.AttrAreaSeriesFillColorBackground;
@@ -19,7 +18,6 @@ import java.awt.*;
  */
 public class VanChartAreaSeriesFillColorPane extends BasicPane {
     private static final long serialVersionUID = 9166866984438854779L;
-    private static final int PANE_WIDTH = 221;
     private VanChartMarkerBackgroundPane fillColorPane;
     private UINumberDragPane transparent;
 
@@ -41,15 +39,9 @@ public class VanChartAreaSeriesFillColorPane extends BasicPane {
 
         JPanel transparentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-Chart_Alpha"), transparent);
 
-        Component[][] components = new Component[][]{
+        this.setLayout(new BorderLayout());
-                new Component[]{fillColorPane},
+        this.add(fillColorPane, BorderLayout.NORTH);
-                new Component[]{transparentPane},
+        this.add(transparentPane, BorderLayout.CENTER);
-        };
-
-        JPanel contentPane = TableLayoutHelper.createTableLayoutPane(components, row, col);
-        contentPane.setPreferredSize(new Dimension(PANE_WIDTH, (int)contentPane.getPreferredSize().getHeight()));
-
-        this.add(contentPane);
     }
 
     protected String title4PopupWindow(){

designer_chart/src/com/fr/plugin/chart/designer/component/background/VanChartBackgroundPane.java

@@ -98,7 +98,7 @@ public class VanChartBackgroundPane extends BasicPane {
                 new Component[]{null, null},
                 new Component[]{new UILabel(Inter.getLocText("FR-Chart-Shape_Fill")), typeComboBox},
                 new Component[]{null, centerPane},
-                new Component[]{new UILabel(Inter.getLocText("Plugin-Chart_Alpha")), transparent},
+                new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Alpha")), transparent},
                 new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Shadow")), shadow},
         };
     }

designer_chart/src/com/fr/plugin/chart/designer/component/background/VanChartBackgroundWithOutShadowWithRadiusPane.java

@@ -25,8 +25,8 @@ public class VanChartBackgroundWithOutShadowWithRadiusPane extends VanChartBackg
                 new Component[]{null, null},
                 new Component[]{new UILabel(Inter.getLocText("FR-Chart-Shape_Fill")), typeComboBox},
                 new Component[]{null, centerPane},
-                new Component[]{new UILabel(Inter.getLocText("Plugin-Chart_Alpha")), transparent},
+                new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Alpha")), transparent},
-                new Component[]{new UILabel(Inter.getLocText("plugin-ChartF_Radius")+":"),radius}
+                new Component[]{new UILabel(Inter.getLocText("plugin-ChartF_Radius")),radius}
         };
     }
 

designer_chart/src/com/fr/plugin/chart/designer/other/VanChartConditionAttrContentPane.java

@@ -5,7 +5,6 @@ import com.fr.chart.chartglyph.ConditionAttr;
 import com.fr.chart.chartglyph.ConditionCollection;
 import com.fr.design.condition.ConditionAttributesPane;
 import com.fr.design.gui.controlpane.UIListControlPane;
-import com.fr.design.gui.imenutable.UIMenuNameableCreator;
 import com.fr.general.NameObject;
 import com.fr.stable.Nameable;
 
@@ -58,10 +57,9 @@ public class VanChartConditionAttrContentPane extends AbstractConditionAttrConte
         Nameable[] nameables = conditionPane.update();
         cc.clearConditionAttr();
         for (int i = 0; i < nameables.length; i++) {
-            if (nameables[i] instanceof UIMenuNameableCreator) {
+            if (nameables[i] instanceof NameObject) {
-                UIMenuNameableCreator uiMenuNameableCreator = (UIMenuNameableCreator) nameables[i];
+                ConditionAttr ca = (ConditionAttr) ((NameObject) nameables[i]).getObject();
-                ConditionAttr ca = (ConditionAttr) uiMenuNameableCreator.getObj();
+                ca.setName(nameables[i].getName());
-                ca.setName(uiMenuNameableCreator.getName());
                 cc.addConditionAttr(ca);
             }
         }

designer_chart/src/com/fr/plugin/chart/designer/style/axis/VanChartBaseAxisPane.java

@@ -252,8 +252,8 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
         axisLimitSize = new UIButtonGroup<Integer>(new String[]{Inter.getLocText("Plugin-ChartF_Limit"),Inter.getLocText("Plugin-ChartF_NotLimit")});
 
         JPanel limitSizePane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_AreaSize"),axisLimitSize);
-        maxProportionPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_MaxProportion"),maxProportion);
+        maxProportionPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_MaxProportion"),maxProportion, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH);
-        maxProportionPane.setBorder(BorderFactory.createEmptyBorder(0,15,0,0));
+        maxProportionPane.setBorder(BorderFactory.createEmptyBorder(0,12,0,0));
         JPanel panel = new JPanel(new BorderLayout());
         panel.add(limitSizePane, BorderLayout.NORTH);
         panel.add(maxProportionPane, BorderLayout.CENTER);

designer_chart/src/com/fr/plugin/chart/designer/style/series/VanChartAbstractPlotSeriesPane.java

@@ -83,7 +83,12 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP
             scrollPane.setViewportView(getContentInPlotType());
             scrollPane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
         }
-        return getContentInPlotType();
+        JPanel panel = new JPanel(new BorderLayout());
+        if (fillStylePane != null) {
+            panel.add(fillStylePane, BorderLayout.NORTH);
+        }
+        panel.add(getContentInPlotType(), BorderLayout.CENTER);
+        return panel;
     }
 
     @Override
@@ -115,7 +120,6 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP
 
     //设置色彩面板内容
     protected void setColorPaneContent (JPanel panel) {
-        panel.add(getFillStylePane(), BorderLayout.NORTH);
         panel.add(createStylePane(), BorderLayout.CENTER);
     }
 

designer_chart/src/com/fr/plugin/chart/funnel/designer/style/VanChartFunnelSeriesPane.java

@@ -42,7 +42,6 @@ public class VanChartFunnelSeriesPane extends VanChartAbstractPlotSeriesPane {
 
     //设置色彩面板内容
     protected void setColorPaneContent (JPanel panel) {
-        panel.add(getFillStylePane(), BorderLayout.NORTH);
         panel.add(createStylePane(), BorderLayout.CENTER);
         panel.add(createAlphaPane(), BorderLayout.SOUTH);
     }

designer_chart/src/com/fr/plugin/chart/gantt/designer/style/series/VanChartGanttSeriesPane.java

@@ -41,7 +41,6 @@ public class VanChartGanttSeriesPane extends VanChartAbstractPlotSeriesPane {
         double[] col = {f};
 
         Component[][] components = new Component[][]{
-                new Component[]{getColorPane()},
                 new Component[]{createGanntStylePane()},
                 new Component[]{createLinkLinePane()},
                 new Component[]{createMarkerPane()}
@@ -51,11 +50,6 @@ public class VanChartGanttSeriesPane extends VanChartAbstractPlotSeriesPane {
         return contentPane;
     }
 
-    //设置色彩面板内容
-    protected void setColorPaneContent (JPanel panel) {
-        panel.add(getFillStylePane(), BorderLayout.NORTH);
-    }
-
     private JPanel createGanntStylePane(){
         seriesNewLine = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_Open"), Inter.getLocText("Plugin-ChartF_Close")});
         JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_Series_New_Line"),seriesNewLine);

designer_chart/src/com/fr/plugin/chart/gauge/VanChartGaugeSeriesPane.java

@@ -57,7 +57,6 @@ public class VanChartGaugeSeriesPane extends VanChartAbstractPlotSeriesPane {
         double[] columnSize = {f};
         double[] rowSize = {p,p,p,p,p,p};
         Component[][] components = new Component[][]{
-                new Component[]{getColorPane()},
                 new Component[]{createGaugeLayoutPane()},
                 new Component[]{createGaugeStylePane(rowSize, new double[]{f,e})},
                 new Component[]{createGaugeBandsPane()}
@@ -66,11 +65,6 @@ public class VanChartGaugeSeriesPane extends VanChartAbstractPlotSeriesPane {
        return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
     }
 
-    //设置色彩面板内容
-    protected void setColorPaneContent (JPanel panel) {
-        panel.add(getFillStylePane(), BorderLayout.NORTH);
-    }
-
     private JPanel createGaugeLayoutPane() {
         gaugeLayout = new UIButtonGroup(new String[]{Inter.getLocText("FR-Chart-Direction_Horizontal"), Inter.getLocText("FR-Chart-Direction_Vertical")});
         JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("PageSetup-Orientation"),gaugeLayout);

designer_chart/src/com/fr/plugin/chart/line/VanChartLineSeriesPane.java

@@ -26,7 +26,6 @@ public class VanChartLineSeriesPane extends VanChartAbstractPlotSeriesPane{
         double[] col = {f};
 
         Component[][] components = new Component[][]{
-                new Component[]{getColorPane()},
                 new Component[]{createLineTypePane()},
                 new Component[]{createMarkerPane()},
                 new Component[]{createStackedAndAxisPane()},
@@ -38,9 +37,4 @@ public class VanChartLineSeriesPane extends VanChartAbstractPlotSeriesPane{
         return contentPane;
     }
 
-    //设置色彩面板内容
-    protected void setColorPaneContent (JPanel panel) {
-        panel.add(getFillStylePane(), BorderLayout.NORTH);
-    }
-
 }

designer_chart/src/com/fr/plugin/chart/map/VanChartMapSeriesPane.java

@@ -152,20 +152,10 @@ public class VanChartMapSeriesPane extends VanChartAbstractPlotSeriesPane {
     }
 
     //设置色彩面板内容
-    protected void setColorPaneContent (JPanel panel) {
+    protected void setColorPaneContent(JPanel panel) {
-        if (getFillStylePane() != null){
+        panel.add(createNullValueColorPane(), BorderLayout.CENTER);
-            panel.add(getFillStylePane(), BorderLayout.NORTH);
+        panel.add(createAlphaPane(), BorderLayout.SOUTH);
-        }
+
-        mapType = ((VanChartMapPlot) plot).getAllLayersMapType();
-        switch (mapType) {
-            case AREA:
-                panel.add(createNullValueColorPane(), BorderLayout.CENTER);
-                panel.add(createAlphaPane(), BorderLayout.SOUTH);
-                break;
-            case POINT:
-                panel.add(createPointAlphaPane(), BorderLayout.CENTER);
-                break;
-        }
     }
 
 
@@ -199,7 +189,7 @@ public class VanChartMapSeriesPane extends VanChartAbstractPlotSeriesPane {
         double[] col = {f};
 
         Component[][] components = new Component[][]{
-                new Component[]{getColorPane()},
+                new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle((Inter.getLocText("Plugin-ChartF_Color")), createPointAlphaPane())},
                 new Component[]{createMarkerComPane()},
                 new Component[]{createLargeDataModelPane()},
                 new Component[]{createPointEffectPane()},
@@ -217,7 +207,6 @@ public class VanChartMapSeriesPane extends VanChartAbstractPlotSeriesPane {
         curvePane = new VanChartCurvePane();
 
         Component[][] components = new Component[][]{
-                new Component[]{getColorPane()},
                 new Component[]{createCurvePane()},
                 new Component[]{createLineMapLargeDataModelPane()},
                 new Component[]{createAnimationPane()}

designer_chart/src/com/fr/plugin/chart/multilayer/style/VanChartMultiPieSeriesPane.java

@@ -34,7 +34,6 @@ public class VanChartMultiPieSeriesPane extends VanChartPieSeriesPane {
         double[] columnSize = {f};
         double[] rowSize = {p,p,p,p,p,p,p};
         Component[][] components = new Component[][]{
-                new Component[]{getColorPane()},
                 new Component[]{createSeriesStylePane(rowSize, new double[]{p,f})},
                 new Component[]{createBorderPane()},
         };
@@ -67,11 +66,6 @@ public class VanChartMultiPieSeriesPane extends VanChartPieSeriesPane {
         return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("FR-Designer-Widget_Style"), panel);
     }
 
-    //设置色彩面板内容
-    protected void setColorPaneContent (JPanel panel) {
-        panel.add(getFillStylePane(), BorderLayout.NORTH);
-    }
-
     protected void populatePieAttr() {
         if(plot.accept(VanChartMultiPiePlot.class)){
             VanChartMultiPiePlot multiPiePlot = (VanChartMultiPiePlot)plot;

designer_chart/src/com/fr/plugin/chart/radar/VanChartRadarSeriesPane.java

@@ -49,7 +49,6 @@ public class VanChartRadarSeriesPane extends VanChartAbstractPlotSeriesPane {
         }
 
         return new Component[][] {
-                new Component[]{getColorPane()},
                 new Component[]{createRadarTypePane()},
                 new Component[]{createLineTypePane()},
                 new Component[]{createMarkerPane()},
@@ -59,10 +58,7 @@ public class VanChartRadarSeriesPane extends VanChartAbstractPlotSeriesPane {
 
     //设置色彩面板内容
     protected void setColorPaneContent (JPanel panel) {
-        panel.add(getFillStylePane(), BorderLayout.NORTH);
+        panel.add(createAlphaPane(), BorderLayout.CENTER);
-        if(((VanChartRadarPlot)plot).isStackChart()) {
-            panel.add(createAlphaPane(), BorderLayout.CENTER);
-        }
     }
 
     private JPanel createRadarTypePane() {

designer_chart/src/com/fr/plugin/chart/range/component/SectionIntervalConfigPaneWithOutNum.java

@@ -3,7 +3,9 @@ package com.fr.plugin.chart.range.component;
 import com.fr.design.gui.ilable.BoldFontTextLabel;
 import com.fr.design.mainframe.chart.gui.style.series.MapColorPickerPaneWithFormula;
 import com.fr.general.Inter;
+import com.fr.plugin.chart.designer.TableLayout4VanChartHelper;
 
+import javax.swing.*;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import java.awt.*;
@@ -28,6 +30,15 @@ public class SectionIntervalConfigPaneWithOutNum extends MapColorPickerPaneWithF
         });
     }
 
+    protected JPanel getUpControlPane (Component[][] components) {
+        double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
+        double d = TableLayout4VanChartHelper.DESCRIPTION_AREA_WIDTH;
+        double[] columnSize = {d, e};
+        JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, getRowSIze (), columnSize);
+        panel.setPreferredSize(new Dimension(230, (int)panel.getPreferredSize().getHeight()));
+        return panel;
+    }
+
     private void setRegionVisible(boolean visible){
         getRegionNumPane().setVisible(visible);
         numLabel.setVisible(visible);
@@ -40,7 +51,7 @@ public class SectionIntervalConfigPaneWithOutNum extends MapColorPickerPaneWithF
         setRegionVisible(false);
 
         return new Component[][]{
-                new Component[]{new BoldFontTextLabel(""),getDesignTypeButtonGroup()},
+                new Component[]{new BoldFontTextLabel(Inter.getLocText("Plugin-ChartF_RangeNum")),getDesignTypeButtonGroup()},
                 new Component[]{numLabel, getRegionNumPane()},
         };
     }

designer_chart/src/com/fr/plugin/chart/scatter/VanChartScatterSeriesPane.java

@@ -48,7 +48,6 @@ public class VanChartScatterSeriesPane extends VanChartAbstractPlotSeriesPane{
 
     //设置色彩面板内容
     protected void setColorPaneContent (JPanel panel) {
-        panel.add(getFillStylePane(), BorderLayout.NORTH);
         panel.add(createAlphaPane(), BorderLayout.CENTER);
     }
 

designer_chart/src/com/fr/plugin/chart/structure/desinger/style/VanChartStructureSeriesPane.java

@@ -44,7 +44,6 @@ public class VanChartStructureSeriesPane extends VanChartAbstractPlotSeriesPane
         double[] columnSize = {f};
         double[] rowSize = {p,p,p};
         Component[][] components = new Component[][]{
-                new Component[]{getColorPane()},
                 new Component[]{createLinkPane()},
                 new Component[]{createNodePane()}
         };
@@ -54,12 +53,6 @@ public class VanChartStructureSeriesPane extends VanChartAbstractPlotSeriesPane
         return contentPane;
     }
 
-    //设置色彩面板内容
-    protected void setColorPaneContent (JPanel panel) {
-        panel.add(getFillStylePane(), BorderLayout.NORTH);
-    }
-
-
     private JPanel createLinkPane() {
         linkColor = new ColorSelectBox(100);
 

designer_chart/src/com/fr/plugin/chart/wordcloud/designer/style/VanChartWordCloudSeriesPane.java

@@ -60,7 +60,6 @@ public class VanChartWordCloudSeriesPane extends VanChartAbstractPlotSeriesPane
         double[] columnSize = {f};
         double[] rowSize = {p,p,p};
         Component[][] components = new Component[][]{
-                new Component[]{getColorPane()},
                 new Component[]{createWordCloudStylePane()},
         };
 
@@ -69,11 +68,6 @@ public class VanChartWordCloudSeriesPane extends VanChartAbstractPlotSeriesPane
         return contentPane;
     }
 
-    //设置色彩面板内容
-    protected void setColorPaneContent (JPanel panel) {
-        panel.add(getFillStylePane(), BorderLayout.NORTH);
-    }
-
     private JPanel createWordCloudStylePane(){
         double labelSize = LABEL_SIZE;
         double p = TableLayout.PREFERRED;