Browse Source

Pull request #13340: REPORT-111279 全局查找与替换,复杂frm搜索失败

Merge in DESIGN/design from ~DESTINY.LIN/design:release/11.0 to release/11.0

* commit '2ba1efbfc2406459c766d41da4a20269ed6e4739':
  REPORT-111279 全局查找与替换,复杂frm搜索失败
  REPORT-111279 全局查找与替换,复杂frm搜索失败
release/11.0
Destiny.Lin-林锦龙 6 months ago
parent
commit
00963f3d1c
  1. 15
      designer-realize/src/main/java/com/fr/design/actions/replace/action/content/js/SearchChartJSAction.java

15
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); dealMonitorRefreshJS(conditionContent, chartCollection, jsInfos);
for (int i = 0; i < chartCollection.getChartCount(); i++) { 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);
}
} }
} }

Loading…
Cancel
Save