Merge pull request #2793 from VisActor/fix-sortState-fieldUndefined-e…

…rror Fix sort state field undefined error
VisActor · Nov 11, 2024 · 9c6ce67 · 9c6ce67
2 parents 8d2ebcb + c49ec28
commit 9c6ce67
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 6 deletions.
diff --git a/common/changes/@visactor/vtable/fix-sortState-fieldUndefined-error_2024-11-07-14-50.json b/common/changes/@visactor/vtable/fix-sortState-fieldUndefined-error_2024-11-07-14-50.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "fix: sortState field undefined occor error\n\n",
+      "type": "none",
+      "packageName": "@visactor/vtable"
+    }
+  ],
+  "packageName": "@visactor/vtable",
+  "email": "892739385@qq.com"
+}
diff --git a/packages/vtable/src/ListTable.ts b/packages/vtable/src/ListTable.ts
@@ -1112,8 +1112,10 @@ export class ListTable extends BaseTable implements ListTableAPI {
 
     //重复逻辑抽取updateWidthHeight
     if (sort !== undefined) {
-      this.internalProps.sortState = this.internalProps.multipleSort ? (Array.isArray(sort) ? sort : [sort]) : sort;
-      this.stateManager.setSortState((this as any).sortState as SortState);
+      if ((!Array.isArray(sort) && isValid(sort.field)) || Array.isArray(sort)) {
+        this.internalProps.sortState = this.internalProps.multipleSort ? (Array.isArray(sort) ? sort : [sort]) : sort;
+        this.stateManager.setSortState((this as any).sortState as SortState);
+      }
     }
     if (records) {
       _setRecords(this, records);

diff --git a/packages/vtable/src/state/state.ts b/packages/vtable/src/state/state.ts
@@ -519,15 +519,15 @@ export class StateManager {
           prev.push({
             field: item.field,
             order: item.order,
-            row: column.startInTotal + this.table.internalProps.layoutMap.leftRowSeriesNumberColumnCount ?? 0,
-            col: column.level
+            row: column?.startInTotal + this.table.internalProps.layoutMap.leftRowSeriesNumberColumnCount ?? 0,
+            col: column?.level
           } as any);
         } else {
           prev.push({
             field: item.field,
             order: item.order,
-            col: column.startInTotal + this.table.internalProps.layoutMap.leftRowSeriesNumberColumnCount ?? 0,
-            row: column.level
+            col: column?.startInTotal + this.table.internalProps.layoutMap.leftRowSeriesNumberColumnCount ?? 0,
+            row: column?.level
           } as any);
         }