From ee50d5424a093209d1c5c549f4578107893b22f8 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 05 十一月 2020 18:40:54 +0800
Subject: [PATCH] 2020-11-05
---
src/menu/datasource/verifycard/customscript/index.jsx | 42 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/src/menu/datasource/verifycard/customscript/index.jsx b/src/menu/datasource/verifycard/customscript/index.jsx
index 996e2ff..39999b7 100644
--- a/src/menu/datasource/verifycard/customscript/index.jsx
+++ b/src/menu/datasource/verifycard/customscript/index.jsx
@@ -1,5 +1,6 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
+import { is, fromJS } from 'immutable'
import { Form, Row, Col, Button, notification, Select } from 'antd'
import Utils from '@/utils/utils.js'
@@ -42,7 +43,7 @@
} else if (['dateweek', 'datemonth', 'daterange'].includes(item.type)) {
_usefulFields.push(item.field)
_usefulFields.push(item.field + '1')
- } else if (_usefulFields.includes(item.field)) {
+ } else if (item.type === 'date' && _usefulFields.includes(item.field)) {
_usefulFields.push(item.field + '1')
} else {
_usefulFields.push(item.field)
@@ -52,6 +53,35 @@
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') {
+ if (item.transfer === 'true') {
+ _usefulFields.push(item.field)
+ }
+ _usefulFields.push(item.datefield)
+ _usefulFields.push(item.datefield + '1')
+ } else if (['dateweek', 'datemonth', 'daterange'].includes(item.type)) {
+ _usefulFields.push(item.field)
+ _usefulFields.push(item.field + '1')
+ } 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) => {
@@ -69,7 +99,7 @@
editItem: null
})
this.props.form.setFieldsValue({
- sql: ''
+ sql: ' '
})
}
@@ -128,9 +158,13 @@
loading: false
})
this.props.form.setFieldsValue({
- sql: ''
+ sql: ' '
})
this.props.scriptSubmit(values)
+ }, () => {
+ this.setState({
+ loading: false
+ })
})
}
})
@@ -185,7 +219,7 @@
</Col>
<Col span={24} className="sqlfield">
<Form.Item label={'鍙敤瀛楁'}>
- id, bid, loginuid, sessionuid, userid, appkey, time_id, calendarDate, calendarDate1{usefulFields ? ', ' + usefulFields : ''}
+ id, bid, loginuid, sessionuid, userid, appkey, time_id{usefulFields ? ', ' + usefulFields : ''}
</Form.Item>
</Col>
<Col span={10}>
--
Gitblit v1.8.0