diff --git a/apps/web-antd/src/views/monitor/operlog/data.tsx b/apps/web-antd/src/views/monitor/operlog/data.tsx index 75b58086..848dd97a 100644 --- a/apps/web-antd/src/views/monitor/operlog/data.tsx +++ b/apps/web-antd/src/views/monitor/operlog/data.tsx @@ -78,10 +78,11 @@ export const columns: VxeGridProps['columns'] = [ }, }, }, - { field: 'operTime', title: '操作日期' }, + { field: 'operTime', title: '操作日期', sortable: true }, { field: 'costTime', title: '操作耗时', + sortable: true, formatter({ cellValue }) { return `${cellValue} ms`; }, diff --git a/apps/web-antd/src/views/monitor/operlog/index.vue b/apps/web-antd/src/views/monitor/operlog/index.vue index 1e3e0809..26ce9fb3 100644 --- a/apps/web-antd/src/views/monitor/operlog/index.vue +++ b/apps/web-antd/src/views/monitor/operlog/index.vue @@ -10,6 +10,7 @@ import { $t } from '@vben/locales'; import { Modal, Space } from 'ant-design-vue'; import dayjs from 'dayjs'; +import { isEmpty } from 'lodash-es'; import { useVbenVxeGrid, type VxeGridProps } from '#/adapter'; import { @@ -47,7 +48,7 @@ const gridOptions: VxeGridProps = { pagerConfig: {}, proxyConfig: { ajax: { - query: async ({ page }, formValues = {}) => { + query: async ({ page, sort }, formValues = {}) => { // 区间选择器处理 if (formValues?.createTime) { formValues.params = { @@ -62,11 +63,20 @@ const gridOptions: VxeGridProps = { } else { Reflect.deleteProperty(formValues, 'params'); } - return await operLogList({ + + const params: any = { pageNum: page.currentPage, pageSize: page.pageSize, ...formValues, - }); + }; + + console.log(sort); + if (!isEmpty(sort)) { + params.orderByColumn = sort.field; + params.isAsc = sort.order; + } + console.log(params); + return await operLogList(params); }, }, }, @@ -74,6 +84,9 @@ const gridOptions: VxeGridProps = { isHover: true, keyField: 'operId', }, + sortConfig: { + remote: true, + }, round: true, align: 'center', showOverflow: true, @@ -84,6 +97,9 @@ const [BasicTable, tableApi] = useVbenVxeGrid({ formOptions, gridOptions, gridEvents: { + sortChange: () => { + tableApi.query(); + }, checkboxChange: (e: any) => { checked.value = e.records.length > 0; },