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

designer-realize/src/main/java/com/fr/design/actions/replace/action/content/js/SearchChartJSAction.java

@@ -63,12 +63,15 @@ public class SearchChartJSAction {
         //图表-特效-交互属性-监控刷新
         dealMonitorRefreshJS(conditionContent, chartCollection, jsInfos);
         for (int i = 0; i < chartCollection.getChartCount(); i++) {
-            ITContent chartContent = ITContent.copy(content);
+            Chart chart = chartCollection.getChart(i);
-            chartContent.addOtherPos(chartCollection.getChart(i).getChartName());
+            if (chart != null) {
-            //坐标轴
+                ITContent chartContent = ITContent.copy(content);
-            searchAxisJS(jsInfos, chartContent, chartCollection.getChart(i));
+                chartContent.addOtherPos(chart.getChartName());
-            //组合图表-条件属性-超链特判
+                //坐标轴
-            dealCustomPlot(jsInfos, conditionContent, chartCollection.getChart(i));
+                searchAxisJS(jsInfos, chartContent, chart);
+                //组合图表-条件属性-超链特判
+                dealCustomPlot(jsInfos, conditionContent, chart);
+            }
         }
     }