From 871c3954afe7d696efecaa89fc5f5c4237b8b777 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E5=B2=B3?= <445798420@qq.com>
Date: Tue, 8 Sep 2020 15:51:26 +0800
Subject: [PATCH] =?UTF-8?q?CHART-15664=20=E9=9B=B7=E8=BE=BE=E5=9B=BE?=
 =?UTF-8?q?=E9=A5=BC=E5=9B=BE=E7=BB=A7=E6=89=BF=E5=A4=9A=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../type/AbstractVanChartTypePane.java        | 19 +++++++++++++++++--
 .../fr/van/chart/pie/VanChartPiePlotPane.java |  5 +++++
 .../chart/radar/VanChartRadarPlotPane.java    |  4 ++++
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/type/AbstractVanChartTypePane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/type/AbstractVanChartTypePane.java
index a4b53796f..9cf916554 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/type/AbstractVanChartTypePane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/type/AbstractVanChartTypePane.java
@@ -1,10 +1,13 @@
 package com.fr.van.chart.designer.type;
 
 import com.fr.base.BaseUtils;
+import com.fr.base.chart.chartdata.TopDefinitionProvider;
 import com.fr.chart.base.AttrFillStyle;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.Legend;
 import com.fr.chart.chartattr.Plot;
+import com.fr.chart.chartdata.NormalReportDataDefinition;
+import com.fr.chart.chartdata.NormalTableDataDefinition;
 import com.fr.chart.chartglyph.ConditionAttr;
 import com.fr.chart.chartglyph.ConditionCollection;
 import com.fr.chart.chartglyph.DataSheet;
@@ -167,6 +170,7 @@ public abstract class AbstractVanChartTypePane extends AbstractChartTypePane<Van
     }
 
     protected void resetChartAttr(VanChart chart, VanChartPlot newPlot) {
+        resetFilterDefinition(chart);
         //上个图表支持继承部分属性到新图表
         if (supportExtendAttr(chart)) {
             newPlot.extendAttribute(chart);
@@ -186,8 +190,6 @@ public abstract class AbstractVanChartTypePane extends AbstractChartTypePane<Van
         resetTitleAttr(chart);
         //重置监控刷新选项
         resetRefreshMoreLabelAttr(chart);
-        resetFilterDefinition(chart);
-
     }
 
     //是否支持属性的继承
@@ -290,4 +292,17 @@ public abstract class AbstractVanChartTypePane extends AbstractChartTypePane<Van
             autoButton.addActionListener(autoButtonListener);
         }
     }
+
+    //部分图表继承到多分类之后会报错
+    protected void resetMoreCateDefinition(Chart chart) {
+        TopDefinitionProvider filterDefinition = chart.getFilterDefinition();
+        if (filterDefinition instanceof NormalTableDataDefinition) {
+            ((NormalTableDataDefinition) filterDefinition).clearMoreCate();
+            ((VanChartPlot) chart.getPlot()).setCategoryNum(1);
+        }
+        if (filterDefinition instanceof NormalReportDataDefinition) {
+            ((NormalReportDataDefinition) filterDefinition).clearMoreCate();
+            ((VanChartPlot) chart.getPlot()).setCategoryNum(1);
+        }
+    }
 }
\ No newline at end of file
diff --git a/designer-chart/src/main/java/com/fr/van/chart/pie/VanChartPiePlotPane.java b/designer-chart/src/main/java/com/fr/van/chart/pie/VanChartPiePlotPane.java
index 9e6e08a0a..27f10bfc8 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/pie/VanChartPiePlotPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/pie/VanChartPiePlotPane.java
@@ -83,4 +83,9 @@ public class VanChartPiePlotPane extends AbstractVanChartTypePane {
     public Chart getDefaultChart() {
         return PieIndependentVanChart.newPieChartTypes[0];
     }
+
+    //重置数据配置
+    protected void resetFilterDefinition(Chart chart) {
+        resetMoreCateDefinition(chart);
+    }
 }
\ No newline at end of file
diff --git a/designer-chart/src/main/java/com/fr/van/chart/radar/VanChartRadarPlotPane.java b/designer-chart/src/main/java/com/fr/van/chart/radar/VanChartRadarPlotPane.java
index a77c71bc9..e05bbe242 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/radar/VanChartRadarPlotPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/radar/VanChartRadarPlotPane.java
@@ -49,4 +49,8 @@ public class VanChartRadarPlotPane  extends AbstractVanChartTypePane {
         return RadarIndependentVanChart.RadarVanChartTypes[0];
     }
 
+    //重置数据配置
+    protected void resetFilterDefinition(Chart chart) {
+        resetMoreCateDefinition(chart);
+    }
 }
\ No newline at end of file