From 6009044fec4125fa316714a116a72ba79b46fa0e Mon Sep 17 00:00:00 2001 From: ssw Date: Fri, 24 Jul 2026 12:11:34 +0800 Subject: [PATCH] =?UTF-8?q?refactor(exit):=20P6c-2=20exemplar=20=E2=80=94?= =?UTF-8?q?=20migrate=20form=20delete=20to=20wrapCommand?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit First of the mutation-command wrapCommand migrations. Delete failure now routes through ctx.fail → CommandLog (dacli log last) instead of bare process.exit(1). The --yes interactive confirmation stays a pre-flight guard (user abort, not a loggable failure). Establishes the transform pattern for the remaining mutation cmds. Key scoping finding (recorded in PLAN P6c-2): wrapCommand adds printCommandEnd side-effects meant for MUTATIONS — READ/utility commands (log/*, app/status·context, kb/show·audit, test/generate, form/preview) should NOT be wrapped (output noise, no failure worth logging). So P6c-2 targets mutation cmds only, not all 23. Verified: tsc 0; form delete --help wires up; delete non-existent id → ctx.fail path prints failure + 'dacli log last' (routes through CommandLog). Co-Authored-By: Claude --- src/commands/form/delete.ts | 112 ++++++++++++++++++++---------------- 1 file changed, 63 insertions(+), 49 deletions(-) diff --git a/src/commands/form/delete.ts b/src/commands/form/delete.ts index 39e5486..2be4c84 100644 --- a/src/commands/form/delete.ts +++ b/src/commands/form/delete.ts @@ -9,10 +9,13 @@ import { Command } from 'commander' import { JnpfClient } from '../../core/client.ts' import { installHelpHookWithPatterns } from '../../core/help.ts' import { log } from '../../core/log.ts' +import { setupOutputFilter, addOutputOptions, wrapCommand } from '../_output_filter.ts' // P6c-2: wrapCommand 收口 (mutation 失败落 CommandLog) interface DeleteOpts { yes?: boolean cascade?: boolean + json?: boolean + verbose?: boolean } export function buildFormDeleteCommand(): Command { @@ -21,67 +24,78 @@ export function buildFormDeleteCommand(): Command { .argument('', '表单 id') .option('--yes', '跳过确认', false) .option('--cascade', '级联删关联菜单 (避免 BS-43)', false) + addOutputOptions(cmd) .action(async (id: string, opts: DeleteOpts) => { + setupOutputFilter(opts) + // 预检 (非失败, 不落 CommandLog): 未加 --yes 的交互确认 if (!opts.yes && process.stdin.isTTY) { log.warn(`确认删除 id=${id}? 加 --yes 跳过提示`) process.exit(1) } + const c = await JnpfClient.fromToken() + const startTime = Date.now() + await wrapCommand({ + command: 'form delete', + appCode: c.appCode, + startTime, + verbose: opts.verbose, + json: opts.json, + }, async (ctx) => { + // D-6 (BS-43 修复): --cascade 先调 unrelease 删 module 反向 menu 绑定 + // v0.19+ BS-新74 增强: cascade 时真正删 menu (不只解绑), 避免菜单残留 + if (opts.cascade) { + log.info(`D-6: 级联删菜单 (formId=${id})`) + const c2 = await JnpfClient.fromToken() + try { + // 1. 反向菜单解绑 (UnModule): form 跟 menu 关联字段清空 + const unr = await c2.postJson(`/visualdev/Base/${id}/Actions/UnModule`, {}) + if (unr.code === 200) log.ok(' ↳ 反向菜单解绑 (UnModule) 成功') + else log.warn(` ↳ UnModule 返回 code=${unr.code}: ${unr.msg?.slice(0, 60)}`) - // D-6 (BS-43 修复): --cascade 先调 unrelease 删 module 反向 menu 绑定 - // v0.19+ BS-新74 增强: cascade 时真正删 menu (不只解绑), 避免菜单残留 - if (opts.cascade) { - log.info(`D-6: 级联删菜单 (formId=${id})`) - const c2 = await JnpfClient.fromToken() - try { - // 1. 反向菜单解绑 (UnModule): form 跟 menu 关联字段清空 - const unr = await c2.postJson(`/visualdev/Base/${id}/Actions/UnModule`, {}) - if (unr.code === 200) log.ok(' ↳ 反向菜单解绑 (UnModule) 成功') - else log.warn(` ↳ UnModule 返回 code=${unr.code}: ${unr.msg?.slice(0, 60)}`) - - // 2. 查关联 menu + 真正删除 (BS-新74 增强, 避免菜单残留) - // web 端 getMenuList(/Menu/ModuleBySystem) 按 systemId 过滤, 不按 moduleId. - // form 关联的 menu 存在 propertyJson.moduleId 里, 需客户端过滤. - const { initWebapi, loadMenu } = await import('../../webapi/menu.ts') - await initWebapi(c2) - const menuList = (await loadMenu.getMenuList({})) as { - list?: Array<{ id?: string; fullName?: string; enCode?: string; propertyJson?: string }> - } - const relatedMenus = (menuList?.list || []).filter((m: any) => { - if (!m.propertyJson) return false - try { - const pj = JSON.parse(m.propertyJson) - return pj.moduleId === id - } catch { return false } - }) - if (relatedMenus.length === 0) { - log.info(' ↳ 无关联菜单 (propertyJson.moduleId === formId), 跳过菜单删除') - } else { - log.info(` ↳ 找到 ${relatedMenus.length} 个关联菜单, 逐个删除`) - for (const m of relatedMenus) { + // 2. 查关联 menu + 真正删除 (BS-新74 增强, 避免菜单残留) + // web 端 getMenuList(/Menu/ModuleBySystem) 按 systemId 过滤, 不按 moduleId. + // form 关联的 menu 存在 propertyJson.moduleId 里, 需客户端过滤. + const { initWebapi, loadMenu } = await import('../../webapi/menu.ts') + await initWebapi(c2) + const menuList = (await loadMenu.getMenuList({})) as { + list?: Array<{ id?: string; fullName?: string; enCode?: string; propertyJson?: string }> + } + const relatedMenus = (menuList?.list || []).filter((m: any) => { + if (!m.propertyJson) return false try { - // v0.19+ BS-新74 修正: web 端 delMenu 用 DELETE /api/system/Menu/{id} - // 镜像 web 端 menu.ts: defHttp.delete({ url: `${Api.Prefix}/${id}` }) - // 不是 POST + body {id: ...} (那是错的) - const del = await c2.del(`/system/Menu/${m.id}`) - if (del.code === 200) log.ok(` ↳ 删菜单 id=${m.id} (${m.fullName || m.enCode || '?'})`) - else log.warn(` ↳ 删菜单 id=${m.id} 失败 code=${del.code}: ${del.msg?.slice(0, 60)}`) - } catch (e) { - log.warn(` ↳ 删菜单 id=${m.id} 异常: ${(e as Error).message?.slice(0, 60)}`) + const pj = JSON.parse(m.propertyJson) + return pj.moduleId === id + } catch { return false } + }) + if (relatedMenus.length === 0) { + log.info(' ↳ 无关联菜单 (propertyJson.moduleId === formId), 跳过菜单删除') + } else { + log.info(` ↳ 找到 ${relatedMenus.length} 个关联菜单, 逐个删除`) + for (const m of relatedMenus) { + try { + // v0.19+ BS-新74 修正: web 端 delMenu 用 DELETE /api/system/Menu/{id} + // 镜像 web 端 menu.ts: defHttp.delete({ url: `${Api.Prefix}/${id}` }) + // 不是 POST + body {id: ...} (那是错的) + const del = await c2.del(`/system/Menu/${m.id}`) + if (del.code === 200) log.ok(` ↳ 删菜单 id=${m.id} (${m.fullName || m.enCode || '?'})`) + else log.warn(` ↳ 删菜单 id=${m.id} 失败 code=${del.code}: ${del.msg?.slice(0, 60)}`) + } catch (e) { + log.warn(` ↳ 删菜单 id=${m.id} 异常: ${(e as Error).message?.slice(0, 60)}`) + } } } + } catch (e) { + log.warn(` ↳ cascade 流程失败: ${(e as Error).message?.slice(0, 80)}`) } - } catch (e) { - log.warn(` ↳ cascade 流程失败: ${(e as Error).message?.slice(0, 80)}`) } - } - const c = await JnpfClient.fromToken() - const r = await c.del(`/visualdev/Base/${id}`) - if (r.code === 200) log.ok(`已删 id=${id}${opts.cascade ? ' (含级联菜单)' : ''}`) - else { - log.error(`删除失败 code=${r.code}: ${r.msg}`) - process.exit(1) - } + const r = await c.del(`/visualdev/Base/${id}`) + if (r.code !== 200) { + return ctx.fail(`删除失败 code=${r.code}: ${r.msg}`, { id }) + } + log.ok(`已删 id=${id}${opts.cascade ? ' (含级联菜单)' : ''}`) + ctx.success({ id, cascade: !!opts.cascade }) + }) }) installHelpHookWithPatterns(cmd, 'form delete', {