From ecd671682ee14fd831f18a97929d12b8af09f010 Mon Sep 17 00:00:00 2001
From: zhoumingfa <daxiongren@foxmail.com>
Date: Sun, 4 Aug 2024 11:38:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2=E5=A4=B4?=
 =?UTF-8?q?=E9=83=A8=E7=9A=84=E6=B6=88=E6=81=AF=E6=B0=94=E6=B3=A1=E5=8D=A1?=
 =?UTF-8?q?=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../header-message-detail-modal.vue           | 44 +++++++++++++
 .../header-user-space/header-message.vue      | 65 +++++++++++--------
 .../header-user-space/header-setting.vue      |  4 +-
 .../components/header-user-space/index.vue    | 10 +--
 .../src/lib/axios.js                          |  2 +-
 5 files changed, 85 insertions(+), 40 deletions(-)
 create mode 100644 smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-message-detail-modal.vue

diff --git a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-message-detail-modal.vue b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-message-detail-modal.vue
new file mode 100644
index 00000000..69164b5b
--- /dev/null
+++ b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-message-detail-modal.vue
@@ -0,0 +1,44 @@
+<template>
+  <a-modal v-model:open="showFlag" :width="800" title="消息内容" :destroyOnClose="true" @ok="showFlag = false">
+    <a-descriptions bordered :column="2" size="small">
+      <a-descriptions-item :labelStyle="{ width: '80px' }" :span="1" label="类型"
+        >{{ $smartEnumPlugin.getDescByValue('MESSAGE_TYPE_ENUM', messageDetail.messageType) }}
+      </a-descriptions-item>
+      <a-descriptions-item :labelStyle="{ width: '120px' }" :span="1" label="发送时间">{{ messageDetail.createTime }}</a-descriptions-item>
+      <a-descriptions-item :labelStyle="{ width: '80px' }" :span="2" label="标题">{{ messageDetail.title }}</a-descriptions-item>
+      <a-descriptions-item :labelStyle="{ width: '80px' }" :span="2" label="内容">
+        <pre>{{ messageDetail.content }}</pre>
+      </a-descriptions-item>
+    </a-descriptions>
+  </a-modal>
+</template>
+<script setup>
+  import { reactive, ref } from 'vue';
+  import { messageApi } from '/@/api/support/message-api.js';
+
+  const emit = defineEmits(['refresh']);
+
+  const messageDetail = reactive({
+    messageType: '',
+    title: '',
+    content: '',
+    createTime: '',
+  });
+
+  const showFlag = ref(false);
+
+  function show(data) {
+    Object.assign(messageDetail, data);
+    showFlag.value = true;
+    read(data);
+  }
+
+  async function read(message) {
+    if (!message.readFlag) {
+      await messageApi.updateReadFlag(message.messageId);
+      emit('refresh');
+    }
+  }
+
+  defineExpose({ show });
+</script>
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-message.vue b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-message.vue
index e457cc8a..699bf975 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-message.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-message.vue
@@ -9,15 +9,19 @@
 -->
 
 <template>
-  <a-dropdown trigger="click" v-model:open="show">
-    <a-badge :count="unreadMessageCount + toBeDoneCount">
-      <div style="width: 26px; height: 26px">
-        <BellOutlined :style="{ fontSize: '16px' }" />
-      </div>
-    </a-badge>
+  <div>
+    <a-popover v-model:open="show" trigger="contextmenu" placement="bottomLeft" @openChange="() => (show = true)">
+      <a-button type="text" @click="showMessage" style="padding: 4px 5px">
+        <a-badge :count="unreadMessageCount + toBeDoneCount">
+          <div style="width: 26px; height: 26px">
+            <BellOutlined :style="{ fontSize: '16px' }" />
+          </div>
+        </a-badge>
+      </a-button>
 
-    <template #overlay>
-      <a-card class="message-container" :bodyStyle="{ padding: 0 }">
+      <template #content>
+        <!-- 为了能在点击查看消息详情弹窗的同时防止消息气泡卡片关闭 所以加了一个手动关闭按钮 -->
+        <a-button type="text" @click="closeMessage" style="padding: 4px 5px"> 关闭 </a-button>
         <a-spin :spinning="loading">
           <a-tabs class="dropdown-tabs" centered :tabBarStyle="{ textAlign: 'center' }" style="width: 300px">
             <a-tab-pane key="message">
@@ -30,7 +34,8 @@
                   <a-list-item-meta>
                     <template #title>
                       <div class="title">
-                        <a @click="gotoMessage">{{ item.title }}</a>
+                        <a-badge status="error" />
+                        <a @click="showMessageDetail(item)">{{ item.title }}</a>
                       </div>
                     </template>
                     <template #description>
@@ -38,12 +43,12 @@
                     </template>
                   </a-list-item-meta>
                 </a-list-item>
