@yh-ui/request 1.0.53 → 1.0.55

package/dist/useLoadMore.cjs

@@ -38,9 +38,8 @@ function useLoadMore(service, options = {}) {
     return isLoadMore && !noMore.value && !loadingMore.value;
   });
   const loadService = loadMoreService || service;
-  const loadData = async (isRefresh = false) => {
+  const loadData = async (requestedPage, isRefresh = false) => {
     if (loading.value || loadingMore.value) return;
-    const requestedPage = current.value;
     const isLoadMoreOp = !isRefresh;
     loading.value = isLoadMoreOp ? false : true;
     if (isRefresh) refreshing.value = true;
@@ -48,7 +47,7 @@ function useLoadMore(service, options = {}) {
     error.value = void 0;
     try {
       const extraParams = params.value.slice(2);
-      const response = await loadService(current.value, pageSize.value, ...extraParams);
+      const response = await loadService(requestedPage, pageSize.value, ...extraParams);
       const pageData = response.data;
       if (pageData && typeof pageData === "object") {
         const paginatedData = pageData;
@@ -56,7 +55,6 @@ function useLoadMore(service, options = {}) {
       }
       if (isRefresh) {
         data.value = pageData;
-        current.value = requestedPage + 1;
       } else {
         const oldData = data.value;
         if (Array.isArray(oldData) && Array.isArray(pageData)) {
@@ -64,8 +62,8 @@ function useLoadMore(service, options = {}) {
         } else {
           data.value = pageData;
         }
-        current.value = requestedPage + 1;
       }
+      current.value = requestedPage;
       onSuccess?.(pageData, params.value);
     } catch (err) {
       error.value = err;
@@ -79,21 +77,22 @@ function useLoadMore(service, options = {}) {
   };
   const loadMore = async () => {
     if (noMore.value || loadingMore.value) return;
-    await loadData(false);
+    await loadData(current.value + 1, false);
   };
   const reload = async () => {
-    current.value = initialPage;
-    await loadData(true);
+    await loadData(initialPage, true);
   };
   const refresh = async () => {
     await reload();
   };
   const pagination = {
     loadPage: async page => {
-      current.value = page;
-      await loadData(true);
+      if (page < 1 || totalPages.value > 0 && page > totalPages.value) return;
+      await loadData(page, true);
+    },
+    nextPage: async () => {
+      await pagination.loadPage(current.value + 1);
     },
-    nextPage: loadMore,
     prevPage: async () => {
       await pagination.loadPage(current.value - 1);
     },
@@ -112,9 +111,13 @@ function useLoadMore(service, options = {}) {
     }
   };
   if (!manual) {
-    (0, _vue.onMounted)(() => {
-      loadData();
-    });
+    if ((0, _vue.getCurrentInstance)()) {
+      (0, _vue.onMounted)(() => {
+        loadData(current.value, false);
+      });
+    } else {
+      loadData(current.value, false);
+    }
   }
   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,
@@ -32,9 +38,8 @@ export function useLoadMore(service, options = {}) {
     return isLoadMore && !noMore.value && !loadingMore.value;
   });
   const loadService = loadMoreService || service;
-  const loadData = async (isRefresh = false) => {
+  const loadData = async (requestedPage, isRefresh = false) => {
     if (loading.value || loadingMore.value) return;
-    const requestedPage = current.value;
     const isLoadMoreOp = !isRefresh;
     loading.value = isLoadMoreOp ? false : true;
     if (isRefresh) refreshing.value = true;
@@ -42,7 +47,7 @@ export function useLoadMore(service, options = {}) {
     error.value = void 0;
     try {
       const extraParams = params.value.slice(2);
-      const response = await loadService(current.value, pageSize.value, ...extraParams);
+      const response = await loadService(requestedPage, pageSize.value, ...extraParams);
       const pageData = response.data;
       if (pageData && typeof pageData === "object") {
         const paginatedData = pageData;
@@ -54,7 +59,6 @@ export function useLoadMore(service, options = {}) {
       }
       if (isRefresh) {
         data.value = pageData;
-        current.value = requestedPage + 1;
       } else {
         const oldData = data.value;
         if (Array.isArray(oldData) && Array.isArray(pageData)) {
@@ -62,8 +66,8 @@ export function useLoadMore(service, options = {}) {
         } else {
           data.value = pageData;
         }
-        current.value = requestedPage + 1;
       }
+      current.value = requestedPage;
       onSuccess?.(pageData, params.value);
     } catch (err) {
       error.value = err;
@@ -77,21 +81,22 @@ export function useLoadMore(service, options = {}) {
   };
   const loadMore = async () => {
     if (noMore.value || loadingMore.value) return;
-    await loadData(false);
+    await loadData(current.value + 1, false);
   };
   const reload = async () => {
-    current.value = initialPage;
-    await loadData(true);
+    await loadData(initialPage, true);
   };
   const refresh = async () => {
     await reload();
   };
   const pagination = {
     loadPage: async (page) => {
-      current.value = page;
-      await loadData(true);
+      if (page < 1 || totalPages.value > 0 && page > totalPages.value) return;
+      await loadData(page, true);
+    },
+    nextPage: async () => {
+      await pagination.loadPage(current.value + 1);
     },
-    nextPage: loadMore,
     prevPage: async () => {
       await pagination.loadPage(current.value - 1);
     },
@@ -110,9 +115,13 @@ export function useLoadMore(service, options = {}) {
     }
   };
   if (!manual) {
-    onMounted(() => {
-      loadData();
-    });
+    if (getCurrentInstance()) {
+      onMounted(() => {
+        loadData(current.value, false);
+      });
+    } else {
+      loadData(current.value, false);
+    }
   }
   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.53",
+  "version": "1.0.55",
   "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.53"
+    "@yh-ui/utils": "^1.0.55"
   },
   "devDependencies": {
     "vue": "^3.5.35",