javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-11-10 00:27:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(ion-datetime): keep the model value consistently an ISO string (#15907)

Browse Source
This commit is contained in:
Ken Sodemann
2018-10-11 16:50:05 -05:00
committed by GitHub
parent fb3b752198
commit b46052bd83
5 changed files with 225 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/src/components/datetime/datetime.tsx
View File

@ -4,7 +4,7 @@ import { InputChangeEvent, Mode, PickerColumn, PickerColumnOption, PickerOptions
import { clamp, deferEvent } from '../../utils/helpers';
import { hostContext } from '../../utils/theme';
import { DatetimeData, LocaleData, convertFormatToKey, convertToArrayOfNumbers, convertToArrayOfStrings, dateDataSortValue, dateSortValue, dateValueRange, daysInMonth, getValueFromFormat, parseDate, parseTemplate, renderDatetime, renderTextFormat, updateDate } from './datetime-util';
import { DatetimeData, LocaleData, convertDataToISO, convertFormatToKey, convertToArrayOfNumbers, convertToArrayOfStrings, dateDataSortValue, dateSortValue, dateValueRange, daysInMonth, getValueFromFormat, parseDate, parseTemplate, renderDatetime, renderTextFormat, updateDate } from './datetime-util';
@Component({
tag: 'ion-datetime',
@ -177,16 +177,16 @@ export class Datetime implements ComponentInterface {
@Prop() placeholder?: string | null;
/**
* the value of the datetime.
* The value of the datetime as a valid ISO 8601 datetime string.
*/
@Prop({ mutable: true }) value?: any;
@Prop({ mutable: true }) value?: string;
/**
* Update the datetime value when the value changes
*/
@Watch('value')
protected valueChanged() {
this.updateValue();
this.updateDatetimeValue(this.value);
this.emitStyle();
this.ionChange.emit({
value: this.value
@ -221,7 +221,7 @@ export class Datetime implements ComponentInterface {
dayShortNames: convertToArrayOfStrings(this.dayShortNames, 'dayShortNames')
};
this.updateValue();
this.updateDatetimeValue(this.value);
}
componentDidLoad() {
@ -252,8 +252,8 @@ export class Datetime implements ComponentInterface {
});
}
private updateValue() {
updateDate(this.datetimeValue, this.value);
private updateDatetimeValue(value: any) {
updateDate(this.datetimeValue, value);
this.updateText();
}
@ -276,7 +276,8 @@ export class Datetime implements ComponentInterface {
{
text: this.doneText,
handler: (data: any) => {
this.value = data;
this.updateDatetimeValue(data);
this.value = convertDataToISO(this.datetimeValue);
}
}
];