From 8b482124183bef41b31bb296c6d9cd716f87f548 Mon Sep 17 00:00:00 2001
From: Rui-Sun <sunrui1992@foxmail.com>
Date: Mon, 1 Jul 2024 20:15:57 +0800
Subject: [PATCH] fix: fix frozen cell update problem in sort #1997

---
 .../fix-sort-update_2024-07-01-12-15.json     | 10 +++++
 .../update-position/sort-horizontal.ts        | 12 ++---
 .../progress/update-position/sort-vertical.ts | 44 +++++++++----------
 3 files changed, 39 insertions(+), 27 deletions(-)
 create mode 100644 common/changes/@visactor/vtable/fix-sort-update_2024-07-01-12-15.json

diff --git a/common/changes/@visactor/vtable/fix-sort-update_2024-07-01-12-15.json b/common/changes/@visactor/vtable/fix-sort-update_2024-07-01-12-15.json
new file mode 100644
index 000000000..1414d72c4
--- /dev/null
+++ b/common/changes/@visactor/vtable/fix-sort-update_2024-07-01-12-15.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@visactor/vtable",
+      "comment": "fix: fix frozen cell update problem in sort #1997",
+      "type": "none"
+    }
+  ],
+  "packageName": "@visactor/vtable"
+}
\ No newline at end of file
diff --git a/packages/vtable/src/scenegraph/group-creater/progress/update-position/sort-horizontal.ts b/packages/vtable/src/scenegraph/group-creater/progress/update-position/sort-horizontal.ts
index ce6cdb98d..f52e87eb2 100644
--- a/packages/vtable/src/scenegraph/group-creater/progress/update-position/sort-horizontal.ts
+++ b/packages/vtable/src/scenegraph/group-creater/progress/update-position/sort-horizontal.ts
@@ -14,6 +14,13 @@ export async function sortHorizontal(proxy: SceneProxy) {
       });
     }
   });
+
+  // 更新同步范围
+  const syncLeftCol = Math.max(proxy.bodyLeftCol, proxy.screenLeftCol - proxy.screenColCount * 1);
+  const syncRightCol = Math.min(proxy.bodyRightCol, proxy.screenLeftCol + proxy.screenColCount * 2);
+
+  computeColsWidth(proxy.table, syncLeftCol, syncRightCol);
+
   for (let col = proxy.colStart; col <= proxy.colEnd; col++) {
     // 将该列的chartInstance清除掉
     const columnGroup = proxy.table.scenegraph.getColGroup(col);
@@ -33,11 +40,6 @@ export async function sortHorizontal(proxy: SceneProxy) {
       proxy.table.scenegraph.updateCellContent(col, row);
     }
   }
-  // 更新同步范围
-  const syncLeftCol = Math.max(proxy.bodyLeftCol, proxy.screenLeftCol - proxy.screenColCount * 1);
-  const syncRightCol = Math.min(proxy.bodyRightCol, proxy.screenLeftCol + proxy.screenColCount * 2);
-
-  computeColsWidth(proxy.table, syncLeftCol, syncRightCol);
 
   updateColContent(syncLeftCol, syncRightCol, proxy);
 
diff --git a/packages/vtable/src/scenegraph/group-creater/progress/update-position/sort-vertical.ts b/packages/vtable/src/scenegraph/group-creater/progress/update-position/sort-vertical.ts
index 1dd54ec48..6f8a21d3d 100644
--- a/packages/vtable/src/scenegraph/group-creater/progress/update-position/sort-vertical.ts
+++ b/packages/vtable/src/scenegraph/group-creater/progress/update-position/sort-vertical.ts
@@ -15,6 +15,28 @@ export async function sortVertical(proxy: SceneProxy) {
     }
   });
 
+  // 更新同步范围
+  let syncTopRow;
+  let syncBottomRow;
+  if (proxy.table.heightMode === 'autoHeight') {
+    syncTopRow = proxy.rowStart;
+    syncBottomRow = proxy.rowEnd;
+  } else {
+    syncTopRow = Math.max(proxy.bodyTopRow, proxy.screenTopRow - proxy.screenRowCount * 1);
+    syncBottomRow = Math.min(proxy.bodyBottomRow, proxy.screenTopRow + proxy.screenRowCount * 2);
+  }
+  // console.log('sort更新同步范围', syncTopRow, syncBottomRow);
+
+  const oldBodyHeight = proxy.table.getAllRowsHeight();
+
+  computeRowsHeight(proxy.table, syncTopRow, syncBottomRow);
+
+  const newBodyHeight = proxy.table.getAllRowsHeight();
+
+  if (oldBodyHeight !== newBodyHeight) {
+    proxy.table.scenegraph.updateContainerHeight(proxy.table.frozenRowCount, newBodyHeight - oldBodyHeight);
+  }
+
   for (let col = 0; col < proxy.table.frozenColCount ?? 0; col++) {
     // 将该列的chartInstance清除掉
     const columnGroup = proxy.table.scenegraph.getColGroup(col);
@@ -46,28 +68,6 @@ export async function sortVertical(proxy: SceneProxy) {
     }
   }
 
-  // 更新同步范围
-  let syncTopRow;
-  let syncBottomRow;
-  if (proxy.table.heightMode === 'autoHeight') {
-    syncTopRow = proxy.rowStart;
-    syncBottomRow = proxy.rowEnd;
-  } else {
-    syncTopRow = Math.max(proxy.bodyTopRow, proxy.screenTopRow - proxy.screenRowCount * 1);
-    syncBottomRow = Math.min(proxy.bodyBottomRow, proxy.screenTopRow + proxy.screenRowCount * 2);
-  }
-  // console.log('sort更新同步范围', syncTopRow, syncBottomRow);
-
-  const oldBodyHeight = proxy.table.getAllRowsHeight();
-
-  computeRowsHeight(proxy.table, syncTopRow, syncBottomRow);
-
-  const newBodyHeight = proxy.table.getAllRowsHeight();
-
-  if (oldBodyHeight !== newBodyHeight) {
-    proxy.table.scenegraph.updateContainerHeight(proxy.table.frozenRowCount, newBodyHeight - oldBodyHeight);
-  }
-
   updateRowContent(syncTopRow, syncBottomRow, proxy);
 
   if (proxy.table.heightMode === 'autoHeight') {