feat(modeler): 存草稿闭环+草稿列表打开+formKey过滤输入

api/processModeler:新增 listModels/getModel/createDraft/saveDraft(PUT)/draftFromProcDef/
deleteDraft;fetchWfTemplates 改返 {templates,degraded} 透传数据源降级标记。

ProcessModelerPage:
- 顶栏「保存草稿」可用:saveXML({format:true})→有 modelId 走 PUT saveDraft(不重发 metaInfo,
  靠后端「不带 metaInfo 不覆盖」保住 eip4IdMap);无 modelId:存量按 procDefId 走 from-procdef
  (后端写 metaInfo)再 PUT 覆盖为编辑源,存量按 key/新建走 createDraft(前端把 source 载入的
  eip4IdMap 写进 metaInfo)。saving 态防重入。
- 打开器加「草稿」tab:listModels 列草稿→「打开」setParams(?modelId=)→getModel→importXML;
  载入草稿时从 metaInfo 解 eip4IdMap 存 ref(发布还原用)。
- 草稿删除按钮+confirm(deleteDraft;后端 DELETE 端点待补,前端契约先落)。

Eip4Panel formKey:1016 项加过滤输入(名称/id 实时 filter);未命名项(name 回落为 id)显示
「<uuid前8>…(未命名)」;degraded 显示「模板列表暂不可用」提示。

测试:Eip4Panel 33→36(formKey 过滤/未命名/degraded)、ProcessModelerPage 10→17
(存草稿 create/put/from-procdef 三路径 + ?modelId= 载入 + 草稿 tab 打开 + 删除确认/取消);
全量 vitest 196 绿 / tsc -b 干净 / npm run build 成功。仅动自己文件。

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
2026-07-02 12:14:37 +08:00
parent a9a304ab3d
commit 5c2c0d95f6
5 changed files with 556 additions and 70 deletions

View File

