diff --git a/src/layouts/BasicLayout/components/GlobalSider/components/DefaultSider/index.vue b/src/layouts/BasicLayout/components/GlobalSider/components/DefaultSider/index.vue
new file mode 100644
index 00000000..f5c4d122
--- /dev/null
+++ b/src/layouts/BasicLayout/components/GlobalSider/components/DefaultSider/index.vue
@@ -0,0 +1,71 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/layouts/BasicLayout/components/GlobalSider/components/VerticalMixSider/components/MixMenu.vue b/src/layouts/BasicLayout/components/GlobalSider/components/VerticalMixSider/components/MixMenu.vue
new file mode 100644
index 00000000..15d4872e
--- /dev/null
+++ b/src/layouts/BasicLayout/components/GlobalSider/components/VerticalMixSider/components/MixMenu.vue
@@ -0,0 +1,39 @@
+
+
+
+
+
+
diff --git a/src/layouts/BasicLayout/components/GlobalSider/components/VerticalMixSider/components/MixMenuCollapse.vue b/src/layouts/BasicLayout/components/GlobalSider/components/VerticalMixSider/components/MixMenuCollapse.vue
new file mode 100644
index 00000000..ad8f3662
--- /dev/null
+++ b/src/layouts/BasicLayout/components/GlobalSider/components/VerticalMixSider/components/MixMenuCollapse.vue
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/layouts/BasicLayout/components/GlobalSider/components/VerticalMixSider/components/index.ts b/src/layouts/BasicLayout/components/GlobalSider/components/VerticalMixSider/components/index.ts
new file mode 100644
index 00000000..36379acd
--- /dev/null
+++ b/src/layouts/BasicLayout/components/GlobalSider/components/VerticalMixSider/components/index.ts
@@ -0,0 +1,4 @@
+import MixMenu from './MixMenu.vue';
+import MixMenuCollapse from './MixMenuCollapse.vue';
+
+export { MixMenu, MixMenuCollapse };
diff --git a/src/layouts/BasicLayout/components/GlobalSider/components/VerticalMixSider/index.vue b/src/layouts/BasicLayout/components/GlobalSider/components/VerticalMixSider/index.vue
new file mode 100644
index 00000000..0fef6161
--- /dev/null
+++ b/src/layouts/BasicLayout/components/GlobalSider/components/VerticalMixSider/index.vue
@@ -0,0 +1,71 @@
+
+
+
+
+
+
diff --git a/src/layouts/BasicLayout/components/GlobalSider/components/index.ts b/src/layouts/BasicLayout/components/GlobalSider/components/index.ts
new file mode 100644
index 00000000..4151f959
--- /dev/null
+++ b/src/layouts/BasicLayout/components/GlobalSider/components/index.ts
@@ -0,0 +1,4 @@
+import DefaultSider from './DefaultSider/index.vue';
+import VerticalMixSider from './VerticalMixSider/index.vue';
+
+export { DefaultSider, VerticalMixSider };
diff --git a/src/layouts/BasicLayout/components/GlobalSider/index.vue b/src/layouts/BasicLayout/components/GlobalSider/index.vue
index d6e34321..92f270fb 100644
--- a/src/layouts/BasicLayout/components/GlobalSider/index.vue
+++ b/src/layouts/BasicLayout/components/GlobalSider/index.vue
@@ -1,28 +1,16 @@
-
-
-
-
+
+
+
+
diff --git a/src/layouts/BasicLayout/components/GlobalTab/components/MultiTab/components/index.ts b/src/layouts/BasicLayout/components/GlobalTab/components/MultiTab/components/index.ts
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/layouts/BasicLayout/components/common/GlobalLogo.vue b/src/layouts/BasicLayout/components/common/GlobalLogo.vue
index 1afa411a..3eb1c8d0 100644
--- a/src/layouts/BasicLayout/components/common/GlobalLogo.vue
+++ b/src/layouts/BasicLayout/components/common/GlobalLogo.vue
@@ -1,5 +1,5 @@
-
+
{{ title }}
@@ -17,5 +17,13 @@ const title = useAppTitle();
const showTitle = computed(
() => !theme.isVerticalNav || (!app.menu.collapsed && theme.navStyle.mode !== 'vertical-mix')
);
+const headerHeight = computed(() => {
+ const { height } = theme.headerStyle;
+ return `${height}px`;
+});
-
+
diff --git a/src/layouts/BasicLayout/index.vue b/src/layouts/BasicLayout/index.vue
index 547f13c4..355b1f49 100644
--- a/src/layouts/BasicLayout/index.vue
+++ b/src/layouts/BasicLayout/index.vue
@@ -3,7 +3,7 @@
-
+
theme.navStyle.mode === 'horizontal-mix');
-const headerHeight = computed(() => {
- const { height } = theme.headerStyle;
- return `${height}px`;
-});
const headerAndMultiTabHeight = computed(() => {
const {
headerStyle: { height: hHeight },
@@ -63,9 +59,7 @@ watch(
:deep(.n-scrollbar-rail) {
z-index: 11;
}
-.sider-margin {
- margin-top: v-bind(headerHeight);
-}
+
.content-padding {
padding-top: v-bind(headerAndMultiTabHeight);
}
diff --git a/src/settings/theme.ts b/src/settings/theme.ts
index c2bf90b9..1fe0d431 100644
--- a/src/settings/theme.ts
+++ b/src/settings/theme.ts
@@ -38,9 +38,9 @@ const themeSettings: ThemeSettings = {
},
menuStyle: {
width: 200,
- mixWidth: 80,
collapsedWidth: 64,
- fixed: true,
+ mixWidth: 80,
+ mixCollapsedWidth: 48,
splitMenu: false,
horizontalPosition: 'flex-start',
horizontalPositionList: [
diff --git a/src/store/modules/theme/index.ts b/src/store/modules/theme/index.ts
index bdab6fc0..919500c4 100644
--- a/src/store/modules/theme/index.ts
+++ b/src/store/modules/theme/index.ts
@@ -69,7 +69,7 @@ const themeStore = defineStore({
setNavMode(mode: NavMode) {
this.navStyle.mode = mode;
},
- /** 折叠菜单 */
+ /** 切割菜单(顶部混合模式horizontal-mix) */
handleSplitMenu(isSplit: boolean) {
this.menuStyle.splitMenu = isSplit;
},