Merge remote-tracking branch 'origin/master'

Administrator
2 parents 842485ac 41b1d6bc
Showing 3 changed files with 8 additions and 3 deletions Show diff stats
npm-debug.log.742618877
src/models/statement.base.ts
src/services/statement.base.service.ts
@@ -39,7 +39,7 @@ export abstract class StatementBase implements AfterViewInit, OnInit {
                       data = [this.createModel()];
                   }
                   let lastRow: number = -1;
-                  if (data.length <= this.params.endRow && !this.isNew) {
+                  if (data.length < (this.params.endRow - this.params.startRow) && !this.isNew) {
                       lastRow = data.length;
                   }
                   this.params.successCallback(data, lastRow);
@@ -76,7 +76,12 @@ export abstract class StatementBase implements AfterViewInit, OnInit {
         this.gridOptions.enableServerSideFilter = true;
         this.showGrid = true;
         this.gridOptions.rowModelType = 'virtual';
-        this.gridOptions.paginationPageSize = 25;
+        this.gridOptions.paginationPageSize = 10;
+        this.gridOptions.paginationOverflowSize = 2;
+        this.gridOptions.maxPagesInCache = 2;
+        this.gridOptions.getRowNodeId = function(item) {
+            return item.id;
+        };
     }
     protected bootstrapGrid(): void {
@@ -29,7 +29,7 @@ export abstract class StatementBaseService {
       sort = this.parseSort(params.sortModel[0]);
     }
     let url: string = this.url;
-    url += '?from=' + params.startRow + '&to=' + params.endRow;
+    url += '?from=' + params.startRow + '&perPage=' + (params.endRow - params.startRow);
     if (sort) {
             url += '&sort=' + sort;
         }