Browse Source

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

feature/x
Destiny.Lin 2 years ago
parent
commit
8b938e3a8a
  1. 2
      designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/chart/SearchChartBoxDataFormulaAction.java
  2. 3
      designer-realize/src/main/java/com/fr/design/actions/replace/action/content/js/SearchChartJSAction.java
  3. 5
      designer-realize/src/main/java/com/fr/design/actions/replace/utils/SearchJSUtils.java

2
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_Median"), resultDefinition.getMedian());
//下四分位数 //下四分位数
dealFormulaObject(formulaInfos, content, Toolkit.i18nText("Fine-Design_Chart_Data_Q1"), resultDefinition.getQ1()); dealFormulaObject(formulaInfos, content, Toolkit.i18nText("Fine-Design_Chart_Data_Q1"), resultDefinition.getQ1());
// //最小值
dealFormulaObject(formulaInfos, content, Toolkit.i18nText("Fine-Design_Chart_Min_Value"), resultDefinition.getMin()); dealFormulaObject(formulaInfos, content, Toolkit.i18nText("Fine-Design_Chart_Min_Value"), resultDefinition.getMin());
} }

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

@ -59,6 +59,7 @@ public class SearchChartJSAction {
} }
private void searchAxisJS(List<JSInfo> jsInfos, ITContent chartContent, Chart chart) { private void searchAxisJS(List<JSInfo> jsInfos, ITContent chartContent, Chart chart) {
if (chart.getPlot() != null){
Axis xAxis = chart.getPlot().getxAxis(); Axis xAxis = chart.getPlot().getxAxis();
Axis yAxis = chart.getPlot().getyAxis(); Axis yAxis = chart.getPlot().getyAxis();
if (xAxis instanceof VanChartAxis) { if (xAxis instanceof VanChartAxis) {
@ -82,6 +83,8 @@ public class SearchChartJSAction {
} }
} }
}
private void dealAxisHtmlLabelJS(List<JSInfo> jsInfos, VanChartHtmlLabel label, ITContent content) { private void dealAxisHtmlLabelJS(List<JSInfo> jsInfos, VanChartHtmlLabel label, ITContent content) {
if (isHtmlLabelValid(label)) { if (isHtmlLabelValid(label)) {
ITContent axisContent = ITContent.copy(content); ITContent axisContent = ITContent.copy(content);

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

@ -71,6 +71,7 @@ public class SearchJSUtils {
*/ */
private static void addHtmlLabel2Array(List<Pair<VanChartHtmlLabel, String>> arrayList, ChartCollection collection) { private static void addHtmlLabel2Array(List<Pair<VanChartHtmlLabel, String>> arrayList, ChartCollection collection) {
for (int i = 0; i < collection.getChartCount(); i++) { for (int i = 0; i < collection.getChartCount(); i++) {
if (collection.getChart(i) instanceof VanChart){
VanChart chart = ((VanChart) collection.getChart(i)); VanChart chart = ((VanChart) collection.getChart(i));
int size = chart.getPlot().getConditionCollection().getConditionAttrSize(); int size = chart.getPlot().getConditionCollection().getConditionAttrSize();
ConditionCollection conditionCollection = chart.getPlot().getConditionCollection(); ConditionCollection conditionCollection = chart.getPlot().getConditionCollection();
@ -80,6 +81,7 @@ public class SearchJSUtils {
} }
} }
} }
}
/** /**
* 将图表-样式-标签以及图表-样式-提示中的HtmlLabel加入数组 * 将图表-样式-标签以及图表-样式-提示中的HtmlLabel加入数组
@ -163,10 +165,11 @@ public class SearchJSUtils {
public static List<NameJavaScript> getNameJavaScript(ChartCollection chartCollection) { public static List<NameJavaScript> getNameJavaScript(ChartCollection chartCollection) {
ArrayList<NameJavaScript> nameJavaScriptArrayList = new ArrayList<>(); ArrayList<NameJavaScript> nameJavaScriptArrayList = new ArrayList<>();
for (int i = 0; i < chartCollection.getChartCount(); i++) { for (int i = 0; i < chartCollection.getChartCount(); i++) {
if (chartCollection.getChart(i) instanceof VanChart){
VanChart chart = ((VanChart) chartCollection.getChart(i)); VanChart chart = ((VanChart) chartCollection.getChart(i));
NameJavaScriptGroup nameJavaScriptGroup = chart.getPlot().getHotHyperLink(); NameJavaScriptGroup nameJavaScriptGroup = chart.getPlot().getHotHyperLink();
addNameJavaScript2Array(nameJavaScriptArrayList, nameJavaScriptGroup); addNameJavaScript2Array(nameJavaScriptArrayList, nameJavaScriptGroup);
}
} }
return nameJavaScriptArrayList; return nameJavaScriptArrayList;
} }

Loading…
Cancel
Save