github
/
element
mirror of https://github.com/ElemeFE/element
1
0
Fork 0
Code Issues Releases Wiki Activity

DateTimePicker: add timeformat for datetimerange (#6052) 

* DateTimePicker: add timeformat for datetimerange

* fix
pull/6325/head
Dreamacro 2017-08-05 16:44:53 +08:00 committed by 杨奕
parent c340ed13e4
commit 5b7a40e951
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
packages/date-picker/src/panel/date-range.vue
View File

@ -43,7 +43,8 @@
ref="minTimePicker" ref="minTimePicker"
:date="minDate" :date="minDate"
@pick="handleMinTimePick" @pick="handleMinTimePick"
:visible="minTimePickerVisible"> :visible="minTimePickerVisible"
@mounted="$refs.minTimePicker.format=timeFormat">
</time-picker> </time-picker>
</span> </span>
</span> </span>
@ -74,7 +75,9 @@
ref="maxTimePicker" ref="maxTimePicker"
:date="maxDate" :date="maxDate"
@pick="handleMaxTimePick" @pick="handleMaxTimePick"
:visible="maxTimePickerVisible"></time-picker> :visible="maxTimePickerVisible"
@mounted="$refs.maxTimePicker.format=timeFormat">
</time-picker>
</span> </span>
</span> </span>
</div> </div>
@ -213,6 +216,14 @@
newDate.setMonth(month + 1); newDate.setMonth(month + 1);
} }
return newDate; return newDate;
},
timeFormat() {
if (this.format && this.format.indexOf('ss') === -1) {
return 'HH:mm';
} else {
return 'HH:mm:ss';
}
} }
}, },
@ -238,7 +249,8 @@
firstDayOfWeek: 7, firstDayOfWeek: 7,
minTimePickerVisible: false, minTimePickerVisible: false,
maxTimePickerVisible: false, maxTimePickerVisible: false,
width: 0 width: 0,
format: ''
}; };
}, },