From bbbca1d9fa7efe441132475ca04c599d855670a3 Mon Sep 17 00:00:00 2001
From: "Destiny.Lin" <3166887LjL>
Date: Tue, 18 Jul 2023 20:23:10 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-100960=20=E3=80=90=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=B8=89=E6=9C=9F=E3=80=91=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E6=9C=AA=E4=BF=9D=E5=AD=98=E7=9A=84=E7=8A=B6=E6=80=81=E4=B8=8B?=
 =?UTF-8?q?=E8=A7=A6=E5=8F=91=E8=BF=98=E5=8E=9F=EF=BC=8C=E8=BF=98=E5=8E=9F?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/mainframe/DesignerFrameFileDealerPane.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java
index 6ef68afe7e..b030479904 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java
@@ -501,10 +501,10 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
         public void actionPerformed(ActionEvent e) {
             String path = DesignerFrameFileDealerPane.getInstance().getSelectedOperation().getFilePath();
             path = StableUtils.pathJoin(ProjectConstants.REPORTLETS_NAME, path);
+            boolean currentEditing = isCurrentEditing(path);
+            // 如果模板已经打开了，关掉，避免出现2个同名tab（1个是模板，1个是版本）
+            closeOpenedTemplate(path, currentEditing);
             if (VcsHelper.getInstance().isLegacyMode()) {
-                boolean currentEditing = isCurrentEditing(path);
-                // 如果模板已经打开了，关掉，避免出现2个同名tab（1个是模板，1个是版本）
-                closeOpenedTemplate(path, currentEditing);
                 FileVersionsPanel fileVersionTablePanel = FileVersionsPanel.getInstance();
                 fileVersionTablePanel.showFileVersionsPane();
                 stateChange();