Browse Source

Pull request #6242: REPORT-60995 导出-导出事件-参数设置-取消勾选继承报表后弹窗关不掉

Merge in DESIGN/design from ~PENGDA/design:release/11.0 to release/11.0

* commit 'c06eab66115cdd334e12d0ac2c21b447b87cb3d3':
  REPORT-60995 导出-导出事件-参数设置-取消勾选继承报表后弹窗关不掉
bugfix/11.0
pengda 3 years ago
parent
commit
dc4558f2c7
  1. 2
      designer-base/src/main/java/com/fr/design/javascript/ExportJavaScriptPane.java

2
designer-base/src/main/java/com/fr/design/javascript/ExportJavaScriptPane.java

@ -780,6 +780,7 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane<ExportJavaScript
if (currentTemplatePane.extendParametersCheckBox.isSelected()) { if (currentTemplatePane.extendParametersCheckBox.isSelected()) {
exportJavaScript.setParameters(null); exportJavaScript.setParameters(null);
} else { } else {
if (parameterViewPane != null) {
List<ParameterProvider> parameterList = parameterViewPane.update(); List<ParameterProvider> parameterList = parameterViewPane.update();
if (!parameterList.isEmpty()) { if (!parameterList.isEmpty()) {
Parameter[] parameters = new Parameter[parameterList.size()]; Parameter[] parameters = new Parameter[parameterList.size()];
@ -787,6 +788,7 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane<ExportJavaScript
js.setParameters(parameters); js.setParameters(parameters);
} }
} }
}
exportJavaScript.addJS(js); exportJavaScript.addJS(js);
} else { } else {
List<SingleJavaScript> javaScripts = otherTemplatePane.editorPane.update(); List<SingleJavaScript> javaScripts = otherTemplatePane.editorPane.update();

Loading…
Cancel
Save