From de25557f86945a96b89294043796ccf4ab476ad5 Mon Sep 17 00:00:00 2001
From: vben <anncwb@126.com>
Date: Thu, 17 Dec 2020 00:20:29 +0800
Subject: [PATCH] fix(menu): fix scrillbar not work

---
 CHANGELOG.zh_CN.md                            |   6 +
 src/components/Menu/src/BasicMenu.vue         |   3 +-
 src/layouts/default/header/index.vue          |  18 ++-
 src/layouts/default/menu/index.tsx            |   8 +-
 src/layouts/default/setting/SettingDrawer.tsx |  20 ++-
 src/layouts/default/setting/enum.ts           |  34 +++--
 src/layouts/default/setting/handler.ts        |   1 +
 src/layouts/default/sider/LayoutSider.tsx     | 121 ----------------
 src/layouts/default/sider/LayoutSider.vue     | 132 ++++++++++++++++++
 src/layouts/default/sider/index.vue           |   2 +-
 .../{useLayoutSider.tsx => useLayoutSider.ts} |  16 +--
 11 files changed, 204 insertions(+), 157 deletions(-)
 delete mode 100644 src/layouts/default/sider/LayoutSider.tsx
 create mode 100644 src/layouts/default/sider/LayoutSider.vue
 rename src/layouts/default/sider/{useLayoutSider.tsx => useLayoutSider.ts} (90%)

diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md
index 815c9caeb85..c053de5e05e 100644
--- a/CHANGELOG.zh_CN.md
+++ b/CHANGELOG.zh_CN.md
@@ -1,3 +1,9 @@
+## Wip
+
+### 🐛 Bug Fixes
+
+- 修复混合模式下滚动条丢失问题
+
 ## 2.0.0-rc.14 (2020-12-15)
 
 ### ✨ Features
diff --git a/src/components/Menu/src/BasicMenu.vue b/src/components/Menu/src/BasicMenu.vue
index 99aa939d48f..463b0516c2a 100644
--- a/src/components/Menu/src/BasicMenu.vue
+++ b/src/components/Menu/src/BasicMenu.vue
@@ -90,9 +90,10 @@
       });
 
       const getMenuClass = computed(() => {
+        const align = props.isHorizontal && unref(getSplit) ? 'start' : unref(getTopMenuAlign);
         return [
           prefixCls,
-          `justify-${unref(getTopMenuAlign)}`,
+          `justify-${align}`,
           {
             [`${prefixCls}--hide-title`]: !unref(showTitle),
             [`${prefixCls}--collapsed-show-title`]: props.collapsedShowTitle,
diff --git a/src/layouts/default/header/index.vue b/src/layouts/default/header/index.vue
index 4f248cf3962..bb1e8d42327 100644
--- a/src/layouts/default/header/index.vue
+++ b/src/layouts/default/header/index.vue
@@ -7,6 +7,7 @@
         v-if="getShowHeaderLogo || getIsMobile"
         :class="`${prefixCls}-logo`"
         :theme="getHeaderTheme"
+        :style="getLogoWidth"
       />
       <LayoutTrigger
         v-if="(getShowContent && getShowHeaderTrigger && !getSplit) || getIsMobile"
@@ -103,7 +104,13 @@
     },
     setup(props) {
       const { prefixCls } = useDesign('layout-header');
-      const { getShowTopMenu, getShowHeaderTrigger, getSplit } = useMenuSetting();
+      const {
+        getShowTopMenu,
+        getShowHeaderTrigger,
+        getSplit,
+        getIsMixMode,
+        getMenuWidth,
+      } = useMenuSetting();
       const { getShowLocale } = useLocaleSetting();
       const { getUseErrorHandle } = useRootSetting();
 
@@ -131,6 +138,14 @@
         ];
       });
 
+      const getLogoWidth = computed(() => {
+        if (!unref(getIsMixMode)) {
+          return {};
+        }
+        const width = unref(getMenuWidth) < 180 ? 180 : unref(getMenuWidth);
+        return { width: `${width}px` };
+      });
+
       const getSplitType = computed(() => {
         return unref(getSplit) ? MenuSplitTyeEnum.TOP : MenuSplitTyeEnum.NONE;
       });
@@ -157,6 +172,7 @@
         getShowNotice,
         getUseLockPage,
         getUseErrorHandle,
+        getLogoWidth,
       };
     },
   });
