From f482baa997d41c29d1e18fa3e71e32e1dfb930de Mon Sep 17 00:00:00 2001 From: roger Date: Wed, 22 Nov 2023 15:14:13 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-107976=20=E8=BF=9C=E7=A8=8B=E8=AE=BE?= =?UTF-8?q?=E8=AE=A1=E5=88=87=E6=8D=A2=E7=9B=AE=E5=BD=95=E6=80=A7=E8=83=BD?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/start/module/DesignerActivator.java | 6 ++++-- .../optimized/DesignerPluginActivator.java | 20 +++++++++++++++---- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/start/module/DesignerActivator.java b/designer-realize/src/main/java/com/fr/start/module/DesignerActivator.java index 851e714be7..0a7b3c6e73 100644 --- a/designer-realize/src/main/java/com/fr/start/module/DesignerActivator.java +++ b/designer-realize/src/main/java/com/fr/start/module/DesignerActivator.java @@ -188,8 +188,10 @@ public class DesignerActivator extends Activator implements Prepare { } CompletableFuture themeConfigPrepare = CompletableFuture.runAsync(() -> { - FormThemeConfigMigrator.getInstance().upgrade(); - ReportThemeConfigMigrator.getInstance().upgrade(); + if (WorkContext.getCurrent().isLocal()) { + FormThemeConfigMigrator.getInstance().upgrade(); + ReportThemeConfigMigrator.getInstance().upgrade(); + } }, DesignerStartupPool.common()); CompletableFuture mainDesignerPrepare = CompletableFuture.runAsync(this::designerModuleStart, DesignerStartupPool.common()); diff --git a/designer-realize/src/main/java/com/fr/start/module/optimized/DesignerPluginActivator.java b/designer-realize/src/main/java/com/fr/start/module/optimized/DesignerPluginActivator.java index fd6286e33d..15ef2594f1 100644 --- a/designer-realize/src/main/java/com/fr/start/module/optimized/DesignerPluginActivator.java +++ b/designer-realize/src/main/java/com/fr/start/module/optimized/DesignerPluginActivator.java @@ -3,7 +3,11 @@ package com.fr.start.module.optimized; import com.fr.module.Activator; import com.fr.module.ModuleContext; import com.fr.plugin.PluginActivator; +import com.fr.plugin.manage.PluginManager; import com.fr.start.common.DesignerStartupExecutor; +import com.fr.workspace.WorkContext; +import com.fr.workspace.WorkspaceSwitchHelper; +import com.fr.workspace.WorkspaceSwitchProcess; /** * created by Harrison on 2022/06/22 @@ -12,13 +16,21 @@ public class DesignerPluginActivator extends Activator { @Override public void start() { - - DesignerStartupExecutor.getInstance().execute(() -> ModuleContext.getModule(PluginActivator.class).start()); + WorkspaceSwitchProcess process = WorkContext.getSwitcher().getProcess(); + if (WorkspaceSwitchHelper.supportHotSwitch(process)) { + PluginManager.getHotModule().start(); + } else { + DesignerStartupExecutor.getInstance().execute(() -> ModuleContext.getModule(PluginActivator.class).start()); + } } @Override public void stop() { - - ModuleContext.getModule(PluginActivator.class).stop(); + WorkspaceSwitchProcess process = WorkContext.getSwitcher().getProcess(); + if (WorkspaceSwitchHelper.supportHotSwitch(process)) { + PluginManager.getHotModule().stop(); + } else { + ModuleContext.getModule(PluginActivator.class).stop(); + } } }