diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 9c9116193..907760c75 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.35 + specifier: workspace:1.0.36 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.35 + specifier: workspace:1.0.36 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.35 + specifier: workspace:1.0.36 version: link:../react-vrender '@visactor/vrender': - specifier: workspace:1.0.35 + specifier: workspace:1.0.36 version: link:../vrender '@visactor/vutils': specifier: ~1.0.12 @@ -211,16 +211,16 @@ importers: ../../packages/vrender: dependencies: '@visactor/vrender-animate': - specifier: workspace:1.0.35 + specifier: workspace:1.0.36 version: link:../vrender-animate '@visactor/vrender-components': - specifier: workspace:1.0.35 + specifier: workspace:1.0.36 version: link:../vrender-components '@visactor/vrender-core': - specifier: workspace:1.0.35 + specifier: workspace:1.0.36 version: link:../vrender-core '@visactor/vrender-kits': - specifier: workspace:1.0.35 + specifier: workspace:1.0.36 version: link:../vrender-kits devDependencies: '@internal/bundler': @@ -287,7 +287,7 @@ importers: ../../packages/vrender-animate: dependencies: '@visactor/vrender-core': - specifier: workspace:1.0.35 + specifier: workspace:1.0.36 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.35 + specifier: workspace:1.0.36 version: link:../vrender-animate '@visactor/vrender-core': - specifier: workspace:1.0.35 + specifier: workspace:1.0.36 version: link:../vrender-core '@visactor/vrender-kits': - specifier: workspace:1.0.35 + specifier: workspace:1.0.36 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.35 + specifier: workspace:1.0.36 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.35 + specifier: workspace:1.0.36 version: link:../../packages/vrender '@visactor/vrender-animate': - specifier: workspace:1.0.35 + specifier: workspace:1.0.36 version: link:../../packages/vrender-animate '@visactor/vrender-components': - specifier: workspace:1.0.35 + specifier: workspace:1.0.36 version: link:../../packages/vrender-components '@visactor/vrender-core': - specifier: workspace:1.0.35 + specifier: workspace:1.0.36 version: link:../../packages/vrender-core '@visactor/vrender-kits': - specifier: workspace:1.0.35 + specifier: workspace:1.0.36 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 09c93a3de..72b7f0347 100644 --- a/common/config/rush/version-policies.json +++ b/common/config/rush/version-policies.json @@ -1 +1 @@ -[{"definitionName":"lockStepVersion","policyName":"vrenderMain","version":"1.0.35","nextBump":"patch"}] +[{"definitionName":"lockStepVersion","policyName":"vrenderMain","version":"1.0.36","nextBump":"patch"}] diff --git a/docs/package.json b/docs/package.json index 8d3c79182..acbc51416 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.35", + "@visactor/vrender": "workspace:1.0.36", "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 8f8c01b19..dad458a12 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.36", + "tag": "@visactor/react-vrender-utils_v1.0.36", + "date": "Wed, 24 Dec 2025 06:30:43 GMT", + "comments": {} + }, { "version": "1.0.35", "tag": "@visactor/react-vrender-utils_v1.0.35", diff --git a/packages/react-vrender-utils/CHANGELOG.md b/packages/react-vrender-utils/CHANGELOG.md index 46a552f9d..f104ca27a 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, 22 Dec 2025 08:54:24 GMT and should not be manually modified. +This log was last generated on Wed, 24 Dec 2025 06:30:43 GMT and should not be manually modified. + +## 1.0.36 +Wed, 24 Dec 2025 06:30:43 GMT + +_Version update only_ ## 1.0.35 Mon, 22 Dec 2025 08:54:24 GMT diff --git a/packages/react-vrender-utils/package.json b/packages/react-vrender-utils/package.json index 7c648de9f..69c46a113 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.35", + "version": "1.0.36", "description": "", "sideEffects": false, "main": "cjs/index.js", @@ -24,8 +24,8 @@ "react-dom": "^18.2.0" }, "dependencies": { - "@visactor/vrender": "workspace:1.0.35", - "@visactor/react-vrender": "workspace:1.0.35", + "@visactor/vrender": "workspace:1.0.36", + "@visactor/react-vrender": "workspace:1.0.36", "@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 91c98f6fa..3c98e47f9 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.36", + "tag": "@visactor/react-vrender_v1.0.36", + "date": "Wed, 24 Dec 2025 06:30:43 GMT", + "comments": {} + }, { "version": "1.0.35", "tag": "@visactor/react-vrender_v1.0.35", diff --git a/packages/react-vrender/CHANGELOG.md b/packages/react-vrender/CHANGELOG.md index 85daaec60..bc6dad0a6 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, 22 Dec 2025 08:54:24 GMT and should not be manually modified. +This log was last generated on Wed, 24 Dec 2025 06:30:43 GMT and should not be manually modified. + +## 1.0.36 +Wed, 24 Dec 2025 06:30:43 GMT + +_Version update only_ ## 1.0.35 Mon, 22 Dec 2025 08:54:24 GMT diff --git a/packages/react-vrender/package.json b/packages/react-vrender/package.json index 94e50318d..f2c8c64d3 100644 --- a/packages/react-vrender/package.json +++ b/packages/react-vrender/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/react-vrender", - "version": "1.0.35", + "version": "1.0.36", "description": "", "sideEffects": false, "main": "cjs/index.js", @@ -23,7 +23,7 @@ "react": "^18.2.0" }, "dependencies": { - "@visactor/vrender": "workspace:1.0.35", + "@visactor/vrender": "workspace:1.0.36", "@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 4200fbb5f..671956e17 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.36", + "tag": "@visactor/vrender-animate_v1.0.36", + "date": "Wed, 24 Dec 2025 06:30:43 GMT", + "comments": {} + }, { "version": "1.0.35", "tag": "@visactor/vrender-animate_v1.0.35", diff --git a/packages/vrender-animate/CHANGELOG.md b/packages/vrender-animate/CHANGELOG.md index 0fbfed83b..a1844b6c9 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, 22 Dec 2025 08:54:24 GMT and should not be manually modified. +This log was last generated on Wed, 24 Dec 2025 06:30:43 GMT and should not be manually modified. + +## 1.0.36 +Wed, 24 Dec 2025 06:30:43 GMT + +_Version update only_ ## 1.0.35 Mon, 22 Dec 2025 08:54:24 GMT diff --git a/packages/vrender-animate/package.json b/packages/vrender-animate/package.json index 64d505289..13728e432 100644 --- a/packages/vrender-animate/package.json +++ b/packages/vrender-animate/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vrender-animate", - "version": "1.0.35", + "version": "1.0.36", "description": "", "sideEffects": false, "main": "cjs/index.js", @@ -21,7 +21,7 @@ }, "dependencies": { "@visactor/vutils": "~1.0.12", - "@visactor/vrender-core": "workspace:1.0.35" + "@visactor/vrender-core": "workspace:1.0.36" }, "devDependencies": { "@internal/bundler": "workspace:*", diff --git a/packages/vrender-components/CHANGELOG.json b/packages/vrender-components/CHANGELOG.json index 245f1b79c..0482d899a 100644 --- a/packages/vrender-components/CHANGELOG.json +++ b/packages/vrender-components/CHANGELOG.json @@ -1,6 +1,12 @@ { "name": "@visactor/vrender-components", "entries": [ + { + "version": "1.0.36", + "tag": "@visactor/vrender-components_v1.0.36", + "date": "Wed, 24 Dec 2025 06:30:43 GMT", + "comments": {} + }, { "version": "1.0.35", "tag": "@visactor/vrender-components_v1.0.35", diff --git a/packages/vrender-components/CHANGELOG.md b/packages/vrender-components/CHANGELOG.md index 2fcd3b0d6..d7a2686dc 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 Mon, 22 Dec 2025 08:54:24 GMT and should not be manually modified. +This log was last generated on Wed, 24 Dec 2025 06:30:43 GMT and should not be manually modified. + +## 1.0.36 +Wed, 24 Dec 2025 06:30:43 GMT + +_Version update only_ ## 1.0.35 Mon, 22 Dec 2025 08:54:24 GMT diff --git a/packages/vrender-components/package.json b/packages/vrender-components/package.json index 890c2cf54..6d55e5ac5 100644 --- a/packages/vrender-components/package.json +++ b/packages/vrender-components/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vrender-components", - "version": "1.0.35", + "version": "1.0.36", "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.35", - "@visactor/vrender-kits": "workspace:1.0.35", - "@visactor/vrender-animate": "workspace:1.0.35" + "@visactor/vrender-core": "workspace:1.0.36", + "@visactor/vrender-kits": "workspace:1.0.36", + "@visactor/vrender-animate": "workspace:1.0.36" }, "devDependencies": { "@internal/bundler": "workspace:*", diff --git a/packages/vrender-components/src/axis/base.ts b/packages/vrender-components/src/axis/base.ts index aa3460e15..285eac315 100644 --- a/packages/vrender-components/src/axis/base.ts +++ b/packages/vrender-components/src/axis/base.ts @@ -15,10 +15,9 @@ import type { } from '@visactor/vrender-core'; // eslint-disable-next-line no-duplicate-imports import { graphicCreator, diff } from '@visactor/vrender-core'; -import type { Dict, IBounds } from '@visactor/vutils'; +import type { Dict } from '@visactor/vutils'; // eslint-disable-next-line no-duplicate-imports -import { abs, cloneDeep, get, isArray, isEmpty, isEqual, isFunction, merge, pi } from '@visactor/vutils'; -import { AbstractComponent } from '../core/base'; +import { abs, cloneDeep, get, isEmpty, isFunction, merge, pi } from '@visactor/vutils'; import type { Point } from '../core/type'; import type { TagAttributes } from '../tag'; import { createTextGraphicByType, traverseGroup } from '../util'; diff --git a/packages/vrender-components/src/axis/line.ts b/packages/vrender-components/src/axis/line.ts index f10d78055..5101230a4 100644 --- a/packages/vrender-components/src/axis/line.ts +++ b/packages/vrender-components/src/axis/line.ts @@ -315,8 +315,9 @@ export class LineAxis extends AxisBase { } const offset = tickLength + labelLength + space; - const titlePoint = this.getVerticalCoord(point, offset, false); // 标题的点 - const vector = this.getVerticalVector(offset, false, { x: 0, y: 0 }); + const actualOffset = this.getActualOffset(offset); + const titlePoint = this.getVerticalCoord(point, actualOffset, false); // 标题的点 + const vector = this.getVerticalVector(actualOffset, false, { x: 0, y: 0 }); let { angle } = restAttrs; // 用户设置的是角度 let textAlign; @@ -359,14 +360,14 @@ export class LineAxis extends AxisBase { const cosValue = Math.abs(Math.cos(angle ?? 0)); maxTagWidth = cosValue < 1e-6 ? Infinity : this.attribute.end.x / cosValue; } else { - maxTagWidth = limitSize - offset; + maxTagWidth = limitSize - actualOffset; } } else { if (angle && angle !== 0) { const sinValue = Math.abs(Math.sin(angle)); maxTagWidth = sinValue < 1e-6 ? Infinity : this.attribute.end.y / sinValue; } else { - maxTagWidth = limitSize - offset; + maxTagWidth = limitSize - actualOffset; } } } @@ -886,6 +887,26 @@ export class LineAxis extends AxisBase { }); } } + + getActualOffset(offset: number): number { + const orient = this.attribute.orient; + const isVertical = orient === 'left' || orient === 'right'; + if (!isVertical) { + return offset; + } + + if (this.attribute.width) { + return this.attribute.width; + } + if (this.attribute.maxWidth) { + offset = Math.min(offset, this.attribute.maxWidth); + } + if (this.attribute.minWidth) { + offset = Math.max(offset, this.attribute.minWidth); + } + return offset; + } + release(): void { super.release(); this._breaks = null; diff --git a/packages/vrender-components/src/axis/type.ts b/packages/vrender-components/src/axis/type.ts index 60c18e56c..4fcca91a0 100644 --- a/packages/vrender-components/src/axis/type.ts +++ b/packages/vrender-components/src/axis/type.ts @@ -243,6 +243,13 @@ export interface LineAxisAttributes extends Omit { * @since 0.20.3 */ breaks?: AxisBreakProps[]; + + /** + * 最大宽度，用于自动调整标签宽度以适应布局区域 + */ + maxWidth?: number; + minWidth?: number; + width?: number; } export interface CircleAxisAttributes extends AxisBaseAttributes { diff --git a/packages/vrender-core/CHANGELOG.json b/packages/vrender-core/CHANGELOG.json index 3974e1819..0cda1692d 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.36", + "tag": "@visactor/vrender-core_v1.0.36", + "date": "Wed, 24 Dec 2025 06:30:43 GMT", + "comments": {} + }, { "version": "1.0.35", "tag": "@visactor/vrender-core_v1.0.35", diff --git a/packages/vrender-core/CHANGELOG.md b/packages/vrender-core/CHANGELOG.md index 581d735fb..c871e6ddd 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, 22 Dec 2025 08:54:24 GMT and should not be manually modified. +This log was last generated on Wed, 24 Dec 2025 06:30:43 GMT and should not be manually modified. + +## 1.0.36 +Wed, 24 Dec 2025 06:30:43 GMT + +_Version update only_ ## 1.0.35 Mon, 22 Dec 2025 08:54:24 GMT diff --git a/packages/vrender-core/package.json b/packages/vrender-core/package.json index 8d3131b3e..715d42e0b 100644 --- a/packages/vrender-core/package.json +++ b/packages/vrender-core/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vrender-core", - "version": "1.0.35", + "version": "1.0.36", "description": "", "sideEffects": [ "./src/modules.ts", diff --git a/packages/vrender-kits/CHANGELOG.json b/packages/vrender-kits/CHANGELOG.json index 9e8e5406f..412c12ba2 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.36", + "tag": "@visactor/vrender-kits_v1.0.36", + "date": "Wed, 24 Dec 2025 06:30:43 GMT", + "comments": {} + }, { "version": "1.0.35", "tag": "@visactor/vrender-kits_v1.0.35", diff --git a/packages/vrender-kits/CHANGELOG.md b/packages/vrender-kits/CHANGELOG.md index 29f71b15d..3b203f8ae 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 Mon, 22 Dec 2025 08:54:24 GMT and should not be manually modified. +This log was last generated on Wed, 24 Dec 2025 06:30:43 GMT and should not be manually modified. + +## 1.0.36 +Wed, 24 Dec 2025 06:30:43 GMT + +_Version update only_ ## 1.0.35 Mon, 22 Dec 2025 08:54:24 GMT diff --git a/packages/vrender-kits/package.json b/packages/vrender-kits/package.json index 28f8655d2..279f24b91 100644 --- a/packages/vrender-kits/package.json +++ b/packages/vrender-kits/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vrender-kits", - "version": "1.0.35", + "version": "1.0.36", "description": "", "sideEffects": false, "main": "cjs/index.js", @@ -21,7 +21,7 @@ }, "dependencies": { "@visactor/vutils": "~1.0.12", - "@visactor/vrender-core": "workspace:1.0.35", + "@visactor/vrender-core": "workspace:1.0.36", "@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 7ef058626..faefd8afd 100644 --- a/packages/vrender/CHANGELOG.json +++ b/packages/vrender/CHANGELOG.json @@ -1,6 +1,12 @@ { "name": "@visactor/vrender", "entries": [ + { + "version": "1.0.36", + "tag": "@visactor/vrender_v1.0.36", + "date": "Wed, 24 Dec 2025 06:30:43 GMT", + "comments": {} + }, { "version": "1.0.35", "tag": "@visactor/vrender_v1.0.35", diff --git a/packages/vrender/CHANGELOG.md b/packages/vrender/CHANGELOG.md index 84427742f..72cb31ba6 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, 22 Dec 2025 08:54:24 GMT and should not be manually modified. +This log was last generated on Wed, 24 Dec 2025 06:30:43 GMT and should not be manually modified. + +## 1.0.36 +Wed, 24 Dec 2025 06:30:43 GMT + +_Version update only_ ## 1.0.35 Mon, 22 Dec 2025 08:54:24 GMT diff --git a/packages/vrender/package.json b/packages/vrender/package.json index 19ba90d1a..5ec54e3ad 100644 --- a/packages/vrender/package.json +++ b/packages/vrender/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vrender", - "version": "1.0.35", + "version": "1.0.36", "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.35", - "@visactor/vrender-kits": "workspace:1.0.35", - "@visactor/vrender-animate": "workspace:1.0.35", - "@visactor/vrender-components": "workspace:1.0.35" + "@visactor/vrender-core": "workspace:1.0.36", + "@visactor/vrender-kits": "workspace:1.0.36", + "@visactor/vrender-animate": "workspace:1.0.36", + "@visactor/vrender-components": "workspace:1.0.36" }, "devDependencies": { "@internal/bundler": "workspace:*", diff --git a/tools/bugserver-trigger/package.json b/tools/bugserver-trigger/package.json index 8b3499ecd..dbe870d76 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.35", - "@visactor/vrender-core": "workspace:1.0.35", - "@visactor/vrender-kits": "workspace:1.0.35", - "@visactor/vrender-components": "workspace:1.0.35", - "@visactor/vrender-animate": "workspace:1.0.35" + "@visactor/vrender": "workspace:1.0.36", + "@visactor/vrender-core": "workspace:1.0.36", + "@visactor/vrender-kits": "workspace:1.0.36", + "@visactor/vrender-components": "workspace:1.0.36", + "@visactor/vrender-animate": "workspace:1.0.36" }, "devDependencies": { "@rushstack/eslint-patch": "~1.1.4",