From dfbb81343ddcd568d6caf5a090fb455692698dd9 Mon Sep 17 00:00:00 2001 From: ssw Date: Mon, 29 Jun 2026 14:24:40 +0800 Subject: [PATCH] =?UTF-8?q?fix(dacli):=209=20=E4=B8=AA=20jxcj=20V1.0=20?= =?UTF-8?q?=E5=8F=91=E7=8E=B0=E7=9A=84=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=20(v0.12+)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit P0: - P0-1: relationForm auto-injection 增强 (camelCase + 大小写不敏感匹配) - P0-2: real-data 模式也跑 join (testMarker 永远注入, --no-keep-data 清理) - P0-3: workflow bindFlow 持久化验证 (GET 验证 onLineformId, 失败明确提示) P1: - P1-4: workflow --ai 返回实际 enCode (JNPF 流水号机制, 警告) - P1-5: 字典冲突加建议 (jxcj{原名} 前缀) - P1-6: verify 默认 warn (form 已发布不阻断) P2: - P2-8: menu list --include-actions 默认 ON (含 form-driven 子菜单) - P2-9: AiFormModel 扩展 dictionaryType/unique/billRule (web 端消费待 web-patches) - P2-11: dacli doc Node 兼容 (已修复或原本 OK) Co-Authored-By: Claude --- src/commands/dict/_validate.ts | 10 +++- src/commands/form/_ai.ts | 11 +++++ src/commands/form/_relationForm_auto.ts | 66 +++++++++++++++++++------ src/commands/form/bindflow.ts | 64 +++++++++++++++++------- src/commands/menu/list.ts | 6 ++- src/commands/workflow/create.ts | 21 +++++--- 6 files changed, 134 insertions(+), 44 deletions(-) diff --git a/src/commands/dict/_validate.ts b/src/commands/dict/_validate.ts index d5b753b..8cd8d32 100644 --- a/src/commands/dict/_validate.ts +++ b/src/commands/dict/_validate.ts @@ -148,7 +148,11 @@ export function validateUniqueness(opts: { if (opts.fullName) { const dup = opts.existingTypes.find((t) => t.fullName === opts.fullName) if (dup) { - errors.push({ field: 'fullName', message: `字典名称"${opts.fullName}"已存在 (BS-47, 后端 EXIST001)`, code: 'EXIST001' }) + // 修复 (2026-06-29 jxcj P1-5): 冲突时建议加 appCode 前缀 (如 "jxcj所属行业" 而非 "所属行业") + // appCode 启发: enCode 中有 `jxcj.` 前缀 或 fullName 中有 `jxcj` 字样 → 是 jxcj app + // 简化: 始终建议 "jxcj{原名}" (因为历史数据通常是平台级, app 用加前缀避免冲突) + const suggestedFullName = `jxcj${opts.fullName}` + errors.push({ field: 'fullName', message: `字典名称"${opts.fullName}"已存在 (BS-47, 后端 EXIST001). 建议: --fullName="${suggestedFullName}" (加 appCode 前缀)`, code: 'EXIST001' }) } } @@ -156,7 +160,9 @@ export function validateUniqueness(opts: { if (opts.enCode) { const dup = opts.existingTypes.find((t) => t.enCode === opts.enCode) if (dup) { - errors.push({ field: 'enCode', message: `字典编码"${opts.enCode}"已存在 (BS-47, 后端 EXIST002)`, code: 'EXIST002' }) + // 修复 (2026-06-29 jxcj P1-5): enCode 冲突建议用 dot-separated 形式 (如 jxcj.industry 而非 industry) + const suggestedEnCode = `jxcj.${opts.enCode.replace(/^jxcj\./, '')}` + errors.push({ field: 'enCode', message: `字典编码"${opts.enCode}"已存在 (BS-47, 后端 EXIST002). 建议: --enCode="${suggestedEnCode}" (加 appCode 前缀)`, code: 'EXIST002' }) } } diff --git a/src/commands/form/_ai.ts b/src/commands/form/_ai.ts index 97365ff..b5ea946 100644 --- a/src/commands/form/_ai.ts +++ b/src/commands/form/_ai.ts @@ -46,6 +46,17 @@ export interface AiFormModel { relationField?: string columnOptions?: Array<{ label?: string; value?: string; enCode?: string }> } + // 修复 (2026-06-29 jxcj P2-9): 字段扩展 — 字典引用 / 唯一约束 / 单据规则 + /** 关联字典 enCode (例如 "jxcj.industry"), 自动转 select 控件 + dictionaryType */ + dictionaryType?: string + /** UNIQUE 约束 (true = 字段值唯一), 提交时校验 + dm 层加 UNIQUE 索引 */ + unique?: boolean + /** 单据规则 (JNPF 自动生成单号), 必填 3 项: prefix(前缀) + middle(中位分隔符) + startValue(起始值) */ + billRule?: { + prefix?: string + middle?: string + startValue?: number + } }> } diff --git a/src/commands/form/_relationForm_auto.ts b/src/commands/form/_relationForm_auto.ts index c95c61f..17fc7a8 100644 --- a/src/commands/form/_relationForm_auto.ts +++ b/src/commands/form/_relationForm_auto.ts @@ -65,14 +65,17 @@ interface FormListItem { /** * 启发式: 字段名 → 候选目标 form enCode * + * 修复 (2026-06-29 jxcj P0-1): 增强匹配 - 支持 camelCase (f_direction_id → topicDirection) + * * 规则: - * f_target_space → 试 "tds_space" (去掉 f_ 前缀 + 末尾 _space 后缀 + 加 appCode 前缀? 直接用剩余部分) - * 实际上: f_target_space 推断 entity = "target_space"? 不一定. 更安全: - * 1. 取 f_ 后缀去掉, 按 _ 分割, 找 "space" / "id" / "code" 在最后位置 - * 2. 候选 entity = "space" / "policy" / "product" 等 (去掉末尾关系后缀的部分) - * 3. 候选 form enCode = entity (e.g. "space") - * 4. 还要加上 appCode 前缀? web 端 relationForm 不强制 appCode 前缀, form enCode 唯一即可 - * 简化: 直接用 entity 部分当 form enCode 候选 + * f_target_space → 试 "tds_space" (去掉 f_ 前缀 + 末尾 _space 后缀) + * f_direction_id → 试 "direction" + camelCase 变体 "Direction" + "topicDirection" (模糊匹配) + * 候选生成: + * 1. stem 整体 (snake_case) + * 2. stem 去下划线 (camelCase) + * 3. stem PascalCase (首字母大写) + * 4. stem 最后一段 (e.g. "user_role_id" → "role") + * 5. stem 全部小写 */ function deriveTargetEnCodes(vmodel: string): string[] { if (!vmodel || !vmodel.startsWith('f_')) return [] @@ -83,12 +86,26 @@ function deriveTargetEnCodes(vmodel: string): string[] { if (body.endsWith(suf)) { const stem = body.slice(0, -suf.length) if (!stem) return [] - // 候选 1: stem 整体作为 form enCode (e.g. "target_space" → "target_space") - // 候选 2: stem 拆最后一段 (e.g. "target_space" → "space"? 不, 用户可能真用 "target_space" 当 form) - // 候选 3: stem 拆首段 (e.g. "target_space" → "target"? 不一定) - // 安全做法: 全部尝试, 让 lookupFormsByEnCode 模糊匹配 - // 这里返回去重数组, 按"最匹配"排序 - return Array.from(new Set([stem, stem.replace(/_/g, '')])) + // 候选生成 (按优先级) + const candidates: string[] = [] + // 1. stem 整体 (snake_case) + candidates.push(stem) + // 2. stem 去下划线 (e.g. "user_role" → "userrole") + candidates.push(stem.replace(/_/g, '')) + // 3. stem 拆最后一段 (e.g. "user_role" → "role") + const parts = stem.split('_') + if (parts.length > 1) { + candidates.push(parts[parts.length - 1]) + // 3b. 最后一段 camelCase (e.g. "role" → "Role", 用于匹配 topicDirection) + const last = parts[parts.length - 1] + candidates.push(last.charAt(0).toUpperCase() + last.slice(1).toLowerCase()) + } + // 4. stem PascalCase 整体 (e.g. "user_role" → "UserRole") + const pascal = parts.map(p => p.charAt(0).toUpperCase() + p.slice(1).toLowerCase()).join('') + candidates.push(pascal) + // 5. stem 全部小写 + candidates.push(stem.toLowerCase()) + return Array.from(new Set(candidates)) } } return [] @@ -156,16 +173,33 @@ export async function autoDetectAndInjectRelationForm( const candidates = deriveTargetEnCodes(vmodel) if (candidates.length === 0) continue - // 在 form list 找匹配 (按 enCode 精确匹配 → 包含匹配) + // 在 form list 找匹配 (按 enCode 精确匹配 → 大小写不敏感匹配 → 包含匹配) + // 修复 (2026-06-29 jxcj P0-1): 大小写不敏感 + 包含匹配, 处理 camelCase (f_direction_id → topicDirection) let matched: FormListItem | null = null + // 1. 精确匹配 (enCode === cand) for (const cand of candidates) { matched = formList.find(f => f.enCode === cand) || null if (matched) break } - // 兜底: 包含匹配 (e.g. "target_space" → 找 enCode 含 "target_space" 的) + // 2. 大小写不敏感匹配 (enCode.toLowerCase() === cand.toLowerCase()) + // 处理: cand="Direction" vs enCode="topicDirection" → false; 但 cand="topicdirection" vs enCode="topicDirection" → true if (!matched) { for (const cand of candidates) { - matched = formList.find(f => f.enCode && f.enCode.includes(cand)) || null + const candLower = cand.toLowerCase() + matched = formList.find(f => f.enCode && f.enCode.toLowerCase() === candLower) || null + if (matched) break + } + } + // 3. 包含匹配 (enCode.toLowerCase() includes cand.toLowerCase() 或反向) + // 处理: cand="Direction" vs enCode="topicDirection" → enCode includes "Direction" → true + if (!matched) { + for (const cand of candidates) { + const candLower = cand.toLowerCase() + matched = formList.find(f => { + if (!f.enCode) return false + const encLower = f.enCode.toLowerCase() + return encLower.includes(candLower) || candLower.includes(encLower) + }) || null if (matched) break } } diff --git a/src/commands/form/bindflow.ts b/src/commands/form/bindflow.ts index bfd0031..11363da 100644 --- a/src/commands/form/bindflow.ts +++ b/src/commands/form/bindflow.ts @@ -1,5 +1,5 @@ /** - * commands/form/bindflow.ts — 表单绑工作流 (D-7 / BS-44 修复) + * commands/form/bindflow.ts — 表单绑工作流 (D-7 / BS-44 修复, v0.12+ 持久化验证) * * 背景: dacli form create --enableFlow=1 --flowId=X 设了 form 的 enableFlow=1, * 但 backend 不持久化 flowId (PUT /visualdev/Base/{id} 的 flowId 字段被忽略). @@ -7,15 +7,16 @@ * 反向绑 form 关系. 此外, JNPF web UI 在创建工作流模板时会显式选 form, 后台会建 * tdp_workflow_template.onLineformId 关联. 我们走 API 路径近似等价: * - * 1. PUT /visualdev/Base/{formId} body={enableFlow:1} - * 2. PUT /workflow/template/{flowId} body={onLineformId: formId} (实际可能不持久化) - * 3. POST /visualdev/Base/{formId}/Actions/Release 重新发布 + * 1. PUT /visualdev/Base/{formId} body={enableFlow:1, flowId:flowId} (form 端关联) + * 2. PUT /workflow/template/{flowId} body={onLineformId: formId, formId, onlineFormId} (workflow 端关联) + * 3. GET /workflow/template/{flowId} 验证 onLineformId 持久化 (v0.12+ 修复) + * 4. POST /visualdev/Base/{formId}/Actions/Release 重新发布 * * 用法: * dacli form bind-flow --formId=836303723314554053 --flowId=836303152285230277 * - * 已知限制: 完整双向绑定 (form 端 flowId 字段) 可能仍需 JNPF web UI 操作, 但 enableFlow - * 标志 + workflow 端 onLineformId 关联是最大努力. + * 修复 (2026-06-29 jxcj P0-3): bindFlow 后必须 GET 验证 onLineformId 已持久化, + * 不持久化则尝试 form 端 PUT 设 flowId, 都失败给明确错误 (避免 launch 400 "Data does not exist"). */ import { Command } from 'commander' import { JnpfClient } from '../../core/client.ts' @@ -32,14 +33,24 @@ interface BindFlowOpts { export function buildFormBindFlowCommand(): Command { const cmd = new Command('bindFlow') .alias('bind-flow') - .description('表单绑工作流 (D-7 修复 BS-44: 解决 form create --flowId 不持久化, 双端 PUT + 重发布)') + .description('表单绑工作流 (D-7 修复 BS-44 + v0.12+ 持久化验证: form 端 flowId + workflow 端 onLineformId)') .requiredOption('--formId ', '表单 id') .requiredOption('--flowId ', '工作流模板 id') .option('--json', '原始 JSON 输出', false) .action(async (opts: BindFlowOpts) => { const c = await JnpfClient.fromToken() + let persisted = false - // 1. workflow 端: 关联 form (走 onLineformId / formId / onlineFormId 3 字段尝试) + // 1. form 端: PUT enableFlow=1 + flowId (v0.12+ 新增, 解决 workflow 端不持久化) + log.info(`PUT /visualdev/Base/${opts.formId} body={enableFlow:1, flowId:${opts.flowId}}`) + const formPut = await c.putJson(`/visualdev/Base/${opts.formId}`, { + enableFlow: 1, + flowId: opts.flowId, + }) + if (formPut.code === 200) log.ok(' ↳ form 端关联 workflow (enableFlow=1, flowId)') + else log.warn(` ↳ form PUT 返 code=${formPut.code}: ${(formPut as any).msg?.slice?.(0, 60)}`) + + // 2. workflow 端: 关联 form (走 onLineformId / formId / onlineFormId 3 字段尝试) log.info(`PUT /workflow/template/${opts.flowId} body={onLineformId:${opts.formId}, formId:${opts.formId}, onlineFormId:${opts.formId}}`) const wfPut = await c.putJson(`/workflow/template/${opts.flowId}`, { onLineformId: opts.formId, @@ -47,29 +58,46 @@ export function buildFormBindFlowCommand(): Command { onlineFormId: opts.formId, }) if (wfPut.code === 200) log.ok(' ↳ workflow 关联 form (3 字段兜底) 返回 200') - else log.warn(` ↳ workflow bind 返 code=${wfPut.code}: ${wfPut.msg?.slice(0, 60)}`) + else log.warn(` ↳ workflow bind 返 code=${wfPut.code}: ${(wfPut as any).msg?.slice?.(0, 60)}`) - // 2. 重新发布 form (确保 enableFlow 标志被后端处理) - v0.11+ webapi + // 3. 验证持久化 (v0.12+ 修复: GET workflow template 看 onLineformId 是否真存) + const wfGet = await c.get<{ data?: { onLineformId?: string; formId?: string; onlineFormId?: string } }>(`/workflow/template/${opts.flowId}`) + const persistedFormId = wfGet?.data?.onLineformId || wfGet?.data?.formId || wfGet?.data?.onlineFormId + if (persistedFormId === opts.formId) { + log.ok(` ↳ 持久化验证 PASS (onLineformId=${persistedFormId})`) + persisted = true + } else { + log.warn(` ↳ 持久化验证 FAIL: workflow 端 onLineformId=${persistedFormId || '(空)'}, 期望=${opts.formId}`) + } + + // 4. 重新发布 form (确保 enableFlow 标志被后端处理) - v0.11+ webapi await initWebapi(c) log.info(`loadVisualDev.release (formId=${opts.formId})`) const rel = (await loadVisualDev.release(opts.formId)) as { code?: number; msg?: string } if (rel.code === 200 || rel.code === undefined) log.ok(' ↳ form 已重新发布 (state=1)') else log.warn(` ↳ release 返 code=${rel.code}: ${rel.msg?.slice(0, 60)}`) - log.ok(`✓ form ${opts.formId} <-> workflow ${opts.flowId} 绑定完成`) - log.info(' 说明: JNPF backend 走 update success 但不持久化 onLineformId (实测),') - log.info(' 完整绑定可能仍需 JNPF web UI 操作: 表单设计器 → 属性 → 选工作流') - if (opts.json) printJson({ formId: opts.formId, flowId: opts.flowId, status: 'best-effort' }) + if (persisted) { + log.ok(`✓ form ${opts.formId} <-> workflow ${opts.flowId} 绑定完成 (持久化已验证)`) + if (opts.json) printJson({ formId: opts.formId, flowId: opts.flowId, status: 'persisted' }) + } else { + log.error(`✗ form ${opts.formId} <-> workflow ${opts.flowId} 绑定未持久化`) + log.error(` 失败原因: JNPF backend 忽略 workflow 端 onLineformId 字段`) + log.error(` 解决方案: 在 JNPF web UI 操作: 表单设计器 → 属性 → 选工作流模板 → 保存`) + log.error(` 然后重新发布 form (本命令已做, 但需要 form 端有 flowId 字段)`) + if (opts.json) printJson({ formId: opts.formId, flowId: opts.flowId, status: 'failed', needWebUI: true }) + process.exit(1) + } }) installAiHelpHook(cmd, { - purpose: '表单绑工作流 (D-7 修复 BS-44). 三步: form 端 enableFlow=1, workflow 端 onLineformId 关联, 重新发布 form.', + purpose: '表单绑工作流 (D-7 修复 BS-44 + v0.12+ 持久化验证). 4 步: form 端 enableFlow+flowId, workflow 端 onLineformId 3 字段, GET 验证, 重新发布.', required: { '--formId': '表单 id', '--flowId': '工作流模板 id' }, example: 'dacli form bindFlow --formId=836303723314554053 --flowId=836303152285230277', - source: { api: 'PUT /visualdev/Base/{formId} + PUT /workflow/template/{flowId} + POST /visualdev/Base/{formId}/Actions/Release' }, + source: { api: 'PUT /visualdev/Base/{formId} + PUT + GET /workflow/template/{flowId} + POST /visualdev/Base/{formId}/Actions/Release' }, notes: [ - '本命令尽力双端绑定, 但 JNPF backend 可能仍需 web UI 完成 form.flowId 持久化', - '失败兜底: 走 JNPF web UI 表单设计器 → 选工作流模板 → 保存', + 'v0.12+ 修复 (jxcj P0-3): bindFlow 后实际 GET 验证 onLineformId 持久化, 失败明确错误+web UI 指引', + '失败兜底: 走 JNPF web UI 表单设计器 → 选工作流模板 → 保存 (同时保存 form 端 flowId 字段)', ], }) return cmd diff --git a/src/commands/menu/list.ts b/src/commands/menu/list.ts index caf1fdb..98e6ddc 100644 --- a/src/commands/menu/list.ts +++ b/src/commands/menu/list.ts @@ -26,7 +26,9 @@ export function buildMenuListCommand(): Command { .option('--keyword ', '按名称搜索') .option('--flat', '不按树形打印, 直接平铺', false) .option('--json', '原始 JSON 输出', false) - .option('--include-actions', '也列出 form 通过 Actions/Module 自动注册的菜单 (visualdev/Base 表, 不在 system/Menu 树里)', false) + // 修复 (2026-06-29 jxcj P2-8): --include-actions 默认 ON (用户经常需要看完整菜单树含 form-driven 子菜单) + .option('--include-actions', '也列出 form 通过 Actions/Module 自动注册的菜单 (visualdev/Base 表, 不在 system/Menu 树里; 默认 ON, --no-include-actions 关闭)', true) + .option('--no-include-actions', '不列 form-driven 菜单 (只列 system/Menu 树)') .action(async (opts: Opts) => { const c = await JnpfClient.fromToken() // v0.11+ Phase 1: 用 web 端 getMenuList (替代 c.get('/system/Menu/ModuleBySystem')) @@ -34,7 +36,7 @@ export function buildMenuListCommand(): Command { const r = (await loadMenu.getMenuList({ keyword: opts.keyword })) as unknown const list = (Array.isArray(r) ? r : (r as { list?: unknown[] })?.list) || [] - // --include-actions: 合并 visualdev/Base 的 form-driven 菜单 + // --include-actions: 合并 visualdev/Base 的 form-driven 菜单 (默认 ON, 修复 P2-8) let actionsMenus: FormReleasedMenu[] = [] let actionsMeta: { scanned: number; failed: number } = { scanned: 0, failed: 0 } if (opts.includeActions) { diff --git a/src/commands/workflow/create.ts b/src/commands/workflow/create.ts index 4df4a6e..27cb504 100644 --- a/src/commands/workflow/create.ts +++ b/src/commands/workflow/create.ts @@ -153,22 +153,31 @@ export function buildWorkflowCreateCommand(): Command { newId = (r.data as { id?: string }).id || '(unknown)' } // 兜底: 如果后端用 r.data 整个对象, 拉 list 查 enCode 拿到 id (最后一次兜底) - if (newId === '(unknown)' && opts.enCode) { + // 修复 (2026-06-29 jxcj P1-4): 拉 list 同时校验用户传的 enCode 是否真生效, JNPF 经常自动改 enCode (如 LC 流水号) + let actualEnCode = opts.enCode + if (newId !== '(unknown)' || opts.enCode) { try { const lr = await c.get<{ list?: Array<{ id: string; enCode: string }> }>('/workflow/template', { currentPage: 1, - pageSize: 5, + pageSize: 10, }) - const match = lr.list?.find((t) => t.enCode === opts.enCode) + // 优先按 id 匹配, 兜底按 enCode 匹配 + const matchById = lr.list?.find((t) => t.id === newId) + const matchByEnCode = lr.list?.find((t) => t.enCode === opts.enCode) + const match = matchById || matchByEnCode if (match?.id) { - newId = match.id - log.info(`兜底: 从 list 拉到 id=${newId} (enCode=${opts.enCode})`) + if (newId === '(unknown)') newId = match.id + actualEnCode = match.enCode + } + if (actualEnCode !== opts.enCode) { + log.warn(`⚠️ JNPF 后端未采用用户传的 enCode, 实际 = ${actualEnCode} (用户传 = ${opts.enCode})`) + log.warn(` 这是 JNPF 流水号机制, 使用实际 enCode "${actualEnCode}" 后续操作 (bindFlow/launch/...)`) } } catch { // 兜底失败忽略 } } - log.ok(`创建成功: id=${newId} enCode=${opts.enCode}`) + log.ok(`创建成功: id=${newId} enCode=${actualEnCode}`) // v0.11e+ Phase B2: auto-authorize (镜像 web 流程创建后自动授权给当前角色) if (opts.autoAuthorize) {