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

apps/web-ele/src/views/mall/promotion/discountActivity/index.vue

@@ -52,6 +52,7 @@ async function handleClose(row: MallDiscountActivityApi.DiscountActivity) {
   } finally {
     loadingInstance.close();
   }
+}
 
 /** 删除满减活动 */
 async function handleDelete(row: MallDiscountActivityApi.DiscountActivity) {

apps/web-ele/src/views/system/operatelog/data.ts

@@ -2,9 +2,13 @@ import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { DescriptionItemSchema } from '#/components/description';
 
+import { h } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
 import { formatDateTime } from '@vben/utils';
 
 import { getSimpleUserList } from '#/api/system/user';
+import { DictTag } from '#/components/dict-tag';
 import { getRangePickerDefaultProps } from '#/utils';
 
 /** 列表的搜索表单 */
@@ -133,12 +137,17 @@ export function useDetailSchema(): DescriptionItemSchema[] {
     {
       field: 'traceId',
       label: '链路追踪',
-      show: (val) => !val,
+      show: (data) => !data?.traceId,
     },
     {
       field: 'userId',
       label: '操作人编号',
     },
+    {
+      field: 'userType',
+      label: '操作人类型',
+      render: (val) => h(DictTag, { type: DICT_TYPE.USER_TYPE, value: val }),
+    },
     {
       field: 'userName',
       label: '操作人名字',