diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index f891e262c..ecbd210bc 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.19 + specifier: workspace:1.0.20 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.19 + specifier: workspace:1.0.20 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.19 + specifier: workspace:1.0.20 version: link:../react-vrender '@visactor/vrender': - specifier: workspace:1.0.19 + specifier: workspace:1.0.20 version: link:../vrender '@visactor/vutils': specifier: 1.0.6 @@ -211,16 +211,16 @@ importers: ../../packages/vrender: dependencies: '@visactor/vrender-animate': - specifier: workspace:1.0.19 + specifier: workspace:1.0.20 version: link:../vrender-animate '@visactor/vrender-components': - specifier: workspace:1.0.19 + specifier: workspace:1.0.20 version: link:../vrender-components '@visactor/vrender-core': - specifier: workspace:1.0.19 + specifier: workspace:1.0.20 version: link:../vrender-core '@visactor/vrender-kits': - specifier: workspace:1.0.19 + specifier: workspace:1.0.20 version: link:../vrender-kits devDependencies: '@internal/bundler': @@ -287,7 +287,7 @@ importers: ../../packages/vrender-animate: dependencies: '@visactor/vrender-core': - specifier: workspace:1.0.19 + specifier: workspace:1.0.20 version: link:../vrender-core '@visactor/vutils': specifier: 1.0.6 @@ -345,13 +345,13 @@ importers: ../../packages/vrender-components: dependencies: '@visactor/vrender-animate': - specifier: workspace:1.0.19 + specifier: workspace:1.0.20 version: link:../vrender-animate '@visactor/vrender-core': - specifier: workspace:1.0.19 + specifier: workspace:1.0.20 version: link:../vrender-core '@visactor/vrender-kits': - specifier: workspace:1.0.19 + specifier: workspace:1.0.20 version: link:../vrender-kits '@visactor/vscale': specifier: 1.0.6 @@ -470,7 +470,7 @@ importers: specifier: 2.4.1 version: 2.4.1 '@visactor/vrender-core': - specifier: workspace:1.0.19 + specifier: workspace:1.0.20 version: link:../vrender-core '@visactor/vutils': specifier: 1.0.6 @@ -586,19 +586,19 @@ importers: ../../tools/bugserver-trigger: dependencies: '@visactor/vrender': - specifier: workspace:1.0.19 + specifier: workspace:1.0.20 version: link:../../packages/vrender '@visactor/vrender-animate': - specifier: workspace:1.0.19 + specifier: workspace:1.0.20 version: link:../../packages/vrender-animate '@visactor/vrender-components': - specifier: workspace:1.0.19 + specifier: workspace:1.0.20 version: link:../../packages/vrender-components '@visactor/vrender-core': - specifier: workspace:1.0.19 + specifier: workspace:1.0.20 version: link:../../packages/vrender-core '@visactor/vrender-kits': - specifier: workspace:1.0.19 + specifier: workspace:1.0.20 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 bd51e8613..9c1260566 100644 --- a/common/config/rush/version-policies.json +++ b/common/config/rush/version-policies.json @@ -1 +1 @@ -[{"definitionName":"lockStepVersion","policyName":"vrenderMain","version":"1.0.19","nextBump":"patch"}] +[{"definitionName":"lockStepVersion","policyName":"vrenderMain","version":"1.0.20","nextBump":"patch"}] diff --git a/docs/package.json b/docs/package.json index 9f181b512..eceaa43c5 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.19", + "@visactor/vrender": "workspace:1.0.20", "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 852828a94..8f35420e3 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.20", + "tag": "@visactor/react-vrender-utils_v1.0.20", + "date": "Mon, 27 Oct 2025 06:44:49 GMT", + "comments": {} + }, { "version": "1.0.19", "tag": "@visactor/react-vrender-utils_v1.0.19", diff --git a/packages/react-vrender-utils/CHANGELOG.md b/packages/react-vrender-utils/CHANGELOG.md index e37b4d112..6e1ce31b2 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 Thu, 23 Oct 2025 07:49:11 GMT and should not be manually modified. +This log was last generated on Mon, 27 Oct 2025 06:44:49 GMT and should not be manually modified. + +## 1.0.20 +Mon, 27 Oct 2025 06:44:49 GMT + +_Version update only_ ## 1.0.19 Thu, 23 Oct 2025 07:49:11 GMT diff --git a/packages/react-vrender-utils/package.json b/packages/react-vrender-utils/package.json index c12f7f9d7..b6979198c 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.19", + "version": "1.0.20", "description": "", "sideEffects": false, "main": "cjs/index.js", @@ -24,8 +24,8 @@ "react-dom": "^18.2.0" }, "dependencies": { - "@visactor/vrender": "workspace:1.0.19", - "@visactor/react-vrender": "workspace:1.0.19", + "@visactor/vrender": "workspace:1.0.20", + "@visactor/react-vrender": "workspace:1.0.20", "@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 091a4cada..a025d28ab 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.20", + "tag": "@visactor/react-vrender_v1.0.20", + "date": "Mon, 27 Oct 2025 06:44:49 GMT", + "comments": {} + }, { "version": "1.0.19", "tag": "@visactor/react-vrender_v1.0.19", diff --git a/packages/react-vrender/CHANGELOG.md b/packages/react-vrender/CHANGELOG.md index fa40a16f4..775bef7df 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 Thu, 23 Oct 2025 07:49:11 GMT and should not be manually modified. +This log was last generated on Mon, 27 Oct 2025 06:44:49 GMT and should not be manually modified. + +## 1.0.20 +Mon, 27 Oct 2025 06:44:49 GMT + +_Version update only_ ## 1.0.19 Thu, 23 Oct 2025 07:49:11 GMT diff --git a/packages/react-vrender/package.json b/packages/react-vrender/package.json index 95db7aefa..b6a9270f3 100644 --- a/packages/react-vrender/package.json +++ b/packages/react-vrender/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/react-vrender", - "version": "1.0.19", + "version": "1.0.20", "description": "", "sideEffects": false, "main": "cjs/index.js", @@ -23,7 +23,7 @@ "react": "^18.2.0" }, "dependencies": { - "@visactor/vrender": "workspace:1.0.19", + "@visactor/vrender": "workspace:1.0.20", "@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 5e10168ef..73c55435d 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.20", + "tag": "@visactor/vrender-animate_v1.0.20", + "date": "Mon, 27 Oct 2025 06:44:49 GMT", + "comments": {} + }, { "version": "1.0.19", "tag": "@visactor/vrender-animate_v1.0.19", diff --git a/packages/vrender-animate/CHANGELOG.md b/packages/vrender-animate/CHANGELOG.md index d1ea10799..64c483063 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 Thu, 23 Oct 2025 07:49:11 GMT and should not be manually modified. +This log was last generated on Mon, 27 Oct 2025 06:44:49 GMT and should not be manually modified. + +## 1.0.20 +Mon, 27 Oct 2025 06:44:49 GMT + +_Version update only_ ## 1.0.19 Thu, 23 Oct 2025 07:49:11 GMT diff --git a/packages/vrender-animate/package.json b/packages/vrender-animate/package.json index af482a84e..50a1c6c33 100644 --- a/packages/vrender-animate/package.json +++ b/packages/vrender-animate/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vrender-animate", - "version": "1.0.19", + "version": "1.0.20", "description": "", "sideEffects": false, "main": "cjs/index.js", @@ -21,7 +21,7 @@ }, "dependencies": { "@visactor/vutils": "1.0.6", - "@visactor/vrender-core": "workspace:1.0.19" + "@visactor/vrender-core": "workspace:1.0.20" }, "devDependencies": { "@internal/bundler": "workspace:*", diff --git a/packages/vrender-components/CHANGELOG.json b/packages/vrender-components/CHANGELOG.json index dc273ebac..c41739412 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.20", + "tag": "@visactor/vrender-components_v1.0.20", + "date": "Mon, 27 Oct 2025 06:44:49 GMT", + "comments": { + "none": [ + { + "comment": "refactor: add drag interaction for table seriesnumber component\n\n" + } + ] + } + }, { "version": "1.0.19", "tag": "@visactor/vrender-components_v1.0.19", diff --git a/packages/vrender-components/CHANGELOG.md b/packages/vrender-components/CHANGELOG.md index 411f71dcc..6852eb8df 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 Thu, 23 Oct 2025 07:49:11 GMT and should not be manually modified. +This log was last generated on Mon, 27 Oct 2025 06:44:49 GMT and should not be manually modified. + +## 1.0.20 +Mon, 27 Oct 2025 06:44:49 GMT + +### Updates + +- refactor: add drag interaction for table seriesnumber component + + ## 1.0.19 Thu, 23 Oct 2025 07:49:11 GMT diff --git a/packages/vrender-components/package.json b/packages/vrender-components/package.json index f919bc825..e4dd55289 100644 --- a/packages/vrender-components/package.json +++ b/packages/vrender-components/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vrender-components", - "version": "1.0.19", + "version": "1.0.20", "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.19", - "@visactor/vrender-kits": "workspace:1.0.19", - "@visactor/vrender-animate": "workspace:1.0.19" + "@visactor/vrender-core": "workspace:1.0.20", + "@visactor/vrender-kits": "workspace:1.0.20", + "@visactor/vrender-animate": "workspace:1.0.20" }, "devDependencies": { "@internal/bundler": "workspace:*", diff --git a/packages/vrender-components/src/table-series-number/event-manager.ts b/packages/vrender-components/src/table-series-number/event-manager.ts index eb432c738..9fb610d5c 100644 --- a/packages/vrender-components/src/table-series-number/event-manager.ts +++ b/packages/vrender-components/src/table-series-number/event-manager.ts @@ -149,11 +149,18 @@ export class TableSeriesNumberEventManager { const XYtoTarget = { x: 0, y: 0 }; target.globalTransMatrix.transformPoint(canvasPointXY, XYtoTarget); + //假如校验后，是整列被选中状态。鼠标样式变为抓手样式 if ( XYtoTarget.x <= 4 || (XYtoTarget.x <= target.getAttributes().width && XYtoTarget.x >= target.getAttributes().width - 4) ) { target.setAttribute('cursor', 'col-resize'); + } else if ( + colIndex !== undefined && + colIndex !== null && + this._tableSeriesNumber.attribute.checkMoveColumnOrder?.(colIndex) + ) { + target.setAttribute('cursor', 'grab'); } else { target.setAttribute('cursor', 'default'); } @@ -169,6 +176,12 @@ export class TableSeriesNumberEventManager { (XYtoTarget.y <= target.getAttributes().height && XYtoTarget.y >= target.getAttributes().height - 4) ) { target.setAttribute('cursor', 'row-resize'); + } else if ( + rowIndex !== undefined && + rowIndex !== null && + this._tableSeriesNumber.attribute.checkMoveRowOrder?.(rowIndex) + ) { + target.setAttribute('cursor', 'grab'); } else { target.setAttribute('cursor', 'default'); } @@ -218,6 +231,16 @@ export class TableSeriesNumberEventManager { event: e }); return; + } else if ( + colIndex !== undefined && + colIndex !== null && + this._tableSeriesNumber.attribute.checkMoveColumnOrder?.(colIndex) + ) { + this._tableSeriesNumber.dispatchTableSeriesNumberEvent(SeriesNumberEvent.dragColumnOrderStart, { + colIndex: colIndex, + event: e + }); + return; } } else if (target.name.startsWith('row')) { //判断鼠标是否位于行间隔线附近，如果是则触发resizeRowHeightStart事件 @@ -239,6 +262,16 @@ export class TableSeriesNumberEventManager { event: e }); return; + } else if ( + rowIndex !== undefined && + rowIndex !== null && + this._tableSeriesNumber.attribute.checkMoveRowOrder?.(rowIndex) + ) { + this._tableSeriesNumber.dispatchTableSeriesNumberEvent(SeriesNumberEvent.dragRowOrderStart, { + rowIndex: rowIndex, + event: e + }); + return; } } this.isPointerDownStartSelect = true; diff --git a/packages/vrender-components/src/table-series-number/type.ts b/packages/vrender-components/src/table-series-number/type.ts index df7bb09d8..b79886f31 100644 --- a/packages/vrender-components/src/table-series-number/type.ts +++ b/packages/vrender-components/src/table-series-number/type.ts @@ -25,7 +25,9 @@ export enum SeriesNumberEvent { /** 调整列宽开始 */ resizeColWidthStart = 'resizeColWidthStart', /** 右键事件 */ - seriesNumberCellRightClick = 'seriesNumberCellRightClick' + seriesNumberCellRightClick = 'seriesNumberCellRightClick', + dragColumnOrderStart = 'dragColumnOrderStart', + dragRowOrderStart = 'dragRowOrderStart' } export type TableSeriesNumberAttributes = IGroupGraphicAttribute & { frozenRowCount?: number; @@ -112,4 +114,6 @@ export type TableSeriesNumberAttributes = IGroupGraphicAttribute & { // **/ // triggerOff?: GraphicEventType; // }; + checkMoveColumnOrder?: (colIndex: number) => boolean; + checkMoveRowOrder?: (rowIndex: number) => boolean; }; diff --git a/packages/vrender-core/CHANGELOG.json b/packages/vrender-core/CHANGELOG.json index 97985acde..b30873f94 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.20", + "tag": "@visactor/vrender-core_v1.0.20", + "date": "Mon, 27 Oct 2025 06:44:49 GMT", + "comments": {} + }, { "version": "1.0.19", "tag": "@visactor/vrender-core_v1.0.19", diff --git a/packages/vrender-core/CHANGELOG.md b/packages/vrender-core/CHANGELOG.md index a0619dfce..3e1a9c64e 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 Thu, 23 Oct 2025 07:49:11 GMT and should not be manually modified. +This log was last generated on Mon, 27 Oct 2025 06:44:49 GMT and should not be manually modified. + +## 1.0.20 +Mon, 27 Oct 2025 06:44:49 GMT + +_Version update only_ ## 1.0.19 Thu, 23 Oct 2025 07:49:11 GMT diff --git a/packages/vrender-core/package.json b/packages/vrender-core/package.json index 898aabfba..6048d51fb 100644 --- a/packages/vrender-core/package.json +++ b/packages/vrender-core/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vrender-core", - "version": "1.0.19", + "version": "1.0.20", "description": "", "sideEffects": [ "./src/modules.ts", diff --git a/packages/vrender-kits/CHANGELOG.json b/packages/vrender-kits/CHANGELOG.json index f6c831a8d..abe2ee0b8 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.20", + "tag": "@visactor/vrender-kits_v1.0.20", + "date": "Mon, 27 Oct 2025 06:44:49 GMT", + "comments": {} + }, { "version": "1.0.19", "tag": "@visactor/vrender-kits_v1.0.19", diff --git a/packages/vrender-kits/CHANGELOG.md b/packages/vrender-kits/CHANGELOG.md index 87aeea994..0dd1163ca 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 Thu, 23 Oct 2025 07:49:11 GMT and should not be manually modified. +This log was last generated on Mon, 27 Oct 2025 06:44:49 GMT and should not be manually modified. + +## 1.0.20 +Mon, 27 Oct 2025 06:44:49 GMT + +_Version update only_ ## 1.0.19 Thu, 23 Oct 2025 07:49:11 GMT diff --git a/packages/vrender-kits/package.json b/packages/vrender-kits/package.json index 7e1242331..51d62b341 100644 --- a/packages/vrender-kits/package.json +++ b/packages/vrender-kits/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vrender-kits", - "version": "1.0.19", + "version": "1.0.20", "description": "", "sideEffects": false, "main": "cjs/index.js", @@ -21,7 +21,7 @@ }, "dependencies": { "@visactor/vutils": "1.0.6", - "@visactor/vrender-core": "workspace:1.0.19", + "@visactor/vrender-core": "workspace:1.0.20", "@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 e21520afd..53f9c701c 100644 --- a/packages/vrender/CHANGELOG.json +++ b/packages/vrender/CHANGELOG.json @@ -1,6 +1,12 @@ { "name": "@visactor/vrender", "entries": [ + { + "version": "1.0.20", + "tag": "@visactor/vrender_v1.0.20", + "date": "Mon, 27 Oct 2025 06:44:49 GMT", + "comments": {} + }, { "version": "1.0.19", "tag": "@visactor/vrender_v1.0.19", diff --git a/packages/vrender/CHANGELOG.md b/packages/vrender/CHANGELOG.md index f5396075c..1789b2512 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 Thu, 23 Oct 2025 07:49:11 GMT and should not be manually modified. +This log was last generated on Mon, 27 Oct 2025 06:44:49 GMT and should not be manually modified. + +## 1.0.20 +Mon, 27 Oct 2025 06:44:49 GMT + +_Version update only_ ## 1.0.19 Thu, 23 Oct 2025 07:49:11 GMT diff --git a/packages/vrender/package.json b/packages/vrender/package.json index d053d4d1e..638c95abe 100644 --- a/packages/vrender/package.json +++ b/packages/vrender/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vrender", - "version": "1.0.19", + "version": "1.0.20", "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.19", - "@visactor/vrender-kits": "workspace:1.0.19", - "@visactor/vrender-animate": "workspace:1.0.19", - "@visactor/vrender-components": "workspace:1.0.19" + "@visactor/vrender-core": "workspace:1.0.20", + "@visactor/vrender-kits": "workspace:1.0.20", + "@visactor/vrender-animate": "workspace:1.0.20", + "@visactor/vrender-components": "workspace:1.0.20" }, "devDependencies": { "@internal/bundler": "workspace:*", diff --git a/tools/bugserver-trigger/package.json b/tools/bugserver-trigger/package.json index fb27ff6bc..ab1e461d9 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.19", - "@visactor/vrender-core": "workspace:1.0.19", - "@visactor/vrender-kits": "workspace:1.0.19", - "@visactor/vrender-components": "workspace:1.0.19", - "@visactor/vrender-animate": "workspace:1.0.19" + "@visactor/vrender": "workspace:1.0.20", + "@visactor/vrender-core": "workspace:1.0.20", + "@visactor/vrender-kits": "workspace:1.0.20", + "@visactor/vrender-components": "workspace:1.0.20", + "@visactor/vrender-animate": "workspace:1.0.20" }, "devDependencies": { "@rushstack/eslint-patch": "~1.1.4",