@churchillliving/se-ui-toolkit 6.53.406 → 6.53.408
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 +2 -2
- package/bundles/churchillliving-se-ui-toolkit.umd.js.map +1 -1
- package/esm2015/lib/components/base/grid/grid.component.js +3 -3
- package/fesm2015/churchillliving-se-ui-toolkit.js +2 -2
- package/fesm2015/churchillliving-se-ui-toolkit.js.map +1 -1
- package/package.json +1 -1
|
@@ -4602,7 +4602,7 @@
|
|
|
4602
4602
|
if (column.data && column.data.data && row[column.field + '_obj'] && !column.disabled) {
|
|
4603
4603
|
column.data.data = (_a = row[column.field + '_obj']) === null || _a === void 0 ? void 0 : _a.dialogData;
|
|
4604
4604
|
}
|
|
4605
|
-
if (column.component && column.data && _this.rowClickData) {
|
|
4605
|
+
if (column.component && column.data && _this.rowClickData && !column.disabled) {
|
|
4606
4606
|
var data = Object.assign({}, column.data);
|
|
4607
4607
|
data.data = autoSetLookupData(column.data.data, _this.rowClickData);
|
|
4608
4608
|
var ref = _this.dialogService.open(column.component, data);
|
|
@@ -5715,7 +5715,7 @@
|
|
|
5715
5715
|
else {
|
|
5716
5716
|
if (labelProp || valueProp) {
|
|
5717
5717
|
row[columnField] = {
|
|
5718
|
-
text: res[labelProp ? labelProp : res[columnField]],
|
|
5718
|
+
text: res[labelProp ? labelProp : valueProp ? valueProp : res[columnField]],
|
|
5719
5719
|
value: res[valueProp ? valueProp : res[columnField]],
|
|
5720
5720
|
};
|
|
5721
5721
|
}
|