From 4a8ce315d1e011ae6a8c94eae0690e2335feb40f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 19 一月 2020 01:34:07 +0800
Subject: [PATCH] 2020-01-19

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

diff --git a/src/components/sidemenu/index.jsx b/src/components/sidemenu/index.jsx
index 89e9edc..d0fc29e 100644
--- a/src/components/sidemenu/index.jsx
+++ b/src/components/sidemenu/index.jsx
@@ -188,7 +188,7 @@
   }
 
   UNSAFE_componentWillReceiveProps (nextProps) {
-    if (nextProps.mainMenu && !is(fromJS(this.props.mainMenu), fromJS(nextProps.mainMenu))) {
+    if (!is(fromJS(this.props.mainMenu), fromJS(nextProps.mainMenu))) {
       // 涓昏彍鍗曞垏鎹紝璇锋眰2銆�3绾ц彍鍗曟暟鎹�
       this.loadsubmenu(nextProps.mainMenu)
     } else if (nextProps.collapse && this.props.collapse !== nextProps.collapse) {
@@ -201,12 +201,12 @@
 
   shouldComponentUpdate(nextProps, nextState) {
     // if (!is(fromJS(this.props.mainMenu), fromJS(nextProps.mainMenu)) || (!this.props.collapse && !is(fromJS(this.props.tabviews), fromJS(nextProps.tabviews)))) {
-    if (!is(fromJS(this.props.mainMenu), fromJS(nextProps.mainMenu))) {
-      // 涓昏彍鍗曞垏鎹紝鎴栬彍鍗曞睍寮�涓嬬殑tab椤靛彉鍖栵紝涓嶄細鍒锋柊
-      return false
-    } else {
-      return !is(fromJS(this.props), fromJS(nextProps)) || !is(fromJS(this.state), fromJS(nextState))
-    }
+    // if (!is(fromJS(this.props.mainMenu), fromJS(nextProps.mainMenu))) {
+    //   // 涓昏彍鍗曞垏鎹紝鎴栬彍鍗曞睍寮�涓嬬殑tab椤靛彉鍖栵紝涓嶄細鍒锋柊
+    //   return false
+    // } else {
+    return !is(fromJS(this.props), fromJS(nextProps)) || !is(fromJS(this.state), fromJS(nextState))
+    // }
   }
 
   onOpenChange = openKeys => {
@@ -257,6 +257,7 @@
 
   render () {
     const editShow = (this.props.editState && !this.props.editLevel) || false
+
     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') &&

--
Gitblit v1.8.0