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

fix: Fix variable availability resolution for child nodes in workflow

Browse Source
This commit is contained in:
zhsama
2026-02-05 15:20:48 +08:00
parent b60f9c7703
commit 8235ad9e62
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
web/app/components/workflow/hooks/use-nodes-available-var-list.ts
View File

@ -31,6 +31,13 @@ const mergeAvailableNodes = (baseNodes: Node[], extraNodes: Node[]) => {
return Array.from(merged.values())
}
const resolveAvailabilityNodeId = (node: Node, nodes: Node[]) => {
const parentNodeId = (node.data as { parent_node_id?: string })?.parent_node_id
if (parentNodeId && nodes.some(n => n.id === parentNodeId))
return parentNodeId
return node.id
}
const getNodeInfo = (nodeId: string, nodes: Node[]) => {
const allNodes = nodes
const node = allNodes.find(n => n.id === nodeId)
@ -66,7 +73,8 @@ const useNodesAvailableVarList = (nodes: Node[], {
nodes.forEach((node) => {
const nodeId = node.id
const baseAvailableNodes = passedInAvailableNodes || (onlyLeafNodeVar ? getTreeLeafNodes(nodeId) : getBeforeNodesInSameBranchIncludeParent(nodeId))
const availabilityNodeId = resolveAvailabilityNodeId(node, nodes)
const baseAvailableNodes = passedInAvailableNodes || (onlyLeafNodeVar ? getTreeLeafNodes(availabilityNodeId) : getBeforeNodesInSameBranchIncludeParent(availabilityNodeId))
const availableNodes = mergeAvailableNodes(baseAvailableNodes, parentAvailableNodes)
if (node.data.type === BlockEnum.Loop)
availableNodes.push(node)
@ -112,7 +120,8 @@ export const useGetNodesAvailableVarList = () => {
nodes.forEach((node) => {
const nodeId = node.id
const baseAvailableNodes = passedInAvailableNodes || (onlyLeafNodeVar ? getTreeLeafNodes(nodeId) : getBeforeNodesInSameBranchIncludeParent(nodeId))
const availabilityNodeId = resolveAvailabilityNodeId(node, nodes)
const baseAvailableNodes = passedInAvailableNodes || (onlyLeafNodeVar ? getTreeLeafNodes(availabilityNodeId) : getBeforeNodesInSameBranchIncludeParent(availabilityNodeId))
const availableNodes = mergeAvailableNodes(baseAvailableNodes, parentAvailableNodes)
if (node.data.type === BlockEnum.Loop)
availableNodes.push(node)