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

2025-09-10 22:33:38 +08:00
parent 4cb1ecfb1c
commit 21f76355fa
15 changed files with 563 additions and 327 deletions
--- a/apps/web-ele/src/views/infra/job/data.ts
+++ b/apps/web-ele/src/views/infra/job/data.ts
@@ -1,8 +1,15 @@
 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 } from 'vue';

 import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
+import { formatDateTime } from '@vben/utils';
+
+import { DictTag } from '#/components/dict-tag';

 /** 新增/修改的表单 */
 export function useFormSchema(): VbenFormSchema[] {
@@ -167,3 +174,57 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
    },
  ];
 }
+
+/** 详情页的字段 */
+export function useDetailSchema(): DescriptionItemSchema[] {
+  return [
+    {
+      field: 'id',
+      label: '任务编号',
+    },
+    {
+      field: 'name',
+      label: '任务名称',
+    },
+    {
+      field: 'status',
+      label: '任务状态',
+      content: (data: InfraJobApi.Job) => {
+        return h(DictTag, {
+          type: DICT_TYPE.INFRA_JOB_STATUS,
+          value: data?.status,
+        });
+      },
+    },
+    {
+      field: 'handlerName',
+      label: '处理器的名字',
+    },
+    {
+      field: 'handlerParam',
+      label: '处理器的参数',
+    },
+    {
+      field: 'cronExpression',
+      label: 'Cron 表达式',
+    },
+    {
+      field: 'retryCount',
+      label: '重试次数',
+    },
+    {
+      label: '重试间隔',
+      content: (data: InfraJobApi.Job) => {
+        return data?.retryInterval ? `${data.retryInterval} 毫秒` : '无间隔';
+      },
+    },
+    {
+      label: '监控超时时间',
+      content: (data: InfraJobApi.Job) => {
+        return data?.monitorTimeout && data.monitorTimeout > 0
+          ? `${data.monitorTimeout} 毫秒`
+          : '未开启';
+      },
+    },
+  ];
+}
--- a/apps/web-ele/src/views/infra/job/logger/data.ts
+++ b/apps/web-ele/src/views/infra/job/logger/data.ts
@@ -1,5 +1,9 @@
 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';

 import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
@@ -7,6 +11,8 @@ import { formatDateTime } from '@vben/utils';

 import dayjs from 'dayjs';

+import { DictTag } from '#/components/dict-tag';
+
 /** 列表的搜索表单 */
 export function useGridFormSchema(): VbenFormSchema[] {
  return [
@@ -121,3 +127,60 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
    },
  ];
 }
+
+/** 详情页的字段 */
+export function useDetailSchema(): DescriptionItemSchema[] {
+  return [
+    {
+      field: 'id',
+      label: '日志编号',
+    },
+    {
+      field: 'jobId',
+      label: '任务编号',
+    },
+    {
+      field: 'handlerName',
+      label: '处理器的名字',
+    },
+    {
+      field: 'handlerParam',
+      label: '处理器的参数',
+    },
+    {
+      field: 'executeIndex',
+      label: '第几次执行',
+    },
+    {
+      field: 'beginTime',
+      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: InfraJobLogApi.JobLog) => {
+        return h(DictTag, {
+          type: DICT_TYPE.INFRA_JOB_LOG_STATUS,
+          value: data?.status,
+        });
+      },
+    },
+    {
+      field: 'result',
+      label: '执行结果',
+    },
+  ];
+}
--- a/apps/web-ele/src/views/infra/job/logger/modules/detail.vue
+++ b/apps/web-ele/src/views/infra/job/logger/modules/detail.vue
@@ -1,19 +1,29 @@
-<script lang="ts" setup>
+<script setup lang="ts">
 import type { InfraJobLogApi } from '#/api/infra/job-log';

 import { ref } from 'vue';

 import { useVbenModal } from '@vben/common-ui';
-import { DICT_TYPE } from '@vben/constants';
-import { formatDateTime } from '@vben/utils';
-
-import { ElDescriptions, ElDescriptionsItem } from 'element-plus';

 import { getJobLog } from '#/api/infra/job-log';
-import { DictTag } from '#/components/dict-tag';
+import { useDescription } from '#/components/description';
+
+import { useDetailSchema } from '../data';

 const formData = ref<InfraJobLogApi.JobLog>();

