adai/MemoryBear
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(web): sub node connected

Browse Source
This commit is contained in:
zhaoying
2026-04-13 12:01:37 +08:00
parent 2b52b32b96
commit 520ee7c132
1 changed files with 33 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
web/src/views/Workflow/hooks/useWorkflowGraph.ts
View File

@@ -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-04-07 23:17:50 * @Last Modified time: 2026-04-13 12:00:09
*/ */
import { Clipboard, Graph, Keyboard, MiniMap, Node, Snapline, type Edge } from '@antv/x6'; import { Clipboard, Graph, Keyboard, MiniMap, Node, Snapline, type Edge } from '@antv/x6';
import { register } from '@antv/x6-react-shape'; import { register } from '@antv/x6-react-shape';
@@ -1022,24 +1022,39 @@ export const useWorkflowGraph = ({
graphRef.current.on('node:removed', blankClick) graphRef.current.on('node:removed', blankClick)
// When edge connected, bring connected nodes' ports to front // When edge connected, bring connected nodes' ports to front
graphRef.current.on('edge:connected', ({ isNew }) => { graphRef.current.on('edge:connected', ({ isNew, edge }) => {
// Bring edge to front first, then bring child nodes above edges
// Parent (loop/iteration) nodes stay behind to avoid covering edges
// Reset any port hover state left from dragging
if (isNew) { if (isNew) {
graphRef.current?.getNodes().forEach(node => { const sourceCellId = edge.getSourceCellId()
if (!node.getData()?.cycle) node.toFront(); const targetCellId = edge.getTargetCellId()
}); const sourceCell = graphRef.current?.getCellById(sourceCellId);
graphRef.current?.getEdges().forEach(edge => { const targetCell = graphRef.current?.getCellById(targetCellId);
const sourceCell = graphRef.current?.getCellById(edge.getSourceCellId());
const targetCell = graphRef.current?.getCellById(edge.getTargetCellId()); sourceCell?.toFront();
if (sourceCell?.getData()?.cycle || targetCell?.getData()?.cycle) { targetCell?.toFront()
edge.toFront(); if (['loop', 'iteration'].includes(sourceCell?.getData()?.type)) {
} graphRef.current?.getEdges().forEach(edge => {
}); const edgeSourceCell = graphRef.current?.getCellById(edge.getSourceCellId());
graphRef.current?.getNodes().forEach(node => { const edgeTargetCell = graphRef.current?.getCellById(edge.getTargetCellId());
if (node.getData()?.cycle) node.toFront(); if (edgeSourceCell?.getData()?.cycle === sourceCellId || edgeTargetCell?.getData()?.cycle === sourceCellId) {
}); edge.toFront();
}
});
graphRef.current?.getNodes().forEach(node => {
if (node.getData()?.cycle === sourceCellId) node.toFront();
});
}
if (['loop', 'iteration'].includes(targetCell?.getData()?.type)) {
graphRef.current?.getEdges().forEach(edge => {
const edgeSourceCell = graphRef.current?.getCellById(edge.getSourceCellId());
const edgeTargetCell = graphRef.current?.getCellById(edge.getTargetCellId());
if (edgeSourceCell?.getData()?.cycle === targetCellId || edgeTargetCell?.getData()?.cycle === targetCellId) {
edge.toFront();
}
});
graphRef.current?.getNodes().forEach(node => {
if (node.getData()?.cycle === targetCellId) node.toFront();
});
}
} }
}); });