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
feat(action-recorder): add experimental action recorder plugin (#3386)
Wenzhao Hu83238fa2be57
diff --git a/e2e/memory/memory.spec.ts b/e2e/memory/memory.spec.tsindex 601198912b..6c483da578 100644--- a/e2e/memory/memory.spec.ts+++ b/e2e/memory/memory.spec.ts@@ -16,10 +16,10 @@/* eslint-disable no-console */-import type { Page } from '@playwright/test';import { expect, test } from '@playwright/test';+import type { Page } from '@playwright/test';-const MAX_MEMORY_OVERFLOW = 2_500_000;+const MAX_MEMORY_OVERFLOW = 5_000_000; // 5MBtest('memory', async ({ page }) => {await page.goto('http://localhost:3000/sheets/');@@ -48,10 +48,10 @@ interface IMetrics {/*** Return a performance metric from the chrome cdp session.- * Note: Chrome-only+ * Chrome only.* @param {Page} page page to attach cdpClient* @return {IMetrics}- * @see {@link https://github.com/microsoft/playwright/issues/18071 Github RFE}+ * @see {@link https://github.com/microsoft/playwright/issues/18071}*/async function getMetrics(page: Page): Promise<IMetrics> {const client = await page.context().newCDPSession(page);diff --git a/examples/package.json b/examples/package.jsonindex 1f2950cd96..e66b998e1d 100644--- a/examples/package.json+++ b/examples/package.json@@ -12,6 +12,7 @@"lint:types": "node ./scripts/generate-locales.mjs && tsc --noEmit"},"dependencies": {+ "@univerjs/action-recorder": "workspace:*","@univerjs/core": "workspace:*","@univerjs/data-validation": "workspace:*","@univerjs/debugger": "workspace:*",diff --git a/examples/src/docs/main.ts b/examples/src/docs/main.tsindex c74a5dea60..8af49a5988 100644--- a/examples/src/docs/main.ts+++ b/examples/src/docs/main.ts@@ -15,26 +15,27 @@*//* eslint-disable node/prefer-global/process */+/* eslint-disable no-console */+import { LocaleType, LogLevel, Univer, UniverInstanceType, UserManagerService } from '@univerjs/core';+import { UniverDebuggerPlugin } from '@univerjs/debugger';import { defaultTheme } from '@univerjs/design';import { UniverDocsPlugin } from '@univerjs/docs';-import { UniverDocsUIPlugin } from '@univerjs/docs-ui';-import { UniverRenderEnginePlugin } from '@univerjs/engine-render';-import { UniverUIPlugin } from '@univerjs/ui';-import { UniverFormulaEnginePlugin } from '@univerjs/engine-formula';-import { UniverDebuggerPlugin } from '@univerjs/debugger';import { UniverDocsDrawingUIPlugin } from '@univerjs/docs-drawing-ui';-import { UniverDocsThreadCommentUIPlugin } from '@univerjs/docs-thread-comment-ui';import { UniverDocsHyperLinkUIPlugin } from '@univerjs/docs-hyper-link-ui';import { UniverDocsMentionUIPlugin } from '@univerjs/docs-mention-ui';+import { UniverDocsThreadCommentUIPlugin } from '@univerjs/docs-thread-comment-ui';+import { UniverDocsUIPlugin } from '@univerjs/docs-ui';+import { UniverFormulaEnginePlugin } from '@univerjs/engine-formula';+import { UniverRenderEnginePlugin } from '@univerjs/engine-render';import { FUniver } from '@univerjs/facade';+import { UniverUIPlugin } from '@univerjs/ui';import { DEFAULT_DOCUMENT_DATA_CN } from '../data';import { enUS, ruRU, zhCN } from '../locales';const IS_E2E: boolean = !!process.env.IS_E2E;// package info-// eslint-disable-next-line no-consoleconsole.table({NODE_ENV: process.env.NODE_ENV,GIT_COMMIT_HASH: process.env.GIT_COMMIT_HASH,diff --git a/examples/src/sheets/lazy.ts b/examples/src/sheets/lazy.tsindex 82c664d759..1a736aa1c5 100644--- a/examples/src/sheets/lazy.ts+++ b/examples/src/sheets/lazy.ts@@ -19,6 +19,7 @@ import { UniverSheetsFilterUIPlugin } from '@univerjs/sheets-filter-ui';import { UniverSheetsFindReplacePlugin } from '@univerjs/sheets-find-replace';import { UniverSheetsCrosshairHighlightPlugin } from '@univerjs/sheets-crosshair-highlight';import { UniverUniscriptPlugin } from '@univerjs/uniscript';+import { UniverActionRecorderPlugin } from '@univerjs/action-recorder';export default function getLazyPlugins(): Array<[PluginCtor<Plugin>] | [PluginCtor<Plugin>, unknown]> {return [@@ -39,6 +40,7 @@ export default function getLazyPlugins(): Array<[PluginCtor<Plugin>] | [PluginCtreturn '/vs/editor/editor.worker.js';},}],+ [UniverActionRecorderPlugin],[UniverSheetsCrosshairHighlightPlugin],[UniverSheetsFilterUIPlugin, { useRemoteFilterValuesGenerator: false }],[UniverSheetsFindReplacePlugin],diff --git a/examples/src/sheets/main.ts b/examples/src/sheets/main.tsindex 33780f313f..64b2d9d8cc 100644--- a/examples/src/sheets/main.ts+++ b/examples/src/sheets/main.ts@@ -41,6 +41,7 @@ import { FUniver } from '@univerjs/facade';import { UniverSheetsZenEditorPlugin } from '@univerjs/sheets-zen-editor';import { UniverSheetsSortUIPlugin } from '@univerjs/sheets-sort-ui';import { UniverSheetsDrawingUIPlugin } from '@univerjs/sheets-drawing-ui';+import { UniverSheetsFilterPlugin } from '@univerjs/sheets-filter';import { enUS, ruRU, viVN, zhCN, zhTW } from '../locales';import { DEFAULT_WORKBOOK_DATA_DEMO } from '../data/sheets/demo/default-workbook-data-demo';@@ -79,6 +80,8 @@ univer.registerPlugin(UniverSheetsNumfmtPlugin);univer.registerPlugin(UniverSheetsZenEditorPlugin);univer.registerPlugin(UniverFormulaEnginePlugin, { notExecuteFormula: true });univer.registerPlugin(UniverSheetsFormulaPlugin, { notExecuteFormula: true });+// filter plugin+univer.registerPlugin(UniverSheetsFilterPlugin);// hyperlinkuniver.registerPlugin(UniverSheetsHyperLinkUIPlugin);// data validationdiff --git a/packages-experimental/action-recorder/README.md b/packages-experimental/action-recorder/README.mdnew file mode 100644index 0000000000..5460d9ec4c--- /dev/null+++ b/packages-experimental/action-recorder/README.md@@ -0,0 +1,16 @@+# @univerjs/action-recorder++[](https://npmjs.org/packages/@univerjs/action-recorder)+[](https://img.shields.io/npm/l/@univerjs/action-recorder)++## Introduction++This plugin is used to record user actions and it can also replay them.++## Usage++### Installation++```shell+npm i @univerjs/action-recorder+```diff --git a/packages-experimental/action-recorder/package.json b/packages-experimental/action-recorder/package.jsonnew file mode 100644index 0000000000..9c244f681f--- /dev/null+++ b/packages-experimental/action-recorder/package.json@@ -0,0 +1,108 @@+{+ "name": "@univerjs/action-recorder",+ "version": "0.0.1",+ "private": true,+ "description": "",+ "author": "DreamNum <[email protected]>",+ "license": "Apache-2.0",+ "funding": {+ "type": "opencollective",+ "url": "https://opencollective.com/univer"+ },+ "homepage": "https://univer.ai",+ "repository": {+ "type": "git",+ "url": "https://github.com/dream-num/univer"+ },+ "bugs": {+ "url": "https://github.com/dream-num/univer/issues"+ },+ "keywords": [],+ "sideEffects": [+ "**/*.css"+ ],+ "exports": {+ ".": "./src/index.ts",+ "./*": "./src/*",+ "./locale/*": "./src/locale/*.ts"+ },+ "main": "./lib/cjs/index.js",+ "module": "./lib/es/index.js",+ "types": "./lib/types/index.d.ts",+ "publishConfig": {+ "access": "public",+ "main": "./lib/cjs/index.js",+ "module": "./lib/es/index.js",+ "exports": {+ ".": {+ "import": "./lib/es/index.js",+ "require": "./lib/cjs/index.js",+ "types": "./lib/types/index.d.ts"+ },+ "./*": {+ "import": "./lib/es/*",+ "require": "./lib/cjs/*",+ "types": "./lib/types/index.d.ts"+ },+ "./lib/*": "./lib/*",+ "./locale/*": "./lib/locale/*.json"+ }+ },+ "directories": {+ "lib": "lib"+ },+ "files": [+ "lib"+ ],+ "scripts": {+ "test": "vitest run",+ "test:watch": "vitest",+ "coverage": "vitest run --coverage",+ "lint:types": "tsc --noEmit",+ "build": "tsc && vite build"+ },+ "peerDependencies": {+ "@univerjs/core": "workspace:*",+ "@univerjs/design": "workspace:*",+ "@univerjs/sheets": "workspace:*",+ "@univerjs/sheets-filter-ui": "workspace:*",+ "@univerjs/sheets-ui": "workspace:*",+ "@univerjs/ui": "workspace:*",+ "clsx": ">=2.0.0",+ "react": ">=16.9.0",+ "rxjs": ">=7.0.0"+ },+ "dependencies": {+ "@univerjs/core": "workspace:*",+ "@univerjs/design": "workspace:*",+ "@univerjs/icons": "^0.1.78",+ "@univerjs/sheets": "workspace:*",+ "@univerjs/sheets-filter-ui": "workspace:*",+ "@univerjs/sheets-ui": "workspace:*",+ "@univerjs/ui": "workspace:*",+ "clsx": "^2.1.1"+ },+ "devDependencies": {+ "@univerjs-infra/shared": "workspace:*",+ "less": "^4.2.0",+ "react": "18.3.1",+ "rxjs": "^7.8.1",+ "typescript": "^5.6.2",+ "vite": "^5.4.3",+ "vitest": "^2.0.5"+ },+ "univerSpace": {+ ".": {+ "import": "./lib/es/index.js",+ "require": "./lib/cjs/index.js",+ "types": "./lib/types/index.d.ts"+ },+ "./*": {+ "import": "./lib/es/*",+ "require": "./lib/cjs/*",+ "types": "./lib/types/index.d.ts"+ },+ "./lib/*": "./lib/*",+ "./locale/*": "./lib/locale/*.json"+ }+}diff --git a/packages-experimental/action-recorder/src/commands/commands/record.command.ts b/packages-experimental/action-recorder/src/commands/commands/record.command.tsnew file mode 100644index 0000000000..375d36dd4f--- /dev/null+++ b/packages-experimental/action-recorder/src/commands/commands/record.command.ts@@ -0,0 +1,48 @@+/**+ * Copyright 2023-present DreamNum Inc.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++import { CommandType, type ICommand } from '@univerjs/core';+import { ActionRecorderService } from '../../services/action-recorder.service';++export const StartRecordingActionCommand: ICommand = {+ id: 'action-recorder.command.start-recording',+ type: CommandType.COMMAND,+ handler: (accessor) => {+ const actionRecorderService = accessor.get(ActionRecorderService);+ actionRecorderService.startRecording();+ return true;+ },+};++export const CompleteRecordingActionCommand: ICommand = {+ id: 'action-recorder.command.complete-recording',+ type: CommandType.COMMAND,+ handler: (accessor) => {+ const actionRecorderService = accessor.get(ActionRecorderService);+ actionRecorderService.completeRecording();+ return true;+ },+};++export const StopRecordingActionCommand: ICommand = {+ id: 'action-recorder.command.stop-recording',+ type: CommandType.COMMAND,+ handler: (accessor) => {+ const actionRecorderService = accessor.get(ActionRecorderService);+ actionRecorderService.completeRecording();+ return true;+ },+};diff --git a/packages-experimental/action-recorder/src/commands/commands/replay.command.ts b/packages-experimental/action-recorder/src/commands/commands/replay.command.tsnew file mode 100644index 0000000000..61f9697d77--- /dev/null+++ b/packages-experimental/action-recorder/src/commands/commands/replay.command.ts@@ -0,0 +1,40 @@+/**+ * Copyright 2023-present DreamNum Inc.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++import { CommandType, type ICommand } from '@univerjs/core';+import { IMessageService } from '@univerjs/ui';+import { MessageType } from '@univerjs/design';+import { ActionReplayService } from '../../services/replay.service';++export const ReplayLocalRecordCommand: ICommand = {+ id: 'action-recorder.command.replay-local-records',+ type: CommandType.COMMAND,+ handler: async (accessor) => {+ const replayService = accessor.get(ActionReplayService);+ const result = await replayService.replayLocalJSON();++ if (result) {+ const messageService = accessor.get(IMessageService);+ messageService.show({+ type: MessageType.Success,+ content: 'Successfully replayed local records',+ });+ }++ return result;+ },+};+diff --git a/packages-experimental/action-recorder/src/commands/operations/operation.ts b/packages-experimental/action-recorder/src/commands/operations/operation.tsnew file mode 100644index 0000000000..e518574ff5--- /dev/null+++ b/packages-experimental/action-recorder/src/commands/operations/operation.ts@@ -0,0 +1,39 @@+/**+ * Copyright 2023-present DreamNum Inc.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++import type { IOperation } from '@univerjs/core';+import { CommandType } from '@univerjs/core';+import { ActionRecorderService } from '../../services/action-recorder.service';++export const OpenRecordPanelOperation: IOperation = {+ id: 'action-recorder.operation.open-panel',+ type: CommandType.OPERATION,+ handler(accessor) {+ const s = accessor.get(ActionRecorderService);+ s.togglePanel(true);+ return true;+ },+};++export const CloseRecordPanelOperation: IOperation = {+ id: 'action-recorder.operation.close-panel',+ type: CommandType.OPERATION,+ handler(accessor) {+ const s = accessor.get(ActionRecorderService);+ s.togglePanel(false);+ return true;+ },+};diff --git a/packages-experimental/action-recorder/src/controllers/action-recorder.controller.tsx b/packages-experimental/action-recorder/src/controllers/action-recorder.controller.tsxnew file mode 100644index 0000000000..7c4005115f--- /dev/null+++ b/packages-experimental/action-recorder/src/controllers/action-recorder.controller.tsx@@ -0,0 +1,140 @@+/**+ * Copyright 2023-present DreamNum Inc.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++import { connectInjector, Disposable, ICommandService, Inject, Injector } from '@univerjs/core';+import { BuiltInUIPart, ComponentManager, IMenuManagerService, IUIPartsService } from '@univerjs/ui';+import { CopySheetCommand, DeleteRangeMoveLeftCommand, DeleteRangeMoveUpCommand, DeltaColumnWidthCommand, DeltaRowHeightCommand, InsertColAfterCommand, InsertColBeforeCommand, InsertRowAfterCommand, InsertRowBeforeCommand, InsertSheetCommand, RemoveSheetCommand, SetFrozenCancelCommand, SetFrozenCommand, SetHorizontalTextAlignCommand, SetOverlineCommand, SetRangeProtectionCommand, SetRangeValuesCommand, SetSelectionsOperation, SetStrikeThroughCommand, SetStyleCommand, SetTextColorCommand, SetTextRotationCommand, SetTextWrapCommand, SetVerticalTextAlignCommand, SetWorksheetActivateCommand, SetWorksheetActiveOperation } from '@univerjs/sheets';+import { SetRangeBoldCommand, SetRangeFontFamilyCommand, SetRangeFontSizeCommand, SetRangeItalicCommand, SetRangeStrickThroughCommand, SetRangeSubscriptCommand, SetRangeSuperscriptCommand, SetRangeTextColorCommand, SetRangeUnderlineCommand, SheetCopyCommand, SheetCutCommand, SheetPasteBesidesBorderCommand, SheetPasteColWidthCommand, SheetPasteCommand, SheetPasteFormatCommand, SheetPasteShortKeyCommand, SheetPasteValueCommand } from '@univerjs/sheets-ui';+import { RemoveSheetFilterCommand, SetSheetFilterRangeCommand, SetSheetsFilterCriteriaCommand } from '@univerjs/sheets-filter-ui';+import { RecordSingle } from '@univerjs/icons';+import { CloseRecordPanelOperation, OpenRecordPanelOperation } from '../commands/operations/operation';+import { RecorderPanel } from '../views/components/RecorderPanel';+import { CompleteRecordingActionCommand, StartRecordingActionCommand, StopRecordingActionCommand } from '../commands/commands/record.command';+import { ActionRecorderService } from '../services/action-recorder.service';+import { ReplayLocalRecordCommand } from '../commands/commands/replay.command';+import { menuSchema } from './action-recorder.menu';++export class ActionRecorderController extends Disposable {+ constructor(+ @ICommandService private readonly _commandSrv: ICommandService,+ @IUIPartsService private readonly _uiPartsSrv: IUIPartsService,+ @IMenuManagerService private readonly _menuManagerService: IMenuManagerService,+ @Inject(ComponentManager) private readonly _componentManager: ComponentManager,+ @Inject(ActionRecorderService) private readonly _actionRecorderService: ActionRecorderService,+ @Inject(Injector) private readonly _injector: Injector+ ) {+ super();++ this._initCommands();+ this._initUI();+ this._initSheetsCommands();+ this._initDocsCommands();+ }++ private _initCommands(): void {+ ([+ StartRecordingActionCommand,+ StopRecordingActionCommand,+ CompleteRecordingActionCommand,+ OpenRecordPanelOperation,+ CloseRecordPanelOperation,+ ReplayLocalRecordCommand,+ ]).forEach((command) => this._commandSrv.registerCommand(command));+ }++ private _initUI(): void {+ this._uiPartsSrv.registerComponent(BuiltInUIPart.GLOBAL, () => connectInjector(RecorderPanel, this._injector));+ this._componentManager.register('RecordSingle', RecordSingle);+ this._menuManagerService.mergeMenu(menuSchema);+ }++ private _initSheetsCommands(): void {+ ([+ // InsertColCommand,+ // InsertRowCommand,+ // #region basic commands+ CopySheetCommand,+ DeleteRangeMoveLeftCommand,+ DeleteRangeMoveUpCommand,+ DeltaColumnWidthCommand,+ DeltaRowHeightCommand,+ InsertSheetCommand,+ InsertColAfterCommand,+ InsertColBeforeCommand,+ InsertRowAfterCommand,+ InsertRowBeforeCommand,+ RemoveSheetCommand,+ SetStyleCommand,+ // ResetBackgroundColorCommand,+ // ResetTextColorCommand,+ // SetBackgroundColorCommand,+ // SetBoldCommand,+ // SetFontFamilyCommand,+ // SetFontSizeCommand,+ SetFrozenCancelCommand,+ SetFrozenCommand,+ SetHorizontalTextAlignCommand,+ // SetItalicCommand,+ SetOverlineCommand,+ SetRangeBoldCommand,+ SetRangeFontFamilyCommand,+ SetRangeFontSizeCommand,+ SetRangeItalicCommand,+ SetRangeProtectionCommand,+ SetRangeStrickThroughCommand,+ SetRangeSubscriptCommand,+ SetRangeSuperscriptCommand,+ SetRangeTextColorCommand,+ SetRangeUnderlineCommand,+ SetRangeValuesCommand,+ SetStrikeThroughCommand,+ SetTextColorCommand,+ SetTextRotationCommand,+ SetTextWrapCommand,+ // SetUnderlineCommand,+ SetVerticalTextAlignCommand,+ SheetCopyCommand,+ SheetCutCommand,+ SheetPasteBesidesBorderCommand,+ SheetPasteColWidthCommand,+ SheetPasteCommand,+ SheetPasteFormatCommand,+ SheetPasteShortKeyCommand,+ SheetPasteValueCommand,++ SetWorksheetActivateCommand,+ SetWorksheetActiveOperation,+ SetSelectionsOperation,+ // #endregion++ // #region data validation command+ // #endregion++ // #region conditional formatting command+ // #endregion++ // #region filter command+ SetSheetFilterRangeCommand,+ SetSheetsFilterCriteriaCommand,+ RemoveSheetFilterCommand,+ // #endregion+ ]).forEach((command) => this._actionRecorderService.registerRecordedCommand(command));+ }++ private _initDocsCommands(): void {+ // TODO+ }+}diff --git a/packages-experimental/action-recorder/src/controllers/action-recorder.menu.ts b/packages-experimental/action-recorder/src/controllers/action-recorder.menu.tsnew file mode 100644index 0000000000..065f2c832c--- /dev/null+++ b/packages-experimental/action-recorder/src/controllers/action-recorder.menu.ts@@ -0,0 +1,69 @@+/**+ * Copyright 2023-present DreamNum Inc.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++import { MenuItemType, RibbonStartGroup } from '@univerjs/ui';+import type { IAccessor } from '@univerjs/core';+import type { IMenuButtonItem, IMenuSelectorItem, MenuSchemaType } from '@univerjs/ui';+import { ReplayLocalRecordCommand } from '../commands/commands/replay.command';+import { OpenRecordPanelOperation } from '../commands/operations/operation';+import { ActionRecorderService } from '../services/action-recorder.service';++export const RECORD_MENU_ITEM_ID = 'RECORD_MENU_ITEM';+export function RecordMenuItemFactory(): IMenuSelectorItem {+ return {+ id: RECORD_MENU_ITEM_ID,+ type: MenuItemType.SUBITEMS,+ icon: 'RecordSingle',+ tooltip: 'action-recorder.menu.title',+ };+}++export function OpenRecorderMenuItemFactory(accessor: IAccessor): IMenuButtonItem {+ const actionRecorderService = accessor.get(ActionRecorderService);++ return {+ id: OpenRecordPanelOperation.id,+ title: 'action-recorder.menu.record',+ type: MenuItemType.BUTTON,+ disabled$: actionRecorderService.panelOpened$,+ };+}++export function ReplayLocalRecordMenuItemFactory(): IMenuButtonItem {+ return {+ id: ReplayLocalRecordCommand.id,+ title: 'action-recorder.menu.replay-local',+ type: MenuItemType.BUTTON,+ };+}++export const menuSchema: MenuSchemaType = {+ [RibbonStartGroup.OTHERS]: {+ [RECORD_MENU_ITEM_ID]: {+ order: 10,+ menuItemFactory: RecordMenuItemFactory,+ [OpenRecordPanelOperation.id]: {+ order: 1,+ menuItemFactory: OpenRecorderMenuItemFactory,+ },+ [ReplayLocalRecordCommand.id]: {+ order: 2,+ menuItemFactory: ReplayLocalRecordMenuItemFactory,+ },+ },++ },+};diff --git a/packages-experimental/action-recorder/src/index.ts b/packages-experimental/action-recorder/src/index.tsnew file mode 100644index 0000000000..d808b154af--- /dev/null+++ b/packages-experimental/action-recorder/src/index.ts@@ -0,0 +1,17 @@+/**+ * Copyright 2023-present DreamNum Inc.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++export { UniverActionRecorderPlugin } from './plugin';diff --git a/packages-experimental/debugger/src/controllers/local-save/export.controller.ts b/packages-experimental/action-recorder/src/locale/en-US.tssimilarity index 56%rename from packages-experimental/debugger/src/controllers/local-save/export.controller.tsrename to packages-experimental/action-recorder/src/locale/en-US.tsindex 8ee48ef0f6..5f0d530b34 100644--- a/packages-experimental/debugger/src/controllers/local-save/export.controller.ts+++ b/packages-experimental/action-recorder/src/locale/en-US.ts@@ -14,17 +14,16 @@* limitations under the License.*/-import { createDownloadElement } from './util';+import type zhCN from './zh-CN';-export class ExportController {- exportJson(data: string, fileName: string) {- const blob = new Blob([data], { type: 'text/json' });- const startDownload = createDownloadElement(`${fileName}.json`, blob);- startDownload();- }+const locale: typeof zhCN = {+ 'action-recorder': {+ menu: {+ title: 'Record Actions',+ record: 'Record Actions...',+ 'replay-local': 'Replace Local Record...',+ },+ },+};- exportWebm(data: Blob, fileName: string) {- const startDownload = createDownloadElement(`${fileName}.webm`, data);- startDownload();- }-}+export default locale;diff --git a/packages-experimental/action-recorder/src/locale/ru-RU.ts b/packages-experimental/action-recorder/src/locale/ru-RU.tsnew file mode 100644index 0000000000..5f0d530b34--- /dev/null+++ b/packages-experimental/action-recorder/src/locale/ru-RU.ts@@ -0,0 +1,29 @@+/**+ * Copyright 2023-present DreamNum Inc.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++import type zhCN from './zh-CN';++const locale: typeof zhCN = {+ 'action-recorder': {+ menu: {+ title: 'Record Actions',+ record: 'Record Actions...',+ 'replay-local': 'Replace Local Record...',+ },+ },+};++export default locale;diff --git a/packages-experimental/action-recorder/src/locale/vi-VN.ts b/packages-experimental/action-recorder/src/locale/vi-VN.tsnew file mode 100644index 0000000000..5f0d530b34--- /dev/null+++ b/packages-experimental/action-recorder/src/locale/vi-VN.ts@@ -0,0 +1,29 @@+/**+ * Copyright 2023-present DreamNum Inc.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++import type zhCN from './zh-CN';++const locale: typeof zhCN = {+ 'action-recorder': {+ menu: {+ title: 'Record Actions',+ record: 'Record Actions...',+ 'replay-local': 'Replace Local Record...',+ },+ },+};++export default locale;diff --git a/packages-experimental/action-recorder/src/locale/zh-CN.ts b/packages-experimental/action-recorder/src/locale/zh-CN.tsnew file mode 100644index 0000000000..4cadda9350--- /dev/null+++ b/packages-experimental/action-recorder/src/locale/zh-CN.ts@@ -0,0 +1,27 @@+/**+ * Copyright 2023-present DreamNum Inc.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++const locale = {+ 'action-recorder': {+ menu: {+ title: '操作录制',+ record: '录制操作...',+ 'replay-local': '回放本地录制...',+ },+ },+};++export default locale;diff --git a/packages-experimental/action-recorder/src/locale/zh-TW.ts b/packages-experimental/action-recorder/src/locale/zh-TW.tsnew file mode 100644index 0000000000..cd59f5bf9d--- /dev/null+++ b/packages-experimental/action-recorder/src/locale/zh-TW.ts@@ -0,0 +1,29 @@+/**+ * Copyright 2023-present DreamNum Inc.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++import type zhCN from './zh-CN';++const locale: typeof zhCN = {+ 'action-recorder': {+ menu: {+ title: '操作录制',+ record: '录制操作...',+ 'replay-local': '回放本地录制...',+ },+ },+};++export default locale;diff --git a/packages-experimental/action-recorder/src/plugin.ts b/packages-experimental/action-recorder/src/plugin.tsnew file mode 100644index 0000000000..d85ca24845--- /dev/null+++ b/packages-experimental/action-recorder/src/plugin.ts@@ -0,0 +1,47 @@+/**+ * Copyright 2023-present DreamNum Inc.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++import type { Dependency } from '@univerjs/core';+import { Inject, Injector, Plugin } from '@univerjs/core';+import { ActionRecorderService } from './services/action-recorder.service';+import { ActionRecorderController } from './controllers/action-recorder.controller';+import { ActionReplayService } from './services/replay.service';++/**+ * This plugin provides a recorder for user's interactions with Univer,+ * it only records commands (and some special operations) so that it can be replayed later.+ */+export class UniverActionRecorderPlugin extends Plugin {+ static override pluginName = 'UNIVER_ACTION_RECORDER_PLUGIN';++ constructor(+ @Inject(Injector) protected readonly _injector: Injector+ ) {+ super();+ }++ override onStarting(_injector?: Injector): void {+ ([+ [ActionRecorderService],+ [ActionReplayService],+ [ActionRecorderController],+ ] as Dependency[]).forEach((d) => this._injector.add(d));+ }++ override onSteady(): void {+ this._injector.get(ActionRecorderController);+ }+}diff --git a/packages-experimental/action-recorder/src/services/action-recorder.service.ts b/packages-experimental/action-recorder/src/services/action-recorder.service.tsnew file mode 100644index 0000000000..262fc70513--- /dev/null+++ b/packages-experimental/action-recorder/src/services/action-recorder.service.ts@@ -0,0 +1,108 @@+/**+ * Copyright 2023-present DreamNum Inc.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++import type { ICommand, ICommandInfo, IDisposable, Nullable } from '@univerjs/core';+import { CommandType, Disposable, ICommandService, ILogService } from '@univerjs/core';+import { SetSelectionsOperation } from '@univerjs/sheets';+import { ILocalFileService } from '@univerjs/ui';+import { BehaviorSubject } from 'rxjs';++/**+ * This service is for recording commands. What commands should be recorded can be configured by other+ * plugins.+ */+export class ActionRecorderService extends Disposable {+ private readonly _shouldRecordCommands = new Set<string>();++ private readonly _panelOpened$ = new BehaviorSubject<boolean>(false);+ readonly panelOpened$ = this._panelOpened$.asObservable();++ private _recorder: Nullable<IDisposable> = null;++ private readonly _recording$ = new BehaviorSubject<boolean>(false);+ readonly recording$ = this._recording$.asObservable();+ get recording(): boolean { return this._recording$.getValue(); }++ private _recorded$ = new BehaviorSubject<ICommandInfo[]>([]);+ private get _recorded(): ICommandInfo[] { return this._recorded$.getValue(); }++ private _recordedCommands$ = new BehaviorSubject<ICommandInfo[]>([]);+ readonly recordedCommands$ = this._recordedCommands$.asObservable();+ private get _recordedCommands(): ICommandInfo[] { return this._recordedCommands$.getValue(); }++ constructor(+ @ICommandService private readonly _commandSrv: ICommandService,+ @ILogService private readonly _logService: ILogService,+ @ILocalFileService private readonly _localFileService: ILocalFileService+ ) {+ super();+ }++ registerRecordedCommand(command: ICommand): void {+ if (command.type === CommandType.MUTATION) throw new Error('[CommandRecorderService] Cannot record mutation commands.');+ this._shouldRecordCommands.add(command.id);+ }++ togglePanel(visible: boolean): void {+ this._panelOpened$.next(visible);++ if (visible === false) this.stopRecording();+ }++ startRecording(): void {+ this._recorder = this._commandSrv.onCommandExecuted((commandInfo) => {+ if (this._shouldRecordCommands.has(commandInfo.id)) {+ const recorded = this._recorded;+ const commands = this._recordedCommands;++ if (+ commandInfo.id === SetSelectionsOperation.id &&+ recorded.length > 0 &&+ recorded[recorded.length - 1].id === SetSelectionsOperation.id+ ) {+ recorded[recorded.length - 1] = commandInfo;+ } else {+ recorded.push(commandInfo);+ this._recorded$.next(recorded);++ if (commandInfo.type === CommandType.COMMAND) {+ commands.push(commandInfo);+ this._recordedCommands$.next(commands);+ }+ }+ }+ });++ this._recording$.next(true);+ }++ stopRecording(): void {+ this._recorder?.dispose();+ this._recorder = null;++ this._recorded$.next([]);+ this._recordedCommands$.next([]);+ this._recording$.next(false);+ }++ completeRecording(): void {+ const commands = this._recorded.slice();+ this._localFileService.downloadFile(new Blob([JSON.stringify(commands, null, 2)]), 'recorded-commands.json');++ this._logService.error('Recorded commands:', commands);+ this.stopRecording();+ }+}diff --git a/packages-experimental/action-recorder/src/services/replay.service.ts b/packages-experimental/action-recorder/src/services/replay.service.tsnew file mode 100644index 0000000000..ab588a7ac3--- /dev/null+++ b/packages-experimental/action-recorder/src/services/replay.service.ts@@ -0,0 +1,88 @@+/**+ * Copyright 2023-present DreamNum Inc.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++import type { ICommandInfo } from '@univerjs/core';+import { Disposable, ICommandService, ILogService, IUniverInstanceService } from '@univerjs/core';+import { MessageType } from '@univerjs/design';+import { ILocalFileService, IMessageService } from '@univerjs/ui';++/**+ * This service is for replaying user actions.+ */+export class ActionReplayService extends Disposable {+ constructor(+ @IMessageService private readonly _messageService: IMessageService,+ @IUniverInstanceService private readonly _instanceService: IUniverInstanceService,+ @ILocalFileService private readonly _localFileService: ILocalFileService,+ @ILogService private readonly _logService: ILogService,+ @ICommandService private readonly _commandService: ICommandService+ ) {+ super();+ }++ /**+ * Read a local file and try to replay commands in this JSON.+ */+ async replayLocalJSON(): Promise<boolean> {+ const files = await this._localFileService.openFile({ multiple: false, accept: '.json' });+ if (files.length !== 1) return false;++ const file = files[0];+ try {+ return this.replayCommands(JSON.parse(await file.text()));+ } catch {+ this._messageService.show({+ type: MessageType.Error,+ content: `Failed to replay commands from local file ${file.name}.`,+ });++ return false;+ }+ }++ /**+ * Replay a list of commands. Note that `unitId` of these commands would be changed to the focused unit.+ * @param commands - The commands to replay.+ * @returns If the replay is successful.+ */+ async replayCommands(commands: ICommandInfo[]): Promise<boolean> {+ const focusedUnitId = this._instanceService.getFocusedUnit()?.getUnitId();+ if (!focusedUnitId) {+ this._logService.error('[ReplayService]', 'no focused unit to replay commands');+ }++ for (const command of commands) {+ const { id, params } = command;+ if (params) {+ if (typeof (params as ISharedCommandParams).unitId !== 'undefined') {+ (params as ISharedCommandParams).unitId = focusedUnitId;+ }++ const result = await this._commandService.executeCommand(id, params);+ if (!result) return false;+ } else {+ const result = await this._commandService.executeCommand(id);+ if (!result) return false;+ }+ }++ return true;+ }+}++interface ISharedCommandParams {+ unitId?: string;+}diff --git a/packages-experimental/action-recorder/src/views/components/RecorderPanel.tsx b/packages-experimental/action-recorder/src/views/components/RecorderPanel.tsxnew file mode 100644index 0000000000..a218205f75--- /dev/null+++ b/packages-experimental/action-recorder/src/views/components/RecorderPanel.tsx@@ -0,0 +1,77 @@+/**+ * Copyright 2023-present DreamNum Inc.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++import { ICommandService, useDependency } from '@univerjs/core';+import React, { useCallback } from 'react';+import { useObservable } from '@univerjs/ui';+import { Button } from '@univerjs/design';+import { RecordSingle } from '@univerjs/icons';+import clsx from 'clsx';+import { ActionRecorderService } from '../../services/action-recorder.service';+import { CompleteRecordingActionCommand, StartRecordingActionCommand, StopRecordingActionCommand } from '../../commands/commands/record.command';+import { CloseRecordPanelOperation } from '../../commands/operations/operation';+import styles from './index.module.less';++export function RecorderPanel() {+ const s = useDependency(ActionRecorderService);+ const opened = useObservable(s.panelOpened$);++ if (!opened) return null;+ return <RecordPanelImpl />;+}++function RecordPanelImpl() {+ const commandService = useDependency(ICommandService);+ const actionRecorderService = useDependency(ActionRecorderService);++ const recording = useObservable(actionRecorderService.recording$);+ const recordedCommands = useObservable(actionRecorderService.recordedCommands$);+ const len = recordedCommands?.length ?? 0;++ const closePanel = useCallback(() => {+ if (!recording) commandService.executeCommand(CloseRecordPanelOperation.id);+ }, [commandService, recording]);++ const startRecording = useCallback(() => {+ if (!recording) commandService.executeCommand(StartRecordingActionCommand.id);+ }, [commandService, recording]);++ const completeRecording = useCallback(() => {+ if (recording) commandService.executeCommand(CompleteRecordingActionCommand.id);+ }, [commandService, recording]);++ const stopRecording = useCallback(() => {+ if (recording) commandService.executeCommand(StopRecordingActionCommand.id);+ }, [commandService, recording]);++ const titleText = recording+ ? len === 0 ? 'Recording...' : (`${len}: ${recordedCommands![len - 1].id}`)+ : 'Start Recording';++ return (+ <div className={styles.actionRecorderPanel}>+ <div className={clsx(styles.actionRecorderPanelIcon, recording ? styles.actionRecorderPanelIconRecording : false)}>+ <RecordSingle />+ </div>+ <div className={styles.actionRecorderPanelTitle}>{titleText}</div>+ <div className={styles.actionRecorderPanelActions}>+ <Button type="default" size="small" onClick={recording ? stopRecording : closePanel}>{ recording ? 'Cancel' : 'Close' }</Button>+ <Button type="primary" size="small" onClick={recording ? completeRecording : startRecording}>{ recording ? 'Save' : 'Start' }</Button>+ </div>+ </div>+ );+}+diff --git a/packages-experimental/action-recorder/src/views/components/index.module.less b/packages-experimental/action-recorder/src/views/components/index.module.lessnew file mode 100644index 0000000000..cc48e290d6--- /dev/null+++ b/packages-experimental/action-recorder/src/views/components/index.module.less@@ -0,0 +1,68 @@+.action-recorder {+ &-panel {+ position: fixed;+ bottom: 80px;+ width: 512px;+ height: 64px;+ border-radius: var(--border-radius-xl);+ background-color: rgb(var(--bg-color-secondary));+ z-index: 1000;+ left: 50%;+ transform: translateX(-50%);+ box-shadow: var(--box-shadow-lg);+ padding-left: var(--padding-xl);+ padding-right: var(--padding-xl);+ display: flex;+ align-items: center;++ &-icon {+ flex-grow: 0;+ flex-shrink: 0;+ font-size: var(--font-size-xxl);+ width: var(--font-size-xxl);+ height: var(--font-size-xxl);+ margin-right: var(--margin-xs);++ @keyframes recording {+ 0% {+ color: rgb(var(--text-color));+ }++ 40% {+ color: red;+ }++ 60% {+ color: red;+ }++ 100% {+ color: rgb(var(--text-color));+ }+ }++ &-recording {+ > svg > g > path:first-of-type {+ animation: recording 2s infinite;+ }+ }+ }++ &-title {+ flex-grow: 1;+ font-size: var(--font-size-xs);+ }++ &-actions {+ display: flex;+ flex-grow: 0;+ flex-shrink: 0;+ width: 180px;+ justify-content: space-between;++ > button {+ width: 80px;+ }+ }+ }+}diff --git a/packages-experimental/action-recorder/src/vite-env.d.ts b/packages-experimental/action-recorder/src/vite-env.d.tsnew file mode 100644index 0000000000..11f02fe2a0--- /dev/null+++ b/packages-experimental/action-recorder/src/vite-env.d.ts@@ -0,0 +1 @@+/// <reference types="vite/client" />diff --git a/packages-experimental/action-recorder/tsconfig.json b/packages-experimental/action-recorder/tsconfig.jsonnew file mode 100644index 0000000000..c62210cbad--- /dev/null+++ b/packages-experimental/action-recorder/tsconfig.json@@ -0,0 +1,9 @@+{+ "extends": "@univerjs-infra/shared/tsconfigs/base",+ "compilerOptions": {+ "rootDir": "src",+ "outDir": "lib/types"+ },+ "references": [{ "path": "./tsconfig.node.json" }],+ "include": ["src"]+}diff --git a/packages-experimental/action-recorder/tsconfig.node.json b/packages-experimental/action-recorder/tsconfig.node.jsonnew file mode 100644index 0000000000..50ef1e6862--- /dev/null+++ b/packages-experimental/action-recorder/tsconfig.node.json@@ -0,0 +1,4 @@+{+ "extends": "@univerjs-infra/shared/tsconfigs/node",+ "include": ["vite.config.ts"]+}diff --git a/packages-experimental/action-recorder/vite.config.ts b/packages-experimental/action-recorder/vite.config.tsnew file mode 100644index 0000000000..04e4e3b060--- /dev/null+++ b/packages-experimental/action-recorder/vite.config.ts@@ -0,0 +1,12 @@+import createViteConfig from '@univerjs-infra/shared/vite';+import pkg from './package.json';++export default ({ mode }) => createViteConfig({}, {+ mode,+ pkg,+ features: {+ react: false,+ css: true,+ dom: true,+ },+});diff --git a/packages-experimental/debugger/src/commands/commands/unit.command.ts b/packages-experimental/debugger/src/commands/commands/unit.command.tsindex e91ea037ab..cd21403894 100644--- a/packages-experimental/debugger/src/commands/commands/unit.command.ts+++ b/packages-experimental/debugger/src/commands/commands/unit.command.ts@@ -15,7 +15,7 @@*/import { CommandType, IUniverInstanceService, UniverInstanceType } from '@univerjs/core';-import { IFileOpenerService } from '@univerjs/ui';+import { ILocalFileService } from '@univerjs/ui';import type { ICommand, IWorkbookData, Univer, Workbook } from '@univerjs/core';import type { FUniver } from '@univerjs/facade';@@ -65,7 +65,7 @@ export const LoadSheetSnapshotCommand: ICommand = {id: 'debugger.command.load-sheet-snapshot',type: CommandType.COMMAND,handler: async (accessor) => {- const fileOpenerService = accessor.get(IFileOpenerService);+ const fileOpenerService = accessor.get(ILocalFileService);const snapshotFile = await fileOpenerService.openFile({ multiple: false, accept: '.json' });if (snapshotFile.length !== 1) return false;diff --git a/packages-experimental/debugger/src/commands/operations/save-snapshot.operations.ts b/packages-experimental/debugger/src/commands/operations/save-snapshot.operations.tsindex 71e48f9cf5..9e939b5e9a 100644--- a/packages-experimental/debugger/src/commands/operations/save-snapshot.operations.ts+++ b/packages-experimental/debugger/src/commands/operations/save-snapshot.operations.ts@@ -14,10 +14,11 @@* limitations under the License.*/-import { CommandType, IResourceLoaderService, IUniverInstanceService, ObjectMatrix, UniverInstanceType } from '@univerjs/core';/* eslint-disable node/prefer-global/process */++import { CommandType, IResourceLoaderService, IUniverInstanceService, ObjectMatrix, UniverInstanceType } from '@univerjs/core';+import { ILocalFileService } from '@univerjs/ui';import type { DocumentDataModel, IAccessor, ICommand, IStyleData, IWorkbookData, Workbook } from '@univerjs/core';-import { ExportController } from '../../controllers/local-save/export.controller';import { RecordController } from '../../controllers/local-save/record.controller';export interface ISaveSnapshotParams {@@ -42,13 +43,14 @@ const filterStyle = (workbookData: IWorkbookData) => {workbookData.styles = cacheStyle;return workbookData;};+export const SaveSnapshotOptions: ICommand = {id: 'debugger.operation.saveSnapshot',type: CommandType.OPERATION,handler: async (accessor: IAccessor, params: ISaveSnapshotParams) => {const univerInstanceService = accessor.get(IUniverInstanceService);const resourceLoaderService = accessor.get(IResourceLoaderService);- const exportController = accessor.get(ExportController);+ const localFileService = accessor.get(ILocalFileService);const recordController = accessor.get(RecordController);const gitHash = process.env.GIT_COMMIT_HASH;const gitBranch = process.env.GIT_REF_NAME;@@ -60,7 +62,7 @@ export const SaveSnapshotOptions: ICommand = {const snapshot = resourceLoaderService.saveUnit(doc.getUnitId());(snapshot as any).__env__ = { gitHash, gitBranch, buildTime };const text = JSON.stringify(snapshot, null, 2);- exportController.exportJson(text, `${preName} snapshot`);+ localFileService.downloadFile(new Blob([text]), `${preName} snapshot.json`);return true;}@@ -79,13 +81,13 @@ export const SaveSnapshotOptions: ICommand = {snapshot.sheets = { [sheetId]: sheet };snapshot.sheetOrder = [sheetId];const text = JSON.stringify(filterStyle(snapshot), null, 2);- exportController.exportJson(text, `${preName} snapshot`);+ localFileService.downloadFile(new Blob([text]), `${preName} snapshot.json`);break;}case 'workbook': {const text = JSON.stringify(filterStyle(snapshot), null, 2);- exportController.exportJson(text, `${preName} snapshot`);+ localFileService.downloadFile(new Blob([text]), `${preName} snapshot.json`);break;}@@ -98,9 +100,8 @@ export const SaveSnapshotOptions: ICommand = {}if (v.type === 'finish') {const commands = endCommands();- exportController.exportWebm(v.data, `${preName} video`);- const commandsText = JSON.stringify(commands, null, 2);- exportController.exportJson(commandsText, `${preName} commands`);+ localFileService.downloadFile(v.data, `${preName} video.webm`);+ localFileService.downloadFile(new Blob([JSON.stringify(commands, null, 2)]), `${preName} commands.json`);}});}diff --git a/packages-experimental/debugger/src/controllers/debugger.controller.ts b/packages-experimental/debugger/src/controllers/debugger.controller.tsindex 9a68d37677..4e4b48efb1 100644--- a/packages-experimental/debugger/src/controllers/debugger.controller.ts+++ b/packages-experimental/debugger/src/controllers/debugger.controller.ts@@ -37,7 +37,6 @@ import { ImageDemo } from '../components/Image';import VueI18nIcon from '../components/VueI18nIcon.vue';import { TEST_EDITOR_CONTAINER_COMPONENT } from '../views/test-editor/component-name';import { TestEditorContainer } from '../views/test-editor/TestTextEditor';-import { ExportController } from './local-save/export.controller';import { RecordController } from './local-save/record.controller';import { menuSchema } from './menu.schema';@@ -73,7 +72,6 @@ export class DebuggerController extends Disposable {ShowCellContentOperation,].forEach((command) => this.disposeWithMe(this._commandService.registerCommand(command)));- this._injector.add([ExportController]);this._injector.add([RecordController]);}diff --git a/packages/core/src/sheets/typedef.ts b/packages/core/src/sheets/typedef.tsindex 966e8b8946..7843bc5d13 100644--- a/packages/core/src/sheets/typedef.ts+++ b/packages/core/src/sheets/typedef.ts@@ -14,14 +14,14 @@* limitations under the License.*/-import type { LocaleType } from '../types/enum/locale-type';-import type { IStyleData } from '../types/interfaces/i-style-data';+import { type BooleanNumber, CellValueType } from '../types/enum';import type { IResources } from '../services/resource-manager/type';import type { IObjectArrayPrimitiveType, IObjectMatrixPrimitiveType, Nullable } from '../shared';-import { type BooleanNumber, CellValueType } from '../types/enum';+import type { LocaleType } from '../types/enum/locale-type';import type { IDocumentData } from '../types/interfaces';import type { ICellCustomRender } from '../types/interfaces/i-cell-custom-render';import type { ICellValidationData } from '../types/interfaces/i-cell-validation-data';+import type { IStyleData } from '../types/interfaces/i-style-data';/*** Snapshot of a workbook.diff --git a/packages/docs-drawing-ui/package.json b/packages/docs-drawing-ui/package.jsonindex 38f71d377c..754290c712 100644--- a/packages/docs-drawing-ui/package.json+++ b/packages/docs-drawing-ui/package.json@@ -72,7 +72,6 @@"@univerjs/drawing-ui": "workspace:*","@univerjs/engine-render": "workspace:*","@univerjs/ui": "workspace:*",- "clsx": ">=2.0.0","react": "^16.9.0 || ^17.0.0 || ^18.0.0","rxjs": ">=7.0.0"},diff --git a/packages/docs-drawing-ui/src/controllers/render-controllers/doc-drawing-update.render-controller.ts b/packages/docs-drawing-ui/src/controllers/render-controllers/doc-drawing-update.render-controller.tsindex 5b0fe58522..73865e153a 100644--- a/packages/docs-drawing-ui/src/controllers/render-controllers/doc-drawing-update.render-controller.ts+++ b/packages/docs-drawing-ui/src/controllers/render-controllers/doc-drawing-update.render-controller.ts@@ -18,7 +18,7 @@ import type { DocumentDataModel, ICommandInfo, IDocDrawingPosition, Nullable } fimport { BooleanNumber, Disposable, FOCUSING_COMMON_DRAWINGS, ICommandService, IContextService, Inject, LocaleService, ObjectRelativeFromH, ObjectRelativeFromV, PositionedObjectLayoutType, WrapTextType } from '@univerjs/core';import type { IImageIoServiceParam } from '@univerjs/drawing';import { DRAWING_IMAGE_ALLOW_IMAGE_LIST, DRAWING_IMAGE_ALLOW_SIZE, DRAWING_IMAGE_COUNT_LIMIT, DRAWING_IMAGE_HEIGHT_LIMIT, DRAWING_IMAGE_WIDTH_LIMIT, DrawingTypeEnum, getDrawingShapeKeyByDrawingSearch, getImageSize, IDrawingManagerService, IImageIoService, ImageUploadStatusType } from '@univerjs/drawing';-import { IFileOpenerService, IMessageService } from '@univerjs/ui';+import { ILocalFileService, IMessageService } from '@univerjs/ui';import { MessageType } from '@univerjs/design';import type { IDocDrawing } from '@univerjs/docs-drawing';import { IDocDrawingService } from '@univerjs/docs-drawing';@@ -38,7 +38,7 @@ export class DocDrawingUpdateRenderController extends Disposable implements IRenconstructor(private readonly _context: IRenderContext<DocumentDataModel>,@ICommandService private readonly _commandService: ICommandService,- @IFileOpenerService private readonly _fileOpenerService: IFileOpenerService,+ @ILocalFileService private readonly _fileOpenerService: ILocalFileService,@Inject(TextSelectionManagerService) private readonly _textSelectionManagerService: TextSelectionManagerService,@IRenderManagerService private readonly _renderManagerSrv: IRenderManagerService,@IImageIoService private readonly _imageIoService: IImageIoService,diff --git a/packages/docs-hyper-link/package.json b/packages/docs-hyper-link/package.jsonindex 03be079416..1f6c2722e4 100644--- a/packages/docs-hyper-link/package.json+++ b/packages/docs-hyper-link/package.json@@ -57,7 +57,7 @@"build": "tsc && vite build"},"peerDependencies": {- "@univerjs/core": "workspace:*"+ "rxjs": "^7.8.1"},"dependencies": {"@univerjs/core": "workspace:*",diff --git a/packages/engine-formula/src/controller/set-dependency.controller.ts b/packages/engine-formula/src/controller/set-dependency.controller.tsindex 3001e42cff..48ce25d894 100644--- a/packages/engine-formula/src/controller/set-dependency.controller.ts+++ b/packages/engine-formula/src/controller/set-dependency.controller.ts@@ -14,22 +14,22 @@* limitations under the License.*/-import type { ICommandInfo } from '@univerjs/core';import { Disposable, ICommandService, LifecycleStages, ObjectMatrix, OnLifecycle } from '@univerjs/core';+import type { ICommandInfo } from '@univerjs/core';-import type {- IRemoveFeatureCalculationMutationParam,- ISetFeatureCalculationMutation } from '../commands/mutations/set-feature-calculation.mutation';import {RemoveFeatureCalculationMutation,SetFeatureCalculationMutation,} from '../commands/mutations/set-feature-calculation.mutation';-import { IFeatureCalculationManagerService } from '../services/feature-calculation-manager.service';-import { IDependencyManagerService } from '../services/dependency-manager.service';-import type { IRemoveOtherFormulaMutationParams, ISetOtherFormulaMutationParams } from '../commands/mutations/set-other-formula.mutation';+import { SetFormulaDataMutation } from '../commands/mutations/set-formula-data.mutation';import { RemoveOtherFormulaMutation, SetOtherFormulaMutation } from '../commands/mutations/set-other-formula.mutation';+import { IDependencyManagerService } from '../services/dependency-manager.service';+import { IFeatureCalculationManagerService } from '../services/feature-calculation-manager.service';+import type {+ IRemoveFeatureCalculationMutationParam,+ ISetFeatureCalculationMutation } from '../commands/mutations/set-feature-calculation.mutation';import type { ISetFormulaDataMutationParams } from '../commands/mutations/set-formula-data.mutation';-import { SetFormulaDataMutation } from '../commands/mutations/set-formula-data.mutation';+import type { IRemoveOtherFormulaMutationParams, ISetOtherFormulaMutationParams } from '../commands/mutations/set-other-formula.mutation';@OnLifecycle(LifecycleStages.Ready, SetDependencyController)export class SetDependencyController extends Disposable {diff --git a/packages/engine-formula/src/engine/dependency/dependency-tree.ts b/packages/engine-formula/src/engine/dependency/dependency-tree.tsindex 2ca1bde145..d83b2e33e8 100644--- a/packages/engine-formula/src/engine/dependency/dependency-tree.ts+++ b/packages/engine-formula/src/engine/dependency/dependency-tree.ts@@ -14,8 +14,8 @@* limitations under the License.*/-import type { IRange, IUnitRange, Nullable } from '@univerjs/core';import { Disposable } from '@univerjs/core';+import type { IRange, IUnitRange, Nullable } from '@univerjs/core';import type {IDirtyUnitSheetNameMap,@@ -23,9 +23,9 @@ import type {IRuntimeUnitDataType,IUnitExcludedCell,} from '../../basics/common';-import type { BaseAstNode } from '../ast-node/base-ast-node';import type { IFormulaDirtyData } from '../../services/current-data.service';import type { IAllRuntimeData } from '../../services/runtime.service';+import type { BaseAstNode } from '../ast-node/base-ast-node';export enum FDtreeStateType {DEFAULT,diff --git a/packages/engine-formula/src/functions/lookup/drop/__tests__/index.spec.ts b/packages/engine-formula/src/functions/lookup/drop/__tests__/index.spec.tsindex f37e324575..90c5d26881 100644--- a/packages/engine-formula/src/functions/lookup/drop/__tests__/index.spec.ts+++ b/packages/engine-formula/src/functions/lookup/drop/__tests__/index.spec.ts@@ -16,13 +16,13 @@import { describe, expect, it } from 'vitest';+import { ErrorType } from '../../../../basics/error-type';import { ArrayValueObject, transformToValueObject } from '../../../../engine/value-object/array-value-object';-import { FUNCTION_NAMES_LOOKUP } from '../../function-names';-import { Drop } from '../index';+import { ErrorValueObject } from '../../../../engine/value-object/base-value-object';import { BooleanValueObject, NullValueObject, NumberValueObject, StringValueObject } from '../../../../engine/value-object/primitive-object';-import { ErrorType } from '../../../../basics/error-type';import { getObjectValue } from '../../../__tests__/create-function-test-bed';-import { ErrorValueObject } from '../../../../engine/value-object/base-value-object';+import { FUNCTION_NAMES_LOOKUP } from '../../function-names';+import { Drop } from '../index';describe('Test drop function', () => {const testFunction = new Drop(FUNCTION_NAMES_LOOKUP.DROP);diff --git a/packages/engine-formula/src/functions/lookup/drop/index.ts b/packages/engine-formula/src/functions/lookup/drop/index.tsindex 454d64e5ee..f4e48eca39 100644--- a/packages/engine-formula/src/functions/lookup/drop/index.ts+++ b/packages/engine-formula/src/functions/lookup/drop/index.ts@@ -15,12 +15,12 @@*/import { ErrorType } from '../../../basics/error-type';-import type { ArrayValueObject } from '../../../engine/value-object/array-value-object';-import type { BaseValueObject } from '../../../engine/value-object/base-value-object';+import { expandArrayValueObject } from '../../../engine/utils/array-object';import { ErrorValueObject } from '../../../engine/value-object/base-value-object';import { NumberValueObject } from '../../../engine/value-object/primitive-object';import { BaseFunction } from '../../base-function';-import { expandArrayValueObject } from '../../../engine/utils/array-object';+import type { ArrayValueObject } from '../../../engine/value-object/array-value-object';+import type { BaseValueObject } from '../../../engine/value-object/base-value-object';export class Drop extends BaseFunction {override minParams = 2;diff --git a/packages/engine-formula/src/functions/lookup/expand/__tests__/index.spec.ts b/packages/engine-formula/src/functions/lookup/expand/__tests__/index.spec.tsindex b60be7ee7e..5de24b4f47 100644--- a/packages/engine-formula/src/functions/lookup/expand/__tests__/index.spec.ts+++ b/packages/engine-formula/src/functions/lookup/expand/__tests__/index.spec.ts@@ -16,13 +16,13 @@import { describe, expect, it } from 'vitest';+import { ErrorType } from '../../../../basics/error-type';import { ArrayValueObject, transformToValueObject } from '../../../../engine/value-object/array-value-object';-import { FUNCTION_NAMES_LOOKUP } from '../../function-names';-import { Expand } from '../index';+import { ErrorValueObject } from '../../../../engine/value-object/base-value-object';import { BooleanValueObject, NullValueObject, NumberValueObject, StringValueObject } from '../../../../engine/value-object/primitive-object';-import { ErrorType } from '../../../../basics/error-type';import { getObjectValue } from '../../../__tests__/create-function-test-bed';-import { ErrorValueObject } from '../../../../engine/value-object/base-value-object';+import { FUNCTION_NAMES_LOOKUP } from '../../function-names';+import { Expand } from '../index';describe('Test expand function', () => {const testFunction = new Expand(FUNCTION_NAMES_LOOKUP.EXPAND);diff --git a/packages/engine-formula/src/functions/lookup/expand/index.ts b/packages/engine-formula/src/functions/lookup/expand/index.tsindex 94021444e4..f73717db05 100644--- a/packages/engine-formula/src/functions/lookup/expand/index.ts+++ b/packages/engine-formula/src/functions/lookup/expand/index.ts@@ -15,12 +15,12 @@*/import { ErrorType } from '../../../basics/error-type';+import { expandArrayValueObject } from '../../../engine/utils/array-object';import { ArrayValueObject } from '../../../engine/value-object/array-value-object';-import type { BaseValueObject } from '../../../engine/value-object/base-value-object';import { ErrorValueObject } from '../../../engine/value-object/base-value-object';import { NumberValueObject } from '../../../engine/value-object/primitive-object';import { BaseFunction } from '../../base-function';-import { expandArrayValueObject } from '../../../engine/utils/array-object';+import type { BaseValueObject } from '../../../engine/value-object/base-value-object';export class Expand extends BaseFunction {override minParams = 2;diff --git a/packages/engine-formula/src/functions/lookup/function-map.ts b/packages/engine-formula/src/functions/lookup/function-map.tsindex 3edf6d1ecb..d7d10d1e47 100644--- a/packages/engine-formula/src/functions/lookup/function-map.ts+++ b/packages/engine-formula/src/functions/lookup/function-map.ts@@ -14,7 +14,6 @@* limitations under the License.*/-import { FUNCTION_NAMES_LOOKUP } from './function-names';import { Address } from './address';import { Areas } from './areas';import { Choose } from './choose';@@ -25,8 +24,10 @@ import { Columns } from './columns';import { Drop } from './drop';import { Expand } from './expand';import { Filter } from './filter';+import { FUNCTION_NAMES_LOOKUP } from './function-names';import { Hlookup } from './hlookup';import { Hstack } from './hstack';+import { Index } from './index';import { Indirect } from './indirect';import { Lookup } from './lookup';import { Match } from './match';@@ -46,7 +47,6 @@ import { Wrapcols } from './wrapcols';import { Wraprows } from './wraprows';import { Xlookup } from './xlookup';import { Xmatch } from './xmatch';-import { Index } from './index';export const functionLookup = [[Address, FUNCTION_NAMES_LOOKUP.ADDRESS],diff --git a/packages/engine-formula/src/functions/lookup/take/__tests__/index.spec.ts b/packages/engine-formula/src/functions/lookup/take/__tests__/index.spec.tsindex 1c3cc3b3f9..1c06ff185e 100644--- a/packages/engine-formula/src/functions/lookup/take/__tests__/index.spec.ts+++ b/packages/engine-formula/src/functions/lookup/take/__tests__/index.spec.ts@@ -16,13 +16,13 @@import { describe, expect, it } from 'vitest';+import { ErrorType } from '../../../../basics/error-type';import { ArrayValueObject, transformToValueObject } from '../../../../engine/value-object/array-value-object';-import { FUNCTION_NAMES_LOOKUP } from '../../function-names';-import { Take } from '../index';+import { ErrorValueObject } from '../../../../engine/value-object/base-value-object';import { BooleanValueObject, NullValueObject, NumberValueObject, StringValueObject } from '../../../../engine/value-object/primitive-object';-import { ErrorType } from '../../../../basics/error-type';import { getObjectValue } from '../../../__tests__/create-function-test-bed';-import { ErrorValueObject } from '../../../../engine/value-object/base-value-object';+import { FUNCTION_NAMES_LOOKUP } from '../../function-names';+import { Take } from '../index';describe('Test take function', () => {const testFunction = new Take(FUNCTION_NAMES_LOOKUP.TAKE);diff --git a/packages/engine-formula/src/functions/lookup/take/index.ts b/packages/engine-formula/src/functions/lookup/take/index.tsindex 9059682926..d7cccdad5d 100644--- a/packages/engine-formula/src/functions/lookup/take/index.ts+++ b/packages/engine-formula/src/functions/lookup/take/index.ts@@ -15,12 +15,12 @@*/import { ErrorType } from '../../../basics/error-type';-import type { ArrayValueObject } from '../../../engine/value-object/array-value-object';-import type { BaseValueObject } from '../../../engine/value-object/base-value-object';+import { expandArrayValueObject } from '../../../engine/utils/array-object';import { ErrorValueObject } from '../../../engine/value-object/base-value-object';import { NumberValueObject } from '../../../engine/value-object/primitive-object';import { BaseFunction } from '../../base-function';-import { expandArrayValueObject } from '../../../engine/utils/array-object';+import type { ArrayValueObject } from '../../../engine/value-object/array-value-object';+import type { BaseValueObject } from '../../../engine/value-object/base-value-object';export class Take extends BaseFunction {override minParams = 2;diff --git a/packages/engine-formula/src/functions/lookup/tocol/__tests__/index.spec.ts b/packages/engine-formula/src/functions/lookup/tocol/__tests__/index.spec.tsindex 65599461bf..fccb951f2c 100644--- a/packages/engine-formula/src/functions/lookup/tocol/__tests__/index.spec.ts+++ b/packages/engine-formula/src/functions/lookup/tocol/__tests__/index.spec.ts@@ -16,13 +16,13 @@import { describe, expect, it } from 'vitest';+import { ErrorType } from '../../../../basics/error-type';import { ArrayValueObject, transformToValueObject } from '../../../../engine/value-object/array-value-object';-import { FUNCTION_NAMES_LOOKUP } from '../../function-names';-import { Tocol } from '../index';+import { ErrorValueObject } from '../../../../engine/value-object/base-value-object';import { NullValueObject, NumberValueObject, StringValueObject } from '../../../../engine/value-object/primitive-object';-import { ErrorType } from '../../../../basics/error-type';import { getObjectValue } from '../../../__tests__/create-function-test-bed';-import { ErrorValueObject } from '../../../../engine/value-object/base-value-object';+import { FUNCTION_NAMES_LOOKUP } from '../../function-names';+import { Tocol } from '../index';describe('Test tocol function', () => {const testFunction = new Tocol(FUNCTION_NAMES_LOOKUP.TOCOL);diff --git a/packages/engine-formula/src/functions/lookup/tocol/index.ts b/packages/engine-formula/src/functions/lookup/tocol/index.tsindex 616af14be2..c4ba03e436 100644--- a/packages/engine-formula/src/functions/lookup/tocol/index.ts+++ b/packages/engine-formula/src/functions/lookup/tocol/index.ts@@ -15,11 +15,11 @@*/import { ErrorType } from '../../../basics/error-type';+import { expandArrayValueObject } from '../../../engine/utils/array-object';import { ArrayValueObject } from '../../../engine/value-object/array-value-object';import { type BaseValueObject, ErrorValueObject } from '../../../engine/value-object/base-value-object';import { BooleanValueObject, NumberValueObject } from '../../../engine/value-object/primitive-object';import { BaseFunction } from '../../base-function';-import { expandArrayValueObject } from '../../../engine/utils/array-object';export class Tocol extends BaseFunction {override minParams = 1;diff --git a/packages/engine-formula/src/functions/lookup/torow/__tests__/index.spec.ts b/packages/engine-formula/src/functions/lookup/torow/__tests__/index.spec.tsindex ee2ea73fc0..e3016c0491 100644--- a/packages/engine-formula/src/functions/lookup/torow/__tests__/index.spec.ts+++ b/packages/engine-formula/src/functions/lookup/torow/__tests__/index.spec.ts@@ -16,13 +16,13 @@import { describe, expect, it } from 'vitest';+import { ErrorType } from '../../../../basics/error-type';import { ArrayValueObject, transformToValueObject } from '../../../../engine/value-object/array-value-object';-import { FUNCTION_NAMES_LOOKUP } from '../../function-names';-import { Torow } from '../index';+import { ErrorValueObject } from '../../../../engine/value-object/base-value-object';import { NullValueObject, NumberValueObject, StringValueObject } from '../../../../engine/value-object/primitive-object';-import { ErrorType } from '../../../../basics/error-type';import { getObjectValue } from '../../../__tests__/create-function-test-bed';-import { ErrorValueObject } from '../../../../engine/value-object/base-value-object';+import { FUNCTION_NAMES_LOOKUP } from '../../function-names';+import { Torow } from '../index';describe('Test torow function', () => {const testFunction = new Torow(FUNCTION_NAMES_LOOKUP.TOROW);diff --git a/packages/engine-formula/src/functions/lookup/torow/index.ts b/packages/engine-formula/src/functions/lookup/torow/index.tsindex 7b1123eeb3..ef69e6d4bd 100644--- a/packages/engine-formula/src/functions/lookup/torow/index.ts+++ b/packages/engine-formula/src/functions/lookup/torow/index.ts@@ -15,11 +15,11 @@*/import { ErrorType } from '../../../basics/error-type';+import { expandArrayValueObject } from '../../../engine/utils/array-object';import { ArrayValueObject } from '../../../engine/value-object/array-value-object';import { type BaseValueObject, ErrorValueObject } from '../../../engine/value-object/base-value-object';import { BooleanValueObject, NumberValueObject } from '../../../engine/value-object/primitive-object';import { BaseFunction } from '../../base-function';-import { expandArrayValueObject } from '../../../engine/utils/array-object';export class Torow extends BaseFunction {override minParams = 1;diff --git a/packages/engine-formula/src/functions/lookup/wrapcols/__tests__/index.spec.ts b/packages/engine-formula/src/functions/lookup/wrapcols/__tests__/index.spec.tsindex 7fb952d881..48554651c4 100644--- a/packages/engine-formula/src/functions/lookup/wrapcols/__tests__/index.spec.ts+++ b/packages/engine-formula/src/functions/lookup/wrapcols/__tests__/index.spec.ts@@ -16,13 +16,13 @@import { describe, expect, it } from 'vitest';+import { ErrorType } from '../../../../basics/error-type';import { ArrayValueObject, transformToValueObject } from '../../../../engine/value-object/array-value-object';-import { FUNCTION_NAMES_LOOKUP } from '../../function-names';-import { Wrapcols } from '../index';+import { ErrorValueObject } from '../../../../engine/value-object/base-value-object';import { NullValueObject, NumberValueObject, StringValueObject } from '../../../../engine/value-object/primitive-object';-import { ErrorType } from '../../../../basics/error-type';import { getObjectValue } from '../../../__tests__/create-function-test-bed';-import { ErrorValueObject } from '../../../../engine/value-object/base-value-object';+import { FUNCTION_NAMES_LOOKUP } from '../../function-names';+import { Wrapcols } from '../index';describe('Test wrapcols function', () => {const testFunction = new Wrapcols(FUNCTION_NAMES_LOOKUP.WRAPCOLS);diff --git a/packages/engine-formula/src/functions/lookup/wrapcols/index.ts b/packages/engine-formula/src/functions/lookup/wrapcols/index.tsindex 4317b50884..f4d698bd16 100644--- a/packages/engine-formula/src/functions/lookup/wrapcols/index.ts+++ b/packages/engine-formula/src/functions/lookup/wrapcols/index.ts@@ -15,11 +15,11 @@*/import { ErrorType } from '../../../basics/error-type';+import { expandArrayValueObject } from '../../../engine/utils/array-object';import { ArrayValueObject } from '../../../engine/value-object/array-value-object';import { type BaseValueObject, ErrorValueObject } from '../../../engine/value-object/base-value-object';-import { BaseFunction } from '../../base-function';-import { expandArrayValueObject } from '../../../engine/utils/array-object';import { NumberValueObject } from '../../../engine/value-object/primitive-object';+import { BaseFunction } from '../../base-function';export class Wrapcols extends BaseFunction {override minParams = 2;diff --git a/packages/engine-formula/src/functions/lookup/wraprows/__tests__/index.spec.ts b/packages/engine-formula/src/functions/lookup/wraprows/__tests__/index.spec.tsindex 14aea7a00f..b3bbc4574c 100644--- a/packages/engine-formula/src/functions/lookup/wraprows/__tests__/index.spec.ts+++ b/packages/engine-formula/src/functions/lookup/wraprows/__tests__/index.spec.ts@@ -16,13 +16,13 @@import { describe, expect, it } from 'vitest';+import { ErrorType } from '../../../../basics/error-type';import { ArrayValueObject, transformToValueObject } from '../../../../engine/value-object/array-value-object';-import { FUNCTION_NAMES_LOOKUP } from '../../function-names';-import { Wraprows } from '../index';+import { ErrorValueObject } from '../../../../engine/value-object/base-value-object';import { NullValueObject, NumberValueObject, StringValueObject } from '../../../../engine/value-object/primitive-object';-import { ErrorType } from '../../../../basics/error-type';import { getObjectValue } from '../../../__tests__/create-function-test-bed';-import { ErrorValueObject } from '../../../../engine/value-object/base-value-object';+import { FUNCTION_NAMES_LOOKUP } from '../../function-names';+import { Wraprows } from '../index';describe('Test wraprows function', () => {const testFunction = new Wraprows(FUNCTION_NAMES_LOOKUP.WRAPROWS);diff --git a/packages/engine-formula/src/functions/lookup/wraprows/index.ts b/packages/engine-formula/src/functions/lookup/wraprows/index.tsindex dda148eabd..4355f926b4 100644--- a/packages/engine-formula/src/functions/lookup/wraprows/index.ts+++ b/packages/engine-formula/src/functions/lookup/wraprows/index.ts@@ -15,11 +15,11 @@*/import { ErrorType } from '../../../basics/error-type';+import { expandArrayValueObject } from '../../../engine/utils/array-object';import { ArrayValueObject } from '../../../engine/value-object/array-value-object';import { type BaseValueObject, ErrorValueObject } from '../../../engine/value-object/base-value-object';-import { BaseFunction } from '../../base-function';-import { expandArrayValueObject } from '../../../engine/utils/array-object';import { NumberValueObject } from '../../../engine/value-object/primitive-object';+import { BaseFunction } from '../../base-function';export class Wraprows extends BaseFunction {override minParams = 2;diff --git a/packages/engine-formula/src/models/formula-data.model.ts b/packages/engine-formula/src/models/formula-data.model.tsindex 94f25ddaf6..a36a682d04 100644--- a/packages/engine-formula/src/models/formula-data.model.ts+++ b/packages/engine-formula/src/models/formula-data.model.ts@@ -14,9 +14,12 @@* limitations under the License.*/-import type { ICellData, IObjectMatrixPrimitiveType, IRange, Nullable, Workbook } from '@univerjs/core';import { Disposable, Inject, isFormulaId, isFormulaString, IUniverInstanceService, ObjectMatrix, UniverInstanceType } from '@univerjs/core';+import type { ICellData, IObjectMatrixPrimitiveType, IRange, Nullable, Workbook } from '@univerjs/core';++import { LexerTreeBuilder } from '../engine/analysis/lexer-tree-builder';+import { clearArrayFormulaCellDataByCell, updateFormulaDataByCellValue } from './utils/formula-data-util';import type {IArrayFormulaRangeType,IArrayFormulaUnitCellType,@@ -27,10 +30,7 @@ import type {IUnitData,IUnitSheetNameMap,} from '../basics/common';--import { LexerTreeBuilder } from '../engine/analysis/lexer-tree-builder';import type { IFormulaIdMap } from './utils/formula-data-util';-import { clearArrayFormulaCellDataByCell, updateFormulaDataByCellValue } from './utils/formula-data-util';export interface IRangeChange {oldCell: IRange;diff --git a/packages/engine-formula/src/models/utils/formula-data-util.ts b/packages/engine-formula/src/models/utils/formula-data-util.tsindex 3f58e14ea1..e460bf1dcf 100644--- a/packages/engine-formula/src/models/utils/formula-data-util.ts+++ b/packages/engine-formula/src/models/utils/formula-data-util.ts@@ -14,8 +14,8 @@* limitations under the License.*/-import type { ICellData, IRange, Nullable, ObjectMatrix } from '@univerjs/core';import { isFormulaId, isFormulaString } from '@univerjs/core';+import type { ICellData, IRange, Nullable, ObjectMatrix } from '@univerjs/core';import type { IFormulaDataItem } from '../../basics/common';export interface IFormulaIdMap {diff --git a/packages/engine-formula/src/services/dependency-manager.service.ts b/packages/engine-formula/src/services/dependency-manager.service.tsindex 41cb57e67f..a51b46655e 100644--- a/packages/engine-formula/src/services/dependency-manager.service.ts+++ b/packages/engine-formula/src/services/dependency-manager.service.ts@@ -14,8 +14,8 @@* limitations under the License.*/-import type { Nullable } from '@univerjs/core';import { createIdentifier, Disposable, ObjectMatrix } from '@univerjs/core';+import type { Nullable } from '@univerjs/core';import { FormulaDependencyTreeCache } from '../engine/dependency/dependency-tree';import type { FormulaDependencyTree } from '../engine/dependency/dependency-tree';diff --git a/packages/engine-render/src/basics/tools.ts b/packages/engine-render/src/basics/tools.tsindex 6a1af279e3..3d3a578c83 100644--- a/packages/engine-render/src/basics/tools.ts+++ b/packages/engine-render/src/basics/tools.ts@@ -14,6 +14,8 @@* limitations under the License.*/+import { BaselineOffset, ColorKit, DEFAULT_STYLES, FontStyleType, getCellInfoInMergeData, Rectangle, Tools } from '@univerjs/core';+import * as cjk from 'cjk-regex';import type {IRange,IRangeWithCoord,@@ -24,13 +26,11 @@ import type {LocaleService,Nullable,} from '@univerjs/core';-import { BaselineOffset, ColorKit, DEFAULT_STYLES, FontStyleType, getCellInfoInMergeData, Rectangle, Tools } from '@univerjs/core';-import * as cjk from 'cjk-regex';import { FontCache } from '../components/docs/layout/shaping-engine/font-cache';import { DEFAULT_FONTFACE_PLANE } from './const';-import type { IBoundRectNoAngle } from './vector2';import type { IDocumentSkeletonFontStyle } from './i-document-skeleton-cached';+import type { IBoundRectNoAngle } from './vector2';const DEG180 = 180;diff --git a/packages/engine-render/src/components/sheets/sheet-skeleton.ts b/packages/engine-render/src/components/sheets/sheet-skeleton.tsindex 3222525ed3..552b19dd57 100644--- a/packages/engine-render/src/components/sheets/sheet-skeleton.ts+++ b/packages/engine-render/src/components/sheets/sheet-skeleton.ts@@ -37,6 +37,8 @@ import {VerticalAlign,WrapStrategy,} from '@univerjs/core';+import { distinctUntilChanged, startWith } from 'rxjs';+import type {BorderStyleTypes,IBorderStyleData,@@ -64,11 +66,9 @@ import type {TextDirection,Worksheet,} from '@univerjs/core';--import { distinctUntilChanged, startWith } from 'rxjs';import { BORDER_TYPE, COLOR_BLACK_RGB, MAXIMUM_ROW_HEIGHT } from '../../basics/const';import { getRotateOffsetAndFarthestHypotenuse } from '../../basics/draw';-import type { IDocumentSkeletonColumn } from '../../basics/i-document-skeleton-cached';+import { convertTextRotation, VERTICAL_ROTATE_ANGLE } from '../../basics/text-rotation';import {degToRad,getCellByIndexWithMergeInfo,@@ -78,12 +78,12 @@ import {isRectIntersect,mergeInfoOffset,} from '../../basics/tools';-import type { IBoundRectNoAngle, IViewportInfo } from '../../basics/vector2';-import { columnIterator } from '../docs/layout/tools';import { DocumentSkeleton } from '../docs/layout/doc-skeleton';+import { columnIterator } from '../docs/layout/tools';import { DocumentViewModel } from '../docs/view-model/document-view-model';import { Skeleton } from '../skeleton';-import { convertTextRotation, VERTICAL_ROTATE_ANGLE } from '../../basics/text-rotation';+import type { IDocumentSkeletonColumn } from '../../basics/i-document-skeleton-cached';+import type { IBoundRectNoAngle, IViewportInfo } from '../../basics/vector2';import type { BorderCache, IFontCacheItem, IStylesCache } from './interfaces';/**diff --git a/packages/engine-render/src/components/sheets/spreadsheet.ts b/packages/engine-render/src/components/sheets/spreadsheet.tsindex 713679c449..155a9a7ad9 100644--- a/packages/engine-render/src/components/sheets/spreadsheet.ts+++ b/packages/engine-render/src/components/sheets/spreadsheet.ts@@ -14,30 +14,30 @@* limitations under the License.*/-import type { IRange, ISelectionCellWithMergeInfo, Nullable, ObjectMatrix } from '@univerjs/core';import { BooleanNumber, sortRules, Tools } from '@univerjs/core';+import type { IRange, ISelectionCellWithMergeInfo, Nullable, ObjectMatrix } from '@univerjs/core';import { FIX_ONE_PIXEL_BLUR_OFFSET, RENDER_CLASS_TYPE } from '../../basics/const';// import { clearLineByBorderType } from '../../basics/draw';import { getCellPositionByIndex, getColor } from '../../basics/tools';+import { Documents } from '../docs/document';+import { SpreadsheetExtensionRegistry } from '../extension';+import { SHEET_EXTENSION_PREFIX } from './extensions/sheet-extension';+import { type IPaintForRefresh, type IPaintForScrolling, SHEET_VIEWPORT_KEY } from './interfaces';+// import type { BorderCacheItem } from './interfaces';+import { SheetComponent } from './sheet-component';import type { IBoundRectNoAngle, IViewportInfo, Vector2 } from '../../basics/vector2';import type { Canvas } from '../../canvas';import type { UniverRenderingContext2D } from '../../context';import type { Engine } from '../../engine';import type { Scene } from '../../scene';import type { SceneViewer } from '../../scene-viewer';-import { Documents } from '../docs/document';-import { SpreadsheetExtensionRegistry } from '../extension';+import type { Background } from './extensions/background';import type { Border } from './extensions/border';import type { Font } from './extensions/font';--// import type { BorderCacheItem } from './interfaces';-import { SheetComponent } from './sheet-component';import type { SpreadsheetSkeleton } from './sheet-skeleton';-import { type IPaintForRefresh, type IPaintForScrolling, SHEET_VIEWPORT_KEY } from './interfaces';-import { SHEET_EXTENSION_PREFIX } from './extensions/sheet-extension';const OBJECT_KEY = '__SHEET_EXTENSION_FONT_DOCUMENT_INSTANCE__';diff --git a/packages/engine-render/src/shape/rect.ts b/packages/engine-render/src/shape/rect.tsindex 3aa16ecc3b..220ec6c49a 100644--- a/packages/engine-render/src/shape/rect.ts+++ b/packages/engine-render/src/shape/rect.ts@@ -16,10 +16,10 @@import type { IKeyValue, Nullable } from '@univerjs/core';-import type { UniverRenderingContext } from '../context';import { ObjectType } from '../base-object';-import type { IShapeProps } from './shape';import { Shape } from './shape';+import type { UniverRenderingContext } from '../context';+import type { IShapeProps } from './shape';export interface IRectProps extends IShapeProps {radius?: number;diff --git a/packages/sheets-drawing-ui/src/controllers/sheet-drawing-update.controller.ts b/packages/sheets-drawing-ui/src/controllers/sheet-drawing-update.controller.tsindex 2bdbedeb17..5b7c775dc2 100644--- a/packages/sheets-drawing-ui/src/controllers/sheet-drawing-update.controller.ts+++ b/packages/sheets-drawing-ui/src/controllers/sheet-drawing-update.controller.ts@@ -23,7 +23,7 @@ import { ISheetDrawingService } from '@univerjs/sheets-drawing';import type { WorkbookSelections } from '@univerjs/sheets';import { SheetsSelectionsService } from '@univerjs/sheets';import { attachRangeWithCoord, ISheetSelectionRenderService, SheetSkeletonManagerService } from '@univerjs/sheets-ui';-import { IFileOpenerService, IMessageService } from '@univerjs/ui';+import { ILocalFileService, IMessageService } from '@univerjs/ui';import { MessageType } from '@univerjs/design';import type { IRenderContext, IRenderModule } from '@univerjs/engine-render';import { InsertSheetDrawingCommand } from '../commands/commands/insert-sheet-drawing.command';@@ -43,7 +43,7 @@ export class SheetDrawingUpdateController extends Disposable implements IRenderM@ICommandService private readonly _commandService: ICommandService,@ISheetSelectionRenderService private readonly _selectionRenderService: ISheetSelectionRenderService,@IImageIoService private readonly _imageIoService: IImageIoService,- @IFileOpenerService private readonly _fileOpenerService: IFileOpenerService,+ @ILocalFileService private readonly _fileOpenerService: ILocalFileService,@ISheetDrawingService private readonly _sheetDrawingService: ISheetDrawingService,@IDrawingManagerService private readonly _drawingManagerService: IDrawingManagerService,@IContextService private readonly _contextService: IContextService,diff --git a/packages/sheets-formula/src/controllers/__tests__/create-command-test-bed.ts b/packages/sheets-formula/src/controllers/__tests__/create-command-test-bed.tsindex ac605bcdfa..e2d2fd1ee3 100644--- a/packages/sheets-formula/src/controllers/__tests__/create-command-test-bed.ts+++ b/packages/sheets-formula/src/controllers/__tests__/create-command-test-bed.ts@@ -14,13 +14,13 @@* limitations under the License.*/-import type { Dependency, IWorkbookData, Workbook } from '@univerjs/core';import { ILogService, Inject, Injector, IUniverInstanceService, LocaleType, LogLevel, Plugin, Univer, UniverInstanceType } from '@univerjs/core';import { CalculateFormulaService, DefinedNamesService, FormulaCurrentConfigService, FormulaDataModel, FormulaRuntimeService, IDefinedNamesService, IFormulaCurrentConfigService, IFormulaRuntimeService, LexerTreeBuilder } from '@univerjs/engine-formula';import { IRenderManagerService, RenderManagerService } from '@univerjs/engine-render';import { IRefSelectionsService, RangeProtectionRuleModel, SheetInterceptorService, SheetsSelectionsService, WorkbookPermissionService, WorksheetPermissionService, WorksheetProtectionPointModel, WorksheetProtectionRuleModel } from '@univerjs/sheets';import { EditorBridgeService, IEditorBridgeService, SheetSkeletonManagerService } from '@univerjs/sheets-ui';import { EditorService, IEditorService } from '@univerjs/ui';+import type { Dependency, IWorkbookData, Workbook } from '@univerjs/core';const TEST_WORKBOOK_DATA_DEMO: IWorkbookData = {id: 'test',diff --git a/packages/sheets-formula/src/controllers/__tests__/formula-auto-fill.controller.spec.ts b/packages/sheets-formula/src/controllers/__tests__/formula-auto-fill.controller.spec.tsindex d8405f6d18..b8c6202afc 100644--- a/packages/sheets-formula/src/controllers/__tests__/formula-auto-fill.controller.spec.ts+++ b/packages/sheets-formula/src/controllers/__tests__/formula-auto-fill.controller.spec.ts@@ -14,7 +14,6 @@* limitations under the License.*/-import type { ICellData, Injector, Nullable, Univer } from '@univerjs/core';import {ICommandService,IUniverInstanceService,@@ -43,6 +42,7 @@ import {} from '@univerjs/sheets-ui';import { IPlatformService, IShortcutService, PlatformService, ShortcutService } from '@univerjs/ui';import { afterEach, beforeEach, describe, expect, it } from 'vitest';+import type { ICellData, Injector, Nullable, Univer } from '@univerjs/core';import { FormulaAutoFillController } from '../formula-auto-fill.controller';import { createCommandTestBed } from './create-command-test-bed';diff --git a/packages/sheets-formula/src/controllers/__tests__/update-formula.controller.spec.ts b/packages/sheets-formula/src/controllers/__tests__/update-formula.controller.spec.tsindex 5cc73c2d3c..c0b3d10349 100644--- a/packages/sheets-formula/src/controllers/__tests__/update-formula.controller.spec.ts+++ b/packages/sheets-formula/src/controllers/__tests__/update-formula.controller.spec.ts@@ -14,13 +14,13 @@* limitations under the License.*/-import type { ICellData, Injector, IObjectMatrixPrimitiveType, IWorkbookData, Nullable, Univer } from '@univerjs/core';import { CellValueType, Direction, ICommandService, IUniverInstanceService, LocaleType, RANGE_TYPE, RedoCommand, UndoCommand } from '@univerjs/core';-import type { IDeleteRangeMoveLeftCommandParams, IDeleteRangeMoveUpCommandParams, IInsertColCommandParams, IInsertRowCommandParams, IMoveColsCommandParams, IMoveRangeCommandParams, IMoveRowsCommandParams, InsertRangeMoveDownCommandParams, InsertRangeMoveRightCommandParams, IRemoveRowColCommandParams, IRemoveSheetCommandParams, ISetRangeValuesCommandParams, ISetWorksheetNameCommandParams } from '@univerjs/sheets';+import { SetArrayFormulaDataMutation, SetFormulaDataMutation } from '@univerjs/engine-formula';import { DeleteRangeMoveLeftCommand, DeleteRangeMoveUpCommand, InsertColCommand, InsertColMutation, InsertRangeMoveDownCommand, InsertRangeMoveRightCommand, InsertRowCommand, InsertRowMutation, MoveColsCommand, MoveColsMutation, MoveRangeCommand, MoveRangeMutation, MoveRowsCommand, MoveRowsMutation, RemoveColCommand, RemoveColMutation, RemoveRowCommand, RemoveRowMutation, RemoveSheetCommand, RemoveSheetMutation, SetRangeValuesCommand, SetRangeValuesMutation, SetSelectionsOperation, SetWorksheetNameCommand, SetWorksheetNameMutation, SheetsSelectionsService } from '@univerjs/sheets';import { afterEach, beforeEach, describe, expect, it } from 'vitest';+import type { ICellData, Injector, IObjectMatrixPrimitiveType, IWorkbookData, Nullable, Univer } from '@univerjs/core';-import { SetArrayFormulaDataMutation, SetFormulaDataMutation } from '@univerjs/engine-formula';+import type { IDeleteRangeMoveLeftCommandParams, IDeleteRangeMoveUpCommandParams, IInsertColCommandParams, IInsertRowCommandParams, IMoveColsCommandParams, IMoveRangeCommandParams, IMoveRowsCommandParams, InsertRangeMoveDownCommandParams, InsertRangeMoveRightCommandParams, IRemoveRowColCommandParams, IRemoveSheetCommandParams, ISetRangeValuesCommandParams, ISetWorksheetNameCommandParams } from '@univerjs/sheets';import { UpdateFormulaController } from '../update-formula.controller';import { createCommandTestBed } from './create-command-test-bed';@@ -340,8 +340,7 @@ describe('Test insert function operation', () => {.getValues();getCellData = () => {- return get(IUniverInstanceService).getUniverSheetInstance('test')- ?.getSheetBySheetId('sheet1')?.getCellMatrix().clone();+ return get(IUniverInstanceService).getUniverSheetInstance('test')?.getSheetBySheetId('sheet1')?.getCellMatrix().clone();};});diff --git a/packages/sheets-formula/src/controllers/utils/ref-range-formula.ts b/packages/sheets-formula/src/controllers/utils/ref-range-formula.tsindex 6a71153a9e..2a85859634 100644--- a/packages/sheets-formula/src/controllers/utils/ref-range-formula.ts+++ b/packages/sheets-formula/src/controllers/utils/ref-range-formula.ts@@ -14,11 +14,11 @@* limitations under the License.*/-import type { ICellData, IMutationInfo, IObjectMatrixPrimitiveType, IRange, Nullable } from '@univerjs/core';import { cellToRange, Direction, isFormulaId, isFormulaString, ObjectMatrix } from '@univerjs/core';+import { EffectRefRangId, handleDeleteRangeMoveLeft, handleDeleteRangeMoveUp, handleInsertCol, handleInsertRangeMoveDown, handleInsertRangeMoveRight, handleInsertRow, handleIRemoveCol, handleIRemoveRow, handleMoveCols, handleMoveRange, handleMoveRows, runRefRangeMutations, SetRangeValuesMutation } from '@univerjs/sheets';+import type { ICellData, IMutationInfo, IObjectMatrixPrimitiveType, IRange, Nullable } from '@univerjs/core';import type { IFormulaData, IFormulaDataItem, IRangeChange } from '@univerjs/engine-formula';import type { ISetRangeValuesMutationParams } from '@univerjs/sheets';-import { EffectRefRangId, handleDeleteRangeMoveLeft, handleDeleteRangeMoveUp, handleInsertCol, handleInsertRangeMoveDown, handleInsertRangeMoveRight, handleInsertRow, handleIRemoveCol, handleIRemoveRow, handleMoveCols, handleMoveRange, handleMoveRows, runRefRangeMutations, SetRangeValuesMutation } from '@univerjs/sheets';import { checkFormulaDataNull } from './offset-formula-data';export enum FormulaReferenceMoveType {diff --git a/packages/sheets-ui/src/commands/commands/__tests__/add-worksheet-merge.command.spec.ts b/packages/sheets-ui/src/commands/commands/__tests__/add-worksheet-merge.command.spec.tsindex fdf49a9a3d..175fff30d1 100644--- a/packages/sheets-ui/src/commands/commands/__tests__/add-worksheet-merge.command.spec.ts+++ b/packages/sheets-ui/src/commands/commands/__tests__/add-worksheet-merge.command.spec.ts@@ -14,7 +14,6 @@* limitations under the License.*/-import type { IDisposable, Injector, IRange, Univer, Workbook } from '@univerjs/core';import {ICommandService,IUniverInstanceService,@@ -52,14 +51,15 @@ import {import { type IConfirmPartMethodOptions, IConfirmService } from '@univerjs/ui';import { Subject } from 'rxjs';import { afterEach, beforeEach, describe, expect, it } from 'vitest';+import type { IDisposable, Injector, IRange, Univer, Workbook } from '@univerjs/core';+import { getClearContentMutationParamForRange } from '../../../common/utils';import {AddWorksheetMergeAllCommand,AddWorksheetMergeCommand,AddWorksheetMergeHorizontalCommand,AddWorksheetMergeVerticalCommand,} from '../add-worksheet-merge.command';-import { getClearContentMutationParamForRange } from '../../../common/utils';import { createCommandTestBed } from './create-command-test-bed';describe('Test add worksheet merge commands', () => {@@ -159,7 +159,8 @@ describe('Test add worksheet merge commands', () => {return get(IUniverInstanceService).getUniverSheetInstance('test')?.getSheetBySheetId('sheet1')- ?.getConfig().mergeData;+ ?.getConfig()+ .mergeData;}expect(getMerge()?.length).toBe(0);@@ -205,7 +206,8 @@ describe('Test add worksheet merge commands', () => {return get(IUniverInstanceService).getUniverSheetInstance('test')?.getSheetBySheetId('sheet1')- ?.getConfig().mergeData;+ ?.getConfig()+ .mergeData;}expect(getMerge()?.length).toBe(0);@@ -249,7 +251,8 @@ describe('Test add worksheet merge commands', () => {return get(IUniverInstanceService).getUniverSheetInstance('test')?.getSheetBySheetId('sheet1')- ?.getConfig().mergeData;+ ?.getConfig()+ .mergeData;}expect(getMerge()?.length).toBe(0);@@ -283,7 +286,8 @@ describe('Test add worksheet merge commands', () => {return get(IUniverInstanceService).getUniverSheetInstance('test')?.getSheetBySheetId('sheet1')- ?.getConfig().mergeData;+ ?.getConfig()+ .mergeData;}expect(getMerge()?.length).toBe(0);diff --git a/packages/sheets-ui/src/common/utils.ts b/packages/sheets-ui/src/common/utils.tsindex aa0dd01820..323a912598 100644--- a/packages/sheets-ui/src/common/utils.ts+++ b/packages/sheets-ui/src/common/utils.ts@@ -14,13 +14,13 @@* limitations under the License.*/-import type { IAccessor, ICellData, IMutationInfo, IPosition, IRange, Nullable, Workbook, Worksheet } from '@univerjs/core';import { ObjectMatrix } from '@univerjs/core';import { SHEET_VIEWPORT_KEY, Vector2 } from '@univerjs/engine-render';-import type { ISetRangeValuesMutationParams, ISheetLocation } from '@univerjs/sheets';import { SetRangeValuesMutation, SetRangeValuesUndoMutationFactory } from '@univerjs/sheets';+import type { IAccessor, ICellData, IMutationInfo, IPosition, IRange, Nullable, Workbook, Worksheet } from '@univerjs/core';import type { IBoundRectNoAngle, IRender, Scene, SpreadsheetSkeleton } from '@univerjs/engine-render';import type { ICollaborator } from '@univerjs/protocol';+import type { ISetRangeValuesMutationParams, ISheetLocation } from '@univerjs/sheets';import type { ISheetSkeletonManagerParam } from '../services/sheet-skeleton-manager.service';export function getUserListEqual(userList1: ICollaborator[], userList2: ICollaborator[]) {diff --git a/packages/sheets-ui/src/controllers/editor/__tests__/end-edit.controller.spec.ts b/packages/sheets-ui/src/controllers/editor/__tests__/end-edit.controller.spec.tsindex df0484936c..b32cc2495a 100644--- a/packages/sheets-ui/src/controllers/editor/__tests__/end-edit.controller.spec.ts+++ b/packages/sheets-ui/src/controllers/editor/__tests__/end-edit.controller.spec.ts@@ -14,13 +14,13 @@* limitations under the License.*/-import type { ICellData, IDocumentData, Injector, Univer, Workbook } from '@univerjs/core';import { CellValueType, IContextService, IResourceLoaderService, LocaleService, LocaleType, Tools, UNIVER_INTERNAL } from '@univerjs/core';import { LexerTreeBuilder } from '@univerjs/engine-formula';import { SpreadsheetSkeleton } from '@univerjs/engine-render';import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';-import { getCellDataByInput, isRichText } from '../editing.render-controller';+import type { ICellData, IDocumentData, Injector, Univer, Workbook } from '@univerjs/core';import { normalizeString } from '../../utils/char-tools';+import { getCellDataByInput, isRichText } from '../editing.render-controller';import { createTestBed } from './create-test-bed';import { IMockFunctionService, MockFunctionService } from './mock-function.service';diff --git a/packages/sheets-ui/src/controllers/permission/sheet-permission-interceptor-base.controller.ts b/packages/sheets-ui/src/controllers/permission/sheet-permission-interceptor-base.controller.tsindex 96af54946d..5fb4195232 100644--- a/packages/sheets-ui/src/controllers/permission/sheet-permission-interceptor-base.controller.ts+++ b/packages/sheets-ui/src/controllers/permission/sheet-permission-interceptor-base.controller.ts@@ -17,23 +17,23 @@/* eslint-disable complexity *//* eslint-disable max-lines-per-function */-import type { ICellData, ICellDataForSheetInterceptor, ICommandInfo, IObjectMatrixPrimitiveType, IPermissionTypes, IRange, Nullable, Workbook, WorkbookPermissionPointConstructor, Worksheet } from '@univerjs/core';import { CustomCommandExecutionError, Disposable, DisposableCollection, FOCUSING_EDITOR_STANDALONE, ICommandService, IContextService, Inject, IPermissionService, isICellData, IUniverInstanceService, LifecycleStages, LocaleService, ObjectMatrix, OnLifecycle, Rectangle, Tools, UniverInstanceType } from '@univerjs/core';-import type { IMoveColsCommandParams, IMoveRangeCommandParams, IMoveRowsCommandParams, ISetRangeValuesCommandParams, ISetSpecificColsVisibleCommandParams, ISetSpecificRowsVisibleCommandParams, ISetWorksheetNameMutationParams } from '@univerjs/sheets';-import { ClearSelectionContentCommand, DeleteRangeMoveLeftCommand, DeleteRangeMoveUpCommand, DeltaColumnWidthCommand, DeltaRowHeightCommand, getSheetCommandTarget, InsertRangeMoveDownCommand, InsertRangeMoveRightCommand, MoveColsCommand, MoveRangeCommand, MoveRowsCommand, RangeProtectionPermissionEditPoint, RangeProtectionPermissionViewPoint, RangeProtectionRuleModel, SetBackgroundColorCommand, SetColWidthCommand, SetRangeValuesCommand, SetRowHeightCommand, SetSelectedColsVisibleCommand, SetSelectedRowsVisibleCommand, SetSpecificColsVisibleCommand, SetSpecificRowsVisibleCommand, SetWorksheetNameCommand, SetWorksheetNameMutation, SetWorksheetOrderCommand, SetWorksheetRowIsAutoHeightCommand, SetWorksheetShowCommand, SheetsSelectionsService, WorkbookCopyPermission, WorkbookEditablePermission, WorkbookHideSheetPermission, WorkbookManageCollaboratorPermission, WorkbookMoveSheetPermission, WorkbookRenameSheetPermission, WorksheetCopyPermission, WorksheetEditPermission, WorksheetProtectionRuleModel, WorksheetSetCellStylePermission, WorksheetSetCellValuePermission, WorksheetSetColumnStylePermission, WorksheetSetRowStylePermission, WorksheetViewPermission } from '@univerjs/sheets';-import { IDialogService } from '@univerjs/ui';import { IMEInputCommand, InsertCommand } from '@univerjs/docs';-import { UnitAction } from '@univerjs/protocol';import { deserializeRangeWithSheet, IDefinedNamesService, LexerTreeBuilder, operatorToken, sequenceNodeType } from '@univerjs/engine-formula';-import { UNIVER_SHEET_PERMISSION_ALERT_DIALOG, UNIVER_SHEET_PERMISSION_ALERT_DIALOG_ID } from '../../views/permission/error-msg-dialog/interface';-import type { ISheetPasteParams } from '../../commands/commands/clipboard.command';+import { UnitAction } from '@univerjs/protocol';+import { ClearSelectionContentCommand, DeleteRangeMoveLeftCommand, DeleteRangeMoveUpCommand, DeltaColumnWidthCommand, DeltaRowHeightCommand, getSheetCommandTarget, InsertRangeMoveDownCommand, InsertRangeMoveRightCommand, MoveColsCommand, MoveRangeCommand, MoveRowsCommand, RangeProtectionPermissionEditPoint, RangeProtectionPermissionViewPoint, RangeProtectionRuleModel, SetBackgroundColorCommand, SetColWidthCommand, SetRangeValuesCommand, SetRowHeightCommand, SetSelectedColsVisibleCommand, SetSelectedRowsVisibleCommand, SetSpecificColsVisibleCommand, SetSpecificRowsVisibleCommand, SetWorksheetNameCommand, SetWorksheetNameMutation, SetWorksheetOrderCommand, SetWorksheetRowIsAutoHeightCommand, SetWorksheetShowCommand, SheetsSelectionsService, WorkbookCopyPermission, WorkbookEditablePermission, WorkbookHideSheetPermission, WorkbookManageCollaboratorPermission, WorkbookMoveSheetPermission, WorkbookRenameSheetPermission, WorksheetCopyPermission, WorksheetEditPermission, WorksheetProtectionRuleModel, WorksheetSetCellStylePermission, WorksheetSetCellValuePermission, WorksheetSetColumnStylePermission, WorksheetSetRowStylePermission, WorksheetViewPermission } from '@univerjs/sheets';+import { IDialogService } from '@univerjs/ui';+import type { ICellData, ICellDataForSheetInterceptor, ICommandInfo, IObjectMatrixPrimitiveType, IPermissionTypes, IRange, Nullable, Workbook, WorkbookPermissionPointConstructor, Worksheet } from '@univerjs/core';+import type { IMoveColsCommandParams, IMoveRangeCommandParams, IMoveRowsCommandParams, ISetRangeValuesCommandParams, ISetSpecificColsVisibleCommandParams, ISetSpecificRowsVisibleCommandParams, ISetWorksheetNameMutationParams } from '@univerjs/sheets';+import { AutoFillCommand } from '../../commands/commands/auto-fill.command';import { SheetCopyCommand, SheetCutCommand, SheetPasteColWidthCommand, SheetPasteShortKeyCommand } from '../../commands/commands/clipboard.command';-import { IAutoFillService } from '../../services/auto-fill/auto-fill.service';-import { SetCellEditVisibleOperation } from '../../commands/operations/cell-edit.operation';-import { ApplyFormatPainterCommand } from '../../commands/commands/set-format-painter.command';import { SetRangeBoldCommand, SetRangeItalicCommand, SetRangeStrickThroughCommand, SetRangeUnderlineCommand } from '../../commands/commands/inline-format.command';-import { AutoFillCommand } from '../../commands/commands/auto-fill.command';+import { ApplyFormatPainterCommand } from '../../commands/commands/set-format-painter.command';+import { SetCellEditVisibleOperation } from '../../commands/operations/cell-edit.operation';+import { IAutoFillService } from '../../services/auto-fill/auto-fill.service';import { PREDEFINED_HOOK_NAME } from '../../services/clipboard/clipboard.service';+import { UNIVER_SHEET_PERMISSION_ALERT_DIALOG, UNIVER_SHEET_PERMISSION_ALERT_DIALOG_ID } from '../../views/permission/error-msg-dialog/interface';+import type { ISheetPasteParams } from '../../commands/commands/clipboard.command';import type { IEditorBridgeServiceVisibleParam } from '../../services/editor-bridge.service';type ICellPermission = Record<UnitAction, boolean> & { ruleId?: string; ranges?: IRange[] };diff --git a/packages/sheets-ui/src/controllers/render-controllers/header-move.render-controller.ts b/packages/sheets-ui/src/controllers/render-controllers/header-move.render-controller.tsindex 2caa83c99a..b945fddba3 100644--- a/packages/sheets-ui/src/controllers/render-controllers/header-move.render-controller.ts+++ b/packages/sheets-ui/src/controllers/render-controllers/header-move.render-controller.ts@@ -14,18 +14,11 @@* limitations under the License.*/-import type {- EventState,- IRange,- Nullable,- Workbook,-} from '@univerjs/core';import {createInterceptorKey, Disposable, ICommandService,Inject,InterceptorManager,RANGE_TYPE } from '@univerjs/core';-import type { IMouseEvent, IPointerEvent, IRenderContext, IRenderModule, SpreadsheetColumnHeader, SpreadsheetHeader } from '@univerjs/engine-render';import {CURSOR_TYPE,Rect,@@ -34,14 +27,21 @@ import {SHEET_VIEWPORT_KEY,Vector2,} from '@univerjs/engine-render';-import type { IMoveColsCommandParams, IMoveRowsCommandParams, ISelectionWithStyle, WorkbookSelections } from '@univerjs/sheets';import {MoveColsCommand,MoveRowsCommand,SheetsSelectionsService,} from '@univerjs/sheets';-import { Subscription } from 'rxjs';+import type {+ EventState,+ IRange,+ Nullable,+ Workbook,+} from '@univerjs/core';+import type { IMouseEvent, IPointerEvent, IRenderContext, IRenderModule, SpreadsheetColumnHeader, SpreadsheetHeader } from '@univerjs/engine-render';++import type { IMoveColsCommandParams, IMoveRowsCommandParams, ISelectionWithStyle, WorkbookSelections } from '@univerjs/sheets';import { SHEET_COMPONENT_HEADER_LAYER_INDEX, SHEET_VIEW_KEY } from '../../common/keys';import { SheetSkeletonManagerService } from '../../services/sheet-skeleton-manager.service';import { getCoordByOffset } from '../utils/component-tools';diff --git a/packages/sheets-ui/src/services/selection/mobile-selection-shape.ts b/packages/sheets-ui/src/services/selection/mobile-selection-shape.tsindex 1a77679009..7d544b97ae 100644--- a/packages/sheets-ui/src/services/selection/mobile-selection-shape.ts+++ b/packages/sheets-ui/src/services/selection/mobile-selection-shape.ts@@ -14,10 +14,10 @@* limitations under the License.*/-import type { ThemeService } from '@univerjs/core';import { RANGE_TYPE } from '@univerjs/core';-import type { BaseObject, IRectProps, Scene } from '@univerjs/engine-render';import { Rect, SHEET_VIEWPORT_KEY } from '@univerjs/engine-render';+import type { ThemeService } from '@univerjs/core';+import type { BaseObject, IRectProps, Scene } from '@univerjs/engine-render';import type { ISelectionStyle } from '@univerjs/sheets';import { SHEET_COMPONENT_SELECTION_LAYER_INDEX } from '../../common/keys';diff --git a/packages/sheets-ui/src/services/selection/selection-shape.ts b/packages/sheets-ui/src/services/selection/selection-shape.tsindex c738b40e61..698edda214 100644--- a/packages/sheets-ui/src/services/selection/selection-shape.ts+++ b/packages/sheets-ui/src/services/selection/selection-shape.ts@@ -14,17 +14,17 @@* limitations under the License.*/-import type { IRangeWithCoord, ISelectionCellWithMergeInfo, Nullable, ThemeService } from '@univerjs/core';import { ColorKit, Disposable, RANGE_TYPE, toDisposable } from '@univerjs/core';-import type { IObjectFullState, IRectProps, Scene } from '@univerjs/engine-render';import { cancelRequestFrame, DashedRect, FIX_ONE_PIXEL_BLUR_OFFSET, Group, Rect, requestNewFrame, TRANSFORM_CHANGE_OBSERVABLE_TYPE } from '@univerjs/engine-render';-import type { ISelectionStyle, ISelectionWidgetConfig, ISelectionWithCoordAndStyle } from '@univerjs/sheets';import {getNormalSelectionStyle,SELECTION_CONTROL_BORDER_BUFFER_COLOR,SELECTION_CONTROL_BORDER_BUFFER_WIDTH,} from '@univerjs/sheets';import { BehaviorSubject, Subject } from 'rxjs';+import type { IRangeWithCoord, ISelectionCellWithMergeInfo, Nullable, ThemeService } from '@univerjs/core';+import type { IObjectFullState, IRectProps, Scene } from '@univerjs/engine-render';+import type { ISelectionStyle, ISelectionWidgetConfig, ISelectionWithCoordAndStyle } from '@univerjs/sheets';import { SHEET_COMPONENT_HEADER_SELECTION_LAYER_INDEX, SHEET_COMPONENT_SELECTION_LAYER_INDEX } from '../../common/keys';import { SelectionRenderModel } from './selection-render-model';diff --git a/packages/sheets/src/basics/cell-style.ts b/packages/sheets/src/basics/cell-style.tsindex 556910174f..816065d423 100644--- a/packages/sheets/src/basics/cell-style.ts+++ b/packages/sheets/src/basics/cell-style.ts@@ -14,8 +14,8 @@* limitations under the License.*/-import type { IBorderData, ICellData, IDocumentData, IKeyValue, IParagraph, IStyleData, ITextRun, ITextStyle, Nullable, Styles } from '@univerjs/core';import { normalizeTextRuns, Tools } from '@univerjs/core';+import type { IBorderData, ICellData, IDocumentData, IKeyValue, IParagraph, IStyleData, ITextRun, ITextStyle, Nullable, Styles } from '@univerjs/core';export function handleStyle(styles: Styles, oldVal: ICellData, newVal: ICellData) {// use null to clear stylediff --git a/packages/sheets/src/commands/commands/__tests__/set-range-values.command.spec.ts b/packages/sheets/src/commands/commands/__tests__/set-range-values.command.spec.tsindex 80ab116cad..3c0e654223 100644--- a/packages/sheets/src/commands/commands/__tests__/set-range-values.command.spec.ts+++ b/packages/sheets/src/commands/commands/__tests__/set-range-values.command.spec.ts@@ -14,7 +14,6 @@* limitations under the License.*/-import type { ICellData, IDocumentData, Injector, IStyleData, IWorkbookData, Nullable, Univer, Workbook } from '@univerjs/core';import {BooleanNumber,CellValueType,@@ -27,14 +26,15 @@ import {UndoCommand,UniverInstanceType,} from '@univerjs/core';+import { DEFAULT_TEXT_FORMAT } from '@univerjs/engine-numfmt';import { afterEach, beforeEach, describe, expect, it } from 'vitest';-import { DEFAULT_TEXT_FORMAT } from '@univerjs/engine-numfmt';+import type { ICellData, IDocumentData, Injector, IStyleData, IWorkbookData, Nullable, Univer, Workbook } from '@univerjs/core';import { SheetsSelectionsService } from '../../../services/selections/selection-manager.service';import { SetRangeValuesMutation } from '../../mutations/set-range-values.mutation';-import type { ISetRangeValuesCommandParams } from '../set-range-values.command';import { SetRangeValuesCommand } from '../set-range-values.command';import { createCommandTestBed } from './create-command-test-bed';+import type { ISetRangeValuesCommandParams } from '../set-range-values.command';const getTestWorkbookDataDemo = (): IWorkbookData => ({id: 'test',diff --git a/packages/sheets/src/commands/mutations/set-range-values.mutation.ts b/packages/sheets/src/commands/mutations/set-range-values.mutation.tsindex 0f9743b2bc..976aeaf591 100644--- a/packages/sheets/src/commands/mutations/set-range-values.mutation.ts+++ b/packages/sheets/src/commands/mutations/set-range-values.mutation.ts@@ -14,6 +14,7 @@* limitations under the License.*/+import { CommandType, IUniverInstanceService, ObjectMatrix, Tools } from '@univerjs/core';import type {IAccessor,ICellData,@@ -25,11 +26,10 @@ import type {Nullable,Workbook,} from '@univerjs/core';-import { CommandType, IUniverInstanceService, ObjectMatrix, Tools } from '@univerjs/core';+import { handleCustom, transformCustom } from '../../basics/cell-custom';import { handleStyle, transformStyle } from '../../basics/cell-style';-import { getCellValue, setNull } from '../../basics/cell-value';import { getCellType } from '../../basics/cell-type';-import { handleCustom, transformCustom } from '../../basics/cell-custom';+import { getCellValue, setNull } from '../../basics/cell-value';/** Params of `SetRangeValuesMutation` */export interface ISetRangeValuesMutationParams extends IMutationCommonParams {diff --git a/packages/sheets/src/services/selections/selection-manager.service.ts b/packages/sheets/src/services/selections/selection-manager.service.tsindex f02fb4d29a..f63728699a 100644--- a/packages/sheets/src/services/selections/selection-manager.service.ts+++ b/packages/sheets/src/services/selections/selection-manager.service.ts@@ -14,10 +14,10 @@* limitations under the License.*/-import type { DeepReadonly, ISelectionCell, Nullable, Workbook } from '@univerjs/core';import { Disposable, IUniverInstanceService, RxDisposable, UniverInstanceType } from '@univerjs/core';-import type { Observable } from 'rxjs';import { BehaviorSubject, of, shareReplay, Subject, switchMap, takeUntil } from 'rxjs';+import type { DeepReadonly, ISelectionCell, Nullable, Workbook } from '@univerjs/core';+import type { Observable } from 'rxjs';import type { ISelectionWithStyle } from '../../basics/selection';diff --git a/packages/slides-ui/src/commands/operations/insert-image.operation.ts b/packages/slides-ui/src/commands/operations/insert-image.operation.tsindex 357d865fc2..7649020249 100644--- a/packages/slides-ui/src/commands/operations/insert-image.operation.ts+++ b/packages/slides-ui/src/commands/operations/insert-image.operation.ts@@ -17,7 +17,7 @@import type { ICommand, SlideDataModel } from '@univerjs/core';import { CommandType, IUniverInstanceService, PageElementType, UniverInstanceType } from '@univerjs/core';import { DRAWING_IMAGE_ALLOW_IMAGE_LIST, getImageSize, IImageIoService } from '@univerjs/drawing';-import { IFileOpenerService } from '@univerjs/ui';+import { ILocalFileService } from '@univerjs/ui';import { CanvasView } from '../../controllers/canvas-view';export const InsertSlideFloatImageCommand: ICommand<{}> = {@@ -28,7 +28,7 @@ export const InsertSlideFloatImageCommand: ICommand<{}> = {const unitId = univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SLIDE)?.getUnitId();if (!unitId) return false;- const fileOpenerService = accessor.get(IFileOpenerService);+ const fileOpenerService = accessor.get(ILocalFileService);const files = await fileOpenerService.openFile({multiple: true,accept: DRAWING_IMAGE_ALLOW_IMAGE_LIST.map((image) => `.${image.replace('image/', '')}`).join(','),diff --git a/packages/ui/src/index.ts b/packages/ui/src/index.tsindex 0c8d6f757a..790f87a2e8 100644--- a/packages/ui/src/index.ts+++ b/packages/ui/src/index.ts@@ -32,7 +32,7 @@ export { IUIController, type IWorkbenchOptions } from './controllers/ui/ui.contrexport { type IUniverUIConfig } from './controllers/config.schema';export { DesktopUIController } from './controllers/ui/ui-desktop.controller';export { IUIPartsService, BuiltInUIPart, UIPartsService } from './services/parts/parts.service';-export { type IOpenFileOptions, IFileOpenerService } from './services/file-opener/file-opener.service';+export { type IOpenFileOptions, ILocalFileService } from './services/local-file/file-opener.service';export { DesktopBeforeCloseService, IBeforeCloseService } from './services/before-close/before-close.service';export { CopyCommand, CutCommand, PasteCommand } from './services/clipboard/clipboard.command';export {diff --git a/packages/ui/src/services/file-opener/desktop-file-opener.service.tsx b/packages/ui/src/services/local-file/desktop-file-opener.service.tsxsimilarity index 84%rename from packages/ui/src/services/file-opener/desktop-file-opener.service.tsxrename to packages/ui/src/services/local-file/desktop-file-opener.service.tsxindex 481853ce9a..d6e5e92ec5 100644--- a/packages/ui/src/services/file-opener/desktop-file-opener.service.tsx+++ b/packages/ui/src/services/local-file/desktop-file-opener.service.tsx@@ -22,13 +22,13 @@ import { connectInjector, Disposable, Inject, Injector, useDependency, useObservimport { Subject } from 'rxjs';import { BuiltInUIPart, IUIPartsService } from '../parts/parts.service';import type { IOpenFileOptions } from './file-opener.service';-import { IFileOpenerService } from './file-opener.service';+import { ILocalFileService } from './file-opener.service';interface IOpenFileRequest extends IOpenFileOptions {onFileSelected: (files: File[]) => void;}-export class DesktopFileOpenerService extends Disposable implements IFileOpenerService {+export class DesktopLocalFileService extends Disposable implements ILocalFileService {private readonly _fileOpenRequest$ = new Subject<IOpenFileRequest | null>();readonly fileOpenRequest$ = this._fileOpenRequest$.asObservable();@@ -58,6 +58,13 @@ export class DesktopFileOpenerService extends Disposable implements IFileOpenerSthis._fileOpenRequest$.next(request);});}++ downloadFile(data: Blob, fileName: string): void {+ const a = document.createElement('a');+ a.download = fileName;+ a.href = window.URL.createObjectURL(data);+ a.click();+ }}function DesktopFileOpener(props: { request: IOpenFileRequest }) {@@ -88,8 +95,8 @@ function DesktopFileOpener(props: { request: IOpenFileRequest }) {}function DesktopFileOpenerWrapper() {- const desktopFileOpenerService = useDependency(IFileOpenerService) as DesktopFileOpenerService;- const request = useObservable(desktopFileOpenerService.fileOpenRequest$, null);+ const DesktopLocalFileService = useDependency(ILocalFileService) as DesktopLocalFileService;+ const request = useObservable(DesktopLocalFileService.fileOpenRequest$, null);if (!request) return null;return <DesktopFileOpener request={request} />;diff --git a/packages/ui/src/services/file-opener/file-opener.service.ts b/packages/ui/src/services/local-file/file-opener.service.tssimilarity index 81%rename from packages/ui/src/services/file-opener/file-opener.service.tsrename to packages/ui/src/services/local-file/file-opener.service.tsindex e7b7da5364..90cad81813 100644--- a/packages/ui/src/services/file-opener/file-opener.service.ts+++ b/packages/ui/src/services/local-file/file-opener.service.ts@@ -21,12 +21,13 @@ export interface IOpenFileOptions {multiple?: boolean;}-export interface IFileOpenerService {+export interface ILocalFileService {openFile(options?: IOpenFileOptions): Promise<File[]>;+ downloadFile(data: Blob, fileName: string): void;}/*** This service is used to upload files.*/-export const IFileOpenerService = createIdentifier<IFileOpenerService>('univer.ui.file-opener.service');+export const ILocalFileService = createIdentifier<ILocalFileService>('univer-ui.local-file.service');diff --git a/packages/ui/src/ui-plugin.ts b/packages/ui/src/ui-plugin.tsindex c3d9304983..2e3f89d0b5 100644--- a/packages/ui/src/ui-plugin.ts+++ b/packages/ui/src/ui-plugin.ts@@ -57,8 +57,8 @@ import { CanvasFloatDomService } from './services/dom/canvas-dom-layer.service';import { IMenuManagerService, MenuManagerService } from './services/menu/menu-manager.service';import type { IUniverUIConfig } from './controllers/config.schema';import { defaultPluginConfig, PLUGIN_CONFIG_KEY } from './controllers/config.schema';-import { IFileOpenerService } from './services/file-opener/file-opener.service';-import { DesktopFileOpenerService } from './services/file-opener/desktop-file-opener.service';+import { ILocalFileService } from './services/local-file/file-opener.service';+import { DesktopLocalFileService } from './services/local-file/desktop-file-opener.service';export const UNIVER_UI_PLUGIN_NAME = 'UNIVER_UI_PLUGIN';@@ -113,7 +113,7 @@ export class UniverUIPlugin extends Plugin {[IMessageService, { useClass: DesktopMessageService, lazy: true }],[ILocalStorageService, { useClass: DesktopLocalStorageService, lazy: true }],[IBeforeCloseService, { useClass: DesktopBeforeCloseService }],- [IFileOpenerService, { useClass: DesktopFileOpenerService }],+ [ILocalFileService, { useClass: DesktopLocalFileService }],[IEditorService, { useClass: EditorService }],[IRangeSelectorService, { useClass: RangeSelectorService }],[ICanvasPopupService, { useClass: CanvasPopupService }],diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 2e559c6ab4..b8b0c9b31f 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -118,7 +118,7 @@ importers:vite-plugin-dts:specifier: ^4.2.1- version: 4.2.1(@types/[email protected])([email protected])([email protected])([email protected](@types/[email protected])([email protected])([email protected])([email protected]))+ version: 4.2.1(@types/[email protected])([email protected])([email protected])([email protected](@types/[email protected])([email protected])([email protected])([email protected]))vitest:specifier: ^2.0.5version: 2.0.5(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])@@ -195,6 +195,9 @@ importers:examples:dependencies:+ '@univerjs/action-recorder':+ specifier: workspace:*+ version: link:../packages-experimental/action-recorder'@univerjs/core':specifier: workspace:*version: link:../packages/core@@ -401,6 +404,55 @@ importers:specifier: ^5.6.2version: 5.6.2+ packages-experimental/action-recorder:+ dependencies:+ '@univerjs/core':+ specifier: workspace:*+ version: link:../../packages/core+ '@univerjs/design':+ specifier: workspace:*+ version: link:../../packages/design+ '@univerjs/icons':+ specifier: ^0.1.78+ '@univerjs/sheets':+ specifier: workspace:*+ version: link:../../packages/sheets+ '@univerjs/sheets-filter-ui':+ specifier: workspace:*+ version: link:../../packages/sheets-filter-ui+ '@univerjs/sheets-ui':+ specifier: workspace:*+ version: link:../../packages/sheets-ui+ '@univerjs/ui':+ specifier: workspace:*+ version: link:../../packages/ui+ clsx:+ specifier: ^2.1.1+ version: 2.1.1+ devDependencies:+ '@univerjs-infra/shared':+ specifier: workspace:*+ version: link:../../common/shared+ less:+ specifier: ^4.2.0+ version: 4.2.0+ react:+ specifier: 18.3.1+ version: 18.3.1+ rxjs:+ specifier: ^7.8.1+ version: 7.8.1+ typescript:+ specifier: ^5.6.2+ version: 5.6.2+ vite:+ specifier: ^5.4.3+ vitest:+ specifier: ^2.0.5+ version: 2.0.5(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])+packages-experimental/debugger:dependencies:'@univerjs/core':@@ -862,7 +914,7 @@ importers:'@rc-component/trigger':specifier: ^2.2.2'@types/react-mentions':specifier: ^4.4.0version: 4.4.0@@ -3328,21 +3380,11 @@ packages:engines: {node: '>=6.0.0'}hasBin: true- '@babel/[email protected]':- resolution: {integrity: sha512-iLTJKDbJ4hMvFPgQwwsVoxtHyWpKKPBrxkANrSYewDPaPpT5py5yeVkgPIJ7XYXhndxJpaA3PyALSXQ7u8e/Dw==}- engines: {node: '>=6.0.0'}- hasBin: true-'@babel/[email protected]':resolution: {integrity: sha512-nq+eWrOgdtu3jG5Os4TQP3x3cLA8hR8TvJNjD8vnPa20WGycimcparWnLK4jJhElTK6SDyuJo1weMKO/5LpmLA==}engines: {node: '>=6.0.0'}hasBin: true- '@babel/[email protected]':- resolution: {integrity: sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q==}- engines: {node: '>=6.0.0'}- hasBin: true-'@babel/[email protected]':resolution: {integrity: sha512-wUrcsxZg6rqBXG05HG1FPYgsP6EvwF4WpBbxIpWIIYnH8wG0gzx3yZY3dtEHas4sTAOGkbTsc9EGPxwff8lRoA==}engines: {node: '>=6.9.0'}@@ -3855,10 +3897,6 @@ packages:resolution: {integrity: sha512-DSgLeL/FNcpXuzav5wfYvHCGvynXkJbn3Zvc3823AEe9nPwW9IK4UoCSS5yGymmQzN0pCPvivtgS6/8U2kkm1w==}engines: {node: '>=6.9.0'}- '@babel/[email protected]':- resolution: {integrity: sha512-VBj9MYyDb9tuLq7yzqjgzt6Q+IBQLrGZfdjOekyEirZPHxXWoTSGUTMrpsfi58Up73d13NfYLv8HT9vmznjzhQ==}- engines: {node: '>=6.9.0'}-'@babel/[email protected]':resolution: {integrity: sha512-TuI4qpWZP6lGOGIuGWtp9sPluqYICmbk8T/1vpSysqJxRPkudh/ofFWyqdcMsDf2s7KvDL4/YHgKyvcS3g9CJQ==}@@ -3882,18 +3920,10 @@ packages:resolution: {integrity: sha512-XEFXSlxiG5td2EJRe8vOmRbaXVgfcBlszKujvVmWIK/UpywWljQCfzAv3RQCGujWQ1RD4YYWEAqDXfuJiy8f5Q==}engines: {node: '>=6.9.0'}- '@babel/[email protected]':- resolution: {integrity: sha512-YTnYtra7W9e6/oAZEHj0bJehPRUlLH9/fbpT5LfB0NhQXyALCRkRs3zH9v07IYhkgpqX6Z78FnuccZr/l4Fs4Q==}- engines: {node: '>=6.9.0'}-'@babel/[email protected]':resolution: {integrity: sha512-zQ1ijeeCXVEh+aNL0RlmkPkG8HUiDcU2pzQQFjtbntgAczRASFzj4H+6+bV+dy1ntKR14I/DypeuRG1uma98iQ==}engines: {node: '>=6.9.0'}- '@babel/[email protected]':- resolution: {integrity: sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==}- engines: {node: '>=6.9.0'}-'@base2/[email protected]':resolution: {integrity: sha512-4iri8i1AqYHJE2DstZYkyEprg6Pq6sKx3xn5FpySk9sNhH7qN2LLlHJCfDTZRILNwQNPD7mATWM0TBui7uC1pA==}@@ -4714,8 +4744,8 @@ packages:react: '>=16.9.0'react-dom: '>=16.9.0'- '@rc-component/[email protected]':- resolution: {integrity: sha512-xDyi0fJ3IV6XJEReMOewS9PEnnuLHKz4rjbgIniDsJFHjL5nROuUlu64mfo90jglLDkQUxRwK7aTtumA65/zYQ==}+ '@rc-component/[email protected]':+ resolution: {integrity: sha512-X1oFIpKoXAMXNDYCviOmTfuNuYxE4h5laBsyCqVAVMjNHxoF3/uiyA7XdegK1XbCvBbCZ6P6byWrEoDRpKL8+A==}engines: {node: '>=8.x'}peerDependencies:react: '>=16.9.0'@@ -4751,83 +4781,83 @@ packages:rollup:optional: true- '@rollup/[email protected]':- resolution: {integrity: sha512-fSuPrt0ZO8uXeS+xP3b+yYTCBUd05MoSp2N/MFOgjhhUhMmchXlpTQrTpI8T+YAwAQuK7MafsCOxW7VrPMrJcg==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-2thheikVEuU7ZxFXubPDOtspKn1x0yqaYQwvALVtEcvFhMifPADBrgRPyHV0TF3b+9BgvgjgagVyvA/UqPZHmg==}cpu: [arm]os: [android]- '@rollup/[email protected]':- resolution: {integrity: sha512-xGU5ZQmPlsjQS6tzTTGwMsnKUtu0WVbl0hYpTPauvbRAnmIvpInhJtgjj3mcuJpEiuUw4v1s4BimkdfDWlh7gA==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-t1lLYn4V9WgnIFHXy1d2Di/7gyzBWS8G5pQSXdZqfrdCGTwi1VasRMSS81DTYb+avDs/Zz4A6dzERki5oRYz1g==}cpu: [arm64]os: [android]- '@rollup/[email protected]':- resolution: {integrity: sha512-99AhQ3/ZMxU7jw34Sq8brzXqWH/bMnf7ZVhvLk9QU2cOepbQSVTns6qoErJmSiAvU3InRqC2RRZ5ovh1KN0d0Q==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-AH/wNWSEEHvs6t4iJ3RANxW5ZCK3fUnmf0gyMxWCesY1AlUj8jY7GC+rQE4wd3gwmZ9XDOpL0kcFnCjtN7FXlA==}cpu: [arm64]os: [darwin]- '@rollup/[email protected]':- resolution: {integrity: sha512-ZbRaUvw2iN/y37x6dY50D8m2BnDbBjlnMPotDi/qITMJ4sIxNY33HArjikDyakhSv0+ybdUxhWxE6kTI4oX26w==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-dO0BIz/+5ZdkLZrVgQrDdW7m2RkrLwYTh2YMFG9IpBtlC1x1NPNSXkfczhZieOlOLEqgXOFH3wYHB7PmBtf+Bg==}cpu: [x64]os: [darwin]- '@rollup/[email protected]':- resolution: {integrity: sha512-ztRJJMiE8nnU1YFcdbd9BcH6bGWG1z+jP+IPW2oDUAPxPjo9dverIOyXz76m6IPA6udEL12reYeLojzW2cYL7w==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-sWWgdQ1fq+XKrlda8PsMCfut8caFwZBmhYeoehJ05FdI0YZXk6ZyUjWLrIgbR/VgiGycrFKMMgp7eJ69HOF2pQ==}cpu: [arm]os: [linux]- '@rollup/[email protected]':- resolution: {integrity: sha512-flOcGHDZajGKYpLV0JNc0VFH361M7rnV1ee+NTeC/BQQ1/0pllYcFmxpagltANYt8FYf9+kL6RSk80Ziwyhr7w==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-9OIiSuj5EsYQlmwhmFRA0LRO0dRRjdCVZA3hnmZe1rEwRk11Jy3ECGGq3a7RrVEZ0/pCsYWx8jG3IvcrJ6RCew==}cpu: [arm]os: [linux]- '@rollup/[email protected]':- resolution: {integrity: sha512-69CF19Kp3TdMopyteO/LJbWufOzqqXzkrv4L2sP8kfMaAQ6iwky7NoXTp7bD6/irKgknDKM0P9E/1l5XxVQAhw==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-0kuAkRK4MeIUbzQYu63NrJmfoUVicajoRAL1bpwdYIYRcs57iyIV9NLcuyDyDXE2GiZCL4uhKSYAnyWpjZkWow==}cpu: [arm64]os: [linux]- '@rollup/[email protected]':- resolution: {integrity: sha512-48pD/fJkTiHAZTnZwR0VzHrao70/4MlzJrq0ZsILjLW/Ab/1XlVUStYyGt7tdyIiVSlGZbnliqmult/QGA2O2w==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-/6dYC9fZtfEY0vozpc5bx1RP4VrtEOhNQGb0HwvYNwXD1BBbwQ5cKIbUVVU7G2d5WRE90NfB922elN8ASXAJEA==}cpu: [arm64]os: [linux]- '@rollup/[email protected]':- resolution: {integrity: sha512-cZdyuInj0ofc7mAQpKcPR2a2iu4YM4FQfuUzCVA2u4HI95lCwzjoPtdWjdpDKyHxI0UO82bLDoOaLfpZ/wviyQ==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-ltUWy+sHeAh3YZ91NUsV4Xg3uBXAlscQe8ZOXRCVAKLsivGuJsrkawYPUEyCV3DYa9urgJugMLn8Z3Z/6CeyRQ==}cpu: [ppc64]os: [linux]- '@rollup/[email protected]':- resolution: {integrity: sha512-RL56JMT6NwQ0lXIQmMIWr1SW28z4E4pOhRRNqwWZeXpRlykRIlEpSWdsgNWJbYBEWD84eocjSGDu/XxbYeCmwg==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-BggMndzI7Tlv4/abrgLwa/dxNEMn2gC61DCLrTzw8LkpSKel4o+O+gtjbnkevZ18SKkeN3ihRGPuBxjaetWzWg==}cpu: [riscv64]os: [linux]- '@rollup/[email protected]':- resolution: {integrity: sha512-PMxkrWS9z38bCr3rWvDFVGD6sFeZJw4iQlhrup7ReGmfn7Oukrr/zweLhYX6v2/8J6Cep9IEA/SmjXjCmSbrMQ==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-z/9rtlGd/OMv+gb1mNSjElasMf9yXusAxnRDrBaYB+eS1shFm6/4/xDH1SAISO5729fFKUkJ88TkGPRUh8WSAA==}cpu: [s390x]os: [linux]- '@rollup/[email protected]':- resolution: {integrity: sha512-B90tYAUoLhU22olrafY3JQCFLnT3NglazdwkHyxNDYF/zAxJt5fJUB/yBoWFoIQ7SQj+KLe3iL4BhOMa9fzgpw==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-kXQVcWqDcDKw0S2E0TmhlTLlUgAmMVqPrJZR+KpH/1ZaZhLSl23GZpQVmawBQGVhyP5WXIsIQ/zqbDBBYmxm5w==}cpu: [x64]os: [linux]- '@rollup/[email protected]':- resolution: {integrity: sha512-7twFizNXudESmC9oneLGIUmoHiiLppz/Xs5uJQ4ShvE6234K0VB1/aJYU3f/4g7PhssLGKBVCC37uRkkOi8wjg==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-CbFv/WMQsSdl+bpX6rVbzR4kAjSSBuDgCqb1l4J68UYsQNalz5wOqLGYj4ZI0thGpyX5kc+LLZ9CL+kpqDovZA==}cpu: [x64]os: [linux]- '@rollup/[email protected]':- resolution: {integrity: sha512-9rRero0E7qTeYf6+rFh3AErTNU1VCQg2mn7CQcI44vNUWM9Ze7MSRS/9RFuSsox+vstRt97+x3sOhEey024FRQ==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-3Q3brDgA86gHXWHklrwdREKIrIbxC0ZgU8lwpj0eEKGBQH+31uPqr0P2v11pn0tSIxHvcdOWxa4j+YvLNx1i6g==}cpu: [arm64]os: [win32]- '@rollup/[email protected]':- resolution: {integrity: sha512-5rA4vjlqgrpbFVVHX3qkrCo/fZTj1q0Xxpg+Z7yIo3J2AilW7t2+n6Q8Jrx+4MrYpAnjttTYF8rr7bP46BPzRw==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-tNg+jJcKR3Uwe4L0/wY3Ro0H+u3nrb04+tcq1GSYzBEmKLeOQF2emk1whxlzNqb6MMrQ2JOcQEpuuiPLyRcSIw==}cpu: [ia32]os: [win32]- '@rollup/[email protected]':- resolution: {integrity: sha512-6UUxd0+SKomjdzuAcp+HAmxw1FlGBnl1v2yEPSabtx4lBfdXHDVsW7+lQkgz9cNFJGY3AWR7+V8P5BqkD9L9nA==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-xGiIH95H1zU7naUyTKEyOA/I0aexNMUdO9qRv0bLKN3qu25bBdrxZHqA3PTJ24YNN/GdMzG4xkDcd/GvjuhfLg==}cpu: [x64]os: [win32]@@ -5435,6 +5465,10 @@ packages:typescript:optional: true+ '@typescript-eslint/[email protected]':+ resolution: {integrity: sha512-mz2X8WcN2nVu5Hodku+IR8GgCOl4C0G/Z1ruaWN4dgec64kDBabuXyPAr+/RgJtumv8EEkqIzf3X2U5DUKB2eg==}+ engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}+'@typescript-eslint/[email protected]':resolution: {integrity: sha512-06JOQ9Qgj33yvBEx6tpC8ecP9o860rsR22hWMEd12WcTRrfaFgHr2RB/CA/B+7BMhHkXT4chg2MyboGdFGawYg==}engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}@@ -5448,10 +5482,23 @@ packages:typescript:optional: true+ '@typescript-eslint/[email protected]':+ resolution: {integrity: sha512-y6sSEeK+facMaAyixM36dQ5NVXTnKWunfD1Ft4xraYqxP0lC0POJmIaL/mw72CUMqjY9qfyVfXafMeaUj0noWw==}+ engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}+'@typescript-eslint/[email protected]':resolution: {integrity: sha512-qjkormnQS5wF9pjSi6q60bKUHH44j2APxfh9TQRXK8wbYVeDYYdYJGIROL87LGZZ2gz3Rbmjc736qyL8deVtdw==}engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}+ '@typescript-eslint/[email protected]':+ resolution: {integrity: sha512-Mq7FTHl0R36EmWlCJWojIC1qn/ZWo2YiWYc1XVtasJ7FIgjo0MVv9rZWXEE7IK2CGrtwe1dVOxWwqXUdNgfRCA==}+ engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}+ peerDependencies:+ typescript: '*'+ peerDependenciesMeta:+ typescript:+ optional: true+'@typescript-eslint/[email protected]':resolution: {integrity: sha512-vEG2Sf9P8BPQ+d0pxdfndw3xIXaoSjliG0/Ejk7UggByZPKXmJmw3GW5jV2gHNQNawBUyfahoSiCFVov0Ruf7Q==}engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}@@ -5461,12 +5508,22 @@ packages:typescript:optional: true+ '@typescript-eslint/[email protected]':+ resolution: {integrity: sha512-F77WwqxIi/qGkIGOGXNBLV7nykwfjLsdauRB/DOFPdv6LTF3BHHkBpq81/b5iMPSF055oO2BiivDJV4ChvNtXA==}+ engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}+ peerDependencies:+ eslint: ^8.57.0 || ^9.0.0+'@typescript-eslint/[email protected]':resolution: {integrity: sha512-6yyGYVL0e+VzGYp60wvkBHiqDWOpT63pdMV2CVG4LVDd5uR6q1qQN/7LafBZtAtNIn/mqXjsSeS5ggv/P0iECw==}engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}peerDependencies:eslint: ^8.57.0 || ^9.0.0+ '@typescript-eslint/[email protected]':+ resolution: {integrity: sha512-RmZwrTbQ9QveF15m/Cl28n0LXD6ea2CjkhH5rQ55ewz3H24w+AMCJHPVYaZ8/0HoG8Z3cLLFFycRXxeO2tz9FA==}+ engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}+'@typescript-eslint/[email protected]':resolution: {integrity: sha512-yTPqMnbAZJNy2Xq2XU8AdtOW9tJIr+UQb64aXB9f3B1498Zx9JorVgFJcZpEc9UBuCCrdzKID2RGAMkYcDtZOw==}engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}@@ -5562,15 +5619,9 @@ packages:'@vue/[email protected]':resolution: {integrity: sha512-8IQOTCWnLFqfHzOGm9+P8OPSEDukgg3Huc92qSG49if/xI2SAwLHQO2qaPQbjCWPBcQoO1WYfXfTACUrWV3c5A==}- '@vue/[email protected]':- resolution: {integrity: sha512-adAfy9boPkP233NTyvLbGEqVuIfK/R0ZsBsIOW4BZNfb4BRpRW41Do1u+ozJpsb+mdoy80O20IzAsHaihRb5qA==}-'@vue/[email protected]':resolution: {integrity: sha512-Osc/c7ABsHXTsETLgykcOwIxFktHfGSUDkb05V61rocEfsFDcjDLH/IHJSNJP+/Sv9KeN2Lx1V6McZzlSb9EhQ==}- '@vue/[email protected]':- resolution: {integrity: sha512-wnzFArg9zpvk/811CDOZOadJRugf1Bgl/TQ3RfV4nKfSPok4hi0w10ziYUQR6LnnBAUlEXYLUfZ71Oj9ds/+QA==}-'@vue/[email protected]':resolution: {integrity: sha512-s5QfZ+9PzPh3T5H4hsQDJtI8x7zdJaew/dCGgqZ2630XdzaZ3AD8xGZfBqpT8oaD/p2eedd+pL8tD5vvt5ZYJQ==}@@ -5605,9 +5656,6 @@ packages:'@vue/[email protected]':resolution: {integrity: sha512-q0xCiLkuWWQLzVrecPb0RMsNWyxICOjPrcrwxTUEHb1fsnvni4dcuyG7RT/Ie7VPTvnjzIaWzRMUBsrqNj/hhw==}- '@vue/[email protected]':- resolution: {integrity: sha512-Jp2v8nylKBT+PlOUjun2Wp/f++TfJVFjshLzNtJDdmFJabJa7noGMncqXRM1vXGX+Yo2V7WykQFNxusSim8SCA==}-'@webassemblyjs/[email protected]':resolution: {integrity: sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==}@@ -6605,15 +6653,6 @@ packages:supports-color:optional: true- resolution: {integrity: sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==}- engines: {node: '>=6.0'}- peerDependencies:- supports-color: '*'- peerDependenciesMeta:- supports-color:- optional: true-resolution: {integrity: sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==}@@ -7463,8 +7502,8 @@ packages:resolution: {integrity: sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==}engines: {node: '>=16.0.0'}- resolution: {integrity: sha512-sJslQKU2uM33qH5nqewAwVB2QgR6w1aMNsYUp3aN5rMRyXEwJGmZvaWzeJFNTOXWlHQyBFCWrdj3fV/fsTOX8w==}+ resolution: {integrity: sha512-ryBwPIIeErmxgPnm6cbESAzXjuEFubs+yKYLBZvg3CaiNcmkJChoOGcBSrZ6IwkMwPABwPpVXE6IlNdGJJrvEg==}engines: {node: '>= 10.4.0'}@@ -7635,8 +7674,8 @@ packages:resolution: {integrity: sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==}engines: {node: '>= 0.4'}- resolution: {integrity: sha512-Pgba6TExTZ0FJAn1qkJAjIeKoDJ3CsI2ChuLohJnZl/tTU8MVrq3b+2t5UOPfRa4RMsorClBjJALkJUMjG1PAw==}+ resolution: {integrity: sha512-ZAqrLlu18NbDdRaHq+AKXzAmqIUPswPWKUchfytdAjiRFnCe5ojG2bstg6mRiZabkKfCoL/e98pbBELIV/YCeA==}resolution: {integrity: sha512-BzUrJBS9EcUb4cFol8r4W3v1cPsSyajLSthNkz5BxbpDcHN5tIrM10E2eNvfnvBn3DaT3DUgx0OpsBKkaOpanw==}@@ -9982,8 +10021,8 @@ packages:deprecated: Rimraf versions prior to v4 are no longer supportedhasBin: true- resolution: {integrity: sha512-e3TapAgYf9xjdLvKQCkQTnbTKd4a6jwlpQSJJFokHGaX2IVjoEqkIIhiQfqsi0cdwlOD+tQGuOd5AJkc5RngBw==}+ resolution: {integrity: sha512-ZnYyKvscThhgd3M5+Qt3pmhO4jIRR5RGzaSovB6Q7rGNrK5cUncrtLmcTTJVSdcKXyZjW8X8MB0JMSuH9bcAJg==}engines: {node: '>=18.0.0', npm: '>=8.0.0'}hasBin: true@@ -10188,10 +10227,6 @@ packages:resolution: {integrity: sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==}engines: {node: '>=0.10.0'}- resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==}- engines: {node: '>=0.10.0'}-resolution: {integrity: sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==}@@ -11125,11 +11160,6 @@ packages:engines: {node: '>= 14'}hasBin: true- resolution: {integrity: sha512-bLQOjaX/ADgQ20isPJRvF0iRUHIxVhYvr53Of7wGcWlO2jvtUlH5m87DsmulFVxRpNLOnI4tB6p/oh8D7kpn9Q==}- engines: {node: '>= 14'}- hasBin: true-resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==}engines: {node: '>=12'}@@ -11491,18 +11521,10 @@ snapshots:dependencies:'@babel/types': 7.24.7- '@babel/[email protected]':- dependencies:- '@babel/types': 7.25.2-'@babel/[email protected]':dependencies:'@babel/types': 7.25.4- '@babel/[email protected]':- dependencies:- '@babel/types': 7.25.6-'@babel/[email protected](@babel/[email protected])':dependencies:'@babel/core': 7.25.2@@ -12141,10 +12163,6 @@ snapshots:dependencies:regenerator-runtime: 0.14.1- '@babel/[email protected]':- dependencies:- regenerator-runtime: 0.14.1-'@babel/[email protected]':dependencies:regenerator-runtime: 0.13.11@@ -12194,30 +12212,18 @@ snapshots:'@babel/helper-validator-identifier': 7.24.7to-fast-properties: 2.0.0- '@babel/[email protected]':- dependencies:- '@babel/helper-string-parser': 7.24.8- '@babel/helper-validator-identifier': 7.24.7- to-fast-properties: 2.0.0-'@babel/[email protected]':dependencies:'@babel/helper-string-parser': 7.24.8'@babel/helper-validator-identifier': 7.24.7to-fast-properties: 2.0.0- '@babel/[email protected]':- dependencies:- '@babel/helper-string-parser': 7.24.8- '@babel/helper-validator-identifier': 7.24.7- to-fast-properties: 2.0.0-'@base2/[email protected]': {}'@chromatic-com/[email protected]([email protected])([email protected](@babel/[email protected](@babel/[email protected])))':dependencies:chromatic: 11.7.1- filesize: 10.1.6+ filesize: 10.1.4jsonfile: 6.1.0react-confetti: 6.1.0([email protected])storybook: 8.2.9(@babel/[email protected](@babel/[email protected]))@@ -12635,7 +12641,7 @@ snapshots:'@eslint/[email protected]':dependencies:'@eslint/object-schema': 2.1.4- debug: 4.3.7+ debug: 4.3.6minimatch: 3.1.2transitivePeerDependencies:- supports-color@@ -12643,7 +12649,7 @@ snapshots:'@eslint/[email protected]':dependencies:ajv: 6.12.6- debug: 4.3.7+ debug: 4.3.6espree: 10.1.0globals: 14.0.0ignore: 5.3.2@@ -13023,9 +13029,9 @@ snapshots:react: 18.3.1react-dom: 18.3.1([email protected])dependencies:- '@babel/runtime': 7.25.6+ '@babel/runtime': 7.25.4classnames: 2.5.1@@ -13059,60 +13065,60 @@ snapshots:release-it: 17.6.0([email protected])semver: 7.6.2- '@rollup/[email protected]([email protected])':+ '@rollup/[email protected]([email protected])':dependencies:'@types/estree': 1.0.5estree-walker: 2.0.2picomatch: 2.3.1optionalDependencies:- rollup: 4.21.2+ rollup: 4.21.1- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true'@rushstack/[email protected](@types/[email protected])':@@ -13885,13 +13891,18 @@ snapshots:'@typescript-eslint/types': 8.5.0'@typescript-eslint/typescript-estree': 8.5.0([email protected])'@typescript-eslint/visitor-keys': 8.5.0- debug: 4.3.7+ debug: 4.3.6eslint: 9.10.0([email protected])optionalDependencies:typescript: 5.6.2transitivePeerDependencies:- supports-color+ '@typescript-eslint/[email protected]':+ dependencies:+ '@typescript-eslint/types': 8.3.0+ '@typescript-eslint/visitor-keys': 8.3.0+'@typescript-eslint/[email protected]':dependencies:'@typescript-eslint/types': 8.5.0@@ -13901,7 +13912,7 @@ snapshots:dependencies:'@typescript-eslint/typescript-estree': 8.5.0([email protected])- debug: 4.3.7+ debug: 4.3.6ts-api-utils: 1.3.0([email protected])optionalDependencies:typescript: 5.6.2@@ -13909,13 +13920,30 @@ snapshots:- eslint- supports-color+ '@typescript-eslint/[email protected]': {}+'@typescript-eslint/[email protected]': {}+ '@typescript-eslint/[email protected]([email protected])':+ dependencies:+ '@typescript-eslint/types': 8.3.0+ '@typescript-eslint/visitor-keys': 8.3.0+ debug: 4.3.6+ fast-glob: 3.3.2+ is-glob: 4.0.3+ minimatch: 9.0.5+ semver: 7.6.3+ ts-api-utils: 1.3.0([email protected])+ optionalDependencies:+ typescript: 5.6.2+ transitivePeerDependencies:+ - supports-color+'@typescript-eslint/[email protected]([email protected])':dependencies:'@typescript-eslint/types': 8.5.0'@typescript-eslint/visitor-keys': 8.5.0- debug: 4.3.7+ debug: 4.3.6fast-glob: 3.3.2is-glob: 4.0.3minimatch: 9.0.5@@ -13926,6 +13954,17 @@ snapshots:transitivePeerDependencies:- supports-color+ dependencies:+ '@eslint-community/eslint-utils': 4.4.0([email protected]([email protected]))+ '@typescript-eslint/scope-manager': 8.3.0+ '@typescript-eslint/types': 8.3.0+ '@typescript-eslint/typescript-estree': 8.3.0([email protected])+ eslint: 9.10.0([email protected])+ transitivePeerDependencies:+ - supports-color+ - typescript+dependencies:'@eslint-community/eslint-utils': 4.4.0([email protected]([email protected]))@@ -13937,6 +13976,11 @@ snapshots:- supports-color- typescript+ '@typescript-eslint/[email protected]':+ dependencies:+ '@typescript-eslint/types': 8.3.0+ eslint-visitor-keys: 3.4.3+'@typescript-eslint/[email protected]':dependencies:'@typescript-eslint/types': 8.5.0@@ -14060,33 +14104,20 @@ snapshots:'@vue/[email protected]':dependencies:- '@babel/parser': 7.25.3+ '@babel/parser': 7.25.4'@vue/shared': 3.4.38entities: 4.5.0estree-walker: 2.0.2source-map-js: 1.2.0- '@vue/[email protected]':- dependencies:- '@babel/parser': 7.25.6- '@vue/shared': 3.5.3- entities: 4.5.0- estree-walker: 2.0.2- source-map-js: 1.2.1-'@vue/[email protected]':dependencies:'@vue/compiler-core': 3.4.38'@vue/shared': 3.4.38- '@vue/[email protected]':- dependencies:- '@vue/compiler-core': 3.5.3- '@vue/shared': 3.5.3-'@vue/[email protected]':dependencies:- '@babel/parser': 7.25.3+ '@babel/parser': 7.25.4'@vue/compiler-core': 3.4.38'@vue/compiler-dom': 3.4.38'@vue/compiler-ssr': 3.4.38@@ -14109,9 +14140,9 @@ snapshots:'@vue/[email protected]([email protected])':dependencies:'@volar/language-core': 2.4.4- '@vue/compiler-dom': 3.5.3+ '@vue/compiler-dom': 3.4.38'@vue/compiler-vue2': 2.7.16- '@vue/shared': 3.5.3+ '@vue/shared': 3.4.38computeds: 0.0.1minimatch: 9.0.5muggle-string: 0.4.1@@ -14143,8 +14174,6 @@ snapshots:'@vue/[email protected]': {}- '@vue/[email protected]': {}-'@webassemblyjs/[email protected]':dependencies:'@webassemblyjs/helper-numbers': 1.11.6@@ -14294,7 +14323,7 @@ snapshots:dependencies:- debug: 4.3.5+ debug: 4.3.6transitivePeerDependencies:- supports-color@@ -14482,7 +14511,7 @@ snapshots:dependencies:- tslib: 2.6.3+ tslib: 2.7.0dependencies:@@ -15196,10 +15225,6 @@ snapshots:dependencies:ms: 2.1.2- dependencies:- ms: 2.1.3-@@ -15770,12 +15795,12 @@ snapshots:dependencies:- debug: 4.3.7+ debug: 4.3.6doctrine: 3.0.0eslint: 9.10.0([email protected])eslint-import-resolver-node: 0.3.9- get-tsconfig: 4.8.0+ get-tsconfig: 4.7.6is-glob: 4.0.3minimatch: 9.0.5semver: 7.6.3@@ -15790,7 +15815,7 @@ snapshots:'@es-joy/jsdoccomment': 0.48.0are-docs-informative: 0.0.2comment-parser: 1.4.1- debug: 4.3.7+ debug: 4.3.6escape-string-regexp: 4.0.0eslint: 9.10.0([email protected])espree: 10.1.0@@ -15819,7 +15844,7 @@ snapshots:enhanced-resolve: 5.17.1eslint: 9.10.0([email protected])eslint-plugin-es-x: 7.8.0([email protected]([email protected]))- get-tsconfig: 4.8.0+ get-tsconfig: 4.7.6globals: 15.9.0ignore: 5.3.2minimatch: 9.0.5@@ -16013,7 +16038,7 @@ snapshots:dependencies:- debug: 4.3.7+ debug: 4.3.6eslint: 9.10.0([email protected])eslint-compat-utils: 0.5.1([email protected]([email protected]))lodash: 4.17.21@@ -16063,7 +16088,7 @@ snapshots:dependencies:- debug: 4.3.7+ debug: 4.3.6eslint: 9.10.0([email protected])eslint-compat-utils: 0.5.1([email protected]([email protected]))lodash: 4.17.21@@ -16117,7 +16142,7 @@ snapshots:ajv: 6.12.6chalk: 4.1.2cross-spawn: 7.0.3- debug: 4.3.7+ debug: 4.3.6escape-string-regexp: 4.0.0eslint-scope: 8.0.2eslint-visitor-keys: 4.0.0@@ -16293,7 +16318,7 @@ snapshots:dependencies:flat-cache: 4.0.1- [email protected]: {}+ [email protected]: {}dependencies:@@ -16484,7 +16509,7 @@ snapshots:es-errors: 1.3.0get-intrinsic: 1.2.4dependencies:resolve-pkg-maps: 1.0.0@@ -16741,7 +16766,7 @@ snapshots:dependencies:agent-base: 7.1.1- debug: 4.3.5+ debug: 4.3.6transitivePeerDependencies:- supports-color@@ -17818,7 +17843,7 @@ snapshots:dependencies:'@types/debug': 4.1.12- debug: 4.3.7+ debug: 4.3.6decode-named-character-reference: 1.0.2devlop: 1.1.0micromark-core-commonmark: 2.0.1@@ -18215,7 +18240,7 @@ snapshots:dependencies:'@tootallnate/quickjs-emscripten': 0.23.0agent-base: 7.1.1- debug: 4.3.5+ debug: 4.3.6get-uri: 6.0.3http-proxy-agent: 7.0.2https-proxy-agent: 7.0.4@@ -18491,8 +18516,8 @@ snapshots:dependencies:nanoid: 3.3.7- picocolors: 1.1.0- source-map-js: 1.2.1+ picocolors: 1.0.1+ source-map-js: 1.2.0@@ -18630,7 +18655,7 @@ snapshots:dependencies:'@babel/runtime': 7.24.7classnames: 2.5.1react: 18.3.1@@ -18657,7 +18682,7 @@ snapshots:dependencies:'@babel/runtime': 7.25.4classnames: 2.5.1@@ -18702,7 +18727,7 @@ snapshots:dependencies:'@babel/runtime': 7.25.4classnames: 2.5.1@@ -18723,7 +18748,7 @@ snapshots:dependencies:- '@babel/runtime': 7.25.6+ '@babel/runtime': 7.25.4classnames: 2.5.1@@ -18732,8 +18757,8 @@ snapshots:dependencies:- '@babel/runtime': 7.25.6+ '@babel/runtime': 7.25.4classnames: 2.5.1@@ -18755,7 +18780,7 @@ snapshots:dependencies:'@babel/runtime': 7.24.7classnames: 2.5.1react: 18.3.1react-dom: 18.3.1([email protected])@@ -19218,26 +19243,26 @@ snapshots:dependencies:glob: 7.2.3dependencies:'@types/estree': 1.0.5optionalDependencies:- '@rollup/rollup-android-arm-eabi': 4.21.2- '@rollup/rollup-android-arm64': 4.21.2- '@rollup/rollup-darwin-arm64': 4.21.2- '@rollup/rollup-darwin-x64': 4.21.2- '@rollup/rollup-linux-arm-gnueabihf': 4.21.2- '@rollup/rollup-linux-arm-musleabihf': 4.21.2- '@rollup/rollup-linux-arm64-gnu': 4.21.2- '@rollup/rollup-linux-arm64-musl': 4.21.2- '@rollup/rollup-linux-powerpc64le-gnu': 4.21.2- '@rollup/rollup-linux-riscv64-gnu': 4.21.2- '@rollup/rollup-linux-s390x-gnu': 4.21.2- '@rollup/rollup-linux-x64-gnu': 4.21.2- '@rollup/rollup-linux-x64-musl': 4.21.2- '@rollup/rollup-win32-arm64-msvc': 4.21.2- '@rollup/rollup-win32-ia32-msvc': 4.21.2- '@rollup/rollup-win32-x64-msvc': 4.21.2+ '@rollup/rollup-android-arm-eabi': 4.21.1+ '@rollup/rollup-android-arm64': 4.21.1+ '@rollup/rollup-darwin-arm64': 4.21.1+ '@rollup/rollup-darwin-x64': 4.21.1+ '@rollup/rollup-linux-arm-gnueabihf': 4.21.1+ '@rollup/rollup-linux-arm-musleabihf': 4.21.1+ '@rollup/rollup-linux-arm64-gnu': 4.21.1+ '@rollup/rollup-linux-arm64-musl': 4.21.1+ '@rollup/rollup-linux-powerpc64le-gnu': 4.21.1+ '@rollup/rollup-linux-riscv64-gnu': 4.21.1+ '@rollup/rollup-linux-s390x-gnu': 4.21.1+ '@rollup/rollup-linux-x64-gnu': 4.21.1+ '@rollup/rollup-linux-x64-musl': 4.21.1+ '@rollup/rollup-win32-arm64-msvc': 4.21.1+ '@rollup/rollup-win32-ia32-msvc': 4.21.1+ '@rollup/rollup-win32-x64-msvc': 4.21.1fsevents: 2.3.3@@ -19487,7 +19512,7 @@ snapshots:dependencies:agent-base: 7.1.1- debug: 4.3.5+ debug: 4.3.6socks: 2.8.3transitivePeerDependencies:- supports-color@@ -19499,8 +19524,6 @@ snapshots:- [email protected]: {}-dependencies:buffer-from: 1.1.2@@ -20170,14 +20193,14 @@ snapshots:- supports-color- terser- [email protected](@types/[email protected])([email protected])([email protected])([email protected](@types/[email protected])([email protected])([email protected])([email protected])):+ [email protected](@types/[email protected])([email protected])([email protected])([email protected](@types/[email protected])([email protected])([email protected])([email protected])):dependencies:'@microsoft/api-extractor': 7.47.7(@types/[email protected])- '@rollup/pluginutils': 5.1.0([email protected])+ '@rollup/pluginutils': 5.1.0([email protected])'@volar/typescript': 2.4.4'@vue/language-core': 2.1.6([email protected])compare-versions: 6.1.1- debug: 4.3.7+ debug: 4.3.6kolorist: 1.8.0local-pkg: 0.5.0magic-string: 0.30.11@@ -20193,7 +20216,7 @@ snapshots:dependencies:esbuild: 0.21.5postcss: 8.4.45- rollup: 4.21.2+ rollup: 4.21.1optionalDependencies:'@types/node': 22.5.4fsevents: 2.3.3@@ -20240,7 +20263,7 @@ snapshots:dependencies:- debug: 4.3.7+ debug: 4.3.6eslint: 9.10.0([email protected])eslint-scope: 7.2.2eslint-visitor-keys: 3.4.3@@ -20470,7 +20493,7 @@ snapshots:dependencies:eslint-visitor-keys: 3.4.3lodash: 4.17.21- yaml: 2.5.1+ yaml: 2.5.0@@ -20478,8 +20501,6 @@ snapshots:- [email protected]: {}-