ods-component-lib 1.18.41 → 1.18.42

package/dist/index.modern.js

@@ -1573,57 +1573,7 @@ function grid(props) {
 }
 
 var DxTreeList = function DxTreeList(props) {
-  var _useState = useState(props.dataSource),
-    dataSource = _useState[0];
-  var renderReadButtons = function renderReadButtons(data) {
-    return React.createElement("div", null, React.createElement(OdsSwitch, {
-      onChange: function onChange(checked) {
-        return onchangeRead(checked, data);
-      },
-      checked: data.ReadPermission
-    }));
-  };
-  var renderModifyButtons = function renderModifyButtons(data) {
-    return React.createElement("div", null, React.createElement(OdsSwitch, {
-      onChange: function onChange(checked) {
-        return onchangeModify(checked, data);
-      },
-      checked: data.ModifyPermission
-    }));
-  };
-  var onchangeModify = function onchangeModify(checked, data) {
-    data.ModifyPermission = checked;
-    props.onDataChange(dataSource);
-  };
-  var onchangeRead = function onchangeRead(checked, data) {
-    data.ReadPermission = checked;
-    props.onDataChange(dataSource);
-  };
-  return React.createElement(React.Fragment, null, React.createElement(TreeList, {
-    id: "Id",
-    dataSource: dataSource,
-    showRowLines: true,
-    showBorders: true,
-    columnAutoWidth: true,
-    itemsExpr: props.itemsExpr,
-    wordWrapEnabled: true,
-    dataStructure: "tree"
-  }, React.createElement(Column, {
-    dataField: "Name",
-    caption: "Name"
-  }), React.createElement(Column, {
-    caption: "Read",
-    cellRender: function cellRender(_ref) {
-      var data = _ref.data;
-      return renderReadButtons(data);
-    }
-  }), React.createElement(Column, {
-    caption: "Modify",
-    cellRender: function cellRender(_ref2) {
-      var data = _ref2.data;
-      return renderModifyButtons(data);
-    }
-  })));
+  return React.createElement(React.Fragment, null, React.createElement(TreeList, Object.assign({}, props), props.children));
 };
 
 var DxTreeView = function DxTreeView(props) {
@@ -16500,7 +16450,8 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
     setIsLoading = _useState2[1];
   var fileName = props.exportFileName ? props.exportFileName + moment().format("YYYYMMDD") : "DatagridExportFile" + moment().format("YYYYMMDD");
   var _useState3 = useState(0),
-    filteredRowCount = _useState3[0];
+    filteredRowCount = _useState3[0],
+    setFilteredRowCount = _useState3[1];
   var _useState4 = useState(props.columns),
     columns = _useState4[0],
     setColumns = _useState4[1];
@@ -16774,7 +16725,24 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
     }
   }, []);
   var renderTotal = useCallback(function () {
-    return totalRecordCount > 0 ? props.customSummary.summaryTotalDataLabel + " : " + totalRecordCount : "";
+    var result = "";
+    var totalloaded = 0;
+    if (data.length < 50 || !props.isServerSide || loadedPageCount == totalPageCount) {
+      totalloaded = data.length;
+    } else {
+      totalloaded = loadedPageCount * props.pageSize;
+    }
+    if (props.isServerSide) {
+      result = totalRecordCount > 0 ? totalloaded + " " + props.customSummary.summaryLoadedDataLabel + ("- " + totalRecordCount) + props.customSummary.summaryTotalDataLabel : "";
+      if (filteredRowCount > 0 && totalloaded !== filteredRowCount) {
+        var filteredLabel = filteredRowCount + " " + props.customSummary.summaryFilteredDataLabel + "- ";
+        result = filteredLabel + " " + result;
+      }
+    }
+    if (props.customSummary.summaryTotalCount !== undefined && !props.isServerSide) {
+      result = props.customSummary.summaryTotalDataLabel + " : " + props.customSummary.summaryTotalCount;
+    }
+    return result;
   }, [data, filteredRowCount, loadedPageCount, props.pageSize, totalRecordCount]);
   var renderTotalPaging = useCallback(function () {
     var result = "";
@@ -16830,6 +16798,11 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
       });
     };
   }, [data.length]);
+  var handleContentReady = function handleContentReady(e) {
+    var dataGridInstance = e.component;
+    var filteredDataCount = dataGridInstance.totalCount();
+    setFilteredRowCount(filteredDataCount);
+  };
   return React.createElement(React.Fragment, null, React.createElement(DataGrid$1, {
     keyExpr: props.keyExpr,
     dataSource: data,
@@ -16863,7 +16836,8 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
     noDataText: props.noDataText,
     onSaved: props.onSaved,
     onSaving: props.onSaving,
-    onEditCanceling: props.onEditCanceling
+    onEditCanceling: props.onEditCanceling,
+    onContentReady: handleContentReady
   }, columns.map(function (col) {
     return React.createElement(Column, Object.assign({
       key: col.dataField