From abf1e0217cbe5cc34bee8d1a08db32598f893586 Mon Sep 17 00:00:00 2001
From: dushixiang <798148596@qq.com>
Date: Sun, 14 Feb 2021 01:16:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A6=96=E9=A1=B5=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E9=97=AA=E7=83=81=E7=9A=84=E9=97=AE=E9=A2=98=20?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=94=B6=E8=B5=B7=E4=BE=A7=E8=BE=B9=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/App.js | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/web/src/App.js b/web/src/App.js
index 9be13bd..900c512 100644
--- a/web/src/App.js
+++ b/web/src/App.js
@@ -23,8 +23,6 @@ import {
     IdcardOutlined,
     LinkOutlined,
     LoginOutlined,
-    MenuFoldOutlined,
-    MenuUnfoldOutlined,
     SettingOutlined,
     SolutionOutlined,
     TeamOutlined,
@@ -55,10 +53,11 @@ class App extends Component {
         user: {
             'nickname': '未定义'
         },
-        package: NT_PACKAGE()
+        package: NT_PACKAGE(),
+        triggerMenu: true
     };
 
-    toggle = () => {
+    onCollapse = () => {
         this.setState({
             collapsed: !this.state.collapsed,
         });
@@ -78,10 +77,11 @@ class App extends Component {
 
         let result = await request.get('/info');
         if (result['code'] === 1) {
-            this.setState({
-                user: result['data']
-            })
             sessionStorage.setItem('user', JSON.stringify(result['data']));
+            this.setState({
+                user: result['data'],
+                triggerMenu: true
+            })
         } else {
             message.error(result['message']);
         }
@@ -120,7 +120,7 @@ class App extends Component {
                 <Route path="/">
                     <Layout className="layout" style={{minHeight: '100vh'}}>
 
-                        <Sider trigger={null} collapsible collapsed={this.state.collapsed} style={{width: 256}}>
+                        <Sider collapsible collapsed={this.state.collapsed} onCollapse={this.onCollapse}>
                             <div className="logo">
                                 <img src='logo.svg' alt='logo'/>
                                 {
@@ -175,7 +175,7 @@ class App extends Component {
                                 </SubMenu>
 
                                 {
-                                    isAdmin() ?
+                                    this.state.triggerMenu && isAdmin() ?
                                         <>
                                             <SubMenu key='audit' title='操作审计' icon={<AuditOutlined/>}>
                                                 <Menu.Item key="online-session" icon={<LinkOutlined/>}>
@@ -221,7 +221,7 @@ class App extends Component {
                                 </Menu.Item>
 
                                 {
-                                    isAdmin() ?
+                                    this.state.triggerMenu && isAdmin() ?
                                         <>
                                             <Menu.Item key="setting" icon={<SettingOutlined/>}>
                                                 <Link to={'/setting'}>
@@ -231,13 +231,6 @@ class App extends Component {
                                         </> : undefined
                                 }
                             </Menu>
-
-                            <div>
-                                {React.createElement(this.state.collapsed ? MenuUnfoldOutlined : MenuFoldOutlined, {
-                                    className: 'trigger',
-                                    onClick: this.toggle,
-                                })}
-                            </div>
                         </Sider>
 
                         <Layout className="site-layout">