From 3ad0c989609e54225ee943fae0959aab98c995ae Mon Sep 17 00:00:00 2001
From: Yvan <Yvan@fanruan.com>
Date: Fri, 27 May 2022 16:15:22 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-70481=20=E8=BF=9C=E7=A8=8B=E8=AE=BE?=
 =?UTF-8?q?=E8=AE=A1=E5=88=87=E6=8D=A2=E6=A0=A1=E9=AA=8C=E6=9C=BA=E5=88=B6?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E3=80=90=E9=97=AE=E9=A2=98=E5=8E=9F?=
 =?UTF-8?q?=E5=9B=A0=E3=80=91=E4=BA=A7=E5=93=81=E4=BF=AE=E6=94=B9=E8=AE=BE?=
 =?UTF-8?q?=E8=AE=A1=20=E3=80=90=E6=94=B9=E5=8A=A8=E6=80=9D=E8=B7=AF?=
 =?UTF-8?q?=E3=80=91=E5=88=87=E6=8D=A2=E5=B7=A5=E4=BD=9C=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=E6=97=B6=E8=B7=B3=E5=87=BA=E7=9A=84=E4=BF=9D=E5=AD=98=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=EF=BC=8C=E5=9C=A8=E7=94=A8=E6=88=B7=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=90=8E=EF=BC=8C=E4=B8=AD=E6=96=AD=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E5=B7=A5=E4=BD=9C=E7=9B=AE=E5=BD=95=E5=8A=A8=E4=BD=9C?=
 =?UTF-8?q?=20=E3=80=90review=E5=BB=BA=E8=AE=AE=E3=80=91=E6=97=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/fr/design/EnvChangeEntrance.java     | 7 +++++--
 .../java/com/fr/design/actions/file/SwitchExistEnv.java    | 6 ++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java b/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java
index 60554ef7dc..7d2fc61065 100644
--- a/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java
+++ b/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java
@@ -83,8 +83,6 @@ public class EnvChangeEntrance {
 
     private boolean envListOkAction(EnvListPane envListPane, PopTipStrategy strategy) {
         final String selectedName = envListPane.updateEnvManager();
-        SaveSomeTemplatePane saveSomeTemplatePane = new SaveSomeTemplatePane(true, SwingUtilities.getWindowAncestor(envListPane));
-        saveSomeTemplatePane.showSavePane();
         return switch2Env(selectedName, strategy);
     }
 
@@ -391,6 +389,11 @@ public class EnvChangeEntrance {
 
             @Override
             public void doOk() {
+                SaveSomeTemplatePane saveSomeTemplatePane = new SaveSomeTemplatePane(true, SwingUtilities.getWindowAncestor(envListPane));
+                if (!saveSomeTemplatePane.showSavePane()) {
+                    // 用户取消保存时，取消切换目录操作
+                    return;
+                }
                 boolean changeResult = envListOkAction(envListPane, PopTipStrategy.LATER);
                 // 切换完成后清理密码
                 updateNotRememberPwdEnv();
diff --git a/designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java b/designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java
index b47d5ef1ec..33761a92e2 100644
--- a/designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java
+++ b/designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java
@@ -68,8 +68,10 @@ public class SwitchExistEnv extends MenuDef {
                 EnvChangeEntrance.getInstance().chooseEnv(envName);
             } else {
                 SaveSomeTemplatePane saveSomeTemplatePane = new SaveSomeTemplatePane(true);
-                saveSomeTemplatePane.showSavePane();
-                EnvChangeEntrance.getInstance().switch2Env(envName);
+                if (saveSomeTemplatePane.showSavePane()) {
+                    // 用户模板保存后，才进行切换目录操作
+                    EnvChangeEntrance.getInstance().switch2Env(envName);
+                }
             }
         }