From 222d4112d7d72bcda5ab0947ede9cde11759061e Mon Sep 17 00:00:00 2001 From: heheer Date: Thu, 26 Sep 2024 18:04:43 +0800 Subject: [PATCH] fix: tool node fold (#2811) * fix: tool node fold * delete console --- .../Flow/nodes/NodeTools.tsx | 2 - .../Flow/nodes/render/NodeCard.tsx | 71 +++++++++++-------- 2 files changed, 42 insertions(+), 31 deletions(-) diff --git a/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/NodeTools.tsx b/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/NodeTools.tsx index 6e71d3498..46a479665 100644 --- a/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/NodeTools.tsx +++ b/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/NodeTools.tsx @@ -34,8 +34,6 @@ const NodeTools = ({ data, selected }: NodeProps) => { text={t('common:core.workflow.tool.Select Tool')} /> - - ); diff --git a/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/render/NodeCard.tsx b/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/render/NodeCard.tsx index 1f185eefd..2f23788d1 100644 --- a/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/render/NodeCard.tsx +++ b/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/render/NodeCard.tsx @@ -9,7 +9,7 @@ import { useToast } from '@fastgpt/web/hooks/useToast'; import { FlowNodeTypeEnum } from '@fastgpt/global/core/workflow/node/constant'; import { useConfirm } from '@fastgpt/web/hooks/useConfirm'; import { LOGO_ICON } from '@fastgpt/global/common/system/constants'; -import { ToolTargetHandle } from './Handle/ToolHandle'; +import { ToolSourceHandle, ToolTargetHandle } from './Handle/ToolHandle'; import { useEditTextarea } from '@fastgpt/web/hooks/useEditTextarea'; import { ConnectionSourceHandle, ConnectionTargetHandle } from './Handle/ConnectionHandle'; import { useDebug } from '../../hooks/useDebug'; @@ -165,31 +165,38 @@ const NodeCard = (props: Props) => { {/* avatar and name */} - { - onChangeNode({ - nodeId, - type: 'attr', - key: 'isFolded', - value: !isFolded - }); - }} - > - {!isFolded ? ( - - ) : ( - - )} - + {node?.flowNodeType !== FlowNodeTypeEnum.stopTool && ( + { + onChangeNode({ + nodeId, + type: 'attr', + key: 'isFolded', + value: !isFolded + }); + }} + > + {!isFolded ? ( + + ) : ( + + )} + + )} {t(name as any)} @@ -272,6 +279,8 @@ const NodeCard = (props: Props) => { }, [ showToolHandle, nodeId, + node?.flowNodeType, + isFolded, avatar, t, name, @@ -283,10 +292,9 @@ const NodeCard = (props: Props) => { nodeList, intro, ConfirmSyncModal, - onOpenCustomTitleModal, onChangeNode, - toast, - isFolded + onOpenCustomTitleModal, + toast ]); const RenderHandle = useMemo(() => { return ( @@ -296,6 +304,10 @@ const NodeCard = (props: Props) => { ); }, [nodeId, isFolded]); + const RenderToolHandle = useMemo( + () => (node?.flowNodeType === FlowNodeTypeEnum.tools ? : null), + [node?.flowNodeType] + ); return ( { {Header} {!isFolded && children} {RenderHandle} + {RenderToolHandle}