diff --git a/template/admin/src/layout/component/transverseAside.vue b/template/admin/src/layout/component/transverseAside.vue new file mode 100644 index 000000000..46807e6b5 --- /dev/null +++ b/template/admin/src/layout/component/transverseAside.vue @@ -0,0 +1,287 @@ + + + + + diff --git a/template/admin/src/layout/navBars/breadcrumb/breadcrumb.vue b/template/admin/src/layout/navBars/breadcrumb/breadcrumb.vue index 9fa215b5d..fe5c738d4 100644 --- a/template/admin/src/layout/navBars/breadcrumb/breadcrumb.vue +++ b/template/admin/src/layout/navBars/breadcrumb/breadcrumb.vue @@ -82,7 +82,7 @@ export default { // 动态设置经典、横向布局不显示 isShowBreadcrumb() { const { layout, isBreadcrumb } = this.$store.state.themeConfig.themeConfig; - if (layout === 'transverse') { + if (layout === 'transverse' || layout === 'classic') { return 'none'; } else { return isBreadcrumb ? '' : 'none'; diff --git a/template/admin/src/layout/navBars/breadcrumb/index.vue b/template/admin/src/layout/navBars/breadcrumb/index.vue index 84a8c27b3..7a655735b 100644 --- a/template/admin/src/layout/navBars/breadcrumb/index.vue +++ b/template/admin/src/layout/navBars/breadcrumb/index.vue @@ -3,6 +3,7 @@ + @@ -12,9 +13,10 @@ import Breadcrumb from '@/layout/navBars/breadcrumb/breadcrumb.vue'; import User from '@/layout/navBars/breadcrumb/user.vue'; import Logo from '@/layout/logo/index.vue'; import Horizontal from '@/layout/navMenu/horizontal.vue'; +import transverseAside from '@/layout/component/transverseAside.vue'; export default { name: 'layoutNavBars', - components: { Breadcrumb, User, Logo, Horizontal }, + components: { Breadcrumb, User, Logo, Horizontal, transverseAside }, data() { return { menuList: [], @@ -31,6 +33,10 @@ export default { let { layout, isClassicSplitMenu } = this.$store.state.themeConfig.themeConfig; return layout === 'transverse' || (isClassicSplitMenu && layout === 'classic'); }, + isLayoutClassic() { + let { layout } = this.$store.state.themeConfig.themeConfig; + return layout === 'classic'; + }, }, mounted() { this.setFilterRoutes(); diff --git a/template/admin/src/layout/navBars/breadcrumb/setings.vue b/template/admin/src/layout/navBars/breadcrumb/setings.vue index 1852dd9e9..bcd0febb8 100644 --- a/template/admin/src/layout/navBars/breadcrumb/setings.vue +++ b/template/admin/src/layout/navBars/breadcrumb/setings.vue @@ -275,7 +275,10 @@ -
+
{{ $t('message.layout.fiveColumnsAsideStyle') }}
@@ -284,7 +287,10 @@
-
+
{{ $t('message.layout.fiveColumnsAsideLayout') }}
diff --git a/template/admin/src/layout/navBars/tagsView/tagsView.vue b/template/admin/src/layout/navBars/tagsView/tagsView.vue index 72f1639c8..9ebdc284a 100644 --- a/template/admin/src/layout/navBars/tagsView/tagsView.vue +++ b/template/admin/src/layout/navBars/tagsView/tagsView.vue @@ -418,7 +418,7 @@ export default { line-height: 26px; display: flex; align-items: center; - border: 1px solid var(--prev-border-color-lighter); + border: 1px solid #ebeef5; padding: 0 12px 0 15px; margin-right: 5px; border-radius: 2px;