From 21d92eff0e23974d76e3e5a79ba50e3fc1c0b879 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 15 四月 2022 01:08:15 +0800
Subject: [PATCH] 2022-04-15
---
src/views/rolemanage/index.jsx | 37 +++++++++++++++++++++++++++----------
1 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/src/views/rolemanage/index.jsx b/src/views/rolemanage/index.jsx
index 06a4db8..1b0eda4 100644
--- a/src/views/rolemanage/index.jsx
+++ b/src/views/rolemanage/index.jsx
@@ -101,7 +101,7 @@
})
}
- getMenuList = (reset) => {
+ getMenuList = (reset, resolve) => {
const { app } = this.state
let param = {
func: 's_get_app_menus',
@@ -114,9 +114,11 @@
param.secretkey = Utils.encrypt(param.LText, param.timestamp)
- this.setState({
- loading: true
- })
+ if (!resolve) {
+ this.setState({
+ loading: true
+ })
+ }
Api.getCloudConfig(param).then(result => {
if (result.status) {
@@ -130,7 +132,10 @@
try {
let pageParam = JSON.parse(window.decodeURIComponent(window.atob(item.menus_rolelist)))
item.nodes = pageParam
- if (pageParam.login) {
+
+ if (pageParam.version !== '1.0') {
+ item.nodes = ''
+ } else if (pageParam.login || pageParam.pass) {
item.nodes = ''
} else if (pageParam.type === 'navbar') {
item.type = 'navbar'
@@ -141,6 +146,8 @@
} catch (e) {
item.nodes = ''
}
+
+ delete item.menus_rolelist
}
if (!ub && app.userbind === item.MenuID) {
@@ -163,7 +170,9 @@
this.setState({
menulist: menus
}, () => {
- if (reset && (!this.oriTrees || this.oriTrees.length === 0)) {
+ if (resolve) {
+ this.initMenutree(resolve)
+ } else if (reset && (!this.oriTrees || this.oriTrees.length === 0)) {
this.initMenutree()
} else if (!reset && this.oriTrees && this.oriTrees.length === 0) {
this.initMenutree()
@@ -503,14 +512,22 @@
try {
let pageParam = JSON.parse(window.decodeURIComponent(window.atob(item.menus_rolelist)))
item.nodes = pageParam
- if (pageParam.login) {
+
+ if (pageParam.version !== '1.0') {
+ item.nodes = ''
+ } else if (pageParam.login || pageParam.pass) {
item.nodes = ''
} else if (pageParam.type === 'navbar') {
item.type = 'navbar'
+ } else if (pageParam.type === 'im') {
+ item.type = 'im'
+ item.nodes = ''
}
} catch (e) {
item.nodes = ''
}
+
+ delete item.menus_rolelist
}
if (targetKeys.includes(item.MenuID) && item.nodes && item.nodes.popviews && item.nodes.popviews.length > 0) {
@@ -645,10 +662,10 @@
initTree = () => {
const _this = this
confirm({
- content: '鍒濆鍖栦細鏍规嵁鑿滃崟閲嶇疆鏉冮檺鏍戯紝纭畾鎵ц鍚楋紵',
+ content: '鏉冮檺鏍戜細閲嶆柊鐢熸垚锛岀‘瀹氭墽琛屽悧锛�',
onOk() {
return new Promise(resolve => {
- _this.initMenutree(resolve)
+ _this.getMenuList(true, resolve)
})
},
onCancel() {}
@@ -889,7 +906,7 @@
</div>
<div className="right-view">
<div className="app-action">
- <Button className="mk-primary" onClick={this.initTree}>鍚屾</Button>
+ <Button className="mk-primary" onClick={this.initTree}>閲嶇疆</Button>
{/* <Button className="mk-purple" onClick={this.syncTree}>鍚屾</Button> */}
<Button className="mk-green save" onClick={this.saveTree}>淇濆瓨</Button>
</div>
--
Gitblit v1.8.0