diff --git a/src/components/common/Pagination.vue b/src/components/common/Pagination.vue
index f03bf38..147df07 100644
--- a/src/components/common/Pagination.vue
+++ b/src/components/common/Pagination.vue
@@ -80,34 +80,16 @@ const pageSize = computed({
set: (val: number) => emit('update:pageSizeValue', val),
})
-// 监听当前页变化,派发事件
-watch(
- () => currentPage,
- (newVal) => {
- emit('update:modelValue', newVal)
- emit('pagination-change', { currentPage: newVal, pageSize })
- },
-)
-
-// 监听每页条数变化,派发事件
-watch(
- () => pageSize,
- (newVal) => {
- emit('update:pageSizeValue', newVal)
- emit('pagination-change', { currentPage, pageSize: newVal })
- },
-)
-
-// 每页条数变更处理(兼容Element Plus原生事件)
+// 每页条数变更处理
const handleSizeChange = (val: number) => {
emit('update:pageSizeValue', val)
- emit('pagination-change', { currentPage, pageSize: val })
+ emit('pagination-change', { currentPage: currentPage.value, pageSize: val })
}
-// 当前页变更处理(兼容Element Plus原生事件)
+// 当前页变更处理
const handleCurrentChange = (val: number) => {
emit('update:modelValue', val)
- emit('pagination-change', { currentPage: val, pageSize })
+ emit('pagination-change', { currentPage: val, pageSize: pageSize.value })
}
diff --git a/src/components/layout/Breadcrumb.vue b/src/components/layout/Breadcrumb.vue
index fd466a8..60f1cd7 100644
--- a/src/components/layout/Breadcrumb.vue
+++ b/src/components/layout/Breadcrumb.vue
@@ -13,17 +13,68 @@