From 4c35a51f64754b050f397435c40f263a85b1287c Mon Sep 17 00:00:00 2001 From: ningyv <1793599591@qq.com> Date: Wed, 19 Feb 2025 10:23:16 +0800 Subject: [PATCH] feat: feature/1.5-Data Integration --- frontend/packages/common/src/hooks/http.ts | 10 +++------- .../src/pages/aiSetting/ConfigureOllamaService.tsx | 3 +-- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/frontend/packages/common/src/hooks/http.ts b/frontend/packages/common/src/hooks/http.ts index c832ed5c..06a23f64 100644 --- a/frontend/packages/common/src/hooks/http.ts +++ b/frontend/packages/common/src/hooks/http.ts @@ -98,7 +98,7 @@ const trimStringValuesInObject = (obj: unknown): unknown => { return obj } -const processQueryParams = (url: string, options: EoRequest, shouldTransformKeys: boolean, transformParams = true) => { +const processQueryParams = (url: string, options: EoRequest, shouldTransformKeys: boolean) => { if (options.eoParams) { const cleanParams = Object.fromEntries( Object.entries(options.eoParams) @@ -106,10 +106,7 @@ const processQueryParams = (url: string, options: EoRequest, shouldTransformKeys .map(([key, value]) => [key, typeof value === 'string' ? value.trim() : value]) ) const queryParams = convertQueryParamsToSnake(cleanParams, shouldTransformKeys, options.eoTransformKeys as string[]) - let queryString = queryParams.toString() - if (!transformParams) { - queryString = decodeURIComponent(queryString) - } + const queryString = queryParams.toString() url += (url.includes('?') ? '&' : '?') + queryString // 添加查询字符串到URL } return url @@ -140,7 +137,6 @@ type EoRequest = RequestInit & { isStream?: boolean handleStream?: (line: any) => void callback?: (cancel: () => void) => void - transformParams?: boolean } type EoHeaders = Headers | { [k: string]: string } @@ -166,7 +162,7 @@ export function useFetch() { !shouldNotTransform(url) && options?.eoTransformKeys && options?.eoTransformKeys?.length > 0 // 处理URL查询参数 - url = processQueryParams(url, options, !!shouldTransformKeys, options?.transformParams) + url = processQueryParams(url, options, !!shouldTransformKeys) // 处理请求体, 当请求头为json时,fetch的body应当是json字符串 options.body = processRequestBody(options, headers as EoHeaders, !!shouldTransformKeys) diff --git a/frontend/packages/core/src/pages/aiSetting/ConfigureOllamaService.tsx b/frontend/packages/core/src/pages/aiSetting/ConfigureOllamaService.tsx index abd8c4d4..6207051b 100644 --- a/frontend/packages/core/src/pages/aiSetting/ConfigureOllamaService.tsx +++ b/frontend/packages/core/src/pages/aiSetting/ConfigureOllamaService.tsx @@ -31,8 +31,7 @@ const ConfigureOllamaService = forwardRef((pr .then((value) => { fetchData>('model/local/source/ollama', { method: 'PUT', - eoParams: { address: value.address }, - transformParams: false + eoBody: { address: value.address } }) .then((response) => { const { code, msg } = response