estel/dify
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix(workflow/if-else): keep conditions in sync on variable rename (#23611)

Browse Source 
Co-authored-by: crazywoola <100913391+crazywoola@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: crazywoola <427733928@qq.com>
This commit is contained in:
Rajhans Jadhao
2025-08-14 17:25:18 +05:30
committed by GitHub
parent f40e2cf98a
commit 8d47213529
2 changed files with 34 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
web/app/components/workflow/hooks/use-workflow.ts
View File

@@ -259,11 +259,11 @@ export const useWorkflow = () => {
const handleOutVarRenameChange = useCallback((nodeId: string, oldValeSelector: ValueSelector, newVarSelector: ValueSelector) => { const handleOutVarRenameChange = useCallback((nodeId: string, oldValeSelector: ValueSelector, newVarSelector: ValueSelector) => {
const { getNodes, setNodes } = store.getState() const { getNodes, setNodes } = store.getState()
const afterNodes = getAfterNodesInSameBranch(nodeId) const allNodes = getNodes()
const effectNodes = findUsedVarNodes(oldValeSelector, afterNodes) const affectedNodes = findUsedVarNodes(oldValeSelector, allNodes)
if (effectNodes.length > 0) { if (affectedNodes.length > 0) {
const newNodes = getNodes().map((node) => { const newNodes = allNodes.map((node) => {
if (effectNodes.find(n => n.id === node.id)) if (affectedNodes.find(n => n.id === node.id))
return updateNodeVars(node, oldValeSelector, newVarSelector) return updateNodeVars(node, oldValeSelector, newVarSelector)
return node return node

30
web/app/components/workflow/nodes/_base/components/variable/utils.ts
View File

@@ -1022,7 +1022,15 @@ export const getNodeUsedVars = (node: Node): ValueSelector[] => {
res = (data as IfElseNodeType).conditions?.map((c) => { res = (data as IfElseNodeType).conditions?.map((c) => {
return c.variable_selector || [] return c.variable_selector || []
}) || [] }) || []
res.push(...((data as IfElseNodeType).cases || []).flatMap(c => (c.conditions || [])).map(c => c.variable_selector || [])) res.push(...((data as IfElseNodeType).cases || []).flatMap(c => (c.conditions || [])).flatMap((c) => {
const selectors: ValueSelector[] = []
if (c.variable_selector)
selectors.push(c.variable_selector)
// Handle sub-variable conditions
if (c.sub_variable_condition && c.sub_variable_condition.conditions)
selectors.push(...c.sub_variable_condition.conditions.map(subC => subC.variable_selector || []).filter(sel => sel.length > 0))
return selectors
}))
break break
} }
case BlockEnum.Code: { case BlockEnum.Code: {
@@ -1259,6 +1267,26 @@ export const updateNodeVars = (oldNode: Node, oldVarSelector: ValueSelector, new
return c return c
}) })
} }
if (payload.cases) {
payload.cases = payload.cases.map((caseItem) => {
if (caseItem.conditions) {
caseItem.conditions = caseItem.conditions.map((c) => {
if (c.variable_selector?.join('.') === oldVarSelector.join('.'))
c.variable_selector = newVarSelector
// Handle sub-variable conditions
if (c.sub_variable_condition && c.sub_variable_condition.conditions) {
c.sub_variable_condition.conditions = c.sub_variable_condition.conditions.map((subC) => {
if (subC.variable_selector?.join('.') === oldVarSelector.join('.'))
subC.variable_selector = newVarSelector
return subC
})
}
return c
})
}
return caseItem
})
}
break break
} }
case BlockEnum.Code: { case BlockEnum.Code: {