From 12f445b41eb5039d774d08dd257eb5ef21e99a39 Mon Sep 17 00:00:00 2001 From: ssw Date: Tue, 21 Jul 2026 18:44:29 +0800 Subject: [PATCH] =?UTF-8?q?feat(dacli):=20P4=20v3=20batch=205=20=E2=80=94?= =?UTF-8?q?=20msg=20+=20monitor=20+=20org=20+=20print=20+=20role=207=20?= =?UTF-8?q?=E6=96=87=E4=BB=B6=20wrapCommand=20+=20printRawTable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 7 文件: - msg/noticeList.ts: 4 列 ID/FULL_NAME/ENCODE/STATE (中文 '已发布/未发布') - msg/templateList.ts: 4 列 ID/FULL_NAME/ENCODE/ENABLED (中文 '是/否') - monitor/online.ts: 2 列 ID/USER - org/list.ts: 5 列 ID/FULL_NAME/PARENT_ID/CATEGORY/CHILDREN. UUID 截断 28+.. 保持原视觉 - print/list.ts: 4 列 ID/FULL_NAME/ENCODE/STATE (打印模板) - role/list.ts: 5 列 ID/FULL_NAME/ENCODE/TYPE/ENABLED (角色列表) - role/selector.ts: 4 列 ID/FULL_NAME/ENCODE/IS_SYSTEM (AI 选角色 id) 每文件统一模式: - import { setupOutputFilter, addOutputOptions, wrapCommand } - 删本地 --json (改 addOutputOptions 注入 --verbose --json) - .action 开头 setupOutputFilter(opts) - 整块业务逻辑 wrapCommand 包 + try/catch → ctx.success/fail - 原 code!==200 检查 → ctx.fail() (不再 process.exit) - console.log table → log.printRawTable 验证: - TS compile 0 新错误 (baseline 57 不变) - 73/73 单元测试 PASS 剩 6 REAL_TABLE 文件. 下批: schedule + user (3 文件). --- src/commands/monitor/online.ts | 50 +++++++++++++++------ src/commands/msg/noticelist.ts | 69 ++++++++++++++++++----------- src/commands/msg/templatelist.ts | 69 ++++++++++++++++++----------- src/commands/org/list.ts | 76 ++++++++++++++++++++------------ src/commands/print/list.ts | 72 +++++++++++++++++++----------- src/commands/role/list.ts | 73 ++++++++++++++++++------------ src/commands/role/selector.ts | 62 +++++++++++++++++--------- 7 files changed, 306 insertions(+), 165 deletions(-) diff --git a/src/commands/monitor/online.ts b/src/commands/monitor/online.ts index f023616..f8fcd92 100644 --- a/src/commands/monitor/online.ts +++ b/src/commands/monitor/online.ts @@ -9,30 +9,52 @@ import { JnpfClient } from '../../core/client.ts' import { installHelpHook } from '../../core/help.ts' import { log, printJson } from '../../core/log.ts' import { initWebapi, loadOnlineUser } from '../../webapi/onlineUser.ts' +import { setupOutputFilter, addOutputOptions, wrapCommand } from '../_output_filter.ts' // v2.1+ 输出过滤; v2.2+ wrapCommand 收口 5c interface ListOpts { json?: boolean + /** v2.1+ (2026-07-21): --verbose, addOutputOptions 注入 */ + verbose?: boolean } export function buildMonitorOnlineCommand(): Command { const cmd = new Command('online') .description('在线用户监控 (v0.11+ webapi)') - .option('--json', '原始 JSON 输出', false) + addOutputOptions(cmd) .action(async (opts: ListOpts) => { + setupOutputFilter(opts) const c = await JnpfClient.fromToken() - await initWebapi(c) - const r = (await loadOnlineUser.getOnlineUser({ currentPage: 1, pageSize: 50 })) as { list?: Record[] } - const list = r.list || [] - if (opts.json) { - printJson(r) - return - } - log.info(`当前在线 ${list.length} 个用户`) - console.log('ID USER') - console.log('-'.repeat(60)) - for (const d of list) { - console.log(`${String(d.id || '').padEnd(30)}${String(d.userName || d.account || '')}`) - } + + await wrapCommand({ + command: 'monitor online', + appCode: c.appCode, + startTime: Date.now(), + verbose: opts.verbose, + json: opts.json, + fixes: [], + }, async (ctx) => { + try { + await initWebapi(c) + const r = (await loadOnlineUser.getOnlineUser({ currentPage: 1, pageSize: 50 })) as { list?: Record[] } + const list = r.list || [] + const summary = { total: list.length } + if (opts.json) { + printJson(r) + return ctx.success(summary) + } + log.info(`当前在线 ${list.length} 个用户`) + log.printRawTable( + ['ID', 'USER'], + list.map((d) => [ + String(d.id || ''), + String(d.userName || d.account || ''), + ]), + ) + ctx.success(summary) + } catch (e) { + ctx.fail(`monitor online 失败: ${(e as Error).message?.slice(0, 200)}`) + } + }) }) installHelpHook(cmd, { purpose: '在线用户监控 (当前登录的用户)', diff --git a/src/commands/msg/noticelist.ts b/src/commands/msg/noticelist.ts index d77c522..d1d7ae2 100644 --- a/src/commands/msg/noticelist.ts +++ b/src/commands/msg/noticelist.ts @@ -7,6 +7,7 @@ import { Command } from 'commander' import { JnpfClient } from '../../core/client.ts' import { installHelpHook } from '../../core/help.ts' import { log, printJson } from '../../core/log.ts' +import { setupOutputFilter, addOutputOptions, wrapCommand } from '../_output_filter.ts' // v2.1+ 输出过滤; v2.2+ wrapCommand 收口 5c interface NoticeItem { id?: string @@ -21,6 +22,8 @@ interface NoticeItem { interface ListOpts { keyword?: string json?: boolean + /** v2.1+ (2026-07-21): --verbose, addOutputOptions 注入 */ + verbose?: boolean } export function buildMsgNoticeListCommand(): Command { @@ -28,34 +31,50 @@ export function buildMsgNoticeListCommand(): Command { .alias('notice-list') .description('列出通知公告 (站内信)') .option('--keyword ', '按名称/编码模糊搜索') - .option('--json', '原始 JSON 输出', false) + addOutputOptions(cmd) .action(async (opts: ListOpts) => { + setupOutputFilter(opts) const c = await JnpfClient.fromToken() - // JNPF Notice 列表用 POST /api/message/Notice/List (GET 返 405) - const r = await c.postJson<{ list: NoticeItem[] }>('/message/Notice/List', { - keyword: opts.keyword, - currentPage: 1, - pageSize: 50, + + await wrapCommand({ + command: 'msg noticeList', + appCode: c.appCode, + startTime: Date.now(), + verbose: opts.verbose, + json: opts.json, + fixes: [], + }, async (ctx) => { + try { + // JNPF Notice 列表用 POST /api/message/Notice/List (GET 返 405) + const r = await c.postJson<{ list: NoticeItem[] }>('/message/Notice/List', { + keyword: opts.keyword, + currentPage: 1, + pageSize: 50, + }) + if (r.code !== 200) { + return ctx.fail(`msg noticeList 失败 (code=${r.code}): ${r.msg}`, { keyword: opts.keyword, code: r.code }) + } + const list = r.data?.list || [] + const summary = { keyword: opts.keyword, total: list.length } + if (opts.json) { + printJson(r.data) + return ctx.success(summary) + } + log.info(`共 ${list.length} 个通知公告`) + log.printRawTable( + ['ID', 'FULL_NAME', 'ENCODE', 'STATE'], + list.map((d) => [ + String(d.id || ''), + String(d.fullName || d.title || ''), + String(d.enCode || ''), + d.state === 1 ? '已发布' : '未发布', + ]), + ) + ctx.success(summary) + } catch (e) { + ctx.fail(`msg noticeList 失败: ${(e as Error).message?.slice(0, 200)}`) + } }) - if (r.code !== 200) { - log.error(`msg noticelist 失败 (code=${r.code}): ${r.msg}`) - process.exit(1) - } - const list = r.data?.list || [] - if (opts.json) { - printJson(r.data) - return - } - log.info(`共 ${list.length} 个通知公告`) - console.log('ID FULL_NAME ENCODE STATE') - console.log('-'.repeat(85)) - for (const d of list) { - const id = String(d.id || '').padEnd(30) - const name = String(d.fullName || d.title || '').padEnd(23) - const code = String(d.enCode || '').padEnd(21) - const state = d.state === 1 ? '已发布' : '未发布' - console.log(`${id}${name}${code}${state}`) - } }) installHelpHook(cmd, { purpose: '列出通知公告 (站内信, msgCenter)', diff --git a/src/commands/msg/templatelist.ts b/src/commands/msg/templatelist.ts index e3e4848..3c18d74 100644 --- a/src/commands/msg/templatelist.ts +++ b/src/commands/msg/templatelist.ts @@ -7,6 +7,7 @@ import { Command } from 'commander' import { JnpfClient } from '../../core/client.ts' import { installHelpHook } from '../../core/help.ts' import { log, printJson } from '../../core/log.ts' +import { setupOutputFilter, addOutputOptions, wrapCommand } from '../_output_filter.ts' // v2.1+ 输出过滤; v2.2+ wrapCommand 收口 5c interface TemplateItem { id?: string @@ -19,6 +20,8 @@ interface TemplateItem { interface ListOpts { keyword?: string json?: boolean + /** v2.1+ (2026-07-21): --verbose, addOutputOptions 注入 */ + verbose?: boolean } export function buildMsgTemplateListCommand(): Command { @@ -26,34 +29,50 @@ export function buildMsgTemplateListCommand(): Command { .alias('template-list') .description('列出消息模板 (站内信/邮件/短信/Webhook 模板)') .option('--keyword ', '按名称/编码模糊搜索') - .option('--json', '原始 JSON 输出', false) + addOutputOptions(cmd) .action(async (opts: ListOpts) => { + setupOutputFilter(opts) const c = await JnpfClient.fromToken() - // web msgTemplate.ts: Prefix = '/api/message/MessageTemplateConfig' - const r = await c.get<{ list: TemplateItem[] }>('/message/MessageTemplateConfig', { - keyword: opts.keyword, - currentPage: 1, - pageSize: 50, + + await wrapCommand({ + command: 'msg templateList', + appCode: c.appCode, + startTime: Date.now(), + verbose: opts.verbose, + json: opts.json, + fixes: [], + }, async (ctx) => { + try { + // web msgTemplate.ts: Prefix = '/api/message/MessageTemplateConfig' + const r = await c.get<{ list: TemplateItem[] }>('/message/MessageTemplateConfig', { + keyword: opts.keyword, + currentPage: 1, + pageSize: 50, + }) + if (r.code !== 200) { + return ctx.fail(`msg templateList 失败 (code=${r.code}): ${r.msg}`, { keyword: opts.keyword, code: r.code }) + } + const list = r.data?.list || [] + const summary = { keyword: opts.keyword, total: list.length } + if (opts.json) { + printJson(r.data) + return ctx.success(summary) + } + log.info(`共 ${list.length} 个消息模板`) + log.printRawTable( + ['ID', 'FULL_NAME', 'ENCODE', 'ENABLED'], + list.map((d) => [ + String(d.id || ''), + String(d.fullName || ''), + String(d.enCode || ''), + d.enabledMark === 1 ? '是' : '否', + ]), + ) + ctx.success(summary) + } catch (e) { + ctx.fail(`msg templateList 失败: ${(e as Error).message?.slice(0, 200)}`) + } }) - if (r.code !== 200) { - log.error(`msg templatelist 失败 (code=${r.code}): ${r.msg}`) - process.exit(1) - } - const list = r.data?.list || [] - if (opts.json) { - printJson(r.data) - return - } - log.info(`共 ${list.length} 个消息模板`) - console.log('ID FULL_NAME ENCODE ENABLED') - console.log('-'.repeat(85)) - for (const d of list) { - const id = String(d.id || '').padEnd(30) - const name = String(d.fullName || '').padEnd(23) - const code = String(d.enCode || '').padEnd(21) - const en = d.enabledMark === 1 ? '是' : '否' - console.log(`${id}${name}${code}${en}`) - } }) installHelpHook(cmd, { purpose: '列出消息模板 (站内信/邮件/短信 模板)', diff --git a/src/commands/org/list.ts b/src/commands/org/list.ts index eec7f92..ef34c1c 100644 --- a/src/commands/org/list.ts +++ b/src/commands/org/list.ts @@ -7,6 +7,7 @@ import { Command } from 'commander' import { JnpfClient } from '../../core/client.ts' import { installHelpHook } from '../../core/help.ts' import { log, printJson } from '../../core/log.ts' +import { setupOutputFilter, addOutputOptions, wrapCommand } from '../_output_filter.ts' // v2.1+ 输出过滤; v2.2+ wrapCommand 收口 5c interface OrgItem { id?: string @@ -22,42 +23,63 @@ interface OrgItem { interface ListOpts { parentId?: string json?: boolean + /** v2.1+ (2026-07-21): --verbose, addOutputOptions 注入 */ + verbose?: boolean } export function buildOrgListCommand(): Command { const cmd = new Command('list') .description('列出组织树 (P1 权限三角 3 号, 根 → 公司 → 部门 → 岗位)') .option('--parentId ', '从指定父节点展开 (默认根 "0")', '0') - .option('--json', '原始 JSON 输出', false) + addOutputOptions(cmd) .action(async (opts: ListOpts) => { + setupOutputFilter(opts) const c = await JnpfClient.fromToken() - const r = await c.get<{ list: OrgItem[] }>('/permission/Organize/Selector', { - parentId: opts.parentId, - currentPage: 1, - pageSize: 200, + + await wrapCommand({ + command: 'org list', + appCode: c.appCode, + startTime: Date.now(), + verbose: opts.verbose, + json: opts.json, + fixes: [], + }, async (ctx) => { + try { + const r = await c.get<{ list: OrgItem[] }>('/permission/Organize/Selector', { + parentId: opts.parentId, + currentPage: 1, + pageSize: 200, + }) + if (r.code !== 200) { + return ctx.fail(`org list 失败 (code=${r.code}): ${r.msg}`, { parentId: opts.parentId, code: r.code }) + } + const list = r.data?.list || [] + const summary = { parentId: opts.parentId, total: list.length } + if (opts.json) { + printJson(r.data) + return ctx.success(summary) + } + log.info(`共 ${list.length} 个组织节点 (从 parentId=${opts.parentId} 展开)`) + log.printRawTable( + ['ID', 'FULL_NAME', 'PARENT_ID', 'CATEGORY', 'CHILDREN'], + list.map((d) => { + // UUID id 可能 36 字符, 截断到前 28 字符 + '..' 标识 (保持原版视觉) + const id = String(d.id || '') + const idShort = id.length > 30 ? id.slice(0, 28) + '..' : id + return [ + idShort, + String(d.fullName || ''), + String(d.parentId || ''), + String(d.category || '-'), + d.hasChildren ? 'yes' : 'no', + ] + }), + ) + ctx.success(summary) + } catch (e) { + ctx.fail(`org list 失败: ${(e as Error).message?.slice(0, 200)}`) + } }) - if (r.code !== 200) { - log.error(`org list 失败 (code=${r.code}): ${r.msg}`) - process.exit(1) - } - const list = r.data?.list || [] - if (opts.json) { - printJson(r.data) - return - } - log.info(`共 ${list.length} 个组织节点 (从 parentId=${opts.parentId} 展开)`) - console.log('ID FULL_NAME PARENT_ID CATEGORY CHILDREN') - console.log('-'.repeat(100)) - for (const d of list) { - // UUID id 可能 36 字符, 截断到前 30 字符 + '..' 标识 - const id = String(d.id || '') - const idShort = id.length > 30 ? id.slice(0, 28) + '..' : id.padEnd(30) - const name = String(d.fullName || '').padEnd(23) - const parent = String(d.parentId || '').padEnd(11) - const cat = String(d.category || '-').padEnd(10) - const ch = d.hasChildren ? 'yes' : 'no' - console.log(`${idShort} ${name} ${parent} ${cat} ${ch}`) - } }) installHelpHook(cmd, { purpose: '列出组织树 (P1 权限三角 3 号)', diff --git a/src/commands/print/list.ts b/src/commands/print/list.ts index ba37af6..3ae2584 100644 --- a/src/commands/print/list.ts +++ b/src/commands/print/list.ts @@ -14,6 +14,7 @@ import { JnpfClient } from '../../core/client.ts' import { installHelpHook } from '../../core/help.ts' import { log, printJson } from '../../core/log.ts' import { initWebapi as initPrintDevWebapi, getPrintDevList } from '../../webapi/printDev.ts' +import { setupOutputFilter, addOutputOptions, wrapCommand } from '../_output_filter.ts' // v2.1+ 输出过滤; v2.2+ wrapCommand 收口 5c interface PrintItem { id?: string @@ -28,40 +29,59 @@ interface PrintItem { interface ListOpts { keyword?: string json?: boolean + /** v2.1+ (2026-07-21): --verbose, addOutputOptions 注入 */ + verbose?: boolean } export function buildPrintListCommand(): Command { const cmd = new Command('list') .description('列出打印模板') .option('--keyword ', '按名称/编码模糊搜索') - .option('--json', '原始 JSON 输出', false) + addOutputOptions(cmd) .action(async (opts: ListOpts) => { + setupOutputFilter(opts) const c = await JnpfClient.fromToken() - // v3.0+ 调用 webapi/printDev.initWebapi - // initWebapi 加载 web 端 system/printDev.ts 形成镜像链路 (CI 关卡 G 要求) - // 实际数据获取走 loadPrintDev.getPrintDevList → defHttp shim (已 unwrap 信封) → 后端 - await initPrintDevWebapi(c) - // shim 已 unwrap: r 形如 { pagination, list } (无 code/data 嵌套) - const r = (await getPrintDevList({ - keyword: opts.keyword, - currentPage: 1, - pageSize: 50, - })) as { list?: PrintItem[]; pagination?: unknown } - const list: PrintItem[] = r.list || [] - if (opts.json) { - printJson(r) - return - } - log.info(`共 ${list.length} 个打印模板`) - console.log('ID FULL_NAME ENCODE STATE') - console.log('-'.repeat(85)) - for (const d of list) { - const id = String(d.id || '').padEnd(30) - const name = String(d.fullName || '').padEnd(23) - const code = String(d.enCode || '').padEnd(21) - const state = d.state === 1 ? '已发布' : '未发布' - console.log(`${id}${name}${code}${state}`) - } + + await wrapCommand({ + command: 'print list', + appCode: c.appCode, + startTime: Date.now(), + verbose: opts.verbose, + json: opts.json, + fixes: [], + }, async (ctx) => { + try { + // v3.0+ 调用 webapi/printDev.initWebapi + // initWebapi 加载 web 端 system/printDev.ts 形成镜像链路 (CI 关卡 G 要求) + // 实际数据获取走 loadPrintDev.getPrintDevList → defHttp shim (已 unwrap 信封) → 后端 + await initPrintDevWebapi(c) + // shim 已 unwrap: r 形如 { pagination, list } (无 code/data 嵌套) + const r = (await getPrintDevList({ + keyword: opts.keyword, + currentPage: 1, + pageSize: 50, + })) as { list?: PrintItem[]; pagination?: unknown } + const list: PrintItem[] = r.list || [] + const summary = { keyword: opts.keyword, total: list.length } + if (opts.json) { + printJson(r) + return ctx.success(summary) + } + log.info(`共 ${list.length} 个打印模板`) + log.printRawTable( + ['ID', 'FULL_NAME', 'ENCODE', 'STATE'], + list.map((d) => [ + String(d.id || ''), + String(d.fullName || ''), + String(d.enCode || ''), + d.state === 1 ? '已发布' : '未发布', + ]), + ) + ctx.success(summary) + } catch (e) { + ctx.fail(`print list 失败: ${(e as Error).message?.slice(0, 200)}`) + } + }) }) installHelpHook(cmd, { purpose: '列出打印模板 (绑 form 数据, 套打)', diff --git a/src/commands/role/list.ts b/src/commands/role/list.ts index ed71550..1d57ca8 100644 --- a/src/commands/role/list.ts +++ b/src/commands/role/list.ts @@ -9,6 +9,7 @@ import { JnpfClient } from '../../core/client.ts' import { installHelpHook } from '../../core/help.ts' import { log, printJson } from '../../core/log.ts' import { initWebapi, loadRole } from '../../webapi/role.ts' +import { setupOutputFilter, addOutputOptions, wrapCommand } from '../_output_filter.ts' // v2.1+ 输出过滤; v2.2+ wrapCommand 收口 5c interface RoleItem { id?: string @@ -22,41 +23,59 @@ interface RoleItem { interface ListOpts { keyword?: string json?: boolean + /** v2.1+ (2026-07-21): --verbose, addOutputOptions 注入 */ + verbose?: boolean } export function buildRoleListCommand(): Command { const cmd = new Command('list') .description('列出角色 (权限载体, P1 权限三角核心, v0.14+ webapi)') .option('--keyword ', '按名称/编码模糊搜索') - .option('--json', '原始 JSON 输出', false) + addOutputOptions(cmd) .action(async (opts: ListOpts) => { + setupOutputFilter(opts) const c = await JnpfClient.fromToken() - await initWebapi(c) - const r = (await loadRole.getRoleList({ - keyword: opts.keyword, - currentPage: 1, - pageSize: 50, - })) as { code?: number; msg?: string; data?: { list?: RoleItem[] } } - if (r.code !== 200) { - log.error(`role list 失败 (code=${r.code}): ${r.msg}`) - process.exit(1) - } - const list = r.data?.list || [] - if (opts.json) { - printJson(r.data) - return - } - log.info(`共 ${list.length} 个角色`) - console.log('ID FULL_NAME ENCODE TYPE ENABLED') - console.log('-'.repeat(95)) - for (const d of list) { - const id = String(d.id || '').padEnd(30) - const name = String(d.fullName || '').padEnd(23) - const code = String(d.enCode || '').padEnd(21) - const type = String(d.type || '').padEnd(11) - const enabled = d.enabledMark === 1 ? '是' : '否' - console.log(`${id}${name}${code}${type}${enabled}`) - } + + await wrapCommand({ + command: 'role list', + appCode: c.appCode, + startTime: Date.now(), + verbose: opts.verbose, + json: opts.json, + fixes: [], + }, async (ctx) => { + try { + await initWebapi(c) + const r = (await loadRole.getRoleList({ + keyword: opts.keyword, + currentPage: 1, + pageSize: 50, + })) as { code?: number; msg?: string; data?: { list?: RoleItem[] } } + if (r.code !== 200) { + return ctx.fail(`role list 失败 (code=${r.code}): ${r.msg}`, { keyword: opts.keyword, code: r.code }) + } + const list = r.data?.list || [] + const summary = { keyword: opts.keyword, total: list.length } + if (opts.json) { + printJson(r.data) + return ctx.success(summary) + } + log.info(`共 ${list.length} 个角色`) + log.printRawTable( + ['ID', 'FULL_NAME', 'ENCODE', 'TYPE', 'ENABLED'], + list.map((d) => [ + String(d.id || ''), + String(d.fullName || ''), + String(d.enCode || ''), + String(d.type || ''), + d.enabledMark === 1 ? '是' : '否', + ]), + ) + ctx.success(summary) + } catch (e) { + ctx.fail(`role list 失败: ${(e as Error).message?.slice(0, 200)}`) + } + }) }) installHelpHook(cmd, { purpose: '列出角色 (权限载体, P1 权限三角核心)', diff --git a/src/commands/role/selector.ts b/src/commands/role/selector.ts index 805fc26..00be948 100644 --- a/src/commands/role/selector.ts +++ b/src/commands/role/selector.ts @@ -9,11 +9,14 @@ import { JnpfClient } from '../../core/client.ts' import { installHelpHook } from '../../core/help.ts' import { log, printJson } from '../../core/log.ts' import { initWebapi, loadRole } from '../../webapi/role.ts' +import { setupOutputFilter, addOutputOptions, wrapCommand } from '../_output_filter.ts' // v2.1+ 输出过滤; v2.2+ wrapCommand 收口 5c interface Opts { type?: string isSystem?: string json?: boolean + /** v2.1+ (2026-07-21): --verbose, addOutputOptions 注入 */ + verbose?: boolean } export function buildRoleSelectorCommand(): Command { @@ -21,29 +24,46 @@ export function buildRoleSelectorCommand(): Command { .description('角色下拉框 (AI 引用角色 id 必需, v0.11+ webapi)') .option('--type ', '角色类型 (0=全局 1=部门)', (v) => parseInt(v, 10)) .option('--isSystem <0|1>', '是否系统内置') - .option('--json', '原始 JSON 输出', false) + addOutputOptions(cmd) .action(async (opts: Opts) => { + setupOutputFilter(opts) const c = await JnpfClient.fromToken() - await initWebapi(c) - const data = (await loadRole.getRoleSelector( - opts.type !== undefined ? String(opts.type) : '', - opts.isSystem !== undefined ? parseInt(opts.isSystem, 10) : null, - )) as { list?: Record[] } | Record[] - const list = Array.isArray(data) ? data : data.list || [] - if (opts.json) { - printJson({ count: list.length, list }) - return - } - log.info(`角色下拉框 ${list.length} 条`) - console.log('ID'.padEnd(36) + 'FULL_NAME'.padEnd(23) + 'ENCODE'.padEnd(21) + 'IS_SYSTEM') - console.log('-'.repeat(95)) - for (const r of list) { - const id = String(r.id || '').padEnd(36) - const name = String(r.fullName || '').padEnd(23) - const code = String(r.enCode || '').padEnd(21) - const sys = r.isSystem === 1 ? '是' : '否' - console.log(`${id}${name}${code}${sys}`) - } + + await wrapCommand({ + command: 'role selector', + appCode: c.appCode, + startTime: Date.now(), + verbose: opts.verbose, + json: opts.json, + fixes: [], + }, async (ctx) => { + try { + await initWebapi(c) + const data = (await loadRole.getRoleSelector( + opts.type !== undefined ? String(opts.type) : '', + opts.isSystem !== undefined ? parseInt(opts.isSystem, 10) : null, + )) as { list?: Record[] } | Record[] + const list = Array.isArray(data) ? data : data.list || [] + const summary = { type: opts.type, isSystem: opts.isSystem, total: list.length } + if (opts.json) { + printJson({ count: list.length, list }) + return ctx.success(summary) + } + log.info(`角色下拉框 ${list.length} 条`) + log.printRawTable( + ['ID', 'FULL_NAME', 'ENCODE', 'IS_SYSTEM'], + list.map((r) => [ + String(r.id || ''), + String(r.fullName || ''), + String(r.enCode || ''), + r.isSystem === 1 ? '是' : '否', + ]), + ) + ctx.success(summary) + } catch (e) { + ctx.fail(`role selector 失败: ${(e as Error).message?.slice(0, 200)}`) + } + }) }) installHelpHook(cmd, { purpose: '角色下拉框. AI 选角色 id 必需 (form 配置 / menu 授权).',