ods-component-lib 1.18.14 → 1.18.16

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

@@ -1,7 +1,6 @@
 import React from 'react';
 import { IDataGridOptions, IButtonProps, ISelectionProps, IEditingProps, ISummaryProps } from 'devextreme-react/data-grid';
 interface IOdsDataGridProps extends IDataGridOptions {
-    isApplyButtonClicked?: boolean;
     language: string;
     exportFileName: string;
     filterEnabledShow: boolean;
@@ -19,6 +18,7 @@ interface IOdsDataGridProps extends IDataGridOptions {
     isServerSide: boolean;
     axiosRequest?: IAxiosProps;
     customSummary?: ISummaryRowOptions;
+    onCancelEdit?: any;
 }
 interface ISummaryRowOptions {
     summaryLoadedDataLabel?: string;

package/dist/index.js

@@ -1276,7 +1276,7 @@ var renderMenuItem = function renderMenuItem() {
   });
 };
 function OdsDataGrid(props) {
-  var _ref2, _props$selectionMode, _props$selectionDefer;
+  var _props$selectionMode, _props$selectionDefer;
   var dataGridRef = React.useRef(null);
   var _useToken = useToken(),
     token = _useToken.token;
@@ -1384,8 +1384,7 @@ function OdsDataGrid(props) {
     remoteOperations: false,
     ref: dataGridRef,
     selectedRowKeys: props.selectedRowKeys,
-    onSelectionChanged: props.onSelectionChanged,
-    noDataText: (_ref2 = props.noDataText !== undefined) != null ? _ref2 : props.noDataText
+    onSelectionChanged: props.onSelectionChanged
   }, React__default.createElement(DataGrid.LoadPanel, {
     enabled: true
   }), React__default.createElement(DataGrid.Paging, {
@@ -17136,6 +17135,12 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
   var _useState4 = React.useState(props.columns),
     columns = _useState4[0],
     setColumns = _useState4[1];
+  var onCancelEditEvent = new CustomEvent('cancelEdit', {
+    bubbles: true,
+    detail: {
+      rowData: null
+    }
+  });
   var headers = new Headers({
     'Content-Type': 'application/json',
     'Authorization': 'Bearer ' + (props.axiosRequest ? props.axiosRequest.token : ""),
@@ -17228,9 +17233,14 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
             return _catch(function () {
               return Promise.resolve(fetch(apiUrl, requestOptions)).then(function (response) {
                 return Promise.resolve(response.json()).then(function (newData) {
-                  setData(function (prevData) {
-                    return [].concat(prevData, newData.Data);
-                  });
+                  if (loadedPageCount == 1) {
+                    setData(newData.Data);
+                    loadedPageCount = 1;
+                  } else if (totalPageCount >= loadedPageCount) {
+                    setData(function (prevData) {
+                      return [].concat(prevData, newData.Data);
+                    });
+                  }
                   totalPageCount = newData.PageCount;
                   totalRecordCount = newData.RowCount;
                 });
@@ -17263,6 +17273,13 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
         e.editorOptions.onFocusOut = enableScrolling;
       }
     }
+    if (e.editorOptions && e.rowType === 'data' && e.parentType === 'dataRow') {
+      e.editorOptions.onValueChanged = function (args) {
+        if (args.event && args.event.type === 'cancel') {
+          e.cellElement.dispatchEvent(onCancelEditEvent);
+        }
+      };
+    }
   }, [props.isServerSide]);
   var getServerSide = React.useCallback(function (type) {
     try {
@@ -17424,7 +17441,6 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
     showBorders: true,
     columnAutoWidth: false,
     onEditorPreparing: onEditorPreparing,
-    onSaving: props.onSaving,
     ref: handleRef,
     onExporting: onExporting,
     height: props.height == undefined ? window.innerHeight - 164 : props.height,
@@ -17448,7 +17464,6 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
     columnFixing: {
       enabled: true
     },
-    selectedRowKeys: props.selectedRowKeys,
     onSelectionChanged: props.onSelectionChanged,
     noDataText: props.noDataText,
     onSaved: props.onSaved
@@ -17465,6 +17480,12 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
         text: 'Passive',
         value: false
       }]
+    }), col.multiLevelColumns && col.multiLevelColumns.map(function (multiLevelColItem) {
+      return React__default.createElement(DataGrid.Column, {
+        dataField: multiLevelColItem.dataField,
+        caption: multiLevelColItem.caption,
+        width: 80
+      });
     }));
   }), props.actionColumnEnable !== undefined && props.actionColumnEnable === true && React__default.createElement(DataGrid.Column, {
     dataField: "Actions",