diff --git a/designer-base/src/main/java/com/fr/design/layout/FRGUIPaneFactory.java b/designer-base/src/main/java/com/fr/design/layout/FRGUIPaneFactory.java
index 0c3a067a95..80efde739e 100644
--- a/designer-base/src/main/java/com/fr/design/layout/FRGUIPaneFactory.java
+++ b/designer-base/src/main/java/com/fr/design/layout/FRGUIPaneFactory.java
@@ -562,7 +562,7 @@ public class FRGUIPaneFactory {
         double n = (double)(width + WIDTH_OFFSET_N ) / (double)WIDTH_PARA_F;
         double i = Math.abs(((double) ((int) m + (int) (m + 1)) / WIDTHABS_PARA_F) - m);
         double j = Math.abs(((double) ((int) n + (int) (n + 1)) / WIDTHABS_PARA_F) - n);
-        double x = i > j ? i : j;
+        double x = Math.max(i,j);
         if (AssistUtils.equals(x, i)) {
             w = (int) (Math.round(m) * WIDTH_PARA_INT - WIDTH_OFFSET_M);
         } else if (AssistUtils.equals(x, j)) {
diff --git a/designer-base/src/main/java/com/fr/design/layout/TableLayoutHelper.java b/designer-base/src/main/java/com/fr/design/layout/TableLayoutHelper.java
index 1be77c8492..d394f43ee7 100644
--- a/designer-base/src/main/java/com/fr/design/layout/TableLayoutHelper.java
+++ b/designer-base/src/main/java/com/fr/design/layout/TableLayoutHelper.java
@@ -372,7 +372,8 @@ public class TableLayoutHelper {
         double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
         JPanel jp1 = TableLayoutHelper.createTableLayoutPane(createTestComponents("jp1"), TableLayoutHelper.FILL_NONE);
-        JPanel jp2 = TableLayoutHelper.createGapTableLayoutPane(createTestComponents("jp2"), TableLayoutHelper.FILL_LASTCOL_AND_ROW, (double)2 * TEN, (double)2 * TEN);
+        JPanel jp2 = TableLayoutHelper.createGapTableLayoutPane(createTestComponents("jp2"),
+                TableLayoutHelper.FILL_LASTCOL_AND_ROW, (double)2 * TEN, (double)2 * TEN);
         JPanel jp3 = TableLayoutHelper.createGapTableLayoutPane(createTestComponents("jp3"),
                 new double[]{f, p, f, p}, new double[]{f, f}, 4, 4);
         JPanel jp4 = TableLayoutHelper.createGapTableLayoutPane(createTestComponents("jp4"),
diff --git a/designer-chart/src/main/java/com/fr/design/chartx/CustomChartDataPane.java b/designer-chart/src/main/java/com/fr/design/chartx/CustomChartDataPane.java
index 9ff8fd28cc..5396e88e63 100644
--- a/designer-chart/src/main/java/com/fr/design/chartx/CustomChartDataPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chartx/CustomChartDataPane.java
@@ -3,6 +3,8 @@ package com.fr.design.chartx;
 import com.fr.chart.chartattr.ChartCollection;
 import com.fr.chartx.data.AbstractDataDefinition;
 import com.fr.chartx.data.CustomChartDataDefinition;
+import com.fr.design.chartx.fields.diff.FunnelCellDataFieldsPane;
+import com.fr.design.chartx.fields.diff.FunnelDataSetFieldsPane;
 import com.fr.design.chartx.fields.diff.GaugeCellDataFieldsPane;
 import com.fr.design.chartx.fields.diff.GaugeDataSetFieldsPane;
 import com.fr.design.chartx.fields.diff.MultiCategoryCellDataFieldsPane;
@@ -41,6 +43,9 @@ import java.util.Map;
  */
 public class CustomChartDataPane extends ChartDataPane {
 
+    private static final int HGAP = 0;
+    private static final int VGAP = 6;
+
     public CustomChartDataPane(AttributeChangeListener listener) {
         super(listener);
     }
@@ -92,10 +97,18 @@ public class CustomChartDataPane extends ChartDataPane {
             case SCATTER:
             case BUBBLE:
                 return new SingleDataPane(new ScatterDataSetFieldsPane(), new ScatterCellDataFieldsPane());
+            case PIE:
+            case SAME_PIE:
+            case DIFFERENT_PIE:
+            case POINTER_180:
+            case POINTER_360:
+                return new SingleDataPane(new FunnelDataSetFieldsPane(), new FunnelCellDataFieldsPane());
             default:
-                return StringUtils.equals(CustomStyle.CUSTOM.toString(), plot.getCustomType()) ?
-                        new SingleDataPane(new SingleCategoryDataSetFieldsPane(), new SingleCategoryCellDataFieldsPane()) :
-                        new SingleDataPane(new MultiCategoryDataSetFieldsPane(), new MultiCategoryCellDataFieldsPane());
+                if (StringUtils.equals(CustomStyle.CUSTOM.toString(), plot.getCustomType())){
+                    return new SingleDataPane(new SingleCategoryDataSetFieldsPane(), new SingleCategoryCellDataFieldsPane());
+                } else {
+                    return new SingleDataPane(new MultiCategoryDataSetFieldsPane(), new MultiCategoryCellDataFieldsPane());
+                }
         }
     }
 
@@ -147,7 +160,7 @@ public class CustomChartDataPane extends ChartDataPane {
         JPanel tabPanel = new JPanel(new BorderLayout());
         tabPanel.setBorder(BorderFactory.createMatteBorder(0, 0, 0, 0, getBackground()));
         tabPanel.add(tabPane, BorderLayout.CENTER);
-        this.setLayout(new BorderLayout(0, 6));
+        this.setLayout(new BorderLayout(HGAP, VGAP));
         this.add(tabPanel, BorderLayout.NORTH);
         this.add(centerPane, BorderLayout.CENTER);
     }
diff --git a/designer-chart/src/main/java/com/fr/design/chartx/component/AbstractMultiComponentPane.java b/designer-chart/src/main/java/com/fr/design/chartx/component/AbstractMultiComponentPane.java
index 6474cad0b6..f82e4b253c 100644
--- a/designer-chart/src/main/java/com/fr/design/chartx/component/AbstractMultiComponentPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chartx/component/AbstractMultiComponentPane.java
@@ -10,13 +10,13 @@ import com.fr.general.IOUtils;
 import javax.swing.BoxLayout;
 import javax.swing.JComponent;
 import javax.swing.JPanel;
+import java.util.ArrayList;
+import java.util.List;
 import java.awt.BorderLayout;
 import java.awt.Dimension;
 import java.awt.FlowLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.util.ArrayList;
-import java.util.List;
 
 
 /**
@@ -168,4 +168,8 @@ public abstract class AbstractMultiComponentPane<T extends JComponent> extends J
             updateField(comboBox, temp);
         }
     }
+
+    public void checkEnable(boolean hasUse){
+        addButton.setEnabled(hasUse);
+    }
 }
diff --git a/designer-chart/src/main/java/com/fr/design/chartx/component/AbstractMultiComponentPaneWithUISpinner.java b/designer-chart/src/main/java/com/fr/design/chartx/component/AbstractMultiComponentPaneWithUISpinner.java
index 5f0e6500b0..f784c4a861 100644
--- a/designer-chart/src/main/java/com/fr/design/chartx/component/AbstractMultiComponentPaneWithUISpinner.java
+++ b/designer-chart/src/main/java/com/fr/design/chartx/component/AbstractMultiComponentPaneWithUISpinner.java
@@ -11,10 +11,10 @@ import com.fr.stable.AssistUtils;
 
 import javax.swing.JComponent;
 import javax.swing.JPanel;
-import java.awt.BorderLayout;
-import java.awt.Component;
 import java.util.ArrayList;
 import java.util.List;
+import java.awt.BorderLayout;
+import java.awt.Component;
 
 /**
  * Created by shine on 2019/6/18.
@@ -148,4 +148,8 @@ public abstract class AbstractMultiComponentPaneWithUISpinner<T extends JCompone
             updateField(comboBox, temp);
         }
     }
+
+    public void checkEnable(boolean hasUse){
+        levelNumSpinner.setEnabled(hasUse);
+    }
 }
diff --git a/designer-chart/src/main/java/com/fr/design/chartx/component/AbstractSingleFilterPane.java b/designer-chart/src/main/java/com/fr/design/chartx/component/AbstractSingleFilterPane.java
index 487c6cf135..187dd25475 100644
--- a/designer-chart/src/main/java/com/fr/design/chartx/component/AbstractSingleFilterPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chartx/component/AbstractSingleFilterPane.java
@@ -20,6 +20,7 @@ import javax.swing.event.ChangeListener;
 import java.awt.BorderLayout;
 import java.awt.Component;
 import java.awt.Dimension;
+import java.awt.Label;
 
 /**
  * Created by shine on 2019/07/18.
@@ -76,7 +77,7 @@ public abstract class AbstractSingleFilterPane extends AbstractChartTabPane<Data
         JPanel panel1 = new JPanel(new BorderLayout());
         JPanel panel2 = new JPanel(new BorderLayout());
         panel1.add(useTopCheckBox, BorderLayout.NORTH);
-        topNumTextField = new UITextField();
+        topNumTextField = new UITextField("0");
         UILabel label = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Records_Num"));
         mergeOtherCheckBox = new UICheckBox(Toolkit.i18nText("Fine-Design_Chart_Data_CombineOther"));
         mergeOtherCheckBox.setSelected(true);
@@ -108,7 +109,11 @@ public abstract class AbstractSingleFilterPane extends AbstractChartTabPane<Data
                 fire();
             }
         };
-        JPanel presentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Present"), present);
+        JPanel presentPane = new JPanel(new BorderLayout(30, 0));
+        presentPane.add(new Label(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Present")), BorderLayout.WEST);
+        presentPane.add(present,BorderLayout.CENTER);
+        presentPane.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
+
         panel2.add(presentPane, BorderLayout.SOUTH);
 
         double[] column = {f};
diff --git a/designer-chart/src/main/java/com/fr/design/chartx/component/CategorySeriesFilterPane.java b/designer-chart/src/main/java/com/fr/design/chartx/component/CategorySeriesFilterPane.java
index fedb962328..55aca59954 100644
--- a/designer-chart/src/main/java/com/fr/design/chartx/component/CategorySeriesFilterPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chartx/component/CategorySeriesFilterPane.java
@@ -8,9 +8,10 @@ import com.fr.design.i18n.Toolkit;
 import com.fr.van.chart.designer.TableLayout4VanChartHelper;
 import com.fr.van.chart.map.designer.VanChartGroupPane;
 
+import javax.swing.BorderFactory;
 import javax.swing.JPanel;
-import java.awt.BorderLayout;
 import java.util.List;
+import java.awt.BorderLayout;
 
 /**
  * @author shine
@@ -36,14 +37,14 @@ public class CategorySeriesFilterPane extends JPanel {
             }
         };
 
-        JPanel groupPane = new VanChartGroupPane(new String[]{seriesFilterPane.title4PopupWindow(), categoryFilterPane.title4PopupWindow()}
-                , new JPanel[]{seriesFilterPane, categoryFilterPane}) {
+        JPanel groupPane = new VanChartGroupPane(new String[]{categoryFilterPane.title4PopupWindow(), seriesFilterPane.title4PopupWindow()}
+                , new JPanel[]{categoryFilterPane, seriesFilterPane}) {
         };
 
         JPanel contentPane = new JPanel(new BorderLayout());
         contentPane.add(new JPanel(), BorderLayout.NORTH);
         contentPane.add(groupPane, BorderLayout.CENTER);
-
+        groupPane.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 15));
         this.setLayout(new BorderLayout());
         this.add(TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Data_Filter"), contentPane), BorderLayout.CENTER);
     }
diff --git a/designer-chart/src/main/java/com/fr/design/chartx/component/MultiComboBoxPane.java b/designer-chart/src/main/java/com/fr/design/chartx/component/MultiComboBoxPane.java
index f1716a0ae0..f66dac3121 100644
--- a/designer-chart/src/main/java/com/fr/design/chartx/component/MultiComboBoxPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chartx/component/MultiComboBoxPane.java
@@ -14,6 +14,7 @@ import java.util.List;
 public class MultiComboBoxPane extends AbstractMultiComponentPane<UIComboBox> {
     private List currentBoxItems = new ArrayList();
 
+
     public void setCurrentBoxItems(List currentBoxItems) {
         this.currentBoxItems = currentBoxItems;
     }
diff --git a/designer-chart/src/main/java/com/fr/design/chartx/fields/AbstractCellDataFieldsPane.java b/designer-chart/src/main/java/com/fr/design/chartx/fields/AbstractCellDataFieldsPane.java
index b302ec8632..6d1cf932ad 100644
--- a/designer-chart/src/main/java/com/fr/design/chartx/fields/AbstractCellDataFieldsPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chartx/fields/AbstractCellDataFieldsPane.java
@@ -47,7 +47,7 @@ public abstract class AbstractCellDataFieldsPane<T extends AbstractColumnFieldCo
             this.add(south, BorderLayout.SOUTH);
         }
 
-        this.setBorder(BorderFactory.createEmptyBorder(0, 15, 0, 8));
+        this.setBorder(BorderFactory.createEmptyBorder(0, 24, 0, 15));
     }
 
     protected JPanel createCenterPane() {
@@ -66,7 +66,7 @@ public abstract class AbstractCellDataFieldsPane<T extends AbstractColumnFieldCo
         }
 
         double p = TableLayout.PREFERRED;
-        double[] columnSize = {ChartDataPane.LABEL_WIDTH, 124};
+        double[] columnSize = {ChartDataPane.LABEL_WIDTH, 122};
         double[] rowSize = new double[len];
         Arrays.fill(rowSize, p);
 
diff --git a/designer-chart/src/main/java/com/fr/design/chartx/fields/AbstractDataSetFieldsPane.java b/designer-chart/src/main/java/com/fr/design/chartx/fields/AbstractDataSetFieldsPane.java
index 82cc89a62c..9e8848ebca 100644
--- a/designer-chart/src/main/java/com/fr/design/chartx/fields/AbstractDataSetFieldsPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chartx/fields/AbstractDataSetFieldsPane.java
@@ -17,10 +17,10 @@ import com.fr.stable.StringUtils;
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 import javax.swing.SwingConstants;
-import java.awt.BorderLayout;
-import java.awt.Component;
 import java.util.Arrays;
 import java.util.List;
+import java.awt.BorderLayout;
+import java.awt.Component;
 
 import static com.fr.design.mainframe.chart.gui.data.table.DataPaneHelper.refreshBoxItems;
 
@@ -95,7 +95,7 @@ public abstract class AbstractDataSetFieldsPane<T extends AbstractColumnFieldCol
     protected abstract UIComboBox[] filedComboBoxes();
 
     public void checkBoxUse(boolean hasUse) {
-        for (Component component : fieldComponents()) {
+        for (Component component : filedComboBoxes()) {
             component.setEnabled(hasUse);
         }
     }
diff --git a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/FunnelCellDataFieldsPane.java b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/FunnelCellDataFieldsPane.java
index abf40ea529..c1766576c4 100644
--- a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/FunnelCellDataFieldsPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/FunnelCellDataFieldsPane.java
@@ -13,6 +13,7 @@ import java.awt.BorderLayout;
 
 /**
  * Created by Wim on 2019/10/23.
+ * 饼图、多指针仪表盘 在组合图中 没有分类配置项, 也用这个。
  */
 public class FunnelCellDataFieldsPane extends AbstractCellDataFieldsWithSeriesValuePane<ColumnFieldCollectionWithSeriesValue> {
 
@@ -54,7 +55,7 @@ public class FunnelCellDataFieldsPane extends AbstractCellDataFieldsWithSeriesVa
         ColumnFieldCollectionWithSeriesValue fieldCollection = new ColumnFieldCollectionWithSeriesValue();
         updateSeriesValuePane(fieldCollection);
         SeriesValueCorrelationDefinition seriesValueCorrelationDefinition = fieldCollection.getSeriesValueCorrelationDefinition();
-        filterPane.updateBean(seriesValueCorrelationDefinition.getFilterProperties());
+        seriesValueCorrelationDefinition.setFilterProperties(filterPane.updateBean());
         return fieldCollection;
     }
 
diff --git a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/FunnelDataSetFieldsPane.java b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/FunnelDataSetFieldsPane.java
index aa1c9fe28a..ee15e39450 100644
--- a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/FunnelDataSetFieldsPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/FunnelDataSetFieldsPane.java
@@ -14,6 +14,7 @@ import java.awt.BorderLayout;
 
 /**
  * Created by Wim on 2019/10/23.
+ * 饼图、多指针仪表盘 在组合图中 没有分类配置项, 也用这个。
  */
 public class FunnelDataSetFieldsPane extends AbstractDataSetFieldsWithSeriesValuePane<ColumnFieldCollectionWithSeriesValue> {
 
diff --git a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/GaugeCellDataFieldsPane.java b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/GaugeCellDataFieldsPane.java
index 5df78ff2ba..f93cf0effa 100644
--- a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/GaugeCellDataFieldsPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/GaugeCellDataFieldsPane.java
@@ -34,7 +34,7 @@ public class GaugeCellDataFieldsPane extends AbstractCellDataFieldsPane<GaugeCol
 
         JPanel northPane = new JPanel(new BorderLayout(0, 6));
         northPane.add(createCenterPane(), BorderLayout.CENTER);
-        northPane.setBorder(BorderFactory.createEmptyBorder(0, 15, 0, 8));
+        northPane.setBorder(BorderFactory.createEmptyBorder(0, 24, 0, 15));
 
         this.setLayout(new BorderLayout(0, 6));
         this.add(northPane, BorderLayout.NORTH);
@@ -69,7 +69,7 @@ public class GaugeCellDataFieldsPane extends AbstractCellDataFieldsPane<GaugeCol
         GaugeColumnFieldCollection gauge = new GaugeColumnFieldCollection();
         updateField(category, gauge.getCategory());
         updateField(value, gauge.getValue());
-        filterPane.updateBean(gauge.getCategory().getFilterProperties());
+        gauge.getCategory().setFilterProperties(filterPane.updateBean());
         return gauge;
     }
 
diff --git a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/MultiCategoryDataSetFieldsPane.java b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/MultiCategoryDataSetFieldsPane.java
index 911db920ca..76a6a21f5e 100644
--- a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/MultiCategoryDataSetFieldsPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/MultiCategoryDataSetFieldsPane.java
@@ -9,8 +9,8 @@ import com.fr.design.gui.icombobox.UIComboBox;
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 import javax.swing.JSeparator;
-import java.awt.BorderLayout;
 import java.util.List;
+import java.awt.BorderLayout;
 
 
 /**
@@ -49,6 +49,12 @@ public class MultiCategoryDataSetFieldsPane extends AbstractDataSetFieldsWithSer
         return list.toArray(new UIComboBox[list.size()]);
     }
 
+    @Override
+    public void checkBoxUse(boolean hasUse) {
+        super.checkBoxUse(hasUse);
+        multiCategoryPane.checkEnable(hasUse);
+    }
+
     @Override
     public void refreshBoxListWithSelectTableData(List columnNameList) {
         super.refreshBoxListWithSelectTableData(columnNameList);
diff --git a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/MultiPieDataSetFieldsPane.java b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/MultiPieDataSetFieldsPane.java
index e186866169..34b7200548 100644
--- a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/MultiPieDataSetFieldsPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/MultiPieDataSetFieldsPane.java
@@ -16,9 +16,9 @@ import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 import javax.swing.JSeparator;
 import javax.swing.SwingConstants;
+import java.util.List;
 import java.awt.BorderLayout;
 import java.awt.Component;
-import java.util.List;
 
 /**
  * Created by shine on 2019/6/18.
@@ -90,6 +90,12 @@ public class MultiPieDataSetFieldsPane extends AbstractDataSetFieldsPane<MultiPi
         return result;
     }
 
+    @Override
+    public void checkBoxUse(boolean hasUse) {
+        super.checkBoxUse(hasUse);
+        levelComboBoxPane.checkEnable(hasUse);
+    }
+
     @Override
     public void refreshBoxListWithSelectTableData(List columnNameList) {
         super.refreshBoxListWithSelectTableData(columnNameList);
diff --git a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/ScatterCellDataFieldsPane.java b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/ScatterCellDataFieldsPane.java
index 920538f431..06a177ea9a 100644
--- a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/ScatterCellDataFieldsPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/ScatterCellDataFieldsPane.java
@@ -76,11 +76,13 @@ public class ScatterCellDataFieldsPane extends AbstractCellDataFieldsPane<Bubble
     public BubbleColumnFieldCollection updateBean() {
         BubbleColumnFieldCollection collection = new BubbleColumnFieldCollection();
         seriesXYValueCorrelationPane.updateBean(collection);
+        collection.setFilterProperties(filterPane.updateBean());
         return collection;
     }
 
     @Override
     public void populateBean(BubbleColumnFieldCollection ob) {
         seriesXYValueCorrelationPane.populateBean(ob);
+        filterPane.populateBean(ob.getFilterProperties());
     }
 }
diff --git a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/ScatterDataSetFieldsPane.java b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/ScatterDataSetFieldsPane.java
index 656d1421bf..21ef67b295 100644
--- a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/ScatterDataSetFieldsPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/ScatterDataSetFieldsPane.java
@@ -75,17 +75,21 @@ public class ScatterDataSetFieldsPane extends AbstractDataSetFieldsPane<BubbleCo
     @Override
     public BubbleColumnFieldCollection updateBean() {
         BubbleColumnFieldCollection collection = new BubbleColumnFieldCollection();
-        BubbleColumnField field = collection.getBubbleColumnField(0);
+        BubbleColumnField field = new BubbleColumnField();
         updateField(series, field.getSeriesName());
         updateField(xField, field.getXField());
         updateField(yField, field.getYField());
         updateField(size, field.getSizeField());
         field.getSeriesName().setFilterProperties(filterPane.updateBean());
+        collection.add(field);
         return collection;
     }
 
     @Override
     public void populateBean(BubbleColumnFieldCollection ob) {
+        if (ob.getList().isEmpty()){
+            return;
+        }
         BubbleColumnField field = ob.getBubbleColumnField(0);
         populateField(series, field.getSeriesName());
         populateField(xField, field.getXField());
diff --git a/designer-chart/src/main/java/com/fr/design/chartx/single/DataSetPane.java b/designer-chart/src/main/java/com/fr/design/chartx/single/DataSetPane.java
index 5875b480a2..491c7cae46 100644
--- a/designer-chart/src/main/java/com/fr/design/chartx/single/DataSetPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chartx/single/DataSetPane.java
@@ -13,11 +13,11 @@ import com.fr.design.mainframe.chart.gui.data.DatabaseTableDataPane;
 import com.fr.design.utils.gui.UIComponentUtils;
 import com.fr.stable.AssistUtils;
 
-import java.awt.BorderLayout;
-import java.awt.Dimension;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.List;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
 
 /**
  * Created by shine on 2019/5/21.
@@ -53,6 +53,7 @@ public class DataSetPane extends FurtherBasicBeanPane<DataSetDefinition> {
         this.setLayout(new BorderLayout());
         this.add(tableDataPane, BorderLayout.NORTH);
         this.add(dataSetFieldsPane, BorderLayout.CENTER);
+        checkBoxUse();
     }
 
     /**
diff --git a/designer-chart/src/main/java/com/fr/design/chartx/single/SingleDataPane.java b/designer-chart/src/main/java/com/fr/design/chartx/single/SingleDataPane.java
index a4e6949983..dc4dfc65ad 100644
--- a/designer-chart/src/main/java/com/fr/design/chartx/single/SingleDataPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chartx/single/SingleDataPane.java
@@ -7,23 +7,24 @@ import com.fr.design.chartx.fields.AbstractCellDataFieldsPane;
 import com.fr.design.chartx.fields.AbstractDataSetFieldsPane;
 import com.fr.design.constants.LayoutConstants;
 import com.fr.design.gui.frpane.UIComboBoxPane;
+import com.fr.design.gui.ilable.BoldFontTextLabel;
 import com.fr.design.gui.ilable.UILabel;
-import com.fr.design.mainframe.chart.gui.ChartDataPane;
-import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.utils.gui.UIComponentUtils;
 
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
-import java.awt.BorderLayout;
-import java.awt.Component;
-import java.awt.Dimension;
 import java.util.ArrayList;
 import java.util.List;
+import java.awt.BorderLayout;
 
 /**
  * Created by shine on 2019/5/21.
  */
 public class SingleDataPane extends BasicBeanPane<AbstractDataDefinition> {
 
+    private static final int  TABLE_DATA_LABEL_LINE_WIDTH = 81;
+
     private UIComboBoxPane<AbstractDataDefinition> comboBoxPane;
 
     private DataSetPane dataSetPane;
@@ -51,11 +52,13 @@ public class SingleDataPane extends BasicBeanPane<AbstractDataDefinition> {
             protected void initLayout() {
                 this.setLayout(new BorderLayout(LayoutConstants.HGAP_LARGE, 6));
                 JPanel northPane = new JPanel(new BorderLayout(LayoutConstants.HGAP_LARGE, 0));
+
+                UILabel label = new BoldFontTextLabel(Toolkit.i18nText("Fine-Design_Chart_Data_Source"));
+                UIComponentUtils.setPreferedWidth(label, TABLE_DATA_LABEL_LINE_WIDTH);
+                northPane.add(label,BorderLayout.WEST);
                 northPane.add(jcb, BorderLayout.CENTER);
-                UILabel label1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Source"));
-                label1.setPreferredSize(new Dimension(ChartDataPane.LABEL_WIDTH, ChartDataPane.LABEL_HEIGHT));
-                northPane.add(GUICoreUtils.createBorderLayoutPane(new Component[]{jcb, null, null, label1, null}));
-                northPane.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 8));
+
+                northPane.setBorder(BorderFactory.createEmptyBorder(5,24,0,15));
                 this.add(northPane, BorderLayout.NORTH);
                 this.add(cardPane, BorderLayout.CENTER);
 
@@ -70,7 +73,6 @@ public class SingleDataPane extends BasicBeanPane<AbstractDataDefinition> {
 
         this.setLayout(new BorderLayout());
         this.add(comboBoxPane, BorderLayout.CENTER);
-
     }
 
     @Override
diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartTitlePane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartTitlePane.java
index 01610a2457..92df8bc6b2 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartTitlePane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartTitlePane.java
@@ -160,7 +160,7 @@ public class VanChartTitlePane extends AbstractVanChartScrollPane<VanChart> {
         initPositionListener();
 
         JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components,row,col);
-        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout"), panel);
+        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Form_Layout"), panel);
     }
 
     private JPanel createTitleStylePane(){
diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartBaseAxisPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartBaseAxisPane.java
index 0949dbf6eb..8b309840e7 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartBaseAxisPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartBaseAxisPane.java
@@ -118,7 +118,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
                 new Component[]{createLabelPane(new double[]{p, p}, column), null},
                 new Component[]{createLineStylePane(new double[]{p, p, p, p, p}, columnSize), null},
                 new Component[]{createAxisPositionPane(new double[]{p, p, p}, columnSize, isXAxis), null},
-                new Component[]{createDisplayStrategy(new double[]{p, p, p}, columnSize), null},
+                new Component[]{createDisplayStrategy(), null},
                 new Component[]{createValueStylePane(), null},
         };
 
@@ -326,7 +326,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
         }
     }
 
-    protected JPanel createDisplayStrategy(double[] row, double[] col){
+    protected JPanel createDisplayStrategy(){
         limitPane = new LimitPane();
         return limitPane;
     }
@@ -385,7 +385,9 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
     protected void checkAllUse() {
         checkCardPane();
         checkLabelPane();
-        limitPane.checkMaxProPortionUse();
+        if (limitPane != null){
+            limitPane.checkMaxProPortionUse();
+        }
     }
 
     protected void checkCardPane() {
diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartTimeAxisPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartTimeAxisPane.java
index 74dbf7221b..2d408c9050 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartTimeAxisPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartTimeAxisPane.java
@@ -73,7 +73,7 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane {
                 new Component[]{createValueDefinition(),null},
                 new Component[]{createLineStylePane(new double[]{p, p,p,p,p}, columnSize),null},
                 new Component[]{createAxisPositionPane(new double[]{p, p, p}, columnSize, isXAxis),null},
-                new Component[]{createDisplayStrategy(new double[]{p, p,p}, columnSize),null},
+                new Component[]{createDisplayStrategy(),null},
                 new Component[]{createValueStylePane(),null},
         };
 
diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartValueAxisPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartValueAxisPane.java
index 3b271f2b3a..2b90633e67 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartValueAxisPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartValueAxisPane.java
@@ -54,7 +54,7 @@ public class VanChartValueAxisPane extends VanChartBaseAxisPane {
                 new Component[]{createMinMaxValuePane(new double[]{p, p}, columnSize), null},
                 new Component[]{createLineStylePane(new double[]{p, p, p, p, p}, columnSize), null},
                 new Component[]{createAxisPositionPane(new double[]{p, p, p}, columnSize, isXAxis), null},
-                new Component[]{createDisplayStrategy(new double[]{p, p, p}, columnSize), null},
+                new Component[]{createDisplayStrategy(), null},
                 new Component[]{createValueStylePane(), null},
         };