ods-component-lib 1.18.5 → 1.18.7

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

@@ -8,6 +8,7 @@ interface IOdsDataGridProps extends IDataGridOptions {
     pageTitle?: string;
     toolbarButtonGroup?: IButtonGroup[];
     actionButtonGroup?: IButtonGroup[];
+    actionButtonGroupCaption?: string;
     columns: any[];
     pageSize?: number;
     actionColumnEnable: boolean;

package/dist/index.js

@@ -16580,11 +16580,18 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
   React.useEffect(function () {
     localization.locale(localStorage.getItem("locale"));
     localization.loadMessages(JSON.parse(localStorage.getItem("localTranslation")));
+    if (gridRef.current) {
+      gridRef.current.instance.updateDimensions();
+    }
   }, []);
   React.useEffect(function () {
-    if (props.actionButtonGroup.length >= 2) {
-      setActionButtons(props.actionButtonGroup.slice(0, 2));
-      setKebabMenuButtons(props.actionButtonGroup.slice(2, props.actionButtonGroup.length));
+    if (props.actionButtonGroup) {
+      if (props.actionButtonGroup.length >= 2 && !props.edit) {
+        setActionButtons(props.actionButtonGroup.slice(0, 2));
+        setKebabMenuButtons(props.actionButtonGroup.slice(2, props.actionButtonGroup.length));
+      } else {
+        setActionButtons(props.actionButtonGroup);
+      }
     }
   }, [props.actionButtonGroup]);
   var handleRef = function handleRef(instance) {
@@ -16643,7 +16650,6 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
         dxScrollable.off("scroll");
         dxScrollable.on("scroll", function (args) {
           if (args.reachedBottom) {
-            debugger;
             getServerSide("reachedBottom");
           }
         });
@@ -16737,7 +16743,12 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
     }
   };
   var renderTotal = function renderTotal() {
-    var totalloaded = loadedPageCount * props.pageSize;
+    var totalloaded = 0;
+    if (data.length < 50) {
+      totalloaded = data.length;
+    } else {
+      totalloaded = loadedPageCount * props.pageSize;
+    }
     var result = "";
     if (filteredRowCount > 0) {
       result = totalloaded + " Filtered" + (totalRecordCount > 0 ? totalloaded + " Loaded - " + totalRecordCount + " Total" : "");
@@ -16800,9 +16811,7 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
       key: col.dataField
     }, col, {
       minWidth: 180
-    }), col.required && React__default.createElement(DataGrid.RequiredRule, {
-      message: col.requiredMessage
-    }), col.dataField === 'IsActive' && React__default.createElement(DataGrid.HeaderFilter, {
+    }), col.lookUp && React__default.createElement(devextremeReact.Lookup, Object.assign({}, col.lookUp)), col.dataField === 'IsActive' && React__default.createElement(DataGrid.HeaderFilter, {
       dataSource: [{
         text: 'Active',
         value: true
@@ -16815,10 +16824,10 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
     dataField: "Actions",
     fixed: true,
     allowSorting: false,
-    caption: "Actions",
+    caption: props.actionButtonGroupCaption,
     type: "buttons",
     showInColumnChooser: false
-  }, actionButtons.map(function (buttonItem) {
+  }, !props.edit && actionButtons.map(function (buttonItem) {
     return React__default.createElement(DataGrid.Button, {
       hint: buttonItem.hint,
       visible: buttonItem.visible,
@@ -16828,6 +16837,8 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
       })),
       onClick: buttonItem.onClick
     });
+  }), props.edit && actionButtons.map(function (buttonItem) {
+    return React__default.createElement(DataGrid.Button, Object.assign({}, buttonItem));
   })), kebabMenuButtons.length > 0 && React__default.createElement(DataGrid.Column, {
     dataField: "Actionss",
     fixed: true,