From f8031e97cb3688269fb481565983efe296708a87 Mon Sep 17 00:00:00 2001 From: shine Date: Thu, 28 Nov 2019 14:53:20 +0800 Subject: [PATCH 1/2] =?UTF-8?q?CHART-11610=20=E9=A5=BC=E5=9B=BE=E3=80=81?= =?UTF-8?q?=E5=A4=9A=E6=8C=87=E9=92=88=E4=BB=AA=E8=A1=A8=E7=9B=98=20?= =?UTF-8?q?=E5=9C=A8=E7=BB=84=E5=90=88=E5=9B=BE=E4=B8=AD=20=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=88=86=E7=B1=BB=E9=85=8D=E7=BD=AE=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/chartx/CustomChartDataPane.java | 8 +++++ .../diff/SeriesValueCellDataFieldsPane.java | 35 +++++++++++++++++++ .../diff/SeriesValueDataSetFieldsPane.java | 35 +++++++++++++++++++ 3 files changed, 78 insertions(+) create mode 100644 designer-chart/src/main/java/com/fr/design/chartx/fields/diff/SeriesValueCellDataFieldsPane.java create mode 100644 designer-chart/src/main/java/com/fr/design/chartx/fields/diff/SeriesValueDataSetFieldsPane.java 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 9ff8fd28c..de2469d5b 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 @@ -9,6 +9,8 @@ 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; @@ -92,6 +94,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 SeriesValueDataSetFieldsPane(), new SeriesValueCellDataFieldsPane()); default: return StringUtils.equals(CustomStyle.CUSTOM.toString(), plot.getCustomType()) ? new SingleDataPane(new SingleCategoryDataSetFieldsPane(), new SingleCategoryCellDataFieldsPane()) : diff --git a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/SeriesValueCellDataFieldsPane.java b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/SeriesValueCellDataFieldsPane.java new file mode 100644 index 000000000..383bcb3a6 --- /dev/null +++ b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/SeriesValueCellDataFieldsPane.java @@ -0,0 +1,35 @@ +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 + *

+ * 饼图、多指针仪表盘 在组合图中 没有分类配置项。 + */ +public class SeriesValueCellDataFieldsPane extends AbstractCellDataFieldsWithSeriesValuePane { + @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; + } +} diff --git a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/SeriesValueDataSetFieldsPane.java b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/SeriesValueDataSetFieldsPane.java new file mode 100644 index 000000000..7f5120505 --- /dev/null +++ b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/SeriesValueDataSetFieldsPane.java @@ -0,0 +1,35 @@ +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 + *

+ * 饼图、多指针仪表盘 在组合图中 没有分类配置项。 + */ +public class SeriesValueDataSetFieldsPane extends AbstractDataSetFieldsWithSeriesValuePane { + @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; + } +} From f0d8bceacc666ab8d63d0fb6c5163b8e5d73a01a Mon Sep 17 00:00:00 2001 From: shine Date: Fri, 29 Nov 2019 16:40:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?CHART-11610=20=E7=BB=84=E5=90=88=E5=9B=BE?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E9=A5=BC=E5=9B=BE=20=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E5=88=86=E7=B1=BB=20=E7=9B=B4=E6=8E=A5=E7=94=A8funnel=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/chartx/CustomChartDataPane.java | 6 ++-- .../fields/diff/FunnelCellDataFieldsPane.java | 1 + .../fields/diff/FunnelDataSetFieldsPane.java | 1 + .../diff/SeriesValueCellDataFieldsPane.java | 35 ------------------- .../diff/SeriesValueDataSetFieldsPane.java | 35 ------------------- 5 files changed, 5 insertions(+), 73 deletions(-) delete mode 100644 designer-chart/src/main/java/com/fr/design/chartx/fields/diff/SeriesValueCellDataFieldsPane.java delete mode 100644 designer-chart/src/main/java/com/fr/design/chartx/fields/diff/SeriesValueDataSetFieldsPane.java 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 13f0ce545..5396e88e6 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,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()); 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 5d9aaf7b0..c1766576c 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 { 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 aa1c9fe28..ee15e3945 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 { diff --git a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/SeriesValueCellDataFieldsPane.java b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/SeriesValueCellDataFieldsPane.java deleted file mode 100644 index 383bcb3a6..000000000 --- a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/SeriesValueCellDataFieldsPane.java +++ /dev/null @@ -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 - *

- * 饼图、多指针仪表盘 在组合图中 没有分类配置项。 - */ -public class SeriesValueCellDataFieldsPane extends AbstractCellDataFieldsWithSeriesValuePane { - @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; - } -} diff --git a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/SeriesValueDataSetFieldsPane.java b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/SeriesValueDataSetFieldsPane.java deleted file mode 100644 index 7f5120505..000000000 --- a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/SeriesValueDataSetFieldsPane.java +++ /dev/null @@ -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 - *

- * 饼图、多指针仪表盘 在组合图中 没有分类配置项。 - */ -public class SeriesValueDataSetFieldsPane extends AbstractDataSetFieldsWithSeriesValuePane { - @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; - } -}