From d320face0ac6223fb84586b2a34b75be5925f88a Mon Sep 17 00:00:00 2001 From: pengda Date: Wed, 23 Jun 2021 16:13:48 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-54306=20=E3=80=90=E7=A8=B3=E5=AE=9A?= =?UTF-8?q?=E5=85=B1=E5=88=9B=E3=80=91=E5=9C=A8=E2=80=9C=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=9B=AE=E5=BD=95=E2=80=9D=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=EF=BC=8C=E5=88=87=E6=8D=A2=E8=BF=9C=E7=A8=8B=E5=90=8E=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E6=B6=88=E6=81=AF=E6=8F=90=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/design/EnvChangeEntrance.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 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 f386437376..14145d1197 100644 --- a/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java +++ b/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java @@ -96,8 +96,9 @@ public class EnvChangeEntrance { * @param envName 目标工作目录名称 */ public void switch2Env(final String envName) { - switch2Env(envName, PopTipStrategy.LATER); - VersionCheckUtils.showVersionCheckDialog(envName); + if (switch2Env(envName, PopTipStrategy.LATER)) { + VersionCheckUtils.showVersionCheckDialog(envName); + } } /** @@ -445,9 +446,12 @@ public class EnvChangeEntrance { @Override public void doOk() { - envListOkAction(envListPane, PopTipStrategy.LATER); + boolean changeResult = envListOkAction(envListPane, PopTipStrategy.LATER); // 切换完成后清理密码 updateNotRememberPwdEnv(); + if (changeResult) { + VersionCheckUtils.showVersionCheckDialog(envListPane.updateEnvManager()); + } } @Override @@ -479,6 +483,7 @@ public class EnvChangeEntrance { DesignerExiter.getInstance().execute(); } else { updateNotRememberPwdEnv(); + VersionCheckUtils.showVersionCheckDialog(envListPane.updateEnvManager()); } }