From a99caad99c3c19e85edd03f2fe425a0630033ac5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 20 十一月 2024 16:09:11 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/views/rolemanage/index.jsx | 20 ++------------------
1 files changed, 2 insertions(+), 18 deletions(-)
diff --git a/src/views/rolemanage/index.jsx b/src/views/rolemanage/index.jsx
index 2bd8b09..736c83f 100644
--- a/src/views/rolemanage/index.jsx
+++ b/src/views/rolemanage/index.jsx
@@ -30,7 +30,7 @@
if (record.extra || this.state.appKeys.includes(record.MenuID)) {
return <span className={className} style={{color: '#1890ff'}}>{text}</span>
} else if (record.interfaces === 'true' || record.msg === 'true' || record.pds === 'true') {
- return <span className={className}>{record.interfaces === 'true' ? <ApiOutlined style={{color: 'orange', marginRight: '5px'}} title="鑿滃崟涓娇鐢ㄤ簡澶栭儴鎺ュ彛" /> : null}{record.msg === 'true' ? <SoundOutlined style={{color: 'orange', marginRight: '5px'}} title="鑿滃崟涓彂閫佷簡娑堟伅" /> : null}{text}{record.pds === 'true' ? <DatabaseOutlined style={{marginLeft: '5px'}} title="鑿滃崟涓娇鐢ㄤ簡鍏叡鏁版嵁婧�" /> : null}</span>
+ return <span className={className}>{record.interfaces === 'true' ? <ApiOutlined style={{color: 'orange', marginRight: '5px'}} title="鑿滃崟涓娇鐢ㄤ簡澶栭儴鎺ュ彛" /> : null}{record.msg === 'true' ? <SoundOutlined style={{color: 'orange', marginRight: '5px'}} title="鑿滃崟涓彂閫佷簡娑堟伅" /> : null}{text}{record.pds === 'true' ? <DatabaseOutlined style={{color: 'orange', marginLeft: '5px'}} title="鑿滃崟涓娇鐢ㄤ簡鍏叡鏁版嵁婧�" /> : null}</span>
}
return <span className={className}>{text}</span>
}
@@ -148,7 +148,6 @@
Api.getCloudConfig(param).then(result => {
if (result.status) {
let ub = app.user_binding === 'true' && app.userbind ? false : true
- let im = app.instantMessage ? false : true
let menus = result.menus.map(item => {
item.nodes = ''
@@ -166,15 +165,13 @@
item.type = pageParam.type
}
- if (item.type === 'navbar' || item.type === 'im') {
+ if (item.type === 'navbar') {
item.backend = 'level1'
}
if (pageParam.version !== '1.0') {
item.nodes = ''
} else if (pageParam.login || pageParam.pass) {
- item.nodes = ''
- } else if (pageParam.type === 'im') {
item.nodes = ''
}
} catch (e) {
@@ -188,17 +185,10 @@
item.extra = true
ub = true
}
- if (app.instantMessage === item.MenuID) {
- item.extra = true
- im = true
- }
return item
})
- if (!im) {
- menus.push({nodes: '', type: 'none', backend: 'level1', extra: true, MenuID: app.instantMessage, MenuName: '鍗虫椂閫氫俊'})
- }
if (!ub) {
menus.push({nodes: '', type: 'none', backend: 'level1', extra: true, MenuID: app.userbind, MenuName: '鐢ㄦ埛缁戝畾'})
}
@@ -554,8 +544,6 @@
item.nodes = ''
} else if (pageParam.login || pageParam.pass) {
item.nodes = ''
- } else if (pageParam.type === 'im') {
- item.nodes = ''
}
} catch (e) {
item.nodes = ''
@@ -893,10 +881,6 @@
duration: 5
})
return
- }
-
- if (app.instantMessage && item.MenuID === app.instantMessage) {
- route = 'imdesign'
}
window.open(window.location.href.replace(/#.+/ig, `#/${route}/${window.btoa(window.encodeURIComponent(JSON.stringify({...app, MenuID: item.MenuID, type: 'app'})))}`))
--
Gitblit v1.8.0