.npmrc

@@ -1,2 +1,2 @@
-registry=https://registry.npmmirror.com
+registry=https://registry.npm.taobao.org
 package-lock=false

.umirc.ts

@@ -39,12 +39,5 @@ export default defineConfig({
     proxy: proxy[REACT_APP_ENV || 'dev'],
     codeSplitting: {
         jsStrategy: 'granularChunks'
-    },
+    }
-    chainWebpack(config, { webpack }) {
-        config.plugin('code-inspector-plugin').use(require('code-inspector-plugin').codeInspectorPlugin, [
-            {
-                bundler: 'webpack',
-            },
-        ]);
-    },
 })

package.json

@@ -20,18 +20,15 @@
     "braft-utils": "^3.0.2",
     "echarts": "^4.9.0",
     "moment": "^2.29.1",
-    "nvm": "^0.0.4",
     "qs": "^6.11.0",
     "react": "^18.2.0",
     "react-contexify": "^5.0.0",
     "react-dom": "^18.2.0",
-    "react-split-pane": "^0.1.92",
+    "react-split-pane": "^0.1.92"
-    "code-inspector-plugin": "^1.2.8"
   },
   "devDependencies": {
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.0",
-    "code-inspector-plugin": "^1.2.8",
     "cross-env": "^7.0.3",
     "typescript": "^4.1.2"
   }

src/pages/nav_system_content/SystemContentList.js

@@ -3,10 +3,6 @@ import { history, Outlet, useLocation, matchRoutes } from '@umijs/max'
 import { Menu, Tabs } from 'antd'
 import './SystemContentList.less'
 import { formatRoute, getDefaultRoute } from '@/utils/routeUtils'