-                <a-list-item v-if="unreadMessageCount !== 0">
+                <a-list-item v-if="unreadMessageCount > 3">
                   <a-button type="text" @click="gotoMessage" style="padding: 4px 5px"> ... 查看更多 </a-button>
                 </a-list-item>
               </a-list>
             </a-tab-pane>
-            <a-tab-pane key="TO_BE_DONE">
+            <a-tab-pane key="to_be_done">
               <template #tab>
                 待办工作
                 <a-badge :count="toBeDoneCount" showZero :offset="[0, -20]" />
@@ -62,10 +67,10 @@
             </a-tab-pane>
           </a-tabs>
         </a-spin>
-      </a-card>
-    </template>
-  </a-dropdown>
-  <MessageDetail ref="messageDetailRef" @refresh="queryMessage" />
+      </template>
+    </a-popover>
+    <MessageDetailModal ref="messageDetailModalRef" @refresh="queryMessage" />
+  </div>
 </template>
 
 <script setup>
@@ -77,24 +82,27 @@
   import dayjs from 'dayjs';
   import { theme } from 'ant-design-vue';
   import { useRouter } from 'vue-router';
-  import MessageDetail from '/@/views/system/account/components/message/components/message-detail.vue';
+  import MessageDetailModal from './header-message-detail-modal.vue';
   import localKey from '/@/constants/local-storage-key-const';
   import { localRead } from '/@/utils/local-util';
 
   const { useToken } = theme;
   const { token } = useToken();
 
-  defineExpose({ showMessage });
-
-  function showMessage() {
-    queryMessage();
-    loadToBeDoneList();
-    show.value = true;
-  }
-
   const loading = ref(false);
   const show = ref(false);
 
+  // 点击按钮打开消息气泡卡片的同时刷新消息
+  function showMessage() {
+    show.value = true;
+    queryMessage();
+    loadToBeDoneList();
+  }
+
+  function closeMessage() {
+    show.value = false;
+  }
+
   // ------------------------- 查询消息  -------------------------
 
   // 未读消息
@@ -124,6 +132,11 @@
     }
   }
 
+  const messageDetailModalRef = ref();
+  function showMessageDetail(data) {
+    messageDetailModalRef.value.show(data);
+  }
+
   const router = useRouter();
   function gotoMessage() {
     show.value = false;
@@ -232,10 +245,6 @@
     cursor: pointer;
   }
 
-  .message-container {
-    border: #eeeeee solid 1px;
-  }
-
   .dropdown-tabs {
     background-color: @base-bg-color;
     border-radius: 4px;
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-setting.vue b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-setting.vue
index 77b4cb07..9fdbbc34 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-setting.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-setting.vue
@@ -18,7 +18,7 @@
       </a-form-item>
       <a-form-item :label="$t('setting.color')">
         <div class="color-container">
-          <template v-for="(item, index) in themeColors">
+          <template v-for="(item, index) in themeColors" :key="index">
             <div v-if="index === formState.colorIndex" class="color">
               <CheckSquareFilled :style="{ color: item.primaryColor, fontSize: '22px' }" />
             </div>
@@ -34,7 +34,7 @@
               >
                 <path
                   d="M128 160.01219c0-17.67619 14.336-32.01219 32.01219-32.01219h704c17.65181 0 31.98781 14.336 31.98781 32.01219v704c0 17.65181-14.336 31.98781-32.01219 31.98781H160.036571a31.98781 31.98781 0 0 1-32.01219-32.01219V160.036571z"
-                ></path>
+                />
               </svg>
             </div>
           </template>
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/index.vue b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/index.vue
index 4ef0c682..cedaa547 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/index.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/index.vue
@@ -18,9 +18,7 @@
         size="small"
       />
       <!---消息通知--->
-      <a-button type="text" @click="showMessage" style="padding: 4px 5px">
-        <HeaderMessage ref="headerMessage" />
-      </a-button>
+      <HeaderMessage ref="headerMessage" />
       <!---国际化--->
       <!-- <a-button type="text" @click="showSetting" class="operate-icon">
         <template #icon><switcher-outlined /></template>
@@ -59,12 +57,6 @@
     headerSetting.value.show();
   }
 
-  //消息通知
-  const headerMessage = ref();
-  function showMessage() {
-    headerMessage.value.showMessage();
-  }
-
   //帮助文档
   function showHelpDoc() {
     useAppConfigStore().showHelpDoc();
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/lib/axios.js b/smart-admin-web/javascript-ant-design-vue3/src/lib/axios.js
index b340b2d5..2ee2b2d1 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/lib/axios.js
+++ b/smart-admin-web/javascript-ant-design-vue3/src/lib/axios.js
@@ -26,7 +26,7 @@ const smartAxios = axios.create({
 
 // 退出系统
 function logout() {
-  useUserStore.logout();
+  useUserStore().logout();
   location.href = '/';
 }