diff --git a/package.json b/package.json
index 701c0535..f241324e 100644
--- a/package.json
+++ b/package.json
@@ -29,8 +29,7 @@
]
},
"dependencies": {
- "antd": "^4.23.5",
- "react": "17.0.2"
+ "antd": "^4.23.6"
},
"devDependencies": {
"@testing-library/jest-dom": "^5.15.1",
@@ -56,4 +55,4 @@
"workspaces": [
"packages/*"
]
-}
+}
\ No newline at end of file
diff --git a/packages/rc-use-hooks/LICENSE b/packages/rc-use-hooks/LICENSE
index 80578f4b..07f689b3 100644
--- a/packages/rc-use-hooks/LICENSE
+++ b/packages/rc-use-hooks/LICENSE
@@ -1,6 +1,6 @@
MIT License
-Copyright (c) 2021 doly-dev
+Copyright (c) 2022 llq0802
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/packages/rc-use-hooks/src/index.ts b/packages/rc-use-hooks/src/index.ts
index 692a7a9a..d5143b36 100644
--- a/packages/rc-use-hooks/src/index.ts
+++ b/packages/rc-use-hooks/src/index.ts
@@ -14,7 +14,7 @@ export { default as useResetState } from './useResetState';
export { default as useSafeState } from './useSafeState';
export { default as useSetState } from './useSetState';
export { default as useShow } from './useShow';
-export type { OnShowInstance } from './useShow';
+export type { UseShowInstance, UseShowInstanceRef, UseShowOptions } from './useShow';
export { default as useThrottleFn } from './useThrottleFn';
export { default as useUnmounted } from './useUnmounted';
export { default as useUpdated } from './useUpdated';
diff --git a/packages/rc-use-hooks/src/useConcurrentRequest/index.md b/packages/rc-use-hooks/src/useConcurrentRequest/index.md
index b4ef310b..c532f6ad 100644
--- a/packages/rc-use-hooks/src/useConcurrentRequest/index.md
+++ b/packages/rc-use-hooks/src/useConcurrentRequest/index.md
@@ -10,7 +10,7 @@ nav:
# useConcurrentRequest
-并发请求函数 请求结果数组顺序同参数数组顺序一致
+并发请求函数,支持设置最大并发数, 请求结果数组顺序同参数数组顺序一致
## 代码演示
diff --git a/packages/rc-use-hooks/src/useLockAsyncFn/demos/demo1.tsx b/packages/rc-use-hooks/src/useLockAsyncFn/demos/demo1.tsx
index a9957cf2..1754a73b 100644
--- a/packages/rc-use-hooks/src/useLockAsyncFn/demos/demo1.tsx
+++ b/packages/rc-use-hooks/src/useLockAsyncFn/demos/demo1.tsx
@@ -17,7 +17,7 @@ function mockRequest() {
export default () => {
const [count, setCount] = useState(0);
- const submit = useLockAsyncFn(async (params) => {
+ const { run, loading } = useLockAsyncFn(async (params) => {
message.info(`开始请求${params}`);
await mockRequest();
setCount((val) => val + 1);
@@ -27,7 +27,7 @@ export default () => {
return (
<>
请求次数: {count}
-
+
);
};
diff --git a/packages/rc-use-hooks/src/useLockAsyncFn/index.md b/packages/rc-use-hooks/src/useLockAsyncFn/index.md
index bb89dbf7..c5c18e02 100644
--- a/packages/rc-use-hooks/src/useLockAsyncFn/index.md
+++ b/packages/rc-use-hooks/src/useLockAsyncFn/index.md
@@ -10,7 +10,7 @@ nav:
# useLockAsyncFn
-用于给一个异步函数增加竞态锁，防止并发执行。
+用于给一个异步函数增加节流阀，防止并发执行。
## 代码演示
diff --git a/packages/rc-use-hooks/src/useLockAsyncFn/index.ts b/packages/rc-use-hooks/src/useLockAsyncFn/index.ts
index 8bf66743..0ec0dfba 100644
--- a/packages/rc-use-hooks/src/useLockAsyncFn/index.ts
+++ b/packages/rc-use-hooks/src/useLockAsyncFn/index.ts
@@ -1,4 +1,4 @@
-import { useCallback, useRef } from 'react';
+import { useCallback, useRef, useState } from 'react';
/**
* 用于给一个异步函数节流阀，防止并发执行。
@@ -6,23 +6,31 @@ import { useCallback, useRef } from 'react';
export default function useLockAsyncFn(
fn: (...args: P) => Promise,
) {
+ const [loading, setLoading] = useState(false);
const lockRef = useRef(false);
- return useCallback(
+ const run = useCallback(
async (...args: P) => {
if (lockRef.current) return;
lockRef.current = true;
try {
+ setLoading(true);
const ret = await fn(...args);
+ setLoading(false);
lockRef.current = false;
return ret;
} catch (e) {
+ setLoading(false);
lockRef.current = false;
throw e;
}
},
[fn],
);
+ return {
+ loading,
+ run,
+ };
}
// // 防止网络请求多次(使用promise实现)
diff --git a/packages/rc-use-hooks/src/useShow/demos/demo1.tsx b/packages/rc-use-hooks/src/useShow/demos/demo1.tsx
index 006198ec..cb1709ee 100644
--- a/packages/rc-use-hooks/src/useShow/demos/demo1.tsx
+++ b/packages/rc-use-hooks/src/useShow/demos/demo1.tsx
@@ -1,11 +1,10 @@
import { Button, Checkbox, Form, Input, message, Modal, Space } from 'antd';
-import type { OnShowInstance } from 'rc-use-hooks';
+import type { UseShowInstance, UseShowInstanceRef } from 'rc-use-hooks';
import { useShow } from 'rc-use-hooks';
-import type { RefObject } from 'react';
import { useRef, useState } from 'react';
const demo1 = () => {
- const childModelRef = useRef(null);
+ const childModelRef = useRef(null);
const handleClickShow = () => {
childModelRef.current?.onShow({
@@ -16,21 +15,22 @@ const demo1 = () => {
};
const handleClickHide = () => {
childModelRef.current?.onHide({
- name: '李岚清',
- age: 25,
- remember: true,
+ name: '吴彦祖',
+ age: 18,
+ remember: false,
});
};
const handleGetData = () => {
const childData = childModelRef.current?.getChildData();
- message.info(`子组件数据为: ${JSON.stringify(childData, null, 2)}`);
+ message.info(`获得到子组件数据为: ${JSON.stringify(childData, null, 2)}`);
console.log(' childData', childData);
};
return (
-
+
+
这是父组件
@@ -45,18 +45,21 @@ const demo1 = () => {
export default demo1;
type ChildModelProps = {
- funcRef: RefObject;
+ funcRef: UseShowInstanceRef;
};
function ChildModel({ funcRef }: ChildModelProps) {
const [open, setOpen] = useState(false);
const { parentData, setParentData } = useShow(funcRef, {
onShow: (data: Record) => {
+ message.info(`父组件调用了onShow并传参数${JSON.stringify(data, null, 2)}`);
console.log('父组件调用了onShow并传参数 ', data);
setOpen(true);
},
onHide: (data) => {
+ message.info(`父组件调用了onHide并传参数${JSON.stringify(data, null, 2)}`);
+
console.log('父组件调用了onHide并传参数 ', data);
setOpen(false);
},
@@ -70,9 +73,20 @@ function ChildModel({ funcRef }: ChildModelProps) {
setOpen(false);
};
+ const handleCancel = () => {
+ setParentData(null);
+ setOpen(false);
+ };
+
return (
<>
- setOpen(false)}>
+