diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md index 0fd29e6b92bdb1c8973413a2ab3a35bd7f5206ac..08115f3b6cc2a94693df58a3cefab7c9704d8fb4 100644 --- a/CHANGELOG.zh_CN.md +++ b/CHANGELOG.zh_CN.md @@ -21,6 +21,7 @@ - 修改 `VirtualScroll`和`ImportExcel`组件名为`VScroll`与`ImpExcel`,暂时解决含有关键字的组件在 vue 模版内使用内存溢出 - 修复 axios 大小写问题 - 修复按钮样式问题 +- 修复菜单分割模式问题 ## 2.0.0-rc.13 (2020-12-10) diff --git a/src/components/Menu/src/BasicMenu.tsx b/src/components/Menu/src/BasicMenu.tsx index 22649bc13cded2a544df808414d6b48f3d5fa028..32a83d250ed7e60e584e4abcb717c2f60e6bcf9f 100644 --- a/src/components/Menu/src/BasicMenu.tsx +++ b/src/components/Menu/src/BasicMenu.tsx @@ -100,11 +100,10 @@ export default defineComponent({ const getWrapperStyle = computed( (): CSSProperties => { - const isHorizontal = unref(getIsHorizontal); + const isHorizontal = unref(getIsHorizontal) || getSplit.value; + return { - height: isHorizontal - ? `calc(100% + 1px)` - : `calc(100% - ${props.showLogo ? '48px' : '0px'})`, + height: isHorizontal ? `calc(100%)` : `calc(100% - ${props.showLogo ? '48px' : '0px'})`, overflowY: isHorizontal ? 'hidden' : 'auto', }; } diff --git a/src/layouts/default/header/LayoutMultipleHeader.tsx b/src/layouts/default/header/LayoutMultipleHeader.tsx index bae171f509e6f6da4fe90c97ded1ef0925c4de0d..6fa7336e11701f9a5950794ec41fe594117149c1 100644 --- a/src/layouts/default/header/LayoutMultipleHeader.tsx +++ b/src/layouts/default/header/LayoutMultipleHeader.tsx @@ -21,7 +21,7 @@ export default defineComponent({ const injectValue = useLayoutContext(); - const { getCalcContentWidth, getSplit } = useMenuSetting(); + const { getCalcContentWidth } = useMenuSetting(); const { getFixed, @@ -56,8 +56,7 @@ export default defineComponent({ (): CSSProperties => { const style: CSSProperties = {}; if (unref(getFixed)) { - style.width = - unref(injectValue.isMobile) || unref(getSplit) ? '100%' : unref(getCalcContentWidth); + style.width = unref(injectValue.isMobile) ? '100%' : unref(getCalcContentWidth); } if (unref(getShowFullHeaderRef)) { style.top = `${unref(fullHeaderHeightRef)}px`; diff --git a/src/router/routes/modules/dashboard.ts b/src/router/routes/modules/dashboard.ts index ca88a7cce70113bb5505e5670b3aa0f9d755933e..31b21f23a568e813e09014397e34f226aae875f8 100644 --- a/src/router/routes/modules/dashboard.ts +++ b/src/router/routes/modules/dashboard.ts @@ -7,7 +7,7 @@ const dashboard: AppRouteModule = { path: '/dashboard', name: 'Dashboard', component: LAYOUT, - redirect: '/dashboard/welcome', + redirect: '/dashboard/workbench', meta: { icon: 'bx:bx-home', title: t('routes.dashboard.dashboard'),