Browse Source

Pull request #11652: REPORT-91486 不打开任何报表进入设计器,选项弹窗触发下保存,模板tab栏会自动弹出来

Merge in DESIGN/design from ~DESTINY.LIN/design:feature/x to feature/x

* commit 'b202be373a96bddfeb4ff78f64f24911dc2ff6da':
  REPORT-91486 不打开任何报表进入设计器,选项弹窗触发下保存,模板tab栏会自动弹出来
feature/x
Destiny.Lin-林锦龙 2 years ago
parent
commit
74d9598beb
  1. 3
      designer-base/src/main/java/com/fr/design/actions/file/PreferenceAction.java

3
designer-base/src/main/java/com/fr/design/actions/file/PreferenceAction.java

@ -40,7 +40,8 @@ public class PreferenceAction extends UpdateAction {
DesignerEnvManager.loadLogSetting(); DesignerEnvManager.loadLogSetting();
DesignerEnvManager.getEnvManager().saveXMLFile(); DesignerEnvManager.getEnvManager().saveXMLFile();
JTemplate jt = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate(); JTemplate jt = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
if (jt != null) { //不能只单纯判断!=null,JTemplate还有可能是JNullTemplate.NULL,这个时候模板也是空内容的
if (JTemplate.isValid(jt)) {
jt.refreshToolArea(); jt.refreshToolArea();
} }
preferencePane.showRestartDialog(); preferencePane.showRestartDialog();

Loading…
Cancel
Save