From 9a1416e0b5cdb40f49b3c2061b04b35551d77e99 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 19 九月 2023 18:14:21 +0800
Subject: [PATCH] 2023-09-19
---
src/menu/datasource/verifycard/customscript/index.jsx | 75 ++++++++++---------------------------
1 files changed, 21 insertions(+), 54 deletions(-)
diff --git a/src/menu/datasource/verifycard/customscript/index.jsx b/src/menu/datasource/verifycard/customscript/index.jsx
index 5babfa1..aee86c2 100644
--- a/src/menu/datasource/verifycard/customscript/index.jsx
+++ b/src/menu/datasource/verifycard/customscript/index.jsx
@@ -33,74 +33,41 @@
UNSAFE_componentWillMount() {
const { searches } = this.props
+ this.getSearchField(searches)
+ }
+
+ UNSAFE_componentWillReceiveProps (nextProps) {
+ if (!is(fromJS(this.props.searches), fromJS(nextProps.searches))) {
+ this.getSearchField(nextProps.searches)
+ }
+ }
+
+ getSearchField = (searches) => {
let _usefulFields = []
searches.forEach(item => {
- if (!item.field) return
-
- if (item.type === 'group') {
- _usefulFields.push(item.field)
- _usefulFields.push(item.datefield)
- _usefulFields.push(item.datefield + '1')
- } else if (['dateweek', 'datemonth'].includes(item.type)) {
- _usefulFields.push(item.field)
- _usefulFields.push(item.field + '1')
+ if (['dateweek', 'datemonth'].includes(item.type)) {
+ _usefulFields.push(item.key)
+ _usefulFields.push(item.key + '1')
} else if (item.type === 'daterange') {
- let _skey = item.field
- let _ekey = item.field + '1'
+ let _skey = item.key
+ let _ekey = item.key + '1'
- if (/,/.test(item.field)) {
- _skey = item.field.split(',')[0]
- _ekey = item.field.split(',')[1]
+ if (/,/.test(item.key)) {
+ _skey = item.key.split(',')[0]
+ _ekey = item.key.split(',')[1]
}
_usefulFields.push(_skey)
_usefulFields.push(_ekey)
- } else if (item.type === 'date' && _usefulFields.includes(item.field)) {
- _usefulFields.push(item.field + '1')
+ } else if (item.type === 'date' && _usefulFields.includes(item.key)) {
+ _usefulFields.push(item.key + '1')
} else {
- _usefulFields.push(item.field)
+ _usefulFields.push(item.key)
}
})
this.setState({
usefulFields: _usefulFields.join(', ')
})
- }
-
- UNSAFE_componentWillReceiveProps (nextProps) {
- if (!is(fromJS(this.props.searches), fromJS(nextProps.searches))) {
-
- let _usefulFields = []
- nextProps.searches.forEach(item => {
- if (!item.field) return
-
- if (item.type === 'group') {
- _usefulFields.push(item.field)
- _usefulFields.push(item.datefield)
- _usefulFields.push(item.datefield + '1')
- } else if (['dateweek', 'datemonth'].includes(item.type)) {
- _usefulFields.push(item.field)
- _usefulFields.push(item.field + '1')
- } else if (item.type === 'daterange') {
- let _skey = item.field
- let _ekey = item.field + '1'
-
- if (/,/.test(item.field)) {
- _skey = item.field.split(',')[0]
- _ekey = item.field.split(',')[1]
- }
- _usefulFields.push(_skey)
- _usefulFields.push(_ekey)
- } else if (item.type === 'date' && _usefulFields.includes(item.field)) {
- _usefulFields.push(item.field + '1')
- } else {
- _usefulFields.push(item.field)
- }
- })
-
- this.setState({
- usefulFields: _usefulFields.join(', ')
- })
- }
}
edit = (record) => {
--
Gitblit v1.8.0