ods-component-lib 1.18.4 → 1.18.5

package/dist/index.js

@@ -16543,7 +16543,7 @@ var loadedPageCount = 1;
 var totalRecordCount = 0;
 var useToken$1 = antd.theme.useToken;
 var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
-  var _props$selectOptions, _props$selectOptions$, _props$selectOptions2, _props$selectOptions$2, _props$selectOptions3;
+  var _props$axiosRequest2, _props$selectOptions, _props$selectOptions$, _props$selectOptions2, _props$selectOptions$2, _props$selectOptions3;
   var _useToken = useToken$1(),
     token = _useToken.token;
   var _useState = React.useState([]),
@@ -16554,36 +16554,39 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
     setIsLoading = _useState2[1];
   var fileName = props.exportFileName ? props.exportFileName + moment().format("YYYYMMDD") : "DatagridExportFile" + moment().format("YYYYMMDD");
   var gridRef = React.useRef(null);
+  var _useState3 = React.useState(0),
+    filteredRowCount = _useState3[0];
+  var _useState4 = React.useState([]),
+    kebabMenuButtons = _useState4[0],
+    setKebabMenuButtons = _useState4[1];
+  var _useState5 = React.useState([]),
+    actionButtons = _useState5[0],
+    setActionButtons = _useState5[1];
   var headers = new Headers({
     'Content-Type': 'application/json',
     'Authorization': 'Bearer ' + (props.axiosRequest ? props.axiosRequest.token : ""),
     "Accept-Language": props.language != "" ? props.language : 'EN'
   });
   React.useEffect(function () {
-    if (props.isApplyButtonClicked) {
+    var _props$axiosRequest;
+    if (props.isApplyButtonClicked && (_props$axiosRequest = props.axiosRequest) !== null && _props$axiosRequest !== void 0 && _props$axiosRequest.requestData) {
       totalPageCount = 1;
       loadedPageCount = 1;
       totalRecordCount = 0;
       setData([]);
       fetchData();
     }
-  }, [props.isApplyButtonClicked, props.axiosRequest.requestData]);
+  }, [props.isApplyButtonClicked, (_props$axiosRequest2 = props.axiosRequest) === null || _props$axiosRequest2 === void 0 ? void 0 : _props$axiosRequest2.requestData]);
   React.useEffect(function () {
     localization.locale(localStorage.getItem("locale"));
     localization.loadMessages(JSON.parse(localStorage.getItem("localTranslation")));
   }, []);
   React.useEffect(function () {
-    if (props.actionButtonGroup.length > 2) {
-      props.actionButtonGroup.push({
-        icon: 'kebabMenu',
-        visible: true,
-        disabled: false,
-        onclick: openActionKebab
-      });
+    if (props.actionButtonGroup.length >= 2) {
+      setActionButtons(props.actionButtonGroup.slice(0, 2));
+      setKebabMenuButtons(props.actionButtonGroup.slice(2, props.actionButtonGroup.length));
     }
-    console.log(props.actionButtonGroup);
   }, [props.actionButtonGroup]);
-  var openActionKebab = function openActionKebab() {};
   var handleRef = function handleRef(instance) {
     if (instance) {
       gridRef.current = instance;
@@ -16640,6 +16643,7 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
         dxScrollable.off("scroll");
         dxScrollable.on("scroll", function (args) {
           if (args.reachedBottom) {
+            debugger;
             getServerSide("reachedBottom");
           }
         });
@@ -16734,7 +16738,13 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
   };
   var renderTotal = function renderTotal() {
     var totalloaded = loadedPageCount * props.pageSize;
-    return totalRecordCount > 0 ? totalloaded + " Loaded - " + totalRecordCount + " Total" : "";
+    var result = "";
+    if (filteredRowCount > 0) {
+      result = totalloaded + " Filtered" + (totalRecordCount > 0 ? totalloaded + " Loaded - " + totalRecordCount + " Total" : "");
+    } else {
+      result = totalRecordCount > 0 ? totalloaded + " Loaded - " + totalRecordCount + " Total" : "";
+    }
+    return result;
   };
   var renderTotalPaging = function renderTotalPaging() {
     var result = "";
@@ -16743,6 +16753,17 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
     }
     return result;
   };
+  var actionCellRender = function actionCellRender() {
+    return React__default.createElement(devextremeReact.DropDownButton, {
+      icon: server_browser.renderToString(React__default.createElement(DynamicIcon, {
+        iconName: 'kebabMenu'
+      })),
+      dataSource: kebabMenuButtons,
+      onItemClick: function onItemClick(e) {
+        return e.itemData.onClick();
+      }
+    });
+  };
   return React__default.createElement(React__default.Fragment, null, React__default.createElement(DataGrid__default, {
     keyExpr: props.keyExpr,
     dataSource: props.isServerSide ? data : props.dataSource,
@@ -16797,7 +16818,7 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
     caption: "Actions",
     type: "buttons",
     showInColumnChooser: false
-  }, props.actionButtonGroup && Array.isArray(props.actionButtonGroup) && props.actionButtonGroup.map(function (buttonItem) {
+  }, actionButtons.map(function (buttonItem) {
     return React__default.createElement(DataGrid.Button, {
       hint: buttonItem.hint,
       visible: buttonItem.visible,
@@ -16807,7 +16828,15 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
       })),
       onClick: buttonItem.onClick
     });
-  })), props.edit && React__default.createElement(DataGrid.Editing, {
+  })), kebabMenuButtons.length > 0 && React__default.createElement(DataGrid.Column, {
+    dataField: "Actionss",
+    fixed: true,
+    allowSorting: false,
+    caption: "",
+    type: "buttons",
+    showInColumnChooser: false,
+    cellRender: actionCellRender
+  }), props.edit && React__default.createElement(DataGrid.Editing, {
     mode: props.edit.mode,
     allowUpdating: props.edit.allowUpdating,
     allowDeleting: props.edit.allowDeleting,
@@ -16908,12 +16937,12 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
     name: "exportButton",
     cssClass: 'toolbarPanelItems'
   })), React__default.createElement(DataGrid.Summary, null, React__default.createElement(DataGrid.TotalItem, {
-    column: "Id",
-    summaryType: "custom",
+    column: props.columns[0].dataField,
+    summaryType: "sum",
     displayFormat: "customizeText",
     customizeText: renderTotal
   }), React__default.createElement(DataGrid.TotalItem, {
-    column: "Id",
+    column: props.columns[1].dataField,
     summaryType: "sum",
     displayFormat: "customizeText",
     customizeText: renderTotalPaging