From 69cd43786253e299f6856a200554ae7fc0621877 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 27 六月 2021 21:26:20 +0800
Subject: [PATCH] 2021-06-27
---
src/tabviews/subtabtable/index.jsx | 30 ++++++++++--------------------
1 files changed, 10 insertions(+), 20 deletions(-)
diff --git a/src/tabviews/subtabtable/index.jsx b/src/tabviews/subtabtable/index.jsx
index 67dca7c..58454ec 100644
--- a/src/tabviews/subtabtable/index.jsx
+++ b/src/tabviews/subtabtable/index.jsx
@@ -136,17 +136,17 @@
config.action = config.action.filter(item => permAction[item.uuid])
}
- let roleId = sessionStorage.getItem('role_id') || '' // 瑙掕壊ID
- // 瀛楁鏉冮檺榛戝悕鍗�
- config.search = config.search.filter(item => {
- item.oriInitval = item.initval
- if (!item.blacklist || item.blacklist.length === 0) return item
- if (item.blacklist.filter(v => roleId.indexOf(v) > -1).length > 0) {
- item.Hide = 'true'
- }
+ config.search = Utils.initSearchVal(config.search)
- return item
+ let hasReqFields = false
+ config.search.forEach(field => {
+ if (field.required) {
+ hasReqFields = true
+ }
})
+
+ // 瀛楁鏉冮檺榛戝悕鍗�
+ let roleId = sessionStorage.getItem('role_id') || '' // 瑙掕壊ID
config.columns = config.columns.map(col => {
if (!col.blacklist || col.blacklist.length === 0) return col
@@ -235,16 +235,6 @@
_columns.push(config.gridBtn)
}
- let valid = true // 鎼滅储鏉′欢蹇呭～楠岃瘉
- let hasReqFields = false
- config.search.forEach(field => {
- if (field.required !== 'true') return
- hasReqFields = true
- if (!field.initval) {
- valid = false
- }
- })
-
config.setting.tabType = 'subtab'
// 鏁版嵁婧愪俊鎭澶勭悊
config.setting.laypage = config.setting.laypage !== 'false' // 鏄惁鍒嗛〉锛岃浆涓篵oolean 缁熶竴鏍煎紡
@@ -317,7 +307,7 @@
search: Utils.initMainSearch(config.search), // 鎼滅储鏉′欢鍒濆鍖栵紙鍚湁鏃堕棿鏍煎紡锛岄渶瑕佽浆鍖栵級
hasReqFields
}, () => {
- if (config.setting.onload !== 'false' && valid) { // 鍒濆鍖栧彲鍔犺浇
+ if (config.setting.onload !== 'false') { // 鍒濆鍖栧彲鍔犺浇
this.loadData()
}
})
--
Gitblit v1.8.0