From e10ea88c377fdaf7cae5ee0a56855c521962a234 Mon Sep 17 00:00:00 2001 From: "lixuefei.1313" Date: Thu, 27 Nov 2025 14:42:59 +0800 Subject: [PATCH 1/2] feat: upgrade vrender to 1.0.30 --- common/config/rush/pnpm-lock.yaml | 106 ++++++++++----------- docs/package.json | 6 +- packages/openinula-vchart/package.json | 6 +- packages/react-vchart/package.json | 6 +- packages/vchart-extension/package.json | 10 +- packages/vchart/package.json | 10 +- packages/vchart/src/mark/base/base-mark.ts | 6 +- tools/story-player/package.json | 8 +- 8 files changed, 79 insertions(+), 79 deletions(-) diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index ceda2f7410..40cc9b0f65 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -22,8 +22,8 @@ importers: '@visactor/vchart-extension': workspace:2.0.9 '@visactor/vchart-theme': ~1.6.6 '@visactor/vmind': 1.2.4-alpha.5 - '@visactor/vrender': ~1.0.28 - '@visactor/vrender-kits': ~1.0.28 + '@visactor/vrender': ~1.0.30 + '@visactor/vrender-kits': ~1.0.30 '@visactor/vtable': 1.19.0-alpha.0 '@visactor/vtable-calendar': 1.19.0-alpha.0 '@visactor/vtable-editors': 1.19.0-alpha.0 @@ -59,8 +59,8 @@ importers: '@visactor/vchart-extension': link:../packages/vchart-extension '@visactor/vchart-theme': 1.6.9 '@visactor/vmind': 1.2.4-alpha.5 - '@visactor/vrender': 1.0.28 - '@visactor/vrender-kits': 1.0.28 + '@visactor/vrender': 1.0.30 + '@visactor/vrender-kits': 1.0.30 '@visactor/vtable': 1.19.0-alpha.0 '@visactor/vtable-calendar': 1.19.0-alpha.0 '@visactor/vtable-editors': 1.19.0-alpha.0 @@ -144,8 +144,8 @@ importers: '@types/offscreencanvas': 2019.6.4 '@types/react-is': ^17.0.3 '@visactor/vchart': workspace:2.0.9 - '@visactor/vrender-core': ~1.0.28 - '@visactor/vrender-kits': ~1.0.28 + '@visactor/vrender-core': ~1.0.30 + '@visactor/vrender-kits': ~1.0.30 '@visactor/vutils': ~1.0.12 '@vitejs/plugin-react': 3.1.0 eslint: ~8.18.0 @@ -164,8 +164,8 @@ importers: vite: 3.2.6 dependencies: '@visactor/vchart': link:../vchart - '@visactor/vrender-core': 1.0.28 - '@visactor/vrender-kits': 1.0.28 + '@visactor/vrender-core': 1.0.30 + '@visactor/vrender-kits': 1.0.30 '@visactor/vutils': 1.0.12 react-is: 18.3.1 devDependencies: @@ -208,8 +208,8 @@ importers: '@types/react-is': ^17.0.3 '@visactor/vchart': workspace:2.0.9 '@visactor/vchart-extension': workspace:2.0.9 - '@visactor/vrender-core': ~1.0.28 - '@visactor/vrender-kits': ~1.0.28 + '@visactor/vrender-core': ~1.0.30 + '@visactor/vrender-kits': ~1.0.30 '@visactor/vutils': ~1.0.12 '@vitejs/plugin-react': 3.1.0 eslint: ~8.18.0 @@ -230,8 +230,8 @@ importers: dependencies: '@visactor/vchart': link:../vchart '@visactor/vchart-extension': link:../vchart-extension - '@visactor/vrender-core': 1.0.28 - '@visactor/vrender-kits': 1.0.28 + '@visactor/vrender-core': 1.0.30 + '@visactor/vrender-kits': 1.0.30 '@visactor/vutils': 1.0.12 react-is: 18.3.1 devDependencies: @@ -371,10 +371,10 @@ importers: '@types/offscreencanvas': 2019.6.4 '@visactor/vdataset': ~1.0.12 '@visactor/vlayouts': ~1.0.12 - '@visactor/vrender-animate': ~1.0.28 - '@visactor/vrender-components': ~1.0.28 - '@visactor/vrender-core': ~1.0.28 - '@visactor/vrender-kits': ~1.0.28 + '@visactor/vrender-animate': ~1.0.30 + '@visactor/vrender-components': ~1.0.30 + '@visactor/vrender-core': ~1.0.30 + '@visactor/vrender-kits': ~1.0.30 '@visactor/vscale': ~1.0.12 '@visactor/vutils': ~1.0.12 '@visactor/vutils-extension': workspace:2.0.9 @@ -413,10 +413,10 @@ importers: dependencies: '@visactor/vdataset': 1.0.12 '@visactor/vlayouts': 1.0.12 - '@visactor/vrender-animate': 1.0.28 - '@visactor/vrender-components': 1.0.28 - '@visactor/vrender-core': 1.0.28 - '@visactor/vrender-kits': 1.0.28 + '@visactor/vrender-animate': 1.0.30 + '@visactor/vrender-components': 1.0.30 + '@visactor/vrender-core': 1.0.30 + '@visactor/vrender-kits': 1.0.30 '@visactor/vscale': 1.0.12 '@visactor/vutils': 1.0.12 '@visactor/vutils-extension': link:../vutils-extension @@ -478,10 +478,10 @@ importers: '@visactor/vchart': workspace:2.0.9 '@visactor/vdataset': ~1.0.12 '@visactor/vlayouts': ~1.0.12 - '@visactor/vrender-animate': ~1.0.28 - '@visactor/vrender-components': ~1.0.28 - '@visactor/vrender-core': ~1.0.28 - '@visactor/vrender-kits': ~1.0.28 + '@visactor/vrender-animate': ~1.0.30 + '@visactor/vrender-components': ~1.0.30 + '@visactor/vrender-core': ~1.0.30 + '@visactor/vrender-kits': ~1.0.30 '@visactor/vutils': ~1.0.12 '@vitejs/plugin-react': 3.1.0 canvas: 2.11.2 @@ -503,10 +503,10 @@ importers: '@visactor/vchart': link:../vchart '@visactor/vdataset': 1.0.12 '@visactor/vlayouts': 1.0.12 - '@visactor/vrender-animate': 1.0.28 - '@visactor/vrender-components': 1.0.28 - '@visactor/vrender-core': 1.0.28 - '@visactor/vrender-kits': 1.0.28 + '@visactor/vrender-animate': 1.0.30 + '@visactor/vrender-components': 1.0.30 + '@visactor/vrender-core': 1.0.30 + '@visactor/vrender-kits': 1.0.30 '@visactor/vutils': 1.0.12 devDependencies: '@internal/bundler': link:../../tools/bundler @@ -878,9 +878,9 @@ importers: '@typescript-eslint/eslint-plugin': 5.30.0 '@typescript-eslint/parser': 5.30.0 '@visactor/vchart': workspace:2.0.9 - '@visactor/vrender': ~1.0.28 - '@visactor/vrender-core': ~1.0.28 - '@visactor/vrender-kits': ~1.0.28 + '@visactor/vrender': ~1.0.30 + '@visactor/vrender-core': ~1.0.30 + '@visactor/vrender-kits': ~1.0.30 '@visactor/vutils': ~1.0.12 cross-env: ^7.0.3 eslint: ~8.18.0 @@ -893,9 +893,9 @@ importers: vite: 3.2.6 dependencies: '@visactor/vchart': link:../../packages/vchart - '@visactor/vrender': 1.0.28 - '@visactor/vrender-core': 1.0.28 - '@visactor/vrender-kits': 1.0.28 + '@visactor/vrender': 1.0.30 + '@visactor/vrender-core': 1.0.30 + '@visactor/vrender-kits': 1.0.30 '@visactor/vutils': 1.0.12 devDependencies: '@internal/bundler': link:../bundler @@ -4884,10 +4884,10 @@ packages: '@visactor/vutils': 1.0.4 dev: false - /@visactor/vrender-animate/1.0.28: - resolution: {integrity: sha512-k409iDGgq43zzNF2djfx1QEjoWAFFzDN0yLA2MWWoy6dESWl7gPZbJzyO6D/JSl8oO80v9bleGS02ZAIcVlXag==} + /@visactor/vrender-animate/1.0.30: + resolution: {integrity: sha512-LgAJqvsJNtCGbxn8W9/68BG0McPz7rcO2lYuz0A+aJU72kyju5MIz+T7aegR/MajHXuHc9o3tayjjQ78qMicfA==} dependencies: - '@visactor/vrender-core': 1.0.28 + '@visactor/vrender-core': 1.0.30 '@visactor/vutils': 1.0.12 dev: false @@ -4901,12 +4901,12 @@ packages: '@visactor/vutils': 1.0.4 dev: false - /@visactor/vrender-components/1.0.28: - resolution: {integrity: sha512-ijaC/5GBQCs0ar0WXyamEKwHst3LeEi7ZmQvD+a0sF7xnKWZsrvKITWWzk8umCef2zrwA7q09/nQD/j72iGPzw==} + /@visactor/vrender-components/1.0.30: + resolution: {integrity: sha512-7CMb2J3euo6dS8o1CKILQls4mZ18hkcn4CzL7QJKt3LY/l2Y+ERZsjMnx1HBeoTVE+5tav6Ua2qq3/bQvQh6MA==} dependencies: - '@visactor/vrender-animate': 1.0.28 - '@visactor/vrender-core': 1.0.28 - '@visactor/vrender-kits': 1.0.28 + '@visactor/vrender-animate': 1.0.30 + '@visactor/vrender-core': 1.0.30 + '@visactor/vrender-kits': 1.0.30 '@visactor/vscale': 1.0.12 '@visactor/vutils': 1.0.12 dev: false @@ -4918,8 +4918,8 @@ packages: color-convert: 2.0.1 dev: false - /@visactor/vrender-core/1.0.28: - resolution: {integrity: sha512-PgspYPDUllXwl9CCYMyNQgBIW12fwF1gerriUVknJdI2fTJ6IIyiiJVtXWBhAL/kfVSVgTT/MLyUYAKlk4/5EA==} + /@visactor/vrender-core/1.0.30: + resolution: {integrity: sha512-SBKoul3PLOGKMow9yfEgZmKwXV5xc0jZV8drD21z1/g2QlWGstc4iQC3sARXyenhe8HJEPC9kQdYdo/AzZty6A==} dependencies: '@visactor/vutils': 1.0.12 color-convert: 2.0.1 @@ -4936,24 +4936,24 @@ packages: roughjs: 4.5.2 dev: false - /@visactor/vrender-kits/1.0.28: - resolution: {integrity: sha512-79GhUUHLm/ZRmvRfRt7+qBBev25fIxBCg5DpIxpo7wyeWl0f7E+sFSdOSCOtwlfKKO43lxIMFw4Zit8CAeuViQ==} + /@visactor/vrender-kits/1.0.30: + resolution: {integrity: sha512-J6sPXNTu0X0eeIqOdNZrJFQukjrJQQuzblLS/p/kVTFf0UF5nF5rR/wA7NeK1gqMmeX1nQlllPM+doGfc7s4Fw==} dependencies: '@resvg/resvg-js': 2.4.1 - '@visactor/vrender-core': 1.0.28 + '@visactor/vrender-core': 1.0.30 '@visactor/vutils': 1.0.12 gifuct-js: 2.1.2 lottie-web: 5.13.0 roughjs: 4.6.6 dev: false - /@visactor/vrender/1.0.28: - resolution: {integrity: sha512-Ml62dm4WeNAx8h6dLaAfd5IpjiJS+3ik28KgJegbW2cgG6X14xKOI4QKB7Qp/ng9z8jsuZkcS9Pz6Q0t7OKBHA==} + /@visactor/vrender/1.0.30: + resolution: {integrity: sha512-Qs1Ozt/cjLHe4YrvTRHs1wpAl4DP5Am2qK84It4qrVUpTxUsVofcZPFVJNey8NVZIlhiBYGeJOl0mAn3W2D5Kw==} dependencies: - '@visactor/vrender-animate': 1.0.28 - '@visactor/vrender-components': 1.0.28 - '@visactor/vrender-core': 1.0.28 - '@visactor/vrender-kits': 1.0.28 + '@visactor/vrender-animate': 1.0.30 + '@visactor/vrender-components': 1.0.30 + '@visactor/vrender-core': 1.0.30 + '@visactor/vrender-kits': 1.0.30 dev: false /@visactor/vscale/0.18.18: diff --git a/docs/package.json b/docs/package.json index 1934a2907b..17a1028d4d 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": "~1.0.12", - "@visactor/vrender": "~1.0.28", - "@visactor/vrender-kits": "~1.0.28", + "@visactor/vrender": "~1.0.30", + "@visactor/vrender-kits": "~1.0.30", "@visactor/vtable": "1.19.0-alpha.0", "@visactor/vtable-editors": "1.19.0-alpha.0", "@visactor/vtable-gantt": "1.19.0-alpha.0", @@ -58,4 +58,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 5ca22ae765..52b18a0b6b 100644 --- a/packages/openinula-vchart/package.json +++ b/packages/openinula-vchart/package.json @@ -30,8 +30,8 @@ "dependencies": { "@visactor/vchart": "workspace:2.0.9", "@visactor/vutils": "~1.0.12", - "@visactor/vrender-core": "~1.0.28", - "@visactor/vrender-kits": "~1.0.28", + "@visactor/vrender-core": "~1.0.30", + "@visactor/vrender-kits": "~1.0.30", "react-is": "^18.2.0" }, "devDependencies": { @@ -78,4 +78,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 a3e36388ec..519ea12db0 100644 --- a/packages/react-vchart/package.json +++ b/packages/react-vchart/package.json @@ -31,8 +31,8 @@ "@visactor/vchart": "workspace:2.0.9", "@visactor/vchart-extension": "workspace:2.0.9", "@visactor/vutils": "~1.0.12", - "@visactor/vrender-core": "~1.0.28", - "@visactor/vrender-kits": "~1.0.28", + "@visactor/vrender-core": "~1.0.30", + "@visactor/vrender-kits": "~1.0.30", "react-is": "^18.2.0" }, "devDependencies": { @@ -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 3f5c3f82ea..76f8accf2d 100644 --- a/packages/vchart-extension/package.json +++ b/packages/vchart-extension/package.json @@ -21,10 +21,10 @@ "start": "ts-node __tests__/runtime/browser/scripts/initVite.ts && vite serve __tests__/runtime/browser" }, "dependencies": { - "@visactor/vrender-core": "~1.0.28", - "@visactor/vrender-kits": "~1.0.28", - "@visactor/vrender-components": "~1.0.28", - "@visactor/vrender-animate": "~1.0.28", + "@visactor/vrender-core": "~1.0.30", + "@visactor/vrender-kits": "~1.0.30", + "@visactor/vrender-components": "~1.0.30", + "@visactor/vrender-animate": "~1.0.30", "@visactor/vchart": "workspace:2.0.9", "@visactor/vutils": "~1.0.12", "@visactor/vdataset": "~1.0.12", @@ -61,4 +61,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 141406d0c6..e75c188282 100644 --- a/packages/vchart/package.json +++ b/packages/vchart/package.json @@ -122,14 +122,14 @@ "@visactor/vdataset": "~1.0.12", "@visactor/vscale": "~1.0.12", "@visactor/vlayouts": "~1.0.12", - "@visactor/vrender-core": "~1.0.28", - "@visactor/vrender-kits": "~1.0.28", - "@visactor/vrender-components": "~1.0.28", - "@visactor/vrender-animate": "~1.0.28", + "@visactor/vrender-core": "~1.0.30", + "@visactor/vrender-kits": "~1.0.30", + "@visactor/vrender-components": "~1.0.30", + "@visactor/vrender-animate": "~1.0.30", "@visactor/vutils-extension": "workspace:2.0.9" }, "publishConfig": { "access": "public", "registry": "https://registry.npmjs.org/" } -} \ No newline at end of file +} diff --git a/packages/vchart/src/mark/base/base-mark.ts b/packages/vchart/src/mark/base/base-mark.ts index 03e99a471e..b5347e8bb9 100644 --- a/packages/vchart/src/mark/base/base-mark.ts +++ b/packages/vchart/src/mark/base/base-mark.ts @@ -1532,7 +1532,7 @@ export class BaseMark extends GrammarItem implements IMar } }; - protected _setStateOfGraphic = (g: IMarkGraphic) => { + protected _setStateOfGraphic = (g: IMarkGraphic, hasAnimation?: boolean) => { g.clearStates(); g.stateProxy = null; @@ -1541,7 +1541,7 @@ export class BaseMark extends GrammarItem implements IMar return this._runEncoderOfGraphic(this._encoderOfState?.[stateName], g); }; - g.context.states && g.useStates(g.context.states); + g.context.states && g.useStates(g.context.states, hasAnimation); } }; @@ -1625,7 +1625,7 @@ export class BaseMark extends GrammarItem implements IMar } } - this._setStateOfGraphic(g); + this._setStateOfGraphic(g, hasStateAnimation); this._setGraphicFromMarkConfig(g); }); } diff --git a/tools/story-player/package.json b/tools/story-player/package.json index ee16283f22..d164c68ea5 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": "~1.0.28", - "@visactor/vrender-kits": "~1.0.28", + "@visactor/vrender-core": "~1.0.30", + "@visactor/vrender-kits": "~1.0.30", "@visactor/vchart": "workspace:2.0.9", - "@visactor/vrender": "~1.0.28", + "@visactor/vrender": "~1.0.30", "@visactor/vutils": "~1.0.12" } -} \ No newline at end of file +} From a56313140c082109df5363ad5c8422e8e76ec0cf Mon Sep 17 00:00:00 2001 From: "lixuefei.1313" Date: Thu, 27 Nov 2025 14:44:19 +0800 Subject: [PATCH 2/2] docs: update changlog of rush --- ...ade-vrender-to-fix-animation_2025-11-27-06-44.json | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 common/changes/@visactor/vchart/feat-upgrade-vrender-to-fix-animation_2025-11-27-06-44.json diff --git a/common/changes/@visactor/vchart/feat-upgrade-vrender-to-fix-animation_2025-11-27-06-44.json b/common/changes/@visactor/vchart/feat-upgrade-vrender-to-fix-animation_2025-11-27-06-44.json new file mode 100644 index 0000000000..46b02581c8 --- /dev/null +++ b/common/changes/@visactor/vchart/feat-upgrade-vrender-to-fix-animation_2025-11-27-06-44.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "feat: upgrade vrender to 1.0.30\n\n", + "type": "none", + "packageName": "@visactor/vchart" + } + ], + "packageName": "@visactor/vchart", + "email": "lixuef1313@163.com" +} \ No newline at end of file