From 2eb2b4c73eacbf5a78a50aa98e51c78bf8530e08 Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Fri, 13 Dec 2024 16:16:48 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-143716=20=E8=BF=9C=E7=A8=8B=E8=AE=BE?= =?UTF-8?q?=E8=AE=A1=E5=90=AF=E5=8A=A8=E5=8D=A1=E4=BD=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../boot/env/function/DesignComponent.java | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/designer-realize/src/main/java/com/fanruan/boot/env/function/DesignComponent.java b/designer-realize/src/main/java/com/fanruan/boot/env/function/DesignComponent.java index 06fe5526a2..a0601752d7 100644 --- a/designer-realize/src/main/java/com/fanruan/boot/env/function/DesignComponent.java +++ b/designer-realize/src/main/java/com/fanruan/boot/env/function/DesignComponent.java @@ -17,15 +17,12 @@ import com.fr.base.process.ProcessOperator; import com.fr.base.theme.migrator.FormThemeConfigMigrator; import com.fr.base.theme.migrator.ReportThemeConfigMigrator; import com.fr.chart.chartattr.ChartCollection; -import com.fr.config.ServerPreferenceConfig; -import com.fr.data.core.db.dml.Update; import com.fr.decision.update.backup.RecoverManager; import com.fr.decision.webservice.v10.plugin.helper.category.impl.PluginResourceLoader; import com.fr.decision.webservice.v10.plugin.helper.category.impl.UpmResourceLoader; import com.fr.design.DesignerEnvManager; import com.fr.design.ExtraDesignClassManager; import com.fr.design.RPCConnectHandlerCenter; -import com.fr.design.actions.NewFormAction; import com.fr.design.actions.UpdateAction; import com.fr.design.actions.core.ActionFactory; import com.fr.design.actions.insert.cell.BiasCellAction; @@ -122,26 +119,22 @@ import com.fr.plugin.manage.PluginFilter; import com.fr.plugin.observer.PluginEvent; import com.fr.plugin.observer.PluginEventListener; import com.fr.quickeditor.cellquick.CellBiasTextPainterEditor; -import com.fr.quickeditor.cellquick.CellDSColumnEditor; import com.fr.quickeditor.cellquick.CellFormulaQuickEditor; import com.fr.quickeditor.cellquick.CellImageQuickEditor; import com.fr.quickeditor.cellquick.CellRichTextEditor; import com.fr.quickeditor.cellquick.CellStringQuickEditor; import com.fr.quickeditor.cellquick.CellSubReportEditor; -import com.fr.quickeditor.chartquick.BasicChartQuickEditor; import com.fr.quickeditor.chartquick.FloatChartQuickEditor; import com.fr.quickeditor.floatquick.FloatImageQuickEditor; import com.fr.quickeditor.floatquick.FloatStringQuickEditor; import com.fr.report.cell.CellElementValueConverter; import com.fr.report.cell.cellattr.core.RichText; import com.fr.report.cell.cellattr.core.SubReport; -import com.fr.report.cell.cellattr.core.group.DSColumn; import com.fr.report.cell.painter.BiasTextPainter; import com.fr.report.cell.painter.CellImagePainter; import com.fr.stable.ArrayUtils; import com.fr.stable.ParameterProvider; import com.fr.stable.bridge.StableFactory; -import com.fr.stable.os.support.OSBasedAction; import com.fr.stable.os.support.OSSupportCenter; import com.fr.stable.plugin.ExtraDesignClassManagerProvider; import com.fr.stable.script.CalculatorProviderContext; @@ -149,7 +142,6 @@ import com.fr.stable.script.ValueConverter; import com.fr.stable.xml.ObjectTokenizer; import com.fr.stable.xml.ObjectXMLWriterFinder; import com.fr.start.BBSGuestPaneProvider; -import com.fr.start.common.DesignerStartupExecutor; import com.fr.start.common.DesignerStartupPool; import com.fr.task.Once; import com.fr.workspace.WorkContext; @@ -198,8 +190,10 @@ public class DesignComponent { } } 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()); CompletableFuture extendDesignerPrepare = CompletableFuture.runAsync(this::designerExtendStart, DesignerStartupPool.common()); @@ -426,7 +420,7 @@ public class DesignComponent { ActionFactory.registerAsyncInitCellEditorClass(BaseFormula.class, CellFormulaQuickEditor.class); ActionFactory.registerAsyncInitCellEditorClass(SubReport.class, CellSubReportEditor.class); ActionFactory.registerAsyncInitCellEditorClass(RichText.class, CellRichTextEditor.class); - ActionFactory.registerAsyncInitCellEditorClass(DSColumn.class, CellDSColumnEditor.class); +// ActionFactory.registerAsyncInitCellEditorClass(DSColumn.class, CellDSColumnEditor.class); ActionFactory.registerAsyncInitCellEditorClass(Image.class, CellImageQuickEditor.class); ActionFactory.registerAsyncInitCellEditorClass(BiasTextPainter.class, CellBiasTextPainterEditor.class); ActionFactory.registerAsyncInitCellEditorClass(BufferedImage.class, CellImageQuickEditor.class);