diff --git a/.vscode/settings.json b/.vscode/settings.json index 0b998025..98b3a4a3 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -54,7 +54,5 @@ "[markdown]": { "editor.defaultFormatter": "yzhang.markdown-all-in-one" }, - "volar.tsPlugin": true, - "volar.tsPluginStatus": true, "workbench.productIconTheme": "fluent-icons", } diff --git a/src/interface/theme.ts b/src/interface/theme.ts index 962c637c..d5a533a7 100644 --- a/src/interface/theme.ts +++ b/src/interface/theme.ts @@ -66,12 +66,12 @@ interface HorizontalMenuPositionList { interface MenuStyle { /** 菜单宽度 */ width: number; - /** 混合菜单的宽度 */ - mixWidth: number; /** 菜单折叠时的宽度 */ collapsedWidth: number; - /** 固定菜单 */ - fixed: boolean; + /** 混合菜单的宽度 */ + mixWidth: number; + /** 混合菜单折叠时的宽度 */ + mixCollapsedWidth: number; /** 分割菜单 */ splitMenu: boolean; /** 水平模式的菜单的位置 */ diff --git a/src/layouts/BasicLayout/components/GlobalHeader/index.vue b/src/layouts/BasicLayout/components/GlobalHeader/index.vue index 382e5f8d..8937a9f0 100644 --- a/src/layouts/BasicLayout/components/GlobalHeader/index.vue +++ b/src/layouts/BasicLayout/components/GlobalHeader/index.vue @@ -5,10 +5,16 @@ -
- - - +
+ + +
+
+
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 @@