From 68f84129b685aa9539ac38ca1cf1f164c4d58074 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 26 一月 2021 13:54:26 +0800
Subject: [PATCH] 2021-01-26
---
src/tabviews/commontable/index.jsx | 26 ++++++++++++--------------
1 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/src/tabviews/commontable/index.jsx b/src/tabviews/commontable/index.jsx
index efd9db8..492ca22 100644
--- a/src/tabviews/commontable/index.jsx
+++ b/src/tabviews/commontable/index.jsx
@@ -343,19 +343,13 @@
let valid = true // 鎼滅储鏉′欢蹇呭～楠岃瘉, 鍒濆鎼滅储鏉′欢, 濡傞�氳繃涓婄骇閫忚锛屽啓鍏ユ悳绱㈡潯浠�
let hasReqFields = false
- let initSearch = config.search.map(item => {
- let _item = fromJS(item).toJS()
-
- if (_item.required === 'true' && !_item.initval) {
+ config.search.forEach(item => {
+ if (item.required !== 'true') return
+ if (!item.initval) {
valid = false
}
- if (_item.required === 'true') {
- hasReqFields = true
- }
- return _item
+ hasReqFields = true
})
-
- initSearch = Utils.initMainSearch(initSearch)
this.setState({
loadingview: false,
@@ -370,7 +364,7 @@
columns: _columns,
arr_field: _arrField.join(','),
BID: param && param.BID ? param.BID : '',
- search: Utils.initMainSearch(initSearch), // 鎼滅储鏉′欢鍒濆鍖栵紙鍚湁鏃堕棿鏍煎紡锛岄渶瑕佽浆鍖栵級
+ search: Utils.initMainSearch(config.search), // 鎼滅储鏉′欢鍒濆鍖栵紙鍚湁鏃堕棿鏍煎紡锛岄渶瑕佽浆鍖栵級
hasReqFields
}, () => {
if (config.setting.onload !== 'false' && valid) { // 鍒濆鍖栧彲鍔犺浇
@@ -433,8 +427,12 @@
}
loadData = () => {
- const { setting, search, BIDs, loadCustomApi } = this.state
- let requireFields = search.filter(item => item.required && (!item.value || item.value.length === 0))
+ const { setting, search, BIDs, loadCustomApi, hasReqFields } = this.state
+ let requireFields = []
+
+ if (hasReqFields) {
+ requireFields = search.filter(item => item.required && (!item.value || item.value.length === 0))
+ }
this.setState({
selectedData: [],
@@ -544,7 +542,7 @@
let error = '鏈煡鐨勮繑鍥炵粨鏋滐紒'
if (typeof(res) === 'string') {
- error = res
+ error = res.replace(/'/ig, '"')
}
let _result = {
--
Gitblit v1.8.0