From 0b6d028a5a3fcc2f6fda2a69655ac9bc6ce8b8df Mon Sep 17 00:00:00 2001 From: From-wh Date: Mon, 8 May 2023 12:01:10 +0800 Subject: [PATCH] =?UTF-8?q?improve:=20=E4=BC=98=E5=8C=96=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/admin/src/i18n/lang/zh-cn.js | 2 +- template/admin/src/layout/component/transverseAside.vue | 4 ++-- template/admin/src/layout/navBars/breadcrumb/index.vue | 2 +- template/admin/src/layout/navBars/breadcrumb/setings.vue | 7 ++++++- template/admin/src/layout/navBars/tagsView/tagsView.vue | 2 +- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/template/admin/src/i18n/lang/zh-cn.js b/template/admin/src/i18n/lang/zh-cn.js index a9f5439fb..6b03f19b7 100644 --- a/template/admin/src/i18n/lang/zh-cn.js +++ b/template/admin/src/i18n/lang/zh-cn.js @@ -137,7 +137,7 @@ export default { themeStyle: '主题', fiveAnimation: '主页面切换动画', fiveColumnsAsideStyle: '菜单高亮风格', - fiveColumnsAsideLayout: '分栏布局风格', + fiveColumnsAsideLayout: '顶级菜单风格', sixTitle: '布局切换', sixDefaults: '默认', sixClassic: '经典', diff --git a/template/admin/src/layout/component/transverseAside.vue b/template/admin/src/layout/component/transverseAside.vue index 0bc1b2bff..4c639ecaa 100644 --- a/template/admin/src/layout/component/transverseAside.vue +++ b/template/admin/src/layout/component/transverseAside.vue @@ -241,7 +241,7 @@ export default { .layout-columns-tra-aside { height: 100%; background: var(--prev-bg-columnsMenuBar); - box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08); + // box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08); overflow-y: hidden; // flex: 1; ul { @@ -302,7 +302,7 @@ export default { transform: translatey(0%); z-index: 0; transition: 0.3s ease-in-out; - border-radius: 5px; + border-radius: 3px; } .columns-card { @extend .columns-round; diff --git a/template/admin/src/layout/navBars/breadcrumb/index.vue b/template/admin/src/layout/navBars/breadcrumb/index.vue index 7a655735b..c32f586ce 100644 --- a/template/admin/src/layout/navBars/breadcrumb/index.vue +++ b/template/admin/src/layout/navBars/breadcrumb/index.vue @@ -81,7 +81,7 @@ export default { height: 50px; display: flex; align-items: center; - padding-right: 15px; + // padding-right: 15px; overflow: hidden; background: var(--prev-bg-topBar); border-bottom: 1px solid var(--prev-border-color-lighter); diff --git a/template/admin/src/layout/navBars/breadcrumb/setings.vue b/template/admin/src/layout/navBars/breadcrumb/setings.vue index 7a88e4e88..98993d19f 100644 --- a/template/admin/src/layout/navBars/breadcrumb/setings.vue +++ b/template/admin/src/layout/navBars/breadcrumb/setings.vue @@ -539,6 +539,11 @@ export default { onSetLayout(layout) { Local.set('oldLayout', layout); if (this.$store.state.themeConfig.themeConfig.layout === layout) return false; + if (['classic', 'transverse'].includes(layout)) { + this.$store.state.themeConfig.themeConfig.isTagsview = false; + } else { + this.$store.state.themeConfig.themeConfig.isTagsview = true; + } this.$store.state.themeConfig.themeConfig.layout = layout; this.$store.state.themeConfig.themeConfig.isDrawer = false; this.$store.state.themeConfig.themeConfig.columnsAsideStyle = 'columns-card'; @@ -660,7 +665,7 @@ body .v-modal { .el-container { height: 100%; .el-aside-dark { - opacity: .5; + opacity: 0.5; background-color: var(--prev-tag-active-color); border-radius: 2px; } diff --git a/template/admin/src/layout/navBars/tagsView/tagsView.vue b/template/admin/src/layout/navBars/tagsView/tagsView.vue index ac35f23e7..a951abcbb 100644 --- a/template/admin/src/layout/navBars/tagsView/tagsView.vue +++ b/template/admin/src/layout/navBars/tagsView/tagsView.vue @@ -461,7 +461,7 @@ export default { width: 14px; text-align: center; line-height: 14px; - top: 1px; + top: 0px; } .is-tagsview-icon { color: var(--prev-color-text-regular);