From 897add4bf730fe791b91f0d62dd09fb5414b6ffe Mon Sep 17 00:00:00 2001 From: fangsmile <892739385@qq.com> Date: Tue, 4 Nov 2025 17:38:19 +0800 Subject: [PATCH 1/6] refactor: resolve roughjs error #1975 --- packages/vrender-kits/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vrender-kits/package.json b/packages/vrender-kits/package.json index 0d3313519..a4859384b 100644 --- a/packages/vrender-kits/package.json +++ b/packages/vrender-kits/package.json @@ -23,7 +23,7 @@ "@visactor/vutils": "~1.0.12", "@visactor/vrender-core": "workspace:1.0.24", "@resvg/resvg-js": "2.4.1", - "roughjs": "4.5.2", + "roughjs": "4.6.6", "gifuct-js": "2.1.2", "lottie-web": "^5.12.2" }, From a3200e3579eda8e9823dc78e1f28ac3b87315d90 Mon Sep 17 00:00:00 2001 From: fangsmile <892739385@qq.com> Date: Tue, 4 Nov 2025 17:42:05 +0800 Subject: [PATCH 2/6] refactor: resolve roughjs error #1975 --- common/config/rush/pnpm-lock.yaml | 95 ++++++------------------------- 1 file changed, 17 insertions(+), 78 deletions(-) diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index f005b945d..8504483a3 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -482,8 +482,8 @@ importers: specifier: ^5.12.2 version: 5.12.2 roughjs: - specifier: 4.5.2 - version: 4.5.2 + specifier: 4.6.6 + version: 4.6.6 devDependencies: '@internal/bundler': specifier: workspace:* @@ -3969,6 +3969,9 @@ packages: resolution: {integrity: sha512-hm6N8nrm3Y08jXie48jsC55eCZz9mnb4OirAStEk2deqeyhXU3C1otDVh+ccttMuc1sBi6RX6ZJ720hs9RCvgw==} engines: {node: '>= 0.10'} + hachure-fill@0.5.2: + resolution: {integrity: sha512-3GKBOn+m2LX9iq+JC1064cSFprJY4jL1jCXTcpnfER5HYE2l/4EfWSGzkPa/ZDBmYI0ZOEj5VHV/eKnPGkHuOg==} + har-schema@2.0.0: resolution: {integrity: sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==} engines: {node: '>=4'} @@ -5887,8 +5890,8 @@ packages: engines: {node: '>=14.18.0', npm: '>=8.0.0'} hasBin: true - roughjs@4.5.2: - resolution: {integrity: sha512-2xSlLDKdsWyFxrveYWk9YQ/Y9UfK38EAMRNkYkMqYBJvPX8abCa9PN0x3w02H8Oa6/0bcZICJU+U95VumPqseg==} + roughjs@4.6.6: + resolution: {integrity: sha512-ZUz/69+SYpFN/g/lUlo2FXcIjRkSu3nDarreVdGGndHEBJ6cXPdKguS8JGxwj5HA5xIbVKSmLgr5b3AWxtRfvQ==} rsvp@4.8.5: resolution: {integrity: sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==} @@ -7961,7 +7964,7 @@ snapshots: jest-resolve: 26.6.2 jest-resolve-dependencies: 26.6.3 jest-runner: 26.6.3(ts-node@10.9.0(@types/node@22.13.17)(typescript@4.9.5)) - jest-runtime: 26.6.3(ts-node@10.9.0(@types/node@22.13.17)(typescript@4.9.5)) + jest-runtime: 26.6.3(canvas@2.11.2)(ts-node@10.9.0(@types/node@22.13.17)(typescript@4.9.5)) jest-snapshot: 26.6.2 jest-util: 26.6.2 jest-validate: 26.6.2 @@ -8100,7 +8103,7 @@ snapshots: graceful-fs: 4.2.11 jest-haste-map: 26.6.2 jest-runner: 26.6.3(ts-node@10.9.0(@types/node@22.13.17)(typescript@4.9.5)) - jest-runtime: 26.6.3(ts-node@10.9.0(@types/node@22.13.17)(typescript@4.9.5)) + jest-runtime: 26.6.3(canvas@2.11.2)(ts-node@10.9.0(@types/node@22.13.17)(typescript@4.9.5)) transitivePeerDependencies: - bufferutil - canvas @@ -10977,6 +10980,8 @@ snapshots: dependencies: glogg: 1.0.2 + hachure-fill@0.5.2: {} + har-schema@2.0.0: {} har-validator@5.1.5: @@ -11513,7 +11518,7 @@ snapshots: jest-environment-jsdom: 26.6.2(canvas@2.11.2) jest-environment-node: 26.6.2 jest-get-type: 26.3.0 - jest-jasmine2: 26.6.3(canvas@2.11.2)(ts-node@10.9.0(@types/node@22.13.17)(typescript@4.9.5)) + jest-jasmine2: 26.6.3 jest-regex-util: 26.0.0 jest-resolve: 26.6.2 jest-util: 26.6.2 @@ -11541,7 +11546,7 @@ snapshots: jest-environment-jsdom: 26.6.2(canvas@2.11.2) jest-environment-node: 26.6.2 jest-get-type: 26.3.0 - jest-jasmine2: 26.6.3(ts-node@10.9.0(@types/node@22.13.17)(typescript@4.9.5)) + jest-jasmine2: 26.6.3 jest-regex-util: 26.0.0 jest-resolve: 26.6.2 jest-util: 26.6.2 @@ -11746,7 +11751,7 @@ snapshots: transitivePeerDependencies: - supports-color - jest-jasmine2@26.6.3(canvas@2.11.2)(ts-node@10.9.0(@types/node@22.13.17)(typescript@4.9.5)): + jest-jasmine2@26.6.3: dependencies: '@babel/traverse': 7.27.0 '@jest/environment': 26.6.2 @@ -11767,38 +11772,7 @@ snapshots: pretty-format: 26.6.2 throat: 5.0.0 transitivePeerDependencies: - - bufferutil - - canvas - supports-color - - ts-node - - utf-8-validate - - jest-jasmine2@26.6.3(ts-node@10.9.0(@types/node@22.13.17)(typescript@4.9.5)): - dependencies: - '@babel/traverse': 7.27.0 - '@jest/environment': 26.6.2 - '@jest/source-map': 26.6.2 - '@jest/test-result': 26.6.2 - '@jest/types': 26.6.2 - '@types/node': 22.13.17 - chalk: 4.1.2 - co: 4.6.0 - expect: 26.6.2 - is-generator-fn: 2.1.0 - jest-each: 26.6.2 - jest-matcher-utils: 26.6.2 - jest-message-util: 26.6.2 - jest-runtime: 26.6.3(ts-node@10.9.0(@types/node@22.13.17)(typescript@4.9.5)) - jest-snapshot: 26.6.2 - jest-util: 26.6.2 - pretty-format: 26.6.2 - throat: 5.0.0 - transitivePeerDependencies: - - bufferutil - - canvas - - supports-color - - ts-node - - utf-8-validate jest-leak-detector@24.9.0: dependencies: @@ -11970,7 +11944,7 @@ snapshots: jest-leak-detector: 26.6.2 jest-message-util: 26.6.2 jest-resolve: 26.6.2 - jest-runtime: 26.6.3(ts-node@10.9.0(@types/node@22.13.17)(typescript@4.9.5)) + jest-runtime: 26.6.3(canvas@2.11.2)(ts-node@10.9.0(@types/node@22.13.17)(typescript@4.9.5)) jest-util: 26.6.2 jest-worker: 26.6.2 source-map-support: 0.5.21 @@ -12046,42 +12020,6 @@ snapshots: - ts-node - utf-8-validate - jest-runtime@26.6.3(ts-node@10.9.0(@types/node@22.13.17)(typescript@4.9.5)): - dependencies: - '@jest/console': 26.6.2 - '@jest/environment': 26.6.2 - '@jest/fake-timers': 26.6.2 - '@jest/globals': 26.6.2 - '@jest/source-map': 26.6.2 - '@jest/test-result': 26.6.2 - '@jest/transform': 26.6.2 - '@jest/types': 26.6.2 - '@types/yargs': 15.0.19 - chalk: 4.1.2 - cjs-module-lexer: 0.6.0 - collect-v8-coverage: 1.0.2 - exit: 0.1.2 - glob: 7.2.3 - graceful-fs: 4.2.11 - jest-config: 26.6.3(ts-node@10.9.0(@types/node@22.13.17)(typescript@4.9.5)) - jest-haste-map: 26.6.2 - jest-message-util: 26.6.2 - jest-mock: 26.6.2 - jest-regex-util: 26.0.0 - jest-resolve: 26.6.2 - jest-snapshot: 26.6.2 - jest-util: 26.6.2 - jest-validate: 26.6.2 - slash: 3.0.0 - strip-bom: 4.0.0 - yargs: 15.4.1 - transitivePeerDependencies: - - bufferutil - - canvas - - supports-color - - ts-node - - utf-8-validate - jest-serializer@24.9.0: {} jest-serializer@26.6.2: @@ -13536,8 +13474,9 @@ snapshots: optionalDependencies: fsevents: 2.3.3 - roughjs@4.5.2: + roughjs@4.6.6: dependencies: + hachure-fill: 0.5.2 path-data-parser: 0.1.0 points-on-curve: 0.2.0 points-on-path: 0.2.1 From d0f5d882fa8cf8ca11c465392f21a3874e304c81 Mon Sep 17 00:00:00 2001 From: fangsmile <892739385@qq.com> Date: Tue, 4 Nov 2025 17:43:01 +0800 Subject: [PATCH 3/6] docs: update changlog of rush --- ...75-bug-roughjs-vite-conflict_2025-11-04-09-43.json | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 common/changes/@visactor/vrender-kits/1975-bug-roughjs-vite-conflict_2025-11-04-09-43.json diff --git a/common/changes/@visactor/vrender-kits/1975-bug-roughjs-vite-conflict_2025-11-04-09-43.json b/common/changes/@visactor/vrender-kits/1975-bug-roughjs-vite-conflict_2025-11-04-09-43.json new file mode 100644 index 000000000..1bbe9abde --- /dev/null +++ b/common/changes/@visactor/vrender-kits/1975-bug-roughjs-vite-conflict_2025-11-04-09-43.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "refactor: resolve roughjs error #1975\n\n", + "type": "none", + "packageName": "@visactor/vrender-kits" + } + ], + "packageName": "@visactor/vrender-kits", + "email": "892739385@qq.com" +} \ No newline at end of file From 5cb8b8cf21af66ffda262cfdedf3fee306ab0e92 Mon Sep 17 00:00:00 2001 From: "lixuefei.1313" Date: Tue, 11 Nov 2025 16:53:03 +0800 Subject: [PATCH 4/6] feat: support filterBeforeOverlap in label --- packages/vrender-components/src/label/base.ts | 22 +++++++++++++--- packages/vrender-components/src/label/type.ts | 25 +++++++++++++++++++ 2 files changed, 43 insertions(+), 4 deletions(-) diff --git a/packages/vrender-components/src/label/base.ts b/packages/vrender-components/src/label/base.ts index c8240ffac..383c2d8d5 100644 --- a/packages/vrender-components/src/label/base.ts +++ b/packages/vrender-components/src/label/base.ts @@ -29,7 +29,8 @@ import { isNil, isArray, isObject, - pointInRect + pointInRect, + isBoolean } from '@visactor/vutils'; import type { PointLocationCfg } from '../core/type'; import { labelSmartInvert, contrastAccessibilityChecker, smartInvertStrategy } from '../util/label-smartInvert'; @@ -212,17 +213,30 @@ export class LabelBase extends AnimateComponent { labels = this._layout(labels); } + const filteredLabels: (IText | IRichText)[] = []; + const overlapLabels: (IText | IRichText)[] = labels; + if (!isBoolean(overlap) && isFunction(overlap.filterBeforeOverlap)) { + const getRelatedGraphic = this.getRelatedGraphic.bind(this); + labels.forEach(label => { + if (overlap.filterBeforeOverlap(label, getRelatedGraphic, this)) { + overlapLabels.push(label); + } else { + filteredLabels.push(label); + } + }); + } + if (isFunction(customOverlapFunc)) { labels = customOverlapFunc( - labels as Text[], + overlapLabels as Text[], this.getRelatedGraphic.bind(this), this._isCollectionBase ? (d: LabelItem) => this._idToPoint.get(d.id) : null, this - ); + ).concat(filteredLabels); } else { // 防重叠逻辑 if (overlap !== false) { - labels = this._overlapping(labels); + labels = this._overlapping(overlapLabels).concat(filteredLabels); } } diff --git a/packages/vrender-components/src/label/type.ts b/packages/vrender-components/src/label/type.ts index 9d726993b..65e3ed068 100644 --- a/packages/vrender-components/src/label/type.ts +++ b/packages/vrender-components/src/label/type.ts @@ -152,6 +152,19 @@ export interface BaseLabelAttrs extends IGroupGraphicAttribute { getRelatedPoint: ((data: LabelItem) => IPointLike) | null | undefined, labelComponent: IGroup ) => void; + + /** + * 防重叠计算前的回调函数 + * 返回true的标签会被计算防重叠 + * 返回false的标签会被直接跳过防重叠计算 + * @since 1.19.16 + */ + filterBeforeOverlap?: ( + label: IText | IRichText, + getRelatedGraphic: (data: LabelItem) => IGraphic, + labelComponent: IGroup + ) => boolean; + /** * 关闭交互效果 * @default false @@ -225,6 +238,18 @@ export interface OverlapAttrs { * @returns number 数值越大，权重越高。权重越高的标签越优先被布局。 */ priority?: (labelItem: LabelItem) => number; + + /** + * 防重叠计算前的回调函数 + * 返回true的标签会被计算防重叠 + * 返回false的标签会被直接跳过防重叠计算 + * @since 1.0.24 + */ + filterBeforeOverlap?: ( + label: IText | IRichText, + getRelatedGraphic: (data: LabelItem) => IGraphic, + labelComponent: IGroup + ) => boolean; } export interface SmartInvertAttrs { From 1d332f800d3a6e3c767eabb4edc8d4a5c5e93775 Mon Sep 17 00:00:00 2001 From: "lixuefei.1313" Date: Tue, 11 Nov 2025 16:55:26 +0800 Subject: [PATCH 5/6] docs: update changlog of rush --- ...filterBeforeOverlap-in-label_2025-11-11-08-55.json | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 common/changes/@visactor/vrender-components/feat-support-filterBeforeOverlap-in-label_2025-11-11-08-55.json diff --git a/common/changes/@visactor/vrender-components/feat-support-filterBeforeOverlap-in-label_2025-11-11-08-55.json b/common/changes/@visactor/vrender-components/feat-support-filterBeforeOverlap-in-label_2025-11-11-08-55.json new file mode 100644 index 000000000..ccf3a0796 --- /dev/null +++ b/common/changes/@visactor/vrender-components/feat-support-filterBeforeOverlap-in-label_2025-11-11-08-55.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "feat: support filterBeforeOverlap in label\n\n", + "type": "none", + "packageName": "@visactor/vrender-components" + } + ], + "packageName": "@visactor/vrender-components", + "email": "lixuef1313@163.com" +} \ No newline at end of file From e6ab94d293ed0a6342f3aac2798d23779861b185 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 17 Nov 2025 06:51:46 +0000 Subject: [PATCH 6/6] build: prelease version 1.0.25 --- ...foreOverlap-in-label_2025-11-11-08-55.json | 11 -- ...oughjs-vite-conflict_2025-11-04-09-43.json | 11 -- common/config/rush/pnpm-lock.yaml | 115 ++++++++++++++---- common/config/rush/version-policies.json | 2 +- docs/package.json | 2 +- packages/react-vrender-utils/CHANGELOG.json | 6 + packages/react-vrender-utils/CHANGELOG.md | 7 +- packages/react-vrender-utils/package.json | 6 +- packages/react-vrender/CHANGELOG.json | 6 + packages/react-vrender/CHANGELOG.md | 7 +- packages/react-vrender/package.json | 4 +- packages/vrender-animate/CHANGELOG.json | 6 + packages/vrender-animate/CHANGELOG.md | 7 +- packages/vrender-animate/package.json | 4 +- packages/vrender-components/CHANGELOG.json | 12 ++ packages/vrender-components/CHANGELOG.md | 11 +- packages/vrender-components/package.json | 8 +- packages/vrender-core/CHANGELOG.json | 6 + packages/vrender-core/CHANGELOG.md | 7 +- packages/vrender-core/package.json | 2 +- packages/vrender-kits/CHANGELOG.json | 12 ++ packages/vrender-kits/CHANGELOG.md | 11 +- packages/vrender-kits/package.json | 4 +- packages/vrender/CHANGELOG.json | 6 + packages/vrender/CHANGELOG.md | 7 +- packages/vrender/package.json | 10 +- tools/bugserver-trigger/package.json | 10 +- 27 files changed, 221 insertions(+), 79 deletions(-) delete mode 100644 common/changes/@visactor/vrender-components/feat-support-filterBeforeOverlap-in-label_2025-11-11-08-55.json delete mode 100644 common/changes/@visactor/vrender-kits/1975-bug-roughjs-vite-conflict_2025-11-04-09-43.json diff --git a/common/changes/@visactor/vrender-components/feat-support-filterBeforeOverlap-in-label_2025-11-11-08-55.json b/common/changes/@visactor/vrender-components/feat-support-filterBeforeOverlap-in-label_2025-11-11-08-55.json deleted file mode 100644 index ccf3a0796..000000000 --- a/common/changes/@visactor/vrender-components/feat-support-filterBeforeOverlap-in-label_2025-11-11-08-55.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "changes": [ - { - "comment": "feat: support filterBeforeOverlap in label\n\n", - "type": "none", - "packageName": "@visactor/vrender-components" - } - ], - "packageName": "@visactor/vrender-components", - "email": "lixuef1313@163.com" -} \ No newline at end of file diff --git a/common/changes/@visactor/vrender-kits/1975-bug-roughjs-vite-conflict_2025-11-04-09-43.json b/common/changes/@visactor/vrender-kits/1975-bug-roughjs-vite-conflict_2025-11-04-09-43.json deleted file mode 100644 index 1bbe9abde..000000000 --- a/common/changes/@visactor/vrender-kits/1975-bug-roughjs-vite-conflict_2025-11-04-09-43.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "changes": [ - { - "comment": "refactor: resolve roughjs error #1975\n\n", - "type": "none", - "packageName": "@visactor/vrender-kits" - } - ], - "packageName": "@visactor/vrender-kits", - "email": "892739385@qq.com" -} \ No newline at end of file diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 8504483a3..cb6f66406 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.24 + specifier: workspace:1.0.25 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.24 + specifier: workspace:1.0.25 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.24 + specifier: workspace:1.0.25 version: link:../react-vrender '@visactor/vrender': - specifier: workspace:1.0.24 + specifier: workspace:1.0.25 version: link:../vrender '@visactor/vutils': specifier: ~1.0.12 @@ -211,16 +211,16 @@ importers: ../../packages/vrender: dependencies: '@visactor/vrender-animate': - specifier: workspace:1.0.24 + specifier: workspace:1.0.25 version: link:../vrender-animate '@visactor/vrender-components': - specifier: workspace:1.0.24 + specifier: workspace:1.0.25 version: link:../vrender-components '@visactor/vrender-core': - specifier: workspace:1.0.24 + specifier: workspace:1.0.25 version: link:../vrender-core '@visactor/vrender-kits': - specifier: workspace:1.0.24 + specifier: workspace:1.0.25 version: link:../vrender-kits devDependencies: '@internal/bundler': @@ -287,7 +287,7 @@ importers: ../../packages/vrender-animate: dependencies: '@visactor/vrender-core': - specifier: workspace:1.0.24 + specifier: workspace:1.0.25 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.24 + specifier: workspace:1.0.25 version: link:../vrender-animate '@visactor/vrender-core': - specifier: workspace:1.0.24 + specifier: workspace:1.0.25 version: link:../vrender-core '@visactor/vrender-kits': - specifier: workspace:1.0.24 + specifier: workspace:1.0.25 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.24 + specifier: workspace:1.0.25 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.24 + specifier: workspace:1.0.25 version: link:../../packages/vrender '@visactor/vrender-animate': - specifier: workspace:1.0.24 + specifier: workspace:1.0.25 version: link:../../packages/vrender-animate '@visactor/vrender-components': - specifier: workspace:1.0.24 + specifier: workspace:1.0.25 version: link:../../packages/vrender-components '@visactor/vrender-core': - specifier: workspace:1.0.24 + specifier: workspace:1.0.25 version: link:../../packages/vrender-core '@visactor/vrender-kits': - specifier: workspace:1.0.24 + specifier: workspace:1.0.25 version: link:../../packages/vrender-kits devDependencies: '@internal/bundler': @@ -7964,7 +7964,7 @@ snapshots: jest-resolve: 26.6.2 jest-resolve-dependencies: 26.6.3 jest-runner: 26.6.3(ts-node@10.9.0(@types/node@22.13.17)(typescript@4.9.5)) - jest-runtime: 26.6.3(canvas@2.11.2)(ts-node@10.9.0(@types/node@22.13.17)(typescript@4.9.5)) + jest-runtime: 26.6.3(ts-node@10.9.0(@types/node@22.13.17)(typescript@4.9.5)) jest-snapshot: 26.6.2 jest-util: 26.6.2 jest-validate: 26.6.2 @@ -8103,7 +8103,7 @@ snapshots: graceful-fs: 4.2.11 jest-haste-map: 26.6.2 jest-runner: 26.6.3(ts-node@10.9.0(@types/node@22.13.17)(typescript@4.9.5)) - jest-runtime: 26.6.3(canvas@2.11.2)(ts-node@10.9.0(@types/node@22.13.17)(typescript@4.9.5)) + jest-runtime: 26.6.3(ts-node@10.9.0(@types/node@22.13.17)(typescript@4.9.5)) transitivePeerDependencies: - bufferutil - canvas @@ -11518,7 +11518,7 @@ snapshots: jest-environment-jsdom: 26.6.2(canvas@2.11.2) jest-environment-node: 26.6.2 jest-get-type: 26.3.0 - jest-jasmine2: 26.6.3 + jest-jasmine2: 26.6.3(canvas@2.11.2)(ts-node@10.9.0(@types/node@22.13.17)(typescript@4.9.5)) jest-regex-util: 26.0.0 jest-resolve: 26.6.2 jest-util: 26.6.2 @@ -11546,7 +11546,7 @@ snapshots: jest-environment-jsdom: 26.6.2(canvas@2.11.2) jest-environment-node: 26.6.2 jest-get-type: 26.3.0 - jest-jasmine2: 26.6.3 + jest-jasmine2: 26.6.3(ts-node@10.9.0(@types/node@22.13.17)(typescript@4.9.5)) jest-regex-util: 26.0.0 jest-resolve: 26.6.2 jest-util: 26.6.2 @@ -11751,7 +11751,7 @@ snapshots: transitivePeerDependencies: - supports-color - jest-jasmine2@26.6.3: + jest-jasmine2@26.6.3(canvas@2.11.2)(ts-node@10.9.0(@types/node@22.13.17)(typescript@4.9.5)): dependencies: '@babel/traverse': 7.27.0 '@jest/environment': 26.6.2 @@ -11772,7 +11772,38 @@ snapshots: pretty-format: 26.6.2 throat: 5.0.0 transitivePeerDependencies: + - bufferutil + - canvas + - supports-color + - ts-node + - utf-8-validate + + jest-jasmine2@26.6.3(ts-node@10.9.0(@types/node@22.13.17)(typescript@4.9.5)): + dependencies: + '@babel/traverse': 7.27.0 + '@jest/environment': 26.6.2 + '@jest/source-map': 26.6.2 + '@jest/test-result': 26.6.2 + '@jest/types': 26.6.2 + '@types/node': 22.13.17 + chalk: 4.1.2 + co: 4.6.0 + expect: 26.6.2 + is-generator-fn: 2.1.0 + jest-each: 26.6.2 + jest-matcher-utils: 26.6.2 + jest-message-util: 26.6.2 + jest-runtime: 26.6.3(ts-node@10.9.0(@types/node@22.13.17)(typescript@4.9.5)) + jest-snapshot: 26.6.2 + jest-util: 26.6.2 + pretty-format: 26.6.2 + throat: 5.0.0 + transitivePeerDependencies: + - bufferutil + - canvas - supports-color + - ts-node + - utf-8-validate jest-leak-detector@24.9.0: dependencies: @@ -11944,7 +11975,7 @@ snapshots: jest-leak-detector: 26.6.2 jest-message-util: 26.6.2 jest-resolve: 26.6.2 - jest-runtime: 26.6.3(canvas@2.11.2)(ts-node@10.9.0(@types/node@22.13.17)(typescript@4.9.5)) + jest-runtime: 26.6.3(ts-node@10.9.0(@types/node@22.13.17)(typescript@4.9.5)) jest-util: 26.6.2 jest-worker: 26.6.2 source-map-support: 0.5.21 @@ -12020,6 +12051,42 @@ snapshots: - ts-node - utf-8-validate + jest-runtime@26.6.3(ts-node@10.9.0(@types/node@22.13.17)(typescript@4.9.5)): + dependencies: + '@jest/console': 26.6.2 + '@jest/environment': 26.6.2 + '@jest/fake-timers': 26.6.2 + '@jest/globals': 26.6.2 + '@jest/source-map': 26.6.2 + '@jest/test-result': 26.6.2 + '@jest/transform': 26.6.2 + '@jest/types': 26.6.2 + '@types/yargs': 15.0.19 + chalk: 4.1.2 + cjs-module-lexer: 0.6.0 + collect-v8-coverage: 1.0.2 + exit: 0.1.2 + glob: 7.2.3 + graceful-fs: 4.2.11 + jest-config: 26.6.3(ts-node@10.9.0(@types/node@22.13.17)(typescript@4.9.5)) + jest-haste-map: 26.6.2 + jest-message-util: 26.6.2 + jest-mock: 26.6.2 + jest-regex-util: 26.0.0 + jest-resolve: 26.6.2 + jest-snapshot: 26.6.2 + jest-util: 26.6.2 + jest-validate: 26.6.2 + slash: 3.0.0 + strip-bom: 4.0.0 + yargs: 15.4.1 + transitivePeerDependencies: + - bufferutil + - canvas + - supports-color + - ts-node + - utf-8-validate + jest-serializer@24.9.0: {} jest-serializer@26.6.2: diff --git a/common/config/rush/version-policies.json b/common/config/rush/version-policies.json index c48c96475..51faec899 100644 --- a/common/config/rush/version-policies.json +++ b/common/config/rush/version-policies.json @@ -1 +1 @@ -[{"definitionName":"lockStepVersion","policyName":"vrenderMain","version":"1.0.24","nextBump":"patch"}] +[{"definitionName":"lockStepVersion","policyName":"vrenderMain","version":"1.0.25","nextBump":"patch"}] diff --git a/docs/package.json b/docs/package.json index 86992e790..ffa68357d 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.24", + "@visactor/vrender": "workspace:1.0.25", "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 9af047ee8..94c173f48 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.25", + "tag": "@visactor/react-vrender-utils_v1.0.25", + "date": "Mon, 17 Nov 2025 06:46:18 GMT", + "comments": {} + }, { "version": "1.0.24", "tag": "@visactor/react-vrender-utils_v1.0.24", diff --git a/packages/react-vrender-utils/CHANGELOG.md b/packages/react-vrender-utils/CHANGELOG.md index a13adbbab..a1ba998ad 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 Mon, 03 Nov 2025 03:43:32 GMT and should not be manually modified. +This log was last generated on Mon, 17 Nov 2025 06:46:18 GMT and should not be manually modified. + +## 1.0.25 +Mon, 17 Nov 2025 06:46:18 GMT + +_Version update only_ ## 1.0.24 Mon, 03 Nov 2025 03:43:32 GMT diff --git a/packages/react-vrender-utils/package.json b/packages/react-vrender-utils/package.json index dab66f74e..e4a29b6e0 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.24", + "version": "1.0.25", "description": "", "sideEffects": false, "main": "cjs/index.js", @@ -24,8 +24,8 @@ "react-dom": "^18.2.0" }, "dependencies": { - "@visactor/vrender": "workspace:1.0.24", - "@visactor/react-vrender": "workspace:1.0.24", + "@visactor/vrender": "workspace:1.0.25", + "@visactor/react-vrender": "workspace:1.0.25", "@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 e1ecb9e57..7e624eb60 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.25", + "tag": "@visactor/react-vrender_v1.0.25", + "date": "Mon, 17 Nov 2025 06:46:18 GMT", + "comments": {} + }, { "version": "1.0.24", "tag": "@visactor/react-vrender_v1.0.24", diff --git a/packages/react-vrender/CHANGELOG.md b/packages/react-vrender/CHANGELOG.md index bac284f16..e8a1756e5 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 Mon, 03 Nov 2025 03:43:32 GMT and should not be manually modified. +This log was last generated on Mon, 17 Nov 2025 06:46:18 GMT and should not be manually modified. + +## 1.0.25 +Mon, 17 Nov 2025 06:46:18 GMT + +_Version update only_ ## 1.0.24 Mon, 03 Nov 2025 03:43:32 GMT diff --git a/packages/react-vrender/package.json b/packages/react-vrender/package.json index 2e1165f25..4b36bfcd0 100644 --- a/packages/react-vrender/package.json +++ b/packages/react-vrender/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/react-vrender", - "version": "1.0.24", + "version": "1.0.25", "description": "", "sideEffects": false, "main": "cjs/index.js", @@ -23,7 +23,7 @@ "react": "^18.2.0" }, "dependencies": { - "@visactor/vrender": "workspace:1.0.24", + "@visactor/vrender": "workspace:1.0.25", "@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 4d43743bf..c21dd7809 100644 --- a/packages/vrender-animate/CHANGELOG.json +++ b/packages/vrender-animate/CHANGELOG.json @@ -1,6 +1,12 @@ { "name": "@visactor/vrender-animate", "entries": [ + { + "version": "1.0.25", + "tag": "@visactor/vrender-animate_v1.0.25", + "date": "Mon, 17 Nov 2025 06:46:18 GMT", + "comments": {} + }, { "version": "1.0.24", "tag": "@visactor/vrender-animate_v1.0.24", diff --git a/packages/vrender-animate/CHANGELOG.md b/packages/vrender-animate/CHANGELOG.md index e9cb4821b..3121202ae 100644 --- a/packages/vrender-animate/CHANGELOG.md +++ b/packages/vrender-animate/CHANGELOG.md @@ -1,6 +1,11 @@ # Change Log - @visactor/vrender-animate -This log was last generated on Mon, 03 Nov 2025 03:43:32 GMT and should not be manually modified. +This log was last generated on Mon, 17 Nov 2025 06:46:18 GMT and should not be manually modified. + +## 1.0.25 +Mon, 17 Nov 2025 06:46:18 GMT + +_Version update only_ ## 1.0.24 Mon, 03 Nov 2025 03:43:32 GMT diff --git a/packages/vrender-animate/package.json b/packages/vrender-animate/package.json index ef3c79ef7..f0c138079 100644 --- a/packages/vrender-animate/package.json +++ b/packages/vrender-animate/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vrender-animate", - "version": "1.0.24", + "version": "1.0.25", "description": "", "sideEffects": false, "main": "cjs/index.js", @@ -21,7 +21,7 @@ }, "dependencies": { "@visactor/vutils": "~1.0.12", - "@visactor/vrender-core": "workspace:1.0.24" + "@visactor/vrender-core": "workspace:1.0.25" }, "devDependencies": { "@internal/bundler": "workspace:*", diff --git a/packages/vrender-components/CHANGELOG.json b/packages/vrender-components/CHANGELOG.json index 66fa657ca..6aec5715b 100644 --- a/packages/vrender-components/CHANGELOG.json +++ b/packages/vrender-components/CHANGELOG.json @@ -1,6 +1,18 @@ { "name": "@visactor/vrender-components", "entries": [ + { + "version": "1.0.25", + "tag": "@visactor/vrender-components_v1.0.25", + "date": "Mon, 17 Nov 2025 06:46:18 GMT", + "comments": { + "none": [ + { + "comment": "feat: support filterBeforeOverlap in label\n\n" + } + ] + } + }, { "version": "1.0.24", "tag": "@visactor/vrender-components_v1.0.24", diff --git a/packages/vrender-components/CHANGELOG.md b/packages/vrender-components/CHANGELOG.md index e2ad065c8..57a4221aa 100644 --- a/packages/vrender-components/CHANGELOG.md +++ b/packages/vrender-components/CHANGELOG.md @@ -1,6 +1,15 @@ # Change Log - @visactor/vrender-components -This log was last generated on Mon, 03 Nov 2025 03:43:32 GMT and should not be manually modified. +This log was last generated on Mon, 17 Nov 2025 06:46:18 GMT and should not be manually modified. + +## 1.0.25 +Mon, 17 Nov 2025 06:46:18 GMT + +### Updates + +- feat: support filterBeforeOverlap in label + + ## 1.0.24 Mon, 03 Nov 2025 03:43:32 GMT diff --git a/packages/vrender-components/package.json b/packages/vrender-components/package.json index 9a387b109..58b64f0a4 100644 --- a/packages/vrender-components/package.json +++ b/packages/vrender-components/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vrender-components", - "version": "1.0.24", + "version": "1.0.25", "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.24", - "@visactor/vrender-kits": "workspace:1.0.24", - "@visactor/vrender-animate": "workspace:1.0.24" + "@visactor/vrender-core": "workspace:1.0.25", + "@visactor/vrender-kits": "workspace:1.0.25", + "@visactor/vrender-animate": "workspace:1.0.25" }, "devDependencies": { "@internal/bundler": "workspace:*", diff --git a/packages/vrender-core/CHANGELOG.json b/packages/vrender-core/CHANGELOG.json index eef96cf87..f32cc33e0 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.25", + "tag": "@visactor/vrender-core_v1.0.25", + "date": "Mon, 17 Nov 2025 06:46:18 GMT", + "comments": {} + }, { "version": "1.0.24", "tag": "@visactor/vrender-core_v1.0.24", diff --git a/packages/vrender-core/CHANGELOG.md b/packages/vrender-core/CHANGELOG.md index 02104c189..bfeae12d6 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 Mon, 03 Nov 2025 03:43:32 GMT and should not be manually modified. +This log was last generated on Mon, 17 Nov 2025 06:46:18 GMT and should not be manually modified. + +## 1.0.25 +Mon, 17 Nov 2025 06:46:18 GMT + +_Version update only_ ## 1.0.24 Mon, 03 Nov 2025 03:43:32 GMT diff --git a/packages/vrender-core/package.json b/packages/vrender-core/package.json index b4760fd71..51dc6d2c3 100644 --- a/packages/vrender-core/package.json +++ b/packages/vrender-core/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vrender-core", - "version": "1.0.24", + "version": "1.0.25", "description": "", "sideEffects": [ "./src/modules.ts", diff --git a/packages/vrender-kits/CHANGELOG.json b/packages/vrender-kits/CHANGELOG.json index 0557ff866..7607d18a1 100644 --- a/packages/vrender-kits/CHANGELOG.json +++ b/packages/vrender-kits/CHANGELOG.json @@ -1,6 +1,18 @@ { "name": "@visactor/vrender-kits", "entries": [ + { + "version": "1.0.25", + "tag": "@visactor/vrender-kits_v1.0.25", + "date": "Mon, 17 Nov 2025 06:46:18 GMT", + "comments": { + "none": [ + { + "comment": "refactor: resolve roughjs error #1975\n\n" + } + ] + } + }, { "version": "1.0.24", "tag": "@visactor/vrender-kits_v1.0.24", diff --git a/packages/vrender-kits/CHANGELOG.md b/packages/vrender-kits/CHANGELOG.md index 21c399170..3d38c091b 100644 --- a/packages/vrender-kits/CHANGELOG.md +++ b/packages/vrender-kits/CHANGELOG.md @@ -1,6 +1,15 @@ # Change Log - @visactor/vrender-kits -This log was last generated on Mon, 03 Nov 2025 03:43:32 GMT and should not be manually modified. +This log was last generated on Mon, 17 Nov 2025 06:46:18 GMT and should not be manually modified. + +## 1.0.25 +Mon, 17 Nov 2025 06:46:18 GMT + +### Updates + +- refactor: resolve roughjs error #1975 + + ## 1.0.24 Mon, 03 Nov 2025 03:43:32 GMT diff --git a/packages/vrender-kits/package.json b/packages/vrender-kits/package.json index a4859384b..b82510fc9 100644 --- a/packages/vrender-kits/package.json +++ b/packages/vrender-kits/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vrender-kits", - "version": "1.0.24", + "version": "1.0.25", "description": "", "sideEffects": false, "main": "cjs/index.js", @@ -21,7 +21,7 @@ }, "dependencies": { "@visactor/vutils": "~1.0.12", - "@visactor/vrender-core": "workspace:1.0.24", + "@visactor/vrender-core": "workspace:1.0.25", "@resvg/resvg-js": "2.4.1", "roughjs": "4.6.6", "gifuct-js": "2.1.2", diff --git a/packages/vrender/CHANGELOG.json b/packages/vrender/CHANGELOG.json index d5cfb0921..001d6a5c6 100644 --- a/packages/vrender/CHANGELOG.json +++ b/packages/vrender/CHANGELOG.json @@ -1,6 +1,12 @@ { "name": "@visactor/vrender", "entries": [ + { + "version": "1.0.25", + "tag": "@visactor/vrender_v1.0.25", + "date": "Mon, 17 Nov 2025 06:46:18 GMT", + "comments": {} + }, { "version": "1.0.24", "tag": "@visactor/vrender_v1.0.24", diff --git a/packages/vrender/CHANGELOG.md b/packages/vrender/CHANGELOG.md index 3842cb152..c8b69171c 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 Mon, 03 Nov 2025 03:43:32 GMT and should not be manually modified. +This log was last generated on Mon, 17 Nov 2025 06:46:18 GMT and should not be manually modified. + +## 1.0.25 +Mon, 17 Nov 2025 06:46:18 GMT + +_Version update only_ ## 1.0.24 Mon, 03 Nov 2025 03:43:32 GMT diff --git a/packages/vrender/package.json b/packages/vrender/package.json index c11268d63..9f76e3c10 100644 --- a/packages/vrender/package.json +++ b/packages/vrender/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vrender", - "version": "1.0.24", + "version": "1.0.25", "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.24", - "@visactor/vrender-kits": "workspace:1.0.24", - "@visactor/vrender-animate": "workspace:1.0.24", - "@visactor/vrender-components": "workspace:1.0.24" + "@visactor/vrender-core": "workspace:1.0.25", + "@visactor/vrender-kits": "workspace:1.0.25", + "@visactor/vrender-animate": "workspace:1.0.25", + "@visactor/vrender-components": "workspace:1.0.25" }, "devDependencies": { "@internal/bundler": "workspace:*", diff --git a/tools/bugserver-trigger/package.json b/tools/bugserver-trigger/package.json index 53ccd78b4..4ecfc753b 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.24", - "@visactor/vrender-core": "workspace:1.0.24", - "@visactor/vrender-kits": "workspace:1.0.24", - "@visactor/vrender-components": "workspace:1.0.24", - "@visactor/vrender-animate": "workspace:1.0.24" + "@visactor/vrender": "workspace:1.0.25", + "@visactor/vrender-core": "workspace:1.0.25", + "@visactor/vrender-kits": "workspace:1.0.25", + "@visactor/vrender-components": "workspace:1.0.25", + "@visactor/vrender-animate": "workspace:1.0.25" }, "devDependencies": { "@rushstack/eslint-patch": "~1.1.4",