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

* commit 'a14592606fd3b3ba15e84db23091ecd5f6ebe8cc':
  CHART-12801 多层饼图数据界面
  CHART-12805 系列面板根据大数据组件判断是否开启大数据

designer-chart/src/main/java/com/fr/van/chart/designer/style/series/VanChartAbstractPlotSeriesPane.java

@@ -221,7 +221,10 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP
 
 
     protected boolean largeModel(Plot plot) {
-        return PlotFactory.largeDataModel(plot);
+        //大数据模式 恢复用注释。下面1行删除。
+        return largeDataModelGroup != null && largeDataModelGroup.getSelectedIndex() == 0;
+        //大数据模式 恢复用注释。取消注释。
+        //return PlotFactory.largeDataModel(plot);
     }
 
 

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;
@@ -47,6 +52,17 @@ public class MultiPieIndependentVanChartInterface extends AbstractIndependentVan
 //        };
 //    }
 
+    //图表数据结构 恢复用注释。删除下面两个方法 getTableDataSourcePane getReportDataSourcePane。
+    @Override
+    public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent){
+        return new MultiPiePlotTableDataContentPane(parent);
+    }
+
+    @Override
+    public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent){
+        return new MultiPiePlotReportDataContentPane(parent);
+    }
+
     public BasicBeanPane<Plot> getPlotSeriesPane(ChartStylePane parent, Plot plot){
         return new VanChartMultiPieSeriesPane(parent, plot);
     }