From 8b3b84265516862d1b672d96020fc82057c1f84c Mon Sep 17 00:00:00 2001 From: dap1 <15891557205@163.com> Date: Fri, 19 May 2023 14:58:56 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=AB=99=E5=86=85=E4=BF=A1=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../notify/message/MessageInfoModal.vue | 27 +++++ src/views/system/notify/message/index.vue | 39 +++++++- .../system/notify/message/message.data.ts | 98 +++++++++++++++++++ 3 files changed, 161 insertions(+), 3 deletions(-) create mode 100644 src/views/system/notify/message/MessageInfoModal.vue diff --git a/src/views/system/notify/message/MessageInfoModal.vue b/src/views/system/notify/message/MessageInfoModal.vue new file mode 100644 index 0000000..7dbff81 --- /dev/null +++ b/src/views/system/notify/message/MessageInfoModal.vue @@ -0,0 +1,27 @@ + + + + + diff --git a/src/views/system/notify/message/index.vue b/src/views/system/notify/message/index.vue index e27b9d2..25d48c4 100644 --- a/src/views/system/notify/message/index.vue +++ b/src/views/system/notify/message/index.vue @@ -1,15 +1,36 @@ diff --git a/src/views/system/notify/message/message.data.ts b/src/views/system/notify/message/message.data.ts index f7c7ab0..e241d7e 100644 --- a/src/views/system/notify/message/message.data.ts +++ b/src/views/system/notify/message/message.data.ts @@ -1,5 +1,8 @@ import { BasicColumn, FormSchema, useRender } from '@/components/Table' import { DICT_TYPE, getDictOptions } from '@/utils/dict' +import { JsonPreview } from '@/components/CodeEditor' +import { DescItem } from '@/components/Description/index' +import { h } from 'vue' export const columns: BasicColumn[] = [ { @@ -56,6 +59,9 @@ export const columns: BasicColumn[] = [ dataIndex: 'readTime', width: 180, customRender: ({ text }) => { + if (!text) { + return useRender.renderTag('未阅读') + } return useRender.renderDate(text) } }, @@ -104,3 +110,95 @@ export const searchFormSchema: FormSchema[] = [ colProps: { span: 8 } } ] + +// 站内信详情modal +export const infoSchema: DescItem[] = [ + { + field: 'id', + label: '编号', + labelMinWidth: 50 + }, + { + field: 'readStatus', + label: '是否已读', + render: (value) => { + return useRender.renderDict(value, DICT_TYPE.INFRA_BOOLEAN_STRING) + } + }, + { + field: 'userType', + label: '用户类型', + render: (value) => { + console.log(value) + return useRender.renderDict(value, DICT_TYPE.USER_TYPE) + } + }, + { + field: 'userType', + label: '用户编号' + }, + { + field: 'templateId', + label: '模板编号' + }, + { + field: 'templateCode', + label: '模板编码' + }, + { + field: 'templateNickname', + label: '发送人名称' + }, + { + field: 'templateContent', + label: '模板内容' + }, + { + field: 'templateParams', + label: '模板参数', + render: (value) => { + return h(JsonPreview, { data: value }) + } + }, + { + field: 'templateType', + label: '模板类型', + render: (value) => { + return useRender.renderDict(value, DICT_TYPE.SYSTEM_NOTIFY_TEMPLATE_TYPE) + } + }, + { + field: 'readTime', + label: '阅读时间', + render: (value) => { + if (!value) { + return useRender.renderTag('未阅读') + } + return useRender.renderDate(value) + } + }, + { + field: 'createTime', + label: '创建时间', + render: (value) => { + return useRender.renderDate(value) + } + } +] + +// 站内信详情 +export interface MessageInfo { + userId: number + userType: number + templateId: number + templateCode: string + templateNickname: string + templateContent: string + templateType: number + templateParams: { [key: string]: string } + readStatus: boolean + readTime?: any + id: number + createTime: number + key: string +}