From 95afd40fc2741ac0ce59c2091f6cfce1f98877d4 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 24 六月 2021 09:15:45 +0800
Subject: [PATCH] 2021-06-24

---
 src/views/pcdesign/index.jsx |  967 ++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 763 insertions(+), 204 deletions(-)

diff --git a/src/views/pcdesign/index.jsx b/src/views/pcdesign/index.jsx
index 7ae3739..584f7b0 100644
--- a/src/views/pcdesign/index.jsx
+++ b/src/views/pcdesign/index.jsx
@@ -1,38 +1,37 @@
 import React, { Component } from 'react'
 import { connect } from 'react-redux'
 import { DndProvider } from 'react-dnd'
+import { withRouter } from 'react-router'
 import { is, fromJS } from 'immutable'
 import moment from 'moment'
 import HTML5Backend from 'react-dnd-html5-backend'
-import { ConfigProvider, notification, Modal, Collapse, Switch, Button, Icon } from 'antd'
-// import html2canvas from 'html2canvas'
+import { ConfigProvider, notification, Modal, Collapse, Switch, Button, Icon, message, Spin } from 'antd'
 
 import Api from '@/api'
-// import options from '@/store/options.js'
-import Utils from '@/utils/utils.js'
+import Utils, { setGLOBFuncs } from '@/utils/utils.js'
 import zhCN from '@/locales/zh-CN/mob.js'
 import enUS from '@/locales/en-US/mob.js'
 import antdEnUS from 'antd/es/locale/en_US'
 import antdZhCN from 'antd/es/locale/zh_CN'
 import MKEmitter from '@/utils/events.js'
-import MenuUtils from '@/menu/utils/menuUtils.js'
+import MenuUtils from '@/utils/utils-custom.js'
 import asyncComponent from '@/utils/asyncComponent'
-import { modifyCustomMenu } from '@/store/action'
 
 import './index.scss'
 
 const { Panel } = Collapse
 const { confirm } = Modal
-const _locale = localStorage.getItem('lang') !== 'en-US' ? antdZhCN : antdEnUS
 
 const MenuForm = asyncComponent(() => import('./menuform'))
-const MenuShell = asyncComponent(() => import('@/menu/menushell'))
+const MenuShell = asyncComponent(() => import('@/pc/menushell'))
 const SourceWrap = asyncComponent(() => import('@/pc/modulesource'))
+const CreateView = asyncComponent(() => import('@/pc/createview'))
 const BgController = asyncComponent(() => import('@/pc/bgcontroller'))
+const Quotecomponent = asyncComponent(() => import('@/pc/quotecomponent'))
 const PasteController = asyncComponent(() => import('@/menu/pastecontroller'))
-const PaddingController = asyncComponent(() => import('@/pc/padcontroller'))
 const StyleController = asyncComponent(() => import('@/menu/stylecontroller'))
 const SysInterface = asyncComponent(() => import('@/menu/sysinterface'))
+const UrlFieldComponent = asyncComponent(() => import('@/menu/urlfieldcomponent'))
 const PictureController = asyncComponent(() => import('@/menu/picturecontroller'))
 const ModalController = asyncComponent(() => import('@/menu/modalconfig/controller'))
 const StyleCombController = asyncComponent(() => import('@/menu/stylecombcontroller'))
@@ -41,32 +40,38 @@
 
 sessionStorage.setItem('isEditState', 'true')
 sessionStorage.setItem('editMenuType', 'menu') // 缂栬緫鑿滃崟绫诲瀷
+sessionStorage.setItem('appType', 'pc')        // 搴旂敤绫诲瀷
+sessionStorage.setItem('typename', 'pc')
 document.body.className = ''
 window.GLOB.UserComponentMap = new Map() // 缂撳瓨鐢ㄦ埛鑷畾涔夌粍浠�
