CHART-11610 组合图中的饼图 没有分类 直接用funnel的

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

@@ -3,14 +3,14 @@ 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;
 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.SeriesValueCellDataFieldsPane;
-import com.fr.design.chartx.fields.diff.SeriesValueDataSetFieldsPane;
 import com.fr.design.chartx.fields.diff.SingleCategoryCellDataFieldsPane;
 import com.fr.design.chartx.fields.diff.SingleCategoryDataSetFieldsPane;
 import com.fr.design.chartx.single.SingleDataPane;
@@ -102,7 +102,7 @@ public class CustomChartDataPane extends ChartDataPane {
             case DIFFERENT_PIE:
             case POINTER_180:
             case POINTER_360:
-                return new SingleDataPane(new SeriesValueDataSetFieldsPane(), new SeriesValueCellDataFieldsPane());
+                return new SingleDataPane(new FunnelDataSetFieldsPane(), new FunnelCellDataFieldsPane());
             default:
                 if (StringUtils.equals(CustomStyle.CUSTOM.toString(), plot.getCustomType())){
                     return new SingleDataPane(new SingleCategoryDataSetFieldsPane(), new SingleCategoryCellDataFieldsPane());

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> {
 

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> {
 

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

@@ -1,35 +0,0 @@
-package com.fr.design.chartx.fields.diff;
-
-import com.fr.chartx.data.field.diff.ColumnFieldCollectionWithSeriesValue;
-import com.fr.design.formula.TinyFormulaPane;
-
-/**
- * @author shine
- * @version 10.0
- * Created by shine on 2019/11/28
- * <p>
- * 饼图、多指针仪表盘 在组合图中 没有分类配置项。
- */
-public class SeriesValueCellDataFieldsPane extends AbstractCellDataFieldsWithSeriesValuePane<ColumnFieldCollectionWithSeriesValue> {
-    @Override
-    protected String[] fieldLabels() {
-        return new String[0];
-    }
-
-    @Override
-    protected TinyFormulaPane[] formulaPanes() {
-        return new TinyFormulaPane[0];
-    }
-
-    @Override
-    public void populateBean(ColumnFieldCollectionWithSeriesValue ob) {
-        populateSeriesValuePane(ob);
-    }
-
-    @Override
-    public ColumnFieldCollectionWithSeriesValue updateBean() {
-        ColumnFieldCollectionWithSeriesValue columnFieldCollectionWithSeriesValue = new ColumnFieldCollectionWithSeriesValue();
-        updateSeriesValuePane(columnFieldCollectionWithSeriesValue);
-        return columnFieldCollectionWithSeriesValue;
-    }
-}

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

@@ -1,35 +0,0 @@
-package com.fr.design.chartx.fields.diff;
-
-import com.fr.chartx.data.field.diff.ColumnFieldCollectionWithSeriesValue;
-import com.fr.design.gui.icombobox.UIComboBox;
-
-/**
- * @author shine
- * @version 10.0
- * Created by shine on 2019/11/28
- * <p>
- * 饼图、多指针仪表盘 在组合图中 没有分类配置项。
- */
-public class SeriesValueDataSetFieldsPane extends AbstractDataSetFieldsWithSeriesValuePane<ColumnFieldCollectionWithSeriesValue> {
-    @Override
-    protected String[] fieldLabels() {
-        return new String[0];
-    }
-
-    @Override
-    protected UIComboBox[] filedComboBoxes() {
-        return new UIComboBox[0];
-    }
-
-    @Override
-    public void populateBean(ColumnFieldCollectionWithSeriesValue ob) {
-        populateSeriesValuePane(ob);
-    }
-
-    @Override
-    public ColumnFieldCollectionWithSeriesValue updateBean() {
-        ColumnFieldCollectionWithSeriesValue columnFieldCollectionWithSeriesValue = new ColumnFieldCollectionWithSeriesValue();
-        updateSeriesValuePane(columnFieldCollectionWithSeriesValue);
-        return columnFieldCollectionWithSeriesValue;
-    }
-}