Browse Source

REPORT-70481 远程设计切换校验机制优化

设计器选项-修改语言后,优先跳出保存提示弹窗,再跳出重启设计器提示弹窗
feature/x
Yvan 3 years ago
parent
commit
677d12a1f2
  1. 7
      designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java

7
designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java

@ -890,6 +890,9 @@ public class PreferencePane extends BasicPane {
if (!languageChanged) { if (!languageChanged) {
return; return;
} }
// 重启弹窗出现之前提示用户保存模板
SaveSomeTemplatePane saveSomeTempaltePane = new SaveSomeTemplatePane(true, SwingUtilities.getWindowAncestor(this));
saveSomeTempaltePane.showSavePane();
int rv = JOptionPane.showOptionDialog( int rv = JOptionPane.showOptionDialog(
null, null,
i18nText("Fine-Design_Basic_Language_Change_Successful"), i18nText("Fine-Design_Basic_Language_Change_Successful"),
@ -901,13 +904,9 @@ public class PreferencePane extends BasicPane {
null null
); );
if (rv == JOptionPane.OK_OPTION) { if (rv == JOptionPane.OK_OPTION) {
// 重启前需要保存下模板
SaveSomeTemplatePane saveSomeTempaltePane = new SaveSomeTemplatePane(true, SwingUtilities.getWindowAncestor(this));
if (saveSomeTempaltePane.showSavePane()) {
RestartHelper.restart(); RestartHelper.restart();
} }
} }
}
@Override @Override
public BasicDialog showWindow(Window window) { public BasicDialog showWindow(Window window) {

Loading…
Cancel
Save