From cf804e19634ff953bb132af1b2f46905d80c1e3a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 12 五月 2021 15:08:34 +0800
Subject: [PATCH] 2021-05-12
---
src/tabviews/zshare/dategroup/index.jsx | 43 +++++++++++--------------------------------
1 files changed, 11 insertions(+), 32 deletions(-)
diff --git a/src/tabviews/zshare/dategroup/index.jsx b/src/tabviews/zshare/dategroup/index.jsx
index 64a37cf..e566a07 100644
--- a/src/tabviews/zshare/dategroup/index.jsx
+++ b/src/tabviews/zshare/dategroup/index.jsx
@@ -88,7 +88,14 @@
}
}
+ UNSAFE_componentWillReceiveProps (nextProps) {
+ if (this.props.reset !== nextProps.reset) {
+ this.reset()
+ }
+ }
+
onChange = (date, type) => {
+ const { card } = this.props
let values = []
if (type === 'day') {
values = [moment(date).format('YYYY-MM-DD'), moment(date).format('YYYY-MM-DD')]
@@ -110,16 +117,17 @@
active: type,
dateRange: values
}, () => {
- this.props.onGroupChange()
+ this.props.onGroupChange({[card.datefield]: values, [card.field]: type})
})
}
clearTime = () => {
+ const { card } = this.props
this.setState({
active: '',
dateRange: ''
}, () => {
- this.props.onGroupChange()
+ this.props.onGroupChange({[card.datefield]: '', [card.field]: ''})
})
}
@@ -130,35 +138,6 @@
active: initType,
dateRange: initDateRange
})
- }
-
- getSearchItems = () => {
- const { card } = this.props
- const { dateRange, active } = this.state
- let items = []
-
- items.push({
- type: 'daterange',
- key: card.datefield,
- value: dateRange,
- label: card.label,
- match: 'between',
- required: card.required === 'true'
- })
-
- if (card.transfer === 'true') {
- items.push({
- type: card.type,
- key: card.field,
- value: active,
- label: card.label,
- match: '=',
- forbid: true,
- required: card.required === 'true'
- })
- }
-
- return items
}
render() {
@@ -220,7 +199,7 @@
{dateRange.join(' ~ ')}
<Icon type="close-circle" onClick={this.clearTime} className="ant-calendar-picker-clear" />
</div> : null}
- {!dateRange && card.required === 'true' ? <div className="ant-form-explain">璇烽�夋嫨{card.label}!</div> : null}
+ {!dateRange && card.required ? <div className="ant-form-explain">璇烽�夋嫨{card.label}!</div> : null}
</div>
)
}
--
Gitblit v1.8.0