@churchillliving/se-ui-toolkit 6.53.419 → 6.53.421

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

@@ -1982,6 +1982,12 @@
               !formData.data.valueProp) {
               formData.data.valueProp = formData.data.labelProp;
           }
+          else if (formData &&
+              formData.data &&
+              formData.data.valueProp &&
+              !formData.data.labelProp) {
+              formData.data.labelProp = formData.data.valueProp;
+          }
           var matchValueKey = getMatchKey(response, (_a = formData === null || formData === void 0 ? void 0 : formData.data) === null || _a === void 0 ? void 0 : _a.valueProp);
           var matchFieldKey = getMatchKey(response, (_b = formData === null || formData === void 0 ? void 0 : formData.data) === null || _b === void 0 ? void 0 : _b.labelProp);
           if ((formData === null || formData === void 0 ? void 0 : formData.data) &&
@@ -4598,14 +4604,20 @@
        */
       GridComponent.prototype.openGridDialog = function (column, row) {
           var _this = this;
+          var _a;
+          var isDisabled = column.disabled
+              ? true
+              : ((_a = row[column.field]) === null || _a === void 0 ? void 0 : _a.action) && row[column.field].action.disabled
+                  ? true
+                  : false;
           this.onClickEvent(column, row);
           setTimeout(function () {
               var _a, _b, _c;
               _this.rowClickData = row;
-              if (column.data && column.data.data && row[column.field + '_obj'] && !column.disabled) {
+              if (column.data && column.data.data && row[column.field + '_obj']) {
                   column.data.data = (_a = row[column.field + '_obj']) === null || _a === void 0 ? void 0 : _a.dialogData;
               }
-              if (column.component && column.data && _this.rowClickData && !column.disabled) {
+              if (column.component && column.data && _this.rowClickData && !isDisabled) {
                   var data = Object.assign({}, column.data);
                   data.data = autoSetLookupData(column.data.data, _this.rowClickData);
                   var ref = _this.dialogService.open(column.component, data);
@@ -5931,7 +5943,7 @@
       };
       // Invoke onClick Event.
       GridComponent.prototype.onClickEvent = function (column, row) {
-          var _a, _b, _c;
+          var _a, _b, _c, _d, _e;
           if (column.type === exports.EGridColumnType.LINK && (column.editLink === false || column.editLink === undefined) && column.editable !== true && column.disabled !== true) {
               if (column && column.onClick && column.disabled !== true && ((_b = (_a = row[column.field]) === null || _a === void 0 ? void 0 : _a.action) === null || _b === void 0 ? void 0 : _b.disabled) !== true) {
                   column.onClick(row);
@@ -5953,9 +5965,9 @@
               column.minutesInterval) {
               this.defaultDate = new Date(setMinutesInterval(new Date()));
           }
-          // if (column && column.onClick && column.disabled !== true && row[column.field]?.action?.disabled !== true) {
-          //   column.onClick(row);
-          // }
+          if (column && column.onClick && column.disabled !== true && ((_e = (_d = row[column.field]) === null || _d === void 0 ? void 0 : _d.action) === null || _e === void 0 ? void 0 : _e.disabled) !== true) {
+              column.onClick(row);
+          }
       };
       // set the select value of multi-select
       GridComponent.prototype.showOption = function (column, row) {