AI/dify
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/langgenius/dify.git synced 2025-08-12 08:38:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: delete end node (#4372)

Browse Source
This commit is contained in:
zxhlyh 2024-05-14 15:51:08 +08:00 committed by GitHub
parent 08e4103fa1
commit 6f1633fa75
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 64 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
web/app/components/workflow/hooks/use-nodes-interactions.ts
View File

@ -488,12 +488,22 @@ export const useNodesInteractions = () => {
_connectedNodeIsSelected: true, _connectedNodeIsSelected: true,
}, },
} }
const nodesConnectedSourceOrTargetHandleIdsMap = getNodesConnectedSourceOrTargetHandleIdsMap(
[
{ type: 'add', edge: newEdge },
],
nodes,
)
const newNodes = produce(nodes, (draft: Node[]) => { const newNodes = produce(nodes, (draft: Node[]) => {
draft.forEach((node) => { draft.forEach((node) => {
node.data.selected = false node.data.selected = false
if (node.id === prevNode.id) if (nodesConnectedSourceOrTargetHandleIdsMap[node.id]) {
node.data._connectedSourceHandleIds?.push(prevNodeSourceHandle!) node.data = {
...node.data,
...nodesConnectedSourceOrTargetHandleIdsMap[node.id],
}
}
}) })
draft.push(newNode) draft.push(newNode)
}) })
@ -512,26 +522,42 @@ export const useNodesInteractions = () => {
if (!prevNodeId && nextNodeId) { if (!prevNodeId && nextNodeId) {
const nextNodeIndex = nodes.findIndex(node => node.id === nextNodeId) const nextNodeIndex = nodes.findIndex(node => node.id === nextNodeId)
const nextNode = nodes[nextNodeIndex]! const nextNode = nodes[nextNodeIndex]!
newNode.data._connectedSourceHandleIds = [sourceHandle] if ((nodeType !== BlockEnum.IfElse) && (nodeType !== BlockEnum.QuestionClassifier))
newNode.data._connectedSourceHandleIds = [sourceHandle]
newNode.data._connectedTargetHandleIds = [] newNode.data._connectedTargetHandleIds = []
newNode.position = { newNode.position = {
x: nextNode.position.x, x: nextNode.position.x,
y: nextNode.position.y, y: nextNode.position.y,
} }
const newEdge = { let newEdge
id: `${newNode.id}-${nextNodeId}`,
type: 'custom', if ((nodeType !== BlockEnum.IfElse) && (nodeType !== BlockEnum.QuestionClassifier)) {
source: newNode.id, newEdge = {
sourceHandle, id: `${newNode.id}-${nextNodeId}`,
target: nextNodeId, type: 'custom',
targetHandle: nextNodeTargetHandle, source: newNode.id,
data: { sourceHandle,
sourceType: newNode.data.type, target: nextNodeId,
targetType: nextNode.data.type, targetHandle: nextNodeTargetHandle,
_connectedNodeIsSelected: true, data: {
}, sourceType: newNode.data.type,
targetType: nextNode.data.type,
_connectedNodeIsSelected: true,
},
}
} }
let nodesConnectedSourceOrTargetHandleIdsMap: Record<string, any>
if (newEdge) {
nodesConnectedSourceOrTargetHandleIdsMap = getNodesConnectedSourceOrTargetHandleIdsMap(
[
{ type: 'add', edge: newEdge },
],
nodes,
)
}
const afterNodesInSameBranch = getAfterNodesInSameBranch(nextNodeId!) const afterNodesInSameBranch = getAfterNodesInSameBranch(nextNodeId!)
const afterNodesInSameBranchIds = afterNodesInSameBranch.map(node => node.id) const afterNodesInSameBranchIds = afterNodesInSameBranch.map(node => node.id)
const newNodes = produce(nodes, (draft) => { const newNodes = produce(nodes, (draft) => {
@ -541,22 +567,28 @@ export const useNodesInteractions = () => {
if (afterNodesInSameBranchIds.includes(node.id)) if (afterNodesInSameBranchIds.includes(node.id))
node.position.x += NODE_WIDTH_X_OFFSET node.position.x += NODE_WIDTH_X_OFFSET
if (node.id === nextNodeId) if (nodesConnectedSourceOrTargetHandleIdsMap?.[node.id]) {
node.data._connectedTargetHandleIds?.push(nextNodeTargetHandle!) node.data = {
...node.data,
...nodesConnectedSourceOrTargetHandleIdsMap[node.id],
}
}
}) })
draft.push(newNode) draft.push(newNode)
}) })
setNodes(newNodes) setNodes(newNodes)
const newEdges = produce(edges, (draft) => { if (newEdge) {
draft.forEach((item) => { const newEdges = produce(edges, (draft) => {
item.data = { draft.forEach((item) => {
...item.data, item.data = {
_connectedNodeIsSelected: false, ...item.data,
} _connectedNodeIsSelected: false,
}
})
draft.push(newEdge)
}) })
draft.push(newEdge) setEdges(newEdges)
}) }
setEdges(newEdges)
} }
if (prevNodeId && nextNodeId) { if (prevNodeId && nextNodeId) {
const prevNode = nodes.find(node => node.id === prevNodeId)! const prevNode = nodes.find(node => node.id === prevNodeId)!
@ -771,14 +803,14 @@ export const useNodesInteractions = () => {
} = store.getState() } = store.getState()
const nodes = getNodes() const nodes = getNodes()
const bundledNodes = nodes.filter(node => node.data._isBundled && node.data.type !== BlockEnum.Start && node.data.type !== BlockEnum.End) const bundledNodes = nodes.filter(node => node.data._isBundled && node.data.type !== BlockEnum.Start)
if (bundledNodes.length) { if (bundledNodes.length) {
setClipboardElements(bundledNodes) setClipboardElements(bundledNodes)
return return
} }
const selectedNode = nodes.find(node => node.data.selected && node.data.type !== BlockEnum.Start && node.data.type !== BlockEnum.End) const selectedNode = nodes.find(node => node.data.selected && node.data.type !== BlockEnum.Start)
if (selectedNode) if (selectedNode)
setClipboardElements([selectedNode]) setClipboardElements([selectedNode])
@ -850,7 +882,7 @@ export const useNodesInteractions = () => {
} = store.getState() } = store.getState()
const nodes = getNodes() const nodes = getNodes()
const selectedNode = nodes.find(node => node.data.selected && node.data.type !== BlockEnum.Start && node.data.type !== BlockEnum.End) const selectedNode = nodes.find(node => node.data.selected && node.data.type !== BlockEnum.Start)
if (selectedNode) { if (selectedNode) {
const nodeType = selectedNode.data.type const nodeType = selectedNode.data.type

2
web/app/components/workflow/nodes/_base/components/panel-operator/panel-operator-popup.tsx
View File

@ -108,7 +108,7 @@ const PanelOperatorPopup = ({
) )
} }
{ {
data.type !== BlockEnum.Start && data.type !== BlockEnum.End && !nodesReadOnly && ( data.type !== BlockEnum.Start && !nodesReadOnly && (
<> <>
<div className='p-1'> <div className='p-1'>
<div <div

4
web/app/components/workflow/utils.ts
View File

@ -148,14 +148,14 @@ export const initialEdges = (originEdges: Edge[], originNodes: Node[]) => {
if (!edge.targetHandle) if (!edge.targetHandle)
edge.targetHandle = 'target' edge.targetHandle = 'target'
if (!edge.data?.sourceType && edge.source) { if (!edge.data?.sourceType && edge.source && nodesMap[edge.source]) {
edge.data = { edge.data = {
...edge.data, ...edge.data,
sourceType: nodesMap[edge.source].data.type!, sourceType: nodesMap[edge.source].data.type!,
} as any } as any
} }
if (!edge.data?.targetType && edge.target) { if (!edge.data?.targetType && edge.target && nodesMap[edge.target]) {
edge.data = { edge.data = {
...edge.data, ...edge.data,
targetType: nodesMap[edge.target].data.type!, targetType: nodesMap[edge.target].data.type!,