From 31ec63f0419895876cbaba99637a884a32d33d0d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 01 九月 2021 10:31:45 +0800
Subject: [PATCH] 2021-09-01

---
 src/components/header/index.jsx | 1091 ++++++++++++++++++++++++++++++--------------------------
 1 files changed, 580 insertions(+), 511 deletions(-)

diff --git a/src/components/header/index.jsx b/src/components/header/index.jsx
index a9b4cb6..1485833 100644
--- a/src/components/header/index.jsx
+++ b/src/components/header/index.jsx
@@ -4,24 +4,19 @@
 import {connect} from 'react-redux'
 import { is, fromJS } from 'immutable'
 import moment from 'moment'
-import { Dropdown, Menu, Icon, Modal, Form, notification, Switch, Button, Input, Badge } from 'antd'
+import { Dropdown, Menu, Icon, Modal, Form, notification, Switch, Input, Badge } from 'antd'
 
-import asyncComponent from '@/utils/asyncComponent'
 import {
   toggleCollapse,
+  modifyMenuTree,
   modifyMainMenu,
   modifyTabview,
-  resetState,
-  resetDebug,
-  resetEditState,
-  resetEditLevel,
-  initPermission,
-  modifyDataManager,
   initActionPermission,
   initMenuPermission,
   logout
 } from '@/store/action'
 import Api from '@/api'
+import MKEmitter from '@/utils/events.js'
 import options from '@/store/options.js'
 import zhCN from '@/locales/zh-CN/main.js'
 import enUS from '@/locales/en-US/main.js'
@@ -31,41 +26,37 @@
 import LoginForm from './loginform'
 import './index.scss'
 
-const EditMenu = asyncComponent(() => import('@/templates/headerconfig'))
 const { confirm } = Modal
 const { Search } = Input
 
 class Header extends Component {
   static propTpyes = {
-    collapse: PropTypes.bool,
-    mainMenu: PropTypes.oneOfType([
-      PropTypes.string,
-      PropTypes.object
-    ])
+    collapse: PropTypes.bool
   }
   state = {
     menulist: null, // 涓�绾ц彍鍗�
     visible: false, // 淇敼瀵嗙爜妯℃�佹
-    dict: localStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
+    dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
     confirmLoading: false,
     userName: sessionStorage.getItem('User_Name'),
     logourl: window.GLOB.mainlogo,
     loginVisible: false,
     loginLoading: false,
-    avatar: avatar,
+    avatar: Utils.getrealurl(sessionStorage.getItem('avatar')),
     systems: [],
     searchkey: '',
     thdMenuList: [],
     oriVersion: '',
-    newVersion: ''
+    newVersion: '',
+    debug: sessionStorage.getItem('debug') === 'true',
+    navBar: ['linkage_navigation', 'linkage', 'menu_board', 'menu_board_navigation'].includes(window.GLOB.navBar) ? 'topmenu' : '',
+    menuType: window.GLOB.navBar
   }
 
   handleCollapse = () => {
     // 灞曞紑銆佹敹璧峰乏渚ц彍鍗曟爮
-    if (!this.props.editState) {
-      this.props.toggleCollapse(!this.props.collapse)
-      localStorage.setItem('collapse', !this.props.collapse)
-    }
+    this.props.toggleCollapse(!this.props.collapse)
+    localStorage.setItem('collapse', !this.props.collapse)
   }
 
   changePassword = () => {
@@ -80,42 +71,37 @@
       this.setState({
         confirmLoading: true
       })
-      this.resetPwdSubmitexec(res)
+
+      let _param = {
+        func: 's_PwdUpt',
+        LText: `select '${res.originpwd}','${res.password}'`
+      }
+      
+      _param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')          // 鏃堕棿鎴�
+      _param.LText = Utils.formatOptions(_param.LText)                   // 鍏抽敭瀛楃鏇挎崲锛宐ase64鍔犲瘑
+      _param.secretkey = Utils.encrypt(_param.LText, _param.timestamp)   // md5瀵嗛挜
+  
+      Api.getSystemConfig(_param).then(result => {
+        this.setState({
+          visible: !result.status,
+          confirmLoading: false
+        })
+
+        if (result.status) {
+          notification.success({
+            top: 92,
+            message: this.state.dict['main.password.resetsuccess'],
+            duration: 2
+          })
+        } else {
+          notification.warning({
+            top: 92,
+            message: result.message,
+            duration: 5
+          })
+        }
+      })
     }, () => {})
