Pull request #10720: REPORT-85363 设计器启动页 BUG 研发汇总

Merge in DESIGN/design from ~HARRISON/design:release/11.0 to release/11.0

* commit '36cc1394381b2a7332688930bd4098cd38d1a5af':
  fix: REPORT-83197【设计器】启动页性能优化 处理一部分问题

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());
 
     /**
      * 阅后即焚的配置项

designer-base/src/main/java/com/fr/design/env/LocalDesignerWorkspaceInfo.java

@@ -100,17 +100,17 @@ 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));
         // 非安装版本允许自由切换
         boolean notExistLib = !CoreConstants.DOT.equals(StableUtils.getInstallHome())

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());