diff --git a/examples/src/sheets/main.ts b/examples/src/sheets/main.ts index 9e8b7e6272..a43d2c3588 100644 --- a/examples/src/sheets/main.ts +++ b/examples/src/sheets/main.ts @@ -62,9 +62,7 @@ univer.registerPlugin(UniverUIPlugin, { univer.registerPlugin(UniverDocsUIPlugin); -univer.registerPlugin(UniverSheetsPlugin, { - notExecuteFormula: true, -}); +univer.registerPlugin(UniverSheetsPlugin); univer.registerPlugin(UniverSheetsUIPlugin); // sheet feature plugins @@ -73,7 +71,7 @@ univer.registerPlugin(UniverSheetsNumfmtPlugin); univer.registerPlugin(DebuggerPlugin); univer.registerPlugin(UniverSheetsZenEditorPlugin); univer.registerPlugin(UniverFormulaEnginePlugin, { - notExecuteFormula: true, + notExecuteFormula: false, }); univer.registerPlugin(UniverSheetsFormulaPlugin); univer.registerPlugin(UniverRPCMainThreadPlugin, { diff --git a/packages/core/src/services/plugin/plugin.service.ts b/packages/core/src/services/plugin/plugin.service.ts index 9d29d2dbf3..bedb63264b 100644 --- a/packages/core/src/services/plugin/plugin.service.ts +++ b/packages/core/src/services/plugin/plugin.service.ts @@ -21,7 +21,7 @@ import { type UnitType, UniverInstanceType } from '../../common/unit'; import { PluginHolder } from './plugin-holder'; import type { Plugin, PluginCtor } from './plugin'; -const INIT_LAZY_PLUGINS_TIMEOUT = 200; +const INIT_LAZY_PLUGINS_TIMEOUT = 4; /** * This service manages plugin registration. @@ -50,9 +50,7 @@ export class PluginService implements IDisposable { registerPlugin>(plugin: T, config?: ConstructorParameters[0]): void { this._assertPluginValid(plugin); - if (this._pluginHolderForUniver.started) { - this._scheduleInitPluginAfterStarted(); - } + this._scheduleInitPlugin(); const { type } = plugin; if (type === UniverInstanceType.UNIVER) { @@ -96,7 +94,7 @@ export class PluginService implements IDisposable { } private _initLazyPluginsTimer?: number; - private _scheduleInitPluginAfterStarted() { + private _scheduleInitPlugin() { if (this._initLazyPluginsTimer === undefined) { this._initLazyPluginsTimer = setTimeout( () => { diff --git a/packages/core/src/univer.ts b/packages/core/src/univer.ts index 059bda5111..af96a85576 100644 --- a/packages/core/src/univer.ts +++ b/packages/core/src/univer.ts @@ -111,10 +111,6 @@ export class Univer { return this._univerInstanceService.createUnit(UniverInstanceType.SLIDE, data); } - start(): void { - this._tryProgressToStart(); - } - private _init(injector: Injector): void { this._univerInstanceService.registerCtorForType(UniverInstanceType.SHEET, Workbook); this._univerInstanceService.registerCtorForType(UniverInstanceType.DOC, DocumentDataModel); diff --git a/packages/engine-formula/src/plugin.ts b/packages/engine-formula/src/plugin.ts index ff74a26a1f..217f3dbf30 100644 --- a/packages/engine-formula/src/plugin.ts +++ b/packages/engine-formula/src/plugin.ts @@ -90,7 +90,6 @@ export class UniverFormulaEnginePlugin extends Plugin { [IActiveDirtyManagerService, { useClass: ActiveDirtyManagerService }], [ISuperTableService, { useClass: SuperTableService }], - // Models [FormulaDataModel], @@ -147,8 +146,4 @@ export class UniverFormulaEnginePlugin extends Plugin { dependencies.forEach((dependency) => this._injector.add(dependency)); } - - override onReady(): void { - this._injector.get(FormulaDataModel).initFormulaData(); - } }