Browse Source

Merge pull request #799 in DESIGN/design from ~YAOH.WU/design:debug-release-10.0 to release/10.0

* commit '33f422f8258105000c9bc875bc0936605a915186':
  REPORT-15207 远程设计另存到本地
bugfix/10.0
yaoh.wu 6 years ago
parent
commit
d76e920f0f
  1. 6
      designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java

6
designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java

@ -599,7 +599,11 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
editingFILE = fileChooser.getSelectedFILE(); editingFILE = fileChooser.getSelectedFILE();
} }
boolean lockedTarget = WorkContext.getCurrent().get(TplOperator.class).saveAs(editingFILE.getPath()); boolean lockedTarget =
// 目标本地文件
!editingFILE.isEnvFile() ||
// 目标远程文件
WorkContext.getCurrent().get(TplOperator.class).saveAs(editingFILE.getPath());
if (lockedTarget) { if (lockedTarget) {
boolean saved = saveNewFile(editingFILE, oldName); boolean saved = saveNewFile(editingFILE, oldName);
// 目标文件保存成功并且源文件不一致的情况下,把源文件锁释放掉 // 目标文件保存成功并且源文件不一致的情况下,把源文件锁释放掉

Loading…
Cancel
Save