diff --git a/src/layouts/default/menu/index.tsx b/src/layouts/default/menu/index.tsx
index 66ccd76d2f9..ef6ca57252a 100644
--- a/src/layouts/default/menu/index.tsx
+++ b/src/layouts/default/menu/index.tsx
@@ -47,6 +47,7 @@ export default defineComponent({
       getMenuTheme,
       getCollapsed,
       getAccordion,
+      getIsHorizontal,
       getIsSidebarType,
     } = useMenuSetting();
     const { getShowLogo } = useRootSetting();
@@ -66,7 +67,12 @@ export default defineComponent({
     const getIsShowLogo = computed(() => unref(getShowLogo) && unref(getIsSidebarType));
 
     const getUseScroll = computed(() => {
-      return unref(getIsSidebarType) || props.splitType === MenuSplitTyeEnum.LEFT;
+      return (
+        !unref(getIsHorizontal) &&
+        (unref(getIsSidebarType) ||
+          props.splitType === MenuSplitTyeEnum.LEFT ||
+          props.splitType === MenuSplitTyeEnum.NONE)
+      );
     });
 
     const getWrapperStyle = computed(
diff --git a/src/layouts/default/setting/SettingDrawer.tsx b/src/layouts/default/setting/SettingDrawer.tsx
index 1871f787f91..1b4c7748a36 100644
--- a/src/layouts/default/setting/SettingDrawer.tsx
+++ b/src/layouts/default/setting/SettingDrawer.tsx
@@ -10,7 +10,7 @@ import {
   InputNumberItem,
 } from './components';
 
-import { MenuTypeEnum } from '/@/enums/menuEnum';
+import { MenuTypeEnum, TriggerEnum } from '/@/enums/menuEnum';
 
 import { useRootSetting } from '/@/hooks/setting/useRootSetting';
 import { useMenuSetting } from '/@/hooks/setting/useMenuSetting';
@@ -25,7 +25,7 @@ import {
   HandlerEnum,
   contentModeOptions,
   topMenuAlignOptions,
-  menuTriggerOptions,
+  getMenuTriggerOptions,
   routerTransitionOptions,
   menuTypeList,
 } from './enum';
@@ -134,6 +134,14 @@ export default defineComponent({
      * @description:
      */
     function renderFeatures() {
+      let triggerDef = unref(getTrigger);
+
+      const triggerOptions = getMenuTriggerOptions(unref(getSplit));
+      const some = triggerOptions.some((item) => item.value === triggerDef);
+      if (!some) {
+        triggerDef = TriggerEnum.FOOTER;
+      }
+
       return (
         <>
           <SwitchItem
@@ -183,13 +191,15 @@ export default defineComponent({
             event={HandlerEnum.MENU_TOP_ALIGN}
             def={unref(getTopMenuAlign)}
             options={topMenuAlignOptions}
-            disabled={!unref(getShowHeader) || (!unref(getIsTopMenu) && !unref(getSplit))}
+            disabled={
+              !unref(getShowHeader) || unref(getSplit) || (!unref(getIsTopMenu) && !unref(getSplit))
+            }
           />
           <SelectItem
             title={t('layout.setting.menuCollapseButton')}
             event={HandlerEnum.MENU_TRIGGER}
-            def={unref(getTrigger)}
-            options={menuTriggerOptions}
+            def={triggerDef}
+            options={triggerOptions}
             disabled={!unref(getShowMenuRef)}
           />
           <SelectItem
diff --git a/src/layouts/default/setting/enum.ts b/src/layouts/default/setting/enum.ts
index 6e199698769..53e9fd3fbfe 100644
--- a/src/layouts/default/setting/enum.ts
+++ b/src/layouts/default/setting/enum.ts
@@ -76,20 +76,26 @@ export const topMenuAlignOptions = [
   },
 ];
 
-export const menuTriggerOptions = [
-  {
-    value: TriggerEnum.NONE,
-    label: t('layout.setting.menuTriggerNone'),
-  },
-  {
-    value: TriggerEnum.FOOTER,
-    label: t('layout.setting.menuTriggerBottom'),
-  },
-  {
-    value: TriggerEnum.HEADER,
-    label: t('layout.setting.menuTriggerTop'),
-  },
-];
+export const getMenuTriggerOptions = (hideTop: boolean) => {
+  return [
+    {
+      value: TriggerEnum.NONE,
+      label: t('layout.setting.menuTriggerNone'),
+    },
+    {
+      value: TriggerEnum.FOOTER,
+      label: t('layout.setting.menuTriggerBottom'),
+    },
+    ...(hideTop
+      ? []
+      : [
+          {
+            value: TriggerEnum.HEADER,
+            label: t('layout.setting.menuTriggerTop'),
+          },
+        ]),
+  ];
+};
 
 export const routerTransitionOptions = [
   RouterTransitionEnum.ZOOM_FADE,
diff --git a/src/layouts/default/setting/handler.ts b/src/layouts/default/setting/handler.ts
index 227e4127d70..6a2dc41516b 100644
--- a/src/layouts/default/setting/handler.ts
+++ b/src/layouts/default/setting/handler.ts
@@ -25,6 +25,7 @@ export function handler(event: HandlerEnum, value: any): DeepPartial<ProjectConf
           type,
           collapsed: false,
           show: true,
+          hidden: false,
           ...splitOpt,
         },
       };
diff --git a/src/layouts/default/sider/LayoutSider.tsx b/src/layouts/default/sider/LayoutSider.tsx
deleted file mode 100644
index a7016510f70..00000000000
--- a/src/layouts/default/sider/LayoutSider.tsx
+++ /dev/null
@@ -1,121 +0,0 @@
-import './index.less';
-
-import { computed, defineComponent, ref, unref, CSSProperties } from 'vue';
-
-import { Layout } from 'ant-design-vue';
-import LayoutMenu from '../menu';
-
-import { MenuModeEnum, MenuSplitTyeEnum } from '/@/enums/menuEnum';
-
-import { useMenuSetting } from '/@/hooks/setting/useMenuSetting';
-import { useTrigger, useDragLine, useSiderEvent } from './useLayoutSider';
-import { useAppInject } from '/@/hooks/web/useAppInject';
-import { useDesign } from '/@/hooks/web/useDesign';
-
-import DragBar from './DragBar.vue';
-export default defineComponent({
-  name: 'LayoutSideBar',
-  setup() {
-    const dragBarRef = ref<ElRef>(null);
-    const sideRef = ref<ElRef>(null);
-
-    const {
-      getCollapsed,
-      getMenuWidth,
-      getSplit,
-      getMenuTheme,
-      getRealWidth,
-      getMenuHidden,
-      getMenuFixed,
-      getIsMixMode,
-    } = useMenuSetting();
-
-    const { prefixCls } = useDesign('layout-sideBar');
-
-    const { getIsMobile } = useAppInject();
-
-    const { getTriggerAttr, getTriggerSlot } = useTrigger(getIsMobile);
-
-    useDragLine(sideRef, dragBarRef);
-
-    const { getCollapsedWidth, onBreakpointChange, onCollapseChange } = useSiderEvent();
-
-    const getMode = computed(() => {
-      return unref(getSplit) ? MenuModeEnum.INLINE : null;
-    });
-
-    const getSplitType = computed(() => {
-      return unref(getSplit) ? MenuSplitTyeEnum.LEFT : MenuSplitTyeEnum.NONE;
-    });
-
-    const showClassSideBarRef = computed(() => {
-      return unref(getSplit) ? !unref(getMenuHidden) : true;
-    });
-
-    const getSiderClass = computed(() => {
-      return [
-        prefixCls,
-        {
-          [`${prefixCls}--fixed`]: unref(getMenuFixed),
-          hidden: !unref(showClassSideBarRef),
-          [`${prefixCls}--mix`]: unref(getIsMixMode) && !unref(getIsMobile),
-        },
-      ];
-    });
-
-    const getHiddenDomStyle = computed(
-      (): CSSProperties => {
-        const width = `${unref(getRealWidth)}px`;
-        return {
-          width: width,
-          overflow: 'hidden',
-          flex: `0 0 ${width}`,
-          maxWidth: width,
-          minWidth: width,
-          transition: 'all 0.2s',
-        };
-      }
-    );
-
-    function renderDefault() {
-      return (
-        <>
-          <LayoutMenu
-            theme={unref(getMenuTheme)}
-            menuMode={unref(getMode)}
-            splitType={unref(getSplitType)}
-          />
-          <DragBar ref={dragBarRef} />
-        </>
-      );
-    }
-
-    return () => {
-      return (
-        <>
-          {unref(getMenuFixed) && !unref(getIsMobile) && (
-            <div style={unref(getHiddenDomStyle)} class={{ hidden: !unref(showClassSideBarRef) }} />
-          )}
-          <Layout.Sider
-            ref={sideRef}
-            breakpoint="lg"
-            collapsible
-            class={unref(getSiderClass)}
-            width={unref(getMenuWidth)}
-            collapsed={unref(getIsMobile) ? false : unref(getCollapsed)}
-            collapsedWidth={unref(getCollapsedWidth)}
-            theme={unref(getMenuTheme)}
-            onCollapse={onCollapseChange}
-            onBreakpoint={onBreakpointChange}
-            {...unref(getTriggerAttr)}
-          >
-            {{
-              ...unref(getTriggerSlot),
-              default: () => renderDefault(),
-            }}
-          </Layout.Sider>
-        </>
-      );
-    };
-  },
-});
diff --git a/src/layouts/default/sider/LayoutSider.vue b/src/layouts/default/sider/LayoutSider.vue
new file mode 100644
index 00000000000..7793a9ff7be
--- /dev/null
+++ b/src/layouts/default/sider/LayoutSider.vue
@@ -0,0 +1,132 @@
+<template>
+  <div
+    v-if="getMenuFixed && !getIsMobile"
+    :style="getHiddenDomStyle"
+    :class="{ hidden: !showClassSideBarRef }"
+  />
+  <Sider
+    ref="sideRef"
+    breakpoint="lg"
+    collapsible
+    :class="getSiderClass"
+    :width="getMenuWidth"
+    :collapsed="getIsMobile ? false : getCollapsed"
+    :collapsedWidth="getCollapsedWidth"
+    :theme="getMenuTheme"
+    @collapse="onCollapseChange"
+    @breakpoint="onBreakpointChange"
+    v-bind="getTriggerAttr"
+  >
+    <template #trigger v-if="getShowTrigger">
+      <LayoutTrigger />
+    </template>
+    <LayoutMenu :theme="getMenuTheme" :menuMode="getMode" :splitType="getSplitType" />
+    <DragBar ref="dragBarRef" />
+  </Sider>
+</template>
+<script lang="ts">
+  import { computed, defineComponent, ref, unref, CSSProperties } from 'vue';
+
+  import { Layout } from 'ant-design-vue';
+  import LayoutMenu from '../menu';
+  import LayoutTrigger from '/@/layouts/default/trigger/index.vue';
+
+  import { MenuModeEnum, MenuSplitTyeEnum } from '/@/enums/menuEnum';
+
+  import { useMenuSetting } from '/@/hooks/setting/useMenuSetting';
+  import { useTrigger, useDragLine, useSiderEvent } from './useLayoutSider';
+  import { useAppInject } from '/@/hooks/web/useAppInject';
+  import { useDesign } from '/@/hooks/web/useDesign';
+
+  import DragBar from './DragBar.vue';
+  export default defineComponent({
+    name: 'LayoutSideBar',
+    components: { Sider: Layout.Sider, LayoutMenu, DragBar, LayoutTrigger },
+    setup() {
+      const dragBarRef = ref<ElRef>(null);
+      const sideRef = ref<ElRef>(null);
+
+      const {
+        getCollapsed,
+        getMenuWidth,
+        getSplit,
+        getMenuTheme,
+        getRealWidth,
+        getMenuHidden,
+        getMenuFixed,
+        getIsMixMode,
+      } = useMenuSetting();
+
+      const { prefixCls } = useDesign('layout-sideBar');
+
+      const { getIsMobile } = useAppInject();
+
+      const { getTriggerAttr, getShowTrigger } = useTrigger(getIsMobile);
+
+      useDragLine(sideRef, dragBarRef);
+
+      const { getCollapsedWidth, onBreakpointChange, onCollapseChange } = useSiderEvent();
+
+      const getMode = computed(() => {
+        return unref(getSplit) ? MenuModeEnum.INLINE : null;
+      });
+
+      const getSplitType = computed(() => {
+        return unref(getSplit) ? MenuSplitTyeEnum.LEFT : MenuSplitTyeEnum.NONE;
+      });
+
+      const showClassSideBarRef = computed(() => {
+        return unref(getSplit) ? !unref(getMenuHidden) : true;
+      });
+
+      const getSiderClass = computed(() => {
+        return [
+          prefixCls,
+          {
+            [`${prefixCls}--fixed`]: unref(getMenuFixed),
+            hidden: !unref(showClassSideBarRef),
+            [`${prefixCls}--mix`]: unref(getIsMixMode) && !unref(getIsMobile),
+          },
+        ];
+      });
+
+      const getHiddenDomStyle = computed(
+        (): CSSProperties => {
+          const width = `${unref(getRealWidth)}px`;
+          return {
+            width: width,
+            overflow: 'hidden',
+            flex: `0 0 ${width}`,
+            maxWidth: width,
+            minWidth: width,
+            transition: 'all 0.2s',
+          };
+        }
+      );
+
+      return {
+        prefixCls,
+        sideRef,
+        dragBarRef,
+        getIsMobile,
+        getHiddenDomStyle,
+        getSiderClass,
+        getTriggerAttr,
+        getCollapsedWidth,
+        getMenuFixed,
+        showClassSideBarRef,
+        getMenuWidth,
+        getCollapsed,
+        getMenuTheme,
+        onBreakpointChange,
+        getMode,
+        getSplitType,
+        onCollapseChange,
+        getShowTrigger,
+      };
+    },
+  });
+</script>
+<style lang="less">
+  @import './index.less';
+</style>
diff --git a/src/layouts/default/sider/index.vue b/src/layouts/default/sider/index.vue
index 57920038a2c..ebf48c24826 100644
--- a/src/layouts/default/sider/index.vue
+++ b/src/layouts/default/sider/index.vue
@@ -15,7 +15,7 @@
 <script lang="ts">
   import { defineComponent } from 'vue';
 
-  import Sider from './LayoutSider';
+  import Sider from './LayoutSider.vue';
   import { Drawer } from 'ant-design-vue';
   import { useAppInject } from '/@/hooks/web/useAppInject';
   import { useMenuSetting } from '/@/hooks/setting/useMenuSetting';
diff --git a/src/layouts/default/sider/useLayoutSider.tsx b/src/layouts/default/sider/useLayoutSider.ts
similarity index 90%
rename from src/layouts/default/sider/useLayoutSider.tsx
rename to src/layouts/default/sider/useLayoutSider.ts
index 263756301e8..1a2a7fdc8b9 100644
--- a/src/layouts/default/sider/useLayoutSider.tsx
+++ b/src/layouts/default/sider/useLayoutSider.ts
@@ -1,7 +1,6 @@
 import type { Ref } from 'vue';
 
 import { computed, unref, onMounted, nextTick, ref } from 'vue';
-import LayoutTrigger from '/@/layouts/default/trigger/index.vue';
 
 import { TriggerEnum } from '/@/enums/menuEnum';
 
@@ -45,7 +44,7 @@ export function useSiderEvent() {
 export function useTrigger(getIsMobile: Ref<boolean>) {
   const { getTrigger, getSplit } = useMenuSetting();
 
-  const showTrigger = computed(() => {
+  const getShowTrigger = computed(() => {
     const trigger = unref(getTrigger);
 
     return (
@@ -56,7 +55,7 @@ export function useTrigger(getIsMobile: Ref<boolean>) {
   });
 
   const getTriggerAttr = computed(() => {
-    if (unref(showTrigger)) {
+    if (unref(getShowTrigger)) {
       return {};
     }
     return {
@@ -64,16 +63,7 @@ export function useTrigger(getIsMobile: Ref<boolean>) {
     };
   });
 
-  const getTriggerSlot = computed(() => {
-    if (unref(showTrigger)) {
-      return {
-        trigger: () => <LayoutTrigger />,
-      };
-    }
-    return {};
-  });
-
-  return { getTriggerAttr, getTriggerSlot };
+  return { getTriggerAttr, getShowTrigger };
 }
 
 /**