reactor：【infra 基础设施】infra 的 job、joblogger 描述的统一

apps/web-antd/src/views/infra/job/data.ts

@@ -1,5 +1,6 @@
 import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { InfraJobApi } from '#/api/infra/job';
 import type { DescriptionItemSchema } from '#/components/description';
 
 import { h, markRaw } from 'vue';
@@ -173,7 +174,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
   ];
 }
 
-/** 详情的配置 */
+/** 详情页的字段 */
 export function useDetailSchema(): DescriptionItemSchema[] {
   return [
     {
@@ -187,11 +188,12 @@ export function useDetailSchema(): DescriptionItemSchema[] {
     {
       field: 'status',
       label: '任务状态',
-      content: (data) =>
-        h(DictTag, {
+      content: (data: InfraJobApi.Job) => {
+        return h(DictTag, {
           type: DICT_TYPE.INFRA_JOB_STATUS,
           value: data?.status,
-        }),
+        });
+      },
     },
     {
       field: 'handlerName',
@@ -203,23 +205,25 @@ export function useDetailSchema(): DescriptionItemSchema[] {
     },
     {
       field: 'cronExpression',
-      label: 'CRON 表达式',
+      label: 'Cron 表达式',
     },
     {
       field: 'retryCount',
       label: '重试次数',
     },
     {
-      field: 'retryInterval',
       label: '重试间隔',
+      content: (data: InfraJobApi.Job) => {
+        return data?.retryInterval ? `${data.retryInterval} 毫秒` : '无间隔';
+      },
     },
     {
-      field: 'monitorTimeout',
       label: '监控超时时间',
-      content: (data) =>
-        data?.monitorTimeout && data.monitorTimeout > 0
+      content: (data: InfraJobApi.Job) => {
+        return data?.monitorTimeout && data.monitorTimeout > 0
           ? `${data.monitorTimeout} 毫秒`
-          : '未开启',
+          : '未开启';
+      },
     },
     {
       field: 'nextTimes',

apps/web-antd/src/views/infra/job/logger/data.ts

@@ -1,5 +1,6 @@
 import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { InfraJobLogApi } from '#/api/infra/job-log';
 import type { DescriptionItemSchema } from '#/components/description';
 
 import { h } from 'vue';
@@ -127,7 +128,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
   ];
 }
 
-/** 详情的配置 */
+/** 详情页的字段 */
 export function useDetailSchema(): DescriptionItemSchema[] {
   return [
     {
@@ -153,23 +154,29 @@ export function useDetailSchema(): DescriptionItemSchema[] {
     {
       field: 'beginTime',
       label: '执行时间',
-    },
-    {
-      field: 'endTime',
-      label: '结束时间',
+      content: (data: InfraJobLogApi.JobLog) => {
+        if (data?.beginTime && data?.endTime) {
+          return `${formatDateTime(data.beginTime)} ~ ${formatDateTime(data.endTime)}`;
+        }
+        return '';
+      },
     },
     {
       field: 'duration',
       label: '执行时长',
+      content: (data: InfraJobLogApi.JobLog) => {
+        return data?.duration ? `${data.duration} 毫秒` : '';
+      },
     },
     {
       field: 'status',
       label: '任务状态',
-      content: (data) =>
-        h(DictTag, {
+      content: (data: InfraJobLogApi.JobLog) => {
+        return h(DictTag, {
           type: DICT_TYPE.INFRA_JOB_LOG_STATUS,
           value: data?.status,
-        }),
+        });
+      },
     },
     {
       field: 'result',

apps/web-antd/src/views/infra/job/logger/modules/detail.vue

@@ -12,6 +12,15 @@ import { useDetailSchema } from '../data';
 
 const formData = ref<InfraJobLogApi.JobLog>();
 
+const [Descriptions] = useDescription({
+  componentProps: {
+    bordered: true,
+    column: 1,
+    class: 'mx-4',
+  },
+  schema: useDetailSchema(),
+});
+
 const [Modal, modalApi] = useVbenModal({
   async onOpenChange(isOpen: boolean) {
     if (!isOpen) {
@@ -31,15 +40,6 @@ const [Modal, modalApi] = useVbenModal({
     }
   },
 });
-
-const [Description] = useDescription({
-  componentProps: {
-    bordered: true,
-    column: 1,
-    class: 'mx-4',
-  },
-  schema: useDetailSchema(),
-});
 </script>
 
 <template>
@@ -49,6 +49,6 @@ const [Description] = useDescription({
     :show-cancel-button="false"
     :show-confirm-button="false"
   >
-    <Description :data="formData" />
+    <Descriptions :data="formData" />
   </Modal>
 </template>