From f8fb5b187a20ad3197926d714a0bd70b2cf3edf2 Mon Sep 17 00:00:00 2001 From: "bai.zixv" Date: Fri, 19 Jul 2024 12:24:12 +0800 Subject: [PATCH] fix: approval, fixed sort (#1356) Reviewed-on: https://git.daoyoucloud.com/daoyoucloud/tachybase/pulls/1356 --- .../blocks/data-blocks/table/hooks/useTableBlockProps.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 36095b87c..647f04725 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 @@ -71,7 +71,10 @@ export const useTableBlockProps = () => { ? [sorter.field] : [`-${sorter.field}`] : parentSort; - ctx.service.run({ ...ctx.service.params?.[0], page: current, pageSize, sort }); + // NOTE: 这里将原本就有的排序参数保留 + const sortParams = ctx.params.sort || []; + const sortFinal = [...new Set([...sortParams, ...(sort || [])])]; + ctx.service.run({ ...ctx.service.params?.[0], page: current, pageSize, sort: sortFinal }); }, onClickRow(record, setSelectedRow, selectedRow) { const { targets, uid } = findFilterTargets(fieldSchema);