feat: support useRequest param is string

alibaba · Mar 1, 2023 · 8ef438b · 8ef438b
1 parent f3ebe8a
commit 8ef438b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/packages/plugin-request/src/hooks.ts b/packages/plugin-request/src/hooks.ts
@@ -8,12 +8,16 @@ interface RequestResult<R, P extends any[]> extends Result<R, P> {
 }
 
 export function useRequest<TData, TParams extends any[]>(
-  service: AxiosRequestConfig | Service<TData, TParams>,
+  service: string | AxiosRequestConfig | Service<TData, TParams>,
   options?: Options<TData, TParams>,
   plugins?: Plugin<TData, TParams>[]) {
   let s: Service<TData, TParams>;
   if (isFunction(service)) {
     s = service as Service<TData, TParams>;
+  } else if (isString(service)) {
+    s = async (...extraOptions: TParams) => {
+      return request({ url: service, ...extraOptions });
+    };
   } else {
     const options = service as AxiosRequestConfig;
     s = async (...extraOptions: TParams) => {
@@ -34,6 +38,10 @@ export function useRequest<TData, TParams extends any[]>(
   } as RequestResult<TData, TParams>;
 }
 
+function isString(str: any): str is string {
+  return typeof str === 'string';
+}
+
 function isFunction(fn: any): fn is Function {
   return typeof fn === 'function';
 }
diff --git a/website/docs/guide/advanced/request.md b/website/docs/guide/advanced/request.md
@@ -341,15 +341,20 @@ const {
 
 ```ts
 import { useRequest } from 'ice';
-// 用法 1：传入 Axios 配置对象
+// 用法 1：传入请求地址
+const { data, error, loading, request } = useRequest('/api/repo');
+
+request();
+
+// 用法 2：传入 Axios 配置对象
 const { data, error, loading, request } = useRequest({
   url: '/api/repo',
   method: 'get',
 });
 
 request();
 
-// 用法 2：传入 service 函数
+// 用法 3：传入 service 函数
 const { data, error, loading, request } = useRequest((id) => Promise.resolve({
   url: '/api/repo',
   method: 'get',