Commit 240f60c0 by Fengrui Liu Committed by GitHub

Fixes: fix edge handler with onDelEdge (#1471)

* fixes: Fix edge handler

* fixes: fix edge handler with onDelEdge

* fixes: fix edge handler with onDelEdge
parent 8d2230f2
...@@ -36,6 +36,7 @@ import { createContext } from 'use-context-selector'; ...@@ -36,6 +36,7 @@ import { createContext } from 'use-context-selector';
import { defaultRunningStatus } from './constants'; import { defaultRunningStatus } from './constants';
import { checkNodeRunStatus } from '@fastgpt/global/core/workflow/runtime/utils'; import { checkNodeRunStatus } from '@fastgpt/global/core/workflow/runtime/utils';
import { EventNameEnum, eventBus } from '@/web/common/utils/eventbus'; import { EventNameEnum, eventBus } from '@/web/common/utils/eventbus';
import { getHandleId } from '@fastgpt/global/core/workflow/utils';
type OnChange<ChangesType> = (changes: ChangesType[]) => void; type OnChange<ChangesType> = (changes: ChangesType[]) => void;
...@@ -321,7 +322,7 @@ const WorkflowContextProvider = ({ ...@@ -321,7 +322,7 @@ const WorkflowContextProvider = ({
item.key === props.key ? props.value : item item.key === props.key ? props.value : item
); );
} else if (type === 'replaceInput') { } else if (type === 'replaceInput') {
onDelEdge({ nodeId, targetHandle: props.key }); onDelEdge({ nodeId, targetHandle: getHandleId(nodeId, 'target', props.key) });
const oldInputIndex = node.data.inputs.findIndex((item) => item.key === props.key); const oldInputIndex = node.data.inputs.findIndex((item) => item.key === props.key);
updateObj.inputs = node.data.inputs.filter((item) => item.key !== props.key); updateObj.inputs = node.data.inputs.filter((item) => item.key !== props.key);
setTimeout(() => { setTimeout(() => {
...@@ -350,14 +351,14 @@ const WorkflowContextProvider = ({ ...@@ -350,14 +351,14 @@ const WorkflowContextProvider = ({
} }
} }
} else if (type === 'delInput') { } else if (type === 'delInput') {
onDelEdge({ nodeId, targetHandle: props.key }); onDelEdge({ nodeId, targetHandle: getHandleId(nodeId, 'target', props.key) });
updateObj.inputs = node.data.inputs.filter((item) => item.key !== props.key); updateObj.inputs = node.data.inputs.filter((item) => item.key !== props.key);
} else if (type === 'updateOutput') { } else if (type === 'updateOutput') {
updateObj.outputs = node.data.outputs.map((item) => updateObj.outputs = node.data.outputs.map((item) =>
item.key === props.key ? props.value : item item.key === props.key ? props.value : item
); );
} else if (type === 'replaceOutput') { } else if (type === 'replaceOutput') {
onDelEdge({ nodeId, sourceHandle: props.key }); onDelEdge({ nodeId, sourceHandle: getHandleId(nodeId, 'source', props.key) });
const oldOutputIndex = node.data.outputs.findIndex((item) => item.key === props.key); const oldOutputIndex = node.data.outputs.findIndex((item) => item.key === props.key);
updateObj.outputs = node.data.outputs.filter((item) => item.key !== props.key); updateObj.outputs = node.data.outputs.filter((item) => item.key !== props.key);
console.log(props.value); console.log(props.value);
...@@ -387,7 +388,7 @@ const WorkflowContextProvider = ({ ...@@ -387,7 +388,7 @@ const WorkflowContextProvider = ({
} }
} }
} else if (type === 'delOutput') { } else if (type === 'delOutput') {
onDelEdge({ nodeId, sourceHandle: props.key }); onDelEdge({ nodeId, sourceHandle: getHandleId(nodeId, 'source', props.key) });
updateObj.outputs = node.data.outputs.filter((item) => item.key !== props.key); updateObj.outputs = node.data.outputs.filter((item) => item.key !== props.key);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment