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

[bugfix] DatetimePicker: value uncorrect when use formatter (#1591)

Browse Source
This commit is contained in:
neverland 2018-08-05 18:12:17 +08:00 committed by GitHub
parent fe5aae7515
commit 58eab6f2df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
packages/datetime-picker/index.vue
View File

@ -32,7 +32,6 @@ export default create({
value: {},
title: String,
itemHeight: Number,
formatter: Function,
visibleItemCount: Number,
confirmButtonText: String,
cancelButtonText: String,
@ -48,6 +47,10 @@ export default create({
type: String,
default: 'YYYY.MM.DD HH时 mm分'
},
formatter: {
type: Function,
default: (type, value) => value
},
minDate: {
type: Date,
default: () => new Date(currentYear - 10, 0, 1),
@ -146,7 +149,7 @@ export default create({
const values = this.times(range[1] - range[0] + 1, index => {
let value = range[0] + index;
value = value < 10 ? `0${value}` : `${value}`;
return this.formatter ? this.formatter(type, value) : value;
return this.formatter(type, value);
});
return {
@ -159,6 +162,10 @@ export default create({
},
methods: {
pad(val) {
return `00${val}`.slice(-2);
},
correctValue(value) {
// validate value
const isDateType = this.type !== 'time';
@ -173,8 +180,7 @@ export default create({
if (!isDateType) {
const [hour, minute] = value.split(':');
let correctedHour = Math.max(hour, this.minHour);
correctedHour = Math.min(correctedHour, this.maxHour);
correctedHour = `00${correctedHour}`.slice(-2);
correctedHour = this.pad(Math.min(correctedHour, this.maxHour));
return `${correctedHour}:${minute}`;
}
@ -302,22 +308,24 @@ export default create({
updateColumnValue(value) {
let values = [];
const { formatter, pad } = this;
if (this.type === 'time') {
const currentValue = value.split(':');
values = [
currentValue[0],
currentValue[1]
formatter('hour', currentValue[0]),
formatter('minute', currentValue[1])
];
} else {
values = [
`${value.getFullYear()}`,
`0${value.getMonth() + 1}`.slice(-2),
`0${value.getDate()}`.slice(-2)
formatter('year', `${value.getFullYear()}`),
formatter('month', pad(value.getMonth() + 1)),
formatter('day', pad(value.getDate()))
];
if (this.type === 'datetime') {
values.push(
`0${value.getHours()}`.slice(-2),
`0${value.getMinutes()}`.slice(-2)
formatter('hour', pad(value.getHours())),
formatter('minute', pad(value.getMinutes()))
);
}
if (this.type === 'year-month') {