ods-component-lib 1.18.261 → 1.18.264

package/dist/index.modern.js

@@ -34206,8 +34206,9 @@ var OdsBasicDataGrid = function OdsBasicDataGrid(props) {
       });
     }
     if (kebabMenuButtons.length > 0) {
+      var _cellData$data, _cellData$data2;
       buttonElements.push(React.createElement(OdsDropdown, {
-        key: "dropdown-" + (cellData.rowIndex || cellData.data.ID),
+        key: "dropdown-" + (cellData.rowIndex || (cellData === null || cellData === void 0 ? void 0 : (_cellData$data = cellData.data) === null || _cellData$data === void 0 ? void 0 : _cellData$data.id) || (cellData === null || cellData === void 0 ? void 0 : (_cellData$data2 = cellData.data) === null || _cellData$data2 === void 0 ? void 0 : _cellData$data2.ID)),
         menuItems: kebabMenuButtons
       }, React.createElement(OdsDataGrdiRowButton, {
         type: "text",
@@ -34376,9 +34377,9 @@ var OdsBasicDataGrid = function OdsBasicDataGrid(props) {
     });
   };
   var renderMasterDetailGrid = useCallback(function (_ref) {
-    var _dataSource$data;
+    var _dataSource$data, _dataSource$data2;
     var dataSource = _ref.data;
-    var detailID = dataSource === null || dataSource === void 0 ? void 0 : (_dataSource$data = dataSource.data) === null || _dataSource$data === void 0 ? void 0 : _dataSource$data.ID;
+    var detailID = (dataSource === null || dataSource === void 0 ? void 0 : (_dataSource$data = dataSource.data) === null || _dataSource$data === void 0 ? void 0 : _dataSource$data.id) || (dataSource === null || dataSource === void 0 ? void 0 : (_dataSource$data2 = dataSource.data) === null || _dataSource$data2 === void 0 ? void 0 : _dataSource$data2.ID);
     if (!detailID || !(detailData !== null && detailData !== void 0 && detailData[detailID])) {
       return null;
     }
@@ -36320,13 +36321,20 @@ var OdsBatchEditDataGrid = function OdsBatchEditDataGrid(props) {
           component: cellData.component,
           row: cellData.row
         }) : buttonItem.visible;
+        var isDisabled = typeof buttonItem.disabled === "function" ? buttonItem.disabled({
+          column: cellData.column,
+          component: cellData.component,
+          row: cellData.row
+        }) : buttonItem.disabled;
+        var permissionDisabled = buttonItem.actionPermission === undefined ? false : !buttonItem.actionPermission;
+        var finalDisabled = isDisabled || permissionDisabled;
         buttonElements.push(React.createElement(OdsDataGrdiRowButton, Object.assign({
           key: "action-button-" + index,
           hint: buttonItem.hint,
           visible: isVisible,
           size: "small",
           type: "text",
-          disabled: buttonItem.actionPermission === undefined ? false : !buttonItem.actionPermission,
+          disabled: finalDisabled,
           icon: buttonItem.icon
         }, props.actionButtonsTooltipType === "styled" && {
           tooltip: buttonItem.hint
@@ -36352,6 +36360,13 @@ var OdsBatchEditDataGrid = function OdsBatchEditDataGrid(props) {
           component: cellData.component,
           row: cellData.row
         }) : buttonItem.visible;
+        var isDisabled = typeof buttonItem.disabled === "function" ? buttonItem.disabled({
+          column: cellData.column,
+          component: cellData.component,
+          row: cellData.row
+        }) : buttonItem.disabled;
+        var permissionDisabled = buttonItem.actionPermission === undefined ? false : !buttonItem.actionPermission;
+        var finalDisabled = isDisabled || permissionDisabled;
         buttonElements.push(React.createElement(OdsDataGrdiRowButton, Object.assign({
           key: "action-button-" + index,
           name: buttonItem.name,
@@ -36359,7 +36374,7 @@ var OdsBatchEditDataGrid = function OdsBatchEditDataGrid(props) {
           visible: isVisible,
           size: "small",
           type: "text",
-          disabled: buttonItem.actionPermission === undefined ? false : !buttonItem.actionPermission,
+          disabled: finalDisabled,
           icon: buttonItem.icon
         }, props.actionButtonsTooltipType === "styled" && {
           tooltip: buttonItem.hint
@@ -36433,6 +36448,9 @@ var OdsBatchEditDataGrid = function OdsBatchEditDataGrid(props) {
     if (((_props$edit = props.edit) === null || _props$edit === void 0 ? void 0 : _props$edit.mode) == "cell" && (_props$edit2 = props.edit) !== null && _props$edit2 !== void 0 && _props$edit2.allowUpdating && e.rowType == "data" && !e.column.allowEditing) {
       e.cellElement.classList.add("grid-cell-disable-colored");
     }
+    if (props.handleCellPrepared) {
+      props.handleCellPrepared(e);
+    }
   };
   var onToolbarPreparing = function onToolbarPreparing(e) {
     if (props.toolbarButtonGroup && props.toolbarButtonGroup.length > 0) {