Skip to content

Commit 6873af0

Browse files
c121914yuc121914yu
authored
fix: popver ui (#4980)
* doc * fix: ui
1 parent 9b73d3f commit 6873af0

File tree

7 files changed

+121
-104
lines changed

7 files changed

+121
-104
lines changed

‎deploy/docker/docker-compose-milvus.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -132,15 +132,15 @@ services:
132132
# fastgpt
133133
sandbox:
134134
container_name: sandbox
135-
image: ghcr.io/labring/fastgpt-sandbox:v4.9.10-fix2 # git
136-
# image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.9.10-fix2 # 阿里云
135+
image: ghcr.io/labring/fastgpt-sandbox:v4.9.11 # git
136+
# image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.9.11 # 阿里云
137137
networks:
138138
- fastgpt
139139
restart: always
140140
fastgpt-mcp-server:
141141
container_name: fastgpt-mcp-server
142-
image: ghcr.io/labring/fastgpt-mcp_server:v4.9.10-fix2 # git
143-
# image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-mcp_server:v4.9.10-fix2 # 阿里云
142+
image: ghcr.io/labring/fastgpt-mcp_server:v4.9.11 # git
143+
# image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-mcp_server:v4.9.11 # 阿里云
144144
ports:
145145
- 3005:3000
146146
networks:
@@ -150,8 +150,8 @@ services:
150150
- FASTGPT_ENDPOINT=http://fastgpt:3000
151151
fastgpt:
152152
container_name: fastgpt
153-
image: ghcr.io/labring/fastgpt:v4.9.10-fix2 # git
154-
# image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.9.10-fix2 # 阿里云
153+
image: ghcr.io/labring/fastgpt:v4.9.11 # git
154+
# image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.9.11 # 阿里云
155155
ports:
156156
- 3000:3000
157157
networks:

‎deploy/docker/docker-compose-oceanbase/docker-compose.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -109,15 +109,15 @@ services:
109109
# fastgpt
110110
sandbox:
111111
container_name: sandbox
112-
image: ghcr.io/labring/fastgpt-sandbox:v4.9.10-fix2 # git
113-
# image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.9.10-fix2 # 阿里云
112+
image: ghcr.io/labring/fastgpt-sandbox:v4.9.11 # git
113+
# image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.9.11 # 阿里云
114114
networks:
115115
- fastgpt
116116
restart: always
117117
fastgpt-mcp-server:
118118
container_name: fastgpt-mcp-server
119-
image: ghcr.io/labring/fastgpt-mcp_server:v4.9.10-fix2 # git
120-
# image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-mcp_server:v4.9.10-fix2 # 阿里云
119+
image: ghcr.io/labring/fastgpt-mcp_server:v4.9.11 # git
120+
# image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-mcp_server:v4.9.11 # 阿里云
121121
ports:
122122
- 3005:3000
123123
networks:
@@ -127,8 +127,8 @@ services:
127127
- FASTGPT_ENDPOINT=http://fastgpt:3000
128128
fastgpt:
129129
container_name: fastgpt
130-
image: ghcr.io/labring/fastgpt:v4.9.10-fix2 # git
131-
# image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.9.10-fix2 # 阿里云
130+
image: ghcr.io/labring/fastgpt:v4.9.11 # git
131+
# image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.9.11 # 阿里云
132132
ports:
133133
- 3000:3000
134134
networks:

‎deploy/docker/docker-compose-pgvector.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,15 +96,15 @@ services:
9696
# fastgpt
9797
sandbox:
9898
container_name: sandbox
99-
image: ghcr.io/labring/fastgpt-sandbox:v4.9.10-fix2 # git
100-
# image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.9.10-fix2 # 阿里云
99+
image: ghcr.io/labring/fastgpt-sandbox:v4.9.11 # git
100+
# image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.9.11 # 阿里云
101101
networks:
102102
- fastgpt
103103
restart: always
104104
fastgpt-mcp-server:
105105
container_name: fastgpt-mcp-server
106-
image: ghcr.io/labring/fastgpt-mcp_server:v4.9.10-fix2 # git
107-
# image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-mcp_server:v4.9.10-fix2 # 阿里云
106+
image: ghcr.io/labring/fastgpt-mcp_server:v4.9.11 # git
107+
# image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-mcp_server:v4.9.11 # 阿里云
108108
ports:
109109
- 3005:3000
110110
networks:
@@ -114,8 +114,8 @@ services:
114114
- FASTGPT_ENDPOINT=http://fastgpt:3000
115115
fastgpt:
116116
container_name: fastgpt
117-
image: ghcr.io/labring/fastgpt:v4.9.10-fix2 # git
118-
# image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.9.10-fix2 # 阿里云
117+
image: ghcr.io/labring/fastgpt:v4.9.11 # git
118+
# image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.9.11 # 阿里云
119119
ports:
120120
- 3000:3000
121121
networks:

‎deploy/docker/docker-compose-zilliz.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,15 +72,15 @@ services:
7272

7373
sandbox:
7474
container_name: sandbox
75-
image: ghcr.io/labring/fastgpt-sandbox:v4.9.10-fix2 # git
76-
# image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.9.10-fix2 # 阿里云
75+
image: ghcr.io/labring/fastgpt-sandbox:v4.9.11 # git
76+
# image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.9.11 # 阿里云
7777
networks:
7878
- fastgpt
7979
restart: always
8080
fastgpt-mcp-server:
8181
container_name: fastgpt-mcp-server
82-
image: ghcr.io/labring/fastgpt-mcp_server:v4.9.10-fix2 # git
83-
# image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-mcp_server:v4.9.10-fix2 # 阿里云
82+
image: ghcr.io/labring/fastgpt-mcp_server:v4.9.11 # git
83+
# image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-mcp_server:v4.9.11 # 阿里云
8484
ports:
8585
- 3005:3000
8686
networks:
@@ -90,8 +90,8 @@ services:
9090
- FASTGPT_ENDPOINT=http://fastgpt:3000
9191
fastgpt:
9292
container_name: fastgpt
93-
image: ghcr.io/labring/fastgpt:v4.9.10-fix2 # git
94-
# image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.9.10-fix2 # 阿里云
93+
image: ghcr.io/labring/fastgpt:v4.9.11 # git
94+
# image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.9.11 # 阿里云
9595
ports:
9696
- 3000:3000
9797
networks:

‎docSite/content/zh-cn/docs/development/upgrading/4911.md

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,23 @@
11
---
2-
title: 'V4.9.11(进行中)'
2+
title: 'V4.9.11(包含升级脚本)'
33
description: 'FastGPT V4.9.11 更新说明'
44
icon: 'upgrade'
55
draft: false
66
toc: true
77
weight: 789
88
---
99

10-
## 执行升级脚本
10+
## 更新指南
11+
12+
### 1. 更新镜像：
13+
14+
- 更新 FastGPT 镜像 tag: v4.9.11
15+
- 更新 FastGPT 商业版镜像 tag: v4.9.11
16+
- mcp_server 无需更新
17+
- 更新 Sandbox 镜像 tag: v4.9.11
18+
- AIProxy 无需更新
19+
20+
### 2. 执行升级脚本
1121

1222
该脚本仅需商业版用户执行。
1323

@@ -30,10 +40,12 @@ curl --location --request POST 'https://{{host}}/api/admin/initv4911' \
3040
3. 工作流中，子流程版本控制，可选择“保持最新版本”，无需手动更新。
3141
4. 增加更多审计操作日志。
3242
5. 知识库增加文档解析异步队列，导入文档时，无需等待文档解析完毕才进行导入。
43+
6. 第三方知识库开发文档, [点击查看](/docs/guide/knowledge_base/third_dataset/)
3344

3445
## ⚙️ 优化
3546

3647
1. 原文缓存改用 gridfs 存储，提高上限。
48+
2. 增加知识库模板导入选项。
3749

3850
## 🐛 修复
3951

@@ -42,4 +54,5 @@ curl --location --request POST 'https://{{host}}/api/admin/initv4911' \
4254
3. 修复备份导入，小于 1000 字时，无法分块问题。
4355
4. 自定义 PDF 解析，无法保存 base64 图片。
4456
5. 非流请求，未进行 CITE 标记替换。
45-
6. Python 沙盒存在隐藏风险。
57+
6. Python 沙盒存在隐藏风险。
58+
7. curl 导入插件缺失确认按键

‎projects/app/src/pageComponents/app/detail/Workflow/components/SaveButton.tsx

Lines changed: 81 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -32,82 +32,90 @@ const SaveButton = ({
3232
} = useDisclosure();
3333

3434
return (
35-
<MyPopover
36-
placement={'bottom-end'}
37-
hasArrow={false}
38-
offset={[2, 4]}
39-
w={'116px'}
40-
onOpenFunc={() => setIsSave(true)}
41-
onCloseFunc={() => setIsSave(false)}
42-
trigger={'hover'}
43-
Trigger={
44-
<Button
45-
size={'sm'}
46-
flexShrink={0}
47-
rightIcon={
48-
<MyIcon
49-
name={isSave ? 'core/chat/chevronUp' : 'core/chat/chevronDown'}
50-
w={['14px', '16px']}
51-
/>
52-
}
53-
>
54-
<Box>{t('common:Save')}</Box>
55-
</Button>
56-
}
35+
<Box
36+
flexShrink={0}
37+
sx={{
38+
section: {
39+
width: 'auto'
40+
}
41+
}}
5742
>
58-
{({ onClose }) => (
59-
<Box p={1.5}>
60-
<MyBox
61-
display={'flex'}
62-
alignItems={'center'}
63-
gap={2}
64-
p={1.5}
65-
rounded={'4px'}
66-
_hover={{ color: 'primary.600', bg: 'rgba(17, 24, 36, 0.05)' }}
67-
cursor={'pointer'}
68-
isLoading={isLoading}
69-
onClick={async () => {
70-
await onClickSave({});
71-
toast({
72-
status: 'success',
73-
title: t('app:saved_success'),
74-
position: 'top-right',
75-
isClosable: true
76-
});
77-
onClose();
78-
setIsSave(false);
79-
}}
80-
>
81-
<MyIcon name={'core/workflow/upload'} w={'1rem'} />
82-
<Box fontSize={'sm'}>{t('common:core.workflow.Save to cloud')}</Box>
83-
</MyBox>
84-
<HStack
85-
p={1.5}
86-
rounded={'4px'}
87-
_hover={{ color: 'primary.600', bg: 'rgba(17, 24, 36, 0.05)' }}
88-
cursor={'pointer'}
89-
onClick={() => {
90-
const canOpen = !checkData || checkData();
91-
if (canOpen) {
92-
onSaveAndPublishModalOpen();
93-
}
94-
onClose();
95-
setIsSave(false);
96-
}}
97-
>
98-
<MyIcon name={'core/workflow/publish'} w={'1rem'} />
99-
<Box fontSize={'sm'}>{t('common:core.workflow.Save and publish')}</Box>
100-
{isSaveAndPublishModalOpen && (
101-
<SaveAndPublishModal
102-
isLoading={isLoading}
103-
onClose={onSaveAndPublishModalClose}
104-
onClickSave={onClickSave}
43+
<MyPopover
44+
placement={'bottom-end'}
45+
hasArrow={false}
46+
offset={[2, 4]}
47+
w={'116px'}
48+
onOpenFunc={() => setIsSave(true)}
49+
onCloseFunc={() => setIsSave(false)}
50+
trigger={'hover'}
51+
Trigger={
52+
<Button
53+
size={'sm'}
54+
rightIcon={
55+
<MyIcon
56+
name={isSave ? 'core/chat/chevronUp' : 'core/chat/chevronDown'}
57+
w={['14px', '16px']}
10558
/>
106-
)}
107-
</HStack>
108-
</Box>
59+
}
60+
>
61+
<Box>{t('common:Save')}</Box>
62+
</Button>
63+
}
64+
>
65+
{({ onClose }) => (
66+
<Box p={1.5}>
67+
<MyBox
68+
display={'flex'}
69+
alignItems={'center'}
70+
gap={2}
71+
p={1.5}
72+
rounded={'4px'}
73+
_hover={{ color: 'primary.600', bg: 'rgba(17, 24, 36, 0.05)' }}
74+
cursor={'pointer'}
75+
isLoading={isLoading}
76+
onClick={async () => {
77+
await onClickSave({});
78+
toast({
79+
status: 'success',
80+
title: t('app:saved_success'),
81+
position: 'top-right',
82+
isClosable: true
83+
});
84+
onClose();
85+
setIsSave(false);
86+
}}
87+
>
88+
<MyIcon name={'core/workflow/upload'} w={'1rem'} />
89+
<Box fontSize={'sm'}>{t('common:core.workflow.Save to cloud')}</Box>
90+
</MyBox>
91+
<HStack
92+
p={1.5}
93+
rounded={'4px'}
94+
_hover={{ color: 'primary.600', bg: 'rgba(17, 24, 36, 0.05)' }}
95+
cursor={'pointer'}
96+
onClick={() => {
97+
const canOpen = !checkData || checkData();
98+
if (canOpen) {
99+
onSaveAndPublishModalOpen();
100+
}
101+
onClose();
102+
setIsSave(false);
103+
}}
104+
>
105+
<MyIcon name={'core/workflow/publish'} w={'1rem'} />
106+
<Box fontSize={'sm'}>{t('common:core.workflow.Save and publish')}</Box>
107+
</HStack>
108+
</Box>
109+
)}
110+
</MyPopover>
111+
{isSaveAndPublishModalOpen && (
112+
<SaveAndPublishModal
113+
isLoading={isLoading}
114+
onClose={onSaveAndPublishModalClose}
115+
onClickSave={onClickSave}
116+
/>
109117
)}
110-
</MyPopover>
118+
</Box>
111119
);
112120
};
113121

‎projects/app/src/web/styles/chakraui.scss

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,3 @@ body select {
66
.chakra-tooltip {
77
font-size: var(--chakra-fontSizes-xs) !important;
88
}
9-
10-
.chakra-popover__popper > section {
11-
width: auto !important;
12-
}

0 commit comments

Comments
 (0)