From 0428a5c9d145c0e88e083920bd01c9810e1a406f Mon Sep 17 00:00:00 2001 From: zhengwr Date: Thu, 2 Jul 2026 14:39:52 +0800 Subject: [PATCH] =?UTF-8?q?fix(modeler):=20=E5=8F=91=E5=B8=83=E6=94=B6?= =?UTF-8?q?=E5=8F=A3=E2=80=94=E2=80=94=E5=8E=9F=E5=A7=8B=E6=BA=90=E5=9F=BA?= =?UTF-8?q?=E7=BA=BF=E4=B8=8D=E8=A2=AB=E9=A6=96=E5=AD=98=E9=87=8D=E7=BD=AE?= =?UTF-8?q?+=E5=8F=91=E5=B8=83=E5=89=8D=E6=8C=81=E4=B9=85=E5=8C=96(?= =?UTF-8?q?=E9=A2=84=E8=A7=88=3D=3D=E9=83=A8=E7=BD=B2)+=E8=B7=A8=E5=91=BD?= =?UTF-8?q?=E5=90=8D=E7=A9=BA=E9=97=B4diff=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- src/modeler/PublishConfirm.tsx | 9 +++- src/modeler/diffSummary.test.ts | 65 +++++++++++++++++++++++++++ src/modeler/diffSummary.ts | 13 ++++-- src/pages/ProcessModelerPage.test.tsx | 31 ++++++++++++- src/pages/ProcessModelerPage.tsx | 32 ++++++++++--- 5 files changed, 138 insertions(+), 12 deletions(-) diff --git a/src/modeler/PublishConfirm.tsx b/src/modeler/PublishConfirm.tsx index ab5998a..97950b9 100644 --- a/src/modeler/PublishConfirm.tsx +++ b/src/modeler/PublishConfirm.tsx @@ -87,6 +87,11 @@ export function PublishConfirm({ } } + // M3:发布进行中拦截关闭(遮罩点击 / X 按钮),避免中途关窗留下不确定态。 + const guardedClose = () => { + if (!deploying) onClose(); + }; + const key = impact?.processKey || processKeyHint || '(未知)'; const cur = impact?.currentVersion ?? 0; const versionText = !impactLoaded @@ -100,7 +105,7 @@ export function PublishConfirm({ const foot = ( <> -