From d4f6764273970538b96651423dad17f9bcffe5de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B4=AA=E6=B4=AA?=
 <liuhonghong@geedgenetworks.com>
Date: Wed, 20 Nov 2024 19:51:26 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20header=E9=A1=B6=E9=83=A8menu=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/components/layout/layout.scss  |  4 +---
 src/components/layout/Header.vue              | 23 ++++++++++++++-----
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/assets/css/components/components/layout/layout.scss b/src/assets/css/components/components/layout/layout.scss
index ab6187e6..6c1ef516 100644
--- a/src/assets/css/components/components/layout/layout.scss
+++ b/src/assets/css/components/components/layout/layout.scss
@@ -99,9 +99,7 @@
           cursor: pointer;
 
           &:hover {
-            span {
-              text-decoration: underline;
-            }
+            color: var(--el-color-primary);
           }
           .cn-icon:first-of-type {
             font-size: 17px;
diff --git a/src/components/layout/Header.vue b/src/components/layout/Header.vue
index 260df967..a6edf573 100644
--- a/src/components/layout/Header.vue
+++ b/src/components/layout/Header.vue
@@ -140,11 +140,11 @@
         :show-close="false"
         @close="closeDrawer"
     >
-      <div class="cn-menu__left" v-if="otherMenu">
-        <div class="left-menu" v-for="menu in otherMenu" :key="menu.id" @click="jumpOther(menu.route,'','',0)">
+      <div class="cn-menu__left" v-if="otherMenu" @mouseleave="mouseleaveLeftMenu">
+        <div class="left-menu" v-for="menu in otherMenu" :key="menu.id" @click="jumpOther(menu.route,'','',0)" @mouseenter="mouseleaveItemMenu(menu.code)">
           <i :class="menu.icon"></i>
           <span>{{ $t(menu.i18n || menu.name) }}</span>
-          <i class="cn-icon cn-icon-right"></i>
+          <i class="cn-icon cn-icon-right" v-show="menu.code==='setting'"></i>
         </div>
       </div>
       <div class="cn-menu__middle" v-if="!isShowSetting">
@@ -187,7 +187,7 @@
           </div>
         </div>
       </div>
-      <div class="cn-menu__middle" v-if="isShowSetting">
+      <div class="cn-menu__middle" v-if="isShowSetting" @mouseenter="mouseleaveItemMenu('setting')" @mouseleave="mouseleaveRightMenu">
         <div class="middle-menus middle-menus--network-analytics">
           <div class="middle-menus__header">{{ $t('overall.setting') }}</div>
           <div class="middle-menus__body" v-if="settingMenu && settingMenu.children">
@@ -494,8 +494,10 @@ export default {
     const newQuery = query
     // 重刷界面后url里参数带空格的部分会被转为+，此处将+再转为空格。后续观察是否存在原本参数带+被误转的
     Object.keys(newQuery).forEach(item => {
-      if (newQuery[item] && newQuery[item].indexOf('+') > -1) {
-        newQuery[item] = newQuery[item].replaceAll('+', ' ')
+      if (newQuery[item] && _.isString(newQuery[item])) {
+        if (newQuery[item].indexOf('+') > -1) {
+          newQuery[item] = newQuery[item].replaceAll('+', ' ')
+        }
       }
     })
     const newUrl = urlParamsHandler(window.location.href, query, newQuery)
@@ -929,6 +931,15 @@ export default {
         this.isShowSetting = false
         clearTimeout(timer)
       }, 400)
+    },
+    mouseleaveLeftMenu () {
+      this.isShowSetting = false
+    },
+    mouseleaveItemMenu (code) {
+      this.isShowSetting = code === 'setting'
+    },
+    mouseleaveRightMenu () {
+      this.isShowSetting = false
     }
   }
 }