diff --git a/packages/pagination/src/pagination.js b/packages/pagination/src/pagination.js index 5e359183a..cfcdf98ca 100644 --- a/packages/pagination/src/pagination.js +++ b/packages/pagination/src/pagination.js @@ -390,12 +390,10 @@ export default { } if (newVal !== undefined) { - this.$nextTick(() => { - this.internalCurrentPage = newVal; - if (oldVal !== newVal) { - this.$emit('update:currentPage', newVal); - } - }); + this.internalCurrentPage = newVal; + if (oldVal !== newVal) { + this.$emit('update:currentPage', newVal); + } } else { this.$emit('update:currentPage', newVal); } diff --git a/test/unit/specs/date-picker.spec.js b/test/unit/specs/date-picker.spec.js index 20d56a219..44b2702a5 100644 --- a/test/unit/specs/date-picker.spec.js +++ b/test/unit/specs/date-picker.spec.js @@ -278,7 +278,7 @@ describe('DatePicker', () => { input.focus(); setTimeout(_ => { const picker = vm.$refs.compo.picker; - picker.$el.querySelector('td.available + td.today').click(); + picker.$el.querySelector('td.available').click(); setTimeout(_ => { const date = vm.$refs.compo.picker.date; expect(date.getHours()).to.equal(12);