fix: pivot sort state show error when rows and columns have same dimension #5055

Author: fangsmile

packages/vtable/examples/menu.ts

@@ -301,6 +301,10 @@ export const menus = [
       {
         path: 'pivot',
         name: 'pivot-autoFillWidth'
+      },
+      {
+        path: 'pivot',
+        name: 'pivot-sort-state-echo'
       }
     ]
   },

packages/vtable/examples/pivot/pivot-sort-state-echo.ts

@@ -0,0 +1,49 @@
+import * as VTable from '../../src';
+const PivotTable = VTable.PivotTable;
+const CONTAINER_ID = 'vTable';
+
+export function createTable() {
+  const option: VTable.PivotTableConstructorOptions = {
+    records: [
+      { Category: 'A', 'Sub-Category': 'A1', Sales: 100, Profit: 10 },
+      { Category: 'A', 'Sub-Category': 'A2', Sales: 150, Profit: 15 },
+      { Category: 'B', 'Sub-Category': 'B1', Sales: 200, Profit: 20 },
+      { Category: 'B', 'Sub-Category': 'B2', Sales: 250, Profit: 25 }
+    ],
+    rows: [
+      {
+        dimensionKey: 'Category',
+        title: 'Category',
+        showSortInCorner: true
+      }
+    ],
+    columns: [
+      {
+        dimensionKey: 'Category',
+        title: 'Category',
+        showSortInCorner: true
+      }
+    ],
+    indicators: [
+      { indicatorKey: 'Sales', title: 'Sales', showSortInCorner: true } as any,
+      { indicatorKey: 'Profit', title: 'Profit', showSortInCorner: true } as any
+    ],
+    corner: {
+      titleOnDimension: 'all'
+    },
+    pivotSortState: [
+      {
+        dimensions: [
+          {
+            dimensionKey: 'Category',
+            isPivotCorner: true
+          }
+        ],
+        order: 'desc'
+      }
+    ]
+  };
+
+  const instance = new PivotTable(document.getElementById(CONTAINER_ID)!, option);
+  (window as any).tableInstance = instance;
+}

packages/vtable/src/PivotTable.ts

@@ -1348,8 +1348,23 @@ export class PivotTable extends BaseTable implements PivotTableAPI {
     for (let i = 0; i < this.pivotSortState.length; i++) {
       const pivotState = this.pivotSortState[i];
       const dimensions = pivotState.dimensions;
+
+      if (this.isCornerHeader(col, row)) {
+        const header = (this.internalProps.layoutMap as PivotHeaderLayoutMap).getHeader(col, row) as HeaderData;
+        if (header && header.pivotInfo && dimensions && dimensions.length > 0) {
+          const dim1 = dimensions[0];
+          const dim2 = header.pivotInfo;
+          if (
+            (dim1.isPivotCorner || (!isValid(dim1.isPivotCorner) && dim1.dimensionKey && !dim1.value)) &&
+            dim2.isPivotCorner &&
+            (dim1.dimensionKey === dim2.dimensionKey || dim1.value === dim2.dimensionKey)
+          ) {
+            return pivotState.order;
+          }
+        }
+      }
+
       const cell = this.getCellAddressByHeaderPaths(dimensions);
-      // const { col: sortCol, row: sortRow, order } = this.pivotSortState[i];
       const order = pivotState.order;
 
       if (cell && cellInRange(cellRange, cell.col, cell.row)) {