diff --git a/docs/dacli/2/v13-coverage-report.md b/docs/dacli/2/v13-coverage-report.md new file mode 100644 index 0000000..3baddec --- /dev/null +++ b/docs/dacli/2/v13-coverage-report.md @@ -0,0 +1,122 @@ +# v13 form 覆盖率验收报告 + +- **生成时间**: Fri Jun 12 00:01:49 CST 2026 +- **baseline 根目录**: `/home/ubuntu/ccWorkDir/baseline` +- **scanner**: `FormCoverageValidatorTest` (v13 Task 1.21) +- **已注册 builder 数**: 29 (28 FieldBuilder + 1 SubTable) + +## 1. 总览 + +| 指标 | 数值 | +|------|------| +| form 总数 | 40 | +| developSystem forms | 20 | +| workSystem forms | 20 | +| 含字段的 form 数 (fields>0) | 24 | +| 工作流 forms (含 flowTemplateJson) | 0 | +| formItems 字段总数 | 302 | +| columnList 列总数 | 118 | +| 已注册 jnpfKey 数 | 29 | +| baseline 用到的 jnpfKey 数 (去重) | 14 | +| 未注册 jnpfKey (去重) | 7 | +| 未注册字段出现次数 | 41 | +| 覆盖率 | 90% | + +## 2. jnpfKey 全局分布 (按出现次数倒序) + +| # | jnpfKey | 出现次数 | 状态 | +|---|---------|----------|------| +| 1 | `input` | 125 | 已注册 | +| 2 | `select` | 89 | **未注册** | +| 3 | `datePicker` | 59 | 已注册 | +| 4 | `textarea` | 48 | 已注册 | +| 5 | `userSelect` | 30 | **未注册** | +| 6 | `groupTitle` | 29 | **未注册** | +| 7 | `organizeSelect` | 14 | 已注册 | +| 8 | `uploadFile` | 11 | 已注册 | +| 9 | `radio` | 4 | **未注册** | +| 10 | `inputNumber` | 3 | 已注册 | +| 11 | `table` | 3 | 已注册 | +| 12 | `divider` | 3 | **未注册** | +| 13 | `tableGrid` | 1 | **未注册** | +| 14 | `cascader` | 1 | **未注册** | + +## 3. 未注册 jnpfKey 清单 (Phase 1.22+ 打磨对象) + +| # | jnpfKey | 出现次数 | 涉及 form (前 3) | +|---|---------|----------|------------------| +| 1 | `userSelect` | 15 | 833729146378002309(入职申请.副本e84ff), 833722857270812549(事件管理.副本6228e), 833723220895997829(事件管理.副本11557) | +| 2 | `select` | 12 | 831608797251244549(学生信息表), 831820624740488517(连接器注册), 833722857270812549(事件管理.副本6228e) | +| 3 | `groupTitle` | 8 | 833722857270812549(事件管理.副本6228e), 833723220895997829(事件管理.副本11557), 833724748268576645(事件管理.副本128a8) | +| 4 | `divider` | 3 | 833729146378002309(入职申请.副本e84ff), 624163990351643525(入职申请), 833729015356333957(入职申请.副本550e5) | +| 5 | `tableGrid` | 1 | 834087478246777157(fzbh_子表支持测试) | +| 6 | `cascader` | 1 | 834087478246777157(fzbh_子表支持测试) | +| 7 | `radio` | 1 | 834154677103763781(任务清单v6) | + +## 4. form 维度统计 (按 app 分组) + +### 4.1 developSystem (20 forms) + +| formId | formName | fields | columns | uniqueKeys | unsupported | flow | +|--------|----------|--------|---------|------------|-------------|------| +| 831820624740488517 | 连接器注册 | 16 | 0 | 3 | 1 | N | +| 831608797251244549 | 学生信息表 | 5 | 0 | 4 | 1 | N | +| 833765095954718789 | 主子表测试A.副本97ba7 | 3 | 1 | 2 | 0 | N | +| 833737463619919749 | 主子表测试A | 3 | 1 | 2 | 0 | N | +| 833736669482983301 | test_parent_child | 2 | 1 | 1 | 0 | N | +| 834159037896466757 | 任务清单v7v | 1 | 1 | 1 | 0 | N | +| 831600958604579269 | 订单管理 | 0 | 0 | 0 | 0 | N | +| 831600951327461829 | 市场准入配置 | 0 | 0 | 0 | 0 | N | +| 831600776244629957 | 数据导入配置 | 0 | 0 | 0 | 0 | N | +| 831600966817026501 | 应用安全检测 | 0 | 0 | 0 | 0 | N | +| 831600844133634501 | 日志查询统计 | 0 | 0 | 0 | 0 | N | +| 831600855152071109 | 安全威胁检测 | 0 | 0 | 0 | 0 | N | +| 831600847761707461 | 预警规则配置 | 0 | 0 | 0 | 0 | N | +| 831600955039420869 | 价格策略配置 | 0 | 0 | 0 | 0 | N | +| 834217152004235589 | v9_wt1 | 0 | 0 | 0 | 0 | N | +| 831600962312344005 | 发票管理 | 0 | 0 | 0 | 0 | N | +| 831600780417962437 | 数据导出配置 | 0 | 0 | 0 | 0 | N | +| 831600840488784325 | 日志归档策略 | 0 | 0 | 0 | 0 | N | +| 831600851633050053 | 预警记录 | 0 | 0 | 0 | 0 | N | +| 831606573984911813 | 测试表单_dev | 0 | 0 | 0 | 0 | N | + +### 4.2 workSystem (20 forms) + +| formId | formName | fields | columns | uniqueKeys | unsupported | flow | +|--------|----------|--------|---------|------------|-------------|------| +| 833722857270812549 | 事件管理.副本6228e | 29 | 6 | 7 | 3 | N | +| 833723220895997829 | 事件管理.副本11557 | 29 | 6 | 7 | 3 | N | +| 833724748268576645 | 事件管理.副本128a8 | 29 | 6 | 7 | 3 | N | +| 833721891595231109 | 事件管理.副本1937f | 29 | 6 | 7 | 3 | N | +| 833723449187770245 | 事件管理.副本9629b | 29 | 6 | 7 | 3 | N | +| 833723152176521093 | 事件管理.副本6d6da | 29 | 6 | 7 | 3 | N | +| 833722442491895685 | 事件管理.副本306cc | 29 | 6 | 7 | 3 | N | +| 833729146378002309 | 入职申请.副本e84ff | 10 | 9 | 6 | 2 | N | +| 624163990351643525 | 入职申请 | 10 | 9 | 6 | 2 | N | +| 833729015356333957 | 入职申请.副本550e5 | 10 | 9 | 6 | 2 | N | +| 623417538411233285 | 离职交接表 | 8 | 7 | 7 | 2 | N | +| 624164673918337925 | 员工培训 | 7 | 7 | 6 | 2 | N | +| 623425065425305605 | 劳动合同续签 | 6 | 6 | 5 | 1 | N | +| 623183958128984261 | 离职员工表 | 6 | 6 | 5 | 1 | N | +| 834154677103763781 | 任务清单v6 | 6 | 6 | 5 | 2 | N | +| 834089186540659013 | xzqhld_浏览器E2E测试 | 3 | 3 | 1 | 1 | N | +| 834087478246777157 | fzbh_子表支持测试 | 2 | 9 | 8 | 3 | N | +| 834154571050787141 | v6测试4 | 1 | 1 | 1 | 0 | N | +| 831559154425401157 | curl_test | 0 | 0 | 0 | 0 | N | +| 833726934956384133 | curl_test.副本bd3c0 | 0 | 0 | 0 | 0 | N | + +## 5. 验收结论 + +- **部分覆盖**: 40 form 中含 41 处 jnpfKey 未注册, 覆盖率 90% +- **未注册 jnpfKey 数量**: 7 (去重) +- **dev 未注册次数**: 2 +- **work 未注册次数**: 39 +- **Phase 1.22+ 打磨对象**: 见第 3 节清单 ([select, divider, userSelect, groupTitle, tableGrid, cascader, radio]) + +--- + +**说明**: + +- 覆盖率 = (formItems + columnList - unsupported) / (formItems + columnList). +- 28/29 form 在 developSystem 仅有 4 个有字段 (其余为系统配置/空模板), 15/20 form 在 workSystem 有字段. +- 旧版 form (developSystem 部分) 仅含 `__config__.tag` 无 `jnpfKey`, FormReverseDebugger 已支持从 `tag` 提取. diff --git a/scripts/v13-coverage-check.sh b/scripts/v13-coverage-check.sh new file mode 100755 index 0000000..5eb48aa --- /dev/null +++ b/scripts/v13-coverage-check.sh @@ -0,0 +1,14 @@ +#!/bin/bash +# v13 form 0 误差验收 (Task 1.21) +# 跑 FormCoverageValidatorTest 生成覆盖率报告 +set -e +cd /home/ubuntu/ccWorkDir/.worktrees/v13-f1-form/ssw-dacli + +mvn test -Dtest='FormCoverageValidatorTest' -q 2>&1 | grep -E "developSystem|workSystem|未注册 jnpfKey|^ " | head -60 + +# 复制到 docs/dacli/2/ +mkdir -p ../docs/dacli/2/ +cp target/baseline-dump/v13-coverage-report.md ../docs/dacli/2/v13-coverage-report.md + +echo "==== 报告已生成: docs/dacli/2/v13-coverage-report.md ====" +ls -la ../docs/dacli/2/v13-coverage-report.md diff --git a/ssw-dacli/src/main/java/ssw/dacli/form/builder/reverse/FormReverseDebugger.java b/ssw-dacli/src/main/java/ssw/dacli/form/builder/reverse/FormReverseDebugger.java index 45fc7fe..13c7d30 100644 --- a/ssw-dacli/src/main/java/ssw/dacli/form/builder/reverse/FormReverseDebugger.java +++ b/ssw-dacli/src/main/java/ssw/dacli/form/builder/reverse/FormReverseDebugger.java @@ -60,12 +60,24 @@ public class FormReverseDebugger { /** * 读 form JSON 文件并分析. * - *
支持两种输入: + *
支持三种输入: *
注: 旧版 form (developSystem 部分) formData.fields[].__config__ 仅有 + * {@code tag} (如 "input"), 无 {@code jnpfKey} — 这种情况读 tag 作为 jnpfKey. + * + *
对于 envelope 格式, 同时扫描: + *
tag 名空间转换: 旧版 form 的 tag 形如 "input"/"inputNumber"/"select", + * 与 v13 FieldBuilder 注册的 jnpfKey 一致; 但部分 tag 用 "JnpfInput" / "JnpfSelect" + * (PascalCase) — 这种情况做 lower-case 转换. */ private String extractJnpfKey(JsonNode item) { if (item == null) return null; JsonNode cfg = item.get("__config__"); - if (cfg != null && cfg.has("jnpfKey")) { + if (cfg != null && cfg.has("jnpfKey") && !cfg.get("jnpfKey").isNull()) { return cfg.get("jnpfKey").asText(); } - if (item.has("jnpfKey")) { + if (cfg != null && cfg.has("tag") && !cfg.get("tag").isNull()) { + String tag = cfg.get("tag").asText(); + // JnpfInput → input; select → select (原样) + if (tag.startsWith("Jnpf") && tag.length() > 4) { + tag = tag.substring(4); + // 第一个字符小写 + tag = Character.toLowerCase(tag.charAt(0)) + tag.substring(1); + } + return tag; + } + if (item.has("jnpfKey") && !item.get("jnpfKey").isNull()) { return item.get("jnpfKey").asText(); } return null; diff --git a/ssw-dacli/src/test/java/ssw/dacli/form/builder/reverse/FormCoverageValidatorTest.java b/ssw-dacli/src/test/java/ssw/dacli/form/builder/reverse/FormCoverageValidatorTest.java new file mode 100644 index 0000000..c11757a --- /dev/null +++ b/ssw-dacli/src/test/java/ssw/dacli/form/builder/reverse/FormCoverageValidatorTest.java @@ -0,0 +1,333 @@ +package ssw.dacli.form.builder.reverse; + +import ssw.dacli.form.builder.FieldBuilderFactory; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; +import java.io.IOException; +import java.io.PrintWriter; +import java.nio.charset.StandardCharsets; +import java.nio.file.*; +import java.util.*; +import java.util.stream.Collectors; + +/** + * v13 Task 1.21 — 35 form 0 误差验收 (40 baseline form 反向覆盖率验证). + * + *
用 {@link FormReverseDebugger} 扫描 baseline/{developSystem,workSystem}/form/*.json, + * 收集 jnpfKey 分布, 跟 {@link FieldBuilderFactory#registeredKeys()} 比对, 输出 + * 未打磨 jnpfKey 清单 + 覆盖率报告. + * + *
4 个 @Test: + *
Test 不强求 PASS — 关键产物是覆盖率报告.
+ */
+public class FormCoverageValidatorTest {
+
+ private static final String BASELINE_ROOT = "/home/ubuntu/ccWorkDir/baseline";
+ private static final String REPORT_PATH = "target/baseline-dump/v13-coverage-report.md";
+
+ private static final ObjectMapper M = new ObjectMapper();
+
+ /** 累计所有 form 的 jnpfKey 分布 (跨 developSystem + workSystem) */
+ private final Map