From d441fa1e1cc80f4ea462a750a42a2b25c1f2b202 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 04 十二月 2020 15:17:51 +0800
Subject: [PATCH] 2020-12-04
---
src/tabviews/formtab/index.jsx | 25 +++++++------------------
1 files changed, 7 insertions(+), 18 deletions(-)
diff --git a/src/tabviews/formtab/index.jsx b/src/tabviews/formtab/index.jsx
index 89ab064..3c78b98 100644
--- a/src/tabviews/formtab/index.jsx
+++ b/src/tabviews/formtab/index.jsx
@@ -120,24 +120,15 @@
})
let _arrField = [config.setting.primaryKey] // 瀛楁闆� , 榛樿娣诲姞涓婚敭
+ let roleId = sessionStorage.getItem('role_id') || '' // 瑙掕壊ID
config.groups.forEach(group => {
group.sublist = group.sublist.filter(item => {
+ item.field && _arrField.push(item.field)
if (!item.blacklist || item.blacklist.length === 0) {
- _arrField.push(item.field)
return true
}
-
- let _black = item.blacklist.filter(v => {
- return this.props.permRoles.indexOf(v) !== -1
- })
-
- if (_black.length > 0) {
- return false
- } else {
- _arrField.push(item.field)
- return true
- }
+ return item.blacklist.filter(v => roleId.indexOf(v) > -1).length === 0
})
})
_arrField = _arrField.join(',')
@@ -207,7 +198,7 @@
arr_field: _option.field
}
- if (this.props.dataManager) { // 鏁版嵁鏉冮檺
+ if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
param.LText = param.LText.replace(/\$@/ig, '/*')
param.LText = param.LText.replace(/@\$/ig, '*/')
} else {
@@ -334,7 +325,7 @@
if (!param) return // 鏈幏鍙栧弬鏁版椂锛屼笉鍙戣姹�
// 鏁版嵁绠＄悊鏉冮檺
- if (this.props.dataManager) {
+ if (sessionStorage.getItem('dataM') === 'true') {
param.dataM = 'Y'
}
@@ -424,7 +415,7 @@
_dataresource = '(' + _dataresource + ') tb'
}
- if (this.props.dataManager) { // 鏁版嵁鏉冮檺
+ if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
_dataresource = _dataresource.replace(/\$@/ig, '/*')
_dataresource = _dataresource.replace(/@\$/ig, '*/')
// param.custom_script = param.custom_script.replace(/\$@/ig, '/*')
@@ -709,9 +700,7 @@
return {
menuType: state.editLevel,
tabviews: state.tabviews,
- permAction: state.permAction,
- dataManager: state.dataManager,
- permRoles: state.permRoles
+ permAction: state.permAction
}
}
--
Gitblit v1.8.0