Merge remote-tracking branch 'origin/release/11.0' into release/11.0

designer-form/src/main/java/com/fr/design/designer/creator/XChartEditor.java

@@ -376,4 +376,5 @@ public class XChartEditor extends XBorderStyleWidgetCreator {
     public boolean isComponent() {
         return true;
     }
+
 }

designer-realize/src/main/java/com/fr/design/share/effect/EffectItemGroup.java

@@ -109,34 +109,30 @@ public class EffectItemGroup {
             Object value = cellElement.getValue();
             if (value instanceof ChartCollection) {
                 ChartCollection chartCollection = (ChartCollection) value;
-                for (int index = 0; index < chartCollection.getChartCount(); index++) {
+                initChartEditorByChartCollection(chartCollection, cellSourceNode);
-                    Chart chart= (Chart) chartCollection.getChart(index, ChartProvider.class);
-                    Plot plot = chart.getPlot();
-                    if (plot == null) {
-                        continue;
-                    }
-                    SourceNode chartSourceNode = SourceNodeUtils.createSourceNode(plot, chartCollection.getChartName(index), cellSourceNode);
-                    initChartPlot(plot, chartSourceNode, false);
             }
-
         }
     }
 
-    }
-
     private void initChartEditor() {
         ChartEditor editor = (ChartEditor) this.widget;
         ChartCollection chartCollection = (ChartCollection) editor.getChartCollection();
+        initChartEditorByChartCollection(chartCollection, null);
+    }
+
+    private void initChartEditorByChartCollection(ChartCollection chartCollection, SourceNode sourceNode) {
         for (int index = 0; index < chartCollection.getChartCount(); index++) {
+            ChartProvider chartProvider = chartCollection.getChart(index, ChartProvider.class);
+            if (chartProvider instanceof Chart) {
                 Chart chart= (Chart) chartCollection.getChart(index, ChartProvider.class);
                 Plot plot = chart.getPlot();
                 if (plot == null) {
                     continue;
                 }
-            SourceNode plotSourceNode = SourceNodeUtils.createSourceNode(plot, chartCollection.getChartName(index), null);
+                SourceNode plotSourceNode = SourceNodeUtils.createSourceNode(plot, chartCollection.getChartName(index), sourceNode);
                 initChartPlot(plot, plotSourceNode, false);
             }
-
+        }
     }
 
     private void initChartPlot(Plot plot, SourceNode sourceNode, boolean isSubChart) {