diff --git a/src/components/date-picker/panel/date.vue b/src/components/date-picker/panel/date.vue index 15b19f9..b29db3e 100644 --- a/src/components/date-picker/panel/date.vue +++ b/src/components/date-picker/panel/date.vue @@ -181,6 +181,7 @@ this.year = this.date.getFullYear(); this.month = this.date.getMonth(); + if (reset) this.isTime = false; }, prevYear () { if (this.currentView === 'year') { diff --git a/test/routers/date.vue b/test/routers/date.vue index 4195856..ab2476f 100644 --- a/test/routers/date.vue +++ b/test/routers/date.vue @@ -1,21 +1,14 @@ <template> - {{value1}} -- {{ value2 }} - <row> - <i-col span="12"> - <Date-picker :value.sync="value1" format="yyyy年MM月dd日" type="date" placeholder="选择日期" style="width: 200px"></Date-picker> - </i-col> - <i-col span="12"> - <Date-picker :value.sync="value2" format="yyyy/MM/dd" type="daterange" placement="bottom-end" placeholder="选择日期" style="width: 200px"></Date-picker> - </i-col> - </row> + <Date-picker type="datetime" placeholder="选择日期和时间" style="width: 200px"></Date-picker> + <br> + <Date-picker type="datetime" format="yyyy-MM-dd HH:mm" placeholder="选择日期和时间(不含秒)" style="width: 200px"></Date-picker> + <br> + <Date-picker type="datetimerange" placeholder="选择日期和时间" style="width: 300px"></Date-picker> + <br> + <Date-picker type="datetimerange" format="yyyy-MM-dd HH:mm" placeholder="选择日期和时间(不含秒)" style="width: 300px"></Date-picker> </template> <script> export default { - data () { - return { - value1: '2016-01-01', - value2: ['2016-01-01', '2016-02-15'] - } - } + } </script> -- libgit2 0.21.4