From eb31b84962c192de57abbb473cb4733a09bf4363 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 14 五月 2020 18:09:40 +0800
Subject: [PATCH] 2020-05-14

---
 src/components/sidemenu/index.jsx |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/components/sidemenu/index.jsx b/src/components/sidemenu/index.jsx
index 4561868..7e146c3 100644
--- a/src/components/sidemenu/index.jsx
+++ b/src/components/sidemenu/index.jsx
@@ -41,7 +41,7 @@
   async loadsubmenu (menu) {
     if (!menu || !menu.MenuID) { // 娌℃湁涓昏彍鍗曟椂锛屾竻绌轰笅绾ц彍鍗�
       this.setState({
-        subMenulist: [],
+        subMenulist: null,
         rootSubmenuKeys: [],
         openKeys: [],
         editMenu: null
@@ -61,10 +61,9 @@
       
       if (result.data.length === 0) { // 鏌ヨ鑿滃崟涓虹┖
         this.setState({
-          subMenulist: [],
+          subMenulist: null,
           rootSubmenuKeys: [],
-          openKeys: [],
-          editMenu: null
+          openKeys: []
         })
         return
       }
@@ -289,10 +288,10 @@
 
     return (
       <aside className={"side-menu ant-menu-dark" + (this.props.collapse ? ' side-menu-collapsed' : '') + (this.props.isiframe ? ' iframe' : '')}>
-        {this.state.subMenulist && !(this.props.editLevel === 'level2' || this.props.editLevel === 'level3') &&
+        {!(this.props.editLevel === 'level2' || this.props.editLevel === 'level3') &&
           <Menu openKeys={this.state.openKeys} onOpenChange={this.onOpenChange} mode="inline" theme="dark" inlineCollapsed={this.props.collapse}>
           {editShow && <li className="sup-menu"><Icon onClick={this.enterSubEdit} className="edit-check" type="edit" /></li>}
-          {this.state.subMenulist.map((item, index) => {
+          {this.state.subMenulist && this.state.subMenulist.map((item, index) => {
             return (
               <SubMenu
                 key={item.MenuID}
@@ -326,14 +325,14 @@
             exitEdit={this.exitEdit}
           />
         }
-        {this.props.editLevel === 'level3' && this.state.subMenulist &&
+        {this.props.editLevel === 'level3' && this.state.subMenulist ?
           <EditThdMenu
             menulist={this.state.editMenu.children}
             supMenuList={this.state.subMenulist}
             supMenu={this.state.editMenu}
             reload={this.reload}
             exitEdit={this.exitEdit}
-          />
+          /> : null
         }
       </aside>
     )

--
Gitblit v1.8.0