diff --git a/apps/web-antd/src/views/bpm/processInstance/report/index.vue b/apps/web-antd/src/views/bpm/processInstance/report/index.vue index b73a637cd..b744eca0b 100644 --- a/apps/web-antd/src/views/bpm/processInstance/report/index.vue +++ b/apps/web-antd/src/views/bpm/processInstance/report/index.vue @@ -15,6 +15,7 @@ import { cancelProcessInstanceByAdmin, getProcessInstanceManagerPage, } from '#/api/bpm/processInstance'; +// TODO @jason:现在 ele 和 antd 使用的 parseFormFields 路径不同;看看以哪个为主。ele 是 import { parseFormFields } from '#/components/form-create'; import { parseFormFields } from '#/views/bpm/components/simple-process-design'; import { useGridColumns, useGridFormSchema } from './data'; diff --git a/apps/web-antd/src/views/infra/apiAccessLog/data.ts b/apps/web-antd/src/views/infra/apiAccessLog/data.ts index ce40868fb..73662e3a3 100644 --- a/apps/web-antd/src/views/infra/apiAccessLog/data.ts +++ b/apps/web-antd/src/views/infra/apiAccessLog/data.ts @@ -196,8 +196,8 @@ export function useDetailSchema(): DescriptionItemSchema[] { label: '用户 UA', }, { - label: '请求信息', field: 'requestMethod', + label: '请求信息', render: (val, data) => { if (val && data?.requestUrl) { return `${val} ${data.requestUrl}`; @@ -245,7 +245,7 @@ export function useDetailSchema(): DescriptionItemSchema[] { render: (val, data) => { if (val === 0) { return '正常'; - } else if (val > 0 && data?.resultMsg) { + } else if (val > 0 && data?.resultCode > 0) { return `失败 | ${val} | ${data.resultMsg}`; } return ''; diff --git a/apps/web-antd/src/views/pay/notify/data.ts b/apps/web-antd/src/views/pay/notify/data.ts index 54e5fb400..90b54dfeb 100644 --- a/apps/web-antd/src/views/pay/notify/data.ts +++ b/apps/web-antd/src/views/pay/notify/data.ts @@ -90,7 +90,6 @@ export function useGridFormSchema(): VbenFormSchema[] { componentProps: { ...getRangePickerDefaultProps(), allowClear: true, - placeholder: ['开始日期', '结束日期'], }, }, ]; diff --git a/apps/web-ele/src/views/bpm/processInstance/data.ts b/apps/web-ele/src/views/bpm/processInstance/data.ts index ec0b51321..883cc97e2 100644 --- a/apps/web-ele/src/views/bpm/processInstance/data.ts +++ b/apps/web-ele/src/views/bpm/processInstance/data.ts @@ -120,4 +120,3 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { }, ]; } - diff --git a/apps/web-ele/src/views/infra/apiAccessLog/modules/detail.vue b/apps/web-ele/src/views/infra/apiAccessLog/modules/detail.vue index 3cb9b3965..3b0186176 100644 --- a/apps/web-ele/src/views/infra/apiAccessLog/modules/detail.vue +++ b/apps/web-ele/src/views/infra/apiAccessLog/modules/detail.vue @@ -11,6 +11,7 @@ import { useDetailSchema } from '../data'; const formData = ref(); +// TODO @xingyu:antd 和 el 这 2 个组件在这个模块的 detail.vue 不一样,看看是不是统一?还是就是区分的哈? const [Descriptions] = useDescription({ column: 1, labelWidth: 110, diff --git a/apps/web-ele/src/views/infra/apiErrorLog/data.ts b/apps/web-ele/src/views/infra/apiErrorLog/data.ts index a681bccc9..e669a77f1 100644 --- a/apps/web-ele/src/views/infra/apiErrorLog/data.ts +++ b/apps/web-ele/src/views/infra/apiErrorLog/data.ts @@ -198,7 +198,9 @@ export function useDetailSchema(): DescriptionItemSchema[] { { field: 'exceptionTime', label: '异常时间', - render: (val) => formatDateTime(val) as string, + render: (val) => { + return formatDateTime(val) as string; + }, }, { field: 'exceptionName', @@ -239,7 +241,9 @@ export function useDetailSchema(): DescriptionItemSchema[] { field: 'processTime', label: '处理时间', show: (val) => !val, - render: (val) => formatDateTime(val) as string, + render: (val) => { + return formatDateTime(val) as string; + }, }, ]; } diff --git a/apps/web-ele/src/views/infra/job/data.ts b/apps/web-ele/src/views/infra/job/data.ts index 01006aa17..7dbe73b4a 100644 --- a/apps/web-ele/src/views/infra/job/data.ts +++ b/apps/web-ele/src/views/infra/job/data.ts @@ -222,12 +222,16 @@ export function useDetailSchema(): DescriptionItemSchema[] { { label: '重试间隔', field: 'retryInterval', - render: (val) => (val ? `${val} 毫秒` : '无间隔'), + render: (val) => { + return val ? `${val} 毫秒` : '无间隔'; + }, }, { label: '监控超时时间', field: 'monitorTimeout', - render: (val) => (val && val > 0 ? `${val} 毫秒` : '未开启'), + render: (val) => { + return val && val > 0 ? `${val} 毫秒` : '未开启'; + }, }, { field: 'nextTimes', 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 481e673cc..f057f4893 100644 --- a/apps/web-ele/src/views/infra/job/logger/data.ts +++ b/apps/web-ele/src/views/infra/job/logger/data.ts @@ -163,7 +163,9 @@ export function useDetailSchema(): DescriptionItemSchema[] { { field: 'duration', label: '执行时长', - render: (val) => (val ? `${val} 毫秒` : ''), + render: (val) => { + return val ? `${val} 毫秒` : ''; + }, }, { field: 'status', diff --git a/apps/web-ele/src/views/system/mail/log/data.ts b/apps/web-ele/src/views/system/mail/log/data.ts index 0eefc0087..cef8cd7f3 100644 --- a/apps/web-ele/src/views/system/mail/log/data.ts +++ b/apps/web-ele/src/views/system/mail/log/data.ts @@ -163,7 +163,9 @@ export function useDetailSchema(): DescriptionItemSchema[] { { field: 'createTime', label: '创建时间', - render: (val) => formatDateTime(val) as string, + render: (val) => { + return formatDateTime(val) as string; + }, }, { field: 'fromMail', diff --git a/apps/web-ele/src/views/system/operatelog/data.ts b/apps/web-ele/src/views/system/operatelog/data.ts index 731f79a5b..67b321fe2 100644 --- a/apps/web-ele/src/views/system/operatelog/data.ts +++ b/apps/web-ele/src/views/system/operatelog/data.ts @@ -169,8 +169,8 @@ export function useDetailSchema(): DescriptionItemSchema[] { show: (val) => !val, }, { - label: '请求 URL', field: 'requestUrl', + label: '请求 URL', render: (val, data) => { if (data?.requestMethod && val) { return `${data.requestMethod} ${val}`;