+const [Descriptions] = useDescription({
+  componentProps: {
+    border: true,
+    column: 1,
+    direction: 'horizontal',
+    title: '',
+    extra: '',
+    labelWidth: 140,
+  },
+  schema: useDetailSchema(),
+});
+
 const [Modal, modalApi] = useVbenModal({
  async onOpenChange(isOpen: boolean) {
    if (!isOpen) {
@@ -42,44 +52,6 @@ const [Modal, modalApi] = useVbenModal({
    :show-cancel-button="false"
    :show-confirm-button="false"
  >
-    <ElDescriptions
-      :column="1"
-      border
-      size="default"
-      class="mx-4"
-      :label-width="140"
-    >
-      <ElDescriptionsItem label="日志编号">
-        {{ formData?.id }}
-      </ElDescriptionsItem>
-      <ElDescriptionsItem label="任务编号">
-        {{ formData?.jobId }}
-      </ElDescriptionsItem>
-      <ElDescriptionsItem label="处理器的名字">
-        {{ formData?.handlerName }}
-      </ElDescriptionsItem>
-      <ElDescriptionsItem label="处理器的参数">
-        {{ formData?.handlerParam }}
-      </ElDescriptionsItem>
-      <ElDescriptionsItem label="第几次执行">
-        {{ formData?.executeIndex }}
-      </ElDescriptionsItem>
-      <ElDescriptionsItem label="执行时间">
-        {{ formData?.beginTime ? formatDateTime(formData.beginTime) : '' }} ~
-        {{ formData?.endTime ? formatDateTime(formData.endTime) : '' }}
-      </ElDescriptionsItem>
-      <ElDescriptionsItem label="执行时长">
-        {{ formData?.duration ? `${formData.duration} 毫秒` : '' }}
-      </ElDescriptionsItem>
-      <ElDescriptionsItem label="任务状态">
-        <DictTag
-          :type="DICT_TYPE.INFRA_JOB_LOG_STATUS"
-          :value="formData?.status"
-        />
-      </ElDescriptionsItem>
-      <ElDescriptionsItem label="执行结果">
-        {{ formData?.result }}
-      </ElDescriptionsItem>
-    </ElDescriptions>
+    <Descriptions :data="formData" />
  </Modal>
 </template>
--- a/apps/web-ele/src/views/infra/job/modules/detail.vue
+++ b/apps/web-ele/src/views/infra/job/modules/detail.vue
@@ -1,25 +1,31 @@
-<script lang="ts" setup>
+<script setup lang="ts">
 import type { InfraJobApi } from '#/api/infra/job';

 import { ref } from 'vue';

 import { useVbenModal } from '@vben/common-ui';
-import { DICT_TYPE } from '@vben/constants';
 import { formatDateTime } from '@vben/utils';

-import {
-  ElDescriptions,
-  ElDescriptionsItem,
-  ElTimeline,
-  ElTimelineItem,
-} from 'element-plus';
-
 import { getJob, getJobNextTimes } from '#/api/infra/job';
-import { DictTag } from '#/components/dict-tag';
+import { useDescription } from '#/components/description';
+
+import { useDetailSchema } from '../data';

 const formData = ref<InfraJobApi.Job>(); // 任务详情
 const nextTimes = ref<Date[]>([]); // 下一次执行时间

+const [Descriptions] = useDescription({
+  componentProps: {
+    border: true,
+    column: 1,
+    direction: 'horizontal',
+    title: '',
+    extra: '',
+    labelWidth: 140,
+  },
+  schema: useDetailSchema(),
+});
+
 const [Modal, modalApi] = useVbenModal({
  async onOpenChange(isOpen: boolean) {
    if (!isOpen) {
@@ -50,57 +56,20 @@ const [Modal, modalApi] = useVbenModal({
    :show-cancel-button="false"
    :show-confirm-button="false"
  >
-    <ElDescriptions
-      :column="1"
-      border
-      size="default"
-      class="mx-4"
-      :label-width="140"
-    >
-      <ElDescriptionsItem label="任务编号">
-        {{ formData?.id }}
-      </ElDescriptionsItem>
-      <ElDescriptionsItem label="任务名称">
-        {{ formData?.name }}
-      </ElDescriptionsItem>
-      <ElDescriptionsItem label="任务状态">
-        <DictTag :type="DICT_TYPE.INFRA_JOB_STATUS" :value="formData?.status" />
-      </ElDescriptionsItem>
-      <ElDescriptionsItem label="处理器的名字">
-        {{ formData?.handlerName }}
-      </ElDescriptionsItem>
-      <ElDescriptionsItem label="处理器的参数">
-        {{ formData?.handlerParam }}
-      </ElDescriptionsItem>
-      <ElDescriptionsItem label="Cron 表达式">
-        {{ formData?.cronExpression }}
-      </ElDescriptionsItem>
-      <ElDescriptionsItem label="重试次数">
-        {{ formData?.retryCount }}
-      </ElDescriptionsItem>
-      <ElDescriptionsItem label="重试间隔">
-        {{
-          formData?.retryInterval ? `${formData.retryInterval} 毫秒` : '无间隔'
-        }}
-      </ElDescriptionsItem>
-      <ElDescriptionsItem label="监控超时时间">
-        {{
-          formData?.monitorTimeout && formData.monitorTimeout > 0
-            ? `${formData.monitorTimeout} 毫秒`
-            : '未开启'
-        }}
-      </ElDescriptionsItem>
-      <ElDescriptionsItem label="后续执行时间">
-        <ElTimeline class="h-[180px]">
-          <ElTimelineItem
-            v-for="(nextTime, index) in nextTimes"
-            :key="index"
-            type="primary"
-          >
-            第 {{ index + 1 }} 次：{{ formatDateTime(nextTime.toString()) }}
-          </ElTimelineItem>
-        </ElTimeline>
-      </ElDescriptionsItem>
-    </ElDescriptions>
+    <Descriptions :data="formData" />
+
+    <!-- 后续执行时间 -->
+    <div v-if="nextTimes.length > 0" class="mt-4">
+      <h4 class="mb-2 text-lg font-medium">后续执行时间</h4>
+      <div class="max-h-[200px] overflow-y-auto rounded border p-2">
+        <div
+          v-for="(nextTime, index) in nextTimes"
+          :key="index"
+          class="py-1 text-sm text-gray-600"
+        >
+          第 {{ index + 1 }} 次：{{ formatDateTime(nextTime.toString()) }}
+        </div>
+      </div>
+    </div>
  </Modal>
 </template>