From f3ec8c20eeabee6eaab1508d2f3896c28aab611c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 22 七月 2021 14:42:42 +0800
Subject: [PATCH] 修改页面中按钮保存

---
 src/views/mobdesign/index.jsx |  423 +++++++++++++---------------------------------------
 1 files changed, 108 insertions(+), 315 deletions(-)

diff --git a/src/views/mobdesign/index.jsx b/src/views/mobdesign/index.jsx
index 8638eb2..fc84f6d 100644
--- a/src/views/mobdesign/index.jsx
+++ b/src/views/mobdesign/index.jsx
@@ -59,9 +59,6 @@
     MenuId: '',
     MenuName: '',
     MenuNo: '',
-    delButtons: [],
-    copyButtons: [],
-    thawButtons: [],
     activeKey: 'component',
     menuloading: false,
     oriConfig: null,
@@ -135,9 +132,6 @@
       document.getElementById('mk-mob-design-view').innerHTML = '<div style="text-align: center; font-size: 30px; margin-top: 40vh; height: 100vh; background: #fff;">鏈簲鐢ㄦ病鏈塒C绔〉闈㈢殑缂栬緫鏉冮檺锛岃鑱旂郴绠$悊鍛橈紒</div>'
       return
     }
-    MKEmitter.addListener('delButtons', this.delButtons)
-    MKEmitter.addListener('thawButtons', this.thawButtons)
-    MKEmitter.addListener('copyButtons', this.copyButtons)
     MKEmitter.addListener('changeEditMenu', this.changeEditMenu)
     MKEmitter.addListener('submitComponentStyle', this.updateComponentStyle)
     MKEmitter.addListener('updateCustomComponent', this.updateCustomComponent)
@@ -156,9 +150,6 @@
     this.setState = () => {
       return
     }
-    MKEmitter.removeListener('delButtons', this.delButtons)
-    MKEmitter.removeListener('thawButtons', this.thawButtons)
-    MKEmitter.removeListener('copyButtons', this.copyButtons)
     MKEmitter.removeListener('changeEditMenu', this.changeEditMenu)
     MKEmitter.removeListener('submitComponentStyle', this.updateComponentStyle)
     MKEmitter.removeListener('updateCustomComponent', this.updateCustomComponent)
@@ -383,23 +374,6 @@
         comloading: false
       })
     })