@@ -97,19 +97,30 @@ interface RawOption {
/** /**
* formKey picker 的一条选项。数据源 `GET /api/workflow/wftemplates`(T2.2 网关端点), * formKey picker 的一条选项。数据源 `GET /api/workflow/wftemplates`(T2.2 网关端点),
* 契约 `{templates:[{id,name}]}`。id=view_wftemplate_id 裸 UUID(即 activiti:formKey 值,无前缀)。 * 契约 `{templates:[{id,name}],degraded?}`。id=view_wftemplate_id 裸 UUID(即 activiti:formKey
* 值,无前缀)。**T2.2 实证**:view_wftemplate 无名称列,网关按 entityid→sys_entity.name 解析,
* 1016 活动模板仅 ~339 有中文名,其余 name 回落为 id(uuid)——前端下拉需过滤 + 未命名展示。
*/ */
export interface WfTemplateOption { export interface WfTemplateOption {
id: string; id: string;
name: string; name: string;
} }
/** GET /api/workflow/wftemplates —— 取表单模板列表供 formKey 下拉(防御性返回数组)。 */ /** wftemplates 结果:degraded=数据源读库异常(网关返 {templates:[],degraded:true})。 */
export async function fetchWfTemplates(): Promise<WfTemplateOption[]> { export interface WfTemplateResult {
const { data } = await http.get<{ templates?: unknown[] }>('/api/workflow/wftemplates'); templates: WfTemplateOption[];
degraded: boolean;
}
/** GET /api/workflow/wftemplates —— 取表单模板列表供 formKey 下拉(防御性;透传 degraded)。 */
export async function fetchWfTemplates(): Promise<WfTemplateResult> {
const { data } = await http.get<{ templates?: unknown[]; degraded?: boolean }>(
'/api/workflow/wftemplates',
);
const degraded = data?.degraded === true;
const raw = data?.templates ?? []; const raw = data?.templates ?? [];
if (!Array.isArray(raw)) return []; if (!Array.isArray(raw)) return { templates: [], degraded };
return raw const templates = raw
.map((t) => { .map((t) => {
const o = (t ?? {}) as { id?: unknown; name?: unknown }; const o = (t ?? {}) as { id?: unknown; name?: unknown };
const id = o.id != null ? String(o.id) : ''; const id = o.id != null ? String(o.id) : '';
@@ -117,6 +128,100 @@ export async function fetchWfTemplates(): Promise<WfTemplateOption[]> {
return { id, name }; return { id, name };
}) })
.filter((t) => t.id !== ''); .filter((t) => t.id !== '');
return { templates, degraded };
}
// ── 流程草稿(act_re_model)CRUD(T2.1 后端 + T2.2 网关,全走超管门;前端已登录 admin) ────
/** GET /api/workflow/models 列表项。 */
export interface ModelSummary {
id: string;
name: string;
key: string;
lastUpdateTime?: string;
}
/** GET /api/workflow/models/{id} 单条草稿(含编辑源 XML 与 metaInfo JSON 串)。 */
export interface DraftModel {
found: boolean;
id?: string;
name?: string;
key?: string;
bpmnXml?: string;
/** metaInfo JSON 串,含 eip4IdMap/sourceProcDefId/originalKey(from-procdef 建的草稿有)。 */
metaInfo?: string;
}
/** 新建草稿请求体。metaInfo 必带 eip4IdMap 以便发布还原中文 key(存量改造场景)。 */
export interface CreateDraftBody {
name: string;
key: string;
bpmnXml: string;
metaInfo?: string;
}
/** GET /api/workflow/models —— 草稿列表(防御性返回数组)。 */
export async function listModels(): Promise<ModelSummary[]> {
const { data } = await http.get<{ models?: unknown[] }>('/api/workflow/models');
const raw = data?.models ?? [];
if (!Array.isArray(raw)) return [];
return raw
.map((m) => {
const o = (m ?? {}) as { id?: unknown; name?: unknown; key?: unknown; lastUpdateTime?: unknown };
return {
id: o.id != null ? String(o.id) : '',
name: o.name != null ? String(o.name) : '',
key: o.key != null ? String(o.key) : '',
lastUpdateTime: o.lastUpdateTime != null ? String(o.lastUpdateTime) : undefined,
};
})
.filter((m) => m.id !== '');
}
/** GET /api/workflow/models/{id} —— 取单条草稿(防御性 found:false)。 */
export async function getModel(id: string): Promise<DraftModel> {
const { data } = await http.get<DraftModel>(`/api/workflow/models/${encodeURIComponent(id)}`);
if (!data?.found) return { found: false };
return {
found: true,
id: data.id != null ? String(data.id) : undefined,
name: data.name != null ? String(data.name) : undefined,
key: data.key != null ? String(data.key) : undefined,
bpmnXml: data.bpmnXml ?? undefined,
metaInfo: data.metaInfo ?? undefined,
};
}
/** POST /api/workflow/models —— 新建草稿,返回 modelId。 */
export async function createDraft(body: CreateDraftBody): Promise<string> {
const { data } = await http.post<{ modelId?: unknown }>('/api/workflow/models', body);
return data?.modelId != null ? String(data.modelId) : '';
}
/**
* PUT /api/workflow/models/{id} —— 保存草稿(更新 name/编辑源)。
* ⚠️ 刻意不传 metaInfo 键:后端 T2.1「不带 metaInfo 不覆盖」保住 from-procdef/create 时写入的
* eip4IdMap,避免二次保存打掉发布还原所需的映射。
*/
export async function saveDraft(id: string, body: { name?: string; bpmnXml: string }): Promise<void> {
await http.put(`/api/workflow/models/${encodeURIComponent(id)}`, body);
}
/** POST /api/workflow/models/from-procdef —— 由 procDefId 建草稿(后端净化+写 metaInfo),返回 modelId。 */
export async function draftFromProcDef(procDefId: string): Promise<string> {
const { data } = await http.post<{ modelId?: unknown }>('/api/workflow/models/from-procdef', {
procDefId,
});
return data?.modelId != null ? String(data.modelId) : '';
}
/**
* DELETE /api/workflow/models/{id} —— 删除草稿。
* ⚠️ 后端端点由 T2.2 遗留待补(flowable-service DELETE /api/flow/models/{id} + 网关转发);
* 前端契约先落,后端上线即通。
*/
export async function deleteDraft(id: string): Promise<void> {
await http.delete(`/api/workflow/models/${encodeURIComponent(id)}`);
} }
/** GET /api/process-select/options —— 取存量流程选项(解 amis 信封,防御性返回数组)。 */ /** GET /api/process-select/options —— 取存量流程选项(解 amis 信封,防御性返回数组)。 */

View File

@@ -7,17 +7,23 @@ import {
type UserPropertyItem, type UserPropertyItem,
} from './candidateExpression'; } from './candidateExpression';
// formKey 下拉数据源:mock,其中一个 id 对齐 fixture 的 formKey 值。 // formKey 下拉数据源:mock,其中一个 id 对齐 fixture 的 formKey 值;第三项 name===id(未命名)。
vi.mock('../api/processModeler', () => ({ vi.mock('../api/processModeler', () => ({
fetchWfTemplates: vi.fn(() => fetchWfTemplates: vi.fn(() =>
Promise.resolve([ Promise.resolve({
{ id: '2098ce21-400b-4425-9c22-63e350974b98', name: '合同交底表单' }, templates: [
{ id: 'aaaa-bbbb', name: '另一个表单' }, { id: '2098ce21-400b-4425-9c22-63e350974b98', name: '合同交底表单' },
]), { id: 'aaaa-bbbb', name: '另一个表单' },
{ id: 'deadbeef-1111-2222', name: 'deadbeef-1111-2222' }, // 未命名(name 回落为 id)
],
degraded: false,
}),
), ),
})); }));
import { Eip4Panel } from './Eip4Panel'; import { Eip4Panel } from './Eip4Panel';
import { fetchWfTemplates } from '../api/processModeler';
const mWfTemplates = vi.mocked(fetchWfTemplates);
// ── 真实办理人形态锚定(同 candidateExpression.test.ts:抽 fixture,做 XML 实体解码) ──── // ── 真实办理人形态锚定(同 candidateExpression.test.ts:抽 fixture,做 XML 实体解码) ────
function xmlDecode(s: string): string { function xmlDecode(s: string): string {
@@ -401,6 +407,36 @@ describe('Eip4Panel — formKey', () => {
expect('activiti:formKey' in payload).toBe(true); expect('activiti:formKey' in payload).toBe(true);
expect(payload['activiti:formKey']).toBeUndefined(); expect(payload['activiti:formKey']).toBeUndefined();
}); });
it('过滤输入实时 filter 选项(名称匹配)', async () => {
const { modeler, 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(3)); // (无)+3
fireEvent.change(screen.getByTestId('eip4-formkey-filter'), { target: { value: '合同' } });
const opts = Array.from(sel.querySelectorAll('option')).map((o) => o.textContent);
expect(opts).toContain('合同交底表单');
expect(opts).not.toContain('另一个表单');
});
it('未命名项(name===id)显示「<uuid前8>…(未命名)」', async () => {
const { modeler, 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(3));
const opts = Array.from(sel.querySelectorAll('option')).map((o) => o.textContent);
expect(opts).toContain('deadbeef…(未命名)');
});
it('degraded:显示「模板列表暂不可用」提示', async () => {
mWfTemplates.mockResolvedValueOnce({ templates: [], degraded: true });
const { modeler, select } = makeModeler();
render(<Eip4Panel modeler={modeler} />);
await select(userTask());
expect(await screen.findByTestId('eip4-formkey-degraded')).toBeInTheDocument();
});
}); });
describe('Eip4Panel — 扩展属性(长尾 $attrs)', () => { describe('Eip4Panel — 扩展属性(长尾 $attrs)', () => {

View File

@@ -99,6 +99,12 @@ function notableMeta(meta: Record<string, unknown>): string[] {
return out; return out;
} }
// formKey 下拉展示名:网关无名称时 name 回落为 id(uuid),未命名项显示「<uuid前8>…(未命名)」。
function wfTemplateLabel(t: WfTemplateOption): string {
if (t.name && t.name !== t.id) return t.name;
return (t.id.length > 8 ? t.id.slice(0, 8) : t.id) + '…(未命名)';
}
function newCandidateItem(): UserPropertyItem { function newCandidateItem(): UserPropertyItem {
return { return {
type: 'user', type: 'user',
@@ -273,6 +279,8 @@ export function Eip4Panel({ modeler }: { modeler: PanelModeler | null }) {
const [newAttr, setNewAttr] = useState<{ key: string; value: string }>({ key: '', value: '' }); const [newAttr, setNewAttr] = useState<{ key: string; value: string }>({ key: '', value: '' });
const [listeners, setListeners] = useState<ListenerRow[]>([]); const [listeners, setListeners] = useState<ListenerRow[]>([]);
const [templates, setTemplates] = useState<WfTemplateOption[]>([]); const [templates, setTemplates] = useState<WfTemplateOption[]>([]);
const [templatesDegraded, setTemplatesDegraded] = useState(false);
const [formKeyFilter, setFormKeyFilter] = useState('');
// undo/redo 重灌计数:commandStack.changed(非自身写入)时自增,触发 init 重跑。 // undo/redo 重灌计数:commandStack.changed(非自身写入)时自增,触发 init 重跑。
const [syncTick, setSyncTick] = useState(0); const [syncTick, setSyncTick] = useState(0);
@@ -281,12 +289,20 @@ export function Eip4Panel({ modeler }: { modeler: PanelModeler | null }) {
// 自身写入标记:updateProperties 会触发 commandStack.changed,借此跳过自触发重灌。 // 自身写入标记:updateProperties 会触发 commandStack.changed,借此跳过自触发重灌。
const selfWriteRef = useRef(false); const selfWriteRef = useRef(false);
// formKey 数据源加载一次。 // formKey 数据源加载一次(透传 degraded;1016 项靠过滤输入,不裸滚动)。
useEffect(() => { useEffect(() => {
let alive = true; let alive = true;
Promise.resolve(fetchWfTemplates()) Promise.resolve(fetchWfTemplates())
.then((t) => alive && setTemplates(Array.isArray(t) ? t : [])) .then((r) => {
.catch(() => alive && setTemplates([])); if (!alive) return;
setTemplates(Array.isArray(r?.templates) ? r.templates : []);
setTemplatesDegraded(!!r?.degraded);
})
.catch(() => {
if (!alive) return;
setTemplates([]);
setTemplatesDegraded(true);
});
return () => { return () => {
alive = false; alive = false;
}; };
@@ -516,6 +532,12 @@ export function Eip4Panel({ modeler }: { modeler: PanelModeler | null }) {
} }
const candidateBadges = notableMeta(candidateMeta); const candidateBadges = notableMeta(candidateMeta);
const formKeyQuery = formKeyFilter.trim().toLowerCase();
const filteredTemplates = formKeyQuery
? templates.filter(
(t) => t.name.toLowerCase().includes(formKeyQuery) || t.id.toLowerCase().includes(formKeyQuery),
)
: templates;
return ( return (
<div <div
@@ -625,6 +647,21 @@ export function Eip4Panel({ modeler }: { modeler: PanelModeler | null }) {
</Section> </Section>
<Section title="表单(formKey)"> <Section title="表单(formKey)">
{templatesDegraded ? (
<div
data-testid="eip4-formkey-degraded"
style={{ fontSize: 12, color: 'var(--warn, #d48806)', marginBottom: 6 }}
>
模板列表暂不可用(数据源异常);可保留当前值或稍后重试。
</div>
) : null}
<input
data-testid="eip4-formkey-filter"
placeholder={`筛选表单(名称或 id,共 ${templates.length} 项)`}
value={formKeyFilter}
onChange={(e) => setFormKeyFilter(e.target.value)}
style={{ width: '100%', marginBottom: 6 }}
/>
<select <select
data-testid="eip4-formkey-select" data-testid="eip4-formkey-select"
value={formKey} value={formKey}
@@ -632,13 +669,18 @@ export function Eip4Panel({ modeler }: { modeler: PanelModeler | null }) {
style={{ width: '100%' }} style={{ width: '100%' }}
> >
<option value="">(无)</option> <option value="">(无)</option>
{/* 当前值不在模板列表时,补一条占位以免下拉丢值 */} {/* 当前值不在(过滤后的)模板列表时,补一条占位以免下拉丢值 */}
{formKey && !templates.some((t) => t.id === formKey) ? ( {formKey && !filteredTemplates.some((t) => t.id === formKey) ? (
<option value={formKey}>{formKey}(当前)</option> <option value={formKey}>
{(() => {
const cur = templates.find((t) => t.id === formKey);
return (cur ? wfTemplateLabel(cur) : formKey) + '(当前)';
})()}
</option>
) : null} ) : null}
{templates.map((t) => ( {filteredTemplates.map((t) => (
<option key={t.id} value={t.id}> <option key={t.id} value={t.id}>
{t.name} {wfTemplateLabel(t)}
</option> </option>
))} ))}
</select> </select>

View File

@@ -3,9 +3,10 @@ import { render, screen, waitFor, fireEvent, act } from '@testing-library/react'
import { MemoryRouter } from 'react-router-dom'; import { MemoryRouter } from 'react-router-dom';
import { SYNTHETIC_BPMN } from '../modeler/moddle/fixtures/synthetic-full-surface.bpmn'; import { SYNTHETIC_BPMN } from '../modeler/moddle/fixtures/synthetic-full-surface.bpmn';
// bpmn-js Modeler:jsdom 跑不动真渲染,stub 成类(可断言 importXML/destroy 调用)。 // bpmn-js Modeler:jsdom 跑不动真渲染,stub 成类(可断言 importXML/saveXML/destroy 调用)。
const { importXMLMock, destroyMock, getMock, onMock, attachToMock, ModelerCtor } = vi.hoisted(() => { const { importXMLMock, saveXMLMock, destroyMock, getMock, onMock, attachToMock, ModelerCtor } = vi.hoisted(() => {
const importXMLMock = vi.fn(); const importXMLMock = vi.fn();
const saveXMLMock = vi.fn();
const destroyMock = vi.fn(); const destroyMock = vi.fn();
const attachToMock = vi.fn(); const attachToMock = vi.fn();
const getMock = vi.fn((service: string) => { const getMock = vi.fn((service: string) => {
@@ -16,11 +17,12 @@ const { importXMLMock, destroyMock, getMock, onMock, attachToMock, ModelerCtor }
const onMock = vi.fn(); const onMock = vi.fn();
const ModelerCtor = vi.fn().mockImplementation(() => ({ const ModelerCtor = vi.fn().mockImplementation(() => ({
importXML: importXMLMock, importXML: importXMLMock,
saveXML: saveXMLMock,
destroy: destroyMock, destroy: destroyMock,
get: getMock, get: getMock,
on: onMock, on: onMock,
})); }));
return { importXMLMock, destroyMock, getMock, onMock, attachToMock, ModelerCtor }; return { importXMLMock, saveXMLMock, destroyMock, getMock, onMock, attachToMock, ModelerCtor };
}); });
vi.mock('bpmn-js/lib/Modeler', () => ({ default: ModelerCtor })); vi.mock('bpmn-js/lib/Modeler', () => ({ default: ModelerCtor }));
// 标准属性面板模块只作为 additionalModules 配置项传入被 mock 的 Modeler,永不真正执行。 // 标准属性面板模块只作为 additionalModules 配置项传入被 mock 的 Modeler,永不真正执行。
@@ -33,7 +35,13 @@ vi.mock('../api/processModeler', () => ({
fetchProcDefSourceByKey: vi.fn(), fetchProcDefSourceByKey: vi.fn(),
fetchProcessOptions: vi.fn(), fetchProcessOptions: vi.fn(),
// Eip4Panel(右栏叠板)挂载时拉 formKey 数据源——mock 成空列表避免真请求。 // Eip4Panel(右栏叠板)挂载时拉 formKey 数据源——mock 成空列表避免真请求。
fetchWfTemplates: vi.fn(() => Promise.resolve([])), fetchWfTemplates: vi.fn(() => Promise.resolve({ templates: [], degraded: false })),
listModels: vi.fn(() => Promise.resolve([])),
getModel: vi.fn(),
createDraft: vi.fn(() => Promise.resolve('NEW-1')),
saveDraft: vi.fn(() => Promise.resolve()),
draftFromProcDef: vi.fn(() => Promise.resolve('FP-1')),
deleteDraft: vi.fn(() => Promise.resolve()),
})); }));
vi.mock('../auth/token', async (importOriginal) => ({ vi.mock('../auth/token', async (importOriginal) => ({
...(await importOriginal<typeof import('../auth/token')>()), ...(await importOriginal<typeof import('../auth/token')>()),
@@ -41,12 +49,28 @@ vi.mock('../auth/token', async (importOriginal) => ({
})); }));
import { ProcessModelerPage } from './ProcessModelerPage'; import { ProcessModelerPage } from './ProcessModelerPage';
import { fetchProcDefSource, fetchProcDefSourceByKey, fetchProcessOptions } from '../api/processModeler'; import {
fetchProcDefSource,
fetchProcDefSourceByKey,
fetchProcessOptions,
listModels,
getModel,
createDraft,
saveDraft,
draftFromProcDef,
deleteDraft,
} from '../api/processModeler';
import { getProfile } from '../auth/token'; import { getProfile } from '../auth/token';
const mSource = vi.mocked(fetchProcDefSource); const mSource = vi.mocked(fetchProcDefSource);
const mSourceByKey = vi.mocked(fetchProcDefSourceByKey); const mSourceByKey = vi.mocked(fetchProcDefSourceByKey);
const mOptions = vi.mocked(fetchProcessOptions); const mOptions = vi.mocked(fetchProcessOptions);
const mListModels = vi.mocked(listModels);
const mGetModel = vi.mocked(getModel);
const mCreateDraft = vi.mocked(createDraft);
const mSaveDraft = vi.mocked(saveDraft);
const mFromProcDef = vi.mocked(draftFromProcDef);
const mDeleteDraft = vi.mocked(deleteDraft);
const mProfile = vi.mocked(getProfile); const mProfile = vi.mocked(getProfile);
function renderPage(initialPath = '/process-modeler') { function renderPage(initialPath = '/process-modeler') {
@@ -59,6 +83,7 @@ function renderPage(initialPath = '/process-modeler') {
beforeEach(() => { beforeEach(() => {
importXMLMock.mockReset().mockResolvedValue(undefined); importXMLMock.mockReset().mockResolvedValue(undefined);
saveXMLMock.mockReset().mockResolvedValue({ xml: '<edited/>' });
destroyMock.mockReset(); destroyMock.mockReset();
attachToMock.mockReset(); attachToMock.mockReset();
getMock.mockClear(); getMock.mockClear();
@@ -67,6 +92,17 @@ beforeEach(() => {
mSource.mockReset().mockResolvedValue({ found: true, bpmnXml: SYNTHETIC_BPMN, idMap: { '总包合同交底': 'Proc_zbht' } }); mSource.mockReset().mockResolvedValue({ found: true, bpmnXml: SYNTHETIC_BPMN, idMap: { '总包合同交底': 'Proc_zbht' } });
mSourceByKey.mockReset().mockResolvedValue({ found: true, bpmnXml: SYNTHETIC_BPMN, idMap: { '总包合同交底': 'Proc_zbht' } }); mSourceByKey.mockReset().mockResolvedValue({ found: true, bpmnXml: SYNTHETIC_BPMN, idMap: { '总包合同交底': 'Proc_zbht' } });
mOptions.mockReset().mockResolvedValue([]); mOptions.mockReset().mockResolvedValue([]);
mListModels.mockReset().mockResolvedValue([]);
mGetModel.mockReset().mockResolvedValue({
found: true,
bpmnXml: SYNTHETIC_BPMN,
metaInfo: JSON.stringify({ eip4IdMap: { '总包合同交底': 'Proc_zbht' } }),
key: '总包合同交底',
});
mCreateDraft.mockReset().mockResolvedValue('NEW-1');
mSaveDraft.mockReset().mockResolvedValue(undefined);
mFromProcDef.mockReset().mockResolvedValue('FP-1');
mDeleteDraft.mockReset().mockResolvedValue(undefined);
mProfile.mockReset().mockReturnValue({ userId: 'ADMIN', account: 'admin', name: '管理员', roles: [] }); mProfile.mockReset().mockReturnValue({ userId: 'ADMIN', account: 'admin', name: '管理员', roles: [] });
}); });
@@ -158,4 +194,90 @@ describe('ProcessModelerPage', () => {
expect(Object.keys(opts.moddleExtensions)).toEqual(['activiti']); expect(Object.keys(opts.moddleExtensions)).toEqual(['activiti']);
expect(opts.additionalModules).toHaveLength(2); expect(opts.additionalModules).toHaveLength(2);
}); });
// ── T2.5 存草稿 ────────────────────────────────────────────────────────────
const saveBtn = () => screen.getByTestId('process-modeler-save-draft');
it('存草稿(存量按 key,无 modelId):createDraft 带 eip4IdMap 进 metaInfo,不走 from-procdef', async () => {
renderPage('/process-modeler?procKey=' + encodeURIComponent('总包合同交底'));
await waitFor(() => expect(importXMLMock).toHaveBeenCalled());
await waitFor(() => expect(saveBtn()).not.toBeDisabled());
fireEvent.click(saveBtn());
await waitFor(() => expect(mCreateDraft).toHaveBeenCalled());
const body = mCreateDraft.mock.calls[0][0];
expect(body.bpmnXml).toBe('<edited/>');
expect(JSON.parse(body.metaInfo!).eip4IdMap).toEqual({ '总包合同交底': 'Proc_zbht' });
expect(mFromProcDef).not.toHaveBeenCalled();
});
it('存草稿(存量按 procDefId,无 modelId):from-procdef 建草稿(后端 metaInfo)再 PUT', async () => {
renderPage('/process-modeler?procDefId=PD-1');
await waitFor(() => expect(importXMLMock).toHaveBeenCalled());
await waitFor(() => expect(saveBtn()).not.toBeDisabled());
fireEvent.click(saveBtn());
await waitFor(() => expect(mFromProcDef).toHaveBeenCalledWith('PD-1'));
await waitFor(() => expect(mSaveDraft).toHaveBeenCalledWith('FP-1', { bpmnXml: '<edited/>' }));
expect(mCreateDraft).not.toHaveBeenCalled();
});
it('第二次保存(已有 modelId):走 saveDraft(PUT),不重发 metaInfo', async () => {
renderPage('/process-modeler?procKey=' + encodeURIComponent('总包合同交底'));
await waitFor(() => expect(importXMLMock).toHaveBeenCalled());
await waitFor(() => expect(saveBtn()).not.toBeDisabled());
fireEvent.click(saveBtn()); // 首次:createDraft → modelId=NEW-1
await waitFor(() => expect(mCreateDraft).toHaveBeenCalled());
await waitFor(() => expect(saveBtn()).not.toBeDisabled()); // saving 复位
fireEvent.click(saveBtn()); // 二次:PUT NEW-1
await waitFor(() => expect(mSaveDraft).toHaveBeenCalledWith('NEW-1', { bpmnXml: '<edited/>' }));
const putBody = mSaveDraft.mock.calls[mSaveDraft.mock.calls.length - 1][1];
expect('metaInfo' in putBody).toBe(false); // 不重发 metaInfo,保住 eip4IdMap
});
it('打开草稿(?modelId=)走 getModel→importXML', async () => {
renderPage('/process-modeler?modelId=MD-7');
await waitFor(() => expect(mGetModel).toHaveBeenCalledWith('MD-7'));
await waitFor(() => expect(importXMLMock).toHaveBeenCalledWith(SYNTHETIC_BPMN));
expect(mSource).not.toHaveBeenCalled();
expect(mSourceByKey).not.toHaveBeenCalled();
});
// ── T2.5 草稿列表打开 ──────────────────────────────────────────────────────
it('草稿 tab:列出草稿→点「打开」→setParams(modelId)→getModel→importXML', async () => {
mListModels.mockResolvedValue([{ id: 'MD-1', name: '草稿甲', key: 'k1' }]);
renderPage();
fireEvent.click(screen.getByTestId('process-modeler-tab-draft'));
await waitFor(() => expect(mListModels).toHaveBeenCalled());
expect(await screen.findByText('草稿甲')).toBeInTheDocument();
fireEvent.click(screen.getByTestId('process-modeler-draft-open-0'));
await waitFor(() => expect(mGetModel).toHaveBeenCalledWith('MD-1'));
await waitFor(() => expect(importXMLMock).toHaveBeenCalledWith(SYNTHETIC_BPMN));
});
// ── T2.5 草稿删除(前端;后端 DELETE 端点待补) ──────────────────────────────
it('草稿删除:confirm=确认→deleteDraft→列表刷新', async () => {
const confirmSpy = vi.spyOn(window, 'confirm').mockReturnValue(true);
mListModels.mockResolvedValue([{ id: 'MD-1', name: '草稿甲', key: 'k1' }]);
renderPage();
fireEvent.click(screen.getByTestId('process-modeler-tab-draft'));
await screen.findByText('草稿甲');
const before = mListModels.mock.calls.length;
fireEvent.click(screen.getByTestId('process-modeler-draft-delete-0'));
await waitFor(() => expect(mDeleteDraft).toHaveBeenCalledWith('MD-1'));
await waitFor(() => expect(mListModels.mock.calls.length).toBeGreaterThan(before)); // 刷新
confirmSpy.mockRestore();
});
it('草稿删除:confirm=取消→不调 deleteDraft', async () => {
const confirmSpy = vi.spyOn(window, 'confirm').mockReturnValue(false);
mListModels.mockResolvedValue([{ id: 'MD-1', name: '草稿甲', key: 'k1' }]);
renderPage();
fireEvent.click(screen.getByTestId('process-modeler-tab-draft'));
await screen.findByText('草稿甲');
fireEvent.click(screen.getByTestId('process-modeler-draft-delete-0'));
await act(async () => {
await Promise.resolve();
});
expect(mDeleteDraft).not.toHaveBeenCalled();
confirmSpy.mockRestore();
});
}); });

View File

@@ -1,7 +1,8 @@
// 在线流程 Modeler(B3)——可编辑 BPMN 设计器页骨架。 // 在线流程 Modeler(B3)——可编辑 BPMN 设计器页。
// 本阶段(T1.5)只做:admin 门 + 三栏布局 + bpmn-js Modeler 挂载 + 存量流程只读载入。 // T1.5 骨架:admin 门 + 三栏布局 + bpmn-js Modeler + 存量只读载入。
// EIP4 定制侧板(办理人/会签/formKey…)是 T2.4,本页右上只放占位容器; // T2.4:右栏叠 EIP4 定制侧板(办理人/会签/formKey…)。
// 「保存草稿」「发布」是 T2.5/T3.3,本页顶栏先放 disabled 占位按钮。 // T2.5:顶栏「保存草稿」可用(saveXML→create/from-procdef→PUT,metaInfo 带 eip4IdMap);
// 打开器加「草稿」tab(listModels→?modelId=→getModel→importXML)+ 草稿删除。
import { useEffect, useRef, useState } from 'react'; import { useEffect, useRef, useState } from 'react';
import { useNavigate, useSearchParams } from 'react-router-dom'; import { useNavigate, useSearchParams } from 'react-router-dom';
import Modeler from 'bpmn-js/lib/Modeler'; import Modeler from 'bpmn-js/lib/Modeler';
@@ -16,14 +17,23 @@ import {
fetchProcDefSource, fetchProcDefSource,
fetchProcDefSourceByKey, fetchProcDefSourceByKey,
fetchProcessOptions, fetchProcessOptions,
listModels,
getModel,
createDraft,
saveDraft,
draftFromProcDef,
deleteDraft,
type ProcessOption, type ProcessOption,
type ModelSummary,
} from '../api/processModeler'; } from '../api/processModeler';
import { Eip4Panel, type PanelModeler } from '../modeler/Eip4Panel'; import { Eip4Panel, type PanelModeler } from '../modeler/Eip4Panel';
import { toast } from '../components/ui';
// bpmn-js/lib/Modeler 自带类型,但选项对象里的标准面板模块(本项目无类型)与 moddle JSON // bpmn-js/lib/Modeler 自带类型,但选项对象里的标准面板模块(本项目无类型)与 moddle JSON
// 会与官方选项类型产生摩擦;照 ProcessDiagram 惯例把构造器收窄为本页用到的最小契约再实例化。 // 会与官方选项类型产生摩擦;照 ProcessDiagram 惯例把构造器收窄为本页用到的最小契约再实例化。
interface ModelerLike { interface ModelerLike {
importXML(xml: string): Promise<unknown>; importXML(xml: string): Promise<unknown>;
saveXML(opts?: { format?: boolean }): Promise<{ xml: string }>;
destroy(): void; destroy(): void;
get(service: string): unknown; get(service: string): unknown;
on(event: string, cb: (e: unknown) => void): void; on(event: string, cb: (e: unknown) => void): void;
@@ -32,33 +42,56 @@ const ModelerCtor = Modeler as unknown as new (options: Record<string, unknown>)
type LoadState = 'idle' | 'loading' | 'ready' | 'error'; type LoadState = 'idle' | 'loading' | 'ready' | 'error';
/** 从草稿 metaInfo JSON 串取 eip4IdMap(发布还原用;防御性)。 */
function parseMetaIdMap(metaInfo?: string): Record<string, string> {
if (!metaInfo) return {};
try {
const o = JSON.parse(metaInfo) as { eip4IdMap?: unknown };
return o && typeof o.eip4IdMap === 'object' && o.eip4IdMap
? (o.eip4IdMap as Record<string, string>)
: {};
} catch {
return {};
}
}
export function ProcessModelerPage() { export function ProcessModelerPage() {
const profile = getProfile(); const profile = getProfile();
const isAdmin = isAdminProfile(profile); const isAdmin = isAdminProfile(profile);
const navigate = useNavigate(); const navigate = useNavigate();
const [params, setParams] = useSearchParams(); const [params, setParams] = useSearchParams();
// 打开存量流程两条路:?procDefId=(source=processDefinition,id 即 procDefId) // 打开三条路:?procDefId=(source=processDefinition)/ ?procKey=(存量按 key)/ ?modelId=(草稿)。
// 或 ?procKey=(source=model/history,按流程 key 载入最新版)。
const procDefId = params.get('procDefId') ?? ''; const procDefId = params.get('procDefId') ?? '';
const procKey = params.get('procKey') ?? ''; const procKey = params.get('procKey') ?? '';
const hasTarget = !!procDefId || !!procKey; const modelIdParam = params.get('modelId') ?? '';
const hasTarget = !!procDefId || !!procKey || !!modelIdParam;
const canvasRef = useRef<HTMLDivElement>(null); const canvasRef = useRef<HTMLDivElement>(null);
const panelRef = useRef<HTMLDivElement>(null); const panelRef = useRef<HTMLDivElement>(null);
const modelerRef = useRef<ModelerLike | null>(null); const modelerRef = useRef<ModelerLike | null>(null);
// Modeler 实例入 state 以驱动 Eip4Panel 重渲染(selection.changed 订阅需要真实例)。 // Modeler 实例入 state 以驱动 Eip4Panel 重渲染(selection.changed 订阅需要真实例)。
const [modelerReady, setModelerReady] = useState<ModelerLike | null>(null); const [modelerReady, setModelerReady] = useState<ModelerLike | null>(null);
// 净化映射 原id→净化id:本阶段仅暂存,发布还原(T3.x)时用。 // 净化映射 原id→净化id:存量载入时暂存,保存草稿写进 metaInfo、发布还原(T3.x)时用。
const idMapRef = useRef<Record<string, string>>({}); const idMapRef = useRef<Record<string, string>>({});
// 当前草稿 modelId(打开草稿或首次保存后写入);空=尚未落草稿。
const modelIdRef = useRef<string>('');
// 当前载入流程的 key(存量 procDefKey / 草稿 key)——新建草稿的 name/key 源。
const loadedKeyRef = useRef<string>('');
const [loadState, setLoadState] = useState<LoadState>('idle'); const [loadState, setLoadState] = useState<LoadState>('idle');
const [loadError, setLoadError] = useState(''); const [loadError, setLoadError] = useState('');
const [saving, setSaving] = useState(false);
const [options, setOptions] = useState<ProcessOption[]>([]); const [options, setOptions] = useState<ProcessOption[]>([]);
const [optionsError, setOptionsError] = useState(''); const [optionsError, setOptionsError] = useState('');
// 打开器 tab:存量流程 / 草稿。
const [openTab, setOpenTab] = useState<'existing' | 'draft'>('existing');
const [drafts, setDrafts] = useState<ModelSummary[]>([]);
const [draftsError, setDraftsError] = useState('');
const [draftsReload, setDraftsReload] = useState(0);
// 未打开任何流程时拉存量流程选项(数据源复用旧 ProcessSelectDialog 端点)。 // 未打开任何流程 + 存量 tab 时拉存量流程选项(复用旧 ProcessSelectDialog 端点)。
useEffect(() => { useEffect(() => {
if (!isAdmin || hasTarget) return; if (!isAdmin || hasTarget || openTab !== 'existing') return;
let alive = true; let alive = true;
fetchProcessOptions() fetchProcessOptions()
.then((opts) => alive && setOptions(opts)) .then((opts) => alive && setOptions(opts))
@@ -66,9 +99,22 @@ export function ProcessModelerPage() {
return () => { return () => {
alive = false; alive = false;
}; };
}, [isAdmin, hasTarget]); }, [isAdmin, hasTarget, openTab]);
// 有目标(procDefId 或 procKey)时挂载 Modeler 并载入净化后的存量 BPMN。 // 未打开任何流程 + 草稿 tab 时拉草稿列表。
useEffect(() => {
if (!isAdmin || hasTarget || openTab !== 'draft') return;
let alive = true;
setDraftsError('');
listModels()
.then((d) => alive && setDrafts(d))
.catch(() => alive && setDraftsError('草稿列表加载失败'));
return () => {
alive = false;
};
}, [isAdmin, hasTarget, openTab, draftsReload]);
// 有目标时挂载 Modeler 并载入 BPMN(草稿→getModel / 存量→source)。
useEffect(() => { useEffect(() => {
if (!isAdmin || !hasTarget) return; if (!isAdmin || !hasTarget) return;
let alive = true; let alive = true;
@@ -78,10 +124,18 @@ export function ProcessModelerPage() {
(async () => { (async () => {
try { try {
// procDefId 优先(source=processDefinition);否则按 key(source=model/history)。 // 三条路统一成 {found,bpmnXml,idMap,key}。
const src = procDefId let src: { found: boolean; bpmnXml?: string; idMap?: Record<string, string>; key?: string };
? await fetchProcDefSource(procDefId) if (modelIdParam) {
: await fetchProcDefSourceByKey(procKey); const m = await getModel(modelIdParam);
src = { found: m.found, bpmnXml: m.bpmnXml, idMap: parseMetaIdMap(m.metaInfo), key: m.key };
} else if (procDefId) {
const s = await fetchProcDefSource(procDefId);
src = { found: s.found, bpmnXml: s.bpmnXml, idMap: s.idMap, key: s.procDefKey };
} else {
const s = await fetchProcDefSourceByKey(procKey);
src = { found: s.found, bpmnXml: s.bpmnXml, idMap: s.idMap, key: s.procDefKey };
}
if (!alive) return; if (!alive) return;
if (!src.found || !src.bpmnXml) { if (!src.found || !src.bpmnXml) {
setLoadError('未找到该流程的 BPMN 源(可能未部署或无布局信息)'); setLoadError('未找到该流程的 BPMN 源(可能未部署或无布局信息)');
@@ -105,9 +159,7 @@ export function ProcessModelerPage() {
// 扩展属性冲突静默丢弃 userTask;单载 activiti 时 flowable 文档经 moddle lax 往返零丢失。 // 扩展属性冲突静默丢弃 userTask;单载 activiti 时 flowable 文档经 moddle lax 往返零丢失。
moddleExtensions: { activiti: activitiModdle }, moddleExtensions: { activiti: activitiModdle },
}); });
// ⚠️ 显式 attachTo:live 实证——只靠构造参数 propertiesPanel.parent,面板从不挂载 // ⚠️ 显式 attachTo:live 实证——只靠构造参数 propertiesPanel.parent,面板从不挂载。
// (.bio-properties-panel 在 document 中为 0;构造时 ref 时序/传对象非 element 皆可致此)。
// attachTo 容器 DOM 是 bpmn-js-properties-panel 的规范补救。放在 importXML 前,alive 内。
if (panelRef.current) { if (panelRef.current) {
try { try {
(modeler.get('propertiesPanel') as { attachTo(el: HTMLElement): void }).attachTo(panelRef.current); (modeler.get('propertiesPanel') as { attachTo(el: HTMLElement): void }).attachTo(panelRef.current);
@@ -116,6 +168,9 @@ export function ProcessModelerPage() {
} }
} }
idMapRef.current = src.idMap ?? {}; idMapRef.current = src.idMap ?? {};
loadedKeyRef.current = src.key ?? '';
// 草稿路:记住 modelId(后续保存走 PUT);存量路:清空(首次保存新建草稿)。
modelIdRef.current = modelIdParam || '';
await modeler.importXML(src.bpmnXml); await modeler.importXML(src.bpmnXml);
if (!alive) return; if (!alive) return;
modelerRef.current = modeler; modelerRef.current = modeler;
@@ -147,7 +202,37 @@ export function ProcessModelerPage() {
modelerRef.current = null; modelerRef.current = null;
setModelerReady(null); setModelerReady(null);
}; };
}, [isAdmin, procDefId, procKey]); }, [isAdmin, procDefId, procKey, modelIdParam]);
// 保存草稿:saveXML → 有 modelId 走 PUT(不重发 metaInfo,保住 eip4IdMap);
// 无 modelId:存量按 procDefId 走 from-procdef(后端写 metaInfo)再 PUT 覆盖为编辑源;
// 存量按 key / 新建走 create(前端带 eip4IdMap 进 metaInfo)。
async function handleSaveDraft() {
const modeler = modelerRef.current;
if (!modeler || saving) return;
setSaving(true);
try {
const { xml } = await modeler.saveXML({ format: true });
let modelId = modelIdRef.current;
if (modelId) {
await saveDraft(modelId, { bpmnXml: xml });
} else if (procDefId) {
modelId = await draftFromProcDef(procDefId);
await saveDraft(modelId, { bpmnXml: xml });
modelIdRef.current = modelId;
} else {
const key = loadedKeyRef.current || procKey || 'new_process';
const metaInfo = JSON.stringify({ eip4IdMap: idMapRef.current, originalKey: key });
modelId = await createDraft({ name: key, key, bpmnXml: xml, metaInfo });
modelIdRef.current = modelId;
}
toast('已保存草稿', 'ok');
} catch {
toast('保存草稿失败', 'err');
} finally {
setSaving(false);
}
}
if (!isAdmin) { if (!isAdmin) {
return <div style={{ padding: 24, color: 'var(--text-3)' }}>流程设计器仅管理员可用。</div>; return <div style={{ padding: 24, color: 'var(--text-3)' }}>流程设计器仅管理员可用。</div>;
@@ -159,7 +244,6 @@ export function ProcessModelerPage() {
); );
// 选择器按 source 分派:processDefinition→?procDefId=<id>;其余→?procKey=<key>。 // 选择器按 source 分派:processDefinition→?procDefId=<id>;其余→?procKey=<key>。
// 用索引取回选项对象(避免把 id/key 直接塞进 <option value> 造成路由二义)。
function openSelected(indexValue: string) { function openSelected(indexValue: string) {
if (indexValue === '') return; if (indexValue === '') return;
const opt = loadableOptions[Number(indexValue)]; const opt = loadableOptions[Number(indexValue)];
@@ -171,6 +255,23 @@ export function ProcessModelerPage() {
} }
} }
function openDraft(id: string) {
setParams({ modelId: id });
}
async function onDeleteDraft(d: ModelSummary) {
if (typeof window !== 'undefined' && !window.confirm(`删除草稿「${d.name || d.key || d.id}」?`)) {
return;
}
try {
await deleteDraft(d.id);
toast('草稿已删除', 'ok');
setDraftsReload((x) => x + 1);
} catch {
toast('删除草稿失败', 'err');
}
}
return ( return (
<div <div
data-testid="process-modeler-root" data-testid="process-modeler-root"
@@ -190,10 +291,18 @@ export function ProcessModelerPage() {
> >
<span style={{ fontWeight: 600, fontSize: 15 }}>流程设计器</span> <span style={{ fontWeight: 600, fontSize: 15 }}>流程设计器</span>
<span className="muted" style={{ fontSize: 12, flex: 1 }}> <span className="muted" style={{ fontSize: 12, flex: 1 }}>
{hasTarget ? `已打开:${procDefId || procKey}` : '在线编辑 BPMN 流程定义(可编辑存量 / 新建)'} {hasTarget
? `已打开:${modelIdParam ? '草稿 ' + modelIdParam : procDefId || procKey}`
: '在线编辑 BPMN 流程定义(可编辑存量 / 草稿)'}
</span> </span>
<button className="btn btn-sm" data-testid="process-modeler-save-draft" disabled title="保存草稿(下阶段)"> <button
保存草稿 className="btn btn-sm"
data-testid="process-modeler-save-draft"
disabled={!modelerReady || saving}
onClick={handleSaveDraft}
title="保存为草稿(act_re_model)"
>
{saving ? '保存中…' : '保存草稿'}
</button> </button>
<button className="btn btn-sm btn-primary" data-testid="process-modeler-publish" disabled title="发布(下阶段)"> <button className="btn btn-sm btn-primary" data-testid="process-modeler-publish" disabled title="发布(下阶段)">
发布 发布
@@ -203,12 +312,12 @@ export function ProcessModelerPage() {
</button> </button>
</div> </div>
{/* 主体:左画布 + 右栏(上=EIP4 侧板占位 / 下=标准属性面板) */} {/* 主体:左画布 + 右栏(上=EIP4 侧板 / 下=标准属性面板) */}
<div style={{ flex: 1, display: 'flex', minHeight: 0 }}> <div style={{ flex: 1, display: 'flex', minHeight: 0 }}>
<div style={{ flex: 1, position: 'relative', minWidth: 0, background: '#fff' }}> <div style={{ flex: 1, position: 'relative', minWidth: 0, background: '#fff' }}>
<div ref={canvasRef} data-testid="process-modeler-canvas" style={{ width: '100%', height: '100%' }} /> <div ref={canvasRef} data-testid="process-modeler-canvas" style={{ width: '100%', height: '100%' }} />
{/* 未打开任何流程:叠加「打开存量流程」选择器 + 新建占位 */} {/* 未打开任何流程:叠加打开器(存量流程 / 草稿 两 tab) */}
{!hasTarget ? ( {!hasTarget ? (
<div <div
style={{ style={{
@@ -222,26 +331,98 @@ export function ProcessModelerPage() {
background: 'var(--surface, #fff)', background: 'var(--surface, #fff)',
}} }}
> >
<div style={{ color: 'var(--text-3)', fontSize: 13 }}>选择一个存量流程开始编辑</div> <div style={{ display: 'flex', gap: 8 }}>
<select <button
data-testid="process-modeler-open-select" className={openTab === 'existing' ? 'btn btn-sm btn-primary' : 'btn btn-sm'}
defaultValue="" data-testid="process-modeler-tab-existing"
onChange={(e) => openSelected(e.target.value)} onClick={() => setOpenTab('existing')}
style={{ minWidth: 280, padding: '6px 8px' }} >
> 存量流程
<option value="">打开存量流程…</option> </button>
{loadableOptions.map((o, i) => ( <button
<option key={o.id ?? o.key ?? i} value={i}> className={openTab === 'draft' ? 'btn btn-sm btn-primary' : 'btn btn-sm'}
{o.label} data-testid="process-modeler-tab-draft"
</option> onClick={() => setOpenTab('draft')}
))} >
</select> 草稿
{optionsError ? ( </button>
<div style={{ color: 'var(--err)', fontSize: 12 }}>{optionsError}</div> </div>
) : null}
<button className="btn btn-sm" data-testid="process-modeler-new" disabled title="新建流程(下阶段)"> {openTab === 'existing' ? (
+ 新建流程 <>
</button> <div style={{ color: 'var(--text-3)', fontSize: 13 }}>选择一个存量流程开始编辑</div>
<select
data-testid="process-modeler-open-select"
defaultValue=""
onChange={(e) => openSelected(e.target.value)}
style={{ minWidth: 280, padding: '6px 8px' }}
>
<option value="">打开存量流程…</option>
{loadableOptions.map((o, i) => (
<option key={o.id ?? o.key ?? i} value={i}>
{o.label}
</option>
))}
</select>
{optionsError ? (
<div style={{ color: 'var(--err)', fontSize: 12 }}>{optionsError}</div>
) : null}
<button className="btn btn-sm" data-testid="process-modeler-new" disabled title="新建流程(下阶段)">
+ 新建流程
</button>
</>
) : (
<div
data-testid="process-modeler-draft-list"
style={{
minWidth: 320,
maxHeight: 320,
overflow: 'auto',
display: 'flex',
flexDirection: 'column',
gap: 4,
}}
>
{drafts.length === 0 ? (
<div style={{ color: 'var(--text-3)', fontSize: 13, textAlign: 'center' }}>暂无草稿</div>
) : (
drafts.map((d, i) => (
<div
key={d.id}
style={{
display: 'flex',
alignItems: 'center',
gap: 8,
padding: '4px 6px',
border: '1px solid var(--line)',
borderRadius: 4,
}}
>
<span style={{ flex: 1, minWidth: 0, fontSize: 13, overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>
{d.name || d.key || d.id}
</span>
<button
className="btn btn-sm"
data-testid={`process-modeler-draft-open-${i}`}
onClick={() => openDraft(d.id)}
>
打开
</button>
<button
className="btn btn-sm"
data-testid={`process-modeler-draft-delete-${i}`}
onClick={() => onDeleteDraft(d)}
>
删除
</button>
</div>
))
)}
{draftsError ? (
<div style={{ color: 'var(--err)', fontSize: 12 }}>{draftsError}</div>
) : null}
</div>
)}
</div> </div>
) : null} ) : null}