From 569ccb3c1ff82f30ffefa7d3700571448d742662 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 03 十二月 2020 11:46:28 +0800
Subject: [PATCH] 2020-12-03
---
src/components/header/index.jsx | 21 +++++++--------------
1 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/src/components/header/index.jsx b/src/components/header/index.jsx
index 7d2eb82..486af95 100644
--- a/src/components/header/index.jsx
+++ b/src/components/header/index.jsx
@@ -15,7 +15,6 @@
resetState,
resetEditState,
resetEditLevel,
- initPermission,
modifyDataManager,
initActionPermission,
initMenuPermission,
@@ -254,7 +253,7 @@
this.props.modifyMenuTree(res.menulist)
this.props.modifyMainMenu(mainMenu)
- this.props.initMenuPermission(res.permMenus)
+ this.props.initMenuPermission(res.thdMenuList)
resolve(_menu)
})
@@ -279,7 +278,6 @@
getMenulist = (result) => {
let thdMenuList = []
- let permMenus = {}
let iframes = ['Main/Index', 'bda/rdt', 'Home/rdt']
let menulist = result.fst_menu.map(fst => {
let fstItem = {
@@ -384,7 +382,6 @@
}
}
- permMenus[trd.MenuID] = true
thdMenuList.push(trdItem)
return trdItem
@@ -398,7 +395,7 @@
return fstItem
})
- return { menulist, thdMenuList, permMenus}
+ return { menulist, thdMenuList }
}
reload = () => {
@@ -473,7 +470,8 @@
_permFuncField = _permFuncField.sort()
}
- this.props.initPermission(_sysRoles, _permFuncField)
+ sessionStorage.setItem('sysRoles', JSON.stringify(_sysRoles))
+ sessionStorage.setItem('permFuncField', JSON.stringify(_permFuncField))
}
})
}
@@ -569,6 +567,7 @@
this.props.modifyMainMenu(menulist[0] || null)
this.props.resetEditLevel(false)
+ this.props.modifyTabview([])
}
exitEdit = () => {
@@ -596,10 +595,7 @@
if (visible) {
setTimeout(() => {
let input = document.getElementById('thdMenu-search')
-
- if (input) {
- input.focus()
- }
+ input && input.focus()
}, 500)
}
})
@@ -844,9 +840,7 @@
editState: state.editState,
editLevel: state.editLevel,
permAction: state.permAction,
- sysRoles: state.sysRoles,
- memberLevel: state.memberLevel,
- permFuncField: state.permFuncField
+ memberLevel: state.memberLevel
}
}
@@ -859,7 +853,6 @@
resetEditState: (state) => dispatch(resetEditState(state)),
resetEditLevel: (level) => dispatch(resetEditLevel(level)),
initActionPermission: (permAction) => dispatch(initActionPermission(permAction)),
- initPermission: (sysRoles, permFuncField) => dispatch(initPermission(sysRoles, permFuncField)),
initMenuPermission: (permMenus) => dispatch(initMenuPermission(permMenus)),
modifyDataManager: (dataManager) => dispatch(modifyDataManager(dataManager)),
resetState: () => dispatch(resetState()),
--
Gitblit v1.8.0