-import styles from './TopNavBar.less'
-import { Row, Col, Avatar, Dropdown, Button } from 'antd'
-import { userInfo } from '@/utils/globalCommon'
-import { HomeOutlined, SettingOutlined, LogoutOutlined } from '@ant-design/icons'
 
 const SystemContentList = (props) => {
     const dynamicRoute = window.dynamicRoute
@@ -54,27 +50,6 @@ const SystemContentList = (props) => {
         history.replace(curKey)
     }
 
-    const handleMenuClick = (e) => {
-        switch (e.key) {
-            case 'logout':
-                loginOut()
-                break
-            default:
-                break
-        }
-    }
-
-    const dropDownMenuItems = [
-        {
-            label: <><LogoutOutlined style={{ marginRight: '8px' }} />退出登录</>,
-            key: 'logout'
-        }
-    ]
-
-    const dropDownMenu = () => (
-        <Menu items={dropDownMenuItems} onClick={handleMenuClick} selectedKeys={[]} className={styles.tabBarMenu} />
-    )
-
     return (
         <div className='pageContainer systemContent'>
             <div className='leftMenu'>
@@ -88,36 +63,10 @@ const SystemContentList = (props) => {
                 />
             </div>
 
-            <div className='rightContent'>
-                {/* <div style={{ width: '100%', backgroundColor: '#fff', marginBottom: '10px' }}> */}
-                <div className='tabBarHeader'>
-                    <Row className='tabBarRow'>
-                        {/* <Col xs={16} sm={16} md={16} lg={16} xl={16} className='tabBarLeft'>
-                            <img src={Logo} alt='logo' className='leftLogo' />
-
-                            <Menu mode='horizontal' className='leftMenu' selectedKeys={[activeKey]} items={menuItems} onClick={value => setRouteActive(value)} />
-                        </Col> */}
-
-                        <Col xs={8} sm={8} md={8} lg={8} xl={8} className='tabBarRight'>
-                            <Avatar className='tabBarRightAvaTor' src='https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fb-ssl.duitang.com%2Fuploads%2Fitem%2F201707%2F31%2F20170731021444_2YUfe.jpeg&refer=http%3A%2F%2Fb-ssl.duitang.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1669779871&t=ec025ed48a1668dee9cfa0e803b6f787' />
-
-                            <span className='tabBarRightName'>{userInfo?.user_name_cn ? userInfo.user_name_cn : (userInfo?.user_name || '')}</span>
-
-                            <Dropdown dropdownRender={dropDownMenu}>
-                                <Button type='text' className='tabBarRightBtn'><SettingOutlined /></Button>
-                            </Dropdown>
-                        </Col>
-                    </Row>
-                </div>
-                {/* </div> */}
-                <div style={{ padding: '12px', height: '100%' }}>
             <div className='rightContentMain'>
                 <Outlet />
             </div>
         </div>
-
-            </div>
-        </div>
     )
 }
 

src/pages/nav_system_content/SystemContentList.less

@@ -1,70 +1,13 @@
 .systemContent {
 	display: flex;
-	height: 100vh;
+	height: 100%;
-	// justify-content: space-between;
-	flex-wrap: nowrap;
-	// padding: 12px;
-
-	.tabBarHeader {
-		background-color: #fff;
-		padding: 0;
-		width: 100%;
-		// margin-bottom: 10px;
-
-		.tabBarRow {
-			padding: 0 12px;
-			justify-content: flex-end;
-
-			.tabBarLeft {
-				display: flex;
 	justify-content: space-between;
 	flex-wrap: nowrap;
-				align-items: center;
+	padding: 12px;
-
-				.leftLogo {
-					width: 36px;
-					height: 36px;
-					margin: 0 12px;
-				}
-
-				.leftMenu {
-					width: calc(100% - 52px);
-				}
-			}
-
-			.tabBarRight {
-				text-align: right;
-				display: flex;
-				justify-content: flex-end;
-				flex-wrap: nowrap;
-				align-items: center;
-
-				.tabBarRightAvaTor {
-					margin-right: 20px;
-				}
-
-				.tabBarRightName {
-					margin-right: 5px;
-				}
-
-				.tabBarRightBtn {
-					height: 100%;
-				}
-			}
-		}
-	}
-
-	.rightContent {
-		width: calc(100% - 230px);
-		display: flex;
-		flex-direction: column;
-		height: 100vh;
-		overflow: auto;
-	}
 
 	.leftMenu {
 		margin: 0;
-		width: 230px;
+		width: 200px;
 		background-color: #ffffff;
 		border-radius: 6px;
 		overflow-y: auto;
@@ -76,11 +19,9 @@
 	}
 
 	.rightContentMain {
-		width: 100%;
+		width: calc(100% - 212px);
 		background-color: #ffffff;
-		// border-radius: 6px;
+		border-radius: 6px;
 		overflow-y: auto;
-		// height: 100%;
-		overflow: auto;
 	}
 }

src/pages/nav_system_content/TopNavBar.less

@@ -1,11 +0,0 @@
-.layoutContainer {
-  height: 100%;
-  background-color: #f0f2f5;
-
-
-
-  .contentMain {
-    height: calc(100% - 46px);
-    overflow-y: hidden;
-  }
-}

src/pages/topnavbar/TopNavBar.js

@@ -122,7 +122,7 @@ const TopNavBar = (props) => {
 
   return (
     <div className={styles.layoutContainer}>
-      {/* <div className={styles.tabBarHeader}>
+      <div className={styles.tabBarHeader}>
         <Row className={styles.tabBarRow}>
           <Col xs={16} sm={16} md={16} lg={16} xl={16} className={styles.tabBarLeft}>
             <img src={Logo} alt='logo' className={styles.leftLogo} />
@@ -140,13 +140,12 @@ const TopNavBar = (props) => {
             </Dropdown>
           </Col>
         </Row>
-      </div> */}
+      </div>
 
-      {/* <div className={styles.contentMain}>
+      <div className={styles.contentMain}>
-        <Outlet />
-      </div> */}
         <Outlet />
       </div>
+    </div>
   )
 }