Merge remote-tracking branch 'origin/10.x'

balmjs · Jun 6, 2023 · 81b4472 · 81b4472
2 parents 69622dd + 99fc671
commit 81b4472
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 - [`balm-ui@8`](https://github.com/balmjs/balm-ui/tree/8.x) for Vue 2
 
+## v10.21.2 / 2023-06-06
+
+### Bug Fixes
+
+- `<ui-pagination>`: fix `total` watcher bug
+
 ## v10.21.0 / 2023-06-05
 
 ### Features

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "balm-ui",
-  "version": "10.21.1",
+  "version": "10.21.2",
   "description": "A modular and customizable UI library based on Material Design and Vue 3",
   "keywords": [
     "balm",

diff --git a/src/scripts/components/pagination/pagination.vue b/src/scripts/components/pagination/pagination.vue
@@ -282,6 +282,15 @@ watch(
   }
 );
 
+watch(
+  () => props.total,
+  () => {
+    if (currentMinRow.value > currentMaxRow.value) {
+      handleChange();
+    }
+  }
+);
+
 watch(
   () => props.pageSize,
   (val) => {