Browse Source

Pull request #6276: REPORT-60993 导出-导出事件-事件内容没有初始化

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

* commit '0b5bc65816a9aa509ce54be81de8fbacedf1172c':
  REPORT-60993 导出-导出事件-事件内容没有初始化
bugfix/11.0
zack 3 years ago
parent
commit
fc54339bfb
  1. 5
      designer-base/src/main/java/com/fr/design/javascript/ExportJavaScriptPane.java

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

@ -218,6 +218,10 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane<ExportJavaScript
this.add(editorPane, BorderLayout.CENTER); this.add(editorPane, BorderLayout.CENTER);
} }
public void reset() {
editorPane.populate(new SingleJavaScript[0]);
}
@Override @Override
protected String title4PopupWindow() { protected String title4PopupWindow() {
return Toolkit.i18nText("Fine-Design_Basic_Export_JS_Setting"); return Toolkit.i18nText("Fine-Design_Basic_Export_JS_Setting");
@ -758,6 +762,7 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane<ExportJavaScript
public void populateBean(ExportJavaScript ob) { public void populateBean(ExportJavaScript ob) {
if (ob == null) { if (ob == null) {
ob = new ExportJavaScript(); ob = new ExportJavaScript();
otherTemplatePane.reset();
} }
this.templateRadioGroup.selectIndexButton(ob.isCurrentTemplate() ? 0 : 1); this.templateRadioGroup.selectIndexButton(ob.isCurrentTemplate() ? 0 : 1);
if (ob.isCurrentTemplate()) { if (ob.isCurrentTemplate()) {

Loading…
Cancel
Save