From 6873af01d4f72b6d7c300450a2f349b2905c4900 Mon Sep 17 00:00:00 2001 From: Archer <545436317@qq.com> Date: Sun, 8 Jun 2025 22:55:36 +0800 Subject: [PATCH] fix: popver ui (#4980) * doc * fix: ui --- deploy/docker/docker-compose-milvus.yml | 12 +- .../docker-compose.yml | 12 +- deploy/docker/docker-compose-pgvector.yml | 12 +- deploy/docker/docker-compose-zilliz.yml | 12 +- .../zh-cn/docs/development/upgrading/4911.md | 19 ++- .../detail/Workflow/components/SaveButton.tsx | 154 +++++++++--------- projects/app/src/web/styles/chakraui.scss | 4 - 7 files changed, 121 insertions(+), 104 deletions(-) diff --git a/deploy/docker/docker-compose-milvus.yml b/deploy/docker/docker-compose-milvus.yml index 438cf369f..0a05b2cfc 100644 --- a/deploy/docker/docker-compose-milvus.yml +++ b/deploy/docker/docker-compose-milvus.yml @@ -132,15 +132,15 @@ services: # fastgpt sandbox: container_name: sandbox - image: ghcr.io/labring/fastgpt-sandbox:v4.9.10-fix2 # git - # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.9.10-fix2 # 阿里云 + image: ghcr.io/labring/fastgpt-sandbox:v4.9.11 # git + # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.9.11 # 阿里云 networks: - fastgpt restart: always fastgpt-mcp-server: container_name: fastgpt-mcp-server - image: ghcr.io/labring/fastgpt-mcp_server:v4.9.10-fix2 # git - # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-mcp_server:v4.9.10-fix2 # 阿里云 + image: ghcr.io/labring/fastgpt-mcp_server:v4.9.11 # git + # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-mcp_server:v4.9.11 # 阿里云 ports: - 3005:3000 networks: @@ -150,8 +150,8 @@ services: - FASTGPT_ENDPOINT=http://fastgpt:3000 fastgpt: container_name: fastgpt - image: ghcr.io/labring/fastgpt:v4.9.10-fix2 # git - # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.9.10-fix2 # 阿里云 + image: ghcr.io/labring/fastgpt:v4.9.11 # git + # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.9.11 # 阿里云 ports: - 3000:3000 networks: diff --git a/deploy/docker/docker-compose-oceanbase/docker-compose.yml b/deploy/docker/docker-compose-oceanbase/docker-compose.yml index dc67477a9..063d199dc 100644 --- a/deploy/docker/docker-compose-oceanbase/docker-compose.yml +++ b/deploy/docker/docker-compose-oceanbase/docker-compose.yml @@ -109,15 +109,15 @@ services: # fastgpt sandbox: container_name: sandbox - image: ghcr.io/labring/fastgpt-sandbox:v4.9.10-fix2 # git - # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.9.10-fix2 # 阿里云 + image: ghcr.io/labring/fastgpt-sandbox:v4.9.11 # git + # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.9.11 # 阿里云 networks: - fastgpt restart: always fastgpt-mcp-server: container_name: fastgpt-mcp-server - image: ghcr.io/labring/fastgpt-mcp_server:v4.9.10-fix2 # git - # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-mcp_server:v4.9.10-fix2 # 阿里云 + image: ghcr.io/labring/fastgpt-mcp_server:v4.9.11 # git + # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-mcp_server:v4.9.11 # 阿里云 ports: - 3005:3000 networks: @@ -127,8 +127,8 @@ services: - FASTGPT_ENDPOINT=http://fastgpt:3000 fastgpt: container_name: fastgpt - image: ghcr.io/labring/fastgpt:v4.9.10-fix2 # git - # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.9.10-fix2 # 阿里云 + image: ghcr.io/labring/fastgpt:v4.9.11 # git + # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.9.11 # 阿里云 ports: - 3000:3000 networks: diff --git a/deploy/docker/docker-compose-pgvector.yml b/deploy/docker/docker-compose-pgvector.yml index 72c945d92..d8cdf4785 100644 --- a/deploy/docker/docker-compose-pgvector.yml +++ b/deploy/docker/docker-compose-pgvector.yml @@ -96,15 +96,15 @@ services: # fastgpt sandbox: container_name: sandbox - image: ghcr.io/labring/fastgpt-sandbox:v4.9.10-fix2 # git - # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.9.10-fix2 # 阿里云 + image: ghcr.io/labring/fastgpt-sandbox:v4.9.11 # git + # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.9.11 # 阿里云 networks: - fastgpt restart: always fastgpt-mcp-server: container_name: fastgpt-mcp-server - image: ghcr.io/labring/fastgpt-mcp_server:v4.9.10-fix2 # git - # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-mcp_server:v4.9.10-fix2 # 阿里云 + image: ghcr.io/labring/fastgpt-mcp_server:v4.9.11 # git + # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-mcp_server:v4.9.11 # 阿里云 ports: - 3005:3000 networks: @@ -114,8 +114,8 @@ services: - FASTGPT_ENDPOINT=http://fastgpt:3000 fastgpt: container_name: fastgpt - image: ghcr.io/labring/fastgpt:v4.9.10-fix2 # git - # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.9.10-fix2 # 阿里云 + image: ghcr.io/labring/fastgpt:v4.9.11 # git + # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.9.11 # 阿里云 ports: - 3000:3000 networks: diff --git a/deploy/docker/docker-compose-zilliz.yml b/deploy/docker/docker-compose-zilliz.yml index 607883ed6..9f5837198 100644 --- a/deploy/docker/docker-compose-zilliz.yml +++ b/deploy/docker/docker-compose-zilliz.yml @@ -72,15 +72,15 @@ services: sandbox: container_name: sandbox - image: ghcr.io/labring/fastgpt-sandbox:v4.9.10-fix2 # git - # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.9.10-fix2 # 阿里云 + image: ghcr.io/labring/fastgpt-sandbox:v4.9.11 # git + # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.9.11 # 阿里云 networks: - fastgpt restart: always fastgpt-mcp-server: container_name: fastgpt-mcp-server - image: ghcr.io/labring/fastgpt-mcp_server:v4.9.10-fix2 # git - # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-mcp_server:v4.9.10-fix2 # 阿里云 + image: ghcr.io/labring/fastgpt-mcp_server:v4.9.11 # git + # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-mcp_server:v4.9.11 # 阿里云 ports: - 3005:3000 networks: @@ -90,8 +90,8 @@ services: - FASTGPT_ENDPOINT=http://fastgpt:3000 fastgpt: container_name: fastgpt - image: ghcr.io/labring/fastgpt:v4.9.10-fix2 # git - # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.9.10-fix2 # 阿里云 + image: ghcr.io/labring/fastgpt:v4.9.11 # git + # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.9.11 # 阿里云 ports: - 3000:3000 networks: diff --git a/docSite/content/zh-cn/docs/development/upgrading/4911.md b/docSite/content/zh-cn/docs/development/upgrading/4911.md index ffba53c9e..bd206085a 100644 --- a/docSite/content/zh-cn/docs/development/upgrading/4911.md +++ b/docSite/content/zh-cn/docs/development/upgrading/4911.md @@ -1,5 +1,5 @@ --- -title: 'V4.9.11(进行中)' +title: 'V4.9.11(包含升级脚本)' description: 'FastGPT V4.9.11 更新说明' icon: 'upgrade' draft: false @@ -7,7 +7,17 @@ toc: true weight: 789 --- -## 执行升级脚本 +## 更新指南 + +### 1. 更新镜像： + +- 更新 FastGPT 镜像 tag: v4.9.11 +- 更新 FastGPT 商业版镜像 tag: v4.9.11 +- mcp_server 无需更新 +- 更新 Sandbox 镜像 tag: v4.9.11 +- AIProxy 无需更新 + +### 2. 执行升级脚本 该脚本仅需商业版用户执行。 @@ -30,10 +40,12 @@ curl --location --request POST 'https://{{host}}/api/admin/initv4911' \ 3. 工作流中，子流程版本控制，可选择“保持最新版本”，无需手动更新。 4. 增加更多审计操作日志。 5. 知识库增加文档解析异步队列，导入文档时，无需等待文档解析完毕才进行导入。 +6. 第三方知识库开发文档, [点击查看](/docs/guide/knowledge_base/third_dataset/) ## ⚙️ 优化 1. 原文缓存改用 gridfs 存储，提高上限。 +2. 增加知识库模板导入选项。 ## 🐛 修复 @@ -42,4 +54,5 @@ curl --location --request POST 'https://{{host}}/api/admin/initv4911' \ 3. 修复备份导入，小于 1000 字时，无法分块问题。 4. 自定义 PDF 解析，无法保存 base64 图片。 5. 非流请求，未进行 CITE 标记替换。 -6. Python 沙盒存在隐藏风险。 \ No newline at end of file +6. Python 沙盒存在隐藏风险。 +7. curl 导入插件缺失确认按键 \ No newline at end of file diff --git a/projects/app/src/pageComponents/app/detail/Workflow/components/SaveButton.tsx b/projects/app/src/pageComponents/app/detail/Workflow/components/SaveButton.tsx index 8938716b4..d89fc39b9 100644 --- a/projects/app/src/pageComponents/app/detail/Workflow/components/SaveButton.tsx +++ b/projects/app/src/pageComponents/app/detail/Workflow/components/SaveButton.tsx @@ -32,82 +32,90 @@ const SaveButton = ({ } = useDisclosure(); return ( - setIsSave(true)} - onCloseFunc={() => setIsSave(false)} - trigger={'hover'} - Trigger={ - - } + - {({ onClose }) => ( - - { - await onClickSave({}); - toast({ - status: 'success', - title: t('app:saved_success'), - position: 'top-right', - isClosable: true - }); - onClose(); - setIsSave(false); - }} - > - - {t('common:core.workflow.Save to cloud')} - - { - const canOpen = !checkData || checkData(); - if (canOpen) { - onSaveAndPublishModalOpen(); - } - onClose(); - setIsSave(false); - }} - > - - {t('common:core.workflow.Save and publish')} - {isSaveAndPublishModalOpen && ( - setIsSave(true)} + onCloseFunc={() => setIsSave(false)} + trigger={'hover'} + Trigger={ + + } + > + {({ onClose }) => ( + + { + await onClickSave({}); + toast({ + status: 'success', + title: t('app:saved_success'), + position: 'top-right', + isClosable: true + }); + onClose(); + setIsSave(false); + }} + > + + {t('common:core.workflow.Save to cloud')} + + { + const canOpen = !checkData || checkData(); + if (canOpen) { + onSaveAndPublishModalOpen(); + } + onClose(); + setIsSave(false); + }} + > + + {t('common:core.workflow.Save and publish')} + + + )} + + {isSaveAndPublishModalOpen && ( + )} - + ); }; diff --git a/projects/app/src/web/styles/chakraui.scss b/projects/app/src/web/styles/chakraui.scss index 2b666371f..1b6597bfd 100644 --- a/projects/app/src/web/styles/chakraui.scss +++ b/projects/app/src/web/styles/chakraui.scss @@ -6,7 +6,3 @@ body select { .chakra-tooltip { font-size: var(--chakra-fontSizes-xs) !important; } - -.chakra-popover__popper > section { - width: auto !important; -}