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

Merge remote-tracking branch 'origin/feat/support-agent-sandbox' into pre-align-hitl-frontend

Browse Source
This commit is contained in:
yyh
2026-02-06 19:15:13 +08:00
parent 16513a340c c5439a3739
commit 39146f7b20
8 changed files with 50 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
web/app/components/base/prompt-editor/index.tsx
View File

@ -20,6 +20,7 @@ import type {
VariableBlockType,
WorkflowVariableBlockType,
} from './types'
import type { EventPayload } from '@/context/event-emitter'
import { CodeNode } from '@lexical/code'
import { LexicalComposer } from '@lexical/react/LexicalComposer'
import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext'
@ -51,17 +52,18 @@ import { ToolBlockContextProvider } from '@/app/components/workflow/skill/editor
import ToolPickerBlock from '@/app/components/workflow/skill/editor/skill-editor/plugins/tool-block/tool-picker-block'
import { useEventEmitterContextContext } from '@/context/event-emitter'
import { cn } from '@/utils/classnames'
import { useWorkflow } from '../../workflow/hooks'
import {
UPDATE_DATASETS_EVENT_EMITTER,
UPDATE_HISTORY_EVENT_EMITTER,
} from './constants'
import ComponentPickerBlock from './plugins/component-picker-block'
import {
ContextBlock,
ContextBlockNode,
ContextBlockReplacementBlock,
} from './plugins/context-block'
import {
CurrentBlock,
CurrentBlockNode,
@ -169,6 +171,7 @@ const EnterCommandPlugin: FC<{ onEnter?: (event: KeyboardEvent) => void }> = ({
export type PromptEditorProps = {
instanceId?: string
nodeId?: string
compact?: boolean
wrapperClassName?: string
className?: string
@ -203,6 +206,7 @@ export type PromptEditorProps = {
const PromptEditor: FC<PromptEditorProps> = ({
instanceId,
nodeId,
compact,
wrapperClassName,
className,
@ -275,15 +279,21 @@ const PromptEditor: FC<PromptEditorProps> = ({
eventEmitter?.emit({
type: UPDATE_DATASETS_EVENT_EMITTER,
payload: contextBlock?.datasets,
} as any)
} as EventPayload)
}, [eventEmitter, contextBlock?.datasets])
useEffect(() => {
eventEmitter?.emit({
type: UPDATE_HISTORY_EVENT_EMITTER,
payload: historyBlock?.history,
} as any)
} as EventPayload)
}, [eventEmitter, historyBlock?.history])
const { getBeforeNodesInSameBranch } = useWorkflow()
const availableNodes = React.useMemo(
() => nodeId && isSupportSandbox ? getBeforeNodesInSameBranch(nodeId || '') : [],
[getBeforeNodesInSameBranch, isSupportSandbox, nodeId],
)
const toolBlockContextValue = React.useMemo(() => {
if (!onToolMetadataChange)
return null
@ -291,8 +301,11 @@ const PromptEditor: FC<PromptEditorProps> = ({
metadata: toolMetadata,
onMetadataChange: onToolMetadataChange,
useModal: true,
nodeId,
nodesOutputVars: workflowVariableBlock?.variables,
availableNodes,
}
}, [onToolMetadataChange, toolMetadata])
}, [availableNodes, nodeId, onToolMetadataChange, toolMetadata, workflowVariableBlock?.variables])
const sandboxPlaceHolder = React.useMemo(() => {
if (!isSupportSandbox)