Skip to content

Commit c3c995e

Browse files
authored
[优化] 优化分页组件,避免在切换单页记录数时可能发生的异常
1 parent b2a4ee3 commit c3c995e

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

src/jigsaw/pc-components/pagination/pagination.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
<jigsaw-select *ngIf="pageSizeOptions && pageSizeOptions.length > 0"
2323
[value]="_$pageSize"
24-
(valueChange)="_changePageSize($event)"
24+
(valueChange)="_$changePageSize($event)"
2525
[trackItemBy]="['value','label']"
2626
labelField="label"
2727
width="80"
@@ -60,7 +60,7 @@
6060
<jigsaw-select *ngIf="pageSizeOptions && pageSizeOptions.length > 0"
6161
class="jigsaw-paging-page-size"
6262
[value]="_$pageSize"
63-
(valueChange)="_changePageSize($event)"
63+
(valueChange)="_$changePageSize($event)"
6464
[trackItemBy]="['value','label']"
6565
labelField="label"
6666
width="80"

src/jigsaw/pc-components/pagination/pagination.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -435,9 +435,13 @@ export class JigsawPagination extends AbstractJigsawComponent implements OnInit,
435435
* @internal
436436
* select组件改变pageSize
437437
* */
438-
public _changePageSize(pageSize) {
439-
if (this.pageSize != pageSize.value) {
440-
this.pageSize = pageSize.value;
438+
public _$changePageSize(pageSize: {value?: number}): void {
439+
const value = pageSize?.value;
440+
if (isNaN(value)) {
441+
return;
442+
}
443+
if (this.pageSize != value) {
444+
this.pageSize = value;
441445
this.current = 1;
442446
}
443447
this._changeDetectorRef.markForCheck();

0 commit comments

Comments
 (0)