From 44a3597ca7ec736a6b068e5f7fdb454470553e46 Mon Sep 17 00:00:00 2001
From: chenshuai2144 <qixian.cs@outlook.com>
Date: Tue, 7 Jul 2020 00:28:34 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=92=84=20UI:=20fix=20side=20fixed=20style?=
 =?UTF-8?q?=20error?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/demo/base.tsx               | 1 -
 src/BasicLayout.less             | 3 ++-
 src/GridContent/GridContent.less | 1 -
 src/SiderMenu/SiderMenu.tsx      | 3 +++
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/demo/base.tsx b/docs/demo/base.tsx
index 61111eb1..1d67585e 100644
--- a/docs/demo/base.tsx
+++ b/docs/demo/base.tsx
@@ -40,7 +40,6 @@ export default () => {
       <ProLayout
         {...defaultProps}
         style={{
-          height: 500,
           maxHeight: '100vh',
         }}
         location={{
diff --git a/src/BasicLayout.less b/src/BasicLayout.less
index 8ea897f9..91ad47cd 100644
--- a/src/BasicLayout.less
+++ b/src/BasicLayout.less
@@ -20,10 +20,11 @@
   &-content {
     position: relative;
     margin: 24px;
-    transition: all 0.2s;
+
     .@{ant-prefix}-pro-page-container {
       margin: -24px -24px 0;
     }
+
     &-disable-margin {
       margin: 0;
       > div > .@{ant-prefix}-pro-page-container {
diff --git a/src/GridContent/GridContent.less b/src/GridContent/GridContent.less
index 25be6242..d51d017b 100644
--- a/src/GridContent/GridContent.less
+++ b/src/GridContent/GridContent.less
@@ -4,7 +4,6 @@
 .@{pro-layout-grid-content-prefix-cls} {
   width: 100%;
   min-height: 100%;
-  transition: 0.3s;
   &.wide {
     max-width: 1200px;
     margin: 0 auto;
diff --git a/src/SiderMenu/SiderMenu.tsx b/src/SiderMenu/SiderMenu.tsx
index a5c7fad3..89d5c0e4 100644
--- a/src/SiderMenu/SiderMenu.tsx
+++ b/src/SiderMenu/SiderMenu.tsx
@@ -129,6 +129,9 @@ const SiderMenu: React.FC<SiderMenuProps> = (props) => {
           style={{
             width: collapsed ? 48 : siderWidth,
             overflow: 'hidden',
+            flex: `0 0 ${collapsed ? 48 : siderWidth}px`,
+            maxWidth: collapsed ? 48 : siderWidth,
+            minWidth: collapsed ? 48 : siderWidth,
             ...style,
           }}
         />