youngkingdom/dify
1
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-05-05 01:48:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'zhsama/assemble-var-input' into feat/pull-a-variable

Browse Source
This commit is contained in:
zhsama
2026-01-16 17:04:18 +08:00
parent 18abc66585 1bc1c04be5
commit 40caaaab23
7 changed files with 54 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
web/app/components/workflow/nodes/_base/components/variable/var-reference-vars.tsx
View File

@ -10,6 +10,7 @@ import { useEffect, useMemo, useRef, useState } from 'react'
import { useTranslation } from 'react-i18next'
import { ChevronRight } from '@/app/components/base/icons/src/vender/line/arrows'
import { CodeAssistant, MagicEdit } from '@/app/components/base/icons/src/vender/line/general'
import { MagicWand } from '@/app/components/base/icons/src/vender/solid/mediaAndDevices'
import { Variable02 } from '@/app/components/base/icons/src/vender/solid/development'
import Input from '@/app/components/base/input'
import {
@ -255,6 +256,8 @@ type Props = {
isInCodeGeneratorInstructionEditor?: boolean
showManageInputField?: boolean
onManageInputField?: () => void
showAssembleVariables?: boolean
onAssembleVariables?: () => void
autoFocus?: boolean
preferSchemaType?: boolean
}
@ -272,6 +275,8 @@ const VarReferenceVars: FC<Props> = ({
isInCodeGeneratorInstructionEditor,
showManageInputField,
onManageInputField,
showAssembleVariables,
onAssembleVariables,
autoFocus = true,
preferSchemaType,
}) => {
@ -285,6 +290,13 @@ const VarReferenceVars: FC<Props> = ({
}
}
const handleAssembleVariables = (e: React.MouseEvent) => {
e.preventDefault()
e.stopPropagation()
onAssembleVariables?.()
onClose?.()
}
const filteredVars = vars.filter((v) => {
const children = v.vars.filter(v => checkKeys([v.variable], false).isValid || isSpecialVar(v.variable.split('.')[0]))
return children.length > 0
@ -393,6 +405,25 @@ const VarReferenceVars: FC<Props> = ({
/>
)
}
{
showAssembleVariables && (
<div className="flex items-center border-t border-divider-subtle pt-1">
<button
type="button"
className="flex h-8 w-full items-center px-3 text-text-tertiary hover:text-text-secondary"
onClick={handleAssembleVariables}
onMouseDown={e => e.preventDefault()}
>
<span className="mr-1 flex h-4 w-4 items-center justify-center rounded bg-util-colors-indigo-indigo-500/10">
<MagicWand className="h-3.5 w-3.5 text-util-colors-indigo-indigo-500" />
</span>
<span className="system-xs-medium truncate" title={t('nodes.tool.assembleVariables', { ns: 'workflow' })}>
{t('nodes.tool.assembleVariables', { ns: 'workflow' })}
</span>
</button>
</div>
)
}
</>
)
}