-  }
-
-  async resetPwdSubmitexec (param) {
-    let _param = {
-      func: 's_PwdUpt',
-      LText: `select '${param.originpwd}','${param.password}'`
-    }
-    
-    _param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')          // 鏃堕棿鎴�
-    _param.LText = Utils.formatOptions(_param.LText)                   // 鍏抽敭瀛楃鏇挎崲锛宐ase64鍔犲瘑
-    _param.secretkey = Utils.encrypt(_param.LText, _param.timestamp)   // md5瀵嗛挜
-
-    let result = await Api.getSystemConfig(_param) // 鍙栨秷淇敼鏈湴瀵嗙爜锛屽彧淇敼鍗曠偣鏈嶅姟鍣�
-
-    if (result.status) {
-      this.setState({
-        visible: false,
-        confirmLoading: false
-      })
-      notification.success({
-        top: 92,
-        message: this.state.dict['main.password.resetsuccess'],
-        duration: 2
-      })
-    } else {
-      notification.warning({
-        top: 92,
-        message: result.message,
-        duration: 5
-      })
-      this.setState({
-        confirmLoading: false
-      })
-    }
   }
 
   handleCancel = () => {
@@ -142,92 +128,29 @@
 
   changeMenu (value) {
     // 涓昏彍鍗曞垏鎹�
-    if (this.props.editState && this.props.editLevel) {
-      // 缂栬緫鐘舵�佷笅锛屼笉鍙垏鎹㈣彍鍗�
-      return
-    }
-    if (value.PageParam.OpenType === 'menu') {
+    if (value.OpenType === 'outpage' && value.linkUrl) {
+      window.open(value.linkUrl)
+    } else if (value.OpenType === 'menu') {
       this.props.modifyMainMenu(value)
-    } else {
-      window.open('#/' + value.PageParam.linkUrl + '/')
     }
   }
 
-  async loadmenu () {
-    // 鑾峰彇涓昏彍鍗�
-    let _param = {func: 'sPC_Get_MainMenu', systemType: options.sysType}
-    if (sessionStorage.getItem('isEditState') === 'true') { // 缂栬緫鐘舵�佹椂锛岃幏鍙栦竴绾ц彍鍗曪紝澧炲姞鍙傛暟debug
-      _param.debug = 'Y'
-    }
-    if (options.sysType !== 'cloud' && window.GLOB.systemType !== 'production') {
-      _param.linkurl = window.GLOB.linkurl
-    }
-
-    let result = await Api.getSystemConfig(_param)
-
-    // 鐧诲綍瓒呮椂
-    if (!result) return
-
-    if (result.status) {
-      if (result.debug === 'true') { // 鏄惁涓篸ebug妯″紡锛屽嵆鍙鍒惰彍鍗曞弬鏁�
-        this.props.resetDebug()
-      }
-
-      let MainMenuId = sessionStorage.getItem('MainMenu') // 鏄惁涓烘墦寮�鏂伴〉闈�
-      if (MainMenuId) {
-        // 閫氳繃url涓璵enuid绛涢�夊嚭閫変腑鐨勪富鑿滃崟
-        let _menu = result.data.filter(item => item.MenuID === MainMenuId)[0]
-        sessionStorage.removeItem('MainMenu')
-        this.props.modifyMainMenu(_menu || result.data[0])
-      } else {
-        this.props.modifyMainMenu(result.data[0])
-      }
-
-      this.setState({
-        menulist: result.data.map((item, index) => {
-          item.id = index
-          item.text = item.MenuName
-          if (item.PageParam) {
-            try {
-              item.PageParam = JSON.parse(item.PageParam)
-            } catch (e) {
-              item.PageParam = {OpenType: 'menu', linkUrl: ''}
-            }
-          } else {
-            item.PageParam = {OpenType: 'menu', linkUrl: ''}
-          }
-          return item
-        }),
-        systems: result.Systems.filter(sys => sys.LinkUrl1 && sys.AppKey !== window.GLOB.appkey)
-      })
-
-      if (result.dataM) {
-        this.props.modifyDataManager(true)
-      }
-    } else {
-      notification.error({
-        top: 92,
-        message: result.message,
-        duration: 10
-      })
-    }
-  }
-
-  async getRolesMenu () {
+  getRolesMenu () {
     // 鑾峰彇瑙掕壊鏉冮檺
-    let promiseRole = new Promise(resolve => {
-      Api.getSystemConfig({func: 'sPC_Get_RolesMenu'}).then(result => {
-        let _permAction = {}
-        let _permRoles = []
-        if (result && result.status) {
-          if (result.UserRoles) {
-            result.UserRoles.forEach(role => {
-              _permRoles.push(role.RoleID)
+    let roledefer = new Promise(resolve => {
+      // edition_type 鎺ュ彛鐗堟湰鎺у埗 ''銆�'Y'銆�'A'
+      Api.getSystemConfig({
+        func: 's_Get_TrdMenu_Role',
+        edition_type: 'A',
+        pro_sys: window.GLOB.systemType === 'production' ? 'Y' : ''
+      }).then(result => {
+        let _permAction = {loaded: true} // 鎸夐挳鏉冮檺
 
-              role.RoleMenu.forEach(menu => {
-                if (!menu.MenuID) return
-                _permAction[menu.MenuID] = true
-              })
+        if (result && result.status) {
+          if (result.UserRoles_Menu) {
+            result.UserRoles_Menu.forEach(menu => {
+              if (!menu.MenuID) return
+              _permAction[menu.MenuID] = true
             })
           }
         } else if (result) {
@@ -238,179 +161,236 @@
           })
         }
 
-        resolve({permAction: _permAction, permRoles: _permRoles})
+        this.props.initActionPermission(_permAction)
+        resolve()
       })
     })
-    
+
     // 鑾峰彇涓昏彍鍗曞弬鏁�
-    let promiseMenu = new Promise(resolve => {
-      let _param = {func: 'sPC_Get_MainMenu', systemType: options.sysType}
-      if (options.sysType !== 'cloud' && window.GLOB.systemType !== 'production') {
-        _param.linkurl = window.GLOB.linkurl
-      }
-
+    let menudefer = new Promise(resolve => {
+      let _param = {func: 's_get_pc_menus', systemType: options.sysType}
+      _param.pro_sys = window.GLOB.systemType === 'production' ? 'Y' : ''
+      
       Api.getSystemConfig(_param).then(result => {
-        let mainMenu = null
-        if (result && result.status) {
-          if (result.debug === 'true') { // 鏄惁涓篸ebug妯″紡锛屽嵆鍙鍒惰彍鍗曞弬鏁�
-            this.props.resetDebug()
-          }
-    
-          let MainMenuId = sessionStorage.getItem('MainMenu') // 鏄惁涓烘墦寮�鏂伴〉闈�
-          if (MainMenuId) {
-            // 閫氳繃url涓璵enuid绛涢�夊嚭閫変腑鐨勪富鑿滃崟
-            let _menu = result.data.filter(item => item.MenuID === MainMenuId)[0]
-            sessionStorage.removeItem('MainMenu')
-            mainMenu = _menu || result.data[0]
-          } else {
-            mainMenu = result.data[0]
-          }
-    
-          this.setState({
-            menulist: result.data.map((item, index) => {
-              item.id = index
-              item.text = item.MenuName
-              if (item.PageParam) {
-                try {
-                  item.PageParam = JSON.parse(item.PageParam)
-                } catch (e) {
-                  item.PageParam = {OpenType: 'menu', linkUrl: ''}
-                }
-              } else {
-                item.PageParam = {OpenType: 'menu', linkUrl: ''}
-              }
-              return item
-            }),
-            systems: result.Systems.filter(sys => sys.LinkUrl1 && sys.AppKey !== window.GLOB.appkey)
-          })
-
-          if (result.dataM) {
-            this.props.modifyDataManager(true)
-          }
-        } else if (result) {
+        if (!result.status) {
           notification.error({
             top: 92,
             message: result.message,
             duration: 10
           })
+          return
         }
 
-        resolve(mainMenu)
+        const { menulist, thdMenuList } = this.getMenulist(result)
+
+        this.setState({
+          menulist,
+          thdMenuList,
+          systems: window.GLOB.systemType === 'production' || options.sysType === 'SSO' ? (result.sys_list || []) : []
+        })
+        
+        let mainMenu = menulist[0] || ''
+        let _menu = null
+
+        if (mainMenu === '') { // 鏄惁鏄剧ず渚ц竟鏍忔帶鍒�
+          let _url = window.location.href.split('#')[0]
+          localStorage.setItem(_url + '-sideHidden', 'true')
+        } else {
+          let _url = window.location.href.split('#')[0]
+          localStorage.removeItem(_url + '-sideHidden')
+        }
+
+        if (sessionStorage.getItem('ThirdMenu')) { // 鏄惁涓烘墦寮�鏂伴〉闈�
+          let ThirdMenuId = sessionStorage.getItem('ThirdMenu')
+          _menu = thdMenuList.filter(item => item.MenuID === ThirdMenuId)[0] // 閫氳繃url涓璵enuid绛涢�夊嚭閫変腑鐨勪富鑿滃崟
+
+          if (_menu) {
+            mainMenu = menulist.filter(item => item.MenuID === _menu.FstId)[0]
+            mainMenu = fromJS(mainMenu).toJS()
+            mainMenu.openId = _menu.ParentId
+          }
+
+          sessionStorage.removeItem('ThirdMenu')
+        }
+
+        this.props.modifyMenuTree(menulist)
+        this.props.modifyMainMenu(mainMenu)
+        this.props.initMenuPermission([...thdMenuList, {MenuID: 'home_page_id', EasyCode: '', MenuName: 'home', type: 'CustomPage'}])
+
+        resolve(_menu)
       })
     })
     
-    let _mainMenu = await promiseMenu
-    if (_mainMenu) {
-      this.props.modifyMainMenu(_mainMenu)
-    }
+    Promise.all([roledefer, menudefer]).then(response => {
+      if (response[1]) {
+        let tabs = fromJS(this.props.tabviews).toJS()
+        let menu = fromJS(response[1]).toJS()
 
-    let _role = await promiseRole
+        if (this.state.navBar === 'topmenu') {
+          menu.selected = true
+          this.props.modifyTabview([menu])
+        } else {
+          tabs = tabs.map(tab => {
+            tab.selected = false
+            return tab
+          })
 
-    this.props.initActionPermission(_role.permRoles, _role.permAction)
-  }
-
-  reload = () => {
-    this.setState({
-      menulist: null
+          menu.selected = true
+          tabs.push(menu)
+          this.props.modifyTabview(tabs)
+        }
+      }
     })
-    this.loadmenu()
   }
 
-  changeEditState = (state) => {
-    const { menulist } = this.state
+  getMenulist = (result) => {
+    let thdMenuList = []
+    let iframes = ['Main/Index', 'bda/rdt', 'Home/rdt']
+    let menulist = []
+    result.fst_menu && result.fst_menu.forEach(fst => {
+      let fstItem = {
+        MenuID: fst.MenuID,
+        MenuName: fst.MenuName,
+        OpenType: 'menu',
+        children: []
+      }
+      if (fst.PageParam) {
+        try {
+          fstItem.PageParam = JSON.parse(fst.PageParam)
+        } catch (e) {
+          fstItem.PageParam = null
+        }
+        if (fstItem.PageParam && fstItem.PageParam.OpenType === 'outpage' && fstItem.PageParam.linkUrl) {
+          fstItem.OpenType = 'outpage'
+          fstItem.linkUrl = fstItem.PageParam.linkUrl
+        }
+      }
 
-    if (!state) { // 閫�鍑虹紪杈戯紝椤甸潰鍒锋柊
-      window.location.reload()
-      return
-    }
+      if (fst.snd_menu) {
+        fstItem.children = fst.snd_menu.map(snd => {
+          let sndItem = {
+            ParentId: fst.MenuID,
+            MenuID: snd.MenuID,
+            MenuName: snd.MenuName,
+            PageParam: {Icon: 'folder'},
+            children: []
+          }
 
+          if (snd.PageParam) {
+            try {
+              sndItem.PageParam = JSON.parse(snd.PageParam)
+            } catch (e) {
+              sndItem.PageParam = {Icon: 'folder'}
+            }
+          }
+
+          let msg = {
+            UserID: sessionStorage.getItem('UserID'),
+            LoginUID: sessionStorage.getItem('LoginUID'),
+            User_Name: sessionStorage.getItem('User_Name'),
+            Full_Name: sessionStorage.getItem('Full_Name'),
+            Member_Level: sessionStorage.getItem('Member_Level'),
+            dataM: sessionStorage.getItem('dataM'),
+            avatar: sessionStorage.getItem('avatar'),
+            debug: sessionStorage.getItem('debug'),
+            role_id: sessionStorage.getItem('role_id'),
+            mainlogo: window.GLOB.mainlogo,
+            navBar: window.GLOB.navBar || '',
+            mstyle: window.GLOB.style
+          }
+
+          if (snd.trd_menu) {
+            sndItem.children = snd.trd_menu.map(trd => {
+              let trdItem = {
+                FstId: fst.MenuID,
+                ParentId: snd.MenuID,
+                MenuID: trd.MenuID,
+                MenuName: trd.MenuName,
+                ParentNames: [fst.MenuName, snd.MenuName],
+                MenuNo: trd.MenuNo,
+                EasyCode: trd.EasyCode,
+                type: 'CommonTable',
+                OpenType: 'newtab',
+                hidden: 'false'
+              }
+  
+              if (trd.LinkUrl && iframes.includes(trd.LinkUrl.split('?')[0])) {
+                trdItem.type = 'iframe'
+                trdItem.LinkUrl = trd.LinkUrl.replace('&amp;', '&')
+              } else {
+                try {
+                  trdItem.PageParam = trd.PageParam ? JSON.parse(trd.PageParam) : {OpenType: 'newtab'}
+                } catch (e) {
+                  trdItem.PageParam = {OpenType: 'newtab'}
+                }
+
+                trdItem.type = trdItem.PageParam.Template || trdItem.type
+                trdItem.OpenType = trdItem.PageParam.OpenType || trdItem.OpenType
+                trdItem.hidden = trdItem.PageParam.hidden || trdItem.hidden
+
+                if (trdItem.type === 'NewPage') {
+                  trdItem.src = trdItem.PageParam.url || ''
+                  
+                  if (trdItem.src.indexOf('paramsmain/') > -1) {
+                    try {
+                      let _url = trdItem.src.split('paramsmain/')[0] + 'paramsmain/'
+                      let _param = JSON.parse(window.decodeURIComponent(window.atob(trdItem.src.split('paramsmain/')[1])))
+                      _param.UserID = sessionStorage.getItem('UserID')
+                      _param.LoginUID = sessionStorage.getItem('LoginUID')
+                      _param.User_Name = sessionStorage.getItem('User_Name')
+                      _param.Full_Name = sessionStorage.getItem('Full_Name')
+
+                      trdItem.src = _url + window.btoa(window.encodeURIComponent(JSON.stringify(_param)))
+                    } catch (e) {
+                      console.warn('鑿滃崟鍙傛暟瑙f瀽閿欒锛�')
+                    }
+                  }
+                } else {
+                  // 鎵撳紑鏂伴〉闈㈤摼鎺�
+                  trdItem.src = '#/paramsmain/' + window.btoa(window.encodeURIComponent(JSON.stringify({
+                    ...msg,
+                    ThirdMenu: trd.MenuID
+                  })))
+                }
+              }
+
+              thdMenuList.push(trdItem)
+
+              return trdItem
+            })
+          }
+
+          sndItem.children = sndItem.children.filter(item => item.hidden !== 'true')
+
+          return sndItem
+        })
+      }
+
+      menulist.push(fstItem)
+    })
+
+    return { menulist, thdMenuList }
+  }
+
+  changeEditState = () => {
     // 淇敼缂栬緫鐘舵��
     let UserID = sessionStorage.getItem('CloudUserID')
     let LoginUID = sessionStorage.getItem('CloudLoginUID')
-
-    if (state && (!UserID || !LoginUID)) {
+    
+    if (!UserID || !LoginUID) {
       this.setState({
         loginVisible: true
       })
     } else {
-      sessionStorage.setItem('isEditState', state)
-      let _userName = sessionStorage.getItem('User_Name')
-      let _avatar = avatar
+      sessionStorage.setItem('role_id', sessionStorage.getItem('cloudRole_id'))
+      sessionStorage.setItem('dataM', sessionStorage.getItem('cloudDataM'))
+      sessionStorage.setItem('isEditState', 'true')
 
-      if (!state && sessionStorage.getItem('avatar')) {
-        _avatar = Utils.getrealurl(sessionStorage.getItem('avatar')) // 澶村儚
-      } else if (state && sessionStorage.getItem('CloudAvatar')) {
-        _avatar = Utils.getrealurl(sessionStorage.getItem('CloudAvatar')) // 澶村儚
-      }
+      this.props.modifyMenuTree([])
+      this.props.modifyMainMenu(null)
+      this.props.modifyTabview([])
 
-      if (state) {
-        _userName = sessionStorage.getItem('CloudUserName')
-      }
-
-      if (window.GLOB.systemType === 'production' && state) {
-        this.props.resetEditLevel('HS')
-        this.props.modifyMainMenu({
-          MenuID: 'systemManageView'
-        })
-
-        this.setState({
-          userName: _userName,
-          avatar: _avatar
-        })
-        this.props.resetEditState(state)
-
-        return
-      } else if (window.GLOB.systemType === 'production' && !state) {
-        this.props.resetEditLevel(false)
-        this.props.modifyMainMenu(menulist[0] || '')
-
-        this.setState({
-          userName: _userName,
-          avatar: _avatar
-        })
-        this.props.resetEditState(state)
-
-        return
-      }
-
-      this.setState({
-        menulist: null,
-        userName: _userName,
-        avatar: _avatar
-      })
-      this.loadmenu()
-      this.props.modifyMainMenu('')
-      this.props.resetEditState(state)
-    }
-
-    if (state && this.props.sysRoles.length === 0 && this.props.permFuncField.length === 0 && window.GLOB.systemType !== 'production') {
-      Api.getSystemConfig({func: 'sPC_Get_Roles_sModular'}).then(res => {
-        if (res.status) {
-          let _permFuncField = []
-          let _sysRoles = []
-
-          if (res.Roles && res.Roles.length > 0) {
-            _sysRoles = res.Roles.map(role => {
-              return {
-                uuid: Utils.getuuid(),
-                value: role.RoleID,
-                text: role.RoleName
-              }
-            })
-          }
-
-          if (res.sModular && res.sModular.length > 0) {
-            res.sModular.forEach(field => {
-              if (field.ModularNo) {
-                _permFuncField.push(field.ModularNo)
-              }
-            })
-            _permFuncField = _permFuncField.sort()
-          }
-
-          this.props.initPermission(_sysRoles, _permFuncField)
-        }
-      })
+      this.props.history.replace('/design')
     }
   }
 
@@ -426,41 +406,25 @@
           sessionStorage.setItem('CloudUserName', res.UserName)
           sessionStorage.setItem('CloudFullName', res.FullName)
           sessionStorage.setItem('CloudAvatar', res.icon)
+          sessionStorage.setItem('cloudDataM', res.dataM ? 'true' : '')
+          sessionStorage.setItem('cloudRole_id', res.role_id || '')
+
+          sessionStorage.setItem('role_id', res.role_id || '')
+          sessionStorage.setItem('dataM', res.dataM ? 'true' : '')
           sessionStorage.setItem('isEditState', 'true')
 
-          let _avatar = avatar
-          if (res.icon) {
-            _avatar = Utils.getrealurl(res.icon) // 澶村儚
-          }
+          this.setSystemFuncs()
 
-          if (window.GLOB.systemType === 'production') {
-            this.props.resetEditLevel('HS')
-            this.props.modifyMainMenu({
-              MenuID: 'systemManageView'
-            })
-    
-            this.setState({
-              loginVisible: false,
-              loginLoading: false,
-              userName: res.UserName,
-              avatar: _avatar
-            })
-            this.props.resetEditState(true)
-    
-            return
-          }
+          this.props.modifyMenuTree([])
+          this.props.modifyMainMenu(null)
+          this.props.modifyTabview([])
 
-          this.setState({
-            menulist: null,
-            loginVisible: false,
-            loginLoading: false,
-            userName: res.UserName,
-            avatar: _avatar
-          })
-          this.loadmenu()
-          this.props.modifyMainMenu('')
-          this.props.resetEditState(true)
+          this.props.history.replace('/design')
         } else {
+          if (res.message.indexOf('瀵嗙爜閿欒') > -1) {
+            const input = document.getElementById('password')
+            input && input.select()
+          }
           this.setState({
             loginLoading: false
           })
@@ -474,44 +438,135 @@
     })
   }
 
-  enterEdit = () => {
-    // 杩涘叆缂栬緫鐘舵��
-    this.props.resetEditLevel('level1')
-  }
-
-  enterEditManage = () => {
-    const { editLevel } = this.props
-
-    if (editLevel === 'HS')  return
-
-    this.props.resetEditLevel('HS')
-    this.props.modifyMainMenu({
-      MenuID: 'systemManageView'
+  setSystemFuncs = () => {
+    if (!window.GLOB.WebSql && !window.GLOB.IndexDB) {
+      return
+    }
+    this.getfuncTime().then(res => {
+      Api.getSystemFuncs(res.createDate).then(result => {
+        if (!result.status) {
+          notification.error({
+            top: 92,
+            message: result.message,
+            duration: 10
+          })
+          return
+        } else if (result.func_detail && result.func_detail.length > 0) {
+          this.writeFuncs(result.func_detail)
+        }
+      })
     })
   }
 
-  /**
-   * @description 閫�鍑虹鐞嗙晫闈㈣彍鍗�
-   */
-  exitManage = () => {
-    if (window.GLOB.systemType === 'production') { // 姝e紡绯荤粺鐗堟湰鍗囩骇鍚庯紝椤甸潰鍒锋柊
-      window.location.reload()
-      return
+  writeFuncs = (funcs) => {
+    let timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
+
+    let sys_datetime = sessionStorage.getItem('sys_datetime')
+    let app_datetime = sessionStorage.getItem('app_datetime')
+    if (sys_datetime && app_datetime) {
+      let seconds = Math.floor((new Date().getTime() - app_datetime) / 1000)
+      timestamp = moment(sys_datetime, 'YYYY-MM-DD HH:mm:ss').add(seconds, 'seconds').format('YYYY-MM-DD HH:mm:ss')
     }
 
-    this.props.resetEditState(true)
-    this.props.resetEditLevel(false)
-    this.reload()
+    if (window.GLOB.WebSql) {
+      window.GLOB.WebSql.transaction(tx => {
+        tx.executeSql('DELETE FROM FUNCS')
+
+        funcs.forEach(item => {
+          if (!item.key_sql) return
+          tx.executeSql('INSERT INTO FUNCS (func_code, key_sql) VALUES (?, ?)', [item.func_code, item.key_sql])
+        })
+        tx.executeSql(`UPDATE VERSIONS SET createDate='${timestamp}' where CDefine1='funcs'`)
+      })
+    } else {
+      let objectStore = window.GLOB.IndexDB.transaction(['funcs'], 'readwrite').objectStore('funcs')
+
+      objectStore.clear()
+
+      funcs.forEach(item => {
+        if (!item.key_sql) return
+        item.id = item.func_code
+        objectStore.add(item)
+      })
+
+      let funcStore = window.GLOB.IndexDB.transaction(['version'], 'readwrite').objectStore('version')
+      funcStore.put({id: 'funcs', version: '1.0', createDate: timestamp})
+    }
   }
-  
-  exitEdit = () => {
-    // 閫�鍑虹紪杈戠姸鎬�
-    this.props.resetEditLevel(false)
+
+  getfuncTime = () => {
+    return new Promise((resolve, reject) => {
+      if (window.GLOB.WebSql) {
+        window.GLOB.WebSql.transaction(tx => {
+          tx.executeSql("SELECT * FROM VERSIONS where CDefine1='funcs'", [], (tx, results) => {
+            let rows = results.rows
+            if (rows.length === 0) {
+              tx.executeSql('DELETE FROM FUNCS')
+              tx.executeSql('INSERT INTO VERSIONS (version, createDate, CDefine1) VALUES (?, ?, ?)', ['1.0', '1970-01-01 14:59:09.000', 'funcs'])
+              resolve({createDate: '1970-01-01 14:59:09.000'})
+            } else {
+              resolve(rows[0])
+            }
+          }, (tx, results) => {
+            reject()
+            console.warn(results)
+          })
+        })
+      } else {
+        let objectStore = window.GLOB.IndexDB.transaction(['version'], 'readwrite').objectStore('version')
+        let request = objectStore.get('funcs')
+
+        request.onerror = (event) => {
+          console.warn(event)
+          reject()
+        }
+
+        request.onsuccess = () => {
+          if (request.result) {
+            resolve(request.result)
+          } else {
+            let add = objectStore.add({id: 'funcs', version: '1.0', createDate: '1970-01-01 14:59:09.000'})
+    
+            add.onerror = () => {
+              reject()
+            }
+            add.onsuccess = () => {
+              resolve({id: 'funcs', version: '1.0', createDate: '1970-01-01 14:59:09.000'})
+            }
+          }
+        }
+      }
+    })
   }
 
   changeSystem = (system) => {
-    let _param = window.btoa('ud=' + sessionStorage.getItem('UserID') + '&ld=' + sessionStorage.getItem('LoginUID') + '&un=' + sessionStorage.getItem('User_Name'))
-    window.location.href = system.LinkUrl1 + '#/ssologin/' + _param
+    let url = system.LinkUrl1
+
+    if (!url) {
+      notification.warning({
+        top: 92,
+        message: '绯荤粺鍦板潃涓嶅瓨鍦紒',
+        duration: 5
+      })
+      return
+    } else if (/index\.html/ig.test(url)) {
+      url = url.replace(/index\.html.*/ig, '')
+    } else if (!/\/$/ig.test(url)) {
+      url = url + '/'
+    }
+
+    let href = url + 'index.html#/ssologin/' + window.btoa(window.encodeURIComponent(JSON.stringify({
+      UserID: sessionStorage.getItem('UserID'),
+      LoginUID: sessionStorage.getItem('LoginUID'),
+      User_Name: sessionStorage.getItem('User_Name'),
+      Full_Name: sessionStorage.getItem('Full_Name'),
+      avatar: sessionStorage.getItem('avatar'),
+      dataM: system.dataM ? 'true' : '',
+      debug: system.debug || '',
+      role_id: system.role_id || ''
+    })))
+
+    window.open(href)
   }
 
   dropdownMenuChange = (visible) => {
@@ -519,134 +574,48 @@
       if (visible) {
         setTimeout(() => {
           let input = document.getElementById('thdMenu-search')
-
-          if (input) {
-            input.focus()
-          }
+          input && input.focus()
         }, 500)
       }
     })
   }
-
-  selectMenu = (item) => {
-    const { tabviews } = this.props
-    
-    let menu = JSON.parse(JSON.stringify(item))
-    menu.selected = true
-
-    let index = 0
-    let isexit = false
-    let tabs = tabviews.map((tab, i) => {
-      tab.selected = false
-
-      if (tab.MenuID === menu.MenuID) {
-        tab.selected = true
-        isexit = true
-      }
-
-      return tab
-    })
-
-    if (!isexit) {
-      tabs.splice(index + 1, 0, menu)
-    }
-
-    this.props.modifyTabview(tabs)
-  }
   
   UNSAFE_componentWillMount () {
     // 缁勪欢鍔犺浇鏃讹紝鑾峰彇鑿滃崟鏁版嵁
-    let _avatar = sessionStorage.getItem('avatar')
-    if (_avatar) {
-      _avatar = Utils.getrealurl(_avatar) // 澶村儚
-      this.setState({avatar: _avatar})
-    }
     this.getRolesMenu()
   }
 
-  componentDidMount () {
-    // 鑾峰彇瑙掕壊鑿滃崟鏉冮檺
-    Api.getSystemConfig({func: 's_Get_TrdMenu_Role'}).then(result => {
-      if (!result) return
-      if (result.status) {
-        let _permMenus = {}
-        let menulist = []
-
-        if (result.UserRoles) {
-          let iframes = ['Main/Index', 'bda/rdt', 'Home/rdt']
-          let menukeys = []
-
-          result.UserRoles.forEach(role => {
-            role.RoleMenu.forEach(menu => {
-              if (!menu.MenuID) return
-              if (menukeys.includes(menu.MenuID)) {
-                console.warn('s_Get_TrdMenu_Role閲嶅鐨勮彍鍗旾D锛�' + menu.MenuID)
-                return
-              }
-              _permMenus[menu.MenuID] = true
-
-              let _type = ''
-              if (menu.LinkUrl) {
-                if (menu.LinkUrl === 'CommonTable') {
-                  _type = 'CommonTable'
-                } else if (menu.LinkUrl === 'DataManage') {
-                  _type = 'DataManage'
-                } else if (iframes.includes(menu.LinkUrl.split('?')[0])) {
-                  _type = 'iframe'
-                }
-              }
-  
-              if (_type !== 'iframe') {
-                let pageParam = {}
-                try {
-                  pageParam = JSON.parse(menu.PageParam)
-                } catch (e) {
-                  pageParam = {}
-                }
-                _type = pageParam.Template || _type
-              }
-
-              menukeys.push(menu.MenuID)
-
-              menulist.push({
-                MenuID: menu.MenuID,
-                MenuName: menu.MenuName,
-                MenuNo: menu.MenuNo || '',
-                EasyCode: menu.EasyCode || '',
-                LinkUrl: menu.LinkUrl,
-                type: _type
-              })
-            })
-          })
-        }
-  
-        this.setState({
-          thdMenuList: menulist
-        })
-
-        this.props.initMenuPermission(_permMenus)
-      } else {
-        notification.error({
-          top: 92,
-          message: result.message,
-          duration: 10
-        })
-      }
-    })
-
-    // 鑾峰彇绯荤粺鐨勭増鏈俊鎭�
-    new Promise((resolve, reject) => {
-      Api.getAppVersion(resolve, reject)
-    }).then(res => {
+  UNSAFE_componentWillReceiveProps (nextProps) {
+    if (!is(fromJS(this.props.menuTree), fromJS(nextProps.menuTree)) && !is(fromJS(this.state.menulist), fromJS(nextProps.menuTree))) {
       this.setState({
-        oriVersion: res.oldVersion,
-        newVersion: res.newVersion
+        menulist: nextProps.menuTree
       })
-    })
+    }
+  }
+
+  componentDidMount () {
+    // 鑾峰彇绯荤粺鐨勭増鏈俊鎭紝寤舵椂鏌ヨ
+    setTimeout(() => {
+      Api.getAppVersion().then(res => {
+        this.setState({
+          oriVersion: res.oldVersion,
+          newVersion: res.newVersion
+        })
+      }, () => {})
+    }, 1000)
   }
 
   shouldComponentUpdate (nextProps, nextState) {
     return !is(fromJS(this.props), fromJS(nextProps)) || !is(fromJS(this.state), fromJS(nextState))
+  }
+
+  /**
+   * @description 缁勪欢閿�姣侊紝娓呴櫎state鏇存柊
+   */
+  componentWillUnmount () {
+    this.setState = () => {
+      return
+    }
   }
 
   verup = () => {
@@ -658,23 +627,23 @@
       content: `鏈�鏂扮増鏈�${newVersion}锛屽綋鍓嶇増鏈�${oriVersion}`,
       onOk() {
         return new Promise(resolve => {
-          Api.updateAppVersion(newVersion).then(res => {
-            if (res.status) {
-              notification.success({
-                top: 92,
-                message: '鍗囩骇鎴愬姛锛�',
-                duration: 2
-              })
-              _this.setState({oriVersion: newVersion})
-            } else {
-              notification.warning({
-                top: 92,
-                message: '鍗囩骇澶辫触锛岃鍒锋柊椤甸潰閲嶈瘯锛�',
-                duration: 2
-              })
-            }
+          if (!window.GLOB.WebSql) {
+            notification.warning({
+              top: 92,
+              message: '鍗囩骇澶辫触锛岃鍒锋柊椤甸潰閲嶈瘯锛�',
+              duration: 2
+            })
             resolve()
-          })
+          } else {
+            Api.updateAppVersion(newVersion)
+            notification.success({
+              top: 92,
+              message: '鍗囩骇鎴愬姛锛�',
+              duration: 2
+            })
+            _this.setState({oriVersion: newVersion})
+            resolve()
+          }
         })
       },
       onCancel() {}
@@ -691,21 +660,62 @@
     }
   }
 
+  changeVerMenu(menu, type) {
+    if (type === 'first') {
+      if (menu.OpenType === 'outpage' && menu.linkUrl) {
+        window.open(menu.linkUrl)
+      } else if (menu.OpenType === 'menu') {
+
+      }
+    } else {
+      if (menu.OpenType === 'newpage' || menu.OpenType === 'NewPage') { // NewPage涓烘墦寮�澶栭儴椤甸潰鍦板潃锛宯ewpage涓烘墦寮�绯荤粺鑿滃崟
+        window.open(menu.src)
+      } else if (menu.OpenType === 'blank') {
+        menu.selected = true
+        this.props.modifyTabview([menu])
+      } else if (this.state.navBar === 'topmenu' && this.state.menuType !== 'menu_board_navigation') {
+        menu.selected = true
+        this.props.modifyTabview([menu])
+      } else {
+        let tabs = fromJS(this.props.tabviews).toJS()
+        tabs = tabs.filter(tab => {
+          tab.selected = false
+          return tab.MenuID !== menu.MenuID
+        })
+  
+        if (this.props.tabviews.length > tabs.length) {
+          this.props.modifyTabview(fromJS(tabs).toJS())
+        }
+  
+        this.setState({}, () => {
+          menu.selected = true
+          tabs.push(menu)
+          this.props.modifyTabview(tabs)
+        })
+      }
+  
+      if (window.GLOB.systemType === 'production') {
+        MKEmitter.emit('queryTrigger', {menuId: menu.MenuID, name: '鑿滃崟'})
+      }
+    }
+  }
+
   render () {
-    const { thdMenuList, searchkey, oriVersion, newVersion } = this.state
+    const { mainMenu, collapse } = this.props
+    const { thdMenuList, searchkey, oriVersion, newVersion, debug, menulist, navBar, menuType } = this.state
 
     const menu = (
       <Menu className="header-dropdown">
-        {this.props.debug && <Menu.Item key="switch">
+        {debug && <Menu.Item key="switch">
           {this.state.dict['main.edit']}
-          <Switch size="small" className="edit-switch" disabled={!!this.props.editLevel} checked={this.props.editState} onChange={this.changeEditState} />
+          <Switch size="small" style={{marginLeft: '7px'}} checked={false} onChange={this.changeEditState} />
         </Menu.Item>}
-        {!this.props.editState ? <Menu.Item key="password" onClick={this.changePassword}>{this.state.dict['main.password']}</Menu.Item> : null}
-        {/* {this.state.systems.length > 0 ? <Menu.SubMenu title="鍒囨崲绯荤粺">
+        <Menu.Item key="password" onClick={this.changePassword}>{this.state.dict['main.password']}</Menu.Item>
+        {this.state.systems.length ? <Menu.SubMenu style={{minWidth: '110px'}} title="鍒囨崲绯荤粺">
           {this.state.systems.map((system, index) => (
-            <Menu.Item className="header-subSystem" key={'sub' + index} onClick={() => {this.changeSystem(system)}}> {system.AppName} </Menu.Item>
+            <Menu.Item style={{minWidth: '100px', lineHeight: '30px'}} key={'sub' + index} onClick={() => {this.changeSystem(system)}}> {system.AppName} </Menu.Item>
           ))}
-        </Menu.SubMenu> : null} */}
+        </Menu.SubMenu> : null}
         <Menu.Item key="doc" onClick={this.gotoDoc}>{this.state.dict['main.doc']}</Menu.Item>
         {oriVersion ? <Menu.Item key="verup" onClick={this.verup}>
           <Badge dot={oriVersion !== newVersion}>{this.state.dict['main.verup']}</Badge>
@@ -716,46 +726,114 @@
 
     return (
       <header className="header-container ant-menu-dark" id="main-header-container">
-        <div className={this.props.collapse ? "collapse header-logo" : "header-logo"}><img src={this.state.logourl} alt=""/></div>
-        <div className={this.props.collapse ? "collapse header-collapse" : "header-collapse"} onClick={this.handleCollapse}>
-          <Icon type={this.props.collapse ? 'menu-unfold' : 'menu-fold'} />
+        <div className={'header-logo ' + (collapse && navBar !== 'topmenu' ? 'collapse' : '')}><img src={this.state.logourl} alt=""/></div>
+        <div className={'header-collapse ' + (collapse && navBar !== 'topmenu' ? 'collapse' : '')}>
+          {navBar !== 'topmenu' ? <Icon type={collapse ? 'menu-unfold' : 'menu-fold'} onClick={this.handleCollapse}/> : null}
         </div>
         {/* 姝e父鑿滃崟 */}
-        {this.props.editLevel !== 'level1' && this.state.menulist ?
-          <ul className={'header-menu ' + this.props.editLevel}>{
-            this.state.menulist.map(item => {
+        {navBar !== 'topmenu' && menulist ?
+          <ul className="header-menu">{
+            menulist.map(item => {
               return (
-                <li key={item.MenuID} onClick={() => {this.changeMenu(item)}} className={this.props.selectmenu.MenuID === item.MenuID ? 'active' : ''}>
+                <li key={item.MenuID} onClick={() => {this.changeMenu(item)}} className={mainMenu && mainMenu.MenuID === item.MenuID ? 'active' : ''}>
                   <span>{item.MenuName}</span>
                 </li>
               )
             })}
-            {this.props.editState && (!this.props.editLevel || this.props.editLevel === 'HS') ?
-              <li key="HS" onClick={this.enterEditManage} className={this.props.editLevel === 'HS' ? 'active' : ''}>
-                <span>HS</span>
-              </li> : null
-            }
           </ul> : null
         }
-        {this.props.editLevel === 'HS' ? <Button className="level4-close" type="primary" onClick={this.exitManage}>閫�鍑�</Button> : null}
-        {/* 杩涘叆缂栬緫鎸夐挳 */}
-        {this.props.editState && !this.props.editLevel ? <Icon onClick={this.enterEdit} className="edit-check" type="edit" /> : null}
-        {/* {this.props.editState && !this.props.editLevel && options.sysType === 'local' && window.GLOB.systemType !== 'production' ?
-          <a href="#/mobmanage" target="_blank" className="mobile" type="edit"> 搴旂敤绠$悊 <Icon type="arrow-right" /></a> : null
-        } */}
-        {/* 缂栬緫鑿滃崟 */}
-        {this.props.editLevel === 'level1' ? <EditMenu menulist={this.state.menulist} reload={this.reload} exitEdit={this.exitEdit}/> : null}
+        {navBar === 'topmenu' && menuType !== 'menu_board' && menuType !== 'menu_board_navigation' && menulist ?
+          <ul className="header-menu vertical-menu">{
+            menulist.map(item => {
+              if (item.children && item.children.length > 0) {
+                return (
+                  <Dropdown key={item.MenuID} overlayClassName="vertical-dropdown-menu" overlay={
+                    <Menu mode="vertical">
+                      {item.children.map(cell => {
+                        if (!cell.children || cell.children.length === 0) {
+                          return (
+                            <Menu.Item key={cell.MenuID}>
+                              {cell.MenuName}
+                            </Menu.Item>
+                          )
+                        } else {
+                          return (
+                            <Menu.SubMenu popupClassName="vertical-dropdown-submenu" key={cell.MenuID} title={cell.MenuName}>
+                              {cell.children.map(m => (
+                                <Menu.Item key={m.MenuID} onClick={() => {this.changeVerMenu(m)}}>
+                                  {m.MenuName}
+                                </Menu.Item>
+                              ))}
+                            </Menu.SubMenu>
+                          )
+                        }
+                      })}
+                    </Menu>
+                  }>
+                    <li>
+                      <span>{item.MenuName}</span>
+                    </li>
+                  </Dropdown>
+                )
+              } else {
+                return (
+                  <li key={item.MenuID} onClick={() => {this.changeVerMenu(item, 'first')}}>
+                    <span>{item.MenuName}</span>
+                  </li>
+                )
+              }
+            })}
+          </ul> : null
+        }
+        {navBar === 'topmenu' && (menuType === 'menu_board' || menuType === 'menu_board_navigation') && menulist ?
+          <ul className="header-menu vertical-menu">{
+            menulist.map(item => {
+              if (item.children && item.children.length > 0) {
+                return (
+                  <Dropdown key={item.MenuID} placement="bottomCenter" overlayClassName="vertical-dropdown-menu" overlay={
+                    <div className="menu-board">
+                      {item.children.map(cell => {
+                        return (
+                          <div className="menu-wrap" key={cell.MenuID}>
+                            <div className="title" onClick={e => e.stopPropagation()}>{cell.MenuName}</div>
+                            <div className="menu-detail">
+                              {cell.children && cell.children.map(m => (
+                                <div key={m.MenuID} title={m.MenuName} onClick={() => {this.changeVerMenu(m)}}>
+                                  {m.MenuName}
+                                </div>
+                              ))}
+                            </div>
+                          </div>
+                        )
+                      })}
+                    </div>
+                  }>
+                    <li>
+                      <span>{item.MenuName}</span>
+                    </li>
+                  </Dropdown>
+                )
+              } else {
+                return (
+                  <li key={item.MenuID} onClick={() => {this.changeVerMenu(item, 'first')}}>
+                    <span>{item.MenuName}</span>
+                  </li>
+                )
+              }
+            })}
+          </ul> : null
+        }
         {/* 澶村儚銆佺敤鎴峰悕 */}
         <Dropdown className="header-setting" overlay={menu}>
           <div>
-            <img src={this.state.avatar} alt=""/>
+            <img src={this.state.avatar || avatar} alt=""/>
             <span>
               <span className="username">{this.state.userName}</span> <Icon type="down" />
             </span>
           </div>
         </Dropdown>
         {/* 鑿滃崟鎼滅储 */}
-        {!this.props.editState && thdMenuList.length > 0 ?
+        {thdMenuList.length > 0 ?
           <Dropdown overlayClassName="menu-select-dropdown" getPopupContainer={() => document.getElementById('main-header-container')} overlay={
             <div>
               <Search
@@ -776,12 +854,12 @@
                         option.MenuNo.toLowerCase().indexOf(searchkey.toLowerCase()) >= 0 ||
                         option.EasyCode.toLowerCase().indexOf(searchkey.toLowerCase()) >= 0
                       ) {
-                        return <Menu.Item key={option.MenuID} onClick={() => this.selectMenu(option)}>{option.MenuName}</Menu.Item>
+                        return <Menu.Item key={option.MenuID} onClick={() => this.changeVerMenu(option)}>{option.MenuName}</Menu.Item>
                       } else {
                         return null
                       }
                     }
-                    return <Menu.Item key={option.MenuID} onClick={() => this.selectMenu(option)}>{option.MenuName}</Menu.Item>
+                    return <Menu.Item key={option.MenuID} onClick={() => this.changeVerMenu(option)}>{option.MenuName}</Menu.Item>
                   })}
                 </Menu>
               </div>
@@ -822,13 +900,9 @@
   return {
     tabviews: state.tabviews,
     collapse: state.collapse,
-    selectmenu: state.selectedMainMenu,
-    debug: state.debug,
-    editState: state.editState,
-    editLevel: state.editLevel,
+    menuTree: state.menuTree,
+    mainMenu: state.mainMenu,
     permAction: state.permAction,
-    sysRoles: state.sysRoles,
-    permFuncField: state.permFuncField
   }
 }
 
@@ -836,15 +910,10 @@
   return {
     toggleCollapse: (collapse) => dispatch(toggleCollapse(collapse)),
     modifyTabview: (tabviews) => dispatch(modifyTabview(tabviews)),
-    modifyMainMenu: (selectmenu) => dispatch(modifyMainMenu(selectmenu)),
-    resetEditState: (state) => dispatch(resetEditState(state)),
-    resetEditLevel: (level) => dispatch(resetEditLevel(level)),
-    initActionPermission: (permRoles, permAction) => dispatch(initActionPermission(permRoles, permAction)),
-    initPermission: (sysRoles, permFuncField) => dispatch(initPermission(sysRoles, permFuncField)),
+    modifyMenuTree: (menuTree) => dispatch(modifyMenuTree(menuTree)),
+    modifyMainMenu: (mainMenu) => dispatch(modifyMainMenu(mainMenu)),
+    initActionPermission: (permAction) => dispatch(initActionPermission(permAction)),
     initMenuPermission: (permMenus) => dispatch(initMenuPermission(permMenus)),
-    modifyDataManager: (dataManager) => dispatch(modifyDataManager(dataManager)),
-    resetState: () => dispatch(resetState()),
-    resetDebug: () => dispatch(resetDebug()),
     logout: () => dispatch(logout())
   }
 }

--
Gitblit v1.8.0