ods-component-lib 1.18.63 → 1.18.65

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$axiosRequest2, _props$axiosRequest3, _props$axiosRequest4, _props$axiosRequest5, _props$axiosRequest6, _props$axiosRequest7, _props$axiosRequest8, _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([]),
@@ -16652,15 +16652,15 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
     totalRecordCount = 0;
   }, [props.dataGridPageName]);
   React.useEffect(function () {
-    var _props$axiosRequest;
-    if (props.axiosRequest !== undefined && Object.keys((_props$axiosRequest = props.axiosRequest) === null || _props$axiosRequest === void 0 ? void 0 : _props$axiosRequest.requestData).length > 0) {
+    var _props$axiosRequest, _props$axiosRequest2, _props$axiosRequest3;
+    if (props.axiosRequest !== undefined && ((_props$axiosRequest = props.axiosRequest) !== null && _props$axiosRequest !== void 0 && _props$axiosRequest.requestData && Object.keys((_props$axiosRequest2 = props.axiosRequest) === null || _props$axiosRequest2 === void 0 ? void 0 : _props$axiosRequest2.requestData).length > 0 || (_props$axiosRequest3 = props.axiosRequest) !== null && _props$axiosRequest3 !== void 0 && _props$axiosRequest3.requestQueryString)) {
       totalPageCount = 1;
       loadedPageCount = 1;
       totalRecordCount = 0;
       setData([]);
       fetchData();
     }
-  }, [(_props$axiosRequest2 = props.axiosRequest) === null || _props$axiosRequest2 === void 0 ? void 0 : _props$axiosRequest2.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) {
@@ -16773,7 +16773,7 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
     } catch (e) {
       return Promise.reject(e);
     }
-  }, [(_props$axiosRequest3 = props.axiosRequest) === null || _props$axiosRequest3 === void 0 ? void 0 : _props$axiosRequest3.requestData, (_props$axiosRequest4 = props.axiosRequest) === null || _props$axiosRequest4 === void 0 ? void 0 : _props$axiosRequest4.apiUrl, (_props$axiosRequest5 = props.axiosRequest) === null || _props$axiosRequest5 === void 0 ? void 0 : _props$axiosRequest5.environmentUrl, (_props$axiosRequest6 = props.axiosRequest) === null || _props$axiosRequest6 === void 0 ? void 0 : _props$axiosRequest6.requestQueryString, (_props$axiosRequest7 = props.axiosRequest) === null || _props$axiosRequest7 === void 0 ? void 0 : _props$axiosRequest7.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 +16819,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 +16851,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 +16960,7 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
   }, [kebabMenuButtons]);
   var onScrollEnd = React.useCallback(function () {
     getServerSide("reachedBottom");
-  }, [(_props$axiosRequest8 = props.axiosRequest) === null || _props$axiosRequest8 === void 0 ? void 0 : _props$axiosRequest8.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;