diff --git a/apps/web-antd/src/views/license/license/data.ts b/apps/web-antd/src/views/license/license/data.ts index b4daed1..812a950 100644 --- a/apps/web-antd/src/views/license/license/data.ts +++ b/apps/web-antd/src/views/license/license/data.ts @@ -346,6 +346,7 @@ export function useGridColumns(): VxeTableGridOptions['colum title: $t('license.expiryDate'), minWidth: 120, formatter: 'formatDate', + sortable: true, }, { field: 'userNumber', diff --git a/apps/web-antd/src/views/license/license/index.vue b/apps/web-antd/src/views/license/license/index.vue index 6dc8c91..805337b 100644 --- a/apps/web-antd/src/views/license/license/index.vue +++ b/apps/web-antd/src/views/license/license/index.vue @@ -148,11 +148,14 @@ const [Grid, gridApi] = useVbenVxeGrid({ storage: true, }, proxyConfig: { + sort: true, ajax: { - query: async ({ page }, formValues) => { + query: async ({ page, sort }, formValues) => { return await getLicensePage({ pageNo: page.currentPage, pageSize: page.pageSize, + sortField: sort.field, + sortOrder: sort.order, ...formValues, }); }, @@ -162,6 +165,10 @@ const [Grid, gridApi] = useVbenVxeGrid({ keyField: 'id', isHover: true, }, + sortConfig: { + remote: true, + multiple: false, + }, toolbarConfig: { refresh: { code: 'query' }, search: true, diff --git a/apps/web-antd/src/views/license/project/index.vue b/apps/web-antd/src/views/license/project/index.vue index 7bef3fd..0a1e98f 100644 --- a/apps/web-antd/src/views/license/project/index.vue +++ b/apps/web-antd/src/views/license/project/index.vue @@ -126,11 +126,14 @@ const [Grid, gridApi] = useVbenVxeGrid({ storage: true, }, proxyConfig: { + sort: true, ajax: { - query: async ({ page }, formValues) => { + query: async ({ page, sort }, formValues) => { return await getProjectPage({ pageNo: page.currentPage, pageSize: page.pageSize, + sortField: sort.field, + sortOrder: sort.order, ...formValues, }); }, @@ -140,6 +143,10 @@ const [Grid, gridApi] = useVbenVxeGrid({ keyField: 'id', isHover: true, }, + sortConfig: { + remote: true, + multiple: false, + }, toolbarConfig: { refresh: { code: 'query' }, search: true,