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

fix: if else node (#1383)

Browse Source 
* fix: if else node

* fix

* fix
This commit is contained in:
heheer
2024-05-07 17:16:33 +08:00
committed by GitHub
parent 8f9203c053
commit 2a99e46353
6 changed files with 81 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
projects/app/src/components/core/workflow/Flow/nodes/NodeIfElse/ListItem.tsx
View File

@@ -21,7 +21,7 @@ import React, { useMemo } from 'react';
import { WorkflowContext } from '../../../context';
import MySelect from '@fastgpt/web/components/common/MySelect';
import MyInput from '@/components/MyInput';
import { getHandleId } from '@fastgpt/global/core/workflow/utils';
import { getElseIFLabel, getHandleId } from '@fastgpt/global/core/workflow/utils';
import { SourceHandle } from '../render/Handle';
import { Position, useReactFlow } from 'reactflow';
import { getReferenceDataValueType } from '@/web/core/workflow/utils';
@@ -63,36 +63,40 @@ const ListItem = ({
>
<Container w={snapshot.isDragging ? '' : 'full'} className="nodrag">
<Flex mb={4} alignItems={'center'}>
<Box {...provided.dragHandleProps}>
<DragHandleIcon color={'blackAlpha.600'} />
</Box>
{ifElseList.length > 1 && (
<Box {...provided.dragHandleProps}>
<DragHandleIcon color={'blackAlpha.600'} />
</Box>
)}
<Box color={'black'} fontSize={'lg'} ml={2}>
{conditionIndex === 0 ? 'IF' : 'ELSE IF'}
{getElseIFLabel(conditionIndex)}
</Box>
<Flex
px={'2.5'}
color={'primary.600'}
fontWeight={'medium'}
alignItems={'center'}
cursor={'pointer'}
rounded={'md'}
onClick={() => {
onUpdateIfElseList(
ifElseList.map((ifElse, index) => {
if (index === conditionIndex) {
return {
...ifElse,
condition: ifElse.condition === 'AND' ? 'OR' : 'AND'
};
}
return ifElse;
})
);
}}
>
{conditionItem.condition}
<MyIcon ml={1} boxSize={5} name="change" />
</Flex>
{conditionItem.list?.length > 1 && (
<Flex
px={'2.5'}
color={'primary.600'}
fontWeight={'medium'}
alignItems={'center'}
cursor={'pointer'}
rounded={'md'}
onClick={() => {
onUpdateIfElseList(
ifElseList.map((ifElse, index) => {
if (index === conditionIndex) {
return {
...ifElse,
condition: ifElse.condition === 'AND' ? 'OR' : 'AND'
};
}
return ifElse;
})
);
}}
>
{conditionItem.condition}
<MyIcon ml={1} boxSize={5} name="change" />
</Flex>
)}
<Box flex={1}></Box>
{ifElseList.length > 1 && (
<MyIcon
@@ -257,7 +261,7 @@ const ListItem = ({
{!snapshot.isDragging && (
<SourceHandle
nodeId={nodeId}
handleId={getHandleId(nodeId, 'source', 'IF' + conditionIndex.toString())}
handleId={getHandleId(nodeId, 'source', getElseIFLabel(conditionIndex))}
position={Position.Right}
translate={[18, 0]}
/>

7
projects/app/src/components/core/workflow/Flow/nodes/NodeIfElse/index.tsx
View File

@@ -13,6 +13,7 @@ import { DragDropContext, DragStart, Draggable, DropResult, Droppable } from 're
import { SourceHandle } from '../render/Handle';
import { getHandleId } from '@fastgpt/global/core/workflow/utils';
import ListItem from './ListItem';
import { IfElseResultEnum } from '@fastgpt/global/core/workflow/template/system/ifElse/constant';
const NodeIfElse = ({ data, selected }: NodeProps<FlowNodeItemType>) => {
const { t } = useTranslation();
@@ -108,7 +109,7 @@ const NodeIfElse = ({ data, selected }: NodeProps<FlowNodeItemType>) => {
)}
</Draggable>
))}
<Box height={draggingItemHeight} />
{snapshot.isDraggingOver && <Box height={draggingItemHeight} />}
</Box>
)}
</Droppable>
@@ -116,11 +117,11 @@ const NodeIfElse = ({ data, selected }: NodeProps<FlowNodeItemType>) => {
<Container position={'relative'}>
<Flex alignItems={'center'}>
<Box color={'black'} fontSize={'lg'} ml={2}>
ELSE
{IfElseResultEnum.ELSE}
</Box>
<SourceHandle
nodeId={nodeId}
handleId={getHandleId(nodeId, 'source', 'ELSE')}
handleId={getHandleId(nodeId, 'source', IfElseResultEnum.ELSE)}
position={Position.Right}
translate={[26, 0]}
/>

25
projects/app/src/web/core/workflow/utils.ts
View File

@@ -25,6 +25,8 @@ import {
import { getSystemVariables } from '../app/utils';
import { TFunction } from 'next-i18next';
import { ReferenceValueProps } from '@fastgpt/global/core/workflow/type/io';
import { IfElseListItemType } from '@fastgpt/global/core/workflow/template/system/ifElse/type';
import { VariableConditionEnum } from '@fastgpt/global/core/workflow/template/system/ifElse/constant';
export const nodeTemplate2FlowNode = ({
template,
@@ -188,6 +190,29 @@ export const checkWorkflowNodeAndConnection = ({
continue;
}
if (data.flowNodeType === FlowNodeTypeEnum.ifElseNode) {
const ifElseList: IfElseListItemType[] = inputs.find(
(input) => input.key === NodeInputKeyEnum.ifElseList
)?.value;
if (
ifElseList.some((item) => {
return item.list.some((listItem) => {
return (
listItem.variable === undefined ||
listItem.condition === undefined ||
(listItem.value === undefined &&
listItem.condition !== VariableConditionEnum.isEmpty &&
listItem.condition !== VariableConditionEnum.isNotEmpty)
);
});
})
) {
return [data.nodeId];
} else {
continue;
}
}
// check node input
if (
inputs.some((input) => {