|
|
|
@ -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; |
|
|
|
@ -128,7 +125,6 @@ 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; |
|
|
|
@ -141,7 +137,6 @@ 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 +144,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 +192,10 @@ public class DesignComponent {
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
CompletableFuture<Void> themeConfigPrepare = CompletableFuture.runAsync(() -> { |
|
|
|
|
FormThemeConfigMigrator.getInstance().upgrade(); |
|
|
|
|
ReportThemeConfigMigrator.getInstance().upgrade(); |
|
|
|
|
if (WorkContext.getCurrent().isLocal()) { |
|
|
|
|
FormThemeConfigMigrator.getInstance().upgrade(); |
|
|
|
|
ReportThemeConfigMigrator.getInstance().upgrade(); |
|
|
|
|
} |
|
|
|
|
}, DesignerStartupPool.common()); |
|
|
|
|
CompletableFuture<Void> mainDesignerPrepare = CompletableFuture.runAsync(this::designerModuleStart, DesignerStartupPool.common()); |
|
|
|
|
CompletableFuture<Void> extendDesignerPrepare = CompletableFuture.runAsync(this::designerExtendStart, DesignerStartupPool.common()); |
|
|
|
|