From ea6a8d284bb78beadb1192e8218cfdce42785c94 Mon Sep 17 00:00:00 2001
From: Bang <15622356989@163.com>
Date: Sat, 25 Mar 2023 11:14:21 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20Popover=E6=96=B0=E5=A2=9EwrapClass?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/opendesign/src/components/popover/OPopover.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/opendesign/src/components/popover/OPopover.vue b/packages/opendesign/src/components/popover/OPopover.vue
index 201b7e94..ff892a73 100644
--- a/packages/opendesign/src/components/popover/OPopover.vue
+++ b/packages/opendesign/src/components/popover/OPopover.vue
@@ -29,7 +29,7 @@ const targetElRef = ref<ComponentPublicInstance | null>(null);
     :trigger="props.trigger"
     :target="props.target || targetElRef"
     :wrapper="props.wrapper"
-    wrap-class="o-popover-wrap"
+    :wrap-class="`o-popover-wrap ${props.wrapClass}`"
     :anchor-class="props.anchor ? props.anchorClass : ''"
     :unmount-on-hide="props.unmountOnHide"
     @update:visible="updateVisible"
-- 
Gitee


From 13acfc08c5b994053c7936eb9888f320f0ac4ae4 Mon Sep 17 00:00:00 2001
From: Bang <15622356989@163.com>
Date: Sat, 25 Mar 2023 16:50:18 +0800
Subject: [PATCH 2/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