Browse Source

Pull request #11816: REPORT-92492 超管强制解锁,普通用户触发保存,弹窗提示和实际效果不符

Merge in DESIGN/design from ~JOHN.YING/design:release/11.0 to release/11.0

* commit 'c2be117534ca20e67a8af8a05ecd1f9f7aa60fdc':
  REPORT-92492 超管强制解锁,普通用户触发保存,弹窗提示和实际效果不符--改下注释
  REPORT-92492 超管强制解锁,普通用户触发保存,弹窗提示和实际效果不符
newui
John.Ying-应志浩 2 years ago
parent
commit
62f4e0e000
  1. 6
      designer-base/src/main/java/com/fr/design/worker/save/SaveFailureHandler.java

6
designer-base/src/main/java/com/fr/design/worker/save/SaveFailureHandler.java

@ -113,12 +113,14 @@ public class SaveFailureHandler implements ThrowableHandler {
new Object[] {Toolkit.i18nText("Fine_Design_Template_SaveAs_Backup"), Toolkit.i18nText("Fine-Design_Basic_Button_Cancel")}, null);
if (option == JOptionPane.YES_OPTION) {
JTemplate<?, ?> template = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
if (template != null) {
if (JTemplate.isValid(template)) {
TemplateUtils.createAndOpenTemplate(
Toolkit.i18nText("Fine_Design_Template_Backup"),
new FileNodeFILE(new FileNode(template.getPath(), false)),
true,
false);
true,
// 创建并打开备份模板后,关闭原模板,无需释放原模板锁(因为已经被超管手动清除了)
() -> HistoryTemplateListCache.getInstance().closeSelectedReport(template));
}
}
}

Loading…
Cancel
Save