feat(modeler): EIP4 侧板五控件(办理人meta透传/会签/formKey/扩展属性/监听器)
选中 userTask 时在标准属性面板上方叠加 React 侧板(§0.5 P5),全部写操作经
modeling.updateProperties(element,{...}),undo/redo 天然生效:
- 办理人:activiti:candidateUsers 经 codec parse→items 表格→build 写回,
🔴 codec 外层业务 meta(taskSuccessService 等)存 ref、写回原样带回(硬要求用例覆盖)
- 会签:loopCharacteristics 开关(moddle.create MultiInstanceLoopCharacteristics,
activiti:collection multiInstance 变体+elementVariable=assignee+completionCondition
全票/过半/指定数 N 三预设);关→undefined
- formKey:GET /api/workflow/wftemplates 下拉写 activiti:formKey(裸 UUID),「无」清除
- 扩展属性:长尾 $attrs(activiti:/flowable:)增删改
- 任务监听器:activiti:taskListener event+class/delegateExpression 互斥;已有 field
子元素显示徽标并原样保留(moddle 元素引用不动)
新增 useSelectedElement hook(订阅 selection.changed,单选返 element/多选空选 null/卸载解绑)。
ProcessModelerPage 右栏上方挂 Eip4Panel(modeler 入 state 驱动订阅)。
📌 红线回归:ProcessModelerPage 断言 moddleExtensions 键恰 ['activiti']、
additionalModules 长度 2(防双包冲突静默丢 userTask)。
测试:Eip4Panel 20 + useSelectedElement 5 + ProcessModelerPage 10(+1 红线);
全量 vitest 164 绿 / tsc -b 干净 / npm run build 成功。
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
350
src/modeler/Eip4Panel.test.tsx
Normal file
350
src/modeler/Eip4Panel.test.tsx
Normal file
@@ -0,0 +1,350 @@
|
||||
import { describe, it, expect, vi, beforeEach } from 'vitest';
|
||||
import { render, screen, fireEvent, act, waitFor } from '@testing-library/react';
|
||||
import { SYNTHETIC_BPMN } from './moddle/fixtures/synthetic-full-surface.bpmn';
|
||||
import { parseCandidateExpression } from './candidateExpression';
|
||||
|
||||
// formKey 下拉数据源:mock,其中一个 id 对齐 fixture 的 formKey 值。
|
||||
vi.mock('../api/processModeler', () => ({
|
||||
fetchWfTemplates: vi.fn(() =>
|
||||
Promise.resolve([
|
||||
{ id: '2098ce21-400b-4425-9c22-63e350974b98', name: '合同交底表单' },
|
||||
{ id: 'aaaa-bbbb', name: '另一个表单' },
|
||||
]),
|
||||
),
|
||||
}));
|
||||
|
||||
import { Eip4Panel } from './Eip4Panel';
|
||||
|
||||
// ── 真实办理人形态锚定(同 candidateExpression.test.ts:抽 fixture,做 XML 实体解码) ────
|
||||
function xmlDecode(s: string): string {
|
||||
return s.replace(/"/g, '"').replace(/</g, '<').replace(/>/g, '>').replace(/&/g, '&');
|
||||
}
|
||||
function extractAttr(attr: string): string {
|
||||
const m = SYNTHETIC_BPMN.match(new RegExp(attr + '="([^"]*)"'));
|
||||
if (!m) throw new Error('fixture 缺属性 ' + attr);
|
||||
return xmlDecode(m[1]);
|
||||
}
|
||||
const REAL_CANDIDATE = extractAttr('activiti:candidateUsers'); // type=position + 非空 taskSuccessService
|
||||
|
||||
// ── 假 modeler / element(vi.fn 捕获 updateProperties 载荷) ────────────────────
|
||||
function makeModeler() {
|
||||
let handler: ((e: unknown) => void) | null = null;
|
||||
const updateProperties = vi.fn();
|
||||
const created: Array<Record<string, unknown>> = [];
|
||||
const moddle = {
|
||||
create: vi.fn((type: string, props: Record<string, unknown> = {}) => {
|
||||
const o = { $type: type, ...props };
|
||||
created.push(o);
|
||||
return o;
|
||||
}),
|
||||
};
|
||||
const modeling = { updateProperties };
|
||||
const on = vi.fn((ev: string, cb: (e: unknown) => void) => {
|
||||
if (ev === 'selection.changed') handler = cb;
|
||||
});
|
||||
const off = vi.fn();
|
||||
const get = (svc: string) => (svc === 'modeling' ? modeling : svc === 'moddle' ? moddle : {});
|
||||
const modeler = { on, off, get };
|
||||
// 选中同时 flush 微任务队列:fetchWfTemplates(mock 已 resolve)的 setState 在 act 内落定,
|
||||
// 避免「update not wrapped in act」告警。
|
||||
const select = (element: unknown) =>
|
||||
act(async () => {
|
||||
handler?.({ newSelection: element ? [element] : [] });
|
||||
await Promise.resolve();
|
||||
await Promise.resolve();
|
||||
});
|
||||
return { modeler, updateProperties, moddle, created, select };
|
||||
}
|
||||
|
||||
/** 造一个 userTask element:map=businessObject.get(name) 源,$attrs=原始扩展属性袋。 */
|
||||
function userTask(map: Record<string, unknown> = {}, $attrs?: Record<string, string>) {
|
||||
return {
|
||||
id: map.__id ? String(map.__id) : 't1',
|
||||
type: 'bpmn:UserTask',
|
||||
businessObject: { $type: 'bpmn:UserTask', $attrs, get: (n: string) => map[n] },
|
||||
};
|
||||
}
|
||||
|
||||
/** 造一个 moddle-ish 元素(taskListener/loop 等):$type + get(name) + 直读属性。 */
|
||||
function moddleEl(type: string, props: Record<string, unknown>) {
|
||||
return { $type: type, ...props, get: (n: string) => props[n] };
|
||||
}
|
||||
|
||||
/** 取最后一次 updateProperties 载荷。 */
|
||||
function lastPayload(updateProperties: ReturnType<typeof vi.fn>): Record<string, unknown> {
|
||||
const calls = updateProperties.mock.calls;
|
||||
return calls[calls.length - 1][1] as Record<string, unknown>;
|
||||
}
|
||||
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks();
|
||||
});
|
||||
|
||||
describe('Eip4Panel — 选择状态', () => {
|
||||
it('未选中任何节点时提示选择', async () => {
|
||||
const { modeler } = makeModeler();
|
||||
render(<Eip4Panel modeler={modeler} />);
|
||||
expect(screen.getByText(/请选择/)).toBeInTheDocument();
|
||||
// flush 挂载期 fetchWfTemplates 的 setState(避免 act 告警)
|
||||
await act(async () => {
|
||||
await Promise.resolve();
|
||||
});
|
||||
});
|
||||
|
||||
it('选中非 userTask 显示简短提示,不渲染办理人控件', async () => {
|
||||
const { modeler, select } = makeModeler();
|
||||
render(<Eip4Panel modeler={modeler} />);
|
||||
await select({ id: 'g1', type: 'bpmn:ExclusiveGateway', businessObject: { get: () => undefined } });
|
||||
expect(screen.getByText(/不是用户任务|仅.*用户任务/)).toBeInTheDocument();
|
||||
expect(screen.queryByTestId('eip4-candidate-add')).not.toBeInTheDocument();
|
||||
});
|
||||
});
|
||||
|
||||
describe('Eip4Panel — 办理人(candidateUsers)', () => {
|
||||
it('顶部灰字提示:引擎以本控件为准', async () => {
|
||||
const { modeler, select } = makeModeler();
|
||||
render(<Eip4Panel modeler={modeler} />);
|
||||
await select(userTask());
|
||||
expect(screen.getByText(/引擎以本控件为准/)).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it('set:改 content 写回 activiti:candidateUsers(可被 codec 解析)', async () => {
|
||||
const { modeler, updateProperties, select } = makeModeler();
|
||||
render(<Eip4Panel modeler={modeler} />);
|
||||
await select(userTask({ 'activiti:candidateUsers': REAL_CANDIDATE }));
|
||||
const input = screen.getByTestId('eip4-candidate-content-0');
|
||||
fireEvent.change(input, { target: { value: 'newUser1,newUser2' } });
|
||||
const payload = lastPayload(updateProperties);
|
||||
const written = payload['activiti:candidateUsers'] as string;
|
||||
const parsed = parseCandidateExpression(written)!;
|
||||
expect(parsed.items[0].content).toBe('newUser1,newUser2');
|
||||
expect(parsed.items[0].type).toBe('position');
|
||||
});
|
||||
|
||||
it('🔴 改 items 后 meta 逐字保留(taskSuccessService 等业务字段不丢)', async () => {
|
||||
const { modeler, updateProperties, select } = makeModeler();
|
||||
const original = parseCandidateExpression(REAL_CANDIDATE)!;
|
||||
render(<Eip4Panel modeler={modeler} />);
|
||||
await select(userTask({ 'activiti:candidateUsers': REAL_CANDIDATE }));
|
||||
fireEvent.change(screen.getByTestId('eip4-candidate-content-0'), {
|
||||
target: { value: 'changed' },
|
||||
});
|
||||
const written = lastPayload(updateProperties)['activiti:candidateUsers'] as string;
|
||||
const parsed = parseCandidateExpression(written)!;
|
||||
// meta 逐字保留
|
||||
expect(parsed.meta).toEqual(original.meta);
|
||||
expect(parsed.meta.taskSuccessService).toBe('PM_CONTRACTUALREGISTER_UPDATEPROJECTSTATUS');
|
||||
// items 确已改
|
||||
expect(parsed.items[0].content).toBe('changed');
|
||||
});
|
||||
|
||||
it('清空最后一行:写回 undefined(清除属性)', async () => {
|
||||
const { modeler, updateProperties, select } = makeModeler();
|
||||
render(<Eip4Panel modeler={modeler} />);
|
||||
await select(userTask({ 'activiti:candidateUsers': REAL_CANDIDATE }));
|
||||
fireEvent.click(screen.getByTestId('eip4-candidate-remove-0'));
|
||||
expect(lastPayload(updateProperties)['activiti:candidateUsers']).toBeUndefined();
|
||||
expect('activiti:candidateUsers' in lastPayload(updateProperties)).toBe(true);
|
||||
});
|
||||
|
||||
it('增行:改 type 下拉写回对应 type', async () => {
|
||||
const { modeler, updateProperties, select } = makeModeler();
|
||||
render(<Eip4Panel modeler={modeler} />);
|
||||
await select(userTask());
|
||||
fireEvent.click(screen.getByTestId('eip4-candidate-add'));
|
||||
fireEvent.change(screen.getByTestId('eip4-candidate-type-0'), {
|
||||
target: { value: 'scriptUser' },
|
||||
});
|
||||
fireEvent.change(screen.getByTestId('eip4-candidate-content-0'), {
|
||||
target: { value: '${APPLYUSERS}' },
|
||||
});
|
||||
const written = lastPayload(updateProperties)['activiti:candidateUsers'] as string;
|
||||
const parsed = parseCandidateExpression(written)!;
|
||||
expect(parsed.items[0]).toMatchObject({ type: 'scriptUser', content: '${APPLYUSERS}' });
|
||||
});
|
||||
});
|
||||
|
||||
describe('Eip4Panel — 会签(multiInstance)', () => {
|
||||
it('开:载荷含 loopCharacteristics(collection multiInstance 前缀+elementVariable+completionCondition 全票预设)', async () => {
|
||||
const { modeler, updateProperties, select } = makeModeler();
|
||||
render(<Eip4Panel modeler={modeler} />);
|
||||
await select(userTask());
|
||||
fireEvent.click(screen.getByTestId('eip4-cosign-toggle'));
|
||||
const loop = lastPayload(updateProperties).loopCharacteristics as Record<string, unknown>;
|
||||
expect(loop).toBeTruthy();
|
||||
expect(String(loop['activiti:collection'])).toContain('multiInstanceUsersHandler.getUsers');
|
||||
expect(loop['activiti:elementVariable']).toBe('assignee');
|
||||
expect((loop.completionCondition as { body: string }).body).toBe(
|
||||
'${nrOfCompletedInstances/nrOfInstances==1}',
|
||||
);
|
||||
expect(loop.isSequential).toBe(false);
|
||||
});
|
||||
|
||||
it('关:已有会签 → 载荷 loopCharacteristics=undefined', async () => {
|
||||
const { modeler, updateProperties, select } = makeModeler();
|
||||
const loop = moddleEl('bpmn:MultiInstanceLoopCharacteristics', {
|
||||
'activiti:collection': extractAttr('activiti:collection'),
|
||||
'activiti:elementVariable': 'assignee',
|
||||
completionCondition: { body: '${nrOfCompletedInstances/nrOfInstances==1}' },
|
||||
});
|
||||
render(<Eip4Panel modeler={modeler} />);
|
||||
await select(userTask({ loopCharacteristics: loop }));
|
||||
// 初始应为开
|
||||
expect((screen.getByTestId('eip4-cosign-toggle') as HTMLInputElement).checked).toBe(true);
|
||||
fireEvent.click(screen.getByTestId('eip4-cosign-toggle'));
|
||||
const payload = lastPayload(updateProperties);
|
||||
expect('loopCharacteristics' in payload).toBe(true);
|
||||
expect(payload.loopCharacteristics).toBeUndefined();
|
||||
});
|
||||
|
||||
it('指定数 N:completionCondition body 代入 N', async () => {
|
||||
const { modeler, updateProperties, select } = makeModeler();
|
||||
render(<Eip4Panel modeler={modeler} />);
|
||||
await select(userTask());
|
||||
fireEvent.click(screen.getByTestId('eip4-cosign-toggle'));
|
||||
fireEvent.change(screen.getByTestId('eip4-cosign-completion-type'), {
|
||||
target: { value: 'count' },
|
||||
});
|
||||
fireEvent.change(screen.getByTestId('eip4-cosign-completion-n'), { target: { value: '3' } });
|
||||
const loop = lastPayload(updateProperties).loopCharacteristics as Record<string, unknown>;
|
||||
expect((loop.completionCondition as { body: string }).body).toBe(
|
||||
'${nrOfCompletedInstances>=3}',
|
||||
);
|
||||
});
|
||||
|
||||
it('过半预设:body 为 >0.5', async () => {
|
||||
const { modeler, updateProperties, select } = makeModeler();
|
||||
render(<Eip4Panel modeler={modeler} />);
|
||||
await select(userTask());
|
||||
fireEvent.click(screen.getByTestId('eip4-cosign-toggle'));
|
||||
fireEvent.change(screen.getByTestId('eip4-cosign-completion-type'), {
|
||||
target: { value: 'majority' },
|
||||
});
|
||||
const loop = lastPayload(updateProperties).loopCharacteristics as Record<string, unknown>;
|
||||
expect((loop.completionCondition as { body: string }).body).toBe(
|
||||
'${nrOfCompletedInstances/nrOfInstances>0.5}',
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
describe('Eip4Panel — formKey', () => {
|
||||
it('选择模板 → 写回 activiti:formKey=裸 UUID', async () => {
|
||||
const { modeler, updateProperties, select } = makeModeler();
|
||||
render(<Eip4Panel modeler={modeler} />);
|
||||
await select(userTask());
|
||||
const sel = await screen.findByTestId('eip4-formkey-select');
|
||||
// 等待模板选项加载
|
||||
await waitFor(() => expect(sel.querySelectorAll('option').length).toBeGreaterThan(2));
|
||||
fireEvent.change(sel, { target: { value: 'aaaa-bbbb' } });
|
||||
expect(lastPayload(updateProperties)['activiti:formKey']).toBe('aaaa-bbbb');
|
||||
});
|
||||
|
||||
it('选「无」→ 写回 undefined 清除', async () => {
|
||||
const { modeler, updateProperties, select } = makeModeler();
|
||||
render(<Eip4Panel modeler={modeler} />);
|
||||
await select(userTask({ 'activiti:formKey': '2098ce21-400b-4425-9c22-63e350974b98' }));
|
||||
const sel = await screen.findByTestId('eip4-formkey-select');
|
||||
fireEvent.change(sel, { target: { value: '' } });
|
||||
const payload = lastPayload(updateProperties);
|
||||
expect('activiti:formKey' in payload).toBe(true);
|
||||
expect(payload['activiti:formKey']).toBeUndefined();
|
||||
});
|
||||
});
|
||||
|
||||
describe('Eip4Panel — 扩展属性(长尾 $attrs)', () => {
|
||||
it('增:填 key/value 后写回命名空间键', async () => {
|
||||
const { modeler, updateProperties, select } = makeModeler();
|
||||
render(<Eip4Panel modeler={modeler} />);
|
||||
await select(userTask());
|
||||
fireEvent.change(screen.getByTestId('eip4-extattr-new-key'), {
|
||||
target: { value: 'activiti:custom' },
|
||||
});
|
||||
fireEvent.change(screen.getByTestId('eip4-extattr-new-value'), { target: { value: 'v1' } });
|
||||
fireEvent.click(screen.getByTestId('eip4-extattr-add'));
|
||||
expect(lastPayload(updateProperties)).toEqual({ 'activiti:custom': 'v1' });
|
||||
});
|
||||
|
||||
it('删:已有扩展属性写回 undefined', async () => {
|
||||
const { modeler, updateProperties, select } = makeModeler();
|
||||
render(<Eip4Panel modeler={modeler} />);
|
||||
await select(userTask({}, { 'activiti:custom': 'v1' }));
|
||||
expect(screen.getByTestId('eip4-extattr-key-0')).toBeInTheDocument();
|
||||
fireEvent.click(screen.getByTestId('eip4-extattr-remove-0'));
|
||||
const payload = lastPayload(updateProperties);
|
||||
expect('activiti:custom' in payload).toBe(true);
|
||||
expect(payload['activiti:custom']).toBeUndefined();
|
||||
});
|
||||
|
||||
it('只列 activiti:/flowable: 前缀的 $attrs(其它前缀不显示)', async () => {
|
||||
const { modeler, select } = makeModeler();
|
||||
render(<Eip4Panel modeler={modeler} />);
|
||||
await select(userTask({}, { 'activiti:custom': 'v1', 'xmlns:foo': 'bar' }));
|
||||
expect(screen.getByTestId('eip4-extattr-key-0')).toHaveValue('activiti:custom');
|
||||
expect(screen.queryByTestId('eip4-extattr-key-1')).not.toBeInTheDocument();
|
||||
});
|
||||
});
|
||||
|
||||
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', {
|
||||
event: 'complete',
|
||||
class: 'com.dsasp.server.wf.user.listener.TaskCompleteListener',
|
||||
fields: [fieldObj],
|
||||
});
|
||||
render(<Eip4Panel modeler={modeler} />);
|
||||
await select(userTask({ extensionElements: { values: [existing] } }));
|
||||
// 已有监听器显示 field 徽标
|
||||
expect(screen.getByText(/含 field 配置/)).toBeInTheDocument();
|
||||
fireEvent.click(screen.getByTestId('eip4-listener-add'));
|
||||
const ext = lastPayload(updateProperties).extensionElements as { values: Array<Record<string, unknown>> };
|
||||
expect(ext.$type).toBe('bpmn:ExtensionElements');
|
||||
expect(ext.values.length).toBe(2);
|
||||
// 原监听器被重建但其 fields 数组引用与 field 元素引用原样保留
|
||||
const withFields = ext.values.find((v) => Array.isArray(v.fields));
|
||||
expect(withFields).toBeTruthy();
|
||||
expect((withFields!.fields as unknown[])[0]).toBe(fieldObj);
|
||||
// moddle.create 被用于构造 taskListener 与 ExtensionElements
|
||||
expect(moddle.create).toHaveBeenCalledWith('bpmn:ExtensionElements', expect.anything());
|
||||
});
|
||||
|
||||
it('编辑 event 下拉 + class 值写回', async () => {
|
||||
const { modeler, updateProperties, select } = makeModeler();
|
||||
render(<Eip4Panel modeler={modeler} />);
|
||||
await select(userTask());
|
||||
fireEvent.click(screen.getByTestId('eip4-listener-add'));
|
||||
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<Record<string, unknown>> };
|
||||
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' });
|
||||
render(<Eip4Panel modeler={modeler} />);
|
||||
await select(userTask({ extensionElements: { values: [existing] } }));
|
||||
fireEvent.click(screen.getByTestId('eip4-listener-remove-0'));
|
||||
const payload = lastPayload(updateProperties);
|
||||
expect('extensionElements' in payload).toBe(true);
|
||||
expect(payload.extensionElements).toBeUndefined();
|
||||
});
|
||||
|
||||
it('delegateExpression 模式:互斥写回 delegateExpression', async () => {
|
||||
const { modeler, updateProperties, select } = makeModeler();
|
||||
render(<Eip4Panel modeler={modeler} />);
|
||||
await select(userTask());
|
||||
fireEvent.click(screen.getByTestId('eip4-listener-add'));
|
||||
fireEvent.change(screen.getByTestId('eip4-listener-mode-0'), {
|
||||
target: { value: 'delegateExpression' },
|
||||
});
|
||||
fireEvent.change(screen.getByTestId('eip4-listener-value-0'), { target: { value: '${bean}' } });
|
||||
const ext = lastPayload(updateProperties).extensionElements as { values: Array<Record<string, unknown>> };
|
||||
const listener = ext.values.find((v) => v.$type === 'activiti:taskListener')!;
|
||||
expect(listener.delegateExpression).toBe('${bean}');
|
||||
expect('class' in listener).toBe(false);
|
||||
});
|
||||
});
|
||||
Reference in New Issue
Block a user