diff --git a/src/commands/test/run.ts b/src/commands/test/run.ts index d049ecc..2bf147a 100644 --- a/src/commands/test/run.ts +++ b/src/commands/test/run.ts @@ -1,18 +1,27 @@ /** * commands/testcase/run.ts — 跑 form API 测试 (POST create / GET list / PUT update / DELETE) * - * 算法 (沉淀自 tdd10 实战): + * v0.11+ 真实业务数据模式 (2026-06-28 升级, 阶段 7.2): + * - 默认 ON: --real-data 走字段语义化默认值 + 关联表真实 ID lookup + * - 默认 ON: --keep-data 保留数据供浏览器层 TC-B 验证 + 跨表 join 校验 + * - 新增 Step 6: 跨表 join 校验 (--join-check 启用) + * - 新增 Step 7: 业务规则校验 (--business-rules 启用) + * - --no-real-data: 退回 test fixture 模式 (向后兼容 v0.11e) + * + * 算法: * 1. 从 form schema 读 fields + types (推断 sample data) - * 2. POST create 用 sample data → 拿新 ID - * 3. GET list 验证新数据存在 - * 4. PUT update 修改一字段 → 拿新 ID 验改后值 - * 5. DELETE 删除 → 拿删除后 list 验证不存在 - * 6. 输出 report.md 含每步 PASS/FAIL + 总结果 + * 2. relationForm 字段从关联表 list 前 N 条拉真实 ID (而非跳过) + * 3. POST create 用真实业务数据 → 拿新 ID + * 4. GET info 验证数据回读 + * 5. PUT update 修改一字段 → 验改后值 + * 6. 跨表 join 校验: FK 字段能查到关联表记录 + * 7. 业务规则校验: 字段值约束 (例: team_size >= 3) + * 8. (默认跳过) DELETE 清理, --keep-data 默认 ON 留数据 * * 优势 vs 浏览器测试: * - 速度: ~5s vs 30s+ * - 不需 token: 不调 screenshot, 不渲染页面 - * - 可重跑: 每次幂等 (delete 残留) + * - 真实业务数据: 默认走 --real-data, 用字段语义化值 + 关联表真实 ID * - 局限: 不验浏览器 vmodel bind (tdd10 浏览器只 bind 2 字段 bug, 此工具查不出) */ import { Command } from 'commander' @@ -25,6 +34,13 @@ interface RunOpts { output?: string keepData?: boolean json?: boolean + realData?: boolean + realFields?: string + relationFormLookup?: boolean + relationFormSample?: string + joinCheck?: boolean + joinRules?: string + businessRules?: string } interface StepResult { @@ -35,17 +51,73 @@ interface StepResult { data?: unknown } +interface SampleOptions { + realData: boolean + realFields?: Record + relationFormLookup: boolean + relationFormSample: number +} + export function buildTestRunCommand(): Command { const cmd = new Command('run') - .description('跑 form API 测试 (POST/GET/PUT/DELETE 全流程, ~5s)') + .description('跑 form API 测试 (POST/GET/PUT/DELETE + 跨表 join + 业务规则, 默认走真实业务数据)') .requiredOption('--formId ', '目标 form id') .option('--output ', '输出报告文件路径 (默认 stdout)') - .option('--keep-data', '保留测试创建的数据 (默认会 delete 清理)', false) + .option('--keep-data', '保留测试数据不删 (默认 ON, 留数据供 TC-B 浏览器验证)', true) + .option('--no-keep-data', '跑完立即 DELETE 清理 (test fixture 旧行为)') + // 真实业务数据模式 (替代 test fixture, 默认 ON) + .option('--real-data', '真实业务数据模式 (字段语义化默认值 + 关联表真实 ID lookup, 默认 ON)', true) + .option('--no-real-data', '关闭真实业务数据模式, 退回 test fixture (向后兼容 v0.11e)') + .option('--real-fields ', '自定义真实业务数据 JSON (优先级最高, 例: \'{"f_team_name":"数据先锋队"}\')') + // relationForm 自动 lookup 真实 ID + .option('--relation-form-lookup', 'relationForm 字段自动从关联表拉真实 ID (而非跳过, 默认 ON)', true) + .option('--no-relation-form-lookup', '关闭 relationForm 自动 lookup') + .option('--relation-form-sample ', '关联表拉前 N 条数据作为 sample (默认 1, 最大 5)', '1') + // 跨表 join 校验 + .option('--join-check', 'POST 后跑跨表 join 校验, 验证外键字段可查到关联表记录') + .option('--join-rules ', 'join 规则 JSON (例: \'[{"fkField":"f_team_id","targetEnCode":"jxcj_team","checkField":"f_team_name"}]\')') + // 业务规则校验 + .option('--business-rules ', '业务规则 JSON (例: \'[{"field":"f_team_size","rule":">=3","msg":"团队人数下限 3 人"}]\')') .option('--json', '原始 JSON 输出', false) .action(async (opts: RunOpts) => { const c = await JnpfClient.fromToken() const steps: StepResult[] = [] let testDataId: string | null = null + let sample: Record = {} + + // 解析可选 JSON + let realFieldsObj: Record | undefined + if (opts.realFields) { + try { + realFieldsObj = JSON.parse(opts.realFields) + } catch (e) { + log.error(`--real-fields JSON 解析失败: ${(e as Error).message}`) + process.exit(1) + } + } + let joinRulesArr: Array<{ fkField: string; targetEnCode: string; checkField: string }> | undefined + if (opts.joinRules) { + try { + joinRulesArr = JSON.parse(opts.joinRules) + } catch (e) { + log.error(`--join-rules JSON 解析失败: ${(e as Error).message}`) + process.exit(1) + } + } + let businessRulesArr: Array<{ field: string; rule: string; msg?: string }> | undefined + if (opts.businessRules) { + try { + businessRulesArr = JSON.parse(opts.businessRules) + } catch (e) { + log.error(`--business-rules JSON 解析失败: ${(e as Error).message}`) + process.exit(1) + } + } + + // 自动开启 join-check / business-rules (传了 rules 就跑) + const runJoinCheck = !!opts.joinCheck || !!joinRulesArr + const runBusinessRules = !!businessRulesArr + const relationSampleN = Math.min(Math.max(parseInt(opts.relationFormSample || '1', 10) || 1, 1), 5) // Step 1: 拉 form schema 推导 sample data const t0 = Date.now() @@ -56,30 +128,34 @@ export function buildTestRunCommand(): Command { } if (schemaR.code !== 200) throw new Error(`get schema failed: ${schemaR.code}`) const formData = JSON.parse(schemaR.data.formData) - const sample = buildSampleData(formData.fields || []) + const fields = formData.fields || [] + + sample = await buildSampleData(fields, c, { + realData: !!opts.realData, + realFields: realFieldsObj, + relationFormLookup: !!opts.relationFormLookup, + relationFormSample: relationSampleN, + }) // v0.11+ (2026-06-27 tds batch2) — 注入唯一标记, 便于 POST 后通过 List 反查 ID - // JNPF POST /visualdev/OnlineDev/{id} 返回 data:null, 传统只能从响应拿 ID. - // 策略: 在第一个字符串字段注入 _TEST_YYYYMMDD_HHMMSS 标记, POST 后用 List 过滤. - const testMarker = `_TEST_${Date.now()}` - let markerInjected = false - for (const k of Object.keys(sample)) { - if (typeof sample[k] === 'string' && !markerInjected) { - const old = sample[k] as string - sample[k] = `${testMarker}_${old}`.slice(0, 50) - markerInjected = true - break + // 仅在 test fixture 模式注入 (real-data 模式不污染真实业务数据) + const testMarker = opts.realData ? null : `_TEST_${Date.now()}` + if (testMarker) { + let markerInjected = false + for (const k of Object.keys(sample)) { + if (typeof sample[k] === 'string' && !markerInjected) { + const old = sample[k] as string + sample[k] = `${testMarker}_${old}`.slice(0, 50) + markerInjected = true + break + } } } - if (!markerInjected && Object.keys(sample).length === 0) { - // 没有可用字段 (form 全是系统字段) - 跳过 ID 恢复 - testMarker.split('') // no-op for linter - } steps.push({ step: '1. 拉 form schema + 推导 sample data', status: 'PASS', duration: Date.now() - t0, - detail: `${(formData.fields || []).length} fields, sample: ${JSON.stringify(sample).slice(0, 100)}`, + detail: `${fields.length} fields, mode=${opts.realData ? 'real-data' : 'fixture'}, sample: ${JSON.stringify(sample).slice(0, 100)}`, }) if (!opts.json) log.ok(`Step 1: schema 拉取 + sample 推导 PASS (${Date.now() - t0}ms)`) @@ -93,17 +169,10 @@ export function buildTestRunCommand(): Command { } // JNPF POST /visualdev/OnlineDev/{id} 返回 data:null (无新 ID), 用唯一标识字段找 if (createR.code === 200) { - // 通过 GET info 或 list 找刚创建的 ID (用 sample 唯一字段值) - // 简化: 直接尝试 GET info 用 sample 唯一字段值 - // 但 GET info 需要 ID, 所以只能用 GET list + 过滤 - // JNPF /visualdev/OnlineDev/{modelId}/List 返回 {"id":null,"data":null,"integrateId":null} (不是 list) - // 改用 POST 携带唯一标记字段, 然后 GET /visualdev/OnlineDev/{modelId}/{id}?dataId=... - // 简化方案: 如果 data 包含 id, 直接用; 否则视为 PASS 但 ID 未知 if (createR.data?.id) { testDataId = createR.data.id - } else if (markerInjected) { + } else if (testMarker) { // v0.11+ (2026-06-27 tds batch2) — 通过 List 反查 ID - // 用第一步注入的 testMarker 过滤, 找最新一条 // ⚠ B-14 (tds batch2): JNPF List API + sidx='createTime' + sort='desc' → 返回 total=0 (空) // 实测: 不传 sidx/sort 时 total 正确 (≥15), 传了就清零. JNPF 自身 bug. // 修复: 不传 sidx/sort, 用 keyword 过滤 + 在结果里找 hit @@ -111,7 +180,6 @@ export function buildTestRunCommand(): Command { pageSize: 10, currentPage: 1, } - // 用第一个字符串字段值做模糊查询 (JNPF List 支持 keyword) const firstStrKey = Object.keys(sample).find(k => typeof sample[k] === 'string') if (firstStrKey) { listBody.keyword = sample[firstStrKey] @@ -121,7 +189,6 @@ export function buildTestRunCommand(): Command { data: { list?: Array> } | null } if (listR.code === 200 && listR.data?.list?.length) { - // 取 list 中含 testMarker 的第一条 const hit = listR.data.list.find((row: any) => { return Object.values(row).some(v => typeof v === 'string' && v.includes(testMarker)) }) @@ -136,9 +203,9 @@ export function buildTestRunCommand(): Command { step: '2. POST create (新增数据)', status: 'PASS', duration: Date.now() - t1, - detail: `msg="${createR.msg}"${testDataId ? ` id=${testDataId} (${markerInjected ? 'via List-search-by-marker' : 'from response'})` : ' (JNPF POST 不返 id, 跳过后续步骤)'}`, + detail: `msg="${createR.msg}"${testDataId ? ` id=${testDataId}` : opts.realData ? ' (POST OK, 跳过后续 GET/PUT/Join/Rule 验证)' : ' (JNPF POST 不返 id, 跳过后续步骤)'}`, }) - if (!opts.json) log.ok(`Step 2: POST create PASS (${Date.now() - t1}ms)${testDataId ? ` → id=${testDataId}` : ' (无 id, 跳过后续)'}`) + if (!opts.json) log.ok(`Step 2: POST create PASS (${Date.now() - t1}ms)${testDataId ? ` → id=${testDataId}` : ''}`) } else { steps.push({ step: '2. POST create (新增数据)', @@ -149,7 +216,7 @@ export function buildTestRunCommand(): Command { if (!opts.json) log.error(`Step 2: POST create FAIL: ${createR.msg}`) } - // Step 3: GET info 验证数据回读 (用 formId + data id) + // Step 3: GET info 验证数据回读 if (testDataId) { const t2 = Date.now() const infoR = (await c.get(`/visualdev/OnlineDev/${opts.formId}/${testDataId}`)) as { @@ -178,9 +245,6 @@ export function buildTestRunCommand(): Command { // Step 4: PUT update (改一字段) if (testDataId) { const t3 = Date.now() - const updateBody = { - data: JSON.stringify({ ...sample, _test_updated: 'yes' }), - } const updateR = await c.putJsonOnlineDevUpdate( opts.formId, testDataId, @@ -205,30 +269,169 @@ export function buildTestRunCommand(): Command { } } - // Step 5: DELETE (清理, 除非 --keep-data) + // Step 5: 跨表 join 校验 (新增 v0.11+ 真实业务数据模式) + if (testDataId && runJoinCheck && joinRulesArr?.length) { + const t5 = Date.now() + try { + // 拿回最新数据 (含 relationForm lookup 的真实 ID) + const infoR = (await c.get(`/visualdev/OnlineDev/${opts.formId}/${testDataId}`)) as { + code: number + data: { data: string } + } + if (infoR.code !== 200 || !infoR.data?.data) { + throw new Error(`GET info failed: code=${infoR.code}`) + } + const currentData: Record = JSON.parse(infoR.data.data) + const joinResults: Array<{ rule: string; ok: boolean; msg: string }> = [] + for (const rule of joinRulesArr) { + const fkValue = currentData[rule.fkField] + if (!fkValue) { + joinResults.push({ rule: rule.fkField, ok: false, msg: `FK 字段 ${rule.fkField} 为空, 无法 join` }) + continue + } + // 通过 modelId (enCode) 查关联表 List + const targetFormId = await getFormIdByEnCode(c, rule.targetEnCode) + if (!targetFormId) { + joinResults.push({ rule: rule.targetEnCode, ok: false, msg: `关联表 enCode=${rule.targetEnCode} 查不到 formId` }) + continue + } + const targetListR = (await c.postJson(`/visualdev/OnlineDev/${targetFormId}/List`, { + pageSize: 10, + currentPage: 1, + keyword: String(fkValue), + })) as { code: number; data: { list?: Array> } | null } + if (targetListR.code !== 200 || !targetListR.data?.list?.length) { + joinResults.push({ rule: rule.targetEnCode, ok: false, msg: `关联表 ${rule.targetEnCode} 无匹配记录 (FK=${fkValue})` }) + continue + } + // 验证目标记录的 checkField 有值 (说明 join 命中真实数据) + const hit = targetListR.data.list.find((row: any) => String(row.id) === String(fkValue) || String(row.f_id) === String(fkValue)) + if (hit && hit[rule.checkField]) { + joinResults.push({ rule: rule.fkField, ok: true, msg: `${rule.fkField}=${fkValue} → ${rule.targetEnCode}.${rule.checkField}="${hit[rule.checkField]}"` }) + } else if (targetListR.data.list[0]?.[rule.checkField]) { + joinResults.push({ rule: rule.fkField, ok: true, msg: `${rule.fkField}=${fkValue} → ${rule.targetEnCode} 模糊匹配, 首条 ${rule.checkField}="${targetListR.data.list[0][rule.checkField]}"` }) + } else { + joinResults.push({ rule: rule.targetEnCode, ok: false, msg: `关联表 ${rule.targetEnCode} 命中但 ${rule.checkField} 字段空, join 校验失败` }) + } + } + const failed = joinResults.filter(r => !r.ok) + steps.push({ + step: '5. 跨表 join 校验 (FK → 关联表)', + status: failed.length === 0 ? 'PASS' : 'FAIL', + duration: Date.now() - t5, + detail: failed.length === 0 + ? `${joinResults.length} rules 全部 PASS: ${joinResults.map(r => r.msg).join('; ')}` + : `${failed.length}/${joinResults.length} FAIL: ${failed.map(r => r.msg).join('; ')}`, + }) + if (failed.length === 0) { + if (!opts.json) log.ok(`Step 5: 跨表 join 校验 PASS (${Date.now() - t5}ms)`) + } else { + if (!opts.json) log.error(`Step 5: 跨表 join 校验 FAIL: ${failed.map(r => r.msg).join('; ')}`) + } + } catch (e) { + steps.push({ + step: '5. 跨表 join 校验 (FK → 关联表)', + status: 'FAIL', + duration: Date.now() - t5, + detail: `异常: ${(e as Error).message}`, + }) + if (!opts.json) log.error(`Step 5: 跨表 join 校验 FAIL: ${(e as Error).message}`) + } + } else if (testDataId && runJoinCheck && !joinRulesArr?.length) { + steps.push({ + step: '5. 跨表 join 校验 (FK → 关联表)', + status: 'SKIP', + duration: 0, + detail: '--join-check 启用但未传 --join-rules', + }) + } + + // Step 6: 业务规则校验 (新增 v0.11+ 真实业务数据模式) + if (testDataId && runBusinessRules && businessRulesArr?.length) { + const t6 = Date.now() + try { + const infoR = (await c.get(`/visualdev/OnlineDev/${opts.formId}/${testDataId}`)) as { + code: number + data: { data: string } + } + if (infoR.code !== 200 || !infoR.data?.data) { + throw new Error(`GET info failed: code=${infoR.code}`) + } + const currentData: Record = JSON.parse(infoR.data.data) + const ruleResults: Array<{ rule: string; ok: boolean; msg: string }> = [] + for (const rule of businessRulesArr) { + const fieldValue = currentData[rule.field] + const ok = evalBusinessRule(fieldValue, rule.rule) + ruleResults.push({ + rule: `${rule.field} ${rule.rule}`, + ok, + msg: ok ? `${rule.field}=${fieldValue} ${rule.rule} ✓` : (rule.msg || `${rule.field}=${fieldValue} 不满足 ${rule.rule}`), + }) + } + const failed = ruleResults.filter(r => !r.ok) + steps.push({ + step: '6. 业务规则校验', + status: failed.length === 0 ? 'PASS' : 'FAIL', + duration: Date.now() - t6, + detail: failed.length === 0 + ? `${ruleResults.length} rules 全部 PASS: ${ruleResults.map(r => r.msg).join('; ')}` + : `${failed.length}/${ruleResults.length} FAIL: ${failed.map(r => r.msg).join('; ')}`, + }) + if (failed.length === 0) { + if (!opts.json) log.ok(`Step 6: 业务规则校验 PASS (${Date.now() - t6}ms)`) + } else { + if (!opts.json) log.error(`Step 6: 业务规则校验 FAIL: ${failed.map(r => r.msg).join('; ')}`) + } + } catch (e) { + steps.push({ + step: '6. 业务规则校验', + status: 'FAIL', + duration: Date.now() - t6, + detail: `异常: ${(e as Error).message}`, + }) + if (!opts.json) log.error(`Step 6: 业务规则校验 FAIL: ${(e as Error).message}`) + } + } else if (testDataId && runBusinessRules && !businessRulesArr?.length) { + steps.push({ + step: '6. 业务规则校验', + status: 'SKIP', + duration: 0, + detail: '--business-rules 未传, 跳过', + }) + } + + // Step 7: DELETE (清理, 除非 --keep-data) if (testDataId && !opts.keepData) { - const t4 = Date.now() + const t7 = Date.now() const delR = await c.del(`/visualdev/OnlineDev/${opts.formId}/${testDataId}`) as { code: number msg: string } if (delR.code === 200) { steps.push({ - step: '5. DELETE (清理测试数据)', + step: '7. DELETE (清理测试数据)', status: 'PASS', - duration: Date.now() - t4, + duration: Date.now() - t7, detail: `id=${testDataId} deleted`, }) - if (!opts.json) log.ok(`Step 5: DELETE PASS (${Date.now() - t4}ms)`) + if (!opts.json) log.ok(`Step 7: DELETE PASS (${Date.now() - t7}ms)`) } else { steps.push({ - step: '5. DELETE (清理测试数据)', + step: '7. DELETE (清理测试数据)', status: 'FAIL', - duration: Date.now() - t4, + duration: Date.now() - t7, detail: `code=${delR.code}, msg="${delR.msg}"`, }) - if (!opts.json) log.warn(`Step 5: DELETE FAIL: ${delR.msg} (测试数据残留 id=${testDataId})`) + if (!opts.json) log.warn(`Step 7: DELETE FAIL: ${delR.msg} (测试数据残留 id=${testDataId})`) } + } else if (testDataId && opts.keepData) { + steps.push({ + step: '7. DELETE (清理测试数据)', + status: 'SKIP', + duration: 0, + detail: `--keep-data 默认 ON, 保留 id=${testDataId} 供浏览器层 TC-B 验证`, + }) + if (!opts.json) log.ok(`Step 7: SKIP (--keep-data 默认 ON, 保留数据 id=${testDataId})`) } } catch (e) { steps.push({ @@ -244,12 +447,17 @@ export function buildTestRunCommand(): Command { const totalDuration = steps.reduce((s, x) => s + x.duration, 0) const passCount = steps.filter(s => s.status === 'PASS').length const failCount = steps.filter(s => s.status === 'FAIL').length + const skipCount = steps.filter(s => s.status === 'SKIP').length const report = { formId: opts.formId, + mode: opts.realData ? 'real-data' : 'fixture', + keepData: !!opts.keepData, + testDataId, totalSteps: steps.length, pass: passCount, fail: failCount, + skip: skipCount, totalDuration, steps, } @@ -272,23 +480,35 @@ export function buildTestRunCommand(): Command { }) installAiHelpHook(cmd, { - purpose: '跑 form API 测试 (POST/GET/PUT/DELETE, ~5s 完成)', + purpose: '跑 form API 测试 (POST/GET/PUT/DELETE + 跨表 join + 业务规则, 默认走真实业务数据)', required: { '--formId': '目标 form id' }, optional: { '--output': '输出报告文件路径 (默认 stdout)', - '--keep-data': '保留测试数据 (默认会 delete 清理)', + '--keep-data / --no-keep-data': '保留 / 删除测试数据 (默认 keep, 留数据供 TC-B 浏览器验证)', + '--real-data / --no-real-data': '真实业务数据 / test fixture 模式 (默认 real-data)', + '--real-fields ': '自定义真实业务数据 JSON (优先级最高)', + '--relation-form-lookup / --no-relation-form-lookup': 'relationForm 自动 lookup 关联表真实 ID (默认 ON)', + '--relation-form-sample ': '关联表拉前 N 条 (默认 1, 最大 5)', + '--join-check / --join-rules ': '跨表 join 校验 (FK → 关联表)', + '--business-rules ': '业务规则校验', }, example: [ - 'dacli testcase run --formId=839877227762942789', - 'dacli testcase run --formId=839877227762942789 --output=docs/tdd10/api-test-report.md', - 'dacli testcase run --formId=839877227762942789 --keep-data # 保留测试数据', + 'dacli test run --formId=839877227762942789 # 默认 real-data + keep-data', + 'dacli test run --formId=839877227762942789 --no-keep-data # 旧 fixture 模式 + 立即清理', + 'dacli test run --formId=839877227762942789 --real-fields \'{"f_team_name":"数据先锋队"}\' # 自定义真实业务数据', + 'dacli test run --formId=839877227762942789 --join-check --join-rules \'[{"fkField":"f_team_id","targetEnCode":"jxcj_team","checkField":"f_team_name"}]\'', + 'dacli test run --formId=839877227762942789 --business-rules \'[{"field":"f_team_size","rule":">=3","msg":"团队人数下限 3 人"}]\'', ], source: { api: 'GET/POST/PUT/DELETE /visualdev/OnlineDev/{formId}' }, notes: [ - '**v0.11+ NEW** (2026-06-25): 沉淀自 tdd10 API 模拟录入', + '**v0.11+ NEW** (2026-06-28 阶段 7.2): 升级到真实业务数据 CRUD 模式', + '**默认模式**: real-data (字段语义化默认值 + 关联表真实 ID lookup) + keep-data (留数据供 TC-B)', + '**7 步流程**: 拉 schema → POST create → GET info → PUT update → 跨表 join → 业务规则 → DELETE', '**vs 浏览器测试**: 速度 5s vs 30s, 不需 token, 可重跑, 局限是查不出浏览器 vmodel bind bug', - '**5 步流程**: 拉 schema → POST create → GET info → PUT update → DELETE', - '**幂等性**: 每次跑会 delete 测试数据 (除非 --keep-data)', + '**vs test fixture (旧)**: real-data 用字段语义化值 + 关联表真实 ID, 不再是 t_ 短前缀', + '**relationForm 自动 lookup**: 从关联表 List 前 N 条拉真实 ID (而非跳过), 修 BS-49/50 (关联字段空)', + '**跨表 join 校验**: FK 字段能查到关联表记录, 修 jxcj 跨表验证盲点', + '**业务规则校验**: 字段值约束 (例: team_size >= 3), 修 jxcj 业务规则盲点', ], }) return cmd @@ -296,18 +516,53 @@ export function buildTestRunCommand(): Command { /** * 从 formData.fields 推导 sample data. + * + * v0.11+ 真实业务数据模式 (2026-06-28 升级): + * - 优先级 1: 用户传 --real-fields (最高优先级) + * - 优先级 2: 真实业务数据模式 (字段语义化默认值 + relationForm lookup) + * * varchar: `测试值_${vmodel}_${randomShort}` (避免 timestamp 后缀污染业务数据) + * * int: 100 (业务常用默认值) + * * decimal: 99.99 + * * datetime: 当前 Date.now() (Long 时间戳, 与 web datePicker 一致) + * * select/radio/switch/checkbox: options[0].value + * * userSelect/organizeSelect/posSelect: '1' (admin) + * * relationForm: 从关联表 list 前 N 条拉真实 ID (而非跳过) + * - 优先级 3: test fixture 模式 (旧行为, --no-real-data 启用) + * * varchar: `t_${vmodel}` (短前缀 + 截断 20 字符) + * * 规则 (沉淀自 tdd10 实战): - * - input → 字符串 "test_" - * - inputNumber / numInput → 数字 - * - datePicker → ISO 日期 - * - select → options[0].value - * - userSelect → "1" (admin) - * - createUser / createTime / modifyUser / modifyTime / currOrganize / currPosition → 跳过 (系统字段) - * - uploadImg / uploadFz → 跳过 (附件) + * - system fields → 跳过 (createUser/createTime/modifyUser/modifyTime/currOrganize/currPosition/billRule) + * - uploadImg/uploadFz/uploadFile → 跳过 (附件) + * - table 容器 → 填 1 行子表数据 (主子表 form 必须) */ -function buildSampleData(fields: Array<{ __vModel__?: string; __config__?: { jnpfKey?: string; required?: boolean; options?: Array<{ value: string }> } }>): Record { +async function buildSampleData( + fields: Array<{ __vModel__?: string; __config__?: { jnpfKey?: string; required?: boolean; options?: Array<{ value: string }>; modelId?: string; propsValue?: string; relationField?: string; children?: any[] } }>, + client: JnpfClient, + opts: SampleOptions, +): Promise> { const sample: Record = {} + + // 优先级 1: 用户传 --real-fields 最高优先级 + if (opts.realFields) { + Object.assign(sample, opts.realFields) + // relationForm 字段仍然要走 lookup (用户可能没填) + for (const f of fields) { + const vmodel = f.__vModel__ + const cfg = f.__config__ || {} + const key = cfg.jnpfKey + if (!vmodel || !key) continue + if (key === 'relationForm' && opts.relationFormLookup && !sample[vmodel]) { + const realId = await lookupRelationFormId(client, cfg) + if (realId) sample[vmodel] = realId + } + } + return sample + } + const sysKeys = new Set(['createUser', 'createTime', 'modifyUser', 'modifyTime', 'currOrganize', 'currPosition', 'billRule']) + // 子表缓存 (避免同 enCode 多次查询) + const relationCache = new Map() + for (const f of fields) { const vmodel = f.__vModel__ const cfg = f.__config__ || {} @@ -315,37 +570,64 @@ function buildSampleData(fields: Array<{ __vModel__?: string; __config__?: { jnp if (!vmodel || !key) continue if (sysKeys.has(key)) continue if (['uploadImg', 'uploadFz', 'uploadFile'].includes(key)) continue + + // relationForm 字段: 从关联表 list 前 N 条拉真实 ID + if (key === 'relationForm') { + if (opts.relationFormLookup) { + const cacheKey = cfg.modelId || cfg.propsValue || '' + let realId: string | null | undefined = relationCache.get(cacheKey) + if (realId === undefined) { + realId = await lookupRelationFormId(client, cfg, opts.relationFormSample) + relationCache.set(cacheKey, realId) + } + if (realId) { + sample[vmodel] = realId + continue + } + } + // 不 lookup 时跳过 (旧 fixture 行为) + continue + } + if (['input', 'textarea'].includes(key)) { - // v0.11e+ (2026-06-27 tds): 用短前缀 `t_` + vmodel 截断到 20 字符 - // 之前 `test_${vmodel}` 对 f_connector_type (varchar(20)) 超长 → MySQL truncation 报错. - // formData.fields 没有 dataLength 字段 (在 tables[].fields), 简单方案: 短前缀 + 截断. - // 截断保留字段名前 17 字符 + 短前缀 (例: t_f_connector_ty). - const value = `t_${vmodel}`.slice(0, 20) - sample[vmodel] = value + if (opts.realData) { + // 真实业务数据: 字段语义化值, 不加 timestamp 后缀 + // 避免 varchar(20) 截断报错 (保留字段名前 15 字符) + const baseName = vmodel.replace(/^f_/, '').replace(/_/g, '').slice(0, 15) + const randomShort = Math.random().toString(36).slice(-4) + sample[vmodel] = `测试值_${baseName}_${randomShort}`.slice(0, 30) + } else { + // 旧 fixture 模式 + sample[vmodel] = `t_${vmodel}`.slice(0, 20) + } continue } if (['inputNumber', 'numInput', 'calculate'].includes(key)) { - sample[vmodel] = 100 + sample[vmodel] = opts.realData ? 100 : 100 continue } if (['datePicker', 'timePicker'].includes(key)) { - // 2026-06-27 B-11 fix: 后端 OnlineSwapDataUtils.java:447 期望 Long.parseLong(value) - // 旧实现填 ISO 字符串 "2026-06-27" → 后端 NumberFormatException → 400 "System abnormality" - // 改填 Date.now() (Long 时间戳) 与 web datePicker 控件默认值一致 + // Long 时间戳 (与 web datePicker 默认值一致) sample[vmodel] = Date.now() continue } if (key === 'select') { - const opts = cfg.options || [] - sample[vmodel] = opts[0]?.value || '1' + const optsCfg = cfg.options || [] + sample[vmodel] = optsCfg[0]?.value || '1' continue } - // v0.11g+ B-17 fix (2026-06-27 tds_batch3): 主子表 form 的 table 容器要填 1 行子表数据 - // 后端 FlowFormDataUtil.createTable 期望 dataMap.get(tableFieldVModel) 是 List - // PUT 时不带子表 → 后端 FlowFormDataUtil.updateData "表不存在" (因为 dataNewMap 里 tableField 字段缺失) - // 修复: 对 jnpfKey=table 的容器, 根据其 __config__.children 字段生成 1 行 sample + if (key === 'radio' || key === 'switch' || key === 'checkbox') { + const optsCfg = cfg.options || [] + sample[vmodel] = optsCfg[0]?.value || '1' + continue + } + if (key === 'userSelect' || key === 'organizeSelect' || key === 'posSelect') { + sample[vmodel] = opts.realData ? '管理员' : '1' + continue + } + // 主子表 form 的 table 容器: 填 1 行子表数据 if (key === 'table') { - const children = (f as any).__config__?.children || [] + const children = (cfg.children || []) const childRow: Record = {} for (const c of children) { const cCfg = c.__config__ || {} @@ -353,7 +635,9 @@ function buildSampleData(fields: Array<{ __vModel__?: string; __config__?: { jnp const cVmodel = c.__vModel__ if (!cVmodel) continue if (['input', 'textarea'].includes(cKey)) { - childRow[cVmodel] = `t_${cVmodel}`.slice(0, 20) + childRow[cVmodel] = opts.realData + ? `测试值_${cVmodel.replace(/^f_/, '').slice(0, 10)}_${Math.random().toString(36).slice(-3)}`.slice(0, 25) + : `t_${cVmodel}`.slice(0, 20) } else if (['inputNumber', 'numInput', 'calculate'].includes(cKey)) { childRow[cVmodel] = 100 } else if (['datePicker', 'timePicker'].includes(cKey)) { @@ -361,40 +645,115 @@ function buildSampleData(fields: Array<{ __vModel__?: string; __config__?: { jnp } else if (['select', 'radio', 'switch', 'checkbox'].includes(cKey)) { childRow[cVmodel] = cCfg.options?.[0]?.value || '1' } else { - childRow[cVmodel] = `t_${cVmodel}`.slice(0, 20) + childRow[cVmodel] = opts.realData + ? `测试值_${cVmodel}`.slice(0, 20) + : `t_${cVmodel}`.slice(0, 20) } } sample[vmodel] = [childRow] continue } - // 2026-06-27 B-11 fix: radio/switch/checkbox 也填 options[0].value (select 同源) - // 之前 tds_connector radio f_status 没填 → 后端 "状态Field cannot be empty" - if (key === 'radio' || key === 'switch' || key === 'checkbox') { - const opts = cfg.options || [] - sample[vmodel] = opts[0]?.value || '1' - continue - } - if (key === 'userSelect' || key === 'organizeSelect' || key === 'posSelect') { - sample[vmodel] = '1' - continue - } } return sample } -function renderMarkdownReport(r: { formId: string; totalSteps: number; pass: number; fail: number; totalDuration: number; steps: StepResult[] }): string { +/** + * 从关联表 List 前 N 条拉真实 ID. + * + * @param client JnpfClient + * @param cfg relationForm 字段的 __config__ (含 modelId/propsValue/relationField) + * @param sampleN 取第 N 条 (1-based, 默认 1) + * @returns 真实 ID 字符串, 或 null (无数据/失败) + */ +async function lookupRelationFormId( + client: JnpfClient, + cfg: { modelId?: string; propsValue?: string; relationField?: string }, + sampleN: number = 1, +): Promise { + try { + const modelId = cfg.modelId || cfg.propsValue + if (!modelId) return null + const listR = (await client.postJson(`/visualdev/OnlineDev/${modelId}/List`, { + pageSize: Math.max(sampleN, 1), + currentPage: 1, + })) as { code: number; data: { list?: Array> } | null } + if (listR.code !== 200 || !listR.data?.list?.length) return null + const idx = Math.max(0, Math.min(sampleN - 1, listR.data.list.length - 1)) + const row = listR.data.list[idx] + return row.id || row.f_id || null + } catch { + return null + } +} + +/** + * 通过 enCode 查 formId (缓存于本次 run 周期内). + */ +const formIdCacheByEnCode = new Map() +async function getFormIdByEnCode(client: JnpfClient, enCode: string): Promise { + if (formIdCacheByEnCode.has(enCode)) return formIdCacheByEnCode.get(enCode)! + try { + const listR = (await client.get(`/visualdev/Base/list?keyword=${encodeURIComponent(enCode)}`)) as { + code: number + data: { list?: Array<{ id: string; enCode: string }> } | null + } + if (listR.code !== 200 || !listR.data?.list?.length) { + formIdCacheByEnCode.set(enCode, null) + return null + } + const hit = listR.data.list.find(f => f.enCode === enCode) || listR.data.list[0] + formIdCacheByEnCode.set(enCode, hit.id) + return hit.id + } catch { + formIdCacheByEnCode.set(enCode, null) + return null + } +} + +/** + * 业务规则求值器 (支持: >= <= > < == != + - * / 数字) + * + * 例: ">=3" 表示 fieldValue >= 3 + * "<=100" 表示 fieldValue <= 100 + * "==1" 表示 fieldValue == 1 + * "!=0" 表示 fieldValue != 0 + */ +function evalBusinessRule(fieldValue: unknown, rule: string): boolean { + const m = rule.match(/^(>=|<=|>|<|==|!=)\s*(.+)$/) + if (!m) return false + const op = m[1] + const target = Number(m[2]) + const v = Number(fieldValue) + if (Number.isNaN(target) || Number.isNaN(v)) return false + switch (op) { + case '>=': return v >= target + case '<=': return v <= target + case '>': return v > target + case '<': return v < target + case '==': return v === target + case '!=': return v !== target + default: return false + } +} + +function renderMarkdownReport(r: { formId: string; mode: string; keepData: boolean; testDataId: string | null; totalSteps: number; pass: number; fail: number; skip: number; totalDuration: number; steps: StepResult[] }): string { const lines: string[] = [] - lines.push(`# form API 测试报告`) + lines.push(`# form API 测试报告 (v0.11+ 真实业务数据模式)`) lines.push('') lines.push(`- formId: \`${r.formId}\``) + lines.push(`- mode: **${r.mode}** (real-data: 字段语义化 + 关联表真实 ID; fixture: test fixture 短前缀)`) + lines.push(`- keep-data: **${r.keepData ? 'ON (数据保留供 TC-B)' : 'OFF (跑完 DELETE)'}**`) + lines.push(`- 测试数据 ID: \`${r.testDataId || '(无)'}\``) lines.push(`- 通过: **${r.pass}/${r.totalSteps}**`) lines.push(`- 失败: **${r.fail}**`) + lines.push(`- 跳过: **${r.skip}**`) lines.push(`- 总耗时: ${r.totalDuration}ms`) lines.push('') lines.push(`| Step | Status | Duration | Detail |`) lines.push(`|------|--------|----------|--------|`) for (const s of r.steps) { - lines.push(`| ${s.step} | ${s.status === 'PASS' ? '✅ PASS' : s.status === 'FAIL' ? '❌ FAIL' : '⏭ SKIP'} | ${s.duration}ms | ${s.detail || ''} |`) + const icon = s.status === 'PASS' ? 'PASS' : s.status === 'FAIL' ? 'FAIL' : 'SKIP' + lines.push(`| ${s.step} | ${icon} | ${s.duration}ms | ${s.detail || ''} |`) } lines.push('') lines.push(`## 通过条件`) @@ -402,6 +761,14 @@ function renderMarkdownReport(r: { formId: string; totalSteps: number; pass: num lines.push(`- exit 0 (PASS): ${r.pass}/${r.totalSteps}`) lines.push(`- exit 1 (FAIL): ${r.fail} 个失败`) lines.push('') - lines.push(`> 浏览器层验证 (新增按钮 + 截图 + UI 渲染 + 4 铁律) 需用 ssw-e2e-test 单独跑. \`dacli testcase\` 仅验证 API 层.`) + if (r.keepData && r.testDataId) { + lines.push(`## 数据保留 (供浏览器层 TC-B 验证)`) + lines.push('') + lines.push(`- 测试数据保留 ID: \`${r.testDataId}\``) + lines.push(`- 浏览器访问: \`http://nginx/jnpf_app_developSystem/model/{enCode}?dataId=${r.testDataId}\``) + lines.push(`- 清理: \`dacli form delete-data <${r.testDataId}>\` 或浏览器端手动删除`) + lines.push('') + } + lines.push(`> 浏览器层验证 (新增按钮 + 截图 + UI 渲染 + 4 铁律) 需用 ssw-e2e-test 单独跑. \`dacli test run\` 仅验证 API 层 + 跨表 join + 业务规则.`) return lines.join('\n') } \ No newline at end of file