diff --git a/src/pages/events/logs/index.tsx b/src/pages/events/logs/index.tsx index 087687c..57ea258 100644 --- a/src/pages/events/logs/index.tsx +++ b/src/pages/events/logs/index.tsx @@ -7,7 +7,7 @@ import { Form, Space, Select, - Tooltip, + Modal, Pagination, } from 'ant-design-vue'; import { useLogModel, ACTION_TYPE_OPTIONS, ACTION_SOURCE_OPTIONS } from './model/useLogModel'; @@ -24,6 +24,7 @@ const LogContentCell = defineComponent({ setup(props) { const textRef = ref(null); const [overflow, setOverflow] = useState(false); + const [modalOpen, setModalOpen] = useState(false); const checkOverflow = () => { const el = textRef.value; if (el) setOverflow(el.scrollHeight > el.clientHeight); @@ -47,10 +48,23 @@ const LogContentCell = defineComponent({ {raw} {overflow.value ? ( - - 查看 - + setModalOpen(true)}> + 查看 + ) : null} + setModalOpen(false)} + > +
+ {raw} +
+
); }; @@ -93,7 +107,7 @@ export default defineComponent({ record: any; index: number; }) => { - if (column.key === 'content') { + if (column.key === 'obj') { const raw = text || ''; return raw ? : --; } diff --git a/src/pages/events/users/model/useUserColumns.tsx b/src/pages/events/users/model/useUserColumns.tsx index 2e7a457..6a11888 100644 --- a/src/pages/events/users/model/useUserColumns.tsx +++ b/src/pages/events/users/model/useUserColumns.tsx @@ -1,4 +1,5 @@ import { Image, Space } from 'ant-design-vue'; +import { EyeOutlined } from '@ant-design/icons-vue'; import { StatusTag } from '@/components'; import { STATUS_MAP } from './config'; @@ -77,6 +78,7 @@ export function useUserColumns() { width={40} height={40} style={{ objectFit: 'cover', borderRadius: '4px', cursor: 'pointer' }} + previewMask={() => } /> ))} diff --git a/src/pages/events/users/model/useUserModel.ts b/src/pages/events/users/model/useUserModel.ts index 06dc821..af393ca 100644 --- a/src/pages/events/users/model/useUserModel.ts +++ b/src/pages/events/users/model/useUserModel.ts @@ -117,7 +117,7 @@ export function useUserModel() { Modal.confirm({ title: `${actionText}确认`, - content: `确认${actionText}用户"${record.realName}"吗?`, + content: `确认${actionText}用户"${record.nickname}"吗?`, okText: '确认', cancelText: '取消', onOk: async () => {