From 5849fe8dd015b076c303f89233d59561a69571fa Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 25 一月 2021 19:38:26 +0800
Subject: [PATCH] 2021-01-25
---
src/tabviews/commontable/index.jsx | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/tabviews/commontable/index.jsx b/src/tabviews/commontable/index.jsx
index 37c74e9..efd9db8 100644
--- a/src/tabviews/commontable/index.jsx
+++ b/src/tabviews/commontable/index.jsx
@@ -65,7 +65,8 @@
statFields: [], // 鍚堣瀛楁
statFValue: [], // 鍚堣鍊�
absFields: [], // 缁濆鍊煎瓧娈�
- loadCustomApi: true // 鍔犺浇澶栭儴璧勬簮
+ loadCustomApi: true, // 鍔犺浇澶栭儴璧勬簮
+ hasReqFields: false
}
/**
@@ -341,14 +342,20 @@
}
let valid = true // 鎼滅储鏉′欢蹇呭～楠岃瘉, 鍒濆鎼滅储鏉′欢, 濡傞�氳繃涓婄骇閫忚锛屽啓鍏ユ悳绱㈡潯浠�
+ let hasReqFields = false
let initSearch = config.search.map(item => {
let _item = fromJS(item).toJS()
if (_item.required === 'true' && !_item.initval) {
valid = false
}
+ if (_item.required === 'true') {
+ hasReqFields = true
+ }
return _item
})
+
+ initSearch = Utils.initMainSearch(initSearch)
this.setState({
loadingview: false,
@@ -363,7 +370,8 @@
columns: _columns,
arr_field: _arrField.join(','),
BID: param && param.BID ? param.BID : '',
- search: Utils.initMainSearch(initSearch) // 鎼滅储鏉′欢鍒濆鍖栵紙鍚湁鏃堕棿鏍煎紡锛岄渶瑕佽浆鍖栵級
+ search: Utils.initMainSearch(initSearch), // 鎼滅储鏉′欢鍒濆鍖栵紙鍚湁鏃堕棿鏍煎紡锛岄渶瑕佽浆鍖栵級
+ hasReqFields
}, () => {
if (config.setting.onload !== 'false' && valid) { // 鍒濆鍖栧彲鍔犺浇
this.loadData()
@@ -447,7 +455,7 @@
duration: 3
})
return
- } else if (window.GLOB.systemType === 'production' && !setting.proInterface) {
+ } else if (window.GLOB.systemType === 'production' && setting.interType === 'custom' && !setting.proInterface) {
notification.warning({
top: 92,
message: '鏈缃寮忕郴缁熷湴鍧�!',
--
Gitblit v1.8.0