+window.GLOB.CacheIndependent = new Map()
+window.GLOB.urlFields = []               // url鍙橀噺
+window.GLOB.customMenu = null            // 淇濆瓨鑿滃崟淇℃伅
 
 class MenuDesign extends Component {
   state = {
-    dict: localStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
+    localedict: sessionStorage.getItem('lang') !== 'en-US' ? antdZhCN : antdEnUS,
+    dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
+    loading: true,
     MenuId: '',
     MenuName: '',
     MenuNo: '',
-    tableFields: [],
     delButtons: [],
     copyButtons: [],
     thawButtons: [],
     activeKey: 'basedata',
     menuloading: false,
     oriConfig: null,
-    openEdition: '',
     config: null,
     popBtn: null,             // 寮圭獥鏍囩椤�
     visible: false,
     customComponents: [],
-    settingshow: true,
-    controlshow: true,
+    settingshow: sessionStorage.getItem('settingshow') !== 'false',
+    controlshow: sessionStorage.getItem('controlshow') !== 'false',
   }
 
   UNSAFE_componentWillMount() {
+    if (this.props.memberLevel < 30) return
     try {
       let param = JSON.parse(window.decodeURIComponent(window.atob(this.props.match.params.param)))
 
@@ -74,15 +79,21 @@
         sessionStorage.setItem('appId', param.ID || '')
         sessionStorage.setItem('lang', param.lang || 'zh-CN')
         sessionStorage.setItem('kei_no', param.kei_no || '')
-        sessionStorage.setItem('link_type', param.link_type || 'true')
         sessionStorage.setItem('role_type', param.role_type || 'true')
         sessionStorage.setItem('login_types', param.login_types || 'true')
+
+        this.setState({
+          localedict: sessionStorage.getItem('lang') !== 'en-US' ? antdZhCN : antdEnUS,
+          dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS
+        })
+        this.getAppMessage()
       } else if (param.type === 'view') {
         this.setState({
           MenuId: param.MenuID
+        }, () => {
+          this.getMenuParam(param)
         })
       }
-      this.getAppMessage()
     } catch {
       notification.warning({
         top: 92,
@@ -92,20 +103,33 @@
     }
   }
 
+  UNSAFE_componentWillReceiveProps(nextProps) {
+    if (this.props.match.params.param !== nextProps.match.params.param) {
+      window.location.reload()
+    }
+  }
+
   shouldComponentUpdate (nextProps, nextState) {
     return !is(fromJS(this.state), fromJS(nextState))
   }
 
   componentDidMount () {
+    if (this.props.memberLevel < 30) {
+      document.getElementById('mk-pc-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('changePopview', this.initPopview)
+    MKEmitter.addListener('changeEditMenu', this.changeEditMenu)
     MKEmitter.addListener('submitComponentStyle', this.updateComponentStyle)
     MKEmitter.addListener('updateCustomComponent', this.updateCustomComponent)
     setTimeout(() => {
       this.updateCustomComponent()
       this.getAppPictures()
+      this.getSmStemp()
+      setGLOBFuncs()
     }, 1000)
   }
 
@@ -120,8 +144,37 @@
     MKEmitter.removeListener('thawButtons', this.thawButtons)
     MKEmitter.removeListener('copyButtons', this.copyButtons)
     MKEmitter.removeListener('changePopview', this.initPopview)
+    MKEmitter.removeListener('changeEditMenu', this.changeEditMenu)
     MKEmitter.removeListener('submitComponentStyle', this.updateComponentStyle)
     MKEmitter.removeListener('updateCustomComponent', this.updateCustomComponent)
+  }
+
+  changeEditMenu = (menu) => {
+    const { oriConfig, config } = this.state
+
+    if (!oriConfig || !is(fromJS(oriConfig), fromJS(config))) {
+      notification.warning({
+        top: 92,
+        message: '閰嶇疆淇℃伅鏈繚瀛橈紒',
+        duration: 5
+      })
+      return
+    }
+
+    let param = {
+      MenuID: menu.MenuID,
+      copyMenuId: menu.copyMenuId || '',
+      type: 'view'
+    }
+
+    param.MenuNo = menu.MenuNo || ''
+    param.MenuName = menu.MenuName || ''
+
+    param = window.btoa(window.encodeURIComponent(JSON.stringify(param)))
+
+    if (param === this.props.match.params.param) return
+
+    this.props.history.push('/pcdesign/' + param)
   }
 
   getAppMessage = () => {
@@ -129,7 +182,7 @@
       func: 's_get_keyids',
       bid: sessionStorage.getItem('appId')
     }).then(res => {
-      if (!res) {
+      if (!res.status) {
         notification.warning({
           top: 92,
           message: res.message,
@@ -139,67 +192,99 @@
       }
 
       let homeId = ''
-      if (this.state.MenuId) {
-        homeId = this.state.MenuId
-      } else {
-        let appViewList = []
-        if (res.data && res.data.length > 0) {
-          appViewList = res.data
-          appViewList.forEach(item => {
-            if (item.keys_type === 'index') {
-              homeId = item.keys_id
-            }
-          })
-        }
-
-        if (!homeId) {
-          homeId = Utils.getuuid()
-
-          let param = {
-            func: 's_kei_link_keyids_addupt',
-            BID: sessionStorage.getItem('appId'),
-            exec_type: 'y',
-            LText: ''
+      let appViewList = []
+      if (res.data && res.data.length > 0) {
+        appViewList = res.data
+        appViewList.forEach(item => {
+          if (item.keys_type === 'index') {
+            homeId = item.keys_id
           }
+        })
+      }
 
-          appViewList.unshift({
-            appkey: window.GLOB.appkey || '',
-            bid: sessionStorage.getItem('appId') || '',
-            kei_no: sessionStorage.getItem('kei_no') || '',
-            keys_id: homeId,
-            keys_type: 'index',
-            remark: '棣栭〉'
-          })
+      if (!homeId) {
+        homeId = Utils.getuuid()
 
-          param.LText = appViewList.map(item => `select '${item.keys_id}','${item.keys_type}','${item.kei_no}','${item.appkey}','${item.bid}','${sessionStorage.getItem('CloudUserID')}','${item.remark}'`)
-          param.LText = param.LText.join(' union all ')
-          param.LText = Utils.formatOptions(param.LText)
-    
-          param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
-          param.secretkey = Utils.encrypt('', param.timestamp)
-
-          Api.getSystemConfig(param).then(result => {
-            if (!result.status) {
-              notification.warning({
-                top: 92,
-                message: result.message,
-                duration: 5
-              })
-            }
-          })
+        let param = {
+          func: 's_kei_link_keyids_addupt',
+          BID: sessionStorage.getItem('appId'),
+          exec_type: 'y',
+          LText: ''
         }
 
+        appViewList.unshift({
+          appkey: window.GLOB.appkey || '',
+          bid: sessionStorage.getItem('appId') || '',
+          kei_no: sessionStorage.getItem('kei_no') || '',
+          keys_id: homeId,
+          keys_type: 'index',
+          remark: '棣栭〉'
+        })
+
+        param.LText = appViewList.map(item => `select '${item.keys_id}','${item.keys_type}','${item.kei_no}','${item.appkey}','${item.bid}','${sessionStorage.getItem('CloudUserID')}','${item.remark}'`)
+        param.LText = param.LText.join(' union all ')
+        param.LText = Utils.formatOptions(param.LText)
+  
+        param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
+        param.secretkey = Utils.encrypt('', param.timestamp)
+
+        Api.getSystemConfig(param).then(result => {
+          if (!result.status) {
+            notification.warning({
+              top: 92,
+              message: result.message,
+              duration: 5
+            })
+          } else {
+            sessionStorage.setItem('appViewList', JSON.stringify(appViewList))
+            sessionStorage.setItem('appHomeId', homeId)
+            this.props.history.replace('/pcdesign/' + window.btoa(window.encodeURIComponent(JSON.stringify({MenuID: homeId, type: 'view'}))))
+          }
+        })
+      } else {
         sessionStorage.setItem('appViewList', JSON.stringify(appViewList))
+        sessionStorage.setItem('appHomeId', homeId)
+        this.props.history.replace('/pcdesign/' + window.btoa(window.encodeURIComponent(JSON.stringify({MenuID: homeId, type: 'view'}))))
       }
-      this.props.history.replace('/pcdesign/' + window.btoa(window.encodeURIComponent(JSON.stringify({MenuID: homeId, type: 'view'}))))
-      
-      this.setState({MenuId: homeId}, () => {
-        this.getMenuParam()
-      })
+    })
+  }
+
+  getSmStemp = () => {
+    let _sql = `select ID,TemplateCode,SignName from (select * from bd_msn_sms_temp where deleted=0 and status=20 ) a 
+      inner join (select openid from sapp where id='${window.GLOB.appkey}') b
+      on a.openid=b.openid`
+
+    _sql = Utils.formatOptions(_sql)
+
+    let param = {
+      func: 'sPC_Get_SelectedList',
+      LText: _sql,
+      obj_name: 'data',
+      arr_field: 'ID,TemplateCode,SignName'
+    }
+    
+    param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
+    param.secretkey = Utils.encrypt(param.LText, param.timestamp)
+    param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp) // 浜戠鏁版嵁楠岃瘉
+    
+    Api.getSystemConfig(param).then(res => {
+      let msgs = []
+      if (!res.status) {
+        notification.warning({
+          top: 92,
+          message: res.message,
+          duration: 5
+        })
+      } else if (res.data) {
+        msgs = res.data
+      }
+      sessionStorage.setItem('msgTemplate', JSON.stringify(msgs))
     })
   }
 
   getAppPictures = () => {
+    if (sessionStorage.getItem('app_videos') || sessionStorage.getItem('app_pictures')) return
+
     Api.getSystemConfig({
       func: 's_url_db_adduptdel',
       PageIndex: 0,  // 0 浠h〃鍏ㄩ儴
@@ -209,6 +294,12 @@
     }).then(res => {
       if (res.status) {
         sessionStorage.setItem('app_pictures', JSON.stringify(res.data || []))
+      } else if (!res.status) {
+        notification.warning({
+          top: 92,
+          message: res.message,
+          duration: 5
+        })
       }
 
       Api.getSystemConfig({
@@ -220,6 +311,12 @@
       }).then(res => {
         if (res.status) {
           sessionStorage.setItem('app_videos', JSON.stringify(res.data || []))
+        } else if (!res.status) {
+          notification.warning({
+            top: 92,
+            message: res.message,
+            duration: 5
+          })
         }
       })
     })
@@ -228,10 +325,17 @@
   updateCustomComponent = () => {
     Api.getSystemConfig({
       func: 's_get_custom_components',
+      typename: 'pc',
       typecharone: ''
     }).then(res => {
       let coms = []
-      if (res.cus_list && res.cus_list.length > 0) {
+      if (!res.status) {
+        notification.warning({
+          top: 92,
+          message: res.message,
+          duration: 5
+        })
+      } else if (res.cus_list && res.cus_list.length > 0) {
         res.cus_list.forEach(item => {
           let config = ''
 
@@ -284,10 +388,10 @@
   }
 
   delButtons = (items) => {
-    const { copyButtons } = this.state
+    const { copyButtons, delButtons } = this.state
 
     this.setState({
-      delButtons: [...this.state.delButtons, ...items],
+      delButtons: [...delButtons, ...items],
       copyButtons: copyButtons.filter(item => !items.includes(item.uuid))
     })
   }
@@ -301,26 +405,23 @@
   }
 
   initPopview = (card, btn) => {
-    // const { oriConfig, config } = this.state
+    const { oriConfig, config } = this.state
 
-    // let _config = fromJS(config).toJS()
-    // delete _config.tableFields
+    if (!oriConfig || !is(fromJS(oriConfig), fromJS(config))) {
+      notification.warning({
+        top: 92,
+        message: '閰嶇疆淇℃伅鏈繚瀛橈紒',
+        duration: 5
+      })
+      return
+    }
 
-    // if (!is(fromJS(oriConfig), fromJS(_config))) {
-    //   notification.warning({
-    //     top: 92,
-    //     message: '閰嶇疆宸蹭慨鏀癸紝璇蜂繚瀛橈紒',
-    //     duration: 5
-    //   })
-    //   return
-    // }
+    btn.config = fromJS(config).toJS()
+    btn.component = card
 
-    // btn.config = _config
-    // btn.component = card
+    sessionStorage.setItem('editMenuType', 'popview') // 缂栬緫寮圭獥鏍囩
 
-    // sessionStorage.setItem('editMenuType', 'popview') // 缂栬緫寮圭獥鏍囩
-
-    // this.setState({popBtn: btn, visible: true})
+    this.setState({popBtn: btn, visible: true})
   }
 
   closeView = () => {
@@ -331,12 +432,9 @@
       return
     }
 
-    let _config = fromJS(config).toJS()
-    delete _config.tableFields
-
-    if (!is(fromJS(oriConfig), fromJS(_config))) {
+    if (!oriConfig || !is(fromJS(oriConfig), fromJS(config))) {
       confirm({
-        title: '閰嶇疆宸蹭慨鏀癸紝鏀惧純淇濆瓨鍚楋紵',
+        title: '閰嶇疆淇℃伅鏈繚瀛橈紝纭畾鍏抽棴鍚楋紵',
         content: '',
         onOk() {
           window.close()
@@ -348,17 +446,30 @@
     }
   }
 
-  getMenuParam = () => {
+  getMenuParam = (urlParam) => {
     const { MenuId } = this.state
 
     let param = {
       func: 'sPC_Get_LongParam',
+      TypeCharOne: sessionStorage.getItem('kei_no'),
+      typename: 'pc',
       MenuID: MenuId
     }
 
     Api.getSystemConfig(param).then(result => {
-      if (result.status) {
+      if (!result.status) {
+        notification.warning({
+          top: 92,
+          message: result.message,
+          duration: 5
+        })
+        this.setState({loading: false})
+        return
+      } else if (!result.LongParam && urlParam.copyMenuId) {
+        this.getCopyParam(urlParam)
+      } else {
         let config = null
+        let isCreate = false
 
         try {
           config = result.LongParam ? JSON.parse(window.decodeURIComponent(window.atob(result.LongParam))) : null
@@ -368,15 +479,15 @@
         }
 
         if (!config) {
+          isCreate = true
           config = {
             version: 1.0,
             uuid: MenuId,
             MenuID: MenuId,
             Template: 'webPage',
-            easyCode: '',
             enabled: false,
-            MenuName: '',
-            MenuNo: '',
+            MenuName: urlParam.MenuName || '',
+            MenuNo: urlParam.MenuNo || '',
             tables: [],
             components: [],
             viewType: 'menu',
@@ -388,21 +499,216 @@
         
         config.uuid = MenuId
         config.MenuID = MenuId
+        config.open_edition = result.open_edition || ''
+        window.GLOB.urlFields = config.urlFields || []
 
-        this.setState({
-          oriConfig: config,
-          config: fromJS(config).toJS(),
-          openEdition: result.open_edition || '',
+        let indeComs = []
+        config.components.forEach(item => {
+          if (item.type === 'navbar') {
+            indeComs.push(fromJS(item).toJS())
+          }
         })
 
-        this.props.modifyCustomMenu(config)
-      } else {
+        if (indeComs.length === 0) {
+          this.setState({
+            oriConfig: isCreate ? null : config,
+            config: fromJS(config).toJS(),
+            loading: false
+          })
+
+          window.GLOB.customMenu = config
+        } else {
+          this.jointComponents(config, indeComs, isCreate)
+        }
+      }
+    })
+    this.getAppMenus()
+  }
+
+  getAppMenus = () => {
+    let _param = {
+      func: 's_get_app_menus',
+      TypeCharOne: sessionStorage.getItem('kei_no'),
+      typename: 'pc',
+      LText: `select '${window.GLOB.appkey}'`,
+      timestamp: moment().format('YYYY-MM-DD HH:mm:ss')
+    }
+
+    _param.secretkey = Utils.encrypt(_param.LText, _param.timestamp)
+
+    Api.getSystemConfig(_param).then(res => {
+      if (!res.status) {
+        notification.warning({
+          top: 92,
+          message: res.message,
+          duration: 5
+        })
+        return
+      }
+
+      let appIndeList = sessionStorage.getItem('appViewList')
+      appIndeList = JSON.parse(appIndeList)
+      appIndeList = appIndeList.map(item => (item.keys_type !== 'index' ? item.keys_id : '')).join(',')
+
+      let menus = res.menus.filter(item => appIndeList.indexOf(item.MenuID) === -1)
+      sessionStorage.setItem('appMenus', JSON.stringify(menus))
+    })
+  }
+
+  getCopyParam = (urlParam) => {
+    const { MenuId } = this.state
+
+    let param = {
+      func: 'sPC_Get_LongParam',
+      TypeCharOne: sessionStorage.getItem('kei_no'),
+      typename: 'pc',
+      MenuID: urlParam.copyMenuId
+    }
+
+    Api.getSystemConfig(param).then(result => {
+      if (!result.status) {
         notification.warning({
           top: 92,
           message: result.message,
           duration: 5
         })
+        this.setState({loading: false})
+        return
+      } else if (!result.LongParam) {
+        notification.warning({
+          top: 92,
+          message: '鏈煡璇㈠埌澶嶅埗鑿滃崟閰嶇疆淇℃伅锛�',
+          duration: 5
+        })
       }
+
+      let config = null
+
+      try {
+        config = result.LongParam ? JSON.parse(window.decodeURIComponent(window.atob(result.LongParam))) : null
+      } catch (e) {
+        console.warn('Parse Failure')
+        config = null
+      }
+
+      
+      if (!config) {
+        config = {
+          version: 1.0,
+          uuid: MenuId,
+          MenuID: MenuId,
+          Template: 'webPage',
+          enabled: false,
+          MenuName: '',
+          MenuNo: '',
+          tables: [],
+          components: [],
+          viewType: 'menu',
+          style: {
+            backgroundColor: '#ffffff', backgroundImage: '', paddingLeft: '20px', paddingRight: '20px'
+          }
+        }
+      } else {
+        config.components = MenuUtils.resetConfig(config.components)
+        message.success('澶嶅埗鎴愬姛锛屼繚瀛樺悗鐢熸晥銆�')
+      }
+      
+      config.uuid = MenuId
+      config.MenuID = MenuId
+      config.open_edition = ''
+      config.MenuName = urlParam.MenuName || ''
+      config.MenuNo = urlParam.MenuNo || ''
+
+      let indeComs = []
+      config.components.forEach(item => {
+        if (item.type === 'navbar') {
+          indeComs.push(fromJS(item).toJS())
+        }
+      })
+
+      if (indeComs.length === 0) {
+        this.setState({
+          oriConfig: null,
+          config: fromJS(config).toJS(),
+          loading: false
+        })
+        window.GLOB.customMenu = config
+      } else {
+        this.jointComponents(config, indeComs, true)
+      }
+    })
+  }
+
+  jointComponents = (config, indeComs, isCreate) => {
+    let deffers = indeComs.map(item => {
+      return new Promise(resolve => {
+        Api.getSystemConfig({
+          func: 'sPC_Get_LongParam',
+          TypeCharOne: sessionStorage.getItem('kei_no'),
+          typename: 'pc',
+          MenuID: item.uuid
+        }).then(res => {
+          res.uuid = item.uuid
+
+          if (!res.status) {
+            notification.warning({
+              top: 92,
+              message: res.message,
+              duration: 5
+            })
+          }
+          
+          resolve(res)
+        })
+      })
+    })
+    Promise.all(deffers).then(result => {
+      let _conf = {}
+      result.forEach(res => {
+        let _config = null
+        try {
+          _config = res.LongParam ? JSON.parse(window.decodeURIComponent(window.atob(res.LongParam))) : null
+        } catch (e) {
+          console.warn('Parse Failure')
+          _config = null
+        }
+
+        if (_config) {
+          _config.open_edition = res.open_edition || ''
+          _conf[res.uuid] = _config
+          window.GLOB.CacheIndependent.set(res.uuid, fromJS(_config).toJS())
+        }
+      })
+
+      let _length = config.components.length
+      config.components = config.components.map(item => {
+        if (item.type === 'navbar') {
+          if (_conf[item.uuid]) {
+            item = _conf[item.uuid]
+          } else {
+            item = null
+          }
+        }
+        return item
+      })
+
+      config.components = config.components.filter(Boolean)
+
+      if (_length > config.components.length) {
+        notification.warning({
+          top: 92,
+          message: '閮ㄥ垎缁勪欢宸插垹闄わ紒',
+          duration: 5
+        })
+      }
+
+      this.setState({
+        oriConfig: isCreate ? null : fromJS(config).toJS(),
+        config: config,
+        loading: false
+      })
+
+      window.GLOB.customMenu = config
     })
   }
 
@@ -506,7 +812,7 @@
   }
 
   submitConfig = () => {
-    const { openEdition, delButtons, copyButtons, thawButtons } = this.state
+    const { delButtons, copyButtons, thawButtons } = this.state
     let config = fromJS(this.state.config).toJS()
 
     if (!config.MenuName || !config.MenuNo || (config.cacheUseful === 'true' && !config.cacheTime)) {
@@ -514,6 +820,11 @@
         top: 92,
         message: '璇峰畬鍠勮彍鍗曞熀鏈俊鎭紒',
         duration: 5
+      })
+      sessionStorage.setItem('settingshow', 'true')
+      this.setState({
+        settingshow: true,
+        activeKey: 'basedata'
       })
       return
     }
@@ -529,39 +840,33 @@
         config.enabled = false
       }
 
-      let _config = fromJS(config).toJS()
-      delete _config.tableFields
-
-      let parMenuId = 'pc' + sessionStorage.getItem('kei_no') + sessionStorage.getItem('lang')
+      let parMenuId = sessionStorage.getItem('kei_no') + 'pc' + sessionStorage.getItem('lang')
       let param = {
         func: 'sPC_TrdMenu_AddUpt',
         FstID: parMenuId,
         SndID: parMenuId,
         ParentID: parMenuId,
-        MenuID: _config.uuid,
-        MenuNo: _config.MenuNo || '',
-        EasyCode: _config.easyCode || '',
+        MenuID: config.uuid,
+        MenuNo: config.MenuNo || '',
+        EasyCode: '',
         Template: 'webPage',
-        MenuName: _config.MenuName || '',
+        TypeCharOne: sessionStorage.getItem('kei_no'),
+        Typename: 'pc',
+        MenuName: config.MenuName || '',
         PageParam: JSON.stringify({Template: 'webPage'}),
-        LongParam: window.btoa(window.encodeURIComponent(JSON.stringify(_config))),
+        open_edition: config.open_edition,
         LText: '',
         LTexttb: ''
       }
 
-      param.LText = Utils.formatOptions(param.LText)
       param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
-      param.secretkey = Utils.encrypt(param.LText, param.timestamp)
-
-      if (openEdition) { // 鐗堟湰绠$悊
-        param.open_edition = openEdition
-      }
+      param.secretkey = Utils.encrypt('', param.timestamp)
 
       let btnParam = {             // 娣诲姞鑿滃崟鎸夐挳
         func: 'sPC_Button_AddUpt',
         Type: 40,                  // 娣诲姞鑿滃崟涓嬬殑鎸夐挳type涓�40锛屾寜閽笅鐨勬寜閽畉ype涓�60
-        ParentID: _config.uuid,
-        MenuNo: _config.MenuNo,
+        ParentID: config.uuid,
+        MenuNo: config.MenuNo,
         Template: 'webPage',
         PageParam: '',
         LongParam: '',
@@ -578,42 +883,208 @@
       btnParam.secretkey = Utils.encrypt(btnParam.LText, btnParam.timestamp)
 
       new Promise(resolve => {
-        // html2canvas(document.getElementById('menu-shell-inner')).then(canvas => {
-        //   let _param = {
-        //     Base64Img: canvas.toDataURL('image/png') // 鑾峰彇鐢熸垚鐨勫浘鐗�
-        //   }
+        let _config = fromJS(config).toJS()
+        let indeComs = []
+        _config.components = _config.components.map(item => {
+          if (item.type === 'navbar') {
+            indeComs.push(item)
+            return {
+              type: 'navbar',
+              uuid: item.uuid
+            }
+          }
+          return item
+        })
 
-        //   _param.rduri = options.cloudServiceApi
-        //   _param.userid = sessionStorage.getItem('CloudUserID') || ''
-        //   _param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
+        param.LongParam = window.btoa(window.encodeURIComponent(JSON.stringify(_config)))
 
-        //   Api.fileuploadbase64(_param).then(result => {
-        //     if (result.status) {
-        //       let Images = Utils.getcloudurl(result.Images)
-        //       param.PageParam = JSON.stringify({Template: 'webPage', Images})
-        //       resolve(true)
-        //     } else {
-        //       notification.warning({
-        //         top: 92,
-        //         message: result.ErrMesg,
-        //         duration: 5
-        //       })
-        //       resolve(false)
-        //     }
-        //   })
-        // })
-        resolve(true)
-      }).then(res => { // 鎸夐挳鍒犻櫎
+        if (indeComs.length === 0) {
+          resolve(true)
+        } else {
+          let new_open_edition = {}
+          let deffers = indeComs.map(item => {
+            return new Promise(resolve => {
+              let _item = window.GLOB.CacheIndependent.get(item.uuid)
+              if (_item && is(fromJS(_item), fromJS(item))) {
+                new_open_edition[item.uuid] = item.open_edition || ''
+                resolve()
+                return
+              }
+
+              let _param = {
+                func: 'sPC_TrdMenu_AddUpt',
+                FstID: parMenuId,
+                SndID: parMenuId,
+                ParentID: parMenuId,
+                MenuID: item.uuid,
+                MenuNo: item.wrap.MenuNo || Utils.getuuid(),
+                EasyCode: '',
+                Template: item.type,
+                TypeCharOne: sessionStorage.getItem('kei_no'),
+                Typename: 'pc',
+                MenuName: item.name || '',
+                PageParam: JSON.stringify({Template: item.type}),
+                open_edition: item.open_edition || '',
+                LText: '',
+                LTexttb: ''
+              }
+
+              _param.LongParam = window.btoa(window.encodeURIComponent(JSON.stringify(item)))
+              _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 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()
+                })
+              }
+            })
+          })
+          Promise.all(deffers).then(() => {
+            let appViewList = sessionStorage.getItem('appViewList')
+            appViewList = JSON.parse(appViewList)
+            let _length = appViewList.length
+            let appIndeList = appViewList.map(item => item.keys_id).join(',')
+            
+
+            config.components = config.components.map(item => {
+              if (item.type === 'navbar') {
+                item.open_edition = new_open_edition[item.uuid] || ''
+                window.GLOB.CacheIndependent.set(item.uuid, fromJS(item).toJS())
+
+                if (appIndeList.indexOf(item.uuid) === -1) {
+                  appViewList.unshift({
+                    appkey: window.GLOB.appkey || '',
+                    bid: sessionStorage.getItem('appId') || '',
+                    kei_no: sessionStorage.getItem('kei_no') || '',
+                    keys_id: item.uuid,
+                    keys_type: 'navbar',
+                    remark: item.name
+                  })
+                }
+              }
+              return item
+            })
+
+            if (appViewList.length > _length) {
+              let kparam = {
+                func: 's_kei_link_keyids_addupt',
+                BID: sessionStorage.getItem('appId'),
+                exec_type: 'y',
+                LText: ''
+              }
+    
+              kparam.LText = appViewList.map(item => `select '${item.keys_id}','${item.keys_type}','${item.kei_no}','${item.appkey}','${item.bid}','${sessionStorage.getItem('CloudUserID')}','${item.remark}'`)
+              kparam.LText = kparam.LText.join(' union all ')
+              kparam.LText = Utils.formatOptions(kparam.LText)
+        
+              kparam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
+              kparam.secretkey = Utils.encrypt('', kparam.timestamp)
+    
+              Api.getSystemConfig(kparam).then(result => {
+                if (!result.status) {
+                  notification.warning({
+                    top: 92,
+                    message: result.message,
+                    duration: 5
+                  })
+                  this.setState({ menuloading: false })
+                } else {
+                  sessionStorage.setItem('appViewList', JSON.stringify(appViewList))
+                  resolve(true)
+                }
+              })
+            } else {
+              resolve(true)
+            }
+          })
+        }
+      }).then(res => { // 鎸夐挳鎴栬彍鍗曞垹闄�
         if (!res) return
 
         if (delButtons.length === 0) {
-          return {
-            status: true
-          }
+          return { status: true, nonexec: true }
         } else {
+          let appHomeId = sessionStorage.getItem('appHomeId')
           let _param = {
             func: 'sPC_MainMenu_Del',
-            MenuID: delButtons.join(',')
+            MenuID: delButtons.filter(id => id !== appHomeId).join(',')
           }
           return Api.getSystemConfig(_param)
         }
@@ -626,13 +1097,13 @@
             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
-          }
+          return { status: true }
         } else {
           return Api.getSystemConfig({
             func: 'sPC_MainMenu_ReDel',
@@ -656,9 +1127,10 @@
         if (!res) return
 
         if (res.status) {
+          config.open_edition = res.open_edition || ''
+
           this.setState({
-            oriConfig: fromJS(_config).toJS(),
-            openEdition: res.open_edition || ''
+            oriConfig: fromJS(config).toJS(),
           })
 
           if (btnParam.LText) {
@@ -730,7 +1202,7 @@
 
                     let _param = {
                       func: 'sPC_ButtonParam_AddUpt',
-                      ParentID: _config.uuid,
+                      ParentID: config.uuid,
                       MenuID: item.uuid,
                       MenuNo: '',
                       Template: 'webPage',
@@ -797,6 +1269,7 @@
   }
 
   getRoleFields = () => {
+    if (sessionStorage.getItem('sysRoles') || sessionStorage.getItem('permFuncField')) return
     Api.getSystemConfig({func: 'sPC_Get_Roles_sModular'}).then(res => {
       if (res.status) {
         let _permFuncField = []
@@ -843,25 +1316,44 @@
     const { config } = this.state
     let error = ''
 
-    config.components.forEach(item => {
-      if (error) return
-      if (['propcard', 'brafteditor', 'sandbox'].includes(item.subtype) && item.wrap.datatype === 'static') return
+    let check = (components) => {
+      components.forEach(item => {
+        if (error) return
+        if (item.type === 'tabs') {
+          item.subtabs.forEach(tab => {
+            check(tab.components)
+          })
+          return
+        } else if (item.type === 'group') {
+          check(item.components)
+          return
+        }
+        if (['propcard', 'brafteditor', 'sandbox', 'stepform'].includes(item.subtype) && item.wrap.datatype === 'static') return
+  
+        if (item.setting) {
+          if (item.setting.interType === 'system' && item.setting.execute !== 'false' && !item.setting.dataresource) {
+            error = `缁勪欢銆�${item.name}銆嬫湭璁剧疆鏁版嵁婧愶紒`
+          } else if (item.setting.interType === 'system' && item.setting.execute === 'false' && item.scripts.length === 0) {
+            error = `缁勪欢銆�${item.name}銆嬫湭璁剧疆鏁版嵁婧愶紒`
+          } else if (!item.setting.primaryKey) {
+            error = `缁勪欢銆�${item.name}銆嬫湭璁剧疆涓婚敭锛乣
+          }
+        }
+        if (item.type === 'bar' || item.type === 'line' || item.type === 'pie') {
+          if (!item.plot.Xaxis) {
+            error = `缁勪欢銆�${item.name}銆嬪浘琛ㄥ瓧娈靛皻鏈缃紒`
+          }
+        } else if (item.type === 'dashboard' && !item.plot.valueField) {
+          error = `缁勪欢銆�${item.name}銆嬫樉绀哄�煎皻鏈缃紒`
+        } else if (item.type === 'scatter' && (!item.plot.Xaxis || !item.plot.Yaxis || !item.plot.gender)) {
+          error = `缁勪欢銆�${item.name}銆嬪潗鏍囪酱灏氭湭璁剧疆锛乣
+        } else if (item.type === 'tree' && (!item.wrap.valueField || !item.wrap.labelField || !item.wrap.parentField)) {
+          error = `缁勪欢銆�${item.name}銆嬪熀鏈俊鎭皻鏈缃紒`
+        }
+      })
+    }
 
-      if (item.setting) {
-        if (item.setting.interType === 'system' && item.setting.execute !== 'false' && !item.setting.dataresource) {
-          error = `缁勪欢銆�${item.name}銆嬫湭璁剧疆鏁版嵁婧愶紒`
-        } else if (item.setting.interType === 'system' && item.setting.execute === 'false' && item.scripts.length === 0) {
-          error = `缁勪欢銆�${item.name}銆嬫湭璁剧疆鏁版嵁婧愶紒`
-        } else if (item.setting.interType && !item.setting.primaryKey) {
-          error = `缁勪欢銆�${item.name}銆嬫湭璁剧疆涓婚敭锛乣
-        }
-      }
-      if (item.type === 'bar' || item.type === 'line' || item.type === 'pie') {
-        if (!item.plot.Xaxis) {
-          error = `缁勪欢銆�${item.name}銆嬪浘琛ㄥ瓧娈靛皻鏈缃紒`
-        }
-      }
-    })
+    check(config.components)
 
     if (show && error) {
       notification.warning({
@@ -880,7 +1372,7 @@
       config: config
     })
 
-    this.props.modifyCustomMenu(config)
+    window.GLOB.customMenu = config
   }
 
   insert = (item) => {
@@ -889,36 +1381,101 @@
     config.components.push(item)
 
     this.setState({config})
-    this.props.modifyCustomMenu(config)
+    window.GLOB.customMenu = config
   }
 
-  /**
-   * @description 鏇存柊甯哥敤琛ㄤ俊鎭紝蹇嵎娣诲姞鍚庢洿鏂伴厤缃俊鎭�
-   */
-  updatetable = (config, fields) => {
-    const { tableFields } = this.state
+  refreshView = () => {
+    const { oriConfig, config } = this.state
 
-    config.tableFields = fields ? fields : tableFields
+    if (!oriConfig || !is(fromJS(oriConfig), fromJS(config))) {
+      notification.warning({
+        top: 92,
+        message: '閰嶇疆淇℃伅鏈繚瀛橈紒',
+        duration: 5
+      })
+      return
+    }
 
-    this.setState({
-      tableFields: fields ? fields : tableFields,
-      config
+    sessionStorage.removeItem('sysRoles')
+    sessionStorage.removeItem('permFuncField')
+    sessionStorage.removeItem('app_videos')
+    sessionStorage.removeItem('app_pictures')
+    
+    window.location.reload()
+  }
+
+  setHomeView = () => {
+    const { oriConfig, config } = this.state
+
+    if (!oriConfig || !is(fromJS(oriConfig), fromJS(config))) {
+      notification.warning({
+        top: 92,
+        message: '閰嶇疆淇℃伅鏈繚瀛橈紒',
+        duration: 5
+      })
+      return
+    }
+
+    let param = {
+      func: 's_kei_link_keyids_addupt',
+      BID: sessionStorage.getItem('appId'),
+      exec_type: 'y',
+      LText: ''
+    }
+
+    let appViewList = sessionStorage.getItem('appViewList')
+    appViewList = appViewList ? JSON.parse(appViewList) : []
+    appViewList = appViewList.filter(item => item.keys_type !== 'index')
+
+    appViewList.unshift({
+      appkey: window.GLOB.appkey || '',
+      bid: sessionStorage.getItem('appId') || '',
+      kei_no: sessionStorage.getItem('kei_no') || '',
+      keys_id: config.MenuID,
+      keys_type: 'index',
+      remark: config.MenuName
     })
 
-    this.props.modifyCustomMenu(config)
+    param.LText = appViewList.map(item => `select '${item.keys_id}','${item.keys_type}','${item.kei_no}','${item.appkey}','${item.bid}','${sessionStorage.getItem('CloudUserID')}','${item.remark}'`)
+    param.LText = param.LText.join(' union all ')
+    param.LText = Utils.formatOptions(param.LText)
+
+    param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
+    param.secretkey = Utils.encrypt('', param.timestamp)
+
+    confirm({
+      title: '纭畾璁剧疆鏈〉闈负棣栭〉鍚楋紵',
+      content: '',
+      onOk() {
+        Api.getSystemConfig(param).then(result => {
+          if (!result.status) {
+            notification.warning({
+              top: 92,
+              message: result.message,
+              duration: 5
+            })
+          } else {
+            sessionStorage.setItem('appHomeId', config.MenuID)
+            sessionStorage.setItem('appViewList', JSON.stringify(appViewList))
+          }
+        })
+      },
+      onCancel() {}
+    })
   }
 
   render () {
-    const { activeKey, settingshow, controlshow, dict, MenuId, config, menuloading, customComponents } = this.state
+    const { localedict, loading, activeKey, settingshow, controlshow, dict, MenuId, config, menuloading, customComponents } = this.state
 
     return (
-      <ConfigProvider locale={_locale}>
-        <div className={'mk-pc-view '} id="mk-menu-design-view">
+      <ConfigProvider locale={localedict}>
+        <div className={'mk-pc-view '} id="mk-pc-design-view">
+          {loading ? <Spin className="view-spin" size="large" /> : null}
           <DndProvider backend={HTML5Backend}>
             <div className={'menu-setting ' + (!settingshow ? 'hidden' : '')}>
               <div className="draw">
-                {settingshow ? <Icon onClick={() => this.setState({settingshow: false})} type="double-left" /> : null}
-                {!settingshow ? <Icon onClick={() => this.setState({settingshow: true})} type="double-right" /> : null}
+                {settingshow ? <Icon onClick={() => {sessionStorage.setItem('settingshow', 'false'); this.setState({settingshow: false})}} type="double-left" /> : null}
+                {!settingshow ? <Icon onClick={() => {sessionStorage.setItem('settingshow', 'true'); this.setState({settingshow: true})}} type="double-right" /> : null}
               </div>
               <div className="pc-setting-tools">
                 <Collapse accordion activeKey={activeKey} bordered={false} onChange={(key) => this.setState({activeKey: key})}>
@@ -931,8 +1488,9 @@
                       MenuId={MenuId}
                       updateConfig={this.updateConfig}
                     /> : null}
+                    {config ? <UrlFieldComponent config={config} updateConfig={this.updateConfig}/> : null}
                     {/* 琛ㄥ悕娣诲姞 */}
-                    {config ? <TableComponent config={config} updatetable={this.updatetable}/> : null}
+                    {config ? <TableComponent config={config} updatetable={this.updateConfig}/> : null}
                   </Panel>
                   {/* 缁勪欢娣诲姞 */}
                   <Panel header={dict['mob.component']} key="component">
@@ -941,27 +1499,28 @@
                   {customComponents && customComponents.length ? <Panel header="鑷畾涔夌粍浠�" key="cuscomponent">
                     <SourceWrap components={customComponents} />
                   </Panel> : null}
-                  <Panel header={'椤甸潰鑳屾櫙'} key="background">
+                  <Panel header={'椤甸潰鏍峰紡'} key="background">
                     {config ? <BgController config={config} updateConfig={this.updateConfig} /> : null}
-                  </Panel>
-                  <Panel header={'椤甸潰鍐呰竟璺�'} key="padding">
-                    {config ? <PaddingController config={config} updateConfig={this.updateConfig} /> : null}
                   </Panel>
                 </Collapse>
               </div>
             </div>
             <div className={'menu-control ' + (!controlshow ? 'hidden' : '')}>
               <div className="draw">
-                {controlshow ? <Icon onClick={() => this.setState({controlshow: false})} type="double-right" /> : null}
-                {!controlshow ? <Icon onClick={() => this.setState({controlshow: true})} type="double-left" /> : null}
+                {controlshow ? <Icon onClick={() => {sessionStorage.setItem('controlshow', 'false'); this.setState({controlshow: false})}} type="double-right" /> : null}
+                {!controlshow ? <Icon onClick={() => {sessionStorage.setItem('controlshow', 'true'); this.setState({controlshow: true})}} type="double-left" /> : null}
               </div>
               <Button type="primary" onClick={this.submitConfig} loading={menuloading}>{dict['mob.save']}</Button>
               <Switch className="big" checkedChildren={dict['mob.enable']} unCheckedChildren={dict['mob.disable']} checked={config && config.enabled} onChange={this.onEnabledChange} />
+              <CreateView resetmenu={this.getAppMenus} />
               <PasteController type="menu" Tab={null} insert={this.insert} />
               <StyleCombControlButton menu={config} />
               <SysInterface config={config} updateConfig={this.updateConfig}/>
               <PictureController/>
-              <Button type="default" onClick={this.closeView}>{dict['mob.return']}</Button>
+              <Quotecomponent config={config} updateConfig={this.updateConfig}/>
+              <Button className="mk-border-green" icon="home" onClick={this.setHomeView}>璁句负棣栭〉</Button>
+              <Button className="mk-border-danger" icon="redo" onClick={this.refreshView}>寮哄埗鍒锋柊</Button>
+              <Button type="default" onClick={this.closeView}>鍏抽棴</Button>
             </div>
             <div className={'menu-body ' + (menuloading ? 'saving' : '')}>
               {config && config.components ? <MenuShell menu={config} handleList={this.updateConfig} /> : null}
@@ -976,14 +1535,14 @@
   }
 }
 
-const mapStateToProps = () => {
-  return {}
-}
-
-const mapDispatchToProps = (dispatch) => {
+const mapStateToProps = (state) => {
   return {
-    modifyCustomMenu: (customMenu) => dispatch(modifyCustomMenu(customMenu))
+    memberLevel: state.memberLevel
   }
 }
 
-export default connect(mapStateToProps, mapDispatchToProps)(MenuDesign)
\ No newline at end of file
+const mapDispatchToProps = () => {
+  return {}
+}
+
+export default withRouter(connect(mapStateToProps, mapDispatchToProps)(MenuDesign))
\ No newline at end of file

--
Gitblit v1.8.0