From 07463cb8c9daaada22a356606cc295e26d7c01a6 Mon Sep 17 00:00:00 2001 From: ssw Date: Tue, 21 Jul 2026 18:47:50 +0800 Subject: [PATCH] =?UTF-8?q?feat(dacli):=20P4=20v3=20batch=208=20=E2=80=94?= =?UTF-8?q?=20menu/list.ts=20(=E5=A4=8D=E6=9D=82=202=20=E8=A1=A8)=20wrapCo?= =?UTF-8?q?mmand=20+=20printRawTable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit menu/list.ts: 命令路径 P4 v3 全量最复杂文件 (1 文件 2 表 + 多 flag): - 表 1: system/Menu 树 (4 列 ID/FULL_NAME/ENCODE/URL), maxColWidth=80 - 表 2: form Actions/Module (4 列 FORM_ID/FORM_ENC/TYPE/MENU_PATH), PC+APP 两路平铺 Options 处理: - --include-actions 默认 ON (--no-include-actions 关), P2-8 修复 - --flat 保留 (但当前版本未实现树形打印, 后续 task) - --keyword 模糊搜索 改造要点: - printCommandEnd + try/catch/finally → wrapCommand + ctx.success/fail - 删本地 --verbose/--json (改 addOutputOptions 注入) - Opts interface 加 verbose?: boolean - log.raw('\n') 分隔两个表 (代替原 console.log('')) - Actions/Module 合并 flatMap: PC/APP 两路展平成多行 - 进度条 process.stderr.write("\r 扫描 form: ...") 保留 (不走 quiet 缓冲, 真实进度可见) - summary 对象含 systemMenus/formActionsMenus/formActionsScanned/formActionsFailed 验证: - TS compile 0 新错误 (baseline 57 不变) - 73/73 单元测试 PASS P4 v3 全量收口: 25 REAL_TABLE 文件全部迁移完毕. - 已 done (prior session): datasource/list, dm/{list,fields}, dict/datalist, di/list, apis/list (6) - 本 session (8 batches): report/list, storage/list, workflow/list, apis/{search,tags}, app/list, bigscreen/list, portal/list, doc/{list,toc}, form/selector, kb/list, msg/{noticeList,templateList}, monitor/online, org/list, print/list, role/{list,selector}, schedule/log, user/{get-position,list}, workflow/{selector,tasks}, menu/list (19) 总计 25/25 = 100%. --- src/commands/menu/list.ts | 169 +++++++++++++++++++------------------- 1 file changed, 86 insertions(+), 83 deletions(-) diff --git a/src/commands/menu/list.ts b/src/commands/menu/list.ts index f5427d8..a944167 100644 --- a/src/commands/menu/list.ts +++ b/src/commands/menu/list.ts @@ -12,7 +12,7 @@ import { installHelpHook } from '../../core/help.ts' import { log, printJson } from '../../core/log.ts' import { fetchAllFormReleasedMenus, type FormReleasedMenu } from './_helpers.ts' import { initWebapi, loadMenu } from '../../webapi/menu.ts' -import { setupOutputFilter, printCommandEnd } from '../_output_filter.ts' // v2.1+ (2026-07-21): 输出过滤 + CommandLog 落盘 +import { setupOutputFilter, addOutputOptions, wrapCommand } from '../_output_filter.ts' // v2.1+ 输出过滤; v2.2+ wrapCommand 收口 5c interface Opts { json?: boolean @@ -27,98 +27,101 @@ export function buildMenuListCommand(): Command { .description('菜单列表 (按当前 app system 过滤)') .option('--keyword ', '按名称搜索') .option('--flat', '不按树形打印, 直接平铺', false) - .option('--json', '原始 JSON 输出', 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 树)') - .option('--verbose', '完整输出 (含 API 调用过程日志)', false) + addOutputOptions(cmd) .action(async (opts: Opts) => { // 输出过滤: 默认静默 (quiet mode), --verbose 走完整日志, --json 走原始 JSON setupOutputFilter(opts) const c = await JnpfClient.fromToken() - const startTime = Date.now() - let cmdError: string | undefined - let cmdSummary: Record = {} - try { - // v0.11+ Phase 1: 用 web 端 getMenuList (替代 c.get('/system/Menu/ModuleBySystem')) - await initWebapi(c) - const r = (await loadMenu.getMenuList({ keyword: opts.keyword })) as unknown - const list = (Array.isArray(r) ? r : (r as { list?: unknown[] })?.list) || [] + await wrapCommand({ + command: 'menu list', + appCode: c.appCode, + startTime: Date.now(), + verbose: opts.verbose, + json: opts.json, + fixes: [], + }, async (ctx) => { + try { + // v0.11+ Phase 1: 用 web 端 getMenuList (替代 c.get('/system/Menu/ModuleBySystem')) + await initWebapi(c) + 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 菜单 (默认 ON, 修复 P2-8) - let actionsMenus: FormReleasedMenu[] = [] - let actionsMeta: { scanned: number; failed: number } = { scanned: 0, failed: 0 } - if (opts.includeActions) { - const r2 = await fetchAllFormReleasedMenus(c, { - onProgress: (done, total) => process.stderr.write(`\r 扫描 form: ${done}/${total}`), - }) - actionsMenus = r2.menus - actionsMeta = { scanned: r2.scanned, failed: r2.failed } - if (r2.scanned) process.stderr.write('\n') - } - cmdSummary = { - keyword: opts.keyword, - systemMenus: list.length, - formActionsMenus: actionsMenus.length, - formActionsScanned: actionsMeta.scanned, - formActionsFailed: actionsMeta.failed, - } - - if (opts.json) { - printJson({ - systemMenus: list, - ...(opts.includeActions ? { formActionsMenus: actionsMenus, formActionsMeta: actionsMeta } : {}), - }) - return - } - - log.info(`当前 app 共 ${list.length} 个菜单项`) - console.log('ID FULL_NAME ENCODE URL') - console.log('-'.repeat(100)) - for (const m of list as Record[]) { - const id = String(m.id || '').padEnd(36) - const name = String(m.fullName || '').padEnd(22) - const enc = String(m.enCode || '').padEnd(20) - console.log(`${id}${name}${enc}${m.urlAddress || ''}`) - } - - if (opts.includeActions) { - console.log('') - console.log('-'.repeat(100)) - log.info(`Actions/Module (form-driven, 扫描 ${actionsMeta.scanned} form, 失败 ${actionsMeta.failed}): ${actionsMenus.length} 条`) - console.log('FORM_ID FORM_ENC TYPE MENU_PATH') - console.log('-'.repeat(100)) - for (const m of actionsMenus) { - if (m.pcName) { - const fid = String(m.formId || '').padEnd(38) - const enc = String(m.formEnCode || '').padEnd(22) - console.log(`${fid}${enc}PC ${m.pcName}`) - } - if (m.appName) { - const fid = String(m.formId || '').padEnd(38) - const enc = String(m.formEnCode || '').padEnd(22) - console.log(`${fid}${enc}APP ${m.appName}`) - } + // --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) { + const r2 = await fetchAllFormReleasedMenus(c, { + onProgress: (done, total) => process.stderr.write(`\r 扫描 form: ${done}/${total}`), + }) + actionsMenus = r2.menus + actionsMeta = { scanned: r2.scanned, failed: r2.failed } + if (r2.scanned) process.stderr.write('\n') } + const summary = { + keyword: opts.keyword, + systemMenus: list.length, + formActionsMenus: actionsMenus.length, + formActionsScanned: actionsMeta.scanned, + formActionsFailed: actionsMeta.failed, + } + + if (opts.json) { + printJson({ + systemMenus: list, + ...(opts.includeActions ? { formActionsMenus: actionsMenus, formActionsMeta: actionsMeta } : {}), + }) + return ctx.success(summary) + } + + log.info(`当前 app 共 ${list.length} 个菜单项`) + log.printRawTable( + ['ID', 'FULL_NAME', 'ENCODE', 'URL'], + (list as Record[]).map((m) => [ + String(m.id || ''), + String(m.fullName || ''), + String(m.enCode || ''), + String(m.urlAddress || ''), + ]), + { maxColWidth: 80 }, + ) + + if (opts.includeActions) { + log.raw('\n') + log.info(`Actions/Module (form-driven, 扫描 ${actionsMeta.scanned} form, 失败 ${actionsMeta.failed}): ${actionsMenus.length} 条`) + log.printRawTable( + ['FORM_ID', 'FORM_ENC', 'TYPE', 'MENU_PATH'], + actionsMenus.flatMap((m) => { + const rows: string[][] = [] + if (m.pcName) { + rows.push([ + String(m.formId || ''), + String(m.formEnCode || ''), + 'PC', + m.pcName, + ]) + } + if (m.appName) { + rows.push([ + String(m.formId || ''), + String(m.formEnCode || ''), + 'APP', + m.appName, + ]) + } + return rows + }), + { maxColWidth: 80 }, + ) + } + ctx.success(summary) + } catch (e) { + ctx.fail(`menu list 失败: ${(e as Error).message?.slice(0, 200)}`) } - } catch (e) { - cmdError = (e as Error).message?.slice(0, 200) - log.error(`menu list 失败: ${cmdError}`) - throw e - } finally { - // v2.1+ (2026-07-21): 落 CommandLog (L3) - printCommandEnd({ - command: 'menu list', - appCode: c.appCode, - result: cmdError ? 'failure' : 'success', - error: cmdError, - summary: cmdSummary, - duration_ms: Date.now() - startTime, - verbose: opts.verbose, - json: opts.json, - }) - } + }) }) installHelpHook(cmd, { @@ -140,4 +143,4 @@ export function buildMenuListCommand(): Command { ], }) return cmd -} +} \ No newline at end of file