Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions common/config/rush/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion common/config/rush/version-policies.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[{"definitionName":"lockStepVersion","policyName":"vrenderMain","version":"1.0.19","nextBump":"patch"}]
[{"definitionName":"lockStepVersion","policyName":"vrenderMain","version":"1.0.20","nextBump":"patch"}]
2 changes: 1 addition & 1 deletion docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 6 additions & 0 deletions packages/react-vrender-utils/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
7 changes: 6 additions & 1 deletion packages/react-vrender-utils/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions packages/react-vrender-utils/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@visactor/react-vrender-utils",
"version": "1.0.19",
"version": "1.0.20",
"description": "",
"sideEffects": false,
"main": "cjs/index.js",
Expand All @@ -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"
Expand Down
6 changes: 6 additions & 0 deletions packages/react-vrender/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
7 changes: 6 additions & 1 deletion packages/react-vrender/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions packages/react-vrender/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@visactor/react-vrender",
"version": "1.0.19",
"version": "1.0.20",
"description": "",
"sideEffects": false,
"main": "cjs/index.js",
Expand All @@ -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"
Expand Down
6 changes: 6 additions & 0 deletions packages/vrender-animate/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
7 changes: 6 additions & 1 deletion packages/vrender-animate/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions packages/vrender-animate/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@visactor/vrender-animate",
"version": "1.0.19",
"version": "1.0.20",
"description": "",
"sideEffects": false,
"main": "cjs/index.js",
Expand All @@ -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:*",
Expand Down
12 changes: 12 additions & 0 deletions packages/vrender-components/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
11 changes: 10 additions & 1 deletion packages/vrender-components/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 4 additions & 4 deletions packages/vrender-components/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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:*",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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');
}
Expand All @@ -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');
}
Expand Down Expand Up @@ -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事件
Expand All @@ -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;
Expand Down
6 changes: 5 additions & 1 deletion packages/vrender-components/src/table-series-number/type.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ export enum SeriesNumberEvent {
/** 调整列宽开始 */
resizeColWidthStart = 'resizeColWidthStart',
/** 右键事件 */
seriesNumberCellRightClick = 'seriesNumberCellRightClick'
seriesNumberCellRightClick = 'seriesNumberCellRightClick',
dragColumnOrderStart = 'dragColumnOrderStart',
dragRowOrderStart = 'dragRowOrderStart'
}
export type TableSeriesNumberAttributes = IGroupGraphicAttribute & {
frozenRowCount?: number;
Expand Down Expand Up @@ -112,4 +114,6 @@ export type TableSeriesNumberAttributes = IGroupGraphicAttribute & {
// **/
// triggerOff?: GraphicEventType;
// };
checkMoveColumnOrder?: (colIndex: number) => boolean;
checkMoveRowOrder?: (rowIndex: number) => boolean;
};
Loading
Loading