From 36cc1394381b2a7332688930bd4098cd38d1a5af Mon Sep 17 00:00:00 2001
From: Harrison <Harrison@fanruan.com>
Date: Tue, 22 Nov 2022 17:00:40 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20REPORT-83197=E3=80=90=E8=AE=BE=E8=AE=A1?=
 =?UTF-8?q?=E5=99=A8=E3=80=91=E5=90=AF=E5=8A=A8=E9=A1=B5=E6=80=A7=E8=83=BD?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E5=A4=84=E7=90=86=E4=B8=80=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/fr/design/DesignerEnvManager.java    |  2 +-
 .../com/fr/design/env/LocalDesignerWorkspaceInfo.java  | 10 +++++-----
 .../src/main/java/com/fr/start/MainDesigner.java       |  3 ++-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java b/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java
index 43e59f2263..6b681699be 100644
--- a/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java
+++ b/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java
@@ -200,7 +200,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter, AsyncXmlReada
     /**
      * alphafine
      */
-    private XmlElement<AlphaFineConfigManager> alphaFineConfigManager;
+    private XmlElement<AlphaFineConfigManager> alphaFineConfigManager = SimpleXmlElement.of(AlphaFineConfigManager.getInstance());
 
     /**
      * 阅后即焚的配置项
diff --git a/designer-base/src/main/java/com/fr/design/env/LocalDesignerWorkspaceInfo.java b/designer-base/src/main/java/com/fr/design/env/LocalDesignerWorkspaceInfo.java
index bd1c48ce72..d3fb4268da 100644
--- a/designer-base/src/main/java/com/fr/design/env/LocalDesignerWorkspaceInfo.java
+++ b/designer-base/src/main/java/com/fr/design/env/LocalDesignerWorkspaceInfo.java
@@ -100,16 +100,16 @@ public class LocalDesignerWorkspaceInfo implements DesignerWorkspaceInfo {
     @Override
     public boolean checkValid(){
     
-        // 如果当前是 debug 模式，就不检测这个逻辑
-        if (CommonUtils.isDebug()) {
-            return true;
-        }
-        
         File file = new File(this.path);
         //判断不是文件夹/路径不在WEB-INF下/代码启动三种情况
         if(!file.isDirectory() || !ComparatorUtils.equals(file.getName(), "WEB-INF") || this.path.startsWith(".")) {
             return false;
         }
+    
+        // 如果当前是 debug 模式，就不检测是否 mainVersion 不一致
+        if (CommonUtils.isDebug()) {
+            return true;
+        }
 
         File engineLib = new File(StableUtils.pathJoin(this.path, ProjectConstants.LIB_NAME, REPORT_ENGINE_JAR));
         // 非安装版本允许自由切换
diff --git a/designer-realize/src/main/java/com/fr/start/MainDesigner.java b/designer-realize/src/main/java/com/fr/start/MainDesigner.java
index 926bbbcc66..bd4ed7116e 100644
--- a/designer-realize/src/main/java/com/fr/start/MainDesigner.java
+++ b/designer-realize/src/main/java/com/fr/start/MainDesigner.java
@@ -193,7 +193,8 @@ public class MainDesigner extends BaseDesigner {
     private static void showSplash() {
         
         // 快快显示启动画面
-        UIUtil.invokeLaterIfNeeded(new Runnable() {
+        // vito: 这里必须用 wait, 不然会导致莫名其妙的问题
+        UIUtil.invokeAndWaitIfNeeded(new Runnable() {
             @Override
             public void run() {
                 SplashContext.getInstance().registerSplash(createSplash());