From f3d4db769ba9b51b799d981511a710fd443d0e08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 四月 2025 12:18:03 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/rolemanage/index.jsx | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/src/tabviews/rolemanage/index.jsx b/src/tabviews/rolemanage/index.jsx
index f7b8453..7e80fd8 100644
--- a/src/tabviews/rolemanage/index.jsx
+++ b/src/tabviews/rolemanage/index.jsx
@@ -106,7 +106,8 @@
*/
getMainMenuList = async () => {
let param = {
- func: 's_rolemenu_get_FstMenu'
+ func: 's_rolemenu_get_FstMenu',
+ version: 1
}
let result = await Api.getSystemConfig(param)
@@ -116,7 +117,7 @@
loading: false,
mainMenus: result.data.map(item => {
return {
- title: item.MenuName,
+ title: item.langname ? item.MenuName + '(' + item.langname + ')' : item.MenuName,
key: item.MenuID,
children: [],
selected: true
@@ -146,7 +147,8 @@
let param = {
func: 's_rolemenu_get_FunMenu',
RoleID: selectRoleId,
- SelectedType: ''
+ SelectedType: '',
+ version: 1
}
let result = await Api.getSystemConfig(param)
@@ -160,9 +162,19 @@
// item.ParentID = item.TypeCharOne
// }
// })
+ // let map = new Map() // 鍘婚噸
+
+ // result.data = result.data.filter(item => {
+ // if (map.has(item.ParentID + item.MenuID)) return false
+
+ // map.set(item.ParentID + item.MenuID, true)
+
+ // return true
+ // })
+
let _tree = this.getTree(fromJS(mainMenus).toJS(), result.data)
if (_tree[0]) {
- if (_tree[0].key === 'PC' && _tree[0].children) {
+ if (_tree[0].key.indexOf('PC') > -1 && _tree[0].children) {
// _openKeys = _tree[0].children.map(cell => cell.key)
this.getOpenNode(_tree[0].children[0], _openKeys)
} else {
@@ -215,7 +227,7 @@
this.getCheckedKeys(fromJS(menuTrees).toJS(), _initKeys)
if (menuTrees[0]) {
- if (menuTrees[0].key === 'PC' && menuTrees[0].children) {
+ if (menuTrees[0].key.indexOf('PC') > -1 && menuTrees[0].children) {
this.getOpenNode(menuTrees[0].children[0], _openKeys)
} else {
this.getOpenNode(menuTrees[0], _openKeys)
@@ -227,7 +239,7 @@
let _tree = this.getSelectTree(fromJS(menuTrees).toJS(), Keys)
if (_tree[0]) {
- if (_tree[0].key === 'PC' && _tree[0].children) {
+ if (_tree[0].key.indexOf('PC') > -1 && _tree[0].children) {
this.getOpenNode(_tree[0].children[0], _openkeys)
} else {
this.getOpenNode(_tree[0], _openkeys)
--
Gitblit v1.8.0