Pull request #14179: REPORT-114392 FR-FBP版本本地设计适配 打包错误+版本管理功能修复

Merge in DESIGN/design from ~DESTINY.LIN/design:fbp-1.0 to fbp-1.0

* commit '7b5d8eb14498c05782ea0e85c2c0297d94eb2368':
  REPORT-114392 FR-FBP版本本地设计适配 打包错误+版本管理功能修复

build.gradle

@@ -101,6 +101,7 @@ allprojects {
         implementation 'io.socket:socket.io-client:0.7.0'
         implementation('com.fr.third:fine-third:' + frVersion) { exclude group: "com.fr.cbb", module: "fine-cbb" }
         implementation 'com.fr.core:fine-core:' + frDevVersion
+        implementation 'com.fr.activator:fine-activator:' + frVersion
         implementation 'com.fr.datasource:fine-datasource-api:' + fdlVersion
         implementation 'com.fr.datasource:fine-datasource-core:' + fdlVersion
         implementation 'com.fr.decision:decision-i18n:' + frVersion

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

@@ -2134,7 +2134,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter, AsyncXmlReada
         if ((tmpVal = reader.getAttrAsString("recentSelectedConnection", null)) != null) {
             this.setRecentSelectedConnection(tmpVal);
         }
-        this.setEmbedServerLazyStartup(reader.getAttrAsBoolean("embedServerLazyStartup", false));
+        this.setEmbedServerLazyStartup(true);
         this.setShowTemplateMissingPlugin(reader.getAttrAsBoolean("showTemplateMissingPlugin", true));
         this.setUseOptimizedUPM4Adapter(reader.getAttrAsBoolean("useOptimizedUPM4Adapter", SupportOSImpl.MACOS_12_VERSION_ADAPTER.support()));
         this.setPropertiesUsable(reader.getAttrAsBoolean("propertiesUsable", false));

designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java

@@ -295,7 +295,8 @@ public class PreferencePane extends BasicPane {
         JPanel embedServerPanel = FRGUIPaneFactory.createVerticalTitledBorderPane(i18nText("Fine-Design_Embed_Server"));
         embedServerLazyStartupCheckBox = new UICheckBox(i18nText("Fine-Design_Startup_When_Needed"));
         embedServerPanel.add(embedServerLazyStartupCheckBox);
-        advancePane.add(embedServerPanel);
+        /// 暂时不支持跟随启动
+        //advancePane.add(embedServerPanel);
 
         JPanel imageCompressPanel = FRGUIPaneFactory.createVerticalTitledBorderPane(i18nText("Fine-Design_Template_Preview_Performance"));
         imageCompressPanelCheckBox = new UICheckBox(i18nText("Fine-Design_Image_Compress"));

designer-base/src/main/java/com/fr/start/server/FineEmbedServer.java

@@ -18,11 +18,13 @@ public abstract class FineEmbedServer {
      * 启动
      */
     public synchronized static void start() throws Exception {
-         onStarting = true;
-         EventDispatcher.fire(EmbedServerEvent.BeforeStart);
-         DesignEmbedHelper.start();
-         onStarting = false;
-         EventDispatcher.fire(EmbedServerEvent.AfterStart);
+        if (!isRunning()) {
+            onStarting = true;
+            EventDispatcher.fire(EmbedServerEvent.BeforeStart);
+            DesignEmbedHelper.start();
+            onStarting = false;
+            EventDispatcher.fire(EmbedServerEvent.AfterStart);
+        }
     }
 
 

designer-realize/src/main/java/com/fanruan/boot/env/DesignEnvComponent.java

@@ -84,7 +84,9 @@ import java.util.Objects;
         "com.fr.decision.authority.entity",
         "com.fanruan.user.oa.basic.db.entity",
         "com.fr.decision.system.entity",
-        "com.fr.decision.workflow.bean"})
+        "com.fr.decision.workflow.bean",
+        "com.fr.report.entity"
+})
 public class DesignEnvComponent {
 
 

designer-realize/src/main/java/com/fr/start/module/optimized/DesignerStartupPageActivator.java

@@ -55,8 +55,7 @@ public class DesignerStartupPageActivator extends Activator {
     
         DesignerStartupContext context = DesignerStartupContext.getInstance();
         context.setStartupArgs(startupArgsValue.getValue());
-        // 目前先只支持启动页
-        if (true) {
+        if (context.isShowStartupPage()) {
             showDesignerStartupPage(context);
         } else {
             startNonStartupPage();