feat(approval): 审批抽屉接协办/转阅多选人 + BPMN 流程图查看

- approval.ts ApprovalActionRequest 加 targetUserIds(协办/转阅多人)
- ApprovalDrawer 新增 MultiUserForm 多选人弹窗(协办 assist / 转阅 circulated)
- 新增 ProcessDiagram(bpmn-js NavigatedViewer:中文走浏览器字体,当前节点绿/已走过灰)
  + diagram.ts API;ApprovalDrawer 加「查看流程图」按需展开段
- 依赖 bpmn-js@^17

配套后端 eip4-platform feat/approval-closure(协办/转阅端点 + 流程图端点 + scriptUser 会签)。
tsc 干净 + vitest 83/83 + build 5104 模块。

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
2026-06-26 08:09:31 +08:00
parent 68d797e1c4
commit 4f06268755
6 changed files with 796 additions and 33 deletions

View File

@@ -100,7 +100,10 @@ export interface ApprovalActionRequest {
/** WfTemplate 按钮 id:后端据此重解析该按钮的 servicename(自定义服务流)并执行。 */
buttonId?: string;
comment?: string;
/** 转办(agent)目标用户(单人)。 */
targetUserId?: string;
/** 协办(assist)/转阅(circulated)目标用户(多人)。 */
targetUserIds?: string[];
businessKey?: string;
processInstanceId?: string;
tableName?: string;

30
src/api/diagram.ts Normal file
View File

@@ -0,0 +1,30 @@
import { http } from './http';
/**
* 流程图(BPMN)数据:bpmn-js 渲染所需的 XML + 高亮节点。
*
* - {@link bpmnXml} 流程定义的 BPMN 2.0 XML(含 BPMNDI 布局段,bpmn-js 据此排版)。
* - {@link activeActivityIds} 当前停留的活动节点 id(绿色高亮)。
* - {@link finishedActivityIds} 已走过的历史节点 id(灰色标记)。
*/
export interface ProcessDiagram {
found: boolean;
processInstanceId?: string | null;
bpmnXml?: string | null;
activeActivityIds: string[];
finishedActivityIds: string[];
}
/** GET /api/workflow/process/{pi}/diagram —— 取流程图 XML + 当前/历史节点。 */
export async function fetchProcessDiagram(processInstanceId: string): Promise<ProcessDiagram> {
const { data } = await http.get<ProcessDiagram>(
`/api/workflow/process/${processInstanceId}/diagram`,
);
return {
found: !!data?.found,
processInstanceId: data?.processInstanceId ?? processInstanceId,
bpmnXml: data?.bpmnXml ?? null,
activeActivityIds: data?.activeActivityIds ?? [],
finishedActivityIds: data?.finishedActivityIds ?? [],
};
}

View File

@@ -9,6 +9,7 @@ import { useEffect, useState } from 'react';
import { Drawer } from './ui/Dialog';
import { toast } from './ui/Toast';
import { AmisRenderer } from './AmisRenderer';
import { ProcessDiagram } from './ProcessDiagram';
import { http } from '../api/http';
import {
approvalHistoryBusinessDataApi,
@@ -192,6 +193,73 @@ function DelegateForm({
);
}
// ---------------------------------------------------------------------------
// 协办/转阅多选人弹窗内容(每人各建一条子/转阅任务)
// ---------------------------------------------------------------------------
function MultiUserForm({
taskId, btn, comment, businessKey, processInstanceId, tableName, onSuccess, onCancel,
}: {
taskId: string;
btn: ApprovalButton;
comment?: string;
businessKey?: string;
processInstanceId?: string;
tableName?: string;
onSuccess: () => void;
onCancel: () => void;
}) {
const [raw, setRaw] = useState('');
const [submitting, setSubmitting] = useState(false);
const verb = btn.type === 'assist' ? '协办' : '转阅';
// 按换行/逗号/分号/空白分隔,去空白去重
const parseUsers = (s: string): string[] => {
const set = new Set<string>();
s.split(/[\s,;,;]+/).forEach((u) => { const t = u.trim(); if (t) set.add(t); });
return Array.from(set);
};
const submit = async () => {
const users = parseUsers(raw);
if (users.length === 0) {
toast(`请输入${verb}人账号`, 'warn');
return;
}
setSubmitting(true);
try {
await submitApprovalAction(taskId, {
actionType: btn.type,
buttonId: btn.id,
comment,
targetUserIds: users,
businessKey,
processInstanceId,
tableName,
});
toast(`${verb}成功(${users.length} 人)`);
onSuccess();
} catch (e) {
toast(actionErrMsg(e, verb), 'err');
} finally {
setSubmitting(false);
}
};
return (
<div style={{ display: 'flex', flexDirection: 'column', gap: 12 }}>
<label style={{ fontSize: 'var(--fs-sm)', color: 'var(--text-2)' }}>
{verb}人账号(userId,多个用换行或逗号分隔)
</label>
<textarea className="input" style={{ minHeight: 80, resize: 'vertical' }}
placeholder={`请输入${verb}人账号`} value={raw}
onChange={(e) => setRaw(e.target.value)} autoFocus />
<div style={{ display: 'flex', gap: 8, justifyContent: 'flex-end', marginTop: 4 }}>
<button className="btn btn-sm" onClick={onCancel} disabled={submitting}>取消</button>
<button className="btn btn-sm btn-primary" onClick={submit} disabled={submitting}>
{submitting ? '提交中…' : `确认${verb}`}
</button>
</div>
</div>
);
}
// ---------------------------------------------------------------------------
// 主组件:ApprovalDrawer
// ---------------------------------------------------------------------------
@@ -215,6 +283,10 @@ export function ApprovalDrawer({
const [traceNodes, setTraceNodes] = useState<TraceNode[]>([]);
const [traceLoading, setTraceLoading] = useState(false);
const [showDelegate, setShowDelegate] = useState(false);
// 协办(assist)/转阅(circulated)多选人弹窗:记录正在办理的按钮(含 type/label/id)
const [multiUserBtn, setMultiUserBtn] = useState<ApprovalButton | null>(null);
// 流程图按需展开(bpmn-js 较重,不默认加载)
const [showDiagram, setShowDiagram] = useState(false);
const effectiveProcessInstanceId = processInstanceId ?? meta?.processInstanceId ?? undefined;
const effectiveBusinessKey = businessKey ?? meta?.businessKey ?? undefined;
const effectiveBusinessTable = businessTable ?? meta?.businessTable ?? undefined;
@@ -289,6 +361,11 @@ export function ApprovalDrawer({
setShowDelegate(true);
return;
}
// 协办/转阅:先选多人,再提交(每人各建一条子/转阅任务)
if (btn.type === 'assist' || btn.type === 'circulated') {
setMultiUserBtn(btn);
return;
}
setSubmitting(true);
try {
await submitApprovalAction(taskId, {
@@ -409,6 +486,27 @@ export function ApprovalDrawer({
<TraceTimeline nodes={traceNodes} />
)}
</section>
{/* 流程图(BPMN,按需展开) */}
{effectiveProcessInstanceId && (
<section>
<div style={{ display: 'flex', alignItems: 'center', gap: 8, marginBottom: 8 }}>
<span style={{ fontSize: 'var(--fs-sm)', fontWeight: 600, color: 'var(--text-2)' }}>流程图</span>
<button
className="btn btn-sm"
data-testid="toggle-diagram"
onClick={() => setShowDiagram((v) => !v)}
>
{showDiagram ? '收起' : '查看流程图'}
</button>
</div>
{showDiagram && (
<div style={{ border: '1px solid var(--line)', borderRadius: 'var(--radius)', overflow: 'hidden' }}>
<ProcessDiagram processInstanceId={effectiveProcessInstanceId} />
</div>
)}
</section>
)}
</div>
</Drawer>
@@ -422,6 +520,23 @@ export function ApprovalDrawer({
/>
</Drawer>
)}
{/* 协办/转阅多选人弹窗 */}
{multiUserBtn && taskId && (
<Drawer title={multiUserBtn.label || (multiUserBtn.type === 'assist' ? '协办' : '转阅')}
width={360} onClose={() => setMultiUserBtn(null)}>
<MultiUserForm
taskId={taskId}
btn={multiUserBtn}
comment={comment.trim() || undefined}
businessKey={effectiveBusinessKey}
processInstanceId={effectiveProcessInstanceId}
tableName={effectiveBusinessTable}
onSuccess={() => { setMultiUserBtn(null); onCompleted(); }}
onCancel={() => setMultiUserBtn(null)}
/>
</Drawer>
)}
</>
);
}

View File

@@ -0,0 +1,102 @@
// 流程图(BPMN)查看:bpmn-js 渲染流程定义 + 高亮当前/已走过节点。
// 节点名为中文,走浏览器字体渲染(服务端出 PNG 会乱码),故用前端 bpmn-js。
import { useEffect, useRef, useState } from 'react';
import NavigatedViewer from 'bpmn-js/lib/NavigatedViewer';
import 'bpmn-js/dist/assets/diagram-js.css';
import 'bpmn-js/dist/assets/bpmn-js.css';
import { fetchProcessDiagram } from '../api/diagram';
/** bpmn-js canvas 服务的最小契约(避免引入全量类型)。 */
interface CanvasLike {
zoom(mode: string, point?: string): void;
addMarker(elementId: string, marker: string): void;
}
const MARKER_CSS = `
.eip4-bpmn .djs-element.diagram-active .djs-visual > :nth-child(1) {
stroke: #1f9d55 !important; stroke-width: 2.5px !important; fill: #e3f9e5 !important;
}
.eip4-bpmn .djs-element.diagram-finished .djs-visual > :nth-child(1) {
stroke: #9aa5b1 !important; fill: #f5f7fa !important;
}
`;
export function ProcessDiagram({ processInstanceId }: { processInstanceId: string }) {
const containerRef = useRef<HTMLDivElement>(null);
const [loading, setLoading] = useState(true);
const [error, setError] = useState<string | null>(null);
useEffect(() => {
let viewer: { importXML: (xml: string) => Promise<unknown>; get: (s: string) => unknown; destroy: () => void } | null = null;
let alive = true;
setLoading(true);
setError(null);
(async () => {
try {
const d = await fetchProcessDiagram(processInstanceId);
if (!alive) return;
if (!d.found || !d.bpmnXml) {
setError('暂无流程图(该流程定义无 BPMN 布局信息)');
setLoading(false);
return;
}
if (!containerRef.current) return;
viewer = new NavigatedViewer({ container: containerRef.current }) as unknown as typeof viewer;
await viewer!.importXML(d.bpmnXml);
const canvas = viewer!.get('canvas') as CanvasLike;
// 已走过节点先标灰,当前节点再标绿(当前节点也在 finished 里时绿覆盖灰)
d.finishedActivityIds.forEach((id) => safeMarker(canvas, id, 'diagram-finished'));
d.activeActivityIds.forEach((id) => safeMarker(canvas, id, 'diagram-active'));
canvas.zoom('fit-viewport', 'auto');
if (alive) setLoading(false);
} catch {
if (alive) {
setError('流程图渲染失败');
setLoading(false);
}
}
})();
return () => {
alive = false;
if (viewer) {
try { viewer.destroy(); } catch { /* 视图已卸载 */ }
}
};
}, [processInstanceId]);
return (
<div style={{ position: 'relative' }}>
<style>{MARKER_CSS}</style>
{loading && (
<div style={{ padding: 16, color: 'var(--text-3)', fontSize: 'var(--fs-sm)' }}>加载流程图…</div>
)}
{error && !loading && (
<div style={{ padding: 16, color: 'var(--warn)', fontSize: 'var(--fs-sm)' }}>{error}</div>
)}
<div
ref={containerRef}
className="eip4-bpmn"
data-testid="process-diagram"
style={{ width: '100%', height: 420, display: error ? 'none' : 'block', background: '#fff' }}
/>
{!loading && !error && (
<div style={{ display: 'flex', gap: 16, padding: '8px 4px', fontSize: 11, color: 'var(--text-3)' }}>
<span><span style={{ display: 'inline-block', width: 10, height: 10, background: '#e3f9e5', border: '2px solid #1f9d55', marginRight: 4, verticalAlign: 'middle' }} />当前节点</span>
<span><span style={{ display: 'inline-block', width: 10, height: 10, background: '#f5f7fa', border: '1px solid #9aa5b1', marginRight: 4, verticalAlign: 'middle' }} />已走过</span>
</div>
)}
</div>
);
}
/** 加标记:activityId 可能不对应图形(如网关/边界事件),addMarker 抛错就跳过。 */
function safeMarker(canvas: CanvasLike, elementId: string, marker: string) {
if (!elementId) return;
try {
canvas.addMarker(elementId, marker);
} catch {
/* 该 activityId 无对应图形,忽略 */
}
}