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 { - +
logo { @@ -175,7 +175,7 @@ class App extends Component { { - isAdmin() ? + this.state.triggerMenu && isAdmin() ? <> }> }> @@ -221,7 +221,7 @@ class App extends Component { { - isAdmin() ? + this.state.triggerMenu && isAdmin() ? <> }> @@ -231,13 +231,6 @@ class App extends Component { : undefined } - -
- {React.createElement(this.state.collapsed ? MenuUnfoldOutlined : MenuFoldOutlined, { - className: 'trigger', - onClick: this.toggle, - })} -