Browse Source

Pull request #4718: REPORT-54306 【稳定共创】在“配置工作目录”界面,切换远程后没有消息提醒

Merge in DESIGN/design from ~PENGDA/design:final/10.0 to final/10.0

* commit '38c22d8d667d8e1369b9dbe0290aedbcd76be0ea':
  REPORT-54306 【稳定共创】在“配置工作目录”界面,切换远程后没有消息提醒
final/10.0
Kara 3 years ago
parent
commit
b0decce6ea
  1. 11
      designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java

11
designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java

@ -96,8 +96,9 @@ public class EnvChangeEntrance {
* @param envName 目标工作目录名称 * @param envName 目标工作目录名称
*/ */
public void switch2Env(final String envName) { public void switch2Env(final String envName) {
switch2Env(envName, PopTipStrategy.LATER); if (switch2Env(envName, PopTipStrategy.LATER)) {
VersionCheckUtils.showVersionCheckDialog(envName); VersionCheckUtils.showVersionCheckDialog(envName);
}
} }
/** /**
@ -445,9 +446,12 @@ public class EnvChangeEntrance {
@Override @Override
public void doOk() { public void doOk() {
envListOkAction(envListPane, PopTipStrategy.LATER); boolean changeResult = envListOkAction(envListPane, PopTipStrategy.LATER);
// 切换完成后清理密码 // 切换完成后清理密码
updateNotRememberPwdEnv(); updateNotRememberPwdEnv();
if (changeResult) {
VersionCheckUtils.showVersionCheckDialog(envListPane.updateEnvManager());
}
} }
@Override @Override
@ -479,6 +483,7 @@ public class EnvChangeEntrance {
DesignerExiter.getInstance().execute(); DesignerExiter.getInstance().execute();
} else { } else {
updateNotRememberPwdEnv(); updateNotRememberPwdEnv();
VersionCheckUtils.showVersionCheckDialog(envListPane.updateEnvManager());
} }
} }

Loading…
Cancel
Save