Merge branch 'v2-220418' of…

config/lingxi.theme.config.ts

@@ -35,6 +35,7 @@ export default {
   // Layout
   '@layout-header-height': '48px',
 
+  '@border-radius-base': '4px',
   // PageHeader
   // '@page-header-padding': '8px 24px',     // 这里替换会出现前边拼接了 '6px 8px 24px'这样，所以直接改成修改样式好了
 }

package.json

@@ -57,8 +57,8 @@
     "start:v2-220318": "cross-env PRO_ENV=v2-220318 yarn start",
     "start:v2-220418": "cross-env PRO_ENV=v2-220418 yarn start",
     "start-fast": "cross-env NODE_OPTIONS=--max_old_space_size=4096 UMI_ENV=local umi dev",
-    "start-fast:v2-220418": "cross-env PRO_ENV=v2-220418 yarn start-fast"
-
+    "start-fast:v2-220418": "cross-env PRO_ENV=v2-220418 yarn start-fast",
+    "start:ali": "cross-env PRO_ENV=v2-ali-demo yarn start"
   },
   "lint-staged": {
     "*.{js,jsx,less,md,json}": [

src/components/AnchorPage/index.tsx

@@ -116,6 +116,8 @@ const AnchorPage = (props: IProps) => {
           targetOffset={rect.height}
           onChange={handleAnchorChange}
           onClick={handleAnchorClick}
+          getContainer={() => document.querySelector('main.ant-pro-basicLayout-content') as HTMLElement}
+          // getContainer={() => document.getElementsByTagName('main')[0]}
         >
           <div className={styles['anchor-page-header-main']}>
             <div className={styles['anchor-page-header-left']}>

src/global/styles/reset.less

@@ -401,3 +401,28 @@
     font-size: 8px;
   }
 }
+
+.ant-pro-basicLayout {
+  height: 100%;
+}
+
+.ant-layout-sider-children {
+  display: flex;
+  flex-direction: column;
+}
+
+main.ant-pro-basicLayout-content {
+  height: 100%;
+  margin: 0;
+  padding: 24px;
+  overflow-y: scroll;
+}
+
+main.ant-pro-basicLayout-content-disable-margin {
+  padding: 0;
+}
+
+.ant-layout-header+div {
+  overflow-y: hidden;
+  min-height: initial !important;
+}
\ No newline at end of file

src/layouts/BasicLayout.tsx

@@ -4,7 +4,7 @@ import ProLayout, {
   Settings,
   DefaultFooter,
   getMenuData,
-  getPageTitle
+  getPageTitle,
 } from '@ant-design/pro-layout';
 import React, { useState, useEffect, useLayoutEffect, useMemo } from 'react';
 import { Link, useIntl, Helmet } from 'umi';
@@ -158,7 +158,7 @@ const BasicLayout: React.FC<BasicLayoutProps> = (props) => {
     <ProLayout
       pageTitleRender={() => currentRouter ? currentRouter.name : window.location.href}
       // contentStyle={{minWidth: '1280px'}}
-      style={prolayoutStyle}
+      // style={prolayoutStyle}
       logo={logo}
       // formatMessage={formatMessage}
       menuHeaderRender={(logoDom, titleDom) => (
@@ -183,17 +183,17 @@ const BasicLayout: React.FC<BasicLayoutProps> = (props) => {
         currentRouter={currentRouter}
         changeOpenKeys={(keys: string[]) => setOpenKeys(keys)}
       />}
-      footerRender={() => defaultFooterDom}
+      // footerRender={() => defaultFooterDom}
       rightContentRender={() => <RightContent isHome={isHome} />}
       {...props}
       {...settings}
     >
       {children}
     </ProLayout>
-  );
+      );
 };
 
-export default BasicLayout
+      export default BasicLayout
 
 // export default connect(({ global, settings }: ConnectState) => ({
 //   collapsed: global.collapsed,

src/layouts/styles/MenuSlider.less

@@ -23,6 +23,8 @@
     max-width: 0 !important;
     min-width: 0 !important;
     width: 0 !important;
+    height: 100%;
+    overflow: hidden;
   }
 }
 
@@ -138,12 +140,24 @@
 
 .wrapperSilder {
   background-color: #38414A !important;
-  min-height: 100vh;
+  height: 100%;
+  overflow: hidden;
+
+  :global {
+    .ant-layout-sider-children {
+      display: flex;
+      flex-direction: column;
+    }
+  }
 
   .menuBox {
-    padding: 0;
+    flex: 1;
+    margin: 0;
+    padding: 24px 0 0 0;
+    box-sizing: border-box;
     text-align: center;
-    padding-top: 24px;
+    overflow-y: scroll;
+    list-style: none;
 
     li {
       padding: 8px 0;
@@ -224,6 +238,10 @@
 }
 
 .menuSlider {
+  flex: 1;
+  overflow-y: scroll;
+  overflow-x: hidden;
+  border-right: 1px solid #fff;
 
   .ant-menu-submenu-title {
     height: 48px !important;

src/pages/document.ejs

@@ -7,8 +7,11 @@
   <link rel="icon" type="image/x-icon" href="/static/imgs/Fav.jpg" />
 </head>
 
-<body>
+<!-- <body >
   <div id="root"></div>
+</body> -->
+<body style="height: 100%; overflow: hidden;">
+  <div id="root" style="height: 100%; overflow: hidden;"></div>
 </body>
 
 </html>