drip-public/iview
6
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update TimePicker

Browse source 
update TimePicker
This commit is contained in:
梁灏 2016-12-29 09:54:29 +08:00
parent a18d2b3a8a
commit 964582b399
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/components/date-picker/panel/time-range.vue
View file

@ -144,7 +144,17 @@
this.dateEnd.setSeconds(dateEnd.seconds); this.dateEnd.setSeconds(dateEnd.seconds);
this.secondsEnd = this.dateEnd.getSeconds(); this.secondsEnd = this.dateEnd.getSeconds();
} }
if (emit) this.$emit('on-pick', [this.date, this.dateEnd], true); // judge endTime > startTime?
if (this.dateEnd < this.date) {
this.$nextTick(() => {
this.dateEnd = new Date(this.date);
this.hoursEnd = this.dateEnd.getHours();
this.minutesEnd = this.dateEnd.getMinutes();
this.secondsEnd = this.dateEnd.getSeconds();
});
} else {
if (emit) this.$emit('on-pick', [this.date, this.dateEnd], true);
}
}, },
handleStartChange (date) { handleStartChange (date) {
this.handleChange(date, {}); this.handleChange(date, {});

2
test/routers/date.vue
View file

@ -51,7 +51,7 @@
methods: { methods: {
c (s) { c (s) {
// console.log(1,s); console.log(s);
// this.value2 = s; // this.value2 = s;
}, },
ok () { ok () {