Merge pull request #1346 in DESIGN/design from ~BJORN/design:feature/10.0 to feature/10.0

* commit 'e8fe03bdd68d350cbc19ef65a6d748f3a682ccfd':
  CHART-11899 漏洞修复
  CHART-11899 漏洞修复

designer-chart/src/main/java/com/fr/van/chart/bubble/BubbleIndependentVanChartInterface.java

@@ -1,7 +1,6 @@
 package com.fr.van.chart.bubble;
 
 import com.fr.chart.chartattr.Chart;
-import com.fr.chart.chartattr.ChartCollection;
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.chartx.AbstractVanSingleDataPane;
@@ -21,7 +20,6 @@ import com.fr.design.mainframe.chart.gui.data.report.BubblePlotReportDataContent
 import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
 import com.fr.plugin.chart.bubble.VanChartBubblePlot;
-import com.fr.plugin.chart.vanchart.VanChart;
 import com.fr.van.chart.bubble.data.VanChartBubblePlotTableDataContentPane;
 import com.fr.van.chart.designer.other.VanChartInteractivePaneWithOutSort;
 import com.fr.van.chart.designer.other.VanChartOtherPane;
@@ -127,24 +125,12 @@ public class BubbleIndependentVanChartInterface extends AbstractIndependentVanCh
     @Override
     public ChartDataPane getChartDataPane(AttributeChangeListener listener) {
         return new AbstractVanSingleDataPane(listener) {
-
-            VanChartBubblePlot plot;
-
-            @Override
-            public void populate(ChartCollection collection) {
-                if (collection == null) {
-                    return;
-                }
-                VanChart chart = collection.getSelectedChartProvider(VanChart.class);
-                if (chart == null) {
-                    return;
-                }
-                plot = chart.getPlot();
-                super.populate(collection);
-            }
-
             @Override
             protected SingleDataPane createSingleDataPane() {
+                VanChartBubblePlot plot = null;
+                if (getVanChart() != null) {
+                    plot = getVanChart().getPlot();
+                }
                 if (plot != null && plot.isForceBubble()) {
                     return new SingleDataPane(new SingleCategoryDataSetFieldsPane(), new SingleCategoryCellDataFieldsPane());
                 }

designer-chart/src/main/java/com/fr/van/chart/gauge/GaugeIndependentVanChartInterface.java

@@ -1,6 +1,5 @@
 package com.fr.van.chart.gauge;
 
-import com.fr.chart.chartattr.ChartCollection;
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.chartx.AbstractVanSingleDataPane;
@@ -22,7 +21,6 @@ import com.fr.design.mainframe.chart.gui.data.table.CategoryPlotTableDataContent
 import com.fr.design.mainframe.chart.gui.data.table.MeterPlotTableDataContentPane;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
 import com.fr.plugin.chart.gauge.VanChartGaugePlot;
-import com.fr.plugin.chart.vanchart.VanChart;
 import com.fr.van.chart.custom.component.CategoryCustomPlotTableDataContentPane;
 import com.fr.van.chart.custom.component.MeterCustomPlotReportDataContentPane;
 import com.fr.van.chart.custom.component.MeterCustomPlotTableDataContentPane;
@@ -72,10 +70,10 @@ public class GaugeIndependentVanChartInterface extends AbstractIndependentVanCha
         return new VanChartGaugePlotPane();
     }
 
-    public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent){
+    public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent) {
-        if(plot instanceof VanChartGaugePlot){
+        if (plot instanceof VanChartGaugePlot) {
-            VanChartGaugePlot gaugePlot = (VanChartGaugePlot)plot;
+            VanChartGaugePlot gaugePlot = (VanChartGaugePlot) plot;
-            switch (gaugePlot.getGaugeStyle()){
+            switch (gaugePlot.getGaugeStyle()) {
                 case POINTER:
                     return gaugePlot.isInCustom() ? new CategoryCustomPlotTableDataContentPane(parent) : new CategoryPlotTableDataContentPane(parent);
                 case POINTER_SEMI:
@@ -84,13 +82,13 @@ public class GaugeIndependentVanChartInterface extends AbstractIndependentVanCha
                     break;
             }
         }
-        return ((VanChartGaugePlot)plot).isInCustom() ? new MeterCustomPlotTableDataContentPane(parent) : new MeterPlotTableDataContentPane(parent);
+        return ((VanChartGaugePlot) plot).isInCustom() ? new MeterCustomPlotTableDataContentPane(parent) : new MeterPlotTableDataContentPane(parent);
     }
 
-    public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent){
+    public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent) {
-        if(plot instanceof VanChartGaugePlot){
+        if (plot instanceof VanChartGaugePlot) {
-            VanChartGaugePlot gaugePlot = (VanChartGaugePlot)plot;
+            VanChartGaugePlot gaugePlot = (VanChartGaugePlot) plot;
-            switch (gaugePlot.getGaugeStyle()){
+            switch (gaugePlot.getGaugeStyle()) {
                 case POINTER:
                     return new CategoryPlotReportDataContentPane(parent);
                 case POINTER_SEMI:
@@ -104,40 +102,28 @@ public class GaugeIndependentVanChartInterface extends AbstractIndependentVanCha
 
     /**
      * 图表的属性界面数组
+     *
      * @return 属性界面
      */
-    public AbstractChartAttrPane[] getAttrPaneArray(AttributeChangeListener listener){
+    public AbstractChartAttrPane[] getAttrPaneArray(AttributeChangeListener listener) {
         VanChartStylePane stylePane = new VanChartGaugeStylePane(listener);
         VanChartOtherPane otherPane = new VanChartOtherPane();
         return new AbstractChartAttrPane[]{stylePane, otherPane};
     }
 
-    public BasicBeanPane<Plot> getPlotSeriesPane(ChartStylePane parent, Plot plot){
+    public BasicBeanPane<Plot> getPlotSeriesPane(ChartStylePane parent, Plot plot) {
         return new VanChartGaugeSeriesPane(parent, plot);
     }
 
     @Override
     public ChartDataPane getChartDataPane(AttributeChangeListener listener) {
         return new AbstractVanSingleDataPane(listener) {
-
-            VanChartGaugePlot gaugePlot;
-
-            @Override
-            public void populate(ChartCollection collection) {
-                if (collection == null) {
-                    return;
-                }
-                VanChart chart = collection.getSelectedChartProvider(VanChart.class);
-                if (chart == null) {
-                    return;
-                }
-                gaugePlot = chart.getPlot();
-
-                super.populate(collection);
-            }
-
             @Override
             protected SingleDataPane createSingleDataPane() {
+                VanChartGaugePlot gaugePlot = null;
+                if (getVanChart() != null) {
+                    gaugePlot = getVanChart().getPlot();
+                }
                 if (gaugePlot != null && !gaugePlot.isMultiPointer()) {
                     return new SingleDataPane(new GaugeDataSetFieldsPane(), new GaugeCellDataFieldsPane());
                 }