blackteay/vant-weapp
1
0
Fork 0
mirror of https://gitee.com/vant-contrib/vant-weapp.git synced 2025-04-06 03:58:05 +08:00
Code Issues Projects Releases Wiki Activity

[bug fix] DatetimePicker: 修复设置了minDate时初始value错误 (#942)

Browse Source
This commit is contained in:
rex 2018-11-25 09:26:29 +08:00 committed by neverland
parent f9a9c8ccdc
commit c0e60fcf57
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/datetime-picker/index.ts
View File

@ -1,7 +1,8 @@
import { VantComponent } from '../common/component';
import { isDef } from '../common/utils';
const currentYear = new Date().getFullYear();
const isValidDate = date => !isNaN(new Date(date).getTime());
const isValidDate = date => isDef(date) && !isNaN(new Date(date).getTime());
function range(num, min, max) {
return Math.min(Math.max(num, min), max);
@ -169,12 +170,8 @@ VantComponent({
}
// date type
const { maxYear, maxDate, maxMonth, maxHour, maxMinute } = this.getBoundary('max', value);
const { minYear, minDate, minMonth, minHour, minMinute } = this.getBoundary('min', value);
const minDay = new Date(minYear, minMonth - 1, minDate, minHour, minMinute);
const maxDay = new Date(maxYear, maxMonth - 1, maxDate, maxHour, maxMinute);
value = Math.max(value, minDay.getTime());
value = Math.min(value, maxDay.getTime());
value = Math.max(value, data.minDate);
value = Math.min(value, data.maxDate);
return value;
},