fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-05-08 06:59:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into next

Browse Source
This commit is contained in:
GitHub Actions Bot 2024-08-17 09:39:24 +00:00
commit cd4b071831
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/core/client/src/modules/blocks/data-blocks/table/hooks/useTableBlockProps.tsx
View File

@ -78,13 +78,11 @@ export const useTableBlockProps = () => {
), ),
onChange: useCallback( onChange: useCallback(
({ current, pageSize }, filters, sorter) => { ({ current, pageSize }, filters, sorter) => {
const sort = !ctx.dragSort const sort = sorter.order
? sorter.order ? sorter.order === `ascend`
? sorter.order === `ascend` ? [sorter.field]
? [sorter.field] : [`-${sorter.field}`]
: [`-${sorter.field}`] : globalSort || ctx.dragSortBy;
: globalSort || ctx.dragSortBy
: ctx.dragSortBy;
const currentPageSize = pageSize || fieldSchema.parent?.['x-decorator-props']?.['params']?.pageSize; const currentPageSize = pageSize || fieldSchema.parent?.['x-decorator-props']?.['params']?.pageSize;
const args = { ...params?.[0], page: current || 1, pageSize: currentPageSize }; const args = { ...params?.[0], page: current || 1, pageSize: currentPageSize };
if (sort) { if (sort) {
@ -92,7 +90,7 @@ export const useTableBlockProps = () => {
} }
ctx.service.run(args); ctx.service.run(args);
}, },
[globalSort, params], [globalSort, params, ctx.dragSort],
), ),
onClickRow: useCallback( onClickRow: useCallback(
(record, setSelectedRow, selectedRow) => { (record, setSelectedRow, selectedRow) => {