ChatGPT/FastGPT
1
0
Fork 0
mirror of https://github.com/labring/FastGPT.git synced 2025-07-23 13:03:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: variables check (#2849)

Browse Source 
* fix: variables check

* remove log
This commit is contained in:
Archer
2024-10-01 11:11:19 +08:00
committed by GitHub
parent d4b99ddcab
commit fc6f28f26e
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/global/core/workflow/utils.ts
View File

@@ -298,7 +298,8 @@ export const formatEditorVariablePickerIcon = (
}; };
export const isReferenceValue = (value: any, nodeIds: string[]): boolean => { export const isReferenceValue = (value: any, nodeIds: string[]): boolean => {
return Array.isArray(value) && value.length === 2 && nodeIds.includes(value[0]); const validIdList = [VARIABLE_NODE_ID, ...nodeIds];
return Array.isArray(value) && value.length === 2 && validIdList.includes(value[0]);
}; };
export const getElseIFLabel = (i: number) => { export const getElseIFLabel = (i: number) => {

13
projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/hooks/useWorkflow.tsx
View File

@@ -423,8 +423,8 @@ export const useWorkflow = () => {
} }
// If the node has child nodes, remove the child nodes // If the node has child nodes, remove the child nodes
if (nodes.some((n) => n.data.parentNodeId === node.id)) { const childNodes = nodes.filter((n) => n.data.parentNodeId === node.id);
const childNodes = nodes.filter((n) => n.data.parentNodeId === node.id); if (childNodes.length > 0) {
const childNodeIds = childNodes.map((n) => n.id); const childNodeIds = childNodes.map((n) => n.id);
const childNodesChange = childNodes.map((node) => ({ const childNodesChange = childNodes.map((node) => ({
...change, ...change,
@@ -440,14 +440,14 @@ export const useWorkflow = () => {
!childNodeIds.includes(edge.target) !childNodeIds.includes(edge.target)
) )
); );
return;
} }
setEdges((state) => setEdges((state) =>
state.filter((edge) => edge.source !== change.id && edge.target !== change.id) state.filter((edge) => edge.source !== change.id && edge.target !== change.id)
); );
onNodesChange([change]);
return true; return;
}); });
const handleSelectNode = useMemoizedFn((change: NodeSelectionChange) => { const handleSelectNode = useMemoizedFn((change: NodeSelectionChange) => {
// If the node is not selected and the Ctrl key is pressed, select the node // If the node is not selected and the Ctrl key is pressed, select the node
@@ -517,9 +517,8 @@ export const useWorkflow = () => {
if (change.type === 'remove') { if (change.type === 'remove') {
const node = nodes.find((n) => n.id === change.id); const node = nodes.find((n) => n.id === change.id);
// 如果删除失败，则不继续执行 // 如果删除失败，则不继续执行
if (node && !handleRemoveNode(change, node)) { node && handleRemoveNode(change, node);
return; return;
}
} else if (change.type === 'select') { } else if (change.type === 'select') {
handleSelectNode(change); handleSelectNode(change);
} else if (change.type === 'position') { } else if (change.type === 'position') {