diff --git a/src/api/processModeler.ts b/src/api/processModeler.ts index 8b6e812..c27fa36 100644 --- a/src/api/processModeler.ts +++ b/src/api/processModeler.ts @@ -217,8 +217,7 @@ export async function draftFromProcDef(procDefId: string): Promise { /** * DELETE /api/workflow/models/{id} —— 删除草稿。 - * ⚠️ 后端端点由 T2.2 遗留待补(flowable-service DELETE /api/flow/models/{id} + 网关转发); - * 前端契约先落,后端上线即通。 + * 后端已实现(flowable-service DELETE /api/flow/models/{id} + 网关同超管门转发,f0d704d)。 */ export async function deleteDraft(id: string): Promise { await http.delete(`/api/workflow/models/${encodeURIComponent(id)}`); diff --git a/src/modeler/Eip4Panel.test.tsx b/src/modeler/Eip4Panel.test.tsx index cbff0d1..58ca69f 100644 --- a/src/modeler/Eip4Panel.test.tsx +++ b/src/modeler/Eip4Panel.test.tsx @@ -437,6 +437,22 @@ describe('Eip4Panel — formKey', () => { await select(userTask()); expect(await screen.findByTestId('eip4-formkey-degraded')).toBeInTheDocument(); }); + + it('过滤掉当前值后 select 仍保留该值(占位「(当前)」防丢值)', async () => { + const { modeler, select } = makeModeler(); + render(); + await select(userTask({ 'activiti:formKey': 'aaaa-bbbb' })); // 当前值=另一个表单 + const sel = (await screen.findByTestId('eip4-formkey-select')) as HTMLSelectElement; + await waitFor(() => expect(sel.querySelectorAll('option').length).toBeGreaterThan(3)); + // 过滤到「合同」→ aaaa-bbbb(另一个表单)被过滤掉 + fireEvent.change(screen.getByTestId('eip4-formkey-filter'), { target: { value: '合同' } }); + expect(sel.value).toBe('aaaa-bbbb'); // 值未丢 + const cur = Array.from(sel.querySelectorAll('option')).find( + (o) => (o as HTMLOptionElement).value === 'aaaa-bbbb', + ); + expect(cur).toBeTruthy(); + expect(cur!.textContent).toContain('(当前)'); + }); }); describe('Eip4Panel — 扩展属性(长尾 $attrs)', () => { diff --git a/src/pages/ProcessModelerPage.test.tsx b/src/pages/ProcessModelerPage.test.tsx index f68c6b8..3d665ea 100644 --- a/src/pages/ProcessModelerPage.test.tsx +++ b/src/pages/ProcessModelerPage.test.tsx @@ -207,9 +207,20 @@ describe('ProcessModelerPage', () => { const body = mCreateDraft.mock.calls[0][0]; expect(body.bpmnXml).toBe(''); expect(JSON.parse(body.metaInfo!).eip4IdMap).toEqual({ '总包合同交底': 'Proc_zbht' }); + expect(JSON.parse(body.metaInfo!)).toHaveProperty('sourceProcDefId'); // 结构对齐 from-procdef expect(mFromProcDef).not.toHaveBeenCalled(); }); + it('I-2 首存后回填 ?modelId=(令刷新幂等):触发按 modelId 重载', async () => { + renderPage('/process-modeler?procKey=' + encodeURIComponent('总包合同交底')); + await waitFor(() => expect(importXMLMock).toHaveBeenCalled()); + await waitFor(() => expect(saveBtn()).not.toBeDisabled()); + fireEvent.click(saveBtn()); + await waitFor(() => expect(mCreateDraft).toHaveBeenCalled()); + // 回填 ?modelId=NEW-1 → 载入效果按 modelId 重载(getModel)——证明 setParams 已写入。 + await waitFor(() => expect(mGetModel).toHaveBeenCalledWith('NEW-1')); + }); + it('存草稿(存量按 procDefId,无 modelId):from-procdef 建草稿(后端 metaInfo)再 PUT', async () => { renderPage('/process-modeler?procDefId=PD-1'); await waitFor(() => expect(importXMLMock).toHaveBeenCalled()); @@ -224,10 +235,11 @@ describe('ProcessModelerPage', () => { renderPage('/process-modeler?procKey=' + encodeURIComponent('总包合同交底')); await waitFor(() => expect(importXMLMock).toHaveBeenCalled()); await waitFor(() => expect(saveBtn()).not.toBeDisabled()); - fireEvent.click(saveBtn()); // 首次:createDraft → modelId=NEW-1 + fireEvent.click(saveBtn()); // 首次:createDraft → modelId=NEW-1 → 回填 ?modelId= → 重载 await waitFor(() => expect(mCreateDraft).toHaveBeenCalled()); - await waitFor(() => expect(saveBtn()).not.toBeDisabled()); // saving 复位 - fireEvent.click(saveBtn()); // 二次:PUT NEW-1 + await waitFor(() => expect(mGetModel).toHaveBeenCalledWith('NEW-1')); // 回填后重载完成 + await waitFor(() => expect(saveBtn()).not.toBeDisabled()); // saving 复位 + 重载就绪 + fireEvent.click(saveBtn()); // 二次:PUT NEW-1(modelId 已在) await waitFor(() => expect(mSaveDraft).toHaveBeenCalledWith('NEW-1', { bpmnXml: '' })); const putBody = mSaveDraft.mock.calls[mSaveDraft.mock.calls.length - 1][1]; expect('metaInfo' in putBody).toBe(false); // 不重发 metaInfo,保住 eip4IdMap diff --git a/src/pages/ProcessModelerPage.tsx b/src/pages/ProcessModelerPage.tsx index 71f5f69..69a9a94 100644 --- a/src/pages/ProcessModelerPage.tsx +++ b/src/pages/ProcessModelerPage.tsx @@ -220,11 +220,20 @@ export function ProcessModelerPage() { modelId = await draftFromProcDef(procDefId); await saveDraft(modelId, { bpmnXml: xml }); modelIdRef.current = modelId; + // I-2:首存回填 ?modelId=,令刷新幂等(不再重复建草稿)、二次保存恒走 PUT。 + setParams({ modelId }, { replace: true }); } else { const key = loadedKeyRef.current || procKey || 'new_process'; - const metaInfo = JSON.stringify({ eip4IdMap: idMapRef.current, originalKey: key }); + // metaInfo 结构与 from-procdef 对齐(sourceProcDefId 便于 T3.x 影响摘要/审计, + // 虽 restore 只读 eip4IdMap)。 + const metaInfo = JSON.stringify({ + eip4IdMap: idMapRef.current, + sourceProcDefId: procDefId || '', + originalKey: key, + }); modelId = await createDraft({ name: key, key, bpmnXml: xml, metaInfo }); modelIdRef.current = modelId; + setParams({ modelId }, { replace: true }); } toast('已保存草稿', 'ok'); } catch {