Pagination: fix current-change not fire after currentPage manually updated (#10562)

94312a44 · 杨奕 · GitHub · af0c8991 · 94312a44
Commit 94312a44 authored Apr 04, 2018 by 杨奕 Committed by GitHub Apr 04, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

packages/pagination/src/pagination.js packages/pagination/src/pagination.js +3 -1

No files found.
--- a/packages/pagination/src/pagination.js
+++ b/packages/pagination/src/pagination.js
@@ -299,6 +299,7 @@ export default {
  methods: {
    handleCurrentChange(val) {
      this.internalCurrentPage = this.getValidCurrentPage(val);
+      this.userChangePageSize = true;
      this.emitChange();
    },
@@ -343,9 +344,10 @@ export default {
    emitChange() {
      this.$nextTick(() => {
-        if (this.internalCurrentPage !== this.lastEmittedPage) {
+        if (this.internalCurrentPage !== this.lastEmittedPage || this.userChangePageSize) {
          this.$emit('current-change', this.internalCurrentPage);
          this.lastEmittedPage = this.internalCurrentPage;
+          this.userChangePageSize = false;
        }
      });
    }