From 6313184711a73f48c287fc10a6334ff3a9fe6a47 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Mon, 30 Jan 2023 15:58:50 +0800
Subject: [PATCH] =?UTF-8?q?pref:=20=E4=BF=AE=E6=94=B9=20theme=20color?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/zh.json                        |  2 +-
 .../components/NavHeader/ViewSwitcher.vue     | 36 +++++++++++++------
 src/layout/components/NavLeft/index.vue       |  2 +-
 src/utils/theme/color.js                      |  2 +-
 4 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/src/i18n/langs/zh.json b/src/i18n/langs/zh.json
index a8fc50515..925953813 100644
--- a/src/i18n/langs/zh.json
+++ b/src/i18n/langs/zh.json
@@ -1212,7 +1212,7 @@
     "UploadFailed": "上传失败",
     "Applets": "远程应用",
     "AppletHosts": "应用发布机",
-    "uploadZipTips": "请上传zip格式的文件",
+    "uploadZipTips": "请上传 zip 格式的文件",
     "HostDeployment": "发布机部署",
     "TerminalStat": "CPU/内存/磁盘"
   },
diff --git a/src/layout/components/NavHeader/ViewSwitcher.vue b/src/layout/components/NavHeader/ViewSwitcher.vue
index af3de1d8a..f0cc68f15 100644
--- a/src/layout/components/NavHeader/ViewSwitcher.vue
+++ b/src/layout/components/NavHeader/ViewSwitcher.vue
@@ -1,17 +1,17 @@
 <template>
   <el-tooltip
     v-model="iShowTip"
-    :manual="true"
     :content="tipText"
+    :manual="true"
     class="item"
     effect="dark"
     placement="bottom-start"
   >
     <el-menu
-      :default-active="currentViewRoute.name"
-      class="menu-main"
       :class="mode"
+      :default-active="currentViewRoute.name"
       :mode="mode"
+      class="menu-main"
       @select="handleSelectView"
     >
       <el-menu-item
@@ -19,7 +19,7 @@
         :key="view.name"
         :index="view.name"
       >
-        <svg-icon class="icons" :icon-class="view.meta.icon" />
+        <svg-icon :icon-class="view.meta.icon" class="icons" />
         <span slot="title" class="icons-title">{{ view.meta.title }}</span>
       </el-menu-item>
     </el-menu>
@@ -122,26 +122,32 @@ export default {
 <style lang="scss" scoped>
 .menu-main.el-menu {
   background-color: transparent;
-  border-right: none!important;
+  border-right: none !important;
+
   ::v-deep .el-submenu .el-submenu__title {
     height: 40px;
     line-height: 40px;
     border-bottom: none;
   }
+
   &.el-menu--horizontal {
     border-bottom: none;
   }
-  &>>> .el-icon-arrow-down {
+
+  & > > > .el-icon-arrow-down {
     font-size: 13px;
     color: #606266;
   }
+
   .el-menu-item {
     height: 36px;
     line-height: 26px;
     padding: 4px 24px;
+
     &:hover {
       background-color: var(--menu-hover);
     }
+
     &:focus {
       background-color: transparent;
     }
@@ -149,49 +155,59 @@ export default {
 }
 
 .el-menu--horizontal .el-menu .el-menu-item {
-  display: inline-block!important;
+  display: inline-block !important;
   padding: 10px 10px;
   text-align: center;
   height: 70px;
+
   &:hover {
     color: inherit;
+
     i {
       color: inherit;
     }
   }
+
   &:first-child {
     margin-left: 16px;
   }
+
   &:last-child {
     margin-right: 16px;
   }
 }
+
 .el-submenu.is-opened {
   background-color: transparent;
 }
+
 .title-label {
   padding-left: 12px;
   font-size: 14px;
   vertical-align: unset;
-  color: #606266!important;
+  color: #606266 !important;
 }
+
 .icons {
-  vertical-align: middle!important;
+  vertical-align: middle !important;
   font-size: 16px;
   text-align: center;
   color: #1F2329;
   margin-right: 10px;
 }
+
 .icons-title {
   display: inline-block;
   font-size: 14px;
 }
+
 .el-menu-item.is-active {
   font-weight: bold;
   color: var(--color-primary);
   border-left: 4px solid var(--color-primary);
 }
-.menu-main.mobile-view-switch >>> .el-submenu__icon-arrow {
+
+.menu-main.mobile-view-switch > > > .el-submenu__icon-arrow {
   right: 10px;
 }
 </style>
diff --git a/src/layout/components/NavLeft/index.vue b/src/layout/components/NavLeft/index.vue
index 512c004f9..eb2780a22 100644
--- a/src/layout/components/NavLeft/index.vue
+++ b/src/layout/components/NavLeft/index.vue
@@ -155,12 +155,12 @@ export default {
     transition: all 0.3s;
 
     .switch-view {
+      padding: 6px;
       position: absolute;
       top: 50%;
       right: 16px;
       transform: translateY(-50%);
       z-index: 1;
-      padding: 3px;
       line-height: 10px;
       border-radius: 3px;
 
diff --git a/src/utils/theme/color.js b/src/utils/theme/color.js
index f3b1d1475..11bcff7b0 100644
--- a/src/utils/theme/color.js
+++ b/src/utils/theme/color.js
@@ -77,7 +77,7 @@ export function changeMenuColor(themeColors) {
   const colorValue = colors['--color-primary'].replace(/#/g, '')
   const white = 'ffffff'
   const black = '000000'
-  const menuHoverColor = mix(white, colorValue, 96)
+  const menuHoverColor = mix(white, colorValue, 90)
   const navBackgroundColor = mix(black, colorValue, 20)
   elementStyle.setProperty('--menu-hover', menuHoverColor)
   elementStyle.setProperty('--nav-bg', navBackgroundColor)