From ea943b303b1c7c592be4c3a473d4a2535cba0a89 Mon Sep 17 00:00:00 2001
From: Katherine <katherine_15995@163.com>
Date: Sat, 17 Aug 2024 17:33:34 +0800
Subject: [PATCH] fix: sorting of Table block data (#5071)

---
 .../data-blocks/table/hooks/useTableBlockProps.tsx | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/packages/core/client/src/modules/blocks/data-blocks/table/hooks/useTableBlockProps.tsx b/packages/core/client/src/modules/blocks/data-blocks/table/hooks/useTableBlockProps.tsx
index 59c9af11ea..ccaf5453ce 100644
--- a/packages/core/client/src/modules/blocks/data-blocks/table/hooks/useTableBlockProps.tsx
+++ b/packages/core/client/src/modules/blocks/data-blocks/table/hooks/useTableBlockProps.tsx
@@ -78,13 +78,11 @@ export const useTableBlockProps = () => {
     ),
     onChange: useCallback(
       ({ current, pageSize }, filters, sorter) => {
-        const sort = !ctx.dragSort
-          ? sorter.order
-            ? sorter.order === `ascend`
-              ? [sorter.field]
-              : [`-${sorter.field}`]
-            : globalSort || ctx.dragSortBy
-          : ctx.dragSortBy;
+        const sort = sorter.order
+          ? sorter.order === `ascend`
+            ? [sorter.field]
+            : [`-${sorter.field}`]
+          : globalSort || ctx.dragSortBy;
         const currentPageSize = pageSize || fieldSchema.parent?.['x-decorator-props']?.['params']?.pageSize;
         const args = { ...params?.[0], page: current || 1, pageSize: currentPageSize };
         if (sort) {
@@ -92,7 +90,7 @@ export const useTableBlockProps = () => {
         }
         ctx.service.run(args);
       },
-      [globalSort, params],
+      [globalSort, params, ctx.dragSort],
     ),
     onClickRow: useCallback(
       (record, setSelectedRow, selectedRow) => {