Merge remote-tracking branch 'yudao/dev' into dev

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';

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 '';

apps/web-antd/src/views/pay/notify/data.ts

@@ -90,7 +90,6 @@ export function useGridFormSchema(): VbenFormSchema[] {
       componentProps: {
         ...getRangePickerDefaultProps(),
         allowClear: true,
-        placeholder: ['开始日期', '结束日期'],
       },
     },
   ];

apps/web-ele/src/views/bpm/processInstance/data.ts

@@ -120,4 +120,3 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     },
   ];
 }
-

apps/web-ele/src/views/infra/apiAccessLog/modules/detail.vue

@@ -11,6 +11,7 @@ import { useDetailSchema } from '../data';
 
 const formData = ref<InfraApiAccessLogApi.ApiAccessLog>();
 
+// TODO @xingyu：antd 和 el 这 2 个组件在这个模块的 detail.vue 不一样，看看是不是统一？还是就是区分的哈？
 const [Descriptions] = useDescription({
   column: 1,
   labelWidth: 110,

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;
+      },
     },
   ];
 }

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',

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',

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',

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}`;