From ae097f2a9c78fbdd99d94494d143533e70f54ac1 Mon Sep 17 00:00:00 2001 From: zhengwr Date: Thu, 2 Jul 2026 10:59:24 +0800 Subject: [PATCH] =?UTF-8?q?fix(modeler):=20=E6=89=93=E5=BC=80=E5=99=A8?= =?UTF-8?q?=E6=94=B9=20by-key=20=E8=BD=BD=E5=85=A5(=E4=BF=AE=20options=20s?= =?UTF-8?q?ource=3Dmodel=20=E8=AF=AD=E4=B9=89=E7=BC=BA=E5=8F=A3)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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=, 其余(model/history)用 ?procKey=;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 --- src/api/processModeler.test.ts | 31 ++++++++++++-- src/api/processModeler.ts | 46 +++++++++++++++----- src/pages/ProcessModelerPage.test.tsx | 40 +++++++++++++++-- src/pages/ProcessModelerPage.tsx | 62 +++++++++++++++++++-------- 4 files changed, 142 insertions(+), 37 deletions(-) diff --git a/src/api/processModeler.test.ts b/src/api/processModeler.test.ts index 8bfcabb..02d695c 100644 --- a/src/api/processModeler.test.ts +++ b/src/api/processModeler.test.ts @@ -3,7 +3,7 @@ import { describe, it, expect, vi, beforeEach } from 'vitest'; vi.mock('./http', () => ({ http: { get: vi.fn() } })); import { http } from './http'; -import { fetchProcDefSource, fetchProcessOptions } from './processModeler'; +import { fetchProcDefSource, fetchProcDefSourceByKey, fetchProcessOptions } from './processModeler'; const mGet = vi.mocked(http.get); @@ -50,17 +50,40 @@ describe('fetchProcDefSource', () => { }); }); +describe('fetchProcDefSourceByKey', () => { + it('纯中文 key 必须 encodeURIComponent 进 by-key path', async () => { + mGet.mockResolvedValue({ + data: { found: true, bpmnXml: '', idMap: {}, procDefKey: '总包合同交底', version: 4 }, + }); + await fetchProcDefSourceByKey('总包合同交底'); + expect(mGet).toHaveBeenCalledTimes(1); + const url = mGet.mock.calls[0][0] as string; + expect(url).toBe('/api/workflow/process-definitions/by-key/' + encodeURIComponent('总包合同交底') + '/source'); + expect(url).not.toContain('总包合同交底'); + expect(url).toContain('%E6%80%BB'); + }); + + it('found:false(省略键)不抛,只返回 found:false', async () => { + mGet.mockResolvedValue({ data: { found: false } }); + const r = await fetchProcDefSourceByKey('无此流程'); + expect(r).toEqual({ found: false }); + expect('bpmnXml' in r).toBe(false); + }); +}); + describe('fetchProcessOptions', () => { - it('解 amis 信封 data.options 并映射字段', async () => { + it('解 amis 信封 data.options 并映射 source/id/key 字段', async () => { mGet.mockResolvedValue({ data: { status: 0, msg: '', - data: { options: [{ label: '总包合同交底', value: '总包合同交底', id: 'PD:3:u', key: 'zbht', type: 'process' }] }, + data: { + options: [{ label: '总包合同交底', value: '总包合同交底', source: 'model', id: 'PD:3:u', key: 'zbht', type: 'process' }], + }, }, }); const opts = await fetchProcessOptions(); - expect(opts).toEqual([{ label: '总包合同交底', value: '总包合同交底', id: 'PD:3:u', key: 'zbht' }]); + expect(opts).toEqual([{ label: '总包合同交底', value: '总包合同交底', source: 'model', id: 'PD:3:u', key: 'zbht' }]); }); it('history 来源 id 为空时 id=undefined(前端据此过滤不可载入项)', async () => { diff --git a/src/api/processModeler.ts b/src/api/processModeler.ts index 3789658..029b4a2 100644 --- a/src/api/processModeler.ts +++ b/src/api/processModeler.ts @@ -22,16 +22,10 @@ export interface ProcDefSource { } /** - * 按 procDefId 取净化后的存量流程源 XML(含可逆 idMap)。 - * - * ⚠️ procDefId 必须编码进 path:真实库 1445 个流程的 id 形如「总包合同交底:3:」 - * (中文 + 冒号),不 encodeURIComponent 会破坏 path segment。 - * found:false 时后端省略 bpmnXml/idMap 键——先判 found 再解构,不在 false 分支碰这些键。 + * source 端点返回体归一:found:false 时后端省略 bpmnXml/idMap 键——先判 found 再解构, + * 不在 false 分支碰这些键。 */ -export async function fetchProcDefSource(procDefId: string): Promise { - const { data } = await http.get( - `/api/workflow/process-definitions/${encodeURIComponent(procDefId)}/source`, - ); +function normalizeProcDefSource(data: ProcDefSource | undefined): ProcDefSource { if (!data?.found) { return { found: false }; } @@ -44,16 +38,46 @@ export async function fetchProcDefSource(procDefId: string): Promise」 + * (中文 + 冒号),不 encodeURIComponent 会破坏 path segment。 + */ +export async function fetchProcDefSource(procDefId: string): Promise { + const { data } = await http.get( + `/api/workflow/process-definitions/${encodeURIComponent(procDefId)}/source`, + ); + return normalizeProcDefSource(data); +} + +/** + * 按流程 key 取净化后的最新版存量流程源 XML。 + * + * ⚠️ 本库 process-select 选项 source 全为 'model'——option.id 是 act_re_model id(非 + * procDefId,按 id 载入必 found:false),只有 option.key 是流程 key。故 model 来源的打开 + * 走本端点按 key 载入。key 常为纯中文(如「总包合同交底」),必须 encodeURIComponent 进 path。 + */ +export async function fetchProcDefSourceByKey(key: string): Promise { + const { data } = await http.get( + `/api/workflow/process-definitions/by-key/${encodeURIComponent(key)}/source`, + ); + return normalizeProcDefSource(data); +} + /** * 存量流程选择器的一条选项。复用旧 ProcessSelectDialog 的数据源 * `/api/process-select/options`(amis 信封 {status,data:{options}})。 * - * - {@link id} 为 procDefId(source=processDefinition/model 时有值;history 来源为空,不可载入)。 + * - {@link source} 决定用哪个参数打开:'processDefinition'→id 即 procDefId;'model'/'history'→用 key。 + * - {@link id} 为 procDefId(仅 source=processDefinition 可信;source=model 时 id 是 act_re_model id, + * 非 procDefId,不能按 id 载入)。 * - {@link value}/{@link label} 均为流程名称(沿用旧口径 value==label==流程名)。 */ export interface ProcessOption { label: string; value: string; + source?: string; id?: string; key?: string; } @@ -66,6 +90,7 @@ interface ProcessSelectEnvelope { interface RawOption { label?: unknown; value?: unknown; + source?: unknown; id?: unknown; key?: unknown; } @@ -83,6 +108,7 @@ export async function fetchProcessOptions(q?: string): Promise return { label, value: opt.value != null ? String(opt.value) : label, + source: opt.source != null ? String(opt.source) : undefined, id: opt.id != null && String(opt.id) !== '' ? String(opt.id) : undefined, key: opt.key != null && String(opt.key) !== '' ? String(opt.key) : undefined, }; diff --git a/src/pages/ProcessModelerPage.test.tsx b/src/pages/ProcessModelerPage.test.tsx index 211b3bd..4bf5869 100644 --- a/src/pages/ProcessModelerPage.test.tsx +++ b/src/pages/ProcessModelerPage.test.tsx @@ -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(); + }); }); diff --git a/src/pages/ProcessModelerPage.tsx b/src/pages/ProcessModelerPage.tsx index 0afb85e..7b097d7 100644 --- a/src/pages/ProcessModelerPage.tsx +++ b/src/pages/ProcessModelerPage.tsx @@ -12,7 +12,12 @@ import 'bpmn-js/dist/assets/bpmn-font/css/bpmn.css'; import '@bpmn-io/properties-panel/dist/assets/properties-panel.css'; import activitiModdle from '../modeler/moddle/activiti.json'; import { getProfile, isAdminProfile } from '../auth/token'; -import { fetchProcDefSource, fetchProcessOptions, type ProcessOption } from '../api/processModeler'; +import { + fetchProcDefSource, + fetchProcDefSourceByKey, + fetchProcessOptions, + type ProcessOption, +} from '../api/processModeler'; // bpmn-js/lib/Modeler 自带类型,但选项对象里的标准面板模块(本项目无类型)与 moddle JSON // 会与官方选项类型产生摩擦;照 ProcessDiagram 惯例把构造器收窄为本页用到的最小契约再实例化。 @@ -31,7 +36,11 @@ export function ProcessModelerPage() { const isAdmin = isAdminProfile(profile); const navigate = useNavigate(); const [params, setParams] = useSearchParams(); + // 打开存量流程两条路:?procDefId=(source=processDefinition,id 即 procDefId) + // 或 ?procKey=(source=model/history,按流程 key 载入最新版)。 const procDefId = params.get('procDefId') ?? ''; + const procKey = params.get('procKey') ?? ''; + const hasTarget = !!procDefId || !!procKey; const canvasRef = useRef(null); const panelRef = useRef(null); @@ -44,9 +53,9 @@ export function ProcessModelerPage() { const [options, setOptions] = useState([]); const [optionsError, setOptionsError] = useState(''); - // 无参时拉存量流程选项(数据源复用旧 ProcessSelectDialog 端点)。 + // 未打开任何流程时拉存量流程选项(数据源复用旧 ProcessSelectDialog 端点)。 useEffect(() => { - if (!isAdmin || procDefId) return; + if (!isAdmin || hasTarget) return; let alive = true; fetchProcessOptions() .then((opts) => alive && setOptions(opts)) @@ -54,11 +63,11 @@ export function ProcessModelerPage() { return () => { alive = false; }; - }, [isAdmin, procDefId]); + }, [isAdmin, hasTarget]); - // 有 procDefId 时挂载 Modeler 并载入净化后的存量 BPMN。 + // 有目标(procDefId 或 procKey)时挂载 Modeler 并载入净化后的存量 BPMN。 useEffect(() => { - if (!isAdmin || !procDefId) return; + if (!isAdmin || !hasTarget) return; let alive = true; let modeler: ModelerLike | null = null; setLoadState('loading'); @@ -66,7 +75,10 @@ export function ProcessModelerPage() { (async () => { try { - const src = await fetchProcDefSource(procDefId); + // procDefId 优先(source=processDefinition);否则按 key(source=model/history)。 + const src = procDefId + ? await fetchProcDefSource(procDefId) + : await fetchProcDefSourceByKey(procKey); if (!alive) return; if (!src.found || !src.bpmnXml) { setLoadError('未找到该流程的 BPMN 源(可能未部署或无布局信息)'); @@ -115,17 +127,29 @@ export function ProcessModelerPage() { } modelerRef.current = null; }; - }, [isAdmin, procDefId]); + }, [isAdmin, procDefId, procKey]); if (!isAdmin) { return
流程设计器仅管理员可用。
; } - function openProcess(id: string) { - if (id) setParams({ procDefId: id }); - } + // 可载入 = 有可用打开参数:processDefinition 需 id(procDefId);其余(model/history)需 key。 + const loadableOptions = options.filter((o) => + o.source === 'processDefinition' ? !!o.id : !!o.key, + ); - const loadableOptions = options.filter((o) => !!o.id); + // 选择器按 source 分派:processDefinition→?procDefId=;其余→?procKey=。 + // 用索引取回选项对象(避免把 id/key 直接塞进