feat: use new desc comp

2025-10-21 11:40:42 +08:00
parent 284c47b721
commit de4ca0a5a4
50 changed files with 421 additions and 586 deletions
--- a/apps/web-antd/src/views/infra/apiAccessLog/data.ts
+++ b/apps/web-antd/src/views/infra/apiAccessLog/data.ts
@@ -1,6 +1,5 @@
 import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
-import type { InfraApiAccessLogApi } from '#/api/infra/api-access-log';
 import type { DescriptionItemSchema } from '#/components/description';

 import { h } from 'vue';
@@ -181,10 +180,10 @@ export function useDetailSchema(): DescriptionItemSchema[] {
    {
      field: 'userType',
      label: '用户类型',
-      content: (data: InfraApiAccessLogApi.ApiAccessLog) => {
+      render: (val) => {
        return h(DictTag, {
          type: DICT_TYPE.USER_TYPE,
-          value: data.userType,
+          value: val,
        });
      },
    },
@@ -198,9 +197,10 @@ export function useDetailSchema(): DescriptionItemSchema[] {
    },
    {
      label: '请求信息',
-      content: (data: InfraApiAccessLogApi.ApiAccessLog) => {
-        if (data?.requestMethod && data?.requestUrl) {
-          return `${data.requestMethod} ${data.requestUrl}`;
+      field: 'requestMethod',
+      render: (val, data) => {
+        if (val && data?.requestUrl) {
+          return `${val} ${data.requestUrl}`;
        }
        return '';
      },
@@ -208,10 +208,10 @@ export function useDetailSchema(): DescriptionItemSchema[] {
    {
      field: 'requestParams',
      label: '请求参数',
-      content: (data: InfraApiAccessLogApi.ApiAccessLog) => {
-        if (data.requestParams) {
+      render: (val) => {
+        if (val) {
          return h(JsonViewer, {
-            value: JSON.parse(data.requestParams),
+            value: JSON.parse(val),
            previewMode: true,
          });
        }
@@ -224,26 +224,29 @@ export function useDetailSchema(): DescriptionItemSchema[] {
    },
    {
      label: '请求时间',
-      content: (data: InfraApiAccessLogApi.ApiAccessLog) => {
-        if (data?.beginTime && data?.endTime) {
-          return `${formatDateTime(data.beginTime)} ~ ${formatDateTime(data.endTime)}`;
+      field: 'beginTime',
+      render: (val, data) => {
+        if (val && data?.endTime) {
+          return `${formatDateTime(val)} ~ ${formatDateTime(data.endTime)}`;
        }
        return '';
      },
    },
    {
      label: '请求耗时',
-      content: (data: InfraApiAccessLogApi.ApiAccessLog) => {
-        return data?.duration ? `${data.duration} ms` : '';
+      field: 'duration',
+      render: (val) => {
+        return val ? `${val} ms` : '';
      },
    },
    {
      label: '操作结果',
-      content: (data: InfraApiAccessLogApi.ApiAccessLog) => {
-        if (data?.resultCode === 0) {
+      field: 'resultCode',
+      render: (val, data) => {
+        if (val === 0) {
          return '正常';
-        } else if (data && data.resultCode > 0) {
-          return `失败 | ${data.resultCode} | ${data.resultMsg}`;
+        } else if (val > 0 && data?.resultMsg) {
+          return `失败 | ${val} | ${data.resultMsg}`;
        }
        return '';
      },
@@ -259,10 +262,10 @@ export function useDetailSchema(): DescriptionItemSchema[] {
    {
      field: 'operateType',
      label: '操作类型',
-      content: (data: InfraApiAccessLogApi.ApiAccessLog) => {
+      render: (val) => {
        return h(DictTag, {
          type: DICT_TYPE.INFRA_OPERATE_TYPE,
-          value: data?.operateType,
+          value: val,
        });
      },
    },
--- a/apps/web-antd/src/views/infra/apiAccessLog/modules/detail.vue
+++ b/apps/web-antd/src/views/infra/apiAccessLog/modules/detail.vue
@@ -12,11 +12,9 @@ import { useDetailSchema } from '../data';
 const formData = ref<InfraApiAccessLogApi.ApiAccessLog>();

 const [Descriptions] = useDescription({
-  componentProps: {
-    bordered: true,
-    column: 1,
-    class: 'mx-4',
-  },
+  bordered: true,
+  column: 1,
+  class: 'mx-4',
  schema: useDetailSchema(),
 });

--- a/apps/web-antd/src/views/infra/apiErrorLog/data.ts
+++ b/apps/web-antd/src/views/infra/apiErrorLog/data.ts
@@ -1,6 +1,5 @@
 import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
-import type { InfraApiErrorLogApi } from '#/api/infra/api-error-log';
 import type { DescriptionItemSchema } from '#/components/description';

 import { h } from 'vue';
@@ -158,10 +157,10 @@ export function useDetailSchema(): DescriptionItemSchema[] {
    {
      field: 'userType',
      label: '用户类型',
-      content: (data: InfraApiErrorLogApi.ApiErrorLog) => {
+      render: (val) => {
        return h(DictTag, {
          type: DICT_TYPE.USER_TYPE,
-          value: data.userType,
+          value: val,
        });
      },
    },
@@ -176,9 +175,9 @@ export function useDetailSchema(): DescriptionItemSchema[] {
    {
      field: 'requestMethod',
      label: '请求信息',
-      content: (data: InfraApiErrorLogApi.ApiErrorLog) => {
+      render: (val, data) => {
        if (data?.requestMethod && data?.requestUrl) {
-          return `${data.requestMethod} ${data.requestUrl}`;
+          return `${val.requestMethod} ${val.requestUrl}`;
        }
        return '';
      },
@@ -186,10 +185,10 @@ export function useDetailSchema(): DescriptionItemSchema[] {
    {
      field: 'requestParams',
      label: '请求参数',
-      content: (data: InfraApiErrorLogApi.ApiErrorLog) => {
-        if (data.requestParams) {
+      render: (val) => {
+        if (val) {
          return h(JsonViewer, {
-            value: JSON.parse(data.requestParams),
+            value: JSON.parse(val),
            previewMode: true,
          });
        }
@@ -199,8 +198,8 @@ export function useDetailSchema(): DescriptionItemSchema[] {
    {
      field: 'exceptionTime',
      label: '异常时间',
-      content: (data: InfraApiErrorLogApi.ApiErrorLog) => {
-        return formatDateTime(data?.exceptionTime || '') as string;
+      render: (val) => {
+        return formatDateTime(val) as string;
      },
    },
    {
@@ -210,12 +209,11 @@ export function useDetailSchema(): DescriptionItemSchema[] {
    {
      field: 'exceptionStackTrace',
      label: '异常堆栈',
-      hidden: (data: InfraApiErrorLogApi.ApiErrorLog) =>
-        !data?.exceptionStackTrace,
-      content: (data: InfraApiErrorLogApi.ApiErrorLog) => {
-        if (data?.exceptionStackTrace) {
+      show: (val) => !val,
+      render: (val) => {
+        if (val) {
          return h('textarea', {
-            value: data.exceptionStackTrace,
+            value: val,
            style:
              'width: 100%; min-height: 200px; max-height: 400px; resize: vertical;',
            readonly: true,
@@ -227,24 +225,24 @@ export function useDetailSchema(): DescriptionItemSchema[] {
    {
      field: 'processStatus',
      label: '处理状态',
-      content: (data: InfraApiErrorLogApi.ApiErrorLog) => {
+      render: (val) => {
        return h(DictTag, {
          type: DICT_TYPE.INFRA_API_ERROR_LOG_PROCESS_STATUS,
-          value: data?.processStatus,
+          value: val,
        });
      },
    },
    {
      field: 'processUserId',
      label: '处理人',
-      hidden: (data: InfraApiErrorLogApi.ApiErrorLog) => !data?.processUserId,
+      show: (val) => !val,
    },
    {
      field: 'processTime',
      label: '处理时间',
-      hidden: (data: InfraApiErrorLogApi.ApiErrorLog) => !data?.processTime,
-      content: (data: InfraApiErrorLogApi.ApiErrorLog) => {
-        return formatDateTime(data?.processTime || '') as string;
+      show: (val) => !val,
+      render: (val) => {
+        return formatDateTime(val) as string;
      },
    },
  ];
--- a/apps/web-antd/src/views/infra/apiErrorLog/modules/detail.vue
+++ b/apps/web-antd/src/views/infra/apiErrorLog/modules/detail.vue
@@ -12,11 +12,9 @@ import { useDetailSchema } from '../data';
 const formData = ref<InfraApiErrorLogApi.ApiErrorLog>();

 const [Descriptions] = useDescription({
-  componentProps: {
-    bordered: true,
-    column: 1,
-    class: 'mx-4',
-  },
+  bordered: true,
+  column: 1,
+  class: 'mx-4',
  schema: useDetailSchema(),
 });

--- a/apps/web-antd/src/views/infra/job/data.ts
+++ b/apps/web-antd/src/views/infra/job/data.ts
@@ -1,6 +1,5 @@
 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';
@@ -191,10 +190,10 @@ export function useDetailSchema(): DescriptionItemSchema[] {
    {
      field: 'status',
      label: '任务状态',
-      content: (data: InfraJobApi.Job) => {
+      render: (val) => {
        return h(DictTag, {
          type: DICT_TYPE.INFRA_JOB_STATUS,
-          value: data?.status,
+          value: val,
        });
      },
    },
@@ -216,27 +215,27 @@ export function useDetailSchema(): DescriptionItemSchema[] {
    },
    {
      label: '重试间隔',
-      content: (data: InfraJobApi.Job) => {
-        return data?.retryInterval ? `${data.retryInterval} 毫秒` : '无间隔';
+      field: 'retryInterval',
+      render: (val) => {
+        return val ? `${val} 毫秒` : '无间隔';
      },
    },
    {
      label: '监控超时时间',
-      content: (data: InfraJobApi.Job) => {
-        return data?.monitorTimeout && data.monitorTimeout > 0
-          ? `${data.monitorTimeout} 毫秒`
-          : '未开启';
+      field: 'monitorTimeout',
+      render: (val) => {
+        return val && val > 0 ? `${val} 毫秒` : '未开启';
      },
    },
    {
      field: 'nextTimes',
      label: '后续执行时间',
-      content: (data: InfraJobApi.Job) => {
-        if (!data?.nextTimes || data.nextTimes.length === 0) {
+      render: (val) => {
+        if (!val || val.length === 0) {
          return '无后续执行时间';
        }
        return h(Timeline, {}, () =>
-          data.nextTimes?.map((time: Date) =>
+          val?.map((time: Date) =>
            h(Timeline.Item, {}, () => formatDateTime(time)),
          ),
        );
--- a/apps/web-antd/src/views/infra/job/logger/data.ts
+++ b/apps/web-antd/src/views/infra/job/logger/data.ts
@@ -1,6 +1,5 @@
 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';
@@ -154,9 +153,9 @@ export function useDetailSchema(): DescriptionItemSchema[] {
    {
      field: 'beginTime',
      label: '执行时间',
-      content: (data: InfraJobLogApi.JobLog) => {
-        if (data?.beginTime && data?.endTime) {
-          return `${formatDateTime(data.beginTime)} ~ ${formatDateTime(data.endTime)}`;
+      render: (val, data) => {
+        if (val && data?.endTime) {
+          return `${formatDateTime(val)} ~ ${formatDateTime(data.endTime)}`;
        }
        return '';
      },
@@ -164,17 +163,17 @@ export function useDetailSchema(): DescriptionItemSchema[] {
    {
      field: 'duration',
      label: '执行时长',
-      content: (data: InfraJobLogApi.JobLog) => {
-        return data?.duration ? `${data.duration} 毫秒` : '';
+      render: (val) => {
+        return val ? `${val} 毫秒` : '';
      },
    },
    {
      field: 'status',
      label: '任务状态',
-      content: (data: InfraJobLogApi.JobLog) => {
+      render: (val) => {
        return h(DictTag, {
          type: DICT_TYPE.INFRA_JOB_LOG_STATUS,
-          value: data?.status,
+          value: val,
        });
      },
    },
--- a/apps/web-antd/src/views/infra/job/logger/modules/detail.vue
+++ b/apps/web-antd/src/views/infra/job/logger/modules/detail.vue
@@ -13,11 +13,9 @@ import { useDetailSchema } from '../data';
 const formData = ref<InfraJobLogApi.JobLog>();

 const [Descriptions] = useDescription({
-  componentProps: {
-    bordered: true,
-    column: 1,
-    class: 'mx-4',
-  },
+  bordered: true,
+  column: 1,
+  class: 'mx-4',
  schema: useDetailSchema(),
 });

--- a/apps/web-antd/src/views/infra/job/modules/detail.vue
+++ b/apps/web-antd/src/views/infra/job/modules/detail.vue
@@ -14,11 +14,9 @@ const formData = ref<InfraJobApi.Job>(); // 任务详情
 const nextTimes = ref<Date[]>([]); // 下一次执行时间

 const [Descriptions] = useDescription({
-  componentProps: {
-    bordered: true,
-    column: 1,
-    class: 'mx-4',
-  },
+  bordered: true,
+  column: 1,
+  class: 'mx-4',
  schema: useDetailSchema(),
 });