fix: keepalive占满容器

alitajs · Aug 9, 2021 · 61115da · 61115da
2 parents f02dbf3 + f601da9
commit 61115da
Showing 1 changed file with 20 additions and 30 deletions.
diff --git a/packages/keep-alive/src/utils/getKeepAliveLayout.tsx b/packages/keep-alive/src/utils/getKeepAliveLayout.tsx
@@ -84,36 +84,26 @@ export default class BasicLayout extends React.PureComponent<PageProps> {
     }
     return (
       <>
-        <div
-          hidden={!showKeepAlive}
-          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} 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>
       </>