From 9f04e9d32809ecd005098f3fb3fdf2b3397194ea Mon Sep 17 00:00:00 2001
From: shine <shine@shinedeMacBook-Pro.local>
Date: Fri, 11 Oct 2019 18:47:34 +0800
Subject: [PATCH] =?UTF-8?q?CHART-10750=20&&=20CHART-10749=20fix:=E8=AF=8D?=
 =?UTF-8?q?=E4=BA=91=E5=92=8C=E5=A4=9A=E5=B1=82=E9=A5=BC=E5=9B=BE=20?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=85=8D=E7=BD=AE=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MultiPieIndependentVanChartInterface.java     | 15 +++++++++++++++
 .../WordCloudIndependentVanChartInterface.java    | 15 +++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/designer-chart/src/main/java/com/fr/van/chart/multilayer/MultiPieIndependentVanChartInterface.java b/designer-chart/src/main/java/com/fr/van/chart/multilayer/MultiPieIndependentVanChartInterface.java
index d6fe79390..c7a44d1b8 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/multilayer/MultiPieIndependentVanChartInterface.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/multilayer/MultiPieIndependentVanChartInterface.java
@@ -4,8 +4,13 @@ import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.condition.ConditionAttributesPane;
 import com.fr.design.i18n.Toolkit;
+import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.ChartStylePane;
+import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane;
+import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
+import com.fr.van.chart.multilayer.data.MultiPiePlotReportDataContentPane;
+import com.fr.van.chart.multilayer.data.MultiPiePlotTableDataContentPane;
 import com.fr.van.chart.multilayer.other.VanChartMultiPieConditionPane;
 import com.fr.van.chart.multilayer.style.VanChartMultiPieSeriesPane;
 import com.fr.van.chart.vanchart.AbstractIndependentVanChartUI;
@@ -36,6 +41,16 @@ public class MultiPieIndependentVanChartInterface extends AbstractIndependentVan
         };
     }
 
+    @Override
+    public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent) {
+        return new MultiPiePlotTableDataContentPane(parent);
+    }
+
+    @Override
+    public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent) {
+        return new MultiPiePlotReportDataContentPane(parent);
+    }
+
 //    @Override
 //    public ChartDataPane getChartDataPane(AttributeChangeListener listener) {
 //        return new AbstractDataPane(listener) {
diff --git a/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/WordCloudIndependentVanChartInterface.java b/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/WordCloudIndependentVanChartInterface.java
index 62356028f..ff4b9bbce 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/WordCloudIndependentVanChartInterface.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/WordCloudIndependentVanChartInterface.java
@@ -8,13 +8,18 @@ import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.frpane.AttributeChangeListener;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.chart.AbstractChartAttrPane;
+import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.ChartStylePane;
+import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane;
+import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
 import com.fr.plugin.chart.base.VanChartConstants;
 import com.fr.van.chart.designer.other.VanChartInteractivePaneWithOutSort;
 import com.fr.van.chart.designer.other.VanChartOtherPane;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 import com.fr.van.chart.vanchart.AbstractIndependentVanChartUI;
+import com.fr.van.chart.wordcloud.designer.data.WordCloudPlotReportDataContentPane;
+import com.fr.van.chart.wordcloud.designer.data.WordCloudPlotTableDataContentPane;
 import com.fr.van.chart.wordcloud.designer.other.VanChartWordCloudConditionPane;
 import com.fr.van.chart.wordcloud.designer.style.VanChartWordCloudSeriesPane;
 import com.fr.van.chart.wordcloud.designer.type.VanChartWordCloudTypePane;
@@ -57,6 +62,16 @@ public class WordCloudIndependentVanChartInterface extends AbstractIndependentVa
         return "com/fr/design/images/form/toolbar/wordcloud.png";
     }
 
+    @Override
+    public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent) {
+        return new WordCloudPlotReportDataContentPane();
+    }
+
+    @Override
+    public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent) {
+        return new WordCloudPlotTableDataContentPane();
+    }
+
     @Override
     public BasicBeanPane<Plot> getPlotSeriesPane(ChartStylePane parent, Plot plot) {
         return new VanChartWordCloudSeriesPane(parent, plot);