diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 2bdb27d19..cfb180c37 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -14,8 +14,8 @@ importers: '@types/react-dom': ^18.0.0 '@visactor/vchart': 1.3.0 '@visactor/vgrammar': ~0.5.7 - '@visactor/vrender': workspace:0.20.1 - '@visactor/vutils': ~0.18.14 + '@visactor/vrender': workspace:0.20.2 + '@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 @@ -71,8 +71,8 @@ importers: '@types/react': ^18.0.0 '@types/react-dom': ^18.0.0 '@types/react-reconciler': ^0.28.2 - '@visactor/vrender': workspace:0.20.1 - '@visactor/vutils': ~0.18.14 + '@visactor/vrender': workspace:0.20.2 + '@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: @@ -111,9 +111,9 @@ importers: '@rushstack/eslint-patch': ~1.1.4 '@types/react': ^18.0.0 '@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/react-vrender': workspace:0.20.2 + '@visactor/vrender': workspace:0.20.2 + '@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: @@ -153,9 +153,9 @@ importers: '@types/jest': ^26.0.0 '@types/react': ^18.0.0 '@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/vrender-core': workspace:0.20.2 + '@visactor/vrender-kits': workspace:0.20.2 + '@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 @@ -200,10 +200,10 @@ importers: '@internal/ts-config': workspace:* '@rushstack/eslint-patch': ~1.1.4 '@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/vrender-core': workspace:0.20.2 + '@visactor/vrender-kits': workspace:0.20.2 + '@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 @@ -287,8 +287,8 @@ importers: '@types/node-fetch': 2.6.4 '@types/react': ^18.0.0 '@types/react-dom': ^18.0.0 - '@visactor/vrender-core': workspace:0.20.1 - '@visactor/vutils': ~0.18.14 + '@visactor/vrender-core': workspace:0.20.2 + '@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 @@ -369,10 +369,10 @@ importers: '@rushstack/eslint-patch': ~1.1.4 '@types/node': '*' '@types/node-fetch': 2.6.4 - '@visactor/vrender': workspace:0.20.1 - '@visactor/vrender-components': workspace:0.20.1 - '@visactor/vrender-core': workspace:0.20.1 - '@visactor/vrender-kits': workspace:0.20.1 + '@visactor/vrender': workspace:0.20.2 + '@visactor/vrender-components': workspace:0.20.2 + '@visactor/vrender-core': workspace:0.20.2 + '@visactor/vrender-kits': workspace:0.20.2 cross-env: ^7.0.3 eslint: ~8.18.0 form-data: ~4.0.0 @@ -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/common/config/rush/version-policies.json b/common/config/rush/version-policies.json index aec36dc70..40619ac3a 100644 --- a/common/config/rush/version-policies.json +++ b/common/config/rush/version-policies.json @@ -1 +1 @@ -[{"definitionName":"lockStepVersion","policyName":"vrenderMain","version":"0.20.1","nextBump":"patch"}] +[{"definitionName":"lockStepVersion","policyName":"vrenderMain","version":"0.20.2","nextBump":"patch"}] diff --git a/docs/assets/changelog/en/changelog.md b/docs/assets/changelog/en/changelog.md index 2e7666246..0ceef71aa 100644 --- a/docs/assets/changelog/en/changelog.md +++ b/docs/assets/changelog/en/changelog.md @@ -1,3 +1,34 @@ +# v0.20.1 + +2024-09-03 + + +**🆕 New feature** + +- **@visactor/vrender-components**: support position `inside-center` of arc label +- **@visactor/vrender-components**: add necessary APIs to player component +- **@visactor/vrender-components**: support line segments update animation in TagPointsUpdate custom animation + +**🐛 Bug fix** + +- **@visactor/vrender-components**: fix textAlign of label when set different angle +- **@visactor/vrender-components**: indicator stop tooltip interaction. fix@VisActor/VChart[#3123](https://github.com/VisActor/VRender/issues/3123) +- **@visactor/vrender-components**: segment line will cause incorrect label position +- **@visactor/vrender-components**: fix issue with poptip memory while stage is released +- **@visactor/vrender-core**: fix issue with poptip release +- **@visactor/vrender-core**: fix issue with animate zero duration +- **@visactor/vrender-core**: fix textAlign of label when set different angle +- **@visactor/vrender-core**: fix memory leak problem in ResourceLoader +- **@visactor/vrender-core**: fix issue with richtext edit plugin while defucus out of text + +**⚡ Performance optimization** + +- **@visactor/vrender-components**: optimize the performance of label component + + + +[more detail about v0.20.1](https://github.com/VisActor/VRender/releases/tag/v0.20.1) + # v0.20.0 2024-08-16 diff --git a/docs/assets/changelog/zh/changelog.md b/docs/assets/changelog/zh/changelog.md index f3edc9b97..cbe3207b1 100644 --- a/docs/assets/changelog/zh/changelog.md +++ b/docs/assets/changelog/zh/changelog.md @@ -1,3 +1,34 @@ +# v0.20.1 + +2024-09-03 + + +**🆕 新增功能** + +- **@visactor/vrender-components**: support position `inside-center` of arc label +- **@visactor/vrender-components**: add necessary APIs to player component +- **@visactor/vrender-components**: support line segments update animation in TagPointsUpdate custom animation + +**🐛 功能修复** + +- **@visactor/vrender-components**: fix textAlign of label when set different angle +- **@visactor/vrender-components**: indicator stop tooltip interaction. fix@VisActor/VChart[#3123](https://github.com/VisActor/VRender/issues/3123) +- **@visactor/vrender-components**: segment line will cause incorrect label position +- **@visactor/vrender-components**: fix issue with poptip memory while stage is released +- **@visactor/vrender-core**: fix issue with poptip release +- **@visactor/vrender-core**: fix issue with animate zero duration +- **@visactor/vrender-core**: fix textAlign of label when set different angle +- **@visactor/vrender-core**: fix memory leak problem in ResourceLoader +- **@visactor/vrender-core**: fix issue with richtext edit plugin while defucus out of text + +**⚡ 性能优化** + +- **@visactor/vrender-components**: optimize the performance of label component + + + +[更多详情请查看 v0.20.1](https://github.com/VisActor/VRender/releases/tag/v0.20.1) + # v0.20.0 2024-08-16 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..881c719b8 100644 --- a/docs/package.json +++ b/docs/package.json @@ -11,9 +11,9 @@ "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", + "@visactor/vrender": "workspace:0.20.2", "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 837bfd9bb..9de94b50b 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": "0.20.2", + "tag": "@visactor/react-vrender-utils_v0.20.2", + "date": "Wed, 04 Sep 2024 12:52:31 GMT", + "comments": {} + }, { "version": "0.20.1", "tag": "@visactor/react-vrender-utils_v0.20.1", diff --git a/packages/react-vrender-utils/CHANGELOG.md b/packages/react-vrender-utils/CHANGELOG.md index 8a8e07ebe..345b3f790 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 Fri, 30 Aug 2024 09:55:07 GMT and should not be manually modified. +This log was last generated on Wed, 04 Sep 2024 12:52:31 GMT and should not be manually modified. + +## 0.20.2 +Wed, 04 Sep 2024 12:52:31 GMT + +_Version update only_ ## 0.20.1 Fri, 30 Aug 2024 09:55:07 GMT diff --git a/packages/react-vrender-utils/package.json b/packages/react-vrender-utils/package.json index 4ce8537bb..8a47f77a3 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": "0.20.1", + "version": "0.20.2", "description": "", "sideEffects": false, "main": "cjs/index.js", @@ -24,9 +24,9 @@ "react-dom": "^18.2.0" }, "dependencies": { - "@visactor/vrender": "workspace:0.20.1", - "@visactor/react-vrender": "workspace:0.20.1", - "@visactor/vutils": "~0.18.14", + "@visactor/vrender": "workspace:0.20.2", + "@visactor/react-vrender": "workspace:0.20.2", + "@visactor/vutils": "~0.18.15", "react-reconciler": "^0.29.0", "tslib": "^2.3.1" }, diff --git a/packages/react-vrender/CHANGELOG.json b/packages/react-vrender/CHANGELOG.json index fa30294dc..2b741e1b6 100644 --- a/packages/react-vrender/CHANGELOG.json +++ b/packages/react-vrender/CHANGELOG.json @@ -1,6 +1,12 @@ { "name": "@visactor/react-vrender", "entries": [ + { + "version": "0.20.2", + "tag": "@visactor/react-vrender_v0.20.2", + "date": "Wed, 04 Sep 2024 12:52:31 GMT", + "comments": {} + }, { "version": "0.20.1", "tag": "@visactor/react-vrender_v0.20.1", diff --git a/packages/react-vrender/CHANGELOG.md b/packages/react-vrender/CHANGELOG.md index 1664a49fd..92cf0387a 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 Fri, 30 Aug 2024 09:55:07 GMT and should not be manually modified. +This log was last generated on Wed, 04 Sep 2024 12:52:31 GMT and should not be manually modified. + +## 0.20.2 +Wed, 04 Sep 2024 12:52:31 GMT + +_Version update only_ ## 0.20.1 Fri, 30 Aug 2024 09:55:07 GMT diff --git a/packages/react-vrender/package.json b/packages/react-vrender/package.json index f4a6fe504..5e7bf976c 100644 --- a/packages/react-vrender/package.json +++ b/packages/react-vrender/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/react-vrender", - "version": "0.20.1", + "version": "0.20.2", "description": "", "sideEffects": false, "main": "cjs/index.js", @@ -23,8 +23,8 @@ "react": "^18.2.0" }, "dependencies": { - "@visactor/vrender": "workspace:0.20.1", - "@visactor/vutils": "~0.18.14", + "@visactor/vrender": "workspace:0.20.2", + "@visactor/vutils": "~0.18.15", "react-reconciler": "^0.29.0", "tslib": "^2.3.1" }, diff --git a/packages/vrender-components/CHANGELOG.json b/packages/vrender-components/CHANGELOG.json index eea30c3db..e644660d2 100644 --- a/packages/vrender-components/CHANGELOG.json +++ b/packages/vrender-components/CHANGELOG.json @@ -1,6 +1,12 @@ { "name": "@visactor/vrender-components", "entries": [ + { + "version": "0.20.2", + "tag": "@visactor/vrender-components_v0.20.2", + "date": "Wed, 04 Sep 2024 12:52:31 GMT", + "comments": {} + }, { "version": "0.20.1", "tag": "@visactor/vrender-components_v0.20.1", diff --git a/packages/vrender-components/CHANGELOG.md b/packages/vrender-components/CHANGELOG.md index 45dee3a74..c463d94eb 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 Fri, 30 Aug 2024 09:55:07 GMT and should not be manually modified. +This log was last generated on Wed, 04 Sep 2024 12:52:31 GMT and should not be manually modified. + +## 0.20.2 +Wed, 04 Sep 2024 12:52:31 GMT + +_Version update only_ ## 0.20.1 Fri, 30 Aug 2024 09:55:07 GMT diff --git a/packages/vrender-components/package.json b/packages/vrender-components/package.json index 7d5218cb2..cee0616d2 100644 --- a/packages/vrender-components/package.json +++ b/packages/vrender-components/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vrender-components", - "version": "0.20.1", + "version": "0.20.2", "description": "components library for dp visualization", "sideEffects": false, "main": "cjs/index.js", @@ -24,17 +24,17 @@ "analysis-core": "cross-env DEBUG='Bundler*' bundle -f umd -a -i core.ts" }, "dependencies": { - "@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/vutils": "~0.18.15", + "@visactor/vscale": "~0.18.15", + "@visactor/vrender-core": "workspace:0.20.2", + "@visactor/vrender-kits": "workspace:0.20.2" }, "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-components/src/poptip/contribution.ts b/packages/vrender-components/src/poptip/contribution.ts index 92464f011..5c7d1c77f 100644 --- a/packages/vrender-components/src/poptip/contribution.ts +++ b/packages/vrender-components/src/poptip/contribution.ts @@ -80,6 +80,7 @@ export class PopTipRenderContribution implements IInteractiveSubRenderContributi visibleAll: false }); this.poptipComponent.parent?.removeChild(this.poptipComponent); + this.poptipComponent = null; } } } diff --git a/packages/vrender-core/CHANGELOG.json b/packages/vrender-core/CHANGELOG.json index eba8a97f2..1e1a3c08b 100644 --- a/packages/vrender-core/CHANGELOG.json +++ b/packages/vrender-core/CHANGELOG.json @@ -1,6 +1,21 @@ { "name": "@visactor/vrender-core", "entries": [ + { + "version": "0.20.2", + "tag": "@visactor/vrender-core_v0.20.2", + "date": "Wed, 04 Sep 2024 12:52:31 GMT", + "comments": { + "none": [ + { + "comment": "fix: fix error of interpolate when use rgba color\n\n" + }, + { + "comment": "fix: fix bug of label in radarchart triggered by aniamtion\n\n" + } + ] + } + }, { "version": "0.20.1", "tag": "@visactor/vrender-core_v0.20.1", diff --git a/packages/vrender-core/CHANGELOG.md b/packages/vrender-core/CHANGELOG.md index f1da21d63..a2bd915a4 100644 --- a/packages/vrender-core/CHANGELOG.md +++ b/packages/vrender-core/CHANGELOG.md @@ -1,6 +1,18 @@ # Change Log - @visactor/vrender-core -This log was last generated on Fri, 30 Aug 2024 09:55:08 GMT and should not be manually modified. +This log was last generated on Wed, 04 Sep 2024 12:52:31 GMT and should not be manually modified. + +## 0.20.2 +Wed, 04 Sep 2024 12:52:31 GMT + +### Updates + +- fix: fix error of interpolate when use rgba color + + +- fix: fix bug of label in radarchart triggered by aniamtion + + ## 0.20.1 Fri, 30 Aug 2024 09:55:08 GMT diff --git a/packages/vrender-core/package.json b/packages/vrender-core/package.json index 2cd59dc7e..21489f27b 100644 --- a/packages/vrender-core/package.json +++ b/packages/vrender-core/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vrender-core", - "version": "0.20.1", + "version": "0.20.2", "description": "", "sideEffects": [ "./src/modules.ts", @@ -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/color-string/interpolate.ts b/packages/vrender-core/src/color-string/interpolate.ts index 96e26c84e..a1b2c5a87 100644 --- a/packages/vrender-core/src/color-string/interpolate.ts +++ b/packages/vrender-core/src/color-string/interpolate.ts @@ -22,6 +22,7 @@ export function interpolateColor( cb?: (fromArray: [number, number, number, number], toArray: [number, number, number, number]) => void ): false | string | IGradientColor | string[] { if ((Array.isArray(from) && !isNumber(from[0])) || (Array.isArray(to) && !isNumber(to[0]))) { + // 待性能优化 const out: string[] = new Array(4).fill(0).map((_, index) => { return _interpolateColor( isArray(from) ? (from[index] as string) : from, diff --git a/packages/vrender-core/src/core/stage.ts b/packages/vrender-core/src/core/stage.ts index 44cfb7c24..91cb569c3 100644 --- a/packages/vrender-core/src/core/stage.ts +++ b/packages/vrender-core/src/core/stage.ts @@ -936,8 +936,11 @@ export class Stage extends Group implements IStage { }); // 额外删除掉interactiveLayer的节点 if (this.interactiveLayer) { + this.interactiveLayer.forEachChildren((item: IGraphic) => { + item.setStage && item.setStage(null, null); + this.interactiveLayer.removeChild(item); + }); this.interactiveLayer.release(); - this.interactiveLayer.removeAllChild(); } this.window.release(); this.ticker.remTimeline(this.timeline); diff --git a/packages/vrender-core/src/graphic/graphic.ts b/packages/vrender-core/src/graphic/graphic.ts index 68fe74bfd..ab4cffee9 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 = Partial void; onFrame?: (step: IStep, ratio: number) => void; diff --git a/packages/vrender-core/src/plugins/builtin-plugin/edit-module.ts b/packages/vrender-core/src/plugins/builtin-plugin/edit-module.ts index 04b924e80..287f34d4f 100644 --- a/packages/vrender-core/src/plugins/builtin-plugin/edit-module.ts +++ b/packages/vrender-core/src/plugins/builtin-plugin/edit-module.ts @@ -56,7 +56,7 @@ export class EditModule { applyStyle(textAreaDom: HTMLTextAreaElement) { textAreaDom.setAttribute( 'style', - `width: 100px; height: 30px; left: 0; position: absolute; z-index: -1; outline: none; resize: none; border: none; overflow: hidden; color: transparent; user-select: none; caret-color: transparent;background-color: transparent;` + `width: 100px; height: 30px; left: 0; top: 0; position: absolute; z-index: -1; outline: none; resize: none; border: none; overflow: hidden; color: transparent; user-select: none; caret-color: transparent;background-color: transparent;` ); textAreaDom.addEventListener('input', this.handleInput); diff --git a/packages/vrender-kits/CHANGELOG.json b/packages/vrender-kits/CHANGELOG.json index 2d58d6c99..28dec4d3b 100644 --- a/packages/vrender-kits/CHANGELOG.json +++ b/packages/vrender-kits/CHANGELOG.json @@ -1,6 +1,12 @@ { "name": "@visactor/vrender-kits", "entries": [ + { + "version": "0.20.2", + "tag": "@visactor/vrender-kits_v0.20.2", + "date": "Wed, 04 Sep 2024 12:52:31 GMT", + "comments": {} + }, { "version": "0.20.1", "tag": "@visactor/vrender-kits_v0.20.1", diff --git a/packages/vrender-kits/CHANGELOG.md b/packages/vrender-kits/CHANGELOG.md index 4c906c94f..53fdd7a3d 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 Fri, 30 Aug 2024 09:55:08 GMT and should not be manually modified. +This log was last generated on Wed, 04 Sep 2024 12:52:31 GMT and should not be manually modified. + +## 0.20.2 +Wed, 04 Sep 2024 12:52:31 GMT + +_Version update only_ ## 0.20.1 Fri, 30 Aug 2024 09:55:08 GMT diff --git a/packages/vrender-kits/package.json b/packages/vrender-kits/package.json index 7cd1c74b7..734cd8964 100644 --- a/packages/vrender-kits/package.json +++ b/packages/vrender-kits/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vrender-kits", - "version": "0.20.1", + "version": "0.20.2", "description": "", "sideEffects": false, "main": "cjs/index.js", @@ -20,8 +20,8 @@ "test": "" }, "dependencies": { - "@visactor/vrender-core": "workspace:0.20.1", - "@visactor/vutils": "~0.18.14", + "@visactor/vutils": "~0.18.15", + "@visactor/vrender-core": "workspace:0.20.2", "@resvg/resvg-js": "2.4.1", "roughjs": "4.5.2" }, diff --git a/packages/vrender/CHANGELOG.json b/packages/vrender/CHANGELOG.json index f11d119c5..89a70b638 100644 --- a/packages/vrender/CHANGELOG.json +++ b/packages/vrender/CHANGELOG.json @@ -1,6 +1,12 @@ { "name": "@visactor/vrender", "entries": [ + { + "version": "0.20.2", + "tag": "@visactor/vrender_v0.20.2", + "date": "Wed, 04 Sep 2024 12:52:31 GMT", + "comments": {} + }, { "version": "0.20.1", "tag": "@visactor/vrender_v0.20.1", diff --git a/packages/vrender/CHANGELOG.md b/packages/vrender/CHANGELOG.md index a011121fe..f6983b0ae 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 Fri, 30 Aug 2024 09:55:08 GMT and should not be manually modified. +This log was last generated on Wed, 04 Sep 2024 12:52:31 GMT and should not be manually modified. + +## 0.20.2 +Wed, 04 Sep 2024 12:52:31 GMT + +_Version update only_ ## 0.20.1 Fri, 30 Aug 2024 09:55:08 GMT diff --git a/packages/vrender/__tests__/browser/src/pages/text.ts b/packages/vrender/__tests__/browser/src/pages/text.ts index e094c5643..76b0d93a4 100644 --- a/packages/vrender/__tests__/browser/src/pages/text.ts +++ b/packages/vrender/__tests__/browser/src/pages/text.ts @@ -12,9 +12,11 @@ import { createWrapText } from '@visactor/vrender'; import { addShapesToStage, colorPools } from '../utils'; +import { loadPoptip } from '@visactor/vrender-components'; // global.setEnv('browser'); +loadPoptip(); const textStr = '蛋糕吃起来像已经放了很多年似的。那天晚上达力神气活现地在起居室里走来走去，向家人展示他那套新校服。斯梅廷中学的男生制服是棕红色燕尾服，橙色短灯笼裤和一顶叫硬草帽2的扁平草帽。他们还配了一支多节的手杖，趁老师不注意时用来互相打斗，这也许是对未来生活的一种很好的训练吧。弗农姨父看着身穿崭新灯笼裤的达力，他的声音都沙哑了，他说这是他平生感到最自豪的一刻。佩妮姨妈突然哭起来，她说她的宝贝疙瘩已经长大了，长得这么帅，简直让她不能相信。哈利却不敢开口。为了强忍住不笑，他的两条肋骨都快折断了。第二天早上哈利来吃早饭时，发现厨房里有一股难闻的味儿。这气味似乎是从污水池里的一只大铁盆里散发出来的。他去看了一眼，发现一盆灰黑色的水里泡着像破抹布似的东西。「这是什么？」他问佩妮姨妈。她把嘴唇抿紧，每当哈利大胆问问题时，她总是这样。「你的新校服呀。」她说。哈利又朝盆里扫了一眼。「哦，」他说，「我不知道还得泡得这么湿。」「别冒傻气，」佩妮姨妈斥责说，「我把达力的旧衣服染好给你用。等我染好以后，穿起来就会跟别人的一模一样。」哈利对此非常怀疑，但他还是觉得最好不要跟她争论。他坐下来吃早饭时，竭力不去想第一天去石墙中学上学自己会是什么模样，八成像披着大象的旧象皮吧。达力和弗农姨父进来时，都因为哈利那套新校服散发的味道皱起了鼻子。弗农姨父像通常一样打开报纸，达力则把他从不离身的斯梅廷手杖啪的一声放到桌上。他们听到信箱咔哒响了一声，一些信落到大门口的擦脚垫上。「去拿信，达力。」弗农姨父从报纸后边说。「叫哈利去捡。」「哈利去捡。」「达力去捡。」「用你的斯梅廷手杖赶他去捡。」哈利躲闪着斯梅廷手杖，去捡信。擦脚垫上有三样邮件：一封是弗农姨父的姐姐玛姬姑妈寄来的明信片，她现在在怀特岛3度假；另一封是看来像账单的棕色信封；还有一封是寄给哈利的信。哈利把信捡起来，目不转睛地盯着看，心里像有一根很粗的橡皮筋嘣的一声弹了起来，嗡嗡直响。活到现在，从来没有人给他写过信。这封信可能是谁写的呢？他没有朋友，没有另外的亲戚，他没有借书证，因此不会收到图书馆催还图书的通知单。可现在确实有一封信，地址清清楚楚，不会有错：萨里郡小惠金区女贞路４号楼梯下的碗柜哈利波特先生收信封是用厚重的羊皮纸做的，地址是甩翡翠绿的墨水写的。没有贴邮票。哈利用颤抖的手把信封翻转过来，只见上边有一块蜡封、一个盾牌纹章，大写「Ｈ」字母的周围圈着一头狮子、一只鹰、一只獾和一条蛇。「小子，快拿过来！」弗农姨父在厨房里喊起来，「你在干什么，在检查邮包有没有炸弹吗？」他开了个玩笑，自己也咯咯地笑开了。哈利回到厨房里，目光一直盯着他的那封信。他把账单和明信片递给弗农姨父，然后坐下来，慢慢拆开他那个黄色的信封。弗农姨父拆开有账单的信封，厌恶地哼了一声，又把明信片轻轻翻转过来。「玛姬病倒了，」他对佩妮姨妈说，「吃了有问题的油螺……」「老爸！」达力突然说，「老爸，哈利收到什么东西了！」哈利刚要打开他那封写在厚重羊皮纸上的信，信却被弗农姨父一把从手中抢过去了。「那是写给我的！」哈利说，想把信夺回来。「谁会给你写信？」弗农姨父讥讽地说，用一只手把信纸抖开，朝它瞥了一眼。他的脸一下子由红变青，比红绿灯变得还快。事情到这里并没结束。几秒钟之内他的脸就变得像灰色的麦片粥一样灰白了。「佩——佩——佩妮！」他气喘吁吁地说。达力想把信抢过来看，可是弗农姨父把信举得老高，他够不着。佩妮姨妈好奇地把信拿过去，刚看第一行，她就好像要晕倒了。她抓住喉咙，噎了一下，像要背过气去。「德思礼！哎呀！我的天……德思礼！」他们俩你看我，我看你，都不说话，似乎忘了哈利和达力还在屋里。达力是不习惯被人冷落的，他用斯梅廷手杖朝他父亲的头上狠狠地敲了一下。「我要看那封信。」他大声说。「我要看。」哈利气呼呼地说，「因为那封信是写给我的。」「你们俩，统统给我出去。」弗农姨父用低沉而沙哑的声音说，把信重新塞到信封里。哈利没有动。「我要我的信！」他大叫说。「让我看！」达力命令说。「出去！」弗农姨父吼了起来，揪住哈利和达力的脖领，把他们俩扔到了走廊里，砰地一'; @@ -161,7 +163,7 @@ export const page = () => { y: 200, fill: colorPools[5], // text: ['Tffg'], - text: ['这是垂aaa直textabc这aaaaa是什么', '这是阿萨姆abcaaaaa'], + text: 'fkdalfffffffffffffffffjkllllll', wordBreak: 'break-word', maxLineWidth: 200, // ellipsis: '', @@ -207,22 +209,24 @@ export const page = () => { y: 500, fill: colorPools[5], // text: ['Tffg'], - text: ['这是textabc这aaaaa是什么', '这是阿萨姆abcaaaaabcdef', '这是textabc这aaaaa是什么', '这是阿萨姆abcaaaaa'], + text: '这是textabc这aaaaa是什么这是阿萨姆abcaaaaabcdef这是textabc这aaaaa是什么这是阿萨姆abcaaaaa', // text: '这是textabc这aaaaa是什么这是阿萨姆abcaaaaabcdef这是textabc这aaaaa是什么这是阿萨姆abcaaaaa', - heightLimit: 40, + // heightLimit: 40, wordBreak: 'break-word', maxLineWidth: 200, stroke: 'green', textAlign: 'left', - textBaseline: 'middle', - whiteSpace: 'normal' + textBaseline: 'middle' + // whiteSpace: 'normal' // wrap: true }); + console.log('textLimit', textLimit); graphics.push(textLimit); const stage = createStage({ canvas: 'main', - autoRender: true + autoRender: true, + pluginList: ['poptipForText'] }); window.visualViewport.addEventListener('resize', e => { @@ -240,4 +244,9 @@ export const page = () => { btn.addEventListener('click', () => { performance(stage); }); + + setTimeout(() => { + console.log(stage.getLayer('_builtin_interactive').children); + stage.release(); + }, 2000); }; diff --git a/packages/vrender/package.json b/packages/vrender/package.json index 7ec09170f..731f87769 100644 --- a/packages/vrender/package.json +++ b/packages/vrender/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vrender", - "version": "0.20.1", + "version": "0.20.2", "description": "", "sideEffects": true, "main": "cjs/index.js", @@ -24,15 +24,15 @@ "test-watch": "cross-env DEBUG_MODE=1 jest --watch" }, "dependencies": { - "@visactor/vrender-core": "workspace:0.20.1", - "@visactor/vrender-kits": "workspace:0.20.1" + "@visactor/vrender-core": "workspace:0.20.2", + "@visactor/vrender-kits": "workspace:0.20.2" }, "devDependencies": { "@internal/bundler": "workspace:*", "@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", diff --git a/tools/bugserver-trigger/package.json b/tools/bugserver-trigger/package.json index dcaa152e9..afde5793e 100644 --- a/tools/bugserver-trigger/package.json +++ b/tools/bugserver-trigger/package.json @@ -8,10 +8,10 @@ "ci": "ts-node --transpileOnly --skipProject ./scripts/trigger-test.ts" }, "dependencies": { - "@visactor/vrender": "workspace:0.20.1", - "@visactor/vrender-core": "workspace:0.20.1", - "@visactor/vrender-kits": "workspace:0.20.1", - "@visactor/vrender-components": "workspace:0.20.1" + "@visactor/vrender": "workspace:0.20.2", + "@visactor/vrender-core": "workspace:0.20.2", + "@visactor/vrender-kits": "workspace:0.20.2", + "@visactor/vrender-components": "workspace:0.20.2" }, "devDependencies": { "@rushstack/eslint-patch": "~1.1.4",