Build your own AI office with Univer Office SDK. Bring editing, calculation, collaboration, and file processing into your product for people and AI agents. Built on an extensible open-source core.
TypeScript boardcollaborationdocdocxexceloffce365officepdfpptpptxpresentationsdksheetslidesspreadsheetuniverwordwordprocessorworkspacexlsx
fix: replace deprecated deepMerge method with merge from @univerjs/core (#4374)
白熱a5949aecfbc5
diff --git a/packages-experimental/action-recorder/src/plugin.ts b/packages-experimental/action-recorder/src/plugin.tsindex 08bab42ecd..520102bb76 100644--- a/packages-experimental/action-recorder/src/plugin.ts+++ b/packages-experimental/action-recorder/src/plugin.ts@@ -16,7 +16,7 @@import type { Dependency } from '@univerjs/core';import type { IUniverActionRecorderConfig } from './controllers/config.schema';-import { IConfigService, Inject, Injector, Plugin, Tools } from '@univerjs/core';+import { IConfigService, Inject, Injector, merge, Plugin } from '@univerjs/core';import { ActionRecorderController } from './controllers/action-recorder.controller';import { ACTION_RECORDER_PLUGIN_CONFIG_KEY, defaultPluginConfig } from './controllers/config.schema';import { ActionRecorderService } from './services/action-recorder.service';@@ -37,7 +37,8 @@ export class UniverActionRecorderPlugin extends Plugin {super();// Manage the plugin configuration.- const { menu, ...rest } = Tools.deepMerge(+ const { menu, ...rest } = merge(+ {},defaultPluginConfig,this._config);diff --git a/packages-experimental/debugger/src/debugger-plugin.ts b/packages-experimental/debugger/src/debugger-plugin.tsindex 2743a20802..02c2351ad5 100644--- a/packages-experimental/debugger/src/debugger-plugin.ts+++ b/packages-experimental/debugger/src/debugger-plugin.ts@@ -16,7 +16,7 @@import type { Dependency } from '@univerjs/core';import type { IUniverDebuggerConfig } from './controllers/config.schema';-import { IConfigService, Inject, Injector, Plugin, Tools } from '@univerjs/core';+import { IConfigService, Inject, Injector, merge, Plugin } from '@univerjs/core';import { DEBUGGER_PLUGIN_CONFIG_KEY, defaultPluginConfig } from './controllers/config.schema';import { DebuggerController } from './controllers/debugger.controller';import { E2EController } from './controllers/e2e/e2e.controller';@@ -36,7 +36,8 @@ export class UniverDebuggerPlugin extends Plugin {super();// Manage the plugin configuration.- const { menu, ...rest } = Tools.deepMerge(+ const { menu, ...rest } = merge(+ {},defaultPluginConfig,this._config);diff --git a/packages-experimental/uniui/src/plugin.ts b/packages-experimental/uniui/src/plugin.tsindex 441aca30cd..77d2f3e249 100644--- a/packages-experimental/uniui/src/plugin.ts+++ b/packages-experimental/uniui/src/plugin.ts@@ -16,7 +16,7 @@import type { Dependency } from '@univerjs/core';import type { IUniverUIConfig } from '@univerjs/ui';-import { DependentOn, ICommandService, IContextService, ILocalStorageService, Inject, Injector, mergeOverrideWithDependencies, Plugin, Tools } from '@univerjs/core';+import { DependentOn, ICommandService, IContextService, ILocalStorageService, Inject, Injector, merge, mergeOverrideWithDependencies, Plugin } from '@univerjs/core';import { UniverRenderEnginePlugin } from '@univerjs/engine-render';import {BrowserClipboardService,@@ -90,7 +90,7 @@ export class UniverUniUIPlugin extends Plugin {) {super();- this._config = Tools.deepMerge({}, this._config);+ this._config = merge({}, this._config);if (this._config.disableAutoFocus) {this._contextService.setContextValue(DISABLE_AUTO_FOCUS_KEY, true);}diff --git a/packages/core/src/services/config/config.service.ts b/packages/core/src/services/config/config.service.tsindex e980c315df..864b5e75ad 100644--- a/packages/core/src/services/config/config.service.ts+++ b/packages/core/src/services/config/config.service.ts@@ -16,11 +16,10 @@import type { IDisposable } from '../../common/di';import type { Nullable } from '../../shared/types';+import { merge } from 'lodash-es';import { filter, Observable, Subject } from 'rxjs';import { createIdentifier } from '../../common/di';-import { Tools } from '../../shared';-// WARNING!!! Do not set per unit config here! You can definitely find a better place to do that./**@@ -66,12 +65,12 @@ export class ConfigService implements IConfigService, IDisposable {}setConfig(id: string, value: unknown, options?: IConfigOptions): void {- const { merge = false } = options || {};+ const { merge: isMerge = false } = options || {};let nextValue = this._config.get(id) ?? {};- if (merge) {- nextValue = Tools.deepMerge(nextValue, value);+ if (isMerge) {+ nextValue = merge(nextValue, value);} else {nextValue = value;}diff --git a/packages/core/src/services/locale/locale.service.ts b/packages/core/src/services/locale/locale.service.tsindex 01fa3fd4ef..559095a27f 100644--- a/packages/core/src/services/locale/locale.service.ts+++ b/packages/core/src/services/locale/locale.service.ts@@ -14,12 +14,12 @@* limitations under the License.*/-import { BehaviorSubject, Subject } from 'rxjs';+import type { ILanguagePack, ILocales, LanguageValue } from '../../shared/locale';+import { merge } from 'lodash-es';+import { BehaviorSubject, Subject } from 'rxjs';import { Disposable, toDisposable } from '../../shared/lifecycle';-import { Tools } from '../../shared/tools';import { LocaleType } from '../../types/enum/locale-type';-import type { ILanguagePack, ILocales, LanguageValue } from '../../shared/locale';/*** This service provides i18n and timezone / location features to other modules.@@ -45,7 +45,7 @@ export class LocaleService extends Disposable {* @param locales - Locale object*/load(locales: ILocales) {- this._locales = Tools.deepMerge(this._locales ?? {}, locales);+ this._locales = merge(this._locales ?? {}, locales);}/**diff --git a/packages/core/src/shared/tools.ts b/packages/core/src/shared/tools.tsindex b3abf6bd37..04ae4d813a 100644--- a/packages/core/src/shared/tools.ts+++ b/packages/core/src/shared/tools.ts@@ -241,6 +241,7 @@ export class Tools {return instance.constructor.name;}+ /** @deprecated This method is deprecated, please use `import { merge } from '@univerjs/core` instead */static deepMerge(target: any, ...sources: any[]): any {sources.forEach((item) => item && deepItem(item));diff --git a/packages/data-validation/src/plugin.ts b/packages/data-validation/src/plugin.tsindex 6c960430b7..4a25eca1cd 100644--- a/packages/data-validation/src/plugin.ts+++ b/packages/data-validation/src/plugin.ts@@ -16,7 +16,7 @@import type { Dependency } from '@univerjs/core';import type { IUniverDataValidationConfig } from './controllers/config.schema';-import { ICommandService, IConfigService, Inject, Injector, Plugin, Tools, UniverInstanceType } from '@univerjs/core';+import { ICommandService, IConfigService, Inject, Injector, merge, Plugin, UniverInstanceType } from '@univerjs/core';import { AddDataValidationCommand, RemoveAllDataValidationCommand, RemoveDataValidationCommand, UpdateDataValidationOptionsCommand, UpdateDataValidationSettingCommand } from './commands/commands/data-validation.command';import { AddDataValidationMutation, RemoveDataValidationMutation, UpdateDataValidationMutation } from './commands/mutations/data-validation.mutation';import { DATA_VALIDATION_PLUGIN_CONFIG_KEY, defaultPluginConfig } from './controllers/config.schema';@@ -39,7 +39,8 @@ export class UniverDataValidationPlugin extends Plugin {super();// Manage the plugin configuration.- const { ...rest } = Tools.deepMerge(+ const { ...rest } = merge(+ {},defaultPluginConfig,this._config);diff --git a/packages/docs-drawing-ui/src/plugin.ts b/packages/docs-drawing-ui/src/plugin.tsindex d0317d2244..1483be0656 100644--- a/packages/docs-drawing-ui/src/plugin.ts+++ b/packages/docs-drawing-ui/src/plugin.ts@@ -16,7 +16,7 @@import type { Dependency } from '@univerjs/core';import type { IUniverDocsDrawingUIConfig } from './controllers/config.schema';-import { DependentOn, IConfigService, Inject, Injector, Plugin, Tools, UniverInstanceType } from '@univerjs/core';+import { DependentOn, IConfigService, Inject, Injector, merge, Plugin, UniverInstanceType } from '@univerjs/core';import { UniverDocsDrawingPlugin } from '@univerjs/docs-drawing';import { UniverDrawingPlugin } from '@univerjs/drawing';import { UniverDrawingUIPlugin } from '@univerjs/drawing-ui';@@ -47,7 +47,8 @@ export class UniverDocsDrawingUIPlugin extends Plugin {super();// Manage the plugin configuration.- const { ...rest } = Tools.deepMerge(+ const { ...rest } = merge(+ {},defaultPluginConfig,this._config);diff --git a/packages/docs-drawing/src/plugin.ts b/packages/docs-drawing/src/plugin.tsindex d8efb9a379..b8fb99e8f1 100644--- a/packages/docs-drawing/src/plugin.ts+++ b/packages/docs-drawing/src/plugin.ts@@ -16,7 +16,7 @@import type { Dependency } from '@univerjs/core';import type { IUniverDocsDrawingConfig } from './controllers/config.schema';-import { IConfigService, Inject, Injector, Plugin, Tools, touchDependencies, UniverInstanceType } from '@univerjs/core';+import { IConfigService, Inject, Injector, merge, Plugin, touchDependencies, UniverInstanceType } from '@univerjs/core';import { defaultPluginConfig, DOCS_DRAWING_PLUGIN_CONFIG_KEY } from './controllers/config.schema';import { DocDrawingController, DOCS_DRAWING_PLUGIN } from './controllers/doc-drawing.controller';import { DocDrawingService, IDocDrawingService } from './services/doc-drawing.service';@@ -33,7 +33,8 @@ export class UniverDocsDrawingPlugin extends Plugin {super();// Manage the plugin configuration.- const { ...rest } = Tools.deepMerge(+ const { ...rest } = merge(+ {},defaultPluginConfig,this._config);diff --git a/packages/docs-hyper-link-ui/src/plugin.ts b/packages/docs-hyper-link-ui/src/plugin.tsindex b9ac0b2f58..524de28fff 100644--- a/packages/docs-hyper-link-ui/src/plugin.ts+++ b/packages/docs-hyper-link-ui/src/plugin.ts@@ -16,7 +16,7 @@import type { Dependency } from '@univerjs/core';import type { IUniverDocsHyperLinkUIConfig } from './controllers/config.schema';-import { DependentOn, IConfigService, Inject, Injector, Plugin, Tools, UniverInstanceType } from '@univerjs/core';+import { DependentOn, IConfigService, Inject, Injector, merge, Plugin, UniverInstanceType } from '@univerjs/core';import { UniverDocsHyperLinkPlugin } from '@univerjs/docs-hyper-link';import { IRenderManagerService } from '@univerjs/engine-render';import { defaultPluginConfig, DOCS_HYPER_LINK_UI_PLUGIN_CONFIG_KEY } from './controllers/config.schema';@@ -41,7 +41,8 @@ export class UniverDocsHyperLinkUIPlugin extends Plugin {super();// Manage the plugin configuration.- const { menu, ...rest } = Tools.deepMerge(+ const { menu, ...rest } = merge(+ {},defaultPluginConfig,this._config);diff --git a/packages/docs-hyper-link/src/plugin.ts b/packages/docs-hyper-link/src/plugin.tsindex 44720e8b6b..32530e91cd 100644--- a/packages/docs-hyper-link/src/plugin.ts+++ b/packages/docs-hyper-link/src/plugin.ts@@ -16,7 +16,7 @@import type { Dependency } from '@univerjs/core';import type { IUniverDocsHyperLinkConfig } from './controllers/config.schema';-import { ICommandService, IConfigService, Inject, Injector, Plugin, Tools, UniverInstanceType } from '@univerjs/core';+import { ICommandService, IConfigService, Inject, Injector, merge, Plugin, UniverInstanceType } from '@univerjs/core';import { AddHyperLinkMuatation, DeleteHyperLinkMuatation, UpdateHyperLinkMuatation } from './commands/mutations/hyper-link.mutation';import { defaultPluginConfig, DOCS_HYPER_LINK_PLUGIN_CONFIG_KEY } from './controllers/config.schema';import { DOC_HYPER_LINK_PLUGIN, DocHyperLinkResourceController } from './controllers/resource.controller';@@ -34,7 +34,8 @@ export class UniverDocsHyperLinkPlugin extends Plugin {super();// Manage the plugin configuration.- const { ...rest } = Tools.deepMerge(+ const { ...rest } = merge(+ {},defaultPluginConfig,this._config);diff --git a/packages/docs-mention-ui/src/plugin.ts b/packages/docs-mention-ui/src/plugin.tsindex ec83493ad4..93ace62b35 100644--- a/packages/docs-mention-ui/src/plugin.ts+++ b/packages/docs-mention-ui/src/plugin.ts@@ -16,7 +16,7 @@import type { Dependency } from '@univerjs/core';import type { IUniverDocsMentionUIConfig } from './controllers/config.schema';-import { IConfigService, Inject, Injector, Plugin, Tools, UniverInstanceType } from '@univerjs/core';+import { IConfigService, Inject, Injector, merge, Plugin, UniverInstanceType } from '@univerjs/core';import { defaultPluginConfig, DOCS_MENTION_UI_PLUGIN_CONFIG_KEY } from './controllers/config.schema';import { DocMentionTriggerController } from './controllers/doc-mention-trigger.controller';import { DocMentionUIController } from './controllers/doc-mention-ui.controller';@@ -36,7 +36,8 @@ export class UniverDocsMentionUIPlugin extends Plugin {super();// Manage the plugin configuration.- const { menu, ...rest } = Tools.deepMerge(+ const { menu, ...rest } = merge(+ {},defaultPluginConfig,this._config);diff --git a/packages/docs-thread-comment-ui/src/plugin.ts b/packages/docs-thread-comment-ui/src/plugin.tsindex ff98d2095a..b6e04bc531 100644--- a/packages/docs-thread-comment-ui/src/plugin.ts+++ b/packages/docs-thread-comment-ui/src/plugin.ts@@ -16,7 +16,7 @@import type { Dependency } from '@univerjs/core';import type { IUniverDocsThreadCommentUIConfig } from './controllers/config.schema';-import { DependentOn, IConfigService, Inject, Injector, Plugin, Tools, UniverInstanceType } from '@univerjs/core';+import { DependentOn, IConfigService, Inject, Injector, merge, Plugin, UniverInstanceType } from '@univerjs/core';import { IRenderManagerService } from '@univerjs/engine-render';import { UniverThreadCommentUIPlugin } from '@univerjs/thread-comment-ui';import { PLUGIN_NAME } from './common/const';@@ -40,7 +40,8 @@ export class UniverDocsThreadCommentUIPlugin extends Plugin {super();// Manage the plugin configuration.- const { menu, ...rest } = Tools.deepMerge(+ const { menu, ...rest } = merge(+ {},defaultPluginConfig,this._config);diff --git a/packages/docs-ui/src/docs-ui-plugin.ts b/packages/docs-ui/src/docs-ui-plugin.tsindex 15b2916bac..73baea2857 100644--- a/packages/docs-ui/src/docs-ui-plugin.ts+++ b/packages/docs-ui/src/docs-ui-plugin.ts@@ -23,8 +23,11 @@ import {Inject,Injector,IUniverInstanceService,+ merge,mergeOverrideWithDependencies,- Plugin, Tools, touchDependencies, UniverInstanceType,+ Plugin,+ touchDependencies,+ UniverInstanceType,} from '@univerjs/core';import { DocInterceptorService, DocSkeletonManagerService } from '@univerjs/docs';import { IRenderManagerService, UniverRenderEnginePlugin } from '@univerjs/engine-render';@@ -114,7 +117,8 @@ export class UniverDocsUIPlugin extends Plugin {super();// Manage the plugin configuration.- const { menu, ...rest } = Tools.deepMerge(+ const { menu, ...rest } = merge(+ {},defaultPluginConfig,this._config);diff --git a/packages/docs/src/doc-plugin.ts b/packages/docs/src/doc-plugin.tsindex e414edf92c..e837620466 100644--- a/packages/docs/src/doc-plugin.ts+++ b/packages/docs/src/doc-plugin.ts@@ -21,8 +21,8 @@ import {IConfigService,Inject,Injector,+ merge,Plugin,- Tools,} from '@univerjs/core';import { RichTextEditingMutation } from './commands/mutations/core-editing.mutation';import { DocsRenameMutation } from './commands/mutations/docs-rename.mutation';@@ -46,7 +46,8 @@ export class UniverDocsPlugin extends Plugin {super();// Manage the plugin configuration.- const { ...rest } = Tools.deepMerge(+ const { ...rest } = merge(+ {},defaultPluginConfig,this._config);diff --git a/packages/drawing-ui/src/plugin.ts b/packages/drawing-ui/src/plugin.tsindex c821eb93b6..098280efec 100644--- a/packages/drawing-ui/src/plugin.ts+++ b/packages/drawing-ui/src/plugin.ts@@ -16,7 +16,7 @@import type { Dependency } from '@univerjs/core';import type { IUniverDrawingUIConfig } from './controllers/config.schema';-import { IConfigService, Inject, Injector, Plugin, Tools } from '@univerjs/core';+import { IConfigService, Inject, Injector, merge, Plugin } from '@univerjs/core';import { defaultPluginConfig, DRAWING_UI_PLUGIN_CONFIG_KEY } from './controllers/config.schema';import { DrawingUIController } from './controllers/drawing-ui.controller';import { DrawingUpdateController } from './controllers/drawing-update.controller';@@ -37,7 +37,8 @@ export class UniverDrawingUIPlugin extends Plugin {super();// Manage the plugin configuration.- const { menu, ...rest } = Tools.deepMerge(+ const { menu, ...rest } = merge(+ {},defaultPluginConfig,this._config);diff --git a/packages/drawing/src/plugin.ts b/packages/drawing/src/plugin.tsindex 3bf5ba1675..531002a772 100644--- a/packages/drawing/src/plugin.ts+++ b/packages/drawing/src/plugin.ts@@ -17,7 +17,7 @@import type { Dependency } from '@univerjs/core';import type { IUniverDrawingConfig } from './controllers/config.schema';-import { IConfigService, Inject, Injector, mergeOverrideWithDependencies, Plugin, Tools } from '@univerjs/core';+import { IConfigService, Inject, Injector, merge, mergeOverrideWithDependencies, Plugin } from '@univerjs/core';import { defaultPluginConfig, DRAWING_PLUGIN_CONFIG_KEY } from './controllers/config.schema';import { DrawingManagerService } from './services/drawing-manager-impl.service';import { IDrawingManagerService } from './services/drawing-manager.service';@@ -37,7 +37,8 @@ export class UniverDrawingPlugin extends Plugin {super();// Manage the plugin configuration.- const { ...rest } = Tools.deepMerge(+ const { ...rest } = merge(+ {},defaultPluginConfig,this._config);diff --git a/packages/engine-formula/src/plugin.ts b/packages/engine-formula/src/plugin.tsindex a31c6af0e7..75444ef34a 100644--- a/packages/engine-formula/src/plugin.ts+++ b/packages/engine-formula/src/plugin.ts@@ -16,7 +16,7 @@import type { Dependency } from '@univerjs/core';import type { IUniverEngineFormulaConfig } from './controller/config.schema';-import { IConfigService, Inject, Injector, Plugin, Tools, touchDependencies } from '@univerjs/core';+import { IConfigService, Inject, Injector, merge, Plugin, touchDependencies } from '@univerjs/core';import { CalculateController } from './controller/calculate.controller';import { defaultPluginConfig, ENGINE_FORMULA_PLUGIN_CONFIG_KEY } from './controller/config.schema';import { FormulaController } from './controller/formula.controller';@@ -67,7 +67,8 @@ export class UniverFormulaEnginePlugin extends Plugin {super();// Manage the plugin configuration.- const { ...rest } = Tools.deepMerge(+ const { ...rest } = merge(+ {},defaultPluginConfig,this._config);diff --git a/packages/engine-render/src/plugin.ts b/packages/engine-render/src/plugin.tsindex 89195c4183..46e80e3ca9 100644--- a/packages/engine-render/src/plugin.ts+++ b/packages/engine-render/src/plugin.ts@@ -16,7 +16,7 @@import type { IUniverEngineRenderConfig } from './controllers/config.schema';-import { createIdentifier, IConfigService, Inject, Injector, Plugin, registerDependencies, Tools } from '@univerjs/core';+import { createIdentifier, IConfigService, Inject, Injector, merge, Plugin, registerDependencies } from '@univerjs/core';import { defaultPluginConfig, ENGINE_RENDER_PLUGIN_CONFIG_KEY } from './controllers/config.schema';import { Engine } from './engine';import { IRenderManagerService, RenderManagerService } from './render-manager/render-manager.service';@@ -39,7 +39,8 @@ export class UniverRenderEnginePlugin extends Plugin {super();// Manage the plugin configuration.- const { ...rest } = Tools.deepMerge(+ const { ...rest } = merge(+ {},defaultPluginConfig,this._config);diff --git a/packages/find-replace/src/plugin.ts b/packages/find-replace/src/plugin.tsindex 4b81349597..cb0c901988 100644--- a/packages/find-replace/src/plugin.ts+++ b/packages/find-replace/src/plugin.ts@@ -15,7 +15,7 @@*/import type { IUniverFindReplaceConfig } from './controllers/config.schema';-import { IConfigService, Plugin, Tools } from '@univerjs/core';+import { IConfigService, merge, Plugin } from '@univerjs/core';import { type Dependency, Inject, Injector } from '@univerjs/core';import { defaultPluginConfig, FIND_REPLACE_PLUGIN_CONFIG_KEY } from './controllers/config.schema';@@ -35,7 +35,8 @@ export class UniverFindReplacePlugin extends Plugin {super();// Manage the plugin configuration.- const { ...rest } = Tools.deepMerge(+ const { ...rest } = merge(+ {},defaultPluginConfig,this._config);diff --git a/packages/rpc/src/plugin.ts b/packages/rpc/src/plugin.tsindex 95894a7579..3737bef283 100644--- a/packages/rpc/src/plugin.ts+++ b/packages/rpc/src/plugin.ts@@ -19,7 +19,7 @@ import type {IUniverRPCMainThreadConfig,IUniverRPCWorkerThreadConfig,} from './controllers/config.schema';-import { IConfigService, Inject, Injector, Plugin, Tools } from '@univerjs/core';+import { IConfigService, Inject, Injector, merge, Plugin } from '@univerjs/core';import {defaultPluginMainThreadConfig,defaultPluginWorkerThreadConfig,@@ -56,7 +56,8 @@ export class UniverRPCMainThreadPlugin extends Plugin {super();// Manage the plugin configuration.- const { ...rest } = Tools.deepMerge(+ const { ...rest } = merge(+ {},defaultPluginMainThreadConfig,this._config);@@ -114,7 +115,8 @@ export class UniverRPCWorkerThreadPlugin extends Plugin {super();// Manage the plugin configuration.- const { ...rest } = Tools.deepMerge(+ const { ...rest } = merge(+ {},defaultPluginWorkerThreadConfig,this._config);diff --git a/packages/sheets-conditional-formatting-ui/src/mobile-plugin.ts b/packages/sheets-conditional-formatting-ui/src/mobile-plugin.tsindex c3a1211c9d..23035659c0 100644--- a/packages/sheets-conditional-formatting-ui/src/mobile-plugin.ts+++ b/packages/sheets-conditional-formatting-ui/src/mobile-plugin.ts@@ -21,8 +21,8 @@ import {IConfigService,Inject,Injector,+ merge,Plugin,- Tools,UniverInstanceType,} from '@univerjs/core';import { SHEET_CONDITIONAL_FORMATTING_PLUGIN, UniverSheetsConditionalFormattingPlugin } from '@univerjs/sheets-conditional-formatting';@@ -64,7 +64,8 @@ export class UniverSheetsConditionalFormattingMobileUIPlugin extends Plugin {super();// Manage the plugin configuration.- const { menu, ...rest } = Tools.deepMerge(+ const { menu, ...rest } = merge(+ {},defaultPluginConfig,this._config);diff --git a/packages/sheets-conditional-formatting-ui/src/plugin.ts b/packages/sheets-conditional-formatting-ui/src/plugin.tsindex d33d1d501a..371896b114 100644--- a/packages/sheets-conditional-formatting-ui/src/plugin.ts+++ b/packages/sheets-conditional-formatting-ui/src/plugin.ts@@ -21,9 +21,9 @@ import {IConfigService,Inject,Injector,+ merge,Plugin,registerDependencies,- Tools,touchDependencies,UniverInstanceType,} from '@univerjs/core';@@ -73,7 +73,8 @@ export class UniverSheetsConditionalFormattingUIPlugin extends Plugin {super();// Manage the plugin configuration.- const { menu, ...rest } = Tools.deepMerge(+ const { menu, ...rest } = merge(+ {},defaultPluginConfig,this._config);diff --git a/packages/sheets-conditional-formatting/src/plugin.ts b/packages/sheets-conditional-formatting/src/plugin.tsindex 1e55c3f4ef..1f85436790 100644--- a/packages/sheets-conditional-formatting/src/plugin.ts+++ b/packages/sheets-conditional-formatting/src/plugin.ts@@ -16,7 +16,7 @@import type { Dependency } from '@univerjs/core';import type { IUniverSheetsConditionalFormattingConfig } from './controllers/config.schema';-import { ICommandService, IConfigService, Inject, Injector, Plugin, Tools, touchDependencies, UniverInstanceType } from '@univerjs/core';+import { ICommandService, IConfigService, Inject, Injector, merge, Plugin, touchDependencies, UniverInstanceType } from '@univerjs/core';import { SHEET_CONDITIONAL_FORMATTING_PLUGIN } from './base/const';import { AddConditionalRuleMutation } from './commands/mutations/add-conditional-rule.mutation';import { DeleteConditionalRuleMutation } from './commands/mutations/delete-conditional-rule.mutation';@@ -45,7 +45,8 @@ export class UniverSheetsConditionalFormattingPlugin extends Plugin {super();// Manage the plugin configuration.- const { ...rest } = Tools.deepMerge(+ const { ...rest } = merge(+ {},defaultPluginConfig,this._config);diff --git a/packages/sheets-crosshair-highlight/src/plugin.ts b/packages/sheets-crosshair-highlight/src/plugin.tsindex 125e9bf71f..20b5e77c8b 100644--- a/packages/sheets-crosshair-highlight/src/plugin.ts+++ b/packages/sheets-crosshair-highlight/src/plugin.ts@@ -16,7 +16,7 @@import type { Dependency } from '@univerjs/core';import type { IUniverSheetsCrosshairHighlightConfig } from './controllers/config.schema';-import { IConfigService, Inject, Injector, Plugin, Tools, UniverInstanceType } from '@univerjs/core';+import { IConfigService, Inject, Injector, merge, Plugin, UniverInstanceType } from '@univerjs/core';import { IRenderManagerService } from '@univerjs/engine-render';import { defaultPluginConfig, SHEETS_CROSSHAIR_HIGHLIGHT_PLUGIN_CONFIG_KEY } from './controllers/config.schema';import { SheetsCrosshairHighlightController } from './controllers/crosshair.controller';@@ -36,7 +36,8 @@ export class UniverSheetsCrosshairHighlightPlugin extends Plugin {super();// Manage the plugin configuration.- const { ...rest } = Tools.deepMerge(+ const { ...rest } = merge(+ {},defaultPluginConfig,this._config);diff --git a/packages/sheets-data-validation-ui/src/mobile-plugin.ts b/packages/sheets-data-validation-ui/src/mobile-plugin.tsindex 221ccb86ab..96a34c5095 100644--- a/packages/sheets-data-validation-ui/src/mobile-plugin.ts+++ b/packages/sheets-data-validation-ui/src/mobile-plugin.ts@@ -16,7 +16,7 @@import type { Dependency, Workbook } from '@univerjs/core';import type { IUniverSheetsDataValidationUIConfig } from './controllers/config.schema';-import { ICommandService, IConfigService, Inject, Injector, Plugin, Tools, UniverInstanceType } from '@univerjs/core';+import { ICommandService, IConfigService, Inject, Injector, merge, Plugin, UniverInstanceType } from '@univerjs/core';import { IRenderManagerService } from '@univerjs/engine-render';import { AddSheetDataValidationAndOpenCommand } from './commands/commands/data-validation-ui.command';import {@@ -52,7 +52,8 @@ export class UniverSheetsDataValidationMobileUIPlugin extends Plugin {super();// Manage the plugin configuration.- const { menu, ...rest } = Tools.deepMerge(+ const { menu, ...rest } = merge(+ {},defaultPluginConfig,this._config);diff --git a/packages/sheets-data-validation-ui/src/plugin.ts b/packages/sheets-data-validation-ui/src/plugin.tsindex c946a6f5e9..7ac632013c 100644--- a/packages/sheets-data-validation-ui/src/plugin.ts+++ b/packages/sheets-data-validation-ui/src/plugin.ts@@ -16,7 +16,7 @@import type { Dependency, Workbook } from '@univerjs/core';import type { IUniverSheetsDataValidationUIConfig } from './controllers/config.schema';-import { ICommandService, IConfigService, Inject, Injector, Plugin, Tools, UniverInstanceType } from '@univerjs/core';+import { ICommandService, IConfigService, Inject, Injector, merge, Plugin, UniverInstanceType } from '@univerjs/core';import { IRenderManagerService } from '@univerjs/engine-render';import { AddSheetDataValidationAndOpenCommand } from './commands/commands/data-validation-ui.command';import {@@ -53,7 +53,8 @@ export class UniverSheetsDataValidationUIPlugin extends Plugin {super();// Manage the plugin configuration.- const { menu, ...rest } = Tools.deepMerge(+ const { menu, ...rest } = merge(+ {},defaultPluginConfig,this._config);diff --git a/packages/sheets-data-validation/src/plugin.ts b/packages/sheets-data-validation/src/plugin.tsindex 4fc57ebcb1..03bd8762c9 100644--- a/packages/sheets-data-validation/src/plugin.ts+++ b/packages/sheets-data-validation/src/plugin.ts@@ -19,8 +19,8 @@ import {DependentOn,ICommandService,IConfigService,+ merge,Plugin,- Tools,UniverInstanceType,} from '@univerjs/core';import { type Dependency, Inject, Injector } from '@univerjs/core';@@ -61,7 +61,8 @@ export class UniverSheetsDataValidationPlugin extends Plugin {super();// Manage the plugin configuration.- const { ...rest } = Tools.deepMerge(+ const { ...rest } = merge(+ {},defaultPluginConfig,this._config);diff --git a/packages/sheets-drawing-ui/src/plugin.ts b/packages/sheets-drawing-ui/src/plugin.tsindex 48550c84b4..6453b40481 100644--- a/packages/sheets-drawing-ui/src/plugin.ts+++ b/packages/sheets-drawing-ui/src/plugin.ts@@ -21,9 +21,9 @@ import {IConfigService,Inject,Injector,+ merge,Plugin,registerDependencies,- Tools,touchDependencies,UniverInstanceType,} from '@univerjs/core';@@ -62,7 +62,8 @@ export class UniverSheetsDrawingUIPlugin extends Plugin {super();// Manage the plugin configuration.- const { menu, ...rest } = Tools.deepMerge(+ const { menu, ...rest } = merge(+ {},defaultPluginConfig,this._config);diff --git a/packages/sheets-drawing/src/plugin.ts b/packages/sheets-drawing/src/plugin.tsindex 2443032433..3b7fc9aa34 100644--- a/packages/sheets-drawing/src/plugin.ts+++ b/packages/sheets-drawing/src/plugin.ts@@ -16,7 +16,7 @@import type { Dependency } from '@univerjs/core';import type { IUniverSheetsDrawingConfig } from './controllers/config.schema';-import { DependentOn, IConfigService, Inject, Injector, Plugin, Tools, UniverInstanceType } from '@univerjs/core';+import { DependentOn, IConfigService, Inject, Injector, merge, Plugin, UniverInstanceType } from '@univerjs/core';import { UniverDrawingPlugin } from '@univerjs/drawing';import { defaultPluginConfig, SHEETS_DRAWING_PLUGIN_CONFIG_KEY } from './controllers/config.schema';import { SHEET_DRAWING_PLUGIN, SheetsDrawingLoadController } from './controllers/sheet-drawing.controller';@@ -35,7 +35,8 @@ export class UniverSheetsDrawingPlugin extends Plugin {super();// Manage the plugin configuration.- const { ...rest } = Tools.deepMerge(+ const { ...rest } = merge(+ {},defaultPluginConfig,this._config);diff --git a/packages/sheets-filter-ui/src/filter-ui-desktop.plugin.ts b/packages/sheets-filter-ui/src/filter-ui-desktop.plugin.tsindex 30511efe0c..b1554f7369 100644--- a/packages/sheets-filter-ui/src/filter-ui-desktop.plugin.ts+++ b/packages/sheets-filter-ui/src/filter-ui-desktop.plugin.ts@@ -21,9 +21,9 @@ import {IConfigService,Inject,Injector,+ merge,Optional,Plugin,- Tools,UniverInstanceType,} from '@univerjs/core';import { IRPCChannelService, toModule } from '@univerjs/rpc';@@ -53,7 +53,8 @@ export class UniverSheetsFilterUIPlugin extends Plugin {super();// Manage the plugin configuration.- const { menu, ...rest } = Tools.deepMerge(+ const { menu, ...rest } = merge(+ {},defaultPluginConfig,this._config);diff --git a/packages/sheets-filter-ui/src/filter-ui-mobile.plugin.ts b/packages/sheets-filter-ui/src/filter-ui-mobile.plugin.tsindex 446fcde4d2..55df1e5487 100644--- a/packages/sheets-filter-ui/src/filter-ui-mobile.plugin.ts+++ b/packages/sheets-filter-ui/src/filter-ui-mobile.plugin.ts@@ -16,7 +16,7 @@import type { Dependency } from '@univerjs/core';import type { IUniverSheetsFilterUIConfig } from './controllers/config.schema';-import { DependentOn, IConfigService, Inject, Injector, Plugin, Tools, UniverInstanceType } from '@univerjs/core';+import { DependentOn, IConfigService, Inject, Injector, merge, Plugin, UniverInstanceType } from '@univerjs/core';import { UniverSheetsFilterPlugin } from '@univerjs/sheets-filter';import { defaultPluginConfig, SHEETS_FILTER_UI_PLUGIN_CONFIG_KEY } from './controllers/config.schema';@@ -38,7 +38,8 @@ export class UniverSheetsFilterMobileUIPlugin extends Plugin {super();// Manage the plugin configuration.- const { menu, ...rest } = Tools.deepMerge(+ const { menu, ...rest } = merge(+ {},defaultPluginConfig,this._config);diff --git a/packages/sheets-filter/src/plugin.ts b/packages/sheets-filter/src/plugin.tsindex fec3779ee2..125291ebf9 100644--- a/packages/sheets-filter/src/plugin.ts+++ b/packages/sheets-filter/src/plugin.ts@@ -17,7 +17,7 @@import type { Dependency } from '@univerjs/core';import type { IUniverSheetsFilterConfig } from './controllers/config.schema';-import { IConfigService, Inject, Injector, Plugin, Tools, UniverInstanceType } from '@univerjs/core';+import { IConfigService, Inject, Injector, merge, Plugin, UniverInstanceType } from '@univerjs/core';import { defaultPluginConfig, SHEETS_FILTER_PLUGIN_CONFIG_KEY } from './controllers/config.schema';import { SheetsFilterController } from './controllers/sheets-filter.controller';import { SHEET_FILTER_SNAPSHOT_ID, SheetsFilterService } from './services/sheet-filter.service';@@ -34,7 +34,8 @@ export class UniverSheetsFilterPlugin extends Plugin {super();// Manage the plugin configuration.- const { ...rest } = Tools.deepMerge(+ const { ...rest } = merge(+ {},defaultPluginConfig,this._config);diff --git a/packages/sheets-find-replace/src/plugin.ts b/packages/sheets-find-replace/src/plugin.tsindex c61ad8e38c..8abd5dbd09 100644--- a/packages/sheets-find-replace/src/plugin.ts+++ b/packages/sheets-find-replace/src/plugin.ts@@ -16,7 +16,7 @@import type { Dependency } from '@univerjs/core';import type { IUniverSheetsFindReplaceConfig } from './controllers/config.schema';-import { DependentOn, IConfigService, Inject, Injector, Plugin, Tools, UniverInstanceType } from '@univerjs/core';+import { DependentOn, IConfigService, Inject, Injector, merge, Plugin, UniverInstanceType } from '@univerjs/core';import { UniverFindReplacePlugin } from '@univerjs/find-replace';import { UniverSheetsPlugin } from '@univerjs/sheets';import { defaultPluginConfig, SHEETS_FIND_REPLACE_PLUGIN_CONFIG_KEY } from './controllers/config.schema';@@ -37,7 +37,8 @@ export class UniverSheetsFindReplacePlugin extends Plugin {super();// Manage the plugin configuration.- const { ...rest } = Tools.deepMerge(+ const { ...rest } = merge(+ {},defaultPluginConfig,this._config);diff --git a/packages/sheets-formula-ui/src/sheets-formula-ui.plugin.ts b/packages/sheets-formula-ui/src/sheets-formula-ui.plugin.tsindex 1f6ad8f6ce..9f75df91cf 100644--- a/packages/sheets-formula-ui/src/sheets-formula-ui.plugin.ts+++ b/packages/sheets-formula-ui/src/sheets-formula-ui.plugin.ts@@ -16,7 +16,7 @@import type { Dependency } from '@univerjs/core';import type { IUniverSheetsFormulaBaseConfig } from './controllers/config.schema';-import { DependentOn, IConfigService, Inject, Injector, Plugin, Tools, touchDependencies, UniverInstanceType } from '@univerjs/core';+import { DependentOn, IConfigService, Inject, Injector, merge, Plugin, touchDependencies, UniverInstanceType } from '@univerjs/core';import { UniverFormulaEnginePlugin } from '@univerjs/engine-formula';import { IRenderManagerService } from '@univerjs/engine-render';import { UniverSheetsFormulaPlugin } from '@univerjs/sheets-formula';@@ -56,7 +56,7 @@ export class UniverSheetsFormulaUIPlugin extends Plugin {super();// Manage the plugin configuration.- const { menu, ...rest } = Tools.deepMerge(+ const { menu, ...rest } = merge(defaultPluginBaseConfig,this._config);diff --git a/packages/sheets-formula/src/sheets-formula.plugin.ts b/packages/sheets-formula/src/sheets-formula.plugin.tsindex 35b6a83cf2..d3d42b74a7 100644--- a/packages/sheets-formula/src/sheets-formula.plugin.ts+++ b/packages/sheets-formula/src/sheets-formula.plugin.ts@@ -19,7 +19,7 @@ import type {IUniverSheetsFormulaBaseConfig,IUniverSheetsFormulaRemoteConfig,} from './controllers/config.schema';-import { DependentOn, IConfigService, Inject, Injector, isNodeEnv, Plugin, Tools, touchDependencies, UniverInstanceType } from '@univerjs/core';+import { DependentOn, IConfigService, Inject, Injector, isNodeEnv, merge, Plugin, touchDependencies, UniverInstanceType } from '@univerjs/core';import { UniverFormulaEnginePlugin } from '@univerjs/engine-formula';import { fromModule, IRPCChannelService, toModule } from '@univerjs/rpc';@@ -58,7 +58,8 @@ export class UniverRemoteSheetsFormulaPlugin extends Plugin {super();// Manage the plugin configuration.- const { ...rest } = Tools.deepMerge(+ const { ...rest } = merge(+ {},defaultPluginRemoteConfig,this._config);@@ -87,7 +88,8 @@ export class UniverSheetsFormulaPlugin extends Plugin {super();// Manage the plugin configuration.- const { ...rest } = Tools.deepMerge(+ const { ...rest } = merge(+ {},defaultPluginBaseConfig,this._config);diff --git a/packages/sheets-graphics/src/plugin.ts b/packages/sheets-graphics/src/plugin.tsindex a268996b9b..94e46b05ea 100644--- a/packages/sheets-graphics/src/plugin.ts+++ b/packages/sheets-graphics/src/plugin.ts@@ -17,7 +17,7 @@import type { Dependency } from '@univerjs/core';import type { IUniverSheetGraphicsConfig } from './controllers/config.schema';-import { IConfigService, Inject, Injector, Plugin, Tools, UniverInstanceType } from '@univerjs/core';+import { IConfigService, Inject, Injector, merge, Plugin, UniverInstanceType } from '@univerjs/core';import { IRenderManagerService } from '@univerjs/engine-render';import { defaultPluginConfig, PLUGIN_CONFIG_KEY } from './controllers/config.schema';import { SheetGraphicsRenderController } from './controllers/graphics-render.controller';@@ -35,7 +35,8 @@ export class UniverSheetGraphicsPlugin extends Plugin {) {super();- const { ...rest } = Tools.deepMerge(+ const { ...rest } = merge(+ {},defaultPluginConfig,this._config);diff --git a/packages/sheets-hyper-link-ui/src/plugin.ts b/packages/sheets-hyper-link-ui/src/plugin.tsindex 39a8aa12e3..5ca4e3b5b1 100644--- a/packages/sheets-hyper-link-ui/src/plugin.ts+++ b/packages/sheets-hyper-link-ui/src/plugin.ts@@ -16,7 +16,7 @@import type { Dependency, Workbook } from '@univerjs/core';import type { IUniverSheetsHyperLinkUIConfig } from './controllers/config.schema';-import { DependentOn, IConfigService, Inject, Injector, Plugin, Tools, UniverInstanceType } from '@univerjs/core';+import { DependentOn, IConfigService, Inject, Injector, merge, Plugin, UniverInstanceType } from '@univerjs/core';import { UniverDocsUIPlugin } from '@univerjs/docs-ui';import { IRenderManagerService } from '@univerjs/engine-render';import { UniverSheetsHyperLinkPlugin } from '@univerjs/sheets-hyper-link';@@ -46,7 +46,8 @@ export class UniverSheetsHyperLinkUIPlugin extends Plugin {super();// Manage the plugin configuration.- const { menu, ...rest } = Tools.deepMerge(+ const { menu, ...rest } = merge(+ {},defaultPluginConfig,this._config);diff --git a/packages/sheets-hyper-link/src/plugin.ts b/packages/sheets-hyper-link/src/plugin.tsindex 90c1cd0f14..164079663b 100644--- a/packages/sheets-hyper-link/src/plugin.ts+++ b/packages/sheets-hyper-link/src/plugin.ts@@ -15,7 +15,7 @@*/import type { IUniverSheetsHyperLinkConfig } from './controllers/config.schema';-import { DependentOn, IConfigService, Inject, Injector, Plugin, registerDependencies, Tools, touchDependencies, UniverInstanceType } from '@univerjs/core';+import { DependentOn, IConfigService, Inject, Injector, merge, Plugin, registerDependencies, touchDependencies, UniverInstanceType } from '@univerjs/core';import { UniverSheetsPlugin } from '@univerjs/sheets';import { defaultPluginConfig, SHEETS_HYPER_LINK_PLUGIN_CONFIG_KEY } from './controllers/config.schema';import { SheetsHyperLinkRefRangeController } from './controllers/ref-range.controller';@@ -41,7 +41,8 @@ export class UniverSheetsHyperLinkPlugin extends Plugin {super();// Manage the plugin configuration.- const { ...rest } = Tools.deepMerge(+ const { ...rest } = merge(+ {},defaultPluginConfig,this._config);diff --git a/packages/sheets-numfmt-ui/src/plugin.ts b/packages/sheets-numfmt-ui/src/plugin.tsindex 27b017d089..6eb523ba87 100644--- a/packages/sheets-numfmt-ui/src/plugin.ts+++ b/packages/sheets-numfmt-ui/src/plugin.ts@@ -15,7 +15,7 @@*/import type { IUniverSheetsNumfmtUIConfig } from './controllers/config.schema';-import { DependentOn, IConfigService, Inject, Injector, Plugin, registerDependencies, Tools, touchDependencies, UniverInstanceType } from '@univerjs/core';+import { DependentOn, IConfigService, Inject, Injector, merge, Plugin, registerDependencies, touchDependencies, UniverInstanceType } from '@univerjs/core';import { UniverSheetsNumfmtPlugin } from '@univerjs/sheets-numfmt';import { UniverSheetsUIPlugin } from '@univerjs/sheets-ui';import { UI_PLUGIN_CONFIG_KEY } from '@univerjs/ui';@@ -40,7 +40,8 @@ export class UniverSheetsNumfmtUIPlugin extends Plugin {super();// Manage the plugin configuration.- const { menu, ...rest } = Tools.deepMerge(+ const { menu, ...rest } = merge(+ {},defaultPluginConfig,this._config);diff --git a/packages/sheets-sort-ui/src/plugin.ts b/packages/sheets-sort-ui/src/plugin.tsindex 94164c6228..8fa23e8dae 100644--- a/packages/sheets-sort-ui/src/plugin.ts+++ b/packages/sheets-sort-ui/src/plugin.ts@@ -21,8 +21,8 @@ import {IConfigService,Inject,Injector,+ merge,Plugin,- Tools,UniverInstanceType,} from '@univerjs/core';import { UniverSheetsSortPlugin } from '@univerjs/sheets-sort';@@ -45,7 +45,8 @@ export class UniverSheetsSortUIPlugin extends Plugin {super();// Manage the plugin configuration.- const { ...rest } = Tools.deepMerge(+ const { ...rest } = merge(+ {},defaultPluginConfig,this._config);diff --git a/packages/sheets-sort/src/plugin.ts b/packages/sheets-sort/src/plugin.tsindex c9c010104a..7c35a58f15 100644--- a/packages/sheets-sort/src/plugin.ts+++ b/packages/sheets-sort/src/plugin.ts@@ -17,7 +17,7 @@import type { Dependency } from '@univerjs/core';import type { IUniverSheetsSortConfig } from './controllers/config.schema';-import { IConfigService, Inject, Injector, Plugin, Tools, UniverInstanceType } from '@univerjs/core';+import { IConfigService, Inject, Injector, merge, Plugin, UniverInstanceType } from '@univerjs/core';import { defaultPluginConfig, SHEETS_SORT_PLUGIN_CONFIG_KEY } from './controllers/config.schema';import { SheetsSortController } from './controllers/sheets-sort.controller';import { SheetsSortService } from './services/sheets-sort.service';@@ -36,7 +36,8 @@ export class UniverSheetsSortPlugin extends Plugin {super();// Manage the plugin configuration.- const { ...rest } = Tools.deepMerge(+ const { ...rest } = merge(+ {},defaultPluginConfig,this._config);diff --git a/packages/sheets-thread-comment-ui/src/plugin.ts b/packages/sheets-thread-comment-ui/src/plugin.tsindex 85d6a007ef..b89207d514 100644--- a/packages/sheets-thread-comment-ui/src/plugin.ts+++ b/packages/sheets-thread-comment-ui/src/plugin.ts@@ -16,7 +16,7 @@import type { Dependency } from '@univerjs/core';import type { IUniverSheetsThreadCommentUIConfig } from './controllers/config.schema';-import { DependentOn, ICommandService, IConfigService, Inject, Injector, Plugin, Tools, UniverInstanceType } from '@univerjs/core';+import { DependentOn, ICommandService, IConfigService, Inject, Injector, merge, Plugin, UniverInstanceType } from '@univerjs/core';import { UniverSheetsThreadCommentPlugin } from '@univerjs/sheets-thread-comment';import { UniverThreadCommentUIPlugin } from '@univerjs/thread-comment-ui';import { ShowAddSheetCommentModalOperation } from './commands/operations/comment.operation';@@ -44,7 +44,8 @@ export class UniverSheetsThreadCommentUIPlugin extends Plugin {super();// Manage the plugin configuration.- const { menu, ...rest } = Tools.deepMerge(+ const { menu, ...rest } = merge(+ {},defaultPluginConfig,this._config);diff --git a/packages/sheets-ui/src/plugin.ts b/packages/sheets-ui/src/plugin.tsindex 2f83179ba2..fd0bf34b62 100644--- a/packages/sheets-ui/src/plugin.ts+++ b/packages/sheets-ui/src/plugin.ts@@ -17,7 +17,7 @@import type { Dependency, Workbook } from '@univerjs/core';import type { IUniverUIConfig } from '@univerjs/ui';import type { IUniverSheetsUIConfig } from './controllers/config.schema';-import { DependentOn, IConfigService, Inject, Injector, IUniverInstanceService, mergeOverrideWithDependencies, Plugin, registerDependencies, Tools, touchDependencies, UniverInstanceType } from '@univerjs/core';+import { DependentOn, IConfigService, Inject, Injector, IUniverInstanceService, merge, mergeOverrideWithDependencies, Plugin, registerDependencies, touchDependencies, UniverInstanceType } from '@univerjs/core';import { IRenderManagerService } from '@univerjs/engine-render';import { IRefSelectionsService, RefSelectionsService, UniverSheetsPlugin } from '@univerjs/sheets';import { UI_PLUGIN_CONFIG_KEY } from '@univerjs/ui';@@ -106,7 +106,8 @@ export class UniverSheetsUIPlugin extends Plugin {super();// Manage the plugin configuration.- const { menu, ...rest } = Tools.deepMerge(+ const { menu, ...rest } = merge(+ {},defaultPluginConfig,this._config);diff --git a/packages/sheets-zen-editor/src/plugin.ts b/packages/sheets-zen-editor/src/plugin.tsindex 55a96e0bea..dd90c8e0ce 100644--- a/packages/sheets-zen-editor/src/plugin.ts+++ b/packages/sheets-zen-editor/src/plugin.ts@@ -17,7 +17,7 @@import type { Dependency } from '@univerjs/core';import type { IUniverSheetsZenEditorConfig } from './controllers/config.schema';-import { IConfigService, Inject, Injector, Plugin, Tools, UniverInstanceType } from '@univerjs/core';+import { IConfigService, Inject, Injector, merge, Plugin, UniverInstanceType } from '@univerjs/core';import { defaultPluginConfig, SHEETS_ZEN_EDITOR_PLUGIN_CONFIG_KEY } from './controllers/config.schema';import { ZenEditorUIController } from './controllers/zen-editor-ui.controller';import { ZenEditorController } from './controllers/zen-editor.controller';@@ -35,7 +35,8 @@ export class UniverSheetsZenEditorPlugin extends Plugin {super();// Manage the plugin configuration.- const { menu, ...rest } = Tools.deepMerge(+ const { menu, ...rest } = merge(+ {},defaultPluginConfig,this._config);diff --git a/packages/sheets/src/sheets-plugin.ts b/packages/sheets/src/sheets-plugin.tsindex 51239fdb9f..d7485a65c4 100644--- a/packages/sheets/src/sheets-plugin.ts+++ b/packages/sheets/src/sheets-plugin.ts@@ -16,7 +16,7 @@import type { Dependency } from '@univerjs/core';import type { IUniverSheetsConfig } from './controllers/config.schema';-import { DependentOn, IConfigService, Inject, Injector, IS_ROW_STYLE_PRECEDE_COLUMN_STYLE, mergeOverrideWithDependencies, Plugin, registerDependencies, Tools, touchDependencies, UniverInstanceType } from '@univerjs/core';+import { DependentOn, IConfigService, Inject, Injector, IS_ROW_STYLE_PRECEDE_COLUMN_STYLE, merge, mergeOverrideWithDependencies, Plugin, registerDependencies, touchDependencies, UniverInstanceType } from '@univerjs/core';import { UniverFormulaEnginePlugin } from '@univerjs/engine-formula';import { BasicWorksheetController } from './controllers/basic-worksheet.controller';import { CalculateResultApplyController } from './controllers/calculate-result-apply.controller';@@ -56,7 +56,8 @@ export class UniverSheetsPlugin extends Plugin {super();// Manage the plugin configuration.- const { ...rest } = Tools.deepMerge(+ const { ...rest } = merge(+ {},defaultPluginConfig,this._config);diff --git a/packages/slides-ui/src/slides-ui-plugin.ts b/packages/slides-ui/src/slides-ui-plugin.tsindex efe2b98e11..a4b50fa6f6 100644--- a/packages/slides-ui/src/slides-ui-plugin.ts+++ b/packages/slides-ui/src/slides-ui-plugin.ts@@ -16,7 +16,7 @@import type { Dependency, SlideDataModel } from '@univerjs/core';import type { IUniverSlidesUIConfig } from './controllers/config.schema';-import { IConfigService, Inject, Injector, IUniverInstanceService, mergeOverrideWithDependencies, Plugin, Tools, UniverInstanceType } from '@univerjs/core';+import { IConfigService, Inject, Injector, IUniverInstanceService, merge, mergeOverrideWithDependencies, Plugin, UniverInstanceType } from '@univerjs/core';import { IRenderManagerService } from '@univerjs/engine-render';import { CanvasView } from './controllers/canvas-view';import { defaultPluginConfig, SLIDES_UI_PLUGIN_CONFIG_KEY } from './controllers/config.schema';@@ -46,7 +46,8 @@ export class UniverSlidesUIPlugin extends Plugin {super();// Manage the plugin configuration.- const { menu, ...rest } = Tools.deepMerge(+ const { menu, ...rest } = merge(+ {},defaultPluginConfig,this._config);diff --git a/packages/slides/src/slides-plugin.ts b/packages/slides/src/slides-plugin.tsindex f871ca6cc5..19b2aed87f 100644--- a/packages/slides/src/slides-plugin.ts+++ b/packages/slides/src/slides-plugin.ts@@ -16,7 +16,7 @@import type { Dependency } from '@univerjs/core';import type { Engine } from '@univerjs/engine-render';-import { IConfigService, Inject, Injector, Plugin, Tools, UniverInstanceType } from '@univerjs/core';+import { IConfigService, Inject, Injector, merge, Plugin, UniverInstanceType } from '@univerjs/core';import { IRenderingEngine, IRenderManagerService } from '@univerjs/engine-render';import { defaultPluginConfig, SLIDES_PLUGIN_CONFIG_KEY } from './controllers/config.schema';// import { DocSelectionManagerService } from '@univerjs/docs';@@ -45,7 +45,8 @@ export class UniverSlidesPlugin extends Plugin {super();// Manage the plugin configuration.- const { ...rest } = Tools.deepMerge(+ const { ...rest } = merge(+ {},defaultPluginConfig,this._config);diff --git a/packages/thread-comment-ui/src/plugin.ts b/packages/thread-comment-ui/src/plugin.tsindex f446890c5f..26c89d864e 100644--- a/packages/thread-comment-ui/src/plugin.ts+++ b/packages/thread-comment-ui/src/plugin.ts@@ -16,7 +16,7 @@import type { Dependency } from '@univerjs/core';import type { IUniverThreadCommentUIConfig } from './controllers/config.schema';-import { DependentOn, ICommandService, IConfigService, Inject, Injector, mergeOverrideWithDependencies, Plugin, Tools, UniverInstanceType } from '@univerjs/core';+import { DependentOn, ICommandService, IConfigService, Inject, Injector, merge, mergeOverrideWithDependencies, Plugin, UniverInstanceType } from '@univerjs/core';import { UniverThreadCommentPlugin } from '@univerjs/thread-comment';import { SetActiveCommentOperation, ToggleSheetCommentPanelOperation } from './commands/operations/comment.operations';import { defaultPluginConfig, THREAD_COMMENT_UI_PLUGIN_CONFIG_KEY } from './controllers/config.schema';@@ -37,7 +37,8 @@ export class UniverThreadCommentUIPlugin extends Plugin {super();// Manage the plugin configuration.- const { menu, ...rest } = Tools.deepMerge(+ const { menu, ...rest } = merge(+ {},defaultPluginConfig,this._config);diff --git a/packages/thread-comment/src/plugin.ts b/packages/thread-comment/src/plugin.tsindex 52507e4325..e19ca825a3 100644--- a/packages/thread-comment/src/plugin.ts+++ b/packages/thread-comment/src/plugin.ts@@ -16,7 +16,7 @@import type { Dependency } from '@univerjs/core';import type { IUniverThreadCommentConfig } from './controllers/config.schema';-import { ICommandService, IConfigService, Inject, Injector, mergeOverrideWithDependencies, Plugin, Tools, UniverInstanceType } from '@univerjs/core';+import { ICommandService, IConfigService, Inject, Injector, merge, mergeOverrideWithDependencies, Plugin, UniverInstanceType } from '@univerjs/core';import { AddCommentCommand, DeleteCommentCommand, DeleteCommentTreeCommand, ResolveCommentCommand, UpdateCommentCommand } from './commands/commands/comment.command';import { AddCommentMutation, DeleteCommentMutation, ResolveCommentMutation, UpdateCommentMutation, UpdateCommentRefMutation } from './commands/mutations/comment.mutation';import { defaultPluginConfig, THREAD_COMMENT_PLUGIN_CONFIG_KEY } from './controllers/config.schema';@@ -38,7 +38,8 @@ export class UniverThreadCommentPlugin extends Plugin {super();// Manage the plugin configuration.- const { ...rest } = Tools.deepMerge(+ const { ...rest } = merge(+ {},defaultPluginConfig,this._config);diff --git a/packages/ui/src/services/menu/menu-manager.service.ts b/packages/ui/src/services/menu/menu-manager.service.tsindex 950eb0536a..1f4c59235a 100644--- a/packages/ui/src/services/menu/menu-manager.service.ts+++ b/packages/ui/src/services/menu/menu-manager.service.ts@@ -17,7 +17,7 @@import type { IAccessor, Nullable } from '@univerjs/core';import type { Observable } from 'rxjs';import type { IMenuItem } from '../menu/menu';-import { createIdentifier, Disposable, IConfigService, Inject, Injector, Tools } from '@univerjs/core';+import { createIdentifier, Disposable, IConfigService, Inject, Injector, merge } from '@univerjs/core';import { Subject } from 'rxjs';import { mergeMenuConfigs } from '../../common/menu-merge-configs';import { ContextMenuGroup, ContextMenuPosition, MenuManagerPosition, RibbonDataGroup, RibbonFormulasGroup, RibbonInsertGroup, RibbonOthersGroup, RibbonPosition, RibbonStartGroup, RibbonViewGroup } from './types';@@ -200,7 +200,7 @@ export class MenuManagerService extends Disposable implements IMenuManagerServicfor (const [key, value] of Object.entries(_target)) {if (key in source) {const _key = key as keyof MenuSchemaType;- Tools.deepMerge(_target[_key], source[_key]);+ merge(_target[_key], source[_key]);this.menuChanged$.next();} else {@@ -210,7 +210,7 @@ export class MenuManagerService extends Disposable implements IMenuManagerServic}appendRootMenu(source: MenuSchemaType): void {- Tools.deepMerge(this._menu, source);+ merge(this._menu, source);this.menuChanged$.next();}diff --git a/packages/ui/src/ui-plugin.ts b/packages/ui/src/ui-plugin.tsindex 0e3dcd875d..d4ae116034 100644--- a/packages/ui/src/ui-plugin.ts+++ b/packages/ui/src/ui-plugin.ts@@ -16,7 +16,7 @@import type { Dependency } from '@univerjs/core';import type { IUniverUIConfig } from './controllers/config.schema';-import { DependentOn, IConfigService, IContextService, ILocalStorageService, Inject, Injector, mergeOverrideWithDependencies, Plugin, Tools } from '@univerjs/core';+import { DependentOn, IConfigService, IContextService, ILocalStorageService, Inject, Injector, merge, mergeOverrideWithDependencies, Plugin } from '@univerjs/core';import { UniverRenderEnginePlugin } from '@univerjs/engine-render';import { ComponentManager } from './common/component-manager';@@ -76,7 +76,8 @@ export class UniverUIPlugin extends Plugin {super();// Manage the plugin configuration.- const { menu, ...rest } = Tools.deepMerge(+ const { menu, ...rest } = merge(+ {},defaultPluginConfig,this._config);diff --git a/packages/uniscript/src/plugin.ts b/packages/uniscript/src/plugin.tsindex c201ded915..072558d759 100644--- a/packages/uniscript/src/plugin.ts+++ b/packages/uniscript/src/plugin.ts@@ -16,7 +16,7 @@import type { Dependency } from '@univerjs/core';import type { IUniverUniscriptConfig } from './controllers/config.schema';-import { IConfigService, Inject, Injector, Plugin, Tools } from '@univerjs/core';+import { IConfigService, Inject, Injector, merge, Plugin } from '@univerjs/core';import { defaultPluginConfig, UNISCRIPT_PLUGIN_CONFIG_KEY } from './controllers/config.schema';import { UniscriptController } from './controllers/uniscript.controller';import { ScriptEditorService } from './services/script-editor.service';@@ -36,7 +36,8 @@ export class UniverUniscriptPlugin extends Plugin {super();// Manage the plugin configuration.- const { menu, ...rest } = Tools.deepMerge(+ const { menu, ...rest } = merge(+ {},defaultPluginConfig,this._config);diff --git a/packages/watermark/src/plugin.ts b/packages/watermark/src/plugin.tsindex 7529cbd290..d46d60c6bf 100644--- a/packages/watermark/src/plugin.ts+++ b/packages/watermark/src/plugin.ts@@ -17,7 +17,7 @@import type { Dependency } from '@univerjs/core';import type { IWatermarkConfigWithType } from './common/type';import type { IUniverWatermarkConfig } from './controllers/config.schema';-import { IConfigService, ILocalStorageService, Inject, Injector, Plugin, Tools, UniverInstanceType } from '@univerjs/core';+import { IConfigService, ILocalStorageService, Inject, Injector, merge, Plugin, UniverInstanceType } from '@univerjs/core';import { IRenderManagerService } from '@univerjs/engine-render';import { UNIVER_WATERMARK_STORAGE_KEY, WatermarkImageBaseConfig, WatermarkTextBaseConfig, WatermarkUserInfoBaseConfig } from './common/const';import { IWatermarkTypeEnum } from './common/type';@@ -40,7 +40,8 @@ export class UniverWatermarkPlugin extends Plugin {super();// Manage the plugin configuration.- const { ...rest } = Tools.deepMerge(+ const { ...rest } = merge(+ {},defaultPluginConfig,this._config);