ods-component-lib 1.18.126 → 1.18.128

package/dist/components/antd/form/OdsBasicForm.d.ts

@@ -0,0 +1,18 @@
+import React from 'react';
+import { FormProps, ButtonProps } from 'antd';
+export interface IFormItemRuleProps {
+    required?: boolean;
+    message?: string;
+}
+export interface IFormItemProps {
+    label?: string;
+    name?: string;
+    formItemType: string;
+    rules?: IFormItemRuleProps[];
+}
+export interface IFormProps extends FormProps {
+    formItems: IFormItemProps[];
+    formButtons: ButtonProps[];
+}
+declare function OdsBasicForm(props: IFormProps): React.JSX.Element;
+export default OdsBasicForm;

package/dist/index.js

@@ -34997,16 +34997,17 @@ var OdsServerSideDatagrid = function OdsServerSideDatagrid(props) {
   var _useState = React.useState(50),
     currentPageSize = _useState[0],
     setCurrentPageSize = _useState[1];
-  var _useState2 = React.useState(false),
-    contentReady = _useState2[0],
-    setContentReady = _useState2[1];
-  var _useState3 = React.useState(0),
-    currentPage = _useState3[0],
-    setCurrentPage = _useState3[1];
+  var _useState2 = React.useState(0),
+    currentPage = _useState2[0],
+    setCurrentPage = _useState2[1];
+  var _useState3 = React.useState(false),
+    filterApplied = _useState3[0],
+    setFilterApplied = _useState3[1];
+  var totalUnfilteredCount = React.useRef(0);
+  var totalFilteredCount = React.useRef(0);
   var _useState4 = React.useState(false),
-    filterApplied = _useState4[0],
-    setFilterApplied = _useState4[1];
-  var filteredRowCount = React.useRef(0);
+    updateTrigger = _useState4[0],
+    setUpdateTrigger = _useState4[1];
   var lastPageIndexRef = React.useRef(null);
   var _useState5 = React.useState({}),
     filterOptions = _useState5[0],
@@ -35018,63 +35019,23 @@ var OdsServerSideDatagrid = function OdsServerSideDatagrid(props) {
     gridStyle = _useStyles.styles;
   var renderTotal = React.useCallback(function () {
     var _props$customSummary, _props$customSummary2, _props$customSummary3, _props$customSummary4;
-    var totalLoaded = rowCount.current;
+    var totalLoaded = filterApplied ? totalFilteredCount.current : totalUnfilteredCount.current;
     var loadedPage = currentPage + 1;
     var totalRecords = props.totalRecordCount;
     var totalPageCount = Math.ceil(totalRecords / currentPageSize);
-    if (totalLoaded === 0) {
+    if (totalLoaded === 0 || totalLoaded === -1) {
       return "";
     }
     var displayText = filterApplied ? totalLoaded + " " + ((_props$customSummary = props.customSummary) === null || _props$customSummary === void 0 ? void 0 : _props$customSummary.summaryFilteredDataLabel) + " - " : totalLoaded + " " + ((_props$customSummary2 = props.customSummary) === null || _props$customSummary2 === void 0 ? void 0 : _props$customSummary2.summaryLoadedDataLabel) + " - ";
     var result = "" + displayText + totalRecords + " " + ((_props$customSummary3 = props.customSummary) === null || _props$customSummary3 === void 0 ? void 0 : _props$customSummary3.summaryTotalDataLabel);
     result += " - " + ((_props$customSummary4 = props.customSummary) === null || _props$customSummary4 === void 0 ? void 0 : _props$customSummary4.summaryTotalPageCountLabel) + " " + loadedPage + " / " + totalPageCount;
     return result;
-  }, [props.totalRecordCount, currentPageSize, props.customSummary, currentPage, filteredRowCount.current, filterApplied]);
-  React.useEffect(function () {
-    var loadFilterData = function loadFilterData() {
-      try {
-        var newFilterOptions = {};
-        var _loop = function _loop() {
-          var col = _step.value;
-          try {
-            if (headerFilterData.length > 0) {
-              var newData = headerFilterData.filter(function (item) {
-                return item[col.dataField] != null && item[col.dataField] !== "";
-              }).map(function (item) {
-                return item[col.dataField].toString();
-              });
-              var values = newData.map(function (group) {
-                return {
-                  text: group,
-                  value: group
-                };
-              });
-              newFilterOptions[col.dataField] = values;
-            }
-          } catch (error) {
-            console.error('Error loading data for header filter:', error);
-          }
-        };
-        for (var _iterator = _createForOfIteratorHelperLoose(props.columns), _step; !(_step = _iterator()).done;) {
-          _loop();
-        }
-        setFilterOptions(newFilterOptions);
-        return Promise.resolve();
-      } catch (e) {
-        return Promise.reject(e);
-      }
-    };
-    loadFilterData();
-  }, [headerFilterData]);
-  React.useEffect(function () {
-    setHeaderFilterData([]);
-  }, []);
+  }, [currentPage, currentPageSize, filterApplied, props.customSummary, props.totalRecordCount]);
   var handleContentReady = React.useCallback(function (e) {
     var _dataGridInstance$get;
     var dataGridInstance = e.component;
     var currentPageIndex = dataGridInstance.pageIndex();
     var currentTotalCount = dataGridInstance.totalCount();
-    var currentPageSizeValue = dataGridInstance.pageSize();
     var newData = dataGridInstance === null || dataGridInstance === void 0 ? void 0 : (_dataGridInstance$get = dataGridInstance.getDataSource()) === null || _dataGridInstance$get === void 0 ? void 0 : _dataGridInstance$get.items();
     if (lastPageIndexRef.current !== currentPageIndex && newData && newData.length > 0) {
       setHeaderFilterData(function (prevData) {
@@ -35103,24 +35064,94 @@ var OdsServerSideDatagrid = function OdsServerSideDatagrid(props) {
         });
         return [].concat(prevData, newItems);
       });
+      setCurrentPage(currentPageIndex);
+      setCurrentPageSize(dataGridInstance.pageSize());
+      rowCount.current = currentTotalCount;
+      if (filterApplied) {
+        totalFilteredCount.current = currentTotalCount;
+      } else {
+        totalUnfilteredCount.current = currentTotalCount;
+      }
+      if (!filterApplied && totalFilteredCount.current === 0) {
+        totalFilteredCount.current = totalUnfilteredCount.current;
+      }
+      setUpdateTrigger(function (prev) {
+        return !prev;
+      });
       lastPageIndexRef.current = currentPageIndex;
-      if (!contentReady) setContentReady(true);
     }
-    setCurrentPage(currentPageIndex);
-    setCurrentPageSize(currentPageSizeValue);
-    rowCount.current = currentTotalCount > -1 ? currentTotalCount : rowCount.current;
-  }, []);
+  }, [props.columns, filterApplied]);
   var handleOptionChanged = React.useCallback(function (e) {
+    var dataGrid = props.dataGridRef.current.instance;
+    var updateFilterStatus = function updateFilterStatus(value) {
+      var active = value !== "" && value !== null && value !== undefined && !(Array.isArray(value) && value.length === 0);
+      setFilterApplied(active);
+      return active;
+    };
     if (e.fullName.includes("sortOrder")) {
-      props.dataGridRef.current.instance.getScrollable().scrollTo(0);
+      dataGrid.getScrollable().scrollTo(0);
     }
+    var filterActive = false;
     if (e.name === "filterValue") {
-      setFilterApplied(!!(e.value && e.value.length > 0));
+      filterActive = updateFilterStatus(e.value);
     } else if (e.name === "columns" && e.fullName.includes("filterValue")) {
-      setFilterApplied(!!e.value);
-    } else if (e.name === "filterPanel" && e.fullName === "filterPanel.filterEnabled") {
+      filterActive = updateFilterStatus(e.value);
+    } else if (e.name === "filterPanel" && e.fullName.includes("filterPanel.filterEnabled")) {
       setFilterApplied(e.value);
+      filterActive = e.value;
+    } else if (e.fullName.includes("searchPanel.text")) {
+      filterActive = updateFilterStatus(e.value);
+    }
+    if (filterActive) {
+      setTimeout(function () {
+        dataGrid.refresh().done(function () {
+          totalFilteredCount.current = dataGrid.totalCount();
+          setUpdateTrigger(function (prev) {
+            return !prev;
+          });
+        });
+      }, 0);
     }
+  }, [props.dataGridRef]);
+  React.useEffect(function () {}, [updateTrigger]);
+  React.useEffect(function () {
+    var loadFilterData = function loadFilterData() {
+      try {
+        var newFilterOptions = {};
+        var _loop = function _loop() {
+          var col = _step.value;
+          try {
+            if (headerFilterData.length > 0) {
+              var newData = headerFilterData.filter(function (item) {
+                return item[col.dataField] != null && item[col.dataField] !== "";
+              }).map(function (item) {
+                return item[col.dataField].toString();
+              });
+              var values = newData.map(function (group) {
+                return {
+                  text: group,
+                  value: group
+                };
+              });
+              newFilterOptions[col.dataField] = values;
+            }
+          } catch (error) {
+            console.error('Error loading data for header filter:', error);
+          }
+        };
+        for (var _iterator = _createForOfIteratorHelperLoose(props.columns), _step; !(_step = _iterator()).done;) {
+          _loop();
+        }
+        setFilterOptions(newFilterOptions);
+        return Promise.resolve();
+      } catch (e) {
+        return Promise.reject(e);
+      }
+    };
+    loadFilterData();
+  }, [headerFilterData, props.columns]);
+  React.useEffect(function () {
+    setHeaderFilterData([]);
   }, []);
   var actionButtons = React.useMemo(function () {
     if (props.actionButtonGroup) {