Commit b6b555df77a64c8b40524e4181556329dbce1705
Merge branch 'fix/DEFECT-2116' into 'main_dev'
fix: 修复规则链事件管理列表字段部分未显示 See merge request yunteng/thingskit-front!1380
Showing
2 changed files
with
33 additions
and
4 deletions
| 1 | -import { h } from 'vue'; | 1 | +import { h, unref } from 'vue'; |
| 2 | import { BasicColumn } from '/@/components/Table'; | 2 | import { BasicColumn } from '/@/components/Table'; |
| 3 | import { dateUtil } from '/@/utils/dateUtil'; | 3 | import { dateUtil } from '/@/utils/dateUtil'; |
| 4 | import Icon from '/@/components/Icon'; | 4 | import Icon from '/@/components/Icon'; |
| 5 | import { Modal } from 'ant-design-vue'; | 5 | import { Modal } from 'ant-design-vue'; |
| 6 | import { JsonPreview } from '/@/components/CodeEditor'; | 6 | import { JsonPreview } from '/@/components/CodeEditor'; |
| 7 | +import { CopyOutlined } from '@ant-design/icons-vue'; | ||
| 8 | +import { useClipboard } from '@vueuse/core'; | ||
| 9 | +import { useMessage } from '/@/hooks/web/useMessage'; | ||
| 7 | 10 | ||
| 8 | const handleOpenJsonPreviewModal = (title: string, content: string) => { | 11 | const handleOpenJsonPreviewModal = (title: string, content: string) => { |
| 9 | Modal.info({ | 12 | Modal.info({ |
| @@ -13,6 +16,15 @@ const handleOpenJsonPreviewModal = (title: string, content: string) => { | @@ -13,6 +16,15 @@ const handleOpenJsonPreviewModal = (title: string, content: string) => { | ||
| 13 | }); | 16 | }); |
| 14 | }; | 17 | }; |
| 15 | 18 | ||
| 19 | +const { copy, copied } = useClipboard({ legacy: true }); | ||
| 20 | +const { createMessage } = useMessage(); | ||
| 21 | + | ||
| 22 | +async function copyText(text: string) { | ||
| 23 | + await copy(text); | ||
| 24 | + | ||
| 25 | + unref(copied) ? createMessage.success('复制成功') : createMessage.error('复制失败'); | ||
| 26 | +} | ||
| 27 | + | ||
| 16 | export const columns: BasicColumn[] = [ | 28 | export const columns: BasicColumn[] = [ |
| 17 | { | 29 | { |
| 18 | title: '事件时间', | 30 | title: '事件时间', |
| @@ -34,13 +46,30 @@ export const columns: BasicColumn[] = [ | @@ -34,13 +46,30 @@ export const columns: BasicColumn[] = [ | ||
| 34 | }, | 46 | }, |
| 35 | { | 47 | { |
| 36 | title: '实体类型', | 48 | title: '实体类型', |
| 37 | - dataIndex: 'body.entityName', | 49 | + dataIndex: 'body.entityType', |
| 38 | ellipsis: true, | 50 | ellipsis: true, |
| 39 | }, | 51 | }, |
| 40 | { | 52 | { |
| 41 | - title: '消息ID', | 53 | + title: '实体ID', |
| 42 | dataIndex: 'body.entityId', | 54 | dataIndex: 'body.entityId', |
| 43 | ellipsis: true, | 55 | ellipsis: true, |
| 56 | + customRender: ({ text }: { text: string }) => { | ||
| 57 | + return h('span', { class: 'flex items-center' }, [ | ||
| 58 | + h('span', { class: 'truncate' }, text), | ||
| 59 | + h(CopyOutlined, { class: 'flex-shrink cursor-pointer', onClick: () => copyText(text) }), | ||
| 60 | + ]); | ||
| 61 | + }, | ||
| 62 | + }, | ||
| 63 | + { | ||
| 64 | + title: '消息ID', | ||
| 65 | + dataIndex: 'body.msgId', | ||
| 66 | + ellipsis: true, | ||
| 67 | + customRender: ({ text }: { text: string }) => { | ||
| 68 | + return h('span', { class: 'flex items-center' }, [ | ||
| 69 | + h('span', { class: 'truncate' }, text), | ||
| 70 | + h(CopyOutlined, { class: 'flex-shrink cursor-pointer', onClick: () => copyText(text) }), | ||
| 71 | + ]); | ||
| 72 | + }, | ||
| 44 | }, | 73 | }, |
| 45 | { | 74 | { |
| 46 | title: '消息类型', | 75 | title: '消息类型', |
| @@ -80,7 +80,7 @@ | @@ -80,7 +80,7 @@ | ||
| 80 | <template> | 80 | <template> |
| 81 | <BasicDrawer | 81 | <BasicDrawer |
| 82 | v-model:visible="visible" | 82 | v-model:visible="visible" |
| 83 | - :width="!nodeData?.created ? '55%' : '40%'" | 83 | + :width="!nodeData?.created ? '55%' : '50%'" |
| 84 | showFooter | 84 | showFooter |
| 85 | showCancelBtn | 85 | showCancelBtn |
| 86 | showOkBtn | 86 | showOkBtn |