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/calendar/index.jsx | 36 ++++++++++++++----------------------
1 files changed, 14 insertions(+), 22 deletions(-)
diff --git a/src/tabviews/calendar/index.jsx b/src/tabviews/calendar/index.jsx
index c1f446a..2c7700f 100644
--- a/src/tabviews/calendar/index.jsx
+++ b/src/tabviews/calendar/index.jsx
@@ -119,26 +119,18 @@
config.easyCode = _curUserConfig.easyCode || config.easyCode || ''
}
- // 瀛楁鏉冮檺榛戝悕鍗曘�佸繀濉�佸瓧娈甸�忚
- let valid = true
- let roleId = sessionStorage.getItem('role_id') || ''
- config.search = config.search.map(item => {
- item.oriInitval = item.initval
- if (['text', 'select', 'link'].includes(item.type) && param && param.$searchkey === item.field) {
- item.initval = param.$searchval
- }
+ config.search = Utils.initSearchVal(config.search)
- if (item.required === 'true' && !item.initval) {
- valid = false
- }
-
- if (!item.blacklist || item.blacklist.length === 0) return item
- if (item.blacklist.filter(v => roleId.indexOf(v) > -1).length > 0) {
- item.Hide = 'true'
- }
-
- return item
- })
+ // 瀛楁閫忚
+ if (param && param.$searchkey) {
+ config.search = config.search.map(item => {
+ if (['text', 'select', 'link'].includes(item.type) && param.$searchkey === item.field) {
+ item.initval = param.$searchval
+ }
+
+ return item
+ })
+ }
// 鏁版嵁婧�
if (config.setting.interType === 'inner' && !config.setting.innerFunc) {
@@ -211,9 +203,9 @@
setting: config.setting,
searchlist: config.search,
arr_field: config.columns.map(item => item.field).join(','),
- search: Utils.initMainSearch(config.search) // 鎼滅储鏉′欢鍒濆鍖栵紙鍚湁鏃堕棿鏍煎紡锛岄渶瑕佽浆鍖栵級
+ search: Utils.initMainSearch(config.search)
}, () => {
- if (config.setting.onload !== 'false' && valid) { // 鍒濆鍖栧彲鍔犺浇
+ if (config.setting.onload !== 'false') {
this.loadmaindata()
}
})
@@ -236,7 +228,7 @@
async loadmaindata () {
const { setting, search, BID } = this.state
let param = ''
- let requireFields = search.filter(item => item.required && (!item.value || item.value.length === 0))
+ let requireFields = search.filter(item => item.required && item.value === '')
if (requireFields.length > 0) {
return
--
Gitblit v1.8.0