Merge pull request #1251 in DESIGN/design from ~WIM.ZHAI/xdesign:feature/10.0 to feature/10.0

* commit 'edae2bdcbf58abc88d3943320457c636b41e8158':
  style 还需按图表类型切换数据面板 #CHART-4248
  refactor:散点图气泡图数据面板 CHART-4248
  CHART-4248 重命名非抽象类

designer-chart/src/main/java/com/fr/design/chartx/CustomChartDataPane.java

@@ -5,6 +5,8 @@ import com.fr.chartx.data.AbstractDataDefinition;
 import com.fr.chartx.data.CustomChartDataDefinition;
 import com.fr.design.chartx.fields.diff.MultiCategoryCellDataFieldsPane;
 import com.fr.design.chartx.fields.diff.MultiCategoryDataSetFieldsPane;
+import com.fr.design.chartx.fields.diff.ScatterCellDataFieldsPane;
+import com.fr.design.chartx.fields.diff.ScatterDataSetFieldsPane;
 import com.fr.design.chartx.fields.diff.SingleCategoryCellDataFieldsPane;
 import com.fr.design.chartx.fields.diff.SingleCategoryDataSetFieldsPane;
 import com.fr.design.chartx.single.SingleDataPane;
@@ -22,13 +24,13 @@ import com.fr.van.chart.custom.component.VanChartCustomPlotUITabGroup;
 
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
+import java.awt.BorderLayout;
+import java.awt.CardLayout;
+import java.awt.Dimension;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.awt.BorderLayout;
-import java.awt.CardLayout;
-import java.awt.Dimension;
 
 /**
  * @author Bjorn
@@ -88,8 +90,7 @@ public class CustomChartDataPane extends ChartDataPane {
                 return new SingleDataPane(new SingleCategoryDataSetFieldsPane(), new SingleCategoryCellDataFieldsPane());
             case SCATTER:
             case BUBBLE:
-                //todo 散点图没写好
+                return new SingleDataPane(new ScatterDataSetFieldsPane(), new ScatterCellDataFieldsPane());
-                return new SingleDataPane(new SingleCategoryDataSetFieldsPane(), new SingleCategoryCellDataFieldsPane());
             default:
                 return StringUtils.equals(CustomStyle.CUSTOM.toString(), plot.getCustomType()) ?
                         new SingleDataPane(new SingleCategoryDataSetFieldsPane(), new SingleCategoryCellDataFieldsPane()) :

designer-chart/src/main/java/com/fr/design/chartx/component/CellDataSeriesXYValueCorrelationPane.java

@@ -0,0 +1,66 @@
+package com.fr.design.chartx.component;
+
+import com.fr.base.Utils;
+import com.fr.chartx.data.field.ColumnField;
+import com.fr.chartx.data.field.diff.BubbleColumnField;
+import com.fr.chartx.data.field.diff.BubbleColumnFieldCollection;
+import com.fr.design.chartx.component.correlation.AbstractCorrelationPane;
+import com.fr.design.chartx.component.correlation.FieldEditorComponentWrapper;
+import com.fr.design.chartx.component.correlation.TinyFormulaPaneEditorComponent;
+import com.fr.design.i18n.Toolkit;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by Wim on 2019/11/04.
+ */
+public class CellDataSeriesXYValueCorrelationPane extends AbstractCorrelationPane<BubbleColumnFieldCollection> {
+
+    @Override
+    protected FieldEditorComponentWrapper[] createFieldEditorComponentWrappers() {
+        return new FieldEditorComponentWrapper[]{
+                new TinyFormulaPaneEditorComponent(Toolkit.i18nText("Fine-Design_Chart_Series_Name")),
+                new TinyFormulaPaneEditorComponent(Toolkit.i18nText("Fine-Design_Chart_X_Axis")),
+                new TinyFormulaPaneEditorComponent(Toolkit.i18nText("Fine-Design_Chart_Y_Axis")),
+                new TinyFormulaPaneEditorComponent(Toolkit.i18nText("Fine-Design_Chart_Series_Value"))
+        };
+    }
+
+    @Override
+    protected List<Object[]> covertTBeanToTableModelList(BubbleColumnFieldCollection bubbleColumnFieldCollection) {
+        List<Object[]> result = new ArrayList<>();
+
+        List<BubbleColumnField> bubbleColumnFieldList = bubbleColumnFieldCollection.getList();
+        for (BubbleColumnField field : bubbleColumnFieldList) {
+            Object[] array = new Object[]{
+                    field.getSeriesName().getFieldName(),
+                    field.getXField().getFieldName(),
+                    field.getYField().getFieldName(),
+                    field.getValueField().getFieldName()
+            };
+            result.add(array);
+        }
+
+        return result;
+    }
+
+    @Override
+    protected void setTableModelListToTBean(List<Object[]> tableValues, BubbleColumnFieldCollection bubbleColumnFieldCollection) {
+        List<BubbleColumnField> bubbleColumnFieldList = new ArrayList<>();
+        for (Object[] oneLine : tableValues) {
+            BubbleColumnField bubbleColumnField = new BubbleColumnField();
+            ColumnField series = new ColumnField(Utils.objectToString(oneLine[0]));
+            ColumnField xField = new ColumnField(Utils.objectToString(oneLine[1]));
+            ColumnField yField = new ColumnField(Utils.objectToString(oneLine[2]));
+            ColumnField value = new ColumnField(Utils.objectToString(oneLine[3]));
+            bubbleColumnField.setSeriesName(series);
+            bubbleColumnField.setXField(xField);
+            bubbleColumnField.setYField(yField);
+            bubbleColumnField.setValueField(value);
+            bubbleColumnFieldList.add(bubbleColumnField);
+        }
+
+        bubbleColumnFieldCollection.setList(bubbleColumnFieldList);
+    }
+}

