fix(menu): fix menu split mode problem

vbenjs · Dec 11, 2020 · 1ef49e5 · 1ef49e5
1 parent 6b3195b
commit 1ef49e5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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'),