Browse Source

Merge pull request #1517 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0

* commit '047b1a2b44db871c4a76ced8bf1099fd99c27eaf':
  REPORT-28459 JWorkBook未释放 场景补充
feature/big-screen
Hades 5 years ago
parent
commit
8f99925abc
  1. 5
      designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java

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

@ -1126,7 +1126,10 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
int index = HistoryTemplateListCache.getInstance().contains(jt); int index = HistoryTemplateListCache.getInstance().contains(jt);
List<JTemplate<?, ?>> historyList = HistoryTemplateListCache.getInstance().getHistoryList(); List<JTemplate<?, ?>> historyList = HistoryTemplateListCache.getInstance().getHistoryList();
if (index != -1) { if (index != -1) {
historyList.get(index).activeJTemplate(index, jt); JTemplate currentTemplate = historyList.get(index);
// 双击激活已经打开的模板之前 需要释放一下
currentTemplate.whenClose();
currentTemplate.activeJTemplate(index, jt);
} else { } else {
this.addAndActivateJTemplate(jt); this.addAndActivateJTemplate(jt);
} }

Loading…
Cancel
Save