@yh-ui/request 1.0.54 → 1.0.56

package/dist/useLoadMore.cjs

@@ -31,8 +31,16 @@ function useLoadMore(service, options = {}) {
   const loadingMore = (0, _vue.ref)(false);
   const error = (0, _vue.shallowRef)(void 0);
   const params = (0, _vue.ref)(defaultParams);
+  let lastRefreshTime = 0;
+  const lastLoadedPageSize = (0, _vue.ref)(null);
   const noMore = (0, _vue.computed)(() => {
-    return current.value >= totalPages.value && total.value > 0;
+    if (total.value > 0) {
+      return current.value >= totalPages.value;
+    }
+    if (lastLoadedPageSize.value !== null && lastLoadedPageSize.value < pageSize.value) {
+      return true;
+    }
+    return false;
   });
   const canLoadMore = (0, _vue.computed)(() => {
     return isLoadMore && !noMore.value && !loadingMore.value;
@@ -42,23 +50,63 @@ function useLoadMore(service, options = {}) {
     if (loading.value || loadingMore.value) return;
     const isLoadMoreOp = !isRefresh;
     loading.value = isLoadMoreOp ? false : true;
-    if (isRefresh) refreshing.value = true;
+    if (isRefresh) {
+      refreshing.value = true;
+      total.value = 0;
+      lastLoadedPageSize.value = null;
+    }
     if (isLoadMoreOp) loadingMore.value = true;
     error.value = void 0;
     try {
-      const extraParams = params.value.slice(2);
+      const extraParams = params.value;
       const response = await loadService(requestedPage, pageSize.value, ...extraParams);
       const pageData = response.data;
+      let totalNum;
       if (pageData && typeof pageData === "object") {
         const paginatedData = pageData;
-        if (typeof paginatedData.total !== "undefined") total.value = paginatedData.total;else if (typeof paginatedData.totalCount !== "undefined") total.value = paginatedData.totalCount;else if (typeof paginatedData.totalElements !== "undefined") total.value = paginatedData.totalElements;
+        if (typeof paginatedData.total !== "undefined") totalNum = paginatedData.total;else if (typeof paginatedData.totalCount !== "undefined") totalNum = paginatedData.totalCount;else if (typeof paginatedData.totalElements !== "undefined") totalNum = paginatedData.totalElements;
+      }
+      if (typeof totalNum === "undefined" && response && typeof response === "object") {
+        const resp = response;
+        if (typeof resp.total !== "undefined") totalNum = resp.total;else if (typeof resp.totalCount !== "undefined") totalNum = resp.totalCount;else if (typeof resp.totalElements !== "undefined") totalNum = resp.totalElements;
+      }
+      if (typeof totalNum !== "undefined") {
+        total.value = totalNum;
       }
+      let loadedSize = 0;
+      if (Array.isArray(pageData)) {
+        loadedSize = pageData.length;
+      } else if (pageData && typeof pageData === "object") {
+        const arrayKeys = Object.keys(pageData).filter(k => Array.isArray(pageData[k]));
+        if (arrayKeys.length > 0) {
+          const preferredKey = arrayKeys.find(k => ["list", "data", "items"].includes(k));
+          if (preferredKey) {
+            loadedSize = pageData[preferredKey].length;
+          } else {
+            loadedSize = pageData[arrayKeys[0]].length;
+          }
+        }
+      }
+      lastLoadedPageSize.value = loadedSize;
       if (isRefresh) {
         data.value = pageData;
+        lastRefreshTime = Date.now();
       } else {
         const oldData = data.value;
         if (Array.isArray(oldData) && Array.isArray(pageData)) {
           data.value = [...oldData, ...pageData];
+        } else if (oldData && typeof oldData === "object" && pageData && typeof pageData === "object") {
+          const merged = {
+            ...pageData
+          };
+          for (const key of Object.keys(pageData)) {
+            const oldValue = oldData[key];
+            const newValue = pageData[key];
+            if (Array.isArray(oldValue) && Array.isArray(newValue)) {
+              merged[key] = [...oldValue, ...newValue];
+            }
+          }
+          data.value = merged;
         } else {
           data.value = pageData;
         }
@@ -77,6 +125,7 @@ function useLoadMore(service, options = {}) {
   };
   const loadMore = async () => {
     if (noMore.value || loadingMore.value) return;
+    if (Date.now() - lastRefreshTime < 100) return;
     await loadData(current.value + 1, false);
   };
   const reload = async () => {
@@ -90,7 +139,9 @@ function useLoadMore(service, options = {}) {
       if (page < 1 || totalPages.value > 0 && page > totalPages.value) return;
       await loadData(page, true);
     },
-    nextPage: loadMore,
+    nextPage: async () => {
+      await pagination.loadPage(current.value + 1);
+    },
     prevPage: async () => {
       await pagination.loadPage(current.value - 1);
     },
@@ -109,9 +160,13 @@ function useLoadMore(service, options = {}) {
     }
   };
   if (!manual) {
-    (0, _vue.onMounted)(() => {
-      loadData(current.value, false);
-    });
+    if ((0, _vue.getCurrentInstance)()) {
+      (0, _vue.onMounted)(() => {
+        loadData(current.value, true);
+      });
+    } else {
+      loadData(current.value, true);
+    }
   }
   return {
     current,

package/dist/useLoadMore.mjs

@@ -1,4 +1,10 @@
-import { ref, shallowRef, computed, onMounted } from "vue";
+import {
+  ref,
+  shallowRef,
+  computed,
+  onMounted,
+  getCurrentInstance
+} from "vue";
 export function useLoadMore(service, options = {}) {
   const {
     initialPage = 1,
@@ -25,8 +31,16 @@ export function useLoadMore(service, options = {}) {
   const loadingMore = ref(false);
   const error = shallowRef(void 0);
   const params = ref(defaultParams);
+  let lastRefreshTime = 0;
+  const lastLoadedPageSize = ref(null);
   const noMore = computed(() => {
-    return current.value >= totalPages.value && total.value > 0;
+    if (total.value > 0) {
+      return current.value >= totalPages.value;
+    }
+    if (lastLoadedPageSize.value !== null && lastLoadedPageSize.value < pageSize.value) {
+      return true;
+    }
+    return false;
   });
   const canLoadMore = computed(() => {
     return isLoadMore && !noMore.value && !loadingMore.value;
@@ -36,27 +50,69 @@ export function useLoadMore(service, options = {}) {
     if (loading.value || loadingMore.value) return;
     const isLoadMoreOp = !isRefresh;
     loading.value = isLoadMoreOp ? false : true;
-    if (isRefresh) refreshing.value = true;
+    if (isRefresh) {
+      refreshing.value = true;
+      total.value = 0;
+      lastLoadedPageSize.value = null;
+    }
     if (isLoadMoreOp) loadingMore.value = true;
     error.value = void 0;
     try {
-      const extraParams = params.value.slice(2);
+      const extraParams = params.value;
       const response = await loadService(requestedPage, pageSize.value, ...extraParams);
       const pageData = response.data;
+      let totalNum;
       if (pageData && typeof pageData === "object") {
         const paginatedData = pageData;
-        if (typeof paginatedData.total !== "undefined") total.value = paginatedData.total;
+        if (typeof paginatedData.total !== "undefined") totalNum = paginatedData.total;
         else if (typeof paginatedData.totalCount !== "undefined")
-          total.value = paginatedData.totalCount;
+          totalNum = paginatedData.totalCount;
         else if (typeof paginatedData.totalElements !== "undefined")
-          total.value = paginatedData.totalElements;
+          totalNum = paginatedData.totalElements;
+      }
+      if (typeof totalNum === "undefined" && response && typeof response === "object") {
+        const resp = response;
+        if (typeof resp.total !== "undefined") totalNum = resp.total;
+        else if (typeof resp.totalCount !== "undefined") totalNum = resp.totalCount;
+        else if (typeof resp.totalElements !== "undefined") totalNum = resp.totalElements;
+      }
+      if (typeof totalNum !== "undefined") {
+        total.value = totalNum;
       }
+      let loadedSize = 0;
+      if (Array.isArray(pageData)) {
+        loadedSize = pageData.length;
+      } else if (pageData && typeof pageData === "object") {
+        const arrayKeys = Object.keys(pageData).filter(
+          (k) => Array.isArray(pageData[k])
+        );
+        if (arrayKeys.length > 0) {
+          const preferredKey = arrayKeys.find((k) => ["list", "data", "items"].includes(k));
+          if (preferredKey) {
+            loadedSize = pageData[preferredKey].length;
+          } else {
+            loadedSize = pageData[arrayKeys[0]].length;
+          }
+        }
+      }
+      lastLoadedPageSize.value = loadedSize;
       if (isRefresh) {
         data.value = pageData;
+        lastRefreshTime = Date.now();
       } else {
         const oldData = data.value;
         if (Array.isArray(oldData) && Array.isArray(pageData)) {
           data.value = [...oldData, ...pageData];
+        } else if (oldData && typeof oldData === "object" && pageData && typeof pageData === "object") {
+          const merged = { ...pageData };
+          for (const key of Object.keys(pageData)) {
+            const oldValue = oldData[key];
+            const newValue = pageData[key];
+            if (Array.isArray(oldValue) && Array.isArray(newValue)) {
+              merged[key] = [...oldValue, ...newValue];
+            }
+          }
+          data.value = merged;
         } else {
           data.value = pageData;
         }
@@ -75,6 +131,7 @@ export function useLoadMore(service, options = {}) {
   };
   const loadMore = async () => {
     if (noMore.value || loadingMore.value) return;
+    if (Date.now() - lastRefreshTime < 100) return;
     await loadData(current.value + 1, false);
   };
   const reload = async () => {
@@ -88,7 +145,9 @@ export function useLoadMore(service, options = {}) {
       if (page < 1 || totalPages.value > 0 && page > totalPages.value) return;
       await loadData(page, true);
     },
-    nextPage: loadMore,
+    nextPage: async () => {
+      await pagination.loadPage(current.value + 1);
+    },
     prevPage: async () => {
       await pagination.loadPage(current.value - 1);
     },
@@ -107,9 +166,13 @@ export function useLoadMore(service, options = {}) {
     }
   };
   if (!manual) {
-    onMounted(() => {
-      loadData(current.value, false);
-    });
+    if (getCurrentInstance()) {
+      onMounted(() => {
+        loadData(current.value, true);
+      });
+    } else {
+      loadData(current.value, true);
+    }
   }
   return {
     current,

package/dist/usePagination.cjs

@@ -139,9 +139,13 @@ function usePagination(service, options = {}) {
     }
   });
   if (!manual) {
-    (0, _vue.onMounted)(() => {
+    if ((0, _vue.getCurrentInstance)()) {
+      (0, _vue.onMounted)(() => {
+        loadData();
+      });
+    } else {
       loadData();
-    });
+    }
   }
   return {
     current,

package/dist/usePagination.mjs

@@ -1,4 +1,11 @@
-import { ref, shallowRef, computed, watch, onMounted } from "vue";
+import {
+  ref,
+  shallowRef,
+  computed,
+  watch,
+  onMounted,
+  getCurrentInstance
+} from "vue";
 export function usePagination(service, options = {}) {
   const {
     defaultPagination = { current: 1, pageSize: 10 },
@@ -130,9 +137,13 @@ export function usePagination(service, options = {}) {
     }
   });
   if (!manual) {
-    onMounted(() => {
+    if (getCurrentInstance()) {
+      onMounted(() => {
+        loadData();
+      });
+    } else {
       loadData();
-    });
+    }
   }
   return {
     current,

package/dist/useQueue.cjs

@@ -237,9 +237,11 @@ function useQueue(options = {}) {
   const getTask = taskId => {
     return taskMap.get(taskId);
   };
-  (0, _vue.onUnmounted)(() => {
-    cancelAll();
-  });
+  if ((0, _vue.getCurrentInstance)()) {
+    (0, _vue.onUnmounted)(() => {
+      cancelAll();
+    });
+  }
   return {
     tasks,
     pendingTasks,

package/dist/useQueue.mjs

@@ -1,4 +1,10 @@
-import { ref, reactive, computed, onUnmounted } from "vue";
+import {
+  ref,
+  reactive,
+  computed,
+  onUnmounted,
+  getCurrentInstance
+} from "vue";
 let taskIdCounter = 0;
 function generateTaskId() {
   return `task_${Date.now()}_${++taskIdCounter}`;
@@ -231,9 +237,11 @@ export function useQueue(options = {}) {
   const getTask = (taskId) => {
     return taskMap.get(taskId);
   };
-  onUnmounted(() => {
-    cancelAll();
-  });
+  if (getCurrentInstance()) {
+    onUnmounted(() => {
+      cancelAll();
+    });
+  }
   return {
     tasks,
     pendingTasks,

package/dist/useRequest.cjs

@@ -150,15 +150,23 @@ function useRequest(service, options = {}) {
     wrappedRun.cancel = () => throttled.cancel();
     cancelFn = () => throttled.cancel();
   }
-  (0, _vue.onUnmounted)(() => {
-    cancelFn?.();
-  });
+  if ((0, _vue.getCurrentInstance)()) {
+    (0, _vue.onUnmounted)(() => {
+      cancel();
+    });
+  }
   if (!manual && defaultParams.length > 0) {
-    (0, _vue.onMounted)(() => {
+    if ((0, _vue.getCurrentInstance)()) {
+      (0, _vue.onMounted)(() => {
+        if (!debounceWait && !throttleWait) {
+          run(...defaultParams).catch(() => {});
+        }
+      });
+    } else {
       if (!debounceWait && !throttleWait) {
         run(...defaultParams).catch(() => {});
       }
-    });
+    }
   }
   const disabled = (0, _vue.computed)(() => loading.value);
   return {
@@ -247,14 +255,16 @@ function useRequestSWR(cacheKey, service, options = {}) {
         swrRefresh();
       }
     };
-    (0, _vue.onMounted)(() => {
-      window.addEventListener("visibilitychange", handleFocus);
-      window.addEventListener("focus", handleFocus);
-    });
-    (0, _vue.onUnmounted)(() => {
-      window.removeEventListener("visibilitychange", handleFocus);
-      window.removeEventListener("focus", handleFocus);
-    });
+    if ((0, _vue.getCurrentInstance)()) {
+      (0, _vue.onMounted)(() => {
+        window.addEventListener("visibilitychange", handleFocus);
+        window.addEventListener("focus", handleFocus);
+      });
+      (0, _vue.onUnmounted)(() => {
+        window.removeEventListener("visibilitychange", handleFocus);
+        window.removeEventListener("focus", handleFocus);
+      });
+    }
   }
   if (refreshDeps && refreshDeps.length > 0 && !manual) {
     (0, _vue.watch)(() => refreshDeps.map(dep => dep.value), () => {
@@ -336,14 +346,20 @@ function useRequestPolling(service, options = {}) {
       startPolling();
     }
   };
-  (0, _vue.onUnmounted)(() => {
-    pause();
-    cancel();
-  });
-  if (polling) {
-    (0, _vue.onMounted)(() => {
-      startPolling();
+  if ((0, _vue.getCurrentInstance)()) {
+    (0, _vue.onUnmounted)(() => {
+      pause();
+      cancel();
     });
+    if (polling) {
+      (0, _vue.onMounted)(() => {
+        startPolling();
+      });
+    }
+  } else {
+    if (polling) {
+      startPolling();
+    }
   }
   return {
     loading,

package/dist/useRequest.mjs

@@ -155,16 +155,25 @@ export function useRequest(service, options = {}) {
     wrappedRun.cancel = () => throttled.cancel();
     cancelFn = () => throttled.cancel();
   }
-  onUnmounted(() => {
-    cancelFn?.();
-  });
+  if (getCurrentInstance()) {
+    onUnmounted(() => {
+      cancel();
+    });
+  }
   if (!manual && defaultParams.length > 0) {
-    onMounted(() => {
+    if (getCurrentInstance()) {
+      onMounted(() => {
+        if (!debounceWait && !throttleWait) {
+          run(...defaultParams).catch(() => {
+          });
+        }
+      });
+    } else {
       if (!debounceWait && !throttleWait) {
         run(...defaultParams).catch(() => {
         });
       }
-    });
+    }
   }
   const disabled = computed(() => loading.value);
   return {
@@ -259,14 +268,16 @@ export function useRequestSWR(cacheKey, service, options = {}) {
         swrRefresh();
       }
     };
-    onMounted(() => {
-      window.addEventListener("visibilitychange", handleFocus);
-      window.addEventListener("focus", handleFocus);
-    });
-    onUnmounted(() => {
-      window.removeEventListener("visibilitychange", handleFocus);
-      window.removeEventListener("focus", handleFocus);
-    });
+    if (getCurrentInstance()) {
+      onMounted(() => {
+        window.addEventListener("visibilitychange", handleFocus);
+        window.addEventListener("focus", handleFocus);
+      });
+      onUnmounted(() => {
+        window.removeEventListener("visibilitychange", handleFocus);
+        window.removeEventListener("focus", handleFocus);
+      });
+    }
   }
   if (refreshDeps && refreshDeps.length > 0 && !manual) {
     watch(
@@ -353,14 +364,20 @@ export function useRequestPolling(service, options = {}) {
       startPolling();
     }
   };
-  onUnmounted(() => {
-    pause();
-    cancel();
-  });
-  if (polling) {
-    onMounted(() => {
-      startPolling();
+  if (getCurrentInstance()) {
+    onUnmounted(() => {
+      pause();
+      cancel();
     });
+    if (polling) {
+      onMounted(() => {
+        startPolling();
+      });
+    }
+  } else {
+    if (polling) {
+      startPolling();
+    }
   }
   return {
     loading,

package/dist/useSSE.cjs

@@ -226,9 +226,11 @@ function useSSE(options = {}) {
     messages.value = [];
     error.value = void 0;
   };
-  (0, _vue.onUnmounted)(() => {
-    stop();
-  });
+  if ((0, _vue.getCurrentInstance)()) {
+    (0, _vue.onUnmounted)(() => {
+      stop();
+    });
+  }
   return {
     loading,
     content,

package/dist/useSSE.mjs

@@ -1,4 +1,4 @@
-import { ref, shallowRef, onUnmounted } from "vue";
+import { ref, shallowRef, onUnmounted, getCurrentInstance } from "vue";
 export function useSSE(options = {}) {
   const {
     parseJSON = true,
@@ -211,9 +211,11 @@ export function useSSE(options = {}) {
     messages.value = [];
     error.value = void 0;
   };
-  onUnmounted(() => {
-    stop();
-  });
+  if (getCurrentInstance()) {
+    onUnmounted(() => {
+      stop();
+    });
+  }
   return {
     loading,
     content,

package/dist/websocket.cjs

@@ -314,9 +314,11 @@ function useWebSocket(options) {
   const state = client.state;
   const isConnected = client.isConnected;
   const lastMessage = client.lastMessage;
-  (0, _vue.onUnmounted)(() => {
-    client.dispose();
-  });
+  if ((0, _vue.getCurrentInstance)()) {
+    (0, _vue.onUnmounted)(() => {
+      client.dispose();
+    });
+  }
   return {
     /** 当前状态 */
     state,

package/dist/websocket.mjs

@@ -1,4 +1,4 @@
-import { ref, onUnmounted } from "vue";
+import { ref, onUnmounted, getCurrentInstance } from "vue";
 export class WebSocketClient {
   ws = null;
   url = "";
@@ -298,9 +298,11 @@ export function useWebSocket(options) {
   const state = client.state;
   const isConnected = client.isConnected;
   const lastMessage = client.lastMessage;
-  onUnmounted(() => {
-    client.dispose();
-  });
+  if (getCurrentInstance()) {
+    onUnmounted(() => {
+      client.dispose();
+    });
+  }
   return {
     /** 当前状态 */
     state,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yh-ui/request",
-  "version": "1.0.54",
+  "version": "1.0.56",
   "description": "YH-UI HTTP request hooks - Enterprise-grade request management",
   "type": "module",
   "sideEffects": false,
@@ -32,7 +32,7 @@
     "postpack": "node ../../scripts/prepare-package-manifest.mjs restore"
   },
   "dependencies": {
-    "@yh-ui/utils": "^1.0.54"
+    "@yh-ui/utils": "^1.0.56"
   },
   "devDependencies": {
     "vue": "^3.5.35",