@wzyjs/hooks 0.0.26 → 0.0.28

package/dist/useFormRef.d.ts

@@ -0,0 +1,2 @@
+/// <reference types="react" />
+export declare const useFormRef: <Values>() => import("react").MutableRefObject<any>;

package/dist/useFormRef.js

@@ -0,0 +1,4 @@
+import { useRef } from 'react';
+export const useFormRef = () => {
+    return useRef();
+};

package/dist/useRequestPro.d.ts

@@ -1,5 +1,5 @@
-import { RequestRes } from '@wzyjs/utils';
-import { Options, Service, Result } from 'ahooks/lib/useRequest/src/types';
+import { RequestRes } from '@wzyjs/types';
+import { Options, Result, Service } from 'ahooks/lib/useRequest/src/types';
 interface UserOptions<P extends any[], R> extends Options<R, P> {
     alertErrorMessage?: false | string;
     alertSuccessMessage?: true | string;
@@ -7,5 +7,5 @@ interface UserOptions<P extends any[], R> extends Options<R, P> {
 interface IResult<R extends RequestRes, P extends any[]> extends Omit<Result<R, P>, 'data'> {
     data?: R['data'];
 }
-export declare const useRequestPro: <P extends any[], R extends RequestRes<any>>(reqPromise?: Service<R, P> | undefined, userOptions?: UserOptions<P, R> | undefined) => IResult<R, P> | null;
+export declare const useRequestPro: <P extends any[], R extends RequestRes<any>>(reqPromise?: Service<R, P> | undefined, userOptions?: UserOptions<P, R> | undefined) => IResult<R, P>;
 export {};

package/dist/useRequestPro.js

@@ -1,19 +1,33 @@
 import { message } from 'antd';
-import { omit } from '@wzyjs/utils';
 import { useRequest } from 'ahooks';
+import { noop, omit } from '@wzyjs/utils';
+const defaultResult = {
+    loading: false,
+    data: undefined,
+    error: undefined,
+    params: [],
+    cancel: noop,
+    refresh: noop,
+    refreshAsync: noop,
+    run: noop,
+    runAsync: noop,
+    mutate: noop,
+};
 export const useRequestPro = (reqPromise, userOptions) => {
     if (!reqPromise) {
-        return null;
+        return defaultResult;
     }
     const { alertErrorMessage = true, alertSuccessMessage = false } = userOptions || {};
     const defaultOptions = {
+        cacheKey: String(reqPromise),
+        staleTime: 5000,
         debounceWait: 300,
         throttleWait: 300,
-        onError: (e, params) => {
+        onError: (err, params) => {
             if (alertErrorMessage) {
-                message.error(typeof alertErrorMessage === 'string' ? alertErrorMessage : e.message || '请求失败');
+                message.error(typeof alertErrorMessage === 'string' ? alertErrorMessage : err.message || '请求失败');
             }
-            userOptions?.onError?.(e, params);
+            userOptions?.onError?.(err, params);
         },
         onSuccess: (res, params) => {
             // 如果失败，则还是调用 onError
@@ -32,6 +46,6 @@ export const useRequestPro = (reqPromise, userOptions) => {
     const options = Object.assign(defaultOptions, omit(userOptions, ['onSuccess', 'onError']));
     // 取出 data 里的 data
     const state = useRequest(reqPromise, options);
-    state.data = state.data?.data || state.data;
+    state.data = state.data?.data;
     return state;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wzyjs/hooks",
-  "version": "0.0.26",
+  "version": "0.0.28",
   "description": "description",
   "author": "wzy",
   "license": "ISC",
@@ -14,18 +14,15 @@
     "dist"
   ],
   "dependencies": {
-    "@types/react": "^18.0.28",
-    "@wzyjs/utils": "^0.0.26",
+    "@wzyjs/types": "^0.0.28",
+    "@wzyjs/utils": "^0.0.28",
     "ahooks": "^3.7.3",
-    "antd": "^5.1.0",
+    "antd": "^5.6.2",
     "react-use": "^17.4.0"
   },
-  "peerDependencies": {
-    "@types/react": "latest",
-    "react": "latest"
-  },
   "devDependencies": {
-    "@types/node": "^18.11.17"
+    "@types/node": "^18.11.17",
+    "@types/react": "latest"
   },
   "publishConfig": {
     "access": "public"
@@ -34,5 +31,5 @@
     "type": "git",
     "url": "https://gitee.com/wang-zhenyu/work.git"
   },
-  "gitHead": "a36becc39314fcf9fe22b6995a38ff85126e986d"
+  "gitHead": "b27e8d285e4092485cd1be538c1f571bc29e7835"
 }