Browse Source

REPORT-101293 【版本管理二期】模板未打开,点击版本管理点不开

newui
Destiny.Lin 1 year ago
parent
commit
3e72f5c4fb
  1. 9
      designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java

9
designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java

@ -394,8 +394,11 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
private boolean isCurrentEditing(String path) { private boolean isCurrentEditing(String path) {
JTemplate<?, ?> jt = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate(); JTemplate<?, ?> jt = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
String editing = jt.getEditingFILE().getPath(); if (JTemplate.isValid(jt)) {
return ComparatorUtils.equals(editing, path); String editing = jt.getEditingFILE().getPath();
return ComparatorUtils.equals(editing, path);
}
return false;
} }
/** /**
@ -594,9 +597,9 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
confirmCloseAndShowVcsNewPane(jTemplate, path); confirmCloseAndShowVcsNewPane(jTemplate, path);
return; return;
} }
showVcsNewPane(path);
} }
} }
showVcsNewPane(path);
} }
private void confirmCloseAndShowVcsNewPane(JTemplate<?, ?> specifiedTemplate, String path) { private void confirmCloseAndShowVcsNewPane(JTemplate<?, ?> specifiedTemplate, String path) {

Loading…
Cancel
Save