From f5c602d5ef67948ae84f86c700dd969605ee4d2e Mon Sep 17 00:00:00 2001
From: Bang <15622356989@163.com>
Date: Sat, 25 Mar 2023 17:08:19 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9Pagination?=
 =?UTF-8?q?=E5=8F=8C=E5=90=91=E7=BB=91=E5=AE=9A=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/pagination/OPagination.vue  | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/packages/opendesign/src/components/pagination/OPagination.vue b/packages/opendesign/src/components/pagination/OPagination.vue
index 0437f149..4b2a90bd 100644
--- a/packages/opendesign/src/components/pagination/OPagination.vue
+++ b/packages/opendesign/src/components/pagination/OPagination.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { computed, ref, nextTick, watch, Ref } from 'vue';
+import { computed, ref, nextTick, watch } from 'vue';
 import { getPagerItem, PagerItemT, getSizeOptions } from './pagination';
 import { OPopover } from '../popover';
 import { OInputNumber } from '../input-number';
@@ -42,7 +42,7 @@ watch(
   }
 );
 
-const updateCurrentPage = (page: number) => {
+const setCurrentPage = (page: number) => {
   if (isNaN(page)) {
     return;
   }
@@ -54,15 +54,27 @@ const updateCurrentPage = (page: number) => {
   } else {
     currentPage.value = page;
   }
+  pages.value = getPagerItem(totalPage.value, currentPage.value, props.showPageCount);
+};
 
+const updateCurrentPage = (page: number) => {
+  setCurrentPage(page);
   emits('update:page', currentPage.value);
   emits('change', {
     page: currentPage.value,
     pageSize: currentPageSize.value,
   });
-  pages.value = getPagerItem(totalPage.value, currentPage.value, props.showPageCount);
 };
 
+watch(
+  () => props.page,
+  (val) => {
+    if (val !== currentPage.value) {
+      setCurrentPage(val);
+    }
+  }
+);
+
 const selectPage = (page: number | string) => {
   updateCurrentPage(page as number);
 };
-- 
Gitee


From 3cc574a7275b10bac047fdf057842b28cf1a2444 Mon Sep 17 00:00:00 2001
From: Bang <15622356989@163.com>
Date: Sat, 25 Mar 2023 17:10:30 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E5=88=86=E9=A1=B5=E5=99=A8=E6=96=87?=
 =?UTF-8?q?=E5=AD=97=E5=B1=85=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../opendesign/src/components/pagination/style/index.scss   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/opendesign/src/components/pagination/style/index.scss b/packages/opendesign/src/components/pagination/style/index.scss
index 92604c7b..1159037c 100644
--- a/packages/opendesign/src/components/pagination/style/index.scss
+++ b/packages/opendesign/src/components/pagination/style/index.scss
@@ -109,3 +109,9 @@
     justify-content: flex-end;
   }
 }
+
+.o-pagination {
+  .o-input-input {
+    text-align: center;
+  }
+}
-- 
Gitee