From a25c9df3113a426392a1c8f541b447d9b5aae7a5 Mon Sep 17 00:00:00 2001 From: kkxxkk2019 Date: Tue, 1 Apr 2025 13:30:07 +0800 Subject: [PATCH 1/7] chore: update rush change log --- common/config/rush/pnpm-config.json | 8 +- common/config/rush/pnpm-lock.yaml | 151 +++++++++++-------------- docs/package.json | 6 +- packages/openinula-vchart/package.json | 6 +- packages/react-vchart/package.json | 6 +- packages/vchart-extension/package.json | 8 +- packages/vchart/package.json | 8 +- packages/vstory/package.json | 6 +- tools/story-player/package.json | 8 +- 9 files changed, 93 insertions(+), 114 deletions(-) diff --git a/common/config/rush/pnpm-config.json b/common/config/rush/pnpm-config.json index 1ab89a9366..8bc1b2e2ac 100644 --- a/common/config/rush/pnpm-config.json +++ b/common/config/rush/pnpm-config.json @@ -83,9 +83,9 @@ * PNPM documentation: https://pnpm.io/package_json#pnpmoverrides */ "globalOverrides": { - // "@visactor/vrender-core": "0.22.3", - // "@visactor/vrender-kits": "0.22.3", - // "@visactor/vrender-components": "0.22.3" + "@visactor/vrender-core": "0.22.7-alpha.2", + "@visactor/vrender-kits": "0.22.7-alpha.2", + "@visactor/vrender-components": "0.22.7-alpha.2" }, /** * The `globalPeerDependencyRules` setting provides various settings for suppressing validation errors @@ -190,4 +190,4 @@ // }, // "pnpm": { "futurePnpmFeature": true } } -} +} \ No newline at end of file diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 9523e10817..dc13dbef8e 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -1,5 +1,10 @@ lockfileVersion: 5.4 +overrides: + '@visactor/vrender-core': 0.22.7-alpha.2 + '@visactor/vrender-kits': 0.22.7-alpha.2 + '@visactor/vrender-components': 0.22.7-alpha.2 + importers: .: @@ -23,8 +28,8 @@ importers: '@visactor/vchart-theme': ~1.6.6 '@visactor/vgrammar': 0.16.3 '@visactor/vmind': 1.2.4-alpha.5 - '@visactor/vrender': 0.22.6 - '@visactor/vrender-kits': 0.22.6 + '@visactor/vrender': 0.22.7-alpha.2 + '@visactor/vrender-kits': 0.22.7-alpha.2 '@visactor/vtable': 1.12.0 '@visactor/vtable-calendar': 1.12.0 '@visactor/vtable-editors': 1.12.0 @@ -61,8 +66,8 @@ importers: '@visactor/vchart-theme': 1.6.9 '@visactor/vgrammar': 0.16.3 '@visactor/vmind': 1.2.4-alpha.5 - '@visactor/vrender': 0.22.6 - '@visactor/vrender-kits': 0.22.6 + '@visactor/vrender': 0.22.7-alpha.2 + '@visactor/vrender-kits': 0.22.7-alpha.2 '@visactor/vtable': 1.12.0 '@visactor/vtable-calendar': 1.12.0 '@visactor/vtable-editors': 1.12.0 @@ -147,8 +152,8 @@ importers: '@types/react-is': ^17.0.3 '@visactor/vchart': workspace:1.13.8 '@visactor/vgrammar-core': 0.16.3 - '@visactor/vrender-core': 0.22.6 - '@visactor/vrender-kits': 0.22.6 + '@visactor/vrender-core': 0.22.7-alpha.2 + '@visactor/vrender-kits': 0.22.7-alpha.2 '@visactor/vutils': ~0.19.4 '@vitejs/plugin-react': 3.1.0 eslint: ~8.18.0 @@ -168,8 +173,8 @@ importers: dependencies: '@visactor/vchart': link:../vchart '@visactor/vgrammar-core': 0.16.3 - '@visactor/vrender-core': 0.22.6 - '@visactor/vrender-kits': 0.22.6 + '@visactor/vrender-core': 0.22.7-alpha.2 + '@visactor/vrender-kits': 0.22.7-alpha.2 '@visactor/vutils': 0.19.4 react-is: 18.3.1 devDependencies: @@ -212,8 +217,8 @@ importers: '@types/react-is': ^17.0.3 '@visactor/vchart': workspace:1.13.8 '@visactor/vgrammar-core': 0.16.3 - '@visactor/vrender-core': 0.22.6 - '@visactor/vrender-kits': 0.22.6 + '@visactor/vrender-core': 0.22.7-alpha.2 + '@visactor/vrender-kits': 0.22.7-alpha.2 '@visactor/vutils': ~0.19.4 '@vitejs/plugin-react': 3.1.0 eslint: ~8.18.0 @@ -234,8 +239,8 @@ importers: dependencies: '@visactor/vchart': link:../vchart '@visactor/vgrammar-core': 0.16.3 - '@visactor/vrender-core': 0.22.6 - '@visactor/vrender-kits': 0.22.6 + '@visactor/vrender-core': 0.22.7-alpha.2 + '@visactor/vrender-kits': 0.22.7-alpha.2 '@visactor/vutils': 0.19.4 react-is: 18.3.1 devDependencies: @@ -380,9 +385,9 @@ importers: '@visactor/vgrammar-venn': 0.16.3 '@visactor/vgrammar-wordcloud': 0.16.3 '@visactor/vgrammar-wordcloud-shape': 0.16.3 - '@visactor/vrender-components': 0.22.6 - '@visactor/vrender-core': 0.22.6 - '@visactor/vrender-kits': 0.22.6 + '@visactor/vrender-components': 0.22.7-alpha.2 + '@visactor/vrender-core': 0.22.7-alpha.2 + '@visactor/vrender-kits': 0.22.7-alpha.2 '@visactor/vscale': ~0.19.4 '@visactor/vutils': ~0.19.4 '@visactor/vutils-extension': workspace:1.13.8 @@ -428,9 +433,9 @@ importers: '@visactor/vgrammar-venn': 0.16.3 '@visactor/vgrammar-wordcloud': 0.16.3 '@visactor/vgrammar-wordcloud-shape': 0.16.3 - '@visactor/vrender-components': 0.22.6 - '@visactor/vrender-core': 0.22.6 - '@visactor/vrender-kits': 0.22.6 + '@visactor/vrender-components': 0.22.7-alpha.2 + '@visactor/vrender-core': 0.22.7-alpha.2 + '@visactor/vrender-kits': 0.22.7-alpha.2 '@visactor/vscale': 0.19.4 '@visactor/vutils': 0.19.4 '@visactor/vutils-extension': link:../vutils-extension @@ -492,9 +497,9 @@ importers: '@visactor/vchart': workspace:1.13.8 '@visactor/vdataset': ~0.19.4 '@visactor/vgrammar-core': 0.16.3 - '@visactor/vrender-components': 0.22.6 - '@visactor/vrender-core': 0.22.6 - '@visactor/vrender-kits': 0.22.6 + '@visactor/vrender-components': 0.22.7-alpha.2 + '@visactor/vrender-core': 0.22.7-alpha.2 + '@visactor/vrender-kits': 0.22.7-alpha.2 '@visactor/vutils': ~0.19.4 '@vitejs/plugin-react': 3.1.0 canvas: 2.11.2 @@ -516,9 +521,9 @@ importers: '@visactor/vchart': link:../vchart '@visactor/vdataset': 0.19.4 '@visactor/vgrammar-core': 0.16.3 - '@visactor/vrender-components': 0.22.6 - '@visactor/vrender-core': 0.22.6 - '@visactor/vrender-kits': 0.22.6 + '@visactor/vrender-components': 0.22.7-alpha.2 + '@visactor/vrender-core': 0.22.7-alpha.2 + '@visactor/vrender-kits': 0.22.7-alpha.2 '@visactor/vutils': 0.19.4 devDependencies: '@internal/bundler': link:../../tools/bundler @@ -890,9 +895,9 @@ importers: '@typescript-eslint/eslint-plugin': 5.30.0 '@typescript-eslint/parser': 5.30.0 '@visactor/vchart': workspace:1.13.8 - '@visactor/vrender': 0.22.6 - '@visactor/vrender-core': 0.22.6 - '@visactor/vrender-kits': 0.22.6 + '@visactor/vrender': 0.22.7-alpha.2 + '@visactor/vrender-core': 0.22.7-alpha.2 + '@visactor/vrender-kits': 0.22.7-alpha.2 '@visactor/vutils': ~0.19.4 cross-env: ^7.0.3 eslint: ~8.18.0 @@ -905,9 +910,9 @@ importers: vite: 3.2.6 dependencies: '@visactor/vchart': link:../../packages/vchart - '@visactor/vrender': 0.22.6 - '@visactor/vrender-core': 0.22.6 - '@visactor/vrender-kits': 0.22.6 + '@visactor/vrender': 0.22.7-alpha.2 + '@visactor/vrender-core': 0.22.7-alpha.2 + '@visactor/vrender-kits': 0.22.7-alpha.2 '@visactor/vutils': 0.19.4 devDependencies: '@internal/bundler': link:../bundler @@ -4874,9 +4879,9 @@ packages: '@visactor/vdataset': 0.19.4 '@visactor/vgrammar-coordinate': 0.16.3 '@visactor/vgrammar-util': 0.16.3 - '@visactor/vrender-components': 0.22.6 - '@visactor/vrender-core': 0.22.6 - '@visactor/vrender-kits': 0.22.6 + '@visactor/vrender-components': 0.22.7-alpha.2 + '@visactor/vrender-core': 0.22.7-alpha.2 + '@visactor/vrender-kits': 0.22.7-alpha.2 '@visactor/vscale': 0.19.4 '@visactor/vutils': 0.19.4 dev: false @@ -4886,8 +4891,8 @@ packages: dependencies: '@visactor/vgrammar-core': 0.16.3 '@visactor/vgrammar-util': 0.16.3 - '@visactor/vrender-core': 0.22.6 - '@visactor/vrender-kits': 0.22.6 + '@visactor/vrender-core': 0.22.7-alpha.2 + '@visactor/vrender-kits': 0.22.7-alpha.2 '@visactor/vutils': 0.19.4 dev: false @@ -4905,15 +4910,15 @@ packages: dependencies: '@visactor/vgrammar-core': 0.16.3 '@visactor/vgrammar-util': 0.16.3 - '@visactor/vrender-core': 0.22.6 - '@visactor/vrender-kits': 0.22.6 + '@visactor/vrender-core': 0.22.7-alpha.2 + '@visactor/vrender-kits': 0.22.7-alpha.2 '@visactor/vutils': 0.19.4 dev: false /@visactor/vgrammar-util/0.16.3: resolution: {integrity: sha512-aF9MqjTR7YvBAVDtp1A/CDVcXFGlO+TxkHVPEQVrn7cVu2DGRXCZnu/iQ+AUhttVYaWlSRflZj4cnQrKS4zy4g==} dependencies: - '@visactor/vrender-core': 0.22.6 + '@visactor/vrender-core': 0.22.7-alpha.2 '@visactor/vutils': 0.19.4 dev: false @@ -4922,8 +4927,8 @@ packages: dependencies: '@visactor/vgrammar-core': 0.16.3 '@visactor/vgrammar-util': 0.16.3 - '@visactor/vrender-core': 0.22.6 - '@visactor/vrender-kits': 0.22.6 + '@visactor/vrender-core': 0.22.7-alpha.2 + '@visactor/vrender-kits': 0.22.7-alpha.2 '@visactor/vutils': 0.19.4 dev: false @@ -4932,8 +4937,8 @@ packages: dependencies: '@visactor/vgrammar-core': 0.16.3 '@visactor/vgrammar-util': 0.16.3 - '@visactor/vrender-core': 0.22.6 - '@visactor/vrender-kits': 0.22.6 + '@visactor/vrender-core': 0.22.7-alpha.2 + '@visactor/vrender-kits': 0.22.7-alpha.2 '@visactor/vscale': 0.19.4 '@visactor/vutils': 0.19.4 dev: false @@ -4943,8 +4948,8 @@ packages: dependencies: '@visactor/vgrammar-core': 0.16.3 '@visactor/vgrammar-util': 0.16.3 - '@visactor/vrender-core': 0.22.6 - '@visactor/vrender-kits': 0.22.6 + '@visactor/vrender-core': 0.22.7-alpha.2 + '@visactor/vrender-kits': 0.22.7-alpha.2 '@visactor/vutils': 0.19.4 dev: false @@ -4972,64 +4977,38 @@ packages: - debug dev: false - /@visactor/vrender-components/0.21.0-alpha.4: - resolution: {integrity: sha512-vVI/Xt0qK50FeTloLfczEMr9CBnpzoRNAsKPZvUgh67i1mBiefJouQSpxQcpWeGrKO8WHNBPVFsQqQBoutmLkQ==} + /@visactor/vrender-components/0.22.7-alpha.2: + resolution: {integrity: sha512-VwiAuHyw66u5bi/LjfFraYUx2y+XuEDnEjSKI+BsEARCPnhL9rFJtsqj6pEjLNs/90J96QcWWFDRHikBZAnKFw==} dependencies: - '@visactor/vrender-core': 0.21.0-alpha.4 - '@visactor/vrender-kits': 0.21.0-alpha.4 - '@visactor/vscale': 0.18.18 - '@visactor/vutils': 0.18.18 - gifuct-js: 2.1.2 - dev: false - - /@visactor/vrender-components/0.22.6: - resolution: {integrity: sha512-YHLjA2GzP5LQxAAgzo2iniBxDldy9GtEzjm/sCXrrOGzzwMFlyhAeXCbUVEIMhTTfpRdK5LocAP1PSJsv4BObA==} - dependencies: - '@visactor/vrender-core': 0.22.6 - '@visactor/vrender-kits': 0.22.6 + '@visactor/vrender-core': 0.22.7-alpha.2 + '@visactor/vrender-kits': 0.22.7-alpha.2 '@visactor/vscale': 0.19.4 '@visactor/vutils': 0.19.4 dev: false - /@visactor/vrender-core/0.21.0-alpha.4: - resolution: {integrity: sha512-kZk5HiJSvAfZLb3GZXvRykFWjhTXlpt0i/+e5kU8AoLYt9T15H9xRv/w7jYEe94dBXd+yCVH4soN2Ad4YXQO6g==} - dependencies: - '@visactor/vutils': 0.18.18 - color-convert: 2.0.1 - dev: false - - /@visactor/vrender-core/0.22.6: - resolution: {integrity: sha512-R/MPjAuF9vT5atn7tAqhA5K1FMqYzv2SOhREsJpgP6QbJSnGR2uMTrNENRFvrM81ikR6yeh7WeTx6Fh2av+M4A==} + /@visactor/vrender-core/0.22.7-alpha.2: + resolution: {integrity: sha512-fo+dcGsE/Wd4an1eGwJONcBYeVunErzajkfMDFnNAfOJdsIXbeCYN8YHhTg4tRyjbJf6Qzkg+a1O4FP5w4RXfg==} dependencies: '@visactor/vutils': 0.19.4 color-convert: 2.0.1 dev: false - /@visactor/vrender-kits/0.21.0-alpha.4: - resolution: {integrity: sha512-OCFruyiXBjrxDulbRcmphMCzzMFFJK7gN1C25M1YwsM43bKA18olr/0HL7fQt0zQZUcTPmVHDVuOTi55YARVCg==} - dependencies: - '@resvg/resvg-js': 2.4.1 - '@visactor/vrender-core': 0.21.0-alpha.4 - '@visactor/vutils': 0.18.18 - roughjs: 4.5.2 - dev: false - - /@visactor/vrender-kits/0.22.6: - resolution: {integrity: sha512-0yRvhMhnT3JeFKCOi8riubkuKjNMIlzcW1FQV+kIyOGGV6nCSjvFL4+XDuEGalHlHt76BSlM1/cmxnmRNTHCRQ==} + /@visactor/vrender-kits/0.22.7-alpha.2: + resolution: {integrity: sha512-w3Z094VD7bOhpvMIL063K3kEWIOgUU2uwtdq8SiaCkYkESgj+sCjutEVm/kt5tYjv77Kj0dMPe2iRqYuC/vNdQ==} dependencies: '@resvg/resvg-js': 2.4.1 - '@visactor/vrender-core': 0.22.6 + '@visactor/vrender-core': 0.22.7-alpha.2 '@visactor/vutils': 0.19.4 gifuct-js: 2.1.2 lottie-web: 5.12.2 roughjs: 4.5.2 dev: false - /@visactor/vrender/0.22.6: - resolution: {integrity: sha512-hcLE3jGJxACBQXwiw4xjOEE2fcLuwTpGQn5m5wDULhgMGG7VuNJoXZNHjcRw2zHiw0J/PRIqAAU7pdamxYw6uA==} + /@visactor/vrender/0.22.7-alpha.2: + resolution: {integrity: sha512-1sG1j/QYd+a94FLPcu64QSD6eCSm2KWZ9yEuMwg9R5ATvHjI7Yqa0wbgZIRdsoVECYDGlZbKljsBEbIy/jBlgQ==} dependencies: - '@visactor/vrender-core': 0.22.6 - '@visactor/vrender-kits': 0.22.6 + '@visactor/vrender-core': 0.22.7-alpha.2 + '@visactor/vrender-kits': 0.22.7-alpha.2 dev: false /@visactor/vscale/0.18.18: @@ -5071,9 +5050,9 @@ packages: resolution: {integrity: sha512-yK33y0RP/K3SNPJMJ3nb6dPyWtBXXJy39RvkJYOa7yqb6c46o+/lP9d1fxdBXDgxNkNuIOPC2pVqyEhOiq3XGw==} dependencies: '@visactor/vdataset': 0.18.18 - '@visactor/vrender-components': 0.21.0-alpha.4 - '@visactor/vrender-core': 0.21.0-alpha.4 - '@visactor/vrender-kits': 0.21.0-alpha.4 + '@visactor/vrender-components': 0.22.7-alpha.2 + '@visactor/vrender-core': 0.22.7-alpha.2 + '@visactor/vrender-kits': 0.22.7-alpha.2 '@visactor/vscale': 0.18.18 '@visactor/vtable-editors': 1.12.0 '@visactor/vutils': 0.18.18 diff --git a/docs/package.json b/docs/package.json index d595435d03..fed4de3e99 100644 --- a/docs/package.json +++ b/docs/package.json @@ -19,8 +19,8 @@ "@visactor/vchart-theme": "~1.6.6", "@visactor/vmind": "1.2.4-alpha.5", "@visactor/vutils": "~0.19.4", - "@visactor/vrender": "0.22.6", - "@visactor/vrender-kits": "0.22.6", + "@visactor/vrender": "0.22.7-alpha.2", + "@visactor/vrender-kits": "0.22.7-alpha.2", "@visactor/vgrammar": "0.16.3", "@visactor/vtable": "1.12.0", "@visactor/vtable-editors": "1.12.0", @@ -59,4 +59,4 @@ "react-device-detect": "^2.2.2", "minimist": "1.2.8" } -} +} \ No newline at end of file diff --git a/packages/openinula-vchart/package.json b/packages/openinula-vchart/package.json index 621c0b43ee..8450bb9dbd 100644 --- a/packages/openinula-vchart/package.json +++ b/packages/openinula-vchart/package.json @@ -30,8 +30,8 @@ "dependencies": { "@visactor/vchart": "workspace:1.13.8", "@visactor/vutils": "~0.19.4", - "@visactor/vrender-core": "0.22.6", - "@visactor/vrender-kits": "0.22.6", + "@visactor/vrender-core": "0.22.7-alpha.2", + "@visactor/vrender-kits": "0.22.7-alpha.2", "@visactor/vgrammar-core": "0.16.3", "react-is": "^18.2.0" }, @@ -79,4 +79,4 @@ "access": "public", "registry": "https://registry.npmjs.org/" } -} +} \ No newline at end of file diff --git a/packages/react-vchart/package.json b/packages/react-vchart/package.json index bd4703bf06..4bdfcd647b 100644 --- a/packages/react-vchart/package.json +++ b/packages/react-vchart/package.json @@ -30,8 +30,8 @@ "dependencies": { "@visactor/vchart": "workspace:1.13.8", "@visactor/vutils": "~0.19.4", - "@visactor/vrender-core": "0.22.6", - "@visactor/vrender-kits": "0.22.6", + "@visactor/vrender-core": "0.22.7-alpha.2", + "@visactor/vrender-kits": "0.22.7-alpha.2", "@visactor/vgrammar-core": "0.16.3", "react-is": "^18.2.0" }, @@ -83,4 +83,4 @@ "access": "public", "registry": "https://registry.npmjs.org/" } -} +} \ No newline at end of file diff --git a/packages/vchart-extension/package.json b/packages/vchart-extension/package.json index a8aed0ca94..91823b7be1 100644 --- a/packages/vchart-extension/package.json +++ b/packages/vchart-extension/package.json @@ -21,9 +21,9 @@ "start": "ts-node __tests__/runtime/browser/scripts/initVite.ts && vite serve __tests__/runtime/browser" }, "dependencies": { - "@visactor/vrender-core": "0.22.6", - "@visactor/vrender-kits": "0.22.6", - "@visactor/vrender-components": "0.22.6", + "@visactor/vrender-core": "0.22.7-alpha.2", + "@visactor/vrender-kits": "0.22.7-alpha.2", + "@visactor/vrender-components": "0.22.7-alpha.2", "@visactor/vgrammar-core": "0.16.3", "@visactor/vutils": "~0.19.4", "@visactor/vdataset": "~0.19.4", @@ -60,4 +60,4 @@ "registry": "https://registry.npmjs.org/" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/vchart/package.json b/packages/vchart/package.json index 33d8232e0e..b567b67c33 100644 --- a/packages/vchart/package.json +++ b/packages/vchart/package.json @@ -121,9 +121,9 @@ "@visactor/vutils": "~0.19.4", "@visactor/vdataset": "~0.19.4", "@visactor/vscale": "~0.19.4", - "@visactor/vrender-core": "0.22.6", - "@visactor/vrender-kits": "0.22.6", - "@visactor/vrender-components": "0.22.6", + "@visactor/vrender-core": "0.22.7-alpha.2", + "@visactor/vrender-kits": "0.22.7-alpha.2", + "@visactor/vrender-components": "0.22.7-alpha.2", "@visactor/vgrammar-core": "0.16.3", "@visactor/vgrammar-projection": "0.16.3", "@visactor/vgrammar-wordcloud": "0.16.3", @@ -138,4 +138,4 @@ "access": "public", "registry": "https://registry.npmjs.org/" } -} +} \ No newline at end of file diff --git a/packages/vstory/package.json b/packages/vstory/package.json index c843ef3885..2a7208852d 100644 --- a/packages/vstory/package.json +++ b/packages/vstory/package.json @@ -21,9 +21,9 @@ }, "dependencies": { "@visactor/vchart": "workspace:1.11.0", - "@visactor/vrender-core": "0.22.6", - "@visactor/vrender-kits": "0.22.6", - "@visactor/vrender-components": "0.22.6", + "@visactor/vrender-core": "0.22.7-alpha.2", + "@visactor/vrender-kits": "0.22.7-alpha.2", + "@visactor/vrender-components": "0.22.7-alpha.2", "@visactor/vutils": "~0.19.4" }, "devDependencies": { diff --git a/tools/story-player/package.json b/tools/story-player/package.json index 6be0042412..f5e8f37965 100644 --- a/tools/story-player/package.json +++ b/tools/story-player/package.json @@ -56,10 +56,10 @@ "vite": "3.2.6" }, "dependencies": { - "@visactor/vrender-core": "0.22.6", - "@visactor/vrender-kits": "0.22.6", + "@visactor/vrender-core": "0.22.7-alpha.2", + "@visactor/vrender-kits": "0.22.7-alpha.2", "@visactor/vchart": "workspace:1.13.8", - "@visactor/vrender": "0.22.6", + "@visactor/vrender": "0.22.7-alpha.2", "@visactor/vutils": "~0.19.4" } -} +} \ No newline at end of file From 10a162a68eaddaf27505b83887be4686a2379281 Mon Sep 17 00:00:00 2001 From: kkxxkk2019 Date: Tue, 1 Apr 2025 13:51:10 +0800 Subject: [PATCH 2/7] feat: markLine and markArea's label can define more than one, closed #3868 --- .../marker/mark-area/base-mark-area.ts | 41 +++++++++------- .../marker/mark-area/interface/theme.ts | 14 +++--- .../marker/mark-line/base-mark-line.ts | 43 +++++++++-------- .../marker/mark-line/cartesian-mark-line.ts | 48 ++++++++++--------- .../marker/mark-line/interface/theme.ts | 14 +++--- 5 files changed, 90 insertions(+), 70 deletions(-) diff --git a/packages/vchart/src/component/marker/mark-area/base-mark-area.ts b/packages/vchart/src/component/marker/mark-area/base-mark-area.ts index b7e99c906f..44a9a4ae7b 100644 --- a/packages/vchart/src/component/marker/mark-area/base-mark-area.ts +++ b/packages/vchart/src/component/marker/mark-area/base-mark-area.ts @@ -13,6 +13,7 @@ import { transformToGraphic } from '../../../util/style'; import { BaseMarker } from '../base-marker'; import { LayoutZIndex } from '../../../constant/layout'; import type { IGroup } from '@visactor/vrender-core'; +import { array } from '@visactor/vutils'; export abstract class BaseMarkArea extends BaseMarker implements IMarkArea { static specKey = 'markArea'; specKey = 'markArea'; @@ -35,7 +36,7 @@ export abstract class BaseMarkArea extends BaseMarker implements } protected _createMarkerComponent() { - const label = this._spec.label ?? {}; + const label = array(this._spec.label ?? {}); const markAreaAttrs: MarkAreaAttrs | MarkArcAreaAttrs = { zIndex: this.layoutZIndex, interactive: this._spec.interactive ?? true, @@ -61,15 +62,17 @@ export abstract class BaseMarkArea extends BaseMarker implements this._markAttributeContext ), clipInRange: this._spec.clip ?? false, - label: transformLabelAttributes(label, this._markerData, this._markAttributeContext), + label: label.map((labelItem: any) => { + return transformLabelAttributes(labelItem, this._markerData, this._markAttributeContext); + }), state: { area: transformState(this._spec.area?.state, this._markerData, this._markAttributeContext), - label: transformState(this._spec.label?.state, this._markerData, this._markAttributeContext), - labelBackground: transformState( - this._spec?.label?.labelBackground?.state, - this._markerData, - this._markAttributeContext - ) + label: label.map((labelItem: any) => { + return transformState(labelItem.state, this._markerData, this._markAttributeContext); + }), + labelBackground: label.map((labelItem: any) => { + return transformState(labelItem.labelBackground?.state, this._markerData, this._markAttributeContext); + }) }, animation: this._spec.animation ?? false, animationEnter: this._spec.animationEnter, @@ -98,7 +101,7 @@ export abstract class BaseMarkArea extends BaseMarker implements : seriesData; let limitRect; - if (spec.clip || spec.label?.confine) { + if (spec.clip || array(spec.label).some(labelCfg => labelCfg?.confine)) { const { minX, maxX, minY, maxY } = computeClipRange([ startRelativeSeries.getRegion(), endRelativeSeries.getRegion(), @@ -113,15 +116,21 @@ export abstract class BaseMarkArea extends BaseMarker implements } if (this._markerComponent) { + const prevLabelAttrs = array(this._markerComponent.attribute?.label); + const specLabels = array(this._spec.label); + this._markerComponent.setAttributes({ ...pointsAttr, - label: { - ...this._markerComponent.attribute?.label, - text: this._spec.label.formatMethod - ? // type error here will be fixed in components - (this._spec.label.formatMethod(dataPoints, seriesData) as any) - : this._markerComponent.attribute?.label?.text - }, + label: prevLabelAttrs.map((prevLabel, index) => { + const specLabel = specLabels[index] || {}; + return { + ...prevLabel, + text: specLabel.formatMethod + ? // type error here will be fixed in components + (specLabel.formatMethod(dataPoints, seriesData) as any) + : prevLabel?.text + }; + }), limitRect, dx: this._layoutOffsetX, dy: this._layoutOffsetY diff --git a/packages/vchart/src/component/marker/mark-area/interface/theme.ts b/packages/vchart/src/component/marker/mark-area/interface/theme.ts index 07987497d7..1c6a7926ec 100644 --- a/packages/vchart/src/component/marker/mark-area/interface/theme.ts +++ b/packages/vchart/src/component/marker/mark-area/interface/theme.ts @@ -2,6 +2,13 @@ import type { IMarkAreaLabelPosition, IMarkCommonArcLabelPosition } from '@visac import type { IArcMarkSpec, IPolygonMarkSpec } from '../../../../typings'; import type { IMarkerLabelWithoutRefSpec, IMarkerState } from '../../interface'; +export type IMarkAreaLabel = { + /** + * label整体 - 相对line的位置 + */ + position?: keyof typeof IMarkAreaLabelPosition | IMarkCommonArcLabelPosition; +} & IMarkerLabelWithoutRefSpec; + export interface IMarkAreaTheme { /** * 标记区域的样式 @@ -10,10 +17,5 @@ export interface IMarkAreaTheme { /** * 标记区域的标签样式配置 */ - label?: { - /** - * label整体 - 相对line的位置 - */ - position?: keyof typeof IMarkAreaLabelPosition | IMarkCommonArcLabelPosition; - } & IMarkerLabelWithoutRefSpec; + label?: IMarkAreaLabel | IMarkAreaLabel[]; } diff --git a/packages/vchart/src/component/marker/mark-line/base-mark-line.ts b/packages/vchart/src/component/marker/mark-line/base-mark-line.ts index 8312250c81..be268c5a25 100644 --- a/packages/vchart/src/component/marker/mark-line/base-mark-line.ts +++ b/packages/vchart/src/component/marker/mark-line/base-mark-line.ts @@ -19,6 +19,7 @@ import type { IMarkerSymbol } from '../interface'; import { markerRegression } from '../../../data/transforms/regression'; import { LayoutZIndex } from '../../../constant/layout'; import { markerFilter } from '../../../data/transforms/marker-filter'; +import { array } from '@visactor/vutils'; export abstract class BaseMarkLine extends BaseMarker implements IMarkLine { static specKey = 'markLine'; @@ -49,11 +50,8 @@ export abstract class BaseMarkLine extends BaseMarker implements } protected _createMarkerComponent() { - const { - label = {}, - startSymbol = {} as IMarkerSymbol, - endSymbol = {} as IMarkerSymbol - } = this._spec as IMarkLineSpec; + const { startSymbol = {} as IMarkerSymbol, endSymbol = {} as IMarkerSymbol } = this._spec as IMarkLineSpec; + const label = array(this._spec.label ?? {}); const markLineAttrs: MarkLineAttrs | MarkArcLineAttrs = { zIndex: this.layoutZIndex, @@ -77,7 +75,9 @@ export abstract class BaseMarkLine extends BaseMarker implements this._markAttributeContext ), clipInRange: this._spec.clip ?? false, - label: transformLabelAttributes(label, this._markerData, this._markAttributeContext), + label: label.map(labelItem => { + return transformLabelAttributes(labelItem, this._markerData, this._markAttributeContext); + }), state: { line: transformState(this._spec.line?.state ?? {}, this._markerData, this._markAttributeContext), lineStartSymbol: transformState( @@ -86,12 +86,12 @@ export abstract class BaseMarkLine extends BaseMarker implements this._markAttributeContext ), lineEndSymbol: transformState(this._spec.endSymbol?.state ?? {}, this._markerData, this._markAttributeContext), - label: transformState(this._spec?.label?.state ?? {}, this._markerData, this._markAttributeContext), - labelBackground: transformState( - this._spec?.label?.labelBackground?.state ?? {}, - this._markerData, - this._markAttributeContext - ) + label: label.map(labelItem => { + return transformState(labelItem.state ?? {}, this._markerData, this._markAttributeContext); + }), + labelBackground: label.map(labelItem => { + return transformState(labelItem.labelBackground?.state ?? {}, this._markerData, this._markAttributeContext); + }) }, animation: this._spec.animation ?? false, animationEnter: this._spec.animationEnter, @@ -140,7 +140,7 @@ export abstract class BaseMarkLine extends BaseMarker implements data.latestData[0] && data.latestData[0].latestData ? data.latestData[0].latestData : data.latestData; let limitRect; - if (spec.clip || spec.label?.confine) { + if (spec.clip || array(spec.label).some(labelCfg => labelCfg?.confine)) { const { minX, maxX, minY, maxY } = computeClipRange([ startRelativeSeries.getRegion(), endRelativeSeries.getRegion(), @@ -154,13 +154,16 @@ export abstract class BaseMarkLine extends BaseMarker implements }; } const markerComponentAttr = this._markerComponent?.attribute ?? {}; - const labelAttrs = { - ...markerComponentAttr.label, - text: this._spec.label.formatMethod - ? this._spec.label.formatMethod(dataPoints, seriesData) - : markerComponentAttr.label?.text - }; - + const prevLabelAttrs = array(markerComponentAttr.label); + const specLabels = array(this._spec.label); + + const labelAttrs = prevLabelAttrs.map((prevLabel, index) => { + const specLabel = specLabels[index] || {}; + return { + ...prevLabel, + text: specLabel.formatMethod ? (specLabel.formatMethod(dataPoints, seriesData) as any) : prevLabel?.text + }; + }); return { ...pointsAttr, label: labelAttrs as MarkLineComponent['attribute']['label'], diff --git a/packages/vchart/src/component/marker/mark-line/cartesian-mark-line.ts b/packages/vchart/src/component/marker/mark-line/cartesian-mark-line.ts index 2f33da2f9d..2cf997c27f 100644 --- a/packages/vchart/src/component/marker/mark-line/cartesian-mark-line.ts +++ b/packages/vchart/src/component/marker/mark-line/cartesian-mark-line.ts @@ -8,7 +8,7 @@ import { MarkLine as MarkLineComponent, registerMarkLineAnimate } from '@visactor/vrender-components'; -import { isValid, isValidNumber } from '@visactor/vutils'; +import { array, isValid, isValidNumber } from '@visactor/vutils'; import type { IDataPos, IMarkProcessOptions } from '../interface'; import { getInsertPoints, getTextOffset } from './util'; import { Factory } from '../../../core/factory'; @@ -105,7 +105,7 @@ export class CartesianMarkLine extends BaseMarkLine { } else { expandDistanceValue = expandDistance as number; } - const { points, label, limitRect } = updateAttrs; + const { points, limitRect } = updateAttrs; const joinPoints = getInsertPoints( (points as IPoint[])[0], @@ -133,19 +133,9 @@ export class CartesianMarkLine extends BaseMarkLine { }; } - if (isValidNumber(this._spec.label?.refX)) { - labelPositionAttrs.refX += this._spec.label.refX; - } - if (isValidNumber(this._spec.label?.refY)) { - labelPositionAttrs.refY += this._spec.label.refY; - } - if (isValidNumber(this._spec.label?.dx)) { - labelPositionAttrs.dx = (labelPositionAttrs.dx || 0) + this._spec.label.dx; - } - if (isValidNumber(this._spec.label?.dy)) { - labelPositionAttrs.dy = (labelPositionAttrs.dy || 0) + this._spec.label.dy; - } const markerComponentAttr = this._markerComponent?.attribute ?? {}; + const prevLabelAttrs = array(markerComponentAttr.label); + const label = array(updateAttrs.label ?? {}); this._markerComponent?.setAttributes({ points: multiSegment ? [ @@ -154,15 +144,29 @@ export class CartesianMarkLine extends BaseMarkLine { [joinPoints[2], joinPoints[3]] ] : joinPoints, - label: { - ...label, - ...labelPositionAttrs, - textStyle: { - ...markerComponentAttr.label.textStyle, - textAlign: 'center', - textBaseline: 'middle' + label: label.map((labelItem, index) => { + if (isValidNumber(labelItem?.refX)) { + labelPositionAttrs.refX += labelItem.refX; + } + if (isValidNumber(labelItem?.refY)) { + labelPositionAttrs.refY += labelItem.refY; + } + if (isValidNumber(labelItem?.dx)) { + labelPositionAttrs.dx = (labelPositionAttrs.dx || 0) + labelItem.dx; + } + if (isValidNumber(labelItem?.dy)) { + labelPositionAttrs.dy = (labelPositionAttrs.dy || 0) + labelItem.dy; } - }, + return { + ...labelItem, + ...labelPositionAttrs, + textStyle: { + ...prevLabelAttrs[index]?.textStyle, + textAlign: 'center', + textBaseline: 'middle' + } + }; + }), limitRect, multiSegment, mainSegmentIndex, diff --git a/packages/vchart/src/component/marker/mark-line/interface/theme.ts b/packages/vchart/src/component/marker/mark-line/interface/theme.ts index 54688f2e1e..ad0e6b1219 100644 --- a/packages/vchart/src/component/marker/mark-line/interface/theme.ts +++ b/packages/vchart/src/component/marker/mark-line/interface/theme.ts @@ -2,6 +2,13 @@ import type { IMarkCommonArcLabelPosition, IMarkLineLabelPosition } from '@visac import type { IArcMarkSpec, ILineMarkSpec } from '../../../../typings'; import type { IMarkerLabelSpec, IMarkerState, IMarkerSymbol } from '../../interface'; +export type IMarkLineLabel = { + /** + * label整体 - 相对line的位置 + */ + position?: keyof typeof IMarkLineLabelPosition | IMarkCommonArcLabelPosition; +} & IMarkerLabelSpec; + export interface IMarkLineTheme { /** * 标注线的线样式 @@ -10,12 +17,7 @@ export interface IMarkLineTheme { /** * 标注线的标签样式 */ - label?: { - /** - * label整体 - 相对line的位置 - */ - position?: keyof typeof IMarkLineLabelPosition | IMarkCommonArcLabelPosition; - } & IMarkerLabelSpec; + label?: IMarkLineLabel | IMarkLineLabel[]; /** * 线标注起点symbol样式 From 6e6b0989008fd3f7558553125d8f355b4883a66a Mon Sep 17 00:00:00 2001 From: kkxxkk2019 Date: Tue, 1 Apr 2025 16:24:57 +0800 Subject: [PATCH 3/7] fix: type-step markline label update error fix --- .../runtime/browser/test-page/debug.ts | 612 +++++++----------- .../marker/mark-line/cartesian-mark-line.ts | 38 +- 2 files changed, 270 insertions(+), 380 deletions(-) diff --git a/packages/vchart/__tests__/runtime/browser/test-page/debug.ts b/packages/vchart/__tests__/runtime/browser/test-page/debug.ts index 5c8edf8cf8..34662bdbb4 100644 --- a/packages/vchart/__tests__/runtime/browser/test-page/debug.ts +++ b/packages/vchart/__tests__/runtime/browser/test-page/debug.ts @@ -2,312 +2,15 @@ import { default as VChart } from '../../../../src/index'; const CONTAINER_ID = 'chart'; const run = async () => { - // const spec = { - // direction: 'vertical', - // type: 'common', - // color: ['#00295C', '#2568BD', '#9F9F9F', '#C5C5C5', '#00B0F0', '#4BCFFF', '#C2C2C2', '#D7D7D7'], - // series: [ - // { - // type: 'bar', - // stack: true, - // direction: 'vertical', - // bar: { - // style: { - // stroke: '', - // lineWidth: 1 - // }, - // state: { - // hover: { - // stroke: '#000', - // lineWidth: 1 - // } - // } - // }, - // barBackground: { - // style: { - // stroke: '', - // lineWidth: 1 - // } - // }, - // label: { - // visible: true, - // position: 'inside', - // style: { - // lineHeight: '100%', - // fontSize: 16, - // fontWeight: 'bold' - // }, - // overlap: { - // strategy: [] - // }, - // smartInvert: true, - // formatConfig: {}, - // interactive: true - // }, - // totalLabel: { - // visible: true, - // position: 'top', - // overlap: false, - // clampForce: false, - // formatConfig: { - // fixed: 0, - // content: 'value' - // }, - // style: { - // lineHeight: '100%', - // lineWidth: 1, - // fill: '#1F2329', - // stroke: '#ffffff', - // fontSize: 16, - // fontWeight: 'bold' - // }, - // interactive: true - // }, - // seriesLabel: { - // visible: true, - // position: 'end', - // label: { - // style: { - // lineHeight: '100%', - // lineWidth: 1, - // stroke: '#ffffff', - // fontSize: 16, - // fontWeight: 'bold' - // }, - // space: 10 - // } - // }, - // xField: '_editor_dimension_field', - // yField: '_editor_value_field', - // dataId: '0', - // id: 'series-0', - // EDITOR_SERIES_DATA_KEY: '销量', - // seriesField: '_editor_type_field' - // } - // ], - // legends: { - // id: 'legend-discrete', - // visible: false, - // autoPage: false, - // position: 'start', - // interactive: false, - // item: { - // label: { - // style: { - // fill: '#1F2329', - // fontSize: 16 - // } - // } - // }, - // _originalVisible: false - // }, - // region: [ - // { - // id: 'region-0' - // } - // ], - // tooltip: { - // visible: true, - // mark: { - // content: [{}], - // title: {} - // }, - // dimension: { - // content: [{}], - // title: {} - // } - // }, - // axes: [ - // { - // orient: 'left', - // id: 'axis-left', - // type: 'linear', - // label: { - // autoLimit: false, - // style: { - // fill: '#1F2329', - // fontSize: 16 - // }, - // formatConfig: {} - // }, - // domainLine: { - // visible: true, - // style: { - // stroke: '#000000' - // } - // }, - // tick: { - // visible: true, - // style: { - // stroke: '#000000' - // } - // }, - // grid: { - // visible: false, - // style: { - // stroke: '#bbbfc4' - // } - // }, - // autoIndent: false, - // maxWidth: null, - // maxHeight: null, - // inverse: true - // }, - // { - // orient: 'bottom', - // id: 'axis-bottom', - // type: 'band', - // label: { - // autoLimit: false, - // style: { - // fill: '#1F2329', - // fontSize: 16 - // }, - // formatConfig: {} - // }, - // domainLine: { - // visible: true, - // style: { - // stroke: '#000000' - // }, - // onZero: true - // }, - // tick: { - // visible: true, - // style: { - // stroke: '#000000' - // } - // }, - // grid: { - // visible: false, - // style: { - // stroke: '#bbbfc4' - // } - // }, - // autoIndent: false, - // maxWidth: null, - // maxHeight: null, - // trimPadding: false, - // paddingInner: [0.2, 0], - // paddingOuter: [0.2, 0] - // } - // ], - // data: [ - // { - // id: '0', - // sourceKey: '销量', - // values: [ - // { - // _editor_dimension_field: '1 月', - // _editor_value_field: 2354, - // _editor_type_field: '销量' - // }, - // { - // _editor_dimension_field: '2 月', - // _editor_value_field: 1902, - // _editor_type_field: '销量' - // }, - // { - // _editor_dimension_field: '3 月', - // _editor_value_field: 3524, - // _editor_type_field: '销量' - // }, - // { - // _editor_dimension_field: '4 月', - // _editor_value_field: 2698, - // _editor_type_field: '销量' - // }, - // { - // _editor_dimension_field: '5 月', - // _editor_value_field: 2896, - // _editor_type_field: '销量' - // }, - // { - // _editor_dimension_field: '6 月', - // _editor_value_field: 2563, - // _editor_type_field: '销量' - // }, - // { - // _editor_dimension_field: '7 月', - // _editor_value_field: 3156, - // _editor_type_field: '销量' - // }, - // { - // _editor_dimension_field: '8 月', - // _editor_value_field: 2896, - // _editor_type_field: '销量' - // }, - // { - // _editor_dimension_field: '9 月', - // _editor_value_field: 3621, - // _editor_type_field: '销量' - // }, - // { - // _editor_dimension_field: '10 月', - // _editor_value_field: 2635, - // _editor_type_field: '销量' - // }, - // { - // _editor_dimension_field: '11 月', - // _editor_value_field: 2963, - // _editor_type_field: '销量' - // }, - // { - // _editor_dimension_field: '12 月', - // _editor_value_field: 2789, - // _editor_type_field: '销量' - // } - // ], - // specField: { - // _editor_dimension_field: { - // type: 'dimension', - // order: 0 - // }, - // _editor_type_field: { - // type: 'series', - // order: 0 - // }, - // _editor_value_field: { - // type: 'value', - // order: 0 - // } - // } - // } - // ], - // labelLayout: 'region', - // customMark: [ - // { - // type: 'component', - // componentType: 'seriesLabel', - // interactive: false, - // style: { - // id: 'a4fdf1eb-5315-48e7-b601-58e095324da6', - // position: 'end', - // label: { - // space: 10, - // style: { - // lineHeight: '100%', - // lineWidth: 1, - // stroke: '#ffffff', - // fontSize: 16, - // fontWeight: 'bold' - // } - // } - // } - // } - // ], - // background: 'transparent' - // }; const spec = { - // direction: 'horizontal', + direction: 'vertical', type: 'common', - // padding: [24, 400, 24, 24], color: ['#00295C', '#2568BD', '#9F9F9F', '#C5C5C5', '#00B0F0', '#4BCFFF', '#C2C2C2', '#D7D7D7'], series: [ { type: 'bar', stack: true, - direction: 'horizontal', + direction: 'vertical', bar: { style: { stroke: '', @@ -332,7 +35,8 @@ const run = async () => { style: { lineHeight: '100%', fontSize: 16, - fontWeight: 'bold' + fontWeight: 'bold', + pickMode: 'imprecise' }, overlap: { strategy: [] @@ -356,13 +60,14 @@ const run = async () => { fill: '#1F2329', stroke: '#ffffff', fontSize: 16, - fontWeight: 'bold' + fontWeight: 'bold', + pickMode: 'imprecise' }, interactive: true }, seriesLabel: { visible: true, - position: 'start', + position: 'end', label: { style: { lineHeight: '100%', @@ -374,11 +79,90 @@ const run = async () => { space: 10 } }, - xField: '_editor_value_field', - yField: '_editor_dimension_field', + xField: '_editor_dimension_field', + yField: '_editor_value_field', dataId: '0', id: 'series-0', - EDITOR_SERIES_DATA_KEY: '2023年库存数量', + EDITOR_SERIES_DATA_KEY: 'a', + seriesField: '_editor_type_field' + }, + { + type: 'bar', + stack: true, + direction: 'vertical', + bar: { + style: { + stroke: '', + lineWidth: 1 + }, + state: { + hover: { + stroke: '#000', + lineWidth: 1 + } + } + }, + barBackground: { + style: { + stroke: '', + lineWidth: 1 + } + }, + label: { + visible: true, + position: 'inside', + style: { + lineHeight: '100%', + fontSize: 16, + fontWeight: 'bold', + pickMode: 'imprecise' + }, + overlap: { + strategy: [] + }, + smartInvert: true, + formatConfig: {}, + interactive: true + }, + totalLabel: { + visible: true, + position: 'top', + overlap: false, + clampForce: false, + formatConfig: { + fixed: 0, + content: 'value' + }, + style: { + lineHeight: '100%', + lineWidth: 1, + fill: '#1F2329', + stroke: '#ffffff', + fontSize: 16, + fontWeight: 'bold', + pickMode: 'imprecise' + }, + interactive: true + }, + seriesLabel: { + visible: true, + position: 'end', + label: { + style: { + lineHeight: '100%', + lineWidth: 1, + stroke: '#ffffff', + fontSize: 16, + fontWeight: 'bold' + }, + space: 10 + } + }, + xField: '_editor_dimension_field', + yField: '_editor_value_field', + dataId: '1', + id: 'series-1', + EDITOR_SERIES_DATA_KEY: 'b', seriesField: '_editor_type_field' } ], @@ -392,7 +176,8 @@ const run = async () => { label: { style: { fill: '#1F2329', - fontSize: 16 + fontSize: 16, + lineWidth: 1 } } }, @@ -400,7 +185,8 @@ const run = async () => { }, region: [ { - id: 'region-0' + id: 'region-0', + stackInverse: true } ], tooltip: { @@ -412,28 +198,37 @@ const run = async () => { dimension: { content: [{}], title: {} + }, + enterable: true, + showDelay: 0, + style: { + maxContentHeight: '95%' } }, axes: [ { - orient: 'right', + orient: 'left', id: 'axis-left', - type: 'band', - trimPadding: false, + type: 'linear', label: { autoLimit: false, style: { fill: '#1F2329', - fontSize: 16 + fontSize: 16, + lineWidth: 1 }, - formatConfig: {} + formatConfig: {}, + _originStyle: { + fill: '#1F2329', + fontSize: 16, + lineWidth: 1 + } }, domainLine: { visible: true, style: { stroke: '#000000' - }, - onZero: true + } }, tick: { visible: true, @@ -454,20 +249,27 @@ const run = async () => { { orient: 'bottom', id: 'axis-bottom', - type: 'linear', + type: 'band', label: { autoLimit: false, style: { fill: '#1F2329', - fontSize: 16 + fontSize: 16, + lineWidth: 1 }, - formatConfig: {} + formatConfig: {}, + _originStyle: { + fill: '#1F2329', + fontSize: 16, + lineWidth: 1 + } }, domainLine: { visible: true, style: { stroke: '#000000' - } + }, + onZero: true }, tick: { visible: true, @@ -484,68 +286,65 @@ const run = async () => { autoIndent: false, maxWidth: null, maxHeight: null, - inverse: true + trimPadding: false, + paddingInner: [0.2, 0], + paddingOuter: [0.2, 0] } ], data: [ { id: '0', - sourceKey: '2023年库存数量', + sourceKey: 'a', values: [ { - _editor_dimension_field: '0-3', - _editor_value_field: 210, - _editor_type_field: '2023年库存数量' - }, - { - _editor_dimension_field: '4-6', - _editor_value_field: 350, - _editor_type_field: '2023年库存数量' + _editor_value_field: 20, + _editor_type_field: 'a', + _editor_dimension_field: 'x1' }, { - _editor_dimension_field: '7-9', - _editor_value_field: 500, - _editor_type_field: '2023年库存数量' + _editor_value_field: 23, + _editor_type_field: 'a', + _editor_dimension_field: 'x2' }, { - _editor_dimension_field: '10-12', - _editor_value_field: 850, - _editor_type_field: '2023年库存数量' - }, - { - _editor_dimension_field: '13-15', - _editor_value_field: 1180, - _editor_type_field: '2023年库存数量' - }, - { - _editor_dimension_field: '16-18', - _editor_value_field: 1450, - _editor_type_field: '2023年库存数量' - }, - { - _editor_dimension_field: '19-21', - _editor_value_field: 1190, - _editor_type_field: '2023年库存数量' + _editor_value_field: 26, + _editor_type_field: 'a', + _editor_dimension_field: 'x3' + } + ], + specField: { + _editor_dimension_field: { + type: 'dimension', + order: 0 }, - { - _editor_dimension_field: '22-24', - _editor_value_field: 950, - _editor_type_field: '2023年库存数量' + _editor_type_field: { + type: 'series', + order: 0 }, + _editor_value_field: { + type: 'value', + order: 0 + } + } + }, + { + id: '1', + sourceKey: 'b', + values: [ { - _editor_dimension_field: '25-27', - _editor_value_field: 700, - _editor_type_field: '2023年库存数量' + _editor_value_field: 20, + _editor_type_field: 'b', + _editor_dimension_field: 'x1' }, { - _editor_dimension_field: '28-30', - _editor_value_field: 400, - _editor_type_field: '2023年库存数量' + _editor_value_field: 24, + _editor_type_field: 'b', + _editor_dimension_field: 'x2' }, { - _editor_dimension_field: '31-33', - _editor_value_field: 300, - _editor_type_field: '2023年库存数量' + _editor_value_field: 29, + _editor_type_field: 'b', + _editor_dimension_field: 'x3' } ], specField: { @@ -564,9 +363,94 @@ const run = async () => { } } ], + markArea: [ + { + id: '17bd0d32-3070-4679-bc39-b0ce3426add8', + name: 'v-area', + interactive: true, + x: '0%', + x1: '50%', + area: { + style: { + fill: '#005DFF', + fillOpacity: '0.1' + } + }, + label: [ + { + position: 'top', + text: 'x1 - x2', + labelBackground: { + visible: true, + style: { + fill: '#fff', + fillOpacity: 1, + stroke: '#000', + lineWidth: 1, + cornerRadius: 4 + } + }, + style: { + fill: '#1F2329', + fontSize: 16, + fontWeight: 'bold' + }, + dy: -6, + pickable: true, + childrenPickable: false + }, + { + position: 'left', + text: 'x1 - x2', + labelBackground: { + visible: true, + style: { + fill: '#fff', + fillOpacity: 1, + stroke: '#000', + lineWidth: 1, + cornerRadius: 4 + } + }, + style: { + fill: '#1F2329', + fontSize: 16, + fontWeight: 'bold' + }, + dx: -6, + pickable: true, + childrenPickable: false + } + ], + _originValue_: ['x1', 'x2'], + _editor_marker_label_: 'x1 - x2', + zIndex: 500 + } + ], + markLine: [], + markPoint: [], labelLayout: 'region', - - background: 'transparent' + customMark: [ + { + type: 'component', + componentType: 'seriesLabel', + interactive: false, + style: { + id: '13643b25-e719-4de6-874c-a4587015f1aa', + position: 'end', + label: { + space: 10, + style: { + lineHeight: '100%', + lineWidth: 1, + stroke: '#ffffff', + fontSize: 16, + fontWeight: 'bold' + } + } + } + } + ] }; const vchart = new VChart(spec, { dom: CONTAINER_ID }); vchart.renderSync(); diff --git a/packages/vchart/src/component/marker/mark-line/cartesian-mark-line.ts b/packages/vchart/src/component/marker/mark-line/cartesian-mark-line.ts index 2cf997c27f..9ec7131e0a 100644 --- a/packages/vchart/src/component/marker/mark-line/cartesian-mark-line.ts +++ b/packages/vchart/src/component/marker/mark-line/cartesian-mark-line.ts @@ -119,23 +119,20 @@ export class CartesianMarkLine extends BaseMarkLine { // 如果用户配置了主线段，则不进行 label 的偏移处理，直接显示在主线段中间 labelPositionAttrs = { position: 'middle', - autoRotate: false, - refX: 0, - refY: 0 + autoRotate: false }; } else { labelPositionAttrs = { position: 'start', autoRotate: false, - ...getTextOffset((points as IPoint[])[0], (points as IPoint[])[1], connectDirection, expandDistanceValue), - refX: 0, - refY: 0 + ...getTextOffset((points as IPoint[])[0], (points as IPoint[])[1], connectDirection, expandDistanceValue) }; } const markerComponentAttr = this._markerComponent?.attribute ?? {}; const prevLabelAttrs = array(markerComponentAttr.label); - const label = array(updateAttrs.label ?? {}); + const updateLabels = array(updateAttrs.label); + const labelsInSpec = array(this._spec.label); this._markerComponent?.setAttributes({ points: multiSegment ? [ @@ -144,22 +141,31 @@ export class CartesianMarkLine extends BaseMarkLine { [joinPoints[2], joinPoints[3]] ] : joinPoints, - label: label.map((labelItem, index) => { - if (isValidNumber(labelItem?.refX)) { - labelPositionAttrs.refX += labelItem.refX; + label: updateLabels.map((labelItem, index) => { + let refX = 0; + let refY = 0; + let dx = labelPositionAttrs.dx ?? 0; + let dy = labelPositionAttrs.dy ?? 0; + const labelSpec = labelsInSpec[index] ?? labelsInSpec[0]; + if (isValidNumber(labelSpec?.refX)) { + refX += labelSpec.refX; } - if (isValidNumber(labelItem?.refY)) { - labelPositionAttrs.refY += labelItem.refY; + if (isValidNumber(labelSpec?.refY)) { + refY += labelSpec.refY; } - if (isValidNumber(labelItem?.dx)) { - labelPositionAttrs.dx = (labelPositionAttrs.dx || 0) + labelItem.dx; + if (isValidNumber(labelSpec?.dx)) { + dx += labelSpec.dx; } - if (isValidNumber(labelItem?.dy)) { - labelPositionAttrs.dy = (labelPositionAttrs.dy || 0) + labelItem.dy; + if (isValidNumber(labelSpec?.dy)) { + dy += labelSpec.dy; } return { ...labelItem, ...labelPositionAttrs, + refX, + refY, + dx, + dy, textStyle: { ...prevLabelAttrs[index]?.textStyle, textAlign: 'center', From 69bbf0be0752a09317a2580569d8eb9c8f90669b Mon Sep 17 00:00:00 2001 From: kkxxkk2019 Date: Mon, 14 Apr 2025 10:29:59 +0800 Subject: [PATCH 4/7] chore: upgrade vrender version --- common/config/rush/pnpm-config.json | 6 +- common/config/rush/pnpm-lock.yaml | 150 ++++++++++++++----------- docs/package.json | 4 +- packages/openinula-vchart/package.json | 4 +- packages/react-vchart/package.json | 4 +- packages/vchart-extension/package.json | 6 +- packages/vchart/package.json | 6 +- packages/vstory/package.json | 6 +- tools/story-player/package.json | 6 +- 9 files changed, 103 insertions(+), 89 deletions(-) diff --git a/common/config/rush/pnpm-config.json b/common/config/rush/pnpm-config.json index 8bc1b2e2ac..c869ecadc3 100644 --- a/common/config/rush/pnpm-config.json +++ b/common/config/rush/pnpm-config.json @@ -83,9 +83,9 @@ * PNPM documentation: https://pnpm.io/package_json#pnpmoverrides */ "globalOverrides": { - "@visactor/vrender-core": "0.22.7-alpha.2", - "@visactor/vrender-kits": "0.22.7-alpha.2", - "@visactor/vrender-components": "0.22.7-alpha.2" + "@visactor/vrender-core": "0.22.7", + "@visactor/vrender-kits": "0.22.7", + "@visactor/vrender-components": "0.22.7" }, /** * The `globalPeerDependencyRules` setting provides various settings for suppressing validation errors diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index dc13dbef8e..95c4c09f10 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -1,9 +1,9 @@ lockfileVersion: 5.4 overrides: - '@visactor/vrender-core': 0.22.7-alpha.2 - '@visactor/vrender-kits': 0.22.7-alpha.2 - '@visactor/vrender-components': 0.22.7-alpha.2 + '@visactor/vrender-core': 0.22.7 + '@visactor/vrender-kits': 0.22.7 + '@visactor/vrender-components': 0.22.7 importers: @@ -28,8 +28,8 @@ importers: '@visactor/vchart-theme': ~1.6.6 '@visactor/vgrammar': 0.16.3 '@visactor/vmind': 1.2.4-alpha.5 - '@visactor/vrender': 0.22.7-alpha.2 - '@visactor/vrender-kits': 0.22.7-alpha.2 + '@visactor/vrender': 0.22.7 + '@visactor/vrender-kits': 0.22.7 '@visactor/vtable': 1.12.0 '@visactor/vtable-calendar': 1.12.0 '@visactor/vtable-editors': 1.12.0 @@ -66,8 +66,8 @@ importers: '@visactor/vchart-theme': 1.6.9 '@visactor/vgrammar': 0.16.3 '@visactor/vmind': 1.2.4-alpha.5 - '@visactor/vrender': 0.22.7-alpha.2 - '@visactor/vrender-kits': 0.22.7-alpha.2 + '@visactor/vrender': 0.22.7 + '@visactor/vrender-kits': 0.22.7 '@visactor/vtable': 1.12.0 '@visactor/vtable-calendar': 1.12.0 '@visactor/vtable-editors': 1.12.0 @@ -152,8 +152,8 @@ importers: '@types/react-is': ^17.0.3 '@visactor/vchart': workspace:1.13.8 '@visactor/vgrammar-core': 0.16.3 - '@visactor/vrender-core': 0.22.7-alpha.2 - '@visactor/vrender-kits': 0.22.7-alpha.2 + '@visactor/vrender-core': 0.22.7 + '@visactor/vrender-kits': 0.22.7 '@visactor/vutils': ~0.19.4 '@vitejs/plugin-react': 3.1.0 eslint: ~8.18.0 @@ -173,8 +173,8 @@ importers: dependencies: '@visactor/vchart': link:../vchart '@visactor/vgrammar-core': 0.16.3 - '@visactor/vrender-core': 0.22.7-alpha.2 - '@visactor/vrender-kits': 0.22.7-alpha.2 + '@visactor/vrender-core': 0.22.7 + '@visactor/vrender-kits': 0.22.7 '@visactor/vutils': 0.19.4 react-is: 18.3.1 devDependencies: @@ -217,8 +217,8 @@ importers: '@types/react-is': ^17.0.3 '@visactor/vchart': workspace:1.13.8 '@visactor/vgrammar-core': 0.16.3 - '@visactor/vrender-core': 0.22.7-alpha.2 - '@visactor/vrender-kits': 0.22.7-alpha.2 + '@visactor/vrender-core': 0.22.7 + '@visactor/vrender-kits': 0.22.7 '@visactor/vutils': ~0.19.4 '@vitejs/plugin-react': 3.1.0 eslint: ~8.18.0 @@ -239,8 +239,8 @@ importers: dependencies: '@visactor/vchart': link:../vchart '@visactor/vgrammar-core': 0.16.3 - '@visactor/vrender-core': 0.22.7-alpha.2 - '@visactor/vrender-kits': 0.22.7-alpha.2 + '@visactor/vrender-core': 0.22.7 + '@visactor/vrender-kits': 0.22.7 '@visactor/vutils': 0.19.4 react-is: 18.3.1 devDependencies: @@ -385,9 +385,9 @@ importers: '@visactor/vgrammar-venn': 0.16.3 '@visactor/vgrammar-wordcloud': 0.16.3 '@visactor/vgrammar-wordcloud-shape': 0.16.3 - '@visactor/vrender-components': 0.22.7-alpha.2 - '@visactor/vrender-core': 0.22.7-alpha.2 - '@visactor/vrender-kits': 0.22.7-alpha.2 + '@visactor/vrender-components': 0.22.7 + '@visactor/vrender-core': 0.22.7 + '@visactor/vrender-kits': 0.22.7 '@visactor/vscale': ~0.19.4 '@visactor/vutils': ~0.19.4 '@visactor/vutils-extension': workspace:1.13.8 @@ -433,9 +433,9 @@ importers: '@visactor/vgrammar-venn': 0.16.3 '@visactor/vgrammar-wordcloud': 0.16.3 '@visactor/vgrammar-wordcloud-shape': 0.16.3 - '@visactor/vrender-components': 0.22.7-alpha.2 - '@visactor/vrender-core': 0.22.7-alpha.2 - '@visactor/vrender-kits': 0.22.7-alpha.2 + '@visactor/vrender-components': 0.22.7 + '@visactor/vrender-core': 0.22.7 + '@visactor/vrender-kits': 0.22.7 '@visactor/vscale': 0.19.4 '@visactor/vutils': 0.19.4 '@visactor/vutils-extension': link:../vutils-extension @@ -497,9 +497,9 @@ importers: '@visactor/vchart': workspace:1.13.8 '@visactor/vdataset': ~0.19.4 '@visactor/vgrammar-core': 0.16.3 - '@visactor/vrender-components': 0.22.7-alpha.2 - '@visactor/vrender-core': 0.22.7-alpha.2 - '@visactor/vrender-kits': 0.22.7-alpha.2 + '@visactor/vrender-components': 0.22.7 + '@visactor/vrender-core': 0.22.7 + '@visactor/vrender-kits': 0.22.7 '@visactor/vutils': ~0.19.4 '@vitejs/plugin-react': 3.1.0 canvas: 2.11.2 @@ -521,9 +521,9 @@ importers: '@visactor/vchart': link:../vchart '@visactor/vdataset': 0.19.4 '@visactor/vgrammar-core': 0.16.3 - '@visactor/vrender-components': 0.22.7-alpha.2 - '@visactor/vrender-core': 0.22.7-alpha.2 - '@visactor/vrender-kits': 0.22.7-alpha.2 + '@visactor/vrender-components': 0.22.7 + '@visactor/vrender-core': 0.22.7 + '@visactor/vrender-kits': 0.22.7 '@visactor/vutils': 0.19.4 devDependencies: '@internal/bundler': link:../../tools/bundler @@ -895,9 +895,9 @@ importers: '@typescript-eslint/eslint-plugin': 5.30.0 '@typescript-eslint/parser': 5.30.0 '@visactor/vchart': workspace:1.13.8 - '@visactor/vrender': 0.22.7-alpha.2 - '@visactor/vrender-core': 0.22.7-alpha.2 - '@visactor/vrender-kits': 0.22.7-alpha.2 + '@visactor/vrender': 0.22.7 + '@visactor/vrender-core': 0.22.7 + '@visactor/vrender-kits': 0.22.7 '@visactor/vutils': ~0.19.4 cross-env: ^7.0.3 eslint: ~8.18.0 @@ -910,9 +910,9 @@ importers: vite: 3.2.6 dependencies: '@visactor/vchart': link:../../packages/vchart - '@visactor/vrender': 0.22.7-alpha.2 - '@visactor/vrender-core': 0.22.7-alpha.2 - '@visactor/vrender-kits': 0.22.7-alpha.2 + '@visactor/vrender': 0.22.7 + '@visactor/vrender-core': 0.22.7 + '@visactor/vrender-kits': 0.22.7 '@visactor/vutils': 0.19.4 devDependencies: '@internal/bundler': link:../bundler @@ -4870,7 +4870,7 @@ packages: resolution: {integrity: sha512-tfDSi3WgY/GWDvbf67eus4a7jR74y7OMod3JrTqyDVzSNZUOgUtS3ieEM71f9yipxjY8gxo53GPDpH/advxUZw==} dependencies: '@visactor/vgrammar-util': 0.16.3 - '@visactor/vutils': 0.19.4 + '@visactor/vutils': 0.19.5 dev: false /@visactor/vgrammar-core/0.16.3: @@ -4879,9 +4879,9 @@ packages: '@visactor/vdataset': 0.19.4 '@visactor/vgrammar-coordinate': 0.16.3 '@visactor/vgrammar-util': 0.16.3 - '@visactor/vrender-components': 0.22.7-alpha.2 - '@visactor/vrender-core': 0.22.7-alpha.2 - '@visactor/vrender-kits': 0.22.7-alpha.2 + '@visactor/vrender-components': 0.22.7 + '@visactor/vrender-core': 0.22.7 + '@visactor/vrender-kits': 0.22.7 '@visactor/vscale': 0.19.4 '@visactor/vutils': 0.19.4 dev: false @@ -4891,8 +4891,8 @@ packages: dependencies: '@visactor/vgrammar-core': 0.16.3 '@visactor/vgrammar-util': 0.16.3 - '@visactor/vrender-core': 0.22.7-alpha.2 - '@visactor/vrender-kits': 0.22.7-alpha.2 + '@visactor/vrender-core': 0.22.7 + '@visactor/vrender-kits': 0.22.7 '@visactor/vutils': 0.19.4 dev: false @@ -4910,15 +4910,15 @@ packages: dependencies: '@visactor/vgrammar-core': 0.16.3 '@visactor/vgrammar-util': 0.16.3 - '@visactor/vrender-core': 0.22.7-alpha.2 - '@visactor/vrender-kits': 0.22.7-alpha.2 + '@visactor/vrender-core': 0.22.7 + '@visactor/vrender-kits': 0.22.7 '@visactor/vutils': 0.19.4 dev: false /@visactor/vgrammar-util/0.16.3: resolution: {integrity: sha512-aF9MqjTR7YvBAVDtp1A/CDVcXFGlO+TxkHVPEQVrn7cVu2DGRXCZnu/iQ+AUhttVYaWlSRflZj4cnQrKS4zy4g==} dependencies: - '@visactor/vrender-core': 0.22.7-alpha.2 + '@visactor/vrender-core': 0.22.7 '@visactor/vutils': 0.19.4 dev: false @@ -4927,8 +4927,8 @@ packages: dependencies: '@visactor/vgrammar-core': 0.16.3 '@visactor/vgrammar-util': 0.16.3 - '@visactor/vrender-core': 0.22.7-alpha.2 - '@visactor/vrender-kits': 0.22.7-alpha.2 + '@visactor/vrender-core': 0.22.7 + '@visactor/vrender-kits': 0.22.7 '@visactor/vutils': 0.19.4 dev: false @@ -4937,8 +4937,8 @@ packages: dependencies: '@visactor/vgrammar-core': 0.16.3 '@visactor/vgrammar-util': 0.16.3 - '@visactor/vrender-core': 0.22.7-alpha.2 - '@visactor/vrender-kits': 0.22.7-alpha.2 + '@visactor/vrender-core': 0.22.7 + '@visactor/vrender-kits': 0.22.7 '@visactor/vscale': 0.19.4 '@visactor/vutils': 0.19.4 dev: false @@ -4948,8 +4948,8 @@ packages: dependencies: '@visactor/vgrammar-core': 0.16.3 '@visactor/vgrammar-util': 0.16.3 - '@visactor/vrender-core': 0.22.7-alpha.2 - '@visactor/vrender-kits': 0.22.7-alpha.2 + '@visactor/vrender-core': 0.22.7 + '@visactor/vrender-kits': 0.22.7 '@visactor/vutils': 0.19.4 dev: false @@ -4977,38 +4977,38 @@ packages: - debug dev: false - /@visactor/vrender-components/0.22.7-alpha.2: - resolution: {integrity: sha512-VwiAuHyw66u5bi/LjfFraYUx2y+XuEDnEjSKI+BsEARCPnhL9rFJtsqj6pEjLNs/90J96QcWWFDRHikBZAnKFw==} + /@visactor/vrender-components/0.22.7: + resolution: {integrity: sha512-34YIWcGK9ltEw+41FZp9CHOpUuMKNzUnno3PE9FrBIapkS1pN89IZhghfwqcqxlP7HFLH78Fsiy5+aDWfNC+TA==} dependencies: - '@visactor/vrender-core': 0.22.7-alpha.2 - '@visactor/vrender-kits': 0.22.7-alpha.2 - '@visactor/vscale': 0.19.4 - '@visactor/vutils': 0.19.4 + '@visactor/vrender-core': 0.22.7 + '@visactor/vrender-kits': 0.22.7 + '@visactor/vscale': 0.19.5 + '@visactor/vutils': 0.19.5 dev: false - /@visactor/vrender-core/0.22.7-alpha.2: - resolution: {integrity: sha512-fo+dcGsE/Wd4an1eGwJONcBYeVunErzajkfMDFnNAfOJdsIXbeCYN8YHhTg4tRyjbJf6Qzkg+a1O4FP5w4RXfg==} + /@visactor/vrender-core/0.22.7: + resolution: {integrity: sha512-1PAmNWIz3r99WpbtRjF4vG7U1ft2/chCPd4c5nDfkWZ1fT+t2TvMAMh8L5NWszxCFT9kDvYpfsmtseX/09nznA==} dependencies: - '@visactor/vutils': 0.19.4 + '@visactor/vutils': 0.19.5 color-convert: 2.0.1 dev: false - /@visactor/vrender-kits/0.22.7-alpha.2: - resolution: {integrity: sha512-w3Z094VD7bOhpvMIL063K3kEWIOgUU2uwtdq8SiaCkYkESgj+sCjutEVm/kt5tYjv77Kj0dMPe2iRqYuC/vNdQ==} + /@visactor/vrender-kits/0.22.7: + resolution: {integrity: sha512-mOcm2O0qH42x5R2zVy2vkQ+s3/DEI0ZiqvoahVvQ//8oHWzrIbhmdj90Oi6Xh2styfvRrh3P2QfuDLU7tug9EA==} dependencies: '@resvg/resvg-js': 2.4.1 - '@visactor/vrender-core': 0.22.7-alpha.2 - '@visactor/vutils': 0.19.4 + '@visactor/vrender-core': 0.22.7 + '@visactor/vutils': 0.19.5 gifuct-js: 2.1.2 lottie-web: 5.12.2 roughjs: 4.5.2 dev: false - /@visactor/vrender/0.22.7-alpha.2: - resolution: {integrity: sha512-1sG1j/QYd+a94FLPcu64QSD6eCSm2KWZ9yEuMwg9R5ATvHjI7Yqa0wbgZIRdsoVECYDGlZbKljsBEbIy/jBlgQ==} + /@visactor/vrender/0.22.7: + resolution: {integrity: sha512-HBeQaf4TwpAl9v1L145d+q2EWcUbn0zawl+a0s1OY1MP6HTAQpy/1GSEiAvw6HrezedmCE3ga7XM9dmlnLP6Dg==} dependencies: - '@visactor/vrender-core': 0.22.7-alpha.2 - '@visactor/vrender-kits': 0.22.7-alpha.2 + '@visactor/vrender-core': 0.22.7 + '@visactor/vrender-kits': 0.22.7 dev: false /@visactor/vscale/0.18.18: @@ -5023,6 +5023,12 @@ packages: '@visactor/vutils': 0.19.4 dev: false + /@visactor/vscale/0.19.5: + resolution: {integrity: sha512-KiXrn184Fh5aJBl/IcOK5irkJr0jwrpNjLPJ/0wfepYSycyEF5z7lDdfnvoJFEcMoljYjDQVg6Fxg9Adozc6vg==} + dependencies: + '@visactor/vutils': 0.19.5 + dev: false + /@visactor/vtable-calendar/1.12.0: resolution: {integrity: sha512-pp+eTnSzXsN0Hj09syGhdtiohBTchc0pBxZoOUx5Fudts3aDErNQkW6FEUZDMoEDFiORzKq2iaLYU/IzrgSvVA==} dependencies: @@ -5050,9 +5056,9 @@ packages: resolution: {integrity: sha512-yK33y0RP/K3SNPJMJ3nb6dPyWtBXXJy39RvkJYOa7yqb6c46o+/lP9d1fxdBXDgxNkNuIOPC2pVqyEhOiq3XGw==} dependencies: '@visactor/vdataset': 0.18.18 - '@visactor/vrender-components': 0.22.7-alpha.2 - '@visactor/vrender-core': 0.22.7-alpha.2 - '@visactor/vrender-kits': 0.22.7-alpha.2 + '@visactor/vrender-components': 0.22.7 + '@visactor/vrender-core': 0.22.7 + '@visactor/vrender-kits': 0.22.7 '@visactor/vscale': 0.18.18 '@visactor/vtable-editors': 1.12.0 '@visactor/vutils': 0.18.18 @@ -5092,6 +5098,14 @@ packages: eventemitter3: 4.0.7 dev: false + /@visactor/vutils/0.19.5: + resolution: {integrity: sha512-sSU9Gnmnej7LgkENKkdmVqx1I3ZYVugDbGP0KEzgo8j+txAwrthEQTSeFwZcVS0iYrAvSzpmAVuN0/NRo6+vpg==} + dependencies: + '@turf/helpers': 6.5.0 + '@turf/invariant': 6.5.0 + eventemitter3: 4.0.7 + dev: false + /@vitejs/plugin-react/3.1.0_vite@3.2.6: resolution: {integrity: sha512-AfgcRL8ZBhAlc3BFdigClmTUMISmmzHn7sB2h9U1odvc5U/MjWXsAaz18b/WoppUTDBzxOJwo2VdClfUcItu9g==} engines: {node: ^14.18.0 || >=16.0.0} diff --git a/docs/package.json b/docs/package.json index fed4de3e99..36674d59d5 100644 --- a/docs/package.json +++ b/docs/package.json @@ -19,8 +19,8 @@ "@visactor/vchart-theme": "~1.6.6", "@visactor/vmind": "1.2.4-alpha.5", "@visactor/vutils": "~0.19.4", - "@visactor/vrender": "0.22.7-alpha.2", - "@visactor/vrender-kits": "0.22.7-alpha.2", + "@visactor/vrender": "0.22.7", + "@visactor/vrender-kits": "0.22.7", "@visactor/vgrammar": "0.16.3", "@visactor/vtable": "1.12.0", "@visactor/vtable-editors": "1.12.0", diff --git a/packages/openinula-vchart/package.json b/packages/openinula-vchart/package.json index 8450bb9dbd..6d8a2fd628 100644 --- a/packages/openinula-vchart/package.json +++ b/packages/openinula-vchart/package.json @@ -30,8 +30,8 @@ "dependencies": { "@visactor/vchart": "workspace:1.13.8", "@visactor/vutils": "~0.19.4", - "@visactor/vrender-core": "0.22.7-alpha.2", - "@visactor/vrender-kits": "0.22.7-alpha.2", + "@visactor/vrender-core": "0.22.7", + "@visactor/vrender-kits": "0.22.7", "@visactor/vgrammar-core": "0.16.3", "react-is": "^18.2.0" }, diff --git a/packages/react-vchart/package.json b/packages/react-vchart/package.json index 4bdfcd647b..8ddea90ac2 100644 --- a/packages/react-vchart/package.json +++ b/packages/react-vchart/package.json @@ -30,8 +30,8 @@ "dependencies": { "@visactor/vchart": "workspace:1.13.8", "@visactor/vutils": "~0.19.4", - "@visactor/vrender-core": "0.22.7-alpha.2", - "@visactor/vrender-kits": "0.22.7-alpha.2", + "@visactor/vrender-core": "0.22.7", + "@visactor/vrender-kits": "0.22.7", "@visactor/vgrammar-core": "0.16.3", "react-is": "^18.2.0" }, diff --git a/packages/vchart-extension/package.json b/packages/vchart-extension/package.json index 91823b7be1..7bf248df20 100644 --- a/packages/vchart-extension/package.json +++ b/packages/vchart-extension/package.json @@ -21,9 +21,9 @@ "start": "ts-node __tests__/runtime/browser/scripts/initVite.ts && vite serve __tests__/runtime/browser" }, "dependencies": { - "@visactor/vrender-core": "0.22.7-alpha.2", - "@visactor/vrender-kits": "0.22.7-alpha.2", - "@visactor/vrender-components": "0.22.7-alpha.2", + "@visactor/vrender-core": "0.22.7", + "@visactor/vrender-kits": "0.22.7", + "@visactor/vrender-components": "0.22.7", "@visactor/vgrammar-core": "0.16.3", "@visactor/vutils": "~0.19.4", "@visactor/vdataset": "~0.19.4", diff --git a/packages/vchart/package.json b/packages/vchart/package.json index b567b67c33..6ce48ac17a 100644 --- a/packages/vchart/package.json +++ b/packages/vchart/package.json @@ -121,9 +121,9 @@ "@visactor/vutils": "~0.19.4", "@visactor/vdataset": "~0.19.4", "@visactor/vscale": "~0.19.4", - "@visactor/vrender-core": "0.22.7-alpha.2", - "@visactor/vrender-kits": "0.22.7-alpha.2", - "@visactor/vrender-components": "0.22.7-alpha.2", + "@visactor/vrender-core": "0.22.7", + "@visactor/vrender-kits": "0.22.7", + "@visactor/vrender-components": "0.22.7", "@visactor/vgrammar-core": "0.16.3", "@visactor/vgrammar-projection": "0.16.3", "@visactor/vgrammar-wordcloud": "0.16.3", diff --git a/packages/vstory/package.json b/packages/vstory/package.json index 2a7208852d..b6081711ea 100644 --- a/packages/vstory/package.json +++ b/packages/vstory/package.json @@ -21,9 +21,9 @@ }, "dependencies": { "@visactor/vchart": "workspace:1.11.0", - "@visactor/vrender-core": "0.22.7-alpha.2", - "@visactor/vrender-kits": "0.22.7-alpha.2", - "@visactor/vrender-components": "0.22.7-alpha.2", + "@visactor/vrender-core": "0.22.7", + "@visactor/vrender-kits": "0.22.7", + "@visactor/vrender-components": "0.22.7", "@visactor/vutils": "~0.19.4" }, "devDependencies": { diff --git a/tools/story-player/package.json b/tools/story-player/package.json index f5e8f37965..cbe2617031 100644 --- a/tools/story-player/package.json +++ b/tools/story-player/package.json @@ -56,10 +56,10 @@ "vite": "3.2.6" }, "dependencies": { - "@visactor/vrender-core": "0.22.7-alpha.2", - "@visactor/vrender-kits": "0.22.7-alpha.2", + "@visactor/vrender-core": "0.22.7", + "@visactor/vrender-kits": "0.22.7", "@visactor/vchart": "workspace:1.13.8", - "@visactor/vrender": "0.22.7-alpha.2", + "@visactor/vrender": "0.22.7", "@visactor/vutils": "~0.19.4" } } \ No newline at end of file From eb2f54696d30b2b91c2071ad7a875ac926af02e8 Mon Sep 17 00:00:00 2001 From: kkxxkk2019 Date: Mon, 14 Apr 2025 14:13:21 +0800 Subject: [PATCH 5/7] docs: add comments and docs --- docs/assets/option/en/component/mark-area.md | 3 ++- docs/assets/option/en/component/mark-line.md | 3 ++- docs/assets/option/zh/component/mark-area.md | 3 ++- docs/assets/option/zh/component/mark-line.md | 3 ++- .../vchart/src/component/marker/mark-area/interface/theme.ts | 3 ++- .../vchart/src/component/marker/mark-line/interface/theme.ts | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/docs/assets/option/en/component/mark-area.md b/docs/assets/option/en/component/mark-area.md index f67164a03b..93590763bb 100644 --- a/docs/assets/option/en/component/mark-area.md +++ b/docs/assets/option/en/component/mark-area.md @@ -137,9 +137,10 @@ The area style for the label area. prefix = '####' ) }} -### label(Object) +### label(Array|Object) Label style for dimension lines. +Since `1.13.9`, configuring multiple labels is supported. #### position(Object) diff --git a/docs/assets/option/en/component/mark-line.md b/docs/assets/option/en/component/mark-line.md index 3af3a85c6c..c0b6ed00e3 100644 --- a/docs/assets/option/en/component/mark-line.md +++ b/docs/assets/option/en/component/mark-line.md @@ -219,9 +219,10 @@ The line style of the dimension line. When performing multi-section configuratio prefix = '####' ) }} -### label(Object) +### label(Array|Object) Label style for dimension lines. +Since `1.13.9`, configuring multiple labels is supported. #### position(Object) diff --git a/docs/assets/option/zh/component/mark-area.md b/docs/assets/option/zh/component/mark-area.md index bbf1b0a826..0e59ae94f9 100644 --- a/docs/assets/option/zh/component/mark-area.md +++ b/docs/assets/option/zh/component/mark-area.md @@ -137,9 +137,10 @@ y 轴上的标注区域边界，与 markArea.y 共同构造标注区域。可以 prefix = '####' ) }} -### label(Object) +### label(Array|Object) 标注线的标签样式。 +自 `1.13.9` 版本开始，支持配置多个标签。 #### position(Object) diff --git a/docs/assets/option/zh/component/mark-line.md b/docs/assets/option/zh/component/mark-line.md index 94a31d7cbc..719b7a4812 100644 --- a/docs/assets/option/zh/component/mark-line.md +++ b/docs/assets/option/zh/component/mark-line.md @@ -219,9 +219,10 @@ x 轴上的参考线。可以配置参考线在 x 轴上的值，或者聚合计 prefix = '####' ) }} -### label(Object) +### label(Array|Object) 标注线的标签样式。 +自 `1.13.9` 版本开始，支持配置多个标签。 #### position(Object) diff --git a/packages/vchart/src/component/marker/mark-area/interface/theme.ts b/packages/vchart/src/component/marker/mark-area/interface/theme.ts index 1c6a7926ec..c61c81874c 100644 --- a/packages/vchart/src/component/marker/mark-area/interface/theme.ts +++ b/packages/vchart/src/component/marker/mark-area/interface/theme.ts @@ -15,7 +15,8 @@ export interface IMarkAreaTheme { */ area?: Partial>; /** - * 标记区域的标签样式配置 + * 标记区域的标签样式配置。 + * 自 1.13.9 版本开始，支持创建多个标签 */ label?: IMarkAreaLabel | IMarkAreaLabel[]; } diff --git a/packages/vchart/src/component/marker/mark-line/interface/theme.ts b/packages/vchart/src/component/marker/mark-line/interface/theme.ts index ad0e6b1219..34c5aedfef 100644 --- a/packages/vchart/src/component/marker/mark-line/interface/theme.ts +++ b/packages/vchart/src/component/marker/mark-line/interface/theme.ts @@ -15,7 +15,8 @@ export interface IMarkLineTheme { */ line?: Partial>; /** - * 标注线的标签样式 + * 标注线的标签样式。 + * 自 1.13.9 版本开始，支持创建多个标签。 */ label?: IMarkLineLabel | IMarkLineLabel[]; From 259733083e006667e1c525d753677137fbbe81db Mon Sep 17 00:00:00 2001 From: kkxxkk2019 Date: Mon, 14 Apr 2025 14:38:29 +0800 Subject: [PATCH 6/7] chore: update rush changelog --- .../vchart/feat-issue-3868_2025-04-14-06-37.json | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 common/changes/@visactor/vchart/feat-issue-3868_2025-04-14-06-37.json diff --git a/common/changes/@visactor/vchart/feat-issue-3868_2025-04-14-06-37.json b/common/changes/@visactor/vchart/feat-issue-3868_2025-04-14-06-37.json new file mode 100644 index 0000000000..99a4c67af5 --- /dev/null +++ b/common/changes/@visactor/vchart/feat-issue-3868_2025-04-14-06-37.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@visactor/vchart", + "comment": "feat: markLine and markArea supports render multiple labels", + "type": "none" + } + ], + "packageName": "@visactor/vchart" +} \ No newline at end of file From a10621c25b22bede90723f9864a3a0649e8b536f Mon Sep 17 00:00:00 2001 From: kkxxkk2019 Date: Thu, 17 Apr 2025 15:39:07 +0800 Subject: [PATCH 7/7] chore: upgrade deps version --- common/config/rush/pnpm-config.json | 6 +- common/config/rush/pnpm-lock.yaml | 357 +++++++++++++------------ docs/package.json | 8 +- packages/openinula-vchart/package.json | 8 +- packages/react-vchart/package.json | 8 +- packages/vchart-extension/package.json | 12 +- packages/vchart/package.json | 28 +- packages/vstory/package.json | 8 +- packages/vutils-extension/package.json | 6 +- tools/story-player/package.json | 8 +- 10 files changed, 228 insertions(+), 221 deletions(-) diff --git a/common/config/rush/pnpm-config.json b/common/config/rush/pnpm-config.json index c869ecadc3..39db9e6211 100644 --- a/common/config/rush/pnpm-config.json +++ b/common/config/rush/pnpm-config.json @@ -83,9 +83,9 @@ * PNPM documentation: https://pnpm.io/package_json#pnpmoverrides */ "globalOverrides": { - "@visactor/vrender-core": "0.22.7", - "@visactor/vrender-kits": "0.22.7", - "@visactor/vrender-components": "0.22.7" + // "@visactor/vrender-core": "0.22.8", + // "@visactor/vrender-kits": "0.22.8", + // "@visactor/vrender-components": "0.22.8" }, /** * The `globalPeerDependencyRules` setting provides various settings for suppressing validation errors diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 95c4c09f10..20397ecfaa 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -1,10 +1,5 @@ lockfileVersion: 5.4 -overrides: - '@visactor/vrender-core': 0.22.7 - '@visactor/vrender-kits': 0.22.7 - '@visactor/vrender-components': 0.22.7 - importers: .: @@ -26,15 +21,15 @@ importers: '@visactor/vchart': workspace:1.13.8 '@visactor/vchart-extension': workspace:1.13.8 '@visactor/vchart-theme': ~1.6.6 - '@visactor/vgrammar': 0.16.3 + '@visactor/vgrammar': 0.16.4 '@visactor/vmind': 1.2.4-alpha.5 - '@visactor/vrender': 0.22.7 - '@visactor/vrender-kits': 0.22.7 + '@visactor/vrender': 0.22.8 + '@visactor/vrender-kits': 0.22.8 '@visactor/vtable': 1.12.0 '@visactor/vtable-calendar': 1.12.0 '@visactor/vtable-editors': 1.12.0 '@visactor/vtable-gantt': 1.12.0 - '@visactor/vutils': ~0.19.4 + '@visactor/vutils': ~0.19.5 '@vitejs/plugin-react': 3.1.0 axios: ^1.4.0 buble: ^0.20.0 @@ -64,15 +59,15 @@ importers: '@visactor/vchart': link:../packages/vchart '@visactor/vchart-extension': link:../packages/vchart-extension '@visactor/vchart-theme': 1.6.9 - '@visactor/vgrammar': 0.16.3 + '@visactor/vgrammar': 0.16.4 '@visactor/vmind': 1.2.4-alpha.5 - '@visactor/vrender': 0.22.7 - '@visactor/vrender-kits': 0.22.7 + '@visactor/vrender': 0.22.8 + '@visactor/vrender-kits': 0.22.8 '@visactor/vtable': 1.12.0 '@visactor/vtable-calendar': 1.12.0 '@visactor/vtable-editors': 1.12.0 '@visactor/vtable-gantt': 1.12.0 - '@visactor/vutils': 0.19.4 + '@visactor/vutils': 0.19.5 axios: 1.7.9 buble: 0.20.0 highlight.js: 11.11.1 @@ -151,10 +146,10 @@ importers: '@types/offscreencanvas': 2019.6.4 '@types/react-is': ^17.0.3 '@visactor/vchart': workspace:1.13.8 - '@visactor/vgrammar-core': 0.16.3 - '@visactor/vrender-core': 0.22.7 - '@visactor/vrender-kits': 0.22.7 - '@visactor/vutils': ~0.19.4 + '@visactor/vgrammar-core': 0.16.4 + '@visactor/vrender-core': 0.22.8 + '@visactor/vrender-kits': 0.22.8 + '@visactor/vutils': ~0.19.5 '@vitejs/plugin-react': 3.1.0 eslint: ~8.18.0 eslint-config-prettier: 8.5.0 @@ -172,10 +167,10 @@ importers: vite: 3.2.6 dependencies: '@visactor/vchart': link:../vchart - '@visactor/vgrammar-core': 0.16.3 - '@visactor/vrender-core': 0.22.7 - '@visactor/vrender-kits': 0.22.7 - '@visactor/vutils': 0.19.4 + '@visactor/vgrammar-core': 0.16.4 + '@visactor/vrender-core': 0.22.8 + '@visactor/vrender-kits': 0.22.8 + '@visactor/vutils': 0.19.5 react-is: 18.3.1 devDependencies: '@internal/bundler': link:../../tools/bundler @@ -216,10 +211,10 @@ importers: '@types/react-dom': ^18.0.0 '@types/react-is': ^17.0.3 '@visactor/vchart': workspace:1.13.8 - '@visactor/vgrammar-core': 0.16.3 - '@visactor/vrender-core': 0.22.7 - '@visactor/vrender-kits': 0.22.7 - '@visactor/vutils': ~0.19.4 + '@visactor/vgrammar-core': 0.16.4 + '@visactor/vrender-core': 0.22.8 + '@visactor/vrender-kits': 0.22.8 + '@visactor/vutils': ~0.19.5 '@vitejs/plugin-react': 3.1.0 eslint: ~8.18.0 eslint-config-prettier: 8.5.0 @@ -238,10 +233,10 @@ importers: vite: 3.2.6 dependencies: '@visactor/vchart': link:../vchart - '@visactor/vgrammar-core': 0.16.3 - '@visactor/vrender-core': 0.22.7 - '@visactor/vrender-kits': 0.22.7 - '@visactor/vutils': 0.19.4 + '@visactor/vgrammar-core': 0.16.4 + '@visactor/vrender-core': 0.22.8 + '@visactor/vrender-kits': 0.22.8 + '@visactor/vutils': 0.19.5 react-is: 18.3.1 devDependencies: '@internal/bundler': link:../../tools/bundler @@ -376,20 +371,20 @@ importers: '@types/jest': ^26.0.0 '@types/node': '*' '@types/offscreencanvas': 2019.6.4 - '@visactor/vdataset': ~0.19.4 - '@visactor/vgrammar-core': 0.16.3 - '@visactor/vgrammar-hierarchy': 0.16.3 - '@visactor/vgrammar-projection': 0.16.3 - '@visactor/vgrammar-sankey': 0.16.3 - '@visactor/vgrammar-util': 0.16.3 - '@visactor/vgrammar-venn': 0.16.3 - '@visactor/vgrammar-wordcloud': 0.16.3 - '@visactor/vgrammar-wordcloud-shape': 0.16.3 - '@visactor/vrender-components': 0.22.7 - '@visactor/vrender-core': 0.22.7 - '@visactor/vrender-kits': 0.22.7 - '@visactor/vscale': ~0.19.4 - '@visactor/vutils': ~0.19.4 + '@visactor/vdataset': ~0.19.5 + '@visactor/vgrammar-core': 0.16.4 + '@visactor/vgrammar-hierarchy': 0.16.4 + '@visactor/vgrammar-projection': 0.16.4 + '@visactor/vgrammar-sankey': 0.16.4 + '@visactor/vgrammar-util': 0.16.4 + '@visactor/vgrammar-venn': 0.16.4 + '@visactor/vgrammar-wordcloud': 0.16.4 + '@visactor/vgrammar-wordcloud-shape': 0.16.4 + '@visactor/vrender-components': 0.22.8 + '@visactor/vrender-core': 0.22.8 + '@visactor/vrender-kits': 0.22.8 + '@visactor/vscale': ~0.19.5 + '@visactor/vutils': ~0.19.5 '@visactor/vutils-extension': workspace:1.13.8 canvas: 2.11.2 cross-env: ^7.0.3 @@ -424,20 +419,20 @@ importers: typescript: 4.9.5 vite: 3.2.6 dependencies: - '@visactor/vdataset': 0.19.4 - '@visactor/vgrammar-core': 0.16.3 - '@visactor/vgrammar-hierarchy': 0.16.3 - '@visactor/vgrammar-projection': 0.16.3 - '@visactor/vgrammar-sankey': 0.16.3 - '@visactor/vgrammar-util': 0.16.3 - '@visactor/vgrammar-venn': 0.16.3 - '@visactor/vgrammar-wordcloud': 0.16.3 - '@visactor/vgrammar-wordcloud-shape': 0.16.3 - '@visactor/vrender-components': 0.22.7 - '@visactor/vrender-core': 0.22.7 - '@visactor/vrender-kits': 0.22.7 - '@visactor/vscale': 0.19.4 - '@visactor/vutils': 0.19.4 + '@visactor/vdataset': 0.19.5 + '@visactor/vgrammar-core': 0.16.4 + '@visactor/vgrammar-hierarchy': 0.16.4 + '@visactor/vgrammar-projection': 0.16.4 + '@visactor/vgrammar-sankey': 0.16.4 + '@visactor/vgrammar-util': 0.16.4 + '@visactor/vgrammar-venn': 0.16.4 + '@visactor/vgrammar-wordcloud': 0.16.4 + '@visactor/vgrammar-wordcloud-shape': 0.16.4 + '@visactor/vrender-components': 0.22.8 + '@visactor/vrender-core': 0.22.8 + '@visactor/vrender-kits': 0.22.8 + '@visactor/vscale': 0.19.5 + '@visactor/vutils': 0.19.5 '@visactor/vutils-extension': link:../vutils-extension devDependencies: '@esbuild-plugins/node-globals-polyfill': 0.1.1 @@ -495,12 +490,12 @@ importers: '@types/react': ^18.0.0 '@types/react-dom': ^18.0.0 '@visactor/vchart': workspace:1.13.8 - '@visactor/vdataset': ~0.19.4 - '@visactor/vgrammar-core': 0.16.3 - '@visactor/vrender-components': 0.22.7 - '@visactor/vrender-core': 0.22.7 - '@visactor/vrender-kits': 0.22.7 - '@visactor/vutils': ~0.19.4 + '@visactor/vdataset': ~0.19.5 + '@visactor/vgrammar-core': 0.16.4 + '@visactor/vrender-components': 0.22.8 + '@visactor/vrender-core': 0.22.8 + '@visactor/vrender-kits': 0.22.8 + '@visactor/vutils': ~0.19.5 '@vitejs/plugin-react': 3.1.0 canvas: 2.11.2 eslint: ~8.18.0 @@ -519,12 +514,12 @@ importers: vite: 3.2.6 dependencies: '@visactor/vchart': link:../vchart - '@visactor/vdataset': 0.19.4 - '@visactor/vgrammar-core': 0.16.3 - '@visactor/vrender-components': 0.22.7 - '@visactor/vrender-core': 0.22.7 - '@visactor/vrender-kits': 0.22.7 - '@visactor/vutils': 0.19.4 + '@visactor/vdataset': 0.19.5 + '@visactor/vgrammar-core': 0.16.4 + '@visactor/vrender-components': 0.22.8 + '@visactor/vrender-core': 0.22.8 + '@visactor/vrender-kits': 0.22.8 + '@visactor/vutils': 0.19.5 devDependencies: '@internal/bundler': link:../../tools/bundler '@internal/eslint-config': link:../../share/eslint-config @@ -598,8 +593,8 @@ importers: '@types/jest': ^26.0.0 '@types/node': '*' '@types/offscreencanvas': 2019.6.4 - '@visactor/vdataset': ~0.19.4 - '@visactor/vutils': ~0.19.4 + '@visactor/vdataset': ~0.19.5 + '@visactor/vutils': ~0.19.5 eslint: ~8.18.0 husky: 7.0.4 jest: ^26.0.0 @@ -616,8 +611,8 @@ importers: typescript: 4.9.5 vite: 3.2.6 dependencies: - '@visactor/vdataset': 0.19.4 - '@visactor/vutils': 0.19.4 + '@visactor/vdataset': 0.19.5 + '@visactor/vutils': 0.19.5 devDependencies: '@internal/bundler': link:../../tools/bundler '@internal/eslint-config': link:../../share/eslint-config @@ -895,10 +890,10 @@ importers: '@typescript-eslint/eslint-plugin': 5.30.0 '@typescript-eslint/parser': 5.30.0 '@visactor/vchart': workspace:1.13.8 - '@visactor/vrender': 0.22.7 - '@visactor/vrender-core': 0.22.7 - '@visactor/vrender-kits': 0.22.7 - '@visactor/vutils': ~0.19.4 + '@visactor/vrender': 0.22.8 + '@visactor/vrender-core': 0.22.8 + '@visactor/vrender-kits': 0.22.8 + '@visactor/vutils': ~0.19.5 cross-env: ^7.0.3 eslint: ~8.18.0 jest: ^26.0.0 @@ -910,10 +905,10 @@ importers: vite: 3.2.6 dependencies: '@visactor/vchart': link:../../packages/vchart - '@visactor/vrender': 0.22.7 - '@visactor/vrender-core': 0.22.7 - '@visactor/vrender-kits': 0.22.7 - '@visactor/vutils': 0.19.4 + '@visactor/vrender': 0.22.8 + '@visactor/vrender-core': 0.22.8 + '@visactor/vrender-kits': 0.22.8 + '@visactor/vutils': 0.19.5 devDependencies: '@internal/bundler': link:../bundler '@internal/eslint-config': link:../../share/eslint-config @@ -4844,13 +4839,13 @@ packages: topojson-client: 3.1.0 dev: false - /@visactor/vdataset/0.19.4: - resolution: {integrity: sha512-xxglcFtvho5jWiQPKwTolKXbNOG8f77CrK7TJhfiqNlzoe27qO8B+A6lUKlLMt1kZaCH7ZNrFFkHyPjnnZ/gng==} + /@visactor/vdataset/0.19.5: + resolution: {integrity: sha512-8sOzJKHRLTdjmCDGemroxo3t3iWYrw4aDgPaCUbV1GiKuttC4CdTJlVsfq/JLdSldvMgNDTAmovAchVgjBNH6Q==} dependencies: '@turf/flatten': 6.5.0 '@turf/helpers': 6.5.0 '@turf/rewind': 6.5.0 - '@visactor/vutils': 0.19.4 + '@visactor/vutils': 0.19.5 d3-dsv: 2.0.0 d3-geo: 1.12.1 d3-hexbin: 0.2.2 @@ -4866,97 +4861,97 @@ packages: topojson-client: 3.1.0 dev: false - /@visactor/vgrammar-coordinate/0.16.3: - resolution: {integrity: sha512-tfDSi3WgY/GWDvbf67eus4a7jR74y7OMod3JrTqyDVzSNZUOgUtS3ieEM71f9yipxjY8gxo53GPDpH/advxUZw==} + /@visactor/vgrammar-coordinate/0.16.4: + resolution: {integrity: sha512-R4c+LjuM7QARv+X47zuJk2hOb6PlkV7CrvQB1pdlq+WUZuGQv5Nv7jRuRPrX9ENzIrlf0S+luH1efm84NR9dSw==} dependencies: - '@visactor/vgrammar-util': 0.16.3 + '@visactor/vgrammar-util': 0.16.4 '@visactor/vutils': 0.19.5 dev: false - /@visactor/vgrammar-core/0.16.3: - resolution: {integrity: sha512-cd7hmh9JobbCDUJPOshmQB5V0KVM0GLTPBe/ZySJDi1cUSWpukAgRrLozEk/M5XgDbVIT+4pjqe6siacCad8dg==} + /@visactor/vgrammar-core/0.16.4: + resolution: {integrity: sha512-eKHDqWDY76ddrkHCJJFJZ3xfVyp0YsGEd8mFPXq9Z8p4gderASmK7hHoWgG+AJ+JVDXwDzMRE1d2b3XXOa8twA==} dependencies: - '@visactor/vdataset': 0.19.4 - '@visactor/vgrammar-coordinate': 0.16.3 - '@visactor/vgrammar-util': 0.16.3 - '@visactor/vrender-components': 0.22.7 - '@visactor/vrender-core': 0.22.7 - '@visactor/vrender-kits': 0.22.7 - '@visactor/vscale': 0.19.4 - '@visactor/vutils': 0.19.4 + '@visactor/vdataset': 0.19.5 + '@visactor/vgrammar-coordinate': 0.16.4 + '@visactor/vgrammar-util': 0.16.4 + '@visactor/vrender-components': 0.22.8 + '@visactor/vrender-core': 0.22.8 + '@visactor/vrender-kits': 0.22.8 + '@visactor/vscale': 0.19.5 + '@visactor/vutils': 0.19.5 dev: false - /@visactor/vgrammar-hierarchy/0.16.3: - resolution: {integrity: sha512-qnfSWRt1PErkVPTtet8DVc4MY+WwmgJoNNW2FALFht1qUfPdglTqT96drPbkurwiZMzSk+Xfr7+IPUA8ZQwWag==} + /@visactor/vgrammar-hierarchy/0.16.4: + resolution: {integrity: sha512-vwDHAdHgJG/bKfMAsROSDcQh4QWc0kWx0r8vAQ70po0xlJKFwoc07GW52PfRBbZAs82MY4KGYtUB7YZXyIVjGQ==} dependencies: - '@visactor/vgrammar-core': 0.16.3 - '@visactor/vgrammar-util': 0.16.3 - '@visactor/vrender-core': 0.22.7 - '@visactor/vrender-kits': 0.22.7 - '@visactor/vutils': 0.19.4 + '@visactor/vgrammar-core': 0.16.4 + '@visactor/vgrammar-util': 0.16.4 + '@visactor/vrender-core': 0.22.8 + '@visactor/vrender-kits': 0.22.8 + '@visactor/vutils': 0.19.5 dev: false - /@visactor/vgrammar-projection/0.16.3: - resolution: {integrity: sha512-c+MJ3qgtsNQHwZCDBVT7fNahNxe0g827IiytQWvrtMxavLIrtJqeul5H+6BYrGvYk8d81ByxNZdoVNn/mfNtDw==} + /@visactor/vgrammar-projection/0.16.4: + resolution: {integrity: sha512-5tluO34qgF8U3fvaSbASrouiwIlRm9lHfghMw/wLnLLLhQMDNOkf9+J3+MwzOSeC9xpxEvj4mL5GJm1DrBdLgQ==} dependencies: - '@visactor/vgrammar-core': 0.16.3 - '@visactor/vgrammar-util': 0.16.3 - '@visactor/vutils': 0.19.4 + '@visactor/vgrammar-core': 0.16.4 + '@visactor/vgrammar-util': 0.16.4 + '@visactor/vutils': 0.19.5 d3-geo: 1.12.1 dev: false - /@visactor/vgrammar-sankey/0.16.3: - resolution: {integrity: sha512-7j0xx77Yn2KzY4EcZ27qFF6R1KTcmy3BtQQewOHA1uoUX8ZRsfe57eziYRiBhyVrzdFWoa0IJqzH7Yk/zITvuQ==} + /@visactor/vgrammar-sankey/0.16.4: + resolution: {integrity: sha512-pQBLvRfsQJOLlTRps7V1bYPrITqTC/DTRZ3uBZ2vY9vtGn8ZHHaWozTsRDQqc9+rsNbuPe9y0t3SdMFhQyQv7g==} dependencies: - '@visactor/vgrammar-core': 0.16.3 - '@visactor/vgrammar-util': 0.16.3 - '@visactor/vrender-core': 0.22.7 - '@visactor/vrender-kits': 0.22.7 - '@visactor/vutils': 0.19.4 + '@visactor/vgrammar-core': 0.16.4 + '@visactor/vgrammar-util': 0.16.4 + '@visactor/vrender-core': 0.22.8 + '@visactor/vrender-kits': 0.22.8 + '@visactor/vutils': 0.19.5 dev: false - /@visactor/vgrammar-util/0.16.3: - resolution: {integrity: sha512-aF9MqjTR7YvBAVDtp1A/CDVcXFGlO+TxkHVPEQVrn7cVu2DGRXCZnu/iQ+AUhttVYaWlSRflZj4cnQrKS4zy4g==} + /@visactor/vgrammar-util/0.16.4: + resolution: {integrity: sha512-T40YzizF0B69GwxSqIqQTIX52CqqjedGJphmkd5pVha9yFiPaftO17u8lYhro9/m/zu+RDFc/Z5Vj9Grqwpqgw==} dependencies: - '@visactor/vrender-core': 0.22.7 - '@visactor/vutils': 0.19.4 + '@visactor/vrender-core': 0.22.8 + '@visactor/vutils': 0.19.5 dev: false - /@visactor/vgrammar-venn/0.16.3: - resolution: {integrity: sha512-M6mtCrpOcPrD6nkQFZ3Fl0Z2zPaKFTyRIPeO235vDwB/ZzefN5BObh85UGsv0swK46L5yu3daBxW0VtrGMBZRA==} + /@visactor/vgrammar-venn/0.16.4: + resolution: {integrity: sha512-Qw5SsdtXFQLHGKmXP14/4QEx2oNEI3Ikj7c9b+Y13ir7aiiqApkNptrUQ9fFi9jKVYR3eDXkKUW10StSOgfCxQ==} dependencies: - '@visactor/vgrammar-core': 0.16.3 - '@visactor/vgrammar-util': 0.16.3 - '@visactor/vrender-core': 0.22.7 - '@visactor/vrender-kits': 0.22.7 - '@visactor/vutils': 0.19.4 + '@visactor/vgrammar-core': 0.16.4 + '@visactor/vgrammar-util': 0.16.4 + '@visactor/vrender-core': 0.22.8 + '@visactor/vrender-kits': 0.22.8 + '@visactor/vutils': 0.19.5 dev: false - /@visactor/vgrammar-wordcloud-shape/0.16.3: - resolution: {integrity: sha512-ZWRHbec4WM2W3v2t57gRaX1IUGy+nDRjumcctgzSvmCpmR3nORgLKmMhxXYEA0VwcpY+umM0lVcd42iqPH8c7g==} + /@visactor/vgrammar-wordcloud-shape/0.16.4: + resolution: {integrity: sha512-XpD+e7OE/mkHKiHEows5nKJtu+mB9C+c5o5n27ZWQF4CjNPiDh2gkv+64W/VqcUpzQommXrGQIVaDxtLlffAdw==} dependencies: - '@visactor/vgrammar-core': 0.16.3 - '@visactor/vgrammar-util': 0.16.3 - '@visactor/vrender-core': 0.22.7 - '@visactor/vrender-kits': 0.22.7 - '@visactor/vscale': 0.19.4 - '@visactor/vutils': 0.19.4 + '@visactor/vgrammar-core': 0.16.4 + '@visactor/vgrammar-util': 0.16.4 + '@visactor/vrender-core': 0.22.8 + '@visactor/vrender-kits': 0.22.8 + '@visactor/vscale': 0.19.5 + '@visactor/vutils': 0.19.5 dev: false - /@visactor/vgrammar-wordcloud/0.16.3: - resolution: {integrity: sha512-uIHUJ3CGir+IjDjv4SpJR5SZvWSIYU2VoBdoCvFdhP9j8t15wadGYfe0/br9d6xOM3laiSCFYvPdhy0Ke5sP4w==} + /@visactor/vgrammar-wordcloud/0.16.4: + resolution: {integrity: sha512-sT+ntTnJHFrqQ80KhQQ41RQ0MTUmfnB0qCPby+jI83OL7fRTShBUcDMkUrHiPyKSKkAdTErnzFrxf3TbnuXD+Q==} dependencies: - '@visactor/vgrammar-core': 0.16.3 - '@visactor/vgrammar-util': 0.16.3 - '@visactor/vrender-core': 0.22.7 - '@visactor/vrender-kits': 0.22.7 - '@visactor/vutils': 0.19.4 + '@visactor/vgrammar-core': 0.16.4 + '@visactor/vgrammar-util': 0.16.4 + '@visactor/vrender-core': 0.22.8 + '@visactor/vrender-kits': 0.22.8 + '@visactor/vutils': 0.19.5 dev: false - /@visactor/vgrammar/0.16.3: - resolution: {integrity: sha512-hUeJliljIPQVHos1WgEwY64VHrc47dd2avKhhGiNgKg66er5CLaapMAKC2S1su4V2+BmdfzKGLM6J93raqbjeA==} + /@visactor/vgrammar/0.16.4: + resolution: {integrity: sha512-1+HQ9DMq7S7AM5ettNVv9B23BV4hUnlipW6DM6DKlpw27UbvISgKpTxesPVddSaOOSOIEz8Ovk4NoSa2Ra4JZw==} dependencies: - '@visactor/vgrammar-core': 0.16.3 + '@visactor/vgrammar-core': 0.16.4 dev: false /@visactor/vmind/1.2.4-alpha.5: @@ -4977,38 +4972,64 @@ packages: - debug dev: false - /@visactor/vrender-components/0.22.7: - resolution: {integrity: sha512-34YIWcGK9ltEw+41FZp9CHOpUuMKNzUnno3PE9FrBIapkS1pN89IZhghfwqcqxlP7HFLH78Fsiy5+aDWfNC+TA==} + /@visactor/vrender-components/0.21.0-alpha.4: + resolution: {integrity: sha512-vVI/Xt0qK50FeTloLfczEMr9CBnpzoRNAsKPZvUgh67i1mBiefJouQSpxQcpWeGrKO8WHNBPVFsQqQBoutmLkQ==} + dependencies: + '@visactor/vrender-core': 0.21.0-alpha.4 + '@visactor/vrender-kits': 0.21.0-alpha.4 + '@visactor/vscale': 0.18.18 + '@visactor/vutils': 0.18.18 + gifuct-js: 2.1.2 + dev: false + + /@visactor/vrender-components/0.22.8: + resolution: {integrity: sha512-DqJ4oEcCvlPkfgoCCk0tqa0N9hJd13EeuVzQTB4n30OUp4uSkws2CML+6Xv+Th0m5xzGOsZLXdMZsyXjxrwBaQ==} dependencies: - '@visactor/vrender-core': 0.22.7 - '@visactor/vrender-kits': 0.22.7 + '@visactor/vrender-core': 0.22.8 + '@visactor/vrender-kits': 0.22.8 '@visactor/vscale': 0.19.5 '@visactor/vutils': 0.19.5 dev: false - /@visactor/vrender-core/0.22.7: - resolution: {integrity: sha512-1PAmNWIz3r99WpbtRjF4vG7U1ft2/chCPd4c5nDfkWZ1fT+t2TvMAMh8L5NWszxCFT9kDvYpfsmtseX/09nznA==} + /@visactor/vrender-core/0.21.0-alpha.4: + resolution: {integrity: sha512-kZk5HiJSvAfZLb3GZXvRykFWjhTXlpt0i/+e5kU8AoLYt9T15H9xRv/w7jYEe94dBXd+yCVH4soN2Ad4YXQO6g==} + dependencies: + '@visactor/vutils': 0.18.18 + color-convert: 2.0.1 + dev: false + + /@visactor/vrender-core/0.22.8: + resolution: {integrity: sha512-sQmZ+uTJ0M6s6Jhkhkz0/uiYiBTiFnLyDxIhZvPNADEMsjkPLj3hFHrhnxe1LrDHfz+IMoLMASD4IxzCGdjNpw==} dependencies: '@visactor/vutils': 0.19.5 color-convert: 2.0.1 dev: false - /@visactor/vrender-kits/0.22.7: - resolution: {integrity: sha512-mOcm2O0qH42x5R2zVy2vkQ+s3/DEI0ZiqvoahVvQ//8oHWzrIbhmdj90Oi6Xh2styfvRrh3P2QfuDLU7tug9EA==} + /@visactor/vrender-kits/0.21.0-alpha.4: + resolution: {integrity: sha512-OCFruyiXBjrxDulbRcmphMCzzMFFJK7gN1C25M1YwsM43bKA18olr/0HL7fQt0zQZUcTPmVHDVuOTi55YARVCg==} dependencies: '@resvg/resvg-js': 2.4.1 - '@visactor/vrender-core': 0.22.7 + '@visactor/vrender-core': 0.21.0-alpha.4 + '@visactor/vutils': 0.18.18 + roughjs: 4.5.2 + dev: false + + /@visactor/vrender-kits/0.22.8: + resolution: {integrity: sha512-k5QiOoFVBr88XMKVNHigBKGPWF63D8pUsUwi74hJNph+Gxy1ML9373eGgUkTEed/LUK/FvJxFwHO0oN23ZWJtg==} + dependencies: + '@resvg/resvg-js': 2.4.1 + '@visactor/vrender-core': 0.22.8 '@visactor/vutils': 0.19.5 gifuct-js: 2.1.2 lottie-web: 5.12.2 roughjs: 4.5.2 dev: false - /@visactor/vrender/0.22.7: - resolution: {integrity: sha512-HBeQaf4TwpAl9v1L145d+q2EWcUbn0zawl+a0s1OY1MP6HTAQpy/1GSEiAvw6HrezedmCE3ga7XM9dmlnLP6Dg==} + /@visactor/vrender/0.22.8: + resolution: {integrity: sha512-XievbxN4oy57m5GrmPZSGhOzrt3ae6cgwplzWo+YiC0bmpgppQwb8PxvbnIeO93lqg7IhuUGGMQDuBfTj5W3dw==} dependencies: - '@visactor/vrender-core': 0.22.7 - '@visactor/vrender-kits': 0.22.7 + '@visactor/vrender-core': 0.22.8 + '@visactor/vrender-kits': 0.22.8 dev: false /@visactor/vscale/0.18.18: @@ -5017,12 +5038,6 @@ packages: '@visactor/vutils': 0.18.18 dev: false - /@visactor/vscale/0.19.4: - resolution: {integrity: sha512-kp69hPMof3GBKRuUiXSR9+9K+Z8ZXsTlOAwcnknXmiiZDhdcDkPlv27/d+Xx1Wi/iqw+BS2S7YIjHmfzdiVQ/Q==} - dependencies: - '@visactor/vutils': 0.19.4 - dev: false - /@visactor/vscale/0.19.5: resolution: {integrity: sha512-KiXrn184Fh5aJBl/IcOK5irkJr0jwrpNjLPJ/0wfepYSycyEF5z7lDdfnvoJFEcMoljYjDQVg6Fxg9Adozc6vg==} dependencies: @@ -5056,9 +5071,9 @@ packages: resolution: {integrity: sha512-yK33y0RP/K3SNPJMJ3nb6dPyWtBXXJy39RvkJYOa7yqb6c46o+/lP9d1fxdBXDgxNkNuIOPC2pVqyEhOiq3XGw==} dependencies: '@visactor/vdataset': 0.18.18 - '@visactor/vrender-components': 0.22.7 - '@visactor/vrender-core': 0.22.7 - '@visactor/vrender-kits': 0.22.7 + '@visactor/vrender-components': 0.21.0-alpha.4 + '@visactor/vrender-core': 0.21.0-alpha.4 + '@visactor/vrender-kits': 0.21.0-alpha.4 '@visactor/vscale': 0.18.18 '@visactor/vtable-editors': 1.12.0 '@visactor/vutils': 0.18.18 @@ -5090,14 +5105,6 @@ packages: eventemitter3: 4.0.7 dev: false - /@visactor/vutils/0.19.4: - resolution: {integrity: sha512-kLbcsTe1/3HSSvEJvJikzGD0plY0gdHbpxt98oo7W6OrianfYd97nm/w7rFXcq/S49e6C5d1SdU4MZk/PYxhEQ==} - dependencies: - '@turf/helpers': 6.5.0 - '@turf/invariant': 6.5.0 - eventemitter3: 4.0.7 - dev: false - /@visactor/vutils/0.19.5: resolution: {integrity: sha512-sSU9Gnmnej7LgkENKkdmVqx1I3ZYVugDbGP0KEzgo8j+txAwrthEQTSeFwZcVS0iYrAvSzpmAVuN0/NRo6+vpg==} dependencies: diff --git a/docs/package.json b/docs/package.json index 36674d59d5..0975864cbe 100644 --- a/docs/package.json +++ b/docs/package.json @@ -18,10 +18,10 @@ "@visactor/vchart-extension": "workspace:1.13.8", "@visactor/vchart-theme": "~1.6.6", "@visactor/vmind": "1.2.4-alpha.5", - "@visactor/vutils": "~0.19.4", - "@visactor/vrender": "0.22.7", - "@visactor/vrender-kits": "0.22.7", - "@visactor/vgrammar": "0.16.3", + "@visactor/vutils": "~0.19.5", + "@visactor/vrender": "0.22.8", + "@visactor/vrender-kits": "0.22.8", + "@visactor/vgrammar": "0.16.4", "@visactor/vtable": "1.12.0", "@visactor/vtable-editors": "1.12.0", "@visactor/vtable-gantt": "1.12.0", diff --git a/packages/openinula-vchart/package.json b/packages/openinula-vchart/package.json index 6d8a2fd628..473b054eba 100644 --- a/packages/openinula-vchart/package.json +++ b/packages/openinula-vchart/package.json @@ -29,10 +29,10 @@ }, "dependencies": { "@visactor/vchart": "workspace:1.13.8", - "@visactor/vutils": "~0.19.4", - "@visactor/vrender-core": "0.22.7", - "@visactor/vrender-kits": "0.22.7", - "@visactor/vgrammar-core": "0.16.3", + "@visactor/vutils": "~0.19.5", + "@visactor/vrender-core": "0.22.8", + "@visactor/vrender-kits": "0.22.8", + "@visactor/vgrammar-core": "0.16.4", "react-is": "^18.2.0" }, "devDependencies": { diff --git a/packages/react-vchart/package.json b/packages/react-vchart/package.json index 8ddea90ac2..db337e67f1 100644 --- a/packages/react-vchart/package.json +++ b/packages/react-vchart/package.json @@ -29,10 +29,10 @@ }, "dependencies": { "@visactor/vchart": "workspace:1.13.8", - "@visactor/vutils": "~0.19.4", - "@visactor/vrender-core": "0.22.7", - "@visactor/vrender-kits": "0.22.7", - "@visactor/vgrammar-core": "0.16.3", + "@visactor/vutils": "~0.19.5", + "@visactor/vrender-core": "0.22.8", + "@visactor/vrender-kits": "0.22.8", + "@visactor/vgrammar-core": "0.16.4", "react-is": "^18.2.0" }, "devDependencies": { diff --git a/packages/vchart-extension/package.json b/packages/vchart-extension/package.json index 7bf248df20..dca06f26a7 100644 --- a/packages/vchart-extension/package.json +++ b/packages/vchart-extension/package.json @@ -21,12 +21,12 @@ "start": "ts-node __tests__/runtime/browser/scripts/initVite.ts && vite serve __tests__/runtime/browser" }, "dependencies": { - "@visactor/vrender-core": "0.22.7", - "@visactor/vrender-kits": "0.22.7", - "@visactor/vrender-components": "0.22.7", - "@visactor/vgrammar-core": "0.16.3", - "@visactor/vutils": "~0.19.4", - "@visactor/vdataset": "~0.19.4", + "@visactor/vrender-core": "0.22.8", + "@visactor/vrender-kits": "0.22.8", + "@visactor/vrender-components": "0.22.8", + "@visactor/vgrammar-core": "0.16.4", + "@visactor/vutils": "~0.19.5", + "@visactor/vdataset": "~0.19.5", "@visactor/vchart": "workspace:1.13.8" }, "devDependencies": { diff --git a/packages/vchart/package.json b/packages/vchart/package.json index 6ce48ac17a..568c43a193 100644 --- a/packages/vchart/package.json +++ b/packages/vchart/package.json @@ -118,20 +118,20 @@ "cross-env": "^7.0.3" }, "dependencies": { - "@visactor/vutils": "~0.19.4", - "@visactor/vdataset": "~0.19.4", - "@visactor/vscale": "~0.19.4", - "@visactor/vrender-core": "0.22.7", - "@visactor/vrender-kits": "0.22.7", - "@visactor/vrender-components": "0.22.7", - "@visactor/vgrammar-core": "0.16.3", - "@visactor/vgrammar-projection": "0.16.3", - "@visactor/vgrammar-wordcloud": "0.16.3", - "@visactor/vgrammar-wordcloud-shape": "0.16.3", - "@visactor/vgrammar-hierarchy": "0.16.3", - "@visactor/vgrammar-sankey": "0.16.3", - "@visactor/vgrammar-venn": "0.16.3", - "@visactor/vgrammar-util": "0.16.3", + "@visactor/vutils": "~0.19.5", + "@visactor/vdataset": "~0.19.5", + "@visactor/vscale": "~0.19.5", + "@visactor/vrender-core": "0.22.8", + "@visactor/vrender-kits": "0.22.8", + "@visactor/vrender-components": "0.22.8", + "@visactor/vgrammar-core": "0.16.4", + "@visactor/vgrammar-projection": "0.16.4", + "@visactor/vgrammar-wordcloud": "0.16.4", + "@visactor/vgrammar-wordcloud-shape": "0.16.4", + "@visactor/vgrammar-hierarchy": "0.16.4", + "@visactor/vgrammar-sankey": "0.16.4", + "@visactor/vgrammar-venn": "0.16.4", + "@visactor/vgrammar-util": "0.16.4", "@visactor/vutils-extension": "workspace:1.13.8" }, "publishConfig": { diff --git a/packages/vstory/package.json b/packages/vstory/package.json index b6081711ea..aedd7acd35 100644 --- a/packages/vstory/package.json +++ b/packages/vstory/package.json @@ -21,10 +21,10 @@ }, "dependencies": { "@visactor/vchart": "workspace:1.11.0", - "@visactor/vrender-core": "0.22.7", - "@visactor/vrender-kits": "0.22.7", - "@visactor/vrender-components": "0.22.7", - "@visactor/vutils": "~0.19.4" + "@visactor/vrender-core": "0.22.8", + "@visactor/vrender-kits": "0.22.8", + "@visactor/vrender-components": "0.22.8", + "@visactor/vutils": "~0.19.5" }, "devDependencies": { "@internal/bundler": "workspace:*", diff --git a/packages/vutils-extension/package.json b/packages/vutils-extension/package.json index bbe4003203..6f1b3c7540 100644 --- a/packages/vutils-extension/package.json +++ b/packages/vutils-extension/package.json @@ -25,8 +25,8 @@ "test-watch": "DEBUG_MODE=1 jest --watch" }, "dependencies": { - "@visactor/vutils": "~0.19.4", - "@visactor/vdataset": "~0.19.4" + "@visactor/vutils": "~0.19.5", + "@visactor/vdataset": "~0.19.5" }, "devDependencies": { "@internal/bundler": "workspace:*", @@ -67,4 +67,4 @@ "url": "https://www.visactor.io/" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/tools/story-player/package.json b/tools/story-player/package.json index cbe2617031..ecc35fc205 100644 --- a/tools/story-player/package.json +++ b/tools/story-player/package.json @@ -56,10 +56,10 @@ "vite": "3.2.6" }, "dependencies": { - "@visactor/vrender-core": "0.22.7", - "@visactor/vrender-kits": "0.22.7", + "@visactor/vrender-core": "0.22.8", + "@visactor/vrender-kits": "0.22.8", "@visactor/vchart": "workspace:1.13.8", - "@visactor/vrender": "0.22.7", - "@visactor/vutils": "~0.19.4" + "@visactor/vrender": "0.22.8", + "@visactor/vutils": "~0.19.5" } } \ No newline at end of file