From c1f5384d41e6fe0c335857e1e11e79d40a47f608 Mon Sep 17 00:00:00 2001
From: paranoidjk <hust2012jiangkai@gmail.com>
Date: Tue, 10 Jan 2017 12:17:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BE=A7=E8=BE=B9?=
 =?UTF-8?q?=E6=A0=8F=E8=8F=9C=E5=8D=95=E8=B6=85=E9=95=BF=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/layout/main.less | 10 +++++++++-
 src/components/layout/menu.js   |  3 ++-
 src/components/layout/sider.js  |  2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/components/layout/main.less b/src/components/layout/main.less
index 123db11..685a4e9 100644
--- a/src/components/layout/main.less
+++ b/src/components/layout/main.less
@@ -106,6 +106,13 @@
         transition: @transition-ease-out;
       }
     }
+    
+    .siderMenu {
+      position: absolute;
+      width: 100%;
+      max-height: ~"calc(100% - 88px)";  // https://github.com/less/less.js/issues/974
+      overflow-y: scroll;
+    }
 
     .switchtheme {
       width: 100%;
@@ -118,7 +125,8 @@
       align-items: center;
       padding: 0 16px 0 24px;
       overflow: hidden;
-
+      z-index: 1000;
+      
       span {
         white-space: nowrap;
         overflow: hidden;
diff --git a/src/components/layout/menu.js b/src/components/layout/menu.js
index 9344ccd..5388654 100644
--- a/src/components/layout/menu.js
+++ b/src/components/layout/menu.js
@@ -26,10 +26,11 @@ const getMenus = function (menuArray, siderFold, parentPath) {
   })
 }
 
-function Menus ({ siderFold, darkTheme, location, isNavbar, handleClickNavMenu }) {
+function Menus ({ siderFold, darkTheme, location, isNavbar, handleClickNavMenu, className }) {
   const menuItems = getMenus(menu, siderFold)
   return (
     <Menu
+      className={className}
       mode={siderFold ? 'vertical' : 'inline'}
       theme={darkTheme ? 'dark' : 'light'}
       onClick={handleClickNavMenu}
diff --git a/src/components/layout/sider.js b/src/components/layout/sider.js
index 882fa92..ec2cafc 100644
--- a/src/components/layout/sider.js
+++ b/src/components/layout/sider.js
@@ -16,7 +16,7 @@ function Sider ({ siderFold, darkTheme, location, changeTheme }) {
         <img src={config.logoSrc} />
         {siderFold ? '' : <span>{config.logoText}</span>}
       </div>
-      <Menus {...menusProps} />
+      <Menus {...menusProps} className={styles.siderMenu} />
       {!siderFold ? <div className={styles.switchtheme}>
         <span><Icon type='bulb' />切换主题</span>
         <Switch onChange={changeTheme} defaultChecked={darkTheme} checkedChildren='黑' unCheckedChildren='白' />