diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index ec3089eba..72eabecbf 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.28 + specifier: workspace:1.0.29 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.28 + specifier: workspace:1.0.29 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.28 + specifier: workspace:1.0.29 version: link:../react-vrender '@visactor/vrender': - specifier: workspace:1.0.28 + specifier: workspace:1.0.29 version: link:../vrender '@visactor/vutils': specifier: ~1.0.12 @@ -211,16 +211,16 @@ importers: ../../packages/vrender: dependencies: '@visactor/vrender-animate': - specifier: workspace:1.0.28 + specifier: workspace:1.0.29 version: link:../vrender-animate '@visactor/vrender-components': - specifier: workspace:1.0.28 + specifier: workspace:1.0.29 version: link:../vrender-components '@visactor/vrender-core': - specifier: workspace:1.0.28 + specifier: workspace:1.0.29 version: link:../vrender-core '@visactor/vrender-kits': - specifier: workspace:1.0.28 + specifier: workspace:1.0.29 version: link:../vrender-kits devDependencies: '@internal/bundler': @@ -287,7 +287,7 @@ importers: ../../packages/vrender-animate: dependencies: '@visactor/vrender-core': - specifier: workspace:1.0.28 + specifier: workspace:1.0.29 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.28 + specifier: workspace:1.0.29 version: link:../vrender-animate '@visactor/vrender-core': - specifier: workspace:1.0.28 + specifier: workspace:1.0.29 version: link:../vrender-core '@visactor/vrender-kits': - specifier: workspace:1.0.28 + specifier: workspace:1.0.29 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.28 + specifier: workspace:1.0.29 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.28 + specifier: workspace:1.0.29 version: link:../../packages/vrender '@visactor/vrender-animate': - specifier: workspace:1.0.28 + specifier: workspace:1.0.29 version: link:../../packages/vrender-animate '@visactor/vrender-components': - specifier: workspace:1.0.28 + specifier: workspace:1.0.29 version: link:../../packages/vrender-components '@visactor/vrender-core': - specifier: workspace:1.0.28 + specifier: workspace:1.0.29 version: link:../../packages/vrender-core '@visactor/vrender-kits': - specifier: workspace:1.0.28 + specifier: workspace:1.0.29 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 c9c738f29..5f4afdf82 100644 --- a/common/config/rush/version-policies.json +++ b/common/config/rush/version-policies.json @@ -1 +1 @@ -[{"definitionName":"lockStepVersion","policyName":"vrenderMain","version":"1.0.28","nextBump":"patch"}] +[{"definitionName":"lockStepVersion","policyName":"vrenderMain","version":"1.0.29","nextBump":"patch"}] diff --git a/docs/package.json b/docs/package.json index 83420bf7a..e00c1b477 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.28", + "@visactor/vrender": "workspace:1.0.29", "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 ae439da73..5e876bac3 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.29", + "tag": "@visactor/react-vrender-utils_v1.0.29", + "date": "Tue, 25 Nov 2025 11:41:43 GMT", + "comments": {} + }, { "version": "1.0.28", "tag": "@visactor/react-vrender-utils_v1.0.28", diff --git a/packages/react-vrender-utils/CHANGELOG.md b/packages/react-vrender-utils/CHANGELOG.md index b9d1653f9..e14732004 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, 25 Nov 2025 09:10:56 GMT and should not be manually modified. +This log was last generated on Tue, 25 Nov 2025 11:41:43 GMT and should not be manually modified. + +## 1.0.29 +Tue, 25 Nov 2025 11:41:43 GMT + +_Version update only_ ## 1.0.28 Tue, 25 Nov 2025 09:10:56 GMT diff --git a/packages/react-vrender-utils/package.json b/packages/react-vrender-utils/package.json index df6664a2f..7527f6d52 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.28", + "version": "1.0.29", "description": "", "sideEffects": false, "main": "cjs/index.js", @@ -24,8 +24,8 @@ "react-dom": "^18.2.0" }, "dependencies": { - "@visactor/vrender": "workspace:1.0.28", - "@visactor/react-vrender": "workspace:1.0.28", + "@visactor/vrender": "workspace:1.0.29", + "@visactor/react-vrender": "workspace:1.0.29", "@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 61a099f73..156701503 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.29", + "tag": "@visactor/react-vrender_v1.0.29", + "date": "Tue, 25 Nov 2025 11:41:43 GMT", + "comments": {} + }, { "version": "1.0.28", "tag": "@visactor/react-vrender_v1.0.28", diff --git a/packages/react-vrender/CHANGELOG.md b/packages/react-vrender/CHANGELOG.md index 0e6e0b0ad..6abca9952 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, 25 Nov 2025 09:10:56 GMT and should not be manually modified. +This log was last generated on Tue, 25 Nov 2025 11:41:43 GMT and should not be manually modified. + +## 1.0.29 +Tue, 25 Nov 2025 11:41:43 GMT + +_Version update only_ ## 1.0.28 Tue, 25 Nov 2025 09:10:56 GMT diff --git a/packages/react-vrender/package.json b/packages/react-vrender/package.json index 792f52fca..eee20bf07 100644 --- a/packages/react-vrender/package.json +++ b/packages/react-vrender/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/react-vrender", - "version": "1.0.28", + "version": "1.0.29", "description": "", "sideEffects": false, "main": "cjs/index.js", @@ -23,7 +23,7 @@ "react": "^18.2.0" }, "dependencies": { - "@visactor/vrender": "workspace:1.0.28", + "@visactor/vrender": "workspace:1.0.29", "@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 0368313f4..541cbc613 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.29", + "tag": "@visactor/vrender-animate_v1.0.29", + "date": "Tue, 25 Nov 2025 11:41:43 GMT", + "comments": {} + }, { "version": "1.0.28", "tag": "@visactor/vrender-animate_v1.0.28", diff --git a/packages/vrender-animate/CHANGELOG.md b/packages/vrender-animate/CHANGELOG.md index 9dee65821..5dd57b19e 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, 25 Nov 2025 09:10:56 GMT and should not be manually modified. +This log was last generated on Tue, 25 Nov 2025 11:41:43 GMT and should not be manually modified. + +## 1.0.29 +Tue, 25 Nov 2025 11:41:43 GMT + +_Version update only_ ## 1.0.28 Tue, 25 Nov 2025 09:10:56 GMT diff --git a/packages/vrender-animate/package.json b/packages/vrender-animate/package.json index b02687e08..4e56b8cc5 100644 --- a/packages/vrender-animate/package.json +++ b/packages/vrender-animate/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vrender-animate", - "version": "1.0.28", + "version": "1.0.29", "description": "", "sideEffects": false, "main": "cjs/index.js", @@ -21,7 +21,7 @@ }, "dependencies": { "@visactor/vutils": "~1.0.12", - "@visactor/vrender-core": "workspace:1.0.28" + "@visactor/vrender-core": "workspace:1.0.29" }, "devDependencies": { "@internal/bundler": "workspace:*", diff --git a/packages/vrender-components/CHANGELOG.json b/packages/vrender-components/CHANGELOG.json index 5ff866265..e7270f855 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.29", + "tag": "@visactor/vrender-components_v1.0.29", + "date": "Tue, 25 Nov 2025 11:41:43 GMT", + "comments": { + "none": [ + { + "comment": "feat: add labelHoverOnAxis for axis component\n\n" + } + ] + } + }, { "version": "1.0.28", "tag": "@visactor/vrender-components_v1.0.28", diff --git a/packages/vrender-components/CHANGELOG.md b/packages/vrender-components/CHANGELOG.md index 3e44703e6..f80a54067 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, 25 Nov 2025 09:10:56 GMT and should not be manually modified. +This log was last generated on Tue, 25 Nov 2025 11:41:43 GMT and should not be manually modified. + +## 1.0.29 +Tue, 25 Nov 2025 11:41:43 GMT + +### Updates + +- feat: add labelHoverOnAxis for axis component + + ## 1.0.28 Tue, 25 Nov 2025 09:10:56 GMT diff --git a/packages/vrender-components/__tests__/browser/examples/axis-hoverOn-label-bottom.ts b/packages/vrender-components/__tests__/browser/examples/axis-hoverOn-label-bottom.ts new file mode 100644 index 000000000..8c8bda13f --- /dev/null +++ b/packages/vrender-components/__tests__/browser/examples/axis-hoverOn-label-bottom.ts @@ -0,0 +1,180 @@ +import { LinearScale, PointScale } from '@visactor/vscale'; +import '@visactor/vrender'; +import { GroupFadeIn, GroupFadeOut } from '@visactor/vrender'; +import { LineAxis, GroupTransition } from '../../../src'; +import render from '../../util/render'; + +const axis = new LineAxis({ + orient: 'bottom', + title: { + // space: 0, + // padding: 0, + // textStyle: { + // fontSize: 12, + // fill: '#363839', + // fontWeight: 'normal', + // fillOpacity: 1, + // textAlign: 'center', + // textBaseline: 'bottom' + // }, + visible: true, + autoRotate: true, + // angle: 1, + // shape: {}, + // background: { + // visible: true, + // style: { + // fill: 'red' + // } + // }, + // state: { + // text: null, + // shape: null, + // background: null + // }, + text: '细分' + // maxWidth: null + }, + label: { + visible: true, + inside: false, + space: 20, + style: { + fontSize: 12, + fill: '#6F6F6F', + fontWeight: 'normal', + fillOpacity: 1, + angle: 0, + textAlign: 'center' + }, + formatMethod: null, + state: null, + autoRotate: false, + autoHide: false, + autoLimit: false, + containerAlign: 'center' + }, + labelHoverOnAxis: { + autoRotate: true, + position: 185, + // space: 10, + padding: 6, + textStyle: { + // fontSize: 12, + // fill: '#363839', + // fontWeight: 'normal', + // fillOpacity: 1, + textAlign: 'center' + // textBaseline: 'top' + }, + visible: true, + // background: { + // visible: true, + // style: { + // fill: 'red' + // } + // }, + text: '' + }, + // tick: { + // visible: true, + // inside: false, + // alignWithLabel: true, + // length: 2, + // style: { + // lineWidth: 1, + // stroke: '#D9DDE4', + // strokeOpacity: 1 + // }, + // state: null + // }, + // subTick: { + // visible: true, + // inside: false, + // count: 4, + // length: 2, + // style: { + // lineWidth: 10, + // stroke: '#D9DDE4', + // strokeOpacity: 1 + // }, + // state: null + // }, + line: { + visible: true, + style: { + lineWidth: 1, + stroke: '#989999', + strokeOpacity: 1 + }, + startSymbol: {}, + endSymbol: {} + }, + x: 0, + y: 0, + // start: { + // x: 0, + // y: 0 + // }, + // end: { + // x: 0, + // y: 427 + // }, + start: { x: 0, y: 200 }, + end: { x: 500, y: 200 }, + items: [ + [ + { + id: '消费者', + label: '消费者', + value: 0.8333333333333334, + rawValue: '消费者' + }, + { + id: '公司', + label: '公司', + value: 0.4999999999999999, + rawValue: '公司' + }, + { + id: '小型企业', + label: '小型企业', + value: 0.1666666666666666, + rawValue: '小型企业' + } + ] + ], + visible: true, + pickable: true, + hover: true, + select: true, + panel: { + visible: true, + state: { + // hover: { + // fillOpacity: 0.08, + // fill: 'red' + // }, + selected: { + fillOpacity: 0.08, + fill: 'blue' + }, + selected_reverse: { + fillOpacity: 0.08, + fill: 'red' + } + // hover_reverse: { + // fillOpacity: 0.08, + // fill: '#141414' + // } + } + }, + verticalFactor: 1, + horizontalLimitSize: 150, + horizontalMinSize: 150 +}); +window.axis = axis; +setTimeout(() => { + axis.showLabelHoverOnAxis(490, '细分细分细分细分细分打撒规细分'); +}, 100); +render([axis], 'main'); diff --git a/packages/vrender-components/__tests__/browser/examples/axis-hoverOn-label-left.ts b/packages/vrender-components/__tests__/browser/examples/axis-hoverOn-label-left.ts new file mode 100644 index 000000000..1b8733225 --- /dev/null +++ b/packages/vrender-components/__tests__/browser/examples/axis-hoverOn-label-left.ts @@ -0,0 +1,159 @@ +import { LinearScale, PointScale } from '@visactor/vscale'; +import '@visactor/vrender'; +import { GroupFadeIn, GroupFadeOut } from '@visactor/vrender'; +import { LineAxis, GroupTransition } from '../../../src'; +import render from '../../util/render'; + +const axis = new LineAxis({ + orient: 'left', + hover: true, + line: { + visible: false, + style: { + lineWidth: 1, + stroke: '#D9DDE4', + strokeOpacity: 1 + } + }, + label: { + style: { + fontSize: 12, + fill: '#BCC1CB', + fontWeight: 400, + fillOpacity: 1, + maxLineWidth: 80, + angle: 0 + }, + formatMethod: null, + state: null, + visible: true, + space: 0, + autoLimit: false, + flush: true, + containerAlign: 'right', + minGap: 1, + autoHide: false, + autoHideMethod: 'greedy', + autoHideSeparation: 1, + autoRotate: false, + autoRotateAngle: [0, -45, -90], + lastVisible: true + }, + tick: { + visible: false, + length: 4, + inside: false, + style: { + lineWidth: 1, + stroke: '#21252C', + strokeOpacity: 1 + }, + state: null + }, + subTick: { + visible: false, + length: 2, + style: { + lineWidth: 1, + stroke: '#D9DDE4', + strokeOpacity: 1 + }, + state: null + }, + grid: { + type: 'line', + visible: false, + style: { + lineWidth: 1, + stroke: '#E3E5EB', + strokeOpacity: 1, + lineDash: [4, 2] + } + }, + subGrid: { + type: 'line', + visible: false, + style: { + lineWidth: 1, + stroke: '#EBEDF2', + strokeOpacity: 1, + lineDash: [4, 4] + } + }, + title: { + visible: false, + space: 10, + autoRotate: false, + angle: -1.5707963267948966, + textStyle: { + textAlign: 'center', + textBaseline: 'bottom', + fontSize: 12, + fill: '#606773', + fontWeight: 400, + fillOpacity: 1 + }, + shape: {}, + background: {}, + state: { + text: null, + shape: null, + background: null + }, + text: 'order_date', + maxWidth: null + }, + panel: { + state: null + }, + labelHoverOnAxis: { + visible: true + }, + x: 140, + y: 0, + start: { + x: 0, + y: 0 + }, + end: { + x: 0, + y: 427 + }, + items: [ + [ + { + id: '2016-01-01', + label: '2016-01-01', + value: 0.1308139534883721, + rawValue: '2016-01-01' + }, + { + id: '2017-01-01', + label: '2017-01-01', + value: 0.37693798449612403, + rawValue: '2017-01-01' + }, + { + id: '2018-01-01', + label: '2018-01-01', + value: 0.623062015503876, + rawValue: '2018-01-01' + }, + { + id: '2019-01-01', + label: '2019-', + value: 0.8691860465116279, + rawValue: '2019-01-01' + } + ] + ], + verticalLimitSize: 66, + verticalMinSize: 66, + verticalFactor: 1 +}); +window.axis = axis; +debugger; +setTimeout(() => { + axis.showLabelHoverOnAxis(390, '2016-01-01'); +}, 100); +render([axis], 'main'); diff --git a/packages/vrender-components/__tests__/browser/examples/axis-overlap.ts b/packages/vrender-components/__tests__/browser/examples/axis-overlap.ts index cd01dc01d..e45c4240d 100644 --- a/packages/vrender-components/__tests__/browser/examples/axis-overlap.ts +++ b/packages/vrender-components/__tests__/browser/examples/axis-overlap.ts @@ -57,6 +57,11 @@ const axisBottom = new LineAxis({ // angle: Math.PI * 0.5 // } }, + labelHoverOnAxis: { + visible: true, + position: 150, + text: 'BBBBBBBBBBBBBB' + }, orient: 'bottom', verticalLimitSize: 100 }); diff --git a/packages/vrender-components/__tests__/browser/index.html b/packages/vrender-components/__tests__/browser/index.html index 96e24d285..f5585af3b 100644 --- a/packages/vrender-components/__tests__/browser/index.html +++ b/packages/vrender-components/__tests__/browser/index.html @@ -8,7 +8,7 @@ Vite App