From 370b4945c9baad1d6b7c794fe4084418efc0713a Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Mon, 1 Jul 2024 10:43:19 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-114392=20FR-FBP=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E8=AE=BE=E8=AE=A1=E9=80=82=E9=85=8D=20?= =?UTF-8?q?=E6=89=93=E5=8C=85=E9=94=99=E8=AF=AF+=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 1 + .../main/java/com/fr/design/DesignerEnvManager.java | 2 +- .../com/fr/design/actions/file/PreferencePane.java | 3 ++- .../java/com/fr/start/server/FineEmbedServer.java | 12 +++++++----- .../com/fanruan/boot/env/DesignEnvComponent.java | 4 +++- .../optimized/DesignerStartupPageActivator.java | 3 +-- 6 files changed, 15 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index 471d66de7b..bba1d9cead 100644 --- a/build.gradle +++ b/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 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 cae6c668e6..2098c8da1f 100644 --- a/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java +++ b/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)); diff --git a/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java b/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java index e09d6f7a05..94e52e0595 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java +++ b/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")); diff --git a/designer-base/src/main/java/com/fr/start/server/FineEmbedServer.java b/designer-base/src/main/java/com/fr/start/server/FineEmbedServer.java index 89d642c265..971fa8d353 100644 --- a/designer-base/src/main/java/com/fr/start/server/FineEmbedServer.java +++ b/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); + } } diff --git a/designer-realize/src/main/java/com/fanruan/boot/env/DesignEnvComponent.java b/designer-realize/src/main/java/com/fanruan/boot/env/DesignEnvComponent.java index 5c7937416d..fe12dc02bc 100644 --- a/designer-realize/src/main/java/com/fanruan/boot/env/DesignEnvComponent.java +++ b/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 { 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 9dde7e0a86..8822185328 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 @@ -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();