Merge pull request #333 from ecaps1038/monorepo-dev

Version 0.0.12
ecaps1038 · Mar 20, 2024 · 73c043c · 73c043c
2 parents 6e332b4 + dcd884e
commit 73c043c
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 6 deletions.
diff --git a/packages/yike-design-demo/src/examples/pagination/pagination-primary.vue b/packages/yike-design-demo/src/examples/pagination/pagination-primary.vue
@@ -1,3 +1,7 @@
 <template>
-  <yk-pagination :total="50"></yk-pagination>
+  <yk-space dir="vertical">
+    <yk-pagination :total="30"></yk-pagination>
+    <yk-pagination :total="40"></yk-pagination>
+    <yk-pagination :total="50"></yk-pagination>
+  </yk-space>
 </template>
diff --git a/packages/yike-design-ui/CHANGELOG.md b/packages/yike-design-ui/CHANGELOG.md
@@ -1,6 +1,14 @@
 # 更新日志 
 
 
+### [0.0.12](https://github.com/ecaps1038/yike-design-dev/compare/v0.0.11...v0.0.12) (2024-03-20)
+
+
+### 🐛 Bug Fixes | Bug 修复
+
+* **modal:** should not trigger keydown event when modelValue is false ([73af440](https://github.com/ecaps1038/yike-design-dev/commit/73af440194f37d2c143aac8c1a1cc62808d06a8a))
+* **pagination:** fix lost page 2 when total page is 3 ([e32feb6](https://github.com/ecaps1038/yike-design-dev/commit/e32feb6bac447fbf0c4fee4336aece6bd972f408))
+
 ### [0.0.11](https://github.com/ecaps1038/yike-design-dev/compare/v0.0.10...v0.0.11) (2024-03-20)
 
 

diff --git a/packages/yike-design-ui/components/modal/src/modal.vue b/packages/yike-design-ui/components/modal/src/modal.vue
@@ -118,7 +118,7 @@ onMounted(() => {
 })
 
 const escapeClose = (ev: KeyboardEvent) => {
-  if (ev.key === 'Escape') closeModal()
+  if (ev.key === 'Escape' && props.modelValue) closeModal()
 }
 const closeMaskToCloseModal = () => {
   props.closeable && emit('update:modelValue', false)

diff --git a/...yike-design-ui/components/pagination/src/components/pagination-pager/pagination-pager.vue b/...yike-design-ui/components/pagination/src/components/pagination-pager/pagination-pager.vue
@@ -20,15 +20,13 @@
     >
       1
     </span>
-
     <span
       v-if="showPrevEllispsis && !simple"
       :class="[cssScope('item'), cssScope('item-ellipsis')]"
       @click.prevent="() => handleEllispsisClick('prev')"
     >
       ...
     </span>
-
     <span
       v-for="pager in pagers"
       :key="pager"
@@ -127,11 +125,13 @@ const showNextEllispsis = computed(() =>
 )
 
 const pagers = computed(() => {
+  if (props.totalPages == 3) {
+    return [2]
+  }
   const array: number[] = []
   if (props.simple || pagerSize.value < 2) {
     return array
   }
-
   if (props.current <= showPrevEllispsisThreshold.value) {
     for (let i = 0; i < pagerSize.value; i++) {
       array.push(i + 2)
@@ -157,6 +157,7 @@ const pagers = computed(() => {
     }
     array.reverse()
   }
+
   return array
 })
 

diff --git a/packages/yike-design-ui/package.json b/packages/yike-design-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@yike-design/ui",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "type": "module",
   "description": "yike-design-ui",
   "author": "ecaps1038 https://github.com/ecaps1038",