ods-component-lib 1.18.14 → 1.18.16

package/dist/index.modern.js

@@ -1271,7 +1271,7 @@ var renderMenuItem = function renderMenuItem() {
   });
 };
 function OdsDataGrid(props) {
-  var _ref2, _props$selectionMode, _props$selectionDefer;
+  var _props$selectionMode, _props$selectionDefer;
   var dataGridRef = useRef(null);
   var _useToken = useToken(),
     token = _useToken.token;
@@ -1379,8 +1379,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.createElement(LoadPanel, {
     enabled: true
   }), React.createElement(Paging, {
@@ -17131,6 +17130,12 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
   var _useState4 = 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 : ""),
@@ -17223,9 +17228,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;
                 });
@@ -17258,6 +17268,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 = useCallback(function (type) {
     try {
@@ -17419,7 +17436,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,
@@ -17443,7 +17459,6 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
     columnFixing: {
       enabled: true
     },
-    selectedRowKeys: props.selectedRowKeys,
     onSelectionChanged: props.onSelectionChanged,
     noDataText: props.noDataText,
     onSaved: props.onSaved
@@ -17460,6 +17475,12 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
         text: 'Passive',
         value: false
       }]
+    }), col.multiLevelColumns && col.multiLevelColumns.map(function (multiLevelColItem) {
+      return React.createElement(Column, {
+        dataField: multiLevelColItem.dataField,
+        caption: multiLevelColItem.caption,
+        width: 80
+      });
     }));
   }), props.actionColumnEnable !== undefined && props.actionColumnEnable === true && React.createElement(Column, {
     dataField: "Actions",