From cfdc48faa3edda7d4131f1b1cdc746420a6b836d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E7=86=B1?= Date: Fri, 7 Jun 2024 18:47:26 +0800 Subject: [PATCH 1/4] chore: update protocol (#2454) * chore: update protocol * fix: fix lockfile --- packages/core/package.json | 2 +- packages/data-validation/package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- packages/sheets-data-validation/package.json | 2 +- packages/sheets-find-replace/package.json | 2 +- packages/sheets-hyper-link/package.json | 6 +- .../sheets-thread-comment-base/package.json | 20 +- packages/sheets-thread-comment/package.json | 1 + packages/sheets-ui/package.json | 2 +- packages/sheets/package.json | 2 +- packages/thread-comment-ui/package.json | 2 +- packages/thread-comment/package.json | 2 +- packages/umd/package.json | 2 +- packages/uniscript/package.json | 2 +- pnpm-lock.yaml | 431 +++++++++++------- 16 files changed, 294 insertions(+), 188 deletions(-) diff --git a/packages/core/package.json b/packages/core/package.json index 197624af43..745b8d2a10 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -63,7 +63,7 @@ "rxjs": ">=7.0.0" }, "dependencies": { - "@univerjs/protocol": "^0.1.36", + "@univerjs/protocol": "^0.1.37", "nanoid": "5.0.7", "numeral": "^2.0.6", "ot-json1": "^1.0.2" diff --git a/packages/data-validation/package.json b/packages/data-validation/package.json index f0eb52f377..d9d0182ef5 100644 --- a/packages/data-validation/package.json +++ b/packages/data-validation/package.json @@ -68,7 +68,7 @@ "rxjs": ">=7.0.0" }, "dependencies": { - "@univerjs/protocol": "^0.1.36" + "@univerjs/protocol": "^0.1.37" }, "devDependencies": { "@univerjs/core": "workspace:*", diff --git a/packages/sheets-conditional-formatting-ui/package.json b/packages/sheets-conditional-formatting-ui/package.json index 2f05561da9..a0d2355335 100644 --- a/packages/sheets-conditional-formatting-ui/package.json +++ b/packages/sheets-conditional-formatting-ui/package.json @@ -80,7 +80,7 @@ }, "dependencies": { "@univerjs/icons": "^0.1.56", - "@univerjs/protocol": "^0.1.36", + "@univerjs/protocol": "^0.1.37", "@univerjs/sheets-conditional-formatting": "workspace:*", "lodash.get": "^4.4.2", "lodash.set": "^4.3.2", diff --git a/packages/sheets-conditional-formatting/package.json b/packages/sheets-conditional-formatting/package.json index 0748918461..68614ad736 100644 --- a/packages/sheets-conditional-formatting/package.json +++ b/packages/sheets-conditional-formatting/package.json @@ -69,7 +69,7 @@ "rxjs": ">=7.0.0" }, "dependencies": { - "@univerjs/protocol": "^0.1.36" + "@univerjs/protocol": "^0.1.37" }, "devDependencies": { "@univerjs/core": "workspace:*", diff --git a/packages/sheets-data-validation/package.json b/packages/sheets-data-validation/package.json index 8d20d859cb..902b73e270 100644 --- a/packages/sheets-data-validation/package.json +++ b/packages/sheets-data-validation/package.json @@ -78,7 +78,7 @@ }, "dependencies": { "@univerjs/icons": "^0.1.56", - "@univerjs/protocol": "^0.1.36" + "@univerjs/protocol": "^0.1.37" }, "devDependencies": { "@univerjs/core": "workspace:*", diff --git a/packages/sheets-find-replace/package.json b/packages/sheets-find-replace/package.json index 0f15fdb865..aed2109aaf 100644 --- a/packages/sheets-find-replace/package.json +++ b/packages/sheets-find-replace/package.json @@ -70,7 +70,7 @@ "rxjs": ">=7.0.0" }, "dependencies": { - "@univerjs/protocol": "0.1.36" + "@univerjs/protocol": "0.1.37" }, "devDependencies": { "@univerjs/core": "workspace:*", diff --git a/packages/sheets-hyper-link/package.json b/packages/sheets-hyper-link/package.json index f5d1446d82..144e87a976 100644 --- a/packages/sheets-hyper-link/package.json +++ b/packages/sheets-hyper-link/package.json @@ -60,16 +60,14 @@ "@univerjs/core": "workspace:*", "@univerjs/engine-formula": "workspace:*", "@univerjs/sheets": "workspace:*", + "@univerjs/sheets-hyper-link": "workspace:*", "@wendellhu/redi": "0.15.2", "rxjs": ">=7.0.0" - }, - "dependencies": { - }, "devDependencies": { "@univerjs/core": "workspace:*", "@univerjs/engine-formula": "workspace:*", - "@univerjs/protocol": "^0.1.36", + "@univerjs/protocol": "^0.1.37", "@univerjs/shared": "workspace:*", "@univerjs/sheets": "workspace:*", "@wendellhu/redi": "^0.15.2", diff --git a/packages/sheets-thread-comment-base/package.json b/packages/sheets-thread-comment-base/package.json index 94c7ebd976..03a09d4090 100644 --- a/packages/sheets-thread-comment-base/package.json +++ b/packages/sheets-thread-comment-base/package.json @@ -20,8 +20,7 @@ "keywords": [], "exports": { ".": "./src/index.ts", - "./*": "./src/*", - "./locale/*": "./src/locale/*.ts" + "./*": "./src/*" }, "main": "./lib/cjs/index.js", "module": "./lib/es/index.js", @@ -41,7 +40,6 @@ "require": "./lib/cjs/*", "types": "./lib/types/index.d.ts" }, - "./locale/*": "./lib/locale/*.json", "./lib/*": "./lib/*" } }, @@ -61,12 +59,9 @@ "peerDependencies": { "@univerjs/core": "workspace:*", "@univerjs/engine-formula": "workspace:*", - "@univerjs/engine-render": "workspace:*", "@univerjs/sheets": "workspace:*", "@univerjs/thread-comment": "workspace:*", - "@univerjs/ui": "workspace:*", "@wendellhu/redi": "0.15.2", - "react": "^16.9.0 || ^17.0.0 || ^18.0.0", "rxjs": ">=7.0.0" }, "dependencies": { @@ -84,5 +79,18 @@ "typescript": "^5.4.5", "vite": "^5.2.12", "vitest": "^1.6.0" + }, + "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/*" } } diff --git a/packages/sheets-thread-comment/package.json b/packages/sheets-thread-comment/package.json index 12cac89a5d..3f91c1da64 100644 --- a/packages/sheets-thread-comment/package.json +++ b/packages/sheets-thread-comment/package.json @@ -63,6 +63,7 @@ "@univerjs/engine-formula": "workspace:*", "@univerjs/engine-render": "workspace:*", "@univerjs/sheets": "workspace:*", + "@univerjs/sheets-thread-comment-base": "workspace:*", "@univerjs/sheets-ui": "workspace:*", "@univerjs/thread-comment": "workspace:*", "@univerjs/thread-comment-ui": "workspace:*", diff --git a/packages/sheets-ui/package.json b/packages/sheets-ui/package.json index 87969832e4..0ebbf8053e 100644 --- a/packages/sheets-ui/package.json +++ b/packages/sheets-ui/package.json @@ -80,7 +80,7 @@ }, "dependencies": { "@univerjs/icons": "^0.1.56", - "@univerjs/protocol": "^0.1.36" + "@univerjs/protocol": "^0.1.37" }, "devDependencies": { "@types/react": "^18.3.3", diff --git a/packages/sheets/package.json b/packages/sheets/package.json index 9182a18337..1eeb7abce1 100644 --- a/packages/sheets/package.json +++ b/packages/sheets/package.json @@ -69,7 +69,7 @@ "rxjs": ">=7.0.0" }, "dependencies": { - "@univerjs/protocol": "^0.1.36" + "@univerjs/protocol": "^0.1.37" }, "devDependencies": { "@univerjs/core": "workspace:*", diff --git a/packages/thread-comment-ui/package.json b/packages/thread-comment-ui/package.json index 7bdda1180b..114a6e496e 100644 --- a/packages/thread-comment-ui/package.json +++ b/packages/thread-comment-ui/package.json @@ -74,7 +74,7 @@ }, "dependencies": { "@univerjs/icons": "^0.1.56", - "@univerjs/protocol": "^0.1.36", + "@univerjs/protocol": "^0.1.37", "@univerjs/thread-comment": "workspace:*" }, "devDependencies": { diff --git a/packages/thread-comment/package.json b/packages/thread-comment/package.json index 497800519a..0dfaadaecb 100644 --- a/packages/thread-comment/package.json +++ b/packages/thread-comment/package.json @@ -65,7 +65,7 @@ "rxjs": ">=7.0.0" }, "dependencies": { - "@univerjs/protocol": "^0.1.36" + "@univerjs/protocol": "^0.1.37" }, "devDependencies": { "@univerjs/core": "workspace:*", diff --git a/packages/umd/package.json b/packages/umd/package.json index cfc96d9769..7e34304971 100644 --- a/packages/umd/package.json +++ b/packages/umd/package.json @@ -52,7 +52,7 @@ "@univerjs/facade": "workspace:*", "@univerjs/find-replace": "workspace:*", "@univerjs/network": "workspace:*", - "@univerjs/protocol": "^0.1.36", + "@univerjs/protocol": "^0.1.37", "@univerjs/rpc": "workspace:*", "@univerjs/sheets": "workspace:*", "@univerjs/sheets-conditional-formatting": "workspace:*", diff --git a/packages/uniscript/package.json b/packages/uniscript/package.json index 527ecf30d8..8e8d05e8d3 100644 --- a/packages/uniscript/package.json +++ b/packages/uniscript/package.json @@ -76,7 +76,7 @@ "rxjs": ">=7.0.0" }, "dependencies": { - "@univerjs/protocol": "^0.1.36", + "@univerjs/protocol": "^0.1.37", "@univerjs/sheets": "workspace:*" }, "devDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d62d99c783..fe1f2e5c2f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -31,7 +31,7 @@ importers: version: 8.0.1(release-it@17.3.0(typescript@5.4.5)) '@storybook/react': specifier: 8.1.6 - version: 8.1.6(prettier@3.3.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.4.5) + version: 8.1.6(prettier@3.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.4.5) '@types/node': specifier: ^20.12.12 version: 20.12.12 @@ -106,10 +106,10 @@ importers: version: 7.12.0(eslint@8.57.0)(typescript@5.4.5) '@vitejs/plugin-react': specifier: ^4.3.0 - version: 4.3.0(vite@5.2.12(@types/node@20.14.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0)) + version: 4.3.0(vite@5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.72.0)(terser@5.30.0)) '@vitest/coverage-istanbul': specifier: ^1.6.0 - version: 1.6.0(vitest@1.6.0(@types/node@20.14.0)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0)) + version: 1.6.0(vitest@1.6.0(@types/node@20.14.2)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0)) happy-dom: specifier: 13.3.8 version: 13.3.8 @@ -118,13 +118,13 @@ importers: version: 4.1.0 vite: specifier: ^5.2.12 - version: 5.2.12(@types/node@20.14.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) vite-plugin-dts: specifier: ^3.9.1 - version: 3.9.1(@types/node@20.14.0)(rollup@4.16.4)(typescript@5.4.5)(vite@5.2.12(@types/node@20.14.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0)) + version: 3.9.1(@types/node@20.14.2)(rollup@4.16.4)(typescript@5.4.5)(vite@5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.72.0)(terser@5.30.0)) vitest: specifier: ^1.6.0 - version: 1.6.0(@types/node@20.14.0)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 1.6.0(@types/node@20.14.2)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) common/storybook: dependencies: @@ -332,7 +332,7 @@ importers: version: 18.3.1(react@18.3.1) react-mosaic-component: specifier: ^6.1.0 - version: 6.1.0(@types/node@20.14.0)(@types/react@18.3.3)(dnd-core@16.0.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 6.1.0(@types/node@20.14.2)(@types/react@18.3.3)(dnd-core@16.0.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) rxjs: specifier: ^7.8.1 version: 7.8.1 @@ -374,8 +374,8 @@ importers: packages/core: dependencies: '@univerjs/protocol': - specifier: ^0.1.36 - version: 0.1.36(@grpc/grpc-js@1.10.6)(rxjs@7.8.1) + specifier: ^0.1.37 + version: 0.1.37(@grpc/grpc-js@1.10.6)(rxjs@7.8.1) nanoid: specifier: 5.0.7 version: 5.0.7 @@ -403,16 +403,16 @@ importers: version: 5.4.5 vite: specifier: ^5.2.12 - version: 5.2.12(@types/node@20.14.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) vitest: specifier: ^1.6.0 - version: 1.6.0(@types/node@20.14.0)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 1.6.0(@types/node@20.14.2)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) packages/data-validation: dependencies: '@univerjs/protocol': - specifier: ^0.1.36 - version: 0.1.36(@grpc/grpc-js@1.10.6)(rxjs@7.8.1) + specifier: ^0.1.37 + version: 0.1.37(@grpc/grpc-js@1.10.6)(rxjs@7.8.1) devDependencies: '@univerjs/core': specifier: workspace:* @@ -434,10 +434,10 @@ importers: version: 5.4.5 vite: specifier: ^5.2.12 - version: 5.2.12(@types/node@20.14.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) vitest: specifier: ^1.6.0 - version: 1.6.0(@types/node@20.14.0)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 1.6.0(@types/node@20.14.2)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) packages/debugger: dependencies: @@ -472,7 +472,7 @@ importers: version: link:../ui '@vitejs/plugin-vue': specifier: ^5.0.4 - version: 5.0.4(vite@5.2.12(@types/node@20.14.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0))(vue@3.4.27(typescript@5.4.5)) + version: 5.0.4(vite@5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.72.0)(terser@5.30.0))(vue@3.4.27(typescript@5.4.5)) '@wendellhu/redi': specifier: 0.15.2 version: 0.15.2 @@ -484,10 +484,10 @@ importers: version: 5.4.5 vite: specifier: ^5.2.12 - version: 5.2.12(@types/node@20.14.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) vitest: specifier: ^1.6.0 - version: 1.6.0(@types/node@20.14.0)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 1.6.0(@types/node@20.14.2)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) packages/design: dependencies: @@ -587,10 +587,10 @@ importers: version: 5.4.5 vite: specifier: ^5.2.12 - version: 5.2.12(@types/node@20.14.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) vitest: specifier: ^1.6.0 - version: 1.6.0(@types/node@20.14.0)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 1.6.0(@types/node@20.14.2)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) packages/docs: devDependencies: @@ -614,10 +614,10 @@ importers: version: 5.4.5 vite: specifier: ^5.2.12 - version: 5.2.12(@types/node@20.14.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) vitest: specifier: ^1.6.0 - version: 1.6.0(@types/node@20.14.0)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 1.6.0(@types/node@20.14.2)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) packages/docs-drawing: devDependencies: @@ -647,10 +647,10 @@ importers: version: 5.4.5 vite: specifier: ^5.2.12 - version: 5.2.12(@types/node@20.14.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) vitest: specifier: ^1.6.0 - version: 1.6.0(@types/node@20.14.0)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 1.6.0(@types/node@20.14.2)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) packages/docs-drawing-ui: dependencies: @@ -711,10 +711,10 @@ importers: version: 5.4.5 vite: specifier: ^5.2.12 - version: 5.2.12(@types/node@20.14.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) vitest: specifier: ^1.6.0 - version: 1.6.0(@types/node@20.14.0)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 1.6.0(@types/node@20.14.2)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) packages/docs-ui: devDependencies: @@ -756,10 +756,10 @@ importers: version: 5.4.5 vite: specifier: ^5.2.12 - version: 5.2.12(@types/node@20.14.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) vitest: specifier: ^1.6.0 - version: 1.6.0(@types/node@20.14.0)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 1.6.0(@types/node@20.14.2)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) packages/drawing: dependencies: @@ -796,10 +796,10 @@ importers: version: 5.4.5 vite: specifier: ^5.2.12 - version: 5.2.12(@types/node@20.14.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) vitest: specifier: ^1.6.0 - version: 1.6.0(@types/node@20.14.0)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 1.6.0(@types/node@20.14.2)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) packages/drawing-ui: dependencies: @@ -845,10 +845,10 @@ importers: version: 5.4.5 vite: specifier: ^5.2.12 - version: 5.2.12(@types/node@20.14.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) vitest: specifier: ^1.6.0 - version: 1.6.0(@types/node@20.14.0)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 1.6.0(@types/node@20.14.2)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) packages/engine-formula: dependencies: @@ -882,10 +882,10 @@ importers: version: 5.4.5 vite: specifier: ^5.2.12 - version: 5.2.12(@types/node@20.14.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) vitest: specifier: ^1.6.0 - version: 1.6.0(@types/node@20.14.0)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 1.6.0(@types/node@20.14.2)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) packages/engine-numfmt: dependencies: @@ -901,10 +901,10 @@ importers: version: 5.4.5 vite: specifier: ^5.2.12 - version: 5.2.12(@types/node@20.14.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) vitest: specifier: ^1.6.0 - version: 1.6.0(@types/node@20.14.0)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 1.6.0(@types/node@20.14.2)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) packages/engine-render: dependencies: @@ -938,10 +938,10 @@ importers: version: 5.4.5 vite: specifier: ^5.2.12 - version: 5.2.12(@types/node@20.14.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) vitest: specifier: ^1.6.0 - version: 1.6.0(@types/node@20.14.0)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 1.6.0(@types/node@20.14.2)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) packages/facade: devDependencies: @@ -998,10 +998,10 @@ importers: version: 5.4.5 vite: specifier: ^5.2.12 - version: 5.2.12(@types/node@20.14.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) vitest: specifier: ^1.6.0 - version: 1.6.0(@types/node@20.14.0)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 1.6.0(@types/node@20.14.2)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) packages/find-replace: dependencies: @@ -1047,10 +1047,10 @@ importers: version: 5.4.5 vite: specifier: ^5.2.12 - version: 5.2.12(@types/node@20.14.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) vitest: specifier: ^1.6.0 - version: 1.6.0(@types/node@20.14.0)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 1.6.0(@types/node@20.14.2)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) packages/network: devDependencies: @@ -1071,10 +1071,10 @@ importers: version: 5.4.5 vite: specifier: ^5.2.12 - version: 5.2.12(@types/node@20.14.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) vitest: specifier: ^1.6.0 - version: 1.6.0(@types/node@20.14.0)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 1.6.0(@types/node@20.14.2)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) packages/rpc: devDependencies: @@ -1095,16 +1095,16 @@ importers: version: 5.4.5 vite: specifier: ^5.2.12 - version: 5.2.12(@types/node@20.14.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) vitest: specifier: ^1.6.0 - version: 1.6.0(@types/node@20.14.0)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 1.6.0(@types/node@20.14.2)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) packages/sheets: dependencies: '@univerjs/protocol': - specifier: ^0.1.36 - version: 0.1.36(@grpc/grpc-js@1.10.6)(rxjs@7.8.1) + specifier: ^0.1.37 + version: 0.1.37(@grpc/grpc-js@1.10.6)(rxjs@7.8.1) devDependencies: '@univerjs/core': specifier: workspace:* @@ -1135,16 +1135,16 @@ importers: version: 5.4.5 vite: specifier: ^5.2.12 - version: 5.2.12(@types/node@20.14.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) vitest: specifier: ^1.6.0 - version: 1.6.0(@types/node@20.14.0)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 1.6.0(@types/node@20.14.2)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) packages/sheets-conditional-formatting: dependencies: '@univerjs/protocol': - specifier: ^0.1.36 - version: 0.1.36(@grpc/grpc-js@1.10.6)(rxjs@7.8.1) + specifier: ^0.1.37 + version: 0.1.37(@grpc/grpc-js@1.10.6)(rxjs@7.8.1) devDependencies: '@univerjs/core': specifier: workspace:* @@ -1181,10 +1181,10 @@ importers: version: 5.4.5 vite: specifier: ^5.2.12 - version: 5.2.12(@types/node@20.14.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) vitest: specifier: ^1.6.0 - version: 1.6.0(@types/node@20.14.0)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 1.6.0(@types/node@20.14.2)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) packages/sheets-conditional-formatting-ui: dependencies: @@ -1192,8 +1192,8 @@ importers: specifier: ^0.1.56 version: 0.1.56(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@univerjs/protocol': - specifier: ^0.1.36 - version: 0.1.36(@grpc/grpc-js@1.10.6)(rxjs@7.8.1) + specifier: ^0.1.37 + version: 0.1.37(@grpc/grpc-js@1.10.6)(rxjs@7.8.1) '@univerjs/sheets-conditional-formatting': specifier: workspace:* version: link:../sheets-conditional-formatting @@ -1269,10 +1269,10 @@ importers: version: 5.4.5 vite: specifier: ^5.2.12 - version: 5.2.12(@types/node@20.14.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) vitest: specifier: ^1.6.0 - version: 1.6.0(@types/node@20.14.0)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 1.6.0(@types/node@20.14.2)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) packages/sheets-data-validation: dependencies: @@ -1280,8 +1280,8 @@ importers: specifier: ^0.1.56 version: 0.1.56(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@univerjs/protocol': - specifier: ^0.1.36 - version: 0.1.36(@grpc/grpc-js@1.10.6)(rxjs@7.8.1) + specifier: ^0.1.37 + version: 0.1.37(@grpc/grpc-js@1.10.6)(rxjs@7.8.1) devDependencies: '@univerjs/core': specifier: workspace:* @@ -1336,10 +1336,10 @@ importers: version: 5.4.5 vite: specifier: ^5.2.12 - version: 5.2.12(@types/node@20.14.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) vitest: specifier: ^1.6.0 - version: 1.6.0(@types/node@20.14.0)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 1.6.0(@types/node@20.14.2)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) packages/sheets-drawing: devDependencies: @@ -1363,10 +1363,10 @@ importers: version: 5.4.5 vite: specifier: ^5.2.12 - version: 5.2.12(@types/node@20.14.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) vitest: specifier: ^1.6.0 - version: 1.6.0(@types/node@20.14.0)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 1.6.0(@types/node@20.14.2)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) packages/sheets-drawing-ui: dependencies: @@ -1424,10 +1424,10 @@ importers: version: 5.4.5 vite: specifier: ^5.2.12 - version: 5.2.12(@types/node@20.14.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) vitest: specifier: ^1.6.0 - version: 1.6.0(@types/node@20.14.0)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 1.6.0(@types/node@20.14.2)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) packages/sheets-filter: devDependencies: @@ -1451,10 +1451,10 @@ importers: version: 5.4.5 vite: specifier: ^5.2.12 - version: 5.2.12(@types/node@20.14.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) vitest: specifier: ^1.6.0 - version: 1.6.0(@types/node@20.14.0)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 1.6.0(@types/node@20.14.2)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) packages/sheets-filter-ui: dependencies: @@ -1515,16 +1515,16 @@ importers: version: 5.4.5 vite: specifier: ^5.2.12 - version: 5.2.12(@types/node@20.14.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) vitest: specifier: ^1.6.0 - version: 1.6.0(@types/node@20.14.0)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 1.6.0(@types/node@20.14.2)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) packages/sheets-find-replace: dependencies: '@univerjs/protocol': - specifier: 0.1.36 - version: 0.1.36(@grpc/grpc-js@1.10.6)(rxjs@7.8.1) + specifier: 0.1.37 + version: 0.1.37(@grpc/grpc-js@1.10.6)(rxjs@7.8.1) devDependencies: '@univerjs/core': specifier: workspace:* @@ -1558,10 +1558,10 @@ importers: version: 5.4.5 vite: specifier: ^5.2.12 - version: 5.2.12(@types/node@20.14.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) vitest: specifier: ^1.6.0 - version: 1.6.0(@types/node@20.14.0)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 1.6.0(@types/node@20.14.2)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) packages/sheets-formula: dependencies: @@ -1604,7 +1604,7 @@ importers: version: link:../ui '@vitejs/plugin-react': specifier: ^4.2.1 - version: 4.2.1(vite@5.2.12(@types/node@20.14.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0)) + version: 4.2.1(vite@5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.72.0)(terser@5.30.0)) '@wendellhu/redi': specifier: 0.15.2 version: 0.15.2 @@ -1622,12 +1622,16 @@ importers: version: 5.4.5 vite: specifier: ^5.2.12 - version: 5.2.12(@types/node@20.14.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) vitest: specifier: ^1.6.0 - version: 1.6.0(@types/node@20.14.0)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 1.6.0(@types/node@20.14.2)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) packages/sheets-hyper-link: + dependencies: + '@univerjs/sheets-hyper-link': + specifier: workspace:* + version: 'link:' devDependencies: '@univerjs/core': specifier: workspace:* @@ -1636,8 +1640,8 @@ importers: specifier: workspace:* version: link:../engine-formula '@univerjs/protocol': - specifier: ^0.1.36 - version: 0.1.36(@grpc/grpc-js@1.10.6)(rxjs@7.8.1) + specifier: ^0.1.37 + version: 0.1.37(@grpc/grpc-js@1.10.6)(rxjs@7.8.1) '@univerjs/shared': specifier: workspace:* version: link:../../common/shared @@ -1655,10 +1659,10 @@ importers: version: 5.4.5 vite: specifier: ^5.2.12 - version: 5.2.12(@types/node@20.14.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) vitest: specifier: ^1.6.0 - version: 1.6.0(@types/node@20.14.0)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 1.6.0(@types/node@20.14.2)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) packages/sheets-hyper-link-ui: dependencies: @@ -1713,10 +1717,10 @@ importers: version: 5.4.5 vite: specifier: ^5.2.12 - version: 5.2.12(@types/node@20.14.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) vitest: specifier: ^1.6.0 - version: 1.6.0(@types/node@20.14.0)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 1.6.0(@types/node@20.14.2)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) packages/sheets-numfmt: dependencies: @@ -1771,10 +1775,10 @@ importers: version: 5.4.5 vite: specifier: ^5.2.12 - version: 5.2.12(@types/node@20.14.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) vitest: specifier: ^1.6.0 - version: 1.6.0(@types/node@20.14.0)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 1.6.0(@types/node@20.14.2)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) packages/sheets-thread-comment: dependencies: @@ -1832,16 +1836,13 @@ importers: version: 5.4.5 vite: specifier: ^5.2.12 - version: 5.2.12(@types/node@20.14.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) vitest: specifier: ^1.6.0 - version: 1.6.0(@types/node@20.14.0)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 1.6.0(@types/node@20.14.2)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) packages/sheets-thread-comment-base: dependencies: - '@univerjs/engine-render': - specifier: workspace:* - version: link:../engine-render '@univerjs/sheets': specifier: workspace:* version: link:../sheets @@ -1878,10 +1879,10 @@ importers: version: 5.4.5 vite: specifier: ^5.2.12 - version: 5.2.12(@types/node@20.12.12)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) vitest: specifier: ^1.6.0 - version: 1.6.0(@types/node@20.12.12)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 1.6.0(@types/node@20.14.2)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) packages/sheets-ui: dependencies: @@ -1892,8 +1893,8 @@ importers: specifier: ^0.1.56 version: 0.1.56(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@univerjs/protocol': - specifier: ^0.1.36 - version: 0.1.36(@grpc/grpc-js@1.10.6)(rxjs@7.8.1) + specifier: ^0.1.37 + version: 0.1.37(@grpc/grpc-js@1.10.6)(rxjs@7.8.1) devDependencies: '@types/react': specifier: ^18.3.3 @@ -1945,10 +1946,10 @@ importers: version: 5.4.5 vite: specifier: ^5.2.12 - version: 5.2.12(@types/node@20.14.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) vitest: specifier: ^1.6.0 - version: 1.6.0(@types/node@20.14.0)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 1.6.0(@types/node@20.14.2)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) packages/sheets-zen-editor: dependencies: @@ -2000,10 +2001,10 @@ importers: version: 5.4.5 vite: specifier: ^5.2.12 - version: 5.2.12(@types/node@20.14.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) vitest: specifier: ^1.6.0 - version: 1.6.0(@types/node@20.14.0)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 1.6.0(@types/node@20.14.2)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) packages/slides: devDependencies: @@ -2027,10 +2028,10 @@ importers: version: 5.4.5 vite: specifier: ^5.2.12 - version: 5.2.12(@types/node@20.14.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) vitest: specifier: ^1.6.0 - version: 1.6.0(@types/node@20.14.0)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 1.6.0(@types/node@20.14.2)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) packages/slides-ui: devDependencies: @@ -2075,16 +2076,16 @@ importers: version: 5.4.5 vite: specifier: ^5.2.12 - version: 5.2.12(@types/node@20.14.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) vitest: specifier: ^1.6.0 - version: 1.6.0(@types/node@20.14.0)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 1.6.0(@types/node@20.14.2)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) packages/thread-comment: dependencies: '@univerjs/protocol': - specifier: ^0.1.36 - version: 0.1.36(@grpc/grpc-js@1.10.6)(rxjs@7.8.1) + specifier: ^0.1.37 + version: 0.1.37(@grpc/grpc-js@1.10.6)(rxjs@7.8.1) devDependencies: '@univerjs/core': specifier: workspace:* @@ -2109,10 +2110,10 @@ importers: version: 5.4.5 vite: specifier: ^5.2.12 - version: 5.2.12(@types/node@20.14.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) vitest: specifier: ^1.6.0 - version: 1.6.0(@types/node@20.14.0)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 1.6.0(@types/node@20.14.2)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) packages/thread-comment-ui: dependencies: @@ -2120,8 +2121,8 @@ importers: specifier: ^0.1.56 version: 0.1.56(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@univerjs/protocol': - specifier: ^0.1.36 - version: 0.1.36(@grpc/grpc-js@1.10.6)(rxjs@7.8.1) + specifier: ^0.1.37 + version: 0.1.37(@grpc/grpc-js@1.10.6)(rxjs@7.8.1) '@univerjs/thread-comment': specifier: workspace:* version: link:../thread-comment @@ -2161,10 +2162,10 @@ importers: version: 5.4.5 vite: specifier: ^5.2.12 - version: 5.2.12(@types/node@20.14.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) vitest: specifier: ^1.6.0 - version: 1.6.0(@types/node@20.14.0)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 1.6.0(@types/node@20.14.2)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) packages/ui: dependencies: @@ -2238,10 +2239,10 @@ importers: version: 5.4.5 vite: specifier: ^5.2.12 - version: 5.2.12(@types/node@20.14.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) vitest: specifier: ^1.6.0 - version: 1.6.0(@types/node@20.14.0)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 1.6.0(@types/node@20.14.2)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) packages/umd: dependencies: @@ -2291,8 +2292,8 @@ importers: specifier: workspace:* version: link:../network '@univerjs/protocol': - specifier: ^0.1.36 - version: 0.1.36(@grpc/grpc-js@1.10.6)(rxjs@7.8.1) + specifier: ^0.1.37 + version: 0.1.37(@grpc/grpc-js@1.10.6)(rxjs@7.8.1) '@univerjs/rpc': specifier: workspace:* version: link:../rpc @@ -2390,8 +2391,8 @@ importers: packages/uniscript: dependencies: '@univerjs/protocol': - specifier: ^0.1.36 - version: 0.1.36(@grpc/grpc-js@1.10.6)(rxjs@7.8.1) + specifier: ^0.1.37 + version: 0.1.37(@grpc/grpc-js@1.10.6)(rxjs@7.8.1) '@univerjs/sheets': specifier: workspace:* version: link:../sheets @@ -2437,10 +2438,10 @@ importers: version: 5.4.5 vite: specifier: ^5.2.12 - version: 5.2.12(@types/node@20.14.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) vitest: specifier: ^1.6.0 - version: 1.6.0(@types/node@20.14.0)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + version: 1.6.0(@types/node@20.14.2)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) packages: @@ -4856,6 +4857,9 @@ packages: '@types/node@20.14.0': resolution: {integrity: sha512-5cHBxFGJx6L4s56Bubp4fglrEpmyJypsqI6RgzMfBHWUJQGWAAi8cWcgetEbZXHYXo9C2Fa4EEds/uSyS4cxmA==} + '@types/node@20.14.2': + resolution: {integrity: sha512-xyu6WAMVwv6AKFLB+e/7ySZVr/0zLCzOa7rSpq6jNwpqOrUbcACDWC+53d4n2QHOnDou0fbIsg8wZu/sxrnI4Q==} + '@types/normalize-package-data@2.4.4': resolution: {integrity: sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==} @@ -5020,8 +5024,8 @@ packages: react: '*' react-dom: '*' - '@univerjs/protocol@0.1.36': - resolution: {integrity: sha512-MYQ3g3mYSoFuDprgPFAa+dyb0L6NqrIg1dyr8s+NsHj3rncwbXFD3PYba30dALP9cqiSs6GXVbeXURYG5ZGWFg==} + '@univerjs/protocol@0.1.37': + resolution: {integrity: sha512-hNfTOCBXUo5NsnxWdFn1VCqNUtRL2RaysI+euKoPYrjWKBjwieMMxbpmkqed2dFbGotYAtMMKggpD8CWLUGlLQ==} engines: {node: '>=16.0.0', npm: '>=8.0.0'} peerDependencies: '@grpc/grpc-js': ^1.9.14 @@ -9003,6 +9007,11 @@ packages: engines: {node: '>=14'} hasBin: true + prettier@3.3.1: + resolution: {integrity: sha512-7CAwy5dRsxs8PHXT3twixW9/OEll8MLE0VRPCJyl7CkS6VHGPSlsVaWTiASPTyGyYRyApxlaWTzwUxVNrhcwDg==} + engines: {node: '>=14'} + hasBin: true + pretty-error@4.0.0: resolution: {integrity: sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw==} @@ -12400,23 +12409,23 @@ snapshots: '@types/react': 18.3.3 react: 18.3.1 - '@microsoft/api-extractor-model@7.28.13(@types/node@20.14.0)': + '@microsoft/api-extractor-model@7.28.13(@types/node@20.14.2)': dependencies: '@microsoft/tsdoc': 0.14.2 '@microsoft/tsdoc-config': 0.16.2 - '@rushstack/node-core-library': 4.0.2(@types/node@20.14.0) + '@rushstack/node-core-library': 4.0.2(@types/node@20.14.2) transitivePeerDependencies: - '@types/node' - '@microsoft/api-extractor@7.43.0(@types/node@20.14.0)': + '@microsoft/api-extractor@7.43.0(@types/node@20.14.2)': dependencies: - '@microsoft/api-extractor-model': 7.28.13(@types/node@20.14.0) + '@microsoft/api-extractor-model': 7.28.13(@types/node@20.14.2) '@microsoft/tsdoc': 0.14.2 '@microsoft/tsdoc-config': 0.16.2 - '@rushstack/node-core-library': 4.0.2(@types/node@20.14.0) + '@rushstack/node-core-library': 4.0.2(@types/node@20.14.2) '@rushstack/rig-package': 0.5.2 - '@rushstack/terminal': 0.10.0(@types/node@20.14.0) - '@rushstack/ts-command-line': 4.19.1(@types/node@20.14.0) + '@rushstack/terminal': 0.10.0(@types/node@20.14.2) + '@rushstack/ts-command-line': 4.19.1(@types/node@20.14.2) lodash: 4.17.21 minimatch: 3.0.8 resolve: 1.22.8 @@ -12830,7 +12839,7 @@ snapshots: '@rollup/rollup-win32-x64-msvc@4.16.4': optional: true - '@rushstack/node-core-library@4.0.2(@types/node@20.14.0)': + '@rushstack/node-core-library@4.0.2(@types/node@20.14.2)': dependencies: fs-extra: 7.0.1 import-lazy: 4.0.0 @@ -12839,23 +12848,23 @@ snapshots: semver: 7.5.4 z-schema: 5.0.5 optionalDependencies: - '@types/node': 20.14.0 + '@types/node': 20.14.2 '@rushstack/rig-package@0.5.2': dependencies: resolve: 1.22.8 strip-json-comments: 3.1.1 - '@rushstack/terminal@0.10.0(@types/node@20.14.0)': + '@rushstack/terminal@0.10.0(@types/node@20.14.2)': dependencies: - '@rushstack/node-core-library': 4.0.2(@types/node@20.14.0) + '@rushstack/node-core-library': 4.0.2(@types/node@20.14.2) supports-color: 8.1.1 optionalDependencies: - '@types/node': 20.14.0 + '@types/node': 20.14.2 - '@rushstack/ts-command-line@4.19.1(@types/node@20.14.0)': + '@rushstack/ts-command-line@4.19.1(@types/node@20.14.2)': dependencies: - '@rushstack/terminal': 0.10.0(@types/node@20.14.0) + '@rushstack/terminal': 0.10.0(@types/node@20.14.2) '@types/argparse': 1.0.38 argparse: 1.0.10 string-argv: 0.3.2 @@ -13232,7 +13241,7 @@ snapshots: node-fetch: 2.7.0 picomatch: 2.3.1 pkg-dir: 5.0.0 - prettier-fallback: prettier@3.3.0 + prettier-fallback: prettier@3.3.1 pretty-hrtime: 1.0.3 resolve-from: 5.0.0 semver: 7.6.2 @@ -13246,6 +13255,43 @@ snapshots: - encoding - supports-color + '@storybook/core-common@8.1.6(prettier@3.3.1)': + dependencies: + '@storybook/core-events': 8.1.6 + '@storybook/csf-tools': 8.1.6 + '@storybook/node-logger': 8.1.6 + '@storybook/types': 8.1.6 + '@yarnpkg/fslib': 2.10.3 + '@yarnpkg/libzip': 2.3.0 + chalk: 4.1.2 + cross-spawn: 7.0.3 + esbuild: 0.20.2 + esbuild-register: 3.5.0(esbuild@0.20.2) + execa: 5.1.1 + file-system-cache: 2.3.0 + find-cache-dir: 3.3.2 + find-up: 5.0.0 + fs-extra: 11.2.0 + glob: 10.3.12 + handlebars: 4.7.8 + lazy-universal-dotenv: 4.0.0 + node-fetch: 2.7.0 + picomatch: 2.3.1 + pkg-dir: 5.0.0 + prettier-fallback: prettier@3.3.1 + pretty-hrtime: 1.0.3 + resolve-from: 5.0.0 + semver: 7.6.2 + tempy: 3.1.0 + tiny-invariant: 1.3.3 + ts-dedent: 2.2.0 + util: 0.12.5 + optionalDependencies: + prettier: 3.3.1 + transitivePeerDependencies: + - encoding + - supports-color + '@storybook/core-events@8.1.6': dependencies: '@storybook/csf': 0.1.7 @@ -13361,6 +13407,21 @@ snapshots: - prettier - supports-color + '@storybook/docs-tools@8.1.6(prettier@3.3.1)': + dependencies: + '@storybook/core-common': 8.1.6(prettier@3.3.1) + '@storybook/core-events': 8.1.6 + '@storybook/preview-api': 8.1.6 + '@storybook/types': 8.1.6 + '@types/doctrine': 0.0.3 + assert: 2.1.0 + doctrine: 3.0.0 + lodash: 4.17.21 + transitivePeerDependencies: + - encoding + - prettier + - supports-color + '@storybook/global@5.0.0': {} '@storybook/icons@1.2.9(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': @@ -13526,6 +13587,38 @@ snapshots: - prettier - supports-color + '@storybook/react@8.1.6(prettier@3.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.4.5)': + dependencies: + '@storybook/client-logger': 8.1.6 + '@storybook/docs-tools': 8.1.6(prettier@3.3.1) + '@storybook/global': 5.0.0 + '@storybook/preview-api': 8.1.6 + '@storybook/react-dom-shim': 8.1.6(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@storybook/types': 8.1.6 + '@types/escodegen': 0.0.6 + '@types/estree': 0.0.51 + '@types/node': 18.19.28 + acorn: 7.4.1 + acorn-jsx: 5.3.2(acorn@7.4.1) + acorn-walk: 7.2.0 + escodegen: 2.1.0 + html-tags: 3.3.1 + lodash: 4.17.21 + prop-types: 15.8.1 + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) + react-element-to-jsx-string: 15.0.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + semver: 7.6.2 + ts-dedent: 2.2.0 + type-fest: 2.19.0 + util-deprecate: 1.0.2 + optionalDependencies: + typescript: 5.4.5 + transitivePeerDependencies: + - encoding + - prettier + - supports-color + '@storybook/router@8.1.6': dependencies: '@storybook/client-logger': 8.1.6 @@ -13870,6 +13963,10 @@ snapshots: dependencies: undici-types: 5.26.5 + '@types/node@20.14.2': + dependencies: + undici-types: 5.26.5 + '@types/normalize-package-data@2.4.4': {} '@types/numeral@2.0.5': {} @@ -14057,19 +14154,19 @@ snapshots: react: 18.3.1 react-dom: 18.3.1(react@18.3.1) - '@univerjs/protocol@0.1.36(@grpc/grpc-js@1.10.6)(rxjs@7.8.1)': + '@univerjs/protocol@0.1.37(@grpc/grpc-js@1.10.6)(rxjs@7.8.1)': dependencies: '@grpc/grpc-js': 1.10.6 rxjs: 7.8.1 - '@vitejs/plugin-react@4.2.1(vite@5.2.12(@types/node@20.14.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0))': + '@vitejs/plugin-react@4.2.1(vite@5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.72.0)(terser@5.30.0))': dependencies: '@babel/core': 7.24.3 '@babel/plugin-transform-react-jsx-self': 7.24.1(@babel/core@7.24.3) '@babel/plugin-transform-react-jsx-source': 7.24.1(@babel/core@7.24.3) '@types/babel__core': 7.20.5 react-refresh: 0.14.0 - vite: 5.2.12(@types/node@20.14.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + vite: 5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) transitivePeerDependencies: - supports-color @@ -14084,23 +14181,23 @@ snapshots: transitivePeerDependencies: - supports-color - '@vitejs/plugin-react@4.3.0(vite@5.2.12(@types/node@20.14.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0))': + '@vitejs/plugin-react@4.3.0(vite@5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.72.0)(terser@5.30.0))': dependencies: '@babel/core': 7.24.5 '@babel/plugin-transform-react-jsx-self': 7.24.6(@babel/core@7.24.5) '@babel/plugin-transform-react-jsx-source': 7.24.1(@babel/core@7.24.5) '@types/babel__core': 7.20.5 react-refresh: 0.14.2 - vite: 5.2.12(@types/node@20.14.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + vite: 5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) transitivePeerDependencies: - supports-color - '@vitejs/plugin-vue@5.0.4(vite@5.2.12(@types/node@20.14.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0))(vue@3.4.27(typescript@5.4.5))': + '@vitejs/plugin-vue@5.0.4(vite@5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.72.0)(terser@5.30.0))(vue@3.4.27(typescript@5.4.5))': dependencies: - vite: 5.2.12(@types/node@20.14.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + vite: 5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) vue: 3.4.27(typescript@5.4.5) - '@vitest/coverage-istanbul@1.6.0(vitest@1.6.0(@types/node@20.14.0)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0))': + '@vitest/coverage-istanbul@1.6.0(vitest@1.6.0(@types/node@20.14.2)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0))': dependencies: debug: 4.3.4 istanbul-lib-coverage: 3.2.2 @@ -14111,7 +14208,7 @@ snapshots: magicast: 0.3.3 picocolors: 1.0.0 test-exclude: 6.0.0 - vitest: 1.6.0(@types/node@20.14.0)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + vitest: 1.6.0(@types/node@20.14.2)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) transitivePeerDependencies: - supports-color @@ -18459,6 +18556,8 @@ snapshots: prettier@3.3.0: {} + prettier@3.3.1: {} + pretty-error@4.0.0: dependencies: lodash: 4.17.21 @@ -18516,7 +18615,7 @@ snapshots: '@protobufjs/path': 1.1.2 '@protobufjs/pool': 1.1.0 '@protobufjs/utf8': 1.1.0 - '@types/node': 20.14.0 + '@types/node': 20.14.2 long: 5.2.3 protocols@2.0.1: {} @@ -18781,26 +18880,26 @@ snapshots: dependencies: dnd-core: 16.0.1 - react-dnd-multi-backend@8.0.3(dnd-core@16.0.1)(react-dnd@16.0.1(@types/node@20.14.0)(@types/react@18.3.3)(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + react-dnd-multi-backend@8.0.3(dnd-core@16.0.1)(react-dnd@16.0.1(@types/node@20.14.2)(@types/react@18.3.3)(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: dnd-core: 16.0.1 dnd-multi-backend: 8.0.3(dnd-core@16.0.1) react: 18.3.1 - react-dnd: 16.0.1(@types/node@20.14.0)(@types/react@18.3.3)(react@18.3.1) - react-dnd-preview: 8.0.3(react-dnd@16.0.1(@types/node@20.14.0)(@types/react@18.3.3)(react@18.3.1))(react@18.3.1) + react-dnd: 16.0.1(@types/node@20.14.2)(@types/react@18.3.3)(react@18.3.1) + react-dnd-preview: 8.0.3(react-dnd@16.0.1(@types/node@20.14.2)(@types/react@18.3.3)(react@18.3.1))(react@18.3.1) react-dom: 18.3.1(react@18.3.1) - react-dnd-preview@8.0.3(react-dnd@16.0.1(@types/node@20.14.0)(@types/react@18.3.3)(react@18.3.1))(react@18.3.1): + react-dnd-preview@8.0.3(react-dnd@16.0.1(@types/node@20.14.2)(@types/react@18.3.3)(react@18.3.1))(react@18.3.1): dependencies: react: 18.3.1 - react-dnd: 16.0.1(@types/node@20.14.0)(@types/react@18.3.3)(react@18.3.1) + react-dnd: 16.0.1(@types/node@20.14.2)(@types/react@18.3.3)(react@18.3.1) react-dnd-touch-backend@16.0.1: dependencies: '@react-dnd/invariant': 4.0.2 dnd-core: 16.0.1 - react-dnd@16.0.1(@types/node@20.14.0)(@types/react@18.3.3)(react@18.3.1): + react-dnd@16.0.1(@types/node@20.14.2)(@types/react@18.3.3)(react@18.3.1): dependencies: '@react-dnd/invariant': 4.0.2 '@react-dnd/shallowequal': 4.0.2 @@ -18809,7 +18908,7 @@ snapshots: hoist-non-react-statics: 3.3.2 react: 18.3.1 optionalDependencies: - '@types/node': 20.14.0 + '@types/node': 20.14.2 '@types/react': 18.3.3 react-docgen-typescript@2.2.2(typescript@5.4.5): @@ -18885,7 +18984,7 @@ snapshots: react-dom: 18.3.1(react@18.3.1) substyle: 9.4.1(react@18.3.1) - react-mosaic-component@6.1.0(@types/node@20.14.0)(@types/react@18.3.3)(dnd-core@16.0.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + react-mosaic-component@6.1.0(@types/node@20.14.2)(@types/react@18.3.3)(dnd-core@16.0.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: classnames: 2.5.1 immutability-helper: 3.1.1 @@ -18893,9 +18992,9 @@ snapshots: prop-types: 15.8.1 rdndmb-html5-to-touch: 8.0.3(dnd-core@16.0.1) react: 18.3.1 - react-dnd: 16.0.1(@types/node@20.14.0)(@types/react@18.3.3)(react@18.3.1) + react-dnd: 16.0.1(@types/node@20.14.2)(@types/react@18.3.3)(react@18.3.1) react-dnd-html5-backend: 16.0.1 - react-dnd-multi-backend: 8.0.3(dnd-core@16.0.1)(react-dnd@16.0.1(@types/node@20.14.0)(@types/react@18.3.3)(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + react-dnd-multi-backend: 8.0.3(dnd-core@16.0.1)(react-dnd@16.0.1(@types/node@20.14.2)(@types/react@18.3.3)(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react-dnd-touch-backend: 16.0.1 uuid: 9.0.1 transitivePeerDependencies: @@ -20194,13 +20293,13 @@ snapshots: - supports-color - terser - vite-node@1.6.0(@types/node@20.14.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0): + vite-node@1.6.0(@types/node@20.14.2)(less@4.2.0)(sass@1.72.0)(terser@5.30.0): dependencies: cac: 6.7.14 debug: 4.3.4 pathe: 1.1.2 picocolors: 1.0.1 - vite: 5.2.12(@types/node@20.14.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + vite: 5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) transitivePeerDependencies: - '@types/node' - less @@ -20211,9 +20310,9 @@ snapshots: - supports-color - terser - vite-plugin-dts@3.9.1(@types/node@20.14.0)(rollup@4.16.4)(typescript@5.4.5)(vite@5.2.12(@types/node@20.14.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0)): + vite-plugin-dts@3.9.1(@types/node@20.14.2)(rollup@4.16.4)(typescript@5.4.5)(vite@5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.72.0)(terser@5.30.0)): dependencies: - '@microsoft/api-extractor': 7.43.0(@types/node@20.14.0) + '@microsoft/api-extractor': 7.43.0(@types/node@20.14.2) '@rollup/pluginutils': 5.1.0(rollup@4.16.4) '@vue/language-core': 1.8.27(typescript@5.4.5) debug: 4.3.4 @@ -20222,7 +20321,7 @@ snapshots: typescript: 5.4.5 vue-tsc: 1.8.27(typescript@5.4.5) optionalDependencies: - vite: 5.2.12(@types/node@20.14.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + vite: 5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) transitivePeerDependencies: - '@types/node' - rollup @@ -20240,13 +20339,13 @@ snapshots: sass: 1.72.0 terser: 5.30.0 - vite@5.2.12(@types/node@20.14.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0): + vite@5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.72.0)(terser@5.30.0): dependencies: esbuild: 0.20.2 postcss: 8.4.38 rollup: 4.16.4 optionalDependencies: - '@types/node': 20.14.0 + '@types/node': 20.14.2 fsevents: 2.3.3 less: 4.2.0 sass: 1.72.0 @@ -20287,7 +20386,7 @@ snapshots: - supports-color - terser - vitest@1.6.0(@types/node@20.14.0)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0): + vitest@1.6.0(@types/node@20.14.2)(happy-dom@13.3.8)(jsdom@24.0.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0): dependencies: '@vitest/expect': 1.6.0 '@vitest/runner': 1.6.0 @@ -20306,11 +20405,11 @@ snapshots: strip-literal: 2.1.0 tinybench: 2.8.0 tinypool: 0.8.4 - vite: 5.2.12(@types/node@20.14.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) - vite-node: 1.6.0(@types/node@20.14.0)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + vite: 5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) + vite-node: 1.6.0(@types/node@20.14.2)(less@4.2.0)(sass@1.72.0)(terser@5.30.0) why-is-node-running: 2.2.2 optionalDependencies: - '@types/node': 20.14.0 + '@types/node': 20.14.2 happy-dom: 13.3.8 jsdom: 24.0.0 transitivePeerDependencies: From 56c6e1269791dfb835f1af7ccdc381518f97e6b5 Mon Sep 17 00:00:00 2001 From: zhangw Date: Tue, 11 Jun 2024 15:40:07 +0800 Subject: [PATCH 2/4] fix(sheets-hyper-link): skip error on ref-range mutation (#2446) * feat: skip error on ref-range mutation * feat: i18n * feat: update * fix: intersets * feat: style * feat: remove skip error --- .../sheets/demo/default-workbook-data-demo.ts | 31 ++++++++++++++----- .../src/locale/en-US.ts | 2 +- .../src/locale/ru-RU.ts | 2 +- .../src/widgets/dropdown-widget.ts | 2 +- .../mutations/update-hyper-link.mutation.ts | 2 +- .../src/controllers/ref-range.controller.ts | 5 ++- .../src/models/hyper-link.model.ts | 20 +++++++----- .../sheets/src/services/ref-range/util.ts | 6 ++-- 8 files changed, 48 insertions(+), 22 deletions(-) diff --git a/examples/src/data/sheets/demo/default-workbook-data-demo.ts b/examples/src/data/sheets/demo/default-workbook-data-demo.ts index 7a2ddd397a..728344a060 100644 --- a/examples/src/data/sheets/demo/default-workbook-data-demo.ts +++ b/examples/src/data/sheets/demo/default-workbook-data-demo.ts @@ -178,13 +178,30 @@ const dataValidation = [ const dv2 = [ { uid: 'xxx-2', - type: DataValidationType.CHECKBOX, - ranges: [{ - startRow: 1, - endRow: 2, - startColumn: 1, - endColumn: 2, - }], + type: 'checkbox', + ranges: [ + { + startRow: 1, + endRow: 2, + startColumn: 1, + endColumn: 2, + }, + ], + }, + { + uid: 'adN9-O', + type: 'list', + formula1: "='sheet-0005'!F4:F8", + ranges: [ + { + startRow: 4, + startColumn: 5, + endRow: 14, + endColumn: 8, + rangeType: 0, + }, + ], + formula2: '', }, ]; diff --git a/packages/sheets-data-validation/src/locale/en-US.ts b/packages/sheets-data-validation/src/locale/en-US.ts index 8115717f28..62e2bcc036 100644 --- a/packages/sheets-data-validation/src/locale/en-US.ts +++ b/packages/sheets-data-validation/src/locale/en-US.ts @@ -35,7 +35,7 @@ const locale: typeof zhCN = { title: 'Data validation management', addTitle: 'Create new data validation', removeAll: 'Remove All', - add: 'Create Data validation', + add: 'Add Rule', range: 'Ranges', type: 'Type', options: 'Advance options', diff --git a/packages/sheets-data-validation/src/locale/ru-RU.ts b/packages/sheets-data-validation/src/locale/ru-RU.ts index a0fe9f8ac3..d6c9645353 100644 --- a/packages/sheets-data-validation/src/locale/ru-RU.ts +++ b/packages/sheets-data-validation/src/locale/ru-RU.ts @@ -35,7 +35,7 @@ const locale: typeof zhCN = { title: 'Управление проверкой данных', addTitle: 'Создать новую проверку данных', removeAll: 'Удалить все', - add: 'Создать проверку данных', + add: 'добавить правило', range: 'Диапазоны', type: 'Тип', options: 'Дополнительные параметры', diff --git a/packages/sheets-data-validation/src/widgets/dropdown-widget.ts b/packages/sheets-data-validation/src/widgets/dropdown-widget.ts index 5fe3d680b9..373dbdee2d 100644 --- a/packages/sheets-data-validation/src/widgets/dropdown-widget.ts +++ b/packages/sheets-data-validation/src/widgets/dropdown-widget.ts @@ -29,7 +29,7 @@ const PADDING_H = 4; const ICON_SIZE = 6; const ICON_PLACE = 14; const MARGIN_H = 6; -const MARGIN_V = 2; +const MARGIN_V = 4; const DROP_DOWN_ICON_COLOR = '#565656'; const downPath = new Path2D('M3.32201 4.84556C3.14417 5.05148 2.85583 5.05148 2.67799 4.84556L0.134292 1.90016C-0.152586 1.56798 0.0505937 1 0.456301 1L5.5437 1C5.94941 1 6.15259 1.56798 5.86571 1.90016L3.32201 4.84556Z'); diff --git a/packages/sheets-hyper-link/src/commands/mutations/update-hyper-link.mutation.ts b/packages/sheets-hyper-link/src/commands/mutations/update-hyper-link.mutation.ts index 0da2ba1ecf..ec9d85aed9 100644 --- a/packages/sheets-hyper-link/src/commands/mutations/update-hyper-link.mutation.ts +++ b/packages/sheets-hyper-link/src/commands/mutations/update-hyper-link.mutation.ts @@ -36,7 +36,7 @@ export const UpdateHyperLinkMutation: ICommand = const model = accessor.get(HyperLinkModel); const { unitId, subUnitId, payload, id } = params; - return model.updateHyperLink(unitId, subUnitId, id, payload); + return model.updateHyperLink(unitId, subUnitId, id, payload, false); }, }; diff --git a/packages/sheets-hyper-link/src/controllers/ref-range.controller.ts b/packages/sheets-hyper-link/src/controllers/ref-range.controller.ts index 57c9d7577e..f2f9cf25be 100644 --- a/packages/sheets-hyper-link/src/controllers/ref-range.controller.ts +++ b/packages/sheets-hyper-link/src/controllers/ref-range.controller.ts @@ -199,6 +199,7 @@ export class SheetsHyperLinkRefRangeController extends Disposable { }; }; this._rangeDisableMap.set(id, this._refRangeService.registerRefRange(range, handleRangeChange, unitId, subUnitId)); + if (!silent) { this._rangeWatcherMap.set(id, this._refRangeService.watchRange(unitId, subUnitId, range, (before, after) => { this._hyperLinkModel.updateHyperLink(unitId, subUnitId, id, { @@ -253,6 +254,7 @@ export class SheetsHyperLinkRefRangeController extends Disposable { this._unregisterPosition(option.payload.id); this._unwatchPosition(option.payload.id); this._unregisterRange(option.payload.id); + this._unwatchRange(option.payload.id); break; } case 'updateRef': { @@ -261,7 +263,6 @@ export class SheetsHyperLinkRefRangeController extends Disposable { if (!link) { return; } - this._unregisterPosition(id); this._registerPosition(unitId, subUnitId, link); if (!silent) { @@ -276,7 +277,9 @@ export class SheetsHyperLinkRefRangeController extends Disposable { const { links } = subUnitData; links.forEach((link) => { this._unregisterPosition(link.id); + this._unwatchPosition(link.id); this._unregisterRange(link.id); + this._unwatchRange(link.id); }); }); break; diff --git a/packages/sheets-hyper-link/src/models/hyper-link.model.ts b/packages/sheets-hyper-link/src/models/hyper-link.model.ts index 67409ecee3..1cf7574a0d 100644 --- a/packages/sheets-hyper-link/src/models/hyper-link.model.ts +++ b/packages/sheets-hyper-link/src/models/hyper-link.model.ts @@ -117,16 +117,22 @@ export class HyperLinkModel extends Disposable { return true; } - updateHyperLink(unitId: string, subUnitId: string, id: string, payload: Partial, silent?: boolean) { + updateHyperLink( + unitId: string, + subUnitId: string, + id: string, + payload: Partial, + silent = false + ) { const { matrix, positionMap } = this._ensureMap(unitId, subUnitId); - // const current = matrix.getValue(); const position = positionMap.get(id); if (!position) { - return false; + return true; } + const link = matrix.getValue(position.row, position.column); if (!link) { - return false; + return true; } Object.assign(link, payload); @@ -146,10 +152,9 @@ export class HyperLinkModel extends Disposable { updateHyperLinkRef(unitId: string, subUnitId: string, id: string, payload: { row: number; column: number }, silent = false) { const { matrix, positionMap } = this._ensureMap(unitId, subUnitId); - // const current = matrix.getValue(); const position = positionMap.get(id); if (!position) { - return false; + return true; } let link = matrix.getValue(position.row, position.column); @@ -187,9 +192,10 @@ export class HyperLinkModel extends Disposable { this._linkUpdate$.next({ unitId, subUnitId, - payload: link, + payload: position.link, type: 'remove', }); + return true; } diff --git a/packages/sheets/src/services/ref-range/util.ts b/packages/sheets/src/services/ref-range/util.ts index 39dbc9094d..6440826837 100644 --- a/packages/sheets/src/services/ref-range/util.ts +++ b/packages/sheets/src/services/ref-range/util.ts @@ -1148,7 +1148,7 @@ export function getEffectedRangesOnMutation(mutation: IMutationInfo Date: Fri, 7 Jun 2024 17:30:20 +0800 Subject: [PATCH 3/4] fix(formula): subtotal count --- .../math/subtotal/__tests__/index.spec.ts | 8 +++++-- .../src/functions/math/subtotal/index.ts | 24 +++++++++++++++---- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/packages/engine-formula/src/functions/math/subtotal/__tests__/index.spec.ts b/packages/engine-formula/src/functions/math/subtotal/__tests__/index.spec.ts index bdec5030b8..9a1282737d 100644 --- a/packages/engine-formula/src/functions/math/subtotal/__tests__/index.spec.ts +++ b/packages/engine-formula/src/functions/math/subtotal/__tests__/index.spec.ts @@ -275,12 +275,16 @@ describe('Test subtotal', () => { expect(result).toBe(11.157); }); it('Count, Var1 is array, var2 is array', async () => { - const result = await calculate('=SUBTOTAL(2,A1:B2,A3:F4)'); + let result = await calculate('=SUBTOTAL(2,A1:B2,A3:F4)'); expect(result).toBe(10); + result = await calculate('=SUBTOTAL(2,B1:C1)'); + expect(result).toBe(1); }); it('Counta, Var1 is array, var2 is array', async () => { - const result = await calculate('=SUBTOTAL(3,A1:B2,A3:F4)'); + let result = await calculate('=SUBTOTAL(3,A1:B2,A3:F4)'); expect(result).toBe(14); + result = await calculate('=SUBTOTAL(3,B1:C1)'); + expect(result).toBe(2); }); it('Max, Var1 is array, var2 is array', async () => { const result = await calculate('=SUBTOTAL(4,A1:B2,A3:F4)'); diff --git a/packages/engine-formula/src/functions/math/subtotal/index.ts b/packages/engine-formula/src/functions/math/subtotal/index.ts index 71976195fd..44ed0daf36 100644 --- a/packages/engine-formula/src/functions/math/subtotal/index.ts +++ b/packages/engine-formula/src/functions/math/subtotal/index.ts @@ -84,6 +84,7 @@ export class Subtotal extends BaseFunction { return this._handleSingleObject(functionNum as BaseValueObject, ...refs); } + // eslint-disable-next-line max-lines-per-function, complexity private _handleSingleObject(functionNum: Nullable, ...refs: FunctionVariantType[]) { const indexNum = this._getIndexNumValue(functionNum); let result; @@ -195,13 +196,28 @@ export class Subtotal extends BaseFunction { } private _count(ignoreHidden: boolean, ...refs: FunctionVariantType[]) { - const flattenArray = this._flattenRefArray(ignoreHidden, ...refs); + let accumulatorAll: BaseValueObject = NumberValueObject.create(0); + for (let i = 0; i < refs.length; i++) { + const variant = refs[i]; - if (flattenArray.isError()) { - return flattenArray; + if (!variant.isReferenceObject()) { + return ErrorValueObject.create(ErrorType.VALUE); + } + + const rowData = (variant as BaseReferenceObject).getRowData(); + + (variant as BaseReferenceObject).iterator((valueObject, rowIndex) => { + if (ignoreHidden && this._isRowHidden(rowData, rowIndex)) { + return true; + } + + if (valueObject?.isNumber()) { + accumulatorAll = accumulatorAll.plusBy(1); + } + }); } - return flattenArray.count(); + return accumulatorAll; } private _counta(ignoreHidden: boolean, ...refs: FunctionVariantType[]) { From bcde98f719d8b15ca7b1e57788ddcd26afcfbf6c Mon Sep 17 00:00:00 2001 From: Dushusir <1414556676@qq.com> Date: Fri, 7 Jun 2024 21:19:57 +0800 Subject: [PATCH 4/4] fix(formula): paste formula in other sheet --- .../formula-clipboard.controller.ts | 34 +++++++++++++------ 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/packages/sheets-formula/src/controllers/formula-clipboard.controller.ts b/packages/sheets-formula/src/controllers/formula-clipboard.controller.ts index 7988326210..95509b3852 100644 --- a/packages/sheets-formula/src/controllers/formula-clipboard.controller.ts +++ b/packages/sheets-formula/src/controllers/formula-clipboard.controller.ts @@ -26,7 +26,7 @@ import { Tools, UniverInstanceType, } from '@univerjs/core'; -import { LexerTreeBuilder } from '@univerjs/engine-formula'; +import { FormulaDataModel, LexerTreeBuilder } from '@univerjs/engine-formula'; import type { ISetRangeValuesMutationParams } from '@univerjs/sheets'; import { SetRangeValuesMutation, SetRangeValuesUndoMutationFactory } from '@univerjs/sheets'; import { COPY_TYPE, ISheetClipboardService, PREDEFINED_HOOK_NAME } from '@univerjs/sheets-ui'; @@ -44,7 +44,8 @@ export class FormulaClipboardController extends Disposable { @IUniverInstanceService private readonly _currentUniverSheet: IUniverInstanceService, @Inject(LexerTreeBuilder) private readonly _lexerTreeBuilder: LexerTreeBuilder, @ISheetClipboardService private readonly _sheetClipboardService: ISheetClipboardService, - @Inject(Injector) private readonly _injector: Injector + @Inject(Injector) private readonly _injector: Injector, + @Inject(FormulaDataModel) private readonly _formulaDataModel: FormulaDataModel ) { super(); @@ -92,8 +93,8 @@ export class FormulaClipboardController extends Disposable { const pastedRange = pasteTo.range; const matrix = data; const workbook = this._currentUniverSheet.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET)!; - const unitId = workbook.getUnitId(); - const subUnitId = workbook.getActiveSheet().getSheetId(); + const unitId = pasteTo.unitId || workbook.getUnitId(); + const subUnitId = pasteTo.subUnitId || workbook.getActiveSheet().getSheetId(); return this._injector.invoke((accessor) => getSetCellFormulaMutations( unitId, @@ -103,11 +104,14 @@ export class FormulaClipboardController extends Disposable { accessor, copyInfo, this._lexerTreeBuilder, - isSpecialPaste + this._formulaDataModel, + isSpecialPaste, + pasteFrom )); } } +// eslint-disable-next-line max-lines-per-function export function getSetCellFormulaMutations( unitId: string, subUnitId: string, @@ -120,7 +124,9 @@ export function getSetCellFormulaMutations( pasteType: string; }, lexerTreeBuilder: LexerTreeBuilder, - isSpecialPaste = false + formulaDataModel: FormulaDataModel, + isSpecialPaste = false, + pasteFrom: ISheetDiscreteRangeLocation | null ) { const redoMutationsInfo: IMutationInfo[] = []; const undoMutationsInfo: IMutationInfo[] = []; @@ -155,10 +161,18 @@ export function getSetCellFormulaMutations( // Directly reuse when there is a formula id if (isFormulaId(originalFormulaId)) { - valueObject.si = originalFormulaId; - valueObject.f = null; - valueObject.v = null; - valueObject.p = null; + const { unitId: pasteFromUnitId = '', subUnitId: pasteFromSubUnitId = '', range } = pasteFrom || {}; + + if (((pasteFromUnitId && unitId !== pasteFromUnitId) || (pasteFromSubUnitId && subUnitId !== pasteFromSubUnitId)) && range?.rows && range?.cols) { + const formulaString = formulaDataModel.getFormulaStringByCell(range.rows[row], range.cols[col], pasteFromSubUnitId, pasteFromUnitId); + + // TODO handle as normal formula string + } else { + valueObject.si = originalFormulaId; + valueObject.f = null; + valueObject.v = null; + valueObject.p = null; + } } else if (isFormulaString(originalFormula) && copyInfo.pasteType === PREDEFINED_HOOK_NAME.DEFAULT_PASTE) { const rowIndex = row % copyRowLength; const colIndex = col % copyColumnLength;