Skip to content

Commit 80dcae8

Browse files
committed
Merge remote-tracking branch 'origin/feat/2.3.0-beta2'
2 parents 7c68c11 + cab1558 commit 80dcae8

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

src/frontend/platform/src/pages/BuildPage/bench/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@ const useChatConfig = (refs: UseChatConfigProps, parentFormData, parentSetFormDa
510510
getWorkstationConfigApi().then((res) => {
511511
if (res) {
512512
// 确保 systemPrompt 有值
513-
const defaultSystemPrompt = t('chatConfig.webSearchPrompt')
513+
const defaultSystemPrompt = t('chatConfig.systemPrompt2')
514514
const systemPrompt = res.systemPrompt || defaultSystemPrompt;
515515

516516
setFormData((prev) => {

src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/SelectVar.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,10 @@ const SelectVar = forwardRef(({
104104
// 过滤不相同tab
105105
if (item.tab && param.tab && item.tab !== param.tab) return
106106
// 过滤当前节点的output变量
107-
if (nodeId === item.id &&( param.key.indexOf('output') === 0 || param.key.indexOf('retrieved') === 0)) return
107+
if (nodeId === item.id && (
108+
param.key.indexOf('output') === 0 ||
109+
(param.key.indexOf('retrieved') === 0 && param.global.split('=')[0] !== 'self')
110+
)) return
108111
// 不能选自己(相同变量名视为self) param.key
109112
if (nodeId === item.id && param.key === itemKey) return
110113
if (!param.global) return

0 commit comments

Comments
 (0)