From c104ba5445f1c990b08ec5fd3a8cf1d783d65c76 Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Thu, 23 May 2024 22:19:43 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=B6=88=E6=81=AF=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=E7=82=B9=E5=BC=80=E5=90=8E=E6=89=8D=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apis/system/message.ts                    |  5 ++
 .../components/HeaderRightBar/Message.vue     | 48 ++++++++++++-------
 .../components/HeaderRightBar/index.vue       | 40 +++++-----------
 src/views/system/user/UserDetailDrawer.vue    |  4 +-
 4 files changed, 53 insertions(+), 44 deletions(-)

diff --git a/src/apis/system/message.ts b/src/apis/system/message.ts
index 30d81cc..5aa1ce0 100644
--- a/src/apis/system/message.ts
+++ b/src/apis/system/message.ts
@@ -17,3 +17,8 @@ export function deleteMessage(ids: string | Array<string>) {
 export function readMessage(ids?: string | Array<string>) {
   return http.patch(`${BASE_URL}/read`, ids)
 }
+
+/** @desc 查询未读消息数量 */
+export function getUnreadMessageCount() {
+  return http.get(`${BASE_URL}/unread`)
+}
diff --git a/src/layout/components/HeaderRightBar/Message.vue b/src/layout/components/HeaderRightBar/Message.vue
index c15bfb4..1218e36 100644
--- a/src/layout/components/HeaderRightBar/Message.vue
+++ b/src/layout/components/HeaderRightBar/Message.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="message">
-    <a-list>
+    <a-list :loading="loading">
       <template #header>通知</template>
-      <a-list-item v-for="item in props.data" :key="item.id">
+      <a-list-item v-for="item in messageList" :key="item.id">
         <div class="content-wrapper" @click="open">
           <div class="content">{{ item.title }}</div>
           <div class="date">{{ item.createTime }}</div>
@@ -19,19 +19,33 @@
 </template>
 
 <script setup lang="ts">
-import { readMessage } from '@/apis'
+import { onMounted } from 'vue'
+import { type MessageResp, listMessage, readMessage } from '@/apis'
 
-const props = defineProps({
-  data: {
-    type: Array as PropType<any>, // 简化数据结构以便测试
-    required: true
-  },
-  fetch: {
-    type: Function, // 简化数据结构以便测试
-    required: true
-  }
+const emit = defineEmits<{
+  (e: 'readall-success'): void
+}>()
+
+const queryParam = reactive({
+  isRead: false,
+  sort: ['createTime,desc'],
+  page: 1,
+  size: 5
 })
 
+const messageList = ref<MessageResp[]>()
+const loading = ref(false)
+// 查询消息数据
+const getMessageData = async () => {
+  try {
+    loading.value = true
+    const { data } = await listMessage(queryParam)
+    messageList.value = data.list
+  } finally {
+    loading.value = false
+  }
+}
+
 // 打开消息中心
 const open = () => {
   window.open('/#/setting/message')
@@ -40,8 +54,13 @@ const open = () => {
 // 全部已读
 const readAll = async () => {
   await readMessage()
-  props.fetch()
+  await getMessageData()
+  emit('readall-success')
 }
+
+onMounted(() => {
+  getMessageData()
+})
 </script>
 
 <style lang="scss" scoped>
@@ -71,9 +90,6 @@ const readAll = async () => {
 
     &:hover {
       background-color: var(--color-bg-4);
-    }
-
-    &:active {
       color: rgb(var(--arcoblue-6));
     }
   }
diff --git a/src/layout/components/HeaderRightBar/index.vue b/src/layout/components/HeaderRightBar/index.vue
index aa03887..0deea95 100644
--- a/src/layout/components/HeaderRightBar/index.vue
+++ b/src/layout/components/HeaderRightBar/index.vue
@@ -17,7 +17,7 @@
         :content-style="{ marginTop: '-5px', padding: 0, border: 'none' }"
         :arrow-style="{ width: 0, height: 0 }"
       >
-        <a-badge :count="messageData.length" dot>
+        <a-badge :count="unreadMessageCount" dot>
           <a-button size="mini" class="gi_hover_btn">
             <template #icon>
               <icon-notification :size="18" />
@@ -25,7 +25,7 @@
           </a-button>
         </a-badge>
         <template #content>
-          <Message :fetch="getMessageData" :data="messageData" />
+          <Message @readall-success="getMessageCount" />
         </template>
       </a-popover>
 
@@ -74,10 +74,9 @@
 import { Modal } from '@arco-design/web-vue'
 import { useFullscreen } from '@vueuse/core'
 import { onMounted, ref } from 'vue'
-import dayjs from 'dayjs'
 import Message from './Message.vue'
 import SettingDrawer from './SettingDrawer.vue'
-import { listMessage } from '@/apis'
+import { getUnreadMessageCount } from '@/apis'
 import { useUserStore } from '@/stores'
 import { isMobile } from '@/utils'
 import { getToken } from '@/utils/auth'
@@ -91,8 +90,9 @@ onBeforeUnmount(() => {
   }
 })
 
-const messageData = ref<Array<any>>([])
-const createWebSocket = (token) => {
+const unreadMessageCount = ref(0)
+// 初始化 WebSocket
+const initWebSocket = (token: string) => {
   socket = new WebSocket(`${import.meta.env.VITE_API_WS_URL}/ws?token=${token}`)
   socket.onopen = () => {
     // console.log('WebSocket connection opened')
@@ -100,15 +100,7 @@ const createWebSocket = (token) => {
 
   socket.onmessage = (event) => {
     const data = JSON.parse(event.data)
-    messageData.value.unshift({
-      id: data?.id,
-      title: data?.content,
-      type: data?.type,
-      isRead: data?.isRead,
-      createTime:
-        data?.sendTime
-        && dayjs(data.sendTime).format('YYYY-MM-DD HH:mm:ss')
-    })
+    unreadMessageCount.value = Number.parseInt(data?.content)
   }
 
   socket.onerror = () => {
@@ -120,19 +112,13 @@ const createWebSocket = (token) => {
   }
 }
 
-// 查询消息通知
-const queryMessageParam = reactive({
-  isRead: false,
-  sort: ['createTime,desc'],
-  page: 1,
-  size: 5
-})
-const getMessageData = async () => {
+// 查询未读消息数量
+const getMessageCount = async () => {
+  const { data } = await getUnreadMessageCount()
+  unreadMessageCount.value = data.total
   const token = getToken()
-  const { data } = await listMessage(queryMessageParam)
-  messageData.value = data.list
   if (token) {
-    createWebSocket(token)
+    initWebSocket(token)
   }
 }
 
@@ -187,7 +173,7 @@ const checkPasswordExpired = () => {
 
 onMounted(() => {
   checkPasswordExpired()
-  getMessageData()
+  getMessageCount()
 })
 </script>
 
diff --git a/src/views/system/user/UserDetailDrawer.vue b/src/views/system/user/UserDetailDrawer.vue
index 74dbf9e..d442323 100644
--- a/src/views/system/user/UserDetailDrawer.vue
+++ b/src/views/system/user/UserDetailDrawer.vue
@@ -1,7 +1,9 @@
 <template>
   <a-drawer v-model:visible="visible" title="用户详情" :width="width >= 600 ? 600 : '100%'" :footer="false">
     <a-descriptions :column="2" size="large" class="general-description">
-      <a-descriptions-item label="ID" :span="2">{{ dataDetail?.id }}</a-descriptions-item>
+      <a-descriptions-item label="ID" :span="2">
+        <a-typography-paragraph copyable>{{ dataDetail?.id }}</a-typography-paragraph>
+      </a-descriptions-item>
       <a-descriptions-item label="用户名">
         <a-typography-paragraph :copyable="!!dataDetail?.username">{{ dataDetail?.username }}</a-typography-paragraph>
       </a-descriptions-item>