fix: fix sort icon update in merge cell

VisActor · Oct 12, 2024 · 6345d76 · 6345d76
1 parent ebceb5e
commit 6345d76
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/common/changes/@visactor/vtable/fix-merge-sort-icon_2024-10-11-12-38.json b/common/changes/@visactor/vtable/fix-merge-sort-icon_2024-10-11-12-38.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@visactor/vtable",
+      "comment": "fix: fix sort icon update in merge cell",
+      "type": "none"
+    }
+  ],
+  "packageName": "@visactor/vtable"
+}
diff --git a/packages/vtable/src/state/state.ts b/packages/vtable/src/state/state.ts
@@ -1274,7 +1274,8 @@ export class StateManager {
     // 执行sort
     dealSort(col, row, this.table as ListTableAPI, event);
 
-    const currentSortItem = this.sort.find(item => item.col === col && item.row === row);
+    const range = this.table.getCellRange(col, row);
+    const currentSortItem = this.sort.find(item => item.col === range.start.col && item.row === range.start.row);
 
     const oldSortCol = this.table.internalProps.multipleSort || !previousSortItem ? null : previousSortItem.col;
     const oldSortRow = this.table.internalProps.multipleSort || !previousSortItem ? null : previousSortItem.row;