diff --git a/src/pages/ProcessModelerPage.test.tsx b/src/pages/ProcessModelerPage.test.tsx index 4bf5869..16005af 100644 --- a/src/pages/ProcessModelerPage.test.tsx +++ b/src/pages/ProcessModelerPage.test.tsx @@ -4,10 +4,15 @@ import { MemoryRouter } from 'react-router-dom'; import { SYNTHETIC_BPMN } from '../modeler/moddle/fixtures/synthetic-full-surface.bpmn'; // bpmn-js Modeler:jsdom 跑不动真渲染,stub 成类(可断言 importXML/destroy 调用)。 -const { importXMLMock, destroyMock, getMock, onMock, ModelerCtor } = vi.hoisted(() => { +const { importXMLMock, destroyMock, getMock, onMock, attachToMock, ModelerCtor } = vi.hoisted(() => { const importXMLMock = vi.fn(); const destroyMock = vi.fn(); - const getMock = vi.fn(() => ({})); + const attachToMock = vi.fn(); + const getMock = vi.fn((service: string) => { + if (service === 'propertiesPanel') return { attachTo: attachToMock }; + if (service === 'canvas') return { zoom: vi.fn() }; + return {}; + }); const onMock = vi.fn(); const ModelerCtor = vi.fn().mockImplementation(() => ({ importXML: importXMLMock, @@ -15,7 +20,7 @@ const { importXMLMock, destroyMock, getMock, onMock, ModelerCtor } = vi.hoisted( get: getMock, on: onMock, })); - return { importXMLMock, destroyMock, getMock, onMock, ModelerCtor }; + return { importXMLMock, destroyMock, getMock, onMock, attachToMock, ModelerCtor }; }); vi.mock('bpmn-js/lib/Modeler', () => ({ default: ModelerCtor })); // 标准属性面板模块只作为 additionalModules 配置项传入被 mock 的 Modeler,永不真正执行。 @@ -53,7 +58,8 @@ function renderPage(initialPath = '/process-modeler') { beforeEach(() => { importXMLMock.mockReset().mockResolvedValue(undefined); destroyMock.mockReset(); - getMock.mockReset().mockReturnValue({}); + attachToMock.mockReset(); + getMock.mockClear(); onMock.mockReset(); ModelerCtor.mockClear(); mSource.mockReset().mockResolvedValue({ found: true, bpmnXml: SYNTHETIC_BPMN, idMap: { '总包合同交底': 'Proc_zbht' } }); @@ -83,6 +89,12 @@ describe('ProcessModelerPage', () => { expect(ModelerCtor).toHaveBeenCalledTimes(1); }); + it('构造后显式 attachTo 属性面板容器一次(修 live 面板从不挂载)', async () => { + renderPage('/process-modeler?procDefId=PD-1'); + await waitFor(() => expect(attachToMock).toHaveBeenCalledTimes(1)); + expect(attachToMock).toHaveBeenCalledWith(screen.getByTestId('process-modeler-props')); + }); + it('接口 found:false 时显示未找到文案且不 importXML', async () => { mSource.mockResolvedValue({ found: false }); renderPage('/process-modeler?procDefId=PD-x'); diff --git a/src/pages/ProcessModelerPage.tsx b/src/pages/ProcessModelerPage.tsx index 7b097d7..24bd158 100644 --- a/src/pages/ProcessModelerPage.tsx +++ b/src/pages/ProcessModelerPage.tsx @@ -85,7 +85,12 @@ export function ProcessModelerPage() { setLoadState('error'); return; } - if (!canvasRef.current) return; + if (!canvasRef.current) { + // 画布容器缺失(异常时序):明确报错,别停在 loading 无提示(T1.5 评审 M-2)。 + setLoadError('画布未就绪,请重试'); + setLoadState('error'); + return; + } modeler = new ModelerCtor({ container: canvasRef.current, propertiesPanel: { parent: panelRef.current }, @@ -97,6 +102,16 @@ export function ProcessModelerPage() { // 扩展属性冲突静默丢弃 userTask;单载 activiti 时 flowable 文档经 moddle lax 往返零丢失。 moddleExtensions: { activiti: activitiModdle }, }); + // ⚠️ 显式 attachTo:live 实证——只靠构造参数 propertiesPanel.parent,面板从不挂载 + // (.bio-properties-panel 在 document 中为 0;构造时 ref 时序/传对象非 element 皆可致此)。 + // attachTo 容器 DOM 是 bpmn-js-properties-panel 的规范补救。放在 importXML 前,alive 内。 + if (panelRef.current) { + try { + (modeler.get('propertiesPanel') as { attachTo(el: HTMLElement): void }).attachTo(panelRef.current); + } catch { + /* 面板模块缺失 / stub 时忽略 */ + } + } idMapRef.current = src.idMap ?? {}; await modeler.importXML(src.bpmnXml); if (!alive) return; @@ -255,8 +270,8 @@ export function ProcessModelerPage() { > EIP4 定制控件(办理人 / 会签 / formKey)将在此叠加,下阶段接入。 - {/* 标准属性面板宿主(bpmn-js-properties-panel 渲染进此容器) */} -
+ {/* 标准属性面板宿主(bpmn-js-properties-panel attachTo 进此容器) */} +