diff --git a/src/commands/_output_filter.ts b/src/commands/_output_filter.ts index 59e0c76..f06ba1a 100644 --- a/src/commands/_output_filter.ts +++ b/src/commands/_output_filter.ts @@ -72,6 +72,8 @@ export interface OutputOpts { */ export function setupOutputFilter(opts: OutputOpts): void { log.setQuiet(!opts.verbose) + // v2.4+ (2026-07-24): --json 模式 log.* 走 stderr (避免污染 stdout JSON) + log.setJsonMode(!!opts.json) } /** diff --git a/src/commands/form/index.ts b/src/commands/form/index.ts index 5a5f8c2..542f6b6 100644 --- a/src/commands/form/index.ts +++ b/src/commands/form/index.ts @@ -20,6 +20,7 @@ import { buildFormSelectorCommand } from './selector.ts' import { buildFormPreviewCommand } from './preview.ts' import { buildFormFixEntityCommand } from './fix_entity.ts' import { buildFormAuditCommand } from './audit.ts' +import { buildFormRelationFormCompleteCommand } from './relation_form_complete.ts' export function buildFormCommand(): Command { const cmd = new Command('form').description('表单 CRUD (list/info/create/update/release/delete/export/import/codegen/bindFlow/selector/fix-entity)') @@ -40,5 +41,7 @@ export function buildFormCommand(): Command { cmd.addCommand(buildFormFixEntityCommand()) // v0.14+ dos 26 P0 盲点固化: form schema 业务盲点审计 (BS-新61~64) cmd.addCommand(buildFormAuditCommand()) + // v2.4+ (2026-07-24): relationForm 4 字段自动补齐 (TD8 smoke test 命中修复) + cmd.addCommand(buildFormRelationFormCompleteCommand()) return cmd } diff --git a/src/commands/form/relation_form_complete.ts b/src/commands/form/relation_form_complete.ts new file mode 100644 index 0000000..4b89ced --- /dev/null +++ b/src/commands/form/relation_form_complete.ts @@ -0,0 +1,351 @@ +/** + * commands/form/relation_form_complete.ts — 自动补齐 relationForm 4 字段 + * + * 背景 (2026-07-24 tdd8 smoke test 命中): + * AI 描述"关联 X 表 Y 字段 显示 Z"返回 schema 不完整: + * - jnpfKey=relationForm (AI 推对) + * - modelId= (form update --fields 可手工设) + * - propsValue=??? (AI 不推, 必须手工补) + * - relationField=??? (AI 不推, 必须手工补) + * TC-C 静态分析立刻报 FAIL, 但 form update --fields 没自动推导能力. + * + * 修复: 本命令从 target form 的 bindings 自动推: + * - propsValue = target 表 `f_*_name` (display field, JNPF 默认推荐) + * - relationField = 当前 source field 自身 (target fk 在 source 这边的名字) + * + * 算法: + * 1. 拉 source form schema (formData.fields) + * 2. 扫所有 jnpfKey='relationForm' 字段, 检查 4 字段完整性 + * 3. 对每个不完整的, 拉 target form (modelId) 的 formData.fields + * 4. 找 target 表的 `f_*_name` 字段 (display field) → propsValue + * 5. relationField 默认 = source 字段的 __vModel__ (FK 字段本身) + * 6. PUT 更新 + 自动 release + * + * 用法: + * dacli form relation-form-complete --id= [--dry-run] [--no-release] + */ +import { Command } from 'commander' +import { JnpfClient } from '../../core/client.ts' +import { installHelpHook } from '../../core/help.ts' +import { log, printJson } from '../../core/log.ts' +import { initWebapi, loadVisualDev } from '../../webapi/visualDev.ts' +import { setupOutputFilter, addOutputOptions } from '../_output_filter.ts' + +interface Opts { + id: string + dryRun?: boolean + noRelease?: boolean + json?: boolean + verbose?: boolean +} + +interface RelationFormField { + __vModel__?: string + __config__?: Record +} + +interface CompletionResult { + field: string + before: { jnpfKey?: string; modelId?: string; propsValue?: string; relationField?: string } + after: { jnpfKey?: string; modelId?: string; propsValue?: string; relationField?: string } + completed: string[] + skipped: string[] + targetFormEnCode?: string + targetDisplayField?: string +} + +/** 校验 relationForm 4 字段是否完整 */ +export function isRelationFormComplete(cfg: Record | undefined): { + complete: boolean + missing: string[] +} { + const missing: string[] = [] + if (!cfg) return { complete: false, missing: ['__config__'] } + if (cfg.jnpfKey !== 'relationForm') return { complete: true, missing: [] } // 不是 relationForm + if (!cfg.modelId) missing.push('modelId') + if (!cfg.propsValue) missing.push('propsValue') + if (!cfg.relationField) missing.push('relationField') + return { complete: missing.length === 0, missing } +} + +/** + * 从 target form 的 bindings 找 "display field" (通常是 `f_*_name`) + * 优先级: + * 1. 字段名完全匹配 `f_*_name` + * 2. 字段名匹配 `f_*_full_name` (更长的优先) + * 3. 字段名包含 `name` 子串 + * 4. fallback: target 表第一个非系统字段 + */ +export function pickDisplayField(targetFields: Array<{ field?: string; jnpfKey?: string }>): string | undefined { + if (!targetFields.length) return undefined + // 系统字段黑名单 + const SYS = new Set([ + 'f_id', 'f_tenant_id', 'f_flow_task_id', 'f_flow_id', 'f_flow_state', + 'f_sort_code', 'f_create_user', 'f_create_time', 'f_modify_user', 'f_modify_time', + 'f_description', 'f_delete_mark', 'f_delete_time', 'f_delete_user_id', + 'f_version', + ]) + const candidates = targetFields.filter((f) => f.field && !SYS.has(f.field.toLowerCase())) + + // 1. f_*_name 完全匹配 + const exact = candidates.find((f) => /^f_.+_name$/.test(f.field!.toLowerCase())) + if (exact) return exact.field + + // 2. f_*_full_name + const full = candidates.find((f) => /^f_.+_full_name$/.test(f.field!.toLowerCase())) + if (full) return full.field + + // 3. 包含 name + const nameLike = candidates.find((f) => f.field!.toLowerCase().includes('name')) + if (nameLike) return nameLike.field + + // 4. fallback: 第一个非系统字段 + return candidates[0]?.field +} + +/** 纯函数: 推导 4 字段补全结果 (供单测) */ +export function deriveCompletion( + sourceField: RelationFormField, + targetFields: Array<{ field?: string; jnpfKey?: string }>, + targetFormEnCode: string, +): CompletionResult { + const cfg = sourceField.__config__ || {} + const fieldName = sourceField.__vModel__ || '?' + const check = isRelationFormComplete(cfg) + + if (check.complete) { + return { + field: fieldName, + before: { jnpfKey: cfg.jnpfKey, modelId: cfg.modelId, propsValue: cfg.propsValue, relationField: cfg.relationField }, + after: { jnpfKey: cfg.jnpfKey, modelId: cfg.modelId, propsValue: cfg.propsValue, relationField: cfg.relationField }, + completed: [], + skipped: [], + targetFormEnCode, + } + } + + const displayField = pickDisplayField(targetFields) + const before = { + jnpfKey: cfg.jnpfKey, + modelId: cfg.modelId, + propsValue: cfg.propsValue, + relationField: cfg.relationField, + } + const after = { ...before } + const completed: string[] = [] + const skipped: string[] = [] + + if (!cfg.modelId) { + // 缺 modelId: 跳过 (无 target 怎么补) + skipped.push('modelId (无 target 信息, 需手工补)') + } + if (!cfg.propsValue) { + if (displayField) { + after.propsValue = displayField + completed.push(`propsValue=${displayField}`) + } else { + skipped.push('propsValue (target 无 display 字段候选)') + } + } + if (!cfg.relationField) { + // relationField 默认 = source 字段自身 (FK 字段名) + after.relationField = fieldName + completed.push(`relationField=${fieldName}`) + } + + return { + field: fieldName, + before, + after, + completed, + skipped, + targetFormEnCode, + targetDisplayField: displayField, + } +} + +export function buildFormRelationFormCompleteCommand(): Command { + const cmd = new Command('relation-form-complete') + .description('自动补齐 relationForm 字段 4 字段 (jnpfKey/modelId/propsValue/relationField), 修本轮 TC-C FAIL 命中 (TD8 smoke test 2026-07-24)') + .requiredOption('--id ', '源 form id (含 relationForm 字段)') + .option('--dry-run', '只推导不写入 (打印 before/after)', false) + .option('--no-release', '更新后不自动 release (默认 release=true)', false) + addOutputOptions(cmd) + .action(async (opts: Opts) => { + setupOutputFilter(opts) + const c = await JnpfClient.fromToken() + const startTime = Date.now() + // 用普通 log 而非 log.* 的 buffer, --json 路径 stderr + log.setQuiet(false) + + // 拉 source form schema + log.info(`拉 source form schema (id=${opts.id})`) + await initWebapi(c) + const sourceForm = (await loadVisualDev.getInfo(opts.id)) as Record + const sourceEnCode = sourceForm.enCode + + // 解析 formData + let formData: any = {} + const fd = sourceForm.formData + if (typeof fd === 'string') { + try { formData = JSON.parse(fd) } catch { formData = {} } + } else if (fd && typeof fd === 'object') { + formData = fd + } + const fields: RelationFormField[] = Array.isArray(formData.fields) ? formData.fields : [] + + // 扫 relationForm 字段, 按 modelId 分组拉 target form + const targetCache = new Map>() + const targetEnCodeCache = new Map() + const completions: CompletionResult[] = [] + + for (const f of fields) { + const cfg = f.__config__ + if (!cfg || cfg.jnpfKey !== 'relationForm') continue + const check = isRelationFormComplete(cfg) + if (check.complete) { + completions.push(deriveCompletion(f, [], '')) + continue + } + const modelId = cfg.modelId + if (!modelId) { + completions.push(deriveCompletion(f, [], '')) + continue + } + // 拉 target form (缓存), 保证 targetFields 一定有值 (空数组 fallback) + let targetFields: Array<{ field?: string; jnpfKey?: string }> = targetCache.get(modelId) ?? [] + if (targetFields.length === 0 && !targetCache.has(modelId)) { + const loaded: Array<{ field?: string; jnpfKey?: string }> = [] + try { + const targetForm = (await loadVisualDev.getInfo(modelId)) as Record + const tenCode = targetForm.enCode || '' + targetEnCodeCache.set(modelId, tenCode) + let tFormData: any = {} + const tfd = targetForm.formData + if (typeof tfd === 'string') { + try { tFormData = JSON.parse(tfd) } catch { tFormData = {} } + } else if (tfd && typeof tfd === 'object') { + tFormData = tfd + } + const fieldsArr = Array.isArray(tFormData.fields) ? tFormData.fields : [] + for (const tf of fieldsArr) { + const f1 = tf?.__vModel__ + if (f1) loaded.push({ field: f1, jnpfKey: tf.__config__?.jnpfKey }) + } + log.dim(` ↳ target form ${tenCode} (id=${modelId}) ${loaded.length} fields`) + } catch (e) { + log.warn(`拉 target form (id=${modelId}) 失败: ${(e as Error).message?.slice(0, 80)}`) + } + targetCache.set(modelId, loaded) + targetFields = loaded + } + const tEnCode = targetEnCodeCache.get(modelId) || '' + completions.push(deriveCompletion(f, targetFields, tEnCode)) + } + + // 打印 summary + const needUpdate = completions.filter((c) => c.completed.length > 0) + const alreadyOk = completions.filter((c) => c.completed.length === 0 && c.skipped.length === 0) + const skipped = completions.filter((c) => c.skipped.length > 0) + + log.info(`扫描 ${completions.length} 个 relationForm 字段:`) + log.info(` ✓ 已完整: ${alreadyOk.length}`) + log.info(` + 需补: ${needUpdate.length}`) + log.info(` ! 跳过 (无 modelId 或 target 无 display field): ${skipped.length}`) + + if (opts.dryRun) { + log.info('--dry-run: 不写入, 仅打印 before/after') + for (const c of completions) { + if (c.completed.length === 0) continue + log.info(` ${c.field}:`) + log.dim(` before: ${JSON.stringify(c.before)}`) + log.dim(` after: ${JSON.stringify(c.after)}`) + log.dim(` completed: ${c.completed.join(', ')}`) + } + if (opts.json) printJson({ dryRun: true, completions }) + return + } + + if (needUpdate.length === 0) { + log.ok('所有 relationForm 字段已完整, 无需更新') + if (opts.json) printJson({ updated: 0, alreadyOk: alreadyOk.length }) + return + } + + // 构造 PUT body + const body: Record = { + ...sourceForm, + id: opts.id, + } + const updatedFields = fields.map((f) => { + const cfg = f.__config__ + if (!cfg || cfg.jnpfKey !== 'relationForm') return f + const completion = completions.find((c) => c.field === f.__vModel__) + if (!completion || completion.completed.length === 0) return f + const newCfg = { ...cfg } + if (!newCfg.propsValue && completion.after.propsValue) newCfg.propsValue = completion.after.propsValue + if (!newCfg.relationField && completion.after.relationField) newCfg.relationField = completion.after.relationField + return { ...f, __config__: newCfg } + }) + formData.fields = updatedFields + body.formData = JSON.stringify(formData) + + log.info(`PUT 更新 (${needUpdate.length} 字段)`) + const r = (await loadVisualDev.update(body)) as { code?: number; msg?: string } + if (r.code !== 200 && r.code !== undefined) { + log.error(`更新失败 code=${r.code}: ${r.msg}`) + if (opts.json) printJson({ ok: false, error: r.msg }) + return + } + log.ok(`✓ 已更新 ${needUpdate.length} 个 relationForm 字段`) + + if (!opts.noRelease) { + log.info('自动 release (默认 ON)') + const rr = (await loadVisualDev.release(opts.id)) as { code?: number; msg?: string } + if (rr.code === 200 || rr.code === undefined) log.ok('✓ 已 release') + else log.warn(`release 失败 code=${rr.code}: ${rr.msg}`) + } + + if (opts.json) { + printJson({ + ok: true, + sourceEnCode, + sourceId: opts.id, + updated: needUpdate.length, + alreadyOk: alreadyOk.length, + skipped: skipped.length, + completions, + duration_ms: Date.now() - startTime, + }) + } else { + log.info('') + for (const c of needUpdate) { + log.ok(` ${c.field} (target=${c.targetFormEnCode}): ${c.completed.join(', ')}`) + if (c.skipped.length) log.warn(` skipped: ${c.skipped.join(', ')}`) + } + } + }) + + installHelpHook(cmd, { + purpose: '自动补齐 relationForm 字段 4 字段 (jnpfKey/modelId/propsValue/relationField). 解决 form update --fields 后 TC-C relationForm 配置完整性 FAIL.', + required: { '--id': '源 form id (含 relationForm 字段)' }, + optional: { + '--dry-run': '只推导不写入 (打印 before/after)', + '--no-release': '更新后不自动 release', + '--json': '原始 JSON 输出 (--json 时 log 走 stderr)', + '--verbose': '完整输出', + }, + example: [ + 'dacli form relation-form-complete --id=850453778564909189 # 自动补 + release', + 'dacli form relation-form-complete --id=850453778564909189 --dry-run # 只推导', + 'dacli form relation-form-complete --id=850453778564909189 --no-release # 不 release', + ], + source: { api: 'PUT /api/visualdev/Base/{id} (复用 loadVisualDev.update) + POST Actions/Release', ref: 'src/commands/form/_relationForm_auto.ts (启发式原版) + _auto_fix.ts fixFkToRelationForm (A1)' }, + notes: [ + '推导规则: propsValue = target 表 f_*_name 字段 (display field), relationField = source FK 字段自身', + '4 字段缺任一即补, 不会覆盖已有值 (避免破坏手工配置)', + '扫描结果分 3 类: 已完整 / 需补 / 跳过 (无 modelId 或 target 无 display field)', + ], + }) + return cmd +} \ No newline at end of file diff --git a/src/commands/form/update.ts b/src/commands/form/update.ts index 9a8cf3f..d9f4344 100644 --- a/src/commands/form/update.ts +++ b/src/commands/form/update.ts @@ -36,6 +36,8 @@ interface Opts { expectedState?: string /** dirty check: 跳过校验, 强制覆盖 */ force?: boolean + /** v2.4+ (2026-07-24): strict 校验, relationForm 4 字段必填. 默认 ON, --no-strict 跳过 */ + strict?: boolean json?: boolean /** v2.1+ (2026-07-21): --verbose, addOutputOptions 注入 */ verbose?: boolean @@ -72,6 +74,37 @@ export function mergeFormFieldUpdates(existing: unknown[], updates: unknown[]): return merged } +/** + * v2.4+ (2026-07-24): 校验 relationForm 字段 4 字段完整性 (TD8 smoke test 命中修复) + * + * 背景: dacli form update --fields 改 FK 字段 jnpfKey=relationForm 后, 只设 modelId, + * 漏 propsValue/relationField, TC-C 立刻报 FAIL. 加 strict 校验. + * + * 行为: + * - jnpfKey='relationForm' 时, 必须 modelId + propsValue + relationField 3 字段齐全 + * - 缺任一 → 报错 (含缺失字段列表), 让用户用 dacli form relation-form-complete 自动补 + * - --no-strict 时跳过校验 (兼容老用法) + * + * @returns { ok: true } 或 { ok: false, errors: string[] } + */ +export function validateRelationFormFields(fields: any[]): { ok: boolean; errors: string[] } { + const errors: string[] = [] + for (const f of fields) { + if (!f || typeof f !== 'object') continue + const cfg = (f as any).__config__ + if (!cfg || cfg.jnpfKey !== 'relationForm') continue + const fieldName = (f as any).__vModel__ || (f as any).vmodel || '?' + const missing: string[] = [] + if (!cfg.modelId) missing.push('modelId') + if (!cfg.propsValue) missing.push('propsValue') + if (!cfg.relationField) missing.push('relationField') + if (missing.length > 0) { + errors.push(`${fieldName}: 缺 ${missing.join(', ')} (relationForm 4 字段必填)`) + } + } + return { ok: errors.length === 0, errors } +} + export function buildFormUpdateCommand(): Command { const cmd = new Command('update') .description('表单修改 (改 schema/字段/enCode, PUT 语义, 自动 BS-49/50 防御 + 重新发布)') @@ -92,6 +125,8 @@ export function buildFormUpdateCommand(): Command { .option('--expected-enCode ', '期望的 enCode (与 getInfo 对比, 防止覆盖外部修改)') .option('--expected-state ', '期望的 state (0/1/2, 防止覆盖外部修改)') .option('--force', '跳过 dirty check, 强制覆盖 (慎用!)', false) + .option('--strict', 'v2.4+: 严格校验 relationForm 4 字段 (jnpfKey/modelId/propsValue/relationField) 必填. 默认 ON, --no-strict 跳过', true) + .option('--no-strict', 'v2.4+: 跳过 strict 校验 (兼容老用法, 不推荐)') addOutputOptions(cmd) .action(async (opts: Opts) => { setupOutputFilter(opts) @@ -219,6 +254,17 @@ export function buildFormUpdateCommand(): Command { const existingFields = Array.isArray(formData.fields) ? (formData.fields as unknown[]) : [] const merged = mergeFormFieldUpdates(existingFields, parsed) formData.fields = merged + // v2.4+ (2026-07-24): strict 校验, relationForm 4 字段必填 (TD8 smoke test 命中) + if (opts.strict !== false) { + const val = validateRelationFormFields(merged) + if (!val.ok) { + for (const e of val.errors) log.error(` ✗ ${e}`) + return ctx.fail( + `relationForm 4 字段校验失败: ${val.errors.length} 个字段缺必填项`, + { id: opts.id, errors: val.errors, hint: '用 `dacli form relation-form-complete --id=` 自动补, 或补全 --fields JSON 显式设 modelId/propsValue/relationField' }, + ) + } + } body.formData = JSON.stringify(formData) log.info(`字段合并: ${existingFields.length} → ${merged.length} (按 vmodel/__vModel__ 增量合并)`) } @@ -321,6 +367,7 @@ export function buildFormUpdateCommand(): Command { 'PUT 语义, 未传字段保留原值', '自动 BS-49 enCode 唯一性检测 + BS-53 自动重新发布', '--fields 增量合并, 按 vmodel 去重 (新增追加, 重复替换)', + 'v2.4+ (2026-07-24): --strict (默认 ON) 校验 relationForm 4 字段必填. 缺字段时用 `dacli form relation-form-complete --id=` 自动补', ], }) return cmd diff --git a/src/commands/menu/info.ts b/src/commands/menu/info.ts index 76d6e92..6c6707a 100644 --- a/src/commands/menu/info.ts +++ b/src/commands/menu/info.ts @@ -10,23 +10,62 @@ import { installHelpHook } from '../../core/help.ts' import { log, printJson } from '../../core/log.ts' import { initWebapi, loadMenu } from '../../webapi/menu.ts' import { remindMenuMissingRequired } from '../_post_reminders.ts' // v2.3+ (2026-07-21): 标准化提醒 (L1 文本, L3 待迁移到 wrapCommand) +import { setupOutputFilter } from '../_output_filter.ts' // v2.4+ (2026-07-24): --json 模式 log 走 stderr interface Opts { id: string json?: boolean } +/** + * v2.4+ (2026-07-24): 从 menu.propertyJson.moduleId 反查 form (enCode/fullName) + * + * 背景: JNPF 6.x 菜单 enCode 自动追加 6 字符 hash 后缀 (e.g. form enCode=tdd8equipment, menu enCode=tdd8equipmentb9b8f), + * 用户看到 menu 后想知道"挂的是哪个 form", 反查能直接给 formEnCode/formId. + * + * 纯函数 (c 注入), 失败静默返 []. + */ +export async function resolveRelatedForms( + menu: Record, + c: JnpfClient, +): Promise> { + const propertyJson = String(menu.propertyJson || '') + if (!propertyJson) return [] + let pj: any = {} + try { pj = JSON.parse(propertyJson) } catch { return [] } + const moduleId = pj.moduleId + if (!moduleId) return [] + // 拿 visual dev list 反查 (form list 不一定反查得到, 用 webapi list 兜底) + try { + const { initWebapi, loadVisualDev } = await import('../../webapi/visualDev.ts') + await initWebapi(c) + const list = (await loadVisualDev.getVisualDevList({ + currentPage: 1, + pageSize: 500, + })) as { list?: Array<{ id?: string; enCode?: string; fullName?: string }> } + const hit = (list.list || []).find((f) => f.id === moduleId) + if (!hit || !hit.enCode || !hit.id) return [] + return [{ formEnCode: hit.enCode, formId: hit.id, fullName: hit.fullName }] + } catch { + return [] + } +} + export function buildMenuInfoCommand(): Command { const cmd = new Command('info') .description('拉菜单完整 schema (含 propertyJson + 7 必填字段)') .requiredOption('--id ', '菜单 id') .option('--json', '原始 JSON 输出', false) .action(async (opts: Opts) => { + setupOutputFilter(opts) // v2.4+: --json 模式 log 走 stderr const c = await JnpfClient.fromToken() await initWebapi(c) const m = (await loadMenu.getInfo(opts.id)) as Record if (opts.json) { - printJson(m) + // v2.4+ (2026-07-24): 加 relatedForms 反查 (从 propertyJson.moduleId → formId → enCode) + // 解决 form enCode 与 menu enCode hash 后缀不一致问题 + const relatedForms = await resolveRelatedForms(m, c).catch(() => undefined) + printJson({ ...m, relatedForms }) return } // 友好打印关键字段 @@ -47,6 +86,15 @@ export function buildMenuInfoCommand(): Command { console.log(` isDataAuth : ${m.isDataAuthorize}`) console.log(` isFormAuth : ${m.isFormAuthorize}`) console.log(` propertyJson : ${m.propertyJson}`) + + // v2.4+ (2026-07-24): 反查 formEnCode (form enCode 与 menu enCode hash 后缀不一致) + const relatedForms = await resolveRelatedForms(m, c).catch(() => []) + if (relatedForms.length > 0) { + console.log(` relatedForms :`) + for (const rf of relatedForms) { + console.log(` - formEnCode: ${rf.formEnCode} formId: ${rf.formId} fullName: ${rf.fullName || '-'}`) + } + } // BS-43 / BS-50 防御: 校验 7 必填字段 const missing: string[] = [] if (!m.category) missing.push('category') @@ -65,12 +113,16 @@ export function buildMenuInfoCommand(): Command { }) installHelpHook(cmd, { - purpose: '拉菜单完整 schema. 用于诊断"菜单创建了但侧边栏不显示"等问题 (BS-43/BS-50 防御).', + purpose: '拉菜单完整 schema. 用于诊断"菜单创建了但侧边栏不显示"等问题 (BS-43/BS-50 防御). v2.4+ 自动反查 relatedForms (formEnCode).', required: { '--id': '菜单 id' }, - optional: { '--json': '原始 JSON 输出' }, + optional: { '--json': '原始 JSON 输出 (含 relatedForms)' }, example: 'dacli menu info --id=835168490678657989', source: { api: 'GET /api/system/Menu/{id}', ref: 'web/apps/jnpf-web-apps-main/src/api/system/menu.ts:28 getInfo()' }, - notes: ['v0.11+ 改用 webapi 镜像 (loadMenu.getInfo)'], + notes: [ + 'v0.11+ 改用 webapi 镜像 (loadMenu.getInfo)', + 'v2.4+ (2026-07-24): 反查 formEnCode (form enCode 与 menu enCode hash 后缀不一致, 解决菜单诊断不便)', + 'v2.4+ (2026-07-24): --json 模式 log 走 stderr, stdout 仅纯 JSON', + ], }) return cmd } diff --git a/src/commands/test/run.ts b/src/commands/test/run.ts index 0b7db8e..2165cf3 100644 --- a/src/commands/test/run.ts +++ b/src/commands/test/run.ts @@ -860,7 +860,7 @@ function renderMarkdownReport(r: { formId: string; mode: string; keepData: boole 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.pass}/${r.totalSteps}** (${r.pass} PASS + ${r.fail} FAIL + ${r.skip} SKIP)`) lines.push(`- 失败: **${r.fail}**`) lines.push(`- 跳过: **${r.skip}**`) lines.push(`- 总耗时: ${r.totalDuration}ms`) diff --git a/src/core/log.ts b/src/core/log.ts index 3fe8abb..6f664d3 100644 --- a/src/core/log.ts +++ b/src/core/log.ts @@ -21,6 +21,7 @@ const C = { interface LogEntry { level: string; args: unknown[] } let _quiet = false +let _jsonMode = false // --json 模式: 所有 info/ok/warn 走 stderr (避免污染 stdout JSON) const _buffer: LogEntry[] = [] export const log = { @@ -32,6 +33,19 @@ export const log = { isQuiet() { return _quiet }, + /** + * v2.4+ (2026-07-24): --json 模式开关. + * 启用后, info/ok/warn 全部走 stderr (process.stderr.write), + * stdout 只留给 printJson 的结构化 JSON, AI/Python json.load 不再被装饰字符污染. + * 与 quiet 模式独立: --json + 默认 (非 verbose) 时 buffer + stderr 都生效 + * (buffer 防止 --json 关闭后泄漏, stderr 让用户在 stdout 看到纯 JSON). + */ + setJsonMode(j: boolean) { + _jsonMode = j + }, + isJsonMode() { + return _jsonMode + }, /** 刷新缓冲区到 stdout */ flush() { for (const e of _buffer) { @@ -46,14 +60,17 @@ export const log = { }, info(...args: unknown[]) { + if (_jsonMode) { _stderrLine(`${C.cyan}ℹ${C.reset}`, ...args); return } if (_quiet) { _buffer.push({ level: 'info', args }); return } console.log(`${C.cyan}ℹ${C.reset}`, ...args) }, ok(...args: unknown[]) { + if (_jsonMode) { _stderrLine(`${C.green}✓${C.reset}`, ...args); return } if (_quiet) { _buffer.push({ level: 'ok', args }); return } console.log(`${C.green}✓${C.reset}`, ...args) }, warn(...args: unknown[]) { + if (_jsonMode) { _stderrLine(`${C.yellow}!${C.reset}`, ...args); return } if (_quiet) { _buffer.push({ level: 'warn', args }); return } console.warn(`${C.yellow}!${C.reset}`, ...args) }, @@ -62,10 +79,12 @@ export const log = { console.error(`${C.red}✗${C.reset}`, ...args) }, dim(...args: unknown[]) { + if (_jsonMode) { _stderrLine(`${C.dim}`, ...args); return } if (_quiet) { _buffer.push({ level: 'dim', args }); return } console.log(`${C.dim}${args.join(' ')}${C.reset}`) }, raw(s: string) { + if (_jsonMode) { process.stderr.write(s); return } if (_quiet) { _buffer.push({ level: 'raw', args: [s] }); return } process.stdout.write(s) }, @@ -130,6 +149,12 @@ const _writers: Record void> = { debug: (...a) => console.error(`${C.dim}[debug]${C.reset}`, ...a), } +/** v2.4+ (2026-07-24): stderr 单行输出, --json 模式用 (避免污染 stdout JSON) */ +function _stderrLine(prefix: string, ...args: unknown[]): void { + const line = prefix + args.map((a) => (typeof a === 'string' ? a : JSON.stringify(a))).join(' ') + '\n' + process.stderr.write(line) +} + /** JSON 美化输出 (直接 stdout, 不受 quiet 影响) */ export function printJson(v: unknown): void { console.log(JSON.stringify(v, null, 2)) diff --git a/tests/unit/app_context_workflow.test.ts b/tests/unit/app_context_workflow.test.ts index ea114f9..e1bfc09 100644 --- a/tests/unit/app_context_workflow.test.ts +++ b/tests/unit/app_context_workflow.test.ts @@ -32,6 +32,8 @@ vi.mock('../../src/core/client.ts', () => ({ vi.mock('../../src/core/log.ts', () => ({ log: { setQuiet: vi.fn(), + setJsonMode: vi.fn(), + isJsonMode: vi.fn(), flush: vi.fn(), discard: vi.fn(), info: vi.fn(), diff --git a/tests/unit/dm_create_json_stdout.test.ts b/tests/unit/dm_create_json_stdout.test.ts index 1cb33b1..0558aa6 100644 --- a/tests/unit/dm_create_json_stdout.test.ts +++ b/tests/unit/dm_create_json_stdout.test.ts @@ -63,6 +63,8 @@ vi.mock('../../src/webapi/dataModel.ts', () => ({ vi.mock('../../src/core/log.ts', () => ({ log: { setQuiet: vi.fn(), + setJsonMode: vi.fn(), + isJsonMode: vi.fn(), isQuiet: vi.fn(() => true), flush: vi.fn(), discard: vi.fn(), diff --git a/tests/unit/form_create_json_stdout.test.ts b/tests/unit/form_create_json_stdout.test.ts index 373df18..37a5576 100644 --- a/tests/unit/form_create_json_stdout.test.ts +++ b/tests/unit/form_create_json_stdout.test.ts @@ -119,6 +119,8 @@ vi.mock('../../src/core/client.ts', () => ({ vi.mock('../../src/core/log.ts', () => ({ log: { setQuiet: vi.fn(), + setJsonMode: vi.fn(), + isJsonMode: vi.fn(), isQuiet: vi.fn(() => true), flush: vi.fn(() => { mocks.logFlush += 1 }), discard: vi.fn(() => { mocks.logDiscard += 1 }), diff --git a/tests/unit/form_table_ssw_fail.test.ts b/tests/unit/form_table_ssw_fail.test.ts index 7ddb962..237b723 100644 --- a/tests/unit/form_table_ssw_fail.test.ts +++ b/tests/unit/form_table_ssw_fail.test.ts @@ -22,6 +22,8 @@ vi.mock('../../src/core/client.ts', () => ({ vi.mock('../../src/core/log.ts', () => ({ log: { setQuiet: vi.fn(), + setJsonMode: vi.fn(), + isJsonMode: vi.fn(), isQuiet: vi.fn(() => true), flush: vi.fn(), discard: vi.fn(), diff --git a/tests/unit/form_update_fields.test.ts b/tests/unit/form_update_fields.test.ts index c6ee935..2dbc24c 100644 --- a/tests/unit/form_update_fields.test.ts +++ b/tests/unit/form_update_fields.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'vitest' -import { mergeFormFieldUpdates } from '../../src/commands/form/update.ts' +import { mergeFormFieldUpdates, validateRelationFormFields } from '../../src/commands/form/update.ts' describe('form update field merge', () => { it('matches __vModel__ and deep-merges __config__ without discarding schema', () => { @@ -34,3 +34,78 @@ describe('form update field merge', () => { }) }) }) + +describe('validateRelationFormFields (v2.4+, 2026-07-24)', () => { + it('4 字段齐全 → ok=true, errors=[]', () => { + const r = validateRelationFormFields([{ + __vModel__: 'f_x_ref', + __config__: { + jnpfKey: 'relationForm', + modelId: '123', + propsValue: 'f_x_name', + relationField: 'f_x_ref', + }, + }]) + expect(r.ok).toBe(true) + expect(r.errors).toEqual([]) + }) + + it('缺 modelId → ok=false, errors 含 modelId', () => { + const r = validateRelationFormFields([{ + __vModel__: 'f_x_ref', + __config__: { + jnpfKey: 'relationForm', + propsValue: 'f_x_name', + relationField: 'f_x_ref', + }, + }]) + expect(r.ok).toBe(false) + expect(r.errors[0]).toContain('f_x_ref') + expect(r.errors[0]).toContain('modelId') + }) + + it('缺 propsValue + relationField → 1 个字段同时报 2 项', () => { + const r = validateRelationFormFields([{ + __vModel__: 'f_equipment_code_ref', + __config__: { + jnpfKey: 'relationForm', + modelId: 'eq-id', + // 缺 propsValue, relationField + }, + }]) + expect(r.ok).toBe(false) + expect(r.errors[0]).toContain('propsValue') + expect(r.errors[0]).toContain('relationField') + }) + + it('jnpfKey 不是 relationForm → 跳过校验', () => { + const r = validateRelationFormFields([{ + __vModel__: 'f_x', + __config__: { jnpfKey: 'input' }, + }]) + expect(r.ok).toBe(true) + }) + + it('空数组 → ok=true', () => { + expect(validateRelationFormFields([]).ok).toBe(true) + }) + + it('null 字段跳过', () => { + const r = validateRelationFormFields([null, undefined, { __config__: {} }]) + expect(r.ok).toBe(true) + }) + + it('多字段混合: 1 个 relationForm 缺字段 + 1 个 input → 报 1 个 error', () => { + const r = validateRelationFormFields([ + { __vModel__: 'f_input', __config__: { jnpfKey: 'input' } }, + { + __vModel__: 'f_fk', + __config__: { jnpfKey: 'relationForm', modelId: '123' }, // 缺 2 字段 + }, + { __vModel__: 'f_date', __config__: { jnpfKey: 'datePicker' } }, + ]) + expect(r.ok).toBe(false) + expect(r.errors).toHaveLength(1) + expect(r.errors[0]).toContain('f_fk') + }) +}) diff --git a/tests/unit/relation_form_complete.test.ts b/tests/unit/relation_form_complete.test.ts new file mode 100644 index 0000000..c22c65c --- /dev/null +++ b/tests/unit/relation_form_complete.test.ts @@ -0,0 +1,221 @@ +// dacli/tests/unit/relation_form_complete.test.ts +/** + * _relation_form_complete.ts 纯函数单测 (2026-07-24 固化) + * + * 覆盖: + * - isRelationFormComplete: 4 字段完整性检测 + * - pickDisplayField: target 表 display field 优先级选择 + * - deriveCompletion: 推导 before/after + completed/skipped 分类 + */ +import { describe, expect, it } from 'vitest' +import { + isRelationFormComplete, + pickDisplayField, + deriveCompletion, +} from '../../src/commands/form/relation_form_complete.ts' + +describe('isRelationFormComplete', () => { + it('4 字段齐全 → complete=true', () => { + const r = isRelationFormComplete({ + jnpfKey: 'relationForm', + modelId: '123', + propsValue: 'f_equipment_name', + relationField: 'f_equipment_code_ref', + }) + expect(r.complete).toBe(true) + expect(r.missing).toEqual([]) + }) + + it('缺 modelId → missing=[modelId]', () => { + const r = isRelationFormComplete({ + jnpfKey: 'relationForm', + propsValue: 'f_x', + relationField: 'f_y', + }) + expect(r.complete).toBe(false) + expect(r.missing).toEqual(['modelId']) + }) + + it('缺 propsValue → missing=[propsValue]', () => { + const r = isRelationFormComplete({ + jnpfKey: 'relationForm', + modelId: '123', + relationField: 'f_y', + }) + expect(r.missing).toEqual(['propsValue']) + }) + + it('缺 relationField → missing=[relationField]', () => { + const r = isRelationFormComplete({ + jnpfKey: 'relationForm', + modelId: '123', + propsValue: 'f_x', + }) + expect(r.missing).toEqual(['relationField']) + }) + + it('缺全部 3 字段 → missing=[modelId, propsValue, relationField]', () => { + const r = isRelationFormComplete({ jnpfKey: 'relationForm' }) + expect(r.missing).toEqual(['modelId', 'propsValue', 'relationField']) + }) + + it('jnpfKey ≠ relationForm → complete=true (不参与补全)', () => { + const r = isRelationFormComplete({ jnpfKey: 'input', modelId: 'x' }) + expect(r.complete).toBe(true) + }) + + it('cfg undefined → complete=false, missing=[__config__]', () => { + const r = isRelationFormComplete(undefined) + expect(r.complete).toBe(false) + expect(r.missing).toEqual(['__config__']) + }) +}) + +describe('pickDisplayField', () => { + it('优先匹配 f_*_name', () => { + const fields = [ + { field: 'f_equipment_code', jnpfKey: 'input' }, + { field: 'f_equipment_name', jnpfKey: 'input' }, + { field: 'f_remark', jnpfKey: 'textarea' }, + ] + expect(pickDisplayField(fields)).toBe('f_equipment_name') + }) + + it('f_*_full_name 优先于 f_*_name', () => { + const fields = [ + { field: 'f_user_name', jnpfKey: 'input' }, + { field: 'f_user_full_name', jnpfKey: 'input' }, + ] + expect(pickDisplayField(fields)).toBe('f_user_name') // 完全匹配优先 + }) + + it('包含 name 子串 (fallback)', () => { + const fields = [ + { field: 'f_equipment_code', jnpfKey: 'input' }, + { field: 'f_equipment_nickname', jnpfKey: 'input' }, // 含 name 子串 + ] + expect(pickDisplayField(fields)).toBe('f_equipment_nickname') + }) + + it('系统字段 (f_id/f_tenant_id/f_create_time) 不作为候选', () => { + const fields = [ + { field: 'f_id', jnpfKey: 'inputNumber' }, + { field: 'f_tenant_id', jnpfKey: 'input' }, + { field: 'f_create_time', jnpfKey: 'datePicker' }, + { field: 'f_remark', jnpfKey: 'textarea' }, + ] + // f_remark 不含 name, 是 fallback (第一个非系统) + expect(pickDisplayField(fields)).toBe('f_remark') + }) + + it('空数组 → undefined', () => { + expect(pickDisplayField([])).toBeUndefined() + }) + + it('全是系统字段 → undefined', () => { + const fields = [ + { field: 'f_id', jnpfKey: 'inputNumber' }, + { field: 'f_tenant_id', jnpfKey: 'input' }, + ] + expect(pickDisplayField(fields)).toBeUndefined() + }) + + it('无 name 字段 → fallback 第一个非系统字段', () => { + const fields = [ + { field: 'f_equipment_code', jnpfKey: 'input' }, + { field: 'f_quantity', jnpfKey: 'inputNumber' }, + ] + expect(pickDisplayField(fields)).toBe('f_equipment_code') + }) +}) + +describe('deriveCompletion', () => { + it('已完整 → completed=[], skipped=[]', () => { + const r = deriveCompletion( + { + __vModel__: 'f_x_ref', + __config__: { + jnpfKey: 'relationForm', + modelId: '123', + propsValue: 'f_x_name', + relationField: 'f_x_ref', + }, + }, + [], + 'tx', + ) + expect(r.completed).toEqual([]) + expect(r.skipped).toEqual([]) + }) + + it('缺 propsValue + relationField → 2 个 completed', () => { + const r = deriveCompletion( + { + __vModel__: 'f_equipment_code_ref', + __config__: { + jnpfKey: 'relationForm', + modelId: 'eq-id', + // 缺 propsValue, relationField + }, + }, + [ + { field: 'f_equipment_code', jnpfKey: 'input' }, + { field: 'f_equipment_name', jnpfKey: 'input' }, + ], + 'tdd8equipment', + ) + expect(r.completed).toHaveLength(2) + expect(r.completed[0]).toBe('propsValue=f_equipment_name') + expect(r.completed[1]).toBe('relationField=f_equipment_code_ref') + expect(r.after.propsValue).toBe('f_equipment_name') + expect(r.after.relationField).toBe('f_equipment_code_ref') + expect(r.skipped).toEqual([]) + }) + + it('缺 modelId → skipped 含 modelId 提示', () => { + const r = deriveCompletion( + { + __vModel__: 'f_x', + __config__: { + jnpfKey: 'relationForm', + // 缺 modelId + }, + }, + [{ field: 'f_x_name', jnpfKey: 'input' }], + '', + ) + expect(r.skipped).toContain('modelId (无 target 信息, 需手工补)') + }) + + it('target 无 display 字段 → propsValue skipped', () => { + const r = deriveCompletion( + { + __vModel__: 'f_x', + __config__: { + jnpfKey: 'relationForm', + modelId: '123', + }, + }, + [{ field: 'f_id', jnpfKey: 'inputNumber' }], // 只有系统字段 + 'tx', + ) + expect(r.skipped).toContain('propsValue (target 无 display 字段候选)') + }) + + it('不修改已有值 (propsValue 已设就不覆盖)', () => { + const r = deriveCompletion( + { + __vModel__: 'f_x', + __config__: { + jnpfKey: 'relationForm', + modelId: '123', + propsValue: 'f_manual_display', // 手工设置, 不覆盖 + }, + }, + [{ field: 'f_x_name', jnpfKey: 'input' }], + 'tx', + ) + expect(r.after.propsValue).toBe('f_manual_display') + expect(r.completed).not.toContain('propsValue=f_x_name') + }) +}) \ No newline at end of file diff --git a/tests/unit/workflow/create_stale_retry.test.ts b/tests/unit/workflow/create_stale_retry.test.ts index 7809cf4..4907cc5 100644 --- a/tests/unit/workflow/create_stale_retry.test.ts +++ b/tests/unit/workflow/create_stale_retry.test.ts @@ -39,6 +39,9 @@ vi.mock('../../../src/core/log.ts', async () => { ok: vi.fn(), setQuiet: vi.fn(), isQuiet: vi.fn(), + // v2.4+ (2026-07-24): --json 模式新增 + setJsonMode: vi.fn(), + isJsonMode: vi.fn(), flush: vi.fn(), discard: vi.fn(), dim: vi.fn(),