Merge pull request #709 in DESIGN/design from ~MATA.LI/designfianl:final/10.0 to final/10.0

* commit '256f211d46b5507adf76af4cfbf81c9e362e4a51':
  REPORT-13810

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

@@ -103,15 +103,16 @@ public class EnvChangeEntrance {
                 return false;
             }
 
+            //REPORT-13810如果只是添加了工作目录,没有切换,这里ToolArea也是要显示新建的工作目录
+            JTemplate template = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
+            if (template != null) {
+                template.refreshToolArea();
+            }
             WorkContext.switchTo(workspace, new WorkContextCallback() {
                 @Override
                 public void done() {
                     DesignerEnvManager.getEnvManager().setCurEnvName(envName);
                     DesignUtils.refreshDesignerFrame();
-                    JTemplate template = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
-                    if (template != null) {
-                        template.refreshToolArea();
-                    }
                     DesignTableDataManager.fireDSChanged(new HashMap<String, String>());
                     if (WorkContext.getCurrent().isLocal()) {
                         //初始化一下serverTray