ods-component-lib 1.18.64 → 1.18.66

package/dist/components/devextreme/OdsRemoteDataGrid.d.ts

@@ -22,6 +22,7 @@ export interface IOdsDataGridProps extends IDataGridOptions {
     customSummary?: ISummaryRowOptions;
     handleEditorPreparing?: any;
     isFilterRow?: boolean;
+    inputFilterData?: any[];
 }
 interface ISummaryRowOptions {
     summaryLoadedDataLabel?: string;

package/dist/index.js

@@ -16619,7 +16619,7 @@ var loadedPageCount = 1;
 var totalRecordCount = 0;
 var useToken$1 = antd.theme.useToken;
 var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
-  var _props$axiosRequest4, _props$axiosRequest5, _props$axiosRequest6, _props$axiosRequest7, _props$axiosRequest8, _props$axiosRequest9, _props$axiosRequest10, _props$selectOptions, _props$selectOptions$, _props$selectOptions2, _props$selectOptions$2, _props$selectOptions3;
+  var _props$axiosRequest4, _props$axiosRequest5, _props$axiosRequest6, _props$axiosRequest7, _props$axiosRequest8, _props$axiosRequest9, _props$axiosRequest10, _props$axiosRequest11, _props$selectOptions, _props$selectOptions$, _props$selectOptions2, _props$selectOptions$2, _props$selectOptions3;
   var _useToken = useToken$1(),
     token = _useToken.token;
   var _useState = React.useState([]),
@@ -16635,6 +16635,9 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
   var _useState3 = React.useState(false),
     loading = _useState3[0],
     setLoading = _useState3[1];
+  var _useState4 = React.useState(false),
+    contentReady = _useState4[0],
+    setContentReady = _useState4[1];
   var onCancelEditEvent = new CustomEvent('cancelEdit', {
     bubbles: true,
     detail: {
@@ -16660,7 +16663,7 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
       setData([]);
       fetchData();
     }
-  }, [(_props$axiosRequest4 = props.axiosRequest) === null || _props$axiosRequest4 === void 0 ? void 0 : _props$axiosRequest4.requestData]);
+  }, [(_props$axiosRequest4 = props.axiosRequest) === null || _props$axiosRequest4 === void 0 ? void 0 : _props$axiosRequest4.requestData, (_props$axiosRequest5 = props.axiosRequest) === null || _props$axiosRequest5 === void 0 ? void 0 : _props$axiosRequest5.requestQueryString]);
   React.useEffect(function () {
     if (columns.current !== undefined && columns.current.length > 0) {
       var newColumns = columns.current.map(function (colItem) {
@@ -16693,6 +16696,45 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
       gridRef.current.instance.updateDimensions();
     }
   }, []);
+  React.useEffect(function () {
+    if (contentReady) checkSortingPropertyForInitilaize();
+  }, [contentReady]);
+  var checkSortingPropertyForInitilaize = function checkSortingPropertyForInitilaize() {
+    var onOptionChanged = props.onOptionChanged;
+    if (onOptionChanged) {
+      var dataGridInstance = gridRef.current.instance;
+      var sortingState = dataGridInstance.getVisibleColumns().map(function (column, index) {
+        return {
+          index: index - 1,
+          dataField: column.dataField,
+          sortOrder: column.sortOrder
+        };
+      });
+      var sortedColumn = sortingState.find(function (column) {
+        return column.sortOrder !== undefined;
+      });
+      console.log("sorted column", sortedColumn);
+      if (sortedColumn) {
+        if (sortedColumn.sortOrder) {
+          dataGridInstance.option("columns[" + sortedColumn.index + "].sortOrder", sortedColumn.sortOrder);
+          var fullName = "columns[" + sortedColumn.index + "].sortOrder";
+          var gridEvent = {
+            component: dataGridInstance,
+            fullName: fullName,
+            name: 'optionChanged',
+            value: sortedColumn.sortOrder,
+            previousValue: null,
+            element: null
+          };
+          onOptionChanged(gridEvent);
+        }
+      }
+    }
+  };
+  var checkRequestDataHasOnlySortingProperty = function checkRequestDataHasOnlySortingProperty(obj) {
+    var keys = Object.keys(obj);
+    return keys.length === 1 && keys[0] === 'Sorting';
+  };
   var actionButtons = React.useMemo(function () {
     if (props.actionButtonGroup) {
       if (props.actionButtonGroup.length >= 2 && !props.edit) {
@@ -16718,9 +16760,10 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
   var fetchData = React.useCallback(function () {
     try {
       if (props.axiosRequest == undefined) return Promise.resolve();
-      var _temp2 = function () {
+      return Promise.resolve(function () {
         if (props.isServerSide) {
           var _props$axiosRequest$r;
+          if (props.axiosRequest.requestData && checkRequestDataHasOnlySortingProperty(props.axiosRequest.requestData)) return;
           var apiUrl = props.axiosRequest.environmentUrl + "" + props.axiosRequest.apiUrl;
           if (((_props$axiosRequest$r = props.axiosRequest.requestData) === null || _props$axiosRequest$r === void 0 ? void 0 : _props$axiosRequest$r.PaginatedRequest) !== undefined) {
             props.axiosRequest.requestData.PaginatedRequest.PageNumber = loadedPageCount;
@@ -16768,12 +16811,11 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
           });
           if (_temp && _temp.then) return _temp.then(function () {});
         }
-      }();
-      return Promise.resolve(_temp2 && _temp2.then ? _temp2.then(function () {}) : void 0);
+      }());
     } catch (e) {
       return Promise.reject(e);
     }
-  }, [(_props$axiosRequest5 = props.axiosRequest) === null || _props$axiosRequest5 === void 0 ? void 0 : _props$axiosRequest5.requestData, (_props$axiosRequest6 = props.axiosRequest) === null || _props$axiosRequest6 === void 0 ? void 0 : _props$axiosRequest6.apiUrl, (_props$axiosRequest7 = props.axiosRequest) === null || _props$axiosRequest7 === void 0 ? void 0 : _props$axiosRequest7.environmentUrl, (_props$axiosRequest8 = props.axiosRequest) === null || _props$axiosRequest8 === void 0 ? void 0 : _props$axiosRequest8.requestQueryString, (_props$axiosRequest9 = props.axiosRequest) === null || _props$axiosRequest9 === void 0 ? void 0 : _props$axiosRequest9.requestType, props.pageSize, props.isServerSide]);
+  }, [(_props$axiosRequest6 = props.axiosRequest) === null || _props$axiosRequest6 === void 0 ? void 0 : _props$axiosRequest6.requestData, (_props$axiosRequest7 = props.axiosRequest) === null || _props$axiosRequest7 === void 0 ? void 0 : _props$axiosRequest7.apiUrl, (_props$axiosRequest8 = props.axiosRequest) === null || _props$axiosRequest8 === void 0 ? void 0 : _props$axiosRequest8.environmentUrl, (_props$axiosRequest9 = props.axiosRequest) === null || _props$axiosRequest9 === void 0 ? void 0 : _props$axiosRequest9.requestQueryString, (_props$axiosRequest10 = props.axiosRequest) === null || _props$axiosRequest10 === void 0 ? void 0 : _props$axiosRequest10.requestType, props.pageSize, props.isServerSide]);
   var getTotalCount = function getTotalCount(response, data) {
     if (data !== null && data !== void 0 && data.PageCount || data !== null && data !== void 0 && data.RowCount) {
       totalPageCount = data.PageCount;
@@ -16819,6 +16861,18 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
   var onExporting = React.useCallback(function (e) {
     if (e.format === 'xlsx') {
       var workbook = new exceljs.Workbook();
+      if (props.inputFilterData != null) {
+        var yeniSutunlarFiltreVerisinden = props.inputFilterData.map(function (filtreItem) {
+          return {
+            dataField: filtreItem.key,
+            caption: filtreItem.key
+          };
+        });
+        var yeniSutunlar = [].concat(columns.current, yeniSutunlarFiltreVerisinden);
+        e.component.beginUpdate();
+        e.component.option("columns", yeniSutunlar);
+        e.component.endUpdate();
+      }
       excel_exporter.exportDataGrid({
         component: e.component,
         worksheet: workbook.addWorksheet('Main sheet'),
@@ -16839,6 +16893,14 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
               excelCell.value = formattedDate;
             }
           }
+          if (gridCell.rowType !== 'header' && props.inputFilterData != null) {
+            var matchingItem = props.inputFilterData.find(function (item) {
+              return item.key === gridCell.column.dataField;
+            });
+            if (matchingItem) {
+              excelCell.value = matchingItem.value;
+            }
+          }
         }
       }).then(function () {
         workbook.xlsx.writeBuffer().then(function (buffer) {
@@ -16940,7 +17002,7 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
   }, [kebabMenuButtons]);
   var onScrollEnd = React.useCallback(function () {
     getServerSide("reachedBottom");
-  }, [(_props$axiosRequest10 = props.axiosRequest) === null || _props$axiosRequest10 === void 0 ? void 0 : _props$axiosRequest10.requestData, getServerSide]);
+  }, [(_props$axiosRequest11 = props.axiosRequest) === null || _props$axiosRequest11 === void 0 ? void 0 : _props$axiosRequest11.requestData, getServerSide]);
   var handleScroll = function handleScroll(e) {
     var run = debounce_1(function (e) {
       var _scrollable$scrollTop, _scrollable$clientHei, _scrollable$scrollHei;
@@ -16972,6 +17034,7 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
     var dataGridInstance = e.component;
     var filteredDataCount = dataGridInstance.totalCount();
     if (filterApplied.current && filteredDataCount > 0) setFilteredRowCount(filteredDataCount);
+    if (!contentReady) setContentReady(true);
   };
   var onFilterValueChange = function onFilterValueChange(e) {
     if (e !== null) filterApplied.current = true;else {