@churchillliving/se-ui-toolkit 6.53.379 → 6.53.380
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bundles/churchillliving-se-ui-toolkit.umd.js +13 -5
- package/bundles/churchillliving-se-ui-toolkit.umd.js.map +1 -1
- package/esm2015/lib/components/shared/global-filters/global-filters.component.js +2 -2
- package/esm2015/lib/services/grid.service.js +12 -5
- package/fesm2015/churchillliving-se-ui-toolkit.js +12 -5
- package/fesm2015/churchillliving-se-ui-toolkit.js.map +1 -1
- package/lib/services/grid.service.d.ts +1 -1
- package/package.json +1 -1
|
@@ -3114,8 +3114,9 @@
|
|
|
3114
3114
|
};
|
|
3115
3115
|
return column;
|
|
3116
3116
|
};
|
|
3117
|
-
GridService.prototype.setLookUpFilter = function (column, dialogService) {
|
|
3117
|
+
GridService.prototype.setLookUpFilter = function (column, dialogService, globalFilterLookup) {
|
|
3118
3118
|
var _this = this;
|
|
3119
|
+
if (globalFilterLookup === void 0) { globalFilterLookup = false; }
|
|
3119
3120
|
var _a, _b;
|
|
3120
3121
|
if (column.lookupControl) {
|
|
3121
3122
|
var dataValue_1 = [];
|
|
@@ -3150,9 +3151,16 @@
|
|
|
3150
3151
|
(_a = document.getElementById('lookUp_filter')) === null || _a === void 0 ? void 0 : _a.focus();
|
|
3151
3152
|
var field = column.field;
|
|
3152
3153
|
var value = setDialogResponse(column, column === null || column === void 0 ? void 0 : column.lookupControl, res);
|
|
3153
|
-
|
|
3154
|
-
? value.value
|
|
3155
|
-
|
|
3154
|
+
if (globalFilterLookup) {
|
|
3155
|
+
column.value = (value === null || value === void 0 ? void 0 : value.value)
|
|
3156
|
+
? value.value
|
|
3157
|
+
: res[field.toLowerCase()];
|
|
3158
|
+
}
|
|
3159
|
+
else {
|
|
3160
|
+
column.filterValue = (value === null || value === void 0 ? void 0 : value.value)
|
|
3161
|
+
? value.value
|
|
3162
|
+
: res[field.toLowerCase()];
|
|
3163
|
+
}
|
|
3156
3164
|
}
|
|
3157
3165
|
}, function (_g) {
|
|
3158
3166
|
var error = _g.error;
|
|
@@ -9760,7 +9768,7 @@
|
|
|
9760
9768
|
* open dialog on lookupControl field
|
|
9761
9769
|
*/
|
|
9762
9770
|
SeGlobalFilterComponent.prototype.selectLookupField = function (globalFilters) {
|
|
9763
|
-
this.gridService.setLookUpFilter(globalFilters, this.dialogService);
|
|
9771
|
+
this.gridService.setLookUpFilter(globalFilters, this.dialogService, true);
|
|
9764
9772
|
};
|
|
9765
9773
|
/**
|
|
9766
9774
|
* Clear all filter values
|