diff --git a/src/App.vue b/src/App.vue index 457d13a0..404125a8 100644 --- a/src/App.vue +++ b/src/App.vue @@ -5,9 +5,6 @@ diff --git a/src/composables/common/layout.ts b/src/composables/common/layout.ts index 82977b81..c1559b84 100644 --- a/src/composables/common/layout.ts +++ b/src/composables/common/layout.ts @@ -1,9 +1,13 @@ -import { computed } from 'vue'; +import { ref, computed, watch } from 'vue'; +import type { ScrollbarInst } from 'naive-ui'; import { useThemeStore, useAppStore } from '@/store'; +import { useRouteProps } from './route'; export function useLayoutConfig() { const theme = useThemeStore(); const app = useAppStore(); + const { setScrollbarInstance } = useAppStore(); + const routeProps = useRouteProps(); /** 反转sider */ const siderInverted = computed(() => theme.navStyle.theme !== 'light'); @@ -30,13 +34,38 @@ export function useLayoutConfig() { /** 全局头部和多页签的总高度 */ const headerAndMultiTabHeight = computed(() => { const { - multiTabStyle: { visible, height: tH }, - headerStyle: { height: hH } + multiTabStyle: { visible, height: tabHeight }, + headerStyle: { height: headerHeight } } = theme; - const height = visible ? tH + hH : hH; + const height = visible ? headerHeight + tabHeight : headerHeight; return `${height}px`; }); + /** 全局侧边栏的样式 */ + const globalSiderClassAndStyle = { + class: 'transition-all duration-300 ease-in-out', + style: 'z-index:12;box-shadow: 2px 0 8px 0 rgb(29 35 41 / 5%);' + }; + + /** 纵向flex布局样式 */ + const flexColumnStyle = 'display:flex;flex-direction:column;height:100%;'; + + /** scrollbar的content的样式 */ + const scrollbarContentStyle = computed(() => { + const { fullPage } = routeProps.value; + const height = fullPage ? '100%' : 'auto'; + return `display:flex;flex-direction:column;height:${height};min-height:100%;`; + }); + + /** 滚动条实例 */ + const scrollbar = ref(null); + + watch(scrollbar, newValue => { + if (newValue) { + setScrollbarInstance(newValue); + } + }); + return { siderInverted, siderMenuWidth, @@ -44,6 +73,10 @@ export function useLayoutConfig() { headerPosition, headerHeight, multiTabHeight, - headerAndMultiTabHeight + headerAndMultiTabHeight, + globalSiderClassAndStyle, + flexColumnStyle, + scrollbarContentStyle, + scrollbar }; } diff --git a/src/composables/common/route.ts b/src/composables/common/route.ts index f29288e8..904d89c5 100644 --- a/src/composables/common/route.ts +++ b/src/composables/common/route.ts @@ -5,7 +5,6 @@ import type { RouteKey } from '@/interface'; /** * 路由属性 - * @description - 必须要在setup里面调用 */ export function useRouteProps() { const route = useRoute(); @@ -29,7 +28,6 @@ export function useRouteProps() { /** * 路由查询参数 - * @description - 必须要在setup里面调用 */ export function useRouteQuery() { const route = useRoute(); @@ -61,3 +59,17 @@ export function routeNameWatcher(callback: (name: RouteKey) => void) { } ); } + +/** + * 路由全路径变化后的回调 + * @param callback + */ +export function routeFullPathWatcher(callback: (fullPath: string) => void) { + const route = useRoute(); + watch( + () => route.fullPath, + newValue => { + callback(newValue); + } + ); +} diff --git a/src/composables/common/router.ts b/src/composables/common/router.ts index c5cf9fbd..e3240d89 100644 --- a/src/composables/common/router.ts +++ b/src/composables/common/router.ts @@ -50,6 +50,8 @@ export function useRouterPush(inSetup: boolean = true) { if (route) { const { query } = route; router.push({ path: routePath('login'), query: { ...query, module } }); + } else { + throw Error('该函数必须在setup里面调用!'); } } diff --git a/src/layouts/BaseLayout/components/HorizontalLayout/index.vue b/src/layouts/BaseLayout/components/HorizontalLayout/index.vue deleted file mode 100644 index 1e15efc4..00000000 --- a/src/layouts/BaseLayout/components/HorizontalLayout/index.vue +++ /dev/null @@ -1,34 +0,0 @@ - - - - diff --git a/src/layouts/BaseLayout/components/HorizontalMixLayout/index.vue b/src/layouts/BaseLayout/components/HorizontalMixLayout/index.vue deleted file mode 100644 index a49ec556..00000000 --- a/src/layouts/BaseLayout/components/HorizontalMixLayout/index.vue +++ /dev/null @@ -1,6 +0,0 @@ - - - - diff --git a/src/layouts/BaseLayout/components/VerticalMixLayout/index.vue b/src/layouts/BaseLayout/components/VerticalMixLayout/index.vue deleted file mode 100644 index 203a00c7..00000000 --- a/src/layouts/BaseLayout/components/VerticalMixLayout/index.vue +++ /dev/null @@ -1,50 +0,0 @@ - - - - diff --git a/src/layouts/BaseLayout/components/common/GlobalContent/index.vue b/src/layouts/BaseLayout/components/common/GlobalContent/index.vue deleted file mode 100644 index f939ad32..00000000 --- a/src/layouts/BaseLayout/components/common/GlobalContent/index.vue +++ /dev/null @@ -1,38 +0,0 @@ - - - - diff --git a/src/layouts/BaseLayout/components/common/SettingDrawer/components/index.ts b/src/layouts/BaseLayout/components/common/SettingDrawer/components/index.ts deleted file mode 100644 index 2b7d6b3a..00000000 --- a/src/layouts/BaseLayout/components/common/SettingDrawer/components/index.ts +++ /dev/null @@ -1,8 +0,0 @@ -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/index.ts b/src/layouts/BaseLayout/components/common/index.ts deleted file mode 100644 index 081ceaf0..00000000 --- a/src/layouts/BaseLayout/components/common/index.ts +++ /dev/null @@ -1,19 +0,0 @@ -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 HeaderPlaceholder from './HeaderPlaceholder/index.vue'; -import SettingDrawer from './SettingDrawer/index.vue'; - -export { - GlobalHeader, - GlobalContent, - GlobalFooter, - GlobalLogo, - GlobalMenu, - GlobalTab, - HeaderPlaceholder, - SettingDrawer -}; diff --git a/src/layouts/BaseLayout/components/index.ts b/src/layouts/BaseLayout/components/index.ts deleted file mode 100644 index c82e87d8..00000000 --- a/src/layouts/BaseLayout/components/index.ts +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index 56f19418..00000000 --- a/src/layouts/BaseLayout/index.vue +++ /dev/null @@ -1,25 +0,0 @@ - - - - diff --git a/src/layouts/BasicLayout/components/GlobalContent/index.vue b/src/layouts/BasicLayout/components/GlobalContent/index.vue deleted file mode 100644 index f70b8514..00000000 --- a/src/layouts/BasicLayout/components/GlobalContent/index.vue +++ /dev/null @@ -1,34 +0,0 @@ - - - - diff --git a/src/layouts/BasicLayout/components/GlobalFooter/index.vue b/src/layouts/BasicLayout/components/GlobalFooter/index.vue deleted file mode 100644 index 98a99661..00000000 --- a/src/layouts/BasicLayout/components/GlobalFooter/index.vue +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/src/layouts/BasicLayout/components/GlobalHeader/components/FullScreen.vue b/src/layouts/BasicLayout/components/GlobalHeader/components/FullScreen.vue deleted file mode 100644 index 18b85410..00000000 --- a/src/layouts/BasicLayout/components/GlobalHeader/components/FullScreen.vue +++ /dev/null @@ -1,14 +0,0 @@ - - - - diff --git a/src/layouts/BasicLayout/components/GlobalHeader/components/GihubSite.vue b/src/layouts/BasicLayout/components/GlobalHeader/components/GihubSite.vue deleted file mode 100644 index e0992af9..00000000 --- a/src/layouts/BasicLayout/components/GlobalHeader/components/GihubSite.vue +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/src/layouts/BasicLayout/components/GlobalHeader/components/GlobalBreadcrumb.vue b/src/layouts/BasicLayout/components/GlobalHeader/components/GlobalBreadcrumb.vue deleted file mode 100644 index 133d16e7..00000000 --- a/src/layouts/BasicLayout/components/GlobalHeader/components/GlobalBreadcrumb.vue +++ /dev/null @@ -1,91 +0,0 @@ - - - - diff --git a/src/layouts/BasicLayout/components/GlobalHeader/components/HeaderMenu.vue b/src/layouts/BasicLayout/components/GlobalHeader/components/HeaderMenu.vue deleted file mode 100644 index dd7385e3..00000000 --- a/src/layouts/BasicLayout/components/GlobalHeader/components/HeaderMenu.vue +++ /dev/null @@ -1,27 +0,0 @@ - - - - diff --git a/src/layouts/BasicLayout/components/GlobalHeader/components/MenuCollapse.vue b/src/layouts/BasicLayout/components/GlobalHeader/components/MenuCollapse.vue deleted file mode 100644 index 9d982606..00000000 --- a/src/layouts/BasicLayout/components/GlobalHeader/components/MenuCollapse.vue +++ /dev/null @@ -1,15 +0,0 @@ - - - - diff --git a/src/layouts/BasicLayout/components/GlobalHeader/components/SettingDrawerButton.vue b/src/layouts/BasicLayout/components/GlobalHeader/components/SettingDrawerButton.vue deleted file mode 100644 index cd5e7e88..00000000 --- a/src/layouts/BasicLayout/components/GlobalHeader/components/SettingDrawerButton.vue +++ /dev/null @@ -1,13 +0,0 @@ - - - - diff --git a/src/layouts/BasicLayout/components/GlobalHeader/components/ThemeMode.vue b/src/layouts/BasicLayout/components/GlobalHeader/components/ThemeMode.vue deleted file mode 100644 index ea6b1ff1..00000000 --- a/src/layouts/BasicLayout/components/GlobalHeader/components/ThemeMode.vue +++ /dev/null @@ -1,15 +0,0 @@ - - - - diff --git a/src/layouts/BasicLayout/components/GlobalHeader/components/UserAvatar.vue b/src/layouts/BasicLayout/components/GlobalHeader/components/UserAvatar.vue deleted file mode 100644 index 34625825..00000000 --- a/src/layouts/BasicLayout/components/GlobalHeader/components/UserAvatar.vue +++ /dev/null @@ -1,55 +0,0 @@ - - - - diff --git a/src/layouts/BasicLayout/components/GlobalHeader/components/index.ts b/src/layouts/BasicLayout/components/GlobalHeader/components/index.ts deleted file mode 100644 index b9ddabc3..00000000 --- a/src/layouts/BasicLayout/components/GlobalHeader/components/index.ts +++ /dev/null @@ -1,9 +0,0 @@ -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 GihubSite from './GihubSite.vue'; - -export { GlobalBreadcrumb, UserAvatar, MenuCollapse, ThemeMode, FullScreen, SettingDrawerButton, GihubSite }; diff --git a/src/layouts/BasicLayout/components/GlobalHeader/index.vue b/src/layouts/BasicLayout/components/GlobalHeader/index.vue deleted file mode 100644 index 6a3975e7..00000000 --- a/src/layouts/BasicLayout/components/GlobalHeader/index.vue +++ /dev/null @@ -1,87 +0,0 @@ - - - - diff --git a/src/layouts/BasicLayout/components/GlobalSider/components/DefaultSider/index.vue b/src/layouts/BasicLayout/components/GlobalSider/components/DefaultSider/index.vue deleted file mode 100644 index e93d95e5..00000000 --- a/src/layouts/BasicLayout/components/GlobalSider/components/DefaultSider/index.vue +++ /dev/null @@ -1,98 +0,0 @@ - - - - diff --git a/src/layouts/BasicLayout/components/GlobalSider/components/index.ts b/src/layouts/BasicLayout/components/GlobalSider/components/index.ts deleted file mode 100644 index 4151f959..00000000 --- a/src/layouts/BasicLayout/components/GlobalSider/components/index.ts +++ /dev/null @@ -1,4 +0,0 @@ -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 deleted file mode 100644 index 14b40f01..00000000 --- a/src/layouts/BasicLayout/components/GlobalSider/index.vue +++ /dev/null @@ -1,43 +0,0 @@ - - - - diff --git a/src/layouts/BasicLayout/components/GlobalTab/components/MultiTab/index.vue b/src/layouts/BasicLayout/components/GlobalTab/components/MultiTab/index.vue deleted file mode 100644 index cc676f0d..00000000 --- a/src/layouts/BasicLayout/components/GlobalTab/components/MultiTab/index.vue +++ /dev/null @@ -1,73 +0,0 @@ - - - - diff --git a/src/layouts/BasicLayout/components/GlobalTab/components/ReloadButton/index.vue b/src/layouts/BasicLayout/components/GlobalTab/components/ReloadButton/index.vue deleted file mode 100644 index 2c3bad69..00000000 --- a/src/layouts/BasicLayout/components/GlobalTab/components/ReloadButton/index.vue +++ /dev/null @@ -1,35 +0,0 @@ - - - - diff --git a/src/layouts/BasicLayout/components/GlobalTab/components/common/ContextMenu.vue b/src/layouts/BasicLayout/components/GlobalTab/components/common/ContextMenu.vue deleted file mode 100644 index 4917358f..00000000 --- a/src/layouts/BasicLayout/components/GlobalTab/components/common/ContextMenu.vue +++ /dev/null @@ -1,153 +0,0 @@ - - - - diff --git a/src/layouts/BasicLayout/components/GlobalTab/components/common/index.ts b/src/layouts/BasicLayout/components/GlobalTab/components/common/index.ts deleted file mode 100644 index 344a7087..00000000 --- a/src/layouts/BasicLayout/components/GlobalTab/components/common/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -import ContextMenu from './ContextMenu.vue'; - -export { ContextMenu }; diff --git a/src/layouts/BasicLayout/components/GlobalTab/components/index.ts b/src/layouts/BasicLayout/components/GlobalTab/components/index.ts deleted file mode 100644 index 386d9184..00000000 --- a/src/layouts/BasicLayout/components/GlobalTab/components/index.ts +++ /dev/null @@ -1,4 +0,0 @@ -import MultiTab from './MultiTab/index.vue'; -import ReloadButton from './ReloadButton/index.vue'; - -export { MultiTab, ReloadButton }; diff --git a/src/layouts/BasicLayout/components/GlobalTab/index.vue b/src/layouts/BasicLayout/components/GlobalTab/index.vue deleted file mode 100644 index ddc1a107..00000000 --- a/src/layouts/BasicLayout/components/GlobalTab/index.vue +++ /dev/null @@ -1,89 +0,0 @@ - - - - diff --git a/src/layouts/BasicLayout/components/HorizontalLayout/index.vue b/src/layouts/BasicLayout/components/HorizontalLayout/index.vue new file mode 100644 index 00000000..57d9013f --- /dev/null +++ b/src/layouts/BasicLayout/components/HorizontalLayout/index.vue @@ -0,0 +1,28 @@ + + + + diff --git a/src/layouts/BasicLayout/components/HorizontalMixLayout/index.vue b/src/layouts/BasicLayout/components/HorizontalMixLayout/index.vue new file mode 100644 index 00000000..c42f66e4 --- /dev/null +++ b/src/layouts/BasicLayout/components/HorizontalMixLayout/index.vue @@ -0,0 +1,58 @@ + + + + diff --git a/src/layouts/BasicLayout/components/SettingDrawer/components/DarkMode/index.vue b/src/layouts/BasicLayout/components/SettingDrawer/components/DarkMode/index.vue deleted file mode 100644 index cf91a1f6..00000000 --- a/src/layouts/BasicLayout/components/SettingDrawer/components/DarkMode/index.vue +++ /dev/null @@ -1,26 +0,0 @@ - - - - diff --git a/src/layouts/BasicLayout/components/SettingDrawer/components/NavMode/components/NavType.vue b/src/layouts/BasicLayout/components/SettingDrawer/components/NavMode/components/NavType.vue deleted file mode 100644 index 9c37c336..00000000 --- a/src/layouts/BasicLayout/components/SettingDrawer/components/NavMode/components/NavType.vue +++ /dev/null @@ -1,59 +0,0 @@ - - - - diff --git a/src/layouts/BasicLayout/components/SettingDrawer/components/NavMode/components/index.ts b/src/layouts/BasicLayout/components/SettingDrawer/components/NavMode/components/index.ts deleted file mode 100644 index 1ffab7cd..00000000 --- a/src/layouts/BasicLayout/components/SettingDrawer/components/NavMode/components/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -import NavType from './NavType.vue'; - -export { NavType }; diff --git a/src/layouts/BasicLayout/components/SettingDrawer/components/NavMode/index.vue b/src/layouts/BasicLayout/components/SettingDrawer/components/NavMode/index.vue deleted file mode 100644 index 0e26080a..00000000 --- a/src/layouts/BasicLayout/components/SettingDrawer/components/NavMode/index.vue +++ /dev/null @@ -1,37 +0,0 @@ - - - - diff --git a/src/layouts/BasicLayout/components/SettingDrawer/components/PageFunc/index.vue b/src/layouts/BasicLayout/components/SettingDrawer/components/PageFunc/index.vue deleted file mode 100644 index 2860f27a..00000000 --- a/src/layouts/BasicLayout/components/SettingDrawer/components/PageFunc/index.vue +++ /dev/null @@ -1,81 +0,0 @@ - - - - diff --git a/src/layouts/BasicLayout/components/SettingDrawer/components/PageView/index.vue b/src/layouts/BasicLayout/components/SettingDrawer/components/PageView/index.vue deleted file mode 100644 index de1e892b..00000000 --- a/src/layouts/BasicLayout/components/SettingDrawer/components/PageView/index.vue +++ /dev/null @@ -1,52 +0,0 @@ - - - - diff --git a/src/layouts/BasicLayout/components/SettingDrawer/components/SystemTheme/index.vue b/src/layouts/BasicLayout/components/SettingDrawer/components/SystemTheme/index.vue deleted file mode 100644 index 627872b0..00000000 --- a/src/layouts/BasicLayout/components/SettingDrawer/components/SystemTheme/index.vue +++ /dev/null @@ -1,18 +0,0 @@ - - - - diff --git a/src/layouts/BasicLayout/components/SettingDrawer/components/ThemeConfig/index.vue b/src/layouts/BasicLayout/components/SettingDrawer/components/ThemeConfig/index.vue deleted file mode 100644 index d317458f..00000000 --- a/src/layouts/BasicLayout/components/SettingDrawer/components/ThemeConfig/index.vue +++ /dev/null @@ -1,65 +0,0 @@ - - - - diff --git a/src/layouts/BasicLayout/components/SettingDrawer/components/common/ColorBlock.vue b/src/layouts/BasicLayout/components/SettingDrawer/components/common/ColorBlock.vue deleted file mode 100644 index 42f5c6cd..00000000 --- a/src/layouts/BasicLayout/components/SettingDrawer/components/common/ColorBlock.vue +++ /dev/null @@ -1,26 +0,0 @@ - - - - diff --git a/src/layouts/BasicLayout/components/SettingDrawer/components/common/SettingMenuItem.vue b/src/layouts/BasicLayout/components/SettingDrawer/components/common/SettingMenuItem.vue deleted file mode 100644 index f29e6610..00000000 --- a/src/layouts/BasicLayout/components/SettingDrawer/components/common/SettingMenuItem.vue +++ /dev/null @@ -1,16 +0,0 @@ - - - - diff --git a/src/layouts/BasicLayout/components/SettingDrawer/components/common/index.ts b/src/layouts/BasicLayout/components/SettingDrawer/components/common/index.ts deleted file mode 100644 index 169aa21b..00000000 --- a/src/layouts/BasicLayout/components/SettingDrawer/components/common/index.ts +++ /dev/null @@ -1,4 +0,0 @@ -import ColorBlock from './ColorBlock.vue'; -import SettingMenuItem from './SettingMenuItem.vue'; - -export { ColorBlock, SettingMenuItem }; diff --git a/src/layouts/BasicLayout/components/SettingDrawer/index.vue b/src/layouts/BasicLayout/components/SettingDrawer/index.vue deleted file mode 100644 index a9cf3d70..00000000 --- a/src/layouts/BasicLayout/components/SettingDrawer/index.vue +++ /dev/null @@ -1,21 +0,0 @@ - - - - diff --git a/src/layouts/BaseLayout/components/VerticalLayout/index.vue b/src/layouts/BasicLayout/components/VerticalLayout/index.vue similarity index 52% rename from src/layouts/BaseLayout/components/VerticalLayout/index.vue rename to src/layouts/BasicLayout/components/VerticalLayout/index.vue index 99c5b0df..918677b2 100644 --- a/src/layouts/BaseLayout/components/VerticalLayout/index.vue +++ b/src/layouts/BasicLayout/components/VerticalLayout/index.vue @@ -1,7 +1,8 @@ - + diff --git a/src/layouts/BasicLayout/components/VerticalMixLayout/index.vue b/src/layouts/BasicLayout/components/VerticalMixLayout/index.vue new file mode 100644 index 00000000..30288086 --- /dev/null +++ b/src/layouts/BasicLayout/components/VerticalMixLayout/index.vue @@ -0,0 +1,30 @@ + + + + diff --git a/src/layouts/BasicLayout/components/common/GlobalContent/index.vue b/src/layouts/BasicLayout/components/common/GlobalContent/index.vue new file mode 100644 index 00000000..35469951 --- /dev/null +++ b/src/layouts/BasicLayout/components/common/GlobalContent/index.vue @@ -0,0 +1,29 @@ + + + + diff --git a/src/layouts/BaseLayout/components/common/GlobalFooter/index.vue b/src/layouts/BasicLayout/components/common/GlobalFooter/index.vue similarity index 90% rename from src/layouts/BaseLayout/components/common/GlobalFooter/index.vue rename to src/layouts/BasicLayout/components/common/GlobalFooter/index.vue index cf9a8f28..0ebbaabd 100644 --- a/src/layouts/BaseLayout/components/common/GlobalFooter/index.vue +++ b/src/layouts/BasicLayout/components/common/GlobalFooter/index.vue @@ -1,5 +1,5 @@ diff --git a/src/layouts/BaseLayout/components/common/GlobalHeader/components/FullScreen.vue b/src/layouts/BasicLayout/components/common/GlobalHeader/components/FullScreen.vue similarity index 100% rename from src/layouts/BaseLayout/components/common/GlobalHeader/components/FullScreen.vue rename to src/layouts/BasicLayout/components/common/GlobalHeader/components/FullScreen.vue diff --git a/src/layouts/BaseLayout/components/common/GlobalHeader/components/GithubSite.vue b/src/layouts/BasicLayout/components/common/GlobalHeader/components/GithubSite.vue similarity index 100% rename from src/layouts/BaseLayout/components/common/GlobalHeader/components/GithubSite.vue rename to src/layouts/BasicLayout/components/common/GlobalHeader/components/GithubSite.vue diff --git a/src/layouts/BaseLayout/components/common/GlobalHeader/components/GlobalBreadcrumb.vue b/src/layouts/BasicLayout/components/common/GlobalHeader/components/GlobalBreadcrumb.vue similarity index 100% rename from src/layouts/BaseLayout/components/common/GlobalHeader/components/GlobalBreadcrumb.vue rename to src/layouts/BasicLayout/components/common/GlobalHeader/components/GlobalBreadcrumb.vue diff --git a/src/layouts/BaseLayout/components/common/GlobalHeader/components/HeaderMenu.vue b/src/layouts/BasicLayout/components/common/GlobalHeader/components/HeaderMenu.vue similarity index 100% rename from src/layouts/BaseLayout/components/common/GlobalHeader/components/HeaderMenu.vue rename to src/layouts/BasicLayout/components/common/GlobalHeader/components/HeaderMenu.vue diff --git a/src/layouts/BaseLayout/components/common/GlobalHeader/components/MenuCollapse.vue b/src/layouts/BasicLayout/components/common/GlobalHeader/components/MenuCollapse.vue similarity index 100% rename from src/layouts/BaseLayout/components/common/GlobalHeader/components/MenuCollapse.vue rename to src/layouts/BasicLayout/components/common/GlobalHeader/components/MenuCollapse.vue diff --git a/src/layouts/BaseLayout/components/common/GlobalHeader/components/SettingDrawerButton.vue b/src/layouts/BasicLayout/components/common/GlobalHeader/components/SettingDrawerButton.vue similarity index 100% rename from src/layouts/BaseLayout/components/common/GlobalHeader/components/SettingDrawerButton.vue rename to src/layouts/BasicLayout/components/common/GlobalHeader/components/SettingDrawerButton.vue diff --git a/src/layouts/BaseLayout/components/common/GlobalHeader/components/ThemeMode.vue b/src/layouts/BasicLayout/components/common/GlobalHeader/components/ThemeMode.vue similarity index 100% rename from src/layouts/BaseLayout/components/common/GlobalHeader/components/ThemeMode.vue rename to src/layouts/BasicLayout/components/common/GlobalHeader/components/ThemeMode.vue diff --git a/src/layouts/BaseLayout/components/common/GlobalHeader/components/UserAvatar.vue b/src/layouts/BasicLayout/components/common/GlobalHeader/components/UserAvatar.vue similarity index 100% rename from src/layouts/BaseLayout/components/common/GlobalHeader/components/UserAvatar.vue rename to src/layouts/BasicLayout/components/common/GlobalHeader/components/UserAvatar.vue diff --git a/src/layouts/BaseLayout/components/common/GlobalHeader/components/index.ts b/src/layouts/BasicLayout/components/common/GlobalHeader/components/index.ts similarity index 100% rename from src/layouts/BaseLayout/components/common/GlobalHeader/components/index.ts rename to src/layouts/BasicLayout/components/common/GlobalHeader/components/index.ts diff --git a/src/layouts/BaseLayout/components/common/GlobalHeader/index.vue b/src/layouts/BasicLayout/components/common/GlobalHeader/index.vue similarity index 88% rename from src/layouts/BaseLayout/components/common/GlobalHeader/index.vue rename to src/layouts/BasicLayout/components/common/GlobalHeader/index.vue index a91b5e11..9a00e739 100644 --- a/src/layouts/BaseLayout/components/common/GlobalHeader/index.vue +++ b/src/layouts/BasicLayout/components/common/GlobalHeader/index.vue @@ -17,7 +17,6 @@ - @@ -32,8 +31,7 @@ import { MenuCollapse, ThemeMode, FullScreen, - GithubSite, - SettingDrawerButton + GithubSite } from './components'; import GlobalLogo from '../GlobalLogo/index.vue'; @@ -50,8 +48,6 @@ defineProps(); const theme = useThemeStore(); const { headerHeight } = useLayoutConfig(); - -const showSettingButton = import.meta.env.DEV || import.meta.env.VITE_HTTP_ENV === 'STAGING'; diff --git a/src/layouts/BaseLayout/components/common/GlobalLogo/index.vue b/src/layouts/BasicLayout/components/common/GlobalLogo/index.vue similarity index 69% rename from src/layouts/BaseLayout/components/common/GlobalLogo/index.vue rename to src/layouts/BasicLayout/components/common/GlobalLogo/index.vue index 9a5b5c16..6cacb3f1 100644 --- a/src/layouts/BaseLayout/components/common/GlobalLogo/index.vue +++ b/src/layouts/BasicLayout/components/common/GlobalLogo/index.vue @@ -1,19 +1,5 @@ diff --git a/src/layouts/BasicLayout/components/common/SpacePlaceholder/index.vue b/src/layouts/BasicLayout/components/common/SpacePlaceholder/index.vue new file mode 100644 index 00000000..5f05021a --- /dev/null +++ b/src/layouts/BasicLayout/components/common/SpacePlaceholder/index.vue @@ -0,0 +1,41 @@ + + + + diff --git a/src/layouts/BasicLayout/components/common/VerticalMixSider/components/MixMenu.vue b/src/layouts/BasicLayout/components/common/VerticalMixSider/components/MixMenu.vue new file mode 100644 index 00000000..61f3e55f --- /dev/null +++ b/src/layouts/BasicLayout/components/common/VerticalMixSider/components/MixMenu.vue @@ -0,0 +1,44 @@ + + + + diff --git a/src/layouts/BasicLayout/components/common/VerticalMixSider/components/MixMenuCollapse.vue b/src/layouts/BasicLayout/components/common/VerticalMixSider/components/MixMenuCollapse.vue new file mode 100644 index 00000000..d9eb87b5 --- /dev/null +++ b/src/layouts/BasicLayout/components/common/VerticalMixSider/components/MixMenuCollapse.vue @@ -0,0 +1,14 @@ + + + + diff --git a/src/layouts/BasicLayout/components/common/VerticalMixSider/components/MixMenuDrawer.vue b/src/layouts/BasicLayout/components/common/VerticalMixSider/components/MixMenuDrawer.vue new file mode 100644 index 00000000..0e25bc41 --- /dev/null +++ b/src/layouts/BasicLayout/components/common/VerticalMixSider/components/MixMenuDrawer.vue @@ -0,0 +1,93 @@ + + + + diff --git a/src/layouts/BasicLayout/components/common/VerticalMixSider/components/index.ts b/src/layouts/BasicLayout/components/common/VerticalMixSider/components/index.ts new file mode 100644 index 00000000..85d8b1ce --- /dev/null +++ b/src/layouts/BasicLayout/components/common/VerticalMixSider/components/index.ts @@ -0,0 +1,5 @@ +import MixMenu from './MixMenu.vue'; +import MixMenuCollapse from './MixMenuCollapse.vue'; +import MixMenuDrawer from './MixMenuDrawer.vue'; + +export { MixMenu, MixMenuCollapse, MixMenuDrawer }; diff --git a/src/layouts/BasicLayout/components/common/VerticalMixSider/index.vue b/src/layouts/BasicLayout/components/common/VerticalMixSider/index.vue new file mode 100644 index 00000000..c1ac51b1 --- /dev/null +++ b/src/layouts/BasicLayout/components/common/VerticalMixSider/index.vue @@ -0,0 +1,104 @@ + + + + diff --git a/src/layouts/BasicLayout/components/common/index.ts b/src/layouts/BasicLayout/components/common/index.ts index 64ce48ad..6c2449d8 100644 --- a/src/layouts/BasicLayout/components/common/index.ts +++ b/src/layouts/BasicLayout/components/common/index.ts @@ -1,3 +1,25 @@ -import GlobalLogo from './GlobalLogo.vue'; +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 VerticalMixSider from './VerticalMixSider/index.vue'; +import MixSider from './MixSider/index.vue'; +import SpacePlaceholder from './SpacePlaceholder/index.vue'; +import HeaderPlaceholder from './HeaderPlaceholder/index.vue'; +import SettingDrawer from './SettingDrawer/index.vue'; -export { GlobalLogo }; +export { + GlobalHeader, + GlobalContent, + GlobalFooter, + GlobalLogo, + GlobalMenu, + GlobalTab, + VerticalMixSider, + MixSider, + SpacePlaceholder, + HeaderPlaceholder, + SettingDrawer +}; diff --git a/src/layouts/BasicLayout/components/index.ts b/src/layouts/BasicLayout/components/index.ts index cbbf81e6..c82e87d8 100644 --- a/src/layouts/BasicLayout/components/index.ts +++ b/src/layouts/BasicLayout/components/index.ts @@ -1,8 +1,7 @@ -import GlobalSider from './GlobalSider/index.vue'; -import GlobalHeader from './GlobalHeader/index.vue'; -import GlobalTab from './GlobalTab/index.vue'; -import GlobalContent from './GlobalContent/index.vue'; -import GlobalFooter from './GlobalFooter/index.vue'; -import SettingDrawer from './SettingDrawer/index.vue'; +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 { GlobalSider, GlobalHeader, GlobalTab, GlobalContent, GlobalFooter, SettingDrawer }; +export { VerticalLayout, VerticalMixLayout, HorizontalLayout, HorizontalMixLayout }; +export * from './common'; diff --git a/src/layouts/BasicLayout/index.vue b/src/layouts/BasicLayout/index.vue index 95babccb..7d74ccac 100644 --- a/src/layouts/BasicLayout/index.vue +++ b/src/layouts/BasicLayout/index.vue @@ -1,51 +1,25 @@ - - + diff --git a/src/layouts/BlankLayout/index.vue b/src/layouts/BlankLayout/index.vue index 2fd8a555..2873476f 100644 --- a/src/layouts/BlankLayout/index.vue +++ b/src/layouts/BlankLayout/index.vue @@ -1,12 +1,12 @@