feat(useLoadMore): add refreshAsync

Author: John60676

src/useLoadMore.ts

@@ -1,8 +1,8 @@
-import type { Ref } from 'vue-demi';
+import type { ComputedRef, Ref } from 'vue-demi';
 import { computed, inject, ref, watch } from 'vue-demi';
 
 import { getGlobalOptions, GLOBAL_OPTIONS_PROVIDE_KEY } from './core/config';
-import type { GlobalOptions, Options } from './core/types';
+import type { GlobalOptions, Options, QueryResult } from './core/types';
 import { get, isFunction, omit } from './core/utils';
 import useRequest from './useRequest';
 
@@ -23,11 +23,28 @@ export type LoadMoreBaseOptions<R, P extends unknown[]> = Options<R, P> &
   LoadMoreGenericExtendsOption<R> &
   LoadMoreExtendsOption;
 
+interface LoadMoreQueryResult<
+  R,
+  P extends unknown[],
+  LR extends unknown[] = any[],
+> extends QueryResult<R, P> {
+  dataList: Ref<LR>;
+  noMore: ComputedRef<number>;
+  loadingMore: Ref<boolean>;
+  refreshing: Ref<boolean>;
+  reloading: Ref<boolean>;
+  reload: () => void;
+  loadMore: () => void;
+}
+
 function useLoadMore<
   R,
   P extends unknown[] = any,
   LR extends unknown[] = any[],
->(service: LoadMoreService<R, P, LR>, options?: LoadMoreBaseOptions<R, P>) {
+>(
+  service: LoadMoreService<R, P, LR>,
+  options?: LoadMoreBaseOptions<R, P>,
+): LoadMoreQueryResult<R, P> {
   const injectedGlobalOptions = inject<GlobalOptions>(
     GLOBAL_OPTIONS_PROVIDE_KEY,
     {},
@@ -54,25 +71,28 @@ function useLoadMore<
     data,
     params,
     runAsync,
-    refreshAsync,
     run,
     cancel: _cancel,
     ...rest
     // @ts-ignore
   } = useRequest<R, P>(service, {
     ...restOptions,
     onSuccess: (...p) => {
+      if (refreshing.value) {
+        dataList.value = [] as any;
+      }
       loadingMore.value = false;
+      refreshing.value = false;
+      reloading.value = false;
       restOptions?.onSuccess?.(...p);
     },
     onError: (...p) => {
       loadingMore.value = false;
+      refreshing.value = false;
+      reloading.value = false;
       restOptions?.onError?.(...p);
     },
     onAfter: (...p) => {
-      if (refreshing.value) {
-        dataList.value = [] as any;
-      }
       restOptions?.onAfter?.(...p);
     },
   });
@@ -103,22 +123,27 @@ function useLoadMore<
     run(...mergerParams);
   };
 
-  const refresh = async () => {
+  const refreshAsync = async () => {
     refreshing.value = true;
     const [, ...restParams] = params.value;
     const mergerParams = [undefined, ...restParams] as any;
     await runAsync(...mergerParams);
-    refreshing.value = false;
   };
 
-  const reload = async () => {
+  const refresh = () => {
+    refreshing.value = true;
+    const [, ...restParams] = params.value;
+    const mergerParams = [undefined, ...restParams] as any;
+    runAsync(...mergerParams);
+  };
+
+  const reload = () => {
     reloading.value = true;
     cancel();
     dataList.value = [] as any;
     const [, ...restParams] = params.value;
     const mergerParams = [undefined, ...restParams] as any;
-    await runAsync(...mergerParams);
-    reloading.value = false;
+    run(...mergerParams);
   };
 
   const cancel = () => {
@@ -140,7 +165,9 @@ function useLoadMore<
     loadMore,
     refresh,
     cancel,
-    ...omit(rest, ['refresh', 'mutate']),
+    run,
+    refreshAsync,
+    ...omit(rest, ['refresh', 'refreshAsync']),
   };
 }