From dbe17a6ccceb26701f453f6c3499222aa9f9f262 Mon Sep 17 00:00:00 2001 From: dolphin Date: Tue, 19 Aug 2025 18:02:24 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E5=B7=A5=E4=BD=9C=E5=8F=B0?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=85=BC=E5=AE=B9=E5=90=8E=E7=AB=AF=E9=9C=80?= =?UTF-8?q?=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/src/pages/BuildPage/bench/LingSiWork.tsx | 9 +++++++-- .../platform/src/pages/BuildPage/bench/index.tsx | 10 +++++++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/frontend/platform/src/pages/BuildPage/bench/LingSiWork.tsx b/src/frontend/platform/src/pages/BuildPage/bench/LingSiWork.tsx index 1d1103e03..507211bfe 100644 --- a/src/frontend/platform/src/pages/BuildPage/bench/LingSiWork.tsx +++ b/src/frontend/platform/src/pages/BuildPage/bench/LingSiWork.tsx @@ -364,7 +364,7 @@ export default function index({ formData: parentFormData, setFormData: parentSet config = parentFormData; } - if (config) { + if (config && 'menuShow' in config) { setFormData({ ...defaultFormValues, ...config, @@ -383,6 +383,11 @@ export default function index({ formData: parentFormData, setFormData: parentSet if (tools?.length > 0) { setSelectedTools(tools); } + } else { + setFormData((prev) => ({ + ...prev, + ...config + })) } } catch (error) { toast({ variant: 'error', description: '初始化数据加载失败' }); @@ -1026,7 +1031,7 @@ export default function index({ formData: parentFormData, setFormData: parentSet {...getLocalFileRootProps()} className="group h-40 border border-dashed rounded-md flex flex-col justify-center items-center cursor-pointer gap-3 hover:border-primary" > - +

{t('code.clickOrDragHere')}

diff --git a/src/frontend/platform/src/pages/BuildPage/bench/index.tsx b/src/frontend/platform/src/pages/BuildPage/bench/index.tsx index 1e0fc2cdd..1a9dda653 100644 --- a/src/frontend/platform/src/pages/BuildPage/bench/index.tsx +++ b/src/frontend/platform/src/pages/BuildPage/bench/index.tsx @@ -151,8 +151,10 @@ export default function index({ formData: parentFormData, setFormData: parentSet console.log("parentFormData is null", parentFormData); getWorkstationConfigApi().then(res => { - setWebSearchData(res.webSearch) - setFormData(res) + res.webSearch && setWebSearchData(res.webSearch) + setFormData((prev) => { + return 'menuShow' in res ? res : { ...prev, ...res } + }) }) } @@ -523,7 +525,9 @@ const useChatConfig = (refs: UseChatConfigProps, parentFormData, parentSetFormDa // api_key: '', // base_url: 'https://api.bing.microsoft.com/v7.0/search' // } - res && setFormData(res); + setFormData((prev) => { + return 'menuShow' in res ? res : { ...prev, ...res } + }) }) } From 146d5119d68c39ef36c6e2bb73318df2d8b330d5 Mon Sep 17 00:00:00 2001 From: GuoQing Zhang Date: Tue, 19 Aug 2025 18:08:23 +0800 Subject: [PATCH 2/2] ci: change version --- docker/docker-compose.yml | 6 +++--- src/backend/bisheng/__init__.py | 2 +- src/backend/pyproject.toml | 2 +- update.sh | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 0875f3837..d43f04a99 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -53,7 +53,7 @@ services: backend: container_name: bisheng-backend - image: dataelement/bisheng-backend:v2.0.0 + image: dataelement/bisheng-backend:v2.0.2 ports: - "7860:7860" environment: @@ -93,7 +93,7 @@ services: backend_worker: container_name: bisheng-backend-worker - image: dataelement/bisheng-backend:v2.0.0 + image: dataelement/bisheng-backend:v2.0.2 environment: TZ: Asia/Shanghai BS_MILVUS_CONNECTION_ARGS: '{"host":"milvus","port":"19530","user":"","password":"","secure":false}' @@ -125,7 +125,7 @@ services: frontend: container_name: bisheng-frontend - image: dataelement/bisheng-frontend:v2.0.0 + image: dataelement/bisheng-frontend:v2.0.2 ports: - "3001:3001" environment: diff --git a/src/backend/bisheng/__init__.py b/src/backend/bisheng/__init__.py index f2df00418..da2174066 100644 --- a/src/backend/bisheng/__init__.py +++ b/src/backend/bisheng/__init__.py @@ -6,7 +6,7 @@ from bisheng.processing.process import load_flow_from_json # noqa: E402 try: # 通过ci去自动修改 - __version__ = '2.0.0' + __version__ = '2.0.2' except metadata.PackageNotFoundError: # Case where package metadata is not available. __version__ = '' diff --git a/src/backend/pyproject.toml b/src/backend/pyproject.toml index 013beb8e8..22362eb7b 100644 --- a/src/backend/pyproject.toml +++ b/src/backend/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "bisheng" -version = "2.0.0" +version = "2.0.2" description = "A Python package with a built-in web application" authors = ["Dataelement "] maintainers = [ diff --git a/update.sh b/update.sh index c3299e3de..60e8d12ad 100644 --- a/update.sh +++ b/update.sh @@ -1,7 +1,7 @@ #! /bin/bash -old_version="1.3.1" -new_version="2.0.0" +old_version="2.0.0" +new_version="2.0.2" sed -i.bak "s/$old_version/$new_version/g" ./docker/docker-compose.yml sed -i.bak "s/$old_version/$new_version/g" ./src/backend/pyproject.toml sed -i.bak "s/$old_version/$new_version/g" ./src/backend/bisheng/__init__.py