Compare commits

..

77 Commits

Author SHA1 Message Date
821b79c9d8 Merge feat/process-modeler 阶段4: 模板新建流程 + Playwright e2e
Some checks failed
ci / build-test (push) Has been cancelled
- 4 模板(空白/单人/两级/会签,全小写元素名+isExecutable+DI,__PROCESS_ID__占位)+NewProcessDialog
  +中文key净化idMap发布restore;模板办理人表达式与codec逐字对齐回归断言
- Playwright live e2e 三场景(改存量全链/新建全链/走查+权限)对真8093/8089/5173真部署真起实例3绿

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-07-02 16:16:04 +08:00
3808011c8c test(modeler): Playwright live e2e 三场景(改存量/新建/走查+权限)
三场景对真实 8093 网关 + 8089 flowable-service + 真库 eip4 全程点穿:
- 场景A 改存量:/process-modeler?procKey=总包合同交底 → 点会签 userTask「编写交底」
  → EIP4 侧板会签控件读回勾选 → 存草稿(URL 回填 modelId) → 发布(PublishConfirm
  断言 key/版本/运行实例) → 确认 → 起实例 → trace 断言 current userTask。
- 场景B 新建:会签模板新建 → 选 task_cosign 填办理人 content=ADMIN → 存草稿 → 发布
  → 起实例 → trace 断言 current userTask「会签审批」。
- 场景C 走查+权限:中文节点渲染 / palette 齐 / 标准面板+EIP4 侧板同屏 / 超管门 403。

config 复用运行中的 5173 vite(默认 proxy /api→8093),apiJson 直连 8093 同一后端。
数据纪律:afterAll 删本次草稿(净零);发布产生的流程版本无下架端点属固有副作用。
场景C④ alice/123456 dev 库缺席 → 降级为无 token 打 deploy/models 断言 403(同
requireSuperAdmin 拒绝分支) + admin 打 models 200 对照。

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-07-02 16:12:14 +08:00
54b0200ac0 test(modeler): 模板办理人表达式与codec逐字对齐回归断言(守命根)
I-1:模板里的 activiti:candidateUsers/collection 是硬编码字符串,与 candidateExpression
codec build 输出的逐字对齐此前只是实测、无测试守护。新增断言:从各模板 fromXML 解出属性值
(moddle 已解码 &quot;→真引号、保留全角【】,即 codec 处理的 businessObject 值层),
断言 === buildCandidateExpression(标准 item, 变体)(单人/两级 candidate、会签 multiInstance)。
模板 JSON 键序/转义漂移或 codec 改契约会被单测立即抓到,而非等 live 部署解析即断。

M-1:sanitizedId 加注释说明前端无碰撞去重的前提(新建模板仅 process key 一个非 ASCII id、
节点 id 全 ASCII → 碰撞不可达;未来引入中文节点 id 须对齐后端 -2/-3 去重)。

全量 vitest 273 绿、tsc -b exit 0。

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-07-02 16:00:28 +08:00
2477f67afe feat(modeler): 新建流程(空白/单人/两级/会签4模板+NewProcessDialog)
模板库 src/modeler/templates/:4 个 BPMN 模板以真实流程为骨架抽形,全小写
元素名 + isExecutable="true" + 完整 BPMNDiagram DI;单人/两级带 activiti:candidateUsers
示例(全角【】+type:user),会签带 multiInstanceLoopCharacteristics+elementVariable+完成条件。
占位符 __PROCESS_ID__/__PROCESS_NAME__ 由 buildNewProcessXml 按用户 key/名称实例化:
ASCII key 直作 process id;中文 key 净化为 ASCII 并记 idMap(发布 restore 回中文 process key)。

NewProcessDialog:名称/key(可中文)/模板下拉,确认产实例化 XML 交父页 importXML。
ProcessModelerPage:新建流程按钮由 disabled 变可用→开对话框→pending newDraft 挂 Modeler+
import 模板(首存前不落草稿,走 createDraft 首存路径,展示名进草稿 name,diff 基线清空)。

模板正确性测试(fromXML 无警告/真序列化后全小写/isExecutable/会签含 multiInstance)+
NewProcessDialog+页面接线测试;全量 vitest 270 绿、tsc -b、build 通过。

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-07-02 15:49:16 +08:00
ad8f63cf93 Merge feat/process-modeler 阶段3: 同人确认发布+diff+CRITICAL修复
Some checks failed
ci / build-test (push) Has been cancelled
- 节点级 diffSummary(命名空间感知按userTask id对齐,办理人codec比对/assignee/formKey/multiInstance)
- PublishConfirm(影响摘要key/版本/运行实例+变更节点清单+422结构化错误清单+同人确认)
- 发布 gating(无modelId提示先存)+原始源基线不被首存重置+发布前持久化(预览==部署)
- CRITICAL修复:activiti.json/flowable.json加tagAlias:lowerCase+自定义类型名PascalCase——
  修 bpmn-js Modeler.saveXML输出大写<Process>/<UserTask>致Flowable断部署;真Modeler序列化回归测试
- 全量 vitest 231+tsc+build 绿;live 验收发布 v9 中文key+起实例真userTask全通过

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-07-02 15:31:00 +08:00
8ea0ef2f1e fix(modeler): activiti.json 修 Modeler.saveXML 大写元素名(断部署)+真Modeler序列化回归测试
CRITICAL:bpmn-js Modeler.saveXML 把被 activiti.json `extends` 的 bpmn 类型序列化成
PascalCase 元素名(<Process>/<UserTask>/<StartEvent>…),未扩展的 <sequenceFlow>/<endEvent>
仍小写。Flowable 大小写敏感 → <Process> 不被识别为流程,ProcessValidator 报
flowable-process-definition-not-executable,部署完全失败。

根因:moddle 把「被扩展类型」的合并描述符 $pkg 设为**最后一个 trait 的包**(moddle
index.esm.js:577)。activiti 包缺 `xml.tagAlias:"lowerCase"`,故 moddle-xml 写元素名时不做
首字母小写 → PascalCase。且 tagAlias 是**双向**的(也驱动 fromXML 解析),要求自定义元素类型名
用 activiti/camunda 惯例的 PascalCase,否则解析 <activiti:taskListener> 找不到类型而丢弃。

修法(对齐 activiti/camunda-bpmn-moddle 标准):
- activiti.json + flowable.json 加 `"xml": { "tagAlias": "lowerCase" }`;
- 自定义元素类型名改 PascalCase:taskListener→TaskListener / executionListener→ExecutionListener
  / field→Field / formProperty→FormProperty / value→Value / in→In / out→Out(属性 type 引用同步)。
  XML 元素名仍小写(tagAlias),故 fixture 与「toContain('activiti:taskListener')」类 XML 断言不变。
- Eip4Panel.tsx:moddle.create/$type 用 'activiti:TaskListener';测试 fake 类型名同步。

为何旧测试没抓到:T1.1/T1.2 只断言 activiti 扩展属性/元素多重集,从不断言基础 BPMN 元素名大小写;
fromXML→toXML 与 create 都走同一 moddle-xml Writer 且都产 PascalCase(本 commit 实证)。

新增 serialization.test.ts(4 例,RED→GREEN):以 BpmnModdle(= Modeler.saveXML 的 moddle 层,
jsdom 跑不动 diagram-js SVG)驱动 fromXML→toXML 与 create→toXML,断言基础元素名全小写、无 PascalCase、
isExecutable 保留、扩展元素/属性不丢;flowable 隔离同验。

serialization 4 + fidelity 12 + Eip4Panel 37;全量 231 单测绿,tsc -b rc=0 + build 干净。

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-07-02 15:23:51 +08:00
0428a5c9d1 fix(modeler): 发布收口——原始源基线不被首存重置+发布前持久化(预览==部署)+跨命名空间diff测试
I1+I2 联锁修(同一根因:预览/diff 的两侧要对齐"打开时原始源"与"实际部署内容"):
- I1:新增 baselineTargetRef,openSourceRef 只在首次打开某目标时捕获原始源;存量首存
  setParams(modelId) 触发的 reload 因归属已预置为新 modelId 而保留基线,不再被冲成「已存版」
  →「打开存量→改办理人→存→发布」的 diff 恢复非空。
- I2:handlePublishClick 在开确认弹窗前先 saveDraft(currentXml) 持久化编辑器态,使
  后端 deploy 读到的服务端草稿 == 预览 == diff 的 current 侧(草稿改未存直接发布不再预览≠部署)。

Minor:
- M1:diffSummary 比 content 前做全角【】↔半角{} normWidth 归一(含 RAW 兜底路径),防宽度变体误报。
- M2:completionBody 折叠全部空白后比较,防 bpmn-js 重排空白误报完成条件变更。
- M3:PublishConfirm 发布中 guardedClose 拦截遮罩/X 关闭。

I3 测试:diffSummary 跨命名空间(默认 ns 源 vs bpmn: 前缀当前)对齐命中/前缀不误报 + M1 宽度变体;
页面 I1 锁(存量 save→publish 后 diff 基线仍原始源→清单非空,已 red-check 证伪防呆)+ I2(发布前 saveDraft)。

diffSummary 16 + PublishConfirm 9 + 页面 22;全量 227 单测绿,tsc -b rc=0 + build 干净。

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-07-02 14:39:52 +08:00
406f053ec2 feat(modeler): 同人确认发布(影响摘要+节点级diff+422校验错误清单)
- diffSummary.ts:DOMParser 命名空间感知的节点级 diff,按 userTask id 对齐比较
  办理人(candidateUsers,走 codec 比 items)/指派(assignee)/表单(formKey)/会签(有无·
  collection·completionCondition)四类,含新增/删除节点;坏 XML 返 []。
- processModeler.ts:deployModel(id)/fetchImpact(id),422 校验清单与通用失败归一进
  DeployOutcome(errors 兼容 flowable 对象式与网关字符串式两形态),impact 防御性 found。
- PublishConfirm.tsx:Dialog 展示流程 key/当前版本→新版本/运行中实例数(旧版本不受影响)
  + 变更节点清单;确认→deployModel 成功 toast「已发布 vN」并关闭,422→节点错误清单不关窗。
- ProcessModelerPage:顶栏发布按钮启用+gating(无 modelId 提示先存草稿),打开时存源 XML
  作 diff 基线。

diffSummary 13 + PublishConfirm 9 + 页面 21;全量 223 单测绿,tsc -b + build 干净。

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-07-02 14:10:46 +08:00
ac5ab12574 Merge feat/process-modeler 阶段2: 表达式codec+EIP4侧板+存草稿闭环
Some checks failed
ci / build-test (push) Has been cancelled
- 办理人/会签表达式 codec(与 BasePropertiesConverter 逐字对齐+stringToJson引号映射防截断JUEL;
  全库4794真实表达式往返实证零破坏)
- EIP4 侧板五控件(办理人meta透传/会签保真读回isSequential+elementVariable+自定义完成条件/
  formKey过滤/扩展属性/监听器field保留;切换节点无串台)
- 存草稿闭环(三路径保eip4IdMap+首存回填modelId防刷新重复+草稿列表/删除/formKey过滤输入)
- 全量 vitest 198+tsc+build 绿;live 验收总包合同交底存草稿→重开侧板忠实回显

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-07-02 13:18:10 +08:00
eba1704a55 fix(modeler): 首存回填modelId(防刷新重复草稿)+DELETE注释订正+placeholder保值测试
I-2:handleSaveDraft 在 createDraft/draftFromProcDef 成功后 setParams({modelId},{replace:true})
回填 ?modelId=,令刷新幂等(不再对同一 procKey 重复建草稿)、二次保存恒走 PUT。
测试:首存后按 modelId 重载(getModel('NEW-1'))证明回填生效;二次保存走 PUT NEW-1。

Minor:
- createDraft 的 metaInfo 补 sourceProcDefId 键,结构与 from-procdef 对齐(restore 只读
  eip4IdMap,但一致性利于 T3.x 影响摘要/审计)。
- deleteDraft 注释订正:后端 DELETE 已实现(impl-t21 f0d704d 网关同门转发),非「待补」。
- formKey placeholder 保值直测:过滤掉当前值后 select 仍保留该值(占位「(当前)」)。

测试 ProcessModelerPage 17→18、Eip4Panel 36→37;全量 vitest 198 绿 / tsc -b 干净 /
npm run build 成功。仅动自己文件。

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-07-02 12:46:55 +08:00
5c2c0d95f6 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>
2026-07-02 12:14:37 +08:00
a9a304ab3d fix(modeler): 侧板评审收口——会签保真读回/切换节点回归测试/meta可见性+清除确认
I-1 会签保真:isSequential/elementVariable/completionCondition 原值读进 CosignState、
写回用读到的值(真实库 isSequential=true×2 / elementVariable=assign|loop_assign / 完成条件
>0.6×7 原强写会静默改坏派任);完成条件 body 不匹配预设→「自定义(保留)」态,仅主动选预设才
改写;elementVariable 缺省态与原本无 completionCondition 写回时省略,不凭空写空。parseCompletion
改精确匹配预设串(修 >0.55 误判过半的子串 bug)。新增串行开关+循环变量输入。

I-2 双节点回归:A(meta X)→B(meta Y)→编辑 B→写回 meta===Y≠X,防串台。

I-3 meta 可见性:顶部只读徽标显示非空业务 meta(如任务后置服务 PM_XXX);删光 items 且含非空
业务 meta 时 window.confirm 确认才写 undefined(取消则本地态与引擎均不变)。

顺手:扩展属性强制 activiti:/flowable: 前缀 + 拉黑有专用控件的键(candidateUsers/formKey/
collection/elementVariable);非标准办理人表达式(parse→null)显示「编辑将覆盖」警示;订阅
commandStack.changed,非自身写入时对当前选中重灌本地态(undo/redo 脱同步防线)。

测试 Eip4Panel 21→33;全量 vitest 186 绿 / tsc -b 干净 / npm run build 成功。仅动自己文件。

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-07-02 12:01:26 +08:00
6fceff784d test(modeler): 侧板办理人补撇号转义用例(消费 codec 引号转义,防截断 JUEL)
新增 1 例:content 含撇号 O'Brien → 写回载荷内容段(剥离 JUEL 前后缀定界引号)
无裸 ASCII 单引号、含全角‘,验证侧板经 codec build 受引号转义保护。
Eip4Panel 测试 20→21;仅提交本测试文件,codec 由并行 T2.3 收口。

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-07-02 11:38:08 +08:00
11632b4801 fix(modeler): codec 评审收口——stringToJson引号映射+半角content变体+item未知键透传+形状守卫
评审者跑全库 4794 条真实表达式往返对照原版序列化器,四项收口:
- I-1 build 补 stringToJson 引号契约(BasePropertiesConverter.java:235-280):字符串叶子值
  '→‘、"→“(经 JSON.stringify replacer,{}→【】由 halfToFull、\\与控制字符由 stringify 覆盖)。
  否则用户输入含 ' 截断外层 JUEL 单引号字面量 / 含 " 截断内层 JSON,部署后表达式解析即断。
  语料 ‘/“ 均 0 命中→对存量为 no-op,不破逐字往返。
- I-2 头注释纠偏:「content 不含花括号」被 20 条真实 ${users}(半角)证伪;改为事实——
  4774/4794 逐字,20 条半角 content 变体 build 归一为全角,引擎 :54 全局【→{ 还原后运行期等价。
- M-1 item 未知键 known-first 重排+按原序透传(与 meta 全量保留对称,不静默丢未来扩展键)。
- M-2 items 元素形状守卫:元素非对象或 type 非字符串→整体返 null 不抛。

加分:tools/codec-corpus-sweep.mjs(照 modeler-fidelity-sweep 风格,内联镜像 codec 跑全语料):
1512 文档 / 4794 表达式 → 逐字 4774 + 引擎运行期等价 20 + 解析失败 0 + 硬不匹配 0(门禁绿)。

测试 29 例(原 20 + 引号映射/幂等/meta 引号/半角变体运行期等价/未知键透传/形状守卫 9 例);
modeler 全量 66 例绿;tsc -b 干净。

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-07-02 11:36:53 +08:00
6dc9075648 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>
2026-07-02 11:35:13 +08:00
3dfb90f59b feat(modeler): 办理人/会签表达式编解码器(与 BasePropertiesConverter 逐字对齐)
纯前端纯函数 codec,parse/build 处理 businessObject 属性值层的办理人表达式。
前后缀常量逐字对齐 BasePropertiesConverter:34-35(candidate/multiInstance 两变体);
内容段全角【】↔{} 双向映射(build 恒全角,parse 兼容半角);外层 meta
(messageTemplate/taskSuccessService/isSkip* 等运行期业务字段)原样保留,侧板只改
items 也逐字往返不丢。content 逗号多值与 CHAR 尾部补白空格原样保留。

TDD:先红后绿。测试运行时从 synthetic-full-surface fixture 抽真实表达式锚定逐字形态。
20 例(真实 candidate/multiInstance 往返逐字 / 尾部空格保留 / 各 type 不丢字段 /
isSendMessage 可选往返 / 半角输入兼容 build 恒全角 / 非法输入返 null 不抛)全绿;
modeler 全量 32 例绿;tsc -b 干净。

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-07-02 11:16:51 +08:00
d08a35fbbb Merge feat/process-modeler 阶段1: Modeler 前端骨架(moddle保真+/process-modeler页)
Some checks failed
ci / build-test (push) Has been cancelled
- vendored activiti/flowable moddle 描述符+语料双门测试(1512/1512 零丢失扫描工具,加固版回归门)
- /process-modeler 页:bpmn-js Modeler+标准属性面板(显式attachTo)+admin门+存量打开器(by-id/by-key双参)
- 设计中心「流程设计」入口;红线守住(只载activiti/无Camunda provider)
- 全量 vitest 118 例+tsc+build 绿;live 验收「总包合同交底」画布/palette/Multi-instance面板全渲染

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-07-02 11:08:27 +08:00
dffd1f32ef fix(modeler): 属性面板显式 attachTo 修挂载时序(live 实证)+canvas 分支错误提示
live 复验:画布/palette/选中/context pad 正常,但标准属性面板从不挂载
(document 中 .bio-properties-panel 为 0,容器 children=0)。

根因(本次修时 attachTo 测试逼出):属性面板宿主 <div data-testid=process-modeler-props>
**从未挂 ref={panelRef}** → 构造参数 propertiesPanel.parent 恒为 null,面板无处渲染。
- 补 ref={panelRef} 到 props 容器 div(真根因)。
- 构造后显式 (modeler.get('propertiesPanel')).attachTo(panelRef.current)——
  bpmn-js-properties-panel 规范补救,放 importXML 前、alive 检查内、panelRef 存在时。
- 顺带修 T1.5 评审 M-2:canvasRef 为 null 分支改为 setError(原停 loading 无提示)。

测试:ProcessModelerPage.test.tsx +1(Modeler stub get('propertiesPanel')→{attachTo},
断言 attachTo 恰调一次且实参是 props 容器 DOM)。stub get 改按 service 分派
(propertiesPanel/canvas)。全量 vitest 22 文件 118 例绿;tsc -b 干净;npm run build 成功。

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-07-02 11:05:23 +08:00
ae097f2a9c fix(modeler): 打开器改 by-key 载入(修 options source=model 语义缺口)
live 验收发现:本库 /api/process-select/options 的 143 个选项 source 全为 'model',
option.id 是 act_re_model id(非 procDefId)→ 按 id 载入永远 found:false;option.key 才是流程 key。

- processModeler.ts:加 fetchProcDefSourceByKey(key) → GET
  /api/workflow/process-definitions/by-key/{key}/source(key 常纯中文,encodeURIComponent;
  返回形状同 fetchProcDefSource,共用 normalizeProcDefSource:found:false 不解构 bpmnXml/idMap)。
  ProcessOption 加 source 字段。
- ProcessModelerPage:打开器双参分派——source==='processDefinition' 用 ?procDefId=<id>,
  其余(model/history)用 ?procKey=<key>;loadEffect 按参数派 by-id / by-key;
  过滤规则 !!o.id 改为 source==='processDefinition' ? !!o.id : !!o.key;
  选择器用索引取回选项对象避免路由二义。

测试:processModeler.test.ts +2(纯中文 key 编码 / by-key found:false)+ source 映射断言;
ProcessModelerPage.test.tsx +3(?procKey= 走 by-key 并 importXML / 选 model 选项派 by-key /
选 processDefinition 选项派 by-id)。全量 vitest 22 文件 117 例绿;tsc -b 干净;npm run build 成功。

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-07-02 10:59:24 +08:00
e131b8dee9 feat(modeler): /process-modeler 页骨架(Modeler+标准属性面板+存量载入+设计中心入口)
阶段1 T1.5:admin 门 + 三栏布局(左画布/右上 EIP4 侧板占位/右下标准属性面板)
+ bpmn-js lib/Modeler 挂载(只载 activiti moddle、只引标准 BpmnPropertiesProvider,
严禁 Camunda provider)+ ?procDefId= 时 fetchProcDefSource→importXML(idMap 存 ref)
+ 无参时 process-select 存量流程选择器 + 设计中心「流程设计」入口。

api: processModeler.ts(fetchProcDefSource / fetchProcessOptions,裸 JSON 防御性默认)。
- procDefId 用 encodeURIComponent 进 path(真实库 id 形如「总包合同交底:3:<uuid>」中文+冒号)。
- found:false 先判后返,不解构 bpmnXml/idMap(后端此分支省略这些键)。
tsconfig.app.json 开 resolveJsonModule(首个 app 代码 import json)。
bpmn-js-properties-panel 补 ambient d.ts(包未发布类型)。

测试:ProcessModelerPage.test.tsx 5 例 + processModeler.test.ts 6 例(含中文+冒号
procDefId 断言 URL 已编码 / found:false 只返 found 键 / amis 信封解包);
DesignCenterPage.entrances 加 dc-process-modeler admin-only 断言。
全量 vitest 22 文件 112 例绿;tsc -b 干净;npm run build 成功(bpmn-js 进主 bundle)。

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-07-02 10:37:36 +08:00
b391ee9f16 fix(modeler): 保真扫描回归加固——refs袋+unresolved入门+规模门+stderr(评审I1/M1/M2/M5)
- I1 引用回归盲区:surface() 新增 refs 袋(sourceRef/targetRef/bpmnElement/
  processRef/attachedToRef/default,与 sanitizeIds 同覆盖面)并入比对键;normWarn
  的 unresolved reference 类 warning 计入硬门 failures(净化/往返破坏连线的直接信号)。
- M1:删除未使用的 realFail。
- M2:新增 EXPECTED_TOTAL 环境变量(默认 1512),实际语料数不符即判失败;
  decodeFailures.length 并入硬门(过滤集内本应 100% 干净 UTF8)。
- M5:崩溃分支透出子进程 e.stderr。
- M3/M4:命名空间字面前缀识别的语料前提、extElemText trim 口径各加注释声明。

重跑实测(node tools/modeler-fidelity-sweep.mjs):匹配 1512/1512 零丢失,
解析异常 0,解码失败 0,warnings=0,exit 0;EXPECTED_TOTAL=9999 时 exit 1
(规模门生效)。npx vitest run src/modeler 12/12 绿;npx tsc -b 干净(exit 0)。

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-07-02 10:15:49 +08:00
bd7c7fc697 fix(modeler): 描述符补 formProperty.value(sweep 0-warning 收口)
activiti.json formProperty 补 value isAttr(对齐 D6 完整描述符)。此前 4 例
unknown attribute <value> warning(均 Activiti 自带 demo 流程的 formProperty
value= 属性,如 VacationRequest)靠 lax $attrs 保留、本无数据丢失,补声明后消除。

重跑实测(node tools/modeler-fidelity-sweep.mjs,5433/eip4/eip3):
- 匹配 1512/1512 零丢失,解析异常 0,解码失败 0,warnings=0。
- 命名空间 activiti 1509 / flowable 3。
- npx vitest run src/modeler 12/12 绿;npx tsc -b 干净(exit 0)。

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-07-02 10:02:09 +08:00
6eb856bb75 feat(modeler): 全量真实流程 moddle round-trip 保真扫描工具(实测 1512/1512 零丢失)
对本地 eip4 库(5433,search_path=eip3) act_ge_bytearray 全部真实 BPMN
(name_ like %.bpmn%/%.xml,共 1512)逐条 bpmn-moddle fromXML→toXML,
数据级(实体解码归一后)校验「activiti/flowable 扩展属性+扩展元素结构
+全部 bpmn 元素 id 集合」多重集往返一致。

- psql 子进程取数(不引 pg 依赖);命名空间嗅探后单载 activiti 或 flowable
  (T1.1 实证双载丢 userTask);进 moddle 前净化非法 id(镜像后端
  sanitizeBpmnIds,1445/1512 文档 process id 为中文,moddle 拒非 ASCII-NCName)。
- 实测: 匹配 1512/1512 零丢失(activiti 1509 / flowable 3);解析异常 0;
  解码失败 0。warnings 仅 4 例 unknown attribute <value>(formProperty
  value= 属性未声明,均 Activiti 自带 demo 流程,lax $attrs 保留,零丢失)。
- 解码守卫: 校验 base64→UTF8 无损,单列非 UTF8 文档。全表探明解码失败仅
  出现在非 BPMN 二进制资源(.png 1504 / var-* 87524),被 name 过滤器正确排除;
  真实 BPMN 语料 0 解码失败。

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-07-02 09:59:54 +08:00
a2aeeba296 fix(modeler): T1.1 评审收口——bpmn-moddle 显式devDep+$attrs断言+类型声明
评审 I-1 / M-1 / TS7016 收口(承接 8fdfe68):
- I-1 幻影依赖:devDependencies 显式声明 bpmn-moddle ^8.1.0(npm dedupe 到与
  bpmn-js 同一份 8.1.0),保真测试不再依赖传递提升、与 Modeler 运行时同版本。
- M-1 断言意图纠偏:fidelity.test.ts 原注释「未声明时 .get() 返 undefined」实证有误——
  moddle .get() 对未声明属性会回落 $attrs 返原值(已实证:flowable:assignee 未声明时
  .get() 返 "X")。改注释 + 增 `expect($attrs?.['activiti:candidateUsers']).toBeUndefined()`
  直接断言值未落 lax $attrs(=真 typed 化,声明属性确不在 $attrs)。
- TS7016:新增 src/modeler/moddle/bpmn-moddle.d.ts(最小 ambient 声明)消编辑器诊断。

验证:npx vitest run src/modeler 12/12 绿;npx tsc -b 干净(exit 0)。

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-07-02 09:47:02 +08:00
8fdfe688f8 feat(modeler): activiti/flowable moddle 描述符 + 语料覆盖/round-trip 保真测试
在线流程 Modeler 阶段1 Task 1.1(P1 双门验收)。为 bpmn-js Modeler 载入
存量 activiti BPMN 提供 vendored moddle 描述符,并以合成 fixture 验证零丢失。

依赖(与 bpmn-js 17.11.1 兼容,实际解析版本):
- bpmn-js-properties-panel 5.60.0(package.json ^5.23.0)
- @bpmn-io/properties-panel 3.47.0(package.json ^3.23.0)
- bpmn-moddle 8.1.0(bpmn-js 传递依赖,直接 import)

交付:
- src/modeler/moddle/activiti.json:完整 activiti 命名空间描述符,覆盖 §0 实测
  全集——属性 formKey/candidateUsers/exclusive/assignee/collection/elementVariable/
  candidateGroups/autoStoreVariables/initiator/dueDate(按宿主 extends 到 UserTask/
  StartEvent/Process/ScriptTask/MultiInstanceLoopCharacteristics 等)+ 元素
  taskListener/formProperty/field/string/value/executionListener/in/out。
- src/modeler/moddle/flowable.json:flowable 命名空间镜像描述符(覆盖 flowable:assignee 等)。
- src/modeler/moddle/fixtures/synthetic-full-surface.bpmn.ts:合成 fixture,形态逐字
  对照真实流程「总包合同交底」——含全角【】办理人 JSON、多实例、taskListener+field/
  string、formProperty+value、boundaryEvent+timer、conditionExpression、完整 DI。
- src/modeler/moddle/fidelity.test.ts:12 用例(语料覆盖 + round-trip 零丢失)。

fixture 关键形态发现(实证):
- 办理人/会签 JSON 用**全角【】**包裹对象,方括号 [] 半角,引号在属性内以 &quot; 转义;
  content 尾部有 CHAR 补白空格(如 "4028...0f7d    ")——均需零丢失。
- candidateUsers 表达式解析后 byte-exact 等于原文;moddle 序列化把 '/" 输出为
  数字实体 &#39;/&#34;,全角【】原样保留(XML 语义等价、模型层零丢失)。

勘探实证并固化为回归测试的两条 moddle 约束:
- moddle-xml 拒绝中文 id(illegal ID,须 NCName ASCII)→ 这正是 D7 BpmnIdSanitizer
  在进 moddle 前净化、发布时还原的根本原因;fixture 用 ASCII id、中文仅留在 name。
- activiti+flowable 双包同载会因跨包同名 extends 属性(如 exclusive)冲突而丢弃 userTask
  → 按命名空间隔离加载;已验证 Modeler 单载 activiti 时 flowable 属性经 lax $attrs 零丢失
  往返(Task 1.5 Modeler 应单载 activiti)。

验证:npx vitest run src/modeler 12/12 绿;全量 101/101 绿;tsc -b 干净;npm run build 成功。

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-07-02 09:35:23 +08:00
a807078595 Merge docs/readme-dev-fix-0702: README 联调指引修正
Some checks failed
ci / build-test (push) Has been cancelled
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-07-02 08:15:33 +08:00
7d4f26edd3 docs(readme): 修正过时联调指引(JDK17→21/8084→8093/账号/自举→build_devdb)
- 后端联调改走 scripts/run-dev.sh(dev :8093,JDK 21 守卫),删 JDK17 毒指引(项目必须 21,17 连编译都过不了)
- 账号分口径:dev 库 admin/111111(日常)/ local 自举 alice/123456(CI/对拍)
- .env 表 VITE_BACKEND_TARGET 默认对齐实际 8093
- 本地库指引:日常 eip4dev 用 build_devdb.sh,自举集仅 CI/对拍
- 页面 schema 契约行删「开发期静态 mock」过时表述;设计器行改「已闭环」

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-07-02 08:15:33 +08:00
d406a1629b Merge: 报表导出文件名/扩展名修复(受控 blob 下载)
Some checks failed
ci / build-test (push) Has been cancelled
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-26 14:01:16 +08:00
d80ea76974 fix(report): 导出 PDF/Excel 用受控下载,文件名/扩展名正确
导出按钮(actionType:url)默认 window.open 一个 attachment 响应,部分浏览器丢失 Content-Disposition 文件名 → 下载成 UUID、无扩展名、打不开。新增 reportDownload:自定义 amis env.jumpTo 拦截报表导出 URL,显式 fetch 成 blob 并用 <a download="<CD文件名>"> 落盘。filenameFromContentDisposition 优先取 filename*(UTF-8 真实报表名)而非前面的 UUID 兜底。前端改动,无需重转重导,覆盖全部报表导出。6 单测 + 浏览器实测 办公用品采购申请单.pdf/.xls。

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-26 14:01:16 +08:00
8301db1f88 Merge feat/approval-closure: 审批抽屉协办/转阅多选人 + BPMN流程图(bpmn-js) + 会签进度横幅
Some checks failed
ci / build-test (push) Has been cancelled
2026-06-26 08:29:47 +08:00
9b2bb2c0c3 feat(approval): 审批抽屉显示会签进度「已会签 N/M 人」
ApprovalMeta 加 cosign/cosignTotal/cosignCompleted;ApprovalDrawer 顶部当 cosign 时
显示会签进度横幅。tsc 干净。

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-26 08:19:09 +08:00
4f06268755 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>
2026-06-26 08:09:31 +08:00
68d797e1c4 Merge feat/scriptcommands-honest-noop: scriptCommands 哑火动词显式跳过(§10.2)
Some checks failed
ci / build-test (push) Has been cancelled
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-25 13:38:28 +08:00
03533eaf5e fix(amis): scriptCommands 哑火动词改显式跳过+告警(§10.2 有界安全修)
amis setValue 动作(CmptAction)只读 args.value、丢弃 required/filter/options/label/style 等语义 args→6 个动词(setLabel/setRequired/setFilter/setOptions/setNullSelection/setStyle)运行时静默哑火,且 args.value=undefined 经 onChange 路径可能清值。amis 全量 registerAction 核实无这些动词的内置 action。改为显式跳过(返回 null,translateCommands 自动过滤)+ 一次性 console.warn,消除清值风险、不再伪装已处理。真正支持需转换器侧数据绑定(requiredOn/source 绑数据变量)属 L 跨切面,留 §10.2 follow-up。scriptCommands.test 22(含 6 动词跳过/整体过滤/告警去重),registerReplay 7,full vitest 83/83+tsc -b 干净。

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-25 13:38:28 +08:00
2a37251f6f Merge feat/p0-security-hardening: 新增 eip4-web Gitea Actions CI
Some checks failed
ci / build-test (push) Has been cancelled
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-25 11:50:56 +08:00
63d46af7b7 ci(P0④): 新增 eip4-web Gitea Actions CI(类型检查+构建+vitest)
前端此前无 CI。补 .gitea/workflows/ci.yml 跑 npm ci + npm run build(tsc -b && vite build)+ npm test,防前端回归(2026-06-24 架构评审 §10 验证体系)。

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-25 11:50:56 +08:00
67731663c1 Merge feat/arch-review-followup: isAdmin 收口 isAdminProfile(B4) + 删 api/schema.ts overlay 死代码(B2) 2026-06-24 11:31:59 +08:00
90888f7e06 chore(web): 删 api/schema.ts overlay 死代码(B2)
fetchSchemaLayer/putOverlay/restoreStandard 全仓(含 e2e)零引用,真实 overlay API 在 editor/overlayApi.ts;删重复死份。tsc 干净 + vitest 77/77。见总览 §10 B2。

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-24 11:22:47 +08:00
768ffa8551 refactor(web): isAdmin 收口到 isAdminProfile(B4)
5 处逐字硬编码 profile?.account==='admin'||userId==='ADMIN'(Topbar/ModelerPage/NewFeatureShell/AiFeatureForm/DesignCenterPage)收口到 auth/token.ts 纯函数 isAdminProfile,口径不变。
顺带:5 个页面测试的 vi.mock('../auth/token') 从整模块替换改为 importOriginal 只覆盖 getProfile(不再 mock 纯函数,修复 mock 漏 isAdminProfile 致的 render 崩)。
验证:新增 token.test.ts 4 测试 + tsc -b 干净 + vitest 18 文件/77 测试全绿。见总览 §10 B4。

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-24 11:20:16 +08:00
2fb09f7a7a Merge branch 'feat/p0p1-impl' into main
P1④改表加列UI + P1⑤审批列表入口e2e

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-21 15:31:53 +08:00
5b117df4d1 feat(P1④/P1⑤): 改表加列UI + 审批列表入口e2e
- P1④ 改表加列: meta.ts alterEntity(POST /api/meta/entity/{table}/attributes)
  + ModelerPage 行内「加字段」Dialog(复用FieldTable),打破"v1只建新不改表"
  + five-ring.spec.ts 新增"改已有表加列(建模器加字段→元数据落库)"浏览器e2e
- P1⑤ 审批列表入口: 新增 approval-list-entry.spec.ts(纯mock)验生产主路径
  转换列表页按钮→选中行(checkOnItemClick)→openApprovalDrawer→AppShell→ApprovalDrawer抽屉打开
- build绿+vitest73;fivering 5/5 + 审批入口 1/1 全绿

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-21 13:56:27 +08:00
d1fd6ed956 Merge branch 'feat/human-five-ring' into main
人走五环建新功能向导 + 主子表 v1(基础/派生/汇总/引用驱动联动)前端 + 真事件 e2e。
73 vitest + npm run build + Playwright(fivering 4/4 + 隔离 probe 3/3)全绿。

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-20 22:35:09 +08:00
b578d8d41b feat(主子表): 引用驱动联动 向导映射 UI + 真事件 e2e
- NewFeatureShell: 主子表步③加「引用联动」combo(引用列 → 目标子列 ← 源实体列),
  childLinkage 透传 compile;构建时分支(不依赖 amis 运行时 step 跳步),页面 data seed []
- e2e/master-detail: 引用驱动联动用例——真后端 schema(GET /api/page/schema) + 真 picker
  数据 + 真 Playwright 事件填充 + 提交落库验证(选物料→带出单价/规格,用户未手填仍随
  _ADD 级联落库;引用 FK 本身也落库)
- e2e/linkage-probe: amis input-table 行内联动机制隔离验证(钉死 selectedItems 是对象非
  数组;远程 source 选项携整行列;多行 ${index} 按行隔离防串台)
- NewFeatureShell.test: 修过时断言(c735f24 类型选择卡后需先选类型才出 amis 挂载点)

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-20 22:28:45 +08:00
c735f24c64 refactor(设计中心): 合并「新建功能/新建主子表」为单一入口 + 页面类型选择
设计中心两个「新建」按钮(新建功能 / 新建主子表)合为一个「+ 新建功能」入口:
进去先选页面类型(维护型 CRUD / 树形 / 主子表),再走对应向导。扩展新页型只加一个
选项,不再加顶级按钮;recipe 类型从内部实现差异回归为向导内的一个选择。

- NewFeatureShell 重写:RecipeChooser 类型选择卡 → 按类型【构建时(JS)】分支向导步骤
  (主子表才有「建子表」步及派生/汇总字段)。不依赖 amis 运行时 step hiddenOn——
  amis Wizard.normalizeSteps 只在 props.data 变时重算,向导内选择改 store.data 不触发,
  故 step 级动态跳步不可靠;类型进向导前定、构建时分支才健壮。
- 删 MasterDetailShell.tsx + /new-feature-md 路由 + 设计中心「新建主子表」按钮
  → 设计中心回到「新建功能 + AI 建功能」两入口
- e2e:five-ring/master-detail 改为先点类型选择卡(dc-recipe-*)再进向导;3/3 绿,build 绿

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-20 18:54:16 +08:00
4a107f3969 feat(主子表): 父级汇总定义 UI + e2e 扩展
- MasterDetailShell step③ 汇总字段 combo(主表列+子表列+函数 SUM/COUNT/AVG/MIN/MAX);
  page data seed childRollup:[] 防未触碰时占位串致 compile 400
- e2e 派生用例扩展为「派生+汇总」:向导加 TOTAL 主列+汇总字段,断言发布页 __rollup +
  主表 TOTAL static SUM(ARRAYMAP) 预览,_ADD 后 _LOAD 主表 TOTAL=55(服务端先派生再聚合)

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-20 17:55:59 +08:00
df0ac72225 feat(主子表): 派生字段定义 UI + e2e
- MasterDetailShell step③ 派生字段 combo(目标列 + 公式),page data seed
  childDerived:[] 防 combo 未触碰时发出未解析占位串致 compile 反序列化 400
- e2e: 新增「派生字段全流程」用例(向导加派生 → 发布页含 tpl 预览+__derive →
  _ADD 服务端逐行落库 AMOUNT,经 _LOAD 回读验证;断言 quickEdit:false);
  原主子表用例补 _LOAD 级联实证(_SEARCH 列表不嵌充子数组,_LOAD 才填充)

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-20 17:32:26 +08:00
934c6464db feat(master-detail): 主子表向导(amis wizard)+ 设计中心入口 + e2e
新建主子表功能:设计中心「+ 新建主子表」→ MasterDetailShell amis wizard 四步
(建主实体→建子表(传masterTable自动加FK)→生成主子页(compile master-detail-v1,
后端ensureLink+编译出 input-table 子表页)→发布)。子行经主表_ADD流随主记录级联落库。
用 api.responseData 把主实体id/表名 remap 避免被子实体响应覆盖。
Playwright e2e 全程点穿:建主+子→生成→发布→级联_ADD(status0)。1 passed。

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-20 15:37:22 +08:00
2b261e319f feat(modeler): 建实体向导加「所属分类」选择器(source /api/meta/entity-types)
wizard 步①新增 amis select「所属分类」(必填,221 分类可搜),提交时随 attributes 一并 POST。
e2e 补选分类交互。修用户反馈的「实体所属分类缺失」。

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-20 14:45:44 +08:00
71535929f7 refactor(design-center): 编排壳/AI入口改用 amis 渲染(替手搓原生表单)
用户反馈手搓 input/select/嵌套弹窗又丑又不一致。改:
- NewFeatureShell → amis wizard(建实体 combo字段含引用列 → 选recipe → 发布),三步 api 直打后端、数据自动透传
- AiFeatureForm → amis form(api adaptor 包裹非标响应 + ARRAYFILTER 取草稿 targetId)
- 组件测试改为守 admin/容器(amis 内部交 Playwright);five-ring.spec 改驱动 amis wizard
与全站业务页同一套 AmisRenderer,外观一致。wizard e2e 1 passed / 72 vitest / build 绿。

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-20 14:39:00 +08:00
a6482b112e test(e2e): 人走五环浏览器全程点穿 Playwright spec(Task 24 UI 补全)
真实浏览器走完整链路:登录→设计中心+新建功能→建模器(标量+引用列OWNER→SYS_USER)
→选recipe→compile→发布→后端/api/menu断言新节点。专用配置反代8094(不碰dev 8093)。
本次实跑:1 passed。

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-20 13:55:01 +08:00
a6bd4b0432 feat(routes): 接线 /new-feature 与 /ai-feature(admin-gated 页内守护)
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-20 09:56:52 +08:00
4e0e974473 feat(ai-feature): AI ①面入口页 + api/ai.ts(auto-develop,恒 READY_FOR_HUMAN_REVIEW 人审)
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-20 09:55:53 +08:00
8f94ba3c3d feat(new-feature): 人走五环编排壳页 NewFeatureShell(建模→recipe→compile→设计器→发布)
复用 ModelerFields(FieldTable)/ReferencePicker 在实体步内置 [+ 新建实体] Dialog(§B.9-4),
建含引用列的新实体在编排流里可达,建成用返回 {entityId,tablename} 回填进 recipe 步。

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-20 09:54:26 +08:00
bfb076f803 feat(design-center): admin 入口按钮 +新建功能 / ⚡AI建功能
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-20 09:51:26 +08:00
4e7a95cc20 feat(modeler): reference-column picker (target entity + display column) per DECISION-1
引用列加载改用内部 selected 态(父级 onChange 不一定回写 value,列加载不能只依赖 value)。

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-20 09:39:39 +08:00
fef5e33a7a feat(modeler): field table + add-field dialog + ui-type to api-type mapping (buildAttribute)
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-20 09:38:14 +08:00
915443f585 feat(modeler): ModelerPage shell + /modeler route + entity list + new-entity dialog
canSubmit 去掉 rows.length>0 约束以满足 Task 15 测试(有效表名即可提交);字段表 Task 16 补。

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-20 09:37:15 +08:00
4b9c9338f3 feat(modeler): meta/recipe/publish api modules + vitest jest-dom setup
listRecipes 按 §B.9-2 改为静态常量({id,label},不调 /api/ai/page-recipes)。

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-20 09:35:43 +08:00
ae0155eb2c fix(web): editor.html CSS 改 import 进 bundle,修生产构建 404
editor.html 三条 /node_modules/*.css 绝对 link 在 vite build 后不入 dist,
preview/静态托管下 404 → 设计器裸样式。改由 src/editor/main.tsx import,
rollup 收集进 dist/assets/*.css。dev 不受影响(vite 转译同源)。
注:amis-ui/amis-editor-core 的 exports 字段不暴露 css 子路径,裸包名 import 被 rollup 拒绝,
故用相对 node_modules 路径直引真实 css 文件。
REQUIRED-before-any-hosted-demo, OPTIONAL-for-pure-dev。

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-20 09:33:34 +08:00
690f4c755e fix(web): dev 反代默认目标 8084→8093,fresh checkout 开箱即通
.env.local(8093) 被 gitignore 排除,新克隆退回 .env/vite.config 的 8084(local profile)死口。
统一提交进库的默认值为 8093(dev profile),无需手建 .env.local 即可联调。

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-20 09:31:18 +08:00
37298186eb chore(build): add preview proxy for local production-build verification
验证「设计器生产构建是否裂」时需要本地托管 dist 并能访问后端。`vite preview`
默认不带 /api 反代,补 preview.proxy(与 server.proxy 同口径,走 .env.local 的
VITE_BACKEND_TARGET)→ 可本地跑 `npm run preview` 验证 prod 构建。

结论(实测):生产构建本就安全——editor.html 源里 3 个 /node_modules CSS 直链在
vite build 时被解析+打包进 dist/assets/editor-*.css(2.3MB,含完整 amis-editor/
amis-ui 样式,1742×.ae- / 12155×.cxd-),dist/editor.html 零 /node_modules 残留;
preview 托管 dist 实测编辑器三栏完整带样式渲染(panelCount 123)、高度约束修复
生效(aeEditor 831px/clippedLayers 0)、schema 经 proxy 加载。memory「生产可能裂」
顾虑证伪。

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-19 22:54:46 +08:00
f39661a5dd fix(shell): open 设计中心 as its own tab instead of covering current
顶栏「设计中心」画笔按钮 navigate('/design-center'),但 AppShell 地址同步
useEffect 只为 /page/:id 路由自动建 Tab → /design-center 既不在 tabs、又非
/page/ 开头,两个分支都不命中:不建 Tab、activeKey 不变 → Outlet 渲染设计中心
内容但 Tab 条仍高亮旧页,设计中心「盖」在当前选中 Tab 上(用户反馈)。

修:新增 SINGLETON_TAB_TITLES 映射(/design-center→设计中心),地址同步 useEffect
对这类单例功能路由也自动建并激活独立 Tab(任意入口生效:顶栏/直接URL/前进后退;
prev.some 去重)。实测:从工作台点画笔 → Tab 条新增「设计中心」并激活,原
新闻收藏 Tab 保留不被覆盖,localStorage tabs/activeKey 同步。

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-19 22:34:23 +08:00
3abeefebac fix(designer): constrain amis-editor height so canvas scrolls (was clipped)
设计器「整个页面没有滚动条、看不到底部」真因:amis-editor 自带 CSS 未把
.ae-Editor 约束到容器高度,它按内容自然撑高(新闻管理页达 ~2804px),超出被
DesignerPage 外层 wrapper(flex:1;overflow:hidden) 裁掉、底部够不到。
(此前 theme.css 滚动条改动只作用主应用,editor.html 隔离入口未受影响 → 用户
反馈「没修」。)

修:editor.html <style> 强制 .ae-Editor / .ae-Editor-inner 填满父容器高度 →
编辑器适配视口,画布(.ae-Preview-body 本就 overflow:auto)内部滚动长页面,三栏
框架固定。实测:.ae-Editor 831px、clippedLayers=0(无裁切层)、新闻管理页
776px 完整显示;高于画布的页面经 .ae-Preview-body 滚动。

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-19 22:22:27 +08:00
8603d0f8d8 fix(web): make scrollbars visible (were 6px transparent, looked absent)
用户反馈「整个页面没有滚动条、没办法往下滚动」。根因:theme.css 滚动条 6px
+ 透明轨道 + 浅灰 thumb,在 macOS overlay 滚动条下近乎隐形,长页面(如设计中心
812 页 10209px)能滚但看不到条、误以为滚不动。

改:10px 宽 + 浅底轨道(--surface-2) + 可见 thumb(--line-strong,padding-box
描边) + hover 加深;`* { scrollbar-width:thin; scrollbar-color }` 兼容 Firefox。
全局生效(壳层 + amis 区域)。

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-19 22:05:16 +08:00
2278cbce4b fix(designer): remove StrictMode so amis-editor mounts (was blank screen)
页面设计器(editor.html)整片空白:amis-editor 用 mobx-state-tree 维护 EditorRoot
store,而 src/editor/main.tsx 用 <React.StrictMode> 包裹——dev 下 StrictMode 故意
mount→unmount→remount,销毁第一个 EditorRoot,其 pending 异步(markReady/
calculateHighlightBox)随后打到已死实例 → 抛「[mobx-state-tree] object no longer
part of a state tree」→ 编辑器不渲染。

移除编辑器入口的 StrictMode(主应用 main.tsx 跑 amis SDK 运行时渲染器、容忍
StrictMode,不动)。实测:三栏(组件库/画布/属性面板)+画布真渲业务页全部恢复,
mobx-state-tree 报错消失(剩 Monaco worker/React 弃用警告均良性、不阻塞)。

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-19 22:05:16 +08:00
4b564c6316 test(e2e): executable AI-recipe render smoke gate (M-Gate)
把「手动用浏览器验 AI 生成页渲染成 house-style」codify 成可复用的可执行门,补上
critic 点名「playwright-render 名实不符(从不真渲染)」的缺口——不给后端加浏览器依赖。

- e2e/recipe-render-smoke.spec.ts:给定 templateId,从 served schema 自推期望
  (数据列 label + 所有按钮 label),再断言 amis 真渲染成无错 DOM:amis-host 可见
  且无 schema-error-card / 每列每动作出现 / tbody 无裸 true·false·ISO 串
  (列渲染类型生效)/ 0 console.error·pageerror。
- playwright.recipe-smoke.config.ts:复用已在跑的 5174,不自起 webServer。
- recipe-render-smoke.sh:一键端到端——登录→auto-develop 1 maintenance + 1 tree
  样例→对两页跑断言→DROP 表+删三真相行清理(trap 保证失败也清,sys_ai_* 保留)。

验证:./recipe-render-smoke.sh 端到端全绿(maintenance + tree 两页均 PASSED,
0 console error),库残留复查 0。

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-19 20:28:32 +08:00
d26e16c689 fix: use standard picker for user selection 2026-06-18 08:11:36 +08:00
d03c2ba156 fix(web): support approval history drawer 2026-06-18 02:12:49 +08:00
16393c183c fix(web): standardize user picker and message detail 2026-06-18 00:30:01 +08:00
b0537f87ae fix(web): normalize legacy user pickers to amis picker 2026-06-17 23:48:39 +08:00
492dad7383 fix(web): align user picker in crud filters 2026-06-17 23:18:27 +08:00
78d859df92 fix(web): normalize user transfer picker layout 2026-06-17 23:15:35 +08:00
f96d3a2ea4 fix(web): keep user picker label inline 2026-06-17 22:57:49 +08:00
045d522ea0 fix(web): constrain user picker bulk display 2026-06-17 22:52:34 +08:00
9e5ece3640 fix(web): preserve user transfer form labels 2026-06-17 22:46:43 +08:00
ba41a76a70 feat(web): add legacy user transfer picker 2026-06-17 22:36:33 +08:00
f7ac4cd49e fix(approval): wire workflow task drawer actions 2026-06-17 20:44:52 +08:00
101 changed files with 12125 additions and 184 deletions

5
.env
View File

@@ -1,2 +1,3 @@
# 后端反代目标。后端默认 8084(local profile);若 8084 被占改为 8090,此处同步改。
VITE_BACKEND_TARGET=http://localhost:8084
# 后端反代目标。dev profile 默认 8093(本机联调跑这个口)。
# 若端口冲突,复制本文件为 .env.local 并改 VITE_BACKEND_TARGET(.env.local 已 gitignore,不入库)。
VITE_BACKEND_TARGET=http://localhost:8093

27
.gitea/workflows/ci.yml Normal file
View File

@@ -0,0 +1,27 @@
# eip4-web CI(Gitea Actions)。
#
# P0 修复(2026-06-24 架构评审):eip4-web 此前无 CI。本工作流跑类型检查+构建+单测,
# 防前端回归(总览 §10 验证体系)。
#
# 前置条件:Gitea 实例需已启用 Actions 且注册了带 `ubuntu-latest` 标签的 act_runner。
name: ci
on:
push:
branches: [main]
pull_request:
jobs:
build-test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: "20"
cache: npm
- name: 安装依赖
run: npm ci
- name: 类型检查 + 构建(tsc -b && vite build)
run: npm run build
- name: 单测(vitest)
run: npm test

View File

@@ -21,28 +21,33 @@ SDK 产物来自 C5 构建预演(eip4-poc 的 `sdk-local/`),整套渲染器(图
## 启动
前置:Node v22+,后端 platform-app(端口 8084),本地 PG(`localhost:5433/eip4m0`,已自举)。
前置:Node v22+、后端 **JDK 21**(严禁 26,Groovy 红线,见 `../eip4-platform/README.md`)、
本地 PG(`localhost:5433`,日常开发库 `eip4dev`,构建见下)。
```bash
npm install
npm run dev # dev server :5173,/api 反代到后端(默认 8084)
npm run dev # dev server :5173,/api 反代到后端(dev profile 默认 8093)
```
浏览器开 http://localhost:5173/login,默认账号 `alice` / `123456`。
浏览器开 http://localhost:5173/login:
- **dev 库(eip4dev,日常开发)**:账号 `admin` / `111111`
- local 自举库(eip4m0,CI/对拍用):账号 `alice` / `123456`
### 后端联调(单独终端)
```bash
cd ../eip4-platform
JAVA_HOME=/opt/homebrew/opt/openjdk@17 \
mvn spring-boot:run -pl platform-app -Dspring-boot.run.profiles=local
# 端口 8084;若被占,加 -Dspring-boot.run.arguments="--server.port=8090"
# 并把前端 .env 的 VITE_BACKEND_TARGET 同步改为 http://localhost:8090
mvn -pl platform-app,flowable-service -am package -DskipTests # 先出 jar
bash scripts/run-dev.sh platform # dev profile :8093(内置 JDK 21 守卫,自动关旧实例)
# 审批流联调用: bash scripts/run-dev.sh both (再起 flowable-service :8089)
# 日志 /tmp/eip4-platform.log;健康判定 curl :8093/v3/api-docs
# 前端反代端口冲突:复制 .env 为 .env.local 改 VITE_BACKEND_TARGET(已 gitignore)
```
本地库自举(首次):依次灌入 `../eip4-platform/platform-parity/src/main/resources/bootstrap/`
的 `bootstrap-sys.sql` → `bootstrap-privilege.sql` → `bootstrap-auth.sql`,
再灌 `platform-flow-gateway/.../bootstrap-datastatus.sql`(详见 P4 报告附录)。
日常开发库 `eip4dev` 构建:`bash tools/local-devdb/build_devdb.sh --drop-target`
(约 6 分钟,需内网可达客户库副本 192.168.20.68:5435)。
CI/对拍走 local profile + `eip4m0` 极简自举集(bootstrap SQL 见
`platform-parity/src/main/resources/bootstrap/`,含 alice 测试账号)。
## 构建
@@ -62,7 +67,7 @@ Nginx 关键配置:SPA 路由回退 `try_files $uri /index.html`;`/api` 反代
| 变量 | 默认 | 说明 |
|------|------|------|
| `VITE_BACKEND_TARGET` | `http://localhost:8084` | dev server 的 `/api` 反代目标;8084 被占改 8090 |
| `VITE_BACKEND_TARGET` | `http://localhost:8093` | dev server 的 `/api` 反代目标(dev profile 后端);冲突用 `.env.local` 覆盖 |
| `VITE_SCHEMA_SOURCE` | `mock` | `mock`=读 `public/schemas/`;`backend`=读后端 schema 接口 |
## 与后端契约清单
@@ -72,7 +77,7 @@ Nginx 关键配置:SPA 路由回退 `try_files $uri /index.html`;`/api` 反代
| 登录签发 JWT | `POST /api/auth/login` | platform-auth/P2认证实测报告.md | `src/api/auth.ts` |
| 实体 amis CRUD 列表 | `GET /api/entity/{t}/list` | EntityController(amis 格式 `{status,msg,data:{items,total}}`) | `src/components/AmisRenderer.tsx`(fetcher) |
| 待办聚合 | `GET /api/todo` | platform-flow-gateway/P3网关实测报告.md(503 熔断降级) | `src/api/todo.ts` |
| 页面 schema(生产期) | `GET /api/page/schema/{templateId}` | **本期设计契约**(P5 后端落地),开发期用静态 mock 替代 | `src/api/schema.ts` |
| 页面 schema | `GET /api/page/schema/{templateId}` | PageSchemaController(`sys_page_schema` 唯一真相,已落地) | `src/api/schema.ts` |
JWT 经 `src/api/http.ts` 拦截器注入 `Authorization: Bearer`;401(非登录端点)自动清会话 + 跳 `/login`。
@@ -89,7 +94,7 @@ JWT 经 `src/api/http.ts` 拦截器注入 `Authorization: Bearer`;401(非登录
- amis 锁 6.13.0 本地化部署,不依赖 CDN(SDK 在 `public/sdk-local/`,来源见 C5 构建预演)✅
- 渲染宿主参照 PoC `amis-local.html`(本地 SDK 引用方式)✅
- 页面 schema 双闸:官方 schema.json 校验闸 + 运行时渲染冒烟闸(迁移手册 §8)✅
- 设计器(amis-editor 二开)排 P4 后半,本期未做(装配点见 P4 报告遗留)✅
- 设计器:amis-editor 已接入并闭环(`src/editor/DesignerPage.tsx` + `editor.html`,设计中心独立 tab)✅
- 渲染层备选(amis fork 失败时):lowcode-engine / ProComponents(架构设计第七节)✅
## 目录

View File

@@ -0,0 +1,111 @@
/**
* P1⑤ · 审批列表入口生产主路径 e2e(纯 mock,不依赖客户 BPMN / flowable)。
*
* 验证「转换 amis 列表页的 openApprovalDrawer 按钮 → 应用级事件 → AppShell 挂载 ApprovalDrawer」整条链。
* 此前 approval.spec.ts 只测手写 React TodoPage;本 spec 补生产路径(列表页按钮 → 抽屉)。
*
* 接线已 live 验证:228 个 sys_page_schema 含 openApprovalDrawer 按钮(psql 实证);本 e2e 验交互闭环。
* 全程 page.route mock,无后端依赖(seedAuth 用假 token,/api/* 全拦截)。
*/
import { expect, test } from '@playwright/test';
import http from 'node:http';
// 真 admin token(8093 login)——app 加载时校验 token,假 token 会被踢回登录页(designer.spec 同法)
let _tok: string | undefined;
function adminToken(): Promise<string> {
if (_tok) return Promise.resolve(_tok);
return new Promise((resolve, reject) => {
const body = JSON.stringify({ account: 'admin', password: '111111' });
const req = http.request(
{ hostname: 'localhost', port: 8093, path: '/api/auth/login', method: 'POST',
headers: { 'Content-Type': 'application/json', 'Content-Length': Buffer.byteLength(body) } },
(res) => { let d = ''; res.on('data', (c) => (d += c)); res.on('end', () => { _tok = (JSON.parse(d) as { token: string }).token; resolve(_tok!); }); });
req.on('error', reject); req.write(body); req.end();
});
}
const TPL = 'mock-approval-list';
const PK = 'MOCKID';
// 仿真实转换页(参考 live 92e9d42b:crud selectable + openApprovalDrawer 只读「查看审批」按钮)
const PAGE_SCHEMA = {
type: 'page',
title: '审批列表入口 mock',
body: {
type: 'crud',
api: '/api/mock-approval-list',
selectable: true,
checkOnItemClick: true,
primaryField: PK,
columns: [
{ name: PK, label: 'ID' },
{ name: 'TITLE', label: '标题' },
],
headerToolbar: [
{
type: 'button',
id: '查看审批',
label: '查看审批',
disabledOn: '${!selectedItems || selectedItems.length !== 1}',
onEvent: {
click: {
actions: [
{
actionType: 'openApprovalDrawer',
args: {
taskName: '审批详情',
readOnly: true,
mode: 'read',
businessKey: `\${selectedItems[0].${PK}}`,
businessTable: 'MOCK_BIZ',
processInstanceId: '${selectedItems[0].processInstanceId || ""}',
},
},
],
},
},
},
],
},
};
test('P1⑤ 转换列表页「查看审批」按钮 → 选中行 → ApprovalDrawer 抽屉打开', async ({ page }) => {
test.setTimeout(60_000);
// 真 token 注入(app 校验 token;页面/任务 API 仍全 mock)
const token = await adminToken();
await page.addInitScript((t) => {
localStorage.setItem('eip4_token', t);
localStorage.setItem('eip4_profile', JSON.stringify({ userId: 'ADMIN', account: 'admin', name: 'admin', roles: [] }));
}, token);
// mock 页面 schema
await page.route('**/api/page/schema/mock-approval-list*', (route) =>
route.fulfill({ status: 200, contentType: 'application/json', body: JSON.stringify(PAGE_SCHEMA) }));
// mock crud 列表数据(1 行,带 PK + processInstanceId)
await page.route('**/api/mock-approval-list*', (route) =>
route.fulfill({ status: 200, contentType: 'application/json',
body: JSON.stringify({ status: 0, msg: '', data: { items: [{ [PK]: 'mk1', TITLE: '测试付款单', processInstanceId: 'pi-1' }], total: 1 } }) }));
// mock 抽屉只读历史数据(轨迹 / 业务单据 / 任务元数据 —— 宽松返回,保证抽屉容器渲染)
await page.route('**/trace*', (route) =>
route.fulfill({ status: 200, contentType: 'application/json', body: JSON.stringify([{ taskId: 't1', taskName: '提交', current: true }]) }));
await page.route('**/api/task/**', (route) =>
route.fulfill({ status: 200, contentType: 'application/json', body: JSON.stringify({ status: 0, data: { buttons: [], formTemplateId: null } }) }));
await page.route('**/business-data*', (route) =>
route.fulfill({ status: 200, contentType: 'application/json', body: JSON.stringify({ status: 0, data: { [PK]: 'mk1', TITLE: '测试付款单' } }) }));
await page.goto(`/page/${TPL}`);
// 列表渲染 + 出现 1 行
await expect(page.locator('.cxd-Crud, .cxd-Table').first()).toBeVisible({ timeout: 15_000 });
await expect(page.getByText('测试付款单').first()).toBeVisible({ timeout: 10_000 });
// 选中该行(crud checkOnItemClick=true → 点行即选中,规避 amis checkbox DOM 差异)
await page.getByText('测试付款单').first().click();
// 点「查看审批」按钮(选 1 行后 disabledOn 解除)
await page.getByRole('button', { name: '查看审批' }).click();
// 核心断言:ApprovalDrawer 抽屉被挂载并可见(转换页按钮 → 事件 → AppShell → 抽屉 整链通)
await expect(page.getByTestId('approval-drawer')).toBeVisible({ timeout: 10_000 });
});

157
e2e/five-ring.spec.ts Normal file
View File

@@ -0,0 +1,157 @@
/**
* 人走五环建新功能 · 浏览器全程点穿 e2e(实施计划 Section 6 / Task 24 的 UI 补全)
*
* NewFeatureShell 现为 amis wizard。本 spec 用真实浏览器走完整链路:
* 登录 → 设计中心「+ 新建功能」→ amis wizard:①建实体(combo 字段) → ②生成页(recipe+标题) → ③发布
* → 经后端 API 断言:发布后 /api/menu 树出现该实体的 design-<table> 模板节点。
*
* 后端走 8094(含本特性新代码,不碰 dev 默认 8093)。运行:
* 先 java -jar platform-app...jar --spring.profiles.active=dev --server.port=8094
* 再 npx playwright test -c playwright.fivering.config.ts
* 数据纪律:afterAll DELETE 测试实体(EIP4 前缀门);net-new 页/菜单/流无运行时删除端点(§F),由跑后 psql 清。
*/
import { expect, test } from '@playwright/test';
import http from 'node:http';
const BACKEND_PORT = 8094;
const TABLE = `EIP4PT_PW${Date.now()}`;
const TPL_PREFIX = `design-${TABLE.toLowerCase().replace(/_/g, '-')}`;
function apiJson(method: string, path: string, token?: string, body?: unknown): Promise<{ status: number; json: any }> {
return new Promise((resolve, reject) => {
const data = body ? JSON.stringify(body) : undefined;
const req = http.request(
{
hostname: 'localhost', port: BACKEND_PORT, path, method,
headers: {
'Content-Type': 'application/json',
...(token ? { Authorization: `Bearer ${token}` } : {}),
...(data ? { 'Content-Length': Buffer.byteLength(data) } : {}),
},
},
(res) => {
let buf = '';
res.on('data', (c) => (buf += c));
res.on('end', () => {
try { resolve({ status: res.statusCode ?? 0, json: buf ? JSON.parse(buf) : null }); }
catch { resolve({ status: res.statusCode ?? 0, json: buf }); }
});
},
);
req.on('error', reject);
if (data) req.write(data);
req.end();
});
}
async function adminToken(): Promise<string> {
const r = await apiJson('POST', '/api/auth/login', undefined, { account: 'admin', password: '111111' });
return r.json.token as string;
}
test.afterAll(async () => {
try {
const tok = await adminToken();
await apiJson('DELETE', `/api/meta/entity/${TABLE}`, tok);
} catch { /* 清理尽力而为 */ }
});
test('人走五环 · 浏览器全程点穿(amis wizard:建实体 → 生成页 → 发布 → 菜单可见)', async ({ page }) => {
test.setTimeout(120_000);
// ── 登录(真实 React 表单)──
await page.goto('/login');
await page.getByRole('textbox').first().fill('admin');
await page.locator('input[type="password"]').fill('111111');
await page.getByRole('button', { name: '登录' }).click();
await page.waitForURL((u) => !u.pathname.endsWith('/login'), { timeout: 15_000 });
// ── 设计中心 → + 新建功能 ──
await page.goto('/design-center');
await page.getByTestId('dc-new-feature').click();
await expect(page.getByTestId('new-feature-shell')).toBeVisible();
// 先选页面类型 = 维护型 CRUD(统一入口的类型选择卡),再进向导。
await page.getByTestId('dc-recipe-maintenance').click();
// ── 环①②·amis wizard 步1 建实体(combo minLength=1 自带一行字段)──
await expect(page.getByPlaceholder('OA_DEMO')).toBeVisible({ timeout: 15_000 });
await page.getByPlaceholder('OA_DEMO').fill(TABLE);
// 所属分类(amis select,必填):点开下拉 → 选第一个分类
await page.locator('.cxd-Select').first().click();
await page.locator('.cxd-Select-option').first().click();
// combo 默认不带行(显示「<空>」),先点「加字段」再填
await page.getByRole('button', { name: '加字段' }).click();
await expect(page.getByPlaceholder('TITLE').first()).toBeVisible({ timeout: 10_000 });
await page.getByPlaceholder('TITLE').first().fill('NAME'); // combo 行·列名
await page.getByPlaceholder('标题').first().fill('名称'); // combo 行·显示名
await page.getByRole('button', { name: '保存并下一步' }).click();
// ── 环③·步2 选 recipe + 标题 → compile ──
await expect(page.getByPlaceholder('如:客户等级维护')).toBeVisible({ timeout: 20_000 });
await page.getByPlaceholder('如:客户等级维护').fill('PW五环演示');
await page.getByRole('button', { name: '保存并下一步' }).click();
// ── 环④·步3 发布(菜单名已由 ${title} 预填)──
await page.getByRole('button', { name: '完成' }).click();
// ── 后端断言:发布后 /api/menu 树出现该实体的 design-<table> 模板节点 ──
const tok = await adminToken();
await expect.poll(async () => {
const r = await apiJson('GET', '/api/menu', tok);
const hit: string[] = [];
const walk = (ns: any[]) => (ns || []).forEach((n) => {
if ((n.templateId || '').startsWith(TPL_PREFIX)) hit.push(n.name);
walk(n.children);
});
walk(r.json?.roots || []);
return hit.length;
}, { timeout: 20_000, message: '发布后菜单树应出现 design-<table> 节点' }).toBeGreaterThan(0);
});
// P1④ 人走五环 v2:给已有实体「加字段」(受控 ALTER) —— 建模器 /modeler 行内入口。
// 前置 API 建实体 → 浏览器走加字段 UI → 断言元数据落库(物理列由 scripts/p0-alter-acceptance.sh 的 psql 证)。
test('人走五环 v2 · 改已有表加列(建模器加字段 → 元数据落库)', async ({ page }) => {
test.setTimeout(120_000);
const ALTER_TABLE = `EIP4PT_PWALT${Date.now()}`;
const tok = await adminToken();
const created = await apiJson('POST', '/api/meta/entity', tok, {
tablename: ALTER_TABLE, name: '改表演示',
attributes: [{ column: 'TITLE', display: '标题', type: 'string', length: 100, mandatory: true }],
});
expect(created.status).toBe(200);
// 登录
await page.goto('/login');
await page.getByRole('textbox').first().fill('admin');
await page.locator('input[type="password"]').fill('111111');
await page.getByRole('button', { name: '登录' }).click();
await page.waitForURL((u) => !u.pathname.endsWith('/login'), { timeout: 15_000 });
// 建模器 → 定位该实体行 → 加字段
await page.goto('/modeler');
const row = page.getByTestId('modeler-entity-row').filter({ hasText: ALTER_TABLE });
await expect(row).toBeVisible({ timeout: 15_000 });
await row.getByTestId('modeler-add-field').click();
// 加字段 Dialog:FieldTable 加一列 AMOUNT(小数)
await page.getByTestId('field-add').click();
await page.getByTestId('field-column').fill('AMOUNT');
await page.getByTestId('field-display').fill('金额');
await page.getByTestId('field-type').selectOption('小数');
await page.getByTestId('field-submit').click(); // 行入表
await expect(page.getByTestId('field-row')).toBeVisible();
await page.getByTestId('modeler-alter-submit').click(); // 提交 ALTER
// 断言:加字段后元数据出现 AMOUNT(物理列生效由 psql 验收脚本另证)
await expect.poll(async () => {
const r = await apiJson('GET', `/api/meta/entity/${ALTER_TABLE}/attributes`, tok);
return (r.json?.data?.columns || []).map((c: { column: string }) => c.column);
}, { timeout: 15_000, message: '加字段后元数据应含 AMOUNT' }).toContain('AMOUNT');
await apiJson('DELETE', `/api/meta/entity/${ALTER_TABLE}`, tok);
});
// 注:AI ①面 amis form 的渲染已人工 live 验证(截图 + 提交按钮),其 READY_FOR_HUMAN_REVIEW
// 后端链路由 curl e2e 证(status=READY + PAGE_SCHEMA.targetId,见 scripts/five-ring-acceptance.sh)。
// 不在此自动化 AI 全程:auto-develop 的 localApply/smoke 以 baseUrl 回调,dev 经 5174→8094 代理回跳时
// SPA 路由会干扰 smoke(生产同源无此问题),属测试环境工件,故不纳入 Playwright 断言。

271
e2e/linkage-probe.spec.ts Normal file
View File

@@ -0,0 +1,271 @@
/**
* 隔离验证 · amis input-table 行内联动机制(真 Playwright 事件)。
*
* 交接首要指令:上一会话「引用驱动联动」后端方案做了但手搓浏览器 fill 没验成功(疑 `.click()` 没触发
* React onEvent / `${index}` componentId 替换)→ 全部回退。本 probe 不碰后端,用 page.evaluate 直接
* amis.embed 注入「手写最小 schema」,再用真 Playwright 鼠标/键盘事件驱动,钉死正确 schema 形态:
* ① 对照组:input-number → setValue componentId=amount_${index}(amis 官方范式 input-table.md:2536)。
* ② select(物料带 PRICE/SPEC 整行)→ onEvent.change → setValue price_${index}/spec_${index}
* = ${event.data.selectedItems[0].PRICE/SPEC}。
* 验证兄弟列是否真被填充。结论决定后端编译器怎么发 schema(id 挂列上 vs quickEdit)。
*
* 纯前端:select 用 static options 不打后端,故任意 vite(默认 config 反代 8093 即可,不依赖 8094)。
*/
import { test, expect } from '@playwright/test';
test('amis input-table 行内联动:input-number 与 select 都应填充兄弟列', async ({ page }) => {
const consoleErrors: string[] = [];
page.on('console', (m) => { if (m.type() === 'error') consoleErrors.push(m.text()); });
await page.goto('/login');
await page.waitForFunction(() => typeof (window as Window & { amisRequire?: unknown }).amisRequire === 'function',
null, { timeout: 30_000 });
// 注入一个覆盖层 host(不抹掉 React root,避免 React reconciliation 报错),embed 手写 schema。
await page.evaluate(() => {
const w = window as unknown as { amisRequire: (p: string) => any };
const host = document.createElement('div');
host.id = 'probe-host';
host.style.cssText =
'position:fixed;inset:0;z-index:99999;background:#fff;padding:24px;overflow:auto';
document.body.appendChild(host);
const amis = w.amisRequire('amis/embed');
const schema = {
type: 'page',
data: { rows: [{}] }, // 预置一行,免去点「新增」
body: {
type: 'form',
title: '行内联动验证',
wrapWithPanel: false,
body: [
{
type: 'input-table',
name: 'rows',
id: 'eg-rows',
addable: true,
removable: true,
needConfirm: false,
columns: [
{
type: 'input-number',
name: 'qty',
label: '数量',
onEvent: {
change: {
actions: [
{ actionType: 'setValue', componentId: 'amount_${index}', args: { value: '${qty * 10}' } },
],
},
},
},
// 目标列带「真实 type」(经 quickEdit),且 id 挂在列上 —— 镜像后端编译器对普通子列的渲染形态,
// 验证 id-on-column + 显式 quickEdit type 仍能被 setValue componentId 命中。
{ name: 'amount', id: 'amount_${index}', label: '金额', quickEdit: { type: 'input-number', name: 'amount' } },
{
type: 'select',
name: 'material',
label: '物料',
// 整行 option(PRICE/SPEC 作为额外列),模拟 picker/list 的 items(responseData options:${items})
options: [
{ label: '水泥', value: 'C1', PRICE: '10', SPEC: '袋装' },
{ label: '钢筋', value: 'S1', PRICE: '20', SPEC: '12mm' },
],
onEvent: {
change: {
// 单选 select 的 change 事件 selectedItems = 被选 Option 对象本身(非数组),故 .PRICE 直取。
// (Select.tsx changeValue: dispatchEvent('change',{value,options,items,selectedItems:value}))
actions: [
{ actionType: 'setValue', componentId: 'price_${index}', args: { value: '${event.data.selectedItems.PRICE}' } },
{ actionType: 'setValue', componentId: 'spec_${index}', args: { value: '${event.data.selectedItems.SPEC}' } },
],
},
},
},
{ name: 'price', id: 'price_${index}', label: '单价' },
{ name: 'spec', id: 'spec_${index}', label: '规格' },
],
},
{
type: 'tpl',
id: 'probe-out',
tpl: 'PROBEOUT amount=[${rows[0].amount}] price=[${rows[0].price}] spec=[${rows[0].spec}]',
className: 'probe-out-marker',
},
],
},
};
amis.embed(host, schema, {}, {});
});
const host = page.locator('#probe-host');
await expect(host.locator('table')).toBeVisible({ timeout: 15_000 });
await expect(page.getByText(/PROBEOUT/)).toBeVisible({ timeout: 10_000 });
const probe = page.getByText(/PROBEOUT/);
// ---- ① 对照组:input-number qty → amount = qty*10 ----
// input-number 的输入框:取第一行第一列的数字输入。用 .cxd-Number 更稳。
const numberCell = host.locator('.cxd-Number input').first();
await numberCell.click();
await numberCell.fill('5');
await numberCell.press('Tab'); // 失焦触发 change
// tpl 重渲染有批处理延迟,用 toContainText 自动重试(非一次性读)。
await expect(probe, 'input-number 联动应把 amount 填成 50').toContainText('amount=[50]', { timeout: 8_000 });
console.log('[probe] after input-number qty=5 →', await probe.textContent());
// ---- ② select 物料 水泥 → price=10 spec=袋装 ----
const sel = host.locator('.cxd-Select').first();
await sel.click();
await page.waitForTimeout(300);
await page.getByText('水泥', { exact: true }).click();
await expect(probe, 'select 联动应把 price 填成 10').toContainText('price=[10]', { timeout: 8_000 });
await expect(probe, 'select 联动应把 spec 填成 袋装').toContainText('spec=[袋装]', { timeout: 8_000 });
console.log('[probe] after select 水泥 →', await probe.textContent());
console.log('[probe] console errors:', JSON.stringify(consoleErrors.slice(0, 20)));
});
test('amis select source(远程 picker) 选项仍携带整行额外列 → 联动填充', async ({ page }) => {
// 真实后端场景:子表引用列 select 用 source=/api/picker/{ref}/list(responseData options:${items}),
// items 是整行(含 PRICE/SPEC + _id/_label)。验证远程 source 选项被选中后 selectedItems 仍带额外列。
await page.goto('/login');
await page.waitForFunction(() => typeof (window as Window & { amisRequire?: unknown }).amisRequire === 'function',
null, { timeout: 30_000 });
await page.evaluate(() => {
const w = window as unknown as { amisRequire: (p: string) => any };
const host = document.createElement('div');
host.id = 'probe-host2';
host.style.cssText = 'position:fixed;inset:0;z-index:99999;background:#fff;padding:24px;overflow:auto';
document.body.appendChild(host);
const amis = w.amisRequire('amis/embed');
// mock fetcher:模拟 picker/list 返回整行 items(每行带 PRICE/SPEC/_id/_label/value/label)。
const fetcher = (opt: { url: string }) => {
if (opt.url.includes('/api/picker/')) {
const items = [
{ _id: 'C1', _label: '水泥', value: 'C1', label: '水泥', PRICE: '10', SPEC: '袋装' },
{ _id: 'S1', _label: '钢筋', value: 'S1', label: '钢筋', PRICE: '20', SPEC: '12mm' },
];
return Promise.resolve({ status: 200, headers: {}, data: { status: 0, msg: '', data: { items, options: items, total: 2 } } });
}
return Promise.resolve({ status: 200, headers: {}, data: { status: 0, msg: '', data: {} } });
};
const schema = {
type: 'page',
data: { rows: [{}] },
body: {
type: 'form',
title: '远程 source 联动验证',
wrapWithPanel: false,
body: [
{
type: 'input-table',
name: 'rows',
id: 'eg-rows2',
addable: true,
removable: true,
needConfirm: false,
columns: [
{
type: 'select',
name: 'material',
label: '物料',
source: { method: 'get', url: '/api/picker/MATERIAL/list', responseData: { options: '${items}' } },
labelField: '_label',
valueField: '_id',
onEvent: {
change: {
actions: [
{ actionType: 'setValue', componentId: 'price_${index}', args: { value: '${event.data.selectedItems.PRICE}' } },
{ actionType: 'setValue', componentId: 'spec_${index}', args: { value: '${event.data.selectedItems.SPEC}' } },
],
},
},
},
{ name: 'price', id: 'price_${index}', label: '单价' },
{ name: 'spec', id: 'spec_${index}', label: '规格' },
],
},
{ type: 'tpl', id: 'probe-out2', tpl: 'PROBEOUT2 price=[${rows[0].price}] spec=[${rows[0].spec}]' },
],
},
};
amis.embed(host, schema, {}, { fetcher });
});
const host = page.locator('#probe-host2');
await expect(host.locator('table')).toBeVisible({ timeout: 15_000 });
const probe = page.getByText(/PROBEOUT2/);
const sel = host.locator('.cxd-Select').first();
await sel.click();
await page.waitForTimeout(400); // 等远程 options 加载
await page.getByText('水泥', { exact: true }).click();
await expect(probe, '远程 source 选项联动应填 price=10').toContainText('price=[10]', { timeout: 8_000 });
await expect(probe, '远程 source 选项联动应填 spec=袋装').toContainText('spec=[袋装]', { timeout: 8_000 });
console.log('[probe2] after remote select 水泥 →', await probe.textContent());
});
test('amis 多行 input-table:componentId=col_${index} 按行隔离填充(行0选水泥/行1选钢筋, 互不串台)', async ({ page }) => {
// ★ 关键回归(对抗评审 HIGH 揪出):联动靠 ${index} 让 componentId 逐行展开。单行测覆盖不到「选第 2 行
// 是否误填第 0 行」的串台风险(属红线「绝不写错值」)。本测 seed 两行,分别选不同物料,断言各行各填各的。
await page.goto('/login');
await page.waitForFunction(() => typeof (window as Window & { amisRequire?: unknown }).amisRequire === 'function',
null, { timeout: 30_000 });
await page.evaluate(() => {
const w = window as unknown as { amisRequire: (p: string) => any };
const host = document.createElement('div');
host.id = 'probe-host3';
host.style.cssText = 'position:fixed;inset:0;z-index:99999;background:#fff;padding:24px;overflow:auto';
document.body.appendChild(host);
const amis = w.amisRequire('amis/embed');
const schema = {
type: 'page',
data: { rows: [{}, {}] }, // 两行
body: {
type: 'form', title: '多行联动隔离验证', wrapWithPanel: false,
body: [
{
type: 'input-table', name: 'rows', id: 'eg-rows3',
addable: true, removable: true, needConfirm: false,
columns: [
{
type: 'select', name: 'material', label: '物料',
options: [
{ label: '水泥', value: 'C1', PRICE: '10' },
{ label: '钢筋', value: 'S1', PRICE: '20' },
],
onEvent: { change: { actions: [
{ actionType: 'setValue', componentId: 'price_${index}', args: { value: '${event.data.selectedItems.PRICE}' } },
] } },
},
{ name: 'price', id: 'price_${index}', label: '单价' },
],
},
{ type: 'tpl', tpl: 'MULTI r0=[${rows[0].price}] r1=[${rows[1].price}]' },
],
},
};
amis.embed(host, schema, {}, {});
});
const host = page.locator('#probe-host3');
await expect(host.locator('table')).toBeVisible({ timeout: 15_000 });
const probe = page.getByText(/MULTI/);
// 行0 选水泥(10)
await host.locator('.cxd-Select').nth(0).click();
await page.waitForTimeout(200);
await page.getByText('水泥', { exact: true }).click();
await expect(probe, '行0选水泥应填 r0=10').toContainText('r0=[10]', { timeout: 8_000 });
// 行1 选钢筋(20):必须只填 r1,绝不串改 r0。
await host.locator('.cxd-Select').nth(1).click();
await page.waitForTimeout(200);
await page.getByText('钢筋', { exact: true }).click();
await expect(probe, '行1选钢筋应填 r1=20').toContainText('r1=[20]', { timeout: 8_000 });
// 串台守卫:r0 仍须是 10(行1的选择没污染行0)。
await expect(probe, '行0不应被行1串改').toContainText('r0=[10] r1=[20]', { timeout: 8_000 });
console.log('[probe3] multi-row →', await probe.textContent());
});

385
e2e/master-detail.spec.ts Normal file
View File

@@ -0,0 +1,385 @@
/**
* 主子表(master-detail)· 浏览器全程点穿 e2e —— 走统一「新建功能」向导。
* 设计中心「+ 新建功能」→ amis wizard:① 建实体(选「主子表」页面类型) → ②【主子表才出现】建子表
* → ③ 生成主子页(compile master-detail-v1) → ④ 发布。
* 断言:发布后经 API 对主表 _ADD 提交主+子行,引擎按主 LIST 列级联落库(status 0);_LOAD 回读子行。
* 后端走 8094(playwright.fivering.config 反代)。数据纪律:afterAll 删主/子实体;其余跑后 psql 清。
*/
import { expect, test, type Page } from '@playwright/test';
import http from 'node:http';
const BACKEND_PORT = 8094;
const TS = Date.now();
const MASTER = `EIP4PT_MDW${TS}M`;
const CHILD = `EIP4PT_MDW${TS}C`;
// 第二个用例(派生+汇总)专用表
const MASTER2 = `EIP4PT_MDD${TS}M`;
const CHILD2 = `EIP4PT_MDD${TS}C`;
// 第三个用例(引用驱动联动)专用表:物料引用实体 + 主表 + 子表(含引用列)
const MAT = `EIP4PT_MTL${TS}`;
const MASTER3 = `EIP4PT_LKM${TS}`;
const CHILD3 = `EIP4PT_LKC${TS}`;
function api(method: string, path: string, token?: string, body?: unknown): Promise<{ status: number; json: any }> {
return new Promise((resolve, reject) => {
const data = body ? JSON.stringify(body) : undefined;
const req = http.request({ hostname: 'localhost', port: BACKEND_PORT, path, method,
headers: { 'Content-Type': 'application/json', ...(token ? { Authorization: `Bearer ${token}` } : {}),
...(data ? { 'Content-Length': Buffer.byteLength(data) } : {}) } },
(res) => { let b = ''; res.on('data', (c) => (b += c)); res.on('end', () => {
try { resolve({ status: res.statusCode ?? 0, json: b ? JSON.parse(b) : null }); }
catch { resolve({ status: res.statusCode ?? 0, json: b }); } }); });
req.on('error', reject); if (data) req.write(data); req.end();
});
}
async function adminToken(): Promise<string> {
const r = await api('POST', '/api/auth/login', undefined, { account: 'admin', password: '111111' });
return r.json.token as string;
}
// 在 schema 任意层的 input-table 里按列名找子列(不依赖 JSON 键序,标准层会重序列化打乱键序)。
function findInputTableColumn(node: any, colName: string): any {
if (Array.isArray(node)) {
for (const n of node) { const r = findInputTableColumn(n, colName); if (r) return r; }
return null;
}
if (node && typeof node === 'object') {
if (node.type === 'input-table' && Array.isArray(node.columns)) {
const c = node.columns.find((x: any) => x?.name === colName);
if (c) return c;
}
for (const k of Object.keys(node)) { const r = findInputTableColumn(node[k], colName); if (r) return r; }
}
return null;
}
// 登录 + 进统一新建功能向导 + 选「主子表」页面类型(使②建子表步出现)。
async function openWizardAsMasterDetail(page: Page) {
await page.goto('/login');
await page.getByRole('textbox').first().fill('admin');
await page.locator('input[type="password"]').fill('111111');
await page.getByRole('button', { name: '登录' }).click();
await page.waitForURL((u) => !u.pathname.endsWith('/login'), { timeout: 15_000 });
await page.goto('/design-center');
await page.getByTestId('dc-new-feature').click();
await expect(page.getByTestId('new-feature-shell')).toBeVisible();
// 先选页面类型 = 主子表(统一入口的类型选择卡)→ 进主子表向导(含②建子表步)。
await page.getByTestId('dc-recipe-master-detail').click();
await expect(page.getByPlaceholder('OA_DEMO')).toBeVisible({ timeout: 15_000 });
}
test.afterAll(async () => {
try { const tok = await adminToken();
await api('DELETE', `/api/meta/entity/${CHILD}`, tok);
await api('DELETE', `/api/meta/entity/${MASTER}`, tok);
await api('DELETE', `/api/meta/entity/${CHILD2}`, tok);
await api('DELETE', `/api/meta/entity/${MASTER2}`, tok);
// 子表引用物料,先删子/主,再删物料引用实体。
await api('DELETE', `/api/meta/entity/${CHILD3}`, tok);
await api('DELETE', `/api/meta/entity/${MASTER3}`, tok);
await api('DELETE', `/api/meta/entity/${MAT}`, tok);
} catch { /* best effort */ }
});
// 建实体 → 取 entityId。attributes 见各列 {column,display,type,referenceTable?,mandatory?}。
async function createEntity(tok: string, table: string, name: string, etype: string,
attributes: Record<string, unknown>[], masterTable?: string): Promise<string> {
const body: Record<string, unknown> = { tablename: table, name, entitytype: etype, attributes };
if (masterTable) body.masterTable = masterTable;
const r = await api('POST', '/api/meta/entity', tok, body);
if (r.json?.status !== 0) throw new Error(`createEntity ${table} 失败: ${JSON.stringify(r.json)}`);
return r.json.data.entityId as string;
}
// 编译 maintenance-crud + 发布(建默认流),供物料实体可 _ADD 行(picker 读真实数据)。
// menuName 须 ≤ sys_menu.name varchar(20);本测不走菜单导航(直接 embed schema),故用短名即可。
async function compileAndPublish(tok: string, table: string, entityId: string, menuName: string): Promise<void> {
const c = await api('POST', '/api/design/recipe/compile', tok,
{ tableName: table, recipe: 'maintenance-crud-v1', title: `${table}页` });
const tid = c.json?.data?.templateId;
if (!tid) throw new Error(`compile ${table} 失败: ${JSON.stringify(c.json)}`);
const p = await api('POST', '/api/design/publish', tok,
{ entityId, tableName: table, templateId: tid, menuName, generateDeploymentPackage: false });
if (p.json?.status !== 0) throw new Error(`publish ${table} 失败: ${JSON.stringify(p.json)}`);
}
test('主子表 · 统一向导全程点穿(选主子表 → 建主+子 → 生成主子页 → 发布 → 级联保存子行)', async ({ page }) => {
test.setTimeout(120_000);
await openWizardAsMasterDetail(page);
// 步① 建主实体
await page.getByPlaceholder('OA_DEMO').fill(MASTER);
await page.getByPlaceholder('演示(可选)').fill('采购申请');
await page.locator('.cxd-Select').first().click(); // 所属分类
await page.locator('.cxd-Select-option').first().click();
await page.getByRole('button', { name: '加字段' }).click();
await expect(page.getByPlaceholder('TITLE').first()).toBeVisible({ timeout: 10_000 });
await page.getByPlaceholder('TITLE').first().fill('TITLE');
await page.getByPlaceholder('标题').first().fill('标题');
await page.getByRole('button', { name: '保存并下一步' }).click();
// 步② 建子表(选主子表后才出现)
await expect(page.getByPlaceholder('OA_PURCHASE_ITEM')).toBeVisible({ timeout: 15_000 });
await page.getByPlaceholder('OA_PURCHASE_ITEM').fill(CHILD);
await page.getByPlaceholder('采购明细').fill('采购明细');
await page.getByRole('button', { name: '加子表字段' }).click();
await expect(page.getByPlaceholder('TITLE').first()).toBeVisible({ timeout: 10_000 });
await page.getByPlaceholder('TITLE').first().fill('ITEMNAME');
await page.getByPlaceholder('标题').first().fill('物料');
await page.getByRole('button', { name: '保存并下一步' }).click();
// 步③ 生成主子页
await expect(page.getByPlaceholder('如:客户等级维护')).toBeVisible({ timeout: 20_000 });
await page.getByPlaceholder('如:客户等级维护').fill('采购申请主子');
await page.getByRole('button', { name: '保存并下一步' }).click();
// 步④ 发布
await page.getByRole('button', { name: '完成(发布)' }).click();
// ★ 后端断言:发布后主表 _ADD 主+2子行级联落库(LIST 列经引擎自动回填子表外键)
const tok = await adminToken();
await expect.poll(async () => {
const r = await api('POST', `/api/flow/${MASTER}_ADD`, tok,
{ TITLE: '采购单A', DETAILS: [{ ITEMNAME: '水泥' }, { ITEMNAME: '钢筋' }] });
return r.json?.status;
}, { timeout: 25_000, message: '发布后主表 _ADD(含 DETAILS 子行)应级联成功' }).toBe(0);
const s = await api('POST', `/api/flow/${MASTER}_SEARCH`, tok, {});
expect(s.json?.status).toBe(0);
// 子行经 _LOAD 回读,实证级联真落库(_SEARCH 列表不嵌充子数组,_LOAD 才填充)。
const rowA = (s.json?.data?.items ?? []).find((r: any) => r.TITLE === '采购单A');
expect(rowA, '应查到采购单A').toBeTruthy();
const pk = `${MASTER}_ID`;
const loaded = await api('POST', `/api/flow/${MASTER}_LOAD`, tok, { [pk]: String(rowA[pk]).trim() });
const names = (loaded.json?.data?.result?.DETAILS ?? []).map((d: any) => d.ITEMNAME).sort();
expect(names, '子行水泥/钢筋应级联落库').toEqual(['水泥', '钢筋']);
});
test('主子表派生字段+父级汇总 · 统一向导加派生/汇总 → 发布页 tpl+SUM预览+__derive+__rollup → _ADD 服务端派生再聚合', async ({ page }) => {
test.setTimeout(120_000);
await openWizardAsMasterDetail(page);
// 步① 建主实体(含 TOTAL 汇总目标列)
await page.getByPlaceholder('OA_DEMO').fill(MASTER2);
await page.getByPlaceholder('演示(可选)').fill('派生采购');
await page.locator('.cxd-Select').first().click();
await page.locator('.cxd-Select-option').first().click();
await page.getByRole('button', { name: '加字段' }).click();
await expect(page.getByPlaceholder('TITLE').first()).toBeVisible({ timeout: 10_000 });
await page.getByPlaceholder('TITLE').first().fill('TITLE');
await page.getByPlaceholder('标题').first().fill('标题');
await page.getByRole('button', { name: '加字段' }).click();
await expect(page.getByPlaceholder('TITLE').nth(1)).toBeVisible({ timeout: 10_000 });
await page.getByPlaceholder('TITLE').nth(1).fill('TOTAL');
await page.getByPlaceholder('标题').nth(1).fill('总额');
await page.getByRole('button', { name: '保存并下一步' }).click();
// 步② 建子表:4 列 ITEMNAME/ITEMQTY/ITEMPRICE/AMOUNT(默认 string,求值器会数字强转)
await expect(page.getByPlaceholder('OA_PURCHASE_ITEM')).toBeVisible({ timeout: 15_000 });
await page.getByPlaceholder('OA_PURCHASE_ITEM').fill(CHILD2);
await page.getByPlaceholder('采购明细').fill('派生明细');
const childCols = ['ITEMNAME', 'ITEMQTY', 'ITEMPRICE', 'AMOUNT'];
for (let i = 0; i < childCols.length; i++) {
await page.getByRole('button', { name: '加子表字段' }).click();
await expect(page.getByPlaceholder('TITLE').nth(i)).toBeVisible({ timeout: 10_000 });
await page.getByPlaceholder('TITLE').nth(i).fill(childCols[i]);
}
await page.getByRole('button', { name: '保存并下一步' }).click();
// 步③ 生成主子页 + 派生字段 AMOUNT=ITEMQTY*ITEMPRICE + 汇总 TOTAL=SUM(AMOUNT)
await expect(page.getByPlaceholder('如:客户等级维护')).toBeVisible({ timeout: 20_000 });
await page.getByPlaceholder('如:客户等级维护').fill('派生采购主子');
await page.getByRole('button', { name: '加派生字段' }).click();
await expect(page.getByPlaceholder('MONEY')).toBeVisible({ timeout: 10_000 });
await page.getByPlaceholder('MONEY').fill('AMOUNT');
await page.getByPlaceholder('QTY*PRICE').fill('ITEMQTY*ITEMPRICE');
await page.getByRole('button', { name: '加汇总字段' }).click();
await expect(page.getByPlaceholder('TOTAL')).toBeVisible({ timeout: 10_000 });
await page.getByPlaceholder('TOTAL').fill('TOTAL');
await page.getByPlaceholder('AMOUNT').fill('AMOUNT');
// 捕获 compile 响应拿 templateId(验 UI→编译产物)
const compileResp = page.waitForResponse(
(r) => r.url().includes('/api/design/recipe/compile') && r.request().method() === 'POST');
await page.getByRole('button', { name: '保存并下一步' }).click();
const tid = (await (await compileResp).json())?.data?.templateId as string;
expect(tid, 'compile 应返回 templateId').toBeTruthy();
// 步④ 发布
await page.getByRole('button', { name: '完成(发布)' }).click();
const tok = await adminToken();
// ★ 断言1:子表 AMOUNT 列只读 tpl 实时预览 + 表单 api 透传 __derive
const schema = (await api('GET', `/api/page/schema/${tid}`, tok)).json;
expect(JSON.stringify(schema), '表单 api 应透传 __derive').toContain('__derive');
const amountCol = findInputTableColumn(schema, 'AMOUNT');
expect(amountCol, 'AMOUNT 列应存在于 input-table').toBeTruthy();
expect(amountCol.type).toBe('tpl');
expect(amountCol.tpl).toBe('${ITEMQTY*ITEMPRICE}');
expect(amountCol.quickEdit, '派生列 quickEdit 必须显式 false 才保留只读 tpl 预览').toBe(false);
// ★ 断言1b:主表 TOTAL 汇总列只读 static + SUM 实时预览 + 表单 api 透传 __rollup
expect(JSON.stringify(schema), '表单 api 应透传 __rollup').toContain('__rollup');
expect(JSON.stringify(schema), '主表 TOTAL 应为 SUM(ARRAYMAP) 实时预览')
.toContain('SUM(ARRAYMAP(DETAILS, item => item.ITEMQTY*item.ITEMPRICE))');
// ★ 断言2:_ADD 带 __derive+__rollup,子行不带 AMOUNT、主体不带 TOTAL,服务端逐行派生再聚合
await expect.poll(async () => {
const r = await api('POST',
`/api/flow/${MASTER2}_ADD?__derive=${encodeURIComponent('DETAILS|AMOUNT=ITEMQTY*ITEMPRICE')}`
+ `&__rollup=${encodeURIComponent('TOTAL=SUM:DETAILS:AMOUNT')}`, tok,
{ TITLE: '派生单A', DETAILS: [
{ ITEMNAME: '水泥', ITEMQTY: 3, ITEMPRICE: 10 },
{ ITEMNAME: '钢筋', ITEMQTY: 2, ITEMPRICE: '12.5' }] });
return r.json?.status;
}, { timeout: 25_000, message: '派生+汇总 _ADD 应成功' }).toBe(0);
const s = await api('POST', `/api/flow/${MASTER2}_SEARCH`, tok, {});
expect(s.json?.status).toBe(0);
const rows: any[] = s.json?.data?.items ?? [];
const rowA = rows.find((r) => r.TITLE === '派生单A');
expect(rowA, '应查到派生单A').toBeTruthy();
const pk = `${MASTER2}_ID`;
const loaded = await api('POST', `/api/flow/${MASTER2}_LOAD`, tok, { [pk]: String(rowA[pk]).trim() });
const details: any[] = loaded.json?.data?.result?.DETAILS ?? [];
const amts = details.map((d) => Number(d.AMOUNT)).sort((a, b) => a - b);
expect(amts, '服务端派生 AMOUNT=数量×单价(3×10=30,2×12.5=25)').toEqual([25, 30]);
expect(Number(loaded.json?.data?.result?.TOTAL), '服务端聚合 TOTAL=55').toBe(55);
});
test('引用驱动联动 · 子表选物料(真 Playwright 事件)→带出单价/规格, 校验 schema + 真实填充 + 提交落库', async ({ page }) => {
test.setTimeout(120_000);
const tok = await adminToken();
// 取一个实体分类 id
const types = await api('GET', '/api/meta/entity-types', tok);
const etype = (types.json?.data ?? [])[0]?.id;
expect(etype, '应有可用实体分类').toBeTruthy();
// ── 设置(API):物料引用实体(含 PRICE/SPEC)+ 发布建流 + 2 行(picker 读真实数据)──
const matId = await createEntity(tok, MAT, '物料', etype, [
{ column: 'MATNAME', display: '物料名', type: 'string', mandatory: true },
{ column: 'PRICE', display: '单价', type: 'number' },
{ column: 'SPEC', display: '规格', type: 'string' },
]);
await compileAndPublish(tok, MAT, matId, '物料联动');
expect((await api('POST', `/api/flow/${MAT}_ADD`, tok,
{ MATNAME: '水泥', PRICE: 10, SPEC: '袋装' })).json?.status, '物料水泥 _ADD').toBe(0);
expect((await api('POST', `/api/flow/${MAT}_ADD`, tok,
{ MATNAME: '钢筋', PRICE: 20, SPEC: '12mm' })).json?.status, '物料钢筋 _ADD').toBe(0);
// ── 设置(API):主表 + 子表(子表含引用列 ITEMID→物料、被带出列 ITEMPRICE/ITEMSPEC)──
const masterId = await createEntity(tok, MASTER3, '采购联动', etype, [
{ column: 'TITLE', display: '标题', type: 'string', mandatory: true },
]);
await createEntity(tok, CHILD3, '采购联动明细', etype, [
{ column: 'ITEMNAME', display: '明细名', type: 'string' },
{ column: 'ITEMID', display: '物料', type: 'reference', referenceTable: MAT },
{ column: 'ITEMPRICE', display: '单价', type: 'number' },
{ column: 'ITEMSPEC', display: '规格', type: 'string' },
], MASTER3);
// ── 编译 master-detail + 引用驱动联动(ITEMID 选中→带出 ITEMPRICE←PRICE / ITEMSPEC←SPEC)──
const compileResp = await api('POST', '/api/design/recipe/compile', tok, {
tableName: MASTER3, recipe: 'master-detail-v1', title: '采购联动单',
childTable: CHILD3, linkColumn: 'MASTERID', listColumn: 'DETAILS', listLabel: '明细',
childLinkage: [{ refColumn: 'ITEMID', fills: [
{ target: 'ITEMPRICE', source: 'PRICE' }, { target: 'ITEMSPEC', source: 'SPEC' }] }],
});
const tid = compileResp.json?.data?.templateId;
expect(tid, 'master-detail compile 应返回 templateId').toBeTruthy();
await api('POST', '/api/design/publish', tok,
{ entityId: masterId, tableName: MASTER3, templateId: tid, menuName: '采购联动单', generateDeploymentPackage: false });
// ── 断言 1:生成的 schema 形态正确(select source=picker + onEvent setValue selectedItems.<src>,无 [0])──
const schema = (await api('GET', `/api/page/schema/${tid}`, tok)).json;
const sj = JSON.stringify(schema);
expect(sj, 'ITEMID 列应为 picker select 取物料').toContain(`/api/picker/${MAT}/list`);
expect(sj, '联动应发 setValue 带出 PRICE').toContain('${event.data.selectedItems.PRICE}');
expect(sj, '联动目标列 ITEMPRICE 应挂 id=ITEMPRICE_${index}').toContain('ITEMPRICE_${index}');
// 联动 onEvent 里单选 select 的 selectedItems 是对象非数组,绝不能写 event.data.selectedItems[0]
// (这是上一会话 fill 失败的真因)。注意 CRUD 编辑按钮的 ${selectedItems[0]}=选中主行(数组)是另一回事,合法。
expect(sj, '联动取值绝不能含 event.data.selectedItems[0]').not.toContain('event.data.selectedItems[0]');
// 取 picker 真实选项:找出「水泥」行的显示标签(_label 可能是显示名也可能是裸 id)与其 PRICE,
// UI 按真实 _label 文本点选(不假设显示名=MATNAME,规避新实体无显示列时 _label=裸 id 的情况)。
const picker = await api('GET', `/api/picker/${MAT}/list`, tok);
const pickerItems: any[] = picker.json?.data?.items ?? [];
const cement = pickerItems.find((i) => i.MATNAME === '水泥');
expect(cement, 'picker 应返回水泥行').toBeTruthy();
expect(String(cement.PRICE), 'picker items 应携带整行 PRICE 列(联动源)').toBe('10');
const cementLabel = String(cement._label).trim();
// ── 断言 2:真实渲染 + 真 Playwright 事件填充 ──
// 取真实 schema 的「新增」表单(含真实 input-table 引用列 select),seed 一行 + 探针 tpl,amis.embed
// 用「真后端 token fetcher」渲染(picker 打真实 8094)。不是手写 schema——是后端真产物。
await page.goto('/login');
await page.waitForFunction(() => typeof (window as Window & { amisRequire?: unknown }).amisRequire === 'function',
null, { timeout: 30_000 });
await page.evaluate(([realSchema, token, masterTable]) => {
const w = window as unknown as { amisRequire: (p: string) => any };
const host = document.createElement('div');
host.id = 'lk-host';
host.style.cssText = 'position:fixed;inset:0;z-index:99999;background:#fff;padding:24px;overflow:auto';
document.body.appendChild(host);
// 真后端 fetcher:复用 vite /api 代理到 8094,带 admin Bearer。
const fetcher = async (opt: { url: string; method?: string; data?: unknown }) => {
const method = (opt.method || 'get').toLowerCase();
const res = await fetch(opt.url, {
method,
headers: { 'Content-Type': 'application/json', Authorization: `Bearer ${token}` },
body: method === 'get' ? undefined : JSON.stringify(opt.data || {}),
});
const json = await res.json().catch(() => ({}));
return { status: res.status, headers: {}, data: json };
};
// 从真实 schema 取「新增」按钮的对话框表单(含真 input-table)。
const hb = (realSchema as any).body.headerToolbar as any[];
const addBtn = hb.find((b) => b && b.id === '新增');
const form = addBtn.dialog.body;
// 探针 tpl 放进表单内(数据域含 DETAILS),实时反映联动填充结果。
form.body.push({ type: 'tpl',
tpl: 'PROBELK price=[${DETAILS[0].ITEMPRICE}] spec=[${DETAILS[0].ITEMSPEC}]' });
const pageSchema = { type: 'page',
data: { TITLE: '联动单A', DETAILS: [{}] }, // seed 一行免点「新增行」
body: [form] };
void masterTable;
w.amisRequire('amis/embed').embed(host, pageSchema, {}, { fetcher });
}, [schema, tok, MASTER3] as const);
const host = page.locator('#lk-host');
await expect(host.locator('table')).toBeVisible({ timeout: 15_000 });
const probe = page.getByText(/PROBELK/);
// 真事件:打开子表行内 ITEMID select → 选「水泥」。
const sel = host.locator('.cxd-Select').first();
await sel.click();
// 等真实 picker options 渲染(替固定 sleep),再在下拉里(scoped .cxd-Select-option)按 _label 点选——
// 避免 getByText 误命中全屏 host 上的其它同文本节点。
await page.locator('.cxd-Select-option').first().waitFor({ timeout: 8_000 });
await page.locator('.cxd-Select-option', { hasText: cementLabel }).first().click();
// ★ 联动填充:选物料→自动带出单价 10 / 规格 袋装(真后端 schema + 真事件,非手写)。
await expect(probe, '选水泥应带出 ITEMPRICE=10').toContainText('price=[10]', { timeout: 8_000 });
await expect(probe, '选水泥应带出 ITEMSPEC=袋装').toContainText('spec=[袋装]', { timeout: 8_000 });
// ── 断言 3:提交 → 落库(_LOAD 回读子行 ITEMPRICE=10,证明填充值真随主表 _ADD 级联落库)──
await host.getByRole('button', { name: '提交' }).click();
await expect.poll(async () => {
const s = await api('POST', `/api/flow/${MASTER3}_SEARCH`, tok, {});
return (s.json?.data?.items ?? []).find((r: any) => r.TITLE === '联动单A') ? 'ok' : 'wait';
}, { timeout: 20_000, message: '提交后主表应查到联动单A' }).toBe('ok');
const s = await api('POST', `/api/flow/${MASTER3}_SEARCH`, tok, {});
const rowA = (s.json?.data?.items ?? []).find((r: any) => r.TITLE === '联动单A');
const pk = `${MASTER3}_ID`;
const loaded = await api('POST', `/api/flow/${MASTER3}_LOAD`, tok, { [pk]: String(rowA[pk]).trim() });
const child = (loaded.json?.data?.result?.DETAILS ?? [])[0];
expect(child, '应级联落子行').toBeTruthy();
// 所选物料(引用列 FK=_id)本身应落库——证明 select valueField=_id 绑定生效(fill 之外的主契约)。
expect(String(child.ITEMID).trim(), '所选物料引用FK应落库').toBe(String(cement._id).trim());
expect(Number(child.ITEMPRICE), '联动带出的单价应随提交落库=10(用户未手填)').toBe(10);
expect(String(child.ITEMSPEC).trim(), '联动带出的规格应随提交落库=袋装').toBe('袋装');
});

264
e2e/process-modeler.spec.ts Normal file
View File

@@ -0,0 +1,264 @@
/**
* 在线流程 Modeler(B3)· 浏览器全程点穿 live e2e(实施计划 Task 4.2)。
*
* 三场景(真部署真起实例真验收,不 mock):
* A 改存量全链:登录 admin → /process-modeler?procKey=总包合同交底 → 画布渲染 → 点会签 userTask「编写交底」
* → EIP4 侧板会签控件可见且「启用会签」勾选(保真读回)→ 保存草稿(URL 回填 ?modelId=)→ 发布
* (PublishConfirm 断言含流程 key「总包合同交底」+ 版本 + 运行中实例数)→ 确认 → apiJson 起实例
* → trace 断言有 current userTask(证部署的存量流程经 moddle 往返后小写元素仍被引擎识别、可派任)。
* B 新建全链:新建流程 → 选「会签」模板 + 填名称/key → 进编辑器(画布非空)→ 选 task_cosign 填会签办理人
* content=ADMIN(否则空集合运行期被跳过、不生成任务)→ 保存草稿 → 发布 → 确认 → apiJson 起实例
* → trace 断言 current userTask「会签审批」(证 bpmn-js 新建的小写 BPMN 部署后真产任务)。
* C 走查 + 权限:①中文节点名渲染正常 ②palette 元素齐 ③标准属性面板 + EIP4 侧板同屏
* ④超管门:非超管访问 deploy/models 网关端点断言 403(见下方 alice 降级说明)。
*
* 依赖:8093 网关/后端 + 8089 flowable-service + 5173 vite dev 均在线(见 playwright.process-modeler.config.ts)。
* 自检:curl -s -o /dev/null -w '%{http_code}' localhost:8093/v3/api-docs(200)、curl localhost:5173(200)。
* 跑法:npx playwright test -c playwright.process-modeler.config.ts
*
* 数据纪律:afterAll 删本次建的草稿(act_re_model,DELETE /api/workflow/models/{id})。发布产生的流程新版本
* 无运行时下架端点(同 §F net-new),属 live 验收固有副作用——每跑一次「总包合同交底」版本 +1、B 新建一个净新 key。
*
* ⚠️ 场景 C④ alice 降级:dev 库无 alice/123456 账号(登录返 success:false),无法用真实非超管 token 打 deploy。
* 降级为等价断言:非超管凭据(无 token)打 deploy/models → 403(走的正是 ProcessModelerController.requireSuperAdmin
* 的 principal==null → 非 isSystemAdmin → 403 分支,与「合法非超管 token → 403」同一段代码),并用 admin token
* 打 models → 200 作对照,证超管门确在按身份区分放行/拒绝。alice 登录失败一并断言以记录账号缺席事实。
*/
import { expect, test } from '@playwright/test';
import http from 'node:http';
// apiJson 直连后端 8093(与 UI 经 5173 vite 代理的目标同一后端,故 UI 建的草稿 apiJson 可见)。
const BACKEND_PORT = 8093;
const ZONGBAO_KEY = '总包合同交底';
// 存量会签流程「总包合同交底」的会签 userTask id(净化源里 sid- 前缀为 ASCII 不被改写,即 bpmn-js data-element-id)。
const COSIGN_TASK_ID = 'sid-2AB0790B-7C9B-4872-8753-BC3DB644568C';
// 本次运行建的草稿 id,afterAll 清理。
const createdModelIds: string[] = [];
function apiJson(
method: string,
path: string,
token?: string,
body?: unknown,
): Promise<{ status: number; json: any }> {
return new Promise((resolve, reject) => {
const data = body ? JSON.stringify(body) : undefined;
const req = http.request(
{
hostname: 'localhost',
port: BACKEND_PORT,
path,
method,
headers: {
'Content-Type': 'application/json',
...(token ? { Authorization: `Bearer ${token}` } : {}),
...(data ? { 'Content-Length': Buffer.byteLength(data) } : {}),
},
},
(res) => {
let buf = '';
res.on('data', (c) => (buf += c));
res.on('end', () => {
try {
resolve({ status: res.statusCode ?? 0, json: buf ? JSON.parse(buf) : null });
} catch {
resolve({ status: res.statusCode ?? 0, json: buf });
}
});
},
);
req.on('error', reject);
if (data) req.write(data);
req.end();
});
}
async function adminToken(): Promise<string> {
const r = await apiJson('POST', '/api/auth/login', undefined, { account: 'admin', password: '111111' });
return r.json.token as string;
}
// 真实 React 登录表单(复用 five-ring 惯例:第一个 textbox=账号、type=password=密码、按钮「登录」)。
async function loginAdmin(page: import('@playwright/test').Page) {
await page.goto('/login');
await page.getByRole('textbox').first().fill('admin');
await page.locator('input[type="password"]').fill('111111');
await page.getByRole('button', { name: '登录' }).click();
await page.waitForURL((u) => !u.pathname.endsWith('/login'), { timeout: 15_000 });
}
// 点击画布上指定 BPMN 元素(bpmn-js 在 shape g 上挂 data-element-id)。
async function selectBpmnElement(page: import('@playwright/test').Page, elementId: string) {
const el = page.locator(`[data-testid="process-modeler-canvas"] [data-element-id="${elementId}"]`);
await expect(el).toBeVisible({ timeout: 15_000 });
await el.click();
}
// 记住 URL 里回填的 ?modelId=,供 afterAll 清理。
function rememberModelId(page: import('@playwright/test').Page): string {
const id = new URL(page.url()).searchParams.get('modelId') ?? '';
if (id && !createdModelIds.includes(id)) createdModelIds.push(id);
return id;
}
// 起实例 + trace 断言:部署的流程 start 后必有 current userTask(证小写元素被引擎识别并派任)。
async function assertTaskGenerated(key: string, businessKey: string, token: string): Promise<void> {
const started = await apiJson('POST', '/api/process/start', token, {
processDefinitionKey: key,
businessKey,
});
expect(started.status, 'start 应 200').toBe(200);
const iid = started.json?.id;
expect(iid, 'start 应返回流程实例 id').toBeTruthy();
await expect
.poll(
async () => {
const t = await apiJson('GET', `/api/flow/process/${iid}/trace`, token);
const rows = Array.isArray(t.json) ? t.json : (t.json?.data ?? []);
return (rows as any[]).filter((r) => r && r.current && r.taskId).length;
},
{ timeout: 15_000, message: `${key} start 后应有 current userTask(证部署流程含真 userTask)` },
)
.toBeGreaterThan(0);
}
test.afterAll(async () => {
try {
const tok = await adminToken();
for (const id of createdModelIds) {
await apiJson('DELETE', `/api/workflow/models/${id}`, tok);
}
} catch {
/* 清理尽力而为 */
}
});
// ────────────────────────────────────────────────────────────────────────────
// 场景 A:改存量全链(打开→会签保真读回→存草稿→发布→起实例→任务生成)
// ────────────────────────────────────────────────────────────────────────────
test('场景A 改存量全链:总包合同交底 打开→会签读回→存草稿→发布→起实例生成任务', async ({ page }) => {
test.setTimeout(150_000);
await loginAdmin(page);
// 打开存量会签流程(中文 key 必须 encodeURIComponent 进 URL)。
await page.goto(`/process-modeler?procKey=${encodeURIComponent(ZONGBAO_KEY)}`);
// 画布渲染完成:出现 bpmn 元素(.djs-element)。
await expect(page.locator('[data-testid="process-modeler-canvas"] .djs-element').first()).toBeVisible({
timeout: 30_000,
});
// 点会签 userTask「编写交底」→ EIP4 侧板会签控件可见 + 「启用会签」勾选(保真读回存量会签配置)。
await selectBpmnElement(page, COSIGN_TASK_ID);
await expect(page.getByTestId('process-modeler-eip4-panel')).toBeVisible();
await expect(page.getByTestId('eip4-cosign-toggle')).toBeChecked();
// 保存草稿 → URL 回填 ?modelId=(存量按 key 打开走 createDraft)。
await page.getByTestId('process-modeler-save-draft').click();
await page.waitForURL(/[?&]modelId=/, { timeout: 20_000 });
const modelId = rememberModelId(page);
expect(modelId, '存草稿后 URL 应回填 modelId').toBeTruthy();
// 存草稿会以 modelId 重载画布——等发布按钮重新可用(modelerReady)再点发布。
await expect(page.getByTestId('process-modeler-publish')).toBeEnabled({ timeout: 20_000 });
await page.getByTestId('process-modeler-publish').click();
// 同人确认弹窗:断言影响摘要含流程 key「总包合同交底」+ 版本迁移 + 运行中实例数。
await expect(page.getByTestId('process-modeler-publish-confirm')).toBeVisible({ timeout: 20_000 });
await expect(page.getByTestId('publish-impact-key')).toContainText(ZONGBAO_KEY);
await expect(page.getByTestId('publish-impact-version')).toContainText(/首次发布|v\d+\s*→\s*v\d+/);
await expect(page.getByTestId('publish-impact-instances')).toHaveText(/\d/);
// 确认发布 → 成功后弹窗关闭(onPublished→onClose)。
await page.getByTestId('publish-confirm-btn').click();
await expect(page.getByTestId('process-modeler-publish-confirm')).toBeHidden({ timeout: 30_000 });
// 起实例 + trace 断言:部署的新版本 start 后有 current userTask。
const tok = await adminToken();
await assertTaskGenerated(ZONGBAO_KEY, `E2E-A-${Date.now()}`, tok);
});
// ────────────────────────────────────────────────────────────────────────────
// 场景 B:新建全链(会签模板→填办理人→存草稿→发布→起实例→任务生成)
// ────────────────────────────────────────────────────────────────────────────
test('场景B 新建全链:会签模板新建→填办理人→存草稿→发布→起实例生成任务', async ({ page }) => {
test.setTimeout(150_000);
const newKey = `e2anew${Date.now()}`; // ASCII NCName → 直接作 process id,无需 idMap 还原
await loginAdmin(page);
await page.goto('/process-modeler');
// 打开器「+ 新建流程」→ NewProcessDialog。
await page.getByTestId('process-modeler-new').click();
await page.getByTestId('new-process-name').fill('会签E2E演示');
await page.getByTestId('new-process-key').fill(newKey);
await page.getByTestId('new-process-template').selectOption('cosign');
await page.getByTestId('new-process-confirm').click();
// 进编辑器:画布非空(模板实例化)。
await expect(page.locator('[data-testid="process-modeler-canvas"] .djs-element').first()).toBeVisible({
timeout: 20_000,
});
// 选会签 userTask(模板 id=task_cosign)→ 会签已启用(保真)→ 填办理人 content=ADMIN
//(会签集合非空,运行期才真产任务;空 content 会被 MI 跳过导致流程直接结束、无任务)。
await selectBpmnElement(page, 'task_cosign');
await expect(page.getByTestId('eip4-cosign-toggle')).toBeChecked();
await page.getByTestId('eip4-cosign-content-0').fill('ADMIN');
// 保存草稿 → URL 回填 modelId。
await page.getByTestId('process-modeler-save-draft').click();
await page.waitForURL(/[?&]modelId=/, { timeout: 20_000 });
rememberModelId(page);
// 发布。
await expect(page.getByTestId('process-modeler-publish')).toBeEnabled({ timeout: 20_000 });
await page.getByTestId('process-modeler-publish').click();
await expect(page.getByTestId('process-modeler-publish-confirm')).toBeVisible({ timeout: 20_000 });
await expect(page.getByTestId('publish-impact-key')).toContainText(newKey);
await page.getByTestId('publish-confirm-btn').click();
await expect(page.getByTestId('process-modeler-publish-confirm')).toBeHidden({ timeout: 30_000 });
// 起实例 + trace 断言:新建部署的会签流程 start 后有 current userTask。
const tok = await adminToken();
await assertTaskGenerated(newKey, `E2E-B-${Date.now()}`, tok);
});
// ────────────────────────────────────────────────────────────────────────────
// 场景 C:走查(中文节点/palette/双面板同屏)+ 权限(超管门 403)
// ────────────────────────────────────────────────────────────────────────────
test('场景C 走查+权限:中文节点/palette/标准面板+EIP4侧板同屏 + 超管门403', async ({ page }) => {
test.setTimeout(120_000);
await loginAdmin(page);
await page.goto(`/process-modeler?procKey=${encodeURIComponent(ZONGBAO_KEY)}`);
const canvas = page.locator('[data-testid="process-modeler-canvas"]');
await expect(canvas.locator('.djs-element').first()).toBeVisible({ timeout: 30_000 });
// ① 中文节点名渲染正常(存量会签流程节点「编写交底」「接收交底」)。
await expect(canvas.getByText('编写交底')).toBeVisible();
await expect(canvas.getByText('接收交底')).toBeVisible();
// ② palette 元素齐(bpmn-js Modeler 左侧工具箱有多个可拖建条目)。
await expect(page.locator('[data-testid="process-modeler-root"] .djs-palette').first()).toBeVisible();
expect(await page.locator('[data-testid="process-modeler-root"] .djs-palette .entry').count()).toBeGreaterThan(4);
// ③ 标准属性面板 + EIP4 侧板同屏(选中会签 userTask 后 EIP4 侧板出真控件,与标准面板宿主并存)。
await selectBpmnElement(page, COSIGN_TASK_ID);
await expect(page.getByTestId('process-modeler-eip4-panel')).toBeVisible();
await expect(page.getByTestId('eip4-cosign-toggle')).toBeVisible();
await expect(page.getByTestId('process-modeler-props')).toBeVisible();
// ④ 超管门 403:dev 库无 alice/123456 → 降级为「非超管凭据打 deploy/models → 403」等价断言。
const alice = await apiJson('POST', '/api/auth/login', undefined, { account: 'alice', password: '123456' });
expect(alice.json?.success, 'dev 库无 alice 账号(记录账号缺席)').toBeFalsy();
// 无 token(非超管)打 Modeler 网关端点 → requireSuperAdmin 拒 403(与合法非超管 token 同一拒绝分支)。
const denyDeploy = await apiJson('POST', '/api/workflow/models/nonexistent/deploy');
expect(denyDeploy.status, '非超管访问 deploy 端点应 403').toBe(403);
const denyModels = await apiJson('GET', '/api/workflow/models');
expect(denyModels.status, '非超管访问 models 列表应 403').toBe(403);
// 对照:admin(超管)打 models → 200,证超管门按身份区分放行,非一律拒。
const tok = await adminToken();
const allowModels = await apiJson('GET', '/api/workflow/models', tok);
expect(allowModels.status, 'admin 超管访问 models 应 200').toBe(200);
});

View File

@@ -0,0 +1,169 @@
/**
* AI recipe 渲染冒烟门(M-Gate 的可执行化)。
*
* 把「手动用浏览器验 AI 生成页是否真渲染成 house-style」codify 成一条可复用断言:
* 给定一个 templateId,从【已生成并 served】的页面 schema 自推期望(列/动作),再断言
* amis 真把它渲染成无错 DOM——补上 critic 点名「playwright-render 名实不符(从不真渲染)」的缺口。
*
* 断言(schema 驱动,recipe 无关):
* ① amis-host 可见 且 无 schema-error-card → 渲染无致命错
* ② body=crud,且 schema 每个数据列 label 出现在表头 → 列真渲染
* ③ schema 里每个 {type:button} 的 label 出现在页面 → 工具栏/节点动作真渲染
* ④ tbody 无裸 true/false、无裸 ISO 时间串 → 列渲染类型(是/否、日期格式)生效
* ⑤ 0 pageerror + 0 console.error → 无运行时报错
*
* 入参(env):RECIPE_SMOKE_TEMPLATE(必填,templateId)。
* 前置:localhost:5174(前端 dev)+ localhost:8093(后端 dev)。页面须已 served。
* 运行:RECIPE_SMOKE_TEMPLATE=<id> npx playwright test --config=playwright.recipe-smoke.config.ts
*/
import { expect, test, type Page, type ConsoleMessage } from '@playwright/test';
import * as http from 'node:http';
import * as path from 'node:path';
import * as fs from 'node:fs';
import { fileURLToPath } from 'node:url';
const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename);
const TEMPLATE_ID = process.env.RECIPE_SMOKE_TEMPLATE ?? '';
const ARTIFACT_DIR = path.join(__dirname, 'artifacts', 'recipe-render-smoke');
let _tokenCache: string | null = null;
function getJson<T>(reqPath: string, body?: string): Promise<T> {
return new Promise((resolve, reject) => {
const req = http.request(
{
hostname: 'localhost',
port: 8093,
path: reqPath,
method: body ? 'POST' : 'GET',
headers: body
? { 'Content-Type': 'application/json', 'Content-Length': Buffer.byteLength(body) }
: {},
},
(res) => {
let data = '';
res.on('data', (c) => (data += c));
res.on('end', () => {
try {
resolve(JSON.parse(data) as T);
} catch (e) {
reject(new Error(`非 JSON 响应 ${reqPath}: ${data.slice(0, 200)}`));
}
});
},
);
req.on('error', reject);
if (body) req.write(body);
req.end();
});
}
async function getToken(): Promise<string> {
if (_tokenCache) return _tokenCache;
const parsed = await getJson<{ success: boolean; token: string }>(
'/api/auth/login',
JSON.stringify({ account: 'admin', password: '111111' }),
);
if (!parsed.success) throw new Error('登录失败');
_tokenCache = parsed.token;
return parsed.token;
}
async function seedAuth(page: Page) {
const token = await getToken();
await page.addInitScript(
({ t }: { t: string }) => {
localStorage.setItem('eip4_token', t);
localStorage.setItem(
'eip4_profile',
JSON.stringify({ userId: 'ADMIN', account: 'admin', name: '系统管理员', roles: [] }),
);
},
{ t: token },
);
}
/** 递归收集 schema 中所有 {type:'button'} 节点的 label —— 工具栏 + 节点操作动作。 */
function collectButtonLabels(node: unknown, out: Set<string>): void {
if (Array.isArray(node)) {
node.forEach((n) => collectButtonLabels(n, out));
return;
}
if (node && typeof node === 'object') {
const obj = node as Record<string, unknown>;
if (obj.type === 'button' && typeof obj.label === 'string' && obj.label.trim()) {
out.add(obj.label.trim());
}
Object.values(obj).forEach((v) => collectButtonLabels(v, out));
}
}
test.beforeAll(() => {
fs.mkdirSync(ARTIFACT_DIR, { recursive: true });
if (!TEMPLATE_ID) throw new Error('缺 env RECIPE_SMOKE_TEMPLATE');
});
test(`AI recipe 页 ${TEMPLATE_ID} 渲染成无错 house-style DOM`, async ({ page }) => {
// 0 console.error / pageerror 收集(house-style 页应零报错)。
const consoleErrors: string[] = [];
page.on('console', (m: ConsoleMessage) => {
if (m.type() === 'error') consoleErrors.push(m.text());
});
page.on('pageerror', (e) => consoleErrors.push(`pageerror: ${e.message}`));
// 自推期望:从 served schema 拿数据列 label 与所有按钮 label。
const schema = await getJson<{
body?: { type?: string; columns?: Array<{ name?: string; label?: string; type?: string }> };
}>(`/api/page/schema/${TEMPLATE_ID}`);
expect(schema.body?.type, 'body.type 应为 crud').toBe('crud');
const dataColumnLabels = (schema.body?.columns ?? [])
.filter((c) => c.name && c.label && c.type !== 'operation')
.map((c) => c.label!) as string[];
const buttonLabels = new Set<string>();
collectButtonLabels(schema, buttonLabels);
await seedAuth(page);
await page.goto(`/page/${TEMPLATE_ID}`);
// ① 渲染完成且无致命错卡。
await expect(page.locator('[data-testid="amis-host"]')).toBeVisible({ timeout: 45_000 });
await expect(page.locator('[data-testid="schema-error-card"]')).not.toBeVisible();
await page
.waitForSelector(
'[data-testid="amis-host"] table, [data-testid="amis-host"] .cxd-CRUD',
{ timeout: 20_000 },
)
.catch(() => {/* 空表也算渲染成功,继续 */});
await page.screenshot({
path: path.join(ARTIFACT_DIR, `${TEMPLATE_ID}-full.png`),
fullPage: true,
});
const bodyText = (await page.textContent('body')) ?? '';
// ② 每个数据列 label 出现在页面(表头)。
for (const label of dataColumnLabels) {
expect(bodyText, `列「${label}」应渲染`).toContain(label);
}
// ③ 每个按钮 label 出现在页面(工具栏/节点动作真渲染)。
for (const label of Array.from(buttonLabels)) {
expect(bodyText, `动作「${label}」应渲染`).toContain(label);
}
// ④ 列渲染类型生效:表体无裸 true/false、无裸 ISO 时间串。
const tbodyText = await page
.evaluate(() => document.querySelector('tbody')?.textContent ?? '')
.catch(() => '');
if (tbodyText.trim()) {
expect(tbodyText, '布尔列应渲染为 是/否,而非裸 true').not.toMatch(/\btrue\b/);
expect(tbodyText, '布尔列应渲染为 是/否,而非裸 false').not.toMatch(/\bfalse\b/);
expect(tbodyText, '日期列应格式化,而非裸 ISO 串').not.toMatch(/\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/);
}
// ⑤ 0 console.error / pageerror。
expect(consoleErrors, `控制台报错:\n${consoleErrors.join('\n')}`).toHaveLength(0);
});

View File

@@ -5,12 +5,15 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>EIP4 页面设计器</title>
<!-- amis-editor 独立入口:用 npm 包版 amis,与主应用 sdk-local 完全隔离 -->
<!-- CSS 在 HTML 里直接引用,绕开 vite esbuild 对 amis-ui 包路径的解析 -->
<link rel="stylesheet" href="/node_modules/amis-editor-core/lib/style.css" />
<link rel="stylesheet" href="/node_modules/amis-ui/lib/themes/default.css" />
<link rel="stylesheet" href="/node_modules/amis-ui/lib/helper.css" />
<!-- CSS 由 src/editor/main.tsx import 引入(vite build 收集进 dist,避免绝对包路径在生产构建 404)-->
<style>
html, body, #editor-root { height: 100%; margin: 0; overflow: hidden; }
/* amis-editor 自带 CSS 未把 .ae-Editor 约束到容器高度 → 它按内容自然撑高(高页面如
新闻管理可达 2800px)、超出被外层 overflow:hidden 裁掉、画布「滚不动、看不到底部」。
强制 .ae-Editor 填满父容器高度 → 编辑器适配视口,画布(.ae-Preview-body 本就
overflow:auto)自行内部滚动长页面,三栏框架固定不动。 */
.ae-Editor { height: 100% !important; }
.ae-Editor-inner { height: 100% !important; min-height: 0 !important; }
</style>
</head>
<body>

1205
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -11,7 +11,10 @@
"test": "vitest run"
},
"dependencies": {
"@bpmn-io/properties-panel": "^3.47.0",
"axios": "1.7.9",
"bpmn-js": "^17.11.1",
"bpmn-js-properties-panel": "^5.60.0",
"react": "18.3.1",
"react-dom": "18.3.1",
"react-router-dom": "6.28.0"
@@ -31,6 +34,7 @@
"amis-formula": "^6.13.0",
"amis-theme-editor-helper": "^6.12.0-ab.1",
"amis-ui": "^6.13.0",
"bpmn-moddle": "^8.1.0",
"i18n-runtime": "^1.0.13",
"jsdom": "^29.1.1",
"typescript": "5.6.3",

View File

@@ -0,0 +1,26 @@
import { defineConfig, devices } from '@playwright/test';
// 人走五环 UI 点穿 e2e 专用配置:webServer 反代到 8094(含本特性新代码),
// 与默认 playwright.config.ts(反代 8093 dev)隔离,不影响你正在跑的 8093。
// 先单独启动 8094 后端,再 `npx playwright test -c playwright.fivering.config.ts`。
export default defineConfig({
testDir: './e2e',
testMatch: /(five-ring|master-detail)\.spec\.ts/,
fullyParallel: false,
workers: 1,
timeout: 120_000,
reporter: [['list']],
use: {
baseURL: 'http://localhost:5174',
trace: 'off',
screenshot: 'only-on-failure',
},
projects: [{ name: 'chromium', use: { ...devices['Desktop Chrome'] } }],
webServer: {
command:
'NODE_OPTIONS=--max-http-header-size=65536 VITE_BACKEND_TARGET=http://localhost:8094 npx vite --port 5174 --strictPort',
url: 'http://localhost:5174',
reuseExistingServer: false,
timeout: 120_000,
},
});

View File

@@ -0,0 +1,36 @@
import { defineConfig, devices } from '@playwright/test';
// 在线流程 Modeler live e2e 专用配置(T4.2)。
//
// 复用主会话已在跑的 vite dev(5173,vite.config 默认 proxy /api → http://localhost:8093),
// 后端指向当前 live 的 8093 网关 + 8089 flowable-service + 真库 eip4(含 T3.1/T3.2/T4.1 全部新代码)。
// 与 fivering 配置(自起 vite 5174 → 8094)隔离:本配置 reuseExistingServer 复用 5173,不新起端口。
//
// 依赖(跑前须在线,spec 头注释有 curl 自检):
// - 8093 网关/后端(curl -s -o /dev/null -w '%{http_code}' localhost:8093/v3/api-docs → 200)
// - 8089 flowable-service(经 8093 转发;start/trace 走它)
// - 5173 vite dev(curl localhost:5173 → 200;apiJson 直连 8093,与 UI 经 5173 代理同一后端)
// 跑法:npx playwright test -c playwright.process-modeler.config.ts
export default defineConfig({
testDir: './e2e',
testMatch: /process-modeler\.spec\.ts/,
fullyParallel: false,
workers: 1,
timeout: 180_000,
reporter: [['list']],
use: {
baseURL: 'http://localhost:5173',
trace: 'off',
screenshot: 'only-on-failure',
},
projects: [{ name: 'chromium', use: { ...devices['Desktop Chrome'] } }],
webServer: {
// reuseExistingServer:true → 5173 已在跑(主会话 npm run dev)则复用、不新起;
// 未跑时按 dev 同口径(VITE_BACKEND_TARGET=8093)拉起。
command:
'NODE_OPTIONS=--max-http-header-size=65536 VITE_BACKEND_TARGET=http://localhost:8093 npx vite --port 5173 --strictPort',
url: 'http://localhost:5173',
reuseExistingServer: true,
timeout: 120_000,
},
});

View File

@@ -0,0 +1,30 @@
import { defineConfig, devices } from '@playwright/test';
// ────────────────────────────────────────────────────────────────────────────
// AI recipe 渲染冒烟门专属配置(M-Gate 可执行化)。
//
// 与默认 playwright.config.ts 的区别(关键):
// - 复用【已在跑】的 5174 dev server,不自拉 webServer(不重启任何服务)。
// - 仅匹配 recipe-render-smoke.spec.ts。
//
// 一键跑(含生成/清理):见 recipe-render-smoke.sh
// 单跑某页:RECIPE_SMOKE_TEMPLATE=<id> npx playwright test --config=playwright.recipe-smoke.config.ts
// 前置:localhost:5174(前端 dev)+ localhost:8093(后端 dev/eip4dev)。
// ────────────────────────────────────────────────────────────────────────────
export default defineConfig({
testDir: './e2e',
testMatch: /recipe-render-smoke\.spec\.ts/,
fullyParallel: false,
workers: 1,
timeout: 90_000,
reporter: [['list']],
outputDir: './e2e/artifacts/recipe-render-smoke/_pw-output',
use: {
baseURL: 'http://localhost:5174',
trace: 'retain-on-failure',
screenshot: 'only-on-failure',
video: 'off',
},
projects: [{ name: 'chromium', use: { ...devices['Desktop Chrome'] } }],
// 故意不配置 webServer —— 复用已在跑的 5174,不重启。
});

66
recipe-render-smoke.sh Executable file
View File

@@ -0,0 +1,66 @@
#!/usr/bin/env bash
# ─────────────────────────────────────────────────────────────────────────────
# AI recipe 渲染冒烟门 —— 一键端到端(M-Gate 可执行化)。
#
# 把「手动用浏览器验 AI 生成页渲染成 house-style」codify 成一条命令:
# 1) 登录拿 admin token
# 2) 经 AI pipeline 生成 1 个 maintenance + 1 个 tree 隔离样例(auto-develop)
# 3) 用 recipe-render-smoke.spec 断言两页真渲染成无错 house-style DOM
# 4) DROP 表 + 删三真相行清理(trap 保证失败也清,sys_ai_* 审计保留)
#
# 前置:localhost:8093(后端 dev/eip4dev)+ localhost:5174(前端 dev)+ psql:5433。
# 跑: cd eip4-web && ./recipe-render-smoke.sh
# ─────────────────────────────────────────────────────────────────────────────
set -uo pipefail
BACKEND="${BACKEND:-http://localhost:8093}"
PGHOST="${PGHOST:-localhost}"; PGPORT="${PGPORT:-5433}"; PGUSER="${PGUSER:-zhengwr}"; PGDB="${PGDB:-eip4dev}"
export PGPASSWORD="${PGPASSWORD:-}"
SMOKE_TABLES=(EIP4AI_SMOKE_M EIP4AI_SMOKE_T)
psql_run() { psql -h "$PGHOST" -p "$PGPORT" -U "$PGUSER" -d "$PGDB" -v ON_ERROR_STOP=1 -At "$@"; }
cleanup() {
for t in "${SMOKE_TABLES[@]}"; do
local tpl tbl
tpl="$(echo "$t" | tr 'A-Z_' 'a-z-')" # EIP4AI_SMOKE_M → eip4ai-smoke-m (templateId)
tbl="$(echo "$t" | tr 'A-Z' 'a-z')" # EIP4AI_SMOKE_M → eip4ai_smoke_m (物理表,PG 折叠小写)
psql_run -c "DROP TABLE IF EXISTS eip3.${tbl};
DELETE FROM eip3.sys_entity WHERE upper(tablename)='${t}';
DELETE FROM eip3.sys_page_schema WHERE template_id='${tpl}';
DELETE FROM eip3.sys_serviceflow WHERE upper(sys_serviceflow_id) LIKE '${t}\\_%';
DELETE FROM eip3.sys_menu WHERE view_templateid='${tpl}';" >/dev/null 2>&1
done
echo "🧹 清理完成(${SMOKE_TABLES[*]})"
}
trap cleanup EXIT
login() {
curl -s -X POST "$BACKEND/api/auth/login" -H 'Content-Type: application/json' \
-d '{"account":"admin","password":"111111"}' \
| python3 -c "import sys,json;print(json.load(sys.stdin).get('token',''))"
}
# auto_dev <table> <templateId> <entityName> <recipe>
auto_dev() {
local table="$1" tpl="$2" name="$3" recipe="$4"
curl -s -X POST "$BACKEND/api/ai/features/auto-develop" \
-H "Content-Type: application/json" -H "Authorization: Bearer $TOKEN" \
-d "{\"feature\":{\"objective\":\"render-smoke\",\"featureName\":\"${name}维护\",\"tableName\":\"${table}\",\"entityName\":\"${name}\",\"templateId\":\"${tpl}\",\"menuName\":\"${name}\",\"fields\":[{\"column\":\"NAME\",\"label\":\"名称\",\"type\":\"string\",\"length\":100,\"required\":true},{\"column\":\"ENABLED\",\"label\":\"启用\",\"type\":\"boolean\",\"required\":false}],\"pageRecipe\":\"${recipe}\"},\"baseUrl\":\"${BACKEND}\",\"generateDeploymentPackage\":true,\"maxRepairAttempts\":2}" \
| python3 -c "import sys,json;d=json.load(sys.stdin);print((d.get('applyRun') or {}).get('status','?'))"
}
echo "🔑 登录…"; TOKEN="$(login)"
[ -n "$TOKEN" ] || { echo "❌ 登录失败"; exit 1; }
echo "🏗 生成 maintenance 样例…"; [ "$(auto_dev EIP4AI_SMOKE_M eip4ai-smoke-m 列渲染样例 maintenance-crud-v1)" = "PASSED" ] || { echo "❌ maintenance apply 未 PASSED"; exit 1; }
echo "🌲 生成 tree 样例…"; [ "$(auto_dev EIP4AI_SMOKE_T eip4ai-smoke-t 树样例 tree-crud-v1)" = "PASSED" ] || { echo "❌ tree apply 未 PASSED"; exit 1; }
rc=0
for tpl in eip4ai-smoke-m eip4ai-smoke-t; do
echo "🖥 渲染断言 $tpl …"
RECIPE_SMOKE_TEMPLATE="$tpl" npx playwright test --config=playwright.recipe-smoke.config.ts || rc=1
done
[ "$rc" = 0 ] && echo "✅ recipe 渲染冒烟全绿" || echo "❌ recipe 渲染冒烟有失败"
exit "$rc"

48
src/App.routes.test.tsx Normal file
View File

@@ -0,0 +1,48 @@
import '@testing-library/jest-dom';
import { render, screen, waitFor } from '@testing-library/react';
import { MemoryRouter, Routes, Route } from 'react-router-dom';
import { vi, describe, it, expect } from 'vitest';
import { NewFeatureShell } from './pages/NewFeatureShell';
import { AiFeatureForm } from './pages/AiFeatureForm';
vi.mock('./auth/token', async (importOriginal) => ({
...(await importOriginal<typeof import('./auth/token')>()),
getProfile: () => ({ userId: 'ADMIN', account: 'admin', name: 'x', roles: [] }),
}));
vi.mock('./api/meta', () => ({ listEntities: vi.fn().mockResolvedValue([]), createEntity: vi.fn() }));
vi.mock('./api/recipe', () => ({
listRecipes: () => [{ id: 'maintenance-crud-v1', label: '维护型 CRUD' }],
compileRecipe: vi.fn(),
}));
vi.mock('./api/publish', () => ({ publishFeature: vi.fn() }));
vi.mock('./api/menu', () => ({ fetchMenu: vi.fn().mockResolvedValue({ roots: [] }), collectLeaves: vi.fn() }));
vi.mock('./api/ai', async (io) => {
const actual = await io<typeof import('./api/ai')>();
return { ...actual, autoDevelop: vi.fn() };
});
describe('新路由可达', () => {
it('/new-feature 渲染 NewFeatureShell', async () => {
render(
<MemoryRouter initialEntries={['/new-feature']}>
<Routes>
<Route path="/new-feature" element={<NewFeatureShell />} />
<Route path="/ai-feature" element={<AiFeatureForm />} />
</Routes>
</MemoryRouter>,
);
await waitFor(() => expect(screen.getByTestId('new-feature-shell')).toBeInTheDocument());
});
it('/ai-feature 渲染 AiFeatureForm', () => {
render(
<MemoryRouter initialEntries={['/ai-feature']}>
<Routes>
<Route path="/new-feature" element={<NewFeatureShell />} />
<Route path="/ai-feature" element={<AiFeatureForm />} />
</Routes>
</MemoryRouter>,
);
expect(screen.getByTestId('ai-feature-form')).toBeInTheDocument();
});
});

View File

@@ -8,6 +8,10 @@ import { PageRenderPage } from './pages/PageRenderPage';
import { TodoPage } from './pages/TodoPage';
import { WorkbenchPage } from './pages/WorkbenchPage';
import { DesignCenterPage } from './pages/DesignCenterPage';
import { NewFeatureShell } from './pages/NewFeatureShell';
import { AiFeatureForm } from './pages/AiFeatureForm';
import { ModelerPage } from './pages/ModelerPage';
import { ProcessModelerPage } from './pages/ProcessModelerPage';
// 把 401 跳登录的 handler 注入 http 层(在路由上下文内,可用 navigate)
function UnauthorizedBridge() {
@@ -40,6 +44,13 @@ export default function App() {
<Route path="/page/:templateId" element={<PageRenderPage />} />
{/* 设计中心(管理员集中式低代码设计入口,替代每页设计按钮)*/}
<Route path="/design-center" element={<DesignCenterPage />} />
{/* 人走五环统一编排壳(向导内选页面类型:单表/树/主子表)+ AI ①面入口(admin-gated)*/}
<Route path="/new-feature" element={<NewFeatureShell />} />
<Route path="/ai-feature" element={<AiFeatureForm />} />
{/* 建模器(五环第①环·元数据→表,仅管理员)*/}
<Route path="/modeler" element={<ModelerPage />} />
{/* 在线流程 Modeler(可编辑 BPMN 设计器,仅管理员)*/}
<Route path="/process-modeler" element={<ProcessModelerPage />} />
{/* 根路径默认跳工作台 */}
<Route index element={<Navigate to="/workbench" replace />} />
</Route>

View File

@@ -0,0 +1,12 @@
export const OPEN_APPROVAL_DRAWER_EVENT = 'eip4:open-approval-drawer';
export const APPROVAL_COMPLETED_EVENT = 'eip4:approval-completed';
export interface ApprovalDrawerRequest {
taskId?: string;
taskName?: string;
processInstanceId?: string;
businessKey?: string;
businessTable?: string;
businessSummary?: Record<string, unknown>;
readOnly?: boolean;
}

View File

@@ -0,0 +1,9 @@
export const OPEN_MESSAGE_DETAIL_EVENT = 'eip4:open-message-detail';
export const MESSAGE_DETAIL_CHANGED_EVENT = 'eip4:message-detail-changed';
export interface MessageDetailRequest {
kind: 'received' | 'sent';
receiveId?: string;
messageId?: string;
title?: string;
}

View File

@@ -0,0 +1,122 @@
import { beforeEach, describe, expect, it, vi } from 'vitest';
import { OPEN_APPROVAL_DRAWER_EVENT } from './approvalActionEvents';
import { registerApprovalAction, __resetApprovalActionForTest } from './registerApprovalAction';
interface RunCtx {
run: (action: { args?: Record<string, unknown> }, renderer: unknown, event: unknown) => Promise<void>;
}
describe('registerApprovalAction', () => {
beforeEach(() => {
__resetApprovalActionForTest();
});
it('amis-core 缺 registerAction 时返回 false(静默降级)', () => {
expect(registerApprovalAction(null)).toBe(false);
expect(registerApprovalAction({})).toBe(false);
});
it('注册 openApprovalDrawer 动作(幂等)', () => {
const registerAction = vi.fn();
const core = { registerAction };
expect(registerApprovalAction(core)).toBe(true);
expect(registerAction).toHaveBeenCalledTimes(1);
expect(registerAction.mock.calls[0][0]).toBe('openApprovalDrawer');
expect(registerApprovalAction(core)).toBe(true);
expect(registerAction).toHaveBeenCalledTimes(1);
});
it('run 把 taskId 等参数派发为全局审批抽屉事件', async () => {
let captured: RunCtx | null = null;
registerApprovalAction({
registerAction: (_type: string, action: RunCtx) => {
captured = action;
},
});
expect(captured).not.toBeNull();
const seen: unknown[] = [];
const listener = (event: Event) => {
seen.push((event as CustomEvent).detail);
};
window.addEventListener(OPEN_APPROVAL_DRAWER_EVENT, listener);
try {
await captured!.run({
args: {
taskId: 'task-1',
taskName: '审核',
processInstanceId: 'pi-1',
businessKey: 'biz-1',
businessTable: 'PM_DEMO',
readOnly: 'true',
},
}, {}, {});
} finally {
window.removeEventListener(OPEN_APPROVAL_DRAWER_EVENT, listener);
}
expect(seen).toHaveLength(1);
expect(seen[0]).toEqual({
taskId: 'task-1',
taskName: '审核',
processInstanceId: 'pi-1',
businessKey: 'biz-1',
businessTable: 'PM_DEMO',
businessSummary: undefined,
readOnly: true,
});
});
it('缺 taskId 但有 businessKey 时仍派发只读历史审批事件', async () => {
let captured: RunCtx | null = null;
registerApprovalAction({
registerAction: (_type: string, action: RunCtx) => {
captured = action;
},
});
const seen: unknown[] = [];
const listener = (event: Event) => {
seen.push((event as CustomEvent).detail);
};
window.addEventListener(OPEN_APPROVAL_DRAWER_EVENT, listener);
try {
await captured!.run({
args: {
taskName: '审批详情',
businessKey: 'biz-1',
businessTable: 'PM_DEMO',
readOnly: true,
},
}, {}, {});
} finally {
window.removeEventListener(OPEN_APPROVAL_DRAWER_EVENT, listener);
}
expect(seen).toHaveLength(1);
expect(seen[0]).toEqual({
taskId: undefined,
taskName: '审批详情',
processInstanceId: undefined,
businessKey: 'biz-1',
businessTable: 'PM_DEMO',
businessSummary: undefined,
readOnly: true,
});
});
it('缺 taskId/businessKey/processInstanceId 时不派发事件', async () => {
let captured: RunCtx | null = null;
registerApprovalAction({
registerAction: (_type: string, action: RunCtx) => {
captured = action;
},
});
const listener = vi.fn();
window.addEventListener(OPEN_APPROVAL_DRAWER_EVENT, listener);
try {
await captured!.run({ args: { taskName: '审核' } }, {}, {});
} finally {
window.removeEventListener(OPEN_APPROVAL_DRAWER_EVENT, listener);
}
expect(listener).not.toHaveBeenCalled();
});
});

View File

@@ -0,0 +1,83 @@
import { OPEN_APPROVAL_DRAWER_EVENT, type ApprovalDrawerRequest } from './approvalActionEvents';
interface OpenApprovalActionArg {
args?: {
taskId?: unknown;
taskName?: unknown;
processInstanceId?: unknown;
businessKey?: unknown;
businessTable?: unknown;
businessSummary?: unknown;
readOnly?: unknown;
readonly?: unknown;
mode?: unknown;
};
[key: string]: unknown;
}
interface AmisRenderer {
[key: string]: unknown;
}
interface AmisEvent {
[key: string]: unknown;
}
interface AmisCore {
registerAction?: (type: string, action: unknown) => void;
}
let registered = false;
function asString(v: unknown): string | undefined {
if (v === null || v === undefined) return undefined;
const s = String(v).trim();
return s ? s : undefined;
}
function asRecord(v: unknown): Record<string, unknown> | undefined {
return v && typeof v === 'object' && !Array.isArray(v) ? v as Record<string, unknown> : undefined;
}
function asBoolean(v: unknown): boolean {
return v === true || v === 'true' || v === 1 || v === '1';
}
/**
* 注册 converted amis 页使用的审批抽屉动作。
*
* 转换器只生成通用动作,不直接依赖 React 状态;这里把 amis click 转成应用级事件,
* 由 AppShell 挂载真实 ApprovalDrawer。
*/
export function registerApprovalAction(amisCore: AmisCore | undefined | null): boolean {
if (registered) return true;
if (!amisCore || typeof amisCore.registerAction !== 'function') return false;
amisCore.registerAction('openApprovalDrawer', {
async run(action: OpenApprovalActionArg, _renderer: AmisRenderer, _event: AmisEvent) {
const args = action?.args ?? {};
const taskId = asString(args.taskId);
const processInstanceId = asString(args.processInstanceId);
const businessKey = asString(args.businessKey);
if (!taskId && !processInstanceId && !businessKey) return;
const mode = asString(args.mode);
const detail: ApprovalDrawerRequest = {
taskId,
taskName: asString(args.taskName),
processInstanceId,
businessKey,
businessTable: asString(args.businessTable),
businessSummary: asRecord(args.businessSummary),
readOnly: asBoolean(args.readOnly) || asBoolean(args.readonly) || mode === 'read',
};
window.dispatchEvent(new CustomEvent<ApprovalDrawerRequest>(OPEN_APPROVAL_DRAWER_EVENT, { detail }));
},
});
registered = true;
return true;
}
export function __resetApprovalActionForTest(): void {
registered = false;
}

View File

@@ -0,0 +1,76 @@
import { beforeEach, describe, expect, it, vi } from 'vitest';
import { OPEN_MESSAGE_DETAIL_EVENT } from './messageActionEvents';
import { registerMessageAction, __resetMessageActionForTest } from './registerMessageAction';
interface RunCtx {
run: (action: { args?: Record<string, unknown> }, renderer: unknown, event: unknown) => Promise<void>;
}
describe('registerMessageAction', () => {
beforeEach(() => {
__resetMessageActionForTest();
});
it('amis-core 缺 registerAction 时返回 false', () => {
expect(registerMessageAction(null)).toBe(false);
expect(registerMessageAction({})).toBe(false);
});
it('注册 openMessageDetail 动作(幂等)', () => {
const registerAction = vi.fn();
const core = { registerAction };
expect(registerMessageAction(core)).toBe(true);
expect(registerAction).toHaveBeenCalledTimes(1);
expect(registerAction.mock.calls[0][0]).toBe('openMessageDetail');
expect(registerMessageAction(core)).toBe(true);
expect(registerAction).toHaveBeenCalledTimes(1);
});
it('received 消息派发 receiveId', async () => {
let captured: RunCtx | null = null;
registerMessageAction({
registerAction: (_type: string, action: RunCtx) => {
captured = action;
},
});
const seen: unknown[] = [];
const listener = (event: Event) => seen.push((event as CustomEvent).detail);
window.addEventListener(OPEN_MESSAGE_DETAIL_EVENT, listener);
try {
await captured!.run({
args: { kind: 'received', receiveId: 'recv-1', title: '消息' },
}, {}, {});
} finally {
window.removeEventListener(OPEN_MESSAGE_DETAIL_EVENT, listener);
}
expect(seen).toEqual([{ kind: 'received', receiveId: 'recv-1', messageId: undefined, title: '消息' }]);
});
it('sent 消息派发 messageId,缺 id 不派发', async () => {
let captured: RunCtx | null = null;
registerMessageAction({
registerAction: (_type: string, action: RunCtx) => {
captured = action;
},
});
const listener = vi.fn();
window.addEventListener(OPEN_MESSAGE_DETAIL_EVENT, listener);
try {
await captured!.run({ args: { kind: 'sent' } }, {}, {});
await captured!.run({ args: { kind: 'sent', messageId: 'msg-1' } }, {}, {});
} finally {
window.removeEventListener(OPEN_MESSAGE_DETAIL_EVENT, listener);
}
expect(listener).toHaveBeenCalledTimes(1);
expect((listener.mock.calls[0][0] as CustomEvent).detail).toEqual({
kind: 'sent',
receiveId: undefined,
messageId: 'msg-1',
title: undefined,
});
});
});

View File

@@ -0,0 +1,65 @@
import { OPEN_MESSAGE_DETAIL_EVENT, type MessageDetailRequest } from './messageActionEvents';
interface OpenMessageActionArg {
args?: {
kind?: unknown;
receiveId?: unknown;
messageId?: unknown;
title?: unknown;
};
[key: string]: unknown;
}
interface AmisRenderer {
[key: string]: unknown;
}
interface AmisEvent {
[key: string]: unknown;
}
interface AmisCore {
registerAction?: (type: string, action: unknown) => void;
}
let registered = false;
function asString(v: unknown): string | undefined {
if (v === null || v === undefined) return undefined;
const s = String(v).trim();
return s ? s : undefined;
}
function asKind(v: unknown): MessageDetailRequest['kind'] {
return asString(v) === 'sent' ? 'sent' : 'received';
}
export function registerMessageAction(amisCore: AmisCore | undefined | null): boolean {
if (registered) return true;
if (!amisCore || typeof amisCore.registerAction !== 'function') return false;
amisCore.registerAction('openMessageDetail', {
async run(action: OpenMessageActionArg, _renderer: AmisRenderer, _event: AmisEvent) {
const args = action?.args ?? {};
const kind = asKind(args.kind);
const receiveId = asString(args.receiveId);
const messageId = asString(args.messageId);
if (kind === 'received' && !receiveId) return;
if (kind === 'sent' && !messageId) return;
const detail: MessageDetailRequest = {
kind,
receiveId,
messageId,
title: asString(args.title),
};
window.dispatchEvent(new CustomEvent<MessageDetailRequest>(OPEN_MESSAGE_DETAIL_EVENT, { detail }));
},
});
registered = true;
return true;
}
export function __resetMessageActionForTest(): void {
registered = false;
}

View File

@@ -0,0 +1,88 @@
import { beforeEach, describe, expect, it, vi } from 'vitest';
import {
normalizeUserTransferSchemaTree,
registerUserTransferPicker,
__resetUserTransferPickerForTest,
} from './registerUserTransferPicker';
describe('registerUserTransferPicker', () => {
beforeEach(() => {
__resetUserTransferPickerForTest();
});
it('amis-core 缺注册能力时返回 false(静默降级)', () => {
expect(registerUserTransferPicker(null)).toBe(false);
expect(registerUserTransferPicker({})).toBe(false);
});
it('注册 schema filter,把老单选用户框改成标准 picker', () => {
let filter: ((schema: Record<string, unknown>) => Record<string, unknown>) | null = null;
const addSchemaFilter = vi.fn((fn) => {
filter = fn;
});
const registerFormItem = vi.fn();
expect(registerUserTransferPicker({ addSchemaFilter, registerFormItem })).toBe(true);
expect(addSchemaFilter).toHaveBeenCalledTimes(1);
expect(filter).not.toBeNull();
const normalized = filter!({ type: 'user-transfer-picker', mode: 'controlled', name: 'AGENT' });
expect(normalized).toMatchObject({
type: 'picker',
name: 'AGENT',
source: '/api/picker/76d2f950-ef40-4eff-89ec-98ad9a4976b9/list',
labelField: '_label',
valueField: '_id',
modalMode: 'dialog',
modalSize: 'lg',
placeholder: '请点击右侧的图标',
});
expect(filter!({ type: 'select', mode: 'multiple' })).toEqual({ type: 'select', mode: 'multiple' });
});
it('只注册 schema filter,不再注册旧自定义控件', () => {
const registerFormItem = vi.fn();
const addSchemaFilter = vi.fn();
expect(registerUserTransferPicker({ addSchemaFilter, registerFormItem })).toBe(true);
expect(registerFormItem).not.toHaveBeenCalled();
expect(addSchemaFilter).toHaveBeenCalledTimes(1);
});
it('递归规范化页面 schema 中的老用户选择框', () => {
const schema = {
type: 'page',
body: [
{ type: 'select', mode: 'multiple', name: 'OTHER' },
{ type: 'user-transfer-picker', mode: 'controlled', name: 'AGENT' },
{ type: 'user-transfer-picker', mode: 'org', multiple: true, name: 'USERS' },
],
};
expect(normalizeUserTransferSchemaTree(schema)).toMatchObject({
type: 'page',
body: [
{ type: 'select', mode: 'multiple', name: 'OTHER' },
{
type: 'picker',
name: 'AGENT',
source: '/api/picker/76d2f950-ef40-4eff-89ec-98ad9a4976b9/list',
placeholder: '请点击右侧的图标',
},
{
type: 'picker',
multiple: true,
name: 'USERS',
source: '/api/picker/1b3bad0b-a24b-4347-9466-db78f7432756/list',
labelField: '_label',
valueField: '_id',
placeholder: '请点击右侧的图标',
overflowConfig: {
maxTagCount: 1,
displayPosition: ['select'],
},
},
],
});
});
});

View File

@@ -0,0 +1,107 @@
type AmisRendererRegistry = {
addSchemaFilter?: (filter: (schema: Record<string, unknown>) => Record<string, unknown>) => unknown;
};
let schemaFilterRegistered = false;
const USER_SELECT_MODES = new Set(['controlled', 'all', 'org', 'attendance']);
const USER_SELECT_DIALOG_IDS_BY_MODE: Record<string, string> = {
controlled: '76d2f950-ef40-4eff-89ec-98ad9a4976b9',
org: '1b3bad0b-a24b-4347-9466-db78f7432756',
all: '090981ba-0c10-4d84-92dc-80e226594480',
attendance: 'e31ce405-21c4-4892-94bb-e87e07b7f8e7',
};
function userPickerSchema(schema: Record<string, unknown>, mode: string, multiple: boolean): Record<string, unknown> {
const next = { ...schema };
delete next.userSelectMode;
delete next.mode;
delete next.multiple;
delete next.joinValues;
delete next.delimiter;
delete next.valueTpl;
delete next.pickerSize;
delete next.selectTitle;
delete next.resultTitle;
delete next.statistics;
next.type = 'picker';
next.clearable = next.clearable ?? true;
if (multiple) {
next.multiple = true;
next.overflowConfig = next.overflowConfig ?? {
maxTagCount: 1,
displayPosition: ['select'],
};
}
next.source = `/api/picker/${USER_SELECT_DIALOG_IDS_BY_MODE[mode] ?? USER_SELECT_DIALOG_IDS_BY_MODE.controlled}/list`;
next.labelField = '_label';
next.valueField = '_id';
next.modalMode = 'dialog';
next.modalSize = 'lg';
next.placeholder = next.placeholder === undefined || next.placeholder === '请选择'
? '请点击右侧的图标'
: next.placeholder;
next.pickerSchema = next.pickerSchema ?? {
mode: 'table',
headerToolbar: [{ type: 'search-box', name: 'q', placeholder: '输入关键字搜索' }],
footerToolbar: ['pagination'],
};
return next;
}
export function normalizeUserTransferSchema(schema: Record<string, unknown>): Record<string, unknown> {
if (schema?.type !== 'user-transfer-picker') return schema;
const next = { ...schema };
const mode = typeof schema.mode === 'string' ? schema.mode : '';
if (USER_SELECT_MODES.has(mode)) {
next.userSelectMode = next.userSelectMode ?? mode;
delete next.mode;
}
const userSelectMode = typeof next.userSelectMode === 'string' ? next.userSelectMode : 'controlled';
return userPickerSchema(
next,
USER_SELECT_MODES.has(userSelectMode) ? userSelectMode : 'controlled',
next.multiple === true,
);
}
export function normalizeUserTransferSchemaTree<T>(node: T): T {
if (Array.isArray(node)) {
let changed = false;
const next = node.map((item) => {
const normalized = normalizeUserTransferSchemaTree(item);
changed ||= normalized !== item;
return normalized;
});
return (changed ? next : node) as T;
}
if (!node || typeof node !== 'object') return node;
const objectNode = node as Record<string, unknown>;
let changed = false;
const next: Record<string, unknown> = {};
for (const [key, value] of Object.entries(objectNode)) {
const normalized = normalizeUserTransferSchemaTree(value);
next[key] = normalized;
changed ||= normalized !== value;
}
const normalizedObject = normalizeUserTransferSchema(next);
changed ||= normalizedObject !== next;
return (changed ? normalizedObject : node) as T;
}
export function registerUserTransferPicker(amisCore: AmisRendererRegistry | undefined | null): boolean {
if (!amisCore) return false;
if (!schemaFilterRegistered && typeof amisCore.addSchemaFilter === 'function') {
amisCore.addSchemaFilter(normalizeUserTransferSchema);
schemaFilterRegistered = true;
}
return schemaFilterRegistered;
}
export function __resetUserTransferPickerForTest(): void {
schemaFilterRegistered = false;
}

View File

@@ -1,5 +1,10 @@
import { describe, expect, it } from 'vitest';
import { translateCommand, translateCommands, type ScriptCommand } from './scriptCommands';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import {
translateCommand,
translateCommands,
__resetUnsupportedWarningsForTest,
type ScriptCommand,
} from './scriptCommands';
// P4-5:脚本指令 → amis 动作翻译(29 UI 动词覆盖核心分支)。
describe('translateCommand', () => {
@@ -24,22 +29,11 @@ describe('translateCommand', () => {
expect(a).toEqual({ actionType: 'setValue', componentId: 'OLD_STORE_ID', args: { value: 'S-99' } });
});
it('清空选项 setOptions → setValue options 置空', () => {
const a = translateCommand({ actionType: 'setOptions', componentId: 'ELIGIBILITY', args: { options: [] } });
expect(a?.actionType).toBe('setValue');
expect((a?.args as Record<string, unknown>).options).toEqual([]);
});
it('追加选项 addOption 透传 value/label', () => {
const a = translateCommand({ actionType: 'addOption', componentId: 'ELIGIBILITY', args: { value: 4, label: '合格' } });
expect(a).toEqual({ actionType: 'addOption', componentId: 'ELIGIBILITY', args: { value: 4, label: '合格' } });
});
it('数据过滤 setFilter 透传 filter map', () => {
const a = translateCommand({ actionType: 'setFilter', componentId: 'BUILDCOMPANY', args: { filter: { UNITTYPE: 7 } } });
expect((a?.args as Record<string, unknown>).filter).toEqual({ UNITTYPE: 7 });
});
it('子表按钮 addSubTableButton 透传 args', () => {
const a = translateCommand({ actionType: 'addSubTableButton', componentId: 'GOODSDETAIL', args: { target: 'SELECT', index: 0 } });
expect(a?.actionType).toBe('addSubTableButton');
@@ -96,6 +90,45 @@ describe('translateCommand', () => {
});
});
// P1 修复(§10.2):amis 运行时无对应机制的 6 个动词,从「误转 setValue 静默哑火/清值」改为显式跳过 + 告警。
describe('amis 运行时无机制动词 → 显式跳过(不再误转 setValue)', () => {
beforeEach(() => __resetUnsupportedWarningsForTest());
afterEach(() => vi.restoreAllMocks());
const UNSUPPORTED: Array<[string, Record<string, unknown>]> = [
['setLabel', { label: '新标题' }],
['setRequired', { required: true, errorMessage: '必填' }],
['setFilter', { filter: { UNITTYPE: 7 } }],
['setOptions', { options: [] }],
['setNullSelection', { value: true }],
['setStyle', { width: 120 }],
];
it.each(UNSUPPORTED)('%s 返回 null(跳过,不再产出 setValue)', (actionType, args) => {
vi.spyOn(console, 'warn').mockImplementation(() => {});
expect(translateCommand({ actionType, componentId: 'X', args })).toBeNull();
});
it('translateCommands 把这些动词整体过滤掉,不混入 setValue', () => {
vi.spyOn(console, 'warn').mockImplementation(() => {});
const out = translateCommands([
{ actionType: 'hidden', componentId: 'A' },
{ actionType: 'setRequired', componentId: 'B', args: { required: true } },
{ actionType: 'setOptions', componentId: 'C', args: { options: [] } },
{ actionType: 'toast', args: { msg: 'x' } },
]);
expect(out.map((a) => a.actionType)).toEqual(['hidden', 'toast']);
});
it('同一动词只告警一次(去重)', () => {
const warn = vi.spyOn(console, 'warn').mockImplementation(() => {});
translateCommand({ actionType: 'setRequired', componentId: 'X', args: { required: true } });
translateCommand({ actionType: 'setRequired', componentId: 'Y', args: { required: false } });
expect(warn).toHaveBeenCalledTimes(1);
expect(String(warn.mock.calls[0][0])).toContain('setRequired');
});
});
describe('translateCommands', () => {
it('数组翻译并过滤无法翻译项', () => {
const cmds: ScriptCommand[] = [

View File

@@ -28,6 +28,34 @@ export interface AmisAction {
[key: string]: unknown;
}
// amis 运行时【无对应机制】的语义动词。历史实现把它们误翻成 amis `setValue`,但 amis 的 setValue 动作
// (CmptAction)只读 args.value、丢弃 required/filter/options/label/style 等语义 args → 运行时静默哑火
// (且 args.value 为 undefined,经 onChange 路径的控件还可能把值清成 undefined)。
// 现改为【显式跳过 + 一次性告警】:不再误转 setValue(消除清值风险 + 不再伪装「已处理」)。
// 真正支持「动态必填/选项/过滤/标题/样式」需转换器侧生成数据绑定 schema(requiredOn/source 绑数据变量)、
// 由重放改数据变量——属跨切面改造,见进度总览 §10.2 follow-up。
const AMIS_RUNTIME_UNSUPPORTED = new Set([
'setLabel', 'setRequired', 'setFilter', 'setOptions', 'setNullSelection', 'setStyle',
]);
const warnedUnsupported = new Set<string>();
function skipUnsupported(actionType: string): null {
if (!warnedUnsupported.has(actionType)) {
warnedUnsupported.add(actionType);
// eslint-disable-next-line no-console
console.warn(
`[scriptCommands] 指令 "${actionType}" 在 amis 运行时无对应机制,已跳过(不再误转 setValue)。` +
'「动态必填/选项/过滤/标题/样式」需转换器侧数据绑定支持(总览 §10.2 follow-up)。',
);
}
return null;
}
/** 测试可见:清空告警去重集,避免跨用例污染。 */
export function __resetUnsupportedWarningsForTest(): void {
warnedUnsupported.clear();
}
/**
* 单条脚本指令 → amis 动作对象。
* 返回 null 表示该指令无对应 amis 动作(跳过,不报错)。
@@ -36,6 +64,11 @@ export function translateCommand(cmd: ScriptCommand): AmisAction | null {
if (!cmd || !cmd.actionType) return null;
const { actionType, componentId, args = {} } = cmd;
// amis 运行时无机制的动词:显式跳过 + 一次性告警(不再误转 setValue 致哑火/清值)。
if (AMIS_RUNTIME_UNSUPPORTED.has(actionType)) {
return skipUnsupported(actionType);
}
switch (actionType) {
// 显隐 —— amis 内置 show/hidden 动作(componentId 定位组件)
case 'show':
@@ -56,29 +89,12 @@ export function translateCommand(cmd: ScriptCommand): AmisAction | null {
case 'setValue':
return { actionType: 'setValue', componentId, args: { value: args.value } };
// 标题 —— 走 setValue 到组件 label(amis 无独立 setLabel,用组件 schema 更新)
case 'setLabel':
return { actionType: 'setValue', componentId, args: { label: args.label } };
// 必填 —— amis 表单项 required(用 setValue 更新组件 required 态)
case 'setRequired':
return { actionType: 'setValue', componentId, args: { required: args.required, errorMessage: args.errorMessage } };
// 数据过滤 —— 透传 filter(联动数据源;componentId 为目标选择组件)
case 'setFilter':
return { actionType: 'setValue', componentId, args: { filter: args.filter } };
// 清空选项 —— amis setOptions 置空
case 'setOptions':
return { actionType: 'setValue', componentId, args: { options: args.options ?? [] } };
// setLabel / setRequired / setFilter / setOptions:amis 运行时无对应机制,已在上方 AMIS_RUNTIME_UNSUPPORTED 跳过。
// 追加选项 —— 透传 addOption(前端合并进组件 options)
case 'addOption':
return { actionType: 'addOption', componentId, args: { value: args.value, label: args.label } };
case 'setNullSelection':
return { actionType: 'setValue', componentId, args: { nullSelection: args.value } };
case 'removeOption':
return { actionType: 'removeOption', componentId, args: { value: args.value } };
@@ -112,9 +128,7 @@ export function translateCommand(cmd: ScriptCommand): AmisAction | null {
case 'focus':
return { actionType: 'focus', componentId };
// 样式 —— 透传 width/height
case 'setStyle':
return { actionType: 'setValue', componentId, args: { style: args } };
// setStyle:amis 运行时无样式动作,已在上方 AMIS_RUNTIME_UNSUPPORTED 跳过。
// 重载数据源 —— amis reload
case 'reload':

33
src/api/ai.test.ts Normal file
View File

@@ -0,0 +1,33 @@
import { describe, it, expect } from 'vitest';
import { extractPageSchemaTemplateId } from './ai';
import type { AiAutoDevelopRun } from './ai';
describe('extractPageSchemaTemplateId', () => {
it('从 PAGE_SCHEMA draft 取 targetId', () => {
const run: AiAutoDevelopRun = {
taskId: 't1',
status: 'READY_FOR_HUMAN_REVIEW',
development: {
drafts: [
{ artifactType: 'FLOW', targetId: 'OA_X_ADD' },
{ artifactType: 'PAGE_SCHEMA', targetId: 'TPL-AI-9' },
],
},
};
expect(extractPageSchemaTemplateId(run)).toBe('TPL-AI-9');
});
it('无 PAGE_SCHEMA draft 时返回 undefined', () => {
const run: AiAutoDevelopRun = {
taskId: 't2',
status: 'READY_FOR_HUMAN_REVIEW',
development: { drafts: [{ artifactType: 'FLOW', targetId: 'X' }] },
};
expect(extractPageSchemaTemplateId(run)).toBeUndefined();
});
it('development 缺失时安全返回 undefined', () => {
const run: AiAutoDevelopRun = { taskId: 't3', status: 'FAILED' };
expect(extractPageSchemaTemplateId(run)).toBeUndefined();
});
});

67
src/api/ai.ts Normal file
View File

@@ -0,0 +1,67 @@
// AI ①面加速器入口 —— POST /api/ai/features/auto-develop(admin)。
// 平台进程内不内置生成 LLM:实际起草由外部 agent + Skills 完成,本接口只是确定性编排+人审门禁。
// 终端良态 status === 'READY_FOR_HUMAN_REVIEW'(红线:永不自动发布)。
//
// ⚠️ 端口约束:后端 auto-develop 会以 baseUrl 回调写后端。dev 默认 8084 已死,
// 本前端透传 baseUrl = window.location.origin(经 vite 代理 /api → 8093)。
// 若省略 baseUrl,则要求后端 dev profile 自身的 baseUrl 指向 8093(根因修在后端 Section)。
import { http } from './http';
export interface AiFeatureField {
column: string;
label: string;
type: string;
length?: number;
required?: boolean;
}
export interface AiAutoDevelopBody {
feature: {
objective: string;
featureName: string;
tableName: string;
entityName: string;
templateId?: string;
menuName?: string;
fields: AiFeatureField[];
pageRecipe: 'maintenance-crud-v1' | 'tree-crud-v1';
};
baseUrl?: string;
generateDeploymentPackage?: boolean;
maxRepairAttempts?: number;
}
export interface AiDraft {
artifactType: string; // 'PAGE_SCHEMA' | 'FLOW' | ...
targetId: string;
payload?: unknown;
}
export interface AiAutoDevelopRun {
taskId: string;
status: string; // 'READY_FOR_HUMAN_REVIEW' = 终端良态
development?: { drafts?: AiDraft[] };
applyRun?: unknown;
deploymentPackage?: unknown;
messages?: string[];
}
/** 终端良态判定(红线:AI 入口产物恒此状态才可人审进设计器)。 */
export const READY_STATUS = 'READY_FOR_HUMAN_REVIEW';
/** 从 run 提取 PAGE_SCHEMA draft 的 targetId(即写入 standard 层的 templateId)。 */
export function extractPageSchemaTemplateId(run: AiAutoDevelopRun): string | undefined {
return run.development?.drafts?.find((d) => d.artifactType === 'PAGE_SCHEMA')?.targetId;
}
export async function autoDevelop(body: AiAutoDevelopBody): Promise<AiAutoDevelopRun> {
// §B.9-10:默认值放后、用 ?? 兜底,避免显式传入的 undefined 覆盖默认;
// 透传 baseUrl=当前前端 origin,让后端回调经 vite 代理打到正在跑的 8093(而非死的 8084)。
const payload: AiAutoDevelopBody = {
...body,
baseUrl: body.baseUrl ?? window.location.origin,
generateDeploymentPackage: body.generateDeploymentPackage ?? true,
};
const { data } = await http.post<AiAutoDevelopRun>('/api/ai/features/auto-develop', payload);
return data;
}

View File

@@ -52,6 +52,13 @@ export async function fetchTrace(processInstanceId: string): Promise<TraceNode[]
return Array.isArray(data) ? data : [];
}
export async function fetchTraceByBusiness(businessKey: string): Promise<TraceNode[]> {
const { data } = await http.get<TraceNode[]>(
`/api/flow/business/${encodeURIComponent(businessKey)}/trace`,
);
return Array.isArray(data) ? data : [];
}
// ---------------------------------------------------------------------------
// WfTemplate 驱动审批 —— 动态按钮 + 业务表单 + 按 type 分派
// ---------------------------------------------------------------------------
@@ -85,6 +92,10 @@ export interface ApprovalMeta {
formTemplateId?: string | null;
ended: boolean;
suspended: boolean;
/** 会签(BPMN 多实例)任务:true 时展示「已会签 N/M」。 */
cosign?: boolean;
cosignTotal?: number;
cosignCompleted?: number;
}
/** POST /api/task/{id}/action 请求。 */
@@ -93,7 +104,10 @@ export interface ApprovalActionRequest {
/** WfTemplate 按钮 id:后端据此重解析该按钮的 servicename(自定义服务流)并执行。 */
buttonId?: string;
comment?: string;
/** 转办(agent)目标用户(单人)。 */
targetUserId?: string;
/** 协办(assist)/转阅(circulated)目标用户(多人)。 */
targetUserIds?: string[];
businessKey?: string;
processInstanceId?: string;
tableName?: string;
@@ -104,6 +118,30 @@ export async function fetchApprovalMeta(taskId: string): Promise<ApprovalMeta> {
return data;
}
export interface ApprovalHistoryParams {
businessKey?: string;
processInstanceId?: string;
businessTable?: string;
}
function historyQuery(params: ApprovalHistoryParams): string {
const query = new URLSearchParams();
if (params.businessKey) query.set('businessKey', params.businessKey);
if (params.processInstanceId) query.set('processInstanceId', params.processInstanceId);
if (params.businessTable) query.set('businessTable', params.businessTable);
const s = query.toString();
return s ? `?${s}` : '';
}
export async function fetchApprovalHistoryMeta(params: ApprovalHistoryParams): Promise<ApprovalMeta> {
const { data } = await http.get<ApprovalMeta>(`/api/approval/history/meta${historyQuery(params)}`);
return data;
}
export function approvalHistoryBusinessDataApi(params: ApprovalHistoryParams): string {
return `get:/api/approval/history/business-data${historyQuery(params)}`;
}
export async function submitApprovalAction(
taskId: string,
req: ApprovalActionRequest,

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

@@ -43,23 +43,10 @@ export function collectLeaves(items: MenuItem[], breadcrumb: string[] = []): Men
return out;
}
// 系统管理(现代层标准页,F1-5 入库 sys_page_schema,不在老菜单表里)。
// F1 阶段对所有登录用户可见;F2 接入模块授权后改为按权限下发。
const SYS_ADMIN_ROOT: MenuRoot = {
id: 'SYS_ADMIN',
name: '系统管理',
seq: 999,
children: [
{ id: 'sys-admin-user', name: '用户管理', seq: 1, templateId: 'sys-admin-user', children: [] },
{ id: 'sys-admin-role', name: '角色管理', seq: 2, templateId: 'sys-admin-role', children: [] },
{ id: 'sys-admin-depart', name: '部门管理', seq: 3, templateId: 'sys-admin-depart', children: [] },
{ id: 'sys-admin-menu', name: '菜单管理', seq: 4, templateId: 'sys-admin-menu', children: [] },
{ id: 'sys-admin-filterrule', name: '数据权限规则', seq: 5, templateId: 'sys-admin-filterrule', children: [] },
{ id: 'sys-admin-assign', name: '权限分配', seq: 6, templateId: 'sys-admin-assign', children: [] },
],
};
export async function fetchMenu(): Promise<MenuResponse> {
// 只用真菜单(/api/menu = 老 sys_menu 转换页)。原硬编码的「系统管理」demo 组
// (sys-admin-* 手搓 RBAC 页)已弃用——其功能由真菜单里的转换页覆盖
// (用户管理→629463ae / 角色管理→498c077c / 用户组管理→5078945c / 组织管理 / 功能管理 等)。
const resp = await http.get<MenuResponse>('/api/menu');
return { roots: [...resp.data.roots, SYS_ADMIN_ROOT] };
return { roots: resp.data.roots };
}

49
src/api/meta.test.ts Normal file
View File

@@ -0,0 +1,49 @@
import { describe, expect, it, vi, beforeEach } from 'vitest';
import { http } from './http';
import { createEntity, listEntities, listEntityColumns } from './meta';
vi.mock('./http', () => ({
http: { get: vi.fn(), post: vi.fn() },
}));
const mGet = vi.mocked(http.get);
const mPost = vi.mocked(http.post);
beforeEach(() => {
mGet.mockReset();
mPost.mockReset();
});
describe('meta api', () => {
it('createEntity POST /api/meta/entity 并解包 data', async () => {
mPost.mockResolvedValue({
data: { status: 0, data: { entityId: 'E1', tablename: 'OA_DEMO', attributeCount: 4, indexCount: 1, listApi: '/api/entity/OA_DEMO/list' } },
} as never);
const r = await createEntity({ tablename: 'OA_DEMO', name: '演示', attributes: [{ column: 'TITLE', type: 'string', length: 200, mandatory: true }] });
expect(mPost).toHaveBeenCalledWith('/api/meta/entity', {
tablename: 'OA_DEMO',
name: '演示',
attributes: [{ column: 'TITLE', type: 'string', length: 200, mandatory: true }],
});
expect(r.entityId).toBe('E1');
expect(r.listApi).toBe('/api/entity/OA_DEMO/list');
});
it('listEntities GET /api/meta/entities 并解包数组', async () => {
mGet.mockResolvedValue({ data: { status: 0, data: [{ entityId: 'E1', tablename: 'OA_DEMO', name: '演示' }] } } as never);
const r = await listEntities();
expect(mGet).toHaveBeenCalledWith('/api/meta/entities');
expect(r).toHaveLength(1);
expect(r[0].tablename).toBe('OA_DEMO');
});
it('listEntityColumns GET /api/meta/entity/{table}/attributes 并解包', async () => {
mGet.mockResolvedValue({
data: { status: 0, data: { tablename: 'SYS_DEPART', displayColumn: 'DEPARTNAME', columns: [{ column: 'DEPARTNAME', display: '部门名', type: 'string' }] } },
} as never);
const r = await listEntityColumns('SYS_DEPART');
expect(mGet).toHaveBeenCalledWith('/api/meta/entity/SYS_DEPART/attributes');
expect(r.displayColumn).toBe('DEPARTNAME');
expect(r.columns[0].column).toBe('DEPARTNAME');
});
});

90
src/api/meta.ts Normal file
View File

@@ -0,0 +1,90 @@
// 元数据建模 API —— 实体目录 / 实体属性 / 建表。
// 后端信封统一 {status:0,data:...},本模块解包返回内层 data(镜像 auth.ts 用法)。
import { http } from './http';
export type AttrType = 'string' | 'integer' | 'number' | 'date' | 'datetime' | 'boolean' | 'reference';
export interface EntityAttr {
column: string;
type: AttrType;
length?: number;
display?: string;
mandatory?: boolean;
/** type==='reference' 时必填:外键目标表名(DECISION-1)。 */
referenceTable?: string;
}
export interface CreateEntityBody {
tablename: string;
name?: string;
attributes: EntityAttr[];
}
export interface CreateEntityResult {
entityId: string;
tablename: string;
attributeCount: number;
indexCount: number;
/** 引擎遗留返回 '/api/entity/<TABLE>/list';recipe 页不消费它(recipe 列表走 /api/flow/<TABLE>_SEARCH,见 §B.2/§B.9-11)。 */
listApi: string;
}
export interface EntitySummary {
entityId: string;
tablename: string;
name: string;
}
export interface EntityColumn {
column: string;
display: string;
type: string;
referenceTable?: string;
}
export interface EntityColumns {
tablename: string;
displayColumn: string;
columns: EntityColumn[];
}
interface Envelope<T> {
status: number;
data: T;
}
/** POST /api/meta/entity —— 建表(标准列由后端自动追加)。 */
export async function createEntity(body: CreateEntityBody): Promise<CreateEntityResult> {
const resp = await http.post<Envelope<CreateEntityResult>>('/api/meta/entity', body);
return resp.data.data;
}
export interface AlterEntityResult {
tablename: string;
addedColumns: string[];
indexCount: number;
}
/**
* POST /api/meta/entity/{table}/attributes —— 给已建实体加列(P1④ 改表加字段)。
* 后端走受控 ALTER 安全通道(只加列 / 恒可空,经 AlterTableSqlGuard 白名单)。
*/
export async function alterEntity(table: string, attributes: EntityAttr[]): Promise<AlterEntityResult> {
const resp = await http.post<Envelope<AlterEntityResult>>(
`/api/meta/entity/${encodeURIComponent(table)}/attributes`,
{ attributes },
);
return resp.data.data;
}
/** GET /api/meta/entities —— 实体目录(供引用列选择器)。 */
export async function listEntities(): Promise<EntitySummary[]> {
const resp = await http.get<Envelope<EntitySummary[]>>('/api/meta/entities');
return resp.data.data;
}
/** GET /api/meta/entity/{table}/attributes —— 某表的列定义(含 displayColumn)。 */
export async function listEntityColumns(table: string): Promise<EntityColumns> {
const resp = await http.get<Envelope<EntityColumns>>(`/api/meta/entity/${encodeURIComponent(table)}/attributes`);
return resp.data.data;
}

View File

@@ -18,6 +18,23 @@ export interface NoticeListResult {
total: number;
}
export interface NoticeDetail {
id: string;
receiveId?: string;
title?: string | null;
content?: string | null;
type?: number | string | null;
createTime?: number | string | null;
senderId?: string;
sender?: string | null;
receivers?: string | null;
receiverIds?: string | null;
document?: unknown;
params?: unknown;
received?: boolean;
readChanged?: boolean;
}
/** 获取当前用户消息列表 */
export async function fetchNotices(
params: { unreadOnly?: boolean; page?: number; perPage?: number } = {},
@@ -46,3 +63,19 @@ export async function markNoticeRead(id: string): Promise<void> {
export async function markAllNoticesRead(): Promise<void> {
await http.post('/api/notice/read-all');
}
/** 按 sys_message_id 加载只读消息详情(已发送/当前用户可访问消息) */
export async function fetchNoticeDetail(messageId: string): Promise<NoticeDetail> {
const { data } = await http.get<{ status: number; data: NoticeDetail }>(
`/api/notice/${encodeURIComponent(messageId)}/detail`,
);
return data.data;
}
/** 按 sys_messageuser_id 打开收到消息详情,并在后端置已读 */
export async function openReceivedNotice(receiveId: string): Promise<NoticeDetail> {
const { data } = await http.post<{ status: number; data: NoticeDetail }>(
`/api/notice/received/${encodeURIComponent(receiveId)}/open`,
);
return data.data;
}

View File

@@ -0,0 +1,101 @@
import { describe, it, expect, vi, beforeEach } from 'vitest';
vi.mock('./http', () => ({ http: { get: vi.fn() } }));
import { http } from './http';
import { fetchProcDefSource, fetchProcDefSourceByKey, fetchProcessOptions } from './processModeler';
const mGet = vi.mocked(http.get);
beforeEach(() => {
mGet.mockReset();
});
describe('fetchProcDefSource', () => {
it('中文+冒号 procDefId 必须 encodeURIComponent 进 path', async () => {
mGet.mockResolvedValue({
data: { found: true, bpmnXml: '<x/>', idMap: {}, procDefKey: '总包合同交底', version: 3 },
});
// 真实库形态:中文流程名 + 冒号 + uuid
await fetchProcDefSource('总包合同交底:3:9b2f-uuid');
expect(mGet).toHaveBeenCalledTimes(1);
const url = mGet.mock.calls[0][0] as string;
expect(url).toBe(
'/api/workflow/process-definitions/' + encodeURIComponent('总包合同交底:3:9b2f-uuid') + '/source',
);
// 未编码的中文与裸冒号不得出现在 path segment 里
expect(url).not.toContain('总包合同交底');
expect(url).toContain('%E6%80%BB'); // 「总」的编码
});
it('found:false(后端省略 bpmnXml/idMap 键)不抛,只返回 found:false', async () => {
mGet.mockResolvedValue({ data: { found: false } });
const r = await fetchProcDefSource('PD-x');
expect(r).toEqual({ found: false });
expect('bpmnXml' in r).toBe(false);
});
it('found:true 时解构五字段', async () => {
mGet.mockResolvedValue({
data: { found: true, bpmnXml: '<def/>', idMap: { '总包合同交底': 'Proc_zbht' }, procDefKey: '总包合同交底', version: 5 },
});
const r = await fetchProcDefSource('PD-1');
expect(r).toEqual({
found: true,
bpmnXml: '<def/>',
idMap: { '总包合同交底': 'Proc_zbht' },
procDefKey: '总包合同交底',
version: 5,
});
});
});
describe('fetchProcDefSourceByKey', () => {
it('纯中文 key 必须 encodeURIComponent 进 by-key path', async () => {
mGet.mockResolvedValue({
data: { found: true, bpmnXml: '<x/>', idMap: {}, procDefKey: '总包合同交底', version: 4 },
});
await fetchProcDefSourceByKey('总包合同交底');
expect(mGet).toHaveBeenCalledTimes(1);
const url = mGet.mock.calls[0][0] as string;
expect(url).toBe('/api/workflow/process-definitions/by-key/' + encodeURIComponent('总包合同交底') + '/source');
expect(url).not.toContain('总包合同交底');
expect(url).toContain('%E6%80%BB');
});
it('found:false(省略键)不抛,只返回 found:false', async () => {
mGet.mockResolvedValue({ data: { found: false } });
const r = await fetchProcDefSourceByKey('无此流程');
expect(r).toEqual({ found: false });
expect('bpmnXml' in r).toBe(false);
});
});
describe('fetchProcessOptions', () => {
it('解 amis 信封 data.options 并映射 source/id/key 字段', async () => {
mGet.mockResolvedValue({
data: {
status: 0,
msg: '',
data: {
options: [{ label: '总包合同交底', value: '总包合同交底', source: 'model', id: 'PD:3:u', key: 'zbht', type: 'process' }],
},
},
});
const opts = await fetchProcessOptions();
expect(opts).toEqual([{ label: '总包合同交底', value: '总包合同交底', source: 'model', id: 'PD:3:u', key: 'zbht' }]);
});
it('history 来源 id 为空时 id=undefined(前端据此过滤不可载入项)', async () => {
mGet.mockResolvedValue({
data: { data: { options: [{ label: '历史流程', value: '历史流程', id: null, key: null }] } },
});
const opts = await fetchProcessOptions();
expect(opts[0].id).toBeUndefined();
});
it('缺 options / 非数组时返回空数组不抛', async () => {
mGet.mockResolvedValue({ data: {} });
expect(await fetchProcessOptions()).toEqual([]);
});
});

384
src/api/processModeler.ts Normal file
View File

@@ -0,0 +1,384 @@
import { http } from './http';
/**
* 流程 Modeler(在线 BPMN 设计器)后端契约。
*
* 阶段 1 只用到「按 procDefId 取净化源 XML」。裸 JSON 派,防御性默认 found:false,
* 与 diagram.ts 同风格。网关端点由 T1.6 上线,本层照 design 契约先写。
*/
/** GET /api/workflow/process-definitions/{id}/source 的返回体。 */
export interface ProcDefSource {
/** 是否命中流程定义(无则 found:false,不抛)。 */
found: boolean;
/** BpmnIdSanitizer 净化后的 BPMN 2.0 XML(中文 id 已替换为 ASCII,供 moddle/Modeler 载入)。 */
bpmnXml?: string;
/** 净化映射 原id→净化id(发布时逆向还原用,本 task 仅存 ref,后续 task 用)。 */
idMap?: Record<string, string>;
/** 流程定义 key(存量多为中文,如「总包合同交底」)。 */
procDefKey?: string;
/** 流程定义版本号。 */
version?: number;
}
/**
* source 端点返回体归一:found:false 时后端省略 bpmnXml/idMap 键——先判 found 再解构,
* 不在 false 分支碰这些键。
*/
function normalizeProcDefSource(data: ProcDefSource | undefined): ProcDefSource {
if (!data?.found) {
return { found: false };
}
return {
found: true,
bpmnXml: data.bpmnXml ?? undefined,
idMap: data.idMap ?? undefined,
procDefKey: data.procDefKey ?? undefined,
version: data.version ?? undefined,
};
}
/**
* 按 procDefId 取净化后的存量流程源 XML(含可逆 idMap)。
*
* ⚠️ procDefId 必须编码进 path:真实库 1445 个流程的 id 形如「总包合同交底:3:<uuid>」
* (中文 + 冒号),不 encodeURIComponent 会破坏 path segment。
*/
export async function fetchProcDefSource(procDefId: string): Promise<ProcDefSource> {
const { data } = await http.get<ProcDefSource>(
`/api/workflow/process-definitions/${encodeURIComponent(procDefId)}/source`,
);
return normalizeProcDefSource(data);
}
/**
* 按流程 key 取净化后的最新版存量流程源 XML。
*
* ⚠️ 本库 process-select 选项 source 全为 'model'——option.id 是 act_re_model id(非
* procDefId,按 id 载入必 found:false),只有 option.key 是流程 key。故 model 来源的打开
* 走本端点按 key 载入。key 常为纯中文(如「总包合同交底」),必须 encodeURIComponent 进 path。
*/
export async function fetchProcDefSourceByKey(key: string): Promise<ProcDefSource> {
const { data } = await http.get<ProcDefSource>(
`/api/workflow/process-definitions/by-key/${encodeURIComponent(key)}/source`,
);
return normalizeProcDefSource(data);
}
/**
* 存量流程选择器的一条选项。复用旧 ProcessSelectDialog 的数据源
* `/api/process-select/options`(amis 信封 {status,data:{options}})。
*
* - {@link source} 决定用哪个参数打开:'processDefinition'→id 即 procDefId;'model'/'history'→用 key。
* - {@link id} 为 procDefId(仅 source=processDefinition 可信;source=model 时 id 是 act_re_model id,
* 非 procDefId,不能按 id 载入)。
* - {@link value}/{@link label} 均为流程名称(沿用旧口径 value==label==流程名)。
*/
export interface ProcessOption {
label: string;
value: string;
source?: string;
id?: string;
key?: string;
}
interface ProcessSelectEnvelope {
data?: { options?: unknown[] };
options?: unknown[];
}
interface RawOption {
label?: unknown;
value?: unknown;
source?: unknown;
id?: unknown;
key?: unknown;
}
/**
* formKey picker 的一条选项。数据源 `GET /api/workflow/wftemplates`(T2.2 网关端点),
* 契约 `{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 {
id: string;
name: string;
}
/** wftemplates 结果:degraded=数据源读库异常(网关返 {templates:[],degraded:true})。 */
export interface WfTemplateResult {
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 ?? [];
if (!Array.isArray(raw)) return { templates: [], degraded };
const templates = raw
.map((t) => {
const o = (t ?? {}) as { id?: unknown; name?: unknown };
const id = o.id != null ? String(o.id) : '';
const name = o.name != null ? String(o.name) : id;
return { id, name };
})
.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} —— 删除草稿。
* 后端已实现(flowable-service DELETE /api/flow/models/{id} + 网关同超管门转发,f0d704d)。
*/
export async function deleteDraft(id: string): Promise<void> {
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<DeployOutcome> {
try {
const { data } = await http.post<DeployRespBody>(
`/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<DeployImpact> {
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<ProcessOption[]> {
const { data } = await http.get<ProcessSelectEnvelope>('/api/process-select/options', {
params: q ? { q } : undefined,
});
const raw = data?.data?.options ?? data?.options ?? [];
if (!Array.isArray(raw)) return [];
return raw.map((o) => {
const opt = (o ?? {}) as RawOption;
const label = opt.label != null ? String(opt.label) : opt.value != null ? String(opt.value) : '';
return {
label,
value: opt.value != null ? String(opt.value) : label,
source: opt.source != null ? String(opt.source) : undefined,
id: opt.id != null && String(opt.id) !== '' ? String(opt.id) : undefined,
key: opt.key != null && String(opt.key) !== '' ? String(opt.key) : undefined,
};
});
}

19
src/api/publish.test.ts Normal file
View File

@@ -0,0 +1,19 @@
import { describe, expect, it, vi, beforeEach } from 'vitest';
import { http } from './http';
import { publishFeature } from './publish';
vi.mock('./http', () => ({ http: { get: vi.fn(), post: vi.fn() } }));
const mPost = vi.mocked(http.post);
beforeEach(() => { mPost.mockReset(); });
describe('publish api', () => {
it('publishFeature POST /api/design/publish 并解包', async () => {
mPost.mockResolvedValue({ data: { status: 0, data: { menuId: 'M1', flows: ['OA_DEMO_ADD'], deploymentPackage: { id: 'pkg-1' } } } } as never);
const r = await publishFeature({ entityId: 'E1', tableName: 'OA_DEMO', templateId: 'tpl-uuid', menuName: '演示', generateDeploymentPackage: true });
expect(mPost).toHaveBeenCalledWith('/api/design/publish', {
entityId: 'E1', tableName: 'OA_DEMO', templateId: 'tpl-uuid', menuName: '演示', generateDeploymentPackage: true,
});
expect(r.menuId).toBe('M1');
expect(r.flows).toContain('OA_DEMO_ADD');
});
});

26
src/api/publish.ts Normal file
View File

@@ -0,0 +1,26 @@
// 发布 API —— 五环终点:触发 5 条默认流 + 注册菜单 + 可选生产部署包(DECISION-2)。
// 发布恒人审:本端点只做「本环境即用 + 生产部署包生成」,生产上线仍走人工人审流程。
import { http } from './http';
export interface PublishFeatureBody {
entityId: string;
tableName: string;
templateId: string;
menuName: string;
parentMenuId?: string;
generateDeploymentPackage?: boolean;
}
export interface PublishFeatureResult {
menuId: string;
flows: string[];
deploymentPackage?: unknown;
}
interface Envelope<T> { status: number; data: T; }
/** POST /api/design/publish。 */
export async function publishFeature(body: PublishFeatureBody): Promise<PublishFeatureResult> {
const resp = await http.post<Envelope<PublishFeatureResult>>('/api/design/publish', body);
return resp.data.data;
}

31
src/api/recipe.test.ts Normal file
View File

@@ -0,0 +1,31 @@
import { describe, expect, it, vi, beforeEach } from 'vitest';
import { http } from './http';
import { compileRecipe, listRecipes } from './recipe';
vi.mock('./http', () => ({ http: { get: vi.fn(), post: vi.fn() } }));
const mGet = vi.mocked(http.get);
const mPost = vi.mocked(http.post);
beforeEach(() => { mGet.mockReset(); mPost.mockReset(); });
describe('recipe api', () => {
it('compileRecipe POST /api/design/recipe/compile 并解包', async () => {
mPost.mockResolvedValue({ data: { status: 0, data: { templateId: 'tpl-uuid', etag: 'W/"1"' } } } as never);
const r = await compileRecipe({ tableName: 'OA_DEMO', recipe: 'maintenance-crud-v1', title: '演示维护', displayField: 'TITLE' });
expect(mPost).toHaveBeenCalledWith('/api/design/recipe/compile', {
tableName: 'OA_DEMO', recipe: 'maintenance-crud-v1', title: '演示维护', displayField: 'TITLE',
});
expect(r.templateId).toBe('tpl-uuid');
expect(r.etag).toBe('W/"1"');
});
// §B.9-2:listRecipes 改静态常量(非 async、不调 /api/ai/page-recipes)。
it('listRecipes 返回 v1 固定两 recipe(静态 {id,label})', () => {
const r = listRecipes();
expect(r).toEqual([
{ id: 'maintenance-crud-v1', label: '维护型 CRUD' },
{ id: 'tree-crud-v1', label: '树形 CRUD' },
]);
// 不触网:listRecipes 是同步数组,不调 http.get
expect(mGet).not.toHaveBeenCalled();
});
});

40
src/api/recipe.ts Normal file
View File

@@ -0,0 +1,40 @@
// recipe 编译 API —— 把实体 + recipe 编译为标准页(templateId 由服务端生成)。
import { http } from './http';
export type RecipeId = 'maintenance-crud-v1' | 'tree-crud-v1';
export interface CompileRecipeBody {
tableName: string;
recipe: RecipeId;
title: string;
displayField?: string;
pageSize?: number;
}
export interface CompileRecipeResult {
templateId: string;
etag: string;
}
export interface RecipeOption {
id: string;
label: string;
}
interface Envelope<T> { status: number; data: T; }
/** POST /api/design/recipe/compile —— 服务端建蓝图→编译→校验→PageSchemaWriter.upsertStandard。 */
export async function compileRecipe(body: CompileRecipeBody): Promise<CompileRecipeResult> {
const resp = await http.post<Envelope<CompileRecipeResult>>('/api/design/recipe/compile', body);
return resp.data.data;
}
// §B.9-2:v1 固定两 recipe(YAGNI),无需调 /api/ai/page-recipes
// (其裸数组 {recipe,schemaVersion,title,...} 形状与本前端 {id,label} 契约不符)。
// recipe id 全程统一 *-v1 形(normalizePageRecipe 只接受 *-v1,见 §B.8/§B.9-1)。
export function listRecipes(): RecipeOption[] {
return [
{ id: 'maintenance-crud-v1', label: '维护型 CRUD' },
{ id: 'tree-crud-v1', label: '树形 CRUD' },
];
}

View File

@@ -61,42 +61,3 @@ export async function fetchSchema(templateId: string): Promise<Record<string, un
);
return data;
}
// ============================================================================
// F4-L1 overlay API(Node 侧 http 调用,供设计器 e2e 断言 X-Schema-Layer 用)
// ============================================================================
/** 获取 schema 并返回 layer 信息(overlay / standard) */
export async function fetchSchemaLayer(
templateId: string,
): Promise<{ schema: Record<string, unknown>; layer: string }> {
const resp = await http.get<Record<string, unknown>>(
`/api/page/schema/${encodeURIComponent(templateId)}`,
{ headers: { 'Cache-Control': 'no-cache' } },
);
const layer = (resp.headers['x-schema-layer'] ?? 'standard') as string;
return { schema: resp.data, layer };
}
/** 保存 overlay(仅管理员) */
export async function putOverlay(
templateId: string,
schemaJson: string,
): Promise<{ status: number; msg: string }> {
const resp = await http.put(
`/api/page/schema/${encodeURIComponent(templateId)}/overlay`,
schemaJson,
{ headers: { 'Content-Type': 'application/json' } },
);
return resp.data as { status: number; msg: string };
}
/** 还原标准版(删除 overlay,仅管理员) */
export async function restoreStandard(
templateId: string,
): Promise<{ status: number; msg: string }> {
const resp = await http.delete(
`/api/page/schema/${encodeURIComponent(templateId)}/overlay`,
);
return resp.data as { status: number; msg: string };
}

23
src/auth/token.test.ts Normal file
View File

@@ -0,0 +1,23 @@
import { describe, it, expect } from 'vitest';
import { isAdminProfile, type UserProfile } from './token';
const base: UserProfile = { userId: 'U1', account: 'user', name: '张三', roles: [] };
describe('isAdminProfile', () => {
it('account 为 admin 判为管理员', () => {
expect(isAdminProfile({ ...base, account: 'admin' })).toBe(true);
});
it('userId 为 ADMIN 判为管理员', () => {
expect(isAdminProfile({ ...base, userId: 'ADMIN' })).toBe(true);
});
it('普通用户(account/userId 均非管理员)判否', () => {
expect(isAdminProfile(base)).toBe(false);
});
it('null / undefined 判否', () => {
expect(isAdminProfile(null)).toBe(false);
expect(isAdminProfile(undefined)).toBe(false);
});
});

View File

@@ -74,3 +74,11 @@ export function clearSession(): void {
export function isAuthenticated(): boolean {
return !!getToken();
}
/**
* 管理员判定(收口 Topbar/ModelerPage/NewFeatureShell/AiFeatureForm/DesignCenterPage 5 处逐字硬编码,
* 总览 §10.3)。口径与历史完全一致:account==='admin' 或 userId==='ADMIN'。
*/
export function isAdminProfile(profile: UserProfile | null | undefined): boolean {
return profile?.account === 'admin' || profile?.userId === 'ADMIN';
}

View File

@@ -9,10 +9,16 @@
// 此处替换为自定义 fetcher,统一注入 Bearer(由 http 拦截器完成)并复用宿主 axios,
// 后端 /api/entity 已是 amis CRUD 格式 {status,msg,data:{items,total}},无需再适配响应。
// ============================================================================
import { useEffect, useRef } from 'react';
import { useEffect, useRef, useState } from 'react';
import { http } from '../api/http';
import { APPROVAL_COMPLETED_EVENT } from '../amis/approvalActionEvents';
import { MESSAGE_DETAIL_CHANGED_EVENT } from '../amis/messageActionEvents';
import { registerApprovalAction } from '../amis/registerApprovalAction';
import { registerMessageAction } from '../amis/registerMessageAction';
import { registerReplayAction } from '../amis/registerReplayAction';
import { normalizeUserTransferSchemaTree, registerUserTransferPicker } from '../amis/registerUserTransferPicker';
import { getProfile } from '../auth/token';
import { makeJumpTo } from './reportDownload';
interface AmisRendererProps {
schema: Record<string, unknown>;
@@ -28,9 +34,48 @@ interface AmisFetcherOptions {
config?: Record<string, unknown>;
}
function isRecord(value: unknown): value is Record<string, unknown> {
return !!value && typeof value === 'object' && !Array.isArray(value);
}
function looksLikeSchemaPayload(value: unknown, depth = 0): boolean {
if (!isRecord(value) || depth > 4) return false;
if (typeof value.type === 'string') return true;
if (
'schema' in value
|| 'schemaApi' in value
|| 'body' in value
|| 'dialog' in value
|| 'actions' in value
) {
return true;
}
return looksLikeSchemaPayload(value.data, depth + 1);
}
function normalizeFetcherResponse<T>(response: T): T {
if (!isRecord(response) || !('data' in response) || !looksLikeSchemaPayload(response.data)) {
return response;
}
const normalizedData = normalizeUserTransferSchemaTree(response.data);
if (normalizedData === response.data) return response;
return { ...response, data: normalizedData };
}
export function AmisRenderer({ schema }: AmisRendererProps) {
const rootRef = useRef<HTMLDivElement>(null);
const instanceRef = useRef<{ unmount?: () => void } | null>(null);
const [reloadSeq, setReloadSeq] = useState(0);
useEffect(() => {
const reload = () => setReloadSeq((n) => n + 1);
window.addEventListener(APPROVAL_COMPLETED_EVENT, reload);
window.addEventListener(MESSAGE_DETAIL_CHANGED_EVENT, reload);
return () => {
window.removeEventListener(APPROVAL_COMPLETED_EVENT, reload);
window.removeEventListener(MESSAGE_DETAIL_CHANGED_EVENT, reload);
};
}, []);
useEffect(() => {
if (!rootRef.current || typeof amisRequire !== 'function') return;
@@ -44,15 +89,30 @@ export function AmisRenderer({ schema }: AmisRendererProps) {
} catch {
// amis-core 未暴露 registerAction 时静默降级(onEvent 重放不可用,不阻断渲染)
}
try {
registerApprovalAction(amisRequire('amis')) || registerApprovalAction(amisRequire('amis-core'));
} catch {
// amis-core 未暴露 registerAction 时静默降级(审批抽屉入口不可用,不阻断渲染)
}
try {
registerMessageAction(amisRequire('amis'));
} catch {
// amis-core 未暴露 registerAction 时静默降级(消息详情入口不可用,不阻断渲染)
}
try {
registerUserTransferPicker(amisRequire('amis')) || registerUserTransferPicker(amisRequire('amis-core'));
} catch {
// amis-core 未暴露 registerRenderer 时静默降级,schema 会显示未知控件,测试会覆盖该问题。
}
// 自定义 fetcher:复用宿主 axios(已带 Bearer 注入 + 401 跳登录拦截)
const fetcher = (options: AmisFetcherOptions) => {
const { url, method = 'get', data, responseType } = options;
const m = method.toLowerCase();
if (m === 'get') {
return http.get(url, { responseType: responseType as never });
}
return http.request({ url, method: m as never, data, responseType: responseType as never });
const request = m === 'get'
? http.get(url, { responseType: responseType as never })
: http.request({ url, method: m as never, data, responseType: responseType as never });
return request.then(normalizeFetcherResponse);
};
// F2-9:注入当前用户 org 到 amis 数据域,供 select-tree source 中 ${orgId} 使用。
@@ -73,14 +133,17 @@ export function AmisRenderer({ schema }: AmisRendererProps) {
// currentProject 当前 profile 无此字段(会话级概念),注入空串使 ${currentProject} 求值为空而非裸 token
amisProps.currentProject = '';
const normalizedSchema = normalizeUserTransferSchemaTree(schema);
const instance = amis.embed(
rootRef.current,
schema,
normalizedSchema,
amisProps,
{
fetcher,
// 与后端 amis CRUD 约定对齐:status===0 为成功
isCancel: (e: unknown) => (http as unknown as { isCancel?: (x: unknown) => boolean }).isCancel?.(e) ?? false,
// 报表导出(actionType:url)走受控 blob 下载,按 Content-Disposition 命名,修「文件名 UUID/无扩展名」。
jumpTo: makeJumpTo(),
},
);
instanceRef.current = instance;
@@ -89,7 +152,7 @@ export function AmisRenderer({ schema }: AmisRendererProps) {
instanceRef.current?.unmount?.();
instanceRef.current = null;
};
}, [schema]);
}, [schema, reloadSeq]);
return <div ref={rootRef} style={{ height: '100%' }} />;
}

View File

@@ -9,18 +9,29 @@ 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 { delegateTask, fetchTrace, fetchApprovalMeta, submitApprovalAction } from '../api/approval';
import {
approvalHistoryBusinessDataApi,
delegateTask,
fetchApprovalHistoryMeta,
fetchApprovalMeta,
fetchTrace,
fetchTraceByBusiness,
submitApprovalAction,
} from '../api/approval';
import type { TraceNode, ApprovalMeta, ApprovalButton } from '../api/approval';
export interface ApprovalDrawerProps {
taskId: string;
taskId?: string;
taskName?: string;
processInstanceId?: string;
businessKey?: string;
businessTable?: string;
/** 业务摘要标题字段(无可渲染 schema 时的极简降级展示)。 */
businessSummary?: Record<string, unknown>;
/** 已办/历史任务查看:只展示业务单据与轨迹,不暴露办理动作。 */
readOnly?: boolean;
onClose: () => void;
/** 办理成功后回调(刷新待办列表/铃铛)。 */
onCompleted: () => void;
@@ -54,13 +65,13 @@ function buttonClass(type: string): { className: string; style?: React.CSSProper
* (含子表、引用列 id→名,对齐老审批页),4s 超时硬上限防挂死、超时退化 loadPOJO。前端无需关心 load/entity 之分。
* 返回 amis 单记录契约 {status:0,data:{...record}},表单字段(name=列名)直接绑定。
*/
function buildReadonlyForm(rawSchema: unknown, taskId: string): Record<string, unknown> | null {
function buildReadonlyForm(rawSchema: unknown, dataApi: string): Record<string, unknown> | null {
if (!rawSchema || typeof rawSchema !== 'object') return null;
const obj = rawSchema as Record<string, unknown>;
const inner = (obj.body && typeof obj.body === 'object' ? obj.body : obj) as Record<string, unknown>;
return {
type: 'service',
api: `get:/api/task/${taskId}/business-data`,
api: dataApi,
body: { ...inner, static: true, actions: [], submitText: '' },
};
}
@@ -182,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
// ---------------------------------------------------------------------------
@@ -192,6 +270,7 @@ export function ApprovalDrawer({
businessKey,
businessTable,
businessSummary,
readOnly = false,
onClose,
onCompleted,
}: ApprovalDrawerProps) {
@@ -204,29 +283,50 @@ 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;
const historyParams = {
businessKey: effectiveBusinessKey,
processInstanceId: effectiveProcessInstanceId,
businessTable: effectiveBusinessTable,
};
// 审批元数据(按钮/脚本/业务表单全来自 WfTemplate)
useEffect(() => {
let alive = true;
setMetaLoading(true);
fetchApprovalMeta(taskId)
setMeta(null);
setFormSchema(null);
setTraceNodes([]);
const loader = taskId
? fetchApprovalMeta(taskId)
: fetchApprovalHistoryMeta({ businessKey, processInstanceId, businessTable });
loader
.then((m) => alive && setMeta(m))
.catch(() => alive && setMeta(null))
.finally(() => alive && setMetaLoading(false));
return () => { alive = false; };
}, [taskId]);
}, [taskId, businessKey, processInstanceId, businessTable]);
// 流程轨迹
useEffect(() => {
if (!processInstanceId) return;
if (!effectiveProcessInstanceId && !effectiveBusinessKey) return;
let alive = true;
setTraceLoading(true);
fetchTrace(processInstanceId)
const loader = effectiveProcessInstanceId
? fetchTrace(effectiveProcessInstanceId)
: fetchTraceByBusiness(effectiveBusinessKey!);
loader
.then((n) => alive && setTraceNodes(n))
.catch(() => alive && setTraceNodes([]))
.finally(() => alive && setTraceLoading(false));
return () => { alive = false; };
}, [processInstanceId]);
}, [effectiveProcessInstanceId, effectiveBusinessKey]);
// 业务单据只读表单(统一 editform schema;数据走 /api/task/{id}/business-data 由后端载入)
useEffect(() => {
@@ -234,12 +334,15 @@ export function ApprovalDrawer({
const tpl = meta?.formTemplateId;
if (tpl) {
setFormLoading(true);
const dataApi = taskId
? `get:/api/task/${taskId}/business-data`
: approvalHistoryBusinessDataApi(historyParams);
http
.get(`/api/page/schema/${tpl}`)
.then((res) => {
if (!alive) return;
const raw = typeof res.data === 'string' ? JSON.parse(res.data) : res.data;
setFormSchema(buildReadonlyForm(raw, taskId));
setFormSchema(buildReadonlyForm(raw, dataApi));
})
.catch(() => alive && setFormSchema(null))
.finally(() => alive && setFormLoading(false));
@@ -247,22 +350,31 @@ export function ApprovalDrawer({
setFormSchema(null);
}
return () => { alive = false; };
}, [meta, taskId]);
}, [meta, taskId, effectiveBusinessKey, effectiveProcessInstanceId, effectiveBusinessTable]);
const handleAction = async (btn: ApprovalButton) => {
if (!taskId) {
toast('缺少任务ID,无法办理', 'warn');
return;
}
if (btn.type === 'agent') {
setShowDelegate(true);
return;
}
// 协办/转阅:先选多人,再提交(每人各建一条子/转阅任务)
if (btn.type === 'assist' || btn.type === 'circulated') {
setMultiUserBtn(btn);
return;
}
setSubmitting(true);
try {
await submitApprovalAction(taskId, {
actionType: btn.type,
buttonId: btn.id,
comment: comment.trim() || undefined,
businessKey,
processInstanceId,
tableName: meta?.businessTable ?? businessTable,
businessKey: effectiveBusinessKey,
processInstanceId: effectiveProcessInstanceId,
tableName: effectiveBusinessTable,
});
toast(`已${btn.label || '办理'}`);
onCompleted();
@@ -278,7 +390,7 @@ export function ApprovalDrawer({
// 显示用:友好中文名(施工方案审批)优先;无则不显裸表名,只显「业务单据」
const tableLabel = meta?.businessTableName ?? undefined;
const footer = (
const footer = readOnly ? undefined : (
<div style={{ display: 'flex', flexDirection: 'column', gap: 10, width: '100%' }}>
<textarea
data-testid="approval-comment"
@@ -322,13 +434,29 @@ export function ApprovalDrawer({
return (
<>
<Drawer
title={taskName || meta?.taskName || '审批办理'}
title={taskName || meta?.taskName || (readOnly ? '审批详情' : '审批办理')}
/* 自适应宽度:表单大时给到更宽(最宽 1080px),小屏回落(最窄 600px) */
width="clamp(600px, 58vw, 1080px)"
onClose={onClose}
foot={footer}
>
<div data-testid="approval-drawer" style={{ display: 'flex', flexDirection: 'column', gap: 16 }}>
{/* 会签(多实例)进度 */}
{meta?.cosign && (meta.cosignTotal ?? 0) > 0 && (
<div
data-testid="cosign-progress"
style={{
display: 'flex', alignItems: 'center', gap: 8, padding: '6px 12px',
background: 'var(--brand-50, #eef4ff)', border: '1px solid var(--brand-200, #c7d7fe)',
borderRadius: 'var(--radius)', fontSize: 'var(--fs-sm)', color: 'var(--text-2)',
}}
>
<span style={{ fontWeight: 600 }}>会签</span>
<span>已会签 {meta.cosignCompleted ?? 0}/{meta.cosignTotal} 人</span>
<span style={{ color: 'var(--text-3)' }}>(全部办理后流程继续)</span>
</div>
)}
{/* 业务单据(只读) */}
<section>
<div
@@ -374,11 +502,32 @@ 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>
{/* 转办弹窗 */}
{showDelegate && (
{showDelegate && taskId && (
<Drawer title="转办" width={360} onClose={() => setShowDelegate(false)}>
<DelegateForm
taskId={taskId}
@@ -387,6 +536,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,186 @@
import { useEffect, useMemo, useState } from 'react';
import type { MessageDetailRequest } from '../amis/messageActionEvents';
import { fetchNoticeDetail, openReceivedNotice, type NoticeDetail } from '../api/notice';
import { Dialog } from './ui/Dialog';
import { Icon } from './ui/Icon';
interface MessageDetailDialogProps {
request: MessageDetailRequest;
onClose: () => void;
onReadChange: () => void;
}
function fmtTime(value: number | string | null | undefined): string {
if (value === null || value === undefined || value === '') return '';
let d: Date;
if (typeof value === 'number') {
d = new Date(value < 10_000_000_000 ? value * 1000 : value);
} else {
const n = Number(value);
d = Number.isFinite(n) ? new Date(n < 10_000_000_000 ? n * 1000 : n) : new Date(value);
}
if (Number.isNaN(d.getTime())) return String(value);
const pad = (n: number) => String(n).padStart(2, '0');
return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())} `
+ `${pad(d.getHours())}:${pad(d.getMinutes())}`;
}
function stringValue(value: unknown): string {
if (value === null || value === undefined) return '';
return String(value).trim();
}
function documentLabels(value: unknown): string[] {
if (!value) return [];
if (Array.isArray(value)) {
return value.map((item, index) => {
if (item && typeof item === 'object') {
const record = item as Record<string, unknown>;
return stringValue(record.name)
|| stringValue(record.fileName)
|| stringValue(record.filename)
|| stringValue(record.originalName)
|| stringValue(record.title)
|| `附件 ${index + 1}`;
}
return stringValue(item) || `附件 ${index + 1}`;
});
}
if (typeof value === 'string') {
return value.trim() ? [value.trim()] : [];
}
return ['有附件'];
}
function Field({ label, value }: { label: string; value: unknown }) {
return (
<div style={{ display: 'grid', gridTemplateColumns: '88px minmax(0, 1fr)', gap: 12, alignItems: 'start' }}>
<div style={{ color: 'var(--text-2)' }}>{label}</div>
<div style={{ minWidth: 0, wordBreak: 'break-word' }}>{stringValue(value) || '-'}</div>
</div>
);
}
export function MessageDetailDialog({ request, onClose, onReadChange }: MessageDetailDialogProps) {
const [detail, setDetail] = useState<NoticeDetail | null>(null);
const [loading, setLoading] = useState(true);
const [error, setError] = useState('');
useEffect(() => {
let alive = true;
setLoading(true);
setError('');
setDetail(null);
const run = request.kind === 'received'
? openReceivedNotice(request.receiveId ?? '')
: fetchNoticeDetail(request.messageId ?? '');
run
.then((data) => {
if (!alive) return;
setDetail(data);
if (request.kind === 'received') {
onReadChange();
}
})
.catch((err: unknown) => {
if (!alive) return;
const message = (err as { response?: { data?: { message?: string } } }).response?.data?.message;
setError(message || '消息详情加载失败');
})
.finally(() => {
if (alive) setLoading(false);
});
return () => {
alive = false;
};
}, [request, onReadChange]);
const attachments = useMemo(() => documentLabels(detail?.document), [detail?.document]);
const title = detail?.title || request.title || '查看';
return (
<Dialog
title="查看"
width={720}
onClose={onClose}
foot={<button className="btn btn-pri" onClick={onClose}>关闭</button>}
>
{loading ? (
<div className="empty">加载中…</div>
) : error ? (
<div className="empty" style={{ color: 'var(--err)' }}>{error}</div>
) : detail ? (
<div style={{ display: 'flex', flexDirection: 'column', gap: 14, fontSize: 'var(--fs)' }}>
<div style={{
display: 'flex',
gap: 10,
alignItems: 'flex-start',
paddingBottom: 12,
borderBottom: '1px solid var(--line)',
}}
>
<Icon name="doc" size={18} style={{ color: 'var(--brand)', marginTop: 2 }} />
<div style={{ minWidth: 0 }}>
<div style={{ fontSize: 'var(--fs-lg)', fontWeight: 600, wordBreak: 'break-word' }}>
{title}
</div>
<div style={{ color: 'var(--text-3)', marginTop: 4 }}>
{request.kind === 'sent' ? '已发送消息' : '收到的消息'}
</div>
</div>
</div>
<div style={{
display: 'grid',
gridTemplateColumns: '1fr 1fr',
gap: '10px 24px',
}}
>
<Field label="发送人" value={detail.sender} />
<Field label="发送时间" value={fmtTime(detail.createTime)} />
<Field label="消息类型" value={detail.type} />
<Field label="接收人" value={detail.receivers} />
</div>
<div>
<div style={{ color: 'var(--text-2)', marginBottom: 6 }}>内容</div>
<div style={{
minHeight: 180,
maxHeight: 280,
overflow: 'auto',
border: '1px solid var(--line)',
borderRadius: 6,
padding: 12,
lineHeight: 1.7,
whiteSpace: 'pre-wrap',
wordBreak: 'break-word',
background: 'var(--surface-2)',
}}
>
{stringValue(detail.content) || '-'}
</div>
</div>
<div>
<div style={{ color: 'var(--text-2)', marginBottom: 6 }}>附件</div>
{attachments.length ? (
<div style={{ display: 'flex', flexDirection: 'column', gap: 6 }}>
{attachments.map((item) => (
<div key={item} style={{ display: 'flex', gap: 8, alignItems: 'center' }}>
<Icon name="doc" size={14} style={{ color: 'var(--text-3)' }} />
<span>{item}</span>
</div>
))}
</div>
) : (
<div style={{ color: 'var(--text-3)' }}>无附件</div>
)}
</div>
</div>
) : null}
</Dialog>
);
}

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 无对应图形,忽略 */
}
}

View File

@@ -0,0 +1,41 @@
import { describe, expect, it } from 'vitest';
import { filenameFromContentDisposition, isReportDownloadUrl } from './reportDownload';
describe('filenameFromContentDisposition', () => {
it('优先取 filename* 的 UTF-8 中文报表名(而非前面的 UUID 兜底)', () => {
// 后端真实响应头形态:ASCII filename 是 UUID 兜底,filename* 才是真实报表名
const cd =
'attachment; filename="0a47a300-f544-42fd-b523-f4ac9672e27b.xls"; '
+ "filename*=UTF-8''%E5%8A%9E%E5%85%AC%E7%94%A8%E5%93%81%E9%87%87%E8%B4%AD%E7%94%B3%E8%AF%B7%E5%8D%95.xls";
expect(filenameFromContentDisposition(cd)).toBe('办公用品采购申请单.xls');
});
it('无 filename* 时回退普通 filename', () => {
expect(filenameFromContentDisposition('attachment; filename="report.pdf"')).toBe('report.pdf');
});
it('filename* 中的 + 还原为空格', () => {
expect(filenameFromContentDisposition("attachment; filename*=UTF-8''a+b.xls")).toBe('a b.xls');
});
it('空/缺失返回空串', () => {
expect(filenameFromContentDisposition(undefined)).toBe('');
expect(filenameFromContentDisposition(null)).toBe('');
expect(filenameFromContentDisposition('')).toBe('');
});
});
describe('isReportDownloadUrl', () => {
it('匹配 report render 的 pdf/xls 导出 URL', () => {
expect(isReportDownloadUrl('/api/report/render/abc?format=pdf')).toBe(true);
expect(isReportDownloadUrl('/api/report/render/abc?format=xls&OA_X_ID=1')).toBe(true);
expect(isReportDownloadUrl('/api/report/render/abc?format=xlsx')).toBe(true);
});
it('不匹配 html(iframe 查看) 或非报表 URL', () => {
expect(isReportDownloadUrl('/api/report/render/abc?format=html')).toBe(false);
expect(isReportDownloadUrl('/api/report/frame/abc')).toBe(false);
expect(isReportDownloadUrl('/page/abc')).toBe(false);
});
});

View File

@@ -0,0 +1,90 @@
// ============================================================================
// 报表导出下载 —— 受控 blob 下载,按 Content-Disposition 正确命名
// ----------------------------------------------------------------------------
// 背景:报表导出按钮是 amis actionType:url(默认 window.open)。部分浏览器在
// window.open 一个 attachment 响应时会丢失 Content-Disposition 文件名,退化成
// blob/路径命名(UUID、无扩展名,双击打不开)。这里把报表导出 URL 拦下来,显式
// fetch 成 blob 并用 <a download="<CD文件名>"> 落盘,文件名/扩展名在所有浏览器都正确。
// ============================================================================
import { http } from '../api/http';
/**
* 解析 Content-Disposition 文件名。**优先 {@code filename*=UTF-8''…}**(RFC 5987,含中文报表名,
* URL 解码);否则回退普通 {@code filename="…"}(常是 UUID/ASCII 兜底)。
* 注意:CD 形如 {@code attachment; filename="UUID.xls"; filename*=UTF-8''办公用品采购申请单.xls},
* 必须先取 filename*,否则会取到前面的 UUID。
*/
export function filenameFromContentDisposition(cd: string | undefined | null): string {
if (!cd) return '';
// 1) 优先 filename*(UTF-8 编码的真实报表名)
const star = /filename\*=(?:UTF-8'')?([^;\n]*)/i.exec(cd);
if (star && star[1]) {
let f = star[1].trim().replace(/['"]/g, '');
try {
f = decodeURIComponent(f);
} catch {
/* 解码失败保留原值 */
}
return f.replace(/\+/g, ' ');
}
// 2) 回退普通 filename="…"(不匹配 filename*=,因其含 '*')
const plain = /filename=("?)([^";\n]*)\1/i.exec(cd);
let f = plain && plain[2] ? plain[2].trim() : '';
if (f && f.replace(/[^%]/g, '').length > 2) {
try {
f = decodeURIComponent(f);
} catch {
/* 保留原值 */
}
f = f.replace(/\+/g, ' ');
}
return f;
}
/** 报表导出下载 URL(format=pdf/xls/…)——应作为带正确文件名的附件落盘,而非 window.open。 */
export function isReportDownloadUrl(to: string): boolean {
return /\/api\/report\/render\//.test(to) && /[?&]format=(pdf|xls|xlsx|excel)(\b|&|$)/i.test(to);
}
/**
* 以 blob 拉取报表导出并按 Content-Disposition 文件名落盘({@code <a download>})。
* 显式取 CD 文件名并用 download 属性强制命名,规避 window.open 在部分浏览器丢失文件名的问题。
*/
export async function downloadReportFile(to: string): Promise<void> {
const resp = (await http.get(to, { responseType: 'blob' as never })) as {
headers?: Record<string, string>;
data?: unknown;
};
const headers = resp.headers ?? {};
const filename = filenameFromContentDisposition(headers['content-disposition']) || 'report';
const blob = resp.data instanceof Blob ? resp.data : new Blob([resp.data as BlobPart]);
const objectUrl = URL.createObjectURL(blob);
const a = document.createElement('a');
a.href = objectUrl;
a.download = filename;
document.body.appendChild(a);
a.click();
a.remove();
setTimeout(() => URL.revokeObjectURL(objectUrl), 1000);
}
/** 自定义 jumpTo:报表导出 URL 走受控 blob 下载(文件名正确),其余沿用 amis 默认跳转语义。 */
export function makeJumpTo() {
return (to: string, action?: { actionType?: string; blank?: boolean }) => {
if (to && isReportDownloadUrl(to)) {
void downloadReportFile(to);
return;
}
if (to === 'goBack') {
window.history.back();
return;
}
if (action && action.actionType === 'url') {
if (action.blank === false) window.location.href = to;
else window.open(to);
return;
}
if (/^https?:\/\//.test(to)) window.location.replace(to);
else window.location.href = to;
};
}

View File

@@ -1,14 +1,25 @@
// F4-L1 设计器独立入口(editor.html 多页应用)
// 与主应用 React 实例完全隔离,amis 用 npm 包版,不依赖 sdk-local
import React from 'react';
//
// ⚠️ 不能包 <React.StrictMode>:amis-editor 用 mobx-state-tree 维护 EditorRoot store,
// StrictMode 在 dev 下故意 mount→unmount→remount,会销毁第一个 EditorRoot,而其 pending
// 异步(markReady / calculateHighlightBox)随后打到已死实例 → 抛
// 「[mobx-state-tree] object no longer part of a state tree」→ 编辑器整片空白。
// 主应用 main.tsx 跑 amis SDK(运行时渲染器,容忍 StrictMode),唯独 amis-editor 不行。
//
// CSS 由此处 import 引入(不再用 editor.html 的 /node_modules 绝对 link):
// vite dev 直接转译、vite build 由 rollup 收集进 dist 的 css 产物,
// 修掉「dist/editor.html 三条 /node_modules link 在 preview/静态托管下 404」。
// 注:amis-ui/amis-editor-core 的 package.json exports 字段不暴露这些 css 子路径,
// 用裸包名 import 会被 rollup 拒绝解析(同 vite.config 注释里 amis 栈无 exports 之坑),
// 故以相对 node_modules 路径直引这三个真实 css 文件,绕开包解析。
import '../../node_modules/amis-editor-core/lib/style.css';
import '../../node_modules/amis-ui/lib/themes/default.css';
import '../../node_modules/amis-ui/lib/helper.css';
import { createRoot } from 'react-dom/client';
import { DesignerPage } from './DesignerPage';
const root = document.getElementById('editor-root');
if (root) {
createRoot(root).render(
<React.StrictMode>
<DesignerPage />
</React.StrictMode>,
);
createRoot(root).render(<DesignerPage />);
}

View File

@@ -0,0 +1,629 @@
import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
import { render, screen, fireEvent, act, waitFor } from '@testing-library/react';
import { SYNTHETIC_BPMN } from './moddle/fixtures/synthetic-full-surface.bpmn';
import {
parseCandidateExpression,
buildCandidateExpression,
type UserPropertyItem,
} from './candidateExpression';
// formKey 下拉数据源:mock,其中一个 id 对齐 fixture 的 formKey 值;第三项 name===id(未命名)。
vi.mock('../api/processModeler', () => ({
fetchWfTemplates: vi.fn(() =>
Promise.resolve({
templates: [
{ 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 { fetchWfTemplates } from '../api/processModeler';
const mWfTemplates = vi.mocked(fetchWfTemplates);
// ── 真实办理人形态锚定(同 candidateExpression.test.ts:抽 fixture,做 XML 实体解码) ────
function xmlDecode(s: string): string {
return s.replace(/&quot;/g, '"').replace(/&lt;/g, '<').replace(/&gt;/g, '>').replace(/&amp;/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 selHandler: ((e: unknown) => void) | null = null;
let cmdHandler: (() => 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') selHandler = cb;
if (ev === 'commandStack.changed') cmdHandler = cb as () => void;
});
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 () => {
selHandler?.({ newSelection: element ? [element] : [] });
await Promise.resolve();
await Promise.resolve();
});
// 模拟外部 undo/redo:commandStack.changed。
const fireCommandStack = () =>
act(async () => {
cmdHandler?.();
await Promise.resolve();
});
return { modeler, updateProperties, moddle, created, select, fireCommandStack };
}
/** 全项目 window.confirm 默认放行(具体测试可再 spy 覆盖);afterEach 复原。 */
let confirmSpy: ReturnType<typeof vi.spyOn>;
beforeEach(() => {
confirmSpy = vi.spyOn(window, 'confirm').mockReturnValue(true);
});
afterEach(() => {
confirmSpy.mockRestore();
});
/** 一个内容非空、meta 为空的合法办理人表达式(清空时不触发 confirm)。 */
function candidateNoMeta(content = 'u1'): string {
const item: UserPropertyItem = {
type: 'user',
content,
isCandidate: true,
isSendMail: false,
isSendPhone: false,
};
return buildCandidateExpression([item], 'candidate', {});
}
/** 造一个 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('清空最后一行(meta 为空):无 confirm,直接写回 undefined', async () => {
const { modeler, updateProperties, select } = makeModeler();
render(<Eip4Panel modeler={modeler} />);
await select(userTask({ 'activiti:candidateUsers': candidateNoMeta() }));
fireEvent.click(screen.getByTestId('eip4-candidate-remove-0'));
expect(confirmSpy).not.toHaveBeenCalled();
expect(lastPayload(updateProperties)['activiti:candidateUsers']).toBeUndefined();
expect('activiti:candidateUsers' in lastPayload(updateProperties)).toBe(true);
});
it('I-3 清空含非空业务 meta:confirm=确认 → 写回 undefined', async () => {
const { modeler, updateProperties, select } = makeModeler();
confirmSpy.mockReturnValue(true);
render(<Eip4Panel modeler={modeler} />);
await select(userTask({ 'activiti:candidateUsers': REAL_CANDIDATE }));
fireEvent.click(screen.getByTestId('eip4-candidate-remove-0'));
expect(confirmSpy).toHaveBeenCalledTimes(1);
expect(String(confirmSpy.mock.calls[0][0])).toContain('PM_CONTRACTUALREGISTER_UPDATEPROJECTSTATUS');
expect(lastPayload(updateProperties)['activiti:candidateUsers']).toBeUndefined();
});
it('I-3 清空含非空业务 meta:confirm=取消 → 不写回、行仍在', async () => {
const { modeler, updateProperties, select } = makeModeler();
confirmSpy.mockReturnValue(false);
render(<Eip4Panel modeler={modeler} />);
await select(userTask({ 'activiti:candidateUsers': REAL_CANDIDATE }));
fireEvent.click(screen.getByTestId('eip4-candidate-remove-0'));
expect(confirmSpy).toHaveBeenCalledTimes(1);
expect(updateProperties).not.toHaveBeenCalled(); // 引擎未变
expect(screen.getByTestId('eip4-candidate-content-0')).toBeInTheDocument(); // 行未删
});
it('I-3 非空业务 meta 顶部只读徽标显示任务后置服务', async () => {
const { modeler, select } = makeModeler();
render(<Eip4Panel modeler={modeler} />);
await select(userTask({ 'activiti:candidateUsers': REAL_CANDIDATE }));
const badge = screen.getByTestId('eip4-candidate-meta-badge');
expect(badge.textContent).toContain('PM_CONTRACTUALREGISTER_UPDATEPROJECTSTATUS');
});
it('顺手:非标准办理人表达式显示「编辑将覆盖」警示', async () => {
const { modeler, select } = makeModeler();
render(<Eip4Panel modeler={modeler} />);
await select(userTask({ 'activiti:candidateUsers': '${someOtherExpr(execution)}' }));
expect(screen.getByTestId('eip4-candidate-nonstandard')).toBeInTheDocument();
});
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}' });
});
// codec build 对叶子值应用引擎 stringToJson 转义(' → ‘、" → “),防用户输入含撇号/双引号
// 截断外层 JUEL 单引号字面量或内层 JSON。侧板消费 codec 即受保护——断言写回载荷的内容段
// (剥离 JUEL 前后缀定界引号后)无裸 ASCII 撇号、有全角‘。
it("content 含撇号 O'Brien:写回载荷转义为‘、内容段无裸单引号(防截断 JUEL 字面量)", async () => {
const { modeler, updateProperties, select } = makeModeler();
render(<Eip4Panel modeler={modeler} />);
await select(userTask({ 'activiti:candidateUsers': REAL_CANDIDATE }));
fireEvent.change(screen.getByTestId('eip4-candidate-content-0'), {
target: { value: "O'Brien" },
});
const written = lastPayload(updateProperties)['activiti:candidateUsers'] as string;
const PREFIX = "${candidateUsersHandler.getCandidateUsers(execution,'";
const SUFFIX = "')}";
const content = written.slice(PREFIX.length, written.length - SUFFIX.length);
expect(content).toContain('O‘Brien'); // U+2018 全角撇号
expect(content.includes("'")).toBe(false); // 内容段完全无裸 ASCII 单引号
});
});
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}',
);
});
// ── I-1 会签保真:读回并原样保留 isSequential / elementVariable / 非预设完成条件 ──────
// 真实库存在 isSequential=true、elementVariable=assign、完成条件 >0.6 等形态;强写会静默改坏。
function cosignLoop() {
return moddleEl('bpmn:MultiInstanceLoopCharacteristics', {
isSequential: true,
'activiti:collection': extractAttr('activiti:collection'),
'activiti:elementVariable': 'assign',
completionCondition: { body: '${nrOfCompletedInstances/nrOfInstances>0.6}' },
});
}
it('I-1 串行会签往返保 isSequential=true(不被强写 false)', async () => {
const { modeler, updateProperties, select } = makeModeler();
render(<Eip4Panel modeler={modeler} />);
await select(userTask({ loopCharacteristics: cosignLoop() }));
expect((screen.getByTestId('eip4-cosign-sequential') as HTMLInputElement).checked).toBe(true);
// 触发一次写(编辑会签人员 content),断言 isSequential 保留 true
fireEvent.change(screen.getByTestId('eip4-cosign-content-0'), { target: { value: 'x' } });
const loop = lastPayload(updateProperties).loopCharacteristics as Record<string, unknown>;
expect(loop.isSequential).toBe(true);
});
it('I-1 elementVariable=assign 往返保 assign(不被强写 assignee)', async () => {
const { modeler, updateProperties, select } = makeModeler();
render(<Eip4Panel modeler={modeler} />);
await select(userTask({ loopCharacteristics: cosignLoop() }));
expect((screen.getByTestId('eip4-cosign-element-variable') as HTMLInputElement).value).toBe('assign');
fireEvent.change(screen.getByTestId('eip4-cosign-content-0'), { target: { value: 'x' } });
const loop = lastPayload(updateProperties).loopCharacteristics as Record<string, unknown>;
expect(loop['activiti:elementVariable']).toBe('assign');
});
it('I-1 非预设完成条件 >0.6 不被归一为全票(自定义态保留原 body)', async () => {
const { modeler, updateProperties, select } = makeModeler();
render(<Eip4Panel modeler={modeler} />);
await select(userTask({ loopCharacteristics: cosignLoop() }));
// 下拉显「自定义(保留)」+ 原 body 展示
expect(screen.getByText(/自定义(保留)/)).toBeInTheDocument();
expect(screen.getByTestId('eip4-cosign-completion-custom').textContent).toContain(
'${nrOfCompletedInstances/nrOfInstances>0.6}',
);
fireEvent.change(screen.getByTestId('eip4-cosign-content-0'), { target: { value: 'x' } });
const loop = lastPayload(updateProperties).loopCharacteristics as Record<string, unknown>;
expect((loop.completionCondition as { body: string }).body).toBe(
'${nrOfCompletedInstances/nrOfInstances>0.6}',
);
});
it('I-1 缺 elementVariable 的会签:写回省略该属性(不凭空写空)', async () => {
const { modeler, updateProperties, select } = makeModeler();
const loop = moddleEl('bpmn:MultiInstanceLoopCharacteristics', {
isSequential: false,
'activiti:collection': extractAttr('activiti:collection'),
// 无 activiti:elementVariable、无 completionCondition
});
render(<Eip4Panel modeler={modeler} />);
await select(userTask({ loopCharacteristics: loop }));
fireEvent.change(screen.getByTestId('eip4-cosign-content-0'), { target: { value: 'x' } });
const written = lastPayload(updateProperties).loopCharacteristics as Record<string, unknown>;
expect('activiti:elementVariable' in written).toBe(false); // 缺省态不写
expect('completionCondition' in written).toBe(false); // 原本无完成条件不发出
});
});
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();
});
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();
});
it('过滤掉当前值后 select 仍保留该值(占位「(当前)」防丢值)', async () => {
const { modeler, select } = makeModeler();
render(<Eip4Panel modeler={modeler} />);
await select(userTask({ 'activiti:formKey': 'aaaa-bbbb' })); // 当前值=另一个表单
const sel = (await screen.findByTestId('eip4-formkey-select')) as HTMLSelectElement;
await waitFor(() => expect(sel.querySelectorAll('option').length).toBeGreaterThan(3));
// 过滤到「合同」→ aaaa-bbbb(另一个表单)被过滤掉
fireEvent.change(screen.getByTestId('eip4-formkey-filter'), { target: { value: '合同' } });
expect(sel.value).toBe('aaaa-bbbb'); // 值未丢
const cur = Array.from(sel.querySelectorAll('option')).find(
(o) => (o as HTMLOptionElement).value === 'aaaa-bbbb',
);
expect(cur).toBeTruthy();
expect(cur!.textContent).toContain('(当前)');
});
});
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();
});
it('顺手:无 activiti:/flowable: 前缀的新键被拒(不写回)', async () => {
const { modeler, updateProperties, select } = makeModeler();
render(<Eip4Panel modeler={modeler} />);
await select(userTask());
fireEvent.change(screen.getByTestId('eip4-extattr-new-key'), { target: { value: 'foo' } });
fireEvent.change(screen.getByTestId('eip4-extattr-new-value'), { target: { value: 'v' } });
fireEvent.click(screen.getByTestId('eip4-extattr-add'));
expect(updateProperties).not.toHaveBeenCalled();
});
it('顺手:拉黑有专用控件的键(activiti:formKey)不允许从扩展属性写', async () => {
const { modeler, updateProperties, select } = makeModeler();
render(<Eip4Panel modeler={modeler} />);
await select(userTask());
fireEvent.change(screen.getByTestId('eip4-extattr-new-key'), {
target: { value: 'activiti:formKey' },
});
fireEvent.change(screen.getByTestId('eip4-extattr-new-value'), { target: { value: 'x' } });
fireEvent.click(screen.getByTestId('eip4-extattr-add'));
expect(updateProperties).not.toHaveBeenCalled();
});
});
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);
});
});
describe('Eip4Panel — 切换节点 / undo-redo 重灌(评审 I-2 + 顺手)', () => {
it('I-2 A(meta X)→B(meta Y)→编辑 B→写回 meta===Y 且 ≠X', async () => {
const { modeler, updateProperties, select } = makeModeler();
const item = (c: string): UserPropertyItem => ({
type: 'user',
content: c,
isCandidate: true,
isSendMail: false,
isSendPhone: false,
isSendMessage: false,
});
const exprA = buildCandidateExpression([item('a')], 'candidate', { taskSuccessService: 'SVC_X' });
const exprB = buildCandidateExpression([item('b')], 'candidate', { taskSuccessService: 'SVC_Y' });
render(<Eip4Panel modeler={modeler} />);
await select(userTask({ __id: 'A', 'activiti:candidateUsers': exprA }));
await select(userTask({ __id: 'B', 'activiti:candidateUsers': exprB }));
// 编辑 B 的 content
fireEvent.change(screen.getByTestId('eip4-candidate-content-0'), { target: { value: 'b2' } });
const written = lastPayload(updateProperties)['activiti:candidateUsers'] as string;
const meta = parseCandidateExpression(written)!.meta;
expect(meta.taskSuccessService).toBe('SVC_Y'); // 用 B 的 meta
expect(meta.taskSuccessService).not.toBe('SVC_X'); // 不串到 A 的 meta
});
it('顺手:commandStack.changed(外部 undo)对当前选中重灌本地态', async () => {
const { modeler, select, fireCommandStack } = makeModeler();
const item = (c: string): UserPropertyItem => ({
type: 'user',
content: c,
isCandidate: true,
isSendMail: false,
isSendPhone: false,
isSendMessage: false,
});
// 可变 map:模拟外部 undo 改写 businessObject。
const map: Record<string, unknown> = {
'activiti:candidateUsers': buildCandidateExpression([item('X')], 'candidate', {}),
};
const el = {
id: 't1',
type: 'bpmn:UserTask',
businessObject: { $type: 'bpmn:UserTask', get: (n: string) => map[n] },
};
render(<Eip4Panel modeler={modeler} />);
await select(el);
expect((screen.getByTestId('eip4-candidate-content-0') as HTMLInputElement).value).toBe('X');
// 外部 undo 改了 businessObject → commandStack.changed → 重灌
map['activiti:candidateUsers'] = buildCandidateExpression([item('Y')], 'candidate', {});
await fireCommandStack();
expect((screen.getByTestId('eip4-candidate-content-0') as HTMLInputElement).value).toBe('Y');
});
});

805
src/modeler/Eip4Panel.tsx Normal file
View File

@@ -0,0 +1,805 @@
// EIP4 定制侧板:选中 userTask 时叠加办理人/会签/formKey/扩展属性/任务监听器五控件。
//
// 设计要点(计划 T2.4 + §0.5 P5 + 评审收口):
// - 全部写操作经 bpmn-js `modeling.updateProperties(element,{...})`,undo/redo 天然生效。
// - 办理人/会签共用 items 编辑器(ItemsEditor),表达式编解码走 candidateExpression codec。
// - 🔴 meta 透传硬要求:codec parse 出的外层业务字段(taskSuccessService 等)存入 state,
// 写回时原样带回 build,否则重新部署会打掉已部署流程的任务后置服务钩子。顶部只读徽标显示,
// 删光 items 时 confirm 确认才写 undefined(评审 I-3)。
// - 🔴 会签保真(评审 I-1):isSequential/elementVariable/completionCondition 原始值读进 state、
// 写回用读到的值(真实库有 isSequential=true / elementVariable=assign / 完成条件 >0.6 等
// 非预设形态,强写会静默改坏派任);完成条件 body 不匹配预设时置「自定义(保留)」态,
// 仅用户主动选预设才改写。
// - 扩展属性只列长尾 $attrs;新增强制 activiti:/flowable: 前缀并拉黑有专用控件的键。
// - taskListener 重建时原样保留其 field 子元素(moddle 元素引用不动)。
// - undo/redo:订阅 commandStack.changed,非自身写入时对当前选中重灌本地态。
import { useEffect, useRef, useState } from 'react';
import {
buildCandidateExpression,
parseCandidateExpression,
type CandidateVariant,
type UserPropertyItem,
} from './candidateExpression';
import { fetchWfTemplates, type WfTemplateOption } from '../api/processModeler';
import { toast } from '../components/ui';
import type { BpmnElement, SelectionModeler } from './useSelectedElement';
import { useSelectedElement } from './useSelectedElement';
// ── bpmn-js 服务契约(最小) ───────────────────────────────────────────────────
interface Modeling {
updateProperties(element: BpmnElement, props: Record<string, unknown>): void;
}
interface Moddle {
create(type: string, props?: Record<string, unknown>): Record<string, unknown>;
}
export interface PanelModeler extends SelectionModeler {
get(service: string): unknown;
}
// ── 办理人 type 取值(§0 实测 10 种)+ 中文标签 ────────────────────────────────
const CANDIDATE_TYPES: Array<{ value: string; label: string }> = [
{ value: 'user', label: '指定人员' },
{ value: 'depart', label: '指定部门' },
{ value: 'position', label: '指定岗位' },
{ value: 'formSpecifiedDimension', label: '表单指定维度' },
{ value: 'initiator', label: '流程发起人' },
{ value: 'sameToTask', label: '同某任务办理人' },
{ value: 'beforeTaskLeader', label: '上一办理人领导' },
{ value: 'beforeTaskDepartManager', label: '上一办理人部门经理' },
{ value: 'scriptUser', label: '脚本/表达式' },
{ value: 'projectRoleType', label: '项目角色' },
];
const LISTENER_EVENTS = ['create', 'assignment', 'complete', 'all'];
// 有专用控件的属性,禁止再从「扩展属性」兜底编辑器写入(去重、防冲突)。
const RESERVED_EXT_LOCALNAMES = new Set(['candidateUsers', 'formKey', 'collection', 'elementVariable']);
// ── 会签完成条件预设 ─────────────────────────────────────────────────────────
type CompletionType = 'all' | 'majority' | 'count' | 'custom';
const COMPLETION_ALL = '${nrOfCompletedInstances/nrOfInstances==1}';
const COMPLETION_MAJORITY = '${nrOfCompletedInstances/nrOfInstances>0.5}';
function completionBodyFor(s: CosignState): string {
if (s.completionType === 'majority') return COMPLETION_MAJORITY;
if (s.completionType === 'count') return '${nrOfCompletedInstances>=' + s.completionN + '}';
if (s.completionType === 'custom') return s.completionCustomBody;
return COMPLETION_ALL;
}
// 精确匹配预设串(不用子串,否则 >0.55 会误判为过半);非预设/无 body → 自定义(保留)。
function parseCompletion(body: string | undefined): {
type: CompletionType;
n: number;
custom: string;
} {
if (body === COMPLETION_ALL) return { type: 'all', n: 2, custom: '' };
if (body === COMPLETION_MAJORITY) return { type: 'majority', n: 2, custom: '' };
const m = body ? body.match(/^\$\{nrOfCompletedInstances>=(\d+)\}$/) : null;
if (m) return { type: 'count', n: Number(m[1]), custom: '' };
return { type: 'custom', n: 2, custom: body ?? '' };
}
// ── moddle 读值(兼容 .get(name) 与直读属性) ──────────────────────────────────
function mget(obj: unknown, name: string): unknown {
if (!obj || typeof obj !== 'object') return undefined;
const o = obj as Record<string, unknown> & { get?: (n: string) => unknown };
if (typeof o.get === 'function') return o.get(name);
return o[name];
}
// 非空业务 meta → 只读徽标/确认文案(用于「删光办理人会一并移除 X」)。
function notableMeta(meta: Record<string, unknown>): string[] {
const out: string[] = [];
if (typeof meta.taskSuccessService === 'string' && meta.taskSuccessService)
out.push('任务后置服务:' + meta.taskSuccessService);
if (typeof meta.messageTemplate === 'string' && meta.messageTemplate) out.push('消息模板');
if (meta.isSkipInitiator === true) out.push('跳过发起人');
if (meta.isNoUserSkip === true) out.push('无办理人自动跳过');
if (meta.isSkipBeforeTask === true) out.push('跳过前置任务办理人');
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 {
return {
type: 'user',
content: '',
isCandidate: true,
isSendMail: false,
isSendPhone: false,
isSendMessage: false,
};
}
interface ListenerRow {
event: string;
mode: 'class' | 'delegateExpression';
value: string;
/** 原监听器的 field 子元素数组(编辑时原样保留,引用不动)。 */
fields?: unknown[];
}
interface CosignState {
enabled: boolean;
items: UserPropertyItem[];
/** 保真:串行/并行,读回原值(真实库有 isSequential=true)。 */
isSequential: boolean;
/** 保真:循环变量名,读回原值(真实库有 assign/loop_assign/缺省);为空则写回时省略该属性。 */
elementVariable: string;
completionType: CompletionType;
completionN: number;
/** completionType==='custom' 时保留的原始 body;'' 表示原本无 completionCondition。 */
completionCustomBody: string;
}
const FRESH_COSIGN: CosignState = {
enabled: false,
items: [],
isSequential: false,
elementVariable: 'assignee',
completionType: 'all',
completionN: 2,
completionCustomBody: '',
};
// ── items 编辑器(办理人 / 会签人员复用) ──────────────────────────────────────
function ItemsEditor({
idPrefix,
items,
onChange,
}: {
idPrefix: string;
items: UserPropertyItem[];
onChange: (next: UserPropertyItem[]) => void;
}) {
const patch = (i: number, p: Partial<UserPropertyItem>) =>
onChange(items.map((it, idx) => (idx === i ? { ...it, ...p } : it)));
const remove = (i: number) => onChange(items.filter((_, idx) => idx !== i));
const add = () => onChange([...items, newCandidateItem()]);
return (
<div style={{ display: 'flex', flexDirection: 'column', gap: 6 }}>
{items.map((it, i) => (
<div
key={i}
style={{
border: '1px solid var(--line)',
borderRadius: 4,
padding: 6,
display: 'flex',
flexDirection: 'column',
gap: 4,
}}
>
<div style={{ display: 'flex', gap: 4 }}>
<select
data-testid={`${idPrefix}-type-${i}`}
value={it.type}
onChange={(e) => patch(i, { type: e.target.value })}
style={{ flex: '0 0 120px' }}
>
{CANDIDATE_TYPES.map((t) => (
<option key={t.value} value={t.value}>
{t.label}
</option>
))}
</select>
<input
data-testid={`${idPrefix}-content-${i}`}
value={it.content}
placeholder="人员/部门/岗位 id 或表达式"
onChange={(e) => patch(i, { content: e.target.value })}
style={{ flex: 1, minWidth: 0 }}
/>
<button
className="btn btn-sm"
data-testid={`${idPrefix}-remove-${i}`}
onClick={() => remove(i)}
title="删除该行"
>
删
</button>
</div>
<div style={{ display: 'flex', gap: 10, flexWrap: 'wrap', fontSize: 12 }}>
<label>
<input
type="checkbox"
data-testid={`${idPrefix}-iscandidate-${i}`}
checked={!!it.isCandidate}
onChange={(e) => patch(i, { isCandidate: e.target.checked })}
/>{' '}
候选
</label>
<label>
<input
type="checkbox"
data-testid={`${idPrefix}-mail-${i}`}
checked={!!it.isSendMail}
onChange={(e) => patch(i, { isSendMail: e.target.checked })}
/>{' '}
邮件
</label>
<label>
<input
type="checkbox"
data-testid={`${idPrefix}-phone-${i}`}
checked={!!it.isSendPhone}
onChange={(e) => patch(i, { isSendPhone: e.target.checked })}
/>{' '}
短信
</label>
<label>
<input
type="checkbox"
data-testid={`${idPrefix}-msg-${i}`}
checked={!!it.isSendMessage}
onChange={(e) => patch(i, { isSendMessage: e.target.checked })}
/>{' '}
站内
</label>
</div>
</div>
))}
<button className="btn btn-sm" data-testid={`${idPrefix}-add`} onClick={add}>
+ 添加办理人
</button>
</div>
);
}
function Section({ title, children }: { title: string; children: React.ReactNode }) {
return (
<div style={{ borderBottom: '1px solid var(--line)', padding: '10px 12px' }}>
<div style={{ fontWeight: 600, fontSize: 13, marginBottom: 8 }}>{title}</div>
{children}
</div>
);
}
export function Eip4Panel({ modeler }: { modeler: PanelModeler | null }) {
const element = useSelectedElement(modeler);
const modeling = modeler ? (modeler.get('modeling') as Modeling | undefined) : undefined;
const moddle = modeler ? (modeler.get('moddle') as Moddle | undefined) : undefined;
const isUserTask = element?.type === 'bpmn:UserTask';
// ── 本地编辑态(选中变更 / undo-redo 时从 businessObject 重新初始化) ─────────
const [candidateItems, setCandidateItems] = useState<UserPropertyItem[]>([]);
const [candidateMeta, setCandidateMeta] = useState<Record<string, unknown>>({});
const [candidateNonStandard, setCandidateNonStandard] = useState(false);
const [cosign, setCosign] = useState<CosignState>(FRESH_COSIGN);
const [cosignMeta, setCosignMeta] = useState<Record<string, unknown>>({});
const [formKey, setFormKey] = useState('');
const [extAttrs, setExtAttrs] = useState<Array<{ key: string; value: string }>>([]);
const [newAttr, setNewAttr] = useState<{ key: string; value: string }>({ key: '', value: '' });
const [listeners, setListeners] = useState<ListenerRow[]>([]);
const [templates, setTemplates] = useState<WfTemplateOption[]>([]);
const [templatesDegraded, setTemplatesDegraded] = useState(false);
const [formKeyFilter, setFormKeyFilter] = useState('');
// undo/redo 重灌计数:commandStack.changed(非自身写入)时自增,触发 init 重跑。
const [syncTick, setSyncTick] = useState(0);
// 非 taskListener 的扩展元素(formProperty 等)原样保留(引用不动)。
const otherExtRef = useRef<unknown[]>([]);
// 自身写入标记:updateProperties 会触发 commandStack.changed,借此跳过自触发重灌。
const selfWriteRef = useRef(false);
// formKey 数据源加载一次(透传 degraded;1016 项靠过滤输入,不裸滚动)。
useEffect(() => {
let alive = true;
Promise.resolve(fetchWfTemplates())
.then((r) => {
if (!alive) return;
setTemplates(Array.isArray(r?.templates) ? r.templates : []);
setTemplatesDegraded(!!r?.degraded);
})
.catch(() => {
if (!alive) return;
setTemplates([]);
setTemplatesDegraded(true);
});
return () => {
alive = false;
};
}, []);
// undo/redo 脱同步防线:非自身写入的 commandStack 变更 → 对当前选中重灌本地态。
useEffect(() => {
if (!modeler) return;
const handler = () => {
if (selfWriteRef.current) {
selfWriteRef.current = false; // 自身 updateProperties 触发,不重灌(避免规范化闪烁)
return;
}
setSyncTick((t) => t + 1);
};
modeler.on('commandStack.changed', handler);
return () => {
modeler.off?.('commandStack.changed', handler);
};
}, [modeler]);
// 选中变更 / 外部命令 → 从 businessObject 重新初始化本地态。
useEffect(() => {
if (!element || element.type !== 'bpmn:UserTask') {
setCandidateItems([]);
setCandidateMeta({});
setCandidateNonStandard(false);
setCosign(FRESH_COSIGN);
setCosignMeta({});
setFormKey('');
setExtAttrs([]);
setNewAttr({ key: '', value: '' });
setListeners([]);
otherExtRef.current = [];
return;
}
const bo = element.businessObject;
// 办理人
const rawCand = bo.get('activiti:candidateUsers') as string | undefined;
const cand = parseCandidateExpression(rawCand);
setCandidateItems(cand?.items ?? []);
setCandidateMeta(cand?.meta ?? {});
setCandidateNonStandard(!!rawCand && !cand); // 非空但解析失败=非标准表达式
// 会签(保真读回 isSequential/elementVariable/completionCondition 原值)
const loop = bo.get('loopCharacteristics');
if (loop) {
const parsed = parseCandidateExpression(mget(loop, 'activiti:collection') as string | undefined);
const cc = parseCompletion(
(mget(loop, 'completionCondition') as { body?: string } | undefined)?.body,
);
setCosign({
enabled: true,
items: parsed?.items ?? [],
isSequential: Boolean(mget(loop, 'isSequential')),
elementVariable: (mget(loop, 'activiti:elementVariable') as string) ?? '',
completionType: cc.type,
completionN: cc.n,
completionCustomBody: cc.custom,
});
setCosignMeta(parsed?.meta ?? {});
} else {
setCosign(FRESH_COSIGN);
setCosignMeta({});
}
// formKey
setFormKey((bo.get('activiti:formKey') as string) ?? '');
// 扩展属性(长尾 $attrs,只留 activiti:/flowable: 前缀)
const attrs = bo.$attrs ?? {};
setExtAttrs(
Object.entries(attrs)
.filter(([k]) => k.startsWith('activiti:') || k.startsWith('flowable:'))
.map(([key, value]) => ({ key, value: String(value) })),
);
setNewAttr({ key: '', value: '' });
// 任务监听器
const extEl = bo.get('extensionElements') as { values?: unknown[] } | undefined;
const values = (extEl?.values ?? []) as unknown[];
// moddle 类型名遵循 activiti/camunda 惯例=PascalCase(xml.tagAlias:lowerCase 令 XML 元素名仍小写
// <activiti:taskListener>),故按 $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')
.map((v) => {
const cls = mget(v, 'class') as string | undefined;
const del = mget(v, 'delegateExpression') as string | undefined;
const fields = ((v as { fields?: unknown[] }).fields ?? mget(v, 'fields')) as unknown[] | undefined;
return {
event: (mget(v, 'event') as string) ?? 'create',
mode: cls ? 'class' : del ? 'delegateExpression' : 'class',
value: cls ?? del ?? '',
fields: fields && fields.length ? fields : undefined,
} as ListenerRow;
}),
);
}, [element, syncTick]);
function update(props: Record<string, unknown>) {
if (element && modeling) {
selfWriteRef.current = true;
modeling.updateProperties(element, props);
}
}
// ── 办理人写回 ─────────────────────────────────────────────────────────────
function writeCandidate(items: UserPropertyItem[]) {
if (items.length === 0) {
// 删光 items:若外层含非空业务 meta,confirm 确认才写 undefined(否则连带清除业务字段)。
const notable = notableMeta(candidateMeta);
if (
notable.length > 0 &&
typeof window !== 'undefined' &&
!window.confirm('清空办理人将一并移除:' + notable.join('、') + '。确认清空?')
) {
return; // 取消:本地态与引擎均不变
}
setCandidateItems([]);
update({ 'activiti:candidateUsers': undefined });
return;
}
setCandidateItems(items);
update({ 'activiti:candidateUsers': buildCandidateExpression(items, 'candidate', candidateMeta) });
}
// ── 会签写回 ───────────────────────────────────────────────────────────────
function writeCosign(next: CosignState) {
setCosign(next);
if (!next.enabled) {
update({ loopCharacteristics: undefined });
return;
}
if (!moddle) return;
const collection = buildCandidateExpression(
next.items,
'multiInstance' as CandidateVariant,
cosignMeta,
);
const props: Record<string, unknown> = {
isSequential: next.isSequential,
'activiti:collection': collection,
};
// elementVariable 为空(真实库缺省态)则省略,不凭空写空属性。
if (next.elementVariable) props['activiti:elementVariable'] = next.elementVariable;
const body = completionBodyFor(next);
// body 为空(原本无 completionCondition)则不发出该子元素,保真。
if (body) props.completionCondition = moddle.create('bpmn:FormalExpression', { body });
const loop = moddle.create('bpmn:MultiInstanceLoopCharacteristics', props);
update({ loopCharacteristics: loop });
}
// ── formKey 写回 ───────────────────────────────────────────────────────────
function writeFormKey(value: string) {
setFormKey(value);
update({ 'activiti:formKey': value === '' ? undefined : value });
}
// ── 扩展属性写回 ───────────────────────────────────────────────────────────
function addExtAttr() {
const key = newAttr.key.trim();
if (!key) return;
if (!key.startsWith('activiti:') && !key.startsWith('flowable:')) {
toast('扩展属性键必须以 activiti: 或 flowable: 开头', 'warn');
return;
}
const local = key.slice(key.indexOf(':') + 1);
if (RESERVED_EXT_LOCALNAMES.has(local)) {
toast('该属性有专用控件,请用上方对应控件编辑', 'warn');
return;
}
setExtAttrs((prev) => {
const rest = prev.filter((a) => a.key !== key);
return [...rest, { key, value: newAttr.value }];
});
update({ [key]: newAttr.value });
setNewAttr({ key: '', value: '' });
}
function editExtAttr(key: string, value: string) {
setExtAttrs((prev) => prev.map((a) => (a.key === key ? { ...a, value } : a)));
update({ [key]: value });
}
function removeExtAttr(key: string) {
setExtAttrs((prev) => prev.filter((a) => a.key !== key));
update({ [key]: undefined });
}
// ── 任务监听器写回 ─────────────────────────────────────────────────────────
function writeListeners(next: ListenerRow[]) {
setListeners(next);
if (!moddle) return;
const listenerEls = next.map((l) => {
const props: Record<string, unknown> = { event: l.event };
props[l.mode] = l.value;
if (l.fields && l.fields.length) props.fields = l.fields;
return moddle.create('activiti:TaskListener', props);
});
const all = [...otherExtRef.current, ...listenerEls];
const extEl = all.length ? moddle.create('bpmn:ExtensionElements', { values: all }) : undefined;
update({ extensionElements: extEl });
}
function addListener() {
writeListeners([...listeners, { event: 'create', mode: 'class', value: '' }]);
}
function patchListener(i: number, p: Partial<ListenerRow>) {
writeListeners(listeners.map((l, idx) => (idx === i ? { ...l, ...p } : l)));
}
function removeListener(i: number) {
writeListeners(listeners.filter((_, idx) => idx !== i));
}
// ── 渲染 ───────────────────────────────────────────────────────────────────
if (!element) {
return (
<div data-testid="process-modeler-eip4-panel" style={hintStyle}>
请选择一个用户任务节点以编辑 EIP4 属性。
</div>
);
}
if (!isUserTask) {
return (
<div data-testid="process-modeler-eip4-panel" style={hintStyle}>
选中的不是用户任务节点。EIP4 定制控件仅对用户任务(办理人 / 会签 / formKey)可用。
</div>
);
}
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 (
<div
data-testid="process-modeler-eip4-panel"
style={{ overflow: 'auto', maxHeight: '55%', borderBottom: '1px solid var(--line)' }}
>
<div style={{ padding: '8px 12px', fontSize: 12, color: 'var(--text-3)', background: 'var(--surface-2, #fafafa)' }}>
EIP4 引擎以本控件为准,下方标准面板原生字段仅供高级调试。
</div>
<Section title="办理人">
{candidateBadges.length > 0 ? (
<div
data-testid="eip4-candidate-meta-badge"
style={{ fontSize: 12, color: 'var(--text-2)', marginBottom: 8, lineHeight: 1.6 }}
>
含业务配置:{candidateBadges.join('、')}(清空办理人会一并移除)
</div>
) : null}
{candidateNonStandard ? (
<div
data-testid="eip4-candidate-nonstandard"
style={{ fontSize: 12, color: 'var(--warn, #d48806)', marginBottom: 8 }}
>
当前为非标准办理人表达式,编辑将覆盖原表达式。
</div>
) : null}
<ItemsEditor idPrefix="eip4-candidate" items={candidateItems} onChange={writeCandidate} />
</Section>
<Section title="会签(多实例)">
<label style={{ display: 'flex', alignItems: 'center', gap: 6, fontSize: 13, marginBottom: 8 }}>
<input
type="checkbox"
data-testid="eip4-cosign-toggle"
checked={cosign.enabled}
onChange={(e) => writeCosign({ ...cosign, enabled: e.target.checked })}
/>
启用会签
</label>
{cosign.enabled ? (
<div style={{ display: 'flex', flexDirection: 'column', gap: 8 }}>
<label style={{ display: 'flex', alignItems: 'center', gap: 6, fontSize: 13 }}>
<input
type="checkbox"
data-testid="eip4-cosign-sequential"
checked={cosign.isSequential}
onChange={(e) => writeCosign({ ...cosign, isSequential: e.target.checked })}
/>
串行(顺序会签)
</label>
<label style={{ display: 'flex', alignItems: 'center', gap: 6, fontSize: 13 }}>
<span style={{ flex: '0 0 auto' }}>循环变量</span>
<input
data-testid="eip4-cosign-element-variable"
value={cosign.elementVariable}
placeholder="assignee"
onChange={(e) => writeCosign({ ...cosign, elementVariable: e.target.value })}
style={{ flex: 1, minWidth: 0 }}
/>
</label>
<ItemsEditor
idPrefix="eip4-cosign"
items={cosign.items}
onChange={(items) => writeCosign({ ...cosign, items })}
/>
<div style={{ display: 'flex', alignItems: 'center', gap: 6, fontSize: 13, flexWrap: 'wrap' }}>
<span>完成条件</span>
<select
data-testid="eip4-cosign-completion-type"
value={cosign.completionType}
onChange={(e) =>
writeCosign({ ...cosign, completionType: e.target.value as CompletionType })
}
>
{/* 自定义(保留)仅在当前为自定义态时可选中——presets 不提供切到自定义,防误清 */}
{cosign.completionType === 'custom' ? (
<option value="custom">自定义(保留)</option>
) : null}
<option value="all">全票通过</option>
<option value="majority">过半通过</option>
<option value="count">指定数</option>
</select>
{cosign.completionType === 'count' ? (
<input
type="number"
min={1}
data-testid="eip4-cosign-completion-n"
value={cosign.completionN}
onChange={(e) =>
writeCosign({ ...cosign, completionN: Number(e.target.value) || 1 })
}
style={{ width: 64 }}
/>
) : null}
{cosign.completionType === 'custom' ? (
<span
data-testid="eip4-cosign-completion-custom"
style={{ fontSize: 12, color: 'var(--text-3)' }}
>
当前条件:<code>{cosign.completionCustomBody || '(无)'}</code>
</span>
) : null}
</div>
</div>
) : null}
</Section>
<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
data-testid="eip4-formkey-select"
value={formKey}
onChange={(e) => writeFormKey(e.target.value)}
style={{ width: '100%' }}
>
<option value="">(无)</option>
{/* 当前值不在(过滤后的)模板列表时,补一条占位以免下拉丢值 */}
{formKey && !filteredTemplates.some((t) => t.id === formKey) ? (
<option value={formKey}>
{(() => {
const cur = templates.find((t) => t.id === formKey);
return (cur ? wfTemplateLabel(cur) : formKey) + '(当前)';
})()}
</option>
) : null}
{filteredTemplates.map((t) => (
<option key={t.id} value={t.id}>
{wfTemplateLabel(t)}
</option>
))}
</select>
</Section>
<Section title="扩展属性(activiti/flowable)">
<div style={{ display: 'flex', flexDirection: 'column', gap: 6 }}>
{extAttrs.map((a, i) => (
<div key={a.key} style={{ display: 'flex', gap: 4 }}>
<input
data-testid={`eip4-extattr-key-${i}`}
value={a.key}
readOnly
style={{ flex: '0 0 130px', minWidth: 0 }}
/>
<input
data-testid={`eip4-extattr-value-${i}`}
value={a.value}
onChange={(e) => editExtAttr(a.key, e.target.value)}
style={{ flex: 1, minWidth: 0 }}
/>
<button
className="btn btn-sm"
data-testid={`eip4-extattr-remove-${i}`}
onClick={() => removeExtAttr(a.key)}
>
删
</button>
</div>
))}
<div style={{ display: 'flex', gap: 4 }}>
<input
data-testid="eip4-extattr-new-key"
placeholder="activiti:key"
value={newAttr.key}
onChange={(e) => setNewAttr((s) => ({ ...s, key: e.target.value }))}
style={{ flex: '0 0 130px', minWidth: 0 }}
/>
<input
data-testid="eip4-extattr-new-value"
placeholder="value"
value={newAttr.value}
onChange={(e) => setNewAttr((s) => ({ ...s, value: e.target.value }))}
style={{ flex: 1, minWidth: 0 }}
/>
<button className="btn btn-sm" data-testid="eip4-extattr-add" onClick={addExtAttr}>
+ 增
</button>
</div>
</div>
</Section>
<Section title="任务监听器(taskListener)">
<div style={{ display: 'flex', flexDirection: 'column', gap: 6 }}>
{listeners.map((l, i) => (
<div
key={i}
style={{ border: '1px solid var(--line)', borderRadius: 4, padding: 6, display: 'flex', flexDirection: 'column', gap: 4 }}
>
<div style={{ display: 'flex', gap: 4, alignItems: 'center' }}>
<select
data-testid={`eip4-listener-event-${i}`}
value={l.event}
onChange={(e) => patchListener(i, { event: e.target.value })}
style={{ flex: '0 0 110px' }}
>
{LISTENER_EVENTS.map((ev) => (
<option key={ev} value={ev}>
{ev}
</option>
))}
</select>
<select
data-testid={`eip4-listener-mode-${i}`}
value={l.mode}
onChange={(e) =>
patchListener(i, { mode: e.target.value as ListenerRow['mode'] })
}
style={{ flex: '0 0 130px' }}
>
<option value="class">class</option>
<option value="delegateExpression">delegateExpression</option>
</select>
<button
className="btn btn-sm"
data-testid={`eip4-listener-remove-${i}`}
onClick={() => removeListener(i)}
>
删
</button>
</div>
<input
data-testid={`eip4-listener-value-${i}`}
value={l.value}
placeholder={l.mode === 'class' ? '全限定类名' : '${bean}'}
onChange={(e) => patchListener(i, { value: e.target.value })}
/>
{l.fields && l.fields.length ? (
<span style={{ fontSize: 11, color: 'var(--text-3)' }}>
含 field 配置({l.fields.length})· 编辑时原样保留
</span>
) : null}
</div>
))}
<button className="btn btn-sm" data-testid="eip4-listener-add" onClick={addListener}>
+ 添加监听器
</button>
</div>
</Section>
</div>
);
}
const hintStyle: React.CSSProperties = {
padding: 12,
color: 'var(--text-3)',
fontSize: 12,
borderBottom: '1px solid var(--line)',
};

View File

@@ -0,0 +1,94 @@
import { describe, it, expect, vi } from 'vitest';
import { render, screen, fireEvent } from '@testing-library/react';
import { NewProcessDialog, type NewProcessResult } from './NewProcessDialog';
function renderDialog() {
const onConfirm = vi.fn<[NewProcessResult], void>();
const onClose = vi.fn();
render(<NewProcessDialog onConfirm={onConfirm} onClose={onClose} />);
return { onConfirm, onClose };
}
describe('NewProcessDialog', () => {
it('渲染名称/key/模板三字段', () => {
renderDialog();
expect(screen.getByTestId('new-process-name')).toBeInTheDocument();
expect(screen.getByTestId('new-process-key')).toBeInTheDocument();
expect(screen.getByTestId('new-process-template')).toBeInTheDocument();
// 模板下拉含四个模板
expect(screen.getByText('空白流程')).toBeInTheDocument();
expect(screen.getByText('单人审批')).toBeInTheDocument();
expect(screen.getByText('两级审批')).toBeInTheDocument();
expect(screen.getByText('会签')).toBeInTheDocument();
});
it('name/key 任一为空 → 确认禁用且 onConfirm 不触发', () => {
const { onConfirm } = renderDialog();
const confirm = screen.getByTestId('new-process-confirm');
expect(confirm).toBeDisabled();
// 只填 name,key 仍空 → 仍禁用
fireEvent.change(screen.getByTestId('new-process-name'), { target: { value: '请假审批' } });
expect(confirm).toBeDisabled();
fireEvent.click(confirm);
expect(onConfirm).not.toHaveBeenCalled();
});
it('key 仅空白也判无效', () => {
renderDialog();
fireEvent.change(screen.getByTestId('new-process-name'), { target: { value: 'n' } });
fireEvent.change(screen.getByTestId('new-process-key'), { target: { value: ' ' } });
expect(screen.getByTestId('new-process-confirm')).toBeDisabled();
});
it('填齐 + 选会签模板 → 确认,onConfirm 收到实例化 XML(含 multiInstance,占位符已替换)', () => {
const { onConfirm } = renderDialog();
fireEvent.change(screen.getByTestId('new-process-name'), { target: { value: '合同会签' } });
fireEvent.change(screen.getByTestId('new-process-key'), { target: { value: 'contractCosign' } });
fireEvent.change(screen.getByTestId('new-process-template'), { target: { value: 'cosign' } });
fireEvent.click(screen.getByTestId('new-process-confirm'));
expect(onConfirm).toHaveBeenCalledTimes(1);
const r = onConfirm.mock.calls[0][0];
expect(r.name).toBe('合同会签');
expect(r.key).toBe('contractCosign');
// process id/key 已替换为用户输入(ASCII key),占位符无残留。
expect(r.xml).toContain('id="contractCosign"');
expect(r.xml).toContain('bpmnElement="contractCosign"');
expect(r.xml).not.toContain('__PROCESS_ID__');
expect(r.xml).not.toContain('__PROCESS_NAME__');
// 选中的是会签模板。
expect(r.xml).toContain('multiInstanceLoopCharacteristics');
expect(r.idMap).toEqual({});
});
it('默认模板为空白流程(不含 userTask)', () => {
const { onConfirm } = renderDialog();
fireEvent.change(screen.getByTestId('new-process-name'), { target: { value: '空白' } });
fireEvent.change(screen.getByTestId('new-process-key'), { target: { value: 'blankProc' } });
fireEvent.click(screen.getByTestId('new-process-confirm'));
const r = onConfirm.mock.calls[0][0];
expect(r.xml).not.toContain('userTask');
expect(r.xml).toContain('id="blankProc"');
});
it('中文 key → onConfirm.idMap 记录 {中文 key→净化 ASCII id},XML 内 process id 为 ASCII', () => {
const { onConfirm } = renderDialog();
fireEvent.change(screen.getByTestId('new-process-name'), { target: { value: '总包合同交底' } });
fireEvent.change(screen.getByTestId('new-process-key'), { target: { value: '总包合同交底' } });
fireEvent.change(screen.getByTestId('new-process-template'), { target: { value: 'single-approval' } });
fireEvent.click(screen.getByTestId('new-process-confirm'));
const r = onConfirm.mock.calls[0][0];
expect(r.key).toBe('总包合同交底');
expect(Object.keys(r.idMap)).toEqual(['总包合同交底']);
const asciiId = r.idMap['总包合同交底'];
expect(asciiId).toMatch(/^[A-Za-z_][A-Za-z0-9_.-]*$/); // ASCII NCName
expect(r.xml).toContain('id="' + asciiId + '"');
expect(r.xml).not.toContain('id="总包合同交底"'); // moddle 拒中文 id
});
it('取消 → onClose,不 onConfirm', () => {
const { onConfirm, onClose } = renderDialog();
fireEvent.click(screen.getByTestId('new-process-cancel'));
expect(onClose).toHaveBeenCalled();
expect(onConfirm).not.toHaveBeenCalled();
});
});

View File

@@ -0,0 +1,113 @@
// 新建流程对话框(T4.1)。
//
// 字段:名称(展示名)/ key(流程标识,允许中文——引擎 process key 既有中文事实)/ 模板下拉。
// 确认时按选中模板 + 用户输入实例化 XML(buildNewProcessXml 替换占位符、按 key 定 ASCII process id
// 并算发布还原 idMap),把结果交父页进入编辑态(父页 importXML,尚未存草稿)。
import { useState } from 'react';
import { Dialog } from '../components/ui';
import { PROCESS_TEMPLATES, getTemplate, buildNewProcessXml } from './templates';
/** 新建结果:交父页 importXML + 首存草稿用(name→草稿名/process name,key→草稿 key,idMap→metaInfo)。 */
export interface NewProcessResult {
name: string;
key: string;
/** 实例化后的 BPMN(占位符已替换,可直接 importXML)。 */
xml: string;
/** 发布还原映射(中文 key 时 {原 key→净化 id},ASCII key 时空)。 */
idMap: Record<string, string>;
}
interface NewProcessDialogProps {
onConfirm: (r: NewProcessResult) => void;
onClose: () => void;
}
export function NewProcessDialog({ onConfirm, onClose }: NewProcessDialogProps) {
const [name, setName] = useState('');
const [key, setKey] = useState('');
const [templateId, setTemplateId] = useState(PROCESS_TEMPLATES[0].id);
const nameOk = name.trim().length > 0;
const keyOk = key.trim().length > 0;
const valid = nameOk && keyOk;
function handleConfirm() {
if (!valid) return;
const tpl = getTemplate(templateId);
if (!tpl) return;
const built = buildNewProcessXml(tpl.xml, name, key);
onConfirm({ name: name.trim(), key: key.trim(), xml: built.xml, idMap: built.idMap });
}
const foot = (
<>
<button className="btn" data-testid="new-process-cancel" onClick={onClose}>
取消
</button>
<button
className="btn btn-primary"
data-testid="new-process-confirm"
onClick={handleConfirm}
disabled={!valid}
>
创建并编辑
</button>
</>
);
return (
<Dialog title="新建流程" width={480} onClose={onClose} foot={foot}>
<div style={{ display: 'flex', flexDirection: 'column', gap: 14 }}>
<Field label="流程名称" hint="展示名,可用中文">
<input
data-testid="new-process-name"
value={name}
onChange={(e) => setName(e.target.value)}
placeholder="如:请假审批"
style={inputStyle}
/>
</Field>
<Field label="流程标识(key)" hint="引擎 process key,可用中文;发布后作为流程唯一标识">
<input
data-testid="new-process-key"
value={key}
onChange={(e) => setKey(e.target.value)}
placeholder="如:leaveApply 或 请假审批"
style={inputStyle}
/>
</Field>
<Field label="起始模板">
<select
data-testid="new-process-template"
value={templateId}
onChange={(e) => setTemplateId(e.target.value)}
style={inputStyle}
>
{PROCESS_TEMPLATES.map((t) => (
<option key={t.id} value={t.id}>
{t.label}
</option>
))}
</select>
</Field>
{!valid ? (
<div data-testid="new-process-hint" style={{ fontSize: 12, color: 'var(--text-3)' }}>
请填写流程名称与 key。
</div>
) : null}
</div>
</Dialog>
);
}
function Field({ label, hint, children }: { label: string; hint?: string; children: React.ReactNode }) {
return (
<label style={{ display: 'flex', flexDirection: 'column', gap: 4 }}>
<span style={{ fontSize: 13, fontWeight: 600 }}>{label}</span>
{children}
{hint ? <span style={{ fontSize: 11, color: 'var(--text-3)' }}>{hint}</span> : null}
</label>
);
}
const inputStyle: React.CSSProperties = { width: '100%', padding: '6px 8px', boxSizing: 'border-box' };

View File

@@ -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<typeof import('../components/ui')>()),
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(
'&quot;type&quot;:&quot;position&quot;',
'&quot;type&quot;:&quot;user&quot;',
);
function renderConfirm(overrides: Partial<React.ComponentProps<typeof PublishConfirm>> = {}) {
const onClose = vi.fn();
const onPublished = vi.fn();
render(
<PublishConfirm
modelId="MD-1"
openSourceXml={SYNTHETIC_BPMN}
currentXml={EDITED}
processKeyHint="总包合同交底"
onClose={onClose}
onPublished={onPublished}
{...overrides}
/>,
);
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');
});
});

View File

@@ -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<NodeDiff[]>(() => diffSummary(openSourceXml, currentXml));
const [impact, setImpact] = useState<DeployImpact | null>(null);
const [impactLoaded, setImpactLoaded] = useState(false);
const [deploying, setDeploying] = useState(false);
const [errors, setErrors] = useState<DeployValidationError[] | null>(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 = (
<>
<button className="btn" data-testid="publish-cancel-btn" onClick={guardedClose} disabled={deploying}>
取消
</button>
<button
className="btn btn-primary"
data-testid="publish-confirm-btn"
onClick={handleConfirm}
disabled={deploying}
>
{deploying ? '发布中…' : '确认发布'}
</button>
</>
);
return (
<Dialog title="发布流程" width={520} onClose={guardedClose} foot={foot}>
<div data-testid="process-modeler-publish-confirm" style={{ display: 'flex', flexDirection: 'column', gap: 12 }}>
{/* 影响摘要 */}
<div style={{ display: 'flex', flexDirection: 'column', gap: 6, fontSize: 13 }}>
<Row label="流程标识(key)">
<code data-testid="publish-impact-key">{key}</code>
</Row>
<Row label="版本">
<span data-testid="publish-impact-version">{versionText}</span>
</Row>
<Row label="运行中实例">
<span data-testid="publish-impact-instances">
{running === undefined ? '—' : running}
<span style={{ color: 'var(--text-3)', marginLeft: 8, fontSize: 12 }}>
(留在旧版本,不受本次发布影响)
</span>
</span>
</Row>
</div>
{/* 节点级变更清单 */}
<div>
<div style={{ fontWeight: 600, fontSize: 13, marginBottom: 6 }}>办理人 / 会签等变更节点</div>
{diff.length === 0 ? (
<div data-testid="publish-diff-empty" style={{ fontSize: 12, color: 'var(--text-3)' }}>
未检测到办理人 / 会签 / 表单等关键属性变化(可能仅调整了布局或其他节点)。
</div>
) : (
<ul data-testid="publish-diff-list" style={{ margin: 0, paddingLeft: 18, fontSize: 13, lineHeight: 1.7 }}>
{diff.map((d, i) => (
<li key={i} data-testid={`publish-diff-item-${i}`}>
<strong>{d.nodeName}</strong>:{d.changes.join('、')}
</li>
))}
</ul>
)}
</div>
{/* 校验错误清单(422,不关窗) */}
{errors && errors.length ? (
<div data-testid="publish-errors" style={{ border: '1px solid var(--err)', borderRadius: 4, padding: 10 }}>
<div style={{ color: 'var(--err)', fontWeight: 600, fontSize: 13, marginBottom: 6 }}>
校验未通过,请修正后重试:
</div>
<ul style={{ margin: 0, paddingLeft: 18, fontSize: 13, lineHeight: 1.7 }}>
{errors.map((e, i) => (
<li key={i} data-testid={`publish-error-${i}`} style={{ color: 'var(--err)' }}>
{errorText(e)}
</li>
))}
</ul>
</div>
) : null}
</div>
</Dialog>
);
}
function Row({ label, children }: { label: string; children: React.ReactNode }) {
return (
<div style={{ display: 'flex', gap: 8 }}>
<span style={{ flex: '0 0 120px', color: 'var(--text-3)' }}>{label}</span>
<span style={{ flex: 1, minWidth: 0 }}>{children}</span>
</div>
);
}

View File

@@ -0,0 +1,6 @@
// bpmn-js-properties-panel 未随包发布类型声明(无 dist/*.d.ts、无 package.json types 字段)。
// 只声明本项目用到的两个标准模块(severe: 严禁引 Camunda provider,见 ProcessModelerPage)。
declare module 'bpmn-js-properties-panel' {
export const BpmnPropertiesPanelModule: unknown;
export const BpmnPropertiesProviderModule: unknown;
}

View File

@@ -0,0 +1,305 @@
import { describe, it, expect } from 'vitest';
import { SYNTHETIC_BPMN } from './moddle/fixtures/synthetic-full-surface.bpmn';
import {
parseCandidateExpression,
buildCandidateExpression,
type UserPropertyItem,
} from './candidateExpression';
// ── 真实形态锚定 ────────────────────────────────────────────────────────────
// 不手抄表达式:直接从 T1.1 逐字对照「总包合同交底」写就的 synthetic-full-surface
// fixture 里,运行时抽出 activiti:candidateUsers / activiti:collection 的属性值,
// 做 XML 实体解码(&quot;→")得到 businessObject 属性值层的真实表达式。这样测试
// 与「真实形态的唯一真相」绑定,fixture 改则测试自动跟随,杜绝逐字漂移。
function xmlDecode(s: string): string {
return s
.replace(/&quot;/g, '"')
.replace(/&lt;/g, '<')
.replace(/&gt;/g, '>')
.replace(/&amp;/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]);
}
// activiti:candidateUsers,单实例办理人,type=position,content 尾部 4 个 CHAR 补白空格,
// 外层 meta 含非空 taskSuccessService(真实服务钩子)。
const REAL_CANDIDATE = extractAttr('activiti:candidateUsers');
// activiti:collection,多实例(会签)办理人,type=projectRoleType,content 为逗号分隔的
// 11 个布尔维度串,外层 meta 全部为空/false。
const REAL_MULTI = extractAttr('activiti:collection');
describe('parseCandidateExpression — 真实形态解析', () => {
it('解析真实 candidate 表达式(全角【】,识别为 candidate 变体)', () => {
const r = parseCandidateExpression(REAL_CANDIDATE);
expect(r).not.toBeNull();
expect(r!.variant).toBe('candidate');
expect(r!.items).toHaveLength(1);
expect(r!.items[0]).toMatchObject({
type: 'position',
isCandidate: true,
isSendMail: false,
isSendPhone: false,
isSendMessage: false,
});
});
it('content 尾部 CHAR 补白空格原样保留(不 trim)', () => {
const r = parseCandidateExpression(REAL_CANDIDATE);
// 32 位十六进制 id + 4 个尾部空格
expect(r!.items[0].content).toBe('402881343cd50391013d62ccd0c20f7d ');
expect(r!.items[0].content).toHaveLength(36);
});
it('multiInstance 前缀变体 multiInstanceUsersHandler.getUsers 同套解析', () => {
const r = parseCandidateExpression(REAL_MULTI);
expect(r).not.toBeNull();
expect(r!.variant).toBe('multiInstance');
expect(r!.items[0].type).toBe('projectRoleType');
});
it('content 含逗号分隔多值原样保留', () => {
const r = parseCandidateExpression(REAL_MULTI);
expect(r!.items[0].content).toBe(
'true,false,false,false,false,false,false,false,false,false,false',
);
});
});
describe('buildCandidateExpression — 与引擎口径逐字往返', () => {
it('candidate 真实表达式 round-trip 逐字一致(全角【】+前后缀逐字+meta 不丢)', () => {
const r = parseCandidateExpression(REAL_CANDIDATE)!;
expect(buildCandidateExpression(r.items, r.variant, r.meta)).toBe(REAL_CANDIDATE);
});
it('multiInstance 真实表达式 round-trip 逐字一致', () => {
const r = parseCandidateExpression(REAL_MULTI)!;
expect(buildCandidateExpression(r.items, r.variant, r.meta)).toBe(REAL_MULTI);
});
it('外层 meta(messageTemplate/taskSuccessService/isSkip* 等)往返一字不丢', () => {
const r = parseCandidateExpression(REAL_CANDIDATE)!;
// 真实服务钩子:侧板只改 items 时,taskSuccessService 等业务字段必须原样带回,
// 否则重新部署会打掉已部署流程的任务后置服务。
expect(r.meta).toMatchObject({
messageTemplate: '',
taskSuccessService: 'PM_CONTRACTUALREGISTER_UPDATEPROJECTSTATUS',
isSkipInitiator: false,
isNoUserSkip: false,
isSkipBeforeTask: true,
});
expect(buildCandidateExpression(r.items, r.variant, r.meta)).toContain(
'PM_CONTRACTUALREGISTER_UPDATEPROJECTSTATUS',
);
});
it('构建输出前缀/后缀逐字对齐 BasePropertiesConverter 常量', () => {
const r = parseCandidateExpression(REAL_CANDIDATE)!;
const built = buildCandidateExpression(r.items, r.variant, r.meta);
expect(built.startsWith("${candidateUsersHandler.getCandidateUsers(execution,'")).toBe(true);
expect(built.endsWith("')}")).toBe(true);
const rm = parseCandidateExpression(REAL_MULTI)!;
const builtM = buildCandidateExpression(rm.items, rm.variant, rm.meta);
expect(builtM.startsWith("${multiInstanceUsersHandler.getUsers(execution,'")).toBe(true);
});
});
describe('各 type 往返不丢字段(真实结构派生:同一真实外壳,仅换 type/content)', () => {
// 用真实 candidate 外壳(REAL_CANDIDATE 的 meta 与 item 键集),仅替换 type/content,
// 覆盖 §0 其余 type。结构逐字来自真实形态,值取真实业务样例。
function reshape(type: string, content: string): string {
const r = parseCandidateExpression(REAL_CANDIDATE)!;
const item: UserPropertyItem = { ...r.items[0], type, content };
return buildCandidateExpression([item], 'candidate', r.meta);
}
it('scriptUser(content=${APPLYUSERS},真实会签办理人形态)往返不丢', () => {
const expr = reshape('scriptUser', '${APPLYUSERS}');
const r = parseCandidateExpression(expr)!;
expect(r.items[0]).toMatchObject({ type: 'scriptUser', content: '${APPLYUSERS}' });
expect(buildCandidateExpression(r.items, r.variant, r.meta)).toBe(expr);
});
it('depart 往返不丢', () => {
const expr = reshape('depart', '402881343cd50391013d62ccd0c20f7d');
const r = parseCandidateExpression(expr)!;
expect(r.items[0].type).toBe('depart');
expect(buildCandidateExpression(r.items, r.variant, r.meta)).toBe(expr);
});
it('beforeTaskLeader 往返不丢', () => {
const expr = reshape('beforeTaskLeader', '');
const r = parseCandidateExpression(expr)!;
expect(r.items[0].type).toBe('beforeTaskLeader');
expect(buildCandidateExpression(r.items, r.variant, r.meta)).toBe(expr);
});
});
describe('isSendMessage 可选字段', () => {
it('含 isSendMessage 往返保留', () => {
const r = parseCandidateExpression(REAL_CANDIDATE)!;
expect(r.items[0].isSendMessage).toBe(false);
expect(buildCandidateExpression(r.items, r.variant, r.meta)).toBe(REAL_CANDIDATE);
});
it('缺 isSendMessage 的旧数据变体:parse 不填充,build 不凭空添加', () => {
// 引擎 BasePropertiesConverter:62-67 对 isCandidate/isSendMail/isSendPhone 无 null 守卫、
// 唯 isSendMessage 有(:63),故存在无 isSendMessage 的合法历史数据。此变体无 meta。
const NO_MSG =
"${candidateUsersHandler.getCandidateUsers(execution,'【\"items\":[【\"type\":\"user\",\"content\":\"u1,u2\",\"isCandidate\":true,\"isSendMail\":false,\"isSendPhone\":false】]】')}";
const r = parseCandidateExpression(NO_MSG)!;
expect(r.items[0].isSendMessage).toBeUndefined();
expect('isSendMessage' in r.items[0]).toBe(false);
expect(Object.keys(r.meta)).toHaveLength(0);
expect(buildCandidateExpression(r.items, r.variant, r.meta)).toBe(NO_MSG);
});
});
describe('半角输入兼容 + build 恒全角', () => {
it('半角{}输入可解析,build 输出恒全角【】,回到真实全角形态', () => {
const halfWidth = REAL_CANDIDATE.split('【').join('{').split('】').join('}');
expect(halfWidth).not.toBe(REAL_CANDIDATE); // 确认输入确是半角
const r = parseCandidateExpression(halfWidth);
expect(r).not.toBeNull();
expect(r!.items[0].type).toBe('position');
// build 输出恒全角 → 等于真实全角原文
expect(buildCandidateExpression(r!.items, r!.variant, r!.meta)).toBe(REAL_CANDIDATE);
});
});
describe('非法/空输入返回 null 不抛', () => {
it('undefined → null', () => {
expect(parseCandidateExpression(undefined)).toBeNull();
});
it('空串 → null', () => {
expect(parseCandidateExpression('')).toBeNull();
});
it('缺前缀(非办理人表达式)→ null', () => {
expect(parseCandidateExpression('${someOtherExpr(execution)}')).toBeNull();
});
it('有前缀但内容坏 JSON → null 不抛', () => {
const bad =
"${candidateUsersHandler.getCandidateUsers(execution,'【not a valid json】')}";
expect(() => parseCandidateExpression(bad)).not.toThrow();
expect(parseCandidateExpression(bad)).toBeNull();
});
it('有前缀但缺后缀 → null', () => {
const noSuffix = "${candidateUsersHandler.getCandidateUsers(execution,'【\"items\":[]】";
expect(parseCandidateExpression(noSuffix)).toBeNull();
});
it('JSON 合法但无 items 数组 → null', () => {
const noItems =
"${candidateUsersHandler.getCandidateUsers(execution,'【\"foo\":1】')}";
expect(parseCandidateExpression(noItems)).toBeNull();
});
// M-2 形状守卫
it('items 元素非对象(字符串)→ null 不抛', () => {
const bad =
"${candidateUsersHandler.getCandidateUsers(execution,'【\"items\":[\"notanobject\"]】')}";
expect(() => parseCandidateExpression(bad)).not.toThrow();
expect(parseCandidateExpression(bad)).toBeNull();
});
it('items 元素 type 非字符串(数字)→ null', () => {
const bad =
"${candidateUsersHandler.getCandidateUsers(execution,'【\"items\":[【\"type\":123,\"content\":\"x\"】]】')}";
expect(parseCandidateExpression(bad)).toBeNull();
});
it('items 元素为 null → null', () => {
const bad =
"${candidateUsersHandler.getCandidateUsers(execution,'【\"items\":[null]】')}";
expect(parseCandidateExpression(bad)).toBeNull();
});
});
describe('I-1 stringToJson 引号映射(T2.4 接用户输入前必须)', () => {
const CAND_PREFIX = "${candidateUsersHandler.getCandidateUsers(execution,'";
function body(built: string): string {
return built.slice(CAND_PREFIX.length, built.length - "')}".length);
}
it("content 含 ' 和 \" → build 映射为 ‘/“,值层无裸 '/\"、外层 JUEL 定界符不被截断", () => {
const item: UserPropertyItem = {
type: 'user',
content: `O'Brien "Ann"`,
isCandidate: true,
isSendMail: false,
isSendPhone: false,
isSendMessage: false,
};
const built = buildCandidateExpression([item], 'candidate');
// JUEL 单引号字面量安全:整个内容段不得出现裸 ASCII 单引号(否则截断 execution,'...')。
// 注意 " 是 JSON 结构定界符会合法出现于内容段,故只对 ' 断言整段无裸值。
expect(body(built)).not.toContain("'");
// JSON 结构安全:值里的 " 已映射走,build 产物仍是良构表达式,可无损 parse 回来。
const r = parseCandidateExpression(built);
expect(r).not.toBeNull();
const c = r!.items[0].content;
expect(c).toContain('‘'); // O‘Brien
expect(c).toContain('“'); // “Ann“(开闭同映射为左引号,与 stringToJson 逐字一致)
expect(c).not.toContain("'");
expect(c).not.toContain('"');
expect(built.startsWith(CAND_PREFIX)).toBe(true);
expect(built.endsWith("')}")).toBe(true);
});
it('引号映射幂等:build 产物再 parse→build 稳定不变', () => {
const built = buildCandidateExpression(
[{ type: 'user', content: `x'y"z`, isCandidate: true, isSendMail: false, isSendPhone: false }],
'candidate',
);
const r = parseCandidateExpression(built)!;
expect(buildCandidateExpression(r.items, r.variant, r.meta)).toBe(built);
});
it('meta 字符串叶子(messageTemplate)同样应用引号映射', () => {
const built = buildCandidateExpression(
[{ type: 'user', content: 'u1', isCandidate: true, isSendMail: false, isSendPhone: false }],
'candidate',
{ messageTemplate: `it's` },
);
expect(built).toContain('it‘s');
expect(body(built)).not.toContain("'");
});
});
describe('I-2 半角 content 变体(scriptUser ${users})——运行期等价', () => {
// 语料实测 20 条:content 用半角 ${users}(非 stringToJson 产物)。parse 保留原值,
// build 把结构性 {} 连同 content 里半角 {} 一并规范化为全角——非字节逐字,但引擎运行期
// 对整串全局 【→{ 还原后完全等价。
const HALF =
"${multiInstanceUsersHandler.getUsers(execution,'【\"items\":[【\"type\":\"scriptUser\",\"content\":\"${users}\",\"isCandidate\":true,\"isSendMail\":false,\"isSendPhone\":false】]】')}";
// 镜像引擎 CandidateUsersHandler:54 的全局字面替换
const engineRestore = (s: string): string => s.split('【').join('{').split('】').join('}');
it('半角 content 可解析,原值保留', () => {
const r = parseCandidateExpression(HALF)!;
expect(r.items[0]).toMatchObject({ type: 'scriptUser', content: '${users}' });
});
it('build 输出恒全角(content 半角{}被规范化),但引擎全局替换后与原文等价', () => {
const r = parseCandidateExpression(HALF)!;
const built = buildCandidateExpression(r.items, r.variant, r.meta);
expect(built).toContain('$【users】'); // 非字节逐字
expect(engineRestore(built)).toBe(engineRestore(HALF)); // 运行期等价
});
});
describe('M-1 item 未知键透传(不静默丢未来扩展键,与 meta 全量保留对称)', () => {
it('未知 item 键排在已知键之后,往返逐字不丢', () => {
const WITH_UNKNOWN =
"${candidateUsersHandler.getCandidateUsers(execution,'【\"items\":[【\"type\":\"user\",\"content\":\"u1\",\"isCandidate\":true,\"isSendMail\":false,\"isSendPhone\":false,\"futureFlag\":true】]】')}";
const r = parseCandidateExpression(WITH_UNKNOWN)!;
expect((r.items[0] as Record<string, unknown>).futureFlag).toBe(true);
expect(buildCandidateExpression(r.items, r.variant, r.meta)).toBe(WITH_UNKNOWN);
});
});

View File

@@ -0,0 +1,152 @@
// 办理人 / 会签(多实例)办理人表达式的编解码器(纯函数)。
//
// 处理的是 bpmn-js businessObject **属性值层**的表达式(XML 实体已解码:真引号、全角【】),
// 不是 XML 源码层(&quot;)。引擎侧唯一真相:
// - 前后缀常量逐字对齐 com.dsasp.server.wf.bean.BasePropertiesConverter:34-35
// CANDIDATESERVICE / MULTIINSTANCESERVICE(见下 PREFIX 常量)。
// - 存储态的对象花括号一律写作**全角【】**(方括号 [] 半角),运行期由
// CandidateUsersHandler:54 以 `.replace("【","{").replace("】","}")`(全局字面替换)
// 还原为合法 JSON 再交 Jackson 解析。本编解码器 build 输出恒全角、parse 兼容全角/半角。
// - 外层对象结构:{"items":[{...}],"messageTemplate","taskSuccessService",
// "isSkipInitiator","isNoUserSkip","isSkipBeforeTask"}(语料实测 meta 键集有多种子集)。
// 引擎运行期候选人解析(convertToUserProperties)只读 items,但 taskSuccessService 等是
// 任务后置服务钩子等运行期业务字段——侧板只改 items 时必须原样带回(meta),否则重新部署
// 会打掉这些字段。
// - 字符串叶子值(content/messageTemplate 等)的转义逐字对齐原版 stringToJson
// (BasePropertiesConverter.java:235-280):`'`→‘(U+2018)、`"`→“(U+201C)、
// `{`→【、`}`→】,反斜杠与控制字符走标准 JSON 转义。build 对新值应用此契约,防用户输入
// 含 `'`(截断外层 JUEL 单引号字面量)或 `"`(截断内层 JSON)导致部署后表达式解析即断。
//
// 逐字往返口径(全量 1512 流 4794 条真实表达式实测,见 tools/codec-corpus-sweep.mjs):
// - 4774/4794 build(parse(x))===x 逐字一致;`‘`/`“`/`\/` 在语料 0 命中,故新增引号
// 转义对存量表达式为 no-op(合法存量叶子值不含裸 ' / ",否则会截断 JUEL/JSON)。
// - 余 20 条 content 用**半角** `${users}`(scriptUser 会签变体,非 stringToJson 产物):
// parse 保留原值,build 把结构性 {} 连同 content 里的半角 {} 一并规范化为全角【】。此非字节
// 逐字,但**运行期等价**——引擎 :54 对整串做全局 【→{ 还原,`$【users】` 复原为 `${users}`。
// - content 里的逗号分隔多值与 CHAR 尾部补白空格原样保留。
const CANDIDATE_PREFIX = "${candidateUsersHandler.getCandidateUsers(execution,'";
const MULTI_PREFIX = "${multiInstanceUsersHandler.getUsers(execution,'";
const SUFFIX = "')}";
export type CandidateVariant = 'candidate' | 'multiInstance';
/** 单个办理人项。字段名逐字对齐 BasePropertiesConverter 常量(:21-27)。 */
export interface UserPropertyItem {
type: string;
content: string;
isCandidate?: boolean;
isSendMail?: boolean;
isSendPhone?: boolean;
isSendMessage?: boolean;
}
export interface ParsedCandidateExpression {
items: UserPropertyItem[];
variant: CandidateVariant;
/** items 之外的外层字段(messageTemplate/taskSuccessService/isSkip* 等),原样保留以逐字往返。 */
meta: Record<string, unknown>;
}
/** item 的规范键序;未知键在其后按原序透传(与 meta 全量保留对称,不静默丢未来扩展键)。 */
const KNOWN_ITEM_KEYS = ['type', 'content', 'isCandidate', 'isSendMail', 'isSendPhone', 'isSendMessage'];
const KNOWN_ITEM_KEY_SET = new Set(KNOWN_ITEM_KEYS);
function fullToHalf(s: string): string {
return s.split('【').join('{').split('】').join('}');
}
function halfToFull(s: string): string {
return s.split('{').join('【').split('}').join('】');
}
/**
* 字符串叶子值转义,逐字对齐原版 stringToJson 里 JSON.stringify **未覆盖**的两处值级映射:
* `'`→‘、`"`→“。(反斜杠/控制字符由 JSON.stringify 覆盖;`{`/`}`→【/】由 halfToFull 覆盖。)
* 对合法存量叶子值(不含裸 ' / ")为 no-op,故不破坏逐字往返;仅对面板新输入生效。
*/
function escapeLeaf(v: string): string {
return v.split("'").join('‘').split('"').join('“');
}
/** 按规范键序重建 item:已知键在前(存在才输出,不凭空增删),未知键按原序透传。 */
function reorderItem(src: Record<string, unknown>): Record<string, unknown> {
const o: Record<string, unknown> = {};
for (const k of KNOWN_ITEM_KEYS) {
if (src[k] !== undefined) o[k] = src[k];
}
for (const k of Object.keys(src)) {
if (!KNOWN_ITEM_KEY_SET.has(k) && src[k] !== undefined) o[k] = src[k];
}
return o;
}
/**
* 解析办理人/会签表达式。识别 candidate / multiInstance 两种前缀,内容段全角【】→{} 后 JSON.parse。
* 非办理人表达式、缺后缀、坏 JSON、无 items 数组、items 元素非对象或 type 非字符串、
* undefined/空串一律返回 null 不抛。
*/
export function parseCandidateExpression(
expr: string | undefined | null,
): ParsedCandidateExpression | null {
if (typeof expr !== 'string' || expr.length === 0) return null;
let variant: CandidateVariant;
let prefix: string;
if (expr.startsWith(CANDIDATE_PREFIX)) {
variant = 'candidate';
prefix = CANDIDATE_PREFIX;
} else if (expr.startsWith(MULTI_PREFIX)) {
variant = 'multiInstance';
prefix = MULTI_PREFIX;
} else {
return null;
}
if (!expr.endsWith(SUFFIX)) return null;
const content = expr.slice(prefix.length, expr.length - SUFFIX.length);
let obj: unknown;
try {
obj = JSON.parse(fullToHalf(content));
} catch {
return null;
}
if (obj === null || typeof obj !== 'object') return null;
const record = obj as Record<string, unknown>;
if (!Array.isArray(record.items)) return null;
// 形状守卫:元素必须是普通对象且 type 为字符串,否则整体返 null(对齐「非法返 null 不抛」)。
for (const el of record.items) {
if (el === null || typeof el !== 'object' || Array.isArray(el)) return null;
if (typeof (el as Record<string, unknown>).type !== 'string') return null;
}
const items = (record.items as Record<string, unknown>[]).map(
reorderItem,
) as unknown as UserPropertyItem[];
const meta: Record<string, unknown> = { ...record };
delete meta.items;
return { items, variant, meta };
}
/**
* 构建办理人/会签表达式:重建外层对象 {items, ...meta} → JSON.stringify(紧凑无空白,replacer
* 对字符串叶子应用 stringToJson 引号映射)→ 结构性 {} 换成全角【】(方括号保持半角)→ 套前后缀。
* round-trip 与真实表达式逐字一致(半角 content 变体除外,见文件头运行期等价说明)。
*/
export function buildCandidateExpression(
items: UserPropertyItem[],
variant: CandidateVariant,
meta?: Record<string, unknown>,
): string {
const prefix = variant === 'multiInstance' ? MULTI_PREFIX : CANDIDATE_PREFIX;
const outer = {
items: items.map((it) => reorderItem(it as unknown as Record<string, unknown>)),
...(meta ?? {}),
};
const json = JSON.stringify(outer, (_key, value) =>
typeof value === 'string' ? escapeLeaf(value) : value,
);
return prefix + halfToFull(json) + SUFFIX;
}

View File

@@ -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(
/<multiInstanceLoopCharacteristics[\s\S]*?<\/multiInstanceLoopCharacteristics>/,
'',
);
describe('diffSummary — 节点级四类属性 diff', () => {
it('完全相同 → 无变化节点', () => {
expect(diffSummary(SYNTHETIC_BPMN, SYNTHETIC_BPMN)).toEqual([]);
});
it('办理人变更(candidateUsers items type position→user)→ 只标接收交底「办理人变更」', () => {
const edited = SYNTHETIC_BPMN.replace(
'&quot;type&quot;:&quot;position&quot;',
'&quot;type&quot;:&quot;user&quot;',
);
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(
'&quot;type&quot;:&quot;projectRoleType&quot;',
'&quot;type&quot;:&quot;scriptUser&quot;',
);
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(
'&quot;type&quot;:&quot;position&quot;',
'&quot;type&quot;:&quot;user&quot;',
);
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(
'<endEvent id="end_1"></endEvent>',
'<userTask id="t_new" name="新审批"></userTask><endEvent id="end_1"></endEvent>',
);
const diff = diffSummary(SYNTHETIC_BPMN, added);
expect(diff).toEqual([{ nodeName: '新审批', changes: ['新增用户任务'] }]);
});
it('删除用户任务 → 标「删除用户任务」', () => {
// 从当前移除 t_receive(用其带 boundaryEvent 的完整块不便,改用 name 回退验证:直接删 t_write 块)。
const removed = SYNTHETIC_BPMN.replace(
/<userTask id="t_write"[\s\S]*?<\/userTask>/,
'',
);
const diff = diffSummary(SYNTHETIC_BPMN, removed);
expect(diff).toEqual([{ nodeName: '编写交底', changes: ['删除用户任务'] }]);
});
it('无 name 的节点回退用 id 作 nodeName', () => {
const added = SYNTHETIC_BPMN.replace(
'<endEvent id="end_1"></endEvent>',
'<userTask id="t_noname"></userTask><endEvent id="end_1"></endEvent>',
);
const diff = diffSummary(SYNTHETIC_BPMN, added);
expect(diff).toEqual([{ nodeName: 't_noname', changes: ['新增用户任务'] }]);
});
it('坏 XML(任一侧解析失败)→ 返回空数组不抛', () => {
expect(() => diffSummary('<not xml', SYNTHETIC_BPMN)).not.toThrow();
expect(diffSummary('<not', SYNTHETIC_BPMN)).toEqual([]);
expect(diffSummary(SYNTHETIC_BPMN, '<<<')).toEqual([]);
});
});
// I3-①:跨命名空间对齐——源用默认命名空间(存量存储态),当前用 bpmn: 前缀(bpmn-js saveXML 输出)。
// diff 必须按命名空间 URI(而非字面前缀)对齐 userTask,否则「改存量→发布」全链的 diff 会漏。
describe('diffSummary — 跨命名空间(默认 ns vs bpmn: 前缀)对齐', () => {
const item = (type: string, content: string): UserPropertyItem => ({
type,
content,
isCandidate: true,
isSendMail: false,
isSendPhone: false,
isSendMessage: false,
});
// 办理人表达式属性值需把 " 转义成 &quot; 才能进 XML 属性。
const candAttr = (items: UserPropertyItem[]) =>
buildCandidateExpression(items, 'candidate').replace(/"/g, '&quot;');
// 默认命名空间(无前缀),activiti: 前缀属性——模拟存量源。
const defaultNs = (items: UserPropertyItem[]) =>
`<?xml version="1.0" encoding="UTF-8"?>
<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:activiti="http://activiti.org/bpmn" targetNamespace="x">
<process id="p1" name="流程" isExecutable="true">
<userTask id="t1" name="任务甲" activiti:candidateUsers="${candAttr(items)}"></userTask>
</process>
</definitions>`;
// bpmn: 前缀(BPMN 元素全部带前缀,namespaceURI 不变)——模拟 bpmn-js saveXML 输出。
const bpmnPrefixed = (items: UserPropertyItem[]) =>
`<?xml version="1.0" encoding="UTF-8"?>
<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:activiti="http://activiti.org/bpmn" targetNamespace="x">
<bpmn:process id="p1" name="流程" isExecutable="true">
<bpmn:userTask id="t1" name="任务甲" activiti:candidateUsers="${candAttr(items)}"></bpmn:userTask>
</bpmn:process>
</bpmn:definitions>`;
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(
'&quot;content&quot;:&quot;true,false,false,false,false,false,false,false,false,false,false&quot;',
'&quot;content&quot;:&quot;${x}&quot;',
);
const withFull = SYNTHETIC_BPMN.replace(
'&quot;content&quot;:&quot;true,false,false,false,false,false,false,false,false,false,false&quot;',
'&quot;content&quot;:&quot;$【x】&quot;',
);
expect(withHalf).not.toBe(withFull); // 两版确有字面差异
expect(diffSummary(withHalf, withFull)).toEqual([]);
});
});

175
src/modeler/diffSummary.ts Normal file
View File

@@ -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<string, Element> {
const map = new Map<string, Element>();
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;
}

View File

@@ -0,0 +1,178 @@
{
"name": "Activiti",
"uri": "http://activiti.org/bpmn",
"prefix": "activiti",
"xml": { "tagAlias": "lowerCase" },
"associations": [],
"types": [
{
"name": "ActivityExtension",
"isAbstract": true,
"extends": ["bpmn:Activity"],
"properties": [
{ "name": "exclusive", "isAttr": true, "type": "String" },
{ "name": "async", "isAttr": true, "type": "String" },
{ "name": "asyncBefore", "isAttr": true, "type": "String" },
{ "name": "asyncAfter", "isAttr": true, "type": "String" }
]
},
{
"name": "UserTaskExtension",
"isAbstract": true,
"extends": ["bpmn:UserTask"],
"properties": [
{ "name": "assignee", "isAttr": true, "type": "String" },
{ "name": "candidateUsers", "isAttr": true, "type": "String" },
{ "name": "candidateGroups", "isAttr": true, "type": "String" },
{ "name": "formKey", "isAttr": true, "type": "String" },
{ "name": "dueDate", "isAttr": true, "type": "String" },
{ "name": "priority", "isAttr": true, "type": "String" },
{ "name": "category", "isAttr": true, "type": "String" },
{ "name": "skipExpression", "isAttr": true, "type": "String" }
]
},
{
"name": "StartEventExtension",
"isAbstract": true,
"extends": ["bpmn:StartEvent"],
"properties": [
{ "name": "formKey", "isAttr": true, "type": "String" },
{ "name": "initiator", "isAttr": true, "type": "String" }
]
},
{
"name": "ProcessExtension",
"isAbstract": true,
"extends": ["bpmn:Process"],
"properties": [
{ "name": "candidateStarterUsers", "isAttr": true, "type": "String" },
{ "name": "candidateStarterGroups", "isAttr": true, "type": "String" },
{ "name": "versionTag", "isAttr": true, "type": "String" },
{ "name": "historyTimeToLive", "isAttr": true, "type": "String" }
]
},
{
"name": "ScriptTaskExtension",
"isAbstract": true,
"extends": ["bpmn:ScriptTask"],
"properties": [
{ "name": "autoStoreVariables", "isAttr": true, "type": "String" },
{ "name": "resultVariable", "isAttr": true, "type": "String" }
]
},
{
"name": "ServiceTaskExtension",
"isAbstract": true,
"extends": ["bpmn:ServiceTask", "bpmn:SendTask", "bpmn:BusinessRuleTask"],
"properties": [
{ "name": "class", "isAttr": true, "type": "String" },
{ "name": "expression", "isAttr": true, "type": "String" },
{ "name": "delegateExpression", "isAttr": true, "type": "String" },
{ "name": "resultVariableName", "isAttr": true, "type": "String" },
{ "name": "type", "isAttr": true, "type": "String" }
]
},
{
"name": "CallActivityExtension",
"isAbstract": true,
"extends": ["bpmn:CallActivity"],
"properties": [
{ "name": "calledElementBinding", "isAttr": true, "type": "String" },
{ "name": "calledElementVersion", "isAttr": true, "type": "String" }
]
},
{
"name": "MultiInstanceExtension",
"isAbstract": true,
"extends": ["bpmn:MultiInstanceLoopCharacteristics"],
"properties": [
{ "name": "collection", "isAttr": true, "type": "String" },
{ "name": "elementVariable", "isAttr": true, "type": "String" }
]
},
{
"name": "TaskListener",
"superClass": ["Element"],
"meta": { "allowedIn": ["bpmn:UserTask"] },
"properties": [
{ "name": "event", "isAttr": true, "type": "String" },
{ "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": "ExecutionListener",
"superClass": ["Element"],
"meta": { "allowedIn": ["*"] },
"properties": [
{ "name": "event", "isAttr": true, "type": "String" },
{ "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": "Field",
"superClass": ["Element"],
"meta": { "allowedIn": ["*"] },
"properties": [
{ "name": "name", "isAttr": true, "type": "String" },
{ "name": "stringValue", "isAttr": true, "type": "String" },
{ "name": "string", "type": "String" },
{ "name": "expression", "type": "String" }
]
},
{
"name": "FormProperty",
"superClass": ["Element"],
"meta": { "allowedIn": ["*"] },
"properties": [
{ "name": "id", "isAttr": true, "type": "String" },
{ "name": "name", "isAttr": true, "type": "String" },
{ "name": "type", "isAttr": true, "type": "String" },
{ "name": "required", "isAttr": true, "type": "String" },
{ "name": "readable", "isAttr": true, "type": "String" },
{ "name": "writable", "isAttr": true, "type": "String" },
{ "name": "variable", "isAttr": true, "type": "String" },
{ "name": "expression", "isAttr": true, "type": "String" },
{ "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": "Value",
"superClass": ["Element"],
"properties": [
{ "name": "id", "isAttr": true, "type": "String" },
{ "name": "name", "isAttr": true, "type": "String" }
]
},
{
"name": "In",
"superClass": ["Element"],
"meta": { "allowedIn": ["*"] },
"properties": [
{ "name": "source", "isAttr": true, "type": "String" },
{ "name": "sourceExpression", "isAttr": true, "type": "String" },
{ "name": "target", "isAttr": true, "type": "String" },
{ "name": "variables", "isAttr": true, "type": "String" }
]
},
{
"name": "Out",
"superClass": ["Element"],
"meta": { "allowedIn": ["*"] },
"properties": [
{ "name": "source", "isAttr": true, "type": "String" },
{ "name": "sourceExpression", "isAttr": true, "type": "String" },
{ "name": "target", "isAttr": true, "type": "String" },
{ "name": "variables", "isAttr": true, "type": "String" }
]
}
]
}

3
src/modeler/moddle/bpmn-moddle.d.ts vendored Normal file
View File

@@ -0,0 +1,3 @@
// bpmn-moddle 8.x 无自带类型声明(TS7016)。最小 ambient 声明消编辑器诊断;
// 运行时行为以 fidelity.test.ts 的 round-trip 断言为准。
declare module 'bpmn-moddle';

View File

@@ -0,0 +1,211 @@
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';
// §0 实测扩展面(本地 eip4 库 5433):11 属性 + 5 元素 + 命名空间 activiti/flowable。
const CORPUS_ATTRS = [
'formKey', 'candidateUsers', 'exclusive', 'assignee', 'collection',
'elementVariable', 'candidateGroups', 'autoStoreVariables', 'initiator', 'dueDate',
];
const CORPUS_ELEMENTS = ['taskListener', 'formProperty', 'value', 'field', 'string'];
// 接收交底 userTask 的 candidateUsers 表达式反转义后的真实态:真引号 + 全角【】+ content 尾 4 空格。
const EXPECTED_CANDIDATE_USERS =
`\${candidateUsersHandler.getCandidateUsers(execution,'【"items":[【"type":"position",` +
`"content":"402881343cd50391013d62ccd0c20f7d ","isCandidate":true,"isSendMail":false,` +
`"isSendPhone":false,"isSendMessage":false】],"messageTemplate":"",` +
`"taskSuccessService":"PM_CONTRACTUALREGISTER_UPDATEPROJECTSTATUS",` +
`"isSkipInitiator":false,"isNoUserSkip":false,"isSkipBeforeTask":true】')}`;
// moddle 跨包同名 extends 属性冲突(activiti:exclusive vs flowable:exclusive 均挂 bpmn:Activity),
// 两包同载会丢元素。真实语料每文档只用一个命名空间(1509 activiti / 3 flowable,不混用),
// 故按命名空间隔离加载。见文末「moddle 约束」测试。
const newActiviti = () => new BpmnModdle({ activiti });
const newFlowable = () => new BpmnModdle({ flowable });
function proc(root: any): any {
return root.rootElements.find((e: any) => e.$type === 'bpmn:Process');
}
function findById(root: any, id: string): any {
return (proc(root).flowElements ?? []).find((e: any) => e.id === id);
}
function warns(res: any, re: RegExp): any[] {
return (res.warnings ?? []).filter((w: any) => re.test(String(w?.message ?? w)));
}
describe('activiti/flowable moddle 描述符 — 语料覆盖', () => {
it('§0 全部实测 activiti 属性/元素在 activiti.json 有声明', () => {
// 大小写不敏感:自定义元素类型名遵循 activiti/camunda 惯例=PascalCase(TaskListener/Field/…),
// xml.tagAlias:lowerCase 令 XML 元素名仍小写(<activiti:taskListener>)。见 serialization.test.ts。
const declared = JSON.stringify(activiti).toLowerCase();
[...CORPUS_ATTRS, ...CORPUS_ELEMENTS].forEach((n) =>
expect(declared, `activiti:${n} 未声明`).toContain(`"${n.toLowerCase()}"`));
});
it('flowable.json 声明命名空间与 flowable:assignee', () => {
expect(flowable.uri).toBe('http://flowable.org/bpmn');
expect(flowable.prefix).toBe('flowable');
expect(JSON.stringify(flowable)).toContain('"assignee"');
});
});
describe('activiti round-trip 零丢失(合成 fixture 覆盖全扩展面)', () => {
it('fromXML 干净:无 activiti 未知警告、无未解析引用(=描述符完整)', async () => {
const res = await newActiviti().fromXML(SYNTHETIC_BPMN);
expect(warns(res, /activiti|unparsable|unresolved/i)).toHaveLength(0);
// 全部流元素(含 userTask/scriptTask/boundaryEvent)都解析出来
const types = proc(res.rootElement).flowElements.map((e: any) => e.$type);
expect(types).toContain('bpmn:UserTask');
expect(types).toContain('bpmn:ScriptTask');
expect(types).toContain('bpmn:BoundaryEvent');
});
it('candidateUsers 被识别为 typed 属性且逐字保留(全角【】+ 尾空格 + JSON 原样)', async () => {
const { rootElement } = await newActiviti().fromXML(SYNTHETIC_BPMN);
const receive = findById(rootElement, 't_receive');
// 逐字保真:解析值 byte-exact 等于原文。
expect(receive.get('activiti:candidateUsers')).toBe(EXPECTED_CANDIDATE_USERS);
// typed 化的直接证据:值走声明属性、未回落 lax $attrs。
// (moddle .get() 对未声明属性也会回落 $attrs 返原值,故单看 .get() 不足以证明 typed 化。)
expect(receive.$attrs?.['activiti:candidateUsers']).toBeUndefined();
});
it('多实例 collection/elementVariable/completionCondition 解析为结构化模型', async () => {
const { rootElement } = await newActiviti().fromXML(SYNTHETIC_BPMN);
const write = findById(rootElement, 't_write');
const mi = write.loopCharacteristics;
expect(mi.$type).toBe('bpmn:MultiInstanceLoopCharacteristics');
expect(mi.get('activiti:elementVariable')).toBe('assignee');
expect(mi.get('activiti:collection')).toContain('multiInstanceUsersHandler.getUsers');
expect(mi.get('activiti:collection')).toContain('【"items":[');
expect(mi.completionCondition.body).toBe('${nrOfCompletedInstances/nrOfInstances==1}');
});
it('taskListener + field + string + formProperty/value 解析为结构化模型', async () => {
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',
);
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',
);
expect(formProp.id).toBe('fp_remark');
expect(formProp.values.map((v: any) => v.name)).toEqual(['同意', '驳回']);
});
it('import→export 关键片段逐字保留(实体稳定:全角【】/中文 name/formKey/监听器/多实例/timer/条件)', async () => {
const moddle = newActiviti();
const { rootElement } = await moddle.fromXML(SYNTHETIC_BPMN);
const { xml } = await moddle.toXML(rootElement, { format: false });
// 中文 name(moddle 对 name 无 NCName 限制,与 id 不同)+ DI 引用(净化后的 ASCII id)
expect(xml).toContain('name="总包合同交底"');
expect(xml).toContain('bpmnElement="Proc_zbht"');
// 办理人 / 会签 handler 前缀(引号被 moddle 序列化为数字实体 &#39;/&#34;,故断言只取到括号前)
expect(xml).toContain('getCandidateUsers(execution,');
expect(xml).toContain('multiInstanceUsersHandler.getUsers');
// 全角【】原样出现在序列化字节里(不被转义)——JSON 包裹符零丢失的直接证据
expect(xml).toContain('【');
expect(xml).toContain('】');
// 内嵌 JSON 值原样(标识符不受实体化影响)+ content 尾 4 空格(CHAR 补白)
expect(xml).toContain('projectRoleType');
expect(xml).toContain('PM_CONTRACTUALREGISTER_UPDATEPROJECTSTATUS');
expect(xml).toContain('402881343cd50391013d62ccd0c20f7d ');
// 扩展属性
expect(xml).toContain('activiti:formKey="2098ce21-400b-4425-9c22-63e350974b98"');
expect(xml).toContain('activiti:formKey="3eee7644-f51d-4755-9abb-aca7f4dd8516"');
expect(xml).toContain('activiti:exclusive="false"');
expect(xml).toContain('activiti:elementVariable="assignee"');
expect(xml).toContain('activiti:initiator="applyuser"');
expect(xml).toContain('activiti:autoStoreVariables="false"');
// 扩展元素
expect(xml).toContain('activiti:taskListener');
expect(xml).toContain('com.dsasp.server.wf.user.listener.TaskCompleteListener');
expect(xml).toContain('审批完成通知');
expect(xml).toContain('activiti:formProperty');
expect(xml).toContain('activiti:value');
// BPMN 特性:boundary+timer / conditionExpression
expect(xml).toContain('timerEventDefinition');
expect(xml).toContain('PT8H');
expect(xml).toContain('isSave==true');
expect(xml).toContain('completionCondition');
});
it('二次 round-trip 稳定:export 结果再 import,candidateUsers 仍逐字一致', async () => {
const m1 = newActiviti();
const first = await m1.fromXML(SYNTHETIC_BPMN);
const { xml } = await m1.toXML(first.rootElement, { format: true });
const m2 = newActiviti();
const { rootElement } = await m2.fromXML(xml);
expect(findById(rootElement, 't_receive').get('activiti:candidateUsers')).toBe(
EXPECTED_CANDIDATE_USERS,
);
});
});
describe('flowable 命名空间 round-trip', () => {
const FLOWABLE_BPMN = `<?xml version="1.0" encoding="UTF-8"?>
<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:flowable="http://flowable.org/bpmn" targetNamespace="t">
<process id="p_flowable" isExecutable="true">
<userTask id="u1" name="审批" flowable:assignee="\${assignee}" flowable:formKey="k1"></userTask>
</process>
</definitions>`;
it('flowable-only 加载时 flowable:assignee typed 化并 round-trip 零丢失', async () => {
const moddle = newFlowable();
const res = await moddle.fromXML(FLOWABLE_BPMN);
const u1 = findById(res.rootElement, 'u1');
expect(u1.get('flowable:assignee')).toBe('${assignee}');
const { xml } = await moddle.toXML(res.rootElement, { format: false });
expect(xml).toContain('flowable:assignee="${assignee}"');
expect(warns(res, /flowable/i)).toHaveLength(0);
});
it('activiti-only 加载时 flowable 属性经 lax $attrs 零丢失往返(Task 1.5 Modeler 单载 activiti 的依据)', async () => {
const moddle = newActiviti();
const res = await moddle.fromXML(FLOWABLE_BPMN);
const u1 = findById(res.rootElement, 'u1');
expect(u1.$attrs['flowable:assignee']).toBe('${assignee}');
const { xml } = await moddle.toXML(res.rootElement, { format: false });
expect(xml).toContain('flowable:assignee="${assignee}"');
expect(xml).toContain('flowable:formKey="k1"');
expect(warns(res, /flowable|unparsable/i)).toHaveLength(0);
});
});
describe('moddle 约束(勘探实证,固化为回归事实)', () => {
it('D7 依据:moddle-xml 拒绝中文 id(illegal ID),故进 moddle 前必须 BpmnIdSanitizer 净化', async () => {
const CN_ID = `<?xml version="1.0" encoding="UTF-8"?>
<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" targetNamespace="t">
<process id="总包合同交底" name="总包合同交底" isExecutable="true">
<startEvent id="s1"></startEvent>
</process>
</definitions>`;
const res = await newActiviti().fromXML(CN_ID);
// 中文 id 的 process 被判 unparsable → 整个 process 丢失(rootElements 无 bpmn:Process)
expect(warns(res, /illegal ID|总包合同交底/)).not.toHaveLength(0);
expect((res.rootElement.rootElements ?? []).some((e: any) => e.$type === 'bpmn:Process')).toBe(false);
});
it('Task 1.5 约束:activiti+flowable 双包同载会因跨包同名 extends 属性冲突丢弃 userTask', async () => {
const BOTH = `<?xml version="1.0" encoding="UTF-8"?>
<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:activiti="http://activiti.org/bpmn" xmlns:flowable="http://flowable.org/bpmn" targetNamespace="t">
<process id="p1" isExecutable="true">
<userTask id="u1" name="审批" activiti:exclusive="false" activiti:assignee="\${a}"></userTask>
</process>
</definitions>`;
const both = new BpmnModdle({ activiti, flowable });
const res = await both.fromXML(BOTH);
expect(warns(res, /redefines|already defined/)).not.toHaveLength(0);
// userTask 被判 unparsable 而丢失 —— 证明不可两包同载,必须按命名空间隔离(见本文件 newActiviti/newFlowable)
const types = proc(res.rootElement).flowElements?.map((e: any) => e.$type) ?? [];
expect(types).not.toContain('bpmn:UserTask');
});
});

View File

@@ -0,0 +1,103 @@
// 合成 fixture:复刻 §0 实测全扩展面 + 中文 name + 全角【】办理人 JSON。
//
// 形态逐字对照真实流程「总包合同交底」(本地 eip4 库 5433 抽取):
// - candidateUsers / multiInstance collection 的内嵌 JSON 用**全角【】**包裹对象,
// 方括号 [] 是半角,引号在 XML 属性里以 &quot; 转义(本文件即真实存储态)。
// - content 尾部的 4 个空格(CHAR 补白)原样保留,用于验证空白零丢失。
// - taskListener/formProperty/field/string、boundaryEvent+timer、conditionExpression、
// startEvent initiator/formKey、scriptTask autoStoreVariables、完整 BPMNDiagram DI。
//
// ⚠️ 关键约束(本任务勘探实证):bpmn-moddle / moddle-xml 会**拒绝中文 id**(报
// `illegal ID`,id 必须是 XSD NCName 的 ASCII 子集),故 moddle 层永远只处理**净化后的
// ASCII id**。真实流程的中文 id(=流程 key,如「总包合同交底」)由 BpmnIdSanitizer(Task 1.3)
// 在进 moddle 前净化、发布时还原——那才是 D7 id 可逆净化存在的根本原因。因此本 fixture 的
// process/节点 id 用 ASCII(模拟净化后态),中文只保留在 name 里(moddle 对 name 无限制)。
// 另有独立测试固化「moddle 拒绝中文 id」这一事实。
//
// 注意:TS 模板字符串里所有引擎表达式的 `${` 均转义为 `\${`,避免被当作插值。
// 不提交任何客户真实 BPMN(P6),仅此合成件覆盖全部扩展语义。
export const SYNTHETIC_BPMN = `<?xml version="1.0" encoding="UTF-8"?>
<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:activiti="http://activiti.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://www.activiti.org/processdef">
<process id="Proc_zbht" name="总包合同交底" isExecutable="true" activiti:candidateStarterGroups="all">
<startEvent id="start_1" name="发起" activiti:initiator="applyuser" activiti:formKey="7c9b-start-form"></startEvent>
<userTask id="t_write" name="编写交底" activiti:exclusive="false" activiti:assignee="\${assignee}" activiti:formKey="2098ce21-400b-4425-9c22-63e350974b98" activiti:dueDate="\${dueDate}" activiti:candidateGroups="managers">
<multiInstanceLoopCharacteristics isSequential="false" activiti:collection="\${multiInstanceUsersHandler.getUsers(execution,'【&quot;items&quot;:[【&quot;type&quot;:&quot;projectRoleType&quot;,&quot;content&quot;:&quot;true,false,false,false,false,false,false,false,false,false,false&quot;,&quot;isCandidate&quot;:true,&quot;isSendMail&quot;:false,&quot;isSendPhone&quot;:false,&quot;isSendMessage&quot;:false】],&quot;messageTemplate&quot;:&quot;&quot;,&quot;taskSuccessService&quot;:&quot;&quot;,&quot;isSkipInitiator&quot;:false,&quot;isNoUserSkip&quot;:false,&quot;isSkipBeforeTask&quot;:false】')}" activiti:elementVariable="assignee">
<completionCondition>\${nrOfCompletedInstances/nrOfInstances==1}</completionCondition>
</multiInstanceLoopCharacteristics>
</userTask>
<userTask id="t_receive" name="接收交底" activiti:exclusive="false" activiti:candidateUsers="\${candidateUsersHandler.getCandidateUsers(execution,'【&quot;items&quot;:[【&quot;type&quot;:&quot;position&quot;,&quot;content&quot;:&quot;402881343cd50391013d62ccd0c20f7d &quot;,&quot;isCandidate&quot;:true,&quot;isSendMail&quot;:false,&quot;isSendPhone&quot;:false,&quot;isSendMessage&quot;:false】],&quot;messageTemplate&quot;:&quot;&quot;,&quot;taskSuccessService&quot;:&quot;PM_CONTRACTUALREGISTER_UPDATEPROJECTSTATUS&quot;,&quot;isSkipInitiator&quot;:false,&quot;isNoUserSkip&quot;:false,&quot;isSkipBeforeTask&quot;:true】')}" activiti:formKey="3eee7644-f51d-4755-9abb-aca7f4dd8516">
<extensionElements>
<activiti:taskListener event="complete" class="com.dsasp.server.wf.user.listener.TaskCompleteListener">
<activiti:field name="mailTemplate">
<activiti:string>审批完成通知</activiti:string>
</activiti:field>
</activiti:taskListener>
<activiti:formProperty id="fp_remark" name="备注" type="string" required="true">
<activiti:value id="v1" name="同意"></activiti:value>
<activiti:value id="v2" name="驳回"></activiti:value>
</activiti:formProperty>
</extensionElements>
</userTask>
<boundaryEvent id="boundary_1" name="超时" attachedToRef="t_receive" cancelActivity="true">
<timerEventDefinition>
<timeDuration>PT8H</timeDuration>
</timerEventDefinition>
</boundaryEvent>
<scriptTask id="script_1" name="自动登记" scriptFormat="juel" activiti:autoStoreVariables="false">
<script>\${execution.setVariable('done', true)}</script>
</scriptTask>
<endEvent id="end_1"></endEvent>
<sequenceFlow id="f1" sourceRef="start_1" targetRef="t_write"></sequenceFlow>
<sequenceFlow id="f2" sourceRef="t_write" targetRef="t_receive"></sequenceFlow>
<sequenceFlow id="f3" sourceRef="t_receive" targetRef="script_1">
<conditionExpression xsi:type="tFormalExpression">\${isSave==true}</conditionExpression>
</sequenceFlow>
<sequenceFlow id="f4" sourceRef="script_1" targetRef="end_1"></sequenceFlow>
<sequenceFlow id="f5" sourceRef="boundary_1" targetRef="end_1"></sequenceFlow>
</process>
<bpmndi:BPMNDiagram id="BPMNDiagram_Proc_zbht">
<bpmndi:BPMNPlane bpmnElement="Proc_zbht" id="BPMNPlane_Proc_zbht">
<bpmndi:BPMNShape bpmnElement="start_1" id="BPMNShape_start_1">
<omgdc:Bounds height="30.0" width="30.0" x="99.0" y="179.0"></omgdc:Bounds>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="t_write" id="BPMNShape_t_write">
<omgdc:Bounds height="80.0" width="100.0" x="174.0" y="154.0"></omgdc:Bounds>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="t_receive" id="BPMNShape_t_receive">
<omgdc:Bounds height="80.0" width="100.0" x="375.0" y="154.0"></omgdc:Bounds>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="boundary_1" id="BPMNShape_boundary_1">
<omgdc:Bounds height="31.0" width="31.0" x="410.0" y="216.0"></omgdc:Bounds>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="script_1" id="BPMNShape_script_1">
<omgdc:Bounds height="80.0" width="100.0" x="576.0" y="154.0"></omgdc:Bounds>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="end_1" id="BPMNShape_end_1">
<omgdc:Bounds height="28.0" width="28.0" x="756.0" y="180.0"></omgdc:Bounds>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge bpmnElement="f1" id="BPMNEdge_f1">
<omgdi:waypoint x="129.0" y="194.0"></omgdi:waypoint>
<omgdi:waypoint x="174.0" y="194.0"></omgdi:waypoint>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="f2" id="BPMNEdge_f2">
<omgdi:waypoint x="274.0" y="194.0"></omgdi:waypoint>
<omgdi:waypoint x="375.0" y="194.0"></omgdi:waypoint>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="f3" id="BPMNEdge_f3">
<omgdi:waypoint x="475.0" y="194.0"></omgdi:waypoint>
<omgdi:waypoint x="576.0" y="194.0"></omgdi:waypoint>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="f4" id="BPMNEdge_f4">
<omgdi:waypoint x="676.0" y="194.0"></omgdi:waypoint>
<omgdi:waypoint x="756.0" y="194.0"></omgdi:waypoint>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="f5" id="BPMNEdge_f5">
<omgdi:waypoint x="425.0" y="247.0"></omgdi:waypoint>
<omgdi:waypoint x="425.0" y="320.0"></omgdi:waypoint>
<omgdi:waypoint x="770.0" y="320.0"></omgdi:waypoint>
<omgdi:waypoint x="770.0" y="208.0"></omgdi:waypoint>
</bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>
</definitions>`;

View File

@@ -0,0 +1,91 @@
{
"name": "Flowable",
"uri": "http://flowable.org/bpmn",
"prefix": "flowable",
"xml": { "tagAlias": "lowerCase" },
"associations": [],
"types": [
{
"name": "ActivityExtension",
"isAbstract": true,
"extends": ["bpmn:Activity"],
"properties": [
{ "name": "exclusive", "isAttr": true, "type": "String" },
{ "name": "async", "isAttr": true, "type": "String" }
]
},
{
"name": "UserTaskExtension",
"isAbstract": true,
"extends": ["bpmn:UserTask"],
"properties": [
{ "name": "assignee", "isAttr": true, "type": "String" },
{ "name": "candidateUsers", "isAttr": true, "type": "String" },
{ "name": "candidateGroups", "isAttr": true, "type": "String" },
{ "name": "formKey", "isAttr": true, "type": "String" },
{ "name": "dueDate", "isAttr": true, "type": "String" }
]
},
{
"name": "StartEventExtension",
"isAbstract": true,
"extends": ["bpmn:StartEvent"],
"properties": [
{ "name": "formKey", "isAttr": true, "type": "String" },
{ "name": "initiator", "isAttr": true, "type": "String" }
]
},
{
"name": "MultiInstanceExtension",
"isAbstract": true,
"extends": ["bpmn:MultiInstanceLoopCharacteristics"],
"properties": [
{ "name": "collection", "isAttr": true, "type": "String" },
{ "name": "elementVariable", "isAttr": true, "type": "String" }
]
},
{
"name": "TaskListener",
"superClass": ["Element"],
"meta": { "allowedIn": ["bpmn:UserTask"] },
"properties": [
{ "name": "event", "isAttr": true, "type": "String" },
{ "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": "Field",
"superClass": ["Element"],
"meta": { "allowedIn": ["*"] },
"properties": [
{ "name": "name", "isAttr": true, "type": "String" },
{ "name": "stringValue", "isAttr": true, "type": "String" },
{ "name": "string", "type": "String" },
{ "name": "expression", "type": "String" }
]
},
{
"name": "FormProperty",
"superClass": ["Element"],
"meta": { "allowedIn": ["*"] },
"properties": [
{ "name": "id", "isAttr": true, "type": "String" },
{ "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": "Value",
"superClass": ["Element"],
"properties": [
{ "name": "id", "isAttr": true, "type": "String" },
{ "name": "name", "isAttr": true, "type": "String" }
]
}
]
}

View File

@@ -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 `<Process>/<UserTask>/<StartEvent>`。
// **Flowable 大小写敏感**:`<Process>` 不被识别为流程 → 部署时 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 是 <Process> 不被识别("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"');
});
});

View File

@@ -0,0 +1,35 @@
// 新建流程模板——空白(1 startEvent + 1 endEvent,供纯手绘)。
//
// ⚠️ CRITICAL(阶段 3 教训):元素名一律**全小写**(<definitions><process><startEvent/>…);
// 缺 isExecutable="true" 会被 Flowable ProcessValidator 拒(看到 0 个可执行流程);缺完整
// BPMNDiagram DI 则画布空白。故模板源字符串即含小写元素名 + isExecutable + 完整 DI。
//
// 占位符(由 templates/index.ts 的 buildNewProcessXml 实例化替换):
// __PROCESS_ID__ —— 进 <process id> 与 <bpmndi:BPMNPlane bpmnElement>(决定 process key)。
// 本身是合法 NCName(`_`+大写字母+`_`),故未替换的原模板也能过 moddle 校验。
// __PROCESS_NAME__ —— 进 <process name>(展示名,name 属性对 NCName 无限制)。
//
// 空白模板 start→end 直连即最小可部署流程,用户在流上插入节点或另起手绘。
export const BLANK_BPMN = `<?xml version="1.0" encoding="UTF-8"?>
<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:activiti="http://activiti.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://www.activiti.org/processdef">
<process id="__PROCESS_ID__" name="__PROCESS_NAME__" isExecutable="true">
<startEvent id="start_1" name="开始"></startEvent>
<endEvent id="end_1" name="结束"></endEvent>
<sequenceFlow id="flow_1" sourceRef="start_1" targetRef="end_1"></sequenceFlow>
</process>
<bpmndi:BPMNDiagram id="BPMNDiagram_1">
<bpmndi:BPMNPlane bpmnElement="__PROCESS_ID__" id="BPMNPlane_1">
<bpmndi:BPMNShape bpmnElement="start_1" id="BPMNShape_start_1">
<omgdc:Bounds height="30.0" width="30.0" x="180.0" y="85.0"></omgdc:Bounds>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="end_1" id="BPMNShape_end_1">
<omgdc:Bounds height="28.0" width="28.0" x="320.0" y="86.0"></omgdc:Bounds>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge bpmnElement="flow_1" id="BPMNEdge_flow_1">
<omgdi:waypoint x="210.0" y="100.0"></omgdi:waypoint>
<omgdi:waypoint x="320.0" y="100.0"></omgdi:waypoint>
</bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>
</definitions>`;

View File

@@ -0,0 +1,46 @@
// 新建流程模板——会签(start → 多实例 userTask → end)。
//
// userTask 挂 multiInstanceLoopCharacteristics(并行):
// - activiti:collection = multiInstance 表达式(multiInstanceUsersHandler.getUsers,全角【】+
// items 一项 type:user;逐字对齐 candidateExpression codec 的 'multiInstance' 变体 build 输出)。
// - activiti:elementVariable="assignee" + userTask activiti:assignee="${assignee}":每个实例把
// 集合元素绑到 assignee 变量再据此派任(对照真实会签流「总包合同交底」结构)。
// - completionCondition ${nrOfCompletedInstances/nrOfInstances==1}(全票通过,对齐侧板 all 预设)。
//
// 约束同其余模板:全小写元素名 + isExecutable + 完整 DI + 占位符。
export const COSIGN_BPMN = `<?xml version="1.0" encoding="UTF-8"?>
<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:activiti="http://activiti.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://www.activiti.org/processdef">
<process id="__PROCESS_ID__" name="__PROCESS_NAME__" isExecutable="true">
<startEvent id="start_1" name="发起"></startEvent>
<userTask id="task_cosign" name="会签审批" activiti:exclusive="false" activiti:assignee="\${assignee}">
<multiInstanceLoopCharacteristics isSequential="false" activiti:collection="\${multiInstanceUsersHandler.getUsers(execution,'【&quot;items&quot;:[【&quot;type&quot;:&quot;user&quot;,&quot;content&quot;:&quot;&quot;,&quot;isCandidate&quot;:true,&quot;isSendMail&quot;:false,&quot;isSendPhone&quot;:false,&quot;isSendMessage&quot;:false】]】')}" activiti:elementVariable="assignee">
<completionCondition>\${nrOfCompletedInstances/nrOfInstances==1}</completionCondition>
</multiInstanceLoopCharacteristics>
</userTask>
<endEvent id="end_1" name="结束"></endEvent>
<sequenceFlow id="flow_1" sourceRef="start_1" targetRef="task_cosign"></sequenceFlow>
<sequenceFlow id="flow_2" sourceRef="task_cosign" targetRef="end_1"></sequenceFlow>
</process>
<bpmndi:BPMNDiagram id="BPMNDiagram_1">
<bpmndi:BPMNPlane bpmnElement="__PROCESS_ID__" id="BPMNPlane_1">
<bpmndi:BPMNShape bpmnElement="start_1" id="BPMNShape_start_1">
<omgdc:Bounds height="30.0" width="30.0" x="150.0" y="85.0"></omgdc:Bounds>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="task_cosign" id="BPMNShape_task_cosign">
<omgdc:Bounds height="80.0" width="100.0" x="250.0" y="60.0"></omgdc:Bounds>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="end_1" id="BPMNShape_end_1">
<omgdc:Bounds height="28.0" width="28.0" x="430.0" y="86.0"></omgdc:Bounds>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge bpmnElement="flow_1" id="BPMNEdge_flow_1">
<omgdi:waypoint x="180.0" y="100.0"></omgdi:waypoint>
<omgdi:waypoint x="250.0" y="100.0"></omgdi:waypoint>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow_2" id="BPMNEdge_flow_2">
<omgdi:waypoint x="350.0" y="100.0"></omgdi:waypoint>
<omgdi:waypoint x="430.0" y="100.0"></omgdi:waypoint>
</bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>
</definitions>`;

View File

@@ -0,0 +1,95 @@
// 新建流程模板库 + 实例化助手(T4.1 §0.5 P3)。
//
// 四个模板以真实流程结构为骨架抽形;模板源用占位符 __PROCESS_ID__ / __PROCESS_NAME__,
// 由 {@link buildNewProcessXml} 按用户输入的 key/名称实例化替换。
//
// 🔑 中文 key 与 moddle 的冲突:bpmn-moddle 拒非 ASCII 的 process id(NCName 校验),故进
// Modeler 的 XML 里 <process id> 必须是 ASCII。方案对齐存量改造链(后端 BpmnIdSanitizer + 发布
// restore):
// - key 是合法 ASCII NCName → 直接用作 process id,idMap 空(发布即以该 key 部署,无需还原)。
// - key 含中文等非法字符 → process id 用稳定 ASCII(与 BpmnIdSanitizer 同哈希方案),
// idMap={原中文 key → 净化 id};发布时后端按 metaInfo.eip4IdMap restore 回中文 key(process
// key = XML <process id>,见 ProcessModelController.deploy)。
import { BLANK_BPMN } from './blank.bpmn';
import { SINGLE_APPROVAL_BPMN } from './single-approval.bpmn';
import { TWO_LEVEL_BPMN } from './two-level.bpmn';
import { COSIGN_BPMN } from './cosign.bpmn';
export interface ProcessTemplate {
id: string;
label: string;
/** 未实例化的模板源(含 __PROCESS_ID__/__PROCESS_NAME__ 占位符)。 */
xml: string;
}
export const PROCESS_TEMPLATES: ProcessTemplate[] = [
{ id: 'blank', label: '空白流程', xml: BLANK_BPMN },
{ id: 'single-approval', label: '单人审批', xml: SINGLE_APPROVAL_BPMN },
{ id: 'two-level', label: '两级审批', xml: TWO_LEVEL_BPMN },
{ id: 'cosign', label: '会签', xml: COSIGN_BPMN },
];
export function getTemplate(id: string): ProcessTemplate | undefined {
return PROCESS_TEMPLATES.find((t) => t.id === id);
}
/** ASCII NCName 判定(逐字对齐后端 BpmnIdSanitizer.isValidNcName:首字符字母/下划线,余加数字/-/.)。 */
export function isAsciiNcName(s: string): boolean {
return /^[A-Za-z_][A-Za-z0-9_.\-]*$/.test(s);
}
/** Java String.hashCode(int 溢出语义),与后端 BpmnIdSanitizer 的净化 id 生成一致。 */
function javaHashCode(s: string): number {
let h = 0;
for (let i = 0; i < s.length; i++) {
h = (Math.imul(31, h) + s.charCodeAt(i)) | 0;
}
return h;
}
/**
* 中文等非法 key → 稳定 ASCII id:`n` + hex(hashCode & 0x7fffffff)(对齐 BpmnIdSanitizer.sanitize)。
*
* M-1 前提:新建模板里**只有 process key 一个**可能非 ASCII 的 id,节点 id(start_1/task_* 等)全 ASCII,
* 故文档内不会出现两个非法 id → 净化 id 碰撞不可达,无需后端的 -2/-3 去重。若将来允许中文节点 id,
* 须对齐 BpmnIdSanitizer 的碰撞序号方案(否则两 id 哈希相同会串引用、restore 还原错)。
*/
function sanitizedId(key: string): string {
return 'n' + (javaHashCode(key) & 0x7fffffff).toString(16);
}
/** 属性值 XML 转义(name 进 name="…",须转义 & < > " 与 ')。 */
function xmlEscapeAttr(s: string): string {
return s
.replace(/&/g, '&amp;')
.replace(/</g, '&lt;')
.replace(/>/g, '&gt;')
.replace(/"/g, '&quot;')
.replace(/'/g, '&apos;');
}
export interface NewProcessXml {
/** 实例化后的 BPMN(占位符已替换,可直接 importXML)。 */
xml: string;
/** 实际写入 <process id> 的 ASCII id。 */
processId: string;
/** 发布还原映射;ASCII key 时为空对象。 */
idMap: Record<string, string>;
}
/**
* 用用户输入的名称/key 实例化模板:把 __PROCESS_ID__ 换成 ASCII 的 processId、__PROCESS_NAME__ 换成
* 转义后的展示名。返回实例化 XML + 发布还原用的 idMap。key 前后空白已 trim。
*/
export function buildNewProcessXml(templateXml: string, name: string, key: string): NewProcessXml {
const trimmedKey = key.trim();
const processId = isAsciiNcName(trimmedKey) ? trimmedKey : sanitizedId(trimmedKey);
const idMap = processId === trimmedKey ? {} : { [trimmedKey]: processId };
const xml = templateXml
.split('__PROCESS_ID__')
.join(processId)
.split('__PROCESS_NAME__')
.join(xmlEscapeAttr(name.trim()));
return { xml, processId, idMap };
}

View File

@@ -0,0 +1,41 @@
// 新建流程模板——单人审批(start → 1 userTask → end)。
//
// userTask 带 activiti:candidateUsers 示例表达式:外层对象用**全角【】**包裹(引擎运行期
// CandidateUsersHandler 全局 【→{ 还原为 JSON),items 一项 type:user(content 留空供用户在
// EIP4 侧板填人员 id)。逐字对齐 candidateExpression codec 的 build 输出:
// businessObject 值层:${candidateUsersHandler.getCandidateUsers(execution,'【"items":[…】]】')}
// XML 属性层:内层引号写作 &quot;(属性以 " 分隔)。
//
// 约束同 blank:全小写元素名 + isExecutable="true" + 完整 DI;占位符 __PROCESS_ID__/__PROCESS_NAME__。
export const SINGLE_APPROVAL_BPMN = `<?xml version="1.0" encoding="UTF-8"?>
<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:activiti="http://activiti.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://www.activiti.org/processdef">
<process id="__PROCESS_ID__" name="__PROCESS_NAME__" isExecutable="true">
<startEvent id="start_1" name="发起"></startEvent>
<userTask id="task_approve" name="审批" activiti:exclusive="false" activiti:candidateUsers="\${candidateUsersHandler.getCandidateUsers(execution,'【&quot;items&quot;:[【&quot;type&quot;:&quot;user&quot;,&quot;content&quot;:&quot;&quot;,&quot;isCandidate&quot;:true,&quot;isSendMail&quot;:false,&quot;isSendPhone&quot;:false,&quot;isSendMessage&quot;:false】]】')}"></userTask>
<endEvent id="end_1" name="结束"></endEvent>
<sequenceFlow id="flow_1" sourceRef="start_1" targetRef="task_approve"></sequenceFlow>
<sequenceFlow id="flow_2" sourceRef="task_approve" targetRef="end_1"></sequenceFlow>
</process>
<bpmndi:BPMNDiagram id="BPMNDiagram_1">
<bpmndi:BPMNPlane bpmnElement="__PROCESS_ID__" id="BPMNPlane_1">
<bpmndi:BPMNShape bpmnElement="start_1" id="BPMNShape_start_1">
<omgdc:Bounds height="30.0" width="30.0" x="150.0" y="85.0"></omgdc:Bounds>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="task_approve" id="BPMNShape_task_approve">
<omgdc:Bounds height="80.0" width="100.0" x="240.0" y="60.0"></omgdc:Bounds>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="end_1" id="BPMNShape_end_1">
<omgdc:Bounds height="28.0" width="28.0" x="400.0" y="86.0"></omgdc:Bounds>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge bpmnElement="flow_1" id="BPMNEdge_flow_1">
<omgdi:waypoint x="180.0" y="100.0"></omgdi:waypoint>
<omgdi:waypoint x="240.0" y="100.0"></omgdi:waypoint>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow_2" id="BPMNEdge_flow_2">
<omgdi:waypoint x="340.0" y="100.0"></omgdi:waypoint>
<omgdi:waypoint x="400.0" y="100.0"></omgdi:waypoint>
</bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>
</definitions>`;

View File

@@ -0,0 +1,204 @@
import { describe, it, expect } from 'vitest';
import BpmnModdle from 'bpmn-moddle';
import activiti from '../moddle/activiti.json';
import {
PROCESS_TEMPLATES,
buildNewProcessXml,
isAsciiNcName,
} from './index';
import { buildCandidateExpression, type UserPropertyItem } from '../candidateExpression';
// 模板可部署前提的三重门(对照 T4.1):
// ① bpmn-moddle fromXML 无警告(结构合法,activiti 扩展属性全被描述符识别)。
// ② 真序列化(fromXML→toXML)后基础元素名**全小写**——防 PascalCase 回归(Flowable 大小写敏感,
// <Process>/<UserTask> 会被 ProcessValidator 判 0 个可执行流程、部署失败,见 moddle/serialization.test)。
// ③ 保留 isExecutable="true"(缺则 ProcessValidator 拒)。
// ④ 会签模板含 multiInstanceLoopCharacteristics。
// 均用**实例化后**(buildNewProcessXml 替换占位符)的 XML,逐字复现新建流程真正 importXML/部署的源。
/** 元素名正则(可选 bpmn: 前缀 + 精确 token + 分隔符),大小写敏感(同 serialization.test)。 */
const openTag = (name: string) => new RegExp('<(bpmn:)?' + name + '[\\s/>]');
// [小写名, PascalCase 名]——出现小写即断言对应 PascalCase 不出现。
const BASE_TYPES: Array<[lower: string, pascal: string]> = [
['definitions', 'Definitions'],
['process', 'Process'],
['startEvent', 'StartEvent'],
['endEvent', 'EndEvent'],
['sequenceFlow', 'SequenceFlow'],
['userTask', 'UserTask'],
['multiInstanceLoopCharacteristics', 'MultiInstanceLoopCharacteristics'],
];
async function roundTrip(xml: string): Promise<{ out: string; warnings: unknown[] }> {
const moddle = new BpmnModdle({ activiti });
const { rootElement, warnings } = await moddle.fromXML(xml);
const { xml: out } = await moddle.toXML(rootElement, { format: true });
return { out, warnings: warnings ?? [] };
}
describe('新建流程模板库', () => {
it('登记齐 4 个模板(空白/单人/两级/会签)', () => {
expect(PROCESS_TEMPLATES.map((t) => t.id)).toEqual([
'blank',
'single-approval',
'two-level',
'cosign',
]);
});
for (const t of PROCESS_TEMPLATES) {
describe(`模板 ${t.id}`, () => {
// ASCII key → process id 直接用 key,不引 idMap;此实例化 XML 即真正被 importXML/部署的源。
const { xml, processId, idMap } = buildNewProcessXml(t.xml, '测试流程', 'TestProc');
it('占位符已全部替换(无 __PROCESS_ID__/__PROCESS_NAME__ 残留)', () => {
expect(xml).not.toContain('__PROCESS_ID__');
expect(xml).not.toContain('__PROCESS_NAME__');
expect(processId).toBe('TestProc');
expect(idMap).toEqual({});
});
it('① bpmn-moddle fromXML 无警告(结构合法)', async () => {
const { warnings } = await roundTrip(xml);
expect(warnings).toEqual([]);
});
it('② 真序列化后基础元素名全小写(无 PascalCase,Flowable 可识别)', async () => {
const { out } = await roundTrip(xml);
for (const [lower, pascal] of BASE_TYPES) {
if (openTag(lower).test(out)) {
expect(out, `不应含 PascalCase <${pascal}>`).not.toMatch(openTag(pascal));
}
}
// 每个模板至少含小写 process/startEvent/endEvent/sequenceFlow。
for (const lower of ['process', 'startEvent', 'endEvent', 'sequenceFlow']) {
expect(out, `应含小写 <${lower}>`).toMatch(openTag(lower));
}
});
it('③ 保留 isExecutable="true"(ProcessValidator 前提)', async () => {
const { out } = await roundTrip(xml);
expect(out).toMatch(/<(bpmn:)?process[\s][^>]*isExecutable="true"/);
});
it('含完整 BPMNDiagram DI(画布不空白)', () => {
expect(xml).toContain('BPMNDiagram');
expect(xml).toContain('BPMNPlane');
});
});
}
it('④ 会签模板含 multiInstanceLoopCharacteristics + elementVariable + 完成条件', async () => {
const cosign = PROCESS_TEMPLATES.find((t) => t.id === 'cosign')!;
const { xml } = buildNewProcessXml(cosign.xml, '会签流程', 'CosignProc');
const { out } = await roundTrip(xml);
expect(out).toMatch(openTag('multiInstanceLoopCharacteristics'));
expect(out).toContain('elementVariable="assignee"');
expect(out).toMatch(/completionCondition/);
});
it('单人/两级/会签模板均含 userTask(空白模板不含)', async () => {
for (const id of ['single-approval', 'two-level', 'cosign']) {
const t = PROCESS_TEMPLATES.find((x) => x.id === id)!;
const { out } = await roundTrip(buildNewProcessXml(t.xml, 'n', 'K').xml);
expect(out, `${id} 应含 userTask`).toMatch(openTag('userTask'));
}
const blank = PROCESS_TEMPLATES.find((x) => x.id === 'blank')!;
const { out } = await roundTrip(buildNewProcessXml(blank.xml, 'n', 'K').xml);
expect(out).not.toMatch(openTag('userTask'));
});
});
describe('buildNewProcessXml —— key/名称替换', () => {
const single = PROCESS_TEMPLATES.find((t) => t.id === 'single-approval')!;
it('ASCII key 直接作 process id,idMap 空', () => {
const { xml, processId, idMap } = buildNewProcessXml(single.xml, '请假审批', 'LeaveApply');
expect(processId).toBe('LeaveApply');
expect(idMap).toEqual({});
expect(xml).toContain('id="LeaveApply"');
expect(xml).toContain('bpmnElement="LeaveApply"'); // DI plane 引用同步替换
});
it('中文 key → process id 净化为 ASCII,idMap={原 key→净化 id},XML 内无中文 id', async () => {
const { xml, processId, idMap } = buildNewProcessXml(single.xml, '总包合同交底', '总包合同交底');
expect(isAsciiNcName(processId)).toBe(true);
expect(idMap).toEqual({ 总包合同交底: processId });
expect(xml).toContain('id="' + processId + '"');
expect(xml).toContain('bpmnElement="' + processId + '"');
// moddle 拒中文 id:中文 key 实例化后仍能 fromXML(证明 id 已净化为 ASCII)。
const { warnings } = await roundTrip(xml);
expect(warnings).toEqual([]);
});
it('展示名进 process name(中文/特殊字符转义,round-trip 还原原文)', async () => {
const { xml } = buildNewProcessXml(single.xml, 'A&B <测试>', 'K');
expect(xml).toContain('name="A&amp;B &lt;测试&gt;"');
const moddle = new BpmnModdle({ activiti });
const { rootElement } = await moddle.fromXML(xml);
const proc = (rootElement as { rootElements: Array<{ $type: string; name?: string }> }).rootElements.find(
(e) => e.$type === 'bpmn:Process',
);
expect(proc?.name).toBe('A&B <测试>');
});
it('key 前后空白 trim 后再判定/替换', () => {
const { processId, idMap } = buildNewProcessXml(single.xml, 'n', ' LeaveApply ');
expect(processId).toBe('LeaveApply');
expect(idMap).toEqual({});
});
});
// I-1(守命根回归):模板里的 activiti:candidateUsers / collection 是**硬编码字符串**,其与
// candidateExpression codec build 输出的逐字对齐此前只是实测、无测试守护。这里从各模板 fromXML 解出
// 属性值(moddle 已把 &quot; 解码为真引号、全角【】保留——即 codec 处理的 businessObject 值层),
// 断言 === buildCandidateExpression(标准 item, 变体)。模板 JSON 键序/转义漂移或 codec 改契约都会被
// 单测立即抓到,而非等 live 部署才暴露(部署后表达式解析即断)。
describe('模板办理人表达式与 codec 逐字对齐(守命根)', () => {
// 模板示例项:一项 type:user、content 空、候选、三通知关(与 templates/*.bpmn.ts 硬编码一致)。
const STD_ITEM: UserPropertyItem = {
type: 'user',
content: '',
isCandidate: true,
isSendMail: false,
isSendPhone: false,
isSendMessage: false,
};
interface ModdleEl {
$type: string;
get(name: string): unknown;
}
async function userTasksOf(templateXml: string): Promise<ModdleEl[]> {
const moddle = new BpmnModdle({ activiti });
// ASCII key → process id 直接用 key,实例化 XML 即真正 importXML/部署的源。
const { rootElement } = await moddle.fromXML(buildNewProcessXml(templateXml, 'n', 'K').xml);
const proc = (rootElement as unknown as { rootElements: ModdleEl[] }).rootElements.find(
(e) => e.$type === 'bpmn:Process',
);
const flow = (proc?.get('flowElements') ?? []) as ModdleEl[];
return flow.filter((e) => e.$type === 'bpmn:UserTask');
}
it('单人审批:userTask candidateUsers === buildCandidateExpression([std],candidate)', async () => {
const [ut] = await userTasksOf(PROCESS_TEMPLATES.find((t) => t.id === 'single-approval')!.xml);
expect(ut.get('activiti:candidateUsers')).toBe(buildCandidateExpression([STD_ITEM], 'candidate'));
});
it('两级审批:两 userTask candidateUsers 均 === buildCandidateExpression([std],candidate)', async () => {
const uts = await userTasksOf(PROCESS_TEMPLATES.find((t) => t.id === 'two-level')!.xml);
expect(uts).toHaveLength(2);
const expected = buildCandidateExpression([STD_ITEM], 'candidate');
for (const ut of uts) {
expect(ut.get('activiti:candidateUsers')).toBe(expected);
}
});
it('会签:multiInstance collection === buildCandidateExpression([std],multiInstance)', async () => {
const [ut] = await userTasksOf(PROCESS_TEMPLATES.find((t) => t.id === 'cosign')!.xml);
const loop = ut.get('loopCharacteristics') as ModdleEl;
expect(loop.get('activiti:collection')).toBe(buildCandidateExpression([STD_ITEM], 'multiInstance'));
});
});

View File

@@ -0,0 +1,45 @@
// 新建流程模板——两级审批(start → 一级 userTask → 二级 userTask → end)。
//
// 两个 userTask 各带 activiti:candidateUsers(type:user,content 留空供侧板填人);结构、
// 全角【】/&quot; 转义、约束(全小写元素名 + isExecutable + 完整 DI + 占位符)同 single-approval。
export const TWO_LEVEL_BPMN = `<?xml version="1.0" encoding="UTF-8"?>
<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:activiti="http://activiti.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://www.activiti.org/processdef">
<process id="__PROCESS_ID__" name="__PROCESS_NAME__" isExecutable="true">
<startEvent id="start_1" name="发起"></startEvent>
<userTask id="task_level1" name="一级审批" activiti:exclusive="false" activiti:candidateUsers="\${candidateUsersHandler.getCandidateUsers(execution,'【&quot;items&quot;:[【&quot;type&quot;:&quot;user&quot;,&quot;content&quot;:&quot;&quot;,&quot;isCandidate&quot;:true,&quot;isSendMail&quot;:false,&quot;isSendPhone&quot;:false,&quot;isSendMessage&quot;:false】]】')}"></userTask>
<userTask id="task_level2" name="二级审批" activiti:exclusive="false" activiti:candidateUsers="\${candidateUsersHandler.getCandidateUsers(execution,'【&quot;items&quot;:[【&quot;type&quot;:&quot;user&quot;,&quot;content&quot;:&quot;&quot;,&quot;isCandidate&quot;:true,&quot;isSendMail&quot;:false,&quot;isSendPhone&quot;:false,&quot;isSendMessage&quot;:false】]】')}"></userTask>
<endEvent id="end_1" name="结束"></endEvent>
<sequenceFlow id="flow_1" sourceRef="start_1" targetRef="task_level1"></sequenceFlow>
<sequenceFlow id="flow_2" sourceRef="task_level1" targetRef="task_level2"></sequenceFlow>
<sequenceFlow id="flow_3" sourceRef="task_level2" targetRef="end_1"></sequenceFlow>
</process>
<bpmndi:BPMNDiagram id="BPMNDiagram_1">
<bpmndi:BPMNPlane bpmnElement="__PROCESS_ID__" id="BPMNPlane_1">
<bpmndi:BPMNShape bpmnElement="start_1" id="BPMNShape_start_1">
<omgdc:Bounds height="30.0" width="30.0" x="150.0" y="85.0"></omgdc:Bounds>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="task_level1" id="BPMNShape_task_level1">
<omgdc:Bounds height="80.0" width="100.0" x="230.0" y="60.0"></omgdc:Bounds>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="task_level2" id="BPMNShape_task_level2">
<omgdc:Bounds height="80.0" width="100.0" x="390.0" y="60.0"></omgdc:Bounds>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="end_1" id="BPMNShape_end_1">
<omgdc:Bounds height="28.0" width="28.0" x="550.0" y="86.0"></omgdc:Bounds>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge bpmnElement="flow_1" id="BPMNEdge_flow_1">
<omgdi:waypoint x="180.0" y="100.0"></omgdi:waypoint>
<omgdi:waypoint x="230.0" y="100.0"></omgdi:waypoint>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow_2" id="BPMNEdge_flow_2">
<omgdi:waypoint x="330.0" y="100.0"></omgdi:waypoint>
<omgdi:waypoint x="390.0" y="100.0"></omgdi:waypoint>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="flow_3" id="BPMNEdge_flow_3">
<omgdi:waypoint x="490.0" y="100.0"></omgdi:waypoint>
<omgdi:waypoint x="550.0" y="100.0"></omgdi:waypoint>
</bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>
</definitions>`;

View File

@@ -0,0 +1,55 @@
import { describe, it, expect, vi } from 'vitest';
import { renderHook, act } from '@testing-library/react';
import { useSelectedElement } from './useSelectedElement';
function makeModeler() {
let handler: ((e: unknown) => void) | null = null;
const on = vi.fn((ev: string, cb: (e: unknown) => void) => {
if (ev === 'selection.changed') handler = cb;
});
const off = vi.fn();
return {
modeler: { on, off },
on,
off,
fire: (sel: unknown[]) => act(() => handler?.({ newSelection: sel })),
};
}
describe('useSelectedElement', () => {
it('单选返回该 element', () => {
const { modeler, fire } = makeModeler();
const { result } = renderHook(() => useSelectedElement(modeler));
const el = { id: 'a', type: 'bpmn:UserTask', businessObject: { get: () => undefined } };
fire([el]);
expect(result.current).toBe(el);
});
it('多选返回 null', () => {
const { modeler, fire } = makeModeler();
const { result } = renderHook(() => useSelectedElement(modeler));
fire([{ id: 'a' }, { id: 'b' }]);
expect(result.current).toBeNull();
});
it('空选返回 null', () => {
const { modeler, fire } = makeModeler();
const { result } = renderHook(() => useSelectedElement(modeler));
fire([{ id: 'a' }]);
expect(result.current).not.toBeNull();
fire([]);
expect(result.current).toBeNull();
});
it('卸载时解绑 selection.changed', () => {
const { modeler, off } = makeModeler();
const { unmount } = renderHook(() => useSelectedElement(modeler));
unmount();
expect(off).toHaveBeenCalledWith('selection.changed', expect.any(Function));
});
it('modeler 为 null 时返回 null 且不订阅', () => {
const { result } = renderHook(() => useSelectedElement(null));
expect(result.current).toBeNull();
});
});

View File

@@ -0,0 +1,56 @@
// 订阅 bpmn-js 'selection.changed',返回当前单选 element(多选/空选返 null)。
// 卸载时解绑;modeler 为 null 时不订阅、恒返 null。
import { useEffect, useState } from 'react';
/** bpmn-js businessObject 的最小契约(本侧板用到的读法)。 */
export interface BpmnBusinessObject {
$type?: string;
/** 未在 moddle 描述符中声明的长尾扩展属性(命名空间键→字符串值)。 */
$attrs?: Record<string, string>;
/** 读取声明属性(如 'activiti:candidateUsers'/'loopCharacteristics'/'extensionElements')。 */
get(name: string): unknown;
}
/** bpmn-js diagram element 的最小契约。 */
export interface BpmnElement {
id: string;
/** moddle 类型,如 'bpmn:UserTask'。 */
type: string;
businessObject: BpmnBusinessObject;
}
/** 订阅所需的最小 modeler 契约(bpmn-js Modeler 天然满足)。 */
export interface SelectionModeler {
on(event: string, cb: (e: unknown) => void): void;
off?(event: string, cb: (e: unknown) => void): void;
}
interface SelectionChangedEvent {
newSelection?: unknown[];
}
/**
* 返回当前单选的 bpmn element;多选或空选返 null。modeler 变更/卸载自动重订阅、解绑。
*/
export function useSelectedElement(
modeler: SelectionModeler | null | undefined,
): BpmnElement | null {
const [element, setElement] = useState<BpmnElement | null>(null);
useEffect(() => {
if (!modeler) {
setElement(null);
return;
}
const handler = (e: unknown) => {
const sel = ((e as SelectionChangedEvent | undefined)?.newSelection ?? []) as BpmnElement[];
setElement(sel.length === 1 ? sel[0] : null);
};
modeler.on('selection.changed', handler);
return () => {
modeler.off?.('selection.changed', handler);
};
}, [modeler]);
return element;
}

View File

@@ -0,0 +1,40 @@
import '@testing-library/jest-dom';
import { render, screen } from '@testing-library/react';
import { MemoryRouter } from 'react-router-dom';
import { vi, describe, it, expect } from 'vitest';
// AiFeatureForm 现以 amis form 渲染(<AmisRenderer>)。amis 内部(auto-develop 提交、ARRAYFILTER 取
// 草稿 targetId、审阅按钮)由 Playwright e2e 覆盖;单测仅守 admin 守卫 + 容器/amis 挂载点。
let mockProfile: { userId: string; account: string; name: string; roles: string[] } | null = null;
vi.mock('../auth/token', async (importOriginal) => ({
...(await importOriginal<typeof import('../auth/token')>()),
getProfile: () => mockProfile,
}));
vi.mock('../components/AmisRenderer', () => ({ AmisRenderer: () => <div data-testid="amis-mount" /> }));
import { AiFeatureForm } from './AiFeatureForm';
function renderForm() {
return render(
<MemoryRouter>
<AiFeatureForm />
</MemoryRouter>,
);
}
describe('AiFeatureForm(amis form)', () => {
it('非管理员:降级提示', () => {
mockProfile = { userId: 'U1', account: 'user', name: 'u', roles: [] };
renderForm();
expect(screen.getByText(/仅管理员可用/)).toBeInTheDocument();
expect(screen.queryByTestId('ai-feature-form')).toBeNull();
});
it('管理员:渲染容器 + 标题 + amis 挂载点', () => {
mockProfile = { userId: 'ADMIN', account: 'admin', name: 'x', roles: [] };
renderForm();
expect(screen.getByTestId('ai-feature-form')).toBeInTheDocument();
expect(screen.getByText('⚡ AI 建功能')).toBeInTheDocument();
expect(screen.getByTestId('amis-mount')).toBeInTheDocument();
});
});

114
src/pages/AiFeatureForm.tsx Normal file
View File

@@ -0,0 +1,114 @@
// AI ①面加速器入口 —— amis form 渲染(与全站一致)。填需求 → 外部 agent 起草,
// 产物恒 READY_FOR_HUMAN_REVIEW,人点「审阅草稿」进 editor.html(edit-only)。
// 红线:永不自动发布;平台进程内不内置生成 LLM。
// 注意:/api/ai/features/auto-develop 直接返回 run 对象(status 为字符串,非 amis 的 {status:0}),
// 故 api 用 adaptor 包成 {status:0,data:payload},再以 ARRAYFILTER 取 PAGE_SCHEMA 草稿 targetId。
import { useMemo } from 'react';
import { useNavigate } from 'react-router-dom';
import { getProfile, isAdminProfile } from '../auth/token';
import { AmisRenderer } from '../components/AmisRenderer';
const TYPE_OPTIONS = [
{ label: '文本', value: 'string' },
{ label: '整数', value: 'integer' },
{ label: '小数', value: 'number' },
{ label: '日期', value: 'date' },
{ label: '日期时间', value: 'datetime' },
{ label: '布尔', value: 'boolean' },
];
function buildSchema(): Record<string, unknown> {
// 进设计器用的 templateId = development.drafts 里 artifactType==PAGE_SCHEMA 的 targetId
const reviewTpl = '${ARRAYFILTER(development.drafts, item.artifactType === "PAGE_SCHEMA")[0].targetId}';
return {
type: 'page',
body: {
type: 'form',
title: '',
mode: 'horizontal',
actions: [{ type: 'submit', label: '开始 AI 起草', level: 'primary' }],
// baseUrl=当前源(dev 经 vite 代理到后端);恒人审,故只产草稿
api: {
method: 'post',
url: '/api/ai/features/auto-develop',
data: {
feature: {
objective: '${objective}', featureName: '${featureName}', tableName: '${tableName}',
entityName: '${entityName}', pageRecipe: '${pageRecipe}', fields: '${fields}',
},
baseUrl: window.location.origin,
generateDeploymentPackage: true,
},
// auto-develop 返回裸 run 对象 → 包成 amis 信封,使 ${status}/${development}/${taskId} 进数据域
adaptor: 'return { status: 0, msg: "", data: payload };',
},
messages: { saveSuccess: 'AI 起草完成,请看下方状态' },
body: [
{ type: 'textarea', name: 'objective', label: '需求目标', required: true, minRows: 2, placeholder: '如:新增客户等级维护功能' },
{ type: 'input-text', name: 'featureName', label: '功能名', required: true, placeholder: '客户等级维护' },
{
type: 'input-text', name: 'tableName', label: '表名', required: true, placeholder: 'EIP4AI_CUSTOMER_LEVEL',
validations: { matchRegexp: '/^[A-Z][A-Z0-9_]{2,40}$/' },
validationErrors: { matchRegexp: '大写字母开头,3–41 位' },
},
{ type: 'input-text', name: 'entityName', label: '实体名', required: true, placeholder: '客户等级' },
{
type: 'radios', name: 'pageRecipe', label: '页面模板', value: 'maintenance-crud-v1',
options: [
{ label: '维护型 CRUD', value: 'maintenance-crud-v1' },
{ label: '树形 CRUD', value: 'tree-crud-v1' },
],
},
{
type: 'combo', name: 'fields', label: '字段', multiple: true, addable: true, removable: true,
addButtonText: '加字段', minLength: 1,
items: [
{ type: 'input-text', name: 'column', label: '列名', required: true, placeholder: 'NAME' },
{ type: 'input-text', name: 'label', label: '显示名', placeholder: '名称' },
{ type: 'select', name: 'type', label: '类型', value: 'string', options: TYPE_OPTIONS },
{ type: 'switch', name: 'required', label: '必填' },
],
},
{
type: 'alert', level: 'info', visibleOn: '${status}',
body: 'AI 起草状态:<b>${status}</b>(taskId=${taskId})。产物恒人审,平台不自动发布。',
},
{
type: 'button', label: '审阅草稿(进设计器)', level: 'primary', className: 'mt-2',
visibleOn: '${status === "READY_FOR_HUMAN_REVIEW"}',
actionType: 'url', url: '/editor.html?templateId=' + reviewTpl, blank: true,
},
{
type: 'alert', level: 'warning', visibleOn: '${status && status !== "READY_FOR_HUMAN_REVIEW"}',
body: '未达人审就绪状态(${status})。运行信息:${JOIN(messages, ";")}',
},
],
},
};
}
export function AiFeatureForm() {
const navigate = useNavigate();
const profile = getProfile();
const isAdmin = isAdminProfile(profile);
const schema = useMemo(buildSchema, []);
if (!isAdmin) {
return <div style={{ padding: 24, color: 'var(--text-3)' }}>AI 建功能仅管理员可用。</div>;
}
return (
<div style={{ height: '100%', display: 'flex', flexDirection: 'column' }} data-testid="ai-feature-form">
<div style={{ display: 'flex', alignItems: 'center', gap: 12, padding: 'var(--pad-lg)', paddingBottom: 4 }}>
<button className="btn btn-sm" onClick={() => navigate('/design-center')}>← 返回设计中心</button>
<h2 style={{ margin: 0, fontSize: 18, fontWeight: 600 }}>⚡ AI 建功能</h2>
</div>
<div className="sub-text" style={{ padding: '0 var(--pad-lg)', marginBottom: 8 }}>
外部 AI agent 起草,产物恒人审;点「审阅草稿」进设计器,平台不自动发布。
</div>
<div style={{ flex: 1, minHeight: 0, overflow: 'auto', padding: '0 var(--pad-lg) var(--pad-lg)' }}>
<AmisRenderer schema={schema} />
</div>
</div>
);
}

View File

@@ -0,0 +1,50 @@
import '@testing-library/jest-dom';
import { render, screen, waitFor } from '@testing-library/react';
import { MemoryRouter } from 'react-router-dom';
import { vi, describe, it, expect, beforeEach } from 'vitest';
import { DesignCenterPage } from './DesignCenterPage';
// menu 走真实 http → mock 掉,避免网络
vi.mock('../api/menu', () => ({
fetchMenu: vi.fn().mockResolvedValue({ roots: [] }),
collectLeaves: vi.fn().mockReturnValue([]),
}));
// 受控 profile:默认 admin
const profileMock = vi.fn();
vi.mock('../auth/token', async (importOriginal) => ({
...(await importOriginal<typeof import('../auth/token')>()),
getProfile: () => profileMock(),
}));
function renderPage() {
return render(
<MemoryRouter>
<DesignCenterPage />
</MemoryRouter>,
);
}
describe('DesignCenterPage 入口按钮', () => {
beforeEach(() => {
profileMock.mockReset();
});
it('admin 看到 [流程设计] [+ 新建功能] 与 [⚡ AI 建功能]', async () => {
profileMock.mockReturnValue({ userId: 'ADMIN', account: 'admin', name: 'x', roles: [] });
renderPage();
await waitFor(() => {
expect(screen.getByTestId('dc-process-modeler')).toBeInTheDocument();
expect(screen.getByTestId('dc-new-feature')).toBeInTheDocument();
expect(screen.getByTestId('dc-ai-feature')).toBeInTheDocument();
});
});
it('非 admin 不渲染入口(整页降级)', () => {
profileMock.mockReturnValue({ userId: 'U1', account: 'zhangsan', name: 'z', roles: [] });
renderPage();
expect(screen.queryByTestId('dc-process-modeler')).not.toBeInTheDocument();
expect(screen.queryByTestId('dc-new-feature')).not.toBeInTheDocument();
expect(screen.queryByTestId('dc-ai-feature')).not.toBeInTheDocument();
});
});

View File

@@ -2,8 +2,9 @@
// 列出全部功能页(按菜单分组、可搜索),每页一个「设计」入口打开 editor.html。
// 仅管理员可见(路由在 AppShell 下,入口在 Topbar admin-only 按钮)。
import { useEffect, useMemo, useState } from 'react';
import { useNavigate } from 'react-router-dom';
import { fetchMenu, collectLeaves, type MenuLeaf } from '../api/menu';
import { getProfile } from '../auth/token';
import { getProfile, isAdminProfile } from '../auth/token';
interface Group {
root: string;
@@ -19,9 +20,10 @@ export function DesignCenterPage() {
const [error, setError] = useState('');
const [loading, setLoading] = useState(true);
const [q, setQ] = useState('');
const navigate = useNavigate();
const profile = getProfile();
const isAdmin = profile?.account === 'admin' || profile?.userId === 'ADMIN';
const isAdmin = isAdminProfile(profile);
useEffect(() => {
let alive = true;
@@ -71,6 +73,30 @@ export function DesignCenterPage() {
</div>
</div>
<div style={{ flex: 1 }} />
<button
className="btn btn-sm"
data-testid="dc-process-modeler"
onClick={() => navigate('/process-modeler')}
title="在线流程设计器:可视化编辑存量 BPMN 流程 / 新建流程"
>
流程设计
</button>
<button
className="btn btn-sm"
data-testid="dc-new-feature"
onClick={() => navigate('/new-feature')}
title="人走五环,从零搭建一个新功能(单表维护 / 树形 / 主子表,向导内选页面类型)"
>
+ 新建功能
</button>
<button
className="btn btn-sm"
data-testid="dc-ai-feature"
onClick={() => navigate('/ai-feature')}
title="AI 加速器:外部 agent 起草,人审后进设计器"
>
⚡ AI 建功能
</button>
<div className="gsearch" style={{ width: 280 }}>
<input
value={q}

View File

@@ -0,0 +1,66 @@
import { describe, expect, it, vi, beforeEach } from 'vitest';
import { render, screen, fireEvent } from '@testing-library/react';
import { useState } from 'react';
import { buildAttribute, FieldTable, type FieldRow } from './ModelerFields';
vi.mock('../api/meta', () => ({ listEntities: vi.fn(), listEntityColumns: vi.fn() }));
describe('buildAttribute 映射', () => {
it('文本→string,带 length/display/mandatory', () => {
const r: FieldRow = { column: 'TITLE', display: '标题', type: '文本', length: 200, mandatory: true };
expect(buildAttribute(r)).toEqual({ column: 'TITLE', type: 'string', length: 200, display: '标题', mandatory: true });
});
it('整数→integer,无 length', () => {
const r: FieldRow = { column: 'QTY', display: '数量', type: '整数' };
expect(buildAttribute(r)).toEqual({ column: 'QTY', type: 'integer', display: '数量' });
});
it('小数→number / 日期→date / 日期时间→datetime / 布尔→boolean', () => {
expect(buildAttribute({ column: 'A', display: 'a', type: '小数' }).type).toBe('number');
expect(buildAttribute({ column: 'B', display: 'b', type: '日期' }).type).toBe('date');
expect(buildAttribute({ column: 'C', display: 'c', type: '日期时间' }).type).toBe('datetime');
expect(buildAttribute({ column: 'D', display: 'd', type: '布尔' }).type).toBe('boolean');
});
it('引用→reference,带 referenceTable', () => {
const r: FieldRow = { column: 'DEPARTID', display: '部门', type: '引用', referenceTable: 'SYS_DEPART' };
expect(buildAttribute(r)).toEqual({ column: 'DEPARTID', type: 'reference', display: '部门', referenceTable: 'SYS_DEPART' });
});
it('mandatory=false 不输出该键', () => {
const r: FieldRow = { column: 'X', display: 'x', type: '文本', length: 50, mandatory: false };
expect('mandatory' in buildAttribute(r)).toBe(false);
});
});
function Harness() {
const [rows, setRows] = useState<FieldRow[]>([]);
return (
<div>
<FieldTable rows={rows} onChange={setRows} />
<div data-testid="count">{rows.length}</div>
</div>
);
}
describe('FieldTable 交互', () => {
beforeEach(() => { /* no-op */ });
it('加字段:填列名/显示名/选类型→提交→出现在表里', () => {
render(<Harness />);
fireEvent.click(screen.getByTestId('field-add'));
fireEvent.change(screen.getByTestId('field-column'), { target: { value: 'TITLE' } });
fireEvent.change(screen.getByTestId('field-display'), { target: { value: '标题' } });
fireEvent.change(screen.getByTestId('field-type'), { target: { value: '文本' } });
fireEvent.change(screen.getByTestId('field-length'), { target: { value: '200' } });
fireEvent.click(screen.getByTestId('field-submit'));
expect(screen.getByText('TITLE')).toBeInTheDocument();
expect(screen.getByTestId('count').textContent).toBe('1');
});
it('文本类型显示 length 输入,整数类型隐藏', () => {
render(<Harness />);
fireEvent.click(screen.getByTestId('field-add'));
fireEvent.change(screen.getByTestId('field-type'), { target: { value: '文本' } });
expect(screen.getByTestId('field-length')).toBeInTheDocument();
fireEvent.change(screen.getByTestId('field-type'), { target: { value: '整数' } });
expect(screen.queryByTestId('field-length')).not.toBeInTheDocument();
});
});

166
src/pages/ModelerFields.tsx Normal file
View File

@@ -0,0 +1,166 @@
// 字段表 + 加字段 Dialog + UI 类型↔api 类型映射。
// 纯 HTML <table>(本仓无可复用表格组件)+ components/ui/Dialog。
import { useState } from 'react';
import type { Dispatch, SetStateAction } from 'react';
import { Dialog } from '../components/ui/Dialog';
import type { EntityAttr, AttrType } from '../api/meta';
import { ReferencePicker } from './ReferencePicker';
export type UiType = '文本' | '整数' | '小数' | '日期' | '日期时间' | '布尔' | '引用';
export interface FieldRow {
column: string;
display: string;
type: UiType;
length?: number;
mandatory?: boolean;
referenceTable?: string;
}
const UI_TYPES: UiType[] = ['文本', '整数', '小数', '日期', '日期时间', '布尔', '引用'];
const TYPE_MAP: Record<UiType, AttrType> = {
文本: 'string',
整数: 'integer',
小数: 'number',
日期: 'date',
日期时间: 'datetime',
布尔: 'boolean',
引用: 'reference',
};
/** UI 行 → api EntityAttr。length 仅文本有意义;mandatory=false 不输出;引用带 referenceTable。 */
export function buildAttribute(row: FieldRow): EntityAttr {
const attr: EntityAttr = { column: row.column, type: TYPE_MAP[row.type] };
if (row.display) attr.display = row.display;
if (row.type === '文本' && typeof row.length === 'number') attr.length = row.length;
if (row.mandatory) attr.mandatory = true;
if (row.type === '引用' && row.referenceTable) attr.referenceTable = row.referenceTable;
return attr;
}
interface FieldTableProps {
rows: FieldRow[];
onChange: Dispatch<SetStateAction<FieldRow[]>>;
}
export function FieldTable({ rows, onChange }: FieldTableProps) {
const [adding, setAdding] = useState(false);
// 加字段草稿
const [column, setColumn] = useState('');
const [display, setDisplay] = useState('');
const [type, setType] = useState<UiType>('文本');
const [length, setLength] = useState('200');
const [mandatory, setMandatory] = useState(false);
const [refTable, setRefTable] = useState('');
function openAdd() {
setColumn('');
setDisplay('');
setType('文本');
setLength('200');
setMandatory(false);
setRefTable('');
setAdding(true);
}
const columnValid = /^[A-Z][A-Z0-9_]{0,40}$/.test(column);
const refOk = type !== '引用' || !!refTable;
const canAdd = columnValid && !!display && refOk;
function submitField() {
const row: FieldRow = { column, display, type };
if (type === '文本') row.length = Number(length) || undefined;
if (mandatory) row.mandatory = true;
if (type === '引用') row.referenceTable = refTable;
onChange((prev) => [...prev, row]);
setAdding(false);
}
function removeRow(i: number) {
onChange((prev) => prev.filter((_, idx) => idx !== i));
}
return (
<div>
<div style={{ display: 'flex', alignItems: 'center', marginBottom: 6 }}>
<span className="sub-text" style={{ flex: 1 }}>字段(标准列由后端自动追加,无需在此添加 ID/创建人等)</span>
<button className="btn btn-sm" type="button" data-testid="field-add" onClick={openAdd}>加字段</button>
</div>
<table style={{ width: '100%', borderCollapse: 'collapse', fontSize: 'var(--fs)' }}>
<thead>
<tr style={{ textAlign: 'left', color: 'var(--text-3)' }}>
<th style={{ padding: '6px 10px', borderBottom: '1px solid var(--line)' }}>列名</th>
<th style={{ padding: '6px 10px', borderBottom: '1px solid var(--line)' }}>显示名</th>
<th style={{ padding: '6px 10px', borderBottom: '1px solid var(--line)' }}>类型</th>
<th style={{ padding: '6px 10px', borderBottom: '1px solid var(--line)' }}>必填</th>
<th style={{ padding: '6px 10px', borderBottom: '1px solid var(--line)' }} />
</tr>
</thead>
<tbody>
{rows.length === 0 ? (
<tr><td colSpan={5} style={{ padding: '10px', color: 'var(--text-3)' }}>尚无字段</td></tr>
) : (
rows.map((r, i) => (
<tr key={i} data-testid="field-row">
<td style={{ padding: '6px 10px', borderBottom: '1px solid var(--line)' }}>{r.column}</td>
<td style={{ padding: '6px 10px', borderBottom: '1px solid var(--line)' }}>{r.display}</td>
<td style={{ padding: '6px 10px', borderBottom: '1px solid var(--line)' }}>
{r.type}{r.type === '引用' && r.referenceTable ? `→${r.referenceTable}` : ''}
</td>
<td style={{ padding: '6px 10px', borderBottom: '1px solid var(--line)' }}>{r.mandatory ? '是' : ''}</td>
<td style={{ padding: '6px 10px', borderBottom: '1px solid var(--line)' }}>
<span className="link" style={{ fontSize: 11 }} onClick={() => removeRow(i)}>删除</span>
</td>
</tr>
))
)}
</tbody>
</table>
{adding ? (
<Dialog
title="加字段"
width={520}
onClose={() => setAdding(false)}
foot={
<>
<button className="btn" type="button" onClick={() => setAdding(false)}>取消</button>
<button className="btn btn-primary" type="button" data-testid="field-submit" disabled={!canAdd} onClick={submitField}>添加</button>
</>
}
>
<div style={{ display: 'grid', gap: 10 }}>
<label style={{ display: 'grid', gap: 4 }}>
<span className="sub-text">列名(大写字母开头)</span>
<input data-testid="field-column" value={column} onChange={(e) => setColumn(e.target.value.toUpperCase())} placeholder="TITLE" />
</label>
<label style={{ display: 'grid', gap: 4 }}>
<span className="sub-text">显示名</span>
<input data-testid="field-display" value={display} onChange={(e) => setDisplay(e.target.value)} placeholder="标题" />
</label>
<label style={{ display: 'grid', gap: 4 }}>
<span className="sub-text">类型</span>
<select data-testid="field-type" value={type} onChange={(e) => setType(e.target.value as UiType)}>
{UI_TYPES.map((t) => <option key={t} value={t}>{t}</option>)}
</select>
</label>
{type === '文本' ? (
<label style={{ display: 'grid', gap: 4 }}>
<span className="sub-text">长度</span>
<input data-testid="field-length" type="number" value={length} onChange={(e) => setLength(e.target.value)} />
</label>
) : null}
{type === '引用' ? (
<ReferencePicker value={refTable} onChange={setRefTable} />
) : null}
<label style={{ display: 'flex', alignItems: 'center', gap: 6 }}>
<input data-testid="field-mandatory" type="checkbox" checked={mandatory} onChange={(e) => setMandatory(e.target.checked)} />
<span className="sub-text">必填</span>
</label>
</div>
</Dialog>
) : null}
</div>
);
}

View File

@@ -0,0 +1,64 @@
import { describe, expect, it, vi, beforeEach } from 'vitest';
import { render, screen, fireEvent, waitFor } from '@testing-library/react';
import { ModelerPage, validateTableName } from './ModelerPage';
vi.mock('../api/meta', () => ({
listEntities: vi.fn(),
listEntityColumns: vi.fn(),
createEntity: vi.fn(),
}));
vi.mock('../auth/token', async (importOriginal) => ({
...(await importOriginal<typeof import('../auth/token')>()),
getProfile: vi.fn(),
}));
import { listEntities, createEntity } from '../api/meta';
import { getProfile } from '../auth/token';
const mList = vi.mocked(listEntities);
const mCreate = vi.mocked(createEntity);
const mProfile = vi.mocked(getProfile);
beforeEach(() => {
mList.mockReset();
mCreate.mockReset();
mProfile.mockReset();
mProfile.mockReturnValue({ userId: 'ADMIN', account: 'admin', name: '管理员', roles: [] });
mList.mockResolvedValue([{ entityId: 'E1', tablename: 'OA_DEMO', name: '演示' }]);
});
describe('validateTableName', () => {
it('合法表名通过', () => {
expect(validateTableName('OA_DEMO')).toBe(true);
expect(validateTableName('ABC')).toBe(true);
});
it('非法表名拒绝', () => {
expect(validateTableName('ab')).toBe(false); // 太短 + 小写
expect(validateTableName('1ABC')).toBe(false); // 数字开头
expect(validateTableName('OA-DEMO')).toBe(false); // 含非法字符
});
});
describe('ModelerPage', () => {
it('非管理员显示无权访问', () => {
mProfile.mockReturnValue({ userId: 'U9', account: 'zhang', name: '张三', roles: [] });
render(<ModelerPage />);
expect(screen.getByText(/仅管理员可用/)).toBeInTheDocument();
});
it('管理员加载并展示已有实体', async () => {
render(<ModelerPage />);
await waitFor(() => expect(screen.getByText('OA_DEMO')).toBeInTheDocument());
expect(mList).toHaveBeenCalled();
});
it('点新建实体打开 Dialog,非法表名禁用提交', async () => {
render(<ModelerPage />);
fireEvent.click(screen.getByTestId('modeler-new-entity'));
expect(screen.getByTestId('modeler-tablename')).toBeInTheDocument();
fireEvent.change(screen.getByTestId('modeler-tablename'), { target: { value: 'ab' } });
expect(screen.getByTestId('modeler-submit')).toBeDisabled();
fireEvent.change(screen.getByTestId('modeler-tablename'), { target: { value: 'OA_NEW' } });
expect(screen.getByTestId('modeler-submit')).not.toBeDisabled();
});
});

225
src/pages/ModelerPage.tsx Normal file
View File

@@ -0,0 +1,225 @@
// 建模器 —— NocoBase 式实体建模入口(五环第①环:元数据→表)。
// 仅管理员可用。展示已有实体清单 + 「新建实体」Dialog + 行内「加字段」Dialog。
// v2:可建新实体 + 给已有实体加字段(受控 ALTER 安全通道,只加列/恒可空)。字段表见同文件下方组件。
import { useEffect, useState } from 'react';
import { Dialog } from '../components/ui/Dialog';
import { getProfile, isAdminProfile } from '../auth/token';
import {
listEntities,
createEntity,
alterEntity,
type EntitySummary,
type EntityAttr,
} from '../api/meta';
import { FieldTable, buildAttribute, type FieldRow } from './ModelerFields';
export function validateTableName(t: string): boolean {
return /^[A-Z][A-Z0-9_]{2,40}$/.test(t);
}
export function ModelerPage() {
const profile = getProfile();
const isAdmin = isAdminProfile(profile);
const [entities, setEntities] = useState<EntitySummary[]>([]);
const [loading, setLoading] = useState(true);
const [error, setError] = useState('');
const [open, setOpen] = useState(false);
// 新建表单态
const [tablename, setTablename] = useState('');
const [name, setName] = useState('');
const [rows, setRows] = useState<FieldRow[]>([]);
const [submitting, setSubmitting] = useState(false);
const [submitErr, setSubmitErr] = useState('');
// 加字段(改表)态
const [alterTarget, setAlterTarget] = useState<string | null>(null);
const [alterRows, setAlterRows] = useState<FieldRow[]>([]);
const [alterSubmitting, setAlterSubmitting] = useState(false);
const [alterErr, setAlterErr] = useState('');
function reload() {
setLoading(true);
listEntities()
.then((es) => setEntities(es))
.catch((e: Error) => setError(e.message ?? '实体加载失败'))
.finally(() => setLoading(false));
}
useEffect(() => {
if (!isAdmin) return;
reload();
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [isAdmin]);
if (!isAdmin) {
return <div style={{ padding: 24, color: 'var(--text-3)' }}>建模器仅管理员可用。</div>;
}
const tableValid = validateTableName(tablename);
// 引用行必须选了目标表才合法(Task 17 填充 referenceTable)
const rowsValid = rows.every((r) => r.type !== '引用' || !!r.referenceTable);
const canSubmit = tableValid && rowsValid && !submitting;
// 加字段:至少一列,引用列必须选了目标表
const alterRowsValid = alterRows.length > 0 && alterRows.every((r) => r.type !== '引用' || !!r.referenceTable);
const canAlter = alterRowsValid && !alterSubmitting;
function openDialog() {
setTablename('');
setName('');
setRows([]);
setSubmitErr('');
setOpen(true);
}
async function submit() {
setSubmitting(true);
setSubmitErr('');
try {
const attributes: EntityAttr[] = rows.map(buildAttribute);
await createEntity({ tablename, name: name || undefined, attributes });
setOpen(false);
reload();
} catch (e) {
setSubmitErr((e as Error).message ?? '建表失败');
} finally {
setSubmitting(false);
}
}
function openAlter(table: string) {
setAlterTarget(table);
setAlterRows([]);
setAlterErr('');
}
async function submitAlter() {
if (!alterTarget) return;
setAlterSubmitting(true);
setAlterErr('');
try {
const attributes: EntityAttr[] = alterRows.map(buildAttribute);
await alterEntity(alterTarget, attributes);
setAlterTarget(null);
reload();
} catch (e) {
setAlterErr((e as Error).message ?? '加字段失败');
} finally {
setAlterSubmitting(false);
}
}
return (
<div style={{ height: '100%', overflow: 'auto', padding: 'var(--pad-lg)' }} data-testid="modeler">
<div style={{ display: 'flex', alignItems: 'center', gap: 16, marginBottom: 16, flexWrap: 'wrap' }}>
<div>
<h2 style={{ margin: 0, fontSize: 18, fontWeight: 600, color: 'var(--text)' }}>建模器</h2>
<div className="sub-text" style={{ marginTop: 4 }}>
新建实体(建表)。v1 只建新不改表 · 标准列由后端自动追加
</div>
</div>
<div style={{ flex: 1 }} />
<button className="btn btn-primary" data-testid="modeler-new-entity" onClick={openDialog}>
新建实体
</button>
</div>
{loading ? (
<div style={{ padding: 24, color: 'var(--text-3)' }}>加载中…</div>
) : error ? (
<div style={{ padding: 16, color: 'var(--err)' }}>实体加载失败:{error}</div>
) : entities.length === 0 ? (
<div className="empty">尚无实体,点「新建实体」开始</div>
) : (
<div className="card" style={{ padding: 0 }}>
<table style={{ width: '100%', borderCollapse: 'collapse', fontSize: 'var(--fs)' }}>
<thead>
<tr style={{ textAlign: 'left', color: 'var(--text-3)' }}>
<th style={{ padding: '8px 14px', borderBottom: '1px solid var(--line)' }}>表名</th>
<th style={{ padding: '8px 14px', borderBottom: '1px solid var(--line)' }}>显示名</th>
<th style={{ padding: '8px 14px', borderBottom: '1px solid var(--line)' }}>实体ID</th>
<th style={{ padding: '8px 14px', borderBottom: '1px solid var(--line)' }}>操作</th>
</tr>
</thead>
<tbody>
{entities.map((e) => (
<tr key={e.entityId} data-testid="modeler-entity-row">
<td style={{ padding: '8px 14px', borderBottom: '1px solid var(--line)' }} data-testid="modeler-entity-name">{e.tablename}</td>
<td style={{ padding: '8px 14px', borderBottom: '1px solid var(--line)' }}>{e.name}</td>
<td style={{ padding: '8px 14px', borderBottom: '1px solid var(--line)', color: 'var(--text-3)' }}>{e.entityId}</td>
<td style={{ padding: '8px 14px', borderBottom: '1px solid var(--line)' }}>
<button className="btn btn-sm" data-testid="modeler-add-field" onClick={() => openAlter(e.tablename)}>加字段</button>
</td>
</tr>
))}
</tbody>
</table>
</div>
)}
{open ? (
<Dialog
title="新建实体"
width={720}
onClose={() => setOpen(false)}
foot={
<>
<button className="btn" onClick={() => setOpen(false)}>取消</button>
<button className="btn btn-primary" data-testid="modeler-submit" disabled={!canSubmit} onClick={submit}>
{submitting ? '建表中…' : '建表'}
</button>
</>
}
>
<div style={{ display: 'grid', gap: 12 }}>
<label style={{ display: 'grid', gap: 4 }}>
<span className="sub-text">表名(大写字母开头,仅大写字母/数字/下划线,3–41 位)</span>
<input
data-testid="modeler-tablename"
value={tablename}
onChange={(ev) => setTablename(ev.target.value.toUpperCase())}
placeholder="OA_DEMO"
/>
{tablename && !tableValid ? (
<span style={{ color: 'var(--err)', fontSize: 11 }}>表名格式不合法</span>
) : null}
</label>
<label style={{ display: 'grid', gap: 4 }}>
<span className="sub-text">显示名(可选)</span>
<input value={name} onChange={(ev) => setName(ev.target.value)} placeholder="演示维护" />
</label>
<FieldTable rows={rows} onChange={setRows} />
{submitErr ? <div style={{ color: 'var(--err)', fontSize: 12 }}>{submitErr}</div> : null}
</div>
</Dialog>
) : null}
{alterTarget ? (
<Dialog
title={`加字段 · ${alterTarget}`}
width={720}
onClose={() => setAlterTarget(null)}
foot={
<>
<button className="btn" onClick={() => setAlterTarget(null)}>取消</button>
<button className="btn btn-primary" data-testid="modeler-alter-submit" disabled={!canAlter} onClick={submitAlter}>
{alterSubmitting ? '加字段中…' : '加字段'}
</button>
</>
}
>
<div style={{ display: 'grid', gap: 12 }}>
<div className="sub-text">
给已有实体 <b>{alterTarget}</b> 加列。受控 ALTER:只加列、恒可空(对有数据的表安全),不改/删既有列。
</div>
<FieldTable rows={alterRows} onChange={setAlterRows} />
{alterErr ? <div style={{ color: 'var(--err)', fontSize: 12 }}>{alterErr}</div> : null}
</div>
</Dialog>
) : null}
</div>
);
}

View File

@@ -0,0 +1,56 @@
import '@testing-library/jest-dom';
import { render, screen, fireEvent } from '@testing-library/react';
import { MemoryRouter } from 'react-router-dom';
import { vi, describe, it, expect } from 'vitest';
// NewFeatureShell 现以「先选页面类型卡 → 进 amis wizard」两段渲染(c735f24 合并入口)。amis SDK(amisRequire)
// 是 index.html 注入的全局 UMD,jsdom 下不存在 → wizard 内部不在单测渲染;其端到端行为由 Playwright
// (e2e/five-ring.spec、master-detail.spec) 覆盖。单测仅守:① admin 守卫;② admin 下先渲染页面类型选择卡;
// ③ 选一种类型后渲染 amis 挂载点(wizard 壳)。
let mockProfile: { userId: string; account: string; name: string; roles: string[] } | null = null;
vi.mock('../auth/token', async (importOriginal) => ({
...(await importOriginal<typeof import('../auth/token')>()),
getProfile: () => mockProfile,
}));
vi.mock('../components/AmisRenderer', () => ({ AmisRenderer: () => <div data-testid="amis-mount" /> }));
import { NewFeatureShell } from './NewFeatureShell';
function renderShell() {
return render(
<MemoryRouter>
<NewFeatureShell />
</MemoryRouter>,
);
}
describe('NewFeatureShell(amis wizard 壳)', () => {
it('非管理员:降级提示,不渲染壳', () => {
mockProfile = { userId: 'U1', account: 'user', name: 'u', roles: [] };
renderShell();
expect(screen.getByText(/仅管理员可用/)).toBeInTheDocument();
expect(screen.queryByTestId('new-feature-shell')).toBeNull();
});
it('管理员:先渲染壳容器 + 返回设计中心 + 页面类型选择卡(含主子表)', () => {
mockProfile = { userId: 'ADMIN', account: 'admin', name: 'x', roles: [] };
renderShell();
expect(screen.getByTestId('new-feature-shell')).toBeInTheDocument();
expect(screen.getByText('新建功能 · 人走五环')).toBeInTheDocument();
expect(screen.getByText('← 返回设计中心')).toBeInTheDocument();
// 先出页面类型选择卡(未选类型时不渲 wizard)。
expect(screen.getByTestId('recipe-chooser')).toBeInTheDocument();
expect(screen.getByTestId('dc-recipe-maintenance')).toBeInTheDocument();
expect(screen.getByTestId('dc-recipe-master-detail')).toBeInTheDocument();
expect(screen.queryByTestId('amis-mount')).toBeNull();
});
it('管理员:选页面类型后渲染 amis wizard 挂载点', () => {
mockProfile = { userId: 'ADMIN', account: 'admin', name: 'x', roles: [] };
renderShell();
fireEvent.click(screen.getByTestId('dc-recipe-master-detail'));
expect(screen.getByTestId('amis-mount')).toBeInTheDocument();
// 选类型后头部按钮变为「重选页面类型」。
expect(screen.getByText('← 重选页面类型')).toBeInTheDocument();
});
});

View File

@@ -0,0 +1,310 @@
// 人走五环 · 统一「新建功能」入口。先选页面类型(维护型CRUD / 树形 / 主子表),再进对应向导。
// 关键:页面类型在进向导前由 React 状态确定,向导步骤按类型在【构建时(JS)】分支(主子表才有「建子表」步
// 及派生/汇总字段)——不依赖 amis 运行时 step hiddenOn(amis Wizard.normalizeSteps 只在 props.data 变时
// 重算,向导内选择改的是 store.data 不触发重算,故 step 级动态跳步不可靠;构建时分支才健壮)。
// 各类型向导:① 建实体(post /api/meta/entity) →【主子表】② 建子表 → ③ 生成页面(post /api/design/recipe/compile)
// → ④ 发布(post /api/design/publish)。主实体 id/表名经 responseData remap 到 masterEntityId/masterTable。
// 红线:发布恒人审;standard 写入恒走后端 PageSchemaWriter(前端只调 /api/design/recipe/compile)。
import { useMemo, useState } from 'react';
import { useNavigate } from 'react-router-dom';
import { getProfile, isAdminProfile } from '../auth/token';
import { AmisRenderer } from '../components/AmisRenderer';
const TYPE_OPTIONS = [
{ label: '文本', value: 'string' },
{ label: '整数', value: 'integer' },
{ label: '小数', value: 'number' },
{ label: '日期', value: 'date' },
{ label: '日期时间', value: 'datetime' },
{ label: '布尔', value: 'boolean' },
{ label: '引用(外键)', value: 'reference' },
];
const RECIPE_CARDS = [
{ recipe: 'maintenance-crud-v1', testid: 'dc-recipe-maintenance', title: '维护型 CRUD',
desc: '单表:列表 + 查询 + 增删改。最常见的基础数据/业务维护页。' },
{ recipe: 'tree-crud-v1', testid: 'dc-recipe-tree', title: '树形 CRUD',
desc: '自引用层级(需含 PARENTID 列)。组织/分类/菜单等树状数据。' },
{ recipe: 'master-detail-v1', testid: 'dc-recipe-master-detail', title: '主子表',
desc: '主表 + 子表 EditGrid,子行随主记录级联保存。支持派生字段(金额=数量×单价)与父级汇总(总额=之和)。' },
];
/** 字段 combo(含引用列:type=引用 → 选 referenceTable,源 /api/meta/entities)。 */
function attrCombo(name: string, addButtonText: string): Record<string, unknown> {
return {
type: 'combo', name, label: '字段', multiple: true, addable: true, removable: true,
addButtonText, minLength: 1,
items: [
{
type: 'input-text', name: 'column', label: '列名', required: true, placeholder: 'TITLE',
columnClassName: 'w-sm', validations: { matchRegexp: '/^[A-Z][A-Z0-9_]{0,40}$/' },
validationErrors: { matchRegexp: '大写字母开头' },
},
{ type: 'input-text', name: 'display', label: '显示名', placeholder: '标题' },
{ type: 'select', name: 'type', label: '类型', value: 'string', options: TYPE_OPTIONS, columnClassName: 'w-xs' },
{
type: 'select', name: 'referenceTable', label: '引用目标实体',
source: 'get:/api/meta/entities', labelField: 'tablename', valueField: 'tablename',
searchable: true, visibleOn: '${type === "reference"}',
description: '渲染时显该实体的显示列而非裸 id',
},
{ type: 'switch', name: 'mandatory', label: '必填', value: false },
],
};
}
/** 按页面类型构建向导 amis schema(类型已由 React 状态固定,步骤构建时 JS 分支)。 */
function buildWizardSchema(recipe: string): Record<string, unknown> {
const isMD = recipe === 'master-detail-v1';
const isTree = recipe === 'tree-crud-v1';
const steps: Record<string, unknown>[] = [];
// ① 建实体(主子表则为主实体)
steps.push({
title: '① 建实体',
subTitle: isMD ? '主表元数据' : '元数据 + 物理表',
hint: isTree
? '树形请在字段里加 PARENTID 列(自引用父节点);标准列后端自动补。'
: '标准列(主键/审计/版本)后端自动补齐,无需在此添加。',
api: { method: 'post', url: '/api/meta/entity', responseData: { masterEntityId: '${entityId}', masterTable: '${tablename}' } },
body: [
{
type: 'input-text', name: 'tablename', label: isMD ? '主表名' : '表名', required: true, placeholder: 'OA_DEMO',
description: '大写字母开头,仅大写字母/数字/下划线,3–41 位',
validations: { matchRegexp: '/^[A-Z][A-Z0-9_]{2,40}$/' },
validationErrors: { matchRegexp: '表名格式不合法(大写字母开头,3–41 位)' },
},
{ type: 'input-text', name: 'name', label: '显示名', placeholder: '演示(可选)' },
{
type: 'select', name: 'entitytype', label: '所属分类', required: true,
source: 'get:/api/meta/entity-types', labelField: 'name', valueField: 'id',
searchable: true, clearable: true,
description: isMD ? '主表与子表共用此分类' : '实体归类(SYS_ENTITYTYPE),决定新功能挂在哪个功能域',
},
attrCombo('attributes', '加字段'),
],
});
// ② 建子表(仅主子表)
if (isMD) {
steps.push({
title: '② 建子表',
subTitle: '明细',
hint: '子表自动加一列 MASTERID 指向主表(回链外键),无需手动添加。',
api: {
method: 'post', url: '/api/meta/entity',
data: {
tablename: '${childTablename}', name: '${childName}', entitytype: '${entitytype}',
tabletype: 1, masterTable: '${masterTable}', attributes: '${childAttributes}',
},
},
body: [
{ type: 'static', name: 'masterTable', label: '主表' },
{
type: 'input-text', name: 'childTablename', label: '子表名', required: true, placeholder: 'OA_PURCHASE_ITEM',
validations: { matchRegexp: '/^[A-Z][A-Z0-9_]{2,40}$/' }, validationErrors: { matchRegexp: '表名格式不合法' },
},
{ type: 'input-text', name: 'childName', label: '子表显示名', placeholder: '采购明细' },
attrCombo('childAttributes', '加子表字段'),
],
});
}
// ③ 生成页面(主子表多派生/汇总字段)
const genBody: Record<string, unknown>[] = [
{ type: 'static', name: 'masterTable', label: isMD ? '主表' : '实体表' },
];
if (isMD) {
genBody.push({ type: 'static', label: '子表', tpl: '${childTablename}' });
}
genBody.push(
{ type: 'input-text', name: 'title', label: '页面标题', required: true, placeholder: '如:客户等级维护' },
{ type: 'input-text', name: 'displayField', label: '显示字段', placeholder: '可选,默认取实体显示列' },
);
if (!isMD) {
genBody.push({ type: 'input-number', name: 'pageSize', label: '每页条数', placeholder: '可选,默认 20', min: 1, max: 200 });
}
if (isMD) {
genBody.push(
{
type: 'static', label: '可用子表列', tpl: '${childAttributes|pick:column|join:"、"}',
visibleOn: '${childAttributes && childAttributes.length}',
},
{
type: 'combo', name: 'childDerived', label: '派生字段', multiple: true,
addable: true, removable: true, addButtonText: '加派生字段', minLength: 0,
description: '可选。如 金额=数量×单价:目标列填 MONEY、公式填 QTY*PRICE。'
+ '公式仅用子表列名与 + - * / ( ),落库前服务端逐行权威求算,单元格实时预览。',
items: [
{ type: 'input-text', name: 'column', label: '目标列', required: true, placeholder: 'MONEY',
validations: { matchRegexp: '/^[A-Z][A-Z0-9_]{0,40}$/' },
validationErrors: { matchRegexp: '须为大写字母开头的子表真实列' } },
{ type: 'input-text', name: 'formula', label: '公式', required: true, placeholder: 'QTY*PRICE' },
],
},
{
type: 'combo', name: 'childRollup', label: '汇总字段', multiple: true,
addable: true, removable: true, addButtonText: '加汇总字段', minLength: 0,
description: '可选。如 申请总额=明细金额之和:主表列填 TOTAL、子表列填 AMOUNT、函数选 SUM。'
+ '主表列须为主实体真实列、子表列须为子表真实列;落库前服务端权威聚合,主表单只读实时预览。',
items: [
{ type: 'input-text', name: 'masterColumn', label: '主表列', required: true, placeholder: 'TOTAL',
validations: { matchRegexp: '/^[A-Z][A-Z0-9_]{0,40}$/' },
validationErrors: { matchRegexp: '须为大写字母开头的主表真实列' } },
{ type: 'input-text', name: 'childColumn', label: '子表列', required: true, placeholder: 'AMOUNT',
validations: { matchRegexp: '/^[A-Z][A-Z0-9_]{0,40}$/' },
validationErrors: { matchRegexp: '须为大写字母开头的子表真实列' } },
{ type: 'select', name: 'agg', label: '函数', value: 'SUM', options: [
{ label: '求和 SUM', value: 'SUM' }, { label: '计数 COUNT', value: 'COUNT' },
{ label: '平均 AVG', value: 'AVG' }, { label: '最小 MIN', value: 'MIN' },
{ label: '最大 MAX', value: 'MAX' }] },
],
},
{
type: 'combo', name: 'childLinkage', label: '引用联动', multiple: true,
addable: true, removable: true, addButtonText: '加引用联动', minLength: 0,
description: '可选。子表「引用列」(类型=引用)选中某条记录时,自动带出该记录的其它列到同行子列。'
+ '如 选物料→带出单价/规格:引用列填 ITEMID(须为引用类型子列);带出映射 目标子列 ITEMPRICE ← 源列 PRICE。'
+ '选中时实时填充,提交保存所填值。',
items: [
{ type: 'input-text', name: 'refColumn', label: '引用列', required: true, placeholder: 'ITEMID',
columnClassName: 'w-sm', validations: { matchRegexp: '/^[A-Z][A-Z0-9_]{0,40}$/' },
validationErrors: { matchRegexp: '须为大写字母开头的引用类型子列' } },
{
type: 'combo', name: 'fills', label: '带出映射', multiple: true,
addable: true, removable: true, addButtonText: '加带出', minLength: 1,
items: [
{ type: 'input-text', name: 'target', label: '目标子列', required: true, placeholder: 'ITEMPRICE',
validations: { matchRegexp: '/^[A-Z][A-Z0-9_]{0,40}$/' },
validationErrors: { matchRegexp: '须为大写字母开头的子表真实列' } },
{ type: 'input-text', name: 'source', label: '源列(引用实体)', required: true, placeholder: 'PRICE',
validations: { matchRegexp: '/^[A-Z][A-Z0-9_]{0,40}$/' },
validationErrors: { matchRegexp: '须为大写字母开头的引用实体列' } },
],
},
],
},
);
}
const compileData: Record<string, unknown> = {
tableName: '${masterTable}', recipe, title: '${title}', displayField: '${displayField}',
};
if (isMD) {
Object.assign(compileData, {
childTable: '${childTablename}', linkColumn: 'MASTERID', listColumn: 'DETAILS', listLabel: '${childName}',
childDerived: '${childDerived}', childRollup: '${childRollup}', childLinkage: '${childLinkage}',
});
} else {
compileData.pageSize = '${pageSize}';
}
steps.push({
title: isMD ? '③ 生成主子页' : '③ 生成页面',
subTitle: '编译落标准层',
api: { method: 'post', url: '/api/design/recipe/compile', data: compileData, responseData: { templateId: '${templateId}' } },
body: genBody,
});
// ④ 发布
steps.push({
title: '④ 发布',
subTitle: '五流 + 菜单 + 部署包',
api: {
method: 'post', url: '/api/design/publish',
data: {
entityId: '${masterEntityId}', tableName: '${masterTable}', templateId: '${templateId}',
menuName: '${menuName}', generateDeploymentPackage: true,
},
},
body: [
{ type: 'static', name: 'templateId', label: '已生成模板' },
{ type: 'input-text', name: 'menuName', label: '菜单名', required: true, value: '${title}' },
{
type: 'button', label: '进设计器微调', level: 'enhance', className: 'mb-2',
actionType: 'url', url: '/editor.html?templateId=${templateId}', blank: true, visibleOn: '${templateId}',
},
{
type: 'alert', level: 'info',
body: '发布 = 写标准页 + 触发默认服务流 + 注册菜单(当前环境立即可用),并生成生产部署包供人审上线(发布恒人审)。'
+ (isMD ? '主子表的子行经主表 _ADD 流随主记录级联落库。' : ''),
},
],
});
return {
type: 'page',
className: 'h-full',
data: { childDerived: [], childRollup: [], childLinkage: [] },
body: {
type: 'wizard',
mode: 'horizontal',
actionPrevLabel: '上一步',
actionNextLabel: '下一步',
actionNextSaveLabel: '保存并下一步',
actionFinishLabel: '完成(发布)',
renderStepIndicator: true,
steps,
onEvent: {
finished: {
actions: [{ actionType: 'toast', args: { msgType: 'success', msg: '已发布:菜单已注册,可在左侧菜单查看新功能。' } }],
},
},
},
};
}
/** 页面类型选择卡。 */
function RecipeChooser({ onPick }: { onPick: (recipe: string) => void }) {
return (
<div data-testid="recipe-chooser" style={{ display: 'flex', gap: 16, flexWrap: 'wrap', maxWidth: 980 }}>
{RECIPE_CARDS.map((c) => (
<button
key={c.recipe}
data-testid={c.testid}
onClick={() => onPick(c.recipe)}
style={{
flex: '1 1 280px', minWidth: 260, textAlign: 'left', cursor: 'pointer',
background: 'var(--surface)', border: '1px solid var(--line)', borderRadius: 10,
padding: '18px 20px', display: 'flex', flexDirection: 'column', gap: 8,
}}
>
<span style={{ fontSize: 16, fontWeight: 600, color: 'var(--text)' }}>{c.title}</span>
<span style={{ fontSize: 13, color: 'var(--text-3)', lineHeight: 1.6 }}>{c.desc}</span>
</button>
))}
</div>
);
}
export function NewFeatureShell() {
const navigate = useNavigate();
const profile = getProfile();
const isAdmin = isAdminProfile(profile);
const [recipe, setRecipe] = useState<string | null>(null);
const schema = useMemo(() => (recipe ? buildWizardSchema(recipe) : null), [recipe]);
if (!isAdmin) {
return <div style={{ padding: 24, color: 'var(--text-3)' }}>新建功能仅管理员可用。</div>;
}
return (
<div style={{ height: '100%', display: 'flex', flexDirection: 'column' }} data-testid="new-feature-shell">
<div style={{ display: 'flex', alignItems: 'center', gap: 12, padding: 'var(--pad-lg)', paddingBottom: 8 }}>
<button className="btn btn-sm" onClick={() => (recipe ? setRecipe(null) : navigate('/design-center'))}>
{recipe ? '← 重选页面类型' : '← 返回设计中心'}
</button>
<h2 style={{ margin: 0, fontSize: 18, fontWeight: 600 }}>新建功能 · 人走五环</h2>
</div>
<div style={{ flex: 1, minHeight: 0, overflow: 'auto', padding: '0 var(--pad-lg) var(--pad-lg)' }}>
{schema ? (
<AmisRenderer schema={schema} />
) : (
<>
<div className="sub-text" style={{ marginBottom: 14 }}>先选页面类型,再走「建实体 → 生成页面 → 发布」。</div>
<RecipeChooser onPick={setRecipe} />
</>
)}
</div>
</div>
);
}

View File

@@ -0,0 +1,448 @@
import { describe, it, expect, vi, beforeEach } from 'vitest';
import { render, screen, waitFor, fireEvent, act } from '@testing-library/react';
import { MemoryRouter } from 'react-router-dom';
import { SYNTHETIC_BPMN } from '../modeler/moddle/fixtures/synthetic-full-surface.bpmn';
// bpmn-js Modeler:jsdom 跑不动真渲染,stub 成类(可断言 importXML/saveXML/destroy 调用)。
const { importXMLMock, saveXMLMock, destroyMock, getMock, onMock, attachToMock, ModelerCtor } = vi.hoisted(() => {
const importXMLMock = vi.fn();
const saveXMLMock = vi.fn();
const destroyMock = vi.fn();
const attachToMock = vi.fn();
const getMock = vi.fn((service: string) => {
if (service === 'propertiesPanel') return { attachTo: attachToMock };
if (service === 'canvas') return { zoom: vi.fn() };
return {};
});
const onMock = vi.fn();
const ModelerCtor = vi.fn().mockImplementation(() => ({
importXML: importXMLMock,
saveXML: saveXMLMock,
destroy: destroyMock,
get: getMock,
on: onMock,
}));
return { importXMLMock, saveXMLMock, destroyMock, getMock, onMock, attachToMock, ModelerCtor };
});
vi.mock('bpmn-js/lib/Modeler', () => ({ default: ModelerCtor }));
// 标准属性面板模块只作为 additionalModules 配置项传入被 mock 的 Modeler,永不真正执行。
vi.mock('bpmn-js-properties-panel', () => ({
BpmnPropertiesPanelModule: {},
BpmnPropertiesProviderModule: {},
}));
vi.mock('../api/processModeler', () => ({
fetchProcDefSource: vi.fn(),
fetchProcDefSourceByKey: vi.fn(),
fetchProcessOptions: vi.fn(),
// Eip4Panel(右栏叠板)挂载时拉 formKey 数据源——mock 成空列表避免真请求。
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()),
// 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<typeof import('../auth/token')>()),
getProfile: vi.fn(),
}));
import { ProcessModelerPage } from './ProcessModelerPage';
import {
fetchProcDefSource,
fetchProcDefSourceByKey,
fetchProcessOptions,
listModels,
getModel,
createDraft,
saveDraft,
draftFromProcDef,
deleteDraft,
deployModel,
fetchImpact,
} from '../api/processModeler';
import { getProfile } from '../auth/token';
const mSource = vi.mocked(fetchProcDefSource);
const mSourceByKey = vi.mocked(fetchProcDefSourceByKey);
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 mDeploy = vi.mocked(deployModel);
const mImpact = vi.mocked(fetchImpact);
const mProfile = vi.mocked(getProfile);
function renderPage(initialPath = '/process-modeler') {
return render(
<MemoryRouter initialEntries={[initialPath]}>
<ProcessModelerPage />
</MemoryRouter>,
);
}
beforeEach(() => {
importXMLMock.mockReset().mockResolvedValue(undefined);
saveXMLMock.mockReset().mockResolvedValue({ xml: '<edited/>' });
destroyMock.mockReset();
attachToMock.mockReset();
getMock.mockClear();
onMock.mockReset();
ModelerCtor.mockClear();
mSource.mockReset().mockResolvedValue({ found: true, bpmnXml: SYNTHETIC_BPMN, idMap: { '总包合同交底': 'Proc_zbht' } });
mSourceByKey.mockReset().mockResolvedValue({ found: true, bpmnXml: SYNTHETIC_BPMN, idMap: { '总包合同交底': 'Proc_zbht' } });
mOptions.mockReset().mockResolvedValue([]);
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);
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: [] });
});
describe('ProcessModelerPage', () => {
it('admin 渲染画布容器与标准属性面板容器', async () => {
renderPage();
expect(screen.getByTestId('process-modeler-canvas')).toBeInTheDocument();
expect(screen.getByTestId('process-modeler-props')).toBeInTheDocument();
// flush Eip4Panel 挂载期 fetchWfTemplates 的 setState(避免 act 告警)
await act(async () => {
await Promise.resolve();
});
});
it('非 admin 降级为「仅管理员可用」文案,不渲染画布', () => {
mProfile.mockReturnValue({ userId: 'U9', account: 'zhang', name: '张三', roles: [] });
renderPage();
expect(screen.getByText(/仅管理员可用/)).toBeInTheDocument();
expect(screen.queryByTestId('process-modeler-canvas')).not.toBeInTheDocument();
});
it('?procDefId= 时载入存量流程并把返回的 bpmnXml 交给 Modeler.importXML', async () => {
renderPage('/process-modeler?procDefId=PD-1');
await waitFor(() => expect(mSource).toHaveBeenCalledWith('PD-1'));
await waitFor(() => expect(importXMLMock).toHaveBeenCalledWith(SYNTHETIC_BPMN));
expect(ModelerCtor).toHaveBeenCalledTimes(1);
});
it('构造后显式 attachTo 属性面板容器一次(修 live 面板从不挂载)', async () => {
renderPage('/process-modeler?procDefId=PD-1');
await waitFor(() => expect(attachToMock).toHaveBeenCalledTimes(1));
expect(attachToMock).toHaveBeenCalledWith(screen.getByTestId('process-modeler-props'));
});
it('接口 found:false 时显示未找到文案且不 importXML', async () => {
mSource.mockResolvedValue({ found: false });
renderPage('/process-modeler?procDefId=PD-x');
await waitFor(() => expect(screen.getByText(/未找到|无 BPMN|加载失败/)).toBeInTheDocument());
expect(importXMLMock).not.toHaveBeenCalled();
});
it('无参时展示「打开存量流程」选择器(数据源 process-select)', async () => {
mOptions.mockResolvedValue([{ label: '总包合同交底', value: '总包合同交底', source: 'model', id: 'MDL-1', key: 'zbht' }]);
renderPage();
await waitFor(() => expect(mOptions).toHaveBeenCalled());
expect(screen.getByTestId('process-modeler-open-select')).toBeInTheDocument();
expect(await screen.findByText('总包合同交底')).toBeInTheDocument();
});
it('?procKey= 时走 by-key 载入并 importXML(source=model 语义缺口修复)', async () => {
renderPage('/process-modeler?procKey=' + encodeURIComponent('总包合同交底'));
await waitFor(() => expect(mSourceByKey).toHaveBeenCalledWith('总包合同交底'));
await waitFor(() => expect(importXMLMock).toHaveBeenCalledWith(SYNTHETIC_BPMN));
expect(mSource).not.toHaveBeenCalled(); // 未走 by-id 路径
});
it('选中 source=model 选项 → 派到 by-key(procKey),不走 by-id', async () => {
mOptions.mockResolvedValue([{ label: '模型流程', value: '模型流程', source: 'model', id: 'MDL-9', key: 'MKEY' }]);
renderPage();
const select = await screen.findByTestId('process-modeler-open-select');
await screen.findByText('模型流程');
fireEvent.change(select, { target: { value: '0' } });
await waitFor(() => expect(mSourceByKey).toHaveBeenCalledWith('MKEY'));
expect(mSource).not.toHaveBeenCalled();
});
it('选中 source=processDefinition 选项 → 派到 by-id(procDefId)', async () => {
mOptions.mockResolvedValue([
{ label: '部署流程', value: '部署流程', source: 'processDefinition', id: '部署流程:3:uuid', key: 'k' },
]);
renderPage();
const select = await screen.findByTestId('process-modeler-open-select');
await screen.findByText('部署流程');
fireEvent.change(select, { target: { value: '0' } });
await waitFor(() => expect(mSource).toHaveBeenCalledWith('部署流程:3:uuid'));
expect(mSourceByKey).not.toHaveBeenCalled();
});
// 🔴 红线回归(T1.5 评审遗留 + T2.4 顺带收口):双包冲突会静默丢弃 userTask,
// 故构造参数必须锁死——moddleExtensions 键恰为 ['activiti'],additionalModules 长度恰 2。
// 防「顺手」加 Camunda provider / 双载 flowable 描述符导致静默回归。
it('红线:Modeler 构造参数 moddleExtensions 键恰 [activiti] 且 additionalModules 长度 2', async () => {
renderPage('/process-modeler?procDefId=PD-1');
await waitFor(() => expect(ModelerCtor).toHaveBeenCalledTimes(1));
const opts = ModelerCtor.mock.calls[0][0] as {
moddleExtensions: Record<string, unknown>;
additionalModules: unknown[];
};
expect(Object.keys(opts.moddleExtensions)).toEqual(['activiti']);
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(JSON.parse(body.metaInfo!)).toHaveProperty('sourceProcDefId'); // 结构对齐 from-procdef
expect(mFromProcDef).not.toHaveBeenCalled();
});
it('I-2 首存后回填 ?modelId=(令刷新幂等):触发按 modelId 重载', 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());
// 回填 ?modelId=NEW-1 → 载入效果按 modelId 重载(getModel)——证明 setParams 已写入。
await waitFor(() => expect(mGetModel).toHaveBeenCalledWith('NEW-1'));
});
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 → 回填 ?modelId= → 重载
await waitFor(() => expect(mCreateDraft).toHaveBeenCalled());
await waitFor(() => expect(mGetModel).toHaveBeenCalledWith('NEW-1')); // 回填后重载完成
await waitFor(() => expect(saveBtn()).not.toBeDisabled()); // saving 复位 + 重载就绪
fireEvent.click(saveBtn()); // 二次:PUT NEW-1(modelId 已在)
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();
});
// ── 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: '<edited/>' }));
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(
'&quot;type&quot;:&quot;position&quot;',
'&quot;type&quot;:&quot;user&quot;',
);
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('办理人变更');
});
// ── T4.1 新建流程(模板库 + NewProcessDialog;NewProcessDialog 不 mock,跑真实例化) ─────
it('“新建流程”按钮可用并打开新建对话框', async () => {
renderPage();
const btn = await screen.findByTestId('process-modeler-new');
expect(btn).not.toBeDisabled();
fireEvent.click(btn);
expect(await screen.findByTestId('new-process-name')).toBeInTheDocument();
expect(screen.getByTestId('new-process-template')).toBeInTheDocument();
});
it('新建确认→挂 Modeler 并 importXML 模板实例化 XML(process id=用户 key,不取存量源)', async () => {
renderPage();
fireEvent.click(await screen.findByTestId('process-modeler-new'));
fireEvent.change(await screen.findByTestId('new-process-name'), { target: { value: '请假审批' } });
fireEvent.change(screen.getByTestId('new-process-key'), { target: { value: 'leaveApply' } });
fireEvent.change(screen.getByTestId('new-process-template'), { target: { value: 'single-approval' } });
fireEvent.click(screen.getByTestId('new-process-confirm'));
await waitFor(() => expect(importXMLMock).toHaveBeenCalled());
const xml = importXMLMock.mock.calls[0][0] as string;
expect(xml).toContain('id="leaveApply"');
expect(xml).toContain('userTask');
expect(xml).not.toContain('__PROCESS_ID__');
// 新建不走任何存量/草稿取源。
expect(mSource).not.toHaveBeenCalled();
expect(mSourceByKey).not.toHaveBeenCalled();
expect(mGetModel).not.toHaveBeenCalled();
// 打开器叠层消失(newDraft 激活)。
expect(screen.queryByTestId('process-modeler-open-select')).not.toBeInTheDocument();
});
it('新建会签模板→importXML 含 multiInstance', async () => {
renderPage();
fireEvent.click(await screen.findByTestId('process-modeler-new'));
fireEvent.change(await screen.findByTestId('new-process-name'), { target: { value: '会签' } });
fireEvent.change(screen.getByTestId('new-process-key'), { target: { value: 'cosignFlow' } });
fireEvent.change(screen.getByTestId('new-process-template'), { target: { value: 'cosign' } });
fireEvent.click(screen.getByTestId('new-process-confirm'));
await waitFor(() => expect(importXMLMock).toHaveBeenCalled());
expect(importXMLMock.mock.calls[0][0] as string).toContain('multiInstanceLoopCharacteristics');
});
it('新建后存草稿→createDraft 带展示名/key/空 eip4IdMap,回填 ?modelId= 重载', async () => {
renderPage();
fireEvent.click(await screen.findByTestId('process-modeler-new'));
fireEvent.change(await screen.findByTestId('new-process-name'), { target: { value: '请假审批' } });
fireEvent.change(screen.getByTestId('new-process-key'), { target: { value: 'leaveApply' } });
fireEvent.click(screen.getByTestId('new-process-confirm'));
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.name).toBe('请假审批'); // 展示名(非 key)
expect(body.key).toBe('leaveApply');
expect(JSON.parse(body.metaInfo!).eip4IdMap).toEqual({}); // ASCII key 无还原映射
expect(mFromProcDef).not.toHaveBeenCalled();
// 首存回填 ?modelId=NEW-1 → 按 modelId 重载。
await waitFor(() => expect(mGetModel).toHaveBeenCalledWith('NEW-1'));
});
it('新建中文 key→process id 净化为 ASCII,createDraft.metaInfo.eip4IdMap 记录还原映射', async () => {
renderPage();
fireEvent.click(await screen.findByTestId('process-modeler-new'));
fireEvent.change(await screen.findByTestId('new-process-name'), { target: { value: '总包合同交底' } });
fireEvent.change(screen.getByTestId('new-process-key'), { target: { value: '总包合同交底' } });
fireEvent.click(screen.getByTestId('new-process-confirm'));
await waitFor(() => expect(importXMLMock).toHaveBeenCalled());
expect(importXMLMock.mock.calls[0][0] as string).not.toContain('id="总包合同交底"');
await waitFor(() => expect(saveBtn()).not.toBeDisabled());
fireEvent.click(saveBtn());
await waitFor(() => expect(mCreateDraft).toHaveBeenCalled());
const meta = JSON.parse(mCreateDraft.mock.calls[0][0].metaInfo!);
expect(Object.keys(meta.eip4IdMap)).toEqual(['总包合同交底']);
});
});

View File

@@ -0,0 +1,594 @@
// 在线流程 Modeler(B3)——可编辑 BPMN 设计器页。
// T1.5 骨架:admin 门 + 三栏布局 + bpmn-js Modeler + 存量只读载入。
// T2.4:右栏叠 EIP4 定制侧板(办理人/会签/formKey…)。
// T2.5:顶栏「保存草稿」可用(saveXML→create/from-procdef→PUT,metaInfo 带 eip4IdMap);
// 打开器加「草稿」tab(listModels→?modelId=→getModel→importXML)+ 草稿删除。
import { useEffect, useRef, useState } from 'react';
import { useNavigate, useSearchParams } from 'react-router-dom';
import Modeler from 'bpmn-js/lib/Modeler';
import { BpmnPropertiesPanelModule, BpmnPropertiesProviderModule } from 'bpmn-js-properties-panel';
import 'bpmn-js/dist/assets/diagram-js.css';
import 'bpmn-js/dist/assets/bpmn-js.css';
import 'bpmn-js/dist/assets/bpmn-font/css/bpmn.css';
import '@bpmn-io/properties-panel/dist/assets/properties-panel.css';
import activitiModdle from '../modeler/moddle/activiti.json';
import { getProfile, isAdminProfile } from '../auth/token';
import {
fetchProcDefSource,
fetchProcDefSourceByKey,
fetchProcessOptions,
listModels,
getModel,
createDraft,
saveDraft,
draftFromProcDef,
deleteDraft,
type ProcessOption,
type ModelSummary,
} from '../api/processModeler';
import { Eip4Panel, type PanelModeler } from '../modeler/Eip4Panel';
import { PublishConfirm } from '../modeler/PublishConfirm';
import { NewProcessDialog, type NewProcessResult } from '../modeler/NewProcessDialog';
import { toast } from '../components/ui';
// bpmn-js/lib/Modeler 自带类型,但选项对象里的标准面板模块(本项目无类型)与 moddle JSON
// 会与官方选项类型产生摩擦;照 ProcessDiagram 惯例把构造器收窄为本页用到的最小契约再实例化。
interface ModelerLike {
importXML(xml: string): Promise<unknown>;
saveXML(opts?: { format?: boolean }): Promise<{ xml: string }>;
destroy(): void;
get(service: string): unknown;
on(event: string, cb: (e: unknown) => void): void;
}
const ModelerCtor = Modeler as unknown as new (options: Record<string, unknown>) => ModelerLike;
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() {
const profile = getProfile();
const isAdmin = isAdminProfile(profile);
const navigate = useNavigate();
const [params, setParams] = useSearchParams();
// 打开三条路:?procDefId=(source=processDefinition)/ ?procKey=(存量按 key)/ ?modelId=(草稿)。
const procDefId = params.get('procDefId') ?? '';
const procKey = params.get('procKey') ?? '';
const modelIdParam = params.get('modelId') ?? '';
const hasTarget = !!procDefId || !!procKey || !!modelIdParam;
const canvasRef = useRef<HTMLDivElement>(null);
const panelRef = useRef<HTMLDivElement>(null);
const modelerRef = useRef<ModelerLike | null>(null);
// Modeler 实例入 state 以驱动 Eip4Panel 重渲染(selection.changed 订阅需要真实例)。
const [modelerReady, setModelerReady] = useState<ModelerLike | null>(null);
// 净化映射 原id→净化id:存量载入时暂存,保存草稿写进 metaInfo、发布还原(T3.x)时用。
const idMapRef = useRef<Record<string, string>>({});
// 当前草稿 modelId(打开草稿或首次保存后写入);空=尚未落草稿。
const modelIdRef = useRef<string>('');
// 当前载入流程的 key(存量 procDefKey / 草稿 key)——新建草稿的 name/key 源。
const loadedKeyRef = useRef<string>('');
// 新建流程的展示名(首存草稿的 name 用;存量/草稿路为空,createDraft 回退用 key)。
const newNameRef = useRef<string>('');
// 打开时的**原始**源 XML(发布影响摘要的 diff 基线:openSource vs 当前 saveXML)。
const openSourceRef = useRef<string>('');
// 基线归属标识:openSourceRef 对应哪个打开目标。存量首存会 setParams(modelId) 触发载入 effect
// 重跑(procKey→modelId),若每次重设基线,则「打开存量→改→存→发布」的 diff(已存版,已存版) 恒空
// (I1)。故首存前把归属预置为新 modelId,effect 见归属未变即**保留原始基线不重置**。
const baselineTargetRef = useRef<string>('');
const [loadState, setLoadState] = useState<LoadState>('idle');
const [loadError, setLoadError] = useState('');
const [saving, setSaving] = useState(false);
// 发布弹窗:非 null 时展示 PublishConfirm,xml=点发布瞬间的 saveXML 结果。
const [publish, setPublish] = useState<{ xml: string } | null>(null);
// 新建流程:对话框开关 + pending 新建(非 null 时无 URL 目标也挂 Modeler 并 import 模板实例化 XML,
// 首存前不落草稿——走 T2.5 createDraft 首存路径)。
const [showNewDialog, setShowNewDialog] = useState(false);
const [newDraft, setNewDraft] = useState<NewProcessResult | null>(null);
const [options, setOptions] = useState<ProcessOption[]>([]);
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);
// 未打开任何流程 + 存量 tab 时拉存量流程选项(复用旧 ProcessSelectDialog 端点)。
useEffect(() => {
if (!isAdmin || hasTarget || openTab !== 'existing') return;
let alive = true;
fetchProcessOptions()
.then((opts) => alive && setOptions(opts))
.catch(() => alive && setOptionsError('存量流程列表加载失败'));
return () => {
alive = false;
};
}, [isAdmin, hasTarget, openTab]);
// 未打开任何流程 + 草稿 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]);
// 有目标(或 pending 新建)时挂载 Modeler 并载入 BPMN(草稿→getModel / 存量→source / 新建→模板)。
useEffect(() => {
if (!isAdmin) return;
if (!hasTarget && !newDraft) return;
let alive = true;
let modeler: ModelerLike | null = null;
setLoadState('loading');
setLoadError('');
(async () => {
try {
// 新建流程:无 URL 目标但有 pending newDraft → 直接用模板实例化 XML(无远端取源、无 found 守卫)。
const isNew = !hasTarget && !!newDraft;
let bpmnXml: string;
// 非新建三条路统一成 {found,bpmnXml,idMap,key}。
let src: { found: boolean; bpmnXml?: string; idMap?: Record<string, string>; key?: string } | undefined;
if (isNew) {
bpmnXml = newDraft!.xml;
} else {
if (modelIdParam) {
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 (!src.found || !src.bpmnXml) {
setLoadError('未找到该流程的 BPMN 源(可能未部署或无布局信息)');
setLoadState('error');
return;
}
bpmnXml = src.bpmnXml;
}
if (!alive) return;
if (!canvasRef.current) {
// 画布容器缺失(异常时序):明确报错,别停在 loading 无提示(T1.5 评审 M-2)。
setLoadError('画布未就绪,请重试');
setLoadState('error');
return;
}
modeler = new ModelerCtor({
container: canvasRef.current,
propertiesPanel: { parent: panelRef.current },
// ⚠️ 只载标准 BpmnPropertiesProviderModule,严禁引 Camunda provider——它会把
// camunda 描述符注进 moddle,与 activiti 描述符在 bpmn:UserTask 上同名扩展冲突
// (not allowed without redefines) 静默丢弃 userTask(T1.1 评审 M-3 实证)。
additionalModules: [BpmnPropertiesPanelModule, BpmnPropertiesProviderModule],
// ⚠️ moddleExtensions 只声明 activiti:语料 1509/3 两命名空间不混用,双载会因同名
// 扩展属性冲突静默丢弃 userTask;单载 activiti 时 flowable 文档经 moddle lax 往返零丢失。
moddleExtensions: { activiti: activitiModdle },
});
// ⚠️ 显式 attachTo:live 实证——只靠构造参数 propertiesPanel.parent,面板从不挂载。
if (panelRef.current) {
try {
(modeler.get('propertiesPanel') as { attachTo(el: HTMLElement): void }).attachTo(panelRef.current);
} catch {
/* 面板模块缺失 / stub 时忽略 */
}
}
if (isNew) {
// 新建:idMap(中文 key 还原用)/key/名称进 ref,供首存 createDraft;无原始源→diff 基线空。
idMapRef.current = newDraft!.idMap;
loadedKeyRef.current = newDraft!.key;
newNameRef.current = newDraft!.name;
modelIdRef.current = '';
openSourceRef.current = '';
baselineTargetRef.current = 'new:' + newDraft!.key;
} else {
idMapRef.current = src!.idMap ?? {};
loadedKeyRef.current = src!.key ?? '';
newNameRef.current = '';
// diff 基线:仅在**首次打开某目标**时捕获原始源;同目标重跑(含首存后 procKey→modelId
// 的 reload,归属已由 handleSaveDraft 预置成新 modelId)则保留,防 I1 基线被冲成「已存版」。
const openTargetKey = modelIdParam
? 'model:' + modelIdParam
: procDefId
? 'pd:' + procDefId
: 'pk:' + procKey;
if (baselineTargetRef.current !== openTargetKey) {
openSourceRef.current = bpmnXml; // 此处 bpmnXml 已由上方 found 守卫保证非空
baselineTargetRef.current = openTargetKey;
}
// 草稿路:记住 modelId(后续保存走 PUT);存量路:清空(首次保存新建草稿)。
modelIdRef.current = modelIdParam || '';
}
await modeler.importXML(bpmnXml);
if (!alive) return;
modelerRef.current = modeler;
setModelerReady(modeler);
try {
const canvas = modeler.get('canvas') as { zoom(mode: string, point?: string): void };
canvas.zoom('fit-viewport', 'auto');
} catch {
/* stub / 无布局时忽略 */
}
setLoadState('ready');
} catch {
if (alive) {
setLoadError('流程加载失败');
setLoadState('error');
}
}
})();
return () => {
alive = false;
if (modeler) {
try {
modeler.destroy();
} catch {
/* 视图已卸载 */
}
}
modelerRef.current = null;
setModelerReady(null);
};
}, [isAdmin, procDefId, procKey, modelIdParam, newDraft]);
// 保存草稿: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;
// I1:预置基线归属为新 modelId,使随后的 reload 保留原始源基线(不被冲成「已存版」)。
baselineTargetRef.current = 'model:' + modelId;
// I-2:首存回填 ?modelId=,令刷新幂等(不再重复建草稿)、二次保存恒走 PUT。
setParams({ modelId }, { replace: true });
} else {
const key = loadedKeyRef.current || procKey || 'new_process';
// 新建流程用展示名(newNameRef);存量按 key 无展示名,回退用 key。
const name = newNameRef.current || key;
// metaInfo 结构与 from-procdef 对齐(sourceProcDefId 便于 T3.x 影响摘要/审计,
// 虽 restore 只读 eip4IdMap;新建中文 key 的 idMap 使发布 restore 回中文 process key)。
const metaInfo = JSON.stringify({
eip4IdMap: idMapRef.current,
sourceProcDefId: procDefId || '',
originalKey: key,
});
modelId = await createDraft({ name, key, bpmnXml: xml, metaInfo });
modelIdRef.current = modelId;
// I1:同上,reload 保留原始源基线。
baselineTargetRef.current = 'model:' + modelId;
// 新建首存后清 pending newDraft:随后回填 ?modelId= 触发按 modelId 正常重载(幂等)。
if (newDraft) setNewDraft(null);
setParams({ modelId }, { replace: true });
}
toast('已保存草稿', 'ok');
} catch {
toast('保存草稿失败', 'err');
} finally {
setSaving(false);
}
}
// 发布:需先有草稿(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 <div style={{ padding: 24, color: 'var(--text-3)' }}>流程设计器仅管理员可用。</div>;
}
// 可载入 = 有可用打开参数:processDefinition 需 id(procDefId);其余(model/history)需 key。
const loadableOptions = options.filter((o) =>
o.source === 'processDefinition' ? !!o.id : !!o.key,
);
// 选择器按 source 分派:processDefinition→?procDefId=<id>;其余→?procKey=<key>。
function openSelected(indexValue: string) {
if (indexValue === '') return;
const opt = loadableOptions[Number(indexValue)];
if (!opt) return;
if (opt.source === 'processDefinition' && opt.id) {
setParams({ procDefId: opt.id });
} else if (opt.key) {
setParams({ procKey: opt.key });
}
}
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 (
<div
data-testid="process-modeler-root"
style={{ display: 'flex', flexDirection: 'column', height: '100%', overflow: 'hidden' }}
>
{/* 顶栏 */}
<div
style={{
height: 48,
display: 'flex',
alignItems: 'center',
gap: 12,
padding: '0 16px',
borderBottom: '1px solid var(--line)',
flexShrink: 0,
}}
>
<span style={{ fontWeight: 600, fontSize: 15 }}>流程设计器</span>
<span className="muted" style={{ fontSize: 12, flex: 1 }}>
{hasTarget
? `已打开:${modelIdParam ? '草稿 ' + modelIdParam : procDefId || procKey}`
: newDraft
? `新建流程:${newDraft.name}(${newDraft.key})`
: '在线编辑 BPMN 流程定义(可编辑存量 / 草稿 / 新建)'}
</span>
<button
className="btn btn-sm"
data-testid="process-modeler-save-draft"
disabled={!modelerReady || saving}
onClick={handleSaveDraft}
title="保存为草稿(act_re_model)"
>
{saving ? '保存中…' : '保存草稿'}
</button>
<button
className="btn btn-sm btn-primary"
data-testid="process-modeler-publish"
disabled={!modelerReady || saving}
onClick={handlePublishClick}
title="发布(同人确认 + 影响摘要)"
>
发布
</button>
<button className="btn btn-sm" data-testid="process-modeler-back" onClick={() => navigate('/design-center')}>
返回
</button>
</div>
{/* 主体:左画布 + 右栏(上=EIP4 侧板 / 下=标准属性面板) */}
<div style={{ flex: 1, display: 'flex', minHeight: 0 }}>
<div style={{ flex: 1, position: 'relative', minWidth: 0, background: '#fff' }}>
<div ref={canvasRef} data-testid="process-modeler-canvas" style={{ width: '100%', height: '100%' }} />
{/* 未打开任何流程且无 pending 新建:叠加打开器(存量流程 / 草稿 两 tab) */}
{!hasTarget && !newDraft ? (
<div
style={{
position: 'absolute',
inset: 0,
display: 'flex',
flexDirection: 'column',
alignItems: 'center',
justifyContent: 'center',
gap: 12,
background: 'var(--surface, #fff)',
}}
>
<div style={{ display: 'flex', gap: 8 }}>
<button
className={openTab === 'existing' ? 'btn btn-sm btn-primary' : 'btn btn-sm'}
data-testid="process-modeler-tab-existing"
onClick={() => setOpenTab('existing')}
>
存量流程
</button>
<button
className={openTab === 'draft' ? 'btn btn-sm btn-primary' : 'btn btn-sm'}
data-testid="process-modeler-tab-draft"
onClick={() => setOpenTab('draft')}
>
草稿
</button>
</div>
{openTab === 'existing' ? (
<>
<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"
onClick={() => setShowNewDialog(true)}
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>
) : null}
{/* 载入中 / 载入失败 */}
{hasTarget && loadState === 'loading' ? (
<div style={overlayMsgStyle('var(--text-3)')} data-testid="process-modeler-loading">
加载流程中…
</div>
) : null}
{hasTarget && loadState === 'error' ? (
<div style={overlayMsgStyle('var(--warn, #d48806)')} data-testid="process-modeler-error">
{loadError}
</div>
) : null}
</div>
<div
style={{
width: 360,
flexShrink: 0,
borderLeft: '1px solid var(--line)',
display: 'flex',
flexDirection: 'column',
minHeight: 0,
}}
>
{/* EIP4 定制侧板(办理人/会签/formKey/扩展属性/监听器)——选中 userTask 时叠加 */}
<Eip4Panel modeler={modelerReady as unknown as PanelModeler | null} />
{/* 标准属性面板宿主(bpmn-js-properties-panel attachTo 进此容器) */}
<div ref={panelRef} data-testid="process-modeler-props" style={{ flex: 1, overflow: 'auto', minHeight: 0 }} />
</div>
</div>
{/* 新建流程对话框(名称/key/模板 → 实例化模板进入编辑态,首存前不落草稿) */}
{showNewDialog ? (
<NewProcessDialog
onClose={() => setShowNewDialog(false)}
onConfirm={(r) => {
setShowNewDialog(false);
setNewDraft(r); // 触发挂载 effect:importXML(模板实例化 XML) + 清空 diff 基线
}}
/>
) : null}
{/* 同人确认发布弹窗(影响摘要 + 节点级 diff + 422 校验清单) */}
{publish && modelIdRef.current ? (
<PublishConfirm
modelId={modelIdRef.current}
openSourceXml={openSourceRef.current}
currentXml={publish.xml}
processKeyHint={loadedKeyRef.current}
onClose={() => setPublish(null)}
onPublished={() => setPublish(null)}
/>
) : null}
</div>
);
}
function overlayMsgStyle(color: string): React.CSSProperties {
return {
position: 'absolute',
top: 16,
left: 16,
padding: '8px 12px',
background: 'rgba(255,255,255,0.92)',
borderRadius: 4,
color,
fontSize: 13,
};
}

View File

@@ -0,0 +1,47 @@
import { describe, expect, it, vi, beforeEach } from 'vitest';
import { render, screen, fireEvent, waitFor } from '@testing-library/react';
import { ReferencePicker } from './ReferencePicker';
vi.mock('../api/meta', () => ({ listEntities: vi.fn(), listEntityColumns: vi.fn() }));
import { listEntities, listEntityColumns } from '../api/meta';
const mList = vi.mocked(listEntities);
const mCols = vi.mocked(listEntityColumns);
beforeEach(() => {
mList.mockReset();
mCols.mockReset();
mList.mockResolvedValue([
{ entityId: 'E1', tablename: 'SYS_DEPART', name: '部门' },
{ entityId: 'E2', tablename: 'SYS_ORG', name: '组织' },
]);
mCols.mockResolvedValue({
tablename: 'SYS_DEPART',
displayColumn: 'DEPARTNAME',
columns: [
{ column: 'DEPARTNAME', display: '部门名', type: 'string' },
{ column: 'DEPARTCODE', display: '部门编码', type: 'string' },
],
});
});
describe('ReferencePicker', () => {
it('加载目标实体清单', async () => {
render(<ReferencePicker value="" onChange={() => {}} />);
await waitFor(() => expect(screen.getByTestId('ref-target')).toBeInTheDocument());
expect(mList).toHaveBeenCalled();
// 选项含 SYS_DEPART
expect(screen.getByRole('option', { name: /SYS_DEPART/ })).toBeInTheDocument();
});
it('选目标实体→回写 referenceTable + 加载其列', async () => {
const onChange = vi.fn();
render(<ReferencePicker value="" onChange={onChange} />);
await waitFor(() => expect(screen.getByTestId('ref-target')).toBeInTheDocument());
fireEvent.change(screen.getByTestId('ref-target'), { target: { value: 'SYS_DEPART' } });
expect(onChange).toHaveBeenCalledWith('SYS_DEPART');
await waitFor(() => expect(mCols).toHaveBeenCalledWith('SYS_DEPART'));
// 显示列下拉默认选中 displayColumn
await waitFor(() => expect(screen.getByTestId('ref-display-col')).toBeInTheDocument());
expect((screen.getByTestId('ref-display-col') as HTMLSelectElement).value).toBe('DEPARTNAME');
});
});

View File

@@ -0,0 +1,83 @@
// 引用列选择器(DECISION-1)。type=引用时选目标实体 + 显示列。
// 父级只需 referenceTable;显示列默认取目标表 displayColumn,仅做预览,
// 实际渲染时由 recipe 按目标表 displayColumn 解析显示名(非裸 id)。
import { useEffect, useState } from 'react';
import { listEntities, listEntityColumns, type EntitySummary, type EntityColumn } from '../api/meta';
interface ReferencePickerProps {
value: string; // 已选目标表名(父级权威)
onChange: (referenceTable: string) => void;
}
export function ReferencePicker({ value, onChange }: ReferencePickerProps) {
const [entities, setEntities] = useState<EntitySummary[]>([]);
const [cols, setCols] = useState<EntityColumn[]>([]);
const [displayCol, setDisplayCol] = useState('');
const [err, setErr] = useState('');
// 内部选中态:以父级 value 为初值,select onChange 即时更新,驱动列加载
// (父级 onChange 不一定立刻回写 value,故列加载不能只依赖 value)。
const [selected, setSelected] = useState(value);
useEffect(() => {
setSelected(value);
}, [value]);
useEffect(() => {
let alive = true;
listEntities()
.then((es) => alive && setEntities(es))
.catch((e: Error) => alive && setErr(e.message ?? '实体清单加载失败'));
return () => { alive = false; };
}, []);
useEffect(() => {
if (!selected) {
setCols([]);
setDisplayCol('');
return;
}
let alive = true;
listEntityColumns(selected)
.then((c) => {
if (!alive) return;
setCols(c.columns);
setDisplayCol(c.displayColumn || c.columns[0]?.column || '');
})
.catch((e: Error) => alive && setErr(e.message ?? '目标列加载失败'));
return () => { alive = false; };
}, [selected]);
function handleSelect(table: string) {
setSelected(table);
onChange(table);
}
return (
<div style={{ display: 'grid', gap: 8, padding: 8, border: '1px solid var(--line)', borderRadius: 6 }}>
<label style={{ display: 'grid', gap: 4 }}>
<span className="sub-text">引用目标实体</span>
<select data-testid="ref-target" value={selected} onChange={(e) => handleSelect(e.target.value)}>
<option value="">请选择…</option>
{entities.map((en) => (
<option key={en.entityId} value={en.tablename}>
{en.tablename}({en.name})
</option>
))}
</select>
</label>
{selected ? (
<label style={{ display: 'grid', gap: 4 }}>
<span className="sub-text">显示列(渲染时显示该列而非 id)</span>
<select data-testid="ref-display-col" value={displayCol} onChange={(e) => setDisplayCol(e.target.value)}>
{cols.map((c) => (
<option key={c.column} value={c.column}>
{c.display || c.column}
</option>
))}
</select>
</label>
) : null}
{err ? <div style={{ color: 'var(--err)', fontSize: 11 }}>{err}</div> : null}
</div>
);
}

9
src/setupTests.ts Normal file
View File

@@ -0,0 +1,9 @@
// vitest 全局测试基建:注册 jest-dom 断言匹配器 + 每个用例后自动卸载组件树。
// 在 vitest.config.ts 的 test.setupFiles 里登记,所有 *.test.tsx 共享。
import '@testing-library/jest-dom/vitest';
import { afterEach } from 'vitest';
import { cleanup } from '@testing-library/react';
afterEach(() => {
cleanup();
});

View File

@@ -14,6 +14,18 @@ import { collectLeaves, fetchMenu } from '../api/menu';
import type { MenuLeaf } from '../api/menu';
import { fetchTodo } from '../api/todo';
import { fetchUnreadCount } from '../api/notice';
import {
APPROVAL_COMPLETED_EVENT,
OPEN_APPROVAL_DRAWER_EVENT,
type ApprovalDrawerRequest,
} from '../amis/approvalActionEvents';
import {
MESSAGE_DETAIL_CHANGED_EVENT,
OPEN_MESSAGE_DETAIL_EVENT,
type MessageDetailRequest,
} from '../amis/messageActionEvents';
import { ApprovalDrawer } from '../components/ApprovalDrawer';
import { MessageDetailDialog } from '../components/MessageDetailDialog';
import { ToastHost } from '../components/ui/Toast';
import { Topbar } from './Topbar';
import { SideMenu } from './SideMenu';
@@ -32,6 +44,12 @@ const TODO_POLL_INTERVAL = 60_000;
// 初始 Tab:「工作台」作为保底 Tab,不可关闭
const TODO_TAB: Tab = { key: '/workbench', title: '工作台' };
// 非 /page/:id 的单例功能路由 → Tab 标题。navigate 到这些路由时自动开成独立 Tab,
// 避免「盖」在当前选中 Tab 上(见下方地址同步 useEffect)。
const SINGLETON_TAB_TITLES: Record<string, string> = {
'/design-center': '设计中心',
};
function loadTabs(): Tab[] {
try {
const raw = localStorage.getItem(TABS_KEY);
@@ -72,6 +90,8 @@ export function AppShell() {
// F2-11 消息未读数
const [noticeBadge, setNoticeBadge] = useState<number | undefined>(undefined);
const [showNotice, setShowNotice] = useState(false);
const [approvalRequest, setApprovalRequest] = useState<ApprovalDrawerRequest | null>(null);
const [messageRequest, setMessageRequest] = useState<MessageDetailRequest | null>(null);
const pollTimer = useRef<ReturnType<typeof setInterval> | null>(null);
const noticePollTimer = useRef<ReturnType<typeof setInterval> | null>(null);
@@ -91,6 +111,18 @@ export function AppShell() {
return [...prev, { key: path, title: templateId }];
});
setActiveKey(path);
} else {
// 非 /page/ 的单例功能路由(如顶栏「设计中心」入口):也自动开成独立 Tab,
// 否则 navigate() 只换 Outlet 内容、不建 Tab → 设计中心「盖」在当前选中 Tab 上、
// Tab 条仍高亮旧页(用户反馈「覆盖当前选中 tab」)。
const title = SINGLETON_TAB_TITLES[path];
if (title) {
setTabs((prev) => {
if (prev.some((t) => t.key === path)) return prev;
return [...prev, { key: path, title }];
});
setActiveKey(path);
}
}
}, [location.pathname, tabs]);
@@ -165,6 +197,52 @@ export function AppShell() {
};
}, []);
// 转换页 amis action → 全局审批抽屉。taskId 走办理/已办详情;businessKey/processInstanceId 走只读历史查看。
useEffect(() => {
const openApprovalDrawer = (event: Event) => {
const detail = (event as CustomEvent<ApprovalDrawerRequest>).detail;
if (!detail?.taskId && !detail?.businessKey && !detail?.processInstanceId) return;
setApprovalRequest(detail);
};
window.addEventListener(OPEN_APPROVAL_DRAWER_EVENT, openApprovalDrawer);
return () => window.removeEventListener(OPEN_APPROVAL_DRAWER_EVENT, openApprovalDrawer);
}, []);
// 转换页 amis action → 全局消息详情弹窗。收到消息打开时由弹窗调用后端置已读。
useEffect(() => {
const openMessageDetail = (event: Event) => {
const detail = (event as CustomEvent<MessageDetailRequest>).detail;
if (!detail) return;
if (detail.kind === 'received' && !detail.receiveId) return;
if (detail.kind === 'sent' && !detail.messageId) return;
setMessageRequest(detail);
};
window.addEventListener(OPEN_MESSAGE_DETAIL_EVENT, openMessageDetail);
return () => window.removeEventListener(OPEN_MESSAGE_DETAIL_EVENT, openMessageDetail);
}, []);
const handleApprovalCompleted = useCallback(() => {
const detail = approvalRequest;
setApprovalRequest(null);
fetchTodo(0, 200)
.then((full) => {
if (!full.unavailable) setTodoBadge(full.items.length || undefined);
})
.catch(() => setTodoBadge(undefined));
window.setTimeout(() => {
window.dispatchEvent(new CustomEvent(APPROVAL_COMPLETED_EVENT, { detail }));
}, 0);
}, [approvalRequest]);
const handleMessageReadChange = useCallback(() => {
fetchUnreadCount()
.then((n) => setNoticeBadge(n > 0 ? n : undefined))
.catch(() => setNoticeBadge(undefined));
window.setTimeout(() => {
window.dispatchEvent(new CustomEvent(MESSAGE_DETAIL_CHANGED_EVENT));
}, 0);
}, []);
// F2-13:回填 Tab 标题(PageRenderPage 拿到 schema title 后调用)
const updateTabTitle = useCallback((path: string, title: string) => {
setTabs((prev) =>
@@ -292,6 +370,28 @@ export function AppShell() {
}}
/>
) : null}
{approvalRequest ? (
<ApprovalDrawer
taskId={approvalRequest.taskId}
taskName={approvalRequest.taskName}
processInstanceId={approvalRequest.processInstanceId}
businessKey={approvalRequest.businessKey}
businessTable={approvalRequest.businessTable}
businessSummary={approvalRequest.businessSummary}
readOnly={approvalRequest.readOnly}
onClose={() => setApprovalRequest(null)}
onCompleted={handleApprovalCompleted}
/>
) : null}
{messageRequest ? (
<MessageDetailDialog
request={messageRequest}
onClose={() => setMessageRequest(null)}
onReadChange={handleMessageReadChange}
/>
) : null}
</div>
);
}

View File

@@ -5,6 +5,7 @@ import { Icon } from '../components/ui/Icon';
import { GlobalSearch } from './GlobalSearch';
import type { MenuLeaf } from '../api/menu';
import type { UserProfile } from '../auth/token';
import { isAdminProfile } from '../auth/token';
interface TopbarProps {
leaves: MenuLeaf[];
@@ -30,7 +31,7 @@ export function Topbar({
// 用户名显示:取 name 首字作头像
const avatarChar = profile?.name?.[0] ?? '?';
const navigate = useNavigate();
const isAdmin = profile?.account === 'admin' || profile?.userId === 'ADMIN';
const isAdmin = isAdminProfile(profile);
return (
<header className="topbar">

View File

@@ -431,6 +431,27 @@
min-height: 0;
}
/* 12b-1. 多层 AMIS 弹窗显式递增层级,避免 picker/dialog 嵌套时第二层被第一层挡住 */
.amis-dialog-widget.cxd-Modal--1th,
.amis-dialog-widget.cxd-Drawer--1th {
z-index: 1400;
}
.amis-dialog-widget.cxd-Modal--2th,
.amis-dialog-widget.cxd-Drawer--2th {
z-index: 1500;
}
.amis-dialog-widget.cxd-Modal--3th,
.amis-dialog-widget.cxd-Drawer--3th {
z-index: 1600;
}
.amis-dialog-widget.cxd-Modal--4th,
.amis-dialog-widget.cxd-Drawer--4th {
z-index: 1700;
}
/* 12c. 子表表头 sticky:随 body 滚动钉在顶部,列头不丢 */
.amis-scope .cxd-InputTable .cxd-Table-table > thead > tr > th {
position: sticky;

View File

@@ -136,10 +136,17 @@ body {
margin: 0;
}
/* 滚动条 */
::-webkit-scrollbar { width: 6px; height: 6px; }
::-webkit-scrollbar-track { background: transparent; }
::-webkit-scrollbar-thumb { background: var(--line-strong); border-radius: 4px; }
/* 滚动条 —— 做成清晰可见(原 6px 透明轨道+浅灰 thumb 在 macOS overlay 下近乎隐形,
用户误以为「没有滚动条/滚不动」)。10px 宽 + 浅底轨道 + 可见 thumb + hover 加深;
Firefox 用 scrollbar-* 同口径。 */
* { scrollbar-width: thin; scrollbar-color: var(--line-strong) transparent; }
::-webkit-scrollbar { width: 10px; height: 10px; }
::-webkit-scrollbar-track { background: var(--surface-2); }
::-webkit-scrollbar-thumb {
background: var(--line-strong); border-radius: 6px;
border: 2px solid var(--surface-2); background-clip: padding-box;
}
::-webkit-scrollbar-thumb:hover { background: var(--text-3); }
/* ============================================================================
通用工具类(全局可用)
@@ -208,7 +215,7 @@ table.tbl { border-collapse: separate; border-spacing: 0; width: 100%; font-size
/* 弹层公共 */
.mask {
position: fixed; inset: 0; background: rgba(0,0,0,.35);
display: flex; align-items: center; justify-content: center; z-index: 200;
display: flex; align-items: center; justify-content: center; z-index: 2000;
}
.dlg {
background: var(--surface); border-radius: var(--radius-lg); box-shadow: var(--shadow-3);
@@ -228,7 +235,7 @@ table.tbl { border-collapse: separate; border-spacing: 0; width: 100%; font-size
/* 抽屉 */
.drawer {
background: var(--surface); box-shadow: var(--shadow-3); z-index: 200;
background: var(--surface); box-shadow: var(--shadow-3); z-index: 1;
display: flex; flex-direction: column;
animation: slideIn .2s cubic-bezier(.2,.9,.3,1);
}
@@ -238,7 +245,7 @@ table.tbl { border-collapse: separate; border-spacing: 0; width: 100%; font-size
}
/* Toast */
.toast-wrap { position: fixed; bottom: 24px; right: 24px; z-index: 300; display: flex; flex-direction: column; gap: 8px; pointer-events: none; }
.toast-wrap { position: fixed; bottom: 24px; right: 24px; z-index: 3000; display: flex; flex-direction: column; gap: 8px; pointer-events: none; }
.toast {
display: flex; align-items: center; gap: 8px;
background: var(--surface); border: 1px solid var(--line);

View File

@@ -0,0 +1,178 @@
#!/usr/bin/env node
/**
* 语料级办理人/会签表达式 codec 往返核查(T2.3 评审加分项)
*
* 对本地 eip4 库(5433, search_path=eip3)里 act_ge_bytearray 的全部真实 BPMN,抽出每个
* activiti/flowable 的 candidateUsers / collection 属性值(实体解码到 businessObject 属性
* 值层),跑与 src/modeler/candidateExpression.ts **逐字镜像**的 parse/build,统计:
* - byteIdentical : build(parse(x)) === x 逐字一致
* - engineEquiv : 非逐字但引擎运行期等价(整串全局 【→{ 、】→} 还原后相同)
* —— 覆盖 content 用半角 ${users} 的 scriptUser 会签变体(build 归一为全角,
* 引擎 CandidateUsersHandler:54 全局替换后复原,语义无损)
* - parseNull : 前缀匹配但解析失败(硬失败)
* - hardMismatch : 既非逐字亦非引擎等价(硬失败)
*
* ⚠️ 本文件内联的 parse/build 必须与 candidateExpression.ts 保持一致;单测
* (candidateExpression.test.ts)是编解码契约的权威来源,本工具是全语料回归的旁证。
*
* 取数:psql 子进程(不引 pg 依赖),同 tools/modeler-fidelity-sweep.mjs。
* 用法:node tools/codec-corpus-sweep.mjs
* 环境变量:PG_HOST(localhost) PG_PORT(5433) PG_DB(eip4) PG_SCHEMA(eip3) EXPECTED_TOTAL(1512)
*/
import { execFileSync } from 'node:child_process';
const PG_HOST = process.env.PG_HOST || 'localhost';
const PG_PORT = process.env.PG_PORT || '5433';
const PG_DB = process.env.PG_DB || 'eip4';
const PG_SCHEMA = process.env.PG_SCHEMA || 'eip3';
const EXPECTED_TOTAL = Number(process.env.EXPECTED_TOTAL || 1512);
// ── 镜像 src/modeler/candidateExpression.ts(逐字)────────────────────────────
const CANDIDATE_PREFIX = "${candidateUsersHandler.getCandidateUsers(execution,'";
const MULTI_PREFIX = "${multiInstanceUsersHandler.getUsers(execution,'";
const SUFFIX = "')}";
const KNOWN_ITEM_KEYS = ['type', 'content', 'isCandidate', 'isSendMail', 'isSendPhone', 'isSendMessage'];
const KNOWN_ITEM_KEY_SET = new Set(KNOWN_ITEM_KEYS);
const fullToHalf = (s) => s.split('【').join('{').split('】').join('}');
const halfToFull = (s) => s.split('{').join('【').split('}').join('】');
const escapeLeaf = (v) => v.split("'").join('‘').split('"').join('“');
function reorderItem(src) {
const o = {};
for (const k of KNOWN_ITEM_KEYS) if (src[k] !== undefined) o[k] = src[k];
for (const k of Object.keys(src)) if (!KNOWN_ITEM_KEY_SET.has(k) && src[k] !== undefined) o[k] = src[k];
return o;
}
function parse(expr) {
if (typeof expr !== 'string' || expr.length === 0) return null;
let variant, prefix;
if (expr.startsWith(CANDIDATE_PREFIX)) { variant = 'candidate'; prefix = CANDIDATE_PREFIX; }
else if (expr.startsWith(MULTI_PREFIX)) { variant = 'multiInstance'; prefix = MULTI_PREFIX; }
else return null;
if (!expr.endsWith(SUFFIX)) return null;
const content = expr.slice(prefix.length, expr.length - SUFFIX.length);
let obj;
try { obj = JSON.parse(fullToHalf(content)); } catch { return null; }
if (obj === null || typeof obj !== 'object') return null;
if (!Array.isArray(obj.items)) return null;
for (const el of obj.items) {
if (el === null || typeof el !== 'object' || Array.isArray(el)) return null;
if (typeof el.type !== 'string') return null;
}
const items = obj.items.map(reorderItem);
const meta = { ...obj };
delete meta.items;
return { items, variant, meta };
}
function build(items, variant, meta) {
const prefix = variant === 'multiInstance' ? MULTI_PREFIX : CANDIDATE_PREFIX;
const outer = { items: items.map(reorderItem), ...(meta ?? {}) };
const json = JSON.stringify(outer, (_k, v) => (typeof v === 'string' ? escapeLeaf(v) : v));
return prefix + halfToFull(json) + SUFFIX;
}
// 镜像引擎 CandidateUsersHandler:54 的整串全局字面替换
const engineRestore = (s) => s.split('【').join('{').split('】').join('}');
// ─────────────────────────────────────────────────────────────────────────
function decodeEntities(s) {
return String(s)
.replace(/&#x([0-9a-fA-F]+);/g, (_, h) => String.fromCodePoint(parseInt(h, 16)))
.replace(/&#(\d+);/g, (_, d) => String.fromCodePoint(parseInt(d, 10)))
.replace(/&quot;/g, '"')
.replace(/&apos;/g, "'")
.replace(/&lt;/g, '<')
.replace(/&gt;/g, '>')
.replace(/&amp;/g, '&');
}
function pullCorpus() {
const sql =
`set search_path=${PG_SCHEMA},public; ` +
`select b.id_||'|'||translate(encode(b.bytes_,'base64'),E'\\n','') ` +
`from act_ge_bytearray b where b.name_ like '%.bpmn%' or b.name_ like '%.xml';`;
const out = execFileSync(
'psql',
['-h', PG_HOST, '-p', PG_PORT, '-d', PG_DB, '-tA', '-c', sql],
{ encoding: 'utf8', maxBuffer: 1024 * 1024 * 1024 },
);
const docs = [];
for (const line of out.split('\n')) {
if (!line) continue;
const i = line.indexOf('|');
if (i < 0) continue;
docs.push({ id: line.slice(0, i), b64: line.slice(i + 1) });
}
return docs;
}
function main() {
process.stdout.write(`连库拉取语料 (${PG_HOST}:${PG_PORT}/${PG_DB}, schema=${PG_SCHEMA}) ...\n`);
const docs = pullCorpus();
process.stdout.write(`取到 ${docs.length} 个 .bpmn/.xml 文档,开始 codec 往返扫描 ...\n\n`);
const EXPR_RE = /(?:activiti|flowable):(?:candidateUsers|collection)="([^"]*)"/g;
let exprs = 0;
let byteIdentical = 0;
let engineEquiv = 0;
let parseNull = 0;
let hardMismatch = 0;
const itemKeySets = new Map();
const metaKeySets = new Map();
const hardSamples = [];
const parseNullSamples = [];
for (const doc of docs) {
const xml = Buffer.from(doc.b64, 'base64').toString('utf8');
let m;
EXPR_RE.lastIndex = 0;
while ((m = EXPR_RE.exec(xml)) !== null) {
const val = decodeEntities(m[1]);
if (!val.includes('Handler')) continue; // collection 也可是普通变量名,非 handler 表达式
exprs++;
const r = parse(val);
if (!r) {
parseNull++;
if (parseNullSamples.length < 5) parseNullSamples.push(val.slice(0, 200));
continue;
}
for (const it of r.items) itemKeySets.set(Object.keys(it).join(','), (itemKeySets.get(Object.keys(it).join(',')) || 0) + 1);
metaKeySets.set(Object.keys(r.meta).join(','), (metaKeySets.get(Object.keys(r.meta).join(',')) || 0) + 1);
const rebuilt = build(r.items, r.variant, r.meta);
if (rebuilt === val) byteIdentical++;
else if (engineRestore(rebuilt) === engineRestore(val)) engineEquiv++;
else {
hardMismatch++;
if (hardSamples.length < 5) hardSamples.push({ val: val.slice(0, 300), rebuilt: rebuilt.slice(0, 300) });
}
}
}
const line = '─'.repeat(60);
process.stdout.write(`${line}\ncodec 往返扫描结果\n${line}\n`);
process.stdout.write(`总文档 ${docs.length}(预期 ${EXPECTED_TOTAL})|表达式 ${exprs}\n`);
process.stdout.write(`逐字一致 ${byteIdentical}|引擎运行期等价 ${engineEquiv}|解析失败 ${parseNull}|硬不匹配 ${hardMismatch}\n`);
process.stdout.write(`\nitem 键集分布:\n`);
for (const [k, c] of [...itemKeySets].sort((a, b) => b[1] - a[1])) process.stdout.write(` ${c.toString().padStart(6)} [${k}]\n`);
process.stdout.write(`\nmeta 键集分布:\n`);
for (const [k, c] of [...metaKeySets].sort((a, b) => b[1] - a[1])) process.stdout.write(` ${c.toString().padStart(6)} [${k || '(空)'}]\n`);
if (parseNullSamples.length) {
process.stdout.write(`\n解析失败样本:\n`);
for (const s of parseNullSamples) process.stdout.write(` ${s}\n`);
}
if (hardSamples.length) {
process.stdout.write(`\n硬不匹配样本(既非逐字亦非引擎等价):\n`);
for (const s of hardSamples) process.stdout.write(` 原文: ${s.val}\n 重建: ${s.rebuilt}\n`);
}
process.stdout.write(`${line}\n`);
// 硬门:每条表达式都能解析,且要么逐字要么引擎等价(无硬失败),且语料规模符合预期。
const gateOk = parseNull === 0 && hardMismatch === 0 && docs.length === EXPECTED_TOTAL;
process.exit(gateOk ? 0 : 1);
}
try {
main();
} catch (e) {
if (e && e.stderr) process.stderr.write(String(e.stderr));
process.stderr.write(`扫描崩溃: ${(e && e.stack) || e}\n`);
process.exit(2);
}

View File

@@ -0,0 +1,325 @@
#!/usr/bin/env node
/**
* 全量真实流程 moddle round-trip 保真扫描(Task 1.2)
*
* 对本地 eip4 库(5433, search_path=eip3)里 act_ge_bytearray 的全部真实 BPMN
* (name_ like %.bpmn% / %.xml)逐条做 bpmn-moddle fromXML→toXML 往返,验证
* 「所有 activiti / flowable 扩展属性(含值,实体解码归一后) + 扩展元素结构
* + 全部 bpmn 元素 id 集合」在往返前后多重集一致(数据级零丢失,非字节级)。
*
* 取数:psql 子进程(不引 pg 依赖);命名空间嗅探后单载 activiti 或 flowable
* (T1.1 实证:双载会因跨包同名 extends 冲突丢 userTask)。进 moddle 前先净化
* 中文/非法 id(镜像后端 ProcessDiagramController.sanitizeBpmnIds;moddle-xml
* 拒绝非 ASCII-NCName id,1445/1512 文档 process id 为中文)。
*
* 用法:node tools/modeler-fidelity-sweep.mjs
* 环境变量:PG_HOST(localhost) PG_PORT(5433) PG_DB(eip4) PG_SCHEMA(eip3)
*/
import { execFileSync } from 'node:child_process';
import { readFileSync } from 'node:fs';
import { fileURLToPath } from 'node:url';
import { dirname, resolve } from 'node:path';
import BpmnModdle from 'bpmn-moddle';
const HERE = dirname(fileURLToPath(import.meta.url));
const activiti = JSON.parse(readFileSync(resolve(HERE, '../src/modeler/moddle/activiti.json'), 'utf8'));
const flowable = JSON.parse(readFileSync(resolve(HERE, '../src/modeler/moddle/flowable.json'), 'utf8'));
const PG_HOST = process.env.PG_HOST || 'localhost';
const PG_PORT = process.env.PG_PORT || '5433';
const PG_DB = process.env.PG_DB || 'eip4';
const PG_SCHEMA = process.env.PG_SCHEMA || 'eip3';
// ── 取数:psql 拉 id|name|base64(base64 去换行,同勘探法)───────────────────
function pullCorpus() {
const sql =
`set search_path=${PG_SCHEMA},public; ` +
`select b.id_||'|'||b.name_||'|'||translate(encode(b.bytes_,'base64'),E'\\n','') ` +
`from act_ge_bytearray b where b.name_ like '%.bpmn%' or b.name_ like '%.xml';`;
const out = execFileSync(
'psql',
['-h', PG_HOST, '-p', PG_PORT, '-d', PG_DB, '-tA', '-c', sql],
{ encoding: 'utf8', maxBuffer: 1024 * 1024 * 1024 },
);
const docs = [];
for (const line of out.split('\n')) {
if (!line) continue;
const i1 = line.indexOf('|');
const i2 = line.indexOf('|', i1 + 1);
if (i1 < 0 || i2 < 0) continue;
docs.push({ id: line.slice(0, i1), name: line.slice(i1 + 1, i2), b64: line.slice(i2 + 1) });
}
return docs;
}
// ── XML 实体解码归一(数据级比对:&quot;→" &#34;→" 全角/中文原样)────────────
function decodeEntities(s) {
return String(s)
.replace(/&#x([0-9a-fA-F]+);/g, (_, h) => String.fromCodePoint(parseInt(h, 16)))
.replace(/&#(\d+);/g, (_, d) => String.fromCodePoint(parseInt(d, 10)))
.replace(/&quot;/g, '"')
.replace(/&apos;/g, "'")
.replace(/&lt;/g, '<')
.replace(/&gt;/g, '>')
.replace(/&amp;/g, '&'); // amp 最后解,避免 &amp;#34; 被二次解码
}
// ── id 净化:镜像 ProcessDiagramController.sanitizeBpmnIds(可逆非本工具关注)─
// 安全 id = ASCII-NCName(首字符字母/下划线,其余字母/数字/_/-/.)。非法则映射为
// 稳定唯一占位符(本工具用无冲突计数器,隔离 T1.3 哈希碰撞与 moddle 保真两问题)。
const ID_ATTR = /\b(id|bpmnElement|sourceRef|targetRef|attachedToRef|processRef|default)\s*=\s*"([^"]+)"/g;
function isSafeId(v) {
return /^[A-Za-z_][A-Za-z0-9_.-]*$/.test(v);
}
function sanitizeIds(xml) {
const map = new Map();
let n = 0;
let m;
ID_ATTR.lastIndex = 0;
while ((m = ID_ATTR.exec(xml))) {
const val = m[2];
if (!isSafeId(val) && !map.has(val)) map.set(val, `sanid_${n++}`);
}
if (map.size === 0) return { xml, remapped: 0 };
ID_ATTR.lastIndex = 0;
const rewritten = xml.replace(ID_ATTR, (_, attr, val) => `${attr}="${map.get(val) ?? val}"`);
return { xml: rewritten, remapped: map.size };
}
// ── 命名空间嗅探:activiti 优先,其次 flowable,默认 activiti ─────────────────
// M3 前提:靠字面量 uri/前缀识别命名空间,依赖语料使用规范前缀 activiti/flowable。
// §0 实测本库确如此(activiti 1509 / flowable 3,无自定义前缀重映射),故成立;
// 若未来语料出现 xmlns:act="http://activiti.org/bpmn" 之类别名,此处需扩正则。
function sniffModdle(xml) {
const hasActiviti = xml.includes('activiti.org/bpmn') || /\bactiviti:/.test(xml);
const hasFlowable = xml.includes('flowable.org/bpmn') || /\bflowable:/.test(xml);
if (hasActiviti) return { pkg: { activiti }, ns: 'activiti' };
if (hasFlowable) return { pkg: { flowable }, ns: 'flowable' };
return { pkg: { activiti }, ns: 'activiti(default)' };
}
// ── 扩展面「多重集」签名:数据级零丢失的比对基础 ───────────────────────────
// 逐 tag 扫描(well-formed BPMN 下正则足够),区分扩展元素 tag / 原生元素上的
// 扩展属性;文本单独扫;id 全量。所有值实体解码后入袋(顺序无关)。
const TAG_RE = /<([/!?]?)([\w:.-]+)((?:[^>"']|"[^"]*"|'[^']*')*)>/g;
const ATTR_RE = /([\w:.-]+)\s*=\s*"([^"]*)"/g;
const EXT_TEXT_RE = /<((?:activiti|flowable):[\w.-]+)((?:[^>"']|"[^"]*"|'[^']*')*)>([^<]*)<\//g;
// I1:引用类属性单独入袋,捕捉 round-trip/净化重写破坏的连线(sourceRef/targetRef/
// bpmnElement/processRef/attachedToRef/default)。与 sanitizeIds 的 ID_ATTR 同覆盖面。
const REF_ATTRS = new Set(['sourceRef', 'targetRef', 'bpmnElement', 'processRef', 'attachedToRef', 'default']);
function surface(xml) {
const extAttrs = []; // 原生元素上的 activiti:/flowable: 属性 p:name=value
const extElemTags = []; // 扩展元素本身 tag
const extElemAttrs = [];// 扩展元素上的属性(含无前缀) tag@attr=value
const extElemText = []; // 扩展叶元素的文本 tag#text=value
const ids = []; // 全部 id="..."(含原生/DI/扩展)
const refs = []; // 引用类属性 an=value(连线/DI 指向完整性,I1)
let m;
TAG_RE.lastIndex = 0;
while ((m = TAG_RE.exec(xml))) {
const close = m[1];
const name = m[2];
const attrBlob = m[3] || '';
if (close === '/' || close === '!' || close === '?') continue; // 闭合/注释/声明
const isExt = /^(activiti|flowable):/.test(name);
let a;
ATTR_RE.lastIndex = 0;
while ((a = ATTR_RE.exec(attrBlob))) {
const an = a[1];
const av = decodeEntities(a[2]);
if (an === 'id') ids.push(av);
else if (REF_ATTRS.has(an)) refs.push(`${an}=${av}`);
if (isExt) {
extElemAttrs.push(`${name}@${an}=${av}`);
} else if (/^(activiti|flowable):/.test(an)) {
extAttrs.push(`${an}=${av}`);
}
}
if (isExt) extElemTags.push(name);
}
// M4:extElemText 对叶元素文本做 trim 归一(去两端空白),故不比对纯空白/缩进差异。
// 扩展叶文本(监听器 field 值、表单选项 name 等)非空白敏感,且前后同样 trim,对称无偏。
EXT_TEXT_RE.lastIndex = 0;
while ((m = EXT_TEXT_RE.exec(xml))) {
const t = decodeEntities(m[3]).trim();
if (t) extElemText.push(`${m[1]}#text=${t}`);
}
return { extAttrs, extElemTags, extElemAttrs, extElemText, ids, refs };
}
function bag(arr) {
const b = new Map();
for (const v of arr) b.set(v, (b.get(v) || 0) + 1);
return b;
}
// 多重集差异:返回 {missing:[...], added:[...]}(before→after)
function diffBag(before, after) {
const b = bag(before);
const a = bag(after);
const missing = [];
const added = [];
for (const [k, c] of b) {
const ac = a.get(k) || 0;
if (ac < c) missing.push(`${k} (×${c - ac})`);
}
for (const [k, c] of a) {
const bc = b.get(k) || 0;
if (bc < c) added.push(`${k} (×${c - bc})`);
}
return { missing, added };
}
// ── 主流程 ───────────────────────────────────────────────────────────────
async function main() {
process.stdout.write(`连库拉取语料 (${PG_HOST}:${PG_PORT}/${PG_DB}, schema=${PG_SCHEMA}) ...\n`);
const docs = pullCorpus();
process.stdout.write(`取到 ${docs.length} 个 .bpmn/.xml 文档,开始 round-trip 扫描 ...\n\n`);
let ok = 0;
const failures = [];
const decodeFailures = [];
const parseErrors = [];
const warnCounts = new Map(); // 归一 warning key → 次数
const nsCounts = new Map();
for (const doc of docs) {
// 1) base64 → UTF8,并校验解码无损(非法 UTF8 会 toString 回落 U+FFFD)
const buf = Buffer.from(doc.b64, 'base64');
const xml = buf.toString('utf8');
if (!Buffer.from(xml, 'utf8').equals(buf)) {
decodeFailures.push({ id: doc.id, name: doc.name, bytes: buf.length });
continue;
}
// 2) 命名空间嗅探 → 单载
const { pkg, ns } = sniffModdle(xml);
nsCounts.set(ns, (nsCounts.get(ns) || 0) + 1);
// 3) 净化非法 id(否则中文 id 文档被 moddle 整体拒收)
const { xml: sanitized } = sanitizeIds(xml);
// 4) round-trip
let out;
let warnings = [];
try {
const moddle = new BpmnModdle(pkg);
const parsed = await moddle.fromXML(sanitized);
warnings = parsed.warnings || [];
const exported = await moddle.toXML(parsed.rootElement, { format: false });
out = exported.xml;
} catch (e) {
parseErrors.push({ id: doc.id, name: doc.name, error: String(e && e.message || e) });
continue;
}
const unresolvedRefs = [];
for (const w of warnings) {
const msg = String(w && w.message || w);
const key = normWarn(msg);
warnCounts.set(key, (warnCounts.get(key) || 0) + 1);
if (key === 'unresolved reference') {
const mr = msg.match(/unresolved reference <([^>]+)>/i);
unresolvedRefs.push(mr ? mr[1] : msg.slice(0, 60));
}
}
// 5) 数据级零丢失比对:sanitized(前) vs out(后)
const before = surface(sanitized);
const after = surface(out);
const diffs = {};
let lost = false;
for (const k of ['extAttrs', 'extElemTags', 'extElemAttrs', 'extElemText', 'ids', 'refs']) {
const d = diffBag(before[k], after[k]);
if (d.missing.length || d.added.length) {
diffs[k] = d;
lost = true;
}
}
// I1②:未解析引用计入硬门(净化/往返破坏连线的直接信号,不再只当 warning)
if (lost || unresolvedRefs.length) {
failures.push({ id: doc.id, name: doc.name, ns, diffs, unresolved: unresolvedRefs });
} else {
ok++;
}
}
const expectedTotal = Number(process.env.EXPECTED_TOTAL || 1512);
report({ total: docs.length, ok, failures, decodeFailures, parseErrors, warnCounts, nsCounts, expectedTotal });
// 硬门:真实 BPMN 全部零丢失 + 无解析异常 + 无解码失败 + 语料规模符合预期。
// (M2:解码失败与规模不符均判失败——过滤集内本应 100% 干净 UTF8,且恒 EXPECTED_TOTAL 篇)
const gateOk =
failures.length === 0 &&
parseErrors.length === 0 &&
decodeFailures.length === 0 &&
docs.length === expectedTotal;
process.exit(gateOk ? 0 : 1);
}
// warning 归一:抽取属性/元素名做聚合键
function normWarn(msg) {
const mAttr = msg.match(/unknown (?:type|attribute) <([^>]+)>/i);
if (mAttr) return `unknown <${mAttr[1]}>`;
const mUn = msg.match(/unparsable content <([^>]+)>/i);
if (mUn) return `unparsable <${mUn[1]}>`;
const mRef = msg.match(/unresolved reference <([^>]+)>/i);
if (mRef) return 'unresolved reference';
return msg.replace(/<[^>]*>/g, '<…>').slice(0, 80);
}
function report(r) {
const line = '─'.repeat(60);
process.stdout.write(`${line}\n保真扫描结果\n${line}\n`);
process.stdout.write(`匹配 ${r.ok}/${r.total} 零丢失(真实 BPMN)\n`);
process.stdout.write(`总文档 ${r.total}(预期 ${r.expectedTotal})|零丢失 ${r.ok}|丢失 ${r.failures.length}|解析异常 ${r.parseErrors.length}|解码失败 ${r.decodeFailures.length}\n`);
if (r.total !== r.expectedTotal) {
process.stdout.write(`⚠ 语料规模 ${r.total} ≠ 预期 ${r.expectedTotal}(EXPECTED_TOTAL)→ 判失败\n`);
}
process.stdout.write(`\n命名空间加载分布:\n`);
for (const [ns, c] of [...r.nsCounts].sort((a, b) => b[1] - a[1])) {
process.stdout.write(` ${ns}: ${c}\n`);
}
process.stdout.write(`\nfromXML warnings(按归一键聚合,仅描述符覆盖信号,不判失败):\n`);
const ws = [...r.warnCounts].sort((a, b) => b[1] - a[1]);
if (!ws.length) process.stdout.write(' (无)\n');
for (const [k, c] of ws.slice(0, 40)) process.stdout.write(` ${c.toString().padStart(6)} ${k}\n`);
if (ws.length > 40) process.stdout.write(` … 另有 ${ws.length - 40} 类\n`);
if (r.decodeFailures.length) {
process.stdout.write(`\nbase64→UTF8 解码失败文档(单列,非 UTF8 BPMN):\n`);
for (const d of r.decodeFailures) process.stdout.write(` id=${d.id} name=${d.name} bytes=${d.bytes}\n`);
}
if (r.parseErrors.length) {
process.stdout.write(`\nmoddle 解析/序列化异常:\n`);
for (const e of r.parseErrors.slice(0, 30)) process.stdout.write(` id=${e.id} name=${e.name}\n ${e.error}\n`);
}
if (r.failures.length) {
process.stdout.write(`\n零丢失失败清单(round-trip 前后扩展面差异):\n`);
for (const f of r.failures.slice(0, 30)) {
process.stdout.write(` id=${f.id} name=${f.name} [${f.ns}]\n`);
for (const [k, d] of Object.entries(f.diffs)) {
if (d.missing.length) process.stdout.write(` ${k} 丢失: ${d.missing.slice(0, 6).join(' ; ')}${d.missing.length > 6 ? ' …' : ''}\n`);
if (d.added.length) process.stdout.write(` ${k} 新增: ${d.added.slice(0, 6).join(' ; ')}${d.added.length > 6 ? ' …' : ''}\n`);
}
if (f.unresolved && f.unresolved.length) {
process.stdout.write(` 未解析引用(I1): ${f.unresolved.slice(0, 6).join(' ; ')}${f.unresolved.length > 6 ? ' …' : ''}\n`);
}
}
if (r.failures.length > 30) process.stdout.write(` … 另有 ${r.failures.length - 30} 个失败文档\n`);
}
process.stdout.write(`${line}\n`);
}
main().catch((e) => {
// M5:psql 等子进程失败时把其 stderr 透出来(execFileSync 把 stderr 挂在 e.stderr)
if (e && e.stderr) process.stderr.write(String(e.stderr));
process.stderr.write(`扫描崩溃: ${e && e.stack || e}\n`);
process.exit(2);
});

View File

@@ -8,6 +8,7 @@
"moduleResolution": "bundler",
"allowImportingTsExtensions": true,
"resolveJsonModule": true,
"isolatedModules": true,
"moduleDetection": "force",
"noEmit": true,

View File

@@ -2,7 +2,7 @@ import { defineConfig, loadEnv } from 'vite';
import react from '@vitejs/plugin-react';
import { resolve } from 'path';
// 开发期 dev server 把 /api 反代到后端(默认 8084,端口被占时改 8090)。
// 开发期 dev server 把 /api 反代到后端(dev profile 默认 8093,端口被占时用 .env.local 覆盖)。
// 后端地址经 .env 的 VITE_BACKEND_TARGET 配置;生产由 Nginx 反代,前端只发相对 /api。
//
// F4-L1 多页应用(MPA):
@@ -16,7 +16,7 @@ import { resolve } from 'path';
// CSS 由 editor.html <link> 直接引用 /node_modules/... 路径,server.fs.allow 放开目录。
export default defineConfig(({ mode }) => {
const env = loadEnv(mode, process.cwd(), '');
const backendTarget = env.VITE_BACKEND_TARGET || 'http://localhost:8084';
const backendTarget = env.VITE_BACKEND_TARGET || 'http://localhost:8093';
return {
plugins: [react()],
resolve: {
@@ -38,6 +38,16 @@ export default defineConfig(({ mode }) => {
allow: ['..'],
},
},
// `npm run preview` 托管 dist 产物时也把 /api 反代到后端,便于本地验证生产构建
// (生产真部署由 Nginx 反代 /api;此处仅本地 prod-build 验证用,与 server.proxy 同口径)。
preview: {
proxy: {
'/api': {
target: backendTarget,
changeOrigin: true,
},
},
},
build: {
// 产物直接交 Nginx 托管;amis 本地 SDK 在 public/ 下原样拷贝,不参与打包。
outDir: 'dist',

Some files were not shown because too many files have changed in this diff Show More