diff --git a/src/components/common/ColorBlock/index.vue b/src/components/common/ColorBlock/index.vue new file mode 100644 index 00000000..74971870 --- /dev/null +++ b/src/components/common/ColorBlock/index.vue @@ -0,0 +1,28 @@ + + + + diff --git a/src/components/common/index.ts b/src/components/common/index.ts index ff66d87d..0c063025 100644 --- a/src/components/common/index.ts +++ b/src/components/common/index.ts @@ -1,3 +1,4 @@ import AppProviderContent from './AppProviderContent/index.vue'; +import ColorBlock from './ColorBlock/index.vue'; -export { AppProviderContent }; +export { AppProviderContent, ColorBlock }; diff --git a/src/components/index.ts b/src/components/index.ts index f149c5aa..91394a0e 100644 --- a/src/components/index.ts +++ b/src/components/index.ts @@ -1 +1 @@ -export { AppProviderContent } from './common'; +export { AppProviderContent, ColorBlock } from './common'; diff --git a/src/enum/theme.ts b/src/enum/theme.ts index 664dd012..d081aaf9 100644 --- a/src/enum/theme.ts +++ b/src/enum/theme.ts @@ -2,6 +2,7 @@ export enum EnumNavMode { 'vertical' = '左侧菜单模式', 'horizontal' = '顶部菜单模式', + 'vertical-mix' = '左侧菜单混合模式', 'horizontal-mix' = '顶部菜单混合模式' } diff --git a/src/layouts/BasicLayout/components/SettingDrawer/components/NavMode.vue b/src/layouts/BasicLayout/components/SettingDrawer/components/NavMode.vue new file mode 100644 index 00000000..36e7e7d4 --- /dev/null +++ b/src/layouts/BasicLayout/components/SettingDrawer/components/NavMode.vue @@ -0,0 +1,8 @@ + + + + diff --git a/src/layouts/BasicLayout/components/SettingDrawer/components/SystemTheme.vue b/src/layouts/BasicLayout/components/SettingDrawer/components/SystemTheme.vue index 62073d96..4bf35db3 100644 --- a/src/layouts/BasicLayout/components/SettingDrawer/components/SystemTheme.vue +++ b/src/layouts/BasicLayout/components/SettingDrawer/components/SystemTheme.vue @@ -1,21 +1,20 @@