diff --git a/src/calendar/range-calendar.jsx b/src/calendar/range-calendar.jsx index 3c1c6bc419..1f6f1bf4a4 100644 --- a/src/calendar/range-calendar.jsx +++ b/src/calendar/range-calendar.jsx @@ -134,7 +134,10 @@ class RangeCalendar extends React.Component { startValue, }); - if (startValue) { + if ( + startValue && + !startValue.isSame(this.state.startValue, 'day') + ) { this.setState({ startVisibleMonth: startValue, }); @@ -156,7 +159,7 @@ class RangeCalendar extends React.Component { } onSelectCell = (date, nextMode) => { - this.changeVisibleMonth(date, 'cellClick'); + // this.changeVisibleMonth(date, 'cellClick'); if (this.state.mode === CALENDAR_MODE_DATE) { this.props.onSelect(date); diff --git a/src/cascader-select/cascader-select.jsx b/src/cascader-select/cascader-select.jsx index 82b440583c..27599ecddf 100644 --- a/src/cascader-select/cascader-select.jsx +++ b/src/cascader-select/cascader-select.jsx @@ -587,6 +587,10 @@ export default class CascaderSelect extends Component { if (onChange) { onChange(value, data, extra); } + + if (searchValue && this.select) { + this.select.handleSearchClear(); + } } handleClear() { @@ -826,7 +830,7 @@ export default class CascaderSelect extends Component { visible, onVisibleChange: this.handleVisibleChange, showSearch, - searchValue, + // searchValue, onSearch: this.handleSearch, onKeyDown: this.handleKeyDown, popupContent, diff --git a/src/select/index.jsx b/src/select/index.jsx index 6da07d831f..2f78196fef 100644 --- a/src/select/index.jsx +++ b/src/select/index.jsx @@ -79,5 +79,5 @@ Select.Combobox = ConfigProvider.config(Select, { export default ConfigProvider.config(Select, { transform, - exportNames: ['focusInput'], + exportNames: ['focusInput', 'handleSearchClear'], });