qidian-shared 1.0.11 → 1.0.13

package/dist/hooks/useService/index.d.ts

@@ -1,3 +1,3 @@
 export * from './loadMore';
 export * from './pagination';
-export type { ServicePageParams, ServicePagination, ServicePageRes, ServicePageDataType, ServicePageBaseOptions, ServicePageLoadMoreOptions, ServicePaginationOptions } from './types';
+export type { ServicePageParams, ServicePagination, ServicePageRes, ServicePageDataType, ServiceMaybePageParams, ServicePageBaseOptions, ServicePageLoadMoreOptions, ServicePaginationOptions } from './types';

package/dist/hooks/useService/loadMore.d.ts

@@ -1,10 +1,2 @@
-import type { Ref } from 'vue';
-import type { ServicePageDataType, ServicePageLoadMoreOptions, ServicePageParams, ServicePagination } from './types';
-import { useLoadMore } from 'vue-request';
-export declare function useServiceLoadMore<D = unknown, R = unknown, P = ServicePageParams, TP = P, Pag extends ServicePagination = Ref<{
-    pageSize?: number;
-}>>({ service, manual, transformParams, transformRes, pagination, onBefore, onAfter, onSuccess, onError }: ServicePageLoadMoreOptions<D, R, P, TP, Pag>): Omit<ReturnType<typeof useLoadMore<ServicePageDataType<D>>>, "dataList"> & {
-    firstLoad: Ref<boolean>;
-    manualTriggerLoad: Ref<boolean>;
-    dataList: Ref<D[]>;
-};
+import type { ServicePageLoadMoreOptions, ServicePageParams, ServicePagination, UseServicePageLoadMoreResult } from './types';
+export declare function useServiceLoadMore<D = unknown, R = unknown, P = ServicePageParams, TP = P, Pag extends ServicePagination = ServicePagination>({ service, manual, transformParams, transformRes, pagination, onBefore, onAfter, onSuccess, onError }: ServicePageLoadMoreOptions<D, R, P, TP, Pag>): UseServicePageLoadMoreResult;

package/dist/hooks/useService/pagination.d.ts

@@ -1,10 +1,2 @@
-import type { Ref } from 'vue';
-import type { ServicePaginationOptions, ServicePageParams, ServicePagination, ServicePageDataType } from './types';
-import { usePagination } from 'vue-request';
-export declare function useServicePagination<D = unknown, R = unknown, P = ServicePageParams, TP = P, Pag extends ServicePagination = Ref<{
-    pageSize?: number;
-}>>({ service, manual, cacheKey, cacheTime, pollingInterval, transformParams, transformRes, pagination, onBefore, onAfter, onSuccess, onError }: ServicePaginationOptions<D, R, P, TP, Pag> & {}): ReturnType<typeof usePagination<ServicePageDataType<D>>> & {
-    firstLoad: Ref<boolean>;
-    manualTriggerLoad: Ref<boolean>;
-    dataList: Ref<D[]>;
-};
+import type { ServicePaginationOptions, ServicePageParams, ServicePagination, UseServicePaginationResult } from './types';
+export declare function useServicePagination<D = unknown, R = unknown, P = ServicePageParams, TP = P, Pag extends ServicePagination = ServicePagination>({ service, manual, cacheKey, cacheTime, pollingInterval, transformParams, transformRes, pagination, onBefore, onAfter, onSuccess, onError }: ServicePaginationOptions<D, R, P, TP, Pag> & {}): UseServicePaginationResult;

package/dist/hooks/useService/types.d.ts

@@ -1,5 +1,5 @@
-import type { MaybeRef } from 'vue';
-import type { LoadMoreBaseOptions, PaginationOptions } from 'vue-request';
+import type { MaybeRef, Ref, UnwrapRef } from 'vue';
+import type { LoadMoreBaseOptions, LoadMoreQueryResult, PaginationOptions, PaginationQueryResult } from 'vue-request';
 export interface ServicePageParams {
     pageSize: number;
     pageNum: number;
@@ -17,13 +17,13 @@ export interface ServicePageDataType<T> {
     size?: number;
     total?: number;
 }
-type PageParams<T> = T extends false ? undefined : ServicePageParams;
+export type ServiceMaybePageParams<T> = UnwrapRef<T> extends false ? undefined : ServicePageParams;
 type ServicePageLoadMoreBaseOptions<T> = LoadMoreBaseOptions<ServicePageDataType<T>>;
 type ServicePaginationBaseOptions<T> = PaginationOptions<ServicePageDataType<T>, unknown[]>;
 export interface ServicePageBaseOptions<D = unknown, R = unknown, P = ServicePageParams, TP = P, Pag extends ServicePagination = ServicePagination> {
     service: (params: TP) => Promise<R>;
     manual?: boolean;
-    transformParams?: (params: PageParams<Pag>) => TP | Promise<TP>;
+    transformParams?: (params: ServiceMaybePageParams<Pag>) => TP | Promise<TP>;
     transformRes?: (res: R) => ServicePageRes<D> | Promise<ServicePageRes<D>>;
     pagination?: Pag;
 }
@@ -33,6 +33,11 @@ export interface ServicePageLoadMoreOptions<D = unknown, R = unknown, P = Servic
     onSuccess?: ServicePageLoadMoreBaseOptions<D>['onSuccess'];
     onError?: ServicePageLoadMoreBaseOptions<D>['onError'];
 }
