diff --git a/service-web/client/src/components/flow/component/AddNodeButton.tsx b/service-web/client/src/components/flow/component/AddNodeButton.tsx index fc27538..d3e0e47 100644 --- a/service-web/client/src/components/flow/component/AddNodeButton.tsx +++ b/service-web/client/src/components/flow/component/AddNodeButton.tsx @@ -9,7 +9,7 @@ import {useFlowStore} from '../store/FlowStore.ts' import type {ButtonProps} from 'antd/lib' export type AddNodeButtonProps = { - parentId?: string + parent?: string } & ButtonProps const AddNodeButton = (props: AddNodeButtonProps) => { @@ -25,7 +25,7 @@ const AddNodeButton = (props: AddNodeButtonProps) => { children: NodeRegistry .filter(i => isEqual(group, i.group)) // 循环节点里不能再嵌套循环节点 - .filter(i => !props.parentId || (props.parentId && !isEqual(i.key, 'loop-node'))) + .filter(i => !props.parent || (props.parent && !isEqual(i.key, 'loop-node'))) .map(i => ({key: i.key, label: i.name, icon: i.icon})), })), onClick: ({key}) => { @@ -51,11 +51,11 @@ const AddNodeButton = (props: AddNodeButtonProps) => { addNode({ id: nodeId, type: key, - position: {x: 100, y: 130}, + position: {x: 50, y: 130}, data: {}, // 如果是循环节点就将节点加入到循环节点中 - ...(props.parentId ? { - parentId: props.parentId, + ...(props.parent ? { + parentId: props.parent, extent: 'parent', } : {}) }) diff --git a/service-web/client/src/components/flow/node/LoopNode.tsx b/service-web/client/src/components/flow/node/LoopNode.tsx index 1611b95..7992236 100644 --- a/service-web/client/src/components/flow/node/LoopNode.tsx +++ b/service-web/client/src/components/flow/node/LoopNode.tsx @@ -11,16 +11,11 @@ const LoopNode = (props: NodeProps) => { className={classnames('w-full', 'h-full', nodeClassName('loop'))} style={{ minWidth: '350px', - minHeight: '200px' + minHeight: '290px' }} nodeProps={props} extraNodeDescription={ -
+
{ color={flowDotColor} bgColor={flowBackgroundColor} /> - +
} handler={}