Browse Source

Merge pull request #1516 in DESIGN/design from ~HADES/design:final/10.0 to final/10.0

* commit 'aaa47a74c6215c43a436289ea10f58ec67ce1bf0':
  REPORT-28459 场景补充
final/10.0
Kara 5 years ago
parent
commit
83bd0f6c76
  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

@ -1110,7 +1110,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