diff --git a/docs/web-patches/_jnpf-bpmn-autoLayout-on-open.md b/docs/web-patches/_jnpf-bpmn-autoLayout-on-open.md index b58592f..4e18d41 100644 --- a/docs/web-patches/_jnpf-bpmn-autoLayout-on-open.md +++ b/docs/web-patches/_jnpf-bpmn-autoLayout-on-open.md @@ -37,16 +37,63 @@ String deploymentId = flowAbleUrl.deployFlowAble(flowXml, templateJsonId); jnpf/bpmn 包编辑器打开时**不**自动调用 autoLayout: ```js -// jnpf/前端/jnpf-bpmn/src/components/bpmn/src/index.vue:148 +// jnpf/前端/jnpf-bpmn/src/components/bpmn/src/index.vue:148 (原文) if ((props.isPreview && props.isFreeType) || (props.flowXml && Object.keys(props.flowNodes)?.length === 0)) props.handleAutoLayoutByHorizontal(); ``` 触发条件: isPreview + isFreeType, 或 flowNodes 为空。**dacli workflow create 后 flowNodes 有值, 触发不命中。** +## jnpf 自研的 autoLayout 实现 (关键发现) + +`handleAutoLayoutByHorizontal` **不是 bpmn.js 内置算法**, 是 jnpf 在 `jnpf/前端/jnpf-web-apps-main/src/components/FlowProcess/src/propPanel/components/FlowButton.vue:354-478` **自研的 Sugiyama 简化算法**: + +```js +// FlowButton.vue:354-478 完整算法 +function handleAutoLayoutByHorizontal() { + // 1. 闭环检测 — 避免环状流程 + if (NodeUtils.getEndlessLoop(props.bpmn)?.length > 0) { ... return } + + // 2. 画布缩放 100% + props.bpmn.get('canvas').zoom(1) + + // 3. 设置 jnpfData layout=horizontal + props.bpmn?.get('jnpfData').setValue('layout', { value: 'horizontal' }) + + // 4. 构建树状数据结构 + const treeBuilder = new BPMNTreeBuilder(elementRegistry.getAll()) + const bpmnTree = treeBuilder.constructTree() + + // 5. BFS 遍历 + 多分支汇合节点 y 居中 (关键) + treeBuilder.bpmnTraverseTreeBFS(bpmnTree, (node) => { + if (incoming?.length > 1) { + let y = 0 + incoming.forEach(connect => { y += connect.source.y }) + y = y / incoming.length // 多源 y 居中 + node.offset = { x: node.offset.x, y } + } + }, 'horizontal') + + // 6. 碰撞算法 (按层避免重叠) + treeBuilder.handleCollisionsByLevel(list, 'horizontal') + + // 7. 格式化画布 + 自动分层 + treeBuilder.formatCanvasHorizontal(list, modeling, elementRegistry) + + // 8. 移动节点 + 更新连线 waypoint + list.forEach(item => modeling.moveShape(element, { x: deltaX, y: 0 })) + treeBuilder.updateConnectionWaypoints(item, modeling, 'horizontal') +} +``` + +**关键点**: jnpf 的 BPMNTreeBuilder **处理多 gateway + 多分支**: +- incoming.length > 1 → y 取平均 (避免分支乱) +- handleCollisionsByLevel → 按层避免重叠 +- updateConnectionWaypoints → sequenceFlow 自动走线绕过节点 + ## 修复 (web-patch) -修改 `jnpf/前端/jnpf-bpmn/src/components/bpmn/src/index.vue:148`: +修改 `jnpf/前端/jnpf-bpmn/src/components/bpmn/src/index.vue:210`: ```diff - if ((props.isPreview && props.isFreeType) || (props.flowXml && Object.keys(props.flowNodes)?.length === 0)) props.handleAutoLayoutByHorizontal();