@churchillliving/se-ui-toolkit 6.53.297 → 6.53.299
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 +17 -18
- package/bundles/churchillliving-se-ui-toolkit.umd.js.map +1 -1
- package/esm2015/lib/components/base/grid/grid.component.js +18 -19
- package/fesm2015/churchillliving-se-ui-toolkit.js +17 -18
- package/fesm2015/churchillliving-se-ui-toolkit.js.map +1 -1
- package/package.json +1 -1
|
@@ -5527,7 +5527,7 @@
|
|
|
5527
5527
|
var ref = this.openLookupDialog(obj_2);
|
|
5528
5528
|
draggableDialog((column === null || column === void 0 ? void 0 : column.field) ? column === null || column === void 0 ? void 0 : column.field : column === null || column === void 0 ? void 0 : column.header);
|
|
5529
5529
|
ref.onClose.subscribe(function (res) {
|
|
5530
|
-
var _a, _b, _c;
|
|
5530
|
+
var _a, _b, _c, _d, _e, _f;
|
|
5531
5531
|
if (column.onReturn) {
|
|
5532
5532
|
column.onReturn(res, row);
|
|
5533
5533
|
}
|
|
@@ -5535,33 +5535,32 @@
|
|
|
5535
5535
|
var value = setDialogResponse(column, column.lookupControl, res);
|
|
5536
5536
|
res = objConvertToLower(res);
|
|
5537
5537
|
var valueField = (_c = (_b = (_a = column === null || column === void 0 ? void 0 : column.lookupControl) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.valueField) === null || _c === void 0 ? void 0 : _c.toLowerCase();
|
|
5538
|
+
var selectedValue = (_f = (_e = (_d = column === null || column === void 0 ? void 0 : column.lookupControl) === null || _d === void 0 ? void 0 : _d.data) === null || _e === void 0 ? void 0 : _e.selectedValue) === null || _f === void 0 ? void 0 : _f.toLowerCase();
|
|
5538
5539
|
if (column.displayField) {
|
|
5539
|
-
|
|
5540
|
-
|
|
5541
|
-
|
|
5542
|
-
|
|
5543
|
-
};
|
|
5544
|
-
}
|
|
5545
|
-
else {
|
|
5546
|
-
row[column.field] = {
|
|
5547
|
-
text: res[column.displayField.toLowerCase()],
|
|
5548
|
-
value: res[column.field.toLowerCase()],
|
|
5549
|
-
};
|
|
5550
|
-
}
|
|
5540
|
+
row[column.field] = {
|
|
5541
|
+
text: res[valueField ? valueField : column.displayField.toLowerCase()],
|
|
5542
|
+
value: res[selectedValue ? selectedValue : column.field.toLowerCase()],
|
|
5543
|
+
};
|
|
5551
5544
|
_this.lookupObject = row[column.field];
|
|
5552
5545
|
}
|
|
5553
5546
|
else if (value && value.value) {
|
|
5554
5547
|
value['field'] = column.field;
|
|
5555
|
-
if (valueField) {
|
|
5556
|
-
row[column.field] =
|
|
5548
|
+
if (valueField || selectedValue) {
|
|
5549
|
+
row[column.field] = {
|
|
5550
|
+
text: res[valueField ? valueField : res[valueField]],
|
|
5551
|
+
value: res[selectedValue ? selectedValue : res[valueField]],
|
|
5552
|
+
};
|
|
5557
5553
|
}
|
|
5558
5554
|
else {
|
|
5559
5555
|
row[column.field] = value.value;
|
|
5560
5556
|
}
|
|
5561
5557
|
}
|
|
5562
5558
|
else {
|
|
5563
|
-
if (valueField) {
|
|
5564
|
-
row[column.field] =
|
|
5559
|
+
if (valueField || selectedValue) {
|
|
5560
|
+
row[column.field] = {
|
|
5561
|
+
text: res[valueField ? valueField : res[column.field.toLowerCase()]],
|
|
5562
|
+
value: res[selectedValue ? selectedValue : res[column.field.toLowerCase()]],
|
|
5563
|
+
};
|
|
5565
5564
|
}
|
|
5566
5565
|
else {
|
|
5567
5566
|
row[column.field] = res[column.field.toLowerCase()];
|
|
@@ -5768,7 +5767,7 @@
|
|
|
5768
5767
|
column.minutesInterval) {
|
|
5769
5768
|
this.defaultDate = new Date(setMinutesInterval(new Date()));
|
|
5770
5769
|
}
|
|
5771
|
-
if (column && column.onClick && column.disabled !== true) {
|
|
5770
|
+
if (column && column.onClick && column.disabled !== true && row[column.field].disabled !== true) {
|
|
5772
5771
|
column.onClick(row);
|
|
5773
5772
|
}
|
|
5774
5773
|
};
|