slick-components 17.0.46 → 17.0.48

package/fesm2022/slick-components.mjs

@@ -23,7 +23,7 @@ class SlickInitParams {
     }
 }
 class SlickInitService {
-    static { this.version = "17.0.46"; }
+    static { this.version = "17.0.48"; }
     constructor() { }
     static init(initParams) {
         console.info(`Slick Components Version ${SlickInitService.version}`);
@@ -5768,7 +5768,7 @@ class SlickGridComponent {
                 this.requestModel.page = 1;
                 await this.resizeGrid();
                 this.requestModel.recordsPerPage = this.recordsPerPage;
-                this.reload(this.requestModel);
+                this.reload();
             }, 500);
         }
     }
@@ -5885,7 +5885,7 @@ class SlickGridComponent {
             this.currentPage = 1;
             this.requestModel.page = 1;
             this.requestModel.recordsPerPage = this.recordsPerPage;
-            await this.reload(this.requestModel);
+            await this.reload();
             if (this.visibleData && this.visibleData.length > 0 && this.gridOptions.autoSelectFirstRow === true)
                 this.selectRow(0);
             this.functionLockService.release("GRID_" + this.uuid + "_DATA_CHANGES");
@@ -5978,7 +5978,7 @@ class SlickGridComponent {
     async onPageChange(pageNumber, selectRow = true) {
         this.currentPage = pageNumber;
         this.requestModel.page = pageNumber;
-        await this.reload(this.requestModel);
+        await this.reload();
         this.selectedIndex = (this.gridOptions.autoSelectFirstRow === true) ? 0 : null;
         if (selectRow === true && this.gridOptions.autoSelectFirstRow === true) {
             const rowData = this.visibleData[this.selectedIndex];
@@ -5995,7 +5995,7 @@ class SlickGridComponent {
             this.requestModel.additionalParams = additionalParams;
             this.requestModel.page = this.currentPage;
             this.requestModel.recordsPerPage = this.recordsPerPage;
-            let responseModel = await this.reload(this.requestModel);
+            let responseModel = await this.reload();
             this.functionLockService.release("GRID_" + this.uuid + "_RELOADGRID");
             return Promise.resolve(responseModel);
         }
@@ -6011,7 +6011,14 @@ class SlickGridComponent {
             this.requestModel = requestModel;
             this.currentPage = 1;
             this.requestModel.page = 1;
-            let responseModel = await this.reload(this.requestModel);
+            let responseModel = null;
+            if (requestModel.url)
+                responseModel = await this.gridService.getDataFromServer(requestModel);
+            else
+                responseModel = await this.gridService.getDataFromDataObj(requestModel, this.data);
+            this.loaded = true;
+            this.totalRecords = responseModel.totalRecords;
+            this.visibleData = responseModel.data;
             this.functionLockService.release("GRID_" + this.uuid + "_RELOADGRIDWITHREQUESTMODEL");
             return Promise.resolve(responseModel);
         }
@@ -6020,10 +6027,10 @@ class SlickGridComponent {
             return Promise.reject(error);
         }
     }
-    async reload(requestModel) {
+    async reload() {
         try {
             await this.functionLockService.lock("GRID_" + this.uuid + "_RELOAD");
-            requestModel = this.getRequestModel(this.requestModel);
+            const requestModel = this.getRequestModel(this.requestModel);
             let responseModel = null;
             if (requestModel.url)
                 responseModel = await this.gridService.getDataFromServer(requestModel);
@@ -6073,7 +6080,7 @@ class SlickGridComponent {
         this.saveColumnsToLocalStorage();
         this.currentPage = 1;
         this.requestModel.page = 1;
-        await this.reload(this.requestModel);
+        await this.reload();
         if (this.visibleData && this.visibleData.length > 0 && this.gridOptions.autoSelectFirstRow === true)
             this.selectRow(0);
     }
@@ -6090,6 +6097,7 @@ class SlickGridComponent {
                 searchValueId: ddValue.id,
                 searchValueText: ddValue.text
             });
+            column.filterDropdownValue;
             column.isFiltering = true;
         }
         else {
@@ -6101,7 +6109,7 @@ class SlickGridComponent {
             return;
         this.currentPage = 1;
         this.requestModel.page = 1;
-        await this.reload(this.requestModel);
+        await this.reload();
         if (this.visibleData && this.visibleData.length > 0 && this.gridOptions.autoSelectFirstRow === true)
             this.selectRow(0);
     }
@@ -6133,7 +6141,7 @@ class SlickGridComponent {
                 return;
             this.currentPage = 1;
             this.requestModel.page = 1;
-            await this.reload(this.requestModel);
+            await this.reload();
             if (this.visibleData && this.visibleData.length > 0 && this.gridOptions.autoSelectFirstRow === true)
                 this.selectRow(0);
         }, 250);
@@ -6156,7 +6164,7 @@ class SlickGridComponent {
             return;
         this.currentPage = 1;
         this.requestModel.page = 1;
-        await this.reload(this.requestModel);
+        await this.reload();
         if (this.visibleData && this.visibleData.length > 0 && this.gridOptions.autoSelectFirstRow === true)
             this.selectRow(0);
     }
@@ -6273,7 +6281,7 @@ class SlickGridComponent {
         this.currentPage = 1;
         this.requestModel.page = 1;
         this.requestModel.recordsPerPage = this.recordsPerPage;
-        await this.reload(this.requestModel);
+        await this.reload();
     }
     onSaveColumns() {
         this.saveDialogColumnsToLocalStorage();
@@ -6417,20 +6425,11 @@ class SlickGridComponent {
         requestModel.columnSearchValues = [];
         this.gridOptions.columns.forEach(c => {
             if (c.visible) {
-                if (c.filterType === SlickGridColumnFilterTypes.text && c.filterText) {
-                    c.filterText = c.filterText;
-                    requestModel.columnSearchValues.push({
-                        columnName: c.dataFieldName,
-                        searchValueId: null,
-                        searchValueText: c.filterText
-                    });
-                }
-                else if (c.filterType === SlickGridColumnFilterTypes.dropdown && c.filterDropdownValue) {
-                    c.filterDropdownValue = c.filterDropdownValue;
+                if ((c.filterType === SlickGridColumnFilterTypes.text && c.filterText) || (c.filterType === SlickGridColumnFilterTypes.dropdown && c.filterDropdownValue)) {
                     requestModel.columnSearchValues.push({
                         columnName: c.dataFieldName,
                         searchValueId: c.filterDropdownValue,
-                        searchValueText: null
+                        searchValueText: c.filterText
                     });
                 }
             }