@adins/ucsearch 2.9.11 → 2.9.13

package/fesm2015/adins-ucsearch.mjs

@@ -588,7 +588,7 @@ class UCSearchComponent {
     postJSON(url, criteria = null) {
         return this.http.post(url, criteria);
     }
-    searchClick() {
+    searchClick(IsExportExcel = false) {
         let filtered = this.configuration.component.filter((item, i, arr) => arr.findIndex((x) => (x.name === item.name)) === i);
         for (let i = 0; i < filtered.length; i++) {
             if (filtered[i].type == "numeric") {
@@ -604,7 +604,10 @@ class UCSearchComponent {
             };
         }
         this.pageNow = 1;
-        this.search(this.apiUrl, this.pageNow, this.pageSize, order, this.arrCrit);
+        let rowPerPage = this.pageSize;
+        if (IsExportExcel)
+            rowPerPage = 9999;
+        this.search(this.apiUrl, this.pageNow, rowPerPage, order, this.arrCrit, IsExportExcel);
     }
     reset() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -614,7 +617,7 @@ class UCSearchComponent {
             yield this.initiateForm();
         });
     }
-    search(apiUrl, pageNo, rowPerPage, orderBy, addCrit = new Array()) {
+    search(apiUrl, pageNo, rowPerPage, orderBy, addCrit = new Array(), IsExportExcel = false) {
         let request = new RequestCriteriaObj();
         let arrCrit = new Array();
         let IsQueryIn = false;
@@ -783,6 +786,11 @@ class UCSearchComponent {
             request.integrationObj = this.searchInput.integrationObj;
         }
         this.http.post(apiUrl, request).subscribe((response) => {
+            if (IsExportExcel) {
+                this.ExcelData = response["Data"];
+                this.excelService.exportAsExcelFile(this.ExcelData, 'sample');
+                return;
+            }
             let qryPaging = {
                 response: response,
                 pageNow: pageNo
@@ -804,7 +812,9 @@ class UCSearchComponent {
             MaxComponent = this.configuration.component.find(x => x.name == component.name && (x.restriction.toUpperCase() == "LT"));
         }
         if (MinComponent && MaxComponent) {
-            if (this.myForm.nativeElement[MinComponent.id].value > this.myForm.nativeElement[MaxComponent.id].value) {
+            let minValue = this.myForm.nativeElement[MinComponent.id].valueAsNumber;
+            let maxValue = this.myForm.nativeElement[MaxComponent.id].valueAsNumber;
+            if (minValue > maxValue) {
                 this.toastr.warning(MinComponent.label + " must be less than " + MaxComponent.label);
                 return false;
             }
@@ -848,24 +858,26 @@ class UCSearchComponent {
         element.target.value = parseFloat(element.target.value.toString().replace(/,/g, ''));
     }
     exportAsXLSX() {
-        let request = new RequestCriteriaObj();
-        request.pageNo = 1;
-        request.rowPerPage = 9999;
-        request.orderBy = null;
-        request.criteria = [];
-        request.queryString = this.configuration.querystring;
-        if (!this.searchInput.isJoinExAPI) {
-            request.integrationObj = null;
-        }
-        else {
-            request.integrationObj = this.searchInput.integrationObj;
-        }
-        this.http.post(this.apiUrl, request).subscribe(response => {
-            this.ExcelData = response["Data"];
-            this.excelService.exportAsExcelFile(this.ExcelData, 'sample');
-        }, (error) => {
-            console.log(error);
-        });
+        this.searchClick(true);
+        // let request = new RequestCriteriaObj();
+        // request.pageNo = 1;
+        // request.rowPerPage = 9999;
+        // request.orderBy = null;
+        // request.criteria = [];
+        // request.queryString = this.configuration.querystring;
+        // if (!this.searchInput.isJoinExAPI) {
+        //   request.integrationObj = null;
+        // } else {
+        //   request.integrationObj = this.searchInput.integrationObj;
+        // }
+        // this.http.post(this.apiUrl, request).subscribe(
+        //   response => {
+        //     this.ExcelData = response["Data"];
+        //     this.excelService.exportAsExcelFile(this.ExcelData, 'sample');
+        //   },
+        //   (error) => {
+        //     console.log(error);
+        //   });
     }
     onChangeEvent(optValue, afFilter) {
         let jsonComp = this.configuration.component;
@@ -1166,7 +1178,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.2", ngImpor
                 args: ['enjiForm']
             }], myForm: [{
                 type: ViewChild,
-                args: ['formIdSearch', { static: false }]
+                args: ['formIdSearch']
             }], searchInput: [{
                 type: Input
             }], pageSize: [{