fui-material 2.8.20 → 2.8.21

package/dist/f-ui-kit.es.js

@@ -9979,6 +9979,51 @@ function extractDefaultPageMeta(raw, defaultSize, currentPage) {
   const number = Number(p.number ?? p.currentPage ?? p.page ?? currentPage);
   return { totalItems, size, totalPages, number };
 }
+function autoMergeAccumulatedData(prev, next) {
+  if (!prev) return next;
+  if (Array.isArray(next)) {
+    const prevArray = Array.isArray(prev) ? prev : [];
+    return [...prevArray, ...next];
+  }
+  if (next && typeof next === "object" && prev && typeof prev === "object") {
+    const nextObj = next;
+    const prevObj = prev;
+    const commonArrayKeys = ["result", "items", "content", "data", "posts", "rows", "list"];
+    for (const key of commonArrayKeys) {
+      if (Array.isArray(nextObj[key])) {
+        return {
+          ...nextObj,
+          [key]: [
+            ...Array.isArray(prevObj[key]) ? prevObj[key] : [],
+            ...nextObj[key]
+          ]
+        };
+      }
+    }
+    if (nextObj.result && typeof nextObj.result === "object" && !Array.isArray(nextObj.result)) {
+      const nextResult = nextObj.result;
+      const prevResult = prevObj.result && typeof prevObj.result === "object" ? prevObj.result : {};
+      const mergedResult = { ...nextResult };
+      let hasArray = false;
+      for (const subKey of Object.keys(nextResult)) {
+        if (Array.isArray(nextResult[subKey])) {
+          hasArray = true;
+          mergedResult[subKey] = [
+            ...Array.isArray(prevResult[subKey]) ? prevResult[subKey] : [],
+            ...nextResult[subKey]
+          ];
+        }
+      }
+      if (hasArray) {
+        return {
+          ...nextObj,
+          result: mergedResult
+        };
+      }
+    }
+  }
+  return next;
+}
 function useFManualPagination(options) {
   const {
     queryKey,
@@ -10006,6 +10051,7 @@ function useFManualPagination(options) {
   const [pageSize, setPageSize] = useState(defaultPageSize);
   const [accumulatedData, setAccumulatedData] = useState(void 0);
   const [isFetchingMore, setIsFetchingMore] = useState(false);
+  const [isSubmitting, setIsSubmitting] = useState(false);
   const isInfinite = mode === "infinite";
   useEffect(() => {
     setPageSize(defaultPageSize);
@@ -10051,11 +10097,7 @@ function useFManualPagination(options) {
   }, [select]);
   const defaultAppend = useCallback((prev, next) => {
     if (appendData) return appendData(prev, next);
-    if (Array.isArray(next)) {
-      const prevArray = Array.isArray(prev) ? prev : [];
-      return [...prevArray, ...next];
-    }
-    return next;
+    return autoMergeAccumulatedData(prev, next);
   }, [appendData]);
   const submitFilters = useCallback(async ({
     payload,
@@ -10069,15 +10111,20 @@ function useFManualPagination(options) {
         setAccumulatedData(void 0);
       }
     }
-    const rawResponse = await query.run({
-      newParams: { ...payload, page: targetPage, size: pageSize },
-      dopUrl
-    });
-    const extracted = extractResult(rawResponse);
-    if (isInfinite) {
-      setAccumulatedData(extracted);
+    setIsSubmitting(true);
+    try {
+      const rawResponse = await query.run({
+        newParams: { ...payload, page: targetPage, size: pageSize },
+        dopUrl
+      });
+      const extracted = extractResult(rawResponse);
+      if (isInfinite) {
+        setAccumulatedData(extracted);
+      }
+      return extracted;
+    } finally {
+      setIsSubmitting(false);
     }
-    return extracted;
   }, [query, page, pageSize, isInfinite, extractResult]);
   const changePage = useCallback(async (newPage) => {
     if (isInfinite) {
@@ -10133,13 +10180,14 @@ function useFManualPagination(options) {
       }
     }
   }), [pageMeta, page, pageSize, changePage]);
+  const isLoading = isInfinite ? isSubmitting || query.isLoading && !accumulatedData : isSubmitting || query.isLoading && !currentExtractedData;
   return {
     data,
     result: data,
     rawResponse: rawData,
     meta,
     pageMeta,
-    isLoading: query.isLoading,
+    isLoading,
     isFetching: query.isFetching,
     isFetchingMore,
     hasMore,