designer-chart/src/main/java/com/fr/design/chartx/fields/diff/AbstractCellDataFieldsWithSeriesValuePane.java

@@ -1,6 +1,6 @@
 package com.fr.design.chartx.fields.diff;
 
-import com.fr.chartx.data.field.diff.AbstractColumnFieldCollectionWithSeriesValue;
+import com.fr.chartx.data.field.diff.ColumnFieldCollectionWithSeriesValue;
 import com.fr.design.chartx.component.CellDataSeriesValueCorrelationPane;
 import com.fr.design.chartx.fields.AbstractCellDataFieldsPane;
 
@@ -10,7 +10,7 @@ import java.awt.BorderLayout;
 /**
  * Created by shine on 2019/6/4.
  */
-public abstract class AbstractCellDataFieldsWithSeriesValuePane<T extends AbstractColumnFieldCollectionWithSeriesValue>
+public abstract class AbstractCellDataFieldsWithSeriesValuePane<T extends ColumnFieldCollectionWithSeriesValue>
         extends AbstractCellDataFieldsPane<T> {
 
     private CellDataSeriesValueCorrelationPane seriesValueFieldsPane;
@@ -41,11 +41,11 @@ public abstract class AbstractCellDataFieldsWithSeriesValuePane<T extends Abstra
         this.seriesValueFieldsPane = seriesValueFieldsPane;
     }
 
