diff --git a/common/changes/@visactor/vrender-core/fix-radar-label_2024-09-03-08-44.json b/common/changes/@visactor/vrender-core/fix-radar-label_2024-09-03-08-44.json new file mode 100644 index 000000000..31aa7935b --- /dev/null +++ b/common/changes/@visactor/vrender-core/fix-radar-label_2024-09-03-08-44.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "fix: fix bug of label in radarchart triggered by aniamtion\n\n", + "type": "none", + "packageName": "@visactor/vrender-core" + } + ], + "packageName": "@visactor/vrender-core", + "email": "dingling112@gmail.com" +} \ No newline at end of file diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 2bdb27d19..b9cc5333e 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -15,7 +15,7 @@ importers: '@visactor/vchart': 1.3.0 '@visactor/vgrammar': ~0.5.7 '@visactor/vrender': workspace:0.20.1 - '@visactor/vutils': ~0.18.14 + '@visactor/vutils': ~0.18.15 '@vitejs/plugin-react': 3.1.0 axios: ^1.4.0 chalk: ^3.0.0 @@ -38,7 +38,7 @@ importers: '@visactor/vchart': 1.3.0 '@visactor/vgrammar': 0.5.7 '@visactor/vrender': link:../packages/vrender - '@visactor/vutils': 0.18.14 + '@visactor/vutils': 0.18.15 axios: 1.7.4 highlight.js: 11.10.0 lodash: 4.17.21 @@ -72,7 +72,7 @@ importers: '@types/react-dom': ^18.0.0 '@types/react-reconciler': ^0.28.2 '@visactor/vrender': workspace:0.20.1 - '@visactor/vutils': ~0.18.14 + '@visactor/vutils': ~0.18.15 '@vitejs/plugin-react': 3.1.0 cross-env: ^7.0.3 eslint: ~8.18.0 @@ -84,7 +84,7 @@ importers: vite: 3.2.6 dependencies: '@visactor/vrender': link:../vrender - '@visactor/vutils': 0.18.14 + '@visactor/vutils': 0.18.15 react-reconciler: 0.29.2_react@18.3.1 tslib: 2.6.3 devDependencies: @@ -113,7 +113,7 @@ importers: '@types/react-dom': ^18.0.0 '@visactor/react-vrender': workspace:0.20.1 '@visactor/vrender': workspace:0.20.1 - '@visactor/vutils': ~0.18.14 + '@visactor/vutils': ~0.18.15 '@vitejs/plugin-react': 3.1.0 cross-env: ^7.0.3 eslint: ~8.18.0 @@ -126,7 +126,7 @@ importers: dependencies: '@visactor/react-vrender': link:../react-vrender '@visactor/vrender': link:../vrender - '@visactor/vutils': 0.18.14 + '@visactor/vutils': 0.18.15 react-reconciler: 0.29.2_react@18.3.1 tslib: 2.6.3 devDependencies: @@ -155,7 +155,7 @@ importers: '@types/react-dom': ^18.0.0 '@visactor/vrender-core': workspace:0.20.1 '@visactor/vrender-kits': workspace:0.20.1 - '@visactor/vutils': ~0.18.14 + '@visactor/vutils': ~0.18.15 '@vitejs/plugin-react': 3.1.0 canvas: 2.11.2 cross-env: ^7.0.3 @@ -179,7 +179,7 @@ importers: '@types/jest': 26.0.24 '@types/react': 18.3.3 '@types/react-dom': 18.3.0 - '@visactor/vutils': 0.18.14 + '@visactor/vutils': 0.18.15 '@vitejs/plugin-react': 3.1.0_vite@3.2.6 canvas: 2.11.2 cross-env: 7.0.3 @@ -202,8 +202,8 @@ importers: '@types/jest': ^26.0.0 '@visactor/vrender-core': workspace:0.20.1 '@visactor/vrender-kits': workspace:0.20.1 - '@visactor/vscale': ~0.18.14 - '@visactor/vutils': ~0.18.14 + '@visactor/vscale': ~0.18.15 + '@visactor/vutils': ~0.18.15 cross-env: ^7.0.3 eslint: ~8.18.0 jest: ^26.0.0 @@ -215,8 +215,8 @@ importers: dependencies: '@visactor/vrender-core': link:../vrender-core '@visactor/vrender-kits': link:../vrender-kits - '@visactor/vscale': 0.18.14 - '@visactor/vutils': 0.18.14 + '@visactor/vscale': 0.18.15 + '@visactor/vutils': 0.18.15 devDependencies: '@internal/bundler': link:../../tools/bundler '@internal/eslint-config': link:../../share/eslint-config @@ -241,7 +241,7 @@ importers: '@types/jest': ^26.0.0 '@types/react': ^18.0.0 '@types/react-dom': ^18.0.0 - '@visactor/vutils': ~0.18.14 + '@visactor/vutils': ~0.18.15 '@vitejs/plugin-react': 3.1.0 color-convert: 2.0.1 cross-env: ^7.0.3 @@ -255,7 +255,7 @@ importers: typescript: 4.9.5 vite: 3.2.6 dependencies: - '@visactor/vutils': 0.18.14 + '@visactor/vutils': 0.18.15 color-convert: 2.0.1 devDependencies: '@internal/bundler': link:../../tools/bundler @@ -288,7 +288,7 @@ importers: '@types/react': ^18.0.0 '@types/react-dom': ^18.0.0 '@visactor/vrender-core': workspace:0.20.1 - '@visactor/vutils': ~0.18.14 + '@visactor/vutils': ~0.18.15 '@vitejs/plugin-react': 3.1.0 canvas: 2.11.2 cross-env: ^7.0.3 @@ -302,7 +302,7 @@ importers: dependencies: '@resvg/resvg-js': 2.4.1 '@visactor/vrender-core': link:../vrender-core - '@visactor/vutils': 0.18.14 + '@visactor/vutils': 0.18.15 roughjs: 4.5.2 devDependencies: '@internal/bundler': link:../../tools/bundler @@ -3422,10 +3422,10 @@ packages: '@visactor/vutils': 0.15.14 dev: false - /@visactor/vscale/0.18.14: - resolution: {integrity: sha512-uhyI8yqOPyMurdwqz1oqcqfTXZebpY5kYdnOM5xG79Lz54L95YNZ1J5BNu+SOxOBWbul5hnyjVpdTbZIoujveQ==} + /@visactor/vscale/0.18.15: + resolution: {integrity: sha512-09dDWc6muJbOMxzp4odCsyLjqAF6u3BOx9kAJJ0tEpKE1AuHL4BTejNe697mJAnXqAo2ynAA+dn+cgWYiW1WQg==} dependencies: - '@visactor/vutils': 0.18.14 + '@visactor/vutils': 0.18.15 dev: false /@visactor/vutils/0.13.3: @@ -3444,8 +3444,8 @@ packages: eventemitter3: 4.0.7 dev: false - /@visactor/vutils/0.18.14: - resolution: {integrity: sha512-Yf6v+utbMd7kK5F2UqZ3pw7xDpsvm24MQHzUzX3OUVFq+kAmYSPIc7j5YigShnn5se9uoghpNo62Vk0+we0W5Q==} + /@visactor/vutils/0.18.15: + resolution: {integrity: sha512-gTw8n14SU4avmqZ6VwpHwqoDfOCq044M2QA43rViNaHBnOQ/ePOPRZHl0heSfGQoMIJSZUD7SowLnn5NJjVXYw==} dependencies: '@turf/helpers': 6.5.0 '@turf/invariant': 6.5.0 diff --git a/docs/demos/package.json b/docs/demos/package.json index d5e356386..caba6c946 100644 --- a/docs/demos/package.json +++ b/docs/demos/package.json @@ -12,7 +12,7 @@ "@internal/eslint-config": "workspace:*", "@internal/ts-config": "workspace:*", "@visactor/vrender-kits": "workspace:0.14.8", - "@visactor/vutils": "~0.18.14", + "@visactor/vutils": "~0.18.15", "d3-scale-chromatic": "^3.0.0", "lodash": "4.17.21", "dat.gui": "^0.7.9", diff --git a/docs/package.json b/docs/package.json index 296c29a59..bae006232 100644 --- a/docs/package.json +++ b/docs/package.json @@ -11,7 +11,7 @@ "dependencies": { "@arco-design/web-react": "2.46.1", "@visactor/vchart": "1.3.0", - "@visactor/vutils": "~0.18.14", + "@visactor/vutils": "~0.18.15", "@visactor/vgrammar": "~0.5.7", "@visactor/vrender": "workspace:0.20.1", "markdown-it": "^13.0.0", diff --git a/packages/react-vrender-utils/package.json b/packages/react-vrender-utils/package.json index 4ce8537bb..81561e60b 100644 --- a/packages/react-vrender-utils/package.json +++ b/packages/react-vrender-utils/package.json @@ -26,7 +26,7 @@ "dependencies": { "@visactor/vrender": "workspace:0.20.1", "@visactor/react-vrender": "workspace:0.20.1", - "@visactor/vutils": "~0.18.14", + "@visactor/vutils": "~0.18.15", "react-reconciler": "^0.29.0", "tslib": "^2.3.1" }, diff --git a/packages/react-vrender/package.json b/packages/react-vrender/package.json index f4a6fe504..c3862646d 100644 --- a/packages/react-vrender/package.json +++ b/packages/react-vrender/package.json @@ -24,7 +24,7 @@ }, "dependencies": { "@visactor/vrender": "workspace:0.20.1", - "@visactor/vutils": "~0.18.14", + "@visactor/vutils": "~0.18.15", "react-reconciler": "^0.29.0", "tslib": "^2.3.1" }, diff --git a/packages/vrender-components/package.json b/packages/vrender-components/package.json index 7d5218cb2..71556a6c8 100644 --- a/packages/vrender-components/package.json +++ b/packages/vrender-components/package.json @@ -24,17 +24,17 @@ "analysis-core": "cross-env DEBUG='Bundler*' bundle -f umd -a -i core.ts" }, "dependencies": { + "@visactor/vutils": "~0.18.15", + "@visactor/vscale": "~0.18.15", "@visactor/vrender-core": "workspace:0.20.1", - "@visactor/vrender-kits": "workspace:0.20.1", - "@visactor/vutils": "~0.18.14", - "@visactor/vscale": "~0.18.14" + "@visactor/vrender-kits": "workspace:0.20.1" }, "devDependencies": { "@internal/bundler": "workspace:*", "@internal/eslint-config": "workspace:*", "@internal/ts-config": "workspace:*", "@rushstack/eslint-patch": "~1.1.4", - "@visactor/vscale": "~0.18.14", + "@visactor/vscale": "~0.18.15", "@types/jest": "^26.0.0", "jest": "^26.0.0", "jest-electron": "^0.1.12", diff --git a/packages/vrender-core/package.json b/packages/vrender-core/package.json index 2cd59dc7e..0cc3fd7cd 100644 --- a/packages/vrender-core/package.json +++ b/packages/vrender-core/package.json @@ -29,7 +29,7 @@ }, "dependencies": { "color-convert": "2.0.1", - "@visactor/vutils": "~0.18.14" + "@visactor/vutils": "~0.18.15" }, "devDependencies": { "@internal/bundler": "workspace:*", diff --git a/packages/vrender-core/src/animate/animate.ts b/packages/vrender-core/src/animate/animate.ts index da51e000d..84d42484c 100644 --- a/packages/vrender-core/src/animate/animate.ts +++ b/packages/vrender-core/src/animate/animate.ts @@ -192,8 +192,13 @@ export class Animate implements IAnimate { declare _onRemove?: (() => void)[]; declare _preventAttrs?: Set; static interpolateMap: Map = new Map(); + slience?: boolean; - constructor(id: string | number = Generator.GenAutoIncrementId(), timeline: ITimeline = defaultTimeline) { + constructor( + id: string | number = Generator.GenAutoIncrementId(), + timeline: ITimeline = defaultTimeline, + slience?: boolean + ) { this.id = id; this.timeline = timeline; this.status = AnimateStatus.INITIAL; @@ -204,6 +209,7 @@ export class Animate implements IAnimate { this._startTime = 0; this._duringTime = 0; this.timeline.addAnimate(this); + this.slience = slience; } setTimeline(timeline: ITimeline) { @@ -420,7 +426,7 @@ export class Animate implements IAnimate { bind(target: IAnimateTarget) { this.target = target; - if (this.target.onAnimateBind) { + if (this.target.onAnimateBind && !this.slience) { this.target.onAnimateBind(this); } diff --git a/packages/vrender-core/src/graphic/graphic.ts b/packages/vrender-core/src/graphic/graphic.ts index 68fe74bfd..425babd26 100644 --- a/packages/vrender-core/src/graphic/graphic.ts +++ b/packages/vrender-core/src/graphic/graphic.ts @@ -755,7 +755,9 @@ export abstract class Graphic = Partial = Partial void; onFrame?: (step: IStep, ratio: number) => void; diff --git a/packages/vrender-kits/package.json b/packages/vrender-kits/package.json index 7cd1c74b7..1fee65c12 100644 --- a/packages/vrender-kits/package.json +++ b/packages/vrender-kits/package.json @@ -20,8 +20,8 @@ "test": "" }, "dependencies": { + "@visactor/vutils": "~0.18.15", "@visactor/vrender-core": "workspace:0.20.1", - "@visactor/vutils": "~0.18.14", "@resvg/resvg-js": "2.4.1", "roughjs": "4.5.2" }, diff --git a/packages/vrender/package.json b/packages/vrender/package.json index 7ec09170f..e9dfc58bd 100644 --- a/packages/vrender/package.json +++ b/packages/vrender/package.json @@ -32,7 +32,7 @@ "@internal/eslint-config": "workspace:*", "@internal/ts-config": "workspace:*", "@rushstack/eslint-patch": "~1.1.4", - "@visactor/vutils": "~0.18.14", + "@visactor/vutils": "~0.18.15", "canvas": "2.11.2", "react": "^18.0.0", "react-dom": "^18.0.0",