From 08cce3334a2dc81d690b518136b0aaea64e48b0b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 14 六月 2023 09:55:50 +0800
Subject: [PATCH] 2023-06-14
---
src/views/design/header/index.jsx | 475 ++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 325 insertions(+), 150 deletions(-)
diff --git a/src/views/design/header/index.jsx b/src/views/design/header/index.jsx
index ddc65dd..2155478 100644
--- a/src/views/design/header/index.jsx
+++ b/src/views/design/header/index.jsx
@@ -1,42 +1,46 @@
import React, {Component} from 'react'
import { withRouter } from 'react-router-dom'
import {connect} from 'react-redux'
-import { is, fromJS } from 'immutable'
-import { Dropdown, Menu, Icon, Modal, Form, notification, Switch, Button } from 'antd'
+import { Dropdown, Menu, Modal, notification, Switch, Button, Popover } from 'antd'
+import { MenuFoldOutlined, SettingOutlined, AppstoreOutlined, DownOutlined, HomeOutlined, ApiOutlined, PlusOutlined, EditOutlined, MenuOutlined, DatabaseOutlined } from '@ant-design/icons'
+import moment from 'moment'
import asyncComponent from '@/utils/asyncComponent'
import {
modifyMenuTree,
modifyMainMenu,
- modifyTabview,
resetEditLevel,
logout
} from '@/store/action'
import Api from '@/api'
import options from '@/store/options.js'
-import zhCN from '@/locales/zh-CN/main.js'
-import enUS from '@/locales/en-US/main.js'
import Utils from '@/utils/utils.js'
import avatar from '@/assets/img/avatar.jpg'
import MainLogo from '@/assets/img/main-logo.png'
+import MKEmitter from '@/utils/events.js'
import './index.scss'
-const EditMenu = asyncComponent(() => import('@/templates/menuconfig/editfirstmenu'))
+const EditMenu = asyncComponent(() => import('./editfirstmenu'))
+const VersionsUp = asyncComponent(() => import('./versions'))
+const ThawMenu = asyncComponent(() => import('@/components/thawmenu'))
+const MenuForm = asyncComponent(() => import('./editfirstmenu/menuform'))
const { confirm } = Modal
class Header extends Component {
state = {
menulist: null, // 涓�绾ц彍鍗�
- dict: localStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
userName: sessionStorage.getItem('CloudUserName'),
avatar: Utils.getrealurl(sessionStorage.getItem('CloudAvatar')),
+ memberLevel: Utils.getMemberLevel(),
+ visible: false,
+ loading: false
}
logout = () => {
// 閫�鍑虹櫥褰�
let _this = this
confirm({
- title: this.state.dict['main.logout.hint'],
+ title: '鎮ㄧ‘瀹氳閫�鍑哄悧?',
content: '',
onOk() {
sessionStorage.clear()
@@ -49,10 +53,6 @@
changeMenu (value) {
// 涓昏彍鍗曞垏鎹�
- if (this.props.editLevel) {
- // 缂栬緫鐘舵�佷笅锛屼笉鍙垏鎹㈣彍鍗�
- return
- }
if (value.PageParam.OpenType === 'menu') {
this.props.modifyMainMenu(value)
} else if (value.PageParam.OpenType === 'outpage') {
@@ -62,12 +62,12 @@
async loadmenu () {
// 鑾峰彇涓昏彍鍗�
- let _param = {func: 's_get_pc_menus', systemType: options.sysType, debug: 'Y'}
-
- if (options.sysType !== 'cloud' && window.GLOB.systemType !== 'production') {
- _param.linkurl = window.GLOB.linkurl
+ let _param = {
+ func: 's_get_pc_menus',
+ systemType: options.sysType,
+ pro_sys: window.GLOB.systemType === 'production' ? 'Y' : '',
+ debug: 'Y'
}
- _param.pro_sys = window.GLOB.systemType === 'production' ? 'Y' : ''
let result = await Api.getSystemConfig(_param)
@@ -79,10 +79,21 @@
this.setState({ menulist })
- this.props.modifyMenuTree(menulist)
- if (window.GLOB.systemType !== 'production') { // 闈炴寮忕郴缁熼�夋嫨绗竴椤�
- this.props.modifyMainMenu(menulist[0] || null)
+ let mainMenu = menulist[0] || null
+
+ if (this.props.editLevel === 'level1') {
+ mainMenu = null
+ } else if (this.props.mainMenu && this.props.mainMenu.MenuID) {
+ let _menu = menulist.filter(item => item.MenuID === this.props.mainMenu.MenuID)[0]
+ mainMenu = _menu || mainMenu
+
+ if (!_menu && (this.props.editLevel === 'level2' || this.props.editLevel === 'level3')) {
+ this.props.resetEditLevel(false)
+ }
}
+
+ this.props.modifyMenuTree(menulist)
+ this.props.modifyMainMenu(mainMenu)
} else {
notification.error({
top: 92,
@@ -93,8 +104,8 @@
}
getMenulist = (result) => {
- let iframes = ['Main/Index', 'bda/rdt', 'Home/rdt']
let menulist = []
+ let thdMenuList = []
result.fst_menu && result.fst_menu.forEach(fst => {
let fstItem = {
MenuID: fst.MenuID,
@@ -117,7 +128,8 @@
MenuID: snd.MenuID,
MenuName: snd.MenuName,
PageParam: {Icon: 'folder'},
- children: []
+ children: [],
+ level: 'second'
}
if (snd.PageParam) {
@@ -138,27 +150,24 @@
MenuNo: trd.MenuNo,
EasyCode: trd.EasyCode,
type: 'CommonTable', // 榛樿鍊间负甯哥敤琛�
- OpenType: 'newtab' // 鎵撳紑鏂瑰紡
+ OpenType: 'newtab', // 鎵撳紑鏂瑰紡
+ level: 'third'
}
- if (trd.LinkUrl && iframes.includes(trd.LinkUrl.split('?')[0])) {
- trdItem.type = 'iframe'
- trdItem.LinkUrl = trd.LinkUrl
- trdItem.forbidden = true
- } else {
- try {
- trdItem.PageParam = trd.PageParam ? JSON.parse(trd.PageParam) : {OpenType: 'newtab'}
- } catch (e) {
- trdItem.PageParam = {OpenType: 'newtab'}
- }
+ try {
+ trdItem.PageParam = trd.PageParam ? JSON.parse(trd.PageParam) : {OpenType: 'newtab'}
trdItem.type = trdItem.PageParam.Template || trdItem.type
- trdItem.OpenType = trdItem.PageParam.OpenType || trdItem.OpenType
-
- if (trdItem.type === 'CustomPage' && this.props.memberLevel < 20) { // 浼氬憳绛夌骇澶т簬绛変簬20鏃讹紝鏈夌紪杈戞潈闄�
- trdItem.forbidden = true
- }
+ trdItem.OpenType = trdItem.PageParam.OpenType
+ } catch (e) {
+ trdItem.PageParam = {OpenType: 'newtab'}
}
+
+ if (trdItem.type === 'CustomPage' && this.state.memberLevel < 20) { // 浼氬憳绛夌骇澶т簬绛変簬20鏃讹紝鏈夌紪杈戞潈闄�
+ trdItem.forbidden = true
+ }
+
+ thdMenuList.push(trdItem)
return trdItem
})
@@ -171,6 +180,7 @@
menulist.push(fstItem)
})
+ sessionStorage.setItem('thdMenuList', JSON.stringify(thdMenuList))
return { menulist }
}
@@ -186,39 +196,143 @@
enterEdit = () => {
// 杩涘叆缂栬緫鐘舵��
this.props.resetEditLevel('level1')
- }
-
- enterEditManage = () => {
- const { editLevel } = this.props
-
- if (editLevel === 'HS') return
-
- this.props.resetEditLevel('HS')
- this.props.modifyMainMenu({
- MenuID: 'systemManageView'
- })
- }
-
- /**
- * @description 閫�鍑虹鐞嗙晫闈㈣彍鍗�
- */
- exitManage = () => {
- const { menulist } = this.state
-
- if (window.GLOB.systemType === 'production') { // 姝ｅ紡绯荤粺鐗堟湰鍗囩骇鍚庯紝椤甸潰鍒锋柊
- this.props.history.replace('/main')
- window.location.reload()
- return
- }
-
- this.props.modifyMainMenu(menulist[0] || null)
- this.props.resetEditLevel(false)
- this.props.modifyTabview([])
+ this.props.modifyMainMenu(null)
}
exitEdit = () => {
// 閫�鍑虹紪杈戠姸鎬�
this.props.resetEditLevel(false)
+ this.props.modifyMainMenu(this.state.menulist[0] || null)
+ }
+
+ addMemuSubmit = () => {
+ // 鏂板缓鑿滃崟锛氭彁浜�
+ this.addMenuFormRef.handleConfirm().then(param => {
+ param.func = 'sPC_MainMenu_Add'
+ param.Sort = (this.state.menulist.length + 1) * 10
+
+ this.setState({
+ loading: true
+ })
+ Api.getSystemConfig(param).then(res => {
+ if (res.status) {
+ this.setState({
+ loading: false,
+ visible: false,
+ })
+
+ this.loadmenu()
+ } else {
+ this.setState({
+ loading: false
+ })
+ notification.warning({
+ top: 92,
+ message: res.message,
+ duration: 5
+ })
+ }
+ })
+ }, () => {})
+ }
+
+ setSystemFuncs = () => {
+ if (!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
+ })
+ } else if (result.func_detail && result.func_detail.length > 0) {
+ this.writeFuncs(result.func_detail)
+ }
+ })
+ })
+ }
+
+ writeFuncs = (funcs) => {
+ let shim = +sessionStorage.getItem('sys_time_shim')
+ let timestamp = moment().add(shim, 'seconds').format('YYYY-MM-DD HH:mm:ss')
+
+ 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})
+ }
+
+ getfuncTime = () => {
+ return new Promise((resolve, reject) => {
+ 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'})
+ }
+ }
+ }
+ })
+ }
+
+ getSmStemp = () => {
+ if (!sessionStorage.getItem('msgTemplate')) {
+ let _sql = `select聽ID,TemplateCode,SignName+'_'+describe as 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))
+ })
+ }
}
UNSAFE_componentWillMount () {
@@ -229,54 +343,55 @@
this.loadmenu()
}
- UNSAFE_componentWillReceiveProps (nextProps) {
- if (!is(fromJS(this.props.menuTree), fromJS(nextProps.menuTree)) && !is(fromJS(this.state.menulist), fromJS(nextProps.menuTree))) {
- this.setState({
- menulist: nextProps.menuTree
- })
- }
- }
-
componentDidMount () {
- if (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()
- }
-
- sessionStorage.setItem('sysRoles', JSON.stringify(_sysRoles))
- sessionStorage.setItem('permFuncField', JSON.stringify(_permFuncField))
+ window.addEventListener('storage', (e) => {
+ if (e.key === 'menuUpdate') {
+ this.reload()
+ } else if (e.key === 'wxTemplates') {
+ if (e.newValue) {
+ sessionStorage.setItem('wxTemplates', e.newValue)
}
- })
- } else if (window.GLOB.systemType === 'production') {
- this.props.resetEditLevel('HS')
- this.props.modifyMainMenu({
- MenuID: 'systemManageView'
- })
- }
- }
+ }
+ })
+ MKEmitter.addListener('mkUpdateMenuList', this.reload)
- shouldComponentUpdate (nextProps, nextState) {
- return !is(fromJS(this.props), fromJS(nextProps)) || !is(fromJS(this.state), fromJS(nextState))
+ if (window.GLOB.systemType !== 'production') {
+ setTimeout(() => {
+ 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()
+ }
+
+ sessionStorage.setItem('sysRoles', JSON.stringify(_sysRoles))
+ sessionStorage.setItem('permFuncField', JSON.stringify(_permFuncField))
+ }
+ })
+ }, 100)
+
+ setTimeout(() => {
+ this.setSystemFuncs()
+ this.getSmStemp()
+ }, 500)
+ }
}
/**
@@ -286,6 +401,7 @@
this.setState = () => {
return
}
+ MKEmitter.removeListener('mkUpdateMenuList', this.reload)
}
gotoDoc = () => {
@@ -299,29 +415,18 @@
}
render () {
- const { mainMenu } = this.props
- const { menulist } = this.state
-
- const menu = (
- <Menu className="header-dropdown">
- <Menu.Item key="switch">
- {this.state.dict['main.edit']}
- <Switch size="small" style={{marginLeft: '7px'}} disabled={!!this.props.editLevel} checked={true} onChange={this.changeEditState} />
- </Menu.Item>
- <Menu.Item key="doc" onClick={this.gotoDoc}>{this.state.dict['main.doc']}</Menu.Item>
- <Menu.Item key="logout" onClick={this.logout}>{this.state.dict['main.logout']}</Menu.Item>
- </Menu>
- )
+ const { mainMenu, editLevel } = this.props
+ const { menulist, memberLevel, visible, loading } = this.state
return (
- <header className={'sys-header-container ant-menu-dark ' + (this.props.editLevel === 'level2' || this.props.editLevel === 'level3' ? 'mask' : '')} id="main-header-container">
+ <header className={'sys-header-container ant-menu-dark ' + (['level2', 'level3'].includes(editLevel) ? 'mask' : '')} id="main-header-container">
<div className="header-logo"><img src={MainLogo} alt=""/></div>
<div className="header-collapse">
- <Icon type="menu-fold"/>
+ <MenuFoldOutlined/>
</div>
{/* 姝ｅ父鑿滃崟 */}
- {this.props.editLevel !== 'level1' && menulist ?
- <ul className={'header-menu ' + this.props.editLevel}>{
+ {editLevel !== 'level1' && menulist ?
+ <ul className={'header-menu ' + editLevel}>{
menulist.map(item => {
return (
<li key={item.MenuID} onClick={() => {this.changeMenu(item)}} className={mainMenu && mainMenu.MenuID === item.MenuID ? 'active' : ''}>
@@ -329,36 +434,110 @@
</li>
)
})}
- {!this.props.editLevel || this.props.editLevel === 'HS' ?
- <li key="HS" onClick={this.enterEditManage} className={this.props.editLevel === 'HS' ? 'active' : ''}>
+ {!editLevel ?
+ <li key="HS" onClick={() => window.open('#/hs')}>
<span>HS</span>
</li> : null
}
</ul> : null
}
- {this.props.editLevel === 'HS' ? <Button className="level4-close" type="primary" onClick={this.exitManage}>閫�鍑�</Button> : null}
{/* 杩涘叆缂栬緫鎸夐挳 */}
- {!this.props.editLevel ? <Icon onClick={this.enterEdit} className="edit-check" type="edit" /> : null}
- {/* {!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
- } */}
+ {!editLevel && window.GLOB.systemType !== 'production' && menulist ? <Popover overlayClassName="mk-popover-control-wrap mk-menu-control" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
+ <div className="mk-popover-control">
+ <PlusOutlined onClick={() => this.setState({visible: true, loading: false})}/>
+ <EditOutlined onClick={this.enterEdit}/>
+ <div style={{display: 'inline-block', minWidth: '32px'}}><ThawMenu ParentId="0" Type="10"/></div>
+ </div>
+ } trigger="hover">
+ <SettingOutlined className="edit-check"/>
+ </Popover> : null}
{/* window.btoa(window.encodeURIComponent(JSON.stringify({ MenuType: 'home', MenuId: 'home_page_id', MenuName: '棣栭〉' }))) */}
- {!this.props.editLevel && window.GLOB.systemType !== 'production' && this.props.memberLevel >= 20 ?
- <a className="home-edit" href={`#/menudesign/JTdCJTIyTWVudVR5cGUlMjIlM0ElMjJob21lJTIyJTJDJTIyTWVudUlkJTIyJTNBJTIyaG9tZV9wYWdlX2lkJTIyJTJDJTIyTWVudU5hbWUlMjIlM0ElMjIlRTklQTYlOTYlRTklQTElQjUlMjIlN0Q=`} target="_blank" rel="noopener noreferrer">
- 棣栭〉 <Icon type="arrow-right" />
- </a> : null
- }
+ <div className="entrance-wrap">
+ {window.GLOB.systemType !== 'production' ?
+ <div className="entrance">
+ <div className="icon"><HomeOutlined /></div>
+ <div className="title">棣栭〉</div>
+ <div className="detail">鍩轰簬鑷畾涔夐〉闈㈢殑棣栭〉璁捐锛屽彲瀹炵幇鐏垫椿鐨勫厓绱犻厤缃強鏍峰紡璋冩暣锛屽睍鐜板綋鍓嶇郴缁熺殑椋庢牸銆�</div>
+ <Button type="primary" disabled={!(memberLevel >= 20)} title={memberLevel >= 20 ? '' : '浼氬憳绛夌骇涓嶅锛屾棤寮�鍙戞潈闄愩��'} onClick={() => {window.open('#/menudesign/JTdCJTIyTWVudVR5cGUlMjIlM0ElMjJob21lJTIyJTJDJTIyTWVudUlkJTIyJTNBJTIyaG9tZV9wYWdlX2lkJTIyJTJDJTIyTWVudU5hbWUlMjIlM0ElMjIlRTklQTYlOTYlRTklQTElQjUlMjIlN0Q=')}}>
+ 缂栬緫
+ </Button>
+ </div> : null
+ }
+ <div className="entrance">
+ <div className="icon"><ApiOutlined /></div>
+ <div className="title">鎺ュ彛璋冭瘯</div>
+ <div className="detail">鍙嚜鍔ㄥ鐞嗙櫥褰曟帴鍙ｇ殑鍙傛暟鍔犲瘑锛屼互鍙婁笟鍔℃帴鍙ｇ殑绛惧悕璁＄畻锛屾柟渚垮紑鍙戜汉鍛樼殑鎺ュ彛娴嬭瘯宸ヤ綔銆�</div>
+ <Button type="primary" disabled={!(memberLevel >= 20)} title={memberLevel >= 20 ? '' : '浼氬憳绛夌骇涓嶅锛屾棤寮�鍙戞潈闄愩��'} onClick={() => {window.open('#/interface')}}>
+ 缂栬緫
+ </Button>
+ </div>
+ <div className="entrance">
+ <div className="icon"><AppstoreOutlined /></div>
+ <div className="title">搴旂敤绠＄悊</div>
+ <div className="detail">鍙垱寤哄強绠＄悊PC銆乸ad鍙婄Щ鍔ㄧ绛変笉鍚岃澶囩殑搴旂敤锛屽疄鐜版槑绉戜簯APP銆佸井淇″叕浼楀彿銆佸皬绋嬪簭绛夊骞冲彴鐨勫簲鐢ㄥ叡浜��</div>
+ {window.GLOB.systemType !== 'production' ?
+ <Button type="primary" disabled={!(memberLevel >= 20)} title={memberLevel >= 20 ? '' : '浼氬憳绛夌骇涓嶅锛屾棤寮�鍙戞潈闄愩��'} onClick={() => {window.open('#/appmanage')}}>
+ 缂栬緫
+ </Button> :
+ <Button type="primary" disabled={!(memberLevel >= 20)} title={memberLevel >= 20 ? '' : '浼氬憳绛夌骇涓嶅锛屾棤寮�鍙戞潈闄愩��'} onClick={() => {window.open('#/appcheck')}}>
+ 鏌ョ湅
+ </Button>
+ }
+ </div>
+ {window.GLOB.systemType !== 'production' ? <div className="entrance">
+ <div className="icon"><MenuOutlined /></div>
+ <div className="title">鑿滃崟鎿嶄綔璇存槑</div>
+ <div className="detail">榧犳爣鎮仠 <SettingOutlined style={{color: '#1890ff'}}/> 鍙樉绀鸿彍鍗曠殑娣诲姞銆佹帓搴忥紙鍖呮嫭缂栬緫銆佸垹闄わ級涓庤В鍐诲姛鑳斤紝鍙屽嚮涓夌骇鑿滃崟鍙繘鍏ョ紪杈戠獥鍙ｃ��</div>
+ <Button type="primary" onClick={() => {window.open('#/main')}}>
+ 鏂扮獥鍙�
+ </Button>
+ </div> : null}
+ {window.GLOB.systemType !== 'production' ? <div className="entrance">
+ <div className="icon"><DatabaseOutlined /></div>
+ <div className="title">瀛樺偍杩囩▼</div>
+ <div className="detail">鍙湪椤甸潰涓煡鐪嬫垨缂栬緫鏈湴瀛樺偍杩囩▼銆�</div>
+ <Button type="primary" onClick={() => {window.open('#/proc')}}>
+ 缂栬緫
+ </Button>
+ </div> : null}
+ </div>
{/* 缂栬緫鑿滃崟 */}
- {this.props.editLevel === 'level1' ? <EditMenu menulist={this.state.menulist} reload={this.reload} exitEdit={this.exitEdit}/> : null}
+ {editLevel === 'level1' ? <EditMenu menulist={this.state.menulist} reload={this.reload} exitEdit={this.exitEdit}/> : null}
{/* 澶村儚銆佺敤鎴峰悕 */}
- <Dropdown className="header-setting" overlay={menu}>
- <div>
+ <Dropdown className="header-setting" overlay={
+ <Menu className="header-dropdown">
+ <Menu.Item key="switch">
+ 缂栬緫
+ <Switch size="small" style={{marginLeft: '7px'}} disabled={!!editLevel} checked={true} onChange={this.changeEditState} />
+ </Menu.Item>
+ <Menu.Item key="doc" onClick={this.gotoDoc}>鏂囨。涓績</Menu.Item>
+ {options.sysType !== 'cloud' ? <Menu.Item style={{padding: 0}} key="verup">
+ <VersionsUp />
+ </Menu.Item> : null}
+ <Menu.Item key="logout" onClick={this.logout}>閫�鍑�</Menu.Item>
+ </Menu>
+ }>
+ <div style={{zIndex: 1, position: 'relative'}}>
<img src={this.state.avatar || avatar} alt=""/>
<span>
- <span className="username">{this.state.userName}</span> <Icon type="down" />
+ <span className="username">{this.state.userName}</span> <DownOutlined />
</span>
</div>
</Dropdown>
+ <Modal
+ title="娣诲姞鑿滃崟"
+ visible={visible}
+ onOk={this.addMemuSubmit}
+ confirmLoading={loading}
+ onCancel={() => this.setState({visible: false})}
+ destroyOnClose
+ >
+ <MenuForm
+ menu={null}
+ inputSubmit={this.addMemuSubmit}
+ wrappedComponentRef={(inst) => this.addMenuFormRef = inst}
+ />
+ </Modal>
</header>
)
}
@@ -366,18 +545,14 @@
const mapStateToProps = (state) => {
return {
- tabviews: state.tabviews,
menuTree: state.menuTree,
mainMenu: state.mainMenu,
- editLevel: state.editLevel,
- permAction: state.permAction,
- memberLevel: state.memberLevel
+ editLevel: state.editLevel
}
}
const mapDispatchToProps = (dispatch) => {
return {
- modifyTabview: (tabviews) => dispatch(modifyTabview(tabviews)),
modifyMenuTree: (menuTree) => dispatch(modifyMenuTree(menuTree)),
modifyMainMenu: (mainMenu) => dispatch(modifyMainMenu(mainMenu)),
resetEditLevel: (level) => dispatch(resetEditLevel(level)),
@@ -385,4 +560,4 @@
}
}
-export default withRouter(connect(mapStateToProps, mapDispatchToProps)(Form.create()(Header)))
\ No newline at end of file
+export default withRouter(connect(mapStateToProps, mapDispatchToProps)(Header))
\ No newline at end of file
--
Gitblit v1.8.0