@churchillliving/se-ui-toolkit 6.53.378 → 6.53.380

package/bundles/churchillliving-se-ui-toolkit.umd.js

@@ -3114,8 +3114,9 @@
           };
           return column;
       };
-      GridService.prototype.setLookUpFilter = function (column, dialogService) {
+      GridService.prototype.setLookUpFilter = function (column, dialogService, globalFilterLookup) {
           var _this = this;
+          if (globalFilterLookup === void 0) { globalFilterLookup = false; }
           var _a, _b;
           if (column.lookupControl) {
               var dataValue_1 = [];
@@ -3150,9 +3151,16 @@
                       (_a = document.getElementById('lookUp_filter')) === null || _a === void 0 ? void 0 : _a.focus();
                       var field = column.field;
                       var value = setDialogResponse(column, column === null || column === void 0 ? void 0 : column.lookupControl, res);
-                      column.filterValue = (value === null || value === void 0 ? void 0 : value.value)
-                          ? value.value
-                          : res[field.toLowerCase()];
+                      if (globalFilterLookup) {
+                          column.value = (value === null || value === void 0 ? void 0 : value.value)
+                              ? value.value
+                              : res[field.toLowerCase()];
+                      }
+                      else {
+                          column.filterValue = (value === null || value === void 0 ? void 0 : value.value)
+                              ? value.value
+                              : res[field.toLowerCase()];
+                      }
                   }
               }, function (_g) {
                   var error = _g.error;
@@ -3425,17 +3433,17 @@
       };
       // set grid data and set selected row based on selection value
       GridService.prototype.setDataWithSelectedRow = function (records, configData) {
-          if ((configData === null || configData === void 0 ? void 0 : configData.valueProp) && configData.data.selection) {
+          if (((configData === null || configData === void 0 ? void 0 : configData.valueProp) || (configData === null || configData === void 0 ? void 0 : configData.labelProp)) && configData.data.selection) {
               records.forEach(function (record) {
                   var _a;
                   (_a = Object.keys(record)) === null || _a === void 0 ? void 0 : _a.forEach(function (key) {
-                      var _a, _b;
-                      if (key.toLowerCase() === configData.valueProp.toLowerCase()) {
+                      var _a, _b, _c, _d;
+                      if (key.toLowerCase() === configData.labelProp ? (_a = configData.labelProp) === null || _a === void 0 ? void 0 : _a.toLowerCase() : (_b = configData.valueProp) === null || _b === void 0 ? void 0 : _b.toLowerCase()) {
                           if (configData.data.value &&
                               record[key] === configData.data.value) {
                               record['highlightRow'] = true;
                           }
-                          else if (((_a = record[key]) === null || _a === void 0 ? void 0 : _a.toString()) === ((_b = configData.data.selection) === null || _b === void 0 ? void 0 : _b.toString())) {
+                          else if (((_c = record[key]) === null || _c === void 0 ? void 0 : _c.toString()) === ((_d = configData.data.selection) === null || _d === void 0 ? void 0 : _d.toString())) {
                               record['highlightRow'] = true;
                           }
                       }
@@ -9760,7 +9768,7 @@
      * open dialog on lookupControl field
      */
       SeGlobalFilterComponent.prototype.selectLookupField = function (globalFilters) {
-          this.gridService.setLookUpFilter(globalFilters, this.dialogService);
+          this.gridService.setLookUpFilter(globalFilters, this.dialogService, true);
       };
       /**
        * Clear all filter values