-  }
-
-  delButtons = (items) => {
-    const { copyButtons, delButtons } = this.state
-
-    this.setState({
-      delButtons: [...delButtons, ...items],
-      copyButtons: copyButtons.filter(item => !items.includes(item.uuid))
-    })
-  }
-
-  copyButtons = (items) => {
-    this.setState({copyButtons: [...this.state.copyButtons, ...items]})
-  }
-  
-  thawButtons = (item) => {
-    this.setState({thawButtons: [...this.state.thawButtons, item]})
   }
 
   closeView = () => {
@@ -693,35 +667,57 @@
 
   getMenuMessage = () => {
     const { config } = this.state
-    let buttons = []
-    let _sort = 1
-
+    
     let traversal = (components) => {
-      components.forEach(item => {
+      let list = components.map(item => {
+        let m = {
+          key: item.uuid,
+          title: item.name,
+          children: []
+        }
         if (item.type === 'tabs') {
+          let tabs = []
           item.subtabs.forEach(tab => {
-            traversal(tab.components)
+            let s = traversal(tab.components)
+
+            if (s.length === 0) return
+
+            tabs.push({
+              key: tab.uuid,
+              title: tab.label,
+              children: s
+            })
           })
+
+          if (tabs.length > 0) {
+            m.children = tabs
+          }
         } else if (item.type === 'group') {
-          traversal(item.components)
+          m.children = traversal(item.components)
         } else if (item.type === 'card' || (item.type === 'table' && item.subtype === 'tablecard')) {
           item.action && item.action.forEach(btn => {
             this.checkBtn(btn)
-            buttons.push(`select '${btn.uuid}' as menuid, '${item.name + '-' + btn.label}' as menuname, '${_sort * 10}' as Sort`)
-            _sort++
+            m.children.push({
+              key: btn.uuid,
+              title: btn.label,
+            })
           })
           item.subcards.forEach(card => {
             card.elements && card.elements.forEach(cell => {
               if (cell.eleType !== 'button') return
               this.checkBtn(cell)
-              buttons.push(`select '${cell.uuid}' as menuid, '${item.name + '-' + cell.label}' as menuname, '${_sort * 10}' as Sort`)
-              _sort++
+              m.children.push({
+                key: cell.uuid,
+                title: cell.label,
+              })
             })
             card.backElements && card.backElements.forEach(cell => {
               if (cell.eleType !== 'button') return
               this.checkBtn(cell)
-              buttons.push(`select '${cell.uuid}' as menuid, '${item.name + '-' + cell.label}' as menuname, '${_sort * 10}' as Sort`)
-              _sort++
+              m.children.push({
+                key: cell.uuid,
+                title: cell.label,
+              })
             })
           })
         } else if (item.type === 'carousel') {
@@ -729,44 +725,65 @@
             card.elements && card.elements.forEach(cell => {
               if (cell.eleType !== 'button') return
               this.checkBtn(cell)
-              buttons.push(`select '${cell.uuid}' as menuid, '${item.name + '-' + cell.label}' as menuname, '${_sort * 10}' as Sort`)
-              _sort++
+              m.children.push({
+                key: cell.uuid,
+                title: cell.label,
+              })
             })
           })
         } else if (item.type === 'balcony') {
           item.elements && item.elements.forEach(cell => {
             if (cell.eleType !== 'button') return
             this.checkBtn(cell)
-            buttons.push(`select '${cell.uuid}' as menuid, '${item.name + '-' + cell.label}' as menuname, '${_sort * 10}' as Sort`)
-            _sort++
+            m.children.push({
+              key: cell.uuid,
+              title: cell.label,
+            })
           })
-        } else if (item.type === 'line' || item.type === 'bar') {
-          item.action && item.action.forEach(btn => {
-            this.checkBtn(btn)
-            buttons.push(`select '${btn.uuid}' as menuid, '${item.name + '-' + btn.label}' as menuname, '${_sort * 10}' as Sort`)
-            _sort++
+        } else if (item.type === 'menubar') {
+          if (item.wrap.title) {
+            m.title = item.wrap.title
+          }
+
+          m.children = item.subMenus.map(menu => {
+            return {
+              key: menu.uuid,
+              title: menu.setting.name
+            }
           })
         } else if (item.type === 'table' && item.subtype === 'normaltable') {
           item.action && item.action.forEach(btn => {
             this.checkBtn(btn)
-            buttons.push(`select '${btn.uuid}' as menuid, '${item.name + '-' + btn.label}' as menuname, '${_sort * 10}' as Sort`)
-            _sort++
+            m.children.push({
+              key: btn.uuid,
+              title: btn.label,
+            })
           })
           item.cols && item.cols.forEach(col => {
             if (col.type !== 'action') return
             col.elements.forEach(btn => {
               this.checkBtn(btn)
-              buttons.push(`select '${btn.uuid}' as menuid, '${item.name + '-' + btn.label}' as menuname, '${_sort * 10}' as Sort`)
-              _sort++
+              m.children.push({
+                key: btn.uuid,
+                title: btn.label,
+              })
             })
           })
         }
+
+        if (m.children.length === 0) return null
+
+        return m
       })
+
+      list = list.filter(Boolean)
+
+      return list
     }
 
-    traversal(config.components)
+    let trees = traversal(config.components)
 
-    return buttons
+    return trees
   }
 
   checkBtn = (btn) => {
@@ -807,7 +824,6 @@
   }
 
   submitConfig = () => {
-    const { delButtons, copyButtons, thawButtons } = this.state
     let config = fromJS(this.state.config).toJS()
 
     if (!config.MenuName || !config.MenuNo || (config.cacheUseful === 'true' && !config.cacheTime)) {
@@ -856,25 +872,9 @@
       param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
       param.secretkey = Utils.encrypt('', param.timestamp)
 
-      let btnParam = {             // 娣诲姞鑿滃崟鎸夐挳
-        func: 'sPC_Button_AddUpt',
-        Type: 40,                  // 娣诲姞鑿滃崟涓嬬殑鎸夐挳type涓�40锛屾寜閽笅鐨勬寜閽畉ype涓�60
-        ParentID: config.uuid,
-        MenuNo: config.MenuNo,
-        Template: 'webPage',
-        PageParam: '',
-        LongParam: '',
-        LText: []
-      }
-
-      btnParam.LText = this.getMenuMessage()
-      btnParam.LText = btnParam.LText.join(' union all ')
-
-      let btnIds = btnParam.LText // 鐢ㄤ簬澶嶅埗鎸夐挳鐨勮繃婊�
-
-      btnParam.LText = Utils.formatOptions(btnParam.LText)
-      btnParam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
-      btnParam.secretkey = Utils.encrypt(btnParam.LText, btnParam.timestamp)
+      let roleParam = {key: config.uuid, title: config.MenuName, children: []}
+      roleParam.children = this.getMenuMessage()
+      console.log(roleParam)
 
       new Promise(resolve => {
         let _config = fromJS(config).toJS()
@@ -927,87 +927,34 @@
               _param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
               _param.secretkey = Utils.encrypt('', _param.timestamp)
 
-              // let appMenuParam = null
-              // if (item.type === 'navbar') {
-              //   appMenuParam = {
-              //     func: 's_appmenus_addupt',
-              //     exec_type: 'y'
-              //   }
-  
-              //   appMenuParam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
-              //   appMenuParam.secretkey = Utils.encrypt('', _param.timestamp)
+              let roles = {
+                key: item.uuid,
+                title: item.name,
+                children: []
+              }
+      
+              roles.children = item.menus.map(menu => {
+                return {
+                  key: menu.MenuID,
+                  title: menu.name
+                }
+              })
+              console.log(roles)
+              
+              Api.getSystemConfig(_param).then(res => {
+                if (!res.status) {
+                  notification.warning({
+                    top: 92,
+                    message: res.message,
+                    duration: 5
+                  })
+                  this.setState({ menuloading: false })
+                  return
+                }
 
-              //   let LText = []
-              //   let app_param = []
-              //   let kei_no = sessionStorage.getItem('kei_no')
-              //   let userid = sessionStorage.getItem('CloudUserID') || ''
-
-              //   item.menus.forEach((fst, findex) => {
-              //     // LText.push(`select '${fst.MenuID}','${fst.name}','','0','${sessionStorage.getItem('appId')}','0','${(findex + 1) * 10}','10','','${userid}','${window.GLOB.appkey}','${fst.MenuNo || ''}','${kei_no}','pc'`)
-              //     LText.push(`select '${fst.MenuID}','${fst.name}','','0','0','0','${(findex + 1) * 10}','10','','${userid}','${window.GLOB.appkey}','${fst.MenuNo || ''}','${kei_no}','pc'`)
-              //     app_param.push(`select '${window.GLOB.appkey}','${fst.MenuID}','${userid}','${(findex + 1) * 10}','','${fst.name}','${fst.MenuNo || ''}','0','10','${kei_no}','pc'`)
-              //     if (fst.property === 'classify' && fst.sublist.length > 0) {
-              //       fst.sublist.forEach(scd => {
-              //         LText.push(`select '${scd.MenuID}','${scd.name}','','0','${fst.MenuID}','0','${(findex + 1) * 10}','20','','${userid}','${window.GLOB.appkey}','${scd.MenuNo || ''}','${kei_no}','pc'`)
-              //         app_param.push(`select '${window.GLOB.appkey}','${scd.MenuID}','${userid}','${(findex + 1) * 10}','','${scd.name}','${scd.MenuNo || ''}','${fst.MenuID}','20','${kei_no}','pc'`)
-                    
-              //         if (scd.property === 'classify' && scd.sublist.length > 0) {
-              //           scd.sublist.forEach(thd => {
-              //             LText.push(`select '${thd.MenuID}','${thd.name}','','0','${scd.MenuID}','0','${(findex + 1) * 10}','20','','${userid}','${window.GLOB.appkey}','${thd.MenuNo || ''}','${kei_no}','pc'`)
-              //             app_param.push(`select '${window.GLOB.appkey}','${thd.MenuID}','${userid}','${(findex + 1) * 10}','','${thd.name}','${thd.MenuNo || ''}','${scd.MenuID}','20','${kei_no}','pc'`)
-              //           })
-              //         }
-              //       })
-              //     }
-              //   })
-              //   appMenuParam.LText = Utils.formatOptions(LText.join(' union '))
-              //   appMenuParam.LText1 = Utils.formatOptions(app_param.join(' union '))
-              // }
-
-              // if (appMenuParam) {
-              //   Api.getSystemConfig(appMenuParam).then(_res => {
-              //     if (!_res.status) {
-              //       notification.warning({
-              //         top: 92,
-              //         message: _res.message,
-              //         duration: 5
-              //       })
-              //       this.setState({ menuloading: false })
-              //       return
-              //     }
-
-              //     Api.getSystemConfig(_param).then(res => {
-              //       if (!res.status) {
-              //         notification.warning({
-              //           top: 92,
-              //           message: res.message,
-              //           duration: 5
-              //         })
-              //         this.setState({ menuloading: false })
-              //         return
-              //       }
-    
-              //       new_open_edition[item.uuid] = res.open_edition || ''
-                    
-              //       resolve()
-              //     })
-              //   })
-              // } else {
-                Api.getSystemConfig(_param).then(res => {
-                  if (!res.status) {
-                    notification.warning({
-                      top: 92,
-                      message: res.message,
-                      duration: 5
-                    })
-                    this.setState({ menuloading: false })
-                    return
-                  }
-  
-                  new_open_edition[item.uuid] = res.open_edition || ''
-                  resolve()
-                })
-              // }
+                new_open_edition[item.uuid] = res.open_edition || ''
+                resolve()
+              })
             })
           })
           Promise.all(deffers).then(() => {
@@ -1075,55 +1022,11 @@
             }
           })
         }
-      }).then(res => { // 鎸夐挳鎴栬彍鍗曞垹闄�
-        if (!res) return
-
-        if (delButtons.length === 0) {
-          return { status: true, nonexec: true }
-        } else {
-          let appHomeId = sessionStorage.getItem('appHomeId')
-          let _param = {
-            func: 'sPC_MainMenu_Del',
-            MenuID: delButtons.filter(id => id !== appHomeId).join(',')
-          }
-          return Api.getSystemConfig(_param)
-        }
-      }).then(res => { // 鎸夐挳瑙i櫎鍐荤粨
-        if (!res) return
-        if (!res.status) {
-          notification.warning({
-            top: 92,
-            message: res.message,
-            duration: 5
-          })
-          return false
-        } else if (!res.nonexec) { // 鎵ц鍒犻櫎鍚庡埛鏂拌彍鍗曞垪琛�
-          this.getAppMenus()
-        }
-
-        let ids = thawButtons.filter(item => btnIds.indexOf(item) !== -1)
-        if (ids.length === 0) {
-          return { status: true }
-        } else {
-          return Api.getSystemConfig({
-            func: 'sPC_MainMenu_ReDel',
-            MenuID: ids.join(',')
-          })
-        }
       }).then(res => { // 椤甸潰淇濆瓨
         if (!res) return
 
-        if (res.status) {
-          return Api.getSystemConfig(param)
-        } else {
-          notification.warning({
-            top: 92,
-            message: res.message,
-            duration: 5
-          })
-          return false
-        }
-      }).then(res => { // 椤甸潰鎸夐挳鍏崇郴淇濆瓨
+        return Api.getSystemConfig(param)
+      }).then(res => {
         if (!res) return
 
         if (res.status) {
@@ -1132,122 +1035,6 @@
           this.setState({
             config,
             oriConfig: fromJS(config).toJS(),
-          })
-
-          if (btnParam.LText) {
-            return Api.getSystemConfig(btnParam)
-          } else {
-            return {
-              status: true
-            }
-          }
-        } else {
-          notification.warning({
-            top: 92,
-            message: res.message,
-            duration: 5
-          })
-          return false
-        }
-      }).then(res => { // 鎸夐挳澶嶅埗
-        if (!res) return
-        if (!res.status) {
-          notification.warning({
-            top: 92,
-            message: res.message,
-            duration: 5
-          })
-          return false
-        }
-
-        if (copyButtons.length === 0) {
-          return {
-            status: true
-          }
-        } else {
-          return new Promise(resolve => {
-            let deffers = copyButtons.map(item => {
-              return new Promise(resolve => {
-                if (btnIds.indexOf(item.uuid) === -1) { // 澶嶅埗鐨勬寜閽凡鍒犻櫎
-                  resolve({
-                    status: true
-                  })
-                  return
-                }
-
-                Api.getSystemConfig({
-                  func: 'sPC_Get_LongParam',
-                  MenuID: item.$originUuid
-                }).then(result => {
-                  if (result.status) {
-                    let _conf = ''
-              
-                    try {
-                      _conf = result.LongParam ? JSON.parse(window.decodeURIComponent(window.atob(result.LongParam))) : ''
-                    } catch (e) {
-                      console.warn('Parse Failure')
-                      _conf = ''
-                    }
-                    
-                    if (_conf) {
-                      _conf.components = MenuUtils.resetConfig(_conf.components)
-                      _conf.uuid = item.uuid
-                      _conf.MenuID = item.uuid
-                      _conf.Template = 'webPage'
-                    } else {
-                      resolve({
-                        status: true
-                      })
-                      return
-                    }
-
-                    let _param = {
-                      func: 'sPC_ButtonParam_AddUpt',
-                      ParentID: config.uuid,
-                      MenuID: item.uuid,
-                      MenuNo: '',
-                      Template: 'webPage',
-                      MenuName: item.label,
-                      PageParam: JSON.stringify({Template: 'webPage'}),
-                      LongParam: window.btoa(window.encodeURIComponent(JSON.stringify(_conf)))
-                    }
-            
-                    Api.getSystemConfig(_param).then(response => {
-                      resolve(response)
-                    })
-                  }
-                })
-              })
-            })
-            Promise.all(deffers).then(result => {
-              let error = null
-              result.forEach(response => {
-                if (!response.status) {
-                  error = response
-                }
-              })
-    
-              if (error) {
-                notification.warning({
-                  top: 92,
-                  message: error.message,
-                  duration: 5
-                })
-                resolve(false)
-              } else {
-                resolve({
-                  status: true
-                })
-              }
-            })
-          })
-        }
-      }).then(res => {
-        if (res && res.status) {
-          this.setState({
-            delButtons: [],
-            copyButtons: [],
-            thawButtons: [],
             menuloading: false,
             comloading: true
           }, () => {
@@ -1255,12 +1042,18 @@
               comloading: false
             })
           })
+
           notification.success({
             top: 92,
             message: '淇濆瓨鎴愬姛',
             duration: 2
           })
         } else {
+          notification.warning({
+            top: 92,
+            message: res.message,
+            duration: 5
+          })
           this.setState({
             menuloading: false
           })

--
Gitblit v1.8.0