Merge pull request #1563 from rijn/1220

Return array of format string when type is datetimerange
This commit is contained in:
Aresn 2017-08-09 11:52:35 +08:00 committed by GitHub
commit d2e6cb96a4
2 changed files with 7 additions and 3 deletions

View file

@ -2,12 +2,16 @@
<div>
<Date-picker transfer type="daterange" placeholder="选择日期" style="width: 200px"></Date-picker>
<Date-picker type="daterange" placeholder="选择日期" style="width: 200px"></Date-picker>
<Date-picker type="daterange" placeholder="选择日期" style="width: 200px"></Date-picker>
<Date-picker type="datetimerange" placeholder="选择日期" style="width: 200px" @on-change="changeDate"></Date-picker>
</div>
</template>
<script>
export default {
methods: {
changeDate(date){
console.log(date);
}
}
}
</script>

View file

@ -459,7 +459,7 @@
).formatter;
let newDate = formatter(date, format);
if (type === 'daterange' || type === 'timerange') {
if (type === 'daterange' || type === 'timerange' || type === 'datetimerange') {
newDate = [newDate.split(RANGE_SEPARATOR)[0], newDate.split(RANGE_SEPARATOR)[1]];
}
return newDate;