Browse Source

Merge pull request #1323 in DESIGN/design from ~ZHENG/c-design:feature/10.0 to feature/10.0

* commit 'f0d8bceacc666ab8d63d0fb6c5163b8e5d73a01a':
  CHART-11610 组合图中的饼图 没有分类 直接用funnel的
  CHART-11610 饼图、多指针仪表盘 在组合图中 没有分类配置项
research/11.0
zheng 5 years ago
parent
commit
50d8549d64
  1. 8
      designer-chart/src/main/java/com/fr/design/chartx/CustomChartDataPane.java
  2. 1
      designer-chart/src/main/java/com/fr/design/chartx/fields/diff/FunnelCellDataFieldsPane.java
  3. 1
      designer-chart/src/main/java/com/fr/design/chartx/fields/diff/FunnelDataSetFieldsPane.java

8
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;
@ -95,6 +97,12 @@ 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:
if (StringUtils.equals(CustomStyle.CUSTOM.toString(), plot.getCustomType())){
return new SingleDataPane(new SingleCategoryDataSetFieldsPane(), new SingleCategoryCellDataFieldsPane());

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

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

Loading…
Cancel
Save