From 85e779da5efe3738a5338777de04d1d15acad41b Mon Sep 17 00:00:00 2001
From: Harrison <Harrison@fanruan.com>
Date: Tue, 9 Aug 2022 14:51:05 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-76057=E3=80=90=E8=BF=AD=E4=BB=A3?=
 =?UTF-8?q?=E3=80=91=E3=80=90=E8=B5=B7=E5=A7=8B=E9=A1=B5=E3=80=91=E8=BF=9B?=
 =?UTF-8?q?=E5=85=A5=E7=9A=84=E4=B8=80=E7=9B=B4=E9=83=BD=E6=98=AF=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=B7=A5=E4=BD=9C=E7=9B=AE=E5=BD=95=20=E8=BF=9B?=
 =?UTF-8?q?=E5=85=A5=E5=B7=A5=E4=BD=9C=E7=9B=AE=E5=BD=95=E5=89=8D=EF=BC=8C?=
 =?UTF-8?q?=E5=85=88=E5=B0=86=E7=8E=AF=E5=A2=83=E5=87=86=E5=A4=87=E5=A5=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/startup/ui/StartupPageWorkspacePanel.java |  7 ++++---
 .../optimized/DesignerStartupPageActivator.java      | 12 ++++++++++++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/startup/ui/StartupPageWorkspacePanel.java b/designer-base/src/main/java/com/fr/startup/ui/StartupPageWorkspacePanel.java
index 297feaa25..c20f623f8 100644
--- a/designer-base/src/main/java/com/fr/startup/ui/StartupPageWorkspacePanel.java
+++ b/designer-base/src/main/java/com/fr/startup/ui/StartupPageWorkspacePanel.java
@@ -223,7 +223,7 @@ public class StartupPageWorkspacePanel extends JPanel {
     
             layoutSelectWorkspacePanel(workspaceInfo, workspaceItemDesc);
     
-            layoutSelectAndCreatePanel(workspaceItemDesc);
+            layoutSelectAndCreatePanel(workspaceInfo, workspaceItemDesc);
     
             partitionPanel.add(workspaceItemDesc);
         
@@ -378,7 +378,7 @@ public class StartupPageWorkspacePanel extends JPanel {
                 public void mousePressed(MouseEvent e) {
 
                     int clickCount = e.getClickCount();
-                    if (clickCount == BORDER_THIN) {
+                    if (clickCount == 2) {
                         pageModel.setSelectWorkspaceInfo(workspaceInfo);
                         openEmptyTemplateRunnable.run();
                         return;
@@ -426,7 +426,7 @@ public class StartupPageWorkspacePanel extends JPanel {
         workspaceItemDesc.add(selectWorkspacePanel, BorderLayout.WEST);
     }
     
-    private void layoutSelectAndCreatePanel(JPanel workspaceItemDesc) {
+    private void layoutSelectAndCreatePanel(StartupWorkspaceBean workspaceInfo, JPanel workspaceItemDesc) {
         
         // 选择并新建
         AtomicReference<Color> borderColorRef = new AtomicReference<>(null);
@@ -497,6 +497,7 @@ public class StartupPageWorkspacePanel extends JPanel {
                 }
                 @Override
                 public void mousePressed(MouseEvent e) {
+                    pageModel.setSelectWorkspaceInfo(workspaceInfo);
                     createNewTemplateRunnable.run();
                 }
             });
diff --git a/designer-realize/src/main/java/com/fr/start/module/optimized/DesignerStartupPageActivator.java b/designer-realize/src/main/java/com/fr/start/module/optimized/DesignerStartupPageActivator.java
index 12e1e1f7c..98ff33466 100644
--- a/designer-realize/src/main/java/com/fr/start/module/optimized/DesignerStartupPageActivator.java
+++ b/designer-realize/src/main/java/com/fr/start/module/optimized/DesignerStartupPageActivator.java
@@ -1,5 +1,6 @@
 package com.fr.start.module.optimized;
 
+import com.fr.design.DesignerEnvManager;
 import com.fr.design.ui.util.UIUtil;
 import com.fr.log.FineLoggerFactory;
 import com.fr.module.Activator;
@@ -10,6 +11,7 @@ import com.fr.start.util.DesignerStartupPageUtil;
 import com.fr.start.warmup.DesignerPreWarmTask;
 import com.fr.startup.ui.StartupPageModel;
 import com.fr.startup.ui.StartupPageWindow;
+import com.fr.startup.ui.StartupWorkspaceBean;
 import com.fr.third.org.apache.commons.lang3.time.StopWatch;
 import com.fr.value.NotNullLazyValue;
 import org.jetbrains.annotations.NotNull;
@@ -66,18 +68,21 @@ public class DesignerStartupPageActivator extends Activator {
             // selectAndOpenLast
             model.setOpenLastTemplateRunnable(() -> {
                 context.setOpenLastFile(true);
+                handleModel(model);
                 launchAfterWarmup(warmTask);
             });
             
             // selectAndOpenEmpty
             model.setOpenEmptyTemplateRunnable(() -> {
                 context.setOpenEmpty(true);
+                handleModel(model);
                 launchAfterWarmup(warmTask);
             });
             
             // selectAndCreateNew
             model.setCreateNewTemplateRunnable(() -> {
                 context.setCreateNew(true);
+                handleModel(model);
                 launchAfterWarmup(warmTask);
             });
             
@@ -87,6 +92,13 @@ public class DesignerStartupPageActivator extends Activator {
         });
     }
     
+    private void handleModel(StartupPageModel model) {
+        
+        // 将选中的环境设置为当前环境
+        StartupWorkspaceBean selectWorkspaceInfo = model.getSelectWorkspaceInfo();
+        DesignerEnvManager.getEnvManager().setCurEnvName(selectWorkspaceInfo.getName());
+    }
+    
     private void launchAfterWarmup(DesignerPreWarmTask warmTask) {
         
         StopWatch stopWatch = StopWatch.createStarted();