[优化] 优化分页组件，避免在切换单页记录数时可能发生的异常

rdkmaster · Nov 11, 2021 · c3c995e · c3c995e
1 parent b2a4ee3
commit c3c995e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/jigsaw/pc-components/pagination/pagination.html b/src/jigsaw/pc-components/pagination/pagination.html
@@ -21,7 +21,7 @@
 
         <jigsaw-select *ngIf="pageSizeOptions && pageSizeOptions.length > 0"
                        [value]="_$pageSize"
-                       (valueChange)="_changePageSize($event)"
+                       (valueChange)="_$changePageSize($event)"
                        [trackItemBy]="['value','label']"
                        labelField="label"
                        width="80"
@@ -60,7 +60,7 @@
         <jigsaw-select *ngIf="pageSizeOptions && pageSizeOptions.length > 0"
                        class="jigsaw-paging-page-size"
                        [value]="_$pageSize"
-                       (valueChange)="_changePageSize($event)"
+                       (valueChange)="_$changePageSize($event)"
                        [trackItemBy]="['value','label']"
                        labelField="label"
                        width="80"

diff --git a/src/jigsaw/pc-components/pagination/pagination.ts b/src/jigsaw/pc-components/pagination/pagination.ts
@@ -435,9 +435,13 @@ export class JigsawPagination extends AbstractJigsawComponent implements OnInit,
      * @internal
      * select组件改变pageSize
      * */
-    public _changePageSize(pageSize) {
-        if (this.pageSize != pageSize.value) {
-            this.pageSize = pageSize.value;
+    public _$changePageSize(pageSize: {value?: number}): void {
+        const value = pageSize?.value;
+        if (isNaN(value)) {
+            return;
+        }
+        if (this.pageSize != value) {
+            this.pageSize = value;
             this.current = 1;
         }
         this._changeDetectorRef.markForCheck();