From 10e2b76a5b403c17da448d8e043c42966b14e657 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 25 七月 2021 23:46:20 +0800
Subject: [PATCH] 2021-07-25

---
 src/pc/components/navbar/normal-navbar/menusetting/menutable/index.jsx |   86 ++++++++++++++++++++++++++++++++++--------
 1 files changed, 69 insertions(+), 17 deletions(-)

diff --git a/src/pc/components/navbar/normal-navbar/menusetting/menutable/index.jsx b/src/pc/components/navbar/normal-navbar/menusetting/menutable/index.jsx
index a96ea84..8174d84 100644
--- a/src/pc/components/navbar/normal-navbar/menusetting/menutable/index.jsx
+++ b/src/pc/components/navbar/normal-navbar/menusetting/menutable/index.jsx
@@ -123,7 +123,7 @@
 
     this.menuRef.handleConfirm().then(res => {
       let _menu = {...editMenu, ...res}
-      let _data = this.state.data
+      let _data = fromJS(this.state.data).toJS()
       if (!_menu.MenuID) {
         _menu.MenuID = Utils.getuuid()
         _data.push(_menu)
@@ -136,8 +136,26 @@
           }
         })
       }
-      this.setState({data: _data, editMenu: null, visible: false})
-      this.props.menuUpdate({...menu, sublist: _data})
+      if (editMenu.MenuID && editMenu.property === 'menu' && _menu.property !== 'menu') {
+        const _this = this
+        confirm({
+          content: '鑿滃崟灞炴�х敱鈥滆彍鍗曗�濆垏鎹㈣嚦鍏朵粬绫诲瀷鏃讹紝鑿滃崟灏嗚閲嶇疆锛屽嵆瑙i櫎涔嬪墠鑿滃崟鐨勭粦瀹氬叧绯伙紝纭畾淇敼鍚楋紵',
+          onOk() {
+            _data = _data.map(item => {
+              if (item.MenuID === _menu.MenuID) {
+                item.MenuID = Utils.getuuid()
+              }
+              return item
+            })
+            _this.setState({data: _data, editMenu: null, visible: false})
+            _this.props.menuUpdate({...menu, sublist: _data})
+          },
+          onCancel() {}
+        })
+      } else {
+        this.setState({data: _data, editMenu: null, visible: false})
+        this.props.menuUpdate({...menu, sublist: _data})
+      }
     })
   }
 
@@ -288,7 +306,7 @@
 
     this.menuRef.handleConfirm().then(res => {
       let _menu = {...editMenu, ...res}
-      let _data = this.state.data
+      let _data = fromJS(this.state.data).toJS()
       if (!_menu.MenuID) {
         _menu.MenuID = Utils.getuuid()
         _data.push(_menu)
@@ -301,8 +319,26 @@
           }
         })
       }
-      this.setState({data: _data, editMenu: null, visible: false})
-      this.props.menuUpdate({...menu, sublist: _data})
+      if (editMenu.MenuID && editMenu.property === 'menu' && _menu.property !== 'menu') {
+        const _this = this
+        confirm({
+          content: '鑿滃崟灞炴�х敱鈥滆彍鍗曗�濆垏鎹㈣嚦鍏朵粬绫诲瀷鏃讹紝鑿滃崟灏嗚閲嶇疆锛屽嵆瑙i櫎涔嬪墠鑿滃崟鐨勭粦瀹氬叧绯伙紝纭畾淇敼鍚楋紵',
+          onOk() {
+            _data = _data.map(item => {
+              if (item.MenuID === _menu.MenuID) {
+                item.MenuID = Utils.getuuid()
+              }
+              return item
+            })
+            _this.setState({data: _data, editMenu: null, visible: false})
+            _this.props.menuUpdate({...menu, sublist: _data})
+          },
+          onCancel() {}
+        })
+      } else {
+        this.setState({data: _data, editMenu: null, visible: false})
+        this.props.menuUpdate({...menu, sublist: _data})
+      }
     })
   }
 
@@ -462,22 +498,38 @@
 
     this.menuRef.handleConfirm().then(res => {
       let _menu = {...editMenu, ...res}
+      let _data = fromJS(data).toJS()
       if (!_menu.MenuID) {
         _menu.MenuID = Utils.getuuid()
-        this.setState({data: [...data, _menu], editMenu: null, visible: false})
+        _data.push(_menu)
       } else {
-        this.setState({
-          editMenu: null,
-          visible: false,
-          data: data.map(item => {
-            if (item.MenuID === _menu.MenuID) {
-              return _menu
-            } else {
-              return item
-            }
-          })
+        _data = _data.map(item => {
+          if (item.MenuID === _menu.MenuID) {
+            return _menu
+          } else {
+            return item
+          }
         })
       }
+
+      if (editMenu.MenuID && editMenu.property === 'menu' && _menu.property !== 'menu') {
+        const _this = this
+        confirm({
+          content: '鑿滃崟灞炴�х敱鈥滆彍鍗曗�濆垏鎹㈣嚦鍏朵粬绫诲瀷鏃讹紝鑿滃崟灏嗚閲嶇疆锛屽嵆瑙i櫎涔嬪墠鑿滃崟鐨勭粦瀹氬叧绯伙紝纭畾淇敼鍚楋紵',
+          onOk() {
+            _data = _data.map(item => {
+              if (item.MenuID === _menu.MenuID) {
+                item.MenuID = Utils.getuuid()
+              }
+              return item
+            })
+            _this.setState({data: _data, editMenu: null, visible: false})
+          },
+          onCancel() {}
+        })
+      } else {
+        this.setState({data: _data, editMenu: null, visible: false})
+      }
     })
   }
 

--
Gitblit v1.8.0