-    protected void populateSeriesValuePane(AbstractColumnFieldCollectionWithSeriesValue fieldCollectionWithSeriesValue) {
+    protected void populateSeriesValuePane(ColumnFieldCollectionWithSeriesValue fieldCollectionWithSeriesValue) {
         seriesValueFieldsPane.populateBean(fieldCollectionWithSeriesValue.getSeriesValueCorrelationDefinition());
     }
 
-    protected void updateSeriesValuePane(AbstractColumnFieldCollectionWithSeriesValue fieldCollectionWithSeriesValue) {
+    protected void updateSeriesValuePane(ColumnFieldCollectionWithSeriesValue fieldCollectionWithSeriesValue) {
         seriesValueFieldsPane.updateBean(fieldCollectionWithSeriesValue.getSeriesValueCorrelationDefinition());
     }
 

designer-chart/src/main/java/com/fr/design/chartx/fields/diff/AbstractDataSetFieldsWithSeriesValuePane.java

@@ -1,6 +1,6 @@
 package com.fr.design.chartx.fields.diff;
 
-import com.fr.chartx.data.field.diff.AbstractColumnFieldCollectionWithSeriesValue;
+import com.fr.chartx.data.field.diff.ColumnFieldCollectionWithSeriesValue;
 import com.fr.design.chartx.component.SeriesValueFieldComboBoxPane;
 import com.fr.design.chartx.fields.AbstractDataSetFieldsPane;
 
@@ -12,7 +12,7 @@ import java.awt.BorderLayout;
  * Created by shine on 2019/5/16.
  * 带有 自定义系列名（fr表现为 系列名使用字段名） 的字段集合 的一个pane
  */
-public abstract class AbstractDataSetFieldsWithSeriesValuePane<T extends AbstractColumnFieldCollectionWithSeriesValue>
+public abstract class AbstractDataSetFieldsWithSeriesValuePane<T extends ColumnFieldCollectionWithSeriesValue>
         extends AbstractDataSetFieldsPane<T> {
 
     private SeriesValueFieldComboBoxPane seriesValueFieldComboBoxPane;
@@ -61,11 +61,11 @@ public abstract class AbstractDataSetFieldsWithSeriesValuePane<T extends Abstrac
         seriesValueFieldComboBoxPane.refreshBoxListWithSelectTableData(columnNameList);
     }
 
-    protected void populateSeriesValuePane(AbstractColumnFieldCollectionWithSeriesValue fieldCollectionWithSeriesValue) {
+    protected void populateSeriesValuePane(ColumnFieldCollectionWithSeriesValue fieldCollectionWithSeriesValue) {
         seriesValueFieldComboBoxPane.populateBean(fieldCollectionWithSeriesValue.getSeriesValueCorrelationDefinition());
     }
 
-    protected void updateSeriesValuePane(AbstractColumnFieldCollectionWithSeriesValue fieldCollectionWithSeriesValue) {
+    protected void updateSeriesValuePane(ColumnFieldCollectionWithSeriesValue fieldCollectionWithSeriesValue) {
         seriesValueFieldComboBoxPane.updateBean(fieldCollectionWithSeriesValue.getSeriesValueCorrelationDefinition());
     }
 }

designer-chart/src/main/java/com/fr/design/chartx/fields/diff/FunnelCellDataFieldsPane.java

@@ -1,7 +1,7 @@
 package com.fr.design.chartx.fields.diff;
 
 import com.fr.chartx.data.field.SeriesValueCorrelationDefinition;
-import com.fr.chartx.data.field.diff.AbstractColumnFieldCollectionWithSeriesValue;
+import com.fr.chartx.data.field.diff.ColumnFieldCollectionWithSeriesValue;
 import com.fr.design.chartx.component.AbstractSingleFilterPane;
 import com.fr.design.formula.TinyFormulaPane;
 import com.fr.design.i18n.Toolkit;
@@ -14,7 +14,7 @@ import java.awt.BorderLayout;
 /**
  * Created by Wim on 2019/10/23.
  */
-public class FunnelCellDataFieldsPane extends AbstractCellDataFieldsWithSeriesValuePane<AbstractColumnFieldCollectionWithSeriesValue> {
+public class FunnelCellDataFieldsPane extends AbstractCellDataFieldsWithSeriesValuePane<ColumnFieldCollectionWithSeriesValue> {
 
     private AbstractSingleFilterPane filterPane;
 
@@ -50,8 +50,8 @@ public class FunnelCellDataFieldsPane extends AbstractCellDataFieldsWithSeriesVa
     }
 
     @Override
-    public AbstractColumnFieldCollectionWithSeriesValue updateBean() {
+    public ColumnFieldCollectionWithSeriesValue updateBean() {
-        AbstractColumnFieldCollectionWithSeriesValue fieldCollection = new AbstractColumnFieldCollectionWithSeriesValue();
+        ColumnFieldCollectionWithSeriesValue fieldCollection = new ColumnFieldCollectionWithSeriesValue();
         updateSeriesValuePane(fieldCollection);
         SeriesValueCorrelationDefinition seriesValueCorrelationDefinition = fieldCollection.getSeriesValueCorrelationDefinition();
         filterPane.updateBean(seriesValueCorrelationDefinition.getFilterProperties());
@@ -59,7 +59,7 @@ public class FunnelCellDataFieldsPane extends AbstractCellDataFieldsWithSeriesVa
     }
 
     @Override
-    public void populateBean(AbstractColumnFieldCollectionWithSeriesValue ob) {
+    public void populateBean(ColumnFieldCollectionWithSeriesValue ob) {
         populateSeriesValuePane(ob);
         SeriesValueCorrelationDefinition seriesValueCorrelationDefinition = ob.getSeriesValueCorrelationDefinition();
         filterPane.populateBean(seriesValueCorrelationDefinition.getFilterProperties());

designer-chart/src/main/java/com/fr/design/chartx/fields/diff/FunnelDataSetFieldsPane.java

@@ -1,7 +1,7 @@
 package com.fr.design.chartx.fields.diff;
 
 import com.fr.chartx.data.field.SeriesValueCorrelationDefinition;
-import com.fr.chartx.data.field.diff.AbstractColumnFieldCollectionWithSeriesValue;
+import com.fr.chartx.data.field.diff.ColumnFieldCollectionWithSeriesValue;
 import com.fr.design.chartx.component.AbstractSingleFilterPane;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.i18n.Toolkit;
@@ -15,7 +15,7 @@ import java.awt.BorderLayout;
 /**
  * Created by Wim on 2019/10/23.
  */
-public class FunnelDataSetFieldsPane extends AbstractDataSetFieldsWithSeriesValuePane<AbstractColumnFieldCollectionWithSeriesValue> {
+public class FunnelDataSetFieldsPane extends AbstractDataSetFieldsWithSeriesValuePane<ColumnFieldCollectionWithSeriesValue> {
 
 
     private AbstractSingleFilterPane filterPane;
@@ -53,8 +53,8 @@ public class FunnelDataSetFieldsPane extends AbstractDataSetFieldsWithSeriesValu
     }
 
     @Override
-    public AbstractColumnFieldCollectionWithSeriesValue updateBean() {
+    public ColumnFieldCollectionWithSeriesValue updateBean() {
-        AbstractColumnFieldCollectionWithSeriesValue collection = new AbstractColumnFieldCollectionWithSeriesValue();
+        ColumnFieldCollectionWithSeriesValue collection = new ColumnFieldCollectionWithSeriesValue();
         updateSeriesValuePane(collection);
         SeriesValueCorrelationDefinition seriesValueCorrelationDefinition = collection.getSeriesValueCorrelationDefinition();
         filterPane.updateBean(seriesValueCorrelationDefinition.getFilterProperties());
@@ -62,7 +62,7 @@ public class FunnelDataSetFieldsPane extends AbstractDataSetFieldsWithSeriesValu
     }
 
     @Override
-    public void populateBean(AbstractColumnFieldCollectionWithSeriesValue ob) {
+    public void populateBean(ColumnFieldCollectionWithSeriesValue ob) {
         populateSeriesValuePane(ob);
         SeriesValueCorrelationDefinition seriesValueCorrelationDefinition = ob.getSeriesValueCorrelationDefinition();
         filterPane.populateBean(seriesValueCorrelationDefinition.getFilterProperties());

designer-chart/src/main/java/com/fr/design/chartx/fields/diff/ScatterCellDataFieldsPane.java

@@ -0,0 +1,86 @@
+package com.fr.design.chartx.fields.diff;
+
+import com.fr.chartx.data.field.diff.BubbleColumnFieldCollection;
+import com.fr.design.chartx.component.AbstractSingleFilterPane;
+import com.fr.design.chartx.component.CellDataSeriesXYValueCorrelationPane;
+import com.fr.design.chartx.fields.AbstractCellDataFieldsPane;
+import com.fr.design.formula.TinyFormulaPane;
+import com.fr.design.i18n.Toolkit;
+import com.fr.van.chart.designer.TableLayout4VanChartHelper;
+
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
+
+/**
+ * Created by Wim on 2019/11/04.
+ */
+public class ScatterCellDataFieldsPane extends AbstractCellDataFieldsPane<BubbleColumnFieldCollection> {
+
+    private CellDataSeriesXYValueCorrelationPane seriesXYValueCorrelationPane;
+    private AbstractSingleFilterPane filterPane;
+
+
+    public CellDataSeriesXYValueCorrelationPane getSeriesXYValueCorrelationPane() {
+        return seriesXYValueCorrelationPane;
+    }
+
+    public void setSeriesXYValueCorrelationPane(CellDataSeriesXYValueCorrelationPane seriesXYValueCorrelationPane) {
+        this.seriesXYValueCorrelationPane = seriesXYValueCorrelationPane;
+    }
+
+    @Override
+    protected void initComponents() {
+        filterPane = new AbstractSingleFilterPane() {
+            @Override
+            public String title4PopupWindow() {
+                return Toolkit.i18nText("Fine-Design_Chart_Series");
+            }
+        };
+
+        this.setLayout(new BorderLayout(0, 6));
+        this.add(createCenterPane(), BorderLayout.NORTH);
+        JPanel contentPane = new JPanel(new BorderLayout());
+        contentPane.add(new JPanel(), BorderLayout.NORTH);
+        contentPane.add(filterPane, BorderLayout.CENTER);
+        this.add(TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Data_Filter"), contentPane), BorderLayout.CENTER);
+
+    }
+
+    @Override
+    protected JPanel createCenterPane() {
+        JPanel normalCenter = super.createCenterPane();
+        seriesXYValueCorrelationPane = new CellDataSeriesXYValueCorrelationPane();
+
+        if (normalCenter != null) {
+            JPanel panel = new JPanel(new BorderLayout(0, 6));
+            panel.add(normalCenter, BorderLayout.NORTH);
+            panel.add(seriesXYValueCorrelationPane, BorderLayout.CENTER);
+            return panel;
+        } else {
+            return seriesXYValueCorrelationPane;
+        }
+
+    }
+
+    @Override
+    protected String[] fieldLabels() {
+        return new String[0];
+    }
+
+    @Override
+    protected TinyFormulaPane[] formulaPanes() {
+        return new TinyFormulaPane[0];
+    }
+
+    @Override
+    public BubbleColumnFieldCollection updateBean() {
+        BubbleColumnFieldCollection collection = new BubbleColumnFieldCollection();
+        seriesXYValueCorrelationPane.updateBean(collection);
+        return collection;
+    }
+
+    @Override
+    public void populateBean(BubbleColumnFieldCollection ob) {
+        seriesXYValueCorrelationPane.populateBean(ob);
+    }
+}

designer-chart/src/main/java/com/fr/design/chartx/fields/diff/ScatterDataSetFieldsPane.java

@@ -0,0 +1,95 @@
+package com.fr.design.chartx.fields.diff;
+
+import com.fr.chartx.data.field.diff.BubbleColumnField;
+import com.fr.chartx.data.field.diff.BubbleColumnFieldCollection;
+import com.fr.design.chartx.component.AbstractSingleFilterPane;
+import com.fr.design.chartx.fields.AbstractDataSetFieldsPane;
+import com.fr.design.gui.icombobox.UIComboBox;
+import com.fr.design.i18n.Toolkit;
+import com.fr.extended.chart.UIComboBoxWithNone;
+import com.fr.van.chart.designer.TableLayout4VanChartHelper;
+
+import javax.swing.BorderFactory;
+import javax.swing.JPanel;
+import javax.swing.JSeparator;
+import java.awt.BorderLayout;
+
+/**
+ * Created by Wim on 2019/10/29.
+ */
+public class ScatterDataSetFieldsPane extends AbstractDataSetFieldsPane<BubbleColumnFieldCollection> {
+
+    private UIComboBoxWithNone series;
+    private UIComboBox xField;
+    private UIComboBox yField;
+    private UIComboBoxWithNone value;
+
+    //todo 数据筛选
+    private AbstractSingleFilterPane filterPane;
+
+
+    @Override
+    protected void initComponents() {
+
+        series = new UIComboBoxWithNone();
+        xField = new UIComboBox();
+        yField = new UIComboBox();
+        value = new UIComboBoxWithNone();
+
+        filterPane = new AbstractSingleFilterPane() {
+            @Override
+            public String title4PopupWindow() {
+                return Toolkit.i18nText("Fine-Design_Chart_Series");
+            }
+        };
+
+        JPanel northPane = new JPanel(new BorderLayout(0, 6));
+        northPane.add(new JSeparator(), BorderLayout.CENTER);
+        northPane.add(createCenterPane(), BorderLayout.SOUTH);
+        northPane.setBorder(BorderFactory.createEmptyBorder(4, 24, 0, 15));
+
+        this.setLayout(new BorderLayout(0, 6));
+        this.add(northPane, BorderLayout.NORTH);
+        JPanel contentPane = new JPanel(new BorderLayout());
+        contentPane.add(new JPanel(), BorderLayout.NORTH);
+        contentPane.add(filterPane, BorderLayout.CENTER);
+        this.add(TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Data_Filter"), contentPane), BorderLayout.CENTER);
+    }
+
+    @Override
+    protected UIComboBox[] filedComboBoxes() {
+        return new UIComboBox[]{
+                series, xField, yField, value
+        };
+    }
+
+    @Override
+    protected String[] fieldLabels() {
+        return new String[]{
+                Toolkit.i18nText("Fine-Design_Chart_Series_Name"),
+                "x",
+                "y",
+                Toolkit.i18nText("Fine-Design_Chart_Use_Value")
+        };
+    }
+
+    @Override
+    public BubbleColumnFieldCollection updateBean() {
+        BubbleColumnFieldCollection collection = new BubbleColumnFieldCollection();
+        BubbleColumnField field = collection.getBubbleColumnField(0);
+        updateField(series, field.getSeriesName());
+        updateField(xField, field.getXField());
+        updateField(yField, field.getYField());
+        updateField(value, field.getValueField());
+        return collection;
+    }
+
+    @Override
+    public void populateBean(BubbleColumnFieldCollection ob) {
+        BubbleColumnField field = ob.getBubbleColumnField(0);
+        populateField(series, field.getSeriesName());
+        populateField(xField, field.getXField());
+        populateField(yField, field.getYField());
+        populateField(value, field.getValueField());
+    }
+}

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartDataPane.java

@@ -11,8 +11,8 @@ import com.fr.design.mainframe.chart.PaneTitleConstants;
 import com.fr.design.mainframe.chart.gui.data.DataContentsPane;
 import com.fr.design.mainframe.chart.gui.data.NormalChartDataPane;
 
-import javax.swing.*;
+import javax.swing.JPanel;
-import java.awt.*;
+import java.awt.BorderLayout;
 
 public class ChartDataPane extends AbstractChartAttrPane {
 
@@ -35,6 +35,7 @@ public class ChartDataPane extends AbstractChartAttrPane {
 		return contentsPane;
 	}
 
+
 	/**
 	 * 界面标题
 	 */

designer-chart/src/main/java/com/fr/van/chart/bubble/BubbleIndependentVanChartInterface.java

@@ -3,6 +3,10 @@ package com.fr.van.chart.bubble;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.chartx.AbstractVanSingleDataPane;
+import com.fr.design.chartx.fields.diff.ScatterCellDataFieldsPane;
+import com.fr.design.chartx.fields.diff.ScatterDataSetFieldsPane;
+import com.fr.design.chartx.single.SingleDataPane;
 import com.fr.design.condition.ConditionAttributesPane;
 import com.fr.design.gui.frpane.AttributeChangeListener;
 import com.fr.design.i18n.Toolkit;
@@ -115,4 +119,14 @@ public class BubbleIndependentVanChartInterface extends AbstractIndependentVanCh
     public ConditionAttributesPane getPlotConditionPane(Plot plot) {
         return new VanChartBubbleConditionPane(plot);
     }
+
+    @Override
+    public ChartDataPane getChartDataPane(AttributeChangeListener listener) {
+        return new AbstractVanSingleDataPane(listener) {
+            @Override
+            protected SingleDataPane createSingleDataPane() {
+                return new SingleDataPane(new ScatterDataSetFieldsPane(), new ScatterCellDataFieldsPane());
+            }
+        };
+    }
 }

designer-chart/src/main/java/com/fr/van/chart/scatter/ScatterIndependentVanChartInterface.java

@@ -4,6 +4,10 @@ package com.fr.van.chart.scatter;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.chartx.AbstractVanSingleDataPane;
+import com.fr.design.chartx.fields.diff.ScatterCellDataFieldsPane;
+import com.fr.design.chartx.fields.diff.ScatterDataSetFieldsPane;
+import com.fr.design.chartx.single.SingleDataPane;
 import com.fr.design.condition.ConditionAttributesPane;
 import com.fr.design.gui.frpane.AttributeChangeListener;
 import com.fr.design.i18n.Toolkit;
@@ -103,4 +107,14 @@ public class ScatterIndependentVanChartInterface extends AbstractIndependentVanC
     public ConditionAttributesPane getPlotConditionPane(Plot plot) {
         return new VanChartScatterConditionPane(plot);
     }
+
+    @Override
+    public ChartDataPane getChartDataPane(AttributeChangeListener listener) {
+        return new AbstractVanSingleDataPane(listener) {
+            @Override
+            protected SingleDataPane createSingleDataPane() {
+                return new SingleDataPane(new ScatterDataSetFieldsPane(), new ScatterCellDataFieldsPane());
+            }
+        };
+    }
 }