|
|
@@ -32,6 +32,7 @@ class ListFilter extends React.Component {
|
|
|
onChange={value => {
|
|
|
let item = filterItems.find(i => i.name === value);
|
|
|
modelName && dispatch({ type: modelName + '/setFilterItem', item });
|
|
|
+ modelName && dispatch({ type: modelName + '/setFilterLabel', label: '' });
|
|
|
if(typeof onChangeFilterItem === 'function') {
|
|
|
onChangeFilterItem(item)
|
|
|
onChangeFilterValue('');
|
|
|
@@ -49,7 +50,9 @@ class ListFilter extends React.Component {
|
|
|
const { type, name } = filterItem;
|
|
|
|
|
|
if(type === 'date') {
|
|
|
- return <RangePicker
|
|
|
+ let arr = !!filterLabel ? [moment(+filterLabel.split('#')[0]), moment(+filterLabel.split('#')[1])] : [];
|
|
|
+ return <RangePicker
|
|
|
+ value={arr}
|
|
|
ranges={{
|
|
|
'今天': [moment().startOf('day'), moment().endOf('day')],
|
|
|
'本月': [moment().startOf('month'), moment().endOf('month')],
|