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" > -
-
+
+
{{ $t(menu.i18n || menu.name) }} - +
@@ -187,7 +187,7 @@
-
+
{{ $t('overall.setting') }}
@@ -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 } } }