Browse Source

Merge pull request #6358 in DESIGN/design from bugfix/10.0 to release/10.0

* commit 'd48dc7e0d53bdb5610d38eb6edea9dc2118159ff':
  REPORT-60253 安装大数据集导出插件后,模板从本地切换到远程,再切换到本地,触发保存模板会弹窗 保存失败,有npe报错
zheng-1641779399395
superman 3 years ago
parent
commit
413f9331cd
  1. 2
      designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java
  2. 5
      designer-base/src/main/java/com/fr/design/mainframe/JTemplateFactory.java

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

@ -381,8 +381,10 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
*/ */
@Deprecated @Deprecated
public void refreshResource() { public void refreshResource() {
if (JTemplateFactory.isAvailable()) {
refreshResource(this.editingFILE); refreshResource(this.editingFILE);
} }
}
public void refreshResource(FILE file) { public void refreshResource(FILE file) {

5
designer-base/src/main/java/com/fr/design/mainframe/JTemplateFactory.java

@ -93,4 +93,7 @@ public final class JTemplateFactory {
ALL_APP.remove(app); ALL_APP.remove(app);
} }
} }
}
public static boolean isAvailable() {
return !ALL_APP.isEmpty();
}}
Loading…
Cancel
Save