fix(modeler): 打开器改 by-key 载入(修 options source=model 语义缺口)

live 验收发现:本库 /api/process-select/options 的 143 个选项 source 全为 'model',
option.id 是 act_re_model id(非 procDefId)→ 按 id 载入永远 found:false;option.key 才是流程 key。

- processModeler.ts:加 fetchProcDefSourceByKey(key) → GET
  /api/workflow/process-definitions/by-key/{key}/source(key 常纯中文,encodeURIComponent;
  返回形状同 fetchProcDefSource,共用 normalizeProcDefSource:found:false 不解构 bpmnXml/idMap)。
  ProcessOption 加 source 字段。
- ProcessModelerPage:打开器双参分派——source==='processDefinition' 用 ?procDefId=<id>,
  其余(model/history)用 ?procKey=<key>;loadEffect 按参数派 by-id / by-key;
  过滤规则 !!o.id 改为 source==='processDefinition' ? !!o.id : !!o.key;
  选择器用索引取回选项对象避免路由二义。

测试:processModeler.test.ts +2(纯中文 key 编码 / by-key found:false)+ source 映射断言;
ProcessModelerPage.test.tsx +3(?procKey= 走 by-key 并 importXML / 选 model 选项派 by-key /
选 processDefinition 选项派 by-id)。全量 vitest 22 文件 117 例绿;tsc -b 干净;npm run build 成功。

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
2026-07-02 10:59:24 +08:00
parent e131b8dee9
commit ae097f2a9c
4 changed files with 142 additions and 37 deletions

View File

@@ -1,5 +1,5 @@
import { describe, it, expect, vi, beforeEach } from 'vitest';
import { render, screen, waitFor } from '@testing-library/react';
import { render, screen, waitFor, fireEvent } from '@testing-library/react';
import { MemoryRouter } from 'react-router-dom';
import { SYNTHETIC_BPMN } from '../modeler/moddle/fixtures/synthetic-full-surface.bpmn';
@@ -25,6 +25,7 @@ vi.mock('bpmn-js-properties-panel', () => ({
}));
vi.mock('../api/processModeler', () => ({
fetchProcDefSource: vi.fn(),
fetchProcDefSourceByKey: vi.fn(),
fetchProcessOptions: vi.fn(),
}));
vi.mock('../auth/token', async (importOriginal) => ({
@@ -33,10 +34,11 @@ vi.mock('../auth/token', async (importOriginal) => ({
}));
import { ProcessModelerPage } from './ProcessModelerPage';
import { fetchProcDefSource, fetchProcessOptions } from '../api/processModeler';
import { fetchProcDefSource, fetchProcDefSourceByKey, fetchProcessOptions } from '../api/processModeler';
import { getProfile } from '../auth/token';
const mSource = vi.mocked(fetchProcDefSource);
const mSourceByKey = vi.mocked(fetchProcDefSourceByKey);
const mOptions = vi.mocked(fetchProcessOptions);
const mProfile = vi.mocked(getProfile);
@@ -55,6 +57,7 @@ beforeEach(() => {
onMock.mockReset();
ModelerCtor.mockClear();
mSource.mockReset().mockResolvedValue({ found: true, bpmnXml: SYNTHETIC_BPMN, idMap: { '总包合同交底': 'Proc_zbht' } });
mSourceByKey.mockReset().mockResolvedValue({ found: true, bpmnXml: SYNTHETIC_BPMN, idMap: { '总包合同交底': 'Proc_zbht' } });
mOptions.mockReset().mockResolvedValue([]);
mProfile.mockReset().mockReturnValue({ userId: 'ADMIN', account: 'admin', name: '管理员', roles: [] });
});
@@ -87,11 +90,40 @@ describe('ProcessModelerPage', () => {
expect(importXMLMock).not.toHaveBeenCalled();
});
it('无 procDefId 时展示「打开存量流程」选择器(数据源 process-select)', async () => {
mOptions.mockResolvedValue([{ label: '总包合同交底', value: '总包合同交底', id: 'PD-9', key: 'zbht' }]);
it('无参时展示「打开存量流程」选择器(数据源 process-select)', async () => {
mOptions.mockResolvedValue([{ label: '总包合同交底', value: '总包合同交底', source: 'model', id: 'MDL-1', key: 'zbht' }]);
renderPage();
await waitFor(() => expect(mOptions).toHaveBeenCalled());
expect(screen.getByTestId('process-modeler-open-select')).toBeInTheDocument();
expect(await screen.findByText('总包合同交底')).toBeInTheDocument();
});
it('?procKey= 时走 by-key 载入并 importXML(source=model 语义缺口修复)', async () => {
renderPage('/process-modeler?procKey=' + encodeURIComponent('总包合同交底'));
await waitFor(() => expect(mSourceByKey).toHaveBeenCalledWith('总包合同交底'));
await waitFor(() => expect(importXMLMock).toHaveBeenCalledWith(SYNTHETIC_BPMN));
expect(mSource).not.toHaveBeenCalled(); // 未走 by-id 路径
});
it('选中 source=model 选项 → 派到 by-key(procKey),不走 by-id', async () => {
mOptions.mockResolvedValue([{ label: '模型流程', value: '模型流程', source: 'model', id: 'MDL-9', key: 'MKEY' }]);
renderPage();
const select = await screen.findByTestId('process-modeler-open-select');
await screen.findByText('模型流程');
fireEvent.change(select, { target: { value: '0' } });
await waitFor(() => expect(mSourceByKey).toHaveBeenCalledWith('MKEY'));
expect(mSource).not.toHaveBeenCalled();
});
it('选中 source=processDefinition 选项 → 派到 by-id(procDefId)', async () => {
mOptions.mockResolvedValue([
{ label: '部署流程', value: '部署流程', source: 'processDefinition', id: '部署流程:3:uuid', key: 'k' },
]);
renderPage();
const select = await screen.findByTestId('process-modeler-open-select');
await screen.findByText('部署流程');
fireEvent.change(select, { target: { value: '0' } });
await waitFor(() => expect(mSource).toHaveBeenCalledWith('部署流程:3:uuid'));
expect(mSourceByKey).not.toHaveBeenCalled();
});
});