Browse Source

Pull request #9100: REPORT-72728 远程切换校验机制优化-切换语言触发保存弹窗,点击取消/关闭,仍触发重启弹窗

Merge in DESIGN/design from ~YVAN/design:feature/x to feature/x

* commit '7141497bb03a800b7eb1be657531c3135a390e9c':
  REPORT-72728 远程切换校验机制优化-切换语言触发保存弹窗,点击取消/关闭,仍触发重启弹窗 【问题原因】之前实现的是不管保存成功还是失败,都会继续走重启弹窗的逻辑 【改动思路】修改为保存失败时直接return 【review建议】无
feature/x
Yvan 2 years ago
parent
commit
e2754967f3
  1. 5
      designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java

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

@ -892,7 +892,10 @@ public class PreferencePane extends BasicPane {
}
// 重启弹窗出现之前提示用户保存模板
SaveSomeTemplatePane saveSomeTempaltePane = new SaveSomeTemplatePane(true, SwingUtilities.getWindowAncestor(this));
saveSomeTempaltePane.showSavePane();
if (!saveSomeTempaltePane.showSavePane()) {
// 保存失败时,直接返回
return;
}
int rv = JOptionPane.showOptionDialog(
null,
i18nText("Fine-Design_Basic_Language_Change_Successful"),

Loading…
Cancel
Save