diff --git a/src/api/processModeler.ts b/src/api/processModeler.ts index c27fa36..8b415d8 100644 --- a/src/api/processModeler.ts +++ b/src/api/processModeler.ts @@ -223,6 +223,146 @@ export async function deleteDraft(id: string): Promise { await http.delete(`/api/workflow/models/${encodeURIComponent(id)}`); } +// ── 发布(deploy)+ 影响摘要(impact)(T3.1 后端 + T3.2 网关,超管门) ────────── + +/** + * 一条发布校验错误。后端两种来源统一收进本形态(防御性——T3.1/T3.2 并行): + * - flowable ProcessValidator(T3.1 flowable-service):`{activityId,problem,defaultDescription}`。 + * - 网关 EIP4 语义校验(T3.2):可能是字符串(或对象)→ 归一到 {message}。 + */ +export interface DeployValidationError { + activityId?: string; + problem?: string; + defaultDescription?: string; + /** 字符串式错误(网关语义校验)或无结构错误的兜底展示文案。 */ + message?: string; +} + +/** deployModel 结果:ok=部署成功;否则 validationErrors(422 校验清单)或 message(通用失败)。 */ +export interface DeployOutcome { + ok: boolean; + deploymentId?: string; + processKey?: string; + newVersion?: number; + /** 校验未通过(422 且带 errors)时的节点错误清单;发布弹窗按此渲染不关窗。 */ + validationErrors?: DeployValidationError[]; + /** 通用失败文案(404/无 errors 的 422/网络异常)。 */ + message?: string; +} + +/** GET /api/workflow/models/{id}/impact 归一结果。found=false 表示不可用(404/异常)。 */ +export interface DeployImpact { + found: boolean; + processKey?: string; + /** 该 key 当前最新已部署版本(无则 0);发布后为 currentVersion+1。 */ + currentVersion?: number; + /** 该 key 运行中实例数(留在旧版本不受影响)。 */ + runningInstances?: number; +} + +interface RawDeployError { + activityId?: unknown; + problem?: unknown; + defaultDescription?: unknown; + message?: unknown; + msg?: unknown; +} + +/** errors 数组归一:元素可为字符串(→{message})或对象(→取标准字段),滤掉全空项。 */ +function normalizeDeployErrors(raw: unknown): DeployValidationError[] { + if (!Array.isArray(raw)) return []; + return raw + .map((e): DeployValidationError => { + if (typeof e === 'string') return { message: e }; + const o = (e ?? {}) as RawDeployError; + const err: DeployValidationError = {}; + if (o.activityId != null) err.activityId = String(o.activityId); + if (o.problem != null) err.problem = String(o.problem); + if (o.defaultDescription != null) err.defaultDescription = String(o.defaultDescription); + const m = o.message ?? o.msg; + if (m != null) err.message = String(m); + return err; + }) + .filter((e) => e.activityId || e.problem || e.defaultDescription || e.message); +} + +/** axios 错误的响应体结构(防御性访问,不依赖 AxiosError 类型强绑定)。 */ +interface HttpErrorLike { + response?: { status?: number; data?: unknown }; +} + +interface DeployRespBody { + status?: unknown; + deploymentId?: unknown; + processKey?: unknown; + newVersion?: unknown; + errors?: unknown; + msg?: unknown; +} + +function successOutcome(d: DeployRespBody | undefined): DeployOutcome { + return { + ok: true, + deploymentId: d?.deploymentId != null ? String(d.deploymentId) : undefined, + processKey: d?.processKey != null ? String(d.processKey) : undefined, + newVersion: d?.newVersion != null ? Number(d.newVersion) : undefined, + }; +} + +/** + * POST /api/workflow/models/{id}/deploy —— 同人确认后发布草稿。 + * + * 不向调用方抛异常:把 422(校验失败带 errors / 其他带 msg)与网络异常都归一进 {ok:false,...}, + * 供发布弹窗区分「校验清单(不关窗让用户改)」与「通用失败 toast」。成功返 {ok:true,newVersion,...}。 + */ +export async function deployModel(id: string): Promise { + try { + const { data } = await http.post( + `/api/workflow/models/${encodeURIComponent(id)}/deploy`, + ); + // 2xx 但后端标 status:1(防御性——理论上 422 才失败,但双写路径下容错)。 + if (data && data.status === 1) { + const errs = normalizeDeployErrors(data.errors); + return errs.length + ? { ok: false, validationErrors: errs, message: data.msg != null ? String(data.msg) : undefined } + : { ok: false, message: data.msg != null ? String(data.msg) : '发布失败' }; + } + return successOutcome(data); + } catch (e) { + const resp = (e as HttpErrorLike)?.response; + const d = resp?.data as DeployRespBody | undefined; + if (d) { + const errs = normalizeDeployErrors(d.errors); + if (errs.length) { + return { ok: false, validationErrors: errs, message: d.msg != null ? String(d.msg) : undefined }; + } + return { ok: false, message: d.msg != null ? String(d.msg) : '发布失败' }; + } + return { ok: false, message: '发布失败(服务不可用或网络异常)' }; + } +} + +/** + * GET /api/workflow/models/{id}/impact —— 发布影响摘要(流程 key/当前版本/运行中实例数)。 + * 防御性:任何失败(404/异常)返 {found:false},弹窗降级提示而不阻断发布。 + */ +export async function fetchImpact(id: string): Promise { + try { + const { data } = await http.get<{ status?: unknown; processKey?: unknown; currentVersion?: unknown; runningInstances?: unknown }>( + `/api/workflow/models/${encodeURIComponent(id)}/impact`, + ); + if (!data || data.status === 1) return { found: false }; + return { + found: true, + processKey: data.processKey != null ? String(data.processKey) : undefined, + currentVersion: data.currentVersion != null ? Number(data.currentVersion) : undefined, + runningInstances: data.runningInstances != null ? Number(data.runningInstances) : undefined, + }; + } catch { + return { found: false }; + } +} + /** GET /api/process-select/options —— 取存量流程选项(解 amis 信封,防御性返回数组)。 */ export async function fetchProcessOptions(q?: string): Promise { const { data } = await http.get('/api/process-select/options', { diff --git a/src/modeler/Eip4Panel.test.tsx b/src/modeler/Eip4Panel.test.tsx index 58ca69f..5bf83ee 100644 --- a/src/modeler/Eip4Panel.test.tsx +++ b/src/modeler/Eip4Panel.test.tsx @@ -513,8 +513,8 @@ describe('Eip4Panel — 扩展属性(长尾 $attrs)', () => { describe('Eip4Panel — 任务监听器(taskListener)', () => { it('增:新监听器写回 extensionElements,并保留已有监听器的 field(引用不动)', async () => { const { modeler, updateProperties, moddle, select } = makeModeler(); - const fieldObj = moddleEl('activiti:field', { name: 'mailTemplate' }); - const existing = moddleEl('activiti:taskListener', { + const fieldObj = moddleEl('activiti:Field', { name: 'mailTemplate' }); + const existing = moddleEl('activiti:TaskListener', { event: 'complete', class: 'com.dsasp.server.wf.user.listener.TaskCompleteListener', fields: [fieldObj], @@ -543,14 +543,14 @@ describe('Eip4Panel — 任务监听器(taskListener)', () => { fireEvent.change(screen.getByTestId('eip4-listener-event-0'), { target: { value: 'assignment' } }); fireEvent.change(screen.getByTestId('eip4-listener-value-0'), { target: { value: 'com.X.Listener' } }); const ext = lastPayload(updateProperties).extensionElements as { values: Array> }; - const listener = ext.values.find((v) => v.$type === 'activiti:taskListener')!; + const listener = ext.values.find((v) => v.$type === 'activiti:TaskListener')!; expect(listener.event).toBe('assignment'); expect(listener.class).toBe('com.X.Listener'); }); it('删:移除唯一监听器 → extensionElements=undefined', async () => { const { modeler, updateProperties, select } = makeModeler(); - const existing = moddleEl('activiti:taskListener', { event: 'create', class: 'com.X' }); + const existing = moddleEl('activiti:TaskListener', { event: 'create', class: 'com.X' }); render(); await select(userTask({ extensionElements: { values: [existing] } })); fireEvent.click(screen.getByTestId('eip4-listener-remove-0')); @@ -569,7 +569,7 @@ describe('Eip4Panel — 任务监听器(taskListener)', () => { }); fireEvent.change(screen.getByTestId('eip4-listener-value-0'), { target: { value: '${bean}' } }); const ext = lastPayload(updateProperties).extensionElements as { values: Array> }; - const listener = ext.values.find((v) => v.$type === 'activiti:taskListener')!; + const listener = ext.values.find((v) => v.$type === 'activiti:TaskListener')!; expect(listener.delegateExpression).toBe('${bean}'); expect('class' in listener).toBe(false); }); diff --git a/src/modeler/Eip4Panel.tsx b/src/modeler/Eip4Panel.tsx index 240600e..414a744 100644 --- a/src/modeler/Eip4Panel.tsx +++ b/src/modeler/Eip4Panel.tsx @@ -385,10 +385,13 @@ export function Eip4Panel({ modeler }: { modeler: PanelModeler | null }) { // 任务监听器 const extEl = bo.get('extensionElements') as { values?: unknown[] } | undefined; const values = (extEl?.values ?? []) as unknown[]; - otherExtRef.current = values.filter((v) => (v as { $type?: string }).$type !== 'activiti:taskListener'); + // moddle 类型名遵循 activiti/camunda 惯例=PascalCase(xml.tagAlias:lowerCase 令 XML 元素名仍小写 + // ),故按 $type 'activiti:TaskListener' 识别;小写名会致扩展类型 $pkg 串味、 + // 断部署(见 moddle/serialization.test.ts)。 + otherExtRef.current = values.filter((v) => (v as { $type?: string }).$type !== 'activiti:TaskListener'); setListeners( values - .filter((v) => (v as { $type?: string }).$type === 'activiti:taskListener') + .filter((v) => (v as { $type?: string }).$type === 'activiti:TaskListener') .map((v) => { const cls = mget(v, 'class') as string | undefined; const del = mget(v, 'delegateExpression') as string | undefined; @@ -499,7 +502,7 @@ export function Eip4Panel({ modeler }: { modeler: PanelModeler | null }) { const props: Record = { event: l.event }; props[l.mode] = l.value; if (l.fields && l.fields.length) props.fields = l.fields; - return moddle.create('activiti:taskListener', props); + return moddle.create('activiti:TaskListener', props); }); const all = [...otherExtRef.current, ...listenerEls]; const extEl = all.length ? moddle.create('bpmn:ExtensionElements', { values: all }) : undefined; diff --git a/src/modeler/PublishConfirm.test.tsx b/src/modeler/PublishConfirm.test.tsx new file mode 100644 index 0000000..136dcc8 --- /dev/null +++ b/src/modeler/PublishConfirm.test.tsx @@ -0,0 +1,139 @@ +import { describe, it, expect, vi, beforeEach } from 'vitest'; +import { render, screen, waitFor, fireEvent, act } from '@testing-library/react'; +import { SYNTHETIC_BPMN } from './moddle/fixtures/synthetic-full-surface.bpmn'; + +vi.mock('../api/processModeler', () => ({ + deployModel: vi.fn(), + fetchImpact: vi.fn(), +})); +const toastMock = vi.fn(); +vi.mock('../components/ui', async (importOriginal) => ({ + ...(await importOriginal()), + toast: (...args: unknown[]) => toastMock(...args), +})); + +import { PublishConfirm } from './PublishConfirm'; +import { deployModel, fetchImpact } from '../api/processModeler'; + +const mDeploy = vi.mocked(deployModel); +const mImpact = vi.mocked(fetchImpact); + +// 办理人改一处 → diff 应识别「接收交底:办理人变更」。 +const EDITED = SYNTHETIC_BPMN.replace( + '"type":"position"', + '"type":"user"', +); + +function renderConfirm(overrides: Partial> = {}) { + const onClose = vi.fn(); + const onPublished = vi.fn(); + render( + , + ); + return { onClose, onPublished }; +} + +beforeEach(() => { + toastMock.mockReset(); + mDeploy.mockReset().mockResolvedValue({ ok: true, deploymentId: 'D1', processKey: '总包合同交底', newVersion: 4 }); + mImpact.mockReset().mockResolvedValue({ found: true, processKey: '总包合同交底', currentVersion: 3, runningInstances: 7 }); +}); + +describe('PublishConfirm', () => { + it('展示影响摘要:流程 key、当前版本→新版本、运行中实例数', async () => { + renderConfirm(); + await waitFor(() => expect(mImpact).toHaveBeenCalledWith('MD-1')); + expect(await screen.findByTestId('publish-impact-key')).toHaveTextContent('总包合同交底'); + // currentVersion 3 → newVersion 4 + expect(screen.getByTestId('publish-impact-version')).toHaveTextContent('v3'); + expect(screen.getByTestId('publish-impact-version')).toHaveTextContent('v4'); + expect(screen.getByTestId('publish-impact-instances')).toHaveTextContent('7'); + // 灰字提示旧版本不受影响 + expect(screen.getByTestId('publish-impact-instances')).toHaveTextContent(/不受.*影响/); + }); + + it('展示节点级 diff(办理人变更)', async () => { + renderConfirm(); + await screen.findByTestId('publish-diff-list'); + expect(screen.getByTestId('publish-diff-list')).toHaveTextContent('接收交底'); + expect(screen.getByTestId('publish-diff-list')).toHaveTextContent('办理人变更'); + }); + + it('无变化时提示未检测到关键属性变化', async () => { + renderConfirm({ currentXml: SYNTHETIC_BPMN }); + await screen.findByTestId('publish-diff-empty'); + expect(screen.getByTestId('publish-diff-empty')).toHaveTextContent(/未检测到|无/); + }); + + it('确认发布成功 → deployModel、toast「已发布 v4」、onPublished(4)、关闭', async () => { + const { onClose, onPublished } = renderConfirm(); + await screen.findByTestId('publish-confirm-btn'); + fireEvent.click(screen.getByTestId('publish-confirm-btn')); + await waitFor(() => expect(mDeploy).toHaveBeenCalledWith('MD-1')); + await waitFor(() => expect(toastMock).toHaveBeenCalledWith(expect.stringContaining('已发布 v4'), 'ok')); + expect(onPublished).toHaveBeenCalledWith(4); + expect(onClose).toHaveBeenCalled(); + }); + + it('422 校验失败 → 按 errors 渲染节点错误清单,不关弹窗、不 onPublished', async () => { + mDeploy.mockResolvedValue({ + ok: false, + validationErrors: [ + { activityId: 't_receive', problem: 'activiti-usertask-assignee', defaultDescription: '用户任务缺办理人' }, + { message: 'formKey 不存在于 view_wftemplate' }, + ], + }); + const { onClose, onPublished } = renderConfirm(); + await screen.findByTestId('publish-confirm-btn'); + fireEvent.click(screen.getByTestId('publish-confirm-btn')); + await waitFor(() => expect(screen.getByTestId('publish-errors')).toBeInTheDocument()); + expect(screen.getByTestId('publish-error-0')).toHaveTextContent('t_receive'); + expect(screen.getByTestId('publish-error-0')).toHaveTextContent('用户任务缺办理人'); + expect(screen.getByTestId('publish-error-1')).toHaveTextContent('formKey 不存在于 view_wftemplate'); + expect(onClose).not.toHaveBeenCalled(); + expect(onPublished).not.toHaveBeenCalled(); + }); + + it('通用失败(无 errors)→ toast 报错,不关弹窗', async () => { + mDeploy.mockResolvedValue({ ok: false, message: '草稿不存在: MD-1' }); + const { onClose } = renderConfirm(); + await screen.findByTestId('publish-confirm-btn'); + fireEvent.click(screen.getByTestId('publish-confirm-btn')); + await waitFor(() => expect(toastMock).toHaveBeenCalledWith(expect.stringContaining('草稿不存在'), 'err')); + expect(onClose).not.toHaveBeenCalled(); + }); + + it('取消 → onClose,不发布', async () => { + const { onClose } = renderConfirm(); + await screen.findByTestId('publish-cancel-btn'); + fireEvent.click(screen.getByTestId('publish-cancel-btn')); + expect(onClose).toHaveBeenCalled(); + expect(mDeploy).not.toHaveBeenCalled(); + }); + + it('impact 不可用(found:false)→ 降级用 processKeyHint 显示 key,仍可发布', async () => { + mImpact.mockResolvedValue({ found: false }); + renderConfirm(); + await waitFor(() => expect(mImpact).toHaveBeenCalled()); + expect(await screen.findByTestId('publish-impact-key')).toHaveTextContent('总包合同交底'); + // 版本不可知时显示占位而非崩溃 + expect(screen.getByTestId('publish-impact-version')).toBeInTheDocument(); + expect(screen.getByTestId('publish-confirm-btn')).not.toBeDisabled(); + }); + + it('首次发布(currentVersion 0)→ 显示「首次发布 → v1」', async () => { + mImpact.mockResolvedValue({ found: true, processKey: 'new_proc', currentVersion: 0, runningInstances: 0 }); + renderConfirm(); + await waitFor(() => expect(mImpact).toHaveBeenCalled()); + await waitFor(() => expect(screen.getByTestId('publish-impact-version')).toHaveTextContent(/首次发布/)); + expect(screen.getByTestId('publish-impact-version')).toHaveTextContent('v1'); + }); +}); diff --git a/src/modeler/PublishConfirm.tsx b/src/modeler/PublishConfirm.tsx new file mode 100644 index 0000000..97950b9 --- /dev/null +++ b/src/modeler/PublishConfirm.tsx @@ -0,0 +1,188 @@ +// 同人确认发布弹窗(T3.3)。 +// +// 发布点击后打开本弹窗:并发拉「影响摘要」(fetchImpact) + 本地算「节点级 diff」(diffSummary, +// 打开时源 XML vs 当前 saveXML) → 展示流程 key / 当前版本→新版本 / 运行中实例数(灰字提示旧版本 +// 不受影响)/ 办理人·会签等变更节点清单 → 用户确认 → deployModel。 +// - 成功:toast「已发布 vN」(用后端返回的真实 newVersion) + onPublished + 关闭。 +// - 422 校验失败:按 errors 渲染节点错误清单,**不关弹窗**让用户回去改。 +// - 通用失败:toast 报错,不关弹窗。 +import { useEffect, useState } from 'react'; +import { Dialog } from '../components/ui'; +import { toast } from '../components/ui'; +import { deployModel, fetchImpact, type DeployImpact, type DeployValidationError } from '../api/processModeler'; +import { diffSummary, type NodeDiff } from './diffSummary'; + +interface PublishConfirmProps { + /** 草稿 modelId(必须已存草稿才可发布)。 */ + modelId: string; + /** 打开流程时保存的源 XML(diff 基线)。 */ + openSourceXml: string; + /** 当前编辑器 saveXML 结果(diff 对比方;由父页在打开弹窗前算好)。 */ + currentXml: string; + /** impact 未回来 / 不可用时兜底显示的流程 key(loadedKey)。 */ + processKeyHint?: string; + onClose: () => void; + /** 发布成功回调(带后端返回的真实新版本号)。 */ + onPublished: (newVersion?: number) => void; +} + +/** 单条校验错误的展示文案:activityId + 问题描述(defaultDescription 优先,回退 problem/message)。 */ +function errorText(e: DeployValidationError): string { + const desc = e.defaultDescription || e.problem || e.message || '校验未通过'; + return e.activityId ? `[${e.activityId}] ${desc}` : desc; +} + +export function PublishConfirm({ + modelId, + openSourceXml, + currentXml, + processKeyHint, + onClose, + onPublished, +}: PublishConfirmProps) { + // 节点级 diff 是纯本地同步计算,初始化即得。 + const [diff] = useState(() => diffSummary(openSourceXml, currentXml)); + const [impact, setImpact] = useState(null); + const [impactLoaded, setImpactLoaded] = useState(false); + const [deploying, setDeploying] = useState(false); + const [errors, setErrors] = useState(null); + + useEffect(() => { + let alive = true; + fetchImpact(modelId) + .then((r) => { + if (!alive) return; + setImpact(r); + setImpactLoaded(true); + }) + .catch(() => { + if (!alive) return; + setImpact({ found: false }); + setImpactLoaded(true); + }); + return () => { + alive = false; + }; + }, [modelId]); + + async function handleConfirm() { + if (deploying) return; + setDeploying(true); + setErrors(null); + try { + const r = await deployModel(modelId); + if (r.ok) { + toast('已发布 v' + (r.newVersion ?? '?'), 'ok'); + onPublished(r.newVersion); + onClose(); + return; + } + if (r.validationErrors && r.validationErrors.length) { + setErrors(r.validationErrors); // 校验清单 → 不关窗,让用户回去改 + } else { + toast(r.message ?? '发布失败', 'err'); + } + } finally { + setDeploying(false); + } + } + + // M3:发布进行中拦截关闭(遮罩点击 / X 按钮),避免中途关窗留下不确定态。 + const guardedClose = () => { + if (!deploying) onClose(); + }; + + const key = impact?.processKey || processKeyHint || '(未知)'; + const cur = impact?.currentVersion ?? 0; + const versionText = !impactLoaded + ? '版本加载中…' + : impact?.found + ? cur > 0 + ? `v${cur} → v${cur + 1}` + : `首次发布 → v1` + : '(版本信息暂不可用)'; + const running = impact?.found ? (impact.runningInstances ?? 0) : undefined; + + const foot = ( + <> + + + + ); + + return ( + +
+ {/* 影响摘要 */} +
+ + {key} + + + {versionText} + + + + {running === undefined ? '—' : running} + + (留在旧版本,不受本次发布影响) + + + +
+ + {/* 节点级变更清单 */} +
+
办理人 / 会签等变更节点
+ {diff.length === 0 ? ( +
+ 未检测到办理人 / 会签 / 表单等关键属性变化(可能仅调整了布局或其他节点)。 +
+ ) : ( +
    + {diff.map((d, i) => ( +
  • + {d.nodeName}:{d.changes.join('、')} +
  • + ))} +
+ )} +
+ + {/* 校验错误清单(422,不关窗) */} + {errors && errors.length ? ( +
+
+ 校验未通过,请修正后重试: +
+
    + {errors.map((e, i) => ( +
  • + {errorText(e)} +
  • + ))} +
+
+ ) : null} +
+
+ ); +} + +function Row({ label, children }: { label: string; children: React.ReactNode }) { + return ( +
+ {label} + {children} +
+ ); +} diff --git a/src/modeler/diffSummary.test.ts b/src/modeler/diffSummary.test.ts new file mode 100644 index 0000000..edb12fc --- /dev/null +++ b/src/modeler/diffSummary.test.ts @@ -0,0 +1,194 @@ +import { describe, it, expect } from 'vitest'; +import { SYNTHETIC_BPMN } from './moddle/fixtures/synthetic-full-surface.bpmn'; +import { diffSummary } from './diffSummary'; +import { buildCandidateExpression, type UserPropertyItem } from './candidateExpression'; + +// 节点级 diff(P2):以「总包合同交底」逐字对照的 synthetic fixture 为基线, +// 按 userTask id 对齐比较四类属性变化(办理人/指派/formKey/会签)。改动用**定点字符串替换** +// 从基线派生,确保只动被测那一处(其余节点无 diff),与真实存储态绑定不手抄表达式。 +// +// fixture 关键锚点(见 synthetic-full-surface.bpmn): +// - t_write(编写交底):activiti:assignee=${assignee} + 多实例会签(collection type=projectRoleType, +// completionCondition 全票 ==1),无 candidateUsers。 +// - t_receive(接收交底):activiti:candidateUsers(type=position)+ activiti:formKey=3eee7644-…,无会签。 + +/** 从基线移除 t_write 的会签块(多实例 loop)。 */ +const NO_COSIGN = SYNTHETIC_BPMN.replace( + //, + '', +); + +describe('diffSummary — 节点级四类属性 diff', () => { + it('完全相同 → 无变化节点', () => { + expect(diffSummary(SYNTHETIC_BPMN, SYNTHETIC_BPMN)).toEqual([]); + }); + + it('办理人变更(candidateUsers items type position→user)→ 只标接收交底「办理人变更」', () => { + const edited = SYNTHETIC_BPMN.replace( + '"type":"position"', + '"type":"user"', + ); + const diff = diffSummary(SYNTHETIC_BPMN, edited); + expect(diff).toEqual([{ nodeName: '接收交底', changes: ['办理人变更'] }]); + }); + + it('指派人变更(activiti:assignee ${assignee}→${boss})→ 只标编写交底「指派人变更」', () => { + const edited = SYNTHETIC_BPMN.replace( + 'activiti:assignee="${assignee}"', + 'activiti:assignee="${boss}"', + ); + const diff = diffSummary(SYNTHETIC_BPMN, edited); + expect(diff).toEqual([{ nodeName: '编写交底', changes: ['指派人变更'] }]); + }); + + it('formKey 变更 → 只标接收交底「表单变更」', () => { + const edited = SYNTHETIC_BPMN.replace( + 'activiti:formKey="3eee7644-f51d-4755-9abb-aca7f4dd8516"', + 'activiti:formKey="99999999-0000-0000-0000-000000000000"', + ); + const diff = diffSummary(SYNTHETIC_BPMN, edited); + expect(diff).toEqual([{ nodeName: '接收交底', changes: ['表单变更'] }]); + }); + + it('会签开启(源无会签→当前有)→ 编写交底「会签开启」', () => { + const diff = diffSummary(NO_COSIGN, SYNTHETIC_BPMN); + expect(diff).toEqual([{ nodeName: '编写交底', changes: ['会签开启'] }]); + }); + + it('会签关闭(源有会签→当前无)→ 编写交底「会签关闭」', () => { + const diff = diffSummary(SYNTHETIC_BPMN, NO_COSIGN); + expect(diff).toEqual([{ nodeName: '编写交底', changes: ['会签关闭'] }]); + }); + + it('会签人员变更(collection items type projectRoleType→scriptUser)→ 编写交底「会签人员变更」', () => { + const edited = SYNTHETIC_BPMN.replace( + '"type":"projectRoleType"', + '"type":"scriptUser"', + ); + const diff = diffSummary(SYNTHETIC_BPMN, edited); + expect(diff).toEqual([{ nodeName: '编写交底', changes: ['会签人员变更'] }]); + }); + + it('会签完成条件变更(全票 ==1 → 过半 >0.5)→ 编写交底「会签完成条件变更」', () => { + const edited = SYNTHETIC_BPMN.replace( + '/nrOfInstances==1}', + '/nrOfInstances>0.5}', + ); + const diff = diffSummary(SYNTHETIC_BPMN, edited); + expect(diff).toEqual([{ nodeName: '编写交底', changes: ['会签完成条件变更'] }]); + }); + + it('一个节点多类同时变更 → changes 汇总多项', () => { + let edited = SYNTHETIC_BPMN.replace( + 'activiti:formKey="3eee7644-f51d-4755-9abb-aca7f4dd8516"', + 'activiti:formKey="99999999-0000-0000-0000-000000000000"', + ); + edited = edited.replace( + '"type":"position"', + '"type":"user"', + ); + const diff = diffSummary(SYNTHETIC_BPMN, edited); + expect(diff).toHaveLength(1); + expect(diff[0].nodeName).toBe('接收交底'); + expect(diff[0].changes).toEqual(expect.arrayContaining(['办理人变更', '表单变更'])); + expect(diff[0].changes).toHaveLength(2); + }); + + it('新增用户任务 → 标「新增用户任务」', () => { + const added = SYNTHETIC_BPMN.replace( + '', + '', + ); + const diff = diffSummary(SYNTHETIC_BPMN, added); + expect(diff).toEqual([{ nodeName: '新审批', changes: ['新增用户任务'] }]); + }); + + it('删除用户任务 → 标「删除用户任务」', () => { + // 从当前移除 t_receive(用其带 boundaryEvent 的完整块不便,改用 name 回退验证:直接删 t_write 块)。 + const removed = SYNTHETIC_BPMN.replace( + //, + '', + ); + const diff = diffSummary(SYNTHETIC_BPMN, removed); + expect(diff).toEqual([{ nodeName: '编写交底', changes: ['删除用户任务'] }]); + }); + + it('无 name 的节点回退用 id 作 nodeName', () => { + const added = SYNTHETIC_BPMN.replace( + '', + '', + ); + const diff = diffSummary(SYNTHETIC_BPMN, added); + expect(diff).toEqual([{ nodeName: 't_noname', changes: ['新增用户任务'] }]); + }); + + it('坏 XML(任一侧解析失败)→ 返回空数组不抛', () => { + expect(() => diffSummary(' { + const item = (type: string, content: string): UserPropertyItem => ({ + type, + content, + isCandidate: true, + isSendMail: false, + isSendPhone: false, + isSendMessage: false, + }); + // 办理人表达式属性值需把 " 转义成 " 才能进 XML 属性。 + const candAttr = (items: UserPropertyItem[]) => + buildCandidateExpression(items, 'candidate').replace(/"/g, '"'); + + // 默认命名空间(无前缀),activiti: 前缀属性——模拟存量源。 + const defaultNs = (items: UserPropertyItem[]) => + ` + + + + +`; + + // bpmn: 前缀(BPMN 元素全部带前缀,namespaceURI 不变)——模拟 bpmn-js saveXML 输出。 + const bpmnPrefixed = (items: UserPropertyItem[]) => + ` + + + + +`; + + const ITEMS_A = [item('user', 'u1')]; + const ITEMS_B = [item('depart', 'd1')]; + + it('前缀不同、语义相同 → 无变化(前缀本身不误报)', () => { + expect(diffSummary(defaultNs(ITEMS_A), bpmnPrefixed(ITEMS_A))).toEqual([]); + }); + + it('前缀不同、办理人改了 → 按 URI 对齐命中「办理人变更」', () => { + expect(diffSummary(defaultNs(ITEMS_A), bpmnPrefixed(ITEMS_B))).toEqual([ + { nodeName: '任务甲', changes: ['办理人变更'] }, + ]); + }); +}); + +// M1:会签人员 content 的全角/半角宽度变体不应误报(parse 已 fullToHalf,diff 再兜一层 normWidth)。 +describe('diffSummary — 人员 content 宽度变体不误报(M1)', () => { + it('collection content 仅全角【】↔半角{} 之差 → 无「会签人员变更」', () => { + // 两版仅 collection 人员 content 的括号宽度不同:${x}(半角)vs $【x】(全角),运行期等价。 + const withHalf = SYNTHETIC_BPMN.replace( + '"content":"true,false,false,false,false,false,false,false,false,false,false"', + '"content":"${x}"', + ); + const withFull = SYNTHETIC_BPMN.replace( + '"content":"true,false,false,false,false,false,false,false,false,false,false"', + '"content":"$【x】"', + ); + expect(withHalf).not.toBe(withFull); // 两版确有字面差异 + expect(diffSummary(withHalf, withFull)).toEqual([]); + }); +}); diff --git a/src/modeler/diffSummary.ts b/src/modeler/diffSummary.ts new file mode 100644 index 0000000..074f552 --- /dev/null +++ b/src/modeler/diffSummary.ts @@ -0,0 +1,175 @@ +// 发布影响摘要——节点级 diff(计划 §0.5 P2)。 +// +// 纯函数:以打开流程时保存的**源 XML**(openSourceXml)对比当前编辑器 saveXML 的**当前 XML** +// (currentXml),按 userTask id 对齐,比较四类会真正影响运行期办理/派任的属性变化: +// ① 办理人 activiti:candidateUsers(用 candidateExpression.parse 比 items,忽略仅格式差异) +// ② 指派人 activiti:assignee +// ③ 表单 activiti:formKey +// ④ 会签 多实例(有无切换 / collection 人员 / completionCondition 完成条件) +// 以及新增 / 删除的用户任务。只返回有变化的节点。不做通用图 diff(YAGNI)。 +// +// 实现要点: +// - 用 DOMParser 命名空间感知解析(getElementsByTagNameNS / getAttributeNS 按 URI 匹配), +// 故 bpmn-js 导出的 `bpmn:` 前缀 vs 存量源的默认命名空间不影响对齐(前缀无关,只认 URI)。 +// - 办理人/会签人员的比较走 candidateExpression codec:解析出 items 做规范化签名对比, +// bpmn-js round-trip 产生的纯格式差异(半角{}→全角【】等)不误报为变更。 +// - 防御性:任一侧 XML 解析失败 → 返回 [](影响摘要是补充信息,版本/实例数才是权威)。 + +import { parseCandidateExpression } from './candidateExpression'; + +const BPMN_NS = 'http://www.omg.org/spec/BPMN/20100524/MODEL'; +const ACTIVITI_NS = 'http://activiti.org/bpmn'; +const FLOWABLE_NS = 'http://flowable.org/bpmn'; + +/** 单个变化节点:节点名(name 回退 id)+ 变化类别中文清单。 */ +export interface NodeDiff { + nodeName: string; + changes: string[]; +} + +/** activiti/flowable 扩展属性读值(命名空间 URI 匹配 + 限定名回退),缺失返 undefined。 */ +function extAttr(el: Element, local: string): string | undefined { + const tryNs = (ns: string): string | undefined => { + const v = el.getAttributeNS(ns, local); + return v == null ? undefined : v; + }; + let v = tryNs(ACTIVITI_NS); + if (v === undefined) v = tryNs(FLOWABLE_NS); + if (v === undefined) { + const q = el.getAttribute('activiti:' + local) ?? el.getAttribute('flowable:' + local); + v = q == null ? undefined : q; + } + return v; +} + +/** 解析 XML → Document;坏 XML(parsererror / 无根 / 抛异常)返 null。 */ +function parseDoc(xml: string): Document | null { + if (typeof xml !== 'string' || xml.length === 0) return null; + try { + const doc = new DOMParser().parseFromString(xml, 'application/xml'); + if (doc.getElementsByTagName('parsererror').length > 0) return null; + if (!doc.documentElement) return null; + return doc; + } catch { + return null; + } +} + +/** 文档内所有 userTask(按命名空间 URI),id→元素,保留文档顺序。 */ +function userTasks(doc: Document): Map { + const map = new Map(); + const list = doc.getElementsByTagNameNS(BPMN_NS, 'userTask'); + for (let i = 0; i < list.length; i++) { + const el = list[i]; + const id = el.getAttribute('id'); + if (id) map.set(id, el); + } + return map; +} + +function nameOf(el: Element, id: string): string { + const name = el.getAttribute('name'); + return name && name.trim() ? name : id; +} + +/** userTask 的多实例(会签)loop 元素,无则 null。 */ +function miOf(el: Element): Element | null { + const list = el.getElementsByTagNameNS(BPMN_NS, 'multiInstanceLoopCharacteristics'); + return list.length ? list[0] : null; +} + +/** 多实例完成条件 body(折叠全部空白后比较,避免 bpmn-js 重排空白误报变更),无则空串。 */ +function completionBody(mi: Element): string { + const list = mi.getElementsByTagNameNS(BPMN_NS, 'completionCondition'); + return list.length ? (list[0].textContent ?? '').replace(/\s+/g, '') : ''; +} + +/** 全角【】↔半角{} 归一(与 codec parse 的 fullToHalf 同口径),防人员 content 宽度变体误报。 */ +function normWidth(s: string): string { + return s.split('【').join('{').split('】').join('}'); +} + +/** + * 办理人/会签人员表达式的**语义签名**:能解析则取 items 的规范化投影(type/content/四通知开关), + * 忽略 meta 与格式差异;不能解析(非标准表达式)则回退原串比较;空则空串。 + * 两侧签名不同即视为人员配置变化。 + */ +function exprSig(raw: string | undefined): string { + if (!raw) return ''; + const parsed = parseCandidateExpression(raw); + if (!parsed) return 'RAW:' + normWidth(raw); + return JSON.stringify( + parsed.items.map((i) => [ + i.type, + normWidth(i.content), + !!i.isCandidate, + !!i.isSendMail, + !!i.isSendPhone, + !!i.isSendMessage, + ]), + ); +} + +/** 比较同一 id 的两个 userTask,返回变化类别清单(无变化返 [])。 */ +function nodeChanges(a: Element, b: Element): string[] { + const changes: string[] = []; + + if (exprSig(extAttr(a, 'candidateUsers')) !== exprSig(extAttr(b, 'candidateUsers'))) { + changes.push('办理人变更'); + } + if ((extAttr(a, 'assignee') ?? '') !== (extAttr(b, 'assignee') ?? '')) { + changes.push('指派人变更'); + } + if ((extAttr(a, 'formKey') ?? '') !== (extAttr(b, 'formKey') ?? '')) { + changes.push('表单变更'); + } + + const miA = miOf(a); + const miB = miOf(b); + if (miA && !miB) { + changes.push('会签关闭'); + } else if (!miA && miB) { + changes.push('会签开启'); + } else if (miA && miB) { + if (exprSig(extAttr(miA, 'collection')) !== exprSig(extAttr(miB, 'collection'))) { + changes.push('会签人员变更'); + } + if (completionBody(miA) !== completionBody(miB)) { + changes.push('会签完成条件变更'); + } + } + + return changes; +} + +/** + * 节点级发布影响 diff。openSourceXml=打开时源,currentXml=当前 saveXML。 + * 返回有变化的用户任务清单(含新增/删除);任一侧坏 XML → []。 + */ +export function diffSummary(openSourceXml: string, currentXml: string): NodeDiff[] { + const srcDoc = parseDoc(openSourceXml); + const curDoc = parseDoc(currentXml); + if (!srcDoc || !curDoc) return []; + + const src = userTasks(srcDoc); + const cur = userTasks(curDoc); + const out: NodeDiff[] = []; + + // 当前文档顺序:匹配节点比属性;仅当前有 = 新增。 + cur.forEach((curEl, id) => { + const srcEl = src.get(id); + if (!srcEl) { + out.push({ nodeName: nameOf(curEl, id), changes: ['新增用户任务'] }); + return; + } + const changes = nodeChanges(srcEl, curEl); + if (changes.length) out.push({ nodeName: nameOf(curEl, id), changes }); + }); + + // 仅源有 = 删除。 + src.forEach((srcEl, id) => { + if (!cur.has(id)) out.push({ nodeName: nameOf(srcEl, id), changes: ['删除用户任务'] }); + }); + + return out; +} diff --git a/src/modeler/moddle/activiti.json b/src/modeler/moddle/activiti.json index 03777a3..24977ee 100644 --- a/src/modeler/moddle/activiti.json +++ b/src/modeler/moddle/activiti.json @@ -2,6 +2,7 @@ "name": "Activiti", "uri": "http://activiti.org/bpmn", "prefix": "activiti", + "xml": { "tagAlias": "lowerCase" }, "associations": [], "types": [ { @@ -90,7 +91,7 @@ ] }, { - "name": "taskListener", + "name": "TaskListener", "superClass": ["Element"], "meta": { "allowedIn": ["bpmn:UserTask"] }, "properties": [ @@ -98,11 +99,11 @@ { "name": "class", "isAttr": true, "type": "String" }, { "name": "expression", "isAttr": true, "type": "String" }, { "name": "delegateExpression", "isAttr": true, "type": "String" }, - { "name": "fields", "type": "field", "isMany": true } + { "name": "fields", "type": "Field", "isMany": true } ] }, { - "name": "executionListener", + "name": "ExecutionListener", "superClass": ["Element"], "meta": { "allowedIn": ["*"] }, "properties": [ @@ -110,11 +111,11 @@ { "name": "class", "isAttr": true, "type": "String" }, { "name": "expression", "isAttr": true, "type": "String" }, { "name": "delegateExpression", "isAttr": true, "type": "String" }, - { "name": "fields", "type": "field", "isMany": true } + { "name": "fields", "type": "Field", "isMany": true } ] }, { - "name": "field", + "name": "Field", "superClass": ["Element"], "meta": { "allowedIn": ["*"] }, "properties": [ @@ -125,7 +126,7 @@ ] }, { - "name": "formProperty", + "name": "FormProperty", "superClass": ["Element"], "meta": { "allowedIn": ["*"] }, "properties": [ @@ -140,11 +141,11 @@ { "name": "datePattern", "isAttr": true, "type": "String" }, { "name": "default", "isAttr": true, "type": "String" }, { "name": "value", "isAttr": true, "type": "String" }, - { "name": "values", "type": "value", "isMany": true } + { "name": "values", "type": "Value", "isMany": true } ] }, { - "name": "value", + "name": "Value", "superClass": ["Element"], "properties": [ { "name": "id", "isAttr": true, "type": "String" }, @@ -152,7 +153,7 @@ ] }, { - "name": "in", + "name": "In", "superClass": ["Element"], "meta": { "allowedIn": ["*"] }, "properties": [ @@ -163,7 +164,7 @@ ] }, { - "name": "out", + "name": "Out", "superClass": ["Element"], "meta": { "allowedIn": ["*"] }, "properties": [ diff --git a/src/modeler/moddle/fidelity.test.ts b/src/modeler/moddle/fidelity.test.ts index 23db2f5..9d60f35 100644 --- a/src/modeler/moddle/fidelity.test.ts +++ b/src/modeler/moddle/fidelity.test.ts @@ -37,9 +37,11 @@ function warns(res: any, re: RegExp): any[] { describe('activiti/flowable moddle 描述符 — 语料覆盖', () => { it('§0 全部实测 activiti 属性/元素在 activiti.json 有声明', () => { - const declared = JSON.stringify(activiti); + // 大小写不敏感:自定义元素类型名遵循 activiti/camunda 惯例=PascalCase(TaskListener/Field/…), + // xml.tagAlias:lowerCase 令 XML 元素名仍小写()。见 serialization.test.ts。 + const declared = JSON.stringify(activiti).toLowerCase(); [...CORPUS_ATTRS, ...CORPUS_ELEMENTS].forEach((n) => - expect(declared, `activiti:${n} 未声明`).toContain(`"${n}"`)); + expect(declared, `activiti:${n} 未声明`).toContain(`"${n.toLowerCase()}"`)); }); it('flowable.json 声明命名空间与 flowable:assignee', () => { @@ -85,14 +87,14 @@ describe('activiti round-trip 零丢失(合成 fixture 覆盖全扩展面)', const { rootElement } = await newActiviti().fromXML(SYNTHETIC_BPMN); const receive = findById(rootElement, 't_receive'); const listener = receive.extensionElements.values.find( - (v: any) => v.$type === 'activiti:taskListener', + (v: any) => v.$type === 'activiti:TaskListener', ); expect(listener.event).toBe('complete'); expect(listener.class).toBe('com.dsasp.server.wf.user.listener.TaskCompleteListener'); expect(listener.fields[0].name).toBe('mailTemplate'); expect(listener.fields[0].string).toBe('审批完成通知'); const formProp = receive.extensionElements.values.find( - (v: any) => v.$type === 'activiti:formProperty', + (v: any) => v.$type === 'activiti:FormProperty', ); expect(formProp.id).toBe('fp_remark'); expect(formProp.values.map((v: any) => v.name)).toEqual(['同意', '驳回']); diff --git a/src/modeler/moddle/flowable.json b/src/modeler/moddle/flowable.json index acbf045..69b0279 100644 --- a/src/modeler/moddle/flowable.json +++ b/src/modeler/moddle/flowable.json @@ -2,6 +2,7 @@ "name": "Flowable", "uri": "http://flowable.org/bpmn", "prefix": "flowable", + "xml": { "tagAlias": "lowerCase" }, "associations": [], "types": [ { @@ -44,7 +45,7 @@ ] }, { - "name": "taskListener", + "name": "TaskListener", "superClass": ["Element"], "meta": { "allowedIn": ["bpmn:UserTask"] }, "properties": [ @@ -52,11 +53,11 @@ { "name": "class", "isAttr": true, "type": "String" }, { "name": "expression", "isAttr": true, "type": "String" }, { "name": "delegateExpression", "isAttr": true, "type": "String" }, - { "name": "fields", "type": "field", "isMany": true } + { "name": "fields", "type": "Field", "isMany": true } ] }, { - "name": "field", + "name": "Field", "superClass": ["Element"], "meta": { "allowedIn": ["*"] }, "properties": [ @@ -67,7 +68,7 @@ ] }, { - "name": "formProperty", + "name": "FormProperty", "superClass": ["Element"], "meta": { "allowedIn": ["*"] }, "properties": [ @@ -75,11 +76,11 @@ { "name": "name", "isAttr": true, "type": "String" }, { "name": "type", "isAttr": true, "type": "String" }, { "name": "required", "isAttr": true, "type": "String" }, - { "name": "values", "type": "value", "isMany": true } + { "name": "values", "type": "Value", "isMany": true } ] }, { - "name": "value", + "name": "Value", "superClass": ["Element"], "properties": [ { "name": "id", "isAttr": true, "type": "String" }, diff --git a/src/modeler/moddle/serialization.test.ts b/src/modeler/moddle/serialization.test.ts new file mode 100644 index 0000000..c693c25 --- /dev/null +++ b/src/modeler/moddle/serialization.test.ts @@ -0,0 +1,95 @@ +import { describe, it, expect } from 'vitest'; +import BpmnModdle from 'bpmn-moddle'; +import activiti from './activiti.json'; +import flowable from './flowable.json'; +import { SYNTHETIC_BPMN } from './fixtures/synthetic-full-surface.bpmn'; + +// 元素名大小写回归(CRITICAL:断部署)。 +// +// 根因:moddle 把「被扩展类型」的合并描述符 $pkg 设为**最后一个 trait 的包** +// (moddle index.esm.js:577)。activiti.json 用 `extends` 给 bpmn:Process/UserTask/StartEvent… +// 加属性 → 这些基础类型的 $pkg 变成 activiti 包;moddle-xml 序列化时按 $pkg 的 +// `xml.tagAlias` 决定元素名首字母是否小写。bpmn 包有 `tagAlias:"lowerCase"`(Process→process), +// activiti 包若无此声明 → 写出 PascalCase `//`。 +// **Flowable 大小写敏感**:`` 不被识别为流程 → 部署时 ProcessValidator 报 +// flowable-process-definition-not-executable(看到 0 个可执行流程),部署完全失败。 +// +// 为何 T1.1/T1.2 没抓到:它们只断言 activiti 扩展属性/元素多重集,**从不断言基础 BPMN 元素名的 +// 大小写**;且 fromXML→toXML 与 create 都走同一 moddle-xml Writer,均产 PascalCase(本文件实证)。 +// +// 为何用 BpmnModdle 而非真 Modeler:bpmn-js Modeler 依赖 diagram-js 的 SVG 布局(getBBox 等), +// jsdom 跑不动;而 Modeler.saveXML 在 moddle 层就是 `moddle.toXML(定义树)`,diagram-js 从不改元素名。 +// 故 `new BpmnModdle({activiti})` 的 fromXML→toXML / create→toXML 忠实复现 saveXML 的元素命名路径。 + +const BASE_TYPES: Array<[create: string, lower: string, pascal: string]> = [ + ['bpmn:Process', 'process', 'Process'], + ['bpmn:UserTask', 'userTask', 'UserTask'], + ['bpmn:StartEvent', 'startEvent', 'StartEvent'], + ['bpmn:ScriptTask', 'scriptTask', 'ScriptTask'], + ['bpmn:EndEvent', 'endEvent', 'EndEvent'], + ['bpmn:SequenceFlow', 'sequenceFlow', 'SequenceFlow'], + ['bpmn:BoundaryEvent', 'boundaryEvent', 'BoundaryEvent'], +]; + +/** 元素名正则(可选 bpmn: 前缀 + 精确 token + 分隔符),大小写敏感。 */ +const openTag = (name: string) => new RegExp('<(bpmn:)?' + name + '[\\s/>]'); + +describe('moddle 序列化——基础 BPMN 元素名小写(断部署回归)', () => { + it('打开存量再导出(fromXML→toXML):基础元素名全小写,无 PascalCase(Flowable 可识别)', async () => { + const moddle = new BpmnModdle({ activiti }); + const { rootElement } = await moddle.fromXML(SYNTHETIC_BPMN); + const { xml } = await moddle.toXML(rootElement, { format: true }); + for (const [, lower, pascal] of BASE_TYPES) { + expect(xml, `应含小写 <${lower}>`).toMatch(openTag(lower)); + expect(xml, `不应含 PascalCase <${pascal}>(Flowable 大小写敏感)`).not.toMatch(openTag(pascal)); + } + }); + + it('isExecutable 症状:process 元素小写且保留 isExecutable="true"', async () => { + const moddle = new BpmnModdle({ activiti }); + const { rootElement } = await moddle.fromXML(SYNTHETIC_BPMN); + const { xml } = await moddle.toXML(rootElement, { format: true }); + // 真正的 bug 是 不被识别("isExecutable 丢失"只是症状)——断言 process 小写即可。 + expect(xml).toMatch(/<(bpmn:)?process[\s][^>]*isExecutable="true"/); + expect(xml).not.toMatch(openTag('Process')); + }); + + it('新建元素(create→toXML):新建流程各基础节点名也全小写', async () => { + const moddle = new BpmnModdle({ activiti }); + const defs = moddle.create('bpmn:Definitions', { targetNamespace: 'http://x' }); + const proc = moddle.create('bpmn:Process', { id: 'p1', isExecutable: true }); + const start = moddle.create('bpmn:StartEvent', { id: 's1' }); + const ut = moddle.create('bpmn:UserTask', { + id: 't1', + 'activiti:candidateUsers': 'X', + 'activiti:formKey': 'K', + }); + const flow = moddle.create('bpmn:SequenceFlow', { id: 'f1', sourceRef: start, targetRef: ut }); + const end = moddle.create('bpmn:EndEvent', { id: 'e1' }); + proc.flowElements = [start, ut, flow, end]; + defs.rootElements = [proc]; + const { xml } = await moddle.toXML(defs, { format: true }); + for (const [, lower, pascal] of BASE_TYPES.filter(([, l]) => l !== 'scriptTask' && l !== 'boundaryEvent')) { + expect(xml, `应含小写 <${lower}>`).toMatch(openTag(lower)); + expect(xml, `不应含 PascalCase <${pascal}>`).not.toMatch(openTag(pascal)); + } + // 扩展属性 / 自定义元素不受影响 + expect(xml).toContain('activiti:candidateUsers="X"'); + expect(xml).toContain('activiti:formKey="K"'); + }); + + it('flowable 描述符隔离同样小写(虽不进 Modeler,防同类潜伏 bug)', async () => { + const moddle = new BpmnModdle({ flowable }); + const defs = moddle.create('bpmn:Definitions', { targetNamespace: 'http://x' }); + const proc = moddle.create('bpmn:Process', { id: 'p1', isExecutable: true }); + const ut = moddle.create('bpmn:UserTask', { id: 't1', 'flowable:assignee': 'u1' }); + proc.flowElements = [ut]; + defs.rootElements = [proc]; + const { xml } = await moddle.toXML(defs, { format: true }); + expect(xml).toMatch(openTag('process')); + expect(xml).toMatch(openTag('userTask')); + expect(xml).not.toMatch(openTag('Process')); + expect(xml).not.toMatch(openTag('UserTask')); + expect(xml).toContain('flowable:assignee="u1"'); + }); +}); diff --git a/src/pages/ProcessModelerPage.test.tsx b/src/pages/ProcessModelerPage.test.tsx index 3d665ea..598df8b 100644 --- a/src/pages/ProcessModelerPage.test.tsx +++ b/src/pages/ProcessModelerPage.test.tsx @@ -42,6 +42,9 @@ vi.mock('../api/processModeler', () => ({ saveDraft: vi.fn(() => Promise.resolve()), draftFromProcDef: vi.fn(() => Promise.resolve('FP-1')), deleteDraft: vi.fn(() => Promise.resolve()), + // T3.3 发布:PublishConfirm 挂载拉 impact、确认调 deploy——mock 成默认成功态。 + deployModel: vi.fn(() => Promise.resolve({ ok: true, deploymentId: 'D1', processKey: 'k', newVersion: 4 })), + fetchImpact: vi.fn(() => Promise.resolve({ found: true, processKey: 'k', currentVersion: 3, runningInstances: 0 })), })); vi.mock('../auth/token', async (importOriginal) => ({ ...(await importOriginal()), @@ -59,6 +62,8 @@ import { saveDraft, draftFromProcDef, deleteDraft, + deployModel, + fetchImpact, } from '../api/processModeler'; import { getProfile } from '../auth/token'; @@ -71,6 +76,8 @@ const mCreateDraft = vi.mocked(createDraft); const mSaveDraft = vi.mocked(saveDraft); const mFromProcDef = vi.mocked(draftFromProcDef); const mDeleteDraft = vi.mocked(deleteDraft); +const mDeploy = vi.mocked(deployModel); +const mImpact = vi.mocked(fetchImpact); const mProfile = vi.mocked(getProfile); function renderPage(initialPath = '/process-modeler') { @@ -103,6 +110,8 @@ beforeEach(() => { mSaveDraft.mockReset().mockResolvedValue(undefined); mFromProcDef.mockReset().mockResolvedValue('FP-1'); mDeleteDraft.mockReset().mockResolvedValue(undefined); + mDeploy.mockReset().mockResolvedValue({ ok: true, deploymentId: 'D1', processKey: 'k', newVersion: 4 }); + mImpact.mockReset().mockResolvedValue({ found: true, processKey: 'k', currentVersion: 3, runningInstances: 0 }); mProfile.mockReset().mockReturnValue({ userId: 'ADMIN', account: 'admin', name: '管理员', roles: [] }); }); @@ -292,4 +301,73 @@ describe('ProcessModelerPage', () => { expect(mDeleteDraft).not.toHaveBeenCalled(); confirmSpy.mockRestore(); }); + + // ── T3.3 发布 gating + 同人确认 ──────────────────────────────────────────── + const publishBtn = () => screen.getByTestId('process-modeler-publish'); + + it('未打开任何流程时发布按钮 disabled(无 Modeler 实例)', async () => { + renderPage(); + expect(publishBtn()).toBeDisabled(); + await act(async () => { + await Promise.resolve(); + }); + }); + + it('发布 gating:存量按 key 打开(尚无 modelId)→点发布不开确认弹窗、不 deploy', async () => { + renderPage('/process-modeler?procKey=' + encodeURIComponent('总包合同交底')); + await waitFor(() => expect(importXMLMock).toHaveBeenCalled()); + await waitFor(() => expect(publishBtn()).not.toBeDisabled()); // 可点(触发提示分支) + fireEvent.click(publishBtn()); + await act(async () => { + await Promise.resolve(); + }); + // 无 modelId:提示先存草稿,不开弹窗、不发布 + expect(screen.queryByTestId('process-modeler-publish-confirm')).not.toBeInTheDocument(); + expect(mDeploy).not.toHaveBeenCalled(); + }); + + it('发布:打开草稿(有 modelId)→点发布→先持久化(I2)→开同人确认弹窗并按 modelId 拉 impact', async () => { + renderPage('/process-modeler?modelId=MD-7'); + await waitFor(() => expect(importXMLMock).toHaveBeenCalled()); + await waitFor(() => expect(publishBtn()).not.toBeDisabled()); + fireEvent.click(publishBtn()); + await waitFor(() => expect(saveXMLMock).toHaveBeenCalled()); + // I2:发布前先 saveDraft(当前 xml) 持久化,使部署内容==预览==diff current 侧。 + await waitFor(() => expect(mSaveDraft).toHaveBeenCalledWith('MD-7', { bpmnXml: '' })); + await waitFor(() => expect(screen.getByTestId('process-modeler-publish-confirm')).toBeInTheDocument()); + await waitFor(() => expect(mImpact).toHaveBeenCalledWith('MD-7')); + // 确认发布 → deployModel(MD-7) → 成功后弹窗关闭 + fireEvent.click(screen.getByTestId('publish-confirm-btn')); + await waitFor(() => expect(mDeploy).toHaveBeenCalledWith('MD-7')); + await waitFor(() => + expect(screen.queryByTestId('process-modeler-publish-confirm')).not.toBeInTheDocument(), + ); + }); + + // I1 锁:存量按 key 打开→改→首存(reload)→发布,diff 基线必须仍是**原始源**(非「已存版」),故 diff 非空。 + it('I1:存量 save→publish 后 diff 基线仍是原始源→变更清单非空', async () => { + // 原始源(办理人 type=position) vs 首存后 reload/当前编辑器态(办理人 type=user)。 + const EDITED = SYNTHETIC_BPMN.replace( + '"type":"position"', + '"type":"user"', + ); + mSourceByKey.mockResolvedValue({ found: true, bpmnXml: SYNTHETIC_BPMN, idMap: { '总包合同交底': 'Proc_zbht' } }); + // 首存后 setParams(modelId=NEW-1) 触发 reload:getModel 返回已存(编辑)版,模拟服务端草稿态。 + mGetModel.mockResolvedValue({ found: true, bpmnXml: EDITED, metaInfo: JSON.stringify({ eip4IdMap: {} }), key: '总包合同交底' }); + // 当前编辑器 saveXML 返回编辑版(与已存版一致)。 + saveXMLMock.mockResolvedValue({ xml: EDITED }); + + renderPage('/process-modeler?procKey=' + encodeURIComponent('总包合同交底')); + await waitFor(() => expect(importXMLMock).toHaveBeenCalledWith(SYNTHETIC_BPMN)); // 初次载原始源 + await waitFor(() => expect(saveBtn()).not.toBeDisabled()); + fireEvent.click(saveBtn()); // 首存 → createDraft NEW-1 → 回填 ?modelId= → reload + await waitFor(() => expect(mCreateDraft).toHaveBeenCalled()); + await waitFor(() => expect(mGetModel).toHaveBeenCalledWith('NEW-1')); + await waitFor(() => expect(publishBtn()).not.toBeDisabled()); + fireEvent.click(publishBtn()); + await waitFor(() => expect(screen.getByTestId('process-modeler-publish-confirm')).toBeInTheDocument()); + // 基线保留为原始源 → diff(原始, 编辑) 非空、含「办理人变更」;未修复则基线=编辑版 → diff 空。 + expect(screen.queryByTestId('publish-diff-empty')).not.toBeInTheDocument(); + expect(screen.getByTestId('publish-diff-list')).toHaveTextContent('办理人变更'); + }); }); diff --git a/src/pages/ProcessModelerPage.tsx b/src/pages/ProcessModelerPage.tsx index 69a9a94..c37c003 100644 --- a/src/pages/ProcessModelerPage.tsx +++ b/src/pages/ProcessModelerPage.tsx @@ -27,6 +27,7 @@ import { type ModelSummary, } from '../api/processModeler'; import { Eip4Panel, type PanelModeler } from '../modeler/Eip4Panel'; +import { PublishConfirm } from '../modeler/PublishConfirm'; import { toast } from '../components/ui'; // bpmn-js/lib/Modeler 自带类型,但选项对象里的标准面板模块(本项目无类型)与 moddle JSON @@ -77,10 +78,18 @@ export function ProcessModelerPage() { const modelIdRef = useRef(''); // 当前载入流程的 key(存量 procDefKey / 草稿 key)——新建草稿的 name/key 源。 const loadedKeyRef = useRef(''); + // 打开时的**原始**源 XML(发布影响摘要的 diff 基线:openSource vs 当前 saveXML)。 + const openSourceRef = useRef(''); + // 基线归属标识:openSourceRef 对应哪个打开目标。存量首存会 setParams(modelId) 触发载入 effect + // 重跑(procKey→modelId),若每次重设基线,则「打开存量→改→存→发布」的 diff(已存版,已存版) 恒空 + // (I1)。故首存前把归属预置为新 modelId,effect 见归属未变即**保留原始基线不重置**。 + const baselineTargetRef = useRef(''); const [loadState, setLoadState] = useState('idle'); const [loadError, setLoadError] = useState(''); const [saving, setSaving] = useState(false); + // 发布弹窗:非 null 时展示 PublishConfirm,xml=点发布瞬间的 saveXML 结果。 + const [publish, setPublish] = useState<{ xml: string } | null>(null); const [options, setOptions] = useState([]); const [optionsError, setOptionsError] = useState(''); // 打开器 tab:存量流程 / 草稿。 @@ -169,6 +178,17 @@ export function ProcessModelerPage() { } idMapRef.current = src.idMap ?? {}; loadedKeyRef.current = src.key ?? ''; + // diff 基线:仅在**首次打开某目标**时捕获原始源;同目标重跑(含首存后 procKey→modelId + // 的 reload,归属已由 handleSaveDraft 预置成新 modelId)则保留,防 I1 基线被冲成「已存版」。 + const openTargetKey = modelIdParam + ? 'model:' + modelIdParam + : procDefId + ? 'pd:' + procDefId + : 'pk:' + procKey; + if (baselineTargetRef.current !== openTargetKey) { + openSourceRef.current = src.bpmnXml; // 此处 bpmnXml 已由上方 found 守卫保证非空 + baselineTargetRef.current = openTargetKey; + } // 草稿路:记住 modelId(后续保存走 PUT);存量路:清空(首次保存新建草稿)。 modelIdRef.current = modelIdParam || ''; await modeler.importXML(src.bpmnXml); @@ -220,6 +240,8 @@ export function ProcessModelerPage() { modelId = await draftFromProcDef(procDefId); await saveDraft(modelId, { bpmnXml: xml }); modelIdRef.current = modelId; + // I1:预置基线归属为新 modelId,使随后的 reload 保留原始源基线(不被冲成「已存版」)。 + baselineTargetRef.current = 'model:' + modelId; // I-2:首存回填 ?modelId=,令刷新幂等(不再重复建草稿)、二次保存恒走 PUT。 setParams({ modelId }, { replace: true }); } else { @@ -233,6 +255,8 @@ export function ProcessModelerPage() { }); modelId = await createDraft({ name: key, key, bpmnXml: xml, metaInfo }); modelIdRef.current = modelId; + // I1:同上,reload 保留原始源基线。 + baselineTargetRef.current = 'model:' + modelId; setParams({ modelId }, { replace: true }); } toast('已保存草稿', 'ok'); @@ -243,6 +267,26 @@ export function ProcessModelerPage() { } } + // 发布:需先有草稿(modelId)——未存则提示先存;已存则先把当前编辑器态持久化进草稿,再开确认弹窗。 + // I2:后端 deploy 从服务端草稿取源部署,故发布前必须 saveDraft(currentXml),使 + // 部署内容 == 预览内容 == diff 的 current 侧(否则「打开草稿→改未存→直接发布」预览≠部署)。 + async function handlePublishClick() { + const modeler = modelerRef.current; + if (!modeler || saving) return; + const modelId = modelIdRef.current; + if (!modelId) { + toast('请先保存草稿,再发布', 'warn'); + return; + } + try { + const { xml } = await modeler.saveXML({ format: true }); + await saveDraft(modelId, { bpmnXml: xml }); // 持久化当前态,保证部署==预览 + setPublish({ xml }); + } catch { + toast('发布前保存失败,请重试', 'err'); + } + } + if (!isAdmin) { return
流程设计器仅管理员可用。
; } @@ -313,7 +357,13 @@ export function ProcessModelerPage() { > {saving ? '保存中…' : '保存草稿'} -