diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 764e5358a..112cd4551 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.16 + specifier: workspace:1.0.17 version: link:../packages/vrender '@visactor/vutils': specifier: 1.0.6 @@ -95,7 +95,7 @@ importers: ../../packages/react-vrender: dependencies: '@visactor/vrender': - specifier: workspace:1.0.16 + specifier: workspace:1.0.17 version: link:../vrender '@visactor/vutils': specifier: 1.0.6 @@ -153,10 +153,10 @@ importers: ../../packages/react-vrender-utils: dependencies: '@visactor/react-vrender': - specifier: workspace:1.0.16 + specifier: workspace:1.0.17 version: link:../react-vrender '@visactor/vrender': - specifier: workspace:1.0.16 + specifier: workspace:1.0.17 version: link:../vrender '@visactor/vutils': specifier: 1.0.6 @@ -211,13 +211,13 @@ importers: ../../packages/vrender: dependencies: '@visactor/vrender-animate': - specifier: workspace:1.0.16 + specifier: workspace:1.0.17 version: link:../vrender-animate '@visactor/vrender-core': - specifier: workspace:1.0.16 + specifier: workspace:1.0.17 version: link:../vrender-core '@visactor/vrender-kits': - specifier: workspace:1.0.16 + specifier: workspace:1.0.17 version: link:../vrender-kits devDependencies: '@internal/bundler': @@ -284,7 +284,7 @@ importers: ../../packages/vrender-animate: dependencies: '@visactor/vrender-core': - specifier: workspace:1.0.16 + specifier: workspace:1.0.17 version: link:../vrender-core '@visactor/vutils': specifier: 1.0.6 @@ -342,13 +342,13 @@ importers: ../../packages/vrender-components: dependencies: '@visactor/vrender-animate': - specifier: workspace:1.0.16 + specifier: workspace:1.0.17 version: link:../vrender-animate '@visactor/vrender-core': - specifier: workspace:1.0.16 + specifier: workspace:1.0.17 version: link:../vrender-core '@visactor/vrender-kits': - specifier: workspace:1.0.16 + specifier: workspace:1.0.17 version: link:../vrender-kits '@visactor/vscale': specifier: 1.0.6 @@ -467,7 +467,7 @@ importers: specifier: 2.4.1 version: 2.4.1 '@visactor/vrender-core': - specifier: workspace:1.0.16 + specifier: workspace:1.0.17 version: link:../vrender-core '@visactor/vutils': specifier: 1.0.6 @@ -583,19 +583,19 @@ importers: ../../tools/bugserver-trigger: dependencies: '@visactor/vrender': - specifier: workspace:1.0.16 + specifier: workspace:1.0.17 version: link:../../packages/vrender '@visactor/vrender-animate': - specifier: workspace:1.0.16 + specifier: workspace:1.0.17 version: link:../../packages/vrender-animate '@visactor/vrender-components': - specifier: workspace:1.0.16 + specifier: workspace:1.0.17 version: link:../../packages/vrender-components '@visactor/vrender-core': - specifier: workspace:1.0.16 + specifier: workspace:1.0.17 version: link:../../packages/vrender-core '@visactor/vrender-kits': - specifier: workspace:1.0.16 + specifier: workspace:1.0.17 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 6ba2a7432..94b601b91 100644 --- a/common/config/rush/version-policies.json +++ b/common/config/rush/version-policies.json @@ -1 +1 @@ -[{"definitionName":"lockStepVersion","policyName":"vrenderMain","version":"1.0.16","nextBump":"patch"}] +[{"definitionName":"lockStepVersion","policyName":"vrenderMain","version":"1.0.17","nextBump":"patch"}] diff --git a/docs/package.json b/docs/package.json index bd9b5621c..f36ad1a28 100644 --- a/docs/package.json +++ b/docs/package.json @@ -13,7 +13,7 @@ "@visactor/vchart": "1.3.0", "@visactor/vutils": "1.0.6", "@visactor/vgrammar": "~0.5.7", - "@visactor/vrender": "workspace:1.0.16", + "@visactor/vrender": "workspace:1.0.17", "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 011d23615..4688b593a 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.17", + "tag": "@visactor/react-vrender-utils_v1.0.17", + "date": "Wed, 24 Sep 2025 07:38:57 GMT", + "comments": {} + }, { "version": "1.0.16", "tag": "@visactor/react-vrender-utils_v1.0.16", diff --git a/packages/react-vrender-utils/CHANGELOG.md b/packages/react-vrender-utils/CHANGELOG.md index 22e03f23f..bba9c23fe 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, 16 Sep 2025 09:57:05 GMT and should not be manually modified. +This log was last generated on Wed, 24 Sep 2025 07:38:57 GMT and should not be manually modified. + +## 1.0.17 +Wed, 24 Sep 2025 07:38:57 GMT + +_Version update only_ ## 1.0.16 Tue, 16 Sep 2025 09:57:05 GMT diff --git a/packages/react-vrender-utils/package.json b/packages/react-vrender-utils/package.json index e2f5fcad6..83eda08a1 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.16", + "version": "1.0.17", "description": "", "sideEffects": false, "main": "cjs/index.js", @@ -24,8 +24,8 @@ "react-dom": "^18.2.0" }, "dependencies": { - "@visactor/vrender": "workspace:1.0.16", - "@visactor/react-vrender": "workspace:1.0.16", + "@visactor/vrender": "workspace:1.0.17", + "@visactor/react-vrender": "workspace:1.0.17", "@visactor/vutils": "1.0.6", "react-reconciler": "^0.29.0", "tslib": "^2.3.1" diff --git a/packages/react-vrender/CHANGELOG.json b/packages/react-vrender/CHANGELOG.json index 49d7128f6..0f52ed2d3 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.17", + "tag": "@visactor/react-vrender_v1.0.17", + "date": "Wed, 24 Sep 2025 07:38:57 GMT", + "comments": {} + }, { "version": "1.0.16", "tag": "@visactor/react-vrender_v1.0.16", diff --git a/packages/react-vrender/CHANGELOG.md b/packages/react-vrender/CHANGELOG.md index 51aa26317..681f657a3 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, 16 Sep 2025 09:57:05 GMT and should not be manually modified. +This log was last generated on Wed, 24 Sep 2025 07:38:57 GMT and should not be manually modified. + +## 1.0.17 +Wed, 24 Sep 2025 07:38:57 GMT + +_Version update only_ ## 1.0.16 Tue, 16 Sep 2025 09:57:05 GMT diff --git a/packages/react-vrender/package.json b/packages/react-vrender/package.json index e89e478b7..038ec9e3d 100644 --- a/packages/react-vrender/package.json +++ b/packages/react-vrender/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/react-vrender", - "version": "1.0.16", + "version": "1.0.17", "description": "", "sideEffects": false, "main": "cjs/index.js", @@ -23,7 +23,7 @@ "react": "^18.2.0" }, "dependencies": { - "@visactor/vrender": "workspace:1.0.16", + "@visactor/vrender": "workspace:1.0.17", "@visactor/vutils": "1.0.6", "react-reconciler": "^0.29.0", "tslib": "^2.3.1" diff --git a/packages/vrender-animate/CHANGELOG.json b/packages/vrender-animate/CHANGELOG.json index 46837c193..8de284ea4 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.17", + "tag": "@visactor/vrender-animate_v1.0.17", + "date": "Wed, 24 Sep 2025 07:38:57 GMT", + "comments": {} + }, { "version": "1.0.16", "tag": "@visactor/vrender-animate_v1.0.16", diff --git a/packages/vrender-animate/CHANGELOG.md b/packages/vrender-animate/CHANGELOG.md index 7256d97e6..659c73b1d 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 Tue, 16 Sep 2025 09:57:05 GMT and should not be manually modified. +This log was last generated on Wed, 24 Sep 2025 07:38:57 GMT and should not be manually modified. + +## 1.0.17 +Wed, 24 Sep 2025 07:38:57 GMT + +_Version update only_ ## 1.0.16 Tue, 16 Sep 2025 09:57:05 GMT diff --git a/packages/vrender-animate/package.json b/packages/vrender-animate/package.json index 6dbe5131c..5b3c34d87 100644 --- a/packages/vrender-animate/package.json +++ b/packages/vrender-animate/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vrender-animate", - "version": "1.0.16", + "version": "1.0.17", "description": "", "sideEffects": false, "main": "cjs/index.js", @@ -21,7 +21,7 @@ }, "dependencies": { "@visactor/vutils": "1.0.6", - "@visactor/vrender-core": "workspace:1.0.16" + "@visactor/vrender-core": "workspace:1.0.17" }, "devDependencies": { "@internal/bundler": "workspace:*", diff --git a/packages/vrender-components/CHANGELOG.json b/packages/vrender-components/CHANGELOG.json index 19f884260..b6e07c834 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.17", + "tag": "@visactor/vrender-components_v1.0.17", + "date": "Wed, 24 Sep 2025 07:38:57 GMT", + "comments": { + "none": [ + { + "comment": "fix: fix the issue of legend pager\n\n" + } + ] + } + }, { "version": "1.0.16", "tag": "@visactor/vrender-components_v1.0.16", diff --git a/packages/vrender-components/CHANGELOG.md b/packages/vrender-components/CHANGELOG.md index 41582a6a0..a0bd351e7 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 Tue, 16 Sep 2025 09:57:05 GMT and should not be manually modified. +This log was last generated on Wed, 24 Sep 2025 07:38:57 GMT and should not be manually modified. + +## 1.0.17 +Wed, 24 Sep 2025 07:38:57 GMT + +### Updates + +- fix: fix the issue of legend pager + + ## 1.0.16 Tue, 16 Sep 2025 09:57:05 GMT diff --git a/packages/vrender-components/package.json b/packages/vrender-components/package.json index a472d5da2..3ed57a064 100644 --- a/packages/vrender-components/package.json +++ b/packages/vrender-components/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vrender-components", - "version": "1.0.16", + "version": "1.0.17", "description": "components library for dp visualization", "sideEffects": false, "main": "cjs/index.js", @@ -27,9 +27,9 @@ "dependencies": { "@visactor/vutils": "1.0.6", "@visactor/vscale": "1.0.6", - "@visactor/vrender-core": "workspace:1.0.16", - "@visactor/vrender-kits": "workspace:1.0.16", - "@visactor/vrender-animate": "workspace:1.0.16" + "@visactor/vrender-core": "workspace:1.0.17", + "@visactor/vrender-kits": "workspace:1.0.17", + "@visactor/vrender-animate": "workspace:1.0.17" }, "devDependencies": { "@internal/bundler": "workspace:*", diff --git a/packages/vrender-components/src/legend/discrete/discrete.ts b/packages/vrender-components/src/legend/discrete/discrete.ts index c1827a34d..77f4cbe29 100644 --- a/packages/vrender-components/src/legend/discrete/discrete.ts +++ b/packages/vrender-components/src/legend/discrete/discrete.ts @@ -1014,7 +1014,8 @@ export class DiscreteLegend extends LegendBase { (itemsContainer.getChildren() as unknown as IGroup[]).forEach((item, index) => { const { width, height } = item.attribute; - if (contentWidth < startX + (width as number)) { + // 第一个元素不能换行 + if (contentWidth < startX + (width as number) && index > 0) { // 超出了,则换行 startX = 0; startY += (height as number) + spaceRow; @@ -1058,8 +1059,9 @@ export class DiscreteLegend extends LegendBase { // 重新进行布局 (itemsContainer.getChildren() as unknown as IGroup[]).forEach((item, index) => { - const { height } = item.attribute; - if (contentHeight < startY + (height as number)) { + const { width, height } = item.attribute; + // 第一个元素不能换行 + if (contentHeight < startY + (height as number) && index > 0) { startY = 0; startX += this._itemMaxWidth + spaceCol; pages += 1; diff --git a/packages/vrender-core/CHANGELOG.json b/packages/vrender-core/CHANGELOG.json index 5e0aa16b9..c906ad296 100644 --- a/packages/vrender-core/CHANGELOG.json +++ b/packages/vrender-core/CHANGELOG.json @@ -1,6 +1,18 @@ { "name": "@visactor/vrender-core", "entries": [ + { + "version": "1.0.17", + "tag": "@visactor/vrender-core_v1.0.17", + "date": "Wed, 24 Sep 2025 07:38:57 GMT", + "comments": { + "none": [ + { + "comment": "fix: fix the issue of legend pager\n\n" + } + ] + } + }, { "version": "1.0.16", "tag": "@visactor/vrender-core_v1.0.16", diff --git a/packages/vrender-core/CHANGELOG.md b/packages/vrender-core/CHANGELOG.md index 23979886e..c4e226a49 100644 --- a/packages/vrender-core/CHANGELOG.md +++ b/packages/vrender-core/CHANGELOG.md @@ -1,6 +1,15 @@ # Change Log - @visactor/vrender-core -This log was last generated on Tue, 16 Sep 2025 09:57:05 GMT and should not be manually modified. +This log was last generated on Wed, 24 Sep 2025 07:38:57 GMT and should not be manually modified. + +## 1.0.17 +Wed, 24 Sep 2025 07:38:57 GMT + +### Updates + +- fix: fix the issue of legend pager + + ## 1.0.16 Tue, 16 Sep 2025 09:57:05 GMT diff --git a/packages/vrender-core/package.json b/packages/vrender-core/package.json index e9275de1b..8fff209b2 100644 --- a/packages/vrender-core/package.json +++ b/packages/vrender-core/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vrender-core", - "version": "1.0.16", + "version": "1.0.17", "description": "", "sideEffects": [ "./src/modules.ts", diff --git a/packages/vrender-kits/CHANGELOG.json b/packages/vrender-kits/CHANGELOG.json index 5beaf1f0c..b94e462fd 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.17", + "tag": "@visactor/vrender-kits_v1.0.17", + "date": "Wed, 24 Sep 2025 07:38:57 GMT", + "comments": {} + }, { "version": "1.0.16", "tag": "@visactor/vrender-kits_v1.0.16", diff --git a/packages/vrender-kits/CHANGELOG.md b/packages/vrender-kits/CHANGELOG.md index 6a279e7f1..76f6fa82d 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, 16 Sep 2025 09:57:05 GMT and should not be manually modified. +This log was last generated on Wed, 24 Sep 2025 07:38:57 GMT and should not be manually modified. + +## 1.0.17 +Wed, 24 Sep 2025 07:38:57 GMT + +_Version update only_ ## 1.0.16 Tue, 16 Sep 2025 09:57:05 GMT diff --git a/packages/vrender-kits/package.json b/packages/vrender-kits/package.json index d68e64ac1..970437d90 100644 --- a/packages/vrender-kits/package.json +++ b/packages/vrender-kits/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vrender-kits", - "version": "1.0.16", + "version": "1.0.17", "description": "", "sideEffects": false, "main": "cjs/index.js", @@ -21,7 +21,7 @@ }, "dependencies": { "@visactor/vutils": "1.0.6", - "@visactor/vrender-core": "workspace:1.0.16", + "@visactor/vrender-core": "workspace:1.0.17", "@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 d1aa7f2ef..a88eaf836 100644 --- a/packages/vrender/CHANGELOG.json +++ b/packages/vrender/CHANGELOG.json @@ -1,6 +1,12 @@ { "name": "@visactor/vrender", "entries": [ + { + "version": "1.0.17", + "tag": "@visactor/vrender_v1.0.17", + "date": "Wed, 24 Sep 2025 07:38:57 GMT", + "comments": {} + }, { "version": "1.0.16", "tag": "@visactor/vrender_v1.0.16", diff --git a/packages/vrender/CHANGELOG.md b/packages/vrender/CHANGELOG.md index 9592bb310..d9c54e027 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, 16 Sep 2025 09:57:05 GMT and should not be manually modified. +This log was last generated on Wed, 24 Sep 2025 07:38:57 GMT and should not be manually modified. + +## 1.0.17 +Wed, 24 Sep 2025 07:38:57 GMT + +_Version update only_ ## 1.0.16 Tue, 16 Sep 2025 09:57:05 GMT diff --git a/packages/vrender/package.json b/packages/vrender/package.json index d131af1b1..4a63034b2 100644 --- a/packages/vrender/package.json +++ b/packages/vrender/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vrender", - "version": "1.0.16", + "version": "1.0.17", "description": "", "sideEffects": true, "main": "cjs/index.js", @@ -24,9 +24,9 @@ "test-watch": "cross-env DEBUG_MODE=1 jest --watch" }, "dependencies": { - "@visactor/vrender-core": "workspace:1.0.16", - "@visactor/vrender-kits": "workspace:1.0.16", - "@visactor/vrender-animate": "workspace:1.0.16" + "@visactor/vrender-core": "workspace:1.0.17", + "@visactor/vrender-kits": "workspace:1.0.17", + "@visactor/vrender-animate": "workspace:1.0.17" }, "devDependencies": { "@internal/bundler": "workspace:*", diff --git a/tools/bugserver-trigger/package.json b/tools/bugserver-trigger/package.json index 124b9ed00..699092ad6 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.16", - "@visactor/vrender-core": "workspace:1.0.16", - "@visactor/vrender-kits": "workspace:1.0.16", - "@visactor/vrender-components": "workspace:1.0.16", - "@visactor/vrender-animate": "workspace:1.0.16" + "@visactor/vrender": "workspace:1.0.17", + "@visactor/vrender-core": "workspace:1.0.17", + "@visactor/vrender-kits": "workspace:1.0.17", + "@visactor/vrender-components": "workspace:1.0.17", + "@visactor/vrender-animate": "workspace:1.0.17" }, "devDependencies": { "@rushstack/eslint-patch": "~1.1.4",