Skip to content

Commit

Permalink
DatePicker: fix trigger multiple watch, fixed ElemeFE#597
Browse files Browse the repository at this point in the history
  • Loading branch information
QingWei-Li committed Oct 24, 2016
1 parent 4e36ff0 commit 202a77a
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1 +1 @@
*.js linguist-language=Vue
test/**/*.js linguist-language=Vue
2 changes: 1 addition & 1 deletion packages/date-picker/src/basic/month-table.vue
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
</table>
</template>

<script type="text/ecmascript-6">
<script type="text/babel">
import { $t } from '../util';
export default {
Expand Down
1 change: 0 additions & 1 deletion packages/date-picker/src/basic/time-spinner.vue
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@
this.hoursPrivate = oldVal;
}
this.$refs.hour.scrollTop = Math.max(0, (this.hoursPrivate - 2.5) * 32 + 80);
this.$emit('change', { hours: newVal });
},
Expand Down
3 changes: 3 additions & 0 deletions packages/date-picker/src/panel/date-range.vue
Original file line number Diff line number Diff line change
Expand Up @@ -400,6 +400,9 @@
},
handleRangePick(val, close = true) {
if (this.maxDate === val.maxDate && this.minDate === val.minDate) {
return;
}
this.maxDate = val.maxDate;
this.minDate = val.minDate;
Expand Down
4 changes: 2 additions & 2 deletions packages/date-picker/src/panel/date.vue
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,8 @@
} else {
this.date.setMonth(month);
this.resetDate();
this.value = new Date(this.date.getFullYear(), month, 1);
this.$emit('pick', this.value);
const value = new Date(this.date.getFullYear(), month, 1);
this.$emit('pick', value);
}
},
Expand Down
4 changes: 4 additions & 0 deletions packages/date-picker/src/panel/time-range.vue
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,9 @@
watch: {
value(val) {
const time = clacTime(val);
if (time.minTime === this.minTime && time.maxTime === this.maxTime) {
return;
}
this.handleMinChange({
hours: time.minTime.getHours(),
Expand Down Expand Up @@ -183,6 +186,7 @@
this.minTime = limitRange(this.minTime, minSelectableRange);
this.maxTime = limitRange(this.maxTime, maxSelectableRange);
if (first) return;
this.$emit('pick', [this.minTime, this.maxTime], visible, first);
},
Expand Down
8 changes: 0 additions & 8 deletions packages/date-picker/src/panel/time-select.vue
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,6 @@
if (this.value && val && compareTime(this.value, val) === -1) {
this.$emit('pick');
}
},
value(val, old) {
if (val && this.items.some(i => i.value === val && !i.disabled)) {
this.$emit('pick', val, true);
} else {
this.$emit('pick', old, true);
}
}
},
Expand Down
1 change: 1 addition & 0 deletions packages/date-picker/src/panel/time.vue
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@
},
handleConfirm(visible = false, first) {
if (first) return;
const date = new Date(limitRange(this.currentDate, this.selectableRange));
this.$emit('pick', date, visible, first);
},
Expand Down
1 change: 0 additions & 1 deletion packages/date-picker/src/picker.vue
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ const newPopper = {
beforeDestroy: Popper.beforeDestroy
};
// const FUNCTION_KEYS = [13, 16, 17, 18, 19, 20, 27, 33, 34, 35, 36, 37, 38, 39, 40];
const RANGE_SEPARATOR = ' - ';
const DEFAULT_FORMATS = {
date: 'yyyy-MM-dd',
Expand Down

0 comments on commit 202a77a

Please sign in to comment.