diff --git a/apps/web-antd/src/views/system/operatelog/data.ts b/apps/web-antd/src/views/system/operatelog/data.ts index 3144daa90..c75d4c26f 100644 --- a/apps/web-antd/src/views/system/operatelog/data.ts +++ b/apps/web-antd/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'; /** 列表的搜索表单 */ @@ -139,6 +143,11 @@ export function useDetailSchema(): DescriptionItemSchema[] { field: 'userId', label: '操作人编号', }, + { + field: 'userType', + label: '操作人类型', + render: (val) => h(DictTag, { type: DICT_TYPE.USER_TYPE, value: val }), + }, { field: 'userName', label: '操作人名字', diff --git a/apps/web-ele/src/views/system/operatelog/data.ts b/apps/web-ele/src/views/system/operatelog/data.ts index 67b321fe2..aa67c8e33 100644 --- a/apps/web-ele/src/views/system/operatelog/data.ts +++ b/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: '操作人名字',