diff --git a/apps/web-antd/src/views/infra/job/logger/data.ts b/apps/web-antd/src/views/infra/job/logger/data.ts index 8c1e3644..d6eabd48 100644 --- a/apps/web-antd/src/views/infra/job/logger/data.ts +++ b/apps/web-antd/src/views/infra/job/logger/data.ts @@ -71,26 +71,32 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { { field: 'id', title: '日志编号', + minWidth: 80, }, { field: 'jobId', title: '任务编号', + minWidth: 80, }, { field: 'handlerName', title: '处理器的名字', + minWidth: 180, }, { field: 'handlerParam', title: '处理器的参数', + minWidth: 140, }, { field: 'executeIndex', title: '第几次执行', + minWidth: 100, }, { field: 'beginTime', title: '执行时间', + minWidth: 280, formatter: ({ row }) => { return `${formatDateTime(row.beginTime)} ~ ${formatDateTime(row.endTime)}`; }, @@ -98,11 +104,15 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { { field: 'duration', title: '执行时长', - formatter: ({ cellValue }) => `${cellValue} 毫秒`, + minWidth: 120, + formatter: ({ row }) => { + return `${row.duration} 毫秒`; + }, }, { field: 'status', title: '任务状态', + minWidth: 100, cellRender: { name: 'CellDict', props: { type: DICT_TYPE.INFRA_JOB_LOG_STATUS }, diff --git a/apps/web-antd/src/views/infra/job/logger/index.vue b/apps/web-antd/src/views/infra/job/logger/index.vue index 32620585..2dc65d3e 100644 --- a/apps/web-antd/src/views/infra/job/logger/index.vue +++ b/apps/web-antd/src/views/infra/job/logger/index.vue @@ -32,12 +32,9 @@ function handleDetail(row: InfraJobLogApi.JobLog) { detailModalApi.setData({ id: row.id }).open(); } -// 获取表单schema并设置默认jobId -const formSchema = useGridFormSchema(); - const [Grid, gridApi] = useVbenVxeGrid({ formOptions: { - schema: formSchema, + schema: useGridFormSchema(), }, gridOptions: { columns: useGridColumns(), @@ -57,6 +54,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ }, rowConfig: { keyField: 'id', + isHover: true, }, toolbarConfig: { refresh: true, diff --git a/apps/web-ele/src/views/infra/job/logger/data.ts b/apps/web-ele/src/views/infra/job/logger/data.ts index f36287a1..50d2e8a0 100644 --- a/apps/web-ele/src/views/infra/job/logger/data.ts +++ b/apps/web-ele/src/views/infra/job/logger/data.ts @@ -1,16 +1,12 @@ import type { VbenFormSchema } from '#/adapter/form'; -import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; -import type { InfraJobLogApi } from '#/api/infra/job-log'; +import type { VxeTableGridOptions } from '#/adapter/vxe-table'; -import { useAccess } from '@vben/access'; import { DICT_TYPE } from '@vben/constants'; import { getDictOptions } from '@vben/hooks'; import { formatDateTime } from '@vben/utils'; import dayjs from 'dayjs'; -const { hasAccessByCodes } = useAccess(); - /** 列表的搜索表单 */ export function useGridFormSchema(): VbenFormSchema[] { return [ @@ -65,9 +61,7 @@ export function useGridFormSchema(): VbenFormSchema[] { } /** 表格列配置 */ -export function useGridColumns( - onActionClick: OnActionClickFn, -): VxeTableGridOptions['columns'] { +export function useGridColumns(): VxeTableGridOptions['columns'] { return [ { field: 'id', @@ -120,26 +114,10 @@ export function useGridColumns( }, }, { - field: 'operation', title: '操作', width: 80, fixed: 'right', - align: 'center', - cellRender: { - attrs: { - nameField: 'id', - nameTitle: '日志', - onClick: onActionClick, - }, - name: 'CellOperation', - options: [ - { - code: 'detail', - text: '详细', - show: hasAccessByCodes(['infra:job:query']), - }, - ], - }, + slots: { default: 'actions' }, }, ]; } diff --git a/apps/web-ele/src/views/infra/job/logger/index.vue b/apps/web-ele/src/views/infra/job/logger/index.vue index 9e949caf..86fad2ed 100644 --- a/apps/web-ele/src/views/infra/job/logger/index.vue +++ b/apps/web-ele/src/views/infra/job/logger/index.vue @@ -1,19 +1,13 @@