From 4c417cc6860419d06fef1d3e96dd2ae98b513360 Mon Sep 17 00:00:00 2001 From: ssw Date: Tue, 21 Jul 2026 18:46:57 +0800 Subject: [PATCH] =?UTF-8?q?feat(dacli):=20P4=20v3=20batch=207=20=E2=80=94?= =?UTF-8?q?=20workflow/{selector,tasks}=20=E5=AE=8C=E6=95=B4=20wrapCommand?= =?UTF-8?q?=20+=20printRawTable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2 文件: - workflow/selector.ts: 4 列 ID/FULL_NAME/ENCODE/CATEGORY (AI 创建菜单挂工作流 type=4 时必跑) - workflow/tasks.ts: 5 列 TASK_ID/FLOW_NAME/CREATOR/TIME/STATE (我的流程任务 待签/待办/已办/抄送) 每文件统一模式: - 改 import setupOutputFilter → setupOutputFilter, addOutputOptions, wrapCommand - 删本地 --verbose/--json (改 addOutputOptions 注入) - Opts interface 加 verbose?: boolean - .action 开头 setupOutputFilter(opts) - 整块业务逻辑 wrapCommand 包 + try/catch → ctx.success/fail - 原 code!==200 检查 → ctx.fail() - console.log table → log.printRawTable workflow/tasks 特殊: - 5 列最长, default maxColWidth=36 自动截断足够 - 多种 fallback 字段名 (id||taskId, flowName||fullName, creatorUser||userName, ...) - CATEGORY_NAMES 中文映射 (待签/待办/已办/抄送) 验证: - TS compile 0 新错误 (baseline 57 不变) - 73/73 单元测试 PASS 剩 1 REAL_TABLE 文件. 下批: menu/list.ts (复杂 2 表 + --include-actions + --flat 选项, 用 Write 全文件重写). --- src/commands/workflow/selector.ts | 67 ++++++++++++++++------- src/commands/workflow/tasks.ts | 90 ++++++++++++++++++------------- 2 files changed, 100 insertions(+), 57 deletions(-) diff --git a/src/commands/workflow/selector.ts b/src/commands/workflow/selector.ts index 981caee..85ff21e 100644 --- a/src/commands/workflow/selector.ts +++ b/src/commands/workflow/selector.ts @@ -11,7 +11,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 } from '../_output_filter.ts' +import { setupOutputFilter, addOutputOptions, wrapCommand } from '../_output_filter.ts' // v2.1+ 输出过滤; v2.2+ wrapCommand 收口 5c import { initWebapi, loadWorkflow } from '../../webapi/workflow.ts' interface Opts { @@ -19,6 +19,8 @@ interface Opts { keyword?: string category?: string formType?: string + /** v2.1+ (2026-07-21): --verbose, addOutputOptions 注入 */ + verbose?: boolean } export function buildWorkflowSelectorCommand(): Command { @@ -28,28 +30,53 @@ export function buildWorkflowSelectorCommand(): Command { .option('--keyword ', '按编码/名称搜索') .option('--category ', '流程分类') .option('--formType ', '表单类型过滤 (0=全部 1=在线表单 2=系统表单)') - .option('--verbose', '完整输出 (含 step machine、API 调用等过程日志)', false) - .option('--json', '原始 JSON 输出 (推荐 AI 用)', false) + addOutputOptions(cmd) .action(async (opts: Opts) => { setupOutputFilter(opts) const c = await JnpfClient.fromToken() - // v0.11+: 用 web 端 getFlowSelector - await initWebapi(c) - const resp = (await loadWorkflow.getFlowSelector({ - keyword: opts.keyword, - category: opts.category, - formType: opts.formType, - })) as Array<{ id: string; fullName: string; enCode?: string; category?: string }> | { list?: unknown[] } - const list = Array.isArray(resp) ? resp : ((resp as { list?: unknown[] })?.list || []) - if (opts.json) { printJson(list); return } - log.info(`共 ${list.length} 个流程模板 (selector)`) - console.log('ID FULL_NAME ENCODE CATEGORY') - console.log('-'.repeat(100)) - for (const t of list as Array>) { - console.log( - `${String(t.id || '').padEnd(36)}${String(t.fullName || '').padEnd(22)}${String(t.enCode || '').padEnd(22)}${t.category || ''}`, - ) - } + + await wrapCommand({ + command: 'workflow selector', + appCode: c.appCode, + startTime: Date.now(), + verbose: opts.verbose, + json: opts.json, + fixes: [], + }, async (ctx) => { + try { + // v0.11+: 用 web 端 getFlowSelector + await initWebapi(c) + const resp = (await loadWorkflow.getFlowSelector({ + keyword: opts.keyword, + category: opts.category, + formType: opts.formType, + })) as Array<{ id: string; fullName: string; enCode?: string; category?: string }> | { list?: unknown[] } + const list = Array.isArray(resp) ? resp : ((resp as { list?: unknown[] })?.list || []) + const summary = { + keyword: opts.keyword, + category: opts.category, + formType: opts.formType, + total: list.length, + } + if (opts.json) { + printJson(list) + return ctx.success(summary) + } + log.info(`共 ${list.length} 个流程模板 (selector)`) + log.printRawTable( + ['ID', 'FULL_NAME', 'ENCODE', 'CATEGORY'], + (list as Array>).map((t) => [ + String(t.id || ''), + String(t.fullName || ''), + String(t.enCode || ''), + String(t.category || ''), + ]), + ) + ctx.success(summary) + } catch (e) { + ctx.fail(`workflow selector 失败: ${(e as Error).message?.slice(0, 200)}`) + } + }) }) installHelpHook(cmd, { diff --git a/src/commands/workflow/tasks.ts b/src/commands/workflow/tasks.ts index 5a54600..4a0e726 100644 --- a/src/commands/workflow/tasks.ts +++ b/src/commands/workflow/tasks.ts @@ -13,13 +13,15 @@ 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 } from '../_output_filter.ts' +import { setupOutputFilter, addOutputOptions, wrapCommand } from '../_output_filter.ts' // v2.1+ 输出过滤; v2.2+ wrapCommand 收口 5c interface Opts { category?: string keyword?: string flowId?: string json?: boolean + /** v2.1+ (2026-07-21): --verbose, addOutputOptions 注入 */ + verbose?: boolean } const CATEGORY_NAMES: Record = { @@ -35,48 +37,62 @@ export function buildWorkflowTasksCommand(): Command { .option('--category <1|2|3|4>', '任务分类 1=待签 2=待办 3=已办 4=抄送 (默认 2)', '2') .option('--flowId ', '按流程模板 id 过滤') .option('--keyword ', '按关键字模糊搜索 (流程名/发起人/单号)') - .option('--verbose', '完整输出 (含 step machine、API 调用等过程日志)', false) - .option('--json', '原始 JSON 输出', false) + addOutputOptions(cmd) .action(async (opts: Opts) => { setupOutputFilter(opts) const c = await JnpfClient.fromToken() - const category = opts.category || '2' - const params: Record = { - currentPage: '1', - pageSize: '20', - } - if (opts.flowId) params.flowId = opts.flowId - if (opts.keyword) params.keyword = opts.keyword - const r = (await c.get(`/workflow/operator/List/${category}`, params)) as { - code?: number - msg?: string - data?: { list?: TaskItem[]; pagination?: { total: number } } - } + await wrapCommand({ + command: 'workflow tasks', + appCode: c.appCode, + startTime: Date.now(), + verbose: opts.verbose, + json: opts.json, + fixes: [], + }, async (ctx) => { + try { + const category = opts.category || '2' + const params: Record = { + currentPage: '1', + pageSize: '20', + } + if (opts.flowId) params.flowId = opts.flowId + if (opts.keyword) params.keyword = opts.keyword - if (r?.code && r.code !== 200) { - log.error(`workflow tasks 失败: ${r.msg}`) - process.exit(1) - } - const list = r.data?.list || [] - const total = r.data?.pagination?.total ?? list.length + const r = (await c.get(`/workflow/operator/List/${category}`, params)) as { + code?: number + msg?: string + data?: { list?: TaskItem[]; pagination?: { total: number } } + } - if (opts.json) { - printJson(r) - return - } - const catName = CATEGORY_NAMES[category] || `category=${category}` - log.info(`共 ${total} 个${catName}任务`) - console.log('TASK_ID'.padEnd(20) + 'FLOW_NAME'.padEnd(30) + 'CREATOR'.padEnd(15) + 'TIME'.padEnd(20) + 'STATE') - console.log('-'.repeat(100)) - for (const t of list) { - const id = String(t.id || t.taskId || '').padEnd(20) - const flow = String(t.flowName || t.fullName || '').padEnd(30) - const creator = String(t.creatorUser || t.userName || '').padEnd(15) - const time = String(t.createTime || t.startTime || t.updateTime || '').padEnd(20) - const state = String(t.statusName || t.state || '') - console.log(`${id}${flow}${creator}${time}${state}`) - } + if (r?.code && r.code !== 200) { + return ctx.fail(`workflow tasks 失败: ${r.msg}`, { category, code: r.code }) + } + const list = r.data?.list || [] + const total = r.data?.pagination?.total ?? list.length + const summary = { category, total, returned: list.length } + + if (opts.json) { + printJson(r) + return ctx.success(summary) + } + const catName = CATEGORY_NAMES[category] || `category=${category}` + log.info(`共 ${total} 个${catName}任务`) + log.printRawTable( + ['TASK_ID', 'FLOW_NAME', 'CREATOR', 'TIME', 'STATE'], + list.map((t) => [ + String(t.id || t.taskId || ''), + String(t.flowName || t.fullName || ''), + String(t.creatorUser || t.userName || ''), + String(t.createTime || t.startTime || t.updateTime || ''), + String(t.statusName || t.state || ''), + ]), + ) + ctx.success(summary) + } catch (e) { + ctx.fail(`workflow tasks 失败: ${(e as Error).message?.slice(0, 200)}`) + } + }) }) installHelpHook(cmd, {