From e65f89377cf1b02c5fd0719a235c491963acc555 Mon Sep 17 00:00:00 2001
From: DIYC <xue.shidongyu110@iwhalecloud.com>
Date: Tue, 3 Aug 2021 14:45:12 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20keepalive=E5=8D=A0=E6=BB=A1=E5=AE=B9?=
 =?UTF-8?q?=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/keep-alive/src/utils/getKeepAliveLayout.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/keep-alive/src/utils/getKeepAliveLayout.tsx b/packages/keep-alive/src/utils/getKeepAliveLayout.tsx
index 4799a2ea..e126c28a 100644
--- a/packages/keep-alive/src/utils/getKeepAliveLayout.tsx
+++ b/packages/keep-alive/src/utils/getKeepAliveLayout.tsx
@@ -86,6 +86,7 @@ export default class BasicLayout extends React.PureComponent<PageProps> {
       <>
         <div
           hidden={!showKeepAlive}
+          style={{ position: 'absolute', inset: 0 }}
           className="rumtime-keep-alive-layout"
         >
           {this.alivePathnames.map(curPathname => {
@@ -113,7 +114,7 @@ export default class BasicLayout extends React.PureComponent<PageProps> {
             ) : null;
           })}
         </div>
-        <div hidden={showKeepAlive} className="rumtime-keep-alive-layout-no">
+        <div hidden={showKeepAlive} style={{ position: 'absolute', inset: 0 }} className="rumtime-keep-alive-layout-no">
           {!showKeepAlive && this.props.children}
         </div>
       </>

From f601da9dbf153aee2c1585b60eba2060f465b427 Mon Sep 17 00:00:00 2001
From: DIYC <xue.shidongyu110@iwhalecloud.com>
Date: Tue, 3 Aug 2021 15:48:29 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20keepalive=E5=8D=A0=E6=BB=A1?=
 =?UTF-8?q?=E7=88=B6=E8=8A=82=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/utils/getKeepAliveLayout.tsx          | 51 ++++++++-----------
 1 file changed, 20 insertions(+), 31 deletions(-)

diff --git a/packages/keep-alive/src/utils/getKeepAliveLayout.tsx b/packages/keep-alive/src/utils/getKeepAliveLayout.tsx
index e126c28a..919d8eff 100644
--- a/packages/keep-alive/src/utils/getKeepAliveLayout.tsx
+++ b/packages/keep-alive/src/utils/getKeepAliveLayout.tsx
@@ -84,37 +84,26 @@ export default class BasicLayout extends React.PureComponent<PageProps> {
     }
     return (
       <>
-        <div
-          hidden={!showKeepAlive}
-          style={{ position: 'absolute', inset: 0 }}
-          className="rumtime-keep-alive-layout"
-        >
-          {this.alivePathnames.map(curPathname => {
-            const currentView = getView(curPathname, this.keepAliveViewMap);
-            const { component: View, recreateTimes } = currentView;
-            const matchRoute = matchRoutes([currentView], curPathname)[0];
-            const pageProps: any = { ...this.props,...matchRoute };
-            return View ? (
-              <div
-                id={\`BasicLayout-\${curPathname}\`}
-                key={
-                  curPathname + recreateTimes
-                }
-                style={{
-                  position: 'absolute',
-                  left: 0,
-                  top: 0,
-                  right: 0,
-                  bottom: 0,
-                }}
-                hidden={curPathname !== pathname.toLowerCase()}
-              >
-                <View {...pageProps} />
-              </div>
-            ) : null;
-          })}
-        </div>
-        <div hidden={showKeepAlive} style={{ position: 'absolute', inset: 0 }} className="rumtime-keep-alive-layout-no">
+        {this.alivePathnames.map(curPathname => {
+          const currentView = getView(curPathname, this.keepAliveViewMap);
+          const { component: View, recreateTimes } = currentView;
+          const matchRoute = matchRoutes([currentView], curPathname)[0];
+          const pageProps: any = { ...this.props,...matchRoute };
+          return View ? (
+            <div
+              id={\`BasicLayout-\${curPathname}\`}
+              key={
+                curPathname + recreateTimes
+              }
+              style={{ height: '100%', width: '100%', position: 'relative', overflow: 'hidden auto' }}
+              className="rumtime-keep-alive-layout"
+              hidden={curPathname !== pathname.toLowerCase()}
+            >
+              <View {...pageProps} />
+            </div>
+          ) : null;
+        })}
+        <div hidden={showKeepAlive} style={{ height: '100%', width: '100%', position: 'relative', overflow: 'hidden auto' }} className="rumtime-keep-alive-layout-no">
           {!showKeepAlive && this.props.children}
         </div>
       </>