From 832426600a7e5797642b44d50fbfa24ee4b53c7b Mon Sep 17 00:00:00 2001 From: shaohuzhang1 <80892890+shaohuzhang1@users.noreply.github.com> Date: Tue, 30 Apr 2024 14:44:19 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=BB=B6=E9=95=BF=E5=88=86=E6=AE=B5?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B6=85=E6=97=B6=E6=97=B6=E9=97=B4=20#306?= =?UTF-8?q?=20(#331)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/src/api/dataset.ts | 2 +- ui/src/api/document.ts | 4 ++-- ui/src/request/index.ts | 33 +++++++++++++++++++++------------ 3 files changed, 24 insertions(+), 15 deletions(-) diff --git a/ui/src/api/dataset.ts b/ui/src/api/dataset.ts index 850626cf4..702731a26 100644 --- a/ui/src/api/dataset.ts +++ b/ui/src/api/dataset.ts @@ -73,7 +73,7 @@ const postDataset: (data: datasetData, loading?: Ref) => Promise { - return post(`${prefix}`, data, undefined, loading) + return post(`${prefix}`, data, undefined, loading, 1000 * 60 * 5) } /** diff --git a/ui/src/api/document.ts b/ui/src/api/document.ts index 8affd3742..2d2fc1f65 100644 --- a/ui/src/api/document.ts +++ b/ui/src/api/document.ts @@ -10,7 +10,7 @@ const prefix = '/dataset' * @param 参数 file:file,limit:number,patterns:array,with_filter:boolean */ const postSplitDocument: (data: any) => Promise> = (data) => { - return post(`${prefix}/document/split`, data) + return post(`${prefix}/document/split`, data, undefined, undefined, 1000 * 60 * 60) } /** @@ -80,7 +80,7 @@ const postDocument: ( data: any, loading?: Ref ) => Promise> = (dataset_id, data, loading) => { - return post(`${prefix}/${dataset_id}/document/_bach`, data, {}, loading) + return post(`${prefix}/${dataset_id}/document/_bach`, data, {}, loading, 1000 * 60 * 5) } /** diff --git a/ui/src/request/index.ts b/ui/src/request/index.ts index 6c83f3ed6..7d748ffd8 100644 --- a/ui/src/request/index.ts +++ b/ui/src/request/index.ts @@ -119,9 +119,15 @@ const promise: ( export const get: ( url: string, params?: unknown, - loading?: NProgress | Ref -) => Promise> = (url: string, params: unknown, loading?: NProgress | Ref) => { - return promise(request({ url: url, method: 'get', params }), loading) + loading?: NProgress | Ref, + timeout?: number +) => Promise> = ( + url: string, + params: unknown, + loading?: NProgress | Ref, + timeout?: number +) => { + return promise(request({ url: url, method: 'get', params, timeout: timeout }), loading) } /** @@ -136,9 +142,10 @@ export const post: ( url: string, data?: unknown, params?: unknown, - loading?: NProgress | Ref -) => Promise | any> = (url, data, params, loading) => { - return promise(request({ url: url, method: 'post', data, params }), loading) + loading?: NProgress | Ref, + timeout?: number +) => Promise | any> = (url, data, params, loading, timeout) => { + return promise(request({ url: url, method: 'post', data, params, timeout }), loading) } /**| @@ -153,9 +160,10 @@ export const put: ( url: string, data?: unknown, params?: unknown, - loading?: NProgress | Ref -) => Promise> = (url, data, params, loading) => { - return promise(request({ url: url, method: 'put', data, params }), loading) + loading?: NProgress | Ref, + timeout?: number +) => Promise> = (url, data, params, loading, timeout) => { + return promise(request({ url: url, method: 'put', data, params, timeout }), loading) } /** @@ -169,9 +177,10 @@ export const del: ( url: string, params?: unknown, data?: unknown, - loading?: NProgress | Ref -) => Promise> = (url, params, data, loading) => { - return promise(request({ url: url, method: 'delete', params, data }), loading) + loading?: NProgress | Ref, + timeout?: number +) => Promise> = (url, params, data, loading, timeout) => { + return promise(request({ url: url, method: 'delete', params, data, timeout }), loading) } /**