Merge branch 'master' into feat/commonmenu

src/layouts/BasicLayout.less

@@ -30,10 +30,10 @@
     }
     .layoutSlider {
         overflow: hidden; 
-        flex: 0 0 100px; 
-        max-width: 100px; 
-        min-width: 100px; 
-        width: 100px;
+        flex: 0 0 80px; 
+        max-width: 80px; 
+        min-width: 80px; 
+        width: 80px;
         background-color: @layout-header-background;
         transition: background .3s,width .3s cubic-bezier(.2,0,0,1) 0s;
         &.fixed {

src/layouts/BasicLayout1.js

@@ -458,18 +458,18 @@ const BasicLayout = props => {
       <div className={classNames(layoutStyles.basicLayout)}>
         <div className={layoutStyles['layout-has-slider']} style={{minHeight: '100%'}}>
           <div style={{
-            width: collapse ? '48px': '100px', 
+            width: collapse ? '48px': '80px', 
             overflow: 'hidden', 
-            flex: collapse ? '0 0 48px': '0 0 100px', 
-            maxWidth: collapse ? '48px':'100px', 
-            minWidth: collapse ? '48px':'100px',
+            flex: collapse ? '0 0 48px': '0 0 80px', 
+            maxWidth: collapse ? '48px':'80px', 
+            minWidth: collapse ? '48px':'80px',
             transition: 'background-color 0.3s ease 0s, min-width 0.3s ease 0s, max-width 0.3s cubic-bezier(0.645, 0.045, 0.355, 1) 0s'
           }}></div>
           <aside className={classNames(layoutStyles.layoutSlider, layoutStyles.fixed, {
             [layoutStyles.collapsed]: collapse
           })}>
             <div className={layoutStyles['layout-slider-childern']}>
-              <div className={layoutStyles.sliderMenu} style={{flex: '1 1 0%', overflow: 'hidden'}}>
+              <div className={layoutStyles.sliderMenu} style={{flex: '1 1 0%', overflow: 'hidden auto'}}>
                 <ul className="menu" style={{minHeight: '0px', marginBottom: '0px'}}>
                   <li className={classNames('menu-item')} onClick={handleToggleSystem}>
                       <Tooltip placement="right" title={collapse ? currentRoutes.name: ''}>
@@ -525,7 +525,7 @@ const BasicLayout = props => {
               </div>
             </div>    
           </aside>
-          <div className={layoutStyles.layout} style={{width: 'calc(100% - 100px)'}}>
+          <div className={layoutStyles.layout} style={{width: 'calc(100% - 80px)'}}>
           <Panel
             visible={toggleSystem}
             keyboard