ods-component-lib 1.18.171 → 1.18.173

package/dist/index.js

@@ -33604,6 +33604,9 @@ var OdsBasicDataGrid = function OdsBasicDataGrid(props) {
       dataSource: props.detailData[data.key.ID]
     }));
   };
+  var checkIsPropArray = function checkIsPropArray(prop) {
+    return prop && Array.isArray(prop);
+  };
   return React__default.createElement(React__default.Fragment, null, React__default.createElement(antd.Modal, {
     title: fastUpdateModalTitle != null ? fastUpdateModalTitle : "Fast Update",
     open: isFastUpdateModalOpen,
@@ -33651,7 +33654,7 @@ var OdsBasicDataGrid = function OdsBasicDataGrid(props) {
   }, " ", fastUpdateModalCancelText != null ? fastUpdateModalCancelText : "Cancel")), React__default.createElement(antd.Col, null, React__default.createElement(OdsButton, {
     htmlType: "submit",
     type: "primary"
-  }, " ", fastUpdateModalSaveText != null ? fastUpdateModalSaveText : "Save"))))), React__default.createElement(DataGrid__default, {
+  }, " ", fastUpdateModalSaveText != null ? fastUpdateModalSaveText : "Save"))))), React__default.createElement(DataGrid__default, Object.assign({
     keyExpr: keyExpr,
     dataSource: data,
     showBorders: true,
@@ -33669,7 +33672,10 @@ var OdsBasicDataGrid = function OdsBasicDataGrid(props) {
     width: "100%",
     repaintChangesOnly: true,
     focusedRowEnabled: false,
-    filterSyncEnabled: true,
+    filterSyncEnabled: true
+  }, checkIsPropArray(props.selectedRowKeys) && {
+    selectedRowKeys: props.selectedRowKeys
+  }, {
     wordWrapEnabled: props.wordWrapEnabled ? props.wordWrapEnabled : false,
     columnFixing: {
       enabled: true
@@ -33702,7 +33708,7 @@ var OdsBasicDataGrid = function OdsBasicDataGrid(props) {
     onCellPrepared: onCustomCellPrepared,
     onOptionChanged: props.onOptionChanged || onCustomOptionChanged,
     onToolbarPreparing: props.onToolbarPreparing || onToolbarPreparing
-  }, gridColumns.map(function (col) {
+  }), gridColumns.map(function (col) {
     return React__default.createElement(DataGrid.Column, Object.assign({
       key: col.dataField
     }, col, {
@@ -34500,11 +34506,11 @@ var OdsServerSideDatagrid = function OdsServerSideDatagrid(props) {
     filterApplied = _useState3[0],
     setFilterApplied = _useState3[1];
   var _useState4 = React.useState(0),
-    totalUnfilteredCount = _useState4[0],
-    setTotalUnfilteredCount = _useState4[1];
+    setTotalUnfilteredCountState = _useState4[1];
   var _useState5 = React.useState(0),
-    totalFilteredCount = _useState5[0],
-    setTotalFilteredCount = _useState5[1];
+    setTotalFilteredCountState = _useState5[1];
+  var totalUnfilteredCount = React.useRef(0);
+  var totalFilteredCount = React.useRef(0);
   var _useState6 = React.useState(false),
     updateTrigger = _useState6[0],
     setUpdateTrigger = _useState6[1];
@@ -34514,7 +34520,7 @@ var OdsServerSideDatagrid = function OdsServerSideDatagrid(props) {
   React.useEffect(function () {}, [updateTrigger, totalUnfilteredCount, totalFilteredCount, filterApplied]);
   var renderTotal = React.useCallback(function () {
     var _props$customSummary, _props$customSummary2, _props$customSummary3, _props$customSummary4;
-    var totalLoaded = filterApplied ? totalFilteredCount : totalUnfilteredCount;
+    var totalLoaded = filterApplied ? totalFilteredCount.current : totalUnfilteredCount.current;
     var loadedPage = currentPage;
     var totalRecords = props.totalRecordCount;
     var totalPageCount = Math.ceil(totalRecords / currentPageSize);
@@ -34522,7 +34528,7 @@ var OdsServerSideDatagrid = function OdsServerSideDatagrid(props) {
       return "";
     }
     var filteredDisplayText = filterApplied ? totalLoaded + " " + ((_props$customSummary = props.customSummary) === null || _props$customSummary === void 0 ? void 0 : _props$customSummary.summaryFilteredDataLabel) + " - " : "";
-    var loadedDisplayText = totalUnfilteredCount + " " + ((_props$customSummary2 = props.customSummary) === null || _props$customSummary2 === void 0 ? void 0 : _props$customSummary2.summaryLoadedDataLabel) + " - ";
+    var loadedDisplayText = totalUnfilteredCount.current + " " + ((_props$customSummary2 = props.customSummary) === null || _props$customSummary2 === void 0 ? void 0 : _props$customSummary2.summaryLoadedDataLabel) + " - ";
     var result = "" + filteredDisplayText + loadedDisplayText + totalRecords + " " + ((_props$customSummary3 = props.customSummary) === null || _props$customSummary3 === void 0 ? void 0 : _props$customSummary3.summaryTotalDataLabel);
     result += " - " + ((_props$customSummary4 = props.customSummary) === null || _props$customSummary4 === void 0 ? void 0 : _props$customSummary4.summaryTotalPageCountLabel) + " " + loadedPage + " / " + totalPageCount;
     return result;
@@ -34534,11 +34540,14 @@ var OdsServerSideDatagrid = function OdsServerSideDatagrid(props) {
     var currentTotalCount = currentPageIndex == 0 ? 50 : dataGridInstance.totalCount();
     var newData = dataGridInstance === null || dataGridInstance === void 0 ? void 0 : (_dataGridInstance$get = dataGridInstance.getDataSource()) === null || _dataGridInstance$get === void 0 ? void 0 : _dataGridInstance$get.items();
     if (filterApplied) {
-      setTotalFilteredCount(currentTotalCount);
+      setTotalFilteredCountState(currentTotalCount);
+      totalFilteredCount.current = currentTotalCount;
     } else {
-      setTotalUnfilteredCount(currentTotalCount);
+      setTotalUnfilteredCountState(currentTotalCount);
+      totalUnfilteredCount.current = currentTotalCount;
     }
-    if ((!filterApplied && currentPageIndex == 1 && currentTotalCount != totalUnfilteredCount || lastPageIndexRef.current !== currentPageIndex) && newData && newData.length > 0) {
+    renderTotal();
+    if ((!filterApplied && currentPageIndex == 1 && currentTotalCount != totalUnfilteredCount.current || lastPageIndexRef.current !== currentPageIndex) && newData && newData.length > 0) {
       setCurrentPage(currentPageIndex);
       setCurrentPageSize(dataGridInstance.pageSize());
       rowCount.current = currentTotalCount;
@@ -34564,7 +34573,7 @@ var OdsServerSideDatagrid = function OdsServerSideDatagrid(props) {
       if (active) {
         setTimeout(function () {
           dataGrid.refresh().done(function () {
-            setTotalFilteredCount(dataGrid.totalCount());
+            totalFilteredCount.current = dataGrid.totalCount();
             setUpdateTrigger(function (prev) {
               return !prev;
             });