From 3c26f581cd77bed95cc56464f8424993f3c6b13a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 28 六月 2021 18:45:44 +0800
Subject: [PATCH] 2021-06-28
---
src/tabviews/calendar/index.jsx | 34 +++++++++++++++++++++-------------
1 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/src/tabviews/calendar/index.jsx b/src/tabviews/calendar/index.jsx
index 2c7700f..b8b7c2a 100644
--- a/src/tabviews/calendar/index.jsx
+++ b/src/tabviews/calendar/index.jsx
@@ -48,6 +48,7 @@
visible: false, // 鏍囩椤垫帶鍒�
triggerTime: '', // 鐐瑰嚮鏃堕棿
calendarYear: moment().format('YYYY'), // 鏃ュ巻骞翠唤
+ hasReqFields: false
}
/**
@@ -122,15 +123,18 @@
config.search = Utils.initSearchVal(config.search)
// 瀛楁閫忚
- 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
- })
- }
+ let hasReqFields = false
+ config.search = config.search.map(item => {
+ if (['text', 'select', 'link'].includes(item.type) && param.$searchkey === item.field) {
+ item.initval = param.$searchval
+ }
+
+ if (item.required) {
+ hasReqFields = true
+ }
+
+ return item
+ })
// 鏁版嵁婧�
if (config.setting.interType === 'inner' && !config.setting.innerFunc) {
@@ -196,6 +200,7 @@
}
this.setState({
+ hasReqFields,
BID: param && param.$BID ? param.$BID : '',
loadingview: false,
config: config,
@@ -226,12 +231,15 @@
* @description 涓昏〃鏁版嵁鍔犺浇
*/
async loadmaindata () {
- const { setting, search, BID } = this.state
+ const { setting, search, BID, hasReqFields } = this.state
let param = ''
- let requireFields = search.filter(item => item.required && item.value === '')
- if (requireFields.length > 0) {
- return
+ if (hasReqFields) {
+ let requireFields = search.filter(item => item.required && item.value === '')
+
+ if (requireFields.length > 0) {
+ return
+ }
}
this.setState({
--
Gitblit v1.8.0