支持多字段默认排序defSort数组

pull/8722/head
JEECG 2025-08-11 18:47:43 +08:00
parent b474e9e5a5
commit 83bb0a0a6a
3 changed files with 21 additions and 7 deletions

View File

@ -238,12 +238,20 @@ export function useDataSource(
const { sortInfo = {}, filterInfo } = searchState; const { sortInfo = {}, filterInfo } = searchState;
//
let defSortInfo: Recordable<any> | undefined = {};
if (defSort && Array.isArray(defSort) && defSort.length > 0) {
defSortInfo['defSortString'] = JSON.stringify(defSort);
} else {
defSortInfo = defSort;
}
let params: Recordable = { let params: Recordable = {
...pageParams, ...pageParams,
// getFieldsValue validate // getFieldsValue validate
...(useSearchForm ? await validate() : {}), ...(useSearchForm ? await validate() : {}),
...searchInfo, ...searchInfo,
...defSort, ...defSortInfo,
...(opt?.searchInfo ?? {}), ...(opt?.searchInfo ?? {}),
...sortInfo, ...sortInfo,
...filterInfo, ...filterInfo,

View File

@ -190,7 +190,7 @@ export interface BasicTableProps<T = any> {
// //
searchInfo?: Recordable; searchInfo?: Recordable;
// //
defSort?: Recordable; defSort?: Recordable | Recordable[];
// 使 // 使
useSearchForm?: boolean; useSearchForm?: boolean;
// //

View File

@ -123,11 +123,17 @@
style: { textAlign: 'left' }, style: { textAlign: 'left' },
}, },
}, },
// //
defSort: { defSort: [
column: 'createTime,sex', {
column: 'name',
order: 'desc', order: 'desc',
}, },
{
column: 'sex',
order: 'asc',
},
],
striped: true, striped: true,
useSearchForm: true, useSearchForm: true,
showTableSetting: true, showTableSetting: true,