+export interface UseServicePageLoadMoreResult<D = unknown> extends Omit<LoadMoreQueryResult<ServicePageDataType<D>>, 'dataList'> {
+    firstLoad: Ref<boolean>;
+    manualTriggerLoad: Ref<boolean>;
+    dataList: Ref<D[]>;
+}
 export interface ServicePaginationOptions<D = unknown, R = unknown, P = ServicePageParams, TP = P, Pag extends ServicePagination = ServicePagination> extends ServicePageBaseOptions<D, R, P, TP, Pag> {
     cacheKey?: ServicePaginationBaseOptions<D>['cacheKey'];
     cacheTime?: ServicePaginationBaseOptions<D>['cacheTime'];
@@ -42,4 +47,9 @@ export interface ServicePaginationOptions<D = unknown, R = unknown, P = ServiceP
     onSuccess?: ServicePageLoadMoreBaseOptions<D>['onSuccess'];
     onError?: ServicePageLoadMoreBaseOptions<D>['onError'];
 }
+export interface UseServicePaginationResult<D = unknown> extends PaginationQueryResult<ServicePageDataType<D>, unknown[]> {
+    firstLoad: Ref<boolean>;
+    manualTriggerLoad: Ref<boolean>;
+    dataList: Ref<D[]>;
+}
 export {};

package/dist/qidian-shared.cjs.js

@@ -11980,6 +11980,18 @@ function setUrlParam(key, value, url, andString, newKey) {
   }
   return urltmp;
 }
+const validatorRegs = {
+  cellPhone: /^1[3-9]\d{9}$/,
+  telephone: /^\d{7,8}$/,
+  url: /^((blob:)*(https|http|ftp|rtsp|mms|wss)?:\/\/)[-A-Za-z0-9+&@#/%?=~_|!:,.;]+[-A-Za-z0-9+&@#/%=~_|]/
+};
+function validator(value, type, required = false) {
+  if (type === "empty") return isEmpty(value);
+  const reg = validatorRegs[type];
+  if (!reg) throw new Error(`[validator] 没有 ${type} 类型`);
+  if (required && isEmpty(value)) return null;
+  return reg.test(value);
+}
 function useServiceLoadMore({
   service,
   manual,
@@ -12010,19 +12022,22 @@ function useServiceLoadMore({
     async (params) => {
       const res = { list: [], page: 1, total: 0 };
       const paginationV = vue.unref(pagination);
-      let currentParams = paginationV ? {
+      const currentParams = paginationV ? {
         pageNum: params?.page ?? 1,
         pageSize: params?.size ?? paginationV?.pageSize ?? 30
       } : void 0;
-      if (!currentParams || currentParams?.pageNum === 1) {
-        firstLoad.value = true;
-      }
+      if (currentParams?.pageNum === 1) firstLoad.value = true;
+      let tParams;
       if (transformParams) {
-        const [tpErr, tpRes] = await suspectedWrapperPromise(transformParams(currentParams));
+        const [tpErr, tpRes] = await suspectedWrapperPromise(
+          transformParams(
+            currentParams ? easyCopy(currentParams) : currentParams
+          )
+        );
         if (tpErr) throw tpErr;
-        currentParams = tpRes;
+        tParams = tpRes;
       }
-      const [serviceErr, serviceRes] = await to(service(currentParams));
+      const [serviceErr, serviceRes] = await to(service(tParams || currentParams));
       if (serviceErr) throw serviceErr;
       let temp;
       if (transformRes) {
@@ -12137,19 +12152,22 @@ function useServicePagination({
     async (params2) => {
       const res = { list: [], page: 1, total: 0 };
       const paginationV = vue.unref(pagination);
-      let currentParams = paginationV !== false ? {
+      const currentParams = paginationV !== false ? {
         pageNum: params2?.page ?? 1,
         pageSize: params2?.size ?? paginationV?.pageSize ?? 10
       } : void 0;
-      if (!currentParams || currentParams?.pageNum === 1) {
-        firstLoad.value = true;
-      }
+      if (currentParams?.pageNum === 1) firstLoad.value = true;
+      let tParams;
       if (transformParams) {
-        const [tpErr, tpRes] = await suspectedWrapperPromise(transformParams(currentParams));
+        const [tpErr, tpRes] = await suspectedWrapperPromise(
+          transformParams(
+            currentParams ? easyCopy(currentParams) : currentParams
+          )
+        );
         if (tpErr) throw tpErr;
-        currentParams = tpRes;
+        tParams = tpRes;
       }
-      const [serviceErr, serviceRes] = await to(service(currentParams));
+      const [serviceErr, serviceRes] = await to(service(tParams || currentParams));
       if (serviceErr) throw serviceErr;
       let temp;
       if (transformRes) {
@@ -12315,7 +12333,7 @@ function useCsl(module2) {
 function useProxy() {
   const instance = vue.getCurrentInstance();
   if (!instance || !instance.proxy) {
-    throw new Error("useProxy 必须在 setup 或生命周期内调用，并且组件已经挂载");
+    throw new Error("[useProxy] 必须在 setup 或生命周期内调用，并且组件已经挂载");
   }
   return instance.proxy;
 }
@@ -12385,5 +12403,7 @@ exports.useProxy = useProxy;
 exports.useServiceLoadMore = useServiceLoadMore;
 exports.useServicePagination = useServicePagination;
 exports.useTimer = useTimer;
+exports.validator = validator;
+exports.validatorRegs = validatorRegs;
 exports.waitTime = waitTime;
 //# sourceMappingURL=qidian-shared.cjs.js.map