From a382e3f657848c1a3bd0c8a36078b2ea7278ab27 Mon Sep 17 00:00:00 2001
From: Ryan2128 <33176053+Ryan2128@users.noreply.github.com>
Date: Tue, 9 Mar 2021 20:45:08 +0800
Subject: [PATCH] fix(pagination): fix current-page event error emit (#1575)

---
 packages/pagination/src/index.ts | 33 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/packages/pagination/src/index.ts b/packages/pagination/src/index.ts
index 3dfc4fd5ea..663fa4b60c 100644
--- a/packages/pagination/src/index.ts
+++ b/packages/pagination/src/index.ts
@@ -119,20 +119,21 @@ export default defineComponent({
     const internalCurrentPage = ref(getValidCurrentPage(props.currentPage))
 
     function emitChange() {
-      nextTick(() => {
-        if (
-          internalCurrentPage.value !== lastEmittedPage.value ||
-          userChangePageSize.value
-        ) {
-          lastEmittedPage.value = internalCurrentPage.value
-          userChangePageSize.value = false
-        }
-      })
+      if (
+        internalCurrentPage.value !== lastEmittedPage.value ||
+        userChangePageSize.value
+      ) {
+        lastEmittedPage.value = internalCurrentPage.value
+        userChangePageSize.value = false
+        emit('update:currentPage', internalCurrentPage.value)
+        emit('current-change', internalCurrentPage.value)
+      }
     }
 
     function handleCurrentChange(val: number) {
       internalCurrentPage.value = getValidCurrentPage(val)
       userChangePageSize.value = true
+      emitChange()
     }
 
     function handleSizesChange(val: number) {
@@ -146,7 +147,7 @@ export default defineComponent({
       if (props.disabled) return
       const newVal = internalCurrentPage.value - 1
       internalCurrentPage.value = getValidCurrentPage(newVal)
-      emit('prev-click', internalCurrentPage)
+      emit('prev-click', internalCurrentPage.value)
       emitChange()
     }
 
@@ -184,19 +185,14 @@ export default defineComponent({
       return resetValue === undefined ? value : resetValue
     }
 
-    watch(() => getValidCurrentPage(props.currentPage), val => {
-      internalCurrentPage.value = val
+    watch(() => props.currentPage, val => {
+      internalCurrentPage.value = getValidCurrentPage(val)
     })
 
     watch(() => props.pageSize, val => {
       internalPageSize.value = getValidPageSize(val)
     })
 
-    watch(internalCurrentPage, val => {
-      emit('update:currentPage', val)
-      emit('current-change', val)
-    })
-
     watch(
       () => internalPageCount.value,
       val => {
@@ -205,9 +201,8 @@ export default defineComponent({
           internalCurrentPage.value = 1
         } else if (oldPage > val) {
           internalCurrentPage.value = val === 0 ? 1 : val
-          userChangePageSize.value && emitChange()
+          emitChange()
         }
-        userChangePageSize.value = false
       },
     )