REPORT-75998 处理扩展图表报错问题

designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/chart/SearchChartBoxDataFormulaAction.java

@@ -50,7 +50,7 @@ public class SearchChartBoxDataFormulaAction implements SearchChartDataFormula {
         dealFormulaObject(formulaInfos, content, Toolkit.i18nText("Fine-Design_Chart_Data_Median"), resultDefinition.getMedian());
         //下四分位数
         dealFormulaObject(formulaInfos, content, Toolkit.i18nText("Fine-Design_Chart_Data_Q1"), resultDefinition.getQ1());
-        //
+        //最小值
         dealFormulaObject(formulaInfos, content, Toolkit.i18nText("Fine-Design_Chart_Min_Value"), resultDefinition.getMin());
 
     }

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

@@ -59,27 +59,30 @@ public class SearchChartJSAction {
     }
 
     private void searchAxisJS(List<JSInfo> jsInfos, ITContent chartContent, Chart chart) {
-        Axis xAxis = chart.getPlot().getxAxis();
+        if (chart.getPlot() != null){
-        Axis yAxis = chart.getPlot().getyAxis();
+            Axis xAxis = chart.getPlot().getxAxis();
-        if (xAxis instanceof VanChartAxis) {
+            Axis yAxis = chart.getPlot().getyAxis();
-            ITContent xAxisContent = ITContent.copy(chartContent);
+            if (xAxis instanceof VanChartAxis) {
-            xAxisContent.addOtherPos(
+                ITContent xAxisContent = ITContent.copy(chartContent);
-                    Toolkit.i18nText("Fine-Design_Chart_Axis"),
+                xAxisContent.addOtherPos(
-                    Toolkit.i18nText("Fine-Design_Chart_X_Axis"),
+                        Toolkit.i18nText("Fine-Design_Chart_Axis"),
-                    Toolkit.i18nText("Fine-Design_Chart_Axis_Label_Format")
+                        Toolkit.i18nText("Fine-Design_Chart_X_Axis"),
-            );
+                        Toolkit.i18nText("Fine-Design_Chart_Axis_Label_Format")
-            dealAxisHtmlLabelJS(jsInfos, ((VanChartAxis) xAxis).getHtmlLabel(), xAxisContent);
+                );
+                dealAxisHtmlLabelJS(jsInfos, ((VanChartAxis) xAxis).getHtmlLabel(), xAxisContent);
+            }
+
+            if (yAxis instanceof VanChartAxis) {
+                ITContent yAxisContent = ITContent.copy(chartContent);
+                yAxisContent.addOtherPos(
+                        Toolkit.i18nText("Fine-Design_Chart_Axis"),
+                        Toolkit.i18nText("Fine-Design_Chart_Y_Axis"),
+                        Toolkit.i18nText("Fine-Design_Chart_Axis_Label_Format")
+                );
+                dealAxisHtmlLabelJS(jsInfos, ((VanChartAxis) yAxis).getHtmlLabel(), yAxisContent);
+            }
         }
 
-        if (yAxis instanceof VanChartAxis) {
-            ITContent yAxisContent = ITContent.copy(chartContent);
-            yAxisContent.addOtherPos(
-                    Toolkit.i18nText("Fine-Design_Chart_Axis"),
-                    Toolkit.i18nText("Fine-Design_Chart_Y_Axis"),
-                    Toolkit.i18nText("Fine-Design_Chart_Axis_Label_Format")
-            );
-            dealAxisHtmlLabelJS(jsInfos, ((VanChartAxis) yAxis).getHtmlLabel(), yAxisContent);
-        }
     }
 
     private void dealAxisHtmlLabelJS(List<JSInfo> jsInfos, VanChartHtmlLabel label, ITContent content) {

designer-realize/src/main/java/com/fr/design/actions/replace/utils/SearchJSUtils.java

@@ -71,12 +71,14 @@ public class SearchJSUtils {
      */
     private static void addHtmlLabel2Array(List<Pair<VanChartHtmlLabel, String>> arrayList, ChartCollection collection) {
         for (int i = 0; i < collection.getChartCount(); i++) {
-            VanChart chart = ((VanChart) collection.getChart(i));
+            if (collection.getChart(i) instanceof VanChart){
-            int size = chart.getPlot().getConditionCollection().getConditionAttrSize();
+                VanChart chart = ((VanChart) collection.getChart(i));
-            ConditionCollection conditionCollection = chart.getPlot().getConditionCollection();
+                int size = chart.getPlot().getConditionCollection().getConditionAttrSize();
-            addAttrLabelHtmlLabel(chart, arrayList);
+                ConditionCollection conditionCollection = chart.getPlot().getConditionCollection();
-            for (int j = 0; j < size; j++) {
+                addAttrLabelHtmlLabel(chart, arrayList);
-                searchConditionCollection(arrayList, conditionCollection.getConditionAttr(j));
+                for (int j = 0; j < size; j++) {
+                    searchConditionCollection(arrayList, conditionCollection.getConditionAttr(j));
+                }
             }
         }
     }
@@ -163,10 +165,11 @@ public class SearchJSUtils {
     public static List<NameJavaScript> getNameJavaScript(ChartCollection chartCollection) {
         ArrayList<NameJavaScript> nameJavaScriptArrayList = new ArrayList<>();
         for (int i = 0; i < chartCollection.getChartCount(); i++) {
-            VanChart chart = ((VanChart) chartCollection.getChart(i));
+            if (chartCollection.getChart(i) instanceof VanChart){
-            NameJavaScriptGroup nameJavaScriptGroup = chart.getPlot().getHotHyperLink();
+                VanChart chart = ((VanChart) chartCollection.getChart(i));
-            addNameJavaScript2Array(nameJavaScriptArrayList, nameJavaScriptGroup);
+                NameJavaScriptGroup nameJavaScriptGroup = chart.getPlot().getHotHyperLink();
-
+                addNameJavaScript2Array(nameJavaScriptArrayList, nameJavaScriptGroup);
+            }
         }
         return nameJavaScriptArrayList;
     }