From 255a70b677d48317908e43bd5aee9c786397d14f Mon Sep 17 00:00:00 2001
From: jim <wasd2144@hotmail.com>
Date: Mon, 14 May 2018 09:40:50 +0800
Subject: [PATCH] Optimize fixSiderbar

---
 src/components/SiderMenu/index.js |  2 +-
 src/layouts/BasicLayout.js        | 30 +++++++++++++++++++++---------
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/components/SiderMenu/index.js b/src/components/SiderMenu/index.js
index 8b73a38e..3ec398b2 100644
--- a/src/components/SiderMenu/index.js
+++ b/src/components/SiderMenu/index.js
@@ -20,7 +20,7 @@ const getFlatMenuKeys = menuData => {
 };
 
 const SiderMenuWrapper = props =>
-  props.isMobile || props.fixSiderbar ? (
+  props.isMobile ? (
     <DrawerMenu
       parent={null}
       level={null}
diff --git a/src/layouts/BasicLayout.js b/src/layouts/BasicLayout.js
index 72c174c6..21d2a420 100644
--- a/src/layouts/BasicLayout.js
+++ b/src/layouts/BasicLayout.js
@@ -75,6 +75,23 @@ class BasicLayout extends React.PureComponent {
     }
     return title;
   }
+  getLayoutStyle = () => {
+    const { fixSiderbar } = this.props;
+    if (fixSiderbar) {
+      return {
+        height: '100vh',
+        overflow: 'auto',
+      };
+    }
+    return null;
+  };
+  getContentStyle = () => {
+    const { fixedHeader } = this.props;
+    return {
+      margin: '24px 24px 0',
+      paddingTop: fixedHeader ? 64 : 0,
+    };
+  };
   getBashRedirect = () => {
     // According to the url parameter to redirect
     // 这里是重定向的,重定向到 url 的 redirect 参数所示地址
@@ -101,8 +118,9 @@ class BasicLayout extends React.PureComponent {
       payload: collapsed,
     });
   };
+
   render() {
-    const { isMobile, redirectData, routerData, fixedHeader, match } = this.props;
+    const { isMobile, redirectData, routerData, match } = this.props;
     const isTop = this.props.layout === 'topmenu';
     const bashRedirect = this.getBashRedirect();
     const myRedirectData = redirectData || [];
@@ -117,15 +135,9 @@ class BasicLayout extends React.PureComponent {
             {...this.props}
           />
         )}
-        <Layout>
+        <Layout style={this.getLayoutStyle()}>
           <Header handleMenuCollapse={this.handleMenuCollapse} logo={logo} {...this.props} />
-          <Content
-            style={{
-              margin: '24px 24px 0',
-              height: '100%',
-              paddingTop: fixedHeader ? 64 : 0,
-            }}
-          >
+          <Content style={this.getContentStyle()}>
             <Switch>
               {myRedirectData.map(item => (
                 <Redirect key={item.from} exact from={item.from} to={item.to} />
-- 
GitLab