diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 1d745da9b..8b8ae8a7f 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -22,7 +22,7 @@ importers: specifier: ~0.5.7 version: 0.5.7 '@visactor/vrender': - specifier: workspace:1.0.21 + specifier: workspace:1.0.22 version: link:../packages/vrender '@visactor/vutils': specifier: ~1.0.12 @@ -95,7 +95,7 @@ importers: ../../packages/react-vrender: dependencies: '@visactor/vrender': - specifier: workspace:1.0.21 + specifier: workspace:1.0.22 version: link:../vrender '@visactor/vutils': specifier: ~1.0.12 @@ -153,10 +153,10 @@ importers: ../../packages/react-vrender-utils: dependencies: '@visactor/react-vrender': - specifier: workspace:1.0.21 + specifier: workspace:1.0.22 version: link:../react-vrender '@visactor/vrender': - specifier: workspace:1.0.21 + specifier: workspace:1.0.22 version: link:../vrender '@visactor/vutils': specifier: ~1.0.12 @@ -211,16 +211,16 @@ importers: ../../packages/vrender: dependencies: '@visactor/vrender-animate': - specifier: workspace:1.0.21 + specifier: workspace:1.0.22 version: link:../vrender-animate '@visactor/vrender-components': - specifier: workspace:1.0.21 + specifier: workspace:1.0.22 version: link:../vrender-components '@visactor/vrender-core': - specifier: workspace:1.0.21 + specifier: workspace:1.0.22 version: link:../vrender-core '@visactor/vrender-kits': - specifier: workspace:1.0.21 + specifier: workspace:1.0.22 version: link:../vrender-kits devDependencies: '@internal/bundler': @@ -287,7 +287,7 @@ importers: ../../packages/vrender-animate: dependencies: '@visactor/vrender-core': - specifier: workspace:1.0.21 + specifier: workspace:1.0.22 version: link:../vrender-core '@visactor/vutils': specifier: ~1.0.12 @@ -345,13 +345,13 @@ importers: ../../packages/vrender-components: dependencies: '@visactor/vrender-animate': - specifier: workspace:1.0.21 + specifier: workspace:1.0.22 version: link:../vrender-animate '@visactor/vrender-core': - specifier: workspace:1.0.21 + specifier: workspace:1.0.22 version: link:../vrender-core '@visactor/vrender-kits': - specifier: workspace:1.0.21 + specifier: workspace:1.0.22 version: link:../vrender-kits '@visactor/vscale': specifier: ~1.0.12 @@ -470,7 +470,7 @@ importers: specifier: 2.4.1 version: 2.4.1 '@visactor/vrender-core': - specifier: workspace:1.0.21 + specifier: workspace:1.0.22 version: link:../vrender-core '@visactor/vutils': specifier: ~1.0.12 @@ -586,19 +586,19 @@ importers: ../../tools/bugserver-trigger: dependencies: '@visactor/vrender': - specifier: workspace:1.0.21 + specifier: workspace:1.0.22 version: link:../../packages/vrender '@visactor/vrender-animate': - specifier: workspace:1.0.21 + specifier: workspace:1.0.22 version: link:../../packages/vrender-animate '@visactor/vrender-components': - specifier: workspace:1.0.21 + specifier: workspace:1.0.22 version: link:../../packages/vrender-components '@visactor/vrender-core': - specifier: workspace:1.0.21 + specifier: workspace:1.0.22 version: link:../../packages/vrender-core '@visactor/vrender-kits': - specifier: workspace:1.0.21 + specifier: workspace:1.0.22 version: link:../../packages/vrender-kits devDependencies: '@internal/bundler': diff --git a/common/config/rush/version-policies.json b/common/config/rush/version-policies.json index 1bf3e8f3b..9dc1802c2 100644 --- a/common/config/rush/version-policies.json +++ b/common/config/rush/version-policies.json @@ -1 +1 @@ -[{"definitionName":"lockStepVersion","policyName":"vrenderMain","version":"1.0.21","nextBump":"patch"}] +[{"definitionName":"lockStepVersion","policyName":"vrenderMain","version":"1.0.22","nextBump":"patch"}] diff --git a/docs/package.json b/docs/package.json index f022dcdd9..3f5a7346c 100644 --- a/docs/package.json +++ b/docs/package.json @@ -13,7 +13,7 @@ "@visactor/vchart": "1.3.0", "@visactor/vutils": "~1.0.12", "@visactor/vgrammar": "~0.5.7", - "@visactor/vrender": "workspace:1.0.21", + "@visactor/vrender": "workspace:1.0.22", "markdown-it": "^13.0.0", "highlight.js": "^11.8.0", "axios": "^1.4.0", diff --git a/packages/react-vrender-utils/CHANGELOG.json b/packages/react-vrender-utils/CHANGELOG.json index 38c0fb8a7..3d15c3c41 100644 --- a/packages/react-vrender-utils/CHANGELOG.json +++ b/packages/react-vrender-utils/CHANGELOG.json @@ -1,6 +1,12 @@ { "name": "@visactor/react-vrender-utils", "entries": [ + { + "version": "1.0.22", + "tag": "@visactor/react-vrender-utils_v1.0.22", + "date": "Fri, 31 Oct 2025 09:24:39 GMT", + "comments": {} + }, { "version": "1.0.21", "tag": "@visactor/react-vrender-utils_v1.0.21", diff --git a/packages/react-vrender-utils/CHANGELOG.md b/packages/react-vrender-utils/CHANGELOG.md index 1e95796b2..74be52753 100644 --- a/packages/react-vrender-utils/CHANGELOG.md +++ b/packages/react-vrender-utils/CHANGELOG.md @@ -1,6 +1,11 @@ # Change Log - @visactor/react-vrender-utils -This log was last generated on Tue, 28 Oct 2025 02:35:07 GMT and should not be manually modified. +This log was last generated on Fri, 31 Oct 2025 09:24:39 GMT and should not be manually modified. + +## 1.0.22 +Fri, 31 Oct 2025 09:24:39 GMT + +_Version update only_ ## 1.0.21 Tue, 28 Oct 2025 02:35:07 GMT diff --git a/packages/react-vrender-utils/package.json b/packages/react-vrender-utils/package.json index f1aa9e2ff..c9b80a8fe 100644 --- a/packages/react-vrender-utils/package.json +++ b/packages/react-vrender-utils/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/react-vrender-utils", - "version": "1.0.21", + "version": "1.0.22", "description": "", "sideEffects": false, "main": "cjs/index.js", @@ -24,8 +24,8 @@ "react-dom": "^18.2.0" }, "dependencies": { - "@visactor/vrender": "workspace:1.0.21", - "@visactor/react-vrender": "workspace:1.0.21", + "@visactor/vrender": "workspace:1.0.22", + "@visactor/react-vrender": "workspace:1.0.22", "@visactor/vutils": "~1.0.12", "react-reconciler": "^0.29.0", "tslib": "^2.3.1" diff --git a/packages/react-vrender/CHANGELOG.json b/packages/react-vrender/CHANGELOG.json index a9fa6bf67..c96929f4a 100644 --- a/packages/react-vrender/CHANGELOG.json +++ b/packages/react-vrender/CHANGELOG.json @@ -1,6 +1,12 @@ { "name": "@visactor/react-vrender", "entries": [ + { + "version": "1.0.22", + "tag": "@visactor/react-vrender_v1.0.22", + "date": "Fri, 31 Oct 2025 09:24:39 GMT", + "comments": {} + }, { "version": "1.0.21", "tag": "@visactor/react-vrender_v1.0.21", diff --git a/packages/react-vrender/CHANGELOG.md b/packages/react-vrender/CHANGELOG.md index 61db20016..4484a9dbc 100644 --- a/packages/react-vrender/CHANGELOG.md +++ b/packages/react-vrender/CHANGELOG.md @@ -1,6 +1,11 @@ # Change Log - @visactor/react-vrender -This log was last generated on Tue, 28 Oct 2025 02:35:07 GMT and should not be manually modified. +This log was last generated on Fri, 31 Oct 2025 09:24:39 GMT and should not be manually modified. + +## 1.0.22 +Fri, 31 Oct 2025 09:24:39 GMT + +_Version update only_ ## 1.0.21 Tue, 28 Oct 2025 02:35:07 GMT diff --git a/packages/react-vrender/package.json b/packages/react-vrender/package.json index 8458c1cd1..3d2877c96 100644 --- a/packages/react-vrender/package.json +++ b/packages/react-vrender/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/react-vrender", - "version": "1.0.21", + "version": "1.0.22", "description": "", "sideEffects": false, "main": "cjs/index.js", @@ -23,7 +23,7 @@ "react": "^18.2.0" }, "dependencies": { - "@visactor/vrender": "workspace:1.0.21", + "@visactor/vrender": "workspace:1.0.22", "@visactor/vutils": "~1.0.12", "react-reconciler": "^0.29.0", "tslib": "^2.3.1" diff --git a/packages/vrender-animate/CHANGELOG.json b/packages/vrender-animate/CHANGELOG.json index 1015a4276..187da4809 100644 --- a/packages/vrender-animate/CHANGELOG.json +++ b/packages/vrender-animate/CHANGELOG.json @@ -1,6 +1,18 @@ { "name": "@visactor/vrender-animate", "entries": [ + { + "version": "1.0.22", + "tag": "@visactor/vrender-animate_v1.0.22", + "date": "Fri, 31 Oct 2025 09:24:39 GMT", + "comments": { + "none": [ + { + "comment": "fix: fix the issue of custom animation params\n\n" + } + ] + } + }, { "version": "1.0.21", "tag": "@visactor/vrender-animate_v1.0.21", diff --git a/packages/vrender-animate/CHANGELOG.md b/packages/vrender-animate/CHANGELOG.md index 8b93c3fe8..7af2e5b9d 100644 --- a/packages/vrender-animate/CHANGELOG.md +++ b/packages/vrender-animate/CHANGELOG.md @@ -1,6 +1,15 @@ # Change Log - @visactor/vrender-animate -This log was last generated on Tue, 28 Oct 2025 02:35:07 GMT and should not be manually modified. +This log was last generated on Fri, 31 Oct 2025 09:24:39 GMT and should not be manually modified. + +## 1.0.22 +Fri, 31 Oct 2025 09:24:39 GMT + +### Updates + +- fix: fix the issue of custom animation params + + ## 1.0.21 Tue, 28 Oct 2025 02:35:07 GMT diff --git a/packages/vrender-animate/package.json b/packages/vrender-animate/package.json index 8b027a222..09826db5f 100644 --- a/packages/vrender-animate/package.json +++ b/packages/vrender-animate/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vrender-animate", - "version": "1.0.21", + "version": "1.0.22", "description": "", "sideEffects": false, "main": "cjs/index.js", @@ -21,7 +21,7 @@ }, "dependencies": { "@visactor/vutils": "~1.0.12", - "@visactor/vrender-core": "workspace:1.0.21" + "@visactor/vrender-core": "workspace:1.0.22" }, "devDependencies": { "@internal/bundler": "workspace:*", diff --git a/packages/vrender-animate/src/executor/animate-executor.ts b/packages/vrender-animate/src/executor/animate-executor.ts index 7042fff60..ca0e92140 100644 --- a/packages/vrender-animate/src/executor/animate-executor.ts +++ b/packages/vrender-animate/src/executor/animate-executor.ts @@ -424,12 +424,18 @@ export class AnimateExecutor implements IAnimateExecutor { ) { // 处理自定义动画 if (custom && customType) { - const customParams = { + const _customParameters = this.resolveValue(customParameters, graphic); + let customParams = _customParameters; + if (typeof customParams !== 'function') { + customParams = customParams(graphic.context?.data?.[0], graphic, {}); + } + customParams = { width: graphic.stage?.width || 0, height: graphic.stage?.height || 0, group: this._target.parent, - ...this.resolveValue(customParameters, graphic) + ..._customParameters }; + const objOptions = isFunction(options) ? options.call( null, diff --git a/packages/vrender-components/CHANGELOG.json b/packages/vrender-components/CHANGELOG.json index 031859908..fb06dae89 100644 --- a/packages/vrender-components/CHANGELOG.json +++ b/packages/vrender-components/CHANGELOG.json @@ -1,6 +1,12 @@ { "name": "@visactor/vrender-components", "entries": [ + { + "version": "1.0.22", + "tag": "@visactor/vrender-components_v1.0.22", + "date": "Fri, 31 Oct 2025 09:24:39 GMT", + "comments": {} + }, { "version": "1.0.21", "tag": "@visactor/vrender-components_v1.0.21", diff --git a/packages/vrender-components/CHANGELOG.md b/packages/vrender-components/CHANGELOG.md index f02618c40..4eb993fbb 100644 --- a/packages/vrender-components/CHANGELOG.md +++ b/packages/vrender-components/CHANGELOG.md @@ -1,6 +1,11 @@ # Change Log - @visactor/vrender-components -This log was last generated on Tue, 28 Oct 2025 02:35:07 GMT and should not be manually modified. +This log was last generated on Fri, 31 Oct 2025 09:24:39 GMT and should not be manually modified. + +## 1.0.22 +Fri, 31 Oct 2025 09:24:39 GMT + +_Version update only_ ## 1.0.21 Tue, 28 Oct 2025 02:35:07 GMT diff --git a/packages/vrender-components/package.json b/packages/vrender-components/package.json index 2dab8b4ac..9c61e4ca6 100644 --- a/packages/vrender-components/package.json +++ b/packages/vrender-components/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vrender-components", - "version": "1.0.21", + "version": "1.0.22", "description": "components library for dp visualization", "sideEffects": false, "main": "cjs/index.js", @@ -27,9 +27,9 @@ "dependencies": { "@visactor/vutils": "~1.0.12", "@visactor/vscale": "~1.0.12", - "@visactor/vrender-core": "workspace:1.0.21", - "@visactor/vrender-kits": "workspace:1.0.21", - "@visactor/vrender-animate": "workspace:1.0.21" + "@visactor/vrender-core": "workspace:1.0.22", + "@visactor/vrender-kits": "workspace:1.0.22", + "@visactor/vrender-animate": "workspace:1.0.22" }, "devDependencies": { "@internal/bundler": "workspace:*", diff --git a/packages/vrender-core/CHANGELOG.json b/packages/vrender-core/CHANGELOG.json index 05a89eaf2..8a7d27610 100644 --- a/packages/vrender-core/CHANGELOG.json +++ b/packages/vrender-core/CHANGELOG.json @@ -1,6 +1,12 @@ { "name": "@visactor/vrender-core", "entries": [ + { + "version": "1.0.22", + "tag": "@visactor/vrender-core_v1.0.22", + "date": "Fri, 31 Oct 2025 09:24:39 GMT", + "comments": {} + }, { "version": "1.0.21", "tag": "@visactor/vrender-core_v1.0.21", diff --git a/packages/vrender-core/CHANGELOG.md b/packages/vrender-core/CHANGELOG.md index bd84df1e1..f78e36e93 100644 --- a/packages/vrender-core/CHANGELOG.md +++ b/packages/vrender-core/CHANGELOG.md @@ -1,6 +1,11 @@ # Change Log - @visactor/vrender-core -This log was last generated on Tue, 28 Oct 2025 02:35:07 GMT and should not be manually modified. +This log was last generated on Fri, 31 Oct 2025 09:24:39 GMT and should not be manually modified. + +## 1.0.22 +Fri, 31 Oct 2025 09:24:39 GMT + +_Version update only_ ## 1.0.21 Tue, 28 Oct 2025 02:35:07 GMT diff --git a/packages/vrender-core/package.json b/packages/vrender-core/package.json index f9c4e9a14..8cadc0be8 100644 --- a/packages/vrender-core/package.json +++ b/packages/vrender-core/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vrender-core", - "version": "1.0.21", + "version": "1.0.22", "description": "", "sideEffects": [ "./src/modules.ts", diff --git a/packages/vrender-kits/CHANGELOG.json b/packages/vrender-kits/CHANGELOG.json index 0073ed447..2b94ce4a1 100644 --- a/packages/vrender-kits/CHANGELOG.json +++ b/packages/vrender-kits/CHANGELOG.json @@ -1,6 +1,12 @@ { "name": "@visactor/vrender-kits", "entries": [ + { + "version": "1.0.22", + "tag": "@visactor/vrender-kits_v1.0.22", + "date": "Fri, 31 Oct 2025 09:24:39 GMT", + "comments": {} + }, { "version": "1.0.21", "tag": "@visactor/vrender-kits_v1.0.21", diff --git a/packages/vrender-kits/CHANGELOG.md b/packages/vrender-kits/CHANGELOG.md index db653a9cb..6a51352b4 100644 --- a/packages/vrender-kits/CHANGELOG.md +++ b/packages/vrender-kits/CHANGELOG.md @@ -1,6 +1,11 @@ # Change Log - @visactor/vrender-kits -This log was last generated on Tue, 28 Oct 2025 02:35:07 GMT and should not be manually modified. +This log was last generated on Fri, 31 Oct 2025 09:24:39 GMT and should not be manually modified. + +## 1.0.22 +Fri, 31 Oct 2025 09:24:39 GMT + +_Version update only_ ## 1.0.21 Tue, 28 Oct 2025 02:35:07 GMT diff --git a/packages/vrender-kits/package.json b/packages/vrender-kits/package.json index 90d998f15..53573cbf9 100644 --- a/packages/vrender-kits/package.json +++ b/packages/vrender-kits/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vrender-kits", - "version": "1.0.21", + "version": "1.0.22", "description": "", "sideEffects": false, "main": "cjs/index.js", @@ -21,7 +21,7 @@ }, "dependencies": { "@visactor/vutils": "~1.0.12", - "@visactor/vrender-core": "workspace:1.0.21", + "@visactor/vrender-core": "workspace:1.0.22", "@resvg/resvg-js": "2.4.1", "roughjs": "4.5.2", "gifuct-js": "2.1.2", diff --git a/packages/vrender/CHANGELOG.json b/packages/vrender/CHANGELOG.json index ac864e1ae..f5b98aca2 100644 --- a/packages/vrender/CHANGELOG.json +++ b/packages/vrender/CHANGELOG.json @@ -1,6 +1,12 @@ { "name": "@visactor/vrender", "entries": [ + { + "version": "1.0.22", + "tag": "@visactor/vrender_v1.0.22", + "date": "Fri, 31 Oct 2025 09:24:39 GMT", + "comments": {} + }, { "version": "1.0.21", "tag": "@visactor/vrender_v1.0.21", diff --git a/packages/vrender/CHANGELOG.md b/packages/vrender/CHANGELOG.md index 70d31c278..3c700975d 100644 --- a/packages/vrender/CHANGELOG.md +++ b/packages/vrender/CHANGELOG.md @@ -1,6 +1,11 @@ # Change Log - @visactor/vrender -This log was last generated on Tue, 28 Oct 2025 02:35:07 GMT and should not be manually modified. +This log was last generated on Fri, 31 Oct 2025 09:24:39 GMT and should not be manually modified. + +## 1.0.22 +Fri, 31 Oct 2025 09:24:39 GMT + +_Version update only_ ## 1.0.21 Tue, 28 Oct 2025 02:35:07 GMT diff --git a/packages/vrender/package.json b/packages/vrender/package.json index 5f52a815d..059f21507 100644 --- a/packages/vrender/package.json +++ b/packages/vrender/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vrender", - "version": "1.0.21", + "version": "1.0.22", "description": "", "sideEffects": true, "main": "cjs/index.js", @@ -24,10 +24,10 @@ "test-watch": "cross-env DEBUG_MODE=1 jest --watch" }, "dependencies": { - "@visactor/vrender-core": "workspace:1.0.21", - "@visactor/vrender-kits": "workspace:1.0.21", - "@visactor/vrender-animate": "workspace:1.0.21", - "@visactor/vrender-components": "workspace:1.0.21" + "@visactor/vrender-core": "workspace:1.0.22", + "@visactor/vrender-kits": "workspace:1.0.22", + "@visactor/vrender-animate": "workspace:1.0.22", + "@visactor/vrender-components": "workspace:1.0.22" }, "devDependencies": { "@internal/bundler": "workspace:*", diff --git a/tools/bugserver-trigger/package.json b/tools/bugserver-trigger/package.json index e31a87b4e..305957b6b 100644 --- a/tools/bugserver-trigger/package.json +++ b/tools/bugserver-trigger/package.json @@ -8,11 +8,11 @@ "ci": "ts-node --transpileOnly --skipProject ./scripts/trigger-test.ts" }, "dependencies": { - "@visactor/vrender": "workspace:1.0.21", - "@visactor/vrender-core": "workspace:1.0.21", - "@visactor/vrender-kits": "workspace:1.0.21", - "@visactor/vrender-components": "workspace:1.0.21", - "@visactor/vrender-animate": "workspace:1.0.21" + "@visactor/vrender": "workspace:1.0.22", + "@visactor/vrender-core": "workspace:1.0.22", + "@visactor/vrender-kits": "workspace:1.0.22", + "@visactor/vrender-components": "workspace:1.0.22", + "@visactor/vrender-animate": "workspace:1.0.22" }, "devDependencies": { "@rushstack/eslint-patch": "~1.1.4",