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

* commit '9f04e9d32809ecd005098f3fb3fdf2b3397194ea':
  CHART-10750 && CHART-10749 fix:词云和多层饼图 数据配置界面

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

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);