fix(web): workflow node ports bugfix
This commit is contained in:
@@ -1,8 +1,8 @@
|
|||||||
/*
|
/*
|
||||||
* @Author: ZhaoYing
|
* @Author: ZhaoYing
|
||||||
* @Date: 2026-02-09 18:30:28
|
* @Date: 2026-02-09 18:30:28
|
||||||
* @Last Modified by: ZhaoYing
|
* @Last Modified by: ZhaoYing
|
||||||
* @Last Modified time: 2026-02-09 18:30:28
|
* @Last Modified time: 2026-03-18 12:06:27
|
||||||
*/
|
*/
|
||||||
import { useEffect, useState } from 'react';
|
import { useEffect, useState } from 'react';
|
||||||
import { Popover } from 'antd';
|
import { Popover } from 'antd';
|
||||||
@@ -70,7 +70,6 @@ const PortClickHandler: React.FC<PortClickHandlerProps> = ({ graph }) => {
|
|||||||
// Get source port group information
|
// Get source port group information
|
||||||
const sourcePortInfo = sourceNode.getPorts().find((p: any) => p.id === sourcePort);
|
const sourcePortInfo = sourceNode.getPorts().find((p: any) => p.id === sourcePort);
|
||||||
const sourcePortGroup = sourcePortInfo?.group || sourcePort;
|
const sourcePortGroup = sourcePortInfo?.group || sourcePort;
|
||||||
console.log('sourcePortGroup', sourcePortGroup, sourcePortInfo)
|
|
||||||
|
|
||||||
// If add-node position exists, use it; otherwise calculate new position
|
// If add-node position exists, use it; otherwise calculate new position
|
||||||
let newX, newY;
|
let newX, newY;
|
||||||
@@ -148,18 +147,23 @@ const PortClickHandler: React.FC<PortClickHandlerProps> = ({ graph }) => {
|
|||||||
if (sourcePortGroup === 'left') {
|
if (sourcePortGroup === 'left') {
|
||||||
// Connect from left port to new node's right side
|
// Connect from left port to new node's right side
|
||||||
targetPort = targetPorts.find((port: any) => port.group === 'right')?.id || 'right';
|
targetPort = targetPorts.find((port: any) => port.group === 'right')?.id || 'right';
|
||||||
|
graph.addEdge({
|
||||||
|
source: { cell: newNode.id, port: targetPort },
|
||||||
|
target: { cell: sourceNode.id, port: sourcePort },
|
||||||
|
...edgeAttrs
|
||||||
|
// zIndex: sourceNodeData.cycle && sourceNodeType == 'cycle-start' ? 1 : sourceNodeData.cycle ? 2 : 0
|
||||||
|
});
|
||||||
} else {
|
} else {
|
||||||
// Connect from right port to new node's left side
|
// Connect from right port to new node's left side
|
||||||
targetPort = targetPorts.find((port: any) => port.group === 'left')?.id || 'left';
|
targetPort = targetPorts.find((port: any) => port.group === 'left')?.id || 'left';
|
||||||
|
graph.addEdge({
|
||||||
|
source: { cell: sourceNode.id, port: sourcePort },
|
||||||
|
target: { cell: newNode.id, port: targetPort },
|
||||||
|
...edgeAttrs
|
||||||
|
// zIndex: sourceNodeData.cycle && sourceNodeType == 'cycle-start' ? 1 : sourceNodeData.cycle ? 2 : 0
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
graph.addEdge({
|
|
||||||
source: { cell: sourceNode.id, port: sourcePort },
|
|
||||||
target: { cell: newNode.id, port: targetPort },
|
|
||||||
...edgeAttrs
|
|
||||||
// zIndex: sourceNodeData.cycle && sourceNodeType == 'cycle-start' ? 1 : sourceNodeData.cycle ? 2 : 0
|
|
||||||
});
|
|
||||||
|
|
||||||
// Adjust loop node size when child node is added via port within loop node
|
// Adjust loop node size when child node is added via port within loop node
|
||||||
const cycleId = sourceNodeData.cycle;
|
const cycleId = sourceNodeData.cycle;
|
||||||
if (cycleId) {
|
if (cycleId) {
|
||||||
@@ -223,20 +227,27 @@ const PortClickHandler: React.FC<PortClickHandlerProps> = ({ graph }) => {
|
|||||||
const isChildOfLoop = sourceNodeData?.cycle && graph?.getNodes().find((n: any) => n.getData()?.id === sourceNodeData.cycle && n.getData()?.type === 'loop');
|
const isChildOfLoop = sourceNodeData?.cycle && graph?.getNodes().find((n: any) => n.getData()?.id === sourceNodeData.cycle && n.getData()?.type === 'loop');
|
||||||
const isChildOfIteration = sourceNodeData?.cycle && graph?.getNodes().find((n: any) => n.getData()?.id === sourceNodeData.cycle && n.getData()?.type === 'iteration');
|
const isChildOfIteration = sourceNodeData?.cycle && graph?.getNodes().find((n: any) => n.getData()?.id === sourceNodeData.cycle && n.getData()?.type === 'iteration');
|
||||||
|
|
||||||
|
const sourcePortInfo = sourceNode?.getPorts().find((p: any) => p.id === sourcePort);
|
||||||
|
const sourcePortGroup = sourcePortInfo?.group || sourcePort;
|
||||||
|
const isLeftPort = sourcePortGroup === 'left';
|
||||||
|
|
||||||
let filteredNodes;
|
let filteredNodes;
|
||||||
if (isChildOfLoop) {
|
if (isChildOfLoop) {
|
||||||
// Use same filtering as AddNode for child nodes of loop, but allow break
|
// Use same filtering as AddNode for child nodes of loop, but allow break
|
||||||
filteredNodes = category.nodes.filter(nodeType => !['start', 'end', 'loop', 'cycle-start', 'iteration'].includes(nodeType.type));
|
filteredNodes = category.nodes.filter(nodeType => !['start', 'end', 'loop', 'cycle-start', 'iteration'].includes(nodeType.type));
|
||||||
} else if (isChildOfIteration) {
|
} else if (isChildOfIteration) {
|
||||||
// Filter out loop and iteration nodes for children of iteration nodes, but allow break
|
// Filter out loop and iteration nodes for children of iteration nodes, but allow break
|
||||||
filteredNodes = category.nodes.filter(nodeType => !['start', 'end', 'loop', 'cycle-start', 'iteration'].includes(nodeType.type));
|
filteredNodes = category.nodes.filter(nodeType => !['start', 'end', 'loop', 'cycle-start', 'iteration'].includes(nodeType.type));
|
||||||
} else {
|
} else {
|
||||||
// Original filtering for non-loop child nodes
|
// Original filtering for non-loop child nodes
|
||||||
filteredNodes = category.nodes.filter(nodeType => !['start', 'break', 'cycle-start'].includes(nodeType.type));
|
|
||||||
filteredNodes = category.nodes.filter(nodeType =>
|
filteredNodes = category.nodes.filter(nodeType =>
|
||||||
nodeType.type !== 'start' && nodeType.type !== 'cycle-start' && nodeType.type !== 'break'
|
nodeType.type !== 'start' && nodeType.type !== 'cycle-start' && nodeType.type !== 'break'
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (isLeftPort) {
|
||||||
|
filteredNodes = filteredNodes.filter(nodeType => nodeType.type !== 'end');
|
||||||
|
}
|
||||||
|
|
||||||
if (filteredNodes.length === 0) return null;
|
if (filteredNodes.length === 0) return null;
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
* @Author: ZhaoYing
|
* @Author: ZhaoYing
|
||||||
* @Date: 2026-02-03 15:17:48
|
* @Date: 2026-02-03 15:17:48
|
||||||
* @Last Modified by: ZhaoYing
|
* @Last Modified by: ZhaoYing
|
||||||
* @Last Modified time: 2026-03-17 10:00:10
|
* @Last Modified time: 2026-03-18 12:07:03
|
||||||
*/
|
*/
|
||||||
import { useRef, useEffect, useState } from 'react';
|
import { useRef, useEffect, useState } from 'react';
|
||||||
import { useParams } from 'react-router-dom';
|
import { useParams } from 'react-router-dom';
|
||||||
@@ -593,13 +593,6 @@ export const useWorkflowGraph = ({
|
|||||||
if (!graphRef.current) return false;
|
if (!graphRef.current) return false;
|
||||||
const selectedNodes = graphRef.current.getNodes().filter(node => node.getData()?.isSelected);
|
const selectedNodes = graphRef.current.getNodes().filter(node => node.getData()?.isSelected);
|
||||||
if (selectedNodes.length) {
|
if (selectedNodes.length) {
|
||||||
selectedNodes.forEach(node => {
|
|
||||||
const data = node.getData();
|
|
||||||
node.setData({
|
|
||||||
...data,
|
|
||||||
id: `${(data.type as string).replace(/-/g, '_')}_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`,
|
|
||||||
});
|
|
||||||
});
|
|
||||||
graphRef.current.copy(selectedNodes);
|
graphRef.current.copy(selectedNodes);
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
@@ -610,7 +603,14 @@ export const useWorkflowGraph = ({
|
|||||||
*/
|
*/
|
||||||
const parseEvent = () => {
|
const parseEvent = () => {
|
||||||
if (!graphRef.current?.isClipboardEmpty()) {
|
if (!graphRef.current?.isClipboardEmpty()) {
|
||||||
graphRef.current?.paste({ offset: 32 });
|
const pastedNodes = graphRef.current?.paste({ offset: 32 }) ?? [];
|
||||||
|
pastedNodes.forEach(cell => {
|
||||||
|
if (cell.isNode()) {
|
||||||
|
const data = cell.getData();
|
||||||
|
const newId = `${(data.type as string).replace(/-/g, '_')}_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`;
|
||||||
|
cell.setData({ ...data, id: newId });
|
||||||
|
}
|
||||||
|
});
|
||||||
blankClick();
|
blankClick();
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
@@ -761,8 +761,23 @@ export const useWorkflowGraph = ({
|
|||||||
createEdge() {
|
createEdge() {
|
||||||
return graphRef.current?.createEdge(edgeAttrs);
|
return graphRef.current?.createEdge(edgeAttrs);
|
||||||
},
|
},
|
||||||
validateConnection({ sourceCell, targetCell, targetMagnet }) {
|
validateConnection({ sourceCell, targetCell, sourceMagnet, targetMagnet }) {
|
||||||
if (!targetMagnet) return false;
|
if (!targetMagnet) return false;
|
||||||
|
|
||||||
|
// Only allow right port → left port connections
|
||||||
|
const getPortGroup = (magnet: Element) => {
|
||||||
|
let el: Element | null = magnet;
|
||||||
|
while (el) {
|
||||||
|
const group = el.getAttribute('port-group');
|
||||||
|
if (group) return group;
|
||||||
|
el = el.parentElement;
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
};
|
||||||
|
const sourceGroup = sourceMagnet ? getPortGroup(sourceMagnet) : null;
|
||||||
|
const targetGroup = targetMagnet ? getPortGroup(targetMagnet) : null;
|
||||||
|
|
||||||
|
if (sourceGroup === 'left' || targetGroup === 'right') return false;
|
||||||
|
|
||||||
// Node cannot connect to itself
|
// Node cannot connect to itself
|
||||||
if (sourceCell?.id === targetCell?.id) return false;
|
if (sourceCell?.id === targetCell?.id) return false;
|
||||||
|
|||||||
Reference in New Issue
Block a user