diff --git a/src/_common b/src/_common index 3073a989d6..ff668def3e 160000 --- a/src/_common +++ b/src/_common @@ -1 +1 @@ -Subproject commit 3073a989d6258d074c86d1251b9e2d01ce24d0f9 +Subproject commit ff668def3e3a64893e71cb2251076730c8591fef diff --git a/src/pagination/pagination.tsx b/src/pagination/pagination.tsx index 13f56d2662..95b4e00f24 100755 --- a/src/pagination/pagination.tsx +++ b/src/pagination/pagination.tsx @@ -9,7 +9,7 @@ import { import config from '../config'; import mixins from '../utils/mixins'; import getConfigReceiverMixins, { PaginationConfig } from '../config-provider/config-receiver'; -import TInput from '../input'; +import TInputNumber from '../input-number'; import { Select, Option } from '../select'; import CLASSNAMES from '../utils/classnames'; import props from './props'; @@ -33,7 +33,7 @@ export default defineComponent({ ChevronLeftDoubleIcon, ChevronRightDoubleIcon, EllipsisIcon, - TInput, + TInputNumber, TSelect: Select, TOption: Option, }, @@ -203,18 +203,6 @@ export default defineComponent({ current(val) { this.jumpIndex = val; }, - jumpIndex(val) { - if (val < 1) { - this.$nextTick(() => { - this.jumpIndex = 1; - }); - } - if (val > this.pageCount) { - this.$nextTick(() => { - this.jumpIndex = this.pageCount; - }); - } - }, }, methods: { toPage(pageIndex: number, isTriggerChange?: boolean): void { @@ -222,8 +210,8 @@ export default defineComponent({ return; } let current = pageIndex; - if (pageIndex < 1) { - current = 1; + if (pageIndex < min) { + current = min; } else if (pageIndex > this.pageCount) { current = this.pageCount; } @@ -401,11 +389,14 @@ export default defineComponent({ {this.showJumper ? (
{this.t(this.global.jumpTo)} - {this.t(this.global.page)}
diff --git a/src/tree-select/tree-select.tsx b/src/tree-select/tree-select.tsx index 5d5fed006f..3b969179c0 100644 --- a/src/tree-select/tree-select.tsx +++ b/src/tree-select/tree-select.tsx @@ -397,6 +397,7 @@ export default defineComponent({ ); const tagItem = this.tagList.map((label, index) => ( -
jump to
- +
jump to
+ +
@@ -21971,8 +21972,9 @@ exports[`ssr snapshot test renders ./examples/pagination/demos/jump.vue correctl
-
跳至
- +
跳至
+ +
@@ -36858,16 +36860,49 @@ exports[`ssr snapshot test renders ./examples/transfer/demos/tree.vue correctly
-
- - - - + +
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+
@@ -38608,7 +38643,7 @@ exports[`ssr snapshot test renders ./examples/tree-select/demos/collapsed.vue co
- guangzhoushenzhen + guangzhou +1