revert: 发布新版本 0.66.1 (2023-12-19)

FightingDesign · Dec 19, 2023 · 9348ffc · 9348ffc
1 parent 20af669
commit 9348ffc
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 5 deletions.
diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md
@@ -4,6 +4,11 @@
 
 English | [Chinese](https://github.com/FightingDesign/fighting-design/blob/master/CHANGELOG.md)
 
+## 0.66.1 (2023-12-19)
+
+- Fix the issue of displaying page numbers incorrectly in the `f-pagination` component when the `total` is less than the `page-size`
+- Fix the issue with the `f-pagination` component not executing `on-change` when executing `on-prev` and `on-text` callbacks
+
 ## 0.66.0 (2023-12-18)
 
 - Fix the issue of the `f-table` component not breaking line styles for English letter text

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 中文 | [英文](https://github.com/FightingDesign/fighting-design/blob/master/CHANGELOG.en-US.md)
 
+## 0.66.1 (2023-12-19)
+
+- 修复 `f-pagination` 组件在 `total` 小于 `page-size` 时候显示页码错误的问题
+- 修复 `f-pagination` 组件在执行 `on-prev` 和 `on-next` 回调的时候为执行 `on-change` 的问题
+
 ## 0.66.0 (2023-12-18)
 
 - 修复 `f-table` 组件对于英文字母的文字不换行样式的问题

diff --git a/docs/docs/changelog.md b/docs/docs/changelog.md
@@ -2,6 +2,11 @@
 
 中文 | [英文](https://github.com/FightingDesign/fighting-design/blob/master/CHANGELOG.en-US.md)
 
+## 0.66.1 (2023-12-19)
+
+- 修复 `f-pagination` 组件在 `total` 小于 `page-size` 时候显示页码错误的问题
+- 修复 `f-pagination` 组件在执行 `on-prev` 和 `on-next` 回调的时候为执行 `on-change` 的问题
+
 ## 0.66.0 (2023-12-18)
 
 - 修复 `f-table` 组件对于英文字母的文字不换行样式的问题

diff --git a/packages/fighting-design/_hooks/use-page/index.ts b/packages/fighting-design/_hooks/use-page/index.ts
@@ -67,7 +67,6 @@ export const usePage = (
     let showPrevMore = false
     /** 显示下一页更多 */
     let showNextMore = false
-
     /** 结果数组 */
     const pageList: number[] = []
 
@@ -80,7 +79,7 @@ export const usePage = (
         showNextMore = true
       }
     } else {
-      // 如果最大页码数小于 当前输入的pagerCount
+      // 如果最大页码数小于 当前输入的 pagerCount
       for (let i = 2; i < maxCount.value; i++) {
         pageList.push(i)
       }
@@ -130,12 +129,14 @@ export const usePage = (
 
         modelValue.currentModelValue.value = newCurrent
         run(prop.onNext, newCurrent, prop.pageSize)
+        run(prop.onChange, newCurrent, prop.pageSize)
       },
       /**上一页切换 */
       prev: (): void => {
         newCurrent = prop.current === 1 ? 1 : prop.current - 1
         modelValue.currentModelValue.value = newCurrent
         run(prop.onPrev, newCurrent, prop.pageSize)
+        run(prop.onChange, newCurrent, prop.pageSize)
       }
     } as const
 

diff --git a/packages/fighting-design/package.json b/packages/fighting-design/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fighting-design",
-  "version": "0.66.0",
+  "version": "0.66.1",
   "description": "Fighting design can quickly build interactive interfaces in vue3 applications, which looks good.",
   "keywords": [
     "fighting",

diff --git a/packages/fighting-design/pagination/src/pagination.vue b/packages/fighting-design/pagination/src/pagination.vue
@@ -112,7 +112,7 @@
 
       <!-- 最后一页 -->
       <div
-        v-if="total > 1"
+        v-if="total > 1 && total > Number(pageSize)"
         :class="[
           PAGINATION_ITEM,
           {

diff --git a/start/src/App.vue b/start/src/App.vue
@@ -2,4 +2,4 @@
 
 <template></template>
 
-<style lang="scss" scoped></style>
+<style scoped></style>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@

		<template></template>

		<style lang="scss" scoped></style>
		<style scoped></style>