ods-component-lib 1.18.67 → 1.18.69

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

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

package/dist/index.js

@@ -16703,9 +16703,11 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
     var onOptionChanged = props.onOptionChanged;
     if (onOptionChanged) {
       var dataGridInstance = gridRef.current.instance;
-      var sortingState = dataGridInstance.getVisibleColumns().map(function (column, index) {
+      var sortingState = dataGridInstance.getVisibleColumns().filter(function (p) {
+        return !p.command;
+      }).map(function (column, index) {
         return {
-          index: index - 1,
+          index: index,
           dataField: column.dataField,
           sortOrder: column.sortOrder
         };
@@ -16859,16 +16861,16 @@ 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) {
+      if (props.filterData != null) {
+        var newColumnFromFilterData = props.filterData.map(function (filterItem) {
           return {
-            dataField: filtreItem.key,
-            caption: filtreItem.key
+            dataField: filterItem.key,
+            caption: filterItem.key
           };
         });
-        var yeniSutunlar = [].concat(columns.current, yeniSutunlarFiltreVerisinden);
+        var newColumns = [].concat(columns.current, newColumnFromFilterData);
         e.component.beginUpdate();
-        e.component.option("columns", yeniSutunlar);
+        e.component.option("columns", newColumns);
         e.component.endUpdate();
       }
       excel_exporter.exportDataGrid({
@@ -16891,8 +16893,8 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
               excelCell.value = formattedDate;
             }
           }
-          if (gridCell.rowType !== 'header' && props.inputFilterData != null) {
-            var matchingItem = props.inputFilterData.find(function (item) {
+          if (gridCell.rowType !== 'header' && props.filterData != null) {
+            var matchingItem = props.filterData.find(function (item) {
               return item.key === gridCell.column.dataField;
             });
             if (matchingItem) {
@@ -16917,7 +16919,7 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
         doc.save(fileName + '.pdf');
       });
     }
-  }, [fileName]);
+  }, [fileName, props.filterData]);
   var customLoad = React.useCallback(function () {
     var state = JSON.parse(localStorage.getItem(props.exportFileName + "Storage"));
     if (localStorage.getItem(props.exportFileName + "Storage")) {