From fbe39c8267576641c3813eb3a2ff3f503cc3dbb0 Mon Sep 17 00:00:00 2001 From: abaishu0730 Date: Mon, 19 Oct 2026 17:00:43 +0800 Subject: [PATCH] feat: add readable category rule workbench and safe draft trials --- docs/HANDOFF.md | 2 + docs/design-requirements.md | 2 + docs/order-rules-guide.md | 10 ++ .../rule-workbench-verification-2026-10-19.md | 42 ++++++++ .../plans/2026-10-19-rule-workbench.md | 45 +++++++++ .../specs/2026-10-19-rule-workbench-design.md | 14 +++ docs/web-action-inventory.md | 10 ++ src/app/assets.cjs | 1 + src/modules/order-execution/coordinator.cjs | 3 +- src/modules/order-rules/api.cjs | 7 ++ src/modules/order-rules/matching.cjs | 7 +- src/modules/order-rules/scopes.cjs | 20 ++++ src/modules/order-rules/store.cjs | 6 +- src/modules/order-rules/trial.cjs | 42 ++++++++ src/modules/order-rules/validation.cjs | 6 ++ src/modules/storage/order-archive.cjs | 8 +- src/modules/storage/order-filename.cjs | 10 ++ tests/app/execution-contract-ui.test.cjs | 4 +- tests/app/web-closure-review-ui.test.cjs | 7 ++ tests/app/web-closure-ui.test.cjs | 2 +- tests/order-rules/execution.test.cjs | 7 ++ tests/order-rules/http.test.cjs | 14 +++ tests/order-rules/web.test.cjs | 10 +- tests/order-rules/workbench-ui.test.cjs | 67 +++++++++++++ tests/order-rules/workbench.test.cjs | 47 +++++++++ web/app.css | 2 + web/index.html | 2 +- web/modules/mail/view.js | 2 +- web/modules/order-rules/editor.js | 24 ++--- web/modules/order-rules/preview.js | 9 +- web/modules/order-rules/scope-editor.js | 20 ++++ web/modules/order-rules/view.js | 98 ++++++++++++++----- 32 files changed, 485 insertions(+), 65 deletions(-) create mode 100644 docs/rule-workbench-verification-2026-10-19.md create mode 100644 docs/superpowers/plans/2026-10-19-rule-workbench.md create mode 100644 docs/superpowers/specs/2026-10-19-rule-workbench-design.md create mode 100644 src/modules/order-rules/scopes.cjs create mode 100644 src/modules/order-rules/trial.cjs create mode 100644 src/modules/storage/order-filename.cjs create mode 100644 tests/order-rules/workbench-ui.test.cjs create mode 100644 tests/order-rules/workbench.test.cjs create mode 100644 web/modules/order-rules/scope-editor.js diff --git a/docs/HANDOFF.md b/docs/HANDOFF.md index 3786532..9535fbf 100644 --- a/docs/HANDOFF.md +++ b/docs/HANDOFF.md @@ -6,6 +6,8 @@ 源码模块:BPM会话与只读接口在src/modules/bpm;15类规则、窗口、冻结批次及受控发送在order-rules;执行协调与字段证据在order-execution;归档提供器在storage/order-archive.cjs。扩展原PDF四字段文件名保持兼容。web/modules/navigation/lifecycle.js负责页面生命周期。 +分类工作台新增 order-rules/scopes.cjs 统一流程节点配对、trial.cjs 验证候选草稿与真实采集凭据;storage/order-filename.cjs 共用正式命名。前端 scope-editor.js、editor.js、preview.js、view.js 分别负责范围、配置、验证呈现和生命周期。现有15类及发送/冻结策略保留;通用字段条件留待后续。验收见[分类工作台验收](rule-workbench-verification-2026-10-19.md)。 + ## 当前要求 [设计要求](design-requirements.md)是当前权威入口,[操作清单](web-action-inventory.md)记录页面动作、权限、前置条件、结果、失败路径与验收。 diff --git a/docs/design-requirements.md b/docs/design-requirements.md index 681abce..867122e 100644 --- a/docs/design-requirements.md +++ b/docs/design-requirements.md @@ -34,6 +34,8 @@ Excel 的15类规则是唯一业务分类。流程名称、版本、配置节点 ## 保留与退役 +分类规则采用可搜索筛选的类别目录、四段配置和样本验证工作台。流程/节点逐行配对,匹配、扫描前置筛选和发布冲突复用同一判定;旧数组规则及发布快照保持原语义。当前输入可做无副作用的处理模拟,仅当前已保存版本结合服务端真实采集可形成发布依据。字段条件组/通用决策表为后续阶段;本期设计见[分类工作台](superpowers/specs/2026-10-19-rule-workbench-design.md)。 + 保留账号、BPM与只读到达历史、分类通知、导出归档、日历、模板与邮箱历史、异常协作、助手、服务健康、审计。旧监管草稿、重复连接汇总页、与Excel并行的通用通知写入/调度和逐单/产品线选项已退役。旧数据、邮件记录与模板保留查询,旧写入返回410并指出新入口,旧hash重定向。收件人仅在Excel分类规则维护。 旧到达记录扫描读取inform接口,仅供到达历史查询;订单执行独立读取实际todo接口,绝不将inform改名当todo。 diff --git a/docs/order-rules-guide.md b/docs/order-rules-guide.md index e632596..b37c080 100644 --- a/docs/order-rules-guide.md +++ b/docs/order-rules-guide.md @@ -20,6 +20,16 @@ Excel15个类别已建立。选择类别后维护适用流程、节点、字段适配器、归档共享路径、文件名日期来源、主题、正文引导语、签名及主送/抄送名单。 +分类规则页采用“分类目录/配置/样本验证”工作台。目录可以搜索名称和类别编号,按待完善、有草稿、已发布和已暂停筛选;这些查询不会产生未保存修改。手机端按相同顺序纵向排列。 + +配置分四部分:哪些订单归到这里、订单信息从哪里取、归类后怎样处理、配置是否正确。流程和节点每行成对选择,任一完整配对命中即可,避免两列产生意外交叉组合。搜索只筛选可选值,已有配置不会被搜索清除。旧版数组规则仍按原组合读取,不自动改写旧发布版本。 + +“试运行草稿”使用当前表单,包括未保存的修改,展示字段来源、命中说明、预计文件名、归档路径、邮件主题、收件人、附件要求和正文。处理预览仅为单个样本的模拟,不创建文件、订单或批次,不验证共享目录,也不连接邮箱。正式发送仍按时段汇总;归档日期暂用模拟时间,实际文件名以归档时为准。 + +真实采集样本不可在此编辑;要核验的字段绑定在“字段映射”维护。只有当前已保存草稿与服务器真实采集样本校验通过才记录发布依据。更改表单或样本立即清除旧结果;保存后重新校验,迟到的旧响应不会覆盖新输入。模拟JSON即使写入demo=false也不能作为发布依据。保存成功而刷新失败时会分别提示,持久状态已经生效,无需重复保存。 + +本期通用性覆盖流程节点配对、多表单版本字段映射、按类别处理及输出预览;任意业务字段的条件组、运算符和决策表属于后续阶段,本期不开放伪生效的条件编辑。 + Excel只有归档分类目录名,完整服务器共享路径与“日期”具体来源仍需业务确认。不会凭目录名猜服务器地址。 保存产生草稿,原发布版本继续服务已有任务。字段对应面板显示中文业务字段、xdatabind来源及样本值。真实字段目录只允许选择服务器实际采集的路径与流程版本;校验展示命中原因、缺失字段和多重规则冲突。预置演示样本仅帮助理解,不能作为发布依据。 diff --git a/docs/rule-workbench-verification-2026-10-19.md b/docs/rule-workbench-verification-2026-10-19.md new file mode 100644 index 0000000..b5407d3 --- /dev/null +++ b/docs/rule-workbench-verification-2026-10-19.md @@ -0,0 +1,42 @@ +# 分类规则工作台验收(2026-10-19) + +范围:业务设置的分类规则工作台。保留15类、原路由、现有通知窗口、冻结批次和人工恢复限制;通用任意字段条件属于后续阶段。设计依据及官方参考见[工作台设计](superpowers/specs/2026-10-19-rule-workbench-design.md)。 + +## 实现 + +- 分类目录支持名称/编号搜索与状态筛选。选择类别经过未保存保护,并在目录内保持可见;查询不会误记为规则修改。 +- 编辑区按“哪些订单归到这里/订单信息从哪里取/归类后怎样处理/配置是否正确”组织,显示草稿、生效版本和Excel来源行。字段绑定显示版本与结构核验状态,连接实际字段目录入口。 +- 流程和节点逐行配对。scopes.cjs统一分类、扫描预筛选、发布冲突;缺少scopes的旧规则保持原数组组合含义,已有发布快照不自动重写。 +- trial.cjs接受选定类别、版本、候选草稿与模拟/捕获样本。管理员可试跑当前输入;操作员限已保存规则且真实采集限连接负责人;viewer拒绝提交。伪造、空白或错误类型的样本标识拒绝,不进入SQLite参数绑定。 +- 仅与当前持久草稿相同且通过服务器真实采集样本的结果记录发布依据;候选模拟不写草稿、订单、批次、文件或邮件,不为另一个类别授予凭据。老预览接口保持兼容。 +- 文件名复用正式order-filename.cjs,正文复用buildBatch及显式类别模板。路径与附件仅为模拟规划,不构成归档证据;归档日暂用模拟时间并注明。正式邮件依然同窗口同类别汇总。 +- 统一写操作锁覆盖保存、发布、暂停和当前页刷新。保存后列表刷新失败仍维护正确已保存基线;试运行在配置/样本变化或离页时失效;保存并继续后暂停读取刷新后的草稿版本。 +- 全量回归发现旧邮件模板切换时旧表单仍可编辑,可能被迟到详情覆盖。现先显示读取状态,失败提供重新选择入口,旧可编辑表单立即退出;增加延迟响应和读取失败测试。 + +## 回归证据 + +- 配对与试运行新增6项域测试,实际扫描新增1项配对测试;26项工作台/执行专项通过,包含15类临时归档与真实本地SMTP闭环、明确拒收与部分拒收。 +- 页面新增6项工作台测试与1项模板读取边界测试。35项页面闭环回归通过,覆盖管理员、操作员、只读角色、390px、目录搜索/滚动、编辑增删、当前草稿试跑、失效响应、保存失败/刷新失败、发布锁和保存后暂停。随后发现同版本多映射的字段来源面板会误选注册表首项,新增当前勾选回归并修复,相关10项规则UI/接口契约测试通过;字段来源现在随当前草稿勾选立即变化,不以注册表顺序猜测。 +- HTTP覆盖跨源拒绝、角色限制、旧版本409、畸形样本标识400、连接负责人范围、未经保存的候选不持久化。 +- RED/GREEN:先观察配对/候选试跑、目录与新增行名称、保存后基线、选中项可见、发布互斥、模板切换延迟的失败,再修复并复测。 +- 首轮全量388项:385通过、2失败、1可选CLI跳过,556.07秒。返回测试错误地依赖旧间接路由的跳转次数,改为显式按侧栏进入;模板失败复现为旧表单编辑竞态,已修复。保留原断言,未放宽等待时间或跳过用例。 +- 锁定依赖npm ci、npm ls通过。未强制升级依赖,npm ci仍报告锁文件现有的2项moderate审计告警。 + +完整日志、截图及本机部署校验文件位于忽略目录output/verification,不随源码提交;不含真实邮件发送或BPM办理的验收声明。 + +## 现场边界 + +隔离预览使用localhost独立主机名与合成样本,不覆盖正式127.0.0.1浏览器会话。390px预览页面实际宽375px,无整页横向溢出。合成捕获仅用于测试发布凭据逻辑,不代表15类真实现场字段已经验收。 + +正式自动发送保持暂停。仍需逐类现场确认真实字段、完整目录、邮箱和批次预览;惠州额外通知条件未确认,BPM节点人工办理。未新增任意字段条件组或通用决策表。 + +## 最终全量与正式更新 + +- 最终完整npm test:391项,390通过、0失败、1可选官方CLI集成跳过(未设置ORDER_TEST_ZCODE_CLI),572.88秒,退出码0。完整日志为output/verification/rule-workbench-complete-tests.log;194个JS/CJS语法检查及git diff检查通过。最终全量开始后未再修改实现或测试代码。 +- 更新前停止服务,完成受当前用户ACL保护的备份:%LOCALAPPDATA%/OrderNotificationAutomationBackups/rule-workbench-20261019-165420,3955个状态文件;12个SQLite数据库只读quick_check全部为ok。配置及PDF输出一并按实际路径备份。 +- 更新前后用户/设置、15类规则配置及其发布快照、3900个已有密钥摘要一致,无新增或丢失密钥;BPM账号、邮箱、存储身份保持原值。2条当时已有服务器会话逐条保留,浏览器原账号仍登录,无密码重置或重新登录。 +- 新服务守护状态running/healthy,双端口内部健康检查通过,自启动仍为false。18766首页200;18765无扩展来源403、合法扩展来源未配对401,认证边界保留。正式自动发送仍false,设置版本仍1。 +- 正式浏览器只读核验1440px桌面与390px手机:15类目录、4个配置区、样本面板与选中类别正确;桌面实际页面宽1425px、手机375px,均小于对应视口。未保存配置、未试跑或发布真实规则、未办理BPM、未发送真实邮件;最后保留分类规则页面并恢复默认视口。 +- 桌面与手机截图保留完整原始画面,并另外裁出首屏作为界面证据:[正式桌面](../output/verification/rule-workbench-formal-desktop.png)、[正式手机](../output/verification/rule-workbench-formal-mobile.png)。截图仅存在本机忽略目录,不随源码提交。 + +本地分支codex/modular-refactor及隔离工作树保留,不推送或合并。设计、计划、配置指南、全站操作清单和交接记录同步更新。 diff --git a/docs/superpowers/plans/2026-10-19-rule-workbench.md b/docs/superpowers/plans/2026-10-19-rule-workbench.md new file mode 100644 index 0000000..e459e2a --- /dev/null +++ b/docs/superpowers/plans/2026-10-19-rule-workbench.md @@ -0,0 +1,45 @@ +# 分类规则工作台 Implementation Plan + +> **For agentic workers:** Execute inline using executing-plans, task by task. User approved the design in chat; retain existing isolated worktree and local branch. + +**Goal:** 将分类规则改成易懂、可验证的业务配置工作台,并完成流程节点配对的真实执行链路。 + +**Architecture:** 公共配对模块负责旧规则兼容和精确范围判断;试运行模块负责只读候选验证和处理模拟。前端范围编辑、规则分区、目录/请求生命周期分别维护。 + +**Tech Stack:** Node CJS/SQLite、现有原生JS与Tabler1.6.1、node:test/Chromium,不增加依赖。 + +**Spec:** docs/superpowers/specs/2026-10-19-rule-workbench-design.md + +## Constraints + +15类保留;BPM人工办理;正式自动发信暂停;不发送真实邮件;旧发布版/已有批次不重写;原工作目录不修改。通用业务字段条件下一阶段交付。 + +## Task 1: 配对及候选试运行 + +Files: 新建src/modules/order-rules/scopes.cjs、trial.cjs及storage/order-filename.cjs;修改matching.cjs、validation.cjs、store.cjs、api.cjs、order-execution/coordinator.cjs、storage/order-archive.cjs;测试tests/order-rules/workbench.test.cjs。 + +- [x] 添加不交叉命中、旧数组兼容、真实执行与冲突一致、版本拒绝、未保存试运行不取发布凭据、真实已保存试运行保留发布凭据测试,运行观察失败。 +- [x] 实现scopesFor(rule)、matchesScope(rule,event)、scopesOverlap(a,b),验证并派生兼容数组。全部匹配入口复用。 +- [x] 新增trial(id,{version,draft,sampleId,sample});校验管理员才能提供draft、真实样本所有权、当前版本。仅匹配持久草稿且真实样本可写凭据。 +- [x] 抽取archiveFilename(event,filenameDate,at)共用文件名,复用buildBatch/applyBodyTemplate模拟单订单内容,不持久化假归档。 +- [x] 运行新域测试、原规则及执行/存储测试;本地提交。 + +## Task 2: 分类工作台 + +Files: 新建web/modules/order-rules/scope-editor.js;修改editor.js、preview.js、view.js、web/app.css及静态资源注册;新增tests/order-rules/workbench-ui.test.cjs。 + +- [x] 先写浏览器用例验证搜索/筛选、增删配对、当前输入模拟、失效响应、未保存保护、三角色和390px;观察失败。 +- [x] scope-editor提供render/read/bind,支持搜索流程和节点、删除行、无选项提示;保留已有未核验值。 +- [x] 编辑器按四个问题分区,字段映射作为状态摘要;处理区提供归档、内容和收件人;共用底部保存/发布操作。 +- [x] view负责目录和选择保护、草稿试运行输入快照/请求版本、保存后刷新、发布/暂停和销毁;preview负责字段和处理模拟呈现。 +- [x] 保留原业务回归断言,必要时更新可见文案/新接口契约;专项通过后本地提交。 + +## Task 3: 验收和本地更新 + +- [x] npm ci、npm test全量、JS语法和git diff检查;失败必须修复并验证。 +- [x] 检查最终实现的权限、旧数据兼容、真实匹配和发布凭据边界。 +- [x] 正式状态ACL备份及数据库quick_check;前后账号/设置/密钥摘要比较;重启双端口健康检查;保持自动发信暂停。 +- [x] 通过独立浏览器会话的隔离样本观察桌面/手机;原正式账号查看新规则页面,未做配置写入。 +- [x] 更新指南、操作清单、交接和验收证据;本地提交,保留分支,不推送或合并。 + +本轮在既有隔离工作树执行,完成最终全量与正式只读验收后统一提交;不推送或合并。测试及部署证据见docs/rule-workbench-verification-2026-10-19.md。 diff --git a/docs/superpowers/specs/2026-10-19-rule-workbench-design.md b/docs/superpowers/specs/2026-10-19-rule-workbench-design.md new file mode 100644 index 0000000..fb82f28 --- /dev/null +++ b/docs/superpowers/specs/2026-10-19-rule-workbench-design.md @@ -0,0 +1,14 @@ +# 分类规则工作台 + +用户确认采用分类目录、分区表单和样本验证的设计;本期交付第一步,通用任意字段条件不在本期。 + +参考已核对的开源/官方交互资料:[React Query Builder](https://react-querybuilder.js.org/docs/intro)的字段选择与条件表达、[n8n Switch](https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.switch/)的分类分支、[Camunda DMN 命中策略](https://docs.camunda.io/docs/components/modeler/dmn/decision-table-hit-policy/)的唯一命中与冲突检查。当前保留原生JS/Tabler,不额外引入React依赖;通用字段条件后续沿字段目录扩展。 + +- 保留15类、现有业务设置路由、管理员编辑/操作员试运行/只读查看权限和自动发信暂停。 +- 左侧搜索与状态筛选;中间按“哪些订单、信息来源、处理方式、验证发布”分区;右侧真实样本与命中/处理预览。窄屏按目录、配置、验证顺序排列。 +- 流程节点逐行配对,以scopes数组保存;旧数组规则按原笛卡尔组合读取,不自动改写已有发布版。所有匹配、扫描和发布冲突使用同一配对判定。 +- 字段映射展示流程/版本/验证状态,链接现有字段映射入口。流程、节点可搜索选择已配置目录和实际采集值;不凭输入猜字段。 +- 新试运行接口接受选定类别的版本和可选未保存草稿,使用当前草稿与其他类别对比,返回命中检查、字段证据与模拟处理结果。未保存输入不写入草稿、发布凭据、订单、归档或邮件。仅完全等于持久草稿的真实服务端样本试运行可记录发布凭据。 +- 处理预览复用正式文件命名和邮件构建;标明模拟路径、归档未核验、单订单示例,正式批次仍按时段汇总。归档日采用模拟时间并注明。类别模板使用已有显式绑定。 +- 保留全部未保存保护、并发版本、提交防重复、离页请求作废;表单变化立即清除旧试运行展示,迟到试运行不得覆盖新输入。 +- 全量回归后备份正式状态,保持密钥/账号/配置,重启并现场核验。使用独立浏览器上下文验证,避免预览Cookie覆盖正式会话。 diff --git a/docs/web-action-inventory.md b/docs/web-action-inventory.md index 89b0ca2..60210eb 100644 --- a/docs/web-action-inventory.md +++ b/docs/web-action-inventory.md @@ -47,6 +47,16 @@ | T02 类别关联、解除关联 | 管理员;有效类别、active模板、版本 | 显式类别绑定;生成批次时冻结 | 不猜旧群组类别;closure-providers/mail-http | 已验证可用 | | T03 模板历史、原EML、附件下载 | 已登录预览;管理员下载 | 保留原始版本;受限返回内容 | 外链脚本隔离;mail-http/mail-ui | 已验证可用 | +分类工作台补充动作(沿用R01–R04的权限): + +| 编号 / 操作 | 执行与结果 | 失败 / 验收 | 状态 | +|---|---|---|---| +| R11 搜索类别、状态筛选、选择类别 | 仅过滤目录,切换类别受未保存保护 | 空结果提示;搜索不误判修改;workbench-ui | 已验证可用 | +| R12 搜索流程节点、添加/删除配对行 | 配对保存到草稿;既有选项保留,最多100个配对 | 空行阻止提交;扫描/匹配/发布按完整配对判断;workbench/execution | 已验证可用 | +| R13 当前输入试运行、展开字段来源和正文 | 仅模拟处理;未保存不写凭据、订单、文件、批次 | 无匹配/冲突/版本失效提示;真实采集标识校验与所有权;workbench/http | 已验证可用 | +| R14 保存后刷新失败、修改中迟到试运行 | 保留输入与已保存版本,分别说明结果;修改立即作废旧试跑 | 保存后基线一致;离页或新输入不显示旧结果;workbench-ui | 已验证可用 | +| R15 真实样本的字段来源面板 | 跟随当前草稿选择的唯一版本映射,支持展开核对 | 同版本多映射不按注册表顺序猜测;workbench-ui | 已验证可用 | + ## 系统设置、存储、助手 | 编号 / 操作 | 权限、前置条件 | 实际执行及结果位置 | 失败 / 验收 | 状态 | diff --git a/src/app/assets.cjs b/src/app/assets.cjs index ce3da42..bb0fe98 100644 --- a/src/app/assets.cjs +++ b/src/app/assets.cjs @@ -20,6 +20,7 @@ function createAssets(){ '/storage-preview-host.js':{path:path.join(webRoot,'modules/storage/preview-host.js'),type:'text/javascript'}, '/storage-preview.css':{path:path.join(webRoot,'modules/storage/preview.css'),type:'text/css',preview:true}, '/order-rules-editor.js':{path:path.join(webRoot,'modules/order-rules/editor.js'),type:'text/javascript'}, + '/order-rules-scopes.js':{path:path.join(webRoot,'modules/order-rules/scope-editor.js'),type:'text/javascript'}, '/order-rules-preview.js':{path:path.join(webRoot,'modules/order-rules/preview.js'),type:'text/javascript'}, '/order-execution.js':{path:path.join(webRoot,'modules/order-rules/execution.js'),type:'text/javascript'}, '/order-notifications-shared.js':{path:path.join(webRoot,'modules/order-notifications/shared.js'),type:'text/javascript'}, diff --git a/src/modules/order-execution/coordinator.cjs b/src/modules/order-execution/coordinator.cjs index b6b1812..11e2b46 100644 --- a/src/modules/order-execution/coordinator.cjs +++ b/src/modules/order-execution/coordinator.cjs @@ -2,6 +2,7 @@ const crypto=require('node:crypto'); const {fail}=require('../order-rules/validation.cjs'); const {dayPolicy}=require('../../shared/schedule.cjs'); +const {matchesScope}=require('../order-rules/scopes.cjs'); const hash=value=>crypto.createHash('sha256').update(JSON.stringify(value)).digest('hex'); const clone=value=>structuredClone(value); class OrderExecutionCoordinator{ @@ -117,7 +118,7 @@ class OrderExecutionCoordinator{ this.store.transaction(()=>{ for(const row of rows){ if(row.source!=='todo')continue; - const rules=this.store.all('rules').map(r=>r.published?.status==='enabled'?r.published:r.draft).filter(rule=>rule.processNames.includes(row.processName)&&rule.nodeNames.includes(row.nodeName)); + const rules=this.store.all('rules').map(r=>r.published?.status==='enabled'?r.published:r.draft).filter(rule=>matchesScope(rule,row)); if(!rules.length)continue; // Historical rows are ignored before any capture or export. const window=this.store.snapshot().window;if(window&&Number.isFinite(Date.parse(row.receivedAt))&&Date.parse(row.receivedAt)200))fail('真实采集样本标识无效。'); + if(body?.sampleId){const captured=orderRules.get('capture-samples',body.sampleId);if(!captured)fail('真实采集样本不存在。',404);if(user.role!=='admin'&&workspace?.getConnection(captured.sample.connectionId)?.owner!==user.username)fail('仅连接负责人或管理员可试运行此采集样本。',403);} + reply(200,orderRules.trial(trial[1],body));return true; + } if(route==='/api/order-rules/preview'||route==='/api/order-rules/events'){ if(route.endsWith('/events'))fail('客户端事件写入已退役,请通过授权待办扫描创建任务。',410); if(!body||Object.keys(body).some(k=>!['sample','sampleId'].includes(k)))fail('请提供 BPM 样本或服务端采集标识。'); diff --git a/src/modules/order-rules/matching.cjs b/src/modules/order-rules/matching.cjs index ddcfa0b..593692b 100644 --- a/src/modules/order-rules/matching.cjs +++ b/src/modules/order-rules/matching.cjs @@ -1,5 +1,6 @@ 'use strict'; const {extractTitle}=require('./title.cjs'); +const {matchesScope,scopesFor}=require('./scopes.cjs'); const labels = { orderNo: '订单号', appDate: '申请日期', customer: '客户', productLine: '产品线', @@ -31,9 +32,7 @@ function previewMatch(rules, adapters, input) { for (const key of ['processName', 'processVersion', 'nodeName']) { check('流程信息', nonblank(sample[key]), `${key}:${nonblank(sample[key]) ? sample[key] : '缺失'}`); } - const matches = (Array.isArray(rules) ? rules : []).filter(rule => - Array.isArray(rule.processNames) && rule.processNames.includes(sample.processName) - && Array.isArray(rule.nodeNames) && rule.nodeNames.includes(sample.nodeName)); + const matches = (Array.isArray(rules) ? rules : []).filter(rule => matchesScope(rule,sample)); check('分类命中', matches.length === 1, matches.length === 1 ? `唯一命中:${matches[0].name}` : matches.length ? `同时命中 ${matches.length} 条规则,须消除冲突` : '没有流程名称和节点名称均精确匹配的规则'); const rule = matches.length === 1 ? matches[0] : null; const available = rule ? (Array.isArray(adapters) ? adapters : []).filter(adapter => @@ -86,7 +85,7 @@ function previewMatch(rules, adapters, input) { function describeRule(rule) { const date = { appDate: '申请日期', receivedAt: '接收日期', archiveDate: '归档日期' }[rule.filenameDate] || '待选择的日期'; - return `${rule.name}:流程“${(rule.processNames || []).join('、')}”到达节点“${(rule.nodeNames || []).join('、')}”时归入本类别。本时段内同类别订单合并一封,通知与更改分别汇总,更早历史不补发。正常工作日首封只取当天零点到首个时点,第二封取两个时点之间;周一首封从上个工作日最后时点起算。${rule.attachPdf ? '附电子流 PDF;' : ''}文件以订单号、${date}、流水编号命名。BPM 节点由人工办理。`; + return `${rule.name}:满足任一流程节点配对(${scopesFor(rule).map(row=>`“${row.processName}” → “${row.nodeName}”`).join(';')||'待选择'})时归入本类别。本时段内同类别订单合并一封,通知与更改分别汇总,更早历史不补发。正常工作日首封只取当天零点到首个时点,第二封取两个时点之间;周一首封从上个工作日最后时点起算。${rule.attachPdf ? '附电子流 PDF;' : ''}文件以订单号、${date}、流水编号命名。BPM 节点由人工办理。`; } module.exports = { previewMatch, describeRule }; diff --git a/src/modules/order-rules/scopes.cjs b/src/modules/order-rules/scopes.cjs new file mode 100644 index 0000000..a081311 --- /dev/null +++ b/src/modules/order-rules/scopes.cjs @@ -0,0 +1,20 @@ +'use strict'; +// Missing scopes means a legacy rule; preserve its original array semantics. +function scopesFor(rule){ + if(Object.hasOwn(rule,'scopes')&&rule.scopes!==undefined)return Array.isArray(rule.scopes)?rule.scopes:[]; + return (rule.processNames||[]).flatMap(processName=>(rule.nodeNames||[]).map(nodeName=>({processName,nodeName}))); +} +function normalizeScopes(rows){ + const fail=()=>{throw Object.assign(Error('流程节点配对范围无效,请逐行选择完整流程和节点(最多100行)。'),{status:400});}; + if(!Array.isArray(rows)||rows.length>100)fail(); + const seen=new Set(),result=[]; + for(const row of rows){ + if(!row||typeof row!=='object'||Array.isArray(row)||Object.keys(row).some(k=>!['processName','nodeName'].includes(k))||['processName','nodeName'].some(k=>typeof row[k]!=='string'||!row[k].trim()||row[k].length>250||/[\x00-\x1f]/.test(row[k])))fail(); + const value={processName:row.processName.trim(),nodeName:row.nodeName.trim()},key=JSON.stringify(value); + if(!seen.has(key)){seen.add(key);result.push(value);} + } + return result; +} +const matchesScope=(rule,event)=>scopesFor(rule).some(row=>row.processName===event.processName&&row.nodeName===event.nodeName); +const scopesOverlap=(a,b)=>scopesFor(a).some(row=>matchesScope(b,row)); +module.exports={scopesFor,normalizeScopes,matchesScope,scopesOverlap}; diff --git a/src/modules/order-rules/store.cjs b/src/modules/order-rules/store.cjs index a9638a2..e45a6fa 100644 --- a/src/modules/order-rules/store.cjs +++ b/src/modules/order-rules/store.cjs @@ -6,6 +6,7 @@ const {buildBatch}=require('./batch.cjs');const {transition}=require('./state.cj const {applyBodyTemplate}=require('./template.cjs'); const {fail,validateRule,publicationIssues}=require('./validation.cjs'); const {windowForCutoff,upcomingWindow,inWindow}=require('./window.cjs'); +const {matchesScope,scopesOverlap}=require('./scopes.cjs'); const canonical=value=>Array.isArray(value)?value.map(canonical):value&&typeof value==='object'?Object.fromEntries(Object.keys(value).sort().map(k=>[k,canonical(value[k])])):value; const digest=value=>crypto.createHash('sha256').update(JSON.stringify(canonical(value))).digest('hex'); const copy=value=>structuredClone(value); @@ -46,6 +47,7 @@ class RuleStore{ saveAdapter(input,actor){return registry.saveAdapter(this,input,actor);} capturedPreview(sampleId){const captured=this.get('capture-samples',sampleId);if(!captured||captured.provenance!=='server-provider')fail('真实捕获样本不存在。',404);const result=this.preview(captured.sample);if(result.valid){const record=this.get('rules',result.ruleId);record.trialSampleId=sampleId;this.put('rules',record);}return result;} previewUntrusted(sample){return previewMatch(this.all('rules').map(r=>r.draft),this.adapters(),sample);} + trial(id,input){return require('./trial.cjs').trial(this,id,input);} transaction(work){this.db.exec('BEGIN IMMEDIATE');try{const result=work();this.db.exec('COMMIT');return result;}catch(error){this.db.exec('ROLLBACK');throw error;}} get(kind,id){const row=this.db.prepare('SELECT payload FROM records WHERE kind=? AND id=?').get(kind,id);return row?this.vault.decode(kind+':'+id,row.payload):null;} @@ -81,7 +83,7 @@ class RuleStore{ const issues=publicationIssues(record.draft,this.adapters()); if(record.trialVersion!==record.draft.version)issues.push('请先用真实结构样本试运行当前草稿'); if(record.trialDemo!==false)issues.push('演示样本仅用于理解字段,发布前请校验真实业务样本'); - const overlaps=this.all('rules').filter(r=>r.id!==id&&r.published?.status==='enabled'&&r.published.processNames.some(p=>record.draft.processNames.includes(p))&&r.published.nodeNames.some(n=>record.draft.nodeNames.includes(n))); + const overlaps=this.all('rules').filter(r=>r.id!==id&&r.published?.status==='enabled'&&scopesOverlap(r.published,record.draft)); if(overlaps.length)issues.push('与已启用规则存在流程和节点冲突:'+overlaps.map(r=>r.draft.name).join('、')); if(issues.length)fail(issues.join(';'),409); record.published={...copy(record.draft),status:'enabled',publishedAt:this.now()};this.put('rules',record); @@ -96,7 +98,7 @@ class RuleStore{ matchingPublications(sample){ const rules=this.all('rules').filter(r=>r.published).map(r=>r.published); const enabled=rules.filter(r=>r.status==='enabled'); - const hasEnabledMatch=enabled.some(r=>r.processNames.includes(sample.processName)&&r.nodeNames.includes(sample.nodeName)); + const hasEnabledMatch=enabled.some(r=>matchesScope(r,sample)); return hasEnabledMatch?enabled:rules; } ingest(sample,actor){return this.transaction(()=>{ diff --git a/src/modules/order-rules/trial.cjs b/src/modules/order-rules/trial.cjs new file mode 100644 index 0000000..8fbc98b --- /dev/null +++ b/src/modules/order-rules/trial.cjs @@ -0,0 +1,42 @@ +'use strict'; +const path=require('node:path'),{isDeepStrictEqual}=require('node:util'); +const {validateRule,publicationIssues,fail}=require('./validation.cjs'); +const {previewMatch}=require('./matching.cjs'),{scopesFor}=require('./scopes.cjs'); +const {archiveFilename}=require('../storage/order-filename.cjs'); +const {buildBatch}=require('./batch.cjs'),{applyBodyTemplate}=require('./template.cjs'); +const comparable=rule=>{const value=validateRule(rule,rule);value.version=rule.version;value.scopes=scopesFor(value);return value;}; +function effects(rule,event,store){ + const result={simulation:true,archiveVerified:false,filename:null,path:null,mail:null,issues:publicationIssues(rule,store.adapters()),provisionalDate:rule.filenameDate==='archiveDate'}; + try{ + const at=rule.filenameDate==='appDate'?event.appDate:rule.filenameDate==='receivedAt'?event.receivedAt:store.now(); + result.filename=archiveFilename(event,rule.filenameDate,at); + if(!/^\\\\[^\\]+\\[^\\]+/.test(rule.archiveDirectory))return result; + result.path=path.win32.join(rule.archiveDirectory,result.filename); + // Planning metadata exists only in this stack frame, never as archive evidence. + const file={name:result.filename,path:result.path,size:0,sha256:'0'.repeat(64),kind:'pdf'}; + const order={id:'simulation',event,ruleSnapshot:rule,status:'pending',archive:{archivedAt:store.now(),files:[file]}}; + const cutoff=new Date(Math.max(Date.parse(event.receivedAt),Date.parse(store.now()))).toISOString(); + const snapshot=applyBodyTemplate(buildBatch(rule,[order],cutoff,{maxMessageBytes:store.settings().maxMessageBytes}),store.templateResolver?.(rule.categoryId),[order],store.settings().maxMessageBytes); + result.mail={subject:snapshot.subject,text:snapshot.text,to:snapshot.to,cc:snapshot.cc,attachments:snapshot.attachments.map(f=>f.name),template:snapshot.template||null}; + }catch(error){result.issues.push(error.message);} + return result; +} +function trial(store,id,input){return store.transaction(()=>{ + const record=store.get('rules',id);if(!record)fail('规则不存在。',404); + if(!input||typeof input!=='object'||Array.isArray(input)||Object.keys(input).some(k=>!['version','draft','sample','sampleId'].includes(k)))fail('草稿试运行参数无效。'); + if(Object.hasOwn(input,'sampleId')&&(typeof input.sampleId!=='string'||!input.sampleId.trim()||input.sampleId.length>200))fail('真实采集样本标识无效。'); + if(input.version!==record.draft.version)fail('规则版本已变化,请刷新后重新试运行。',409); + if((!!input.sampleId)===(!!input.sample))fail('请选择一个真实采集样本,或提供一个模拟样本。'); + const captured=input.sampleId?store.get('capture-samples',input.sampleId):null; + if(input.sampleId&&(!captured||captured.provenance!=='server-provider'))fail('真实捕获样本不存在。',404); + const sample=captured?.sample||input.sample; + if(!sample||typeof sample!=='object'||Array.isArray(sample))fail('样本必须是对象。'); + const candidate=input.draft?validateRule(input.draft,record.draft):structuredClone(record.draft);candidate.version=record.draft.version; + const saved=isDeepStrictEqual(comparable(candidate),comparable(record.draft)); + const rules=store.all('rules').map(r=>r.id===id?candidate:r.draft),result=previewMatch(rules,store.adapters(),sample); + if(result.ruleId!==id){result.valid=false;result.issues.push('样本未唯一命中当前类别,请检查适用范围或其他类别冲突。');} + const publishEvidence=!!(result.valid&&saved&&captured&&sample.demo!==true); + if(publishEvidence){record.trialVersion=record.draft.version;record.trialDemo=false;record.trialSampleId=captured.id;store.put('rules',record);} + return {...result,trial:{saved,version:record.draft.version,publishEvidence,source:captured?'captured':'simulation'},effects:result.ruleId===id?effects(candidate,result.event,store):null}; +});} +module.exports={trial}; diff --git a/src/modules/order-rules/validation.cjs b/src/modules/order-rules/validation.cjs index 48fba78..11d4f9b 100644 --- a/src/modules/order-rules/validation.cjs +++ b/src/modules/order-rules/validation.cjs @@ -1,4 +1,5 @@ 'use strict'; +const {normalizeScopes}=require('./scopes.cjs'); const fail=(message,status=400)=>{throw Object.assign(new Error(message),{status});}; const fields=['id','version','name','categoryId','processNames','nodeNames','adapterIds','archiveDirectory','filenameDate','subjectPrefix','intro','signature','to','cc','attachPdf','sourceRow']; function addresses(values){ @@ -13,6 +14,11 @@ function validateRule(input,old){ if(!old||input.id!==old.id||input.categoryId!==old.categoryId)fail('规则类别标识不能修改。'); if(input.version!==old.version)fail('规则已被其他人修改,请刷新后重试。',409); const rule=Object.fromEntries(fields.map(k=>[k,input[k]??old[k]])); + if(Object.hasOwn(input,'scopes')&&input.scopes!==undefined){ + rule.scopes=normalizeScopes(input.scopes); + rule.processNames=[...new Set(rule.scopes.map(row=>row.processName))]; + rule.nodeNames=[...new Set(rule.scopes.map(row=>row.nodeName))]; + }else if(old.scopes&&input.processNames===undefined&&input.nodeNames===undefined)rule.scopes=normalizeScopes(old.scopes); for(const key of ['name','subjectPrefix','archiveDirectory','intro','signature']){ if(typeof rule[key]!=='string'||rule[key].length>(['intro','signature'].includes(key)?4000:1200)||(/[\x00]/.test(rule[key])))fail('规则文本格式无效。'); rule[key]=rule[key].trim(); diff --git a/src/modules/storage/order-archive.cjs b/src/modules/storage/order-archive.cjs index 2d57213..3fe9087 100644 --- a/src/modules/storage/order-archive.cjs +++ b/src/modules/storage/order-archive.cjs @@ -4,8 +4,8 @@ const fs=require('node:fs/promises'); const crypto=require('node:crypto'); const {segments,inside}=require('./files.cjs'); const {renderSnapshot}=require('../pdf/exporter.cjs'); +const {archiveFilename}=require('./order-filename.cjs'); const fail=message=>Object.assign(new Error(message),{status:409}); -const day=value=>new Intl.DateTimeFormat('en-CA',{timeZone:'Asia/Shanghai'}).format(new Date(value)); function targetFor(storage,directory){ if(typeof directory!=='string'||!directory.startsWith('\\\\'))throw fail('请在分类规则选择已配置服务器的共享目录。'); const parts=directory.slice(2).replace(/\//g,'\\').split('\\');segments(parts.slice(2).join('/')); @@ -32,10 +32,8 @@ class OrderArchiveProvider{ const id=taskId||order.id,previous=id&&this.journal?.get('archive-intents',id); if(previous&&previous.sourceHash!==order.sourceHash)throw fail('归档来源版本与持久意图不一致,请人工核验。'); const event=order.event||order,chosen=previous?.chosen||(rule.filenameDate==='appDate'?event.appDate:rule.filenameDate==='receivedAt'?event.receivedAt:this.clock()); - if(!['appDate','receivedAt','archiveDate'].includes(rule.filenameDate)||!Number.isFinite(+new Date(chosen)))throw fail('规则的文件名日期来源缺失或无效。'); - const target=targetFor(this.storage,previous?.directory||rule.archiveDirectory),safe=v=>String(v||'').replace(/[<>:"/\\|?*\x00-\x1f]/g,'_').replace(/[. ]+$/g,'').slice(0,65); - const filename=[event.orderNo,day(chosen),event.serialNum||event.documentNum].map(safe).join('_')+'.pdf';segments(filename); - if(!event.orderNo||!(event.serialNum||event.documentNum))throw fail('归档文件缺少订单号或流程流水号。'); + const filename=archiveFilename(event,rule.filenameDate,chosen); + const target=targetFor(this.storage,previous?.directory||rule.archiveDirectory); // Renderer public extension contract remains its original four-field filename. const renderInput={...snapshot,metadata:{order:String(event.orderNo),project:'流程归档',model:'订单',serial:String(event.serialNum||event.documentNum)}}; let generated; diff --git a/src/modules/storage/order-filename.cjs b/src/modules/storage/order-filename.cjs new file mode 100644 index 0000000..002af1e --- /dev/null +++ b/src/modules/storage/order-filename.cjs @@ -0,0 +1,10 @@ +'use strict'; +const {segments}=require('./files.cjs'); +function archiveFilename(event,filenameDate,at){ + if(!['appDate','receivedAt','archiveDate'].includes(filenameDate)||!Number.isFinite(+new Date(at)))throw Object.assign(Error('规则的文件名日期来源缺失或无效。'),{status:409}); + if(!event.orderNo||!(event.serialNum||event.documentNum))throw Object.assign(Error('归档文件缺少订单号或流程流水号。'),{status:409}); + const day=new Intl.DateTimeFormat('en-CA',{timeZone:'Asia/Shanghai'}).format(new Date(at)); + const safe=v=>String(v||'').replace(/[<>:"/\\|?*\x00-\x1f]/g,'_').replace(/[. ]+$/g,'').slice(0,65); + const filename=[event.orderNo,day,event.serialNum||event.documentNum].map(safe).join('_')+'.pdf';segments(filename);return filename; +} +module.exports={archiveFilename}; diff --git a/tests/app/execution-contract-ui.test.cjs b/tests/app/execution-contract-ui.test.cjs index 40a8193..47777ed 100644 --- a/tests/app/execution-contract-ui.test.cjs +++ b/tests/app/execution-contract-ui.test.cjs @@ -4,8 +4,8 @@ const {startTestDashboard,login}=require('../fixtures/dashboard-runtime.cjs'),{l test('real captured sample uses server evidence id and uncertain batch verification carries version and idempotency',async t=>{ const dir=await fs.mkdtemp(path.join(os.tmpdir(),'execution-contract-ui-')),runtime=await startTestDashboard({stateDir:dir}),browser=await loadPlaywright().chromium.launch(browserOptions());t.after(async()=>{await browser.close();await runtime.close();await fs.rm(dir,{recursive:true,force:true});});const page=await browser.newPage();page.setDefaultTimeout(5000);const writes=[]; let captured=false;await page.route('**/api/order-rules/fields',route=>route.fulfill({json:{samples:captured?[{id:'capture-1',processName:'备损订单更改评审',processVersion:'1.4',sample:{demo:false,processName:'备损订单更改评审',processVersion:'1.4',fields:{'OFR_BS_Applicant.OrderNum':'REAL-1'},title:'订单号:REAL-1'},fields:[{path:'OFR_BS_Applicant.OrderNum',label:'订单号',value:'REAL-1'}]}]:[],adapters:[]}})); - await page.route('**/api/order-rules/preview',route=>{writes.push(route.request().postDataJSON());return route.fulfill({json:{valid:true,issues:[]}});}); - await page.goto('http://127.0.0.1:'+runtime.server.address().port+'/#order-rules');await login(page);await page.locator('#order-rule-refresh').waitFor();captured=true;await page.locator('#order-rule-refresh').click();await page.locator('[data-rule-id="bs-change"]').click();await page.getByLabel('表单样本',{exact:true}).selectOption('capture:capture-1');assert.equal(await page.locator('#order-rule-sample').getAttribute('readonly'),'');await page.getByRole('button',{name:'校验已保存规则',exact:true}).click();await page.locator('#order-rule-preview-result .alert-success').waitFor();assert.deepEqual(writes[0],{sampleId:'capture-1'}); + await page.route('**/api/order-rules/rules/bs-change/trial',route=>{writes.push(route.request().postDataJSON());return route.fulfill({json:{valid:true,issues:[]}});}); + await page.goto('http://127.0.0.1:'+runtime.server.address().port+'/#order-rules');await login(page);await page.locator('#order-rule-refresh').waitFor();captured=true;await page.locator('#order-rule-refresh').click();await page.locator('[data-rule-id="bs-change"]').click();await page.getByLabel('表单样本',{exact:true}).selectOption('capture:capture-1');assert.equal(await page.locator('#order-rule-sample').getAttribute('readonly'),'');await page.getByRole('button',{name:'试运行草稿',exact:true}).click();await page.locator('#order-rule-preview-result .alert-success').waitFor();assert.equal(writes[0].sampleId,'capture-1');assert.equal(writes[0].version,1);assert.equal(Object.hasOwn(writes[0],'sample'),false);assert.deepEqual(writes[0].draft.scopes,[{processName:'备损订单更改评审',nodeName:'订单专员(订单通知书)'}]); const snapshot=runtime.orderRules.snapshot();snapshot.batches=[{id:'unknown-1',version:7,status:'unknown',subject:'待核验批次',to:['orders@example.test'],orderIds:[],text:'冻结内容'}];await page.route('**/api/order-rules',route=>route.fulfill({json:snapshot}));await page.route('**/api/order-rules/batches/unknown-1/resolve',route=>{writes.push(route.request().postDataJSON());return route.fulfill({json:{status:'failed'}});});await openRuleRoute(page,'notification-history');await page.getByLabel('核验依据',{exact:true}).fill('已核实SMTP服务器未接受');await page.getByRole('button',{name:'保存核验结论',exact:true}).click();await page.getByText('核验结论已保存。',{exact:true}).waitFor();assert.equal(writes[1].version,7);assert.ok(writes[1].idempotencyKey);assert.equal(writes[1].note,'已核实SMTP服务器未接受'); }); diff --git a/tests/app/web-closure-review-ui.test.cjs b/tests/app/web-closure-review-ui.test.cjs index 9c1d2fe..828fdbc 100644 --- a/tests/app/web-closure-review-ui.test.cjs +++ b/tests/app/web-closure-review-ui.test.cjs @@ -5,6 +5,13 @@ async function fixture(t,hash='schedule'){const dir=await fs.mkdtemp(path.join(o test('a successful delayed save commits only submitted inputs and later edits remain dirty',{timeout:45000},async t=>{const {page}=await fixture(t);await page.locator('#schedule-form').waitFor();let release,arrive;const arrived=new Promise(r=>arrive=r),gate=new Promise(r=>release=r);await page.route('**/api/settings',async route=>{if(route.request().method()==='GET')return route.continue();const response=await route.fetch();arrive();await gate;return route.fulfill({response});});await page.locator('#time-first').fill('09:11');await page.getByRole('button',{name:'保存发送计划',exact:true}).click();await arrived;await page.locator('#time-first').fill('09:12');release();await page.getByText('发送计划已保存。',{exact:true}).waitFor();assert.equal(await page.evaluate(()=>PageLifecycle.dirty()),true);await page.getByRole('link',{name:'业务日历',exact:true}).first().click();await page.getByRole('dialog',{name:'未保存的修改'}).waitFor();assert.equal(await page.locator('#time-first').inputValue(),'09:12');}); for(const destination of ['internal','route'])test('Save and Continue preserves currentTarget for rule settings: '+destination,{timeout:45000},async t=>{const {page}=await fixture(t,'order-rules');await openRuleRoute(page,'notification-settings');await page.locator('#order-rule-settings').waitFor();const input=page.locator('#order-rule-settings [name=maxSize]');await input.fill('12');const posts=[];await page.route('**/api/order-rules/settings',async route=>{posts.push(route.request().postDataJSON());return route.continue();});if(destination==='internal')await openRuleRoute(page,'order-notifications');else await page.getByRole('link',{name:'发送计划',exact:true}).first().click();await page.getByRole('button',{name:'保存并继续',exact:true}).click();if(destination==='internal')await page.getByRole('heading',{name:'本时段范围',exact:true}).waitFor();else await page.locator('#schedule-form').waitFor();assert.equal(posts.length,1);assert.equal(posts[0].maxMessageBytes,12582912);}); async function mailFixture(page){const drafts=['t1','t2'].map((id,i)=>({id,version:1,status:'pending',subject:'模板'+(i+1),scope:'',channelId:'mail1',sender:'fixture@example.test',attachmentCount:0,attachments:[],text:'正文'}));await page.route('**/api/mail',route=>route.fulfill({json:{channels:[],templates:drafts,receipts:[],sends:[]}}));await page.route('**/api/mail/templates/categories',route=>route.fulfill({json:{categories:[],bindings:[]}}));await page.route(/\/api\/mail\/templates\/t[12]$/,route=>route.fulfill({json:drafts.find(d=>route.request().url().endsWith('/'+d.id))}));await page.route('**/api/mail/templates/*/preview',route=>route.fulfill({contentType:'text/html',body:'

正文

'}));return drafts;} + +test('switching a template immediately retires its old editable form while the next detail loads',{timeout:45000},async t=>{ + const {page}=await fixture(t),drafts=await mailFixture(page);await page.getByRole('link',{name:'邮件模板',exact:true}).click();await page.locator('[data-template=t1]').click();await page.waitForFunction(()=>document.querySelector('#template-subject')?.value==='模板1'); + let release,arrive;const gate=new Promise(r=>release=r),arrived=new Promise(r=>arrive=r);await page.route('**/api/mail/templates/t2',async route=>{arrive();await gate;await route.fulfill({json:drafts[1]});}); + await page.locator('[data-template=t2]').click();await arrived;const staleInputs=await page.locator('#template-subject').count();release();await page.waitForFunction(()=>document.querySelector('#template-subject')?.value==='模板2');assert.equal(staleInputs,0); + await page.route('**/api/mail/templates/t1',route=>route.fulfill({status:503,json:{error:'模板读取中断'}}));await page.locator('[data-template=t1]').click();await page.locator('#mail-template-detail').getByText(/模板读取中断/).waitFor();assert.equal(await page.locator('#template-subject').count(),0); +}); test('switching a dirty template supports stay discard and save before selecting another',{timeout:45000},async t=>{const {page}=await fixture(t);const drafts=await mailFixture(page);let saved;await page.route('**/api/mail/templates/t1/confirm',route=>{saved=route.request().postDataJSON();drafts[0].status='active';drafts[0].subject=saved.subject;return route.fulfill({json:{ok:true}});});await page.getByRole('link',{name:'邮件模板',exact:true}).click();await page.locator('[data-template=t1]').click();await page.locator('#template-subject').fill('未保存模板一');await page.locator('[data-template=t2]').click();await page.getByRole('button',{name:'留在此页',exact:true}).click();assert.equal(await page.locator('#template-subject').inputValue(),'未保存模板一');await page.locator('[data-template=t2]').click();await page.getByRole('button',{name:'放弃并继续',exact:true}).click();await page.waitForFunction(()=>document.querySelector('#template-subject')?.value==='模板2');await page.locator('[data-template=t1]').click();await page.locator('#template-subject').fill('保存模板一');await page.locator('[data-template=t2]').click();await page.getByRole('button',{name:'保存并继续',exact:true}).click();await page.waitForFunction(()=>document.querySelector('#template-subject')?.value==='模板2');assert.equal(saved.subject,'保存模板一');}); test('failed uncertain-result readback stays uncertain and never claims state was queried',{timeout:45000},async t=>{const {page}=await fixture(t);await page.locator('#schedule-form').waitFor();let posts=0,reads=0;await page.route('**/api/settings',route=>{if(route.request().method()==='POST'){posts++;return route.abort('timedout');}reads++;return route.fulfill({status:503,json:{error:'State unavailable'}});});await page.locator('#time-first').fill('10:01');await page.getByRole('button',{name:'保存发送计划',exact:true}).click();await page.waitForFunction(()=>document.querySelector('#operation-uncertain')?.textContent.includes('查询失败'));const text=await page.locator('#operation-uncertain').innerText();assert.match(text,/结果待核实/);assert.doesNotMatch(text,/已查询最新状态/);assert.equal(posts,1);assert.equal(reads,1);}); test('delayed readback cannot notify after leaving its originating page',{timeout:45000},async t=>{const {page}=await fixture(t);await page.locator('#schedule-form').waitFor();let release,arrive;const gate=new Promise(r=>release=r),arrived=new Promise(r=>arrive=r);await page.route('**/api/settings',async route=>{if(route.request().method()==='POST')return route.abort('timedout');arrive();await gate;return route.fulfill({json:{version:2,schedule:{times:['09:00','17:00']}}});});await page.locator('#time-first').fill('10:02');await page.getByRole('button',{name:'保存发送计划',exact:true}).click();await arrived;await page.getByRole('link',{name:'系统设置',exact:true}).click();await page.getByRole('button',{name:'放弃并继续',exact:true}).click();await page.getByRole('heading',{name:'BPM 连接',exact:true}).first().waitFor();await page.evaluate(()=>document.querySelector('#flash')?.remove());release();await page.waitForTimeout(250);assert.equal(await page.locator('#flash').count(),0);assert.equal(await page.locator('#operation-uncertain').count(),0);}); diff --git a/tests/app/web-closure-ui.test.cjs b/tests/app/web-closure-ui.test.cjs index d1af39a..e06bcf4 100644 --- a/tests/app/web-closure-ui.test.cjs +++ b/tests/app/web-closure-ui.test.cjs @@ -3,7 +3,7 @@ const {test}=require('node:test'),assert=require('node:assert/strict'),fs=requir const {startTestDashboard,login}=require('../fixtures/dashboard-runtime.cjs'); const {loadPlaywright,browserOptions}=require('../../src/platform/browser.cjs'); async function fixture(t,hash='schedule') {const dir=await fs.mkdtemp(path.join(os.tmpdir(),'web-closure-'));const runtime=await startTestDashboard({stateDir:dir});const browser=await loadPlaywright().chromium.launch(browserOptions());t.after(async()=>{await browser.close();await runtime.close();await fs.rm(dir,{recursive:true,force:true});});const page=await browser.newPage({viewport:{width:1440,height:1000}});page.setDefaultTimeout(5000);await page.goto('http://127.0.0.1:'+runtime.server.address().port+'/#'+hash);await login(page);return {page,runtime};} -test('settings open directly with horizontal tabs, retired hashes redirect, and mobile stays inside viewport',{timeout:45000},async t=>{const {page}=await fixture(t,'business-settings');await page.locator('#order-rules-panel').waitFor();assert.equal(await page.locator('#settings-tabs a').count(),2);await openRuleRoute(page,'schedule');await page.locator('#schedule-form').waitFor();assert.equal(await page.locator('#send-mode').count(),0);await page.goBack();await page.goBack();await page.locator('#order-rules-panel').waitFor();for(const [hash,title] of [['supervisor','系统健康'],['connections','系统健康'],['notifications','分类通知规则']]){await page.evaluate(h=>location.hash=h,hash);await page.getByRole('heading',{name:title,exact:true}).first().waitFor();}await page.evaluate(()=>location.hash='system-settings');await page.getByRole('heading',{name:'BPM 连接',exact:true}).first().waitFor();assert.equal(await page.locator('#settings-tabs a').count(),7);await page.setViewportSize({width:390,height:844});assert.equal(await page.evaluate(()=>document.documentElement.scrollWidth<=innerWidth),true);assert.equal(await page.locator('#settings-tabs').evaluate(e=>getComputedStyle(e).overflowX),'auto');}); +test('settings open directly with horizontal tabs, retired hashes redirect, and mobile stays inside viewport',{timeout:45000},async t=>{const {page}=await fixture(t,'business-settings');await page.locator('#order-rules-panel').waitFor();assert.equal(await page.locator('#settings-tabs a').count(),2);await page.getByRole('link',{name:'订单通知管理',exact:true}).click();await page.getByRole('link',{name:'发送计划',exact:true}).first().click();await page.locator('#schedule-form').waitFor();assert.equal(await page.locator('#send-mode').count(),0);await page.goBack();await page.goBack();await page.locator('#order-rules-panel').waitFor();for(const [hash,title] of [['supervisor','系统健康'],['connections','系统健康'],['notifications','分类通知规则']]){await page.evaluate(h=>location.hash=h,hash);await page.getByRole('heading',{name:title,exact:true}).first().waitFor();}await page.evaluate(()=>location.hash='system-settings');await page.getByRole('heading',{name:'BPM 连接',exact:true}).first().waitFor();assert.equal(await page.locator('#settings-tabs a').count(),7);await page.setViewportSize({width:390,height:844});assert.equal(await page.evaluate(()=>document.documentElement.scrollWidth<=innerWidth),true);assert.equal(await page.locator('#settings-tabs').evaluate(e=>getComputedStyle(e).overflowX),'auto');}); test('dirty navigation offers stay discard save, suppresses duplicate saves and preserves failed inputs',{timeout:45000},async t=>{const {page}=await fixture(t);await page.locator('#schedule-form').waitFor();await page.locator('#time-first').fill('09:11');await page.getByRole('link',{name:'业务日历',exact:true}).first().click();await page.getByRole('dialog',{name:'未保存的修改'}).waitFor();await page.getByRole('button',{name:'留在此页',exact:true}).click();assert.equal(await page.locator('#time-first').inputValue(),'09:11');await page.getByRole('link',{name:'业务日历',exact:true}).first().click();await page.getByRole('button',{name:'放弃并继续',exact:true}).click();await page.locator('#day-form').waitFor();await page.getByRole('link',{name:'发送计划',exact:true}).first().click();await page.locator('#time-first').fill('09:12');let requests=0;await page.route('**/api/settings',async route=>{if(route.request().method()==='GET')return route.continue();requests++;await new Promise(r=>setTimeout(r,100));await route.fulfill({status:409,json:{error:'版本已更新,请核对'}});});await page.getByRole('button',{name:'保存发送计划',exact:true}).dblclick();await page.getByRole('alert').getByText('版本已更新,请核对',{exact:true}).waitFor();assert.equal(requests,1);assert.equal(await page.locator('#time-first').inputValue(),'09:12');await page.unroute('**/api/settings');await page.getByRole('link',{name:'业务日历',exact:true}).first().click();await page.getByRole('button',{name:'保存并继续',exact:true}).click();await page.locator('#day-form').waitFor();await page.getByRole('link',{name:'发送计划',exact:true}).first().click();assert.equal(await page.locator('#time-first').inputValue(),'09:12');}); test('password creation is discard-only and assistant settings have a distinct route',{timeout:45000},async t=>{const {page}=await fixture(t,'account');await page.route('**/api/assistant',route=>route.fulfill({json:{settings:{version:1,runtimePath:'',apiBase:'',model:'',timeoutSeconds:60,dailyLimit:30,enabled:false,allowActions:false},conversations:[],usage:{calls:0,limit:30}}}));await page.locator('#account-current').fill('unsaved-test-secret');await page.getByRole('link',{name:'系统设置',exact:true}).click();await page.getByRole('dialog',{name:'未保存的修改'}).waitFor();assert.equal(await page.getByRole('button',{name:'保存并继续',exact:true}).count(),0);await page.getByRole('button',{name:'放弃并继续',exact:true}).click();await page.getByRole('link',{name:'助手设置',exact:true}).click();await page.locator('#assistant-settings-form').waitFor();await page.getByRole('link',{name:'ZCode 助手',exact:true}).click();await page.locator('#assistant-compose').waitFor();assert.equal(await page.locator('#assistant-settings-form').count(),0);}); test('execution scan, evidence-only field binding and frozen-batch resend emit versioned contracts',{timeout:45000},async t=>{const {page}=await fixture(t,'order-rules');const writes=[];await page.route('**/api/order-execution**',async route=>{if(route.request().method()==='POST'){writes.push({url:route.request().url(),body:route.request().postDataJSON()});return route.fulfill({json:{ok:true}});}return route.fulfill({json:{tasks:[{id:'task1',version:4,status:'failed',error:'归档失败',connectionId:'connection1'}],capabilities:{liveTodo:false,pdfExport:false,automaticArchive:false},fields:{samples:[],adapters:[]}}});});await page.route('**/api/order-rules/fields',route=>route.fulfill({json:{samples:[{id:'sample1',processName:'订单流程',processVersion:'v7',fields:[{path:'Order.Number',label:'订单编号',value:'A123'},{path:'Order.Text',label:'正文',value:'通知'}]}],adapters:[]}}));await page.route('**/api/order-rules/adapters',route=>{writes.push({url:route.request().url(),body:route.request().postDataJSON()});return route.fulfill({json:{ok:true}});});await openRuleRoute(page,'notification-execution');await page.getByText('归档失败',{exact:true}).waitFor();await page.getByLabel('扫描连接',{exact:true}).selectOption('connection1');await page.evaluate(()=>{crypto.randomUUID=undefined;});await page.getByRole('button',{name:'扫描待办',exact:true}).click();await page.getByText('扫描请求已提交,请核对任务状态。',{exact:true}).waitFor();assert.equal(writes[0].body.connectionId,'connection1');assert.match(writes[0].body.idempotencyKey,/^[a-z0-9-]+$/i);await page.getByLabel('任务重试依据',{exact:true}).fill('已恢复隔离归档目录');await page.getByRole('button',{name:'重试失败任务',exact:true}).click();await page.getByText('重试请求已提交,请核对任务状态。',{exact:true}).waitFor();assert.equal(writes[1].body.version,4);await openRuleRoute(page,'rule-fields');await page.getByLabel('真实采集样本',{exact:true}).selectOption('sample1');await page.getByLabel('订单号来源',{exact:true}).selectOption('Order.Number');await page.getByLabel('简要说明来源',{exact:true}).selectOption('Order.Text');assert.equal(await page.locator('#adapter-fields input[type=text]').count(),0);await page.getByRole('button',{name:'保存字段对应',exact:true}).click();await page.getByText('字段对应已保存。',{exact:true}).waitFor();assert.deepEqual(writes[2].body,{sampleId:'sample1',processName:'订单流程',processVersion:'v7',fields:{orderNo:'Order.Number',brief:'Order.Text'}});}); diff --git a/tests/order-rules/execution.test.cjs b/tests/order-rules/execution.test.cjs index 50548bb..70931dc 100644 --- a/tests/order-rules/execution.test.cjs +++ b/tests/order-rules/execution.test.cjs @@ -23,6 +23,13 @@ async function configure(f){ const saved=f.store.saveRule({...current,adapterIds:[adapter.id],to:['orders@example.test'],archiveDirectory:'\\\\server\\orders',filenameDate:'receivedAt'},'admin'); assert.equal(f.store.capturedPreview(captured.id).valid,true);f.store.publish(saved.id,{version:saved.version},'admin'); } + +test('scan prefilter uses complete process-node pairs without crossing their columns',async t=>{ + const f=fixture(t),rule=f.store.get('rules','bs-change').draft; + f.store.saveRule({...rule,scopes:[{processName:f.row.processName,nodeName:'另一个节点'},{processName:'另一个流程',nodeName:f.row.nodeName}]},'admin'); + await f.execution.scan({connectionId:'c1',idempotencyKey:'paired-scope-scan'},principal); + assert.equal(f.store.all('capture-samples').length,0);assert.equal(f.execution.snapshot().tasks.length,0);assert.deepEqual(f.counts(),{captures:0,exports:0});await f.execution.stop(); +}); test('capture-backed dynamic binding recovers blocked task with stable identity and exports only once',async t=>{ const f=fixture(t);await configure(f);await f.execution.scan({connectionId:'c1',idempotencyKey:'second'},principal); assert.equal(f.store.all('orders')[0].status,'pending');assert.equal(f.execution.snapshot().tasks.length,1);assert.equal(f.counts().exports,1); diff --git a/tests/order-rules/http.test.cjs b/tests/order-rules/http.test.cjs index 4f0d840..c47161e 100644 --- a/tests/order-rules/http.test.cjs +++ b/tests/order-rules/http.test.cjs @@ -28,4 +28,18 @@ test('rule HTTP authorizes drafts and trials, prevents origin forgery and archiv assert.equal((await call('/order-rules/preview',{sample:{...sample,demo:false}},operator)).status,200); assert.equal(orderRules.get('rules','bs-change').trialVersion,null); assert.equal((await call('/order-rules/preview',{sample,ruleId:'untrusted'},operator)).status,400); + const current=orderRules.get('rules',rule.id).draft,trialRoute='/order-rules/rules/'+rule.id+'/trial'; + assert.equal((await call(trialRoute,{version:current.version,draft:current,sample},operator)).status,403); + assert.equal((await call(trialRoute,{version:current.version,sample},viewer)).status,403); + assert.equal((await call(trialRoute,{version:current.version,sample},admin,'https://evil.test')).status,403); + assert.equal((await call(trialRoute,{version:current.version-1,sample},admin)).status,409); + assert.equal((await call(trialRoute,{version:current.version,sampleId:{}},admin)).status,400); + assert.equal((await call(trialRoute,{version:current.version,sample},operator)).status,200);assert.equal(orderRules.get('rules',rule.id).trialSampleId,null); + const members=[{username:'admin',role:'admin'},{username:'operator',role:'operator'}]; + for(const owner of ['admin','operator']){ + const connection=workspace.createConnection({name:'隔离连接 '+owner,owner},members[0],members),real={...sample,demo:false,connectionId:connection.id}; + const captured=orderRules.recordCapture({taskId:owner,sample:real,snapshot:{processVersion:real.processVersion,fields:Object.entries(real.fields).map(([path,value])=>({path,value}))}}); + assert.equal((await call(trialRoute,{version:current.version,sampleId:captured.id},operator)).status,owner==='admin'?403:200); + } + const candidate=await(await call(trialRoute,{version:current.version,draft:{...current,name:'未保存类别'},sample},admin)).json();assert.equal(candidate.trial.saved,false);assert.equal(candidate.trial.publishEvidence,false);assert.equal(orderRules.get('rules',rule.id).draft.name,current.name); }); diff --git a/tests/order-rules/web.test.cjs b/tests/order-rules/web.test.cjs index aebcc61..19d9775 100644 --- a/tests/order-rules/web.test.cjs +++ b/tests/order-rules/web.test.cjs @@ -19,12 +19,12 @@ test('category editor saves/reloads drafts, previews readable evidence without i const data={rules:[{id:'category-1',version:1,status:'draft',name:'示例类别',categoryId:'category-1',processNames:['订单流程'],nodeNames:['通知'],adapterIds:['a1'],archiveDirectory:'',filenameDate:'appDate',subjectPrefix:'通知',intro:'正文',signature:'团队',to:[],cc:[],attachPdf:true}],adapters:[{id:'a1',label:'订单表单',verified:true,processName:'订单流程',fields:{quantity:'订单.数量'},sample}],orders:[],batches:[],settings:{version:1,enabled:false,channelId:'',maxMessageBytes:20971520},audit:[],capabilities:{liveTodo:false,pdfExport:false,automaticArchive:false}}; data.window={start:'2026-10-20T00:00:00+08:00',end:'2026-10-20T11:00:00+08:00',label:'工作日第一时段',available:true}; const writes=[];browser=await loadPlaywright().chromium.launch(browserOptions());const page=await browser.newPage({viewport:{width:1440,height:1000}});page.setDefaultTimeout(7000);const errors=[];page.on('pageerror',e=>errors.push(e.message));await page.clock.install(); - await page.route('**/api/order-rules**',async route=>{const req=route.request(),url=new URL(req.url());let result=data;if(req.method()==='POST'){const body=req.postDataJSON();writes.push({path:url.pathname,body});if(url.pathname.endsWith('/rules')){data.rules[0]={...data.rules[0],...body,version:data.rules[0].version+1};result=data.rules[0];}else if(url.pathname.endsWith('/preview'))result={valid:true,ruleId:'category-1',checks:[{label:'数量',ok:true,detail:'零数量合法'}],issues:[],explanation:'按类别汇总一封邮件',fieldTrace:[{key:'quantity',label:'数量',path:'订单.数量',value:0}],event:{orderNo:'SAMPLE-1',quantity:0}};else if(url.pathname.endsWith('/publish')){await route.fulfill({status:409,json:{error:'实时待办接入待联调,暂不可发布'}});return;}}await route.fulfill({json:result});}); + await page.route('**/api/order-rules**',async route=>{const req=route.request(),url=new URL(req.url());let result=data;if(req.method()==='POST'){const body=req.postDataJSON();writes.push({path:url.pathname,body});if(url.pathname.endsWith('/rules')){data.rules[0]={...data.rules[0],...body,version:data.rules[0].version+1};result=data.rules[0];}else if(url.pathname.endsWith('/trial'))result={valid:true,ruleId:'category-1',checks:[{label:'数量',ok:true,detail:'零数量合法'}],issues:[],explanation:'按类别汇总一封邮件',fieldTrace:[{key:'quantity',label:'数量',path:'订单.数量',value:0}],event:{orderNo:'SAMPLE-1',quantity:0}};else if(url.pathname.endsWith('/publish')){await route.fulfill({status:409,json:{error:'实时待办接入待联调,暂不可发布'}});return;}}await route.fulfill({json:result});}); await page.goto('http://127.0.0.1:'+server.address().port+'/#order-rules');await page.getByLabel('账号',{exact:true}).waitFor();assert.equal(await page.getByRole('button',{name:'进入演示空间',exact:true}).count(),0);await page.getByLabel('账号',{exact:true}).fill('admin');await page.getByLabel('密码',{exact:true}).fill('Test-password-123');await page.getByRole('button',{name:'登录',exact:true}).click(); await openRuleRoute(page,'order-rules');await page.getByLabel('规则名称',{exact:true}).fill('订单类别更新');await page.getByLabel('收件人',{exact:true}).fill('recipient@example.test');await page.getByRole('button',{name:'保存草稿',exact:true}).click();await page.getByText('规则草稿已保存。',{exact:true}).waitFor(); assert.equal(data.rules[0].name,'订单类别更新');assert.deepEqual(data.rules[0].to,['recipient@example.test']);assert.deepEqual(writes[0].body.processNames,['订单流程']); await page.reload();await openRuleRoute(page,'order-rules');assert.equal(await page.getByLabel('规则名称',{exact:true}).inputValue(),'订单类别更新'); - await page.getByLabel('BPM 原始标题',{exact:true}).fill('客户等级:C订单号:148396机芯号:X毛利:绿标订单号:HA148396总数量:5000');await page.getByRole('button',{name:'校验已保存规则',exact:true}).click();await page.locator('#order-rule-preview-result').getByText('零数量合法',{exact:true}).waitFor();assert.match(await page.locator('#order-rule-preview-result').innerText(),/订单.数量/);assert.match(await page.locator('#order-rule-preview-result').innerText(),/0/);assert.equal(data.orders.length,0);assert.equal(writes.some(x=>x.path.endsWith('/events')),false);assert.equal(writes.find(x=>x.path.endsWith('/preview')).body.sample.title,'客户等级:C订单号:148396机芯号:X毛利:绿标订单号:HA148396总数量:5000'); + await page.getByLabel('BPM 原始标题',{exact:true}).fill('客户等级:C订单号:148396机芯号:X毛利:绿标订单号:HA148396总数量:5000');await page.getByRole('button',{name:'试运行草稿',exact:true}).click();await page.locator('#order-rule-preview-result').getByText('零数量合法',{exact:true}).waitFor();assert.match(await page.locator('#order-rule-preview-result').innerText(),/订单.数量/);assert.match(await page.locator('#order-rule-preview-result').innerText(),/0/);assert.equal(data.orders.length,0);assert.equal(writes.some(x=>x.path.endsWith('/events')),false);assert.equal(writes.find(x=>x.path.endsWith('/trial')).body.sample.title,'客户等级:C订单号:148396机芯号:X毛利:绿标订单号:HA148396总数量:5000'); await page.getByRole('button',{name:'发布此版本',exact:true}).click();await page.getByText('实时待办接入待联调,暂不可发布',{exact:true}).waitFor(); await openRuleRoute(page,'notification-settings');assert.equal(await page.getByLabel('启用自动分类通知',{exact:true}).isDisabled(),true);assert.match(await page.locator('#order-rules-panel').innerText(),/待联调/); data.orders=[{id:'old',orderNo:'HISTORICAL-ORDER',categoryId:'category-1',status:'pending',receivedAt:'2026-10-19T09:00:00+08:00'},{id:'current',orderNo:'CURRENT-ORDER',categoryId:'category-1',status:'pending',receivedAt:'2026-10-20T09:00:00+08:00'},{id:'future',orderNo:'FUTURE-ORDER',categoryId:'category-1',status:'pending',receivedAt:'2026-10-20T15:00:00+08:00'}]; @@ -51,15 +51,15 @@ test('real catalog workflow publishes a saved and sampled draft while roles and async function open(role){const page=await browser.newPage({viewport:{width:1440,height:1000}});page.setDefaultTimeout(7000);await page.goto(base+'/#order-rules');await page.getByLabel('账号',{exact:true}).fill(role);await page.getByLabel('密码',{exact:true}).fill('Test-password-123');await page.getByRole('button',{name:'登录',exact:true}).click();await openRuleRoute(page,'order-rules');return page;} const page=await open('admin');await page.locator('[data-rule-id="bs-change"]').click();await page.getByLabel('规则名称',{exact:true}).fill('备损更改通知测试');await page.getByLabel('归档目录',{exact:true}).fill('\\\\fixture-server\\orders\\changes');await page.getByLabel('文件名日期依据',{exact:true}).selectOption('appDate');await page.getByLabel('收件人',{exact:true}).fill('recipient@example.test');await page.getByRole('button',{name:'保存草稿',exact:true}).click();await page.getByText('规则草稿已保存。',{exact:true}).waitFor(); await page.reload();await openRuleRoute(page,'order-rules');await page.locator('[data-rule-id="bs-change"]').click();assert.equal(await page.getByLabel('规则名称',{exact:true}).inputValue(),'备损更改通知测试'); - await page.locator('#order-rule-advanced summary').click();const realSample=JSON.parse(await page.getByLabel('待校验 JSON 样本',{exact:true}).inputValue());realSample.demo=false;await page.getByLabel('待校验 JSON 样本',{exact:true}).fill(JSON.stringify(realSample));await page.getByRole('button',{name:'校验已保存规则',exact:true}).click();await page.locator('#order-rule-preview-result .alert').getByText(/样本校验通过/).waitFor();assert.match(await page.locator('#order-rule-preview-result').innerText(),/OFR_BS_Applicant.OrderNum/);await page.getByRole('button',{name:'发布此版本',exact:true}).click();await page.getByText('发布前必须选择服务端真实采集样本完成试运行。',{exact:true}).waitFor(); + await page.locator('#order-rule-advanced summary').click();const realSample=JSON.parse(await page.getByLabel('待校验 JSON 样本',{exact:true}).inputValue());realSample.demo=false;await page.getByLabel('待校验 JSON 样本',{exact:true}).fill(JSON.stringify(realSample));await page.getByRole('button',{name:'试运行草稿',exact:true}).click();await page.locator('#order-rule-preview-result .alert').getByText(/样本校验通过/).waitFor();assert.match(await page.locator('#order-rule-preview-result').innerText(),/OFR_BS_Applicant.OrderNum/);await page.getByRole('button',{name:'发布此版本',exact:true}).click();await page.getByText('发布前必须选择服务端真实采集样本完成试运行。',{exact:true}).waitFor(); const captured=orderRules.recordCapture({sample:realSample,snapshot:{processVersion:realSample.processVersion,html:'

isolated provider fixture

',fields:Object.entries(realSample.fields).map(([path,value])=>({path,label:path,value}))},taskId:'isolated-provider-fixture'}); const trial=await page.request.post(base+'/api/order-rules/preview',{headers:{Origin:base},data:{sampleId:captured.id}});assert.equal(trial.status(),200);assert.equal((await trial.json()).valid,true); await page.getByRole('button',{name:'发布此版本',exact:true}).click();await page.getByText('规则版本已发布。自动执行仍由全局设置与接入状态控制。',{exact:true}).waitFor(); assert.equal(orderRules.snapshot().rules.find(r=>r.id==='bs-change').status,'enabled');assert.equal(orderRules.snapshot().settings.enabled,false);assert.equal(orderRules.snapshot().orders.length,0); await page.setViewportSize({width:390,height:844});assert.equal(await page.evaluate(()=>document.documentElement.scrollWidth<=innerWidth),true); await fs.mkdir(path.resolve('output/verification'),{recursive:true});await page.screenshot({path:path.resolve('output/verification/order-rules-mobile.png'),fullPage:true});await page.setViewportSize({width:1440,height:1000});await page.screenshot({path:path.resolve('output/verification/order-rules-desktop.png'),fullPage:true}); - const operator=await open('operator');assert.equal(await operator.getByLabel('规则名称',{exact:true}).isDisabled(),true);assert.equal(await operator.getByRole('button',{name:'保存草稿',exact:true}).count(),0);assert.equal(await operator.getByRole('button',{name:'校验已保存规则',exact:true}).count(),1); - const viewer=await open('viewer');assert.equal(await viewer.getByLabel('规则名称',{exact:true}).isDisabled(),true);assert.equal(await viewer.getByRole('button',{name:'校验已保存规则',exact:true}).count(),0); + const operator=await open('operator');assert.equal(await operator.getByLabel('规则名称',{exact:true}).isDisabled(),true);assert.equal(await operator.getByRole('button',{name:'保存草稿',exact:true}).count(),0);assert.equal(await operator.getByRole('button',{name:'试运行草稿',exact:true}).count(),1); + const viewer=await open('viewer');assert.equal(await viewer.getByLabel('规则名称',{exact:true}).isDisabled(),true);assert.equal(await viewer.getByRole('button',{name:'试运行草稿',exact:true}).count(),0); }); async function openRuleRoute(page,hash){ diff --git a/tests/order-rules/workbench-ui.test.cjs b/tests/order-rules/workbench-ui.test.cjs new file mode 100644 index 0000000..8eeec46 --- /dev/null +++ b/tests/order-rules/workbench-ui.test.cjs @@ -0,0 +1,67 @@ +'use strict'; +const test=require('node:test'),assert=require('node:assert/strict'),fs=require('node:fs/promises'),os=require('node:os'),path=require('node:path'); +const {startTestDashboard,login}=require('../fixtures/dashboard-runtime.cjs'); +const {loadPlaywright,browserOptions}=require('../../src/platform/browser.cjs'); +async function setup(t){ + const dir=await fs.mkdtemp(path.join(os.tmpdir(),'rule-workbench-ui-')),runtime=await startTestDashboard({stateDir:dir}),browser=await loadPlaywright().chromium.launch(browserOptions()); + t.after(async()=>{await browser.close();await runtime.close();await fs.rm(dir,{recursive:true,force:true});}); + const sample={...runtime.orderRules.adapters().find(a=>a.id==='bs-change').sample,demo:false}; + const captured=runtime.orderRules.recordCapture({taskId:'isolated',sample,snapshot:{processVersion:sample.processVersion,fields:Object.entries(sample.fields).map(([path,value])=>({path,label:path,value}))}}); + const page=await browser.newPage({viewport:{width:1440,height:1000}});page.setDefaultTimeout(7000);await page.route('**/api/order-rules/fields',route=>route.fulfill({json:runtime.orderRules.fields()})); + await page.goto('http://127.0.0.1:'+runtime.server.address().port+'/#order-rules');await login(page);await page.locator('[data-rule-id="bs-change"]').click();return{page,runtime,captured,browser}; +} +test('workbench searches categories, pairs rows and trials unsaved input before saved real evidence',{timeout:90000},async t=>{ + const {page,runtime,captured}=await setup(t); + assert.equal(await page.locator('#rule-category-list').evaluate(list=>{const row=list.querySelector('[aria-current]'),a=row.getBoundingClientRect(),b=list.getBoundingClientRect();return a.top>=b.top&&a.bottom<=b.bottom;}),true); + await page.getByLabel('搜索分类',{exact:true}).fill('备损');assert.equal(await page.locator('[data-rule-id]').count(),2); + await page.getByRole('heading',{name:'哪些订单归到这里?',exact:true}).waitFor(); + await page.getByRole('button',{name:'添加流程节点',exact:true}).click();assert.equal(await page.locator('[data-scope-row]').count(),2); + await page.getByLabel('第2行适用流程',{exact:true}).selectOption('试产订单更改评审');await page.getByLabel('第2行触发节点',{exact:true}).selectOption({index:1}); + await page.getByRole('button',{name:'删除第2行',exact:true}).click();assert.equal(await page.locator('[data-scope-row]').count(),1); + await page.getByLabel('归档目录',{exact:true}).fill('\\\\fixture-server\\orders');await page.getByLabel('文件名日期依据',{exact:true}).selectOption('receivedAt');await page.getByLabel('收件人',{exact:true}).fill('orders@example.test');await page.getByLabel('邮件主题前缀',{exact:true}).fill('【未保存预览】'); + await page.getByLabel('表单样本',{exact:true}).selectOption('capture:'+captured.id);await page.getByRole('button',{name:'试运行草稿',exact:true}).click(); + await page.locator('#order-rule-preview-result').getByText('当前输入的模拟结果,尚未保存,不能作为发布依据。',{exact:true}).waitFor();assert.match(await page.locator('#order-rule-preview-result').innerText(),/未保存预览/);assert.match(await page.locator('#order-rule-preview-result').innerText(),/fixture-server/);assert.equal(runtime.orderRules.get('rules','bs-change').trialVersion,null);assert.equal(runtime.orderRules.all('orders').length,0); + await page.getByRole('link',{name:'字段映射',exact:true}).first().click();await page.getByRole('button',{name:'留在此页',exact:true}).click();assert.match(page.url(),/#order-rules$/); + await page.getByRole('button',{name:'保存草稿',exact:true}).click();await page.getByText('规则草稿已保存。',{exact:true}).waitFor();assert.equal(runtime.orderRules.get('rules','bs-change').draft.scopes.length,1); + await page.getByLabel('表单样本',{exact:true}).selectOption('capture:'+captured.id);await page.getByRole('button',{name:'试运行草稿',exact:true}).click();await page.locator('#order-rule-preview-result').getByText('已保存草稿已通过真实样本校验,可继续检查发布条件。',{exact:true}).waitFor(); + await page.getByRole('button',{name:'发布此版本',exact:true}).click();await page.getByText('规则版本已发布。自动执行仍由全局设置与接入状态控制。',{exact:true}).waitFor();assert.equal(runtime.orderRules.settings().enabled,false); + await page.getByLabel('分类状态',{exact:true}).selectOption('published');assert.equal(await page.locator('[data-rule-id]').count(),1); + await fs.mkdir('output/verification',{recursive:true});await page.screenshot({path:'output/verification/rule-workbench-isolated-desktop.png',fullPage:true});await page.setViewportSize({width:390,height:844});assert.equal(await page.evaluate(()=>document.documentElement.scrollWidth<=innerWidth),true);await page.screenshot({path:'output/verification/rule-workbench-isolated-mobile.png',fullPage:true}); +}); +test('editing while a trial is pending invalidates its output and failed saves preserve input',{timeout:60000},async t=>{ + const {page}=await setup(t);let release;const pending=new Promise(r=>release=r); + await page.route('**/api/order-rules/rules/bs-change/trial',async route=>{await pending;await route.fulfill({json:{valid:true,ruleId:'bs-change',checks:[],issues:[],explanation:'迟到旧结果'}});}); + await page.getByRole('button',{name:'试运行草稿',exact:true}).click();await page.getByLabel('规则名称',{exact:true}).fill('新输入不能被旧结果覆盖');release();await page.waitForFunction(()=>!document.querySelector('#order-rule-preview').disabled); + assert.doesNotMatch(await page.locator('#order-rule-preview-result').innerText(),/迟到旧结果/); + await page.route('**/api/order-rules/rules',route=>route.fulfill({status:409,json:{error:'规则版本冲突,请刷新核对'}}));await page.getByRole('button',{name:'保存草稿',exact:true}).click();await page.getByText('规则版本冲突,请刷新核对',{exact:true}).waitFor();assert.equal(await page.getByLabel('规则名称',{exact:true}).inputValue(),'新输入不能被旧结果覆盖'); +}); + +test('saved state remains the clean baseline when the following list refresh fails',{timeout:60000},async t=>{ + const {page,runtime}=await setup(t);await page.getByLabel('规则名称',{exact:true}).fill('已保存但刷新失败'); + await page.route('**/api/order-rules',route=>route.fulfill({status:503,json:{error:'列表暂不可用'}})); + await page.getByRole('button',{name:'保存草稿',exact:true}).click();await page.getByText(/规则草稿已保存。 刷新失败/).waitFor(); + assert.equal(runtime.orderRules.get('rules','bs-change').draft.name,'已保存但刷新失败');assert.equal(await page.getByLabel('规则名称',{exact:true}).inputValue(),'已保存但刷新失败'); + await page.getByLabel('规则名称',{exact:true}).dispatchEvent('input'); + assert.equal(await page.locator('#order-rule-dirty').innerText(),'');await page.getByRole('link',{name:'字段映射',exact:true}).first().click();assert.equal(await page.getByRole('dialog',{name:'未保存的修改'}).count(),0); +}); + +test('publishing locks other rule mutations and pause after Save and Continue uses the refreshed draft',{timeout:60000},async t=>{ + const {page,runtime,captured}=await setup(t);let release,arrive;const gate=new Promise(r=>release=r),arrived=new Promise(r=>arrive=r); + await page.route('**/api/order-rules/rules/bs-change/publish',async route=>{arrive();await gate;await route.fulfill({status:409,json:{error:'隔离发布校验阻塞'}});}); + await page.getByRole('button',{name:'发布此版本',exact:true}).click();await arrived;const locked=await page.getByLabel('规则名称',{exact:true}).isDisabled(),saveLocked=await page.getByRole('button',{name:'保存草稿',exact:true}).isDisabled();release();await page.getByText('隔离发布校验阻塞',{exact:true}).waitFor();assert.equal(locked,true);assert.equal(saveLocked,true);await page.unroute('**/api/order-rules/rules/bs-change/publish'); + const old=runtime.orderRules.get('rules','bs-change').draft,saved=runtime.orderRules.saveRule({...old,to:['orders@example.test'],archiveDirectory:'\\\\fixture-server\\orders',filenameDate:'receivedAt'},'admin');runtime.orderRules.trial(saved.id,{version:saved.version,sampleId:captured.id});runtime.orderRules.publish(saved.id,{version:saved.version},'admin'); + await page.getByRole('button',{name:'刷新规则与字段',exact:true}).click();await page.getByLabel('规则名称',{exact:true}).fill('保存后暂停的草稿');await page.getByRole('button',{name:'暂停此规则',exact:true}).click();await page.getByRole('button',{name:'保存并继续',exact:true}).click();await page.getByText('此规则已暂停。',{exact:true}).waitFor();assert.equal(runtime.orderRules.get('rules',saved.id).published.status,'paused');assert.equal(runtime.orderRules.get('rules',saved.id).draft.name,'保存后暂停的草稿'); +}); +test('rule search is not a dirty edit and operators/viewers keep their role boundaries',{timeout:90000},async t=>{ + const {page,runtime,browser}=await setup(t);await page.getByLabel('搜索分类',{exact:true}).fill('不存在类别');assert.equal(await page.locator('[data-rule-id]').count(),0);await page.getByRole('link',{name:'字段映射',exact:true}).first().click();assert.equal(await page.getByRole('dialog',{name:'未保存的修改'}).count(),0); + const base=new URL(page.url()).origin; + for(const role of ['operator','viewer']){runtime.store.addUser({username:role,password:'Test-password-123',role},'admin');const context=await browser.newContext(),member=await context.newPage();await member.goto(base+'/#order-rules');await member.getByLabel('账号',{exact:true}).fill(role);await member.getByLabel('密码',{exact:true}).fill('Test-password-123');await member.getByRole('button',{name:'登录',exact:true}).click();await member.getByLabel('规则名称',{exact:true}).waitFor();assert.equal(await member.getByLabel('规则名称',{exact:true}).isDisabled(),true);assert.equal(await member.getByRole('button',{name:'保存草稿',exact:true}).count(),0);assert.equal(await member.getByRole('button',{name:'试运行草稿',exact:true}).count(),role==='operator'?1:0);await context.close();} +}); + +test('captured field evidence follows the adapter selected in the current draft rather than registry order',{timeout:60000},async t=>{ + const {page,runtime}=await setup(t),original=runtime.orderRules.adapters().find(a=>a.id==='bs-change').sample,real={...original,demo:false,fields:{...original.fields,'Alternate.Order':'ALT-2','Alternate.Brief':'新字段摘要'}}; + const capture=runtime.orderRules.recordCapture({taskId:'alternate-fields',sample:real,snapshot:{processVersion:real.processVersion,fields:Object.entries(real.fields).map(([path,value])=>({path,value}))}}),adapter=runtime.orderRules.saveAdapter({sampleId:capture.id,processName:real.processName,processVersion:real.processVersion,fields:{orderNo:'Alternate.Order',brief:'Alternate.Brief'}},{username:'admin',role:'admin'}); + const old=runtime.orderRules.get('rules','bs-change').draft;runtime.orderRules.saveRule({...old,adapterIds:[adapter.id]},'admin');await page.getByRole('button',{name:'刷新规则与字段',exact:true}).click();await page.waitForFunction(()=>!document.querySelector('#order-rule-refresh').disabled);await page.getByLabel('表单样本',{exact:true}).selectOption('capture:'+capture.id); + assert.match(await page.locator('#order-rule-adapter').textContent(),/Alternate\.Order/);assert.doesNotMatch(await page.locator('#order-rule-adapter').textContent(),/OFR_BS_Applicant\.OrderNum/); + await page.locator('[data-adapter-choice][value="bs-change"]').check();assert.match(await page.locator('#order-rule-adapter').textContent(),/暂无字段映射/); +}); diff --git a/tests/order-rules/workbench.test.cjs b/tests/order-rules/workbench.test.cjs new file mode 100644 index 0000000..69a20ba --- /dev/null +++ b/tests/order-rules/workbench.test.cjs @@ -0,0 +1,47 @@ +'use strict'; +const test=require('node:test'),assert=require('node:assert/strict'),fs=require('node:fs'),os=require('node:os'),path=require('node:path'); +const {RuleStore}=require('../../src/modules/order-rules/store.cjs'); +const {previewMatch}=require('../../src/modules/order-rules/matching.cjs'); +const {seedRules,adapters}=require('../../src/modules/order-rules/catalog.cjs'); +function setup(t){const dir=fs.mkdtempSync(path.join(os.tmpdir(),'rule-workbench-')),store=new RuleStore(dir,{clock:()=>new Date('2026-10-19T02:00:00Z')});t.after(()=>{store.close();fs.rmSync(dir,{recursive:true,force:true});});const old=store.get('rules','bs-change').draft,sample={...adapters.find(a=>a.id==='bs-change').sample,demo:false};const captured=store.recordCapture({sample,taskId:'fixture-task',snapshot:{processVersion:sample.processVersion,fields:Object.entries(sample.fields).map(([path,value])=>({path,value}))}});return{store,old,sample,captured};} +test('paired scopes never match the cross product while legacy arrays retain their meaning',()=>{ + const rules=seedRules(),rule=rules.find(r=>r.id==='bs-change'),sample=adapters.find(a=>a.id==='bs-change').sample; + rule.processNames.push('另一个流程');rule.nodeNames.push('另一个节点');rule.scopes=[{processName:sample.processName,nodeName:sample.nodeName},{processName:'另一个流程',nodeName:'另一个节点'}]; + assert.equal(previewMatch(rules,adapters,{...sample,nodeName:'另一个节点'}).ruleId,null); + assert.equal(previewMatch(rules,adapters,sample).ruleId,rule.id); + delete rule.scopes;assert.equal(previewMatch(rules,adapters,{...sample,nodeName:'另一个节点'}).ruleId,rule.id); +}); +test('saving paired scopes validates rows and persists derived legacy fields without rewriting publications',t=>{ + const {store,old,sample}=setup(t),scopes=[{processName:sample.processName,nodeName:sample.nodeName},{processName:'另一流程',nodeName:'另一节点'}]; + const saved=store.saveRule({...old,scopes},'admin');assert.deepEqual(saved.scopes,scopes);assert.deepEqual(saved.processNames,[sample.processName,'另一流程']);assert.deepEqual(saved.nodeNames,[sample.nodeName,'另一节点']); + assert.equal(store.get('rules',old.id).published,null); + for(const scopes of [null,[{processName:sample.processName,nodeName:''}],[{processName:sample.processName,nodeName:sample.nodeName,script:'bad'}]])assert.throws(()=>store.saveRule({...saved,scopes},'admin'),/范围|节点|配对/); +}); +test('unsaved draft trial previews the actual proposed output without writing rule, trial or order evidence',t=>{ + const {store,old,sample,captured}=setup(t),draft={...old,subjectPrefix:'【草稿预览】',to:['orders@example.test'],archiveDirectory:'\\\\server\\orders',filenameDate:'receivedAt'}; + const before=store.get('rules',old.id),result=store.trial(old.id,{version:old.version,draft,sampleId:captured.id}); + assert.equal(result.valid,true);assert.equal(result.trial.saved,false);assert.equal(result.trial.publishEvidence,false);assert.equal(result.effects.simulation,true);assert.match(result.effects.mail.subject,/草稿预览/);assert.match(result.effects.filename,/\.pdf$/);assert.match(result.effects.path,/server\\orders/);assert.equal(result.effects.archiveVerified,false); + assert.deepEqual(store.get('rules',old.id),before);assert.equal(store.all('orders').length,0);assert.equal(store.all('batches').length,0);assert.equal(store.settings().enabled,false); + assert.throws(()=>store.publish(old.id,{version:old.version},'admin'),/真实结构样本|收件人|目录/); +}); +test('only current persisted draft plus immutable captured sample can establish publish evidence',t=>{ + const {store,old,captured,sample}=setup(t),saved=store.saveRule({...old,to:['orders@example.test'],archiveDirectory:'\\\\server\\orders',filenameDate:'appDate',scopes:[{processName:sample.processName,nodeName:sample.nodeName}]},'admin'); + const untrusted=store.trial(old.id,{version:saved.version,sample});assert.equal(untrusted.trial.publishEvidence,false);assert.equal(store.get('rules',old.id).trialSampleId,null); + const real=store.trial(old.id,{version:saved.version,draft:saved,sampleId:captured.id});assert.equal(real.trial.saved,true);assert.equal(real.trial.publishEvidence,true);assert.equal(store.get('rules',old.id).trialSampleId,captured.id); + store.publish(old.id,{version:saved.version},'admin');const published=store.get('rules',old.id).published; + const edited=store.saveRule({...saved,intro:'后续草稿'},'admin');assert.throws(()=>store.trial(old.id,{version:saved.version,sampleId:captured.id}),e=>e.status===409);assert.equal(store.get('rules',old.id).published.intro,published.intro);assert.equal(store.get('rules',old.id).trialVersion,null);assert.equal(edited.version,saved.version+1); +}); +test('trial reports selected-category mismatch and does not grant evidence to another category',t=>{ + const {store,old,captured}=setup(t),other=store.get('rules','trial-change').draft; + const result=store.trial(other.id,{version:other.version,sampleId:captured.id});assert.equal(result.valid,false);assert.match(result.issues.join(';'),/当前类别/);assert.equal(result.effects,null);assert.equal(store.get('rules',old.id).trialSampleId,undefined); +}); + +test('publication overlap uses paired rows and permits disjoint pairs sharing both columns',t=>{ + const {store,old,sample}=setup(t),other=store.get('rules','overseas-change').draft,second=adapters.find(a=>a.id==='overseas-change').sample; + const scopes=[{processName:sample.processName,nodeName:'节点甲'},{processName:second.processName,nodeName:'节点乙'}]; + const configure=(rule,rows)=>store.saveRule({...rule,scopes:rows,adapterIds:['bs-change','overseas-change'],to:['orders@example.test'],archiveDirectory:'\\\\server\\orders',filenameDate:'receivedAt'},'admin'); + const a=configure(old,scopes),b=configure(other,[{processName:sample.processName,nodeName:'节点乙'},{processName:second.processName,nodeName:'节点甲'}]); + const check=(rule,nodeName)=>{const real={...sample,nodeName,demo:false},capture=store.recordCapture({taskId:rule.id,sample:real,snapshot:{processVersion:real.processVersion,fields:Object.entries(real.fields).map(([path,value])=>({path,value}))}});assert.equal(store.trial(rule.id,{version:rule.version,sampleId:capture.id}).valid,true);}; + check(a,'节点甲');store.publish(a.id,{version:a.version},'admin');check(b,'节点乙');assert.equal(store.publish(b.id,{version:b.version},'admin').status,'enabled'); + const overlapping=configure(b,scopes);assert.throws(()=>store.publish(b.id,{version:overlapping.version},'admin'),/冲突/); +}); diff --git a/web/app.css b/web/app.css index 0534ebe..6c57a42 100644 --- a/web/app.css +++ b/web/app.css @@ -41,3 +41,5 @@ .settings-tabs[hidden]{display:none} .notification-timing{display:grid;grid-template-columns:minmax(0,1.2fr) minmax(0,1fr);gap:1rem}.notification-timing>.card{min-width:0}.notification-timing .card-header{flex-wrap:wrap;gap:.5rem}.notification-timing .card-header>.ms-auto{margin-left:0!important}.notification-timing .card-body{overflow-wrap:anywhere}@media(max-width:767px){.notification-timing{grid-template-columns:minmax(0,1fr);gap:0}} + +.rule-workbench-grid{display:grid;grid-template-columns:200px minmax(0,1fr) 320px;gap:18px;align-items:start}.rule-workbench-grid>*{min-width:0}.rule-category-directory{position:sticky;top:20px}.rule-category-directory .card-body{padding:14px}.rule-category-directory .list-group{max-height:calc(100vh - 340px);overflow:auto}.rule-category-directory .list-group-item{text-align:left;white-space:normal;overflow-wrap:anywhere;padding:14px;border-left:3px solid transparent}.rule-category-directory .list-group-item strong{font-size:.83rem;font-weight:550}.rule-category-directory .list-group-item.active{color:#254c3a;background:#eef6f1;border-left-color:#28745b}.rule-version-bar{display:flex;align-items:center;justify-content:space-between;gap:12px;margin-bottom:18px}.rule-config-section{margin-bottom:16px}.rule-config-section .card-header{gap:12px;padding:18px}.rule-config-section .card-body{padding:18px}.rule-config-section .card-title{font-size:.95rem}.rule-section-number{display:grid;place-items:center;width:32px;height:32px;border-radius:10px;flex:none;background:#eef6f1;color:#28745b;font-size:.75rem;font-weight:600}.rule-scope-row{display:grid;grid-template-columns:minmax(0,1fr) minmax(0,1fr) auto;align-items:end;gap:8px;padding:12px 0;border-bottom:1px solid var(--tblr-border-color)}.rule-scope-row>*{min-width:0}.rule-scope-row .form-label{font-size:.75rem}.rule-scope-row .form-select{font-size:.8rem}.rule-adapter-options{display:grid;gap:8px}.rule-adapter-option{display:flex;gap:10px;align-items:flex-start;padding:12px;border:1px solid var(--tblr-border-color);border-radius:8px;font-size:.8rem;overflow-wrap:anywhere}.rule-adapter-option:has(input:checked){border-color:#9bc4af;background:#f7fbf8}.rule-adapter-option .form-check-input{flex:none;margin-top:2px}.rule-save-bar{position:sticky;bottom:12px;display:flex;flex-wrap:wrap;align-items:center;gap:10px;background:#fff;border:1px solid var(--tblr-border-color);border-radius:10px;padding:14px;box-shadow:0 3px 15px #172d2210;z-index:2}.rule-save-bar>span{flex:1 0 100%}.rule-validation-column>.card>.card-header{padding:18px}.rule-validation-column>.card>.card-body{padding:18px}.rule-validation-column .card-title{font-size:.95rem}.rule-validation-column .order-rule-fields{font-size:.75rem}.rule-validation-column .order-rule-explanation{font-size:.78rem}.rule-effect-preview{padding:14px;border:1px solid #dce9df;background:#f8fbf9;border-radius:10px}.rule-effect-preview dt{font-size:.75rem;color:#667486;font-weight:400}.rule-effect-preview dd{font-size:.8rem;overflow-wrap:anywhere;margin:4px 0 12px}.rule-validation-column pre{font-size:.77rem;white-space:pre-wrap;overflow-wrap:anywhere}.rule-editor-column .row>*{min-width:0}@media(max-width:1350px){.rule-workbench-grid{grid-template-columns:200px minmax(0,1fr)}.rule-validation-column{grid-column:2}}@media(max-width:991px){.rule-workbench-grid{grid-template-columns:minmax(0,1fr)}.rule-category-directory{position:static}.rule-category-directory .list-group{max-height:220px}.rule-validation-column{grid-column:auto}.rule-save-bar{position:static}.rule-scope-row{grid-template-columns:minmax(0,1fr) auto}.rule-scope-row>div:first-child{grid-column:1/-1}.rule-config-section .card-header,.rule-config-section .card-body{padding:16px}} diff --git a/web/index.html b/web/index.html index 9892eb5..69e9d0a 100644 --- a/web/index.html +++ b/web/index.html @@ -1,3 +1,3 @@ 订单通知中心 -
正在连接订单通知中心…
+
正在连接订单通知中心…
diff --git a/web/modules/mail/view.js b/web/modules/mail/view.js index 5e532ab..3fff6b7 100644 --- a/web/modules/mail/view.js +++ b/web/modules/mail/view.js @@ -21,7 +21,7 @@ window.MailViews=(()=>{ const data=await api('/mail');if(!isActive())return;const admin=user.role==='admin';let filter='pending',detailRevision=0; container.innerHTML=`

发信模板

向托管邮箱发送 [模板][产品线]发信标题,新版本将在这里等待确认。未填写产品线时作为默认模板。

可用变量:{{产品线}}、{{订单号}}、{{日期}}、{{订单列表}}
`; const draw=()=>{const items=data.templates.filter(t=>t.status===filter);container.querySelector('#mail-template-list').innerHTML=items.length?`
${items.map(t=>``).join('')}
标题 / 范围来源
${esc(t.subject)}
${esc(t.scope||'默认模板')} · ${stateBadge(t)} · ${t.attachmentCount} 个附件
${esc(data.channels.find(c=>c.id===t.channelId)?.name||'旧模板草稿')}
${esc(t.sender)}
${formatDate(t.createdAt)}
`:'
暂无'+labels[filter]+'模板
';container.querySelectorAll('[data-template]').forEach(b=>b.onclick=()=>window.PageLifecycle.guard(()=>action(b,()=>detail(b.dataset.template))));};draw();container.querySelector('#template-filter').onchange=event=>{filter=event.target.value;draw();}; - async function detail(id){const revision=++detailRevision,t=await api('/mail/templates/'+id);if(!isActive()||revision!==detailRevision)return;const pending=t.status==='pending',host=container.querySelector('#mail-template-detail');host.innerHTML=`

模板预览

${stateBadge(t)}
来源:${esc(t.sender)} · ${formatDate(t.date||t.createdAt)}
原主题:${esc(t.sourceSubject||t.subject)}
${t.notes?.length?`
${t.notes.map(esc).join('
')}
`:''}${t.channelId==='legacy'?`
`:''}
${pending&&admin?`
`:''}

附件(${t.attachments.length})

    ${t.attachments.map((a,i)=>`
  • ${admin?`${esc(a.filename)}`:esc(a.filename)} ${Math.ceil(a.size/1024)} KB${a.inline?' · 内嵌图片':''}
  • `).join('')||'
  • 无附件
  • '}
`;host.scrollIntoView({block:'start',behavior:'smooth'});host.querySelector('#template-close').onclick=()=>{detailRevision++;host.replaceChildren();}; + async function detail(id){const revision=++detailRevision,host=container.querySelector('#mail-template-detail');host.innerHTML='
正在读取模板…
';let t;try{t=await api('/mail/templates/'+id);}catch(error){if(!isActive()||revision!==detailRevision)return;host.innerHTML='
'+esc(error.message)+';请重新选择模板重试。
';throw error;}if(!isActive()||revision!==detailRevision)return;const pending=t.status==='pending';host.innerHTML=`

模板预览

${stateBadge(t)}
来源:${esc(t.sender)} · ${formatDate(t.date||t.createdAt)}
原主题:${esc(t.sourceSubject||t.subject)}
${t.notes?.length?`
${t.notes.map(esc).join('
')}
`:''}${t.channelId==='legacy'?`
`:''}
${pending&&admin?`
`:''}

附件(${t.attachments.length})

    ${t.attachments.map((a,i)=>`
  • ${admin?`${esc(a.filename)}`:esc(a.filename)} ${Math.ceil(a.size/1024)} KB${a.inline?' · 内嵌图片':''}
  • `).join('')||'
  • 无附件
  • '}
`;host.scrollIntoView({block:'start',behavior:'smooth'});host.querySelector('#template-close').onclick=()=>{detailRevision++;host.replaceChildren();}; if(pending&&admin){host.querySelector('#template-use-text').onchange=e=>host.querySelector('#template-text-editor').hidden=!e.target.checked;host.querySelector('#template-review').onsubmit=async e=>{e.preventDefault();const button=e.submitter;button.disabled=true;try{const useText=host.querySelector('#template-use-text').checked;await api(`/mail/templates/${id}/confirm`,{version:t.version,subject:host.querySelector('#template-subject').value,scope:host.querySelector('#template-scope').value,useText,...(useText?{text:host.querySelector('#template-text').value}:{}),...(t.channelId==='legacy'?{channelId:host.querySelector('#legacy-channel').value}:{})});if(isActive()){host.innerHTML='
模板已确认生效。
';await window.PageLifecycle.afterSave(()=>templates(container,isActive),'模板已确认生效。',notify,isActive);}}catch(error){if(isActive())host.querySelector('#template-error').textContent=error.message;}finally{if(button.isConnected)button.disabled=false;}};host.querySelector('#template-reject').onclick=e=>action(e.target,async()=>{await api(`/mail/templates/${id}/reject`,{version:t.version});if(isActive()){host.innerHTML='
模板已忽略。
';await window.PageLifecycle.afterSave(()=>templates(container,isActive),'模板已忽略。',notify,isActive);}});} host.querySelector('#template-test')?.addEventListener('click',e=>{const c=data.channels.find(c=>c.id===t.channelId);if(!confirm(`使用此模板发送一封测试邮件到 ${c.email}?`))return;action(e.target,async()=>{await api(`/mail/channels/${t.channelId}/test`,{templateId:id});notify('测试邮件已提交至邮件服务器。');});}); } diff --git a/web/modules/order-rules/editor.js b/web/modules/order-rules/editor.js index c793405..4521336 100644 --- a/web/modules/order-rules/editor.js +++ b/web/modules/order-rules/editor.js @@ -2,23 +2,17 @@ 'use strict'; const list=value=>String(value||'').split(/[,,;;\n]/).map(v=>v.trim()).filter(Boolean); const dates={appDate:'申请日期',receivedAt:'接收日期',archiveDate:'归档日期'}; - function describe(rule){ - return `当流程为“${(rule.processNames||[]).join('、')||'待选择'}”、节点为“${(rule.nodeNames||[]).join('、')||'待选择'}”时,按“${rule.name||rule.categoryId}”类别识别订单。归档至“${rule.archiveDirectory||'待配置目录'}”,文件名日期使用${dates[rule.filenameDate]||'待确认日期'};本时段内同类别订单合并一封,更早历史不补发,${rule.attachPdf?'附带通知书 PDF':'不附带 PDF'}。收件人 ${(rule.to||[]).join('、')||'待配置'}。BPM 节点由人工办理。`; - } - function render(rule,adapters,{esc,admin,processes=[],nodes=[]}){ + function describe(rule){return `满足任一配对:${window.OrderRuleScopes.scopesFor(rule).map(r=>`${r.processName||'待选流程'} → ${r.nodeName||'待选节点'}`).join(';')||'尚未配置'}。归入“${rule.name||rule.categoryId}”,归档至“${rule.archiveDirectory||'待配置目录'}”,文件名日期使用${dates[rule.filenameDate]||'待确认日期'};本时段同类别合并一封,${rule.attachPdf?'附带通知书 PDF':'不附带 PDF'}。BPM 节点由人工办理。`;} + function render(rule,adapters,{esc,admin}){ const disabled=admin?'':'disabled'; - const options=(values,selected)=>[...new Set([...values,...selected])].filter(Boolean).map(v=>``).join(''); const text=(name,label,value,extra='')=>`
`; - const multi=(name,label,values,selected)=>`
可选择多项;按完整名称精确匹配。
`; - return `

规则编辑

版本 ${esc(rule.version)} · ${esc(rule.categoryId)}
${text('name','规则名称',rule.name,'required maxlength="160"')}${text('categoryId','Excel 类别编号',rule.categoryId,'readonly')}${multi('processNames','适用流程',[...processes,...adapters.map(a=>a.processName)],rule.processNames)}${multi('nodeNames','触发节点',[...nodes,...adapters.flatMap(a=>[a.nodeName,a.sample?.nodeName])],rule.nodeNames)}
${text('archiveDirectory','归档目录',rule.archiveDirectory,'maxlength="1200" placeholder="完整 UNC 共享归档目录"')}
${text('subjectPrefix','邮件主题前缀',rule.subjectPrefix,'maxlength="200"')}${text('signature','邮件签名',rule.signature,'maxlength="4000"')}
每行一个邮箱,也可用逗号分隔。
已保存规则的执行说明

${esc(rule.explanation||describe(rule))}

${admin?'':''}
`; - } - function read(form,rule){ - const result={...rule}; - for(const name of ['name','archiveDirectory','subjectPrefix','intro','signature','filenameDate'])result[name]=form.elements.namedItem(name).value.trim(); - for(const name of ['processNames','nodeNames','adapterIds'])result[name]=[...form.elements.namedItem(name).selectedOptions].map(o=>o.value); - for(const name of ['to','cc'])result[name]=list(form.elements.namedItem(name).value); - result.attachPdf=form.elements.namedItem('attachPdf').checked; - return result; + const card=(number,title,description,body)=>`
${number}

${title}

${description}
${body}
`; + return `
${card('01','哪些订单归到这里?','选择流程和节点,完整名称精确匹配。',`
${text('name','规则名称',rule.name,'required maxlength="160"')}${text('categoryId','Excel 类别编号',rule.categoryId,'readonly')}
${window.OrderRuleScopes.render(rule,{esc,admin})}`)} + ${card('02','订单信息从哪里取?','同一业务字段可对应不同表单来源;每个版本分别核验。',`
${adapters.map(a=>``).join('')}${(rule.adapterIds||[]).filter(id=>!adapters.some(a=>a.id===id)).map(id=>``).join('')}
维护字段映射`)} + ${card('03','归类后怎样处理?','目录、邮件和收件人按本类别维护。',`
${text('archiveDirectory','归档目录',rule.archiveDirectory,'maxlength="1200" placeholder="完整 UNC 共享分类目录"')}
文件名:订单号_日期_流水编号.pdf。检查存储服务器
${text('subjectPrefix','邮件主题前缀',rule.subjectPrefix,'maxlength="200"')}${text('signature','邮件签名',rule.signature,'maxlength="4000"')}
已显式关联类别模板时,正文使用该模板;收件人和主题仍以本类别为准。维护类别模板
每行一个邮箱,也可用逗号分隔;重复地址自动去重。
`)} + ${card('04','配置是否正确?','保存后用真实样本校验,再检查发布条件。',`
已保存规则的执行说明

${esc(describe(rule))}

${rule.validationIssues?.length?`
发布前待补全
    ${rule.validationIssues.map(v=>`
  • ${esc(typeof v==='string'?v:v.message||JSON.stringify(v))}
  • `).join('')}
`:''}

发送时段与邮箱在通知配置维护;本时段同类别汇总一封,更早历史不补发。

`)} + ${admin?'
保存生成草稿,已生效版本继续运行。
':''}
`; } + function read(form,rule){const result={...rule};for(const name of ['name','archiveDirectory','subjectPrefix','intro','signature','filenameDate'])result[name]=form.elements.namedItem(name).value.trim();result.scopes=window.OrderRuleScopes.read(form);result.processNames=[...new Set(result.scopes.map(r=>r.processName).filter(Boolean))];result.nodeNames=[...new Set(result.scopes.map(r=>r.nodeName).filter(Boolean))];result.adapterIds=[...form.querySelectorAll('[data-adapter-choice]:checked')].map(e=>e.value);for(const name of ['to','cc'])result[name]=list(form.elements.namedItem(name).value);result.attachPdf=form.elements.namedItem('attachPdf').checked;return result;} window.OrderRuleEditor={render,read,describe}; })(); diff --git a/web/modules/order-rules/preview.js b/web/modules/order-rules/preview.js index 9cdfae7..23636a4 100644 --- a/web/modules/order-rules/preview.js +++ b/web/modules/order-rules/preview.js @@ -3,16 +3,19 @@ const labels={orderNo:'订单号',appDate:'申请日期',customer:'客户',productLine:'产品线',quantity:'数量',changeReason:'更改原因',changeContent:'更改内容',totalAmount:'总金额',brief:'简要说明',serialNum:'通知书编号',nodeName:'节点',processName:'流程'}; const value=v=>v===undefined||v===null?'未提供':typeof v==='object'?JSON.stringify(v):String(v); function panel(adapters,{esc,operator}){ - return `

字段对应与样本试运行

${operator?'
填写后以此标题生成正文;每个订单号单独一段,只保留订单号、机芯号、产品型号、客户简称、总数量、订单类别。留空沿用样本。
高级:查看或替换 JSON 样本

校验使用已保存的规则。预览不会创建订单、归档文件、办理 BPM 或发送邮件。

':'
操作员和管理员可运行样本校验;当前账号仅查看字段对应。
'}
`; + return `

用订单样本验证

${operator?'
填写后以此标题生成正文;每个订单号单独一段,只保留订单号、机芯号、产品型号、客户简称、总数量、订单类别。留空沿用样本。
高级:查看或替换 JSON 样本

试运行当前输入;未保存的模拟不能作为发布依据。预览不会创建订单、归档文件、办理 BPM 或发送邮件。

':'
操作员和管理员可运行样本校验;当前账号仅查看字段对应。
'}
`; } function adapter(a,{esc}){ if(!a)return '

选择表单后显示业务字段、来源路径及样本值。

'; const fields=Array.isArray(a.fields)?a.fields.map(f=>[f.key,f]):Object.entries(a.fields||{}); - return `
${esc(a.processName||'流程未标注')} · ${a.verified?'样本字段结构已核验':'样本字段结构待核验'}
演示样本用于理解字段;发布需真实业务样本校验,且不代表实时接入已完成。
${fields.map(([key,f])=>{const field=typeof f==='string'?{path:f}:f||{},p=field.path||field.xdatabind||field.bind||'';const v=a.sample?.fields?.[p]??a.sample?.[p];return ``;}).join('')||''}
业务字段来源路径样本值
${esc(field.label||labels[key]||key)}${esc(p||'未映射')}${esc(value(v))}
暂无字段映射
`; + return `
${esc(a.processName||'流程未标注')} · ${a.verified?'样本字段结构已核验':'样本字段结构待核验'}
${a.sampleId?'服务端真实采集样本;字段结构核验不代表实时接入已完成。':'演示样本用于理解字段;发布需真实采集样本校验。'}
查看字段来源与样本值
${fields.map(([key,f])=>{const field=typeof f==='string'?{path:f}:f||{},p=field.path||field.xdatabind||field.bind||'';const v=a.sample?.fields?.[p]??a.sample?.[p];return ``;}).join('')||''}
业务字段来源路径样本值
${esc(field.label||labels[key]||key)}${esc(p||'未映射')}${esc(value(v))}
暂无字段映射
`; } function result(r,{esc,demo=false}){ + const trial=r.trial?`
${r.trial.publishEvidence?'已保存草稿已通过真实样本校验,可继续检查发布条件。':r.trial.saved?'已保存草稿的模拟结果,仍需真实采集样本才能发布。':'当前输入的模拟结果,尚未保存,不能作为发布依据。'}
`:''; + const plan=r.effects; + const effects=plan?`

处理预览

单个样本的模拟结果,未生成文件、未核验存储、未发送邮件。正式发送仍按时段汇总。

${plan.provisionalDate?'
归档日期暂用当前模拟时间,实际文件名以归档时为准。
':''}
预计文件名
${esc(plan.filename||'待完善字段')}
预计归档路径
${esc(plan.path||'待配置完整目录')}
${plan.mail?`
邮件主题
${esc(plan.mail.subject)}
主送
${esc(plan.mail.to.join(';'))}
抄送
${esc(plan.mail.cc.join(';')||'无')}
附件
${esc(plan.mail.attachments.join(';')||'不附带 PDF')}
正文来源
${plan.mail.template?'已关联类别模板 v'+esc(plan.mail.template.version):'本类别引导语、订单摘要和签名'}
`:''}
${plan.mail?`
查看模拟邮件正文
${esc(plan.mail.text)}
`:''}${plan.issues?.length?`
待完善:${plan.issues.map(v=>esc(v)).join(';')}
`:''}
`:''; const title=r.event?.rawTitle!==undefined?`

标题提取结果

${esc(r.event.brief||'')}
${r.event.factoryHints?.length?`
惠州线索待核实:${r.event.factoryHints.map(h=>esc(h.source+':'+h.value)).join(';')}。额外通知要求尚未确认,不会自动多发。
`:''}
查看 BPM 原始标题
${esc(r.event.rawTitle)}
`:''; - return title+`
${r.valid?'样本校验通过':'样本校验未通过'}${r.ruleId?' · 命中规则 '+esc(r.ruleId):''}
${demo?'
本次使用演示样本,仅校验字段结构,不能作为规则发布的真实业务样本。
':''}${r.issues?.length?``:''}${r.explanation?`

${esc(r.explanation)}

`:''}${r.checks?.length?`
${r.checks.map(c=>`
${c.ok?'通过':'待处理'}${esc(c.label)}
${esc(c.detail)}
`).join('')}
`:''}${r.fieldTrace?.length?`
${r.fieldTrace.map(f=>``).join('')}
业务字段来源路径实际值
${esc(f.label||labels[f.key]||f.key)}${esc(f.path)}${esc(value(f.value))}
`:''}`; + return trial+effects+title+`
${r.valid?'样本校验通过':'样本校验未通过'}${r.ruleId?' · 命中规则 '+esc(r.ruleId):''}
${demo?'
本次使用演示样本,仅校验字段结构,不能作为规则发布的真实业务样本。
':''}${r.issues?.length?``:''}${r.explanation?`

${esc(r.explanation)}

`:''}${r.checks?.length?`
${r.checks.map(c=>`
${c.ok?'通过':'待处理'}${esc(c.label)}
${esc(c.detail)}
`).join('')}
`:''}${r.fieldTrace?.length?`
${r.fieldTrace.map(f=>``).join('')}
业务字段来源路径实际值
${esc(f.label||labels[f.key]||f.key)}${esc(f.path)}${esc(value(f.value))}
`:''}`; } window.OrderRulePreview={panel,adapter,result}; })(); diff --git a/web/modules/order-rules/scope-editor.js b/web/modules/order-rules/scope-editor.js new file mode 100644 index 0000000..21dbd53 --- /dev/null +++ b/web/modules/order-rules/scope-editor.js @@ -0,0 +1,20 @@ +(() => { + 'use strict'; + const scopesFor=rule=>Array.isArray(rule.scopes)?rule.scopes:(rule.processNames||[]).flatMap(processName=>(rule.nodeNames||[]).map(nodeName=>({processName,nodeName}))); + const read=host=>[...host.querySelectorAll('[data-scope-row]')].map(row=>({processName:row.querySelector('[data-scope-process]').value,nodeName:row.querySelector('[data-scope-node]').value})); + function render(rule,{esc,admin}){return `
${admin?'':''}

任一行完整匹配即可归入本类别。每行的流程与节点一起判断。

`;} + function bind(host,{catalog,esc,admin,onChange}){ + let rows=JSON.parse(host.dataset.scopes),query='';const mount=host.querySelector('#rule-scope-rows'); + function draw(){ + const options=(values,current)=>['',...new Set([...values,current].filter(Boolean))].filter(v=>!v||v===current||!query||v.toLocaleLowerCase().includes(query)).map(v=>``).join(''); + mount.innerHTML=rows.map((row,i)=>`
${admin?``:''}
`).join('')||'

尚未选择适用流程,添加一行后选择对应节点。

'; + mount.querySelectorAll('[data-scope-remove]').forEach(button=>button.onclick=()=>{rows.splice(Number(button.dataset.scopeRemove),1);draw();onChange();}); + mount.querySelectorAll('[data-scope-process]').forEach((select,i)=>select.onchange=()=>{rows[i].processName=select.value;if(!catalog.some(r=>r.processName===select.value&&r.nodeName===rows[i].nodeName))rows[i].nodeName='';draw();onChange();}); + mount.querySelectorAll('[data-scope-node]').forEach((select,i)=>select.onchange=()=>{rows[i].nodeName=select.value;onChange();}); + const add=host.querySelector('#rule-scope-add');if(add)add.disabled=rows.length>=100; + } + host.querySelector('#rule-scope-search').oninput=event=>{query=event.target.value.trim().toLocaleLowerCase();draw();}; + const add=host.querySelector('#rule-scope-add');if(add)add.onclick=()=>{if(rows.length>=100)return;rows.push({processName:'',nodeName:''});draw();onChange();};draw(); + } + window.OrderRuleScopes={scopesFor,render,read,bind}; +})(); diff --git a/web/modules/order-rules/view.js b/web/modules/order-rules/view.js index 3477033..befb5a0 100644 --- a/web/modules/order-rules/view.js +++ b/web/modules/order-rules/view.js @@ -2,39 +2,87 @@ 'use strict'; let api,esc,formatDate,notify,user; async function render(container,isActive=()=>true,section='rules'){ - const tab=['rules','fields'].includes(section)?section:'rules'; + const tab=section==='fields'?'fields':'rules',admin=user.role==='admin',operator=user.role!=='viewer'; const {status,empty}=window.OrderNotificationShared.create({esc}); - container.innerHTML='
规则与字段配置
'; - const panel=container.querySelector('#order-rules-panel'),admin=user.role==='admin',operator=user.role!=='viewer'; - let data={rules:[],adapters:[],samples:[]},selectedId,dirty=false,revision=0,controller; + container.innerHTML='
按业务类别配置,使用订单样本核对结果
'; + const panel=container.querySelector('#order-rules-panel'); + let data={rules:[],adapters:[],samples:[]},selectedId,dirty=false,revision=0,trialRevision=0,controller,unregister,query='',filter='all',saving=false,pauseCurrent,refreshCurrent=reload; const feedback=(message,type='success')=>{if(!isActive())return;const node=container.querySelector('#order-rules-feedback');node.textContent=message;node.className='alert alert-'+type;}; - async function action(button,work){if(button)button.disabled=true;try{await work();}catch(error){feedback(error.message,'danger');}finally{if(button?.isConnected)button.disabled=false;}} - async function saved(message){if(!isActive())return false;dirty=false;return window.PageLifecycle.afterSave(reload,message,feedback,isActive);} - async function reload(){if(!isActive())return false;const request=++revision;if(tab==='fields'){controller?.dispose?.();const next=await window.OrderExecutionViews.fields(panel,{api,esc,formatDate,user,isActive:()=>isActive()&&request===revision,feedback});if(isActive()&&request===revision)controller=next;return true;} - const [snapshot,catalog]=await Promise.all([api('/order-rules'),api('/order-rules/fields').catch(()=>({samples:[]}))]);if(!isActive()||request!==revision)return false; - data={rules:snapshot.rules||[],adapters:snapshot.adapters||[],samples:catalog.samples||[]};dirty=false;drawRules();return true; + async function action(button,work){if(button.disabled)return false;const owner=panel.firstElementChild;button.disabled=true;try{return await work();}catch(error){if(panel.firstElementChild===owner)feedback(error.message,'danger');return false;}finally{if(button.isConnected)button.disabled=false;}} + async function reload(){ + if(!isActive())return false;const request=++revision;++trialRevision; + if(tab==='fields'){controller?.dispose?.();const next=await window.OrderExecutionViews.fields(panel,{api,esc,formatDate,user,isActive:()=>isActive()&&request===revision,feedback});if(isActive()&&request===revision)controller=next;return true;} + const [snapshot,catalog]=await Promise.all([api('/order-rules'),api('/order-rules/fields').catch(error=>({samples:[],error:error.message}))]); + if(!isActive()||request!==revision)return false; + data={rules:snapshot.rules||[],adapters:snapshot.adapters||[],samples:catalog.samples||[],catalogError:catalog.error};dirty=false;draw();return true; } - function drawRules(){ + function draw(){ + unregister?.();++trialRevision; if(!data.rules.length){panel.innerHTML=`
${empty('暂无分类规则,请先导入经确认的 Excel 分类。')}
`;return;} const rule=data.rules.find(r=>r.id===selectedId)||data.rules[0];selectedId=rule.id; - const sources=[...data.adapters,...data.samples.filter(sample=>rule.processNames.includes(sample.processName)).map(c=>({id:'capture:'+c.id,sampleId:c.id,label:c.processName+' '+c.processVersion+' · 真实采集',processName:c.processName,verified:true,fields:data.adapters.find(a=>a.processName===c.processName&&a.processVersion===c.processVersion)?.fields||{},sample:c.sample}))]; - panel.innerHTML=`
已发布版本:${esc(rule.publishedVersion??'无')} · Excel 行 ${esc(rule.sourceRow??'—')}${admin?``:''}
${rule.validationIssues?.length?`
发布前待补全:${rule.validationIssues.map(v=>esc(typeof v==='string'?v:v.message||JSON.stringify(v))).join(';')}
`:''}${window.OrderRuleEditor.render(rule,data.adapters,{esc,admin,processes:data.rules.flatMap(r=>r.processNames||[]),nodes:data.rules.flatMap(r=>r.nodeNames||[])})}
${window.OrderRulePreview.panel(sources,{esc,operator})}
`; - const form=panel.querySelector('#order-rule-editor'); - function changed(){dirty=true;panel.querySelector('#order-rule-explanation-title').textContent='当前表单的执行说明(尚未保存)';panel.querySelector('#order-rule-explanation').textContent=window.OrderRuleEditor.describe(window.OrderRuleEditor.read(form,rule));panel.querySelector('#order-rule-dirty').textContent='有未保存的修改。保存草稿后再校验或发布。';for(const id of ['#order-rule-publish','#order-rule-preview','#order-rule-pause']){const button=panel.querySelector(id);if(button)button.disabled=true;}} - if(admin){form.oninput=changed;form.onchange=changed;form.onsubmit=e=>{e.preventDefault();return action(e.submitter,async()=>{const result=await api('/order-rules/rules',window.OrderRuleEditor.read(form,rule));if(!isActive())return;Object.assign(rule,result);await saved('规则草稿已保存。');});}; - panel.querySelector('#order-rule-publish').onclick=e=>action(e.currentTarget,async()=>{const result=await api('/order-rules/rules/'+encodeURIComponent(rule.id)+'/publish',{version:rule.version});if(!isActive())return;Object.assign(rule,result);await saved('规则版本已发布。自动执行仍由全局设置与接入状态控制。');}); - panel.querySelector('#order-rule-pause').onclick=e=>action(e.currentTarget,async()=>{const result=await api('/order-rules/rules/'+encodeURIComponent(rule.id)+'/pause',{version:rule.version});if(!isActive())return;Object.assign(rule,result);await saved('此规则已暂停。');}); + const sources=[...data.adapters.map(a=>({...a,sample:a.sample||data.samples.find(c=>c.id===a.sampleId)?.sample})),...data.samples.filter(c=>(rule.processNames||[]).includes(c.processName)).map(c=>({id:'capture:'+c.id,sampleId:c.id,label:c.processName+' '+c.processVersion+' · 真实采集',processName:c.processName,verified:true,fields:data.adapters.find(a=>a.processName===c.processName&&a.processVersion===c.processVersion)?.fields||{},sample:c.sample}))]; + panel.innerHTML=`

${esc(rule.name)}

编辑草稿 v${esc(rule.version)} · 生效版本 ${esc(rule.publishedVersion?'v'+rule.publishedVersion:'无')} · Excel 行 ${esc(rule.sourceRow??'—')}
${admin?``:''}
${window.OrderRuleEditor.render(rule,data.adapters,{esc,admin})}
`; + const form=panel.querySelector('#order-rule-editor'),owned=()=>isActive()&&panel.querySelector('#order-rule-editor')===form; + const read=()=>window.OrderRuleEditor.read(form,rule);let baseline; + function coverage(){const value=read(),processes=[...new Set(value.scopes.map(r=>r.processName).filter(Boolean))],missing=processes.filter(p=>!data.adapters.some(a=>a.processName===p&&a.verified&&value.adapterIds.includes(a.id)));panel.querySelector('#rule-field-coverage').textContent=missing.length?'待绑定或核验:'+missing.join('、'):'当前适用流程已关联字段结构;未知表单版本仍会受阻。';} + function changed(){ + if(!owned())return;++trialRevision;dirty=JSON.stringify(read())!==baseline; + panel.querySelector('#order-rule-explanation-title').textContent=dirty?'当前输入的执行说明(尚未保存)':'已保存规则的执行说明'; + panel.querySelector('#order-rule-explanation').textContent=window.OrderRuleEditor.describe(read()); + panel.querySelector('#order-rule-dirty').textContent=dirty?'有未保存的修改。可以试运行当前输入;保存后需重新校验再发布。':''; + panel.querySelector('#order-rule-preview-result').innerHTML='

输入已变化,请重新试运行。

'; + const publish=panel.querySelector('#order-rule-publish');if(publish)publish.disabled=dirty||saving;coverage();refreshAdapter(); } - panel.querySelectorAll('[data-rule-id]').forEach(button=>button.onclick=()=>window.PageLifecycle.guard(()=>{dirty=false;selectedId=button.dataset.ruleId;drawRules();})); + const catalog=[...data.rules.flatMap(window.OrderRuleScopes.scopesFor),...data.samples.map(c=>({processName:c.processName,nodeName:c.sample?.nodeName})).filter(r=>r.nodeName)]; + window.OrderRuleScopes.bind(panel.querySelector('#rule-scopes'),{catalog,esc,admin,onChange:changed});baseline=JSON.stringify(read());coverage(); const source=panel.querySelector('#order-rule-sample-source'); - const preferred=sources.find(a=>a.sampleId)?.id||(rule.adapterIds||[]).find(id=>sources.some(a=>a.id===id&&a.sample));source.value=preferred||''; - function choose(){const a=sources.find(a=>a.id===source.value);panel.querySelector('#order-rule-adapter').innerHTML=window.OrderRulePreview.adapter(a,{esc});const input=panel.querySelector('#order-rule-sample');if(input){input.value=a?.sample?JSON.stringify(a.sample,null,2):'';input.readOnly=!!a?.sampleId;}const title=panel.querySelector('#order-rule-title');if(title){title.value=a?.sampleId?a.sample?.title||'':'';title.readOnly=!!a?.sampleId;}panel.querySelector('#order-rule-preview-result').innerHTML='';}source.onchange=choose;choose(); - if(operator)panel.querySelector('#order-rule-preview').onclick=e=>action(e.currentTarget,async()=>{let sample;try{sample=JSON.parse(panel.querySelector('#order-rule-sample').value);}catch{throw Error('请选择样本,或在高级选项中提供有效的 JSON 对象。');}if(!sample||typeof sample!=='object'||Array.isArray(sample))throw Error('样本必须是 JSON 对象。');const title=panel.querySelector('#order-rule-title').value;if(title.trim())sample.title=title;const evidence=sources.find(a=>a.id===source.value);const result=await api('/order-rules/preview',evidence?.sampleId?{sampleId:evidence.sampleId}:{sample});if(!isActive()||tab!=='rules'||selectedId!==rule.id||panel.querySelector('#order-rule-editor')!==form)return;panel.querySelector('#order-rule-preview-result').innerHTML=window.OrderRulePreview.result(result,{esc,demo:sample.demo===true});}); + function refreshAdapter(){ + let a=sources.find(a=>a.id===source.value); + if(a?.sampleId){const mappings=data.adapters.filter(adapter=>adapter.processName===a.processName&&adapter.processVersion===a.sample?.processVersion&&read().adapterIds.includes(adapter.id));a={...a,fields:mappings.length===1?mappings[0].fields:{}};} + panel.querySelector('#order-rule-adapter').innerHTML=window.OrderRulePreview.adapter(a,{esc}); + } + function choose(){ + ++trialRevision;const a=sources.find(a=>a.id===source.value);refreshAdapter(); + const input=panel.querySelector('#order-rule-sample');if(input){input.value=a?.sample?JSON.stringify(a.sample,null,2):'';input.readOnly=!!a?.sampleId;} + const title=panel.querySelector('#order-rule-title');if(title){title.value=a?.sampleId?a.sample?.title||'':'';title.readOnly=!!a?.sampleId;} + panel.querySelector('#order-rule-preview-result').innerHTML=''; + } + source.value=sources.find(a=>a.sampleId)?.id||(rule.adapterIds||[]).find(id=>sources.some(a=>a.id===id&&a.sample))||'';source.onchange=choose;choose(); + for(const id of ['#order-rule-sample','#order-rule-title']){const input=panel.querySelector(id);if(input)input.oninput=()=>{++trialRevision;panel.querySelector('#order-rule-preview-result').innerHTML='

样本已变化,请重新试运行。

';};} + async function mutate(work){ + if(saving||!owned())return false;saving=true;form.setAttribute('aria-busy','true'); + const locked=[...form.querySelectorAll('input,select,textarea,button'),panel.querySelector('#order-rule-pause'),panel.querySelector('#order-rule-preview')].filter(e=>e&&!e.disabled);locked.forEach(e=>e.disabled=true); + try{return await work();}finally{saving=false;form.removeAttribute('aria-busy');if(form.isConnected){locked.forEach(e=>e.disabled=false);const publish=form.querySelector('#order-rule-publish');if(publish)publish.disabled=dirty;}} + } + refreshCurrent=()=>mutate(reload); + async function save(){ + if(!owned()||!form.reportValidity())return false;const value=read(); + return mutate(async()=>{try{const result=await api('/order-rules/rules',value);if(!owned())return true;Object.assign(rule,result);baseline=JSON.stringify(read());dirty=false;++trialRevision;panel.querySelector('#order-rule-dirty').textContent='';panel.querySelector('#order-rule-explanation-title').textContent='已保存规则的执行说明';panel.querySelector('#order-rule-preview-result').innerHTML='

草稿已保存,请重新试运行当前版本。

';await window.PageLifecycle.afterSave(reload,'规则草稿已保存。',feedback,isActive);return true;}catch(error){if(owned())feedback(error.message,'danger');return false;}}); + } + unregister=window.PageLifecycle.register({dirty:()=>owned()&&dirty,save:admin?save:null}); + if(admin){ + form.oninput=form.onchange=event=>{if(event.target.id!=='rule-scope-search')changed();};form.onsubmit=event=>{event.preventDefault();return save();}; + panel.querySelector('#order-rule-publish').onclick=event=>action(event.currentTarget,async()=>{if(dirty||saving)throw Error('请先保存当前修改,再试运行并发布。');return mutate(async()=>{await api('/order-rules/rules/'+encodeURIComponent(rule.id)+'/publish',{version:rule.version});if(!owned())return;await window.PageLifecycle.afterSave(reload,'规则版本已发布。自动执行仍由全局设置与接入状态控制。',feedback,isActive);});}); + pauseCurrent=()=>action(panel.querySelector('#order-rule-pause'),()=>mutate(async()=>{await api('/order-rules/rules/'+encodeURIComponent(rule.id)+'/pause',{version:rule.version});if(!owned())return;dirty=false;await window.PageLifecycle.afterSave(reload,'此规则已暂停。',feedback,isActive);})); + panel.querySelector('#order-rule-pause').onclick=()=>window.PageLifecycle.guard(()=>pauseCurrent()); + } + if(operator)panel.querySelector('#order-rule-preview').onclick=event=>action(event.currentTarget,async()=>{ + if(saving||!form.reportValidity())return;const request=++trialRevision,evidence=sources.find(a=>a.id===source.value);let sample; + if(!evidence?.sampleId){try{sample=JSON.parse(panel.querySelector('#order-rule-sample').value);}catch{throw Error('请选择样本,或在高级选项中提供有效的 JSON 对象。');}if(!sample||typeof sample!=='object'||Array.isArray(sample))throw Error('样本必须是 JSON 对象。');const title=panel.querySelector('#order-rule-title').value;if(title.trim())sample.title=title;} + const body={version:rule.version,...(admin?{draft:read()}:{}),...(evidence?.sampleId?{sampleId:evidence.sampleId}:{sample})}; + let result;try{result=await api('/order-rules/rules/'+encodeURIComponent(rule.id)+'/trial',body);}catch(error){if(owned()&&request===trialRevision)throw error;return;} + if(!owned()||request!==trialRevision)return;panel.querySelector('#order-rule-preview-result').innerHTML=window.OrderRulePreview.result(result,{esc,demo:sample?.demo===true}); + }); + function drawList(){ + const filtered=data.rules.filter(r=>(r.name+' '+r.categoryId).toLocaleLowerCase().includes(query.toLocaleLowerCase())&&(filter==='all'||filter==='needs'&&r.validationIssues?.length||filter==='draft'&&r.hasDraft||filter==='published'&&r.status==='enabled'||filter==='paused'&&r.status==='paused')); + panel.querySelector('#rule-category-list').innerHTML=filtered.map(r=>``).join('')||'

没有符合条件的类别,请调整搜索或筛选。

'; + panel.querySelectorAll('[data-rule-id]').forEach(button=>button.onclick=()=>{if(button.dataset.ruleId===selectedId)return;window.PageLifecycle.guard(()=>{dirty=false;selectedId=button.dataset.ruleId;draw();});}); + } + const search=panel.querySelector('#rule-category-search'),state=panel.querySelector('#rule-category-filter');state.value=filter;search.oninput=()=>{query=search.value;drawList();};state.onchange=()=>{filter=state.value;drawList();};drawList(); + const directory=panel.querySelector('#rule-category-list'),active=directory.querySelector('[aria-current]');if(active){const row=active.getBoundingClientRect(),list=directory.getBoundingClientRect();directory.scrollTop+=row.top-list.top-(directory.clientHeight-row.height)/2;} } - - container.querySelector('#order-rule-refresh').onclick=e=>window.PageLifecycle.guard(()=>action(e.currentTarget,reload)); - window.PageLifecycle?.onDispose(()=>{revision++;controller?.dispose?.();}); - await reload(); + container.querySelector('#order-rule-refresh').onclick=event=>window.PageLifecycle.guard(()=>action(event.currentTarget,()=>refreshCurrent())); + window.PageLifecycle.onDispose(()=>{revision++;trialRevision++;controller?.dispose?.();unregister?.();});await reload(); } window.OrderRuleViews={configure:helpers=>({api,esc,formatDate,notify,user}=helpers),render}; })();