fix: change_header_position_start event add argumment

VisActor · Oct 11, 2024 · 2caaf3c · 2caaf3c
1 parent da6b074
commit 2caaf3c
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git a/packages/vtable/__tests__/columns/listTable-dragHeader.test.ts b/packages/vtable/__tests__/columns/listTable-dragHeader.test.ts
@@ -78,7 +78,7 @@ describe('listTable-cellType-function init test', () => {
   const listTable = new ListTable(containerDom, option);
   test('listTable dragHeader interaction', () => {
     listTable.selectCell(4, 1);
-    listTable.stateManager.startMoveCol(4, 1, 342, 60);
+    listTable.stateManager.startMoveCol(4, 1, 342, 60, null);
     listTable.stateManager.updateMoveCol(1, 1, 100, 60);
     listTable.stateManager.endMoveCol();
     expect(listTable.columns).toEqual([

diff --git a/packages/vtable/examples/cell-move/pivot-move.ts b/packages/vtable/examples/cell-move/pivot-move.ts
@@ -462,7 +462,7 @@ export function createTable() {
     console.log('copy_data', e);
   });
 
-  VTable.bindDebugTool(instance.scenegraph.stage as any, {
-    customGrapicKeys: ['role', '_updateTag']
-  });
+  // VTable.bindDebugTool(instance.scenegraph.stage as any, {
+  //   customGrapicKeys: ['role', '_updateTag']
+  // });
 }
diff --git a/packages/vtable/examples/unit-test-demo/unitTestPivotTable.ts b/packages/vtable/examples/unit-test-demo/unitTestPivotTable.ts
@@ -438,6 +438,7 @@ export function createTable(el: any, v: any) {
   ];
   //初始化表格
   const tableInstance = new PivotTable({
+    dragHeaderMode: 'all',
     container: document.getElementById(CONTAINER_ID),
     rowTree,
     columnTree,

diff --git a/packages/vtable/src/event/event.ts b/packages/vtable/src/event/event.ts
@@ -594,11 +594,11 @@ export class EventManager {
       this.table._canDragHeaderPosition(eventArgs.col, eventArgs.row)
     ) {
       this.table.stateManager.startMoveCol(
-        eventArgs.event.nativeEvent,
         eventArgs.col,
         eventArgs.row,
         eventArgsSet.abstractPos.x,
-        eventArgsSet.abstractPos.y
+        eventArgsSet.abstractPos.y,
+        eventArgs?.event?.nativeEvent
       );
       return true;
     }

diff --git a/packages/vtable/src/event/listener/table-group.ts b/packages/vtable/src/event/listener/table-group.ts
@@ -557,11 +557,11 @@ export function bindTableGroupListener(eventManager: EventManager) {
         }
       } else if ((hitIcon.attribute as any).funcType === IconFuncTypeEnum.dragReorder) {
         stateManager.startMoveCol(
-          e.nativeEvent,
           eventArgsSet.eventArgs.col,
           eventArgsSet.eventArgs.row,
           eventArgsSet.abstractPos.x,
-          eventArgsSet.abstractPos.y
+          eventArgsSet.abstractPos.y,
+          eventArgsSet.eventArgs?.event?.nativeEvent
         );
         stateManager.updateInteractionState(InteractionState.grabing);
       }

diff --git a/packages/vtable/src/state/state.ts b/packages/vtable/src/state/state.ts
@@ -802,7 +802,7 @@ export class StateManager {
     this.fillHandle.beforeFillMinRow = undefined;
   }
 
-  startMoveCol(event: MouseEvent | PointerEvent | TouchEvent, col: number, row: number, x: number, y: number) {
+  startMoveCol(col: number, row: number, x: number, y: number, event: MouseEvent | PointerEvent | TouchEvent) {
     startMoveCol(col, row, x, y, this);
     this.table.fireListeners(TABLE_EVENT_TYPE.CHANGE_HEADER_POSITION_START, { col, row, x, y, event });
   }