ods-component-lib 1.18.222 → 1.18.225

package/dist/components/antd/fileUpload/OdsFileUploadv2.d.ts

@@ -30,7 +30,7 @@ interface IUploadRequestModel {
     operatorId: number;
 }
 declare type FileUploadProps = {
-    image: any | null;
+    file: any | null;
     title: string;
     uploadTitle?: string;
     defaultFileList?: UploadProps["defaultFileList"];
@@ -46,7 +46,7 @@ declare type FileUploadProps = {
     maxFileSizeMB?: number;
     moduleType?: number;
     operatorId?: number;
-    uploadFile?: (request: IUploadRequestModel) => void;
+    uploadFile?: (request: IUploadRequestModel[]) => void;
 };
 declare function OdsFileUploadv2(props: FileUploadProps): React.JSX.Element;
 export default OdsFileUploadv2;

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

@@ -15,6 +15,10 @@ export interface IMultiCellEditableDataGridProps {
     onFastUpdateFailed?: (errorInfo: any) => void;
 }
 export declare type IActionButtonsTooltipType = "raw" | "styled";
+export interface IActionButtonGroup extends Partial<IButtonGroup> {
+    elementType?: "button" | "element";
+    element?: JSX.Element;
+}
 export interface IOdsDataGridProps extends IDataGridOptions, IMultiCellEditableDataGridProps {
     dataGridPageName?: string;
     language: string;
@@ -22,7 +26,7 @@ export interface IOdsDataGridProps extends IDataGridOptions, IMultiCellEditableD
     filterEnabledShow: boolean;
     pageTitle?: string;
     toolbarButtonGroup?: IButtonGroup[];
-    actionButtonGroup?: IButtonGroup[];
+    actionButtonGroup?: IActionButtonGroup[];
     actionButtonGroupCaption?: string;
     columns: any[];
     pageSize?: number;

package/dist/index.js

@@ -1968,7 +1968,6 @@ var OdsFilterPlus = function OdsFilterPlus(props) {
     activeTabKey = _useState[0],
     setActiveTabKey = _useState[1];
   var advancedRef = React__default.createRef();
-  var advanceFilterTabsRows = React.useRef([]);
   var _useState2 = React.useState(true),
     showFilter = _useState2[0],
     setShowFilter = _useState2[1];
@@ -2069,58 +2068,6 @@ var OdsFilterPlus = function OdsFilterPlus(props) {
       return _temp && _temp.then ? _temp.then(_temp2) : _temp2();
     });
   };
-  var addAdditionalRowsToAdvanceFilterTabs = function addAdditionalRowsToAdvanceFilterTabs(children) {
-    if (children.length > 6) {
-      var _advanceFilterTabsRow;
-      var additionalRows = children.slice(6).map(function (filterRow) {
-        return {
-          colSize: filterRow.colSize,
-          element: filterRow.element
-        };
-      });
-      (_advanceFilterTabsRow = advanceFilterTabsRows.current).push.apply(_advanceFilterTabsRow, additionalRows);
-    }
-  };
-  var FilterList = function FilterList(_ref2) {
-    var isDisplayInline = _ref2.isDisplayInline;
-    return React__default.createElement(antd.Row, {
-      gutter: 12
-    }, filterRow.map(function (item, index) {
-      return React__default.createElement(antd.Col, Object.assign({
-        key: index
-      }, item.colSize || defaultColSize({
-        isDisplayInline: isDisplayInline
-      }), {
-        className: (filterRow === null || filterRow === void 0 ? void 0 : filterRow.length) > 6 ? "mb-4" : ""
-      }), item.element);
-    }));
-  };
-  var FilterTabsList = function FilterTabsList(_ref3) {
-    var tabs = _ref3.tabs,
-      isDisplayInline = _ref3.isDisplayInline;
-    advanceFilterTabsRows.current = [];
-    tabs.forEach(function (tab) {
-      if (tab.children && tab.children.length > 6) {
-        addAdditionalRowsToAdvanceFilterTabs(tab.children);
-      }
-    });
-    return React__default.createElement(React__default.Fragment, null, tabs.map(function (tab) {
-      return tab.children ? React__default.createElement(antd.Row, {
-        gutter: 12,
-        key: tab.key
-      }, tab.children.slice(0, 6).map(function (filterRow, index) {
-        return React__default.createElement(antd.Col, Object.assign({
-          key: index,
-          xs: 24,
-          sm: 12,
-          md: 8,
-          lg: 4
-        }, filterRow.colSize || defaultColSize({
-          isDisplayInline: isDisplayInline
-        })), filterRow.element);
-      })) : null;
-    }));
-  };
   React.useEffect(function () {
     var _props$tabs;
     var selectedTab = (_props$tabs = props.tabs) === null || _props$tabs === void 0 ? void 0 : _props$tabs.find(function (tab) {
@@ -2130,34 +2077,8 @@ var OdsFilterPlus = function OdsFilterPlus(props) {
       setHasAdvancedFilters(selectedTab.isAdvanceSearchEnable !== false && selectedTab.children.length > 5);
     }
   }, [activeTabKey, props.tabs]);
-  var FilterTabsContainer = function FilterTabsContainer() {
-    return React__default.createElement(OdsTab, {
-      activeKey: activeTabKey,
-      onChange: onTabChange,
-      items: props.tabs.map(function (tab) {
-        return {
-          key: tab.key,
-          label: tab.label,
-          children: React__default.createElement(FilterTabsList, {
-            tabs: [tab],
-            isDisplayInline: true
-          }),
-          icon: tab.icon
-        };
-      })
-    });
-  };
   var onTabChange = function onTabChange(key) {
     setActiveTabKey(key);
-    advanceFilterTabsRows.current = [];
-    var selectedTab = props.tabs.find(function (tab) {
-      return tab.key === key;
-    });
-    if (selectedTab && selectedTab.children) {
-      if (selectedTab.children.length > 6) {
-        addAdditionalRowsToAdvanceFilterTabs(selectedTab.children);
-      }
-    }
   };
   var ActionButtons = function ActionButtons() {
     return React__default.createElement("div", {
@@ -2255,22 +2176,58 @@ var OdsFilterPlus = function OdsFilterPlus(props) {
     className: styles.filterBody
   }, hasTabFilter && React__default.createElement("div", {
     className: styles.filterInlineDisplayWrapper
-  }, React__default.createElement(FilterTabsContainer, null), React__default.createElement("div", {
+  }, React__default.createElement(OdsTab, {
+    activeKey: activeTabKey,
+    onChange: onTabChange,
+    items: props.tabs.map(function (tab) {
+      return {
+        key: tab.key,
+        label: tab.label,
+        children: React__default.createElement(antd.Row, {
+          gutter: 12,
+          key: tab.key
+        }, tab.children ? tab.children.slice(0, 6).map(function (filterRow, index) {
+          return React__default.createElement(antd.Col, Object.assign({
+            key: index,
+            xs: 24,
+            sm: 12,
+            md: 8,
+            lg: 4
+          }, filterRow.colSize || defaultColSize({
+            isDisplayInline: shouldDisplayButtonsInline
+          })), filterRow.element);
+        }) : null),
+        icon: tab.icon
+      };
+    })
+  }), " ", React__default.createElement("div", {
     className: advancedFilterStyles.advancedFilterRowWrapper,
     ref: advancedRef
   }, React__default.createElement("div", {
     className: advancedFilterStyles.advancedFilterRow
   }, React__default.createElement(antd.Row, {
     gutter: [12, 16]
-  }, advanceFilterTabsRows.current.map(function (item, index) {
-    return React__default.createElement(antd.Col, Object.assign({
-      key: index
-    }, item.colSize || defaultColSize({})), item.element);
+  }, props.tabs.map(function (tab) {
+    if (tab.key === activeTabKey && tab.children) {
+      var additionalRows = tab.children.slice(6).map(function (filterRow, rowIndex) {
+        return React__default.createElement(antd.Col, Object.assign({
+          key: rowIndex
+        }, filterRow.colSize || defaultColSize({})), filterRow.element);
+      });
+      return additionalRows;
+    }
+    return null;
   })))), shouldDisplayButtonsInline && React__default.createElement(ActionButtons, null)), hasFilterRow && !hasTabFilter && React__default.createElement("div", {
     className: styles.filterInlineDisplayWrapper
-  }, React__default.createElement(FilterList, {
-    isDisplayInline: shouldDisplayButtonsInline
-  }), shouldDisplayButtonsInline && React__default.createElement(ActionButtons, null)), hasAdvancedFilters && !hasTabFilter && React__default.createElement("div", {
+  }, React__default.createElement(antd.Row, {
+    gutter: 12
+  }, filterRow.map(function (item, index) {
+    return React__default.createElement(antd.Col, Object.assign({
+      key: index
+    }, item.colSize || defaultColSize({
+      isDisplayInline: shouldDisplayButtonsInline
+    })), item.element);
+  })), shouldDisplayButtonsInline && React__default.createElement(ActionButtons, null)), hasAdvancedFilters && !hasTabFilter && React__default.createElement("div", {
     className: advancedFilterStyles.advancedFilterRowWrapper,
     ref: advancedRef
   }, React__default.createElement("div", {
@@ -35356,20 +35313,26 @@ var OdsServerSideDatagrid = function OdsServerSideDatagrid(props) {
   }, []);
   function actionCellRender(cellData, props) {
     var kebabMenuButtons = props.actionButtonGroup && props.actionButtonGroup.length > 3 && !props.edit ? props.actionButtonGroup.slice(2).map(function (button) {
-      return {
-        icon: button.icon,
-        onClick: function onClick(event) {
-          var customEvent = {
-            column: cellData.column,
-            component: cellData.component,
-            element: cellData.element,
-            event: event,
-            model: cellData.data,
-            row: cellData.row
-          };
-          button.onClick(customEvent);
-        }
-      };
+      if (button.elementType === "element" && button.element) {
+        return {
+          icon: button.element
+        };
+      } else {
+        return {
+          icon: button.icon,
+          onClick: function onClick(event) {
+            var customEvent = {
+              column: cellData.column,
+              component: cellData.component,
+              element: cellData.element,
+              event: event,
+              model: cellData.data,
+              row: cellData.row
+            };
+            button.onClick(customEvent);
+          }
+        };
+      }
     }) : [];
     var buttonElements = [];
     {
@@ -36400,7 +36363,7 @@ var ModuleType;
 })(ModuleType || (ModuleType = {}));
 var Text$2 = antd.Typography.Text;
 function OdsFileUploadv2(props) {
-  var image = props.image,
+  var file = props.file,
     removeFile = props.removeFile,
     title = props.title,
     uploadTitle = props.uploadTitle,
@@ -36495,23 +36458,19 @@ function OdsFileUploadv2(props) {
     },
     onChange: function onChange(info) {
       if (info.fileList) {
-        var updatedFileList = info.fileList.map(function (file) {
-          if (file.originFileObj) {
-            if (!fileList.includes(file.uid)) {
-              uploadFile({
-                uid: file.uid,
-                file: file.originFileObj,
-                fileName: file.name,
-                fileType: getFileType(file.name),
-                moduleType: moduleType,
-                operatorId: operatorId
-              });
-            }
-          }
-          return file;
+        var filesToUpload = info.fileList.map(function (file) {
+          return {
+            uid: file.uid,
+            file: file.originFileObj,
+            fileName: file.name,
+            fileType: getFileType(file.name),
+            moduleType: moduleType,
+            operatorId: operatorId
+          };
         });
-        setFileList(updatedFileList);
-      }
+        uploadFile(filesToUpload);
+        setFileList(info.fileList);
+      } else setFileList(null);
     },
     onRemove: function onRemove(file) {
       confirm({
@@ -36527,14 +36486,16 @@ function OdsFileUploadv2(props) {
             return item.uid !== file.uid;
           });
           setFileList(updatedFileList);
-          removeFile && removeFile({
-            uid: file.uid,
-            file: file.originFileObj,
-            fileName: file.name,
-            fileType: getFileType(file.name),
-            moduleType: moduleType,
-            operatorId: operatorId
-          });
+          if (removeFile) {
+            removeFile({
+              uid: file.uid,
+              file: file.originFileObj,
+              fileName: file.name,
+              fileType: getFileType(file.name),
+              moduleType: moduleType,
+              operatorId: operatorId
+            });
+          }
         },
         onCancel: function onCancel() {}
       });
@@ -36549,11 +36510,11 @@ function OdsFileUploadv2(props) {
     return setPreviewOpen(false);
   };
   var handlePreview = function handlePreview() {
-    setPreviewOpen(true);
+    return setPreviewOpen(true);
   };
   React.useEffect(function () {
-    if (image) {
-      var formattedFiles = isMultipleDoc ? image.map(function (file) {
+    if (file) {
+      var formattedFiles = isMultipleDoc ? file.map(function (file) {
         return {
           uid: file.uid,
           name: file.filename,
@@ -36564,11 +36525,11 @@ function OdsFileUploadv2(props) {
         uid: v4(),
         name: "file",
         status: "done",
-        url: image
+        url: file
       }];
       setFileList(formattedFiles);
     }
-  }, [image]);
+  }, [file]);
   var renderPreviewContent = function renderPreviewContent(fileName, previewSrc) {
     if (previewSrc === null) {
       return "";
@@ -37917,22 +37878,30 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
   }, [data, filteredRowCount, constants$2.loadedPageCount, props.pageSize, constants$2.totalRecordCount, filterApplied.current]);
   function actionCellRender(cellData, props) {
     var kebabMenuButtons = props.actionButtonGroup && props.actionButtonGroup.length >= 2 && !props.edit ? props.actionButtonGroup.slice(2).map(function (button) {
-      return {
-        icon: React__default.createElement(DynamicIcon, {
-          iconName: button.icon
-        }),
-        onClick: function onClick(event) {
-          var customEvent = {
-            column: cellData.column,
-            component: cellData.component,
-            element: cellData.element,
-            event: event,
-            model: cellData.data,
-            row: cellData.row
-          };
-          button.onClick(customEvent);
-        }
-      };
+      if (button.elementType === "element" && button.element) {
+        return {
+          icon: button.element
+        };
+      } else {
+        return {
+          icon: React__default.createElement(DynamicIcon, {
+            iconName: button.icon
+          }),
+          onClick: function onClick(event) {
+            var customEvent = {
+              column: cellData.column,
+              component: cellData.component,
+              element: cellData.element,
+              event: event,
+              model: cellData.data,
+              row: cellData.row
+            };
+            if (button.onClick) {
+              button.onClick(customEvent);
+            }
+          }
+        };
+      }
     }) : [];
     var buttonElements = [];
     {