|
@@ -542,8 +542,8 @@ export default class MonthsGridFoundation extends BaseFoundation<MonthsGridAdapt
|
|
|
type: YearMonthChangeType,
|
|
type: YearMonthChangeType,
|
|
|
targetDate: Date
|
|
targetDate: Date
|
|
|
) {
|
|
) {
|
|
|
- const { multiple, disabledDate } = this.getProps();
|
|
|
|
|
- const { selected: selectedSet, rangeStart, rangeEnd } = this.getStates();
|
|
|
|
|
|
|
+ const { multiple, disabledDate, type: dateType } = this.getProps();
|
|
|
|
|
+ const { selected: selectedSet, rangeStart, rangeEnd, monthLeft } = this.getStates();
|
|
|
// FIXME:
|
|
// FIXME:
|
|
|
const includeRange = ['dateRange', 'dateTimeRange'].includes(type);
|
|
const includeRange = ['dateRange', 'dateTimeRange'].includes(type);
|
|
|
const options = { closePanel: false };
|
|
const options = { closePanel: false };
|
|
@@ -552,7 +552,14 @@ export default class MonthsGridFoundation extends BaseFoundation<MonthsGridAdapt
|
|
|
const selectedDate = new Date(selectedStr);
|
|
const selectedDate = new Date(selectedStr);
|
|
|
const year = targetDate.getFullYear();
|
|
const year = targetDate.getFullYear();
|
|
|
const month = targetDate.getMonth();
|
|
const month = targetDate.getMonth();
|
|
|
- const fullDate = set(selectedDate, { year, month });
|
|
|
|
|
|
|
+ let fullDate = set(selectedDate, { year, month });
|
|
|
|
|
+ if (dateType === 'dateTime') {
|
|
|
|
|
+ /**
|
|
|
|
|
+ * 如果是 type dateTime 切换月份要读取只取的time
|
|
|
|
|
+ * 无论 monthLeft 还是 monthRight 他们的 time 是不变的,所以只取 monthLeft 即可
|
|
|
|
|
+ */
|
|
|
|
|
+ fullDate = this._mergeDateAndTime(fullDate, monthLeft.pickerDate);
|
|
|
|
|
+ }
|
|
|
if (disabledDate(fullDate, { rangeStart, rangeEnd })) {
|
|
if (disabledDate(fullDate, { rangeStart, rangeEnd })) {
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|