diff --git a/src/interface/theme.ts b/src/interface/theme.ts index 1644685d..c5f07478 100644 --- a/src/interface/theme.ts +++ b/src/interface/theme.ts @@ -19,6 +19,8 @@ export interface ThemeSettings { multiTabStyle: MultiTabStyle; /** 面包屑样式 */ crumbsStyle: CrumbsStyle; + /** 底部样式 */ + footerStyle: FooterStyle; /** 页面样式 */ pageStyle: PageStyle; /** 固定头部和多页签 */ @@ -105,6 +107,11 @@ interface CrumbsStyle { showIcon: boolean; } +interface FooterStyle { + /** 底部高度 */ + height: number; +} + export type AnimateType = keyof typeof EnumAnimate; interface AnimateTypeList { diff --git a/src/layouts/BaseLayout/components/HorizontalLayout/index.vue b/src/layouts/BaseLayout/components/HorizontalLayout/index.vue new file mode 100644 index 00000000..71868bcb --- /dev/null +++ b/src/layouts/BaseLayout/components/HorizontalLayout/index.vue @@ -0,0 +1,11 @@ + + + + diff --git a/src/layouts/BaseLayout/components/HorizontalMixLayout/index.vue b/src/layouts/BaseLayout/components/HorizontalMixLayout/index.vue new file mode 100644 index 00000000..8c61314c --- /dev/null +++ b/src/layouts/BaseLayout/components/HorizontalMixLayout/index.vue @@ -0,0 +1,11 @@ + + + + diff --git a/src/layouts/BaseLayout/components/VerticalLayout/index.vue b/src/layouts/BaseLayout/components/VerticalLayout/index.vue new file mode 100644 index 00000000..b2b402f8 --- /dev/null +++ b/src/layouts/BaseLayout/components/VerticalLayout/index.vue @@ -0,0 +1,101 @@ + + + + diff --git a/src/layouts/BaseLayout/components/VerticalMixLayout/index.vue b/src/layouts/BaseLayout/components/VerticalMixLayout/index.vue new file mode 100644 index 00000000..e07069d4 --- /dev/null +++ b/src/layouts/BaseLayout/components/VerticalMixLayout/index.vue @@ -0,0 +1,11 @@ + + + + diff --git a/src/layouts/BaseLayout/components/common/GlobalContent/index.vue b/src/layouts/BaseLayout/components/common/GlobalContent/index.vue new file mode 100644 index 00000000..e17becc5 --- /dev/null +++ b/src/layouts/BaseLayout/components/common/GlobalContent/index.vue @@ -0,0 +1,38 @@ + + + + diff --git a/src/layouts/BaseLayout/components/common/GlobalFooter/index.vue b/src/layouts/BaseLayout/components/common/GlobalFooter/index.vue new file mode 100644 index 00000000..cf9a8f28 --- /dev/null +++ b/src/layouts/BaseLayout/components/common/GlobalFooter/index.vue @@ -0,0 +1,20 @@ + + + + diff --git a/src/layouts/BaseLayout/components/common/GlobalHeader/components/FullScreen.vue b/src/layouts/BaseLayout/components/common/GlobalHeader/components/FullScreen.vue new file mode 100644 index 00000000..18b85410 --- /dev/null +++ b/src/layouts/BaseLayout/components/common/GlobalHeader/components/FullScreen.vue @@ -0,0 +1,14 @@ + + + + diff --git a/src/layouts/BaseLayout/components/common/GlobalHeader/components/GithubSite.vue b/src/layouts/BaseLayout/components/common/GlobalHeader/components/GithubSite.vue new file mode 100644 index 00000000..e0992af9 --- /dev/null +++ b/src/layouts/BaseLayout/components/common/GlobalHeader/components/GithubSite.vue @@ -0,0 +1,12 @@ + + + + diff --git a/src/layouts/BaseLayout/components/common/GlobalHeader/components/GlobalBreadcrumb.vue b/src/layouts/BaseLayout/components/common/GlobalHeader/components/GlobalBreadcrumb.vue new file mode 100644 index 00000000..1c41fdf3 --- /dev/null +++ b/src/layouts/BaseLayout/components/common/GlobalHeader/components/GlobalBreadcrumb.vue @@ -0,0 +1,91 @@ + + + + diff --git a/src/layouts/BaseLayout/components/common/GlobalHeader/components/HeaderMenu.vue b/src/layouts/BaseLayout/components/common/GlobalHeader/components/HeaderMenu.vue new file mode 100644 index 00000000..dd7385e3 --- /dev/null +++ b/src/layouts/BaseLayout/components/common/GlobalHeader/components/HeaderMenu.vue @@ -0,0 +1,27 @@ + + + + diff --git a/src/layouts/BaseLayout/components/common/GlobalHeader/components/MenuCollapse.vue b/src/layouts/BaseLayout/components/common/GlobalHeader/components/MenuCollapse.vue new file mode 100644 index 00000000..9d982606 --- /dev/null +++ b/src/layouts/BaseLayout/components/common/GlobalHeader/components/MenuCollapse.vue @@ -0,0 +1,15 @@ + + + + diff --git a/src/layouts/BaseLayout/components/common/GlobalHeader/components/SettingDrawerButton.vue b/src/layouts/BaseLayout/components/common/GlobalHeader/components/SettingDrawerButton.vue new file mode 100644 index 00000000..cd5e7e88 --- /dev/null +++ b/src/layouts/BaseLayout/components/common/GlobalHeader/components/SettingDrawerButton.vue @@ -0,0 +1,13 @@ + + + + diff --git a/src/layouts/BaseLayout/components/common/GlobalHeader/components/ThemeMode.vue b/src/layouts/BaseLayout/components/common/GlobalHeader/components/ThemeMode.vue new file mode 100644 index 00000000..ea6b1ff1 --- /dev/null +++ b/src/layouts/BaseLayout/components/common/GlobalHeader/components/ThemeMode.vue @@ -0,0 +1,15 @@ + + + + diff --git a/src/layouts/BaseLayout/components/common/GlobalHeader/components/UserAvatar.vue b/src/layouts/BaseLayout/components/common/GlobalHeader/components/UserAvatar.vue new file mode 100644 index 00000000..9ad56125 --- /dev/null +++ b/src/layouts/BaseLayout/components/common/GlobalHeader/components/UserAvatar.vue @@ -0,0 +1,55 @@ + + + + diff --git a/src/layouts/BaseLayout/components/common/GlobalHeader/components/index.ts b/src/layouts/BaseLayout/components/common/GlobalHeader/components/index.ts new file mode 100644 index 00000000..bf5e1e42 --- /dev/null +++ b/src/layouts/BaseLayout/components/common/GlobalHeader/components/index.ts @@ -0,0 +1,19 @@ +import HeaderMenu from './HeaderMenu.vue'; +import GlobalBreadcrumb from './GlobalBreadcrumb.vue'; +import UserAvatar from './UserAvatar.vue'; +import MenuCollapse from './MenuCollapse.vue'; +import ThemeMode from './ThemeMode.vue'; +import FullScreen from './FullScreen.vue'; +import SettingDrawerButton from './SettingDrawerButton.vue'; +import GithubSite from './GithubSite.vue'; + +export { + HeaderMenu, + GlobalBreadcrumb, + UserAvatar, + MenuCollapse, + ThemeMode, + FullScreen, + SettingDrawerButton, + GithubSite +}; diff --git a/src/layouts/BaseLayout/components/common/GlobalHeader/index.vue b/src/layouts/BaseLayout/components/common/GlobalHeader/index.vue new file mode 100644 index 00000000..7c59e909 --- /dev/null +++ b/src/layouts/BaseLayout/components/common/GlobalHeader/index.vue @@ -0,0 +1,58 @@ + + + + diff --git a/src/layouts/BaseLayout/components/common/GlobalLogo/index.vue b/src/layouts/BaseLayout/components/common/GlobalLogo/index.vue new file mode 100644 index 00000000..686054ea --- /dev/null +++ b/src/layouts/BaseLayout/components/common/GlobalLogo/index.vue @@ -0,0 +1,23 @@ + + + + diff --git a/src/layouts/BaseLayout/components/common/GlobalMenu/index.vue b/src/layouts/BaseLayout/components/common/GlobalMenu/index.vue new file mode 100644 index 00000000..07893614 --- /dev/null +++ b/src/layouts/BaseLayout/components/common/GlobalMenu/index.vue @@ -0,0 +1,60 @@ + + + + diff --git a/src/layouts/BaseLayout/components/common/GlobalTab/components/MultiTab/index.vue b/src/layouts/BaseLayout/components/common/GlobalTab/components/MultiTab/index.vue new file mode 100644 index 00000000..cc676f0d --- /dev/null +++ b/src/layouts/BaseLayout/components/common/GlobalTab/components/MultiTab/index.vue @@ -0,0 +1,73 @@ + + + + diff --git a/src/layouts/BaseLayout/components/common/GlobalTab/components/ReloadButton/index.vue b/src/layouts/BaseLayout/components/common/GlobalTab/components/ReloadButton/index.vue new file mode 100644 index 00000000..2c3bad69 --- /dev/null +++ b/src/layouts/BaseLayout/components/common/GlobalTab/components/ReloadButton/index.vue @@ -0,0 +1,35 @@ + + + + diff --git a/src/layouts/BaseLayout/components/common/GlobalTab/components/common/ContextMenu.vue b/src/layouts/BaseLayout/components/common/GlobalTab/components/common/ContextMenu.vue new file mode 100644 index 00000000..4917358f --- /dev/null +++ b/src/layouts/BaseLayout/components/common/GlobalTab/components/common/ContextMenu.vue @@ -0,0 +1,153 @@ + + + + diff --git a/src/layouts/BaseLayout/components/common/GlobalTab/components/common/index.ts b/src/layouts/BaseLayout/components/common/GlobalTab/components/common/index.ts new file mode 100644 index 00000000..344a7087 --- /dev/null +++ b/src/layouts/BaseLayout/components/common/GlobalTab/components/common/index.ts @@ -0,0 +1,3 @@ +import ContextMenu from './ContextMenu.vue'; + +export { ContextMenu }; diff --git a/src/layouts/BaseLayout/components/common/GlobalTab/components/index.ts b/src/layouts/BaseLayout/components/common/GlobalTab/components/index.ts new file mode 100644 index 00000000..386d9184 --- /dev/null +++ b/src/layouts/BaseLayout/components/common/GlobalTab/components/index.ts @@ -0,0 +1,4 @@ +import MultiTab from './MultiTab/index.vue'; +import ReloadButton from './ReloadButton/index.vue'; + +export { MultiTab, ReloadButton }; diff --git a/src/layouts/BaseLayout/components/common/GlobalTab/index.vue b/src/layouts/BaseLayout/components/common/GlobalTab/index.vue new file mode 100644 index 00000000..c9ef4d0f --- /dev/null +++ b/src/layouts/BaseLayout/components/common/GlobalTab/index.vue @@ -0,0 +1,41 @@ + + + + diff --git a/src/layouts/BaseLayout/components/common/SettingDrawer/components/DarkMode/index.vue b/src/layouts/BaseLayout/components/common/SettingDrawer/components/DarkMode/index.vue new file mode 100644 index 00000000..cf91a1f6 --- /dev/null +++ b/src/layouts/BaseLayout/components/common/SettingDrawer/components/DarkMode/index.vue @@ -0,0 +1,26 @@ + + + + diff --git a/src/layouts/BaseLayout/components/common/SettingDrawer/components/NavMode/components/NavType.vue b/src/layouts/BaseLayout/components/common/SettingDrawer/components/NavMode/components/NavType.vue new file mode 100644 index 00000000..9c37c336 --- /dev/null +++ b/src/layouts/BaseLayout/components/common/SettingDrawer/components/NavMode/components/NavType.vue @@ -0,0 +1,59 @@ + + + + diff --git a/src/layouts/BaseLayout/components/common/SettingDrawer/components/NavMode/components/index.ts b/src/layouts/BaseLayout/components/common/SettingDrawer/components/NavMode/components/index.ts new file mode 100644 index 00000000..1ffab7cd --- /dev/null +++ b/src/layouts/BaseLayout/components/common/SettingDrawer/components/NavMode/components/index.ts @@ -0,0 +1,3 @@ +import NavType from './NavType.vue'; + +export { NavType }; diff --git a/src/layouts/BaseLayout/components/common/SettingDrawer/components/NavMode/index.vue b/src/layouts/BaseLayout/components/common/SettingDrawer/components/NavMode/index.vue new file mode 100644 index 00000000..0e26080a --- /dev/null +++ b/src/layouts/BaseLayout/components/common/SettingDrawer/components/NavMode/index.vue @@ -0,0 +1,37 @@ + + + + diff --git a/src/layouts/BaseLayout/components/common/SettingDrawer/components/PageFunc/index.vue b/src/layouts/BaseLayout/components/common/SettingDrawer/components/PageFunc/index.vue new file mode 100644 index 00000000..2860f27a --- /dev/null +++ b/src/layouts/BaseLayout/components/common/SettingDrawer/components/PageFunc/index.vue @@ -0,0 +1,81 @@ + + + + diff --git a/src/layouts/BaseLayout/components/common/SettingDrawer/components/PageView/index.vue b/src/layouts/BaseLayout/components/common/SettingDrawer/components/PageView/index.vue new file mode 100644 index 00000000..de1e892b --- /dev/null +++ b/src/layouts/BaseLayout/components/common/SettingDrawer/components/PageView/index.vue @@ -0,0 +1,52 @@ + + + + diff --git a/src/layouts/BaseLayout/components/common/SettingDrawer/components/SystemTheme/index.vue b/src/layouts/BaseLayout/components/common/SettingDrawer/components/SystemTheme/index.vue new file mode 100644 index 00000000..627872b0 --- /dev/null +++ b/src/layouts/BaseLayout/components/common/SettingDrawer/components/SystemTheme/index.vue @@ -0,0 +1,18 @@ + + + + diff --git a/src/layouts/BaseLayout/components/common/SettingDrawer/components/ThemeConfig/index.vue b/src/layouts/BaseLayout/components/common/SettingDrawer/components/ThemeConfig/index.vue new file mode 100644 index 00000000..d317458f --- /dev/null +++ b/src/layouts/BaseLayout/components/common/SettingDrawer/components/ThemeConfig/index.vue @@ -0,0 +1,65 @@ + + + + diff --git a/src/layouts/BaseLayout/components/common/SettingDrawer/components/common/ColorBlock.vue b/src/layouts/BaseLayout/components/common/SettingDrawer/components/common/ColorBlock.vue new file mode 100644 index 00000000..42f5c6cd --- /dev/null +++ b/src/layouts/BaseLayout/components/common/SettingDrawer/components/common/ColorBlock.vue @@ -0,0 +1,26 @@ + + + + diff --git a/src/layouts/BaseLayout/components/common/SettingDrawer/components/common/SettingMenuItem.vue b/src/layouts/BaseLayout/components/common/SettingDrawer/components/common/SettingMenuItem.vue new file mode 100644 index 00000000..f29e6610 --- /dev/null +++ b/src/layouts/BaseLayout/components/common/SettingDrawer/components/common/SettingMenuItem.vue @@ -0,0 +1,16 @@ + + + + diff --git a/src/layouts/BaseLayout/components/common/SettingDrawer/components/common/index.ts b/src/layouts/BaseLayout/components/common/SettingDrawer/components/common/index.ts new file mode 100644 index 00000000..169aa21b --- /dev/null +++ b/src/layouts/BaseLayout/components/common/SettingDrawer/components/common/index.ts @@ -0,0 +1,4 @@ +import ColorBlock from './ColorBlock.vue'; +import SettingMenuItem from './SettingMenuItem.vue'; + +export { ColorBlock, SettingMenuItem }; diff --git a/src/layouts/BaseLayout/components/common/SettingDrawer/components/index.ts b/src/layouts/BaseLayout/components/common/SettingDrawer/components/index.ts new file mode 100644 index 00000000..2b7d6b3a --- /dev/null +++ b/src/layouts/BaseLayout/components/common/SettingDrawer/components/index.ts @@ -0,0 +1,8 @@ +import DarkMode from './DarkMode/index.vue'; +import NavMode from './NavMode/index.vue'; +import SystemTheme from './SystemTheme/index.vue'; +import PageFunc from './PageFunc/index.vue'; +import PageView from './PageView/index.vue'; +import ThemeConfig from './ThemeConfig/index.vue'; + +export { DarkMode, NavMode, SystemTheme, PageFunc, PageView, ThemeConfig }; diff --git a/src/layouts/BaseLayout/components/common/SettingDrawer/index.vue b/src/layouts/BaseLayout/components/common/SettingDrawer/index.vue new file mode 100644 index 00000000..a9cf3d70 --- /dev/null +++ b/src/layouts/BaseLayout/components/common/SettingDrawer/index.vue @@ -0,0 +1,21 @@ + + + + diff --git a/src/layouts/BaseLayout/components/common/index.ts b/src/layouts/BaseLayout/components/common/index.ts new file mode 100644 index 00000000..fe613bd8 --- /dev/null +++ b/src/layouts/BaseLayout/components/common/index.ts @@ -0,0 +1,9 @@ +import GlobalHeader from './GlobalHeader/index.vue'; +import GlobalContent from './GlobalContent/index.vue'; +import GlobalFooter from './GlobalFooter/index.vue'; +import GlobalLogo from './GlobalLogo/index.vue'; +import GlobalMenu from './GlobalMenu/index.vue'; +import GlobalTab from './GlobalTab/index.vue'; +import SettingDrawer from './SettingDrawer/index.vue'; + +export { GlobalHeader, GlobalContent, GlobalFooter, GlobalLogo, GlobalMenu, GlobalTab, SettingDrawer }; diff --git a/src/layouts/BaseLayout/components/index.ts b/src/layouts/BaseLayout/components/index.ts new file mode 100644 index 00000000..c82e87d8 --- /dev/null +++ b/src/layouts/BaseLayout/components/index.ts @@ -0,0 +1,7 @@ +import VerticalLayout from './VerticalLayout/index.vue'; +import VerticalMixLayout from './VerticalMixLayout/index.vue'; +import HorizontalLayout from './HorizontalLayout/index.vue'; +import HorizontalMixLayout from './HorizontalMixLayout/index.vue'; + +export { VerticalLayout, VerticalMixLayout, HorizontalLayout, HorizontalMixLayout }; +export * from './common'; diff --git a/src/layouts/BaseLayout/index.vue b/src/layouts/BaseLayout/index.vue new file mode 100644 index 00000000..56f19418 --- /dev/null +++ b/src/layouts/BaseLayout/index.vue @@ -0,0 +1,25 @@ + + + + diff --git a/src/layouts/BasicLayout/components/GlobalSider/components/DefaultSider/index.vue b/src/layouts/BasicLayout/components/GlobalSider/components/DefaultSider/index.vue index f00bd296..e93d95e5 100644 --- a/src/layouts/BasicLayout/components/GlobalSider/components/DefaultSider/index.vue +++ b/src/layouts/BasicLayout/components/GlobalSider/components/DefaultSider/index.vue @@ -6,6 +6,7 @@ :collapsed="app.menu.collapsed" :collapsed-width="theme.menuStyle.collapsedWidth" :width="menuWidth" + :native-scrollbar="false" @collapse="handleMenuCollapse(true)" @expand="handleMenuCollapse(false)" > diff --git a/src/layouts/index.ts b/src/layouts/index.ts index 42c5dca9..b6ca9d17 100644 --- a/src/layouts/index.ts +++ b/src/layouts/index.ts @@ -1,5 +1,6 @@ +import BaseLayout from './BaseLayout/index.vue'; import BasicLayout from './BasicLayout/index.vue'; import BlankLayout from './BlankLayout/index.vue'; import RouterViewLayout from './RouterViewLayout/index.vue'; -export { BasicLayout, BlankLayout, RouterViewLayout }; +export { BaseLayout, BasicLayout, BlankLayout, RouterViewLayout }; diff --git a/src/settings/theme.json b/src/settings/theme.json index 302eb7fa..415a5dc3 100644 --- a/src/settings/theme.json +++ b/src/settings/theme.json @@ -76,6 +76,9 @@ "visible": true, "showIcon": true }, + "footerStyle": { + "height": 48 + }, "pageStyle": { "animate": true, "animateType": "fade-slide", diff --git a/src/settings/theme.ts b/src/settings/theme.ts index 51ba28ae..78d9f586 100644 --- a/src/settings/theme.ts +++ b/src/settings/theme.ts @@ -67,6 +67,9 @@ const defaultThemeSettings: ThemeSettings = { visible: true, showIcon: true }, + footerStyle: { + height: 48 + }, pageStyle: { animate: true, animateType: 'fade-slide', diff --git a/windi.config.ts b/windi.config.ts index 463382fa..ddde3a9b 100644 --- a/windi.config.ts +++ b/windi.config.ts @@ -52,7 +52,8 @@ export default defineConfig({ 'error-pressed': 'var(--error-color-pressed)', 'error-active': 'var(--error-color-active)', light: '#ffffff', - dark: '#18181c' + dark: '#18181c', + 'deep-dark': '#101014' }, transitionProperty: ['width', 'height', 'background', 'background-color'] }