From 9a82bce9cf0ed4a51c1b0b0669eaa38cedbace07 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 16 七月 2020 16:35:58 +0800
Subject: [PATCH] 2020-07-16
---
src/components/header/index.jsx | 522 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 452 insertions(+), 70 deletions(-)
diff --git a/src/components/header/index.jsx b/src/components/header/index.jsx
index 346762c..c34965b 100644
--- a/src/components/header/index.jsx
+++ b/src/components/header/index.jsx
@@ -4,30 +4,36 @@
import {connect} from 'react-redux'
import { is, fromJS } from 'immutable'
import moment from 'moment'
-import {Dropdown, Menu, Icon, Modal, Form, notification, Switch } from 'antd'
+import {Dropdown, Menu, Icon, Modal, Form, notification, Switch, Button, Input } from 'antd'
+
import asyncComponent from '@/utils/asyncComponent'
import {
toggleCollapse,
modifyMainMenu,
+ modifyTabview,
resetState,
resetDebug,
resetEditState,
resetEditLevel,
initPermission,
+ modifyDataManager,
+ initActionPermission,
+ initMenuPermission,
logout
} from '@/store/action'
import Api from '@/api'
-import zhCN from '@/locales/zh-CN/header.js'
-import enUS from '@/locales/en-US/header.js'
+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 logourl from '@/assets/img/main-logo.png'
import avatar from '@/assets/img/avatar.jpg'
import Resetpwd from './resetpwd'
import LoginForm from './loginform'
import './index.scss'
-const EditMenu = asyncComponent(() => import('./editmenu'))
+const EditMenu = asyncComponent(() => import('@/templates/headerconfig'))
const { confirm } = Modal
+const { Search } = Input
class Header extends Component {
static propTpyes = {
@@ -40,20 +46,23 @@
state = {
menulist: null, // 涓�绾ц彍鍗�
visible: false, // 淇敼瀵嗙爜妯℃�佹
- dict: (!localStorage.getItem('lang') || localStorage.getItem('lang') === 'zh-CN') ? zhCN : enUS,
+ dict: localStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
confirmLoading: false,
userName: sessionStorage.getItem('User_Name'),
- logourl: window.GLOB.mainlogo || logourl,
+ logourl: window.GLOB.mainlogo,
loginVisible: false,
loginLoading: false,
avatar: avatar,
- systems: []
+ systems: [],
+ searchkey: '',
+ thdMenuList: []
}
handleCollapse = () => {
// 灞曞紑銆佹敹璧峰乏渚ц彍鍗曟爮
if (!this.props.editState) {
this.props.toggleCollapse(!this.props.collapse)
+ localStorage.setItem('collapse', !this.props.collapse)
}
}
@@ -83,28 +92,23 @@
_param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000' // 鏃堕棿鎴�
_param.secretkey = Utils.encrypt(_param.LText, _param.timestamp) // md5瀵嗛挜
- let localResult = await Api.getLocalConfig(_param)
- let result = {status: true}
+ let result = await Api.getSystemConfig(_param) // 鍙栨秷淇敼鏈湴瀵嗙爜锛屽彧淇敼鍗曠偣鏈嶅姟鍣�
- if (window.GLOB.mainSystemApi && window.GLOB.subSystemApi !== window.GLOB.mainSystemApi) {
- result = await Api.getSystemConfig(_param)
- }
-
- if (result.status && localResult.status) {
+ if (result.status) {
this.setState({
visible: false,
confirmLoading: false
})
notification.success({
top: 92,
- message: this.state.dict['header.password.resetsuccess'],
+ message: this.state.dict['main.password.resetsuccess'],
duration: 2
})
} else {
notification.warning({
top: 92,
- message: result.message || localResult.message,
- duration: 10
+ message: result.message,
+ duration: 5
})
this.setState({
confirmLoading: false
@@ -123,10 +127,10 @@
// 閫�鍑虹櫥褰�
let _this = this
confirm({
- title: this.state.dict['header.logout.hint'],
+ title: this.state.dict['main.logout.hint'],
content: '',
- okText: this.state.dict['header.confirm'],
- cancelText: this.state.dict['header.cancel'],
+ okText: this.state.dict['main.confirm'],
+ cancelText: this.state.dict['main.cancel'],
onOk() {
sessionStorage.clear()
_this.props.logout()
@@ -151,7 +155,19 @@
async loadmenu () {
// 鑾峰彇涓昏彍鍗�
- let result = await Api.getSystemConfig({func: 'sPC_Get_MainMenu'})
+ 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()
@@ -184,38 +200,113 @@
}),
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: 15
+ duration: 10
})
}
}
async getRolesMenu () {
- // 鑾峰彇涓昏彍鍗�
- let result = await Api.getSystemConfig({func: 'sPC_Get_RolesMenu'})
- if (result.status) {
- let _permAction = {}
- let _permFuncField = []
- if (result.UserRoles && result.UserRoles[0] && result.UserRoles[0].RoleMenu) {
- result.UserRoles[0].RoleMenu.forEach(menu => {
- _permAction[menu.MenuID] = true
- })
- }
+ // 鑾峰彇瑙掕壊鏉冮檺
+ 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)
- if (result.sModular && result.sModular.length > 0) {
- result.sModular.forEach(field => {
- if (field.ModularNo) {
- _permFuncField.push(field.ModularNo)
+ role.RoleMenu.forEach(menu => {
+ if (!menu.MenuID) return
+ _permAction[menu.MenuID] = true
+ })
+ })
}
- })
- _permFuncField = _permFuncField.sort()
+ } else if (result) {
+ notification.error({
+ top: 92,
+ message: result.message,
+ duration: 10
+ })
+ }
+
+ resolve({permAction: _permAction, permRoles: _permRoles})
+ })
+ })
+
+ // 鑾峰彇涓昏彍鍗曞弬鏁�
+ 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
}
- this.props.initPermission(_permAction, _permFuncField)
+ 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) {
+ notification.error({
+ top: 92,
+ message: result.message,
+ duration: 10
+ })
+ }
+
+ resolve(mainMenu)
+ })
+ })
+
+ let _mainMenu = await promiseMenu
+ if (_mainMenu) {
+ this.props.modifyMainMenu(_mainMenu)
}
+
+ let _role = await promiseRole
+
+ this.props.initActionPermission(_role.permRoles, _role.permAction)
}
reload = () => {
@@ -226,6 +317,13 @@
}
changeEditState = (state) => {
+ const { menulist } = this.state
+
+ if (!state) { // 閫�鍑虹紪杈戯紝椤甸潰鍒锋柊
+ window.location.reload()
+ return
+ }
+
// 淇敼缂栬緫鐘舵��
let UserID = sessionStorage.getItem('CloudUserID')
let LoginUID = sessionStorage.getItem('CloudLoginUID')
@@ -236,12 +334,83 @@
})
} else {
sessionStorage.setItem('isEditState', state)
+ let _userName = sessionStorage.getItem('User_Name')
+ let _avatar = avatar
+
+ if (!state && sessionStorage.getItem('avatar')) {
+ _avatar = Utils.getrealurl(sessionStorage.getItem('avatar')) // 澶村儚
+ } else if (state && sessionStorage.getItem('CloudAvatar')) {
+ _avatar = Utils.getrealurl(sessionStorage.getItem('CloudAvatar')) // 澶村儚
+ }
+
+ 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
+ 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)
+ }
+ })
}
}
@@ -255,12 +424,39 @@
sessionStorage.setItem('CloudUserID', res.UserID)
sessionStorage.setItem('CloudSessionUid', Utils.getuuid())
sessionStorage.setItem('CloudLoginUID', res.LoginUID)
+ sessionStorage.setItem('CloudUserName', res.UserName)
+ sessionStorage.setItem('CloudFullName', res.FullName)
+ sessionStorage.setItem('CloudAvatar', res.icon)
sessionStorage.setItem('isEditState', 'true')
+
+ let _avatar = avatar
+ if (res.icon) {
+ _avatar = Utils.getrealurl(res.icon) // 澶村儚
+ }
+
+ 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.setState({
menulist: null,
loginVisible: false,
- loginLoading: false
+ loginLoading: false,
+ userName: res.UserName,
+ avatar: _avatar
})
this.loadmenu()
this.props.modifyMainMenu('')
@@ -272,7 +468,7 @@
notification.error({
top: 92,
message: res.message,
- duration: 15
+ duration: 10
})
}
})
@@ -282,6 +478,31 @@
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 = () => {
+ if (window.GLOB.systemType === 'production') { // 姝ｅ紡绯荤粺鐗堟湰鍗囩骇鍚庯紝椤甸潰鍒锋柊
+ window.location.reload()
+ return
+ }
+
+ this.props.resetEditState(true)
+ this.props.resetEditLevel(false)
+ this.reload()
}
exitEdit = () => {
@@ -293,6 +514,46 @@
let _param = window.btoa('ud=' + sessionStorage.getItem('UserID') + '&sd=' + sessionStorage.getItem('SessionUid') + '&ld=' + sessionStorage.getItem('LoginUID') + '&un=' + sessionStorage.getItem('User_Name'))
window.location.href = system.LinkUrl1 + '#/ssologin/' + _param
}
+
+ dropdownMenuChange = (visible) => {
+ this.setState({searchkey: ''}, () => {
+ if (visible) {
+ setTimeout(() => {
+ let input = document.getElementById('thdMenu-search')
+
+ if (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 () {
// 缁勪欢鍔犺浇鏃讹紝鑾峰彇鑿滃崟鏁版嵁
@@ -301,59 +562,138 @@
_avatar = Utils.getrealurl(_avatar) // 澶村儚
this.setState({avatar: _avatar})
}
- this.loadmenu()
+ this.getRolesMenu()
}
- UNSAFE_componentWillReceiveProps () {
+ 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']
+
+ result.UserRoles.forEach(role => {
+ role.RoleMenu.forEach(menu => {
+ if (!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
+ }
+
+ 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
+ })
+ }
+ })
}
shouldComponentUpdate (nextProps, nextState) {
return !is(fromJS(this.props), fromJS(nextProps)) || !is(fromJS(this.state), fromJS(nextState))
}
- componentDidMount () {
- this.getRolesMenu()
+ gotoDoc = () => {
+ if (options.sysType === 'local' && window.GLOB.mainSystemApi) {
+ let ssodomain = window.GLOB.mainSystemApi.replace('/webapi/dostars', '')
+ let url = `${ssodomain}/doc/index.html#?appkey=${window.GLOB.appkey}&LoginUID=${sessionStorage.getItem('LoginUID')}`
+ window.open(url)
+ } else if (options.sysType === 'SSO' || options.sysType === 'cloud') {
+ window.open(`${window.location.href.replace(/\/index.html(.*)|\/#(.*)/ig, '')}/doc/index.html#?appkey=${window.GLOB.appkey}&LoginUID=${sessionStorage.getItem('LoginUID')}`)
+ }
}
render () {
+ const { thdMenuList, searchkey } = this.state
+
const menu = (
<Menu overlayclassname="header-dropdown">
{this.props.debug && <Menu.Item key="0">
- {this.state.dict['header.edit']}
+ {this.state.dict['main.edit']}
<Switch size="small" className="edit-switch" disabled={!!this.props.editLevel} checked={this.props.editState} onChange={this.changeEditState} />
</Menu.Item>}
- {!this.props.editState ? <Menu.Item key="1" onClick={this.changePassword}>{this.state.dict['header.password']}</Menu.Item> : null}
+ {!this.props.editState ? <Menu.Item key="1" onClick={this.changePassword}>{this.state.dict['main.password']}</Menu.Item> : null}
{/* {this.state.systems.length > 0 ? <Menu.SubMenu title="鍒囨崲绯荤粺">
{this.state.systems.map((system, index) => (
<Menu.Item className="header-subSystem" key={'sub' + index} onClick={() => {this.changeSystem(system)}}> {system.AppName} </Menu.Item>
))}
</Menu.SubMenu> : null} */}
- <Menu.Item key="2" onClick={this.logout}>{this.state.dict['header.logout']}</Menu.Item>
+ <Menu.Item key="2" onClick={this.gotoDoc}>{this.state.dict['main.doc']}</Menu.Item>
+ <Menu.Item key="3" onClick={this.logout}>{this.state.dict['main.logout']}</Menu.Item>
</Menu>
)
return (
- <header className="header-container ant-menu-dark">
+ <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>
{/* 姝ｅ父鑿滃崟 */}
- {this.props.editLevel !== 'level1' && this.state.menulist &&
- <ul className="header-menu">{
- this.state.menulist.map(item => {
- return (
- <li key={item.MenuID} onClick={() => {this.changeMenu(item)}} className={this.props.selectmenu.MenuID === item.MenuID ? 'active' : ''}>
- <span>{item.MenuName}</span>
- </li>
- )
- })}
- </ul>}
+ {this.props.editLevel !== 'level1' && this.state.menulist ?
+ <ul className={'header-menu ' + this.props.editLevel}>{
+ this.state.menulist.map(item => {
+ return (
+ <li key={item.MenuID} onClick={() => {this.changeMenu(item)}} className={this.props.selectmenu.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" />}
+ {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}/>}
+ {this.props.editLevel === 'level1' ? <EditMenu menulist={this.state.menulist} reload={this.reload} exitEdit={this.exitEdit}/> : null}
{/* 澶村儚銆佺敤鎴峰悕 */}
<Dropdown className="header-setting" overlay={menu}>
<div>
@@ -363,11 +703,47 @@
</span>
</div>
</Dropdown>
+ {/* 鑿滃崟鎼滅储 */}
+ {!this.props.editState && thdMenuList.length > 0 ?
+ <Dropdown overlayClassName="menu-select-dropdown" getPopupContainer={() => document.getElementById('main-header-container')} overlay={
+ <div>
+ <Search
+ placeholder=""
+ id="thdMenu-search"
+ value={searchkey}
+ onChange={e => this.setState({searchkey: e.target.value})}
+ style={{ minWidth: '200px' }}
+ onSearch={(val, e) => {e.stopPropagation()}}
+ onClick={(e) => {e.stopPropagation()}}
+ />
+ <div className="menu-select-box">
+ <Menu>
+ {thdMenuList.map(option => {
+ if (searchkey) {
+ if (
+ option.MenuName.toLowerCase().indexOf(searchkey.toLowerCase()) >= 0 ||
+ 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>
+ } else {
+ return null
+ }
+ }
+ return <Menu.Item key={option.MenuID} onClick={() => this.selectMenu(option)}>{option.MenuName}</Menu.Item>
+ })}
+ </Menu>
+ </div>
+ </div>
+ } trigger={['click']} className="search-menu" placement="bottomRight" onVisibleChange={this.dropdownMenuChange}>
+ <Icon className="search-menu" type="search" />
+ </Dropdown> : null
+ }
{/* 淇敼瀵嗙爜 */}
<Modal
- title={this.state.dict['header.password']}
- okText={this.state.dict['header.confirm']}
- cancelText={this.state.dict['header.cancel']}
+ title={this.state.dict['main.password']}
+ okText={this.state.dict['main.confirm']}
+ cancelText={this.state.dict['main.cancel']}
visible={this.state.visible}
onOk={this.resetPwdSubmit}
confirmLoading={this.state.confirmLoading}
@@ -378,9 +754,9 @@
</Modal>
{/* 缂栬緫鐘舵�佺櫥褰� */}
<Modal
- title={this.state.dict['header.login.develop']}
- okText={this.state.dict['header.confirm']}
- cancelText={this.state.dict['header.cancel']}
+ title={this.state.dict['main.login.develop']}
+ okText={this.state.dict['main.confirm']}
+ cancelText={this.state.dict['main.cancel']}
visible={this.state.loginVisible}
onOk={this.loginSubmit}
width={'430px'}
@@ -397,12 +773,14 @@
const mapStateToProps = (state) => {
return {
+ tabviews: state.tabviews,
collapse: state.collapse,
selectmenu: state.selectedMainMenu,
debug: state.debug,
editState: state.editState,
editLevel: state.editLevel,
permAction: state.permAction,
+ sysRoles: state.sysRoles,
permFuncField: state.permFuncField
}
}
@@ -410,10 +788,14 @@
const mapDispatchToProps = (dispatch) => {
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)),
- initPermission: (permAction, permFuncField) => dispatch(initPermission(permAction, permFuncField)),
+ initActionPermission: (permRoles, permAction) => dispatch(initActionPermission(permRoles, permAction)),
+ initPermission: (sysRoles, permFuncField) => dispatch(initPermission(sysRoles, permFuncField)),
+ initMenuPermission: (permMenus) => dispatch(initMenuPermission(permMenus)),
+ modifyDataManager: (dataManager) => dispatch(modifyDataManager(dataManager)),
resetState: () => dispatch(resetState()),
resetDebug: () => dispatch(resetDebug()),
logout: () => dispatch(logout())
--
Gitblit v1.8.0