From 0fb757bb4505b0aeafa6c0ae6d32e7dfab1a73e0 Mon Sep 17 00:00:00 2001 From: ssw Date: Thu, 2 Jul 2026 12:36:21 +0800 Subject: [PATCH] =?UTF-8?q?P2-3=20=E4=BF=AE=E5=A4=8D:=20report=20delete=20?= =?UTF-8?q?--cascade/--yes=20(2026-07-02)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit FINDING-R5: report delete 无 --cascade 无 --yes, 误删风险 - 报表能挂菜单 (web 端 '生成菜单' 按钮, 走 createMenu) - 旧版 delete 单 --id 必填直接删, 跟 form/delete 不一致 - 后续 menu create --formId=X 报'主表不存在' 但菜单还在, 占 enCode 命名空间 (BS-43) 修复: - --cascade: 级联清理挂的菜单 (走 loadMenu.getMenuList 找 moduleId=reportId, 逐个 delMenu) - --yes: 跳过 TTY 确认 (跟 form/delete 一致) - 不加 --yes 在 TTY 下 exit 1 提示确认 (防 AI 误删) - 错误消息明确: 级联清理失败但报表已删, 不阻断 审计: dacli/docs/cmd-review/v0.14-rollout-audit-2026-07-02.md §2.1 R5 --- src/commands/report/delete.ts | 59 +++++++++++++++++++++++++++++++++-- 1 file changed, 57 insertions(+), 2 deletions(-) diff --git a/src/commands/report/delete.ts b/src/commands/report/delete.ts index 252f137..90436fe 100644 --- a/src/commands/report/delete.ts +++ b/src/commands/report/delete.ts @@ -17,17 +17,31 @@ import { initWebapi as initReportWebapi, loadReport } from '../../webapi/report. interface DeleteOpts { id: string json?: boolean + // v0.15+ (P2-3): 级联清理 + 确认选项 + cascade?: boolean + yes?: boolean } export function buildReportDeleteCommand(): Command { const cmd = new Command('delete') .description('删除报表 (BS-新116 配套, jyzs 2026-07-02 补, 镜像 web report.ts:30 delReport, 走 DELETE /api/Report/{id})') .requiredOption('--id ', '报表 id') + // v0.15+ (P2-3): --cascade 级联清理挂的菜单 (报表能挂菜单, web 端 "生成菜单" 按钮) + .option('--cascade', '级联清理: 删报表 + 删挂的菜单 (f_module_type=report)', false) + // v0.15+ (P2-3): --yes 跳过 TTY 确认 (跟 form/delete 一致, 防误删) + .option('--yes', '跳过 TTY 确认 (强制删除)', false) .option('--json', '原始 JSON 输出', false) .action(async (opts: DeleteOpts) => { const c = await JnpfClient.fromToken() await initReportWebapi(c) + // v0.15+ (P2-3): TTY 确认 (跟 form/delete 一致) + if (!opts.yes && process.stdin.isTTY) { + log.warn(`即将删除报表 id=${opts.id}${opts.cascade ? ' (含级联菜单清理)' : ''}, 此操作不可恢复`) + log.warn(' 提示: 加 --yes 跳过确认 (AI/脚本场景)') + process.exit(1) + } + // 镜像 web 端 delReport(id) → reportHttp.delete({url: `/api/Report/${id}`}) // webapi Proxy 自动调用 web 端函数 const r = (await loadReport.delReport(opts.id)) as unknown @@ -42,13 +56,51 @@ export function buildReportDeleteCommand(): Command { log.error(`report delete 失败 (code=${code}): ${msg}`) process.exit(1) } + + // v0.15+ (P2-3): --cascade 级联清理菜单 + if (opts.cascade) { + try { + const { loadMenu } = await import('../../webapi/menu.ts') + const { initWebapi as initMenuWebapi } = await import('../../webapi/menu.ts') + await initMenuWebapi(c) + // 找挂这个报表的菜单 (f_module_type='report' + f_module_id=opts.id) + const menuList = (await loadMenu.getMenuList()) as { data?: unknown } | unknown + const list = (menuList as { data?: { list?: unknown[] } })?.data?.list + || (Array.isArray(menuList) ? menuList as unknown[] : []) + const related = (list as Array<{ id?: string; moduleId?: string; type?: number }>).filter( + (m) => m.moduleId === opts.id || (m.type === 3 && m.moduleId === opts.id), // type=3 是 web 端 report module + ) + for (const m of related) { + if (m.id) { + try { + await loadMenu.delMenu(String(m.id)) + log.dim(` 级联清理菜单 id=${m.id}`) + } catch (e) { + log.warn(` 级联清理菜单 id=${m.id} 失败: ${(e as Error).message?.slice(0, 100)}`) + } + } + } + log.ok(`✓ 报表 + ${related.length} 个关联菜单已级联清理`) + } catch (e) { + log.warn(`--cascade 菜单清理失败 (报表已删): ${(e as Error).message?.slice(0, 100)}`) + } + } + log.ok(`✓ 报表已删除 id=${opts.id} (BS-新116 配套, msg="${msg || '删除成功'}")`) - if (opts.json) printJson({ id: opts.id, code, msg, raw: r }) + if (opts.json) printJson({ id: opts.id, code, msg, raw: r, cascade: opts.cascade }) }) installAiHelpHook(cmd, { purpose: '删除报表 (BS-新116 配套, 镜像 web report.ts:30 delReport, jnpf-datareport-univer /api/Report/{id})', required: { '--id': '报表 id' }, - example: ['dacli report delete --id=842032225770801349'], + optional: { + // v0.15+ (P2-3) + '--cascade': '级联清理: 删报表 + 删挂的菜单 (f_module_type=report)', + '--yes': '跳过 TTY 确认 (强制删除)', + }, + example: [ + 'dacli report delete --id=842032225770801349 --yes', + 'dacli report delete --id=842032225770801349 --cascade --yes # 级联清理挂的菜单', + ], source: { web: 'web/apps/jnpf-web-apps-main/src/api/onlineDev/report.ts:30 delReport(id)', api: 'DELETE /api/Report/{id} (走 webapi/report Proxy, 端口 32000 报表服务)', @@ -58,6 +110,9 @@ export function buildReportDeleteCommand(): Command { '**BS-新116 配套** (jyzs 2026-07-02): release 子命令新增后, 补 delete 子命令清理测试残留', '**web 镜像**: 走 web 端 delReport (reportHttp.delete → /api/Report/{id})', '**BACKEND-7 已知**: nginx /api/Report 重定向 /api/Report/ → 404, delete 走 DELETE /{id} 通常 200', + // v0.15+ (P2-3) + '**v0.15+ (P2-3)**: 加 --cascade (级联清理菜单, 报表能挂菜单) + --yes (TTY 确认)', + ' 防误删: 不加 --yes 时 TTY 下 exit 1 提示确认; 跟 form/delete 行为一致', ], }) return cmd