rename variable (element-plus#10503)

In version 2.2.17, use currentPage can't bind variable to current page. fix(components): [input] input width change by clearable (element-plus#7287)
MrWeilian · Nov 8, 2022 · 21a927c · 21a927c
1 parent 75a088b
commit 21a927c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/docs/examples/pagination/more-elements.vue b/docs/examples/pagination/more-elements.vue
@@ -18,7 +18,7 @@
   <div class="demo-pagination-block">
     <div class="demonstration">Total item count</div>
     <el-pagination
-      v-model:currentPage="currentPage1"
+      v-model:current-page="currentPage1"
       :page-size="100"
       :small="small"
       :disabled="disabled"
@@ -32,7 +32,7 @@
   <div class="demo-pagination-block">
     <div class="demonstration">Change page size</div>
     <el-pagination
-      v-model:currentPage="currentPage2"
+      v-model:current-page="currentPage2"
       v-model:page-size="pageSize2"
       :page-sizes="[100, 200, 300, 400]"
       :small="small"
@@ -47,7 +47,7 @@
   <div class="demo-pagination-block">
     <div class="demonstration">Jump to</div>
     <el-pagination
-      v-model:currentPage="currentPage3"
+      v-model:current-page="currentPage3"
       v-model:page-size="pageSize3"
       :small="small"
       :disabled="disabled"
@@ -61,7 +61,7 @@
   <div class="demo-pagination-block">
     <div class="demonstration">All combined</div>
     <el-pagination
-      v-model:currentPage="currentPage4"
+      v-model:current-page="currentPage4"
       v-model:page-size="pageSize4"
       :page-sizes="[100, 200, 300, 400]"
       :small="small"

diff --git a/packages/theme-chalk/src/input.scss b/packages/theme-chalk/src/input.scss
@@ -283,6 +283,11 @@
         > :first-child, :nth-child(2) {
           margin-left: 8px;
         }
+        > :nth-child(2) {
+          .#{$namespace}-input__count-inner {
+            padding-left: 0;
+          }
+        }
       }
     }
   }