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

Merge pull request #2070 from QingWei-Li/fix/datepicker-change 

DatePicker: fix change event trigger multiple times, fixed #2060
pull/2081/head
baiyaaaaa 2016-12-29 21:38:24 +08:00 committed by GitHub
parent ee91c12e7a f28dca049c
commit e21e77bd49
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
packages/date-picker/src/picker.vue
View File

@ -318,6 +318,9 @@ export default {
}, },
created() { created() {
this.cachePicker = {};
this.cacheChange = {};
// vue-popper // vue-popper
this.options = { this.options = {
boundariesPadding: 0, boundariesPadding: 0,
@ -343,17 +346,17 @@ export default {
} }
}, },
dateIsUpdated(date) { dateIsUpdated(date, cache) {
let updated = true; let updated = true;
if (Array.isArray(date)) { if (Array.isArray(date)) {
if (equalDate(this.cacheDateMin, date[0]) && if (equalDate(cache.cacheDateMin, date[0]) &&
equalDate(this.cacheDateMax, date[1])) updated = false; equalDate(cache.cacheDateMax, date[1])) updated = false;
this.cacheDateMin = date[0]; cache.cacheDateMin = date[0];
this.cacheDateMax = date[1]; cache.cacheDateMax = date[1];
} else { } else {
if (equalDate(this.cacheDate, date)) updated = false; if (equalDate(cache.cacheDate, date)) updated = false;
this.cacheDate = date; cache.cacheDate = date;
} }
return updated; return updated;
@ -443,9 +446,9 @@ export default {
this.picker.$on('dodestroy', this.doDestroy); this.picker.$on('dodestroy', this.doDestroy);
this.picker.$on('pick', (date, visible = false) => { this.picker.$on('pick', (date, visible = false) => {
if (this.dateIsUpdated(date)) this.$emit('input', date); if (this.dateIsUpdated(date, this.cachePicker)) this.$emit('input', date);
this.$nextTick(() => this.$emit('change', this.visualValue)); this.$nextTick(() => this.dateIsUpdated(date, this.cacheChange) && this.$emit('change', this.visualValue));
this.pickerVisible = this.picker.visible = visible; this.pickerVisible = this.picker.visible = visible;
this.picker.resetView && this.picker.resetView(); this.picker.resetView && this.picker.resetView();
}); });

2
packages/date-picker/src/util/index.js
View File

@ -9,7 +9,7 @@ const newArray = function(start, end) {
}; };
export const equalDate = function(dateA, dateB) { export const equalDate = function(dateA, dateB) {
return new Date(dateA).getTime() === new Date(dateB).getTime(); return dateA === dateB || new Date(dateA).getTime() === new Date(dateB).getTime();
}; };
export const toDate = function(date) { export const toDate = function(date) {