auto(bfc0cfa2c3a4): session end @ 2026-07-21T11:39:46 (+16f)

This commit is contained in:
ssw committed 2026-07-21 11:39:46 +08:00
1 parent 2c849e1604
commit f058ddead0
16 files changed
+486 -245

No files matched your search

+101
View File
@@ -14,6 +14,7 @@
import type { FixEntry } from '../core/logfile.ts'
import { autoStripEnCode, autoStripFullName } from './_encode_validator.ts'
import type { JnpfClient } from '../core/client.ts'
// ============================================================
// Types
@@ -552,6 +553,106 @@ export function runCommandAutoFix(
return { opts: fixed, silent, assertive, suggestions }
}
/**
* 拉已有 forms/dicts/menus/roles 列表 (供 G-X1 BS-47 重名 suggest 启用) (2026-07-21)
*
* 容错: 任何单个 list 调用失败不阻断命令 (返回空数组). 拉列表失败时 G-X1 自动降级为不工作,
* 但不影响 S-X1/S-X2 silent 修复.
*
* 用法 (在 .action() 入口, runCommandAutoFix 之前):
* const fixCtx = await fetchExistingLists(c, c.appCode)
* const cmdFix = runCommandAutoFix(opts, fixCtx)
*
* flags 控制拉哪些列表 (默认全拉):
* - 全拉耗时长, 但 BS-47 重名检查跨全平台 (form/menu/dict/role 同名都冲突)
* - 仅菜单类命令可传 { forms: false, dicts: false, roles: false } 只查 menus
*
* 镜像 web 端 create form/menu/dict/role 时分别查同模块重名 + BS-47 全平台 (后端 EXIST 系列)
*/
export async function fetchExistingLists(
c: JnpfClient,
appCode?: string,
flags: { forms?: boolean; dicts?: boolean; menus?: boolean; roles?: boolean } = {},
): Promise<CommandFixContext> {
const enableAll =
!flags.forms && !flags.dicts && !flags.menus && !flags.roles
const wantForms = enableAll || flags.forms === true
const wantDicts = enableAll || flags.dicts === true
const wantMenus = enableAll || flags.menus === true
const wantRoles = enableAll || flags.roles === true
const ctx: CommandFixContext = { appCode }
// forms (loadVisualDev.getVisualDevList, 跟 form/create 一致)
if (wantForms) {
try {
const r = await c.get<{ data?: { list?: Array<{ id: string; enCode: string }> } }>(
'/visualdev/Base',
{ currentPage: 1, pageSize: 500 },
)
const list = (r.data as { list?: Array<{ id: string; enCode: string }> } | undefined)?.list || []
ctx.existingForms = list
.filter((f) => f && f.enCode)
.map((f) => ({ id: String(f.id), enCode: String(f.enCode) }))
} catch {
// 容错: 拉失败不阻断, G-X1 降级为空
}
}
// dicts (跟 dict/_validate.ts runDictStepMachine 同样的递归展开)
if (wantDicts) {
try {
const r = await c.get<{ data?: { list?: Array<any> } }>('/system/DictionaryType')
const list = (r.data as { list?: Array<any> } | undefined)?.list || []
const flat: Array<{ id: string; enCode: string }> = []
const walk = (nodes: Array<any>) => {
for (const n of nodes) {
if (n.enCode) flat.push({ id: String(n.id), enCode: String(n.enCode) })
if (Array.isArray(n.children) && n.children.length) walk(n.children)
}
}
walk(list)
ctx.existingDicts = flat
} catch {
// 容错
}
}
// menus (loadMenu.getMenuList)
if (wantMenus) {
try {
const r = await c.get<{ data?: { list?: Array<{ id: string; enCode: string }> } }>(
'/system/Menu',
{ currentPage: 1, pageSize: 500 },
)
const list = (r.data as { list?: Array<{ id: string; enCode: string }> } | undefined)?.list || []
ctx.existingMenus = list
.filter((m) => m && m.enCode)
.map((m) => ({ id: String(m.id), enCode: String(m.enCode) }))
} catch {
// 容错
}
}
// roles (loadRole.getRoleList)
if (wantRoles) {
try {
const r = await c.get<{ data?: { list?: Array<{ id: string; enCode: string }> } }>(
'/permission/Role',
{ currentPage: 1, pageSize: 500 },
)
const list = (r.data as { list?: Array<{ id: string; enCode: string }> } | undefined)?.list || []
ctx.existingRoles = list
.filter((r) => r && r.enCode)
.map((r) => ({ id: String(r.id), enCode: String(r.enCode) }))
} catch {
// 容错
}
}
return ctx
}
// ============================================================
// Main pipeline
// ============================================================
+4 -8
View File
@@ -33,7 +33,7 @@ import { installHelpHook } from '../../core/help.ts'
import { log, printJson } from '../../core/log.ts'
import { initWebapi, loadVisualData } from '../../webapi/visualdata.ts'
import { setupOutputFilter, printCommandEnd } from '../_output_filter.ts' // v2.1+ (2026-07-21): 输出过滤 + CommandLog 落盘
import { runCommandAutoFix } from '../_auto_fix.ts' // v2.1+ (2026-07-21): 跨命令 auto-fix pipeline
import { runCommandAutoFix, fetchExistingLists } from '../_auto_fix.ts' // v2.1+ (2026-07-21): 跨命令 auto-fix pipeline
import {
getBaseConfig,
listComponentProps,
@@ -118,13 +118,9 @@ export function buildBigscreenConstructCommand(): Command {
const c = await JnpfClient.fromToken()
const startTime = Date.now()
// v2.1+ (2026-07-21): 命令级 auto-fix pipeline
const cmdFix = runCommandAutoFix(opts as unknown as Record<string, unknown>, {
existingForms: [],
existingDicts: [],
existingMenus: [],
appCode: c.appCode,
})
// v2.1+ (2026-07-21): 命令级 auto-fix pipeline (G-X1 启用 — 含 <appCode> 前缀建议)
const fixCtx = await fetchExistingLists(c, c.appCode)
const cmdFix = runCommandAutoFix(opts as unknown as Record<string, unknown>, fixCtx)
if (cmdFix.silent.length > 0) {
Object.assign(opts, cmdFix.opts)
}
+3 -7
View File
@@ -17,7 +17,7 @@ import { installHelpHook } from '../../core/help.ts'
import { log, printJson } from '../../core/log.ts'
import { initWebapi, loadVisualData } from '../../webapi/visualdata.ts'
import { setupOutputFilter, printCommandEnd } from '../_output_filter.ts' // v2.1+ (2026-07-21): 输出过滤 + CommandLog 落盘
import { runCommandAutoFix } from '../_auto_fix.ts' // v2.1+ (2026-07-21): enCode/fullName 跨命令 auto-fix
import { runCommandAutoFix, fetchExistingLists } from '../_auto_fix.ts' // v2.1+ (2026-07-21): enCode/fullName 跨命令 auto-fix
interface CreateOpts {
fullName: string
@@ -50,12 +50,8 @@ export function buildBigscreenCreateCommand(): Command {
const startTime = Date.now()
// v2.1+ (2026-07-21): 命令级 auto-fix pipeline (S-X1 enCode strip / S-X2 fullName soften / G-X1 BS-47 重名 suggest)
const cmdFix = runCommandAutoFix(opts as unknown as Record<string, unknown>, {
existingForms: [],
existingDicts: [],
existingMenus: [],
appCode: c.appCode,
})
const fixCtx = await fetchExistingLists(c, c.appCode)
const cmdFix = runCommandAutoFix(opts as unknown as Record<string, unknown>, fixCtx)
if (cmdFix.silent.length > 0) {
Object.assign(opts, cmdFix.opts)
}
+54 -25
View File
@@ -14,44 +14,73 @@ import { JnpfClient } from '../../core/client.ts'
import { installHelpHook } from '../../core/help.ts'
import { log, printJson } from '../../core/log.ts'
import { initWebapi, loadVisualData } from '../../webapi/visualdata.ts'
import { setupOutputFilter, printCommandEnd } from '../_output_filter.ts' // v2.1+ (2026-07-21): 输出过滤 + CommandLog 落盘
interface ListOpts {
keyword?: string
json?: boolean
verbose?: boolean
}
export function buildBigscreenListCommand(): Command {
const cmd = new Command('list')
.description('列出大屏 (大屏设计器产物)')
.option('--keyword <k>', '按名称/编码模糊搜索')
.option('--verbose', '完整输出 (含 API 调用过程日志)', false)
.option('--json', '原始 JSON 输出', false)
.action(async (opts: ListOpts) => {
// 输出过滤: 默认静默 (quiet mode), --verbose 走完整日志, --json 走原始 JSON
setupOutputFilter(opts)
const c = await JnpfClient.fromToken()
// v0.14+ webapi 化 (走 /api/blade-visual/visual/list, 真大屏端点 — jnpf-visualdata 微服务)
// 注意: web 端 baseURL=window.$website.url='/api/blade-visual', 跟 v0.13 §8.1 写的 '/api/visual/*' 不一致
await initWebapi(c)
// web 端 getList(params) → axios request(method='get', url=baseUrl+'/list', params)
// params 是 query string. web 端字段名: current/size/title (不是 keyword)
// axios shim 已 unwrap envelope + 包成 {data: <unwrapped>}, 所以 r.data = 后端 data 字段
const r = (await loadVisualData.getList({
title: opts.keyword,
current: 1,
size: 50,
})) as { data?: { records?: Record<string, unknown>[]; total?: number; current?: number; size?: number } }
const list = r.data?.records || []
if (opts.json) {
printJson(r.data)
return
}
log.info(`共 ${list.length} 张大屏 (total=${r.data?.total || 0})`)
console.log('ID FULL_NAME ENCODE CATEGORY')
console.log('-'.repeat(90))
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 cat = String(d.category || '')
console.log(`${id}${name}${code}${cat}`)
const startTime = Date.now()
let cmdError: string | undefined
let cmdSummary: Record<string, unknown> = {}
try {
// v0.14+ webapi 化 (走 /api/blade-visual/visual/list, 真大屏端点 — jnpf-visualdata 微服务)
// 注意: web 端 baseURL=window.$website.url='/api/blade-visual', 跟 v0.13 §8.1 写的 '/api/visual/*' 不一致
await initWebapi(c)
// web 端 getList(params) → axios request(method='get', url=baseUrl+'/list', params)
// params 是 query string. web 端字段名: current/size/title (不是 keyword)
// axios shim 已 unwrap envelope + 包成 {data: <unwrapped>}, 所以 r.data = 后端 data 字段
const r = (await loadVisualData.getList({
title: opts.keyword,
current: 1,
size: 50,
})) as { data?: { records?: Record<string, unknown>[]; total?: number; current?: number; size?: number } }
const list = r.data?.records || []
cmdSummary = { keyword: opts.keyword, total: list.length, serverTotal: r.data?.total || 0 }
if (opts.json) {
printJson(r.data)
return
}
log.info(`共 ${list.length} 张大屏 (total=${r.data?.total || 0})`)
console.log('ID FULL_NAME ENCODE CATEGORY')
console.log('-'.repeat(90))
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 cat = String(d.category || '')
console.log(`${id}${name}${code}${cat}`)
}
} catch (e) {
cmdError = (e as Error).message?.slice(0, 200)
log.error(`bigscreen list 失败: ${cmdError}`)
throw e
} finally {
// v2.1+ (2026-07-21): 落 CommandLog (L3)
printCommandEnd({
command: 'bigscreen 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, {
+4 -8
View File
@@ -17,7 +17,7 @@ import { log, printJson } from '../../core/log.ts'
import { initWebapi, loadDataInterface, getDataInterfaceList } from '../../webapi/di.ts' // v0.15+ (P0-8): getDataInterfaceList 替代 c.get
import { validateDiUpdate, type DiOpts } from './_validate.ts'
import { enhanceFromBackend, formatErrorLine } from '../_error_codes.ts'
import { runCommandAutoFix } from '../_auto_fix.ts' // v2.1+ (2026-07-21): 跨命令 auto-fix pipeline (替代原 inline autoStripEnCode + soften)
import { runCommandAutoFix, fetchExistingLists } from '../_auto_fix.ts' // v2.1+ (2026-07-21): 跨命令 auto-fix pipeline (替代原 inline autoStripEnCode + soften)
import { setupOutputFilter, printCommandEnd } from '../_output_filter.ts' // v2.1+ (2026-07-21): 输出过滤 + CommandLog 落盘
import { lookupDataInterfaceIdByEnCode } from './_lookup.ts'
@@ -77,13 +77,9 @@ export function buildDiCreateCommand(): Command {
// v2.1+ (2026-07-21): 命令级 auto-fix pipeline (替代原 inline autoStripEnCode + soften)
// S-X1 enCode strip silent (BS-新38)
// S-X2 fullName soften silent (BS-新52)
// G-X1 BS-47 重名 suggest
const cmdFix = runCommandAutoFix(opts as unknown as Record<string, unknown>, {
existingForms: [],
existingDicts: [],
existingMenus: [],
appCode: c.appCode,
})
// G-X1 BS-47 重名 suggest (含 <appCode> 前缀建议, 启用需 fetchExistingLists)
const fixCtx = await fetchExistingLists(c, c.appCode)
const cmdFix = runCommandAutoFix(opts as unknown as Record<string, unknown>, fixCtx)
if (cmdFix.silent.length > 0) {
Object.assign(opts, cmdFix.opts)
}
+4 -7
View File
@@ -12,7 +12,7 @@ import { initWebapi, loadDict } from '../../webapi/dict.ts'
import { validateDictTypeCreate, type DictItemLite } from './_validate.ts'
import { lookupTypeIdByEnCode, lookupDataIdByEnCode } from './_lookup.ts'
import { enhanceFromBackend, formatErrorLine } from '../_error_codes.ts'
import { runCommandAutoFix } from '../_auto_fix.ts' // v2.1+ (2026-07-21): 跨命令 auto-fix pipeline (替代原 inline autoStripEnCode/FullName + soften 调用)
import { runCommandAutoFix, fetchExistingLists } from '../_auto_fix.ts' // v2.1+ (2026-07-21): 跨命令 auto-fix pipeline (替代原 inline autoStripEnCode/FullName + soften 调用)
import { setupOutputFilter, printCommandEnd } from '../_output_filter.ts' // v2.1+ (2026-07-21): 输出过滤 + CommandLog 落盘
interface Opts {
@@ -54,12 +54,9 @@ export function buildDictTypeCreateCommand(): Command {
// v2.1+ (2026-07-21): 命令级 auto-fix pipeline (替代原 inline autoStripEnCode/FullName + soften)
// S-X1 enCode strip silent (BS-新38)
// S-X2 fullName soften silent (BS-新52)
// G-X1 BS-47 重名 suggest (含 <appCode> 前缀建议)
const cmdFix = runCommandAutoFix(opts as unknown as Record<string, unknown>, {
existingForms: [],
existingDicts: [],
appCode: c.appCode,
})
// G-X1 BS-47 重名 suggest (含 <appCode> 前缀建议, 启用需 fetchExistingLists)
const fixCtx = await fetchExistingLists(c, c.appCode)
const cmdFix = runCommandAutoFix(opts as unknown as Record<string, unknown>, fixCtx)
if (cmdFix.silent.length > 0) {
Object.assign(opts, cmdFix.opts)
}
+83 -48
View File
@@ -16,8 +16,9 @@ import { JnpfClient } from '../../core/client.ts'
import { installHelpHook } from '../../core/help.ts'
import { log, printJson } from '../../core/log.ts'
import { initWebapi, loadDict } from '../../webapi/dict.ts'
import { setupOutputFilter, printCommandEnd } from '../_output_filter.ts' // v2.1+ (2026-07-21): 输出过滤 + CommandLog 落盘
interface Opts { json?: boolean; keyword?: string; recursive?: boolean; tree?: boolean }
interface Opts { json?: boolean; keyword?: string; recursive?: boolean; tree?: boolean; verbose?: boolean }
/** 递归展平树形 list → 扁平数组 (保留 _path 路径用于追溯) */
function flattenTree(items: any[], parentPath: string = ''): Array<Record<string, any> & { _path: string }> {
@@ -55,59 +56,93 @@ export function buildDictTypeListCommand(): Command {
.option('--recursive', '递归展平 children 树 (默认 ON, 显示所有子分类)', true)
.option('--no-recursive', '只显示顶层 2 项 (旧行为)')
.option('--tree', '显示原始树形结构 (含缩进, 调试用)', false)
.option('--verbose', '完整输出 (含 API 调用过程日志)', false)
.option('--json', '原始 JSON 输出', false)
.action(async (opts: Opts) => {
// 输出过滤: 默认静默 (quiet mode), --verbose 走完整日志, --json 走原始 JSON
setupOutputFilter(opts)
const c = await JnpfClient.fromToken()
await initWebapi(c)
const data = (await loadDict.getDictionaryType()) as { list?: Record<string, unknown>[] }
if (opts.json) {
printJson(data)
return
}
const startTime = Date.now()
let cmdError: string | undefined
let cmdSummary: Record<string, unknown> = {}
// === v0.12+ BS-New-6: 默认递归展平 children (用户实际想要的字典)
// 旧行为: 只显示顶层 2 项, --keyword 无法命中
// 新行为: 递归展平所有节点, --keyword 真正可用
const recursive = opts.recursive !== false && !opts.tree
const treeView = !!opts.tree
// --tree 模式直接打印树
if (treeView) {
log.info(`共 ${data?.list?.length || 0} 个顶层分类 (树形视图)`)
if (opts.keyword) {
log.warn('--tree 与 --keyword 互斥 (树形显示全部, 不用过滤)')
try {
await initWebapi(c)
const data = (await loadDict.getDictionaryType()) as { list?: Record<string, unknown>[] }
if (opts.json) {
cmdSummary = { mode: 'json' }
printJson(data)
return
}
console.log('ID'.padEnd(36) + 'ENCODE'.padEnd(22) + 'FULL_NAME')
// === v0.12+ BS-New-6: 默认递归展平 children (用户实际想要的字典)
// 旧行为: 只显示顶层 2 项, --keyword 无法命中
// 新行为: 递归展平所有节点, --keyword 真正可用
const recursive = opts.recursive !== false && !opts.tree
const treeView = !!opts.tree
// --tree 模式直接打印树
if (treeView) {
log.info(`共 ${data?.list?.length || 0} 个顶层分类 (树形视图)`)
if (opts.keyword) {
log.warn('--tree 与 --keyword 互斥 (树形显示全部, 不用过滤)')
}
console.log('ID'.padEnd(36) + 'ENCODE'.padEnd(22) + 'FULL_NAME')
console.log('-'.repeat(80))
printTree(data?.list || [], 0)
cmdSummary = { mode: 'tree' }
return
}
let list: Array<Record<string, any>>
if (recursive) {
list = flattenTree(data?.list || [])
} else {
list = (data?.list || []) as Array<Record<string, any>>
}
if (opts.keyword) {
const kw = opts.keyword.toLowerCase()
list = list.filter(
(t) =>
String(t.enCode || '').toLowerCase().includes(kw) ||
String(t.fullName || '').toLowerCase().includes(kw),
)
}
cmdSummary = {
keyword: opts.keyword,
total: list.length,
recursive,
mode: 'flat',
}
log.info(`共 ${list.length} 个字典类型${opts.keyword ? ` (匹配 keyword="${opts.keyword}")` : ''}${recursive ? ' [递归展平]' : ' [仅顶层]'}`)
if (recursive && !opts.keyword) {
console.log('(BS-New-6: 默认递归展平 children 树, --tree 看原始树形, --no-recursive 只看顶层)')
}
console.log('ID'.padEnd(36) + 'ENCODE'.padEnd(21) + 'FULL_NAME')
console.log('-'.repeat(80))
printTree(data?.list || [], 0)
return
}
let list: Array<Record<string, any>>
if (recursive) {
list = flattenTree(data?.list || [])
} else {
list = (data?.list || []) as Array<Record<string, any>>
}
if (opts.keyword) {
const kw = opts.keyword.toLowerCase()
list = list.filter(
(t) =>
String(t.enCode || '').toLowerCase().includes(kw) ||
String(t.fullName || '').toLowerCase().includes(kw),
)
}
log.info(`共 ${list.length} 个字典类型${opts.keyword ? ` (匹配 keyword="${opts.keyword}")` : ''}${recursive ? ' [递归展平]' : ' [仅顶层]'}`)
if (recursive && !opts.keyword) {
console.log('(BS-New-6: 默认递归展平 children 树, --tree 看原始树形, --no-recursive 只看顶层)')
}
console.log('ID'.padEnd(36) + 'ENCODE'.padEnd(21) + 'FULL_NAME')
console.log('-'.repeat(80))
for (const t of list) {
const path = t._path ? ` [${t._path}]` : ''
console.log(`${String(t.id || '').padEnd(36)}${String(t.enCode || '').padEnd(21)}${t.fullName || ''}${path}`)
for (const t of list) {
const path = t._path ? ` [${t._path}]` : ''
console.log(`${String(t.id || '').padEnd(36)}${String(t.enCode || '').padEnd(21)}${t.fullName || ''}${path}`)
}
} catch (e) {
cmdError = (e as Error).message?.slice(0, 200)
log.error(`dict typeList 失败: ${cmdError}`)
throw e
} finally {
// v2.1+ (2026-07-21): 落 CommandLog (L3)
printCommandEnd({
command: 'dict typeList',
appCode: c.appCode,
result: cmdError ? 'failure' : 'success',
error: cmdError,
summary: cmdSummary,
duration_ms: Date.now() - startTime,
verbose: opts.verbose,
json: opts.json,
})
}
})
+3 -4
View File
@@ -16,7 +16,7 @@ import { loadAppContext } from '../app/context.ts'
import { initWebapi, loadDataModel } from '../../webapi/dataModel.ts'
import { validateDmCreate, type DmFieldLite } from './_validate.ts'
import { enhanceFromBackend, formatErrorLine } from '../_error_codes.ts'
import { runCommandAutoFix } from '../_auto_fix.ts' // v2.1+ (2026-07-21): 跨命令 auto-fix pipeline (BS-新38 enCode strip / BS-新52 fullName soften / BS-47 重名 suggest)
import { runCommandAutoFix, fetchExistingLists } from '../_auto_fix.ts' // v2.1+ (2026-07-21): 跨命令 auto-fix pipeline (BS-新38 enCode strip / BS-新52 fullName soften / BS-47 重名 suggest)
import { setupOutputFilter, printCommandEnd } from '../_output_filter.ts' // v2.1+ (2026-07-21): 输出过滤 + CommandLog 落盘
interface CreateOpts {
@@ -48,10 +48,9 @@ export function buildDmCreateCommand(): Command {
// v2.1+ (2026-07-21): 命令级 auto-fix pipeline (silent strip + G-X1 重名 suggest)
// dm 用 --table/--tableName 而非 enCode/fullName, 通过 fieldAliases 映射
const fixCtx = await fetchExistingLists(c, c.appCode)
const cmdFix = runCommandAutoFix(opts as unknown as Record<string, unknown>, {
existingForms: [],
existingDicts: [],
appCode: c.appCode,
...fixCtx,
fieldAliases: { enCode: 'table', fullName: 'tableName' },
})
if (cmdFix.silent.length > 0) {
+72 -40
View File
@@ -12,6 +12,7 @@ import { installHelpHook } from '../../core/help.ts'
import { log, printJson } from '../../core/log.ts'
import type { FormSummary } from '../../core/types.ts'
import { initWebapi, loadVisualDev } from '../../webapi/visualDev.ts'
import { setupOutputFilter, printCommandEnd } from '../_output_filter.ts' // v2.1+ (2026-07-21): 输出过滤 + CommandLog 落盘 (list 类查询命令历史可追溯)
interface ListResp {
list: FormSummary[]
@@ -32,54 +33,85 @@ export function buildFormListCommand(): Command {
.option('--keyword <k>', '关键字 (匹配 fullName/enCode)')
.option('--state <s>', '过滤 state (0|1|2)', (v) => parseInt(v, 10))
.option('--limit <n>', '最多取 N 条 (默认 100)', (v) => parseInt(v, 10), 100)
.option('--verbose', '完整输出 (含 API 调用过程日志)', false)
.option('--json', '原始 JSON', false)
.option('--summary', '输出 state 分布汇总 (不列明细)', false)
.action(async (opts: { keyword?: string; state?: number; limit: number; json?: boolean; summary?: boolean }) => {
.action(async (opts: { keyword?: string; state?: number; limit: number; json?: boolean; summary?: boolean; verbose?: boolean }) => {
// 输出过滤: 默认静默 (quiet mode), --verbose 走完整日志, --json 走原始 JSON
setupOutputFilter(opts)
const c = await JnpfClient.fromToken()
// v0.11+ Phase 1: 用 web 端 getVisualDevList (替代 c.get('/visualdev/Base'))
await initWebapi(c)
const data = (await loadVisualDev.getVisualDevList({
keyword: opts.keyword,
currentPage: 1,
pageSize: opts.limit,
})) as ListResp
let list = data.list || []
if (opts.state !== undefined) list = list.filter((f) => f.state === opts.state)
const startTime = Date.now()
let cmdError: string | undefined
let cmdSummary: Record<string, unknown> = {}
// BS-53: --summary 输出 state 分布, 帮 AI 快速识别"全是 state=2 待重发布"等异常
if (opts.summary) {
const dist: Record<string, number> = {}
for (const f of list) {
const key = stateLabel(f.state)
dist[key] = (dist[key] || 0) + 1
try {
// v0.11+ Phase 1: 用 web 端 getVisualDevList (替代 c.get('/visualdev/Base'))
await initWebapi(c)
const data = (await loadVisualDev.getVisualDevList({
keyword: opts.keyword,
currentPage: 1,
pageSize: opts.limit,
})) as ListResp
let list = data.list || []
if (opts.state !== undefined) list = list.filter((f) => f.state === opts.state)
cmdSummary = {
keyword: opts.keyword,
state: opts.state,
total: list.length,
mode: opts.summary ? 'summary' : (opts.json ? 'json' : 'table'),
}
if (opts.json) {
printJson({ total: list.length, distribution: dist })
} else {
log.ok(`共 ${list.length} 张 (app=${c.appCode})`)
console.log('state 分布:')
for (const [k, v] of Object.entries(dist)) {
console.log(` ${k.padEnd(10)} ${v}`)
// BS-53: --summary 输出 state 分布, 帮 AI 快速识别"全是 state=2 待重发布"等异常
if (opts.summary) {
const dist: Record<string, number> = {}
for (const f of list) {
const key = stateLabel(f.state)
dist[key] = (dist[key] || 0) + 1
}
if (opts.json) {
printJson({ total: list.length, distribution: dist })
} else {
log.ok(`共 ${list.length} 张 (app=${c.appCode})`)
console.log('state 分布:')
for (const [k, v] of Object.entries(dist)) {
console.log(` ${k.padEnd(10)} ${v}`)
}
}
return
}
return
}
if (opts.json) {
printJson({ total: list.length, list })
return
}
log.ok(`共 ${list.length} 张 (app=${c.appCode})`)
console.log('ID'.padEnd(20), 'STATE'.padEnd(8), 'TYPE', 'FLOW', 'enCode'.padEnd(32), 'fullName')
for (const f of list) {
console.log(
String(f.id).padEnd(20),
stateLabel(f.state).padEnd(8),
String(f.type ?? '-').padEnd(4),
String((f as unknown as { enableFlow?: number }).enableFlow ?? '-').padEnd(4),
(f.enCode || '').padEnd(32),
f.fullName,
)
if (opts.json) {
printJson({ total: list.length, list })
return
}
log.ok(`共 ${list.length} 张 (app=${c.appCode})`)
console.log('ID'.padEnd(20), 'STATE'.padEnd(8), 'TYPE', 'FLOW', 'enCode'.padEnd(32), 'fullName')
for (const f of list) {
console.log(
String(f.id).padEnd(20),
stateLabel(f.state).padEnd(8),
String(f.type ?? '-').padEnd(4),
String((f as unknown as { enableFlow?: number }).enableFlow ?? '-').padEnd(4),
(f.enCode || '').padEnd(32),
f.fullName,
)
}
} catch (e) {
cmdError = (e as Error).message?.slice(0, 200)
log.error(`form list 失败: ${cmdError}`)
throw e
} finally {
// v2.1+ (2026-07-21): 落 CommandLog (L3) — list 类查询命令历史可追溯
printCommandEnd({
command: 'form list',
appCode: c.appCode,
result: cmdError ? 'failure' : 'success',
error: cmdError,
summary: cmdSummary,
duration_ms: Date.now() - startTime,
verbose: opts.verbose,
json: opts.json,
})
}
})
+4 -8
View File
@@ -28,7 +28,7 @@ import { enhanceFromBackend, formatErrorLine } from '../_error_codes.ts'
import { fetchMenuTree } from './_helpers.ts'
import { lookupMenuIdByEnCode } from './_lookup.ts'
import { initWebapi, loadMenu } from '../../webapi/menu.ts'
import { runCommandAutoFix } from '../_auto_fix.ts' // v2.1+ (2026-07-21): 跨命令 auto-fix pipeline (替代原 inline autoStripEnCode/FullName)
import { runCommandAutoFix, fetchExistingLists } from '../_auto_fix.ts' // v2.1+ (2026-07-21): 跨命令 auto-fix pipeline (替代原 inline autoStripEnCode/FullName)
import { setupOutputFilter, printCommandEnd } from '../_output_filter.ts' // v2.1+ (2026-07-21): 输出过滤 + CommandLog 落盘
interface Opts {
@@ -86,13 +86,9 @@ export function buildMenuCreateCommand(): Command {
// v2.1+ (2026-07-21): 命令级 auto-fix pipeline (替代原 inline autoStripEnCode/FullName)
// S-X1 enCode strip silent (BS-新38)
// S-X2 fullName soften silent (BS-新52)
// G-X1 BS-47 重名 suggest
const cmdFix = runCommandAutoFix(opts as unknown as Record<string, unknown>, {
existingForms: [],
existingDicts: [],
existingMenus: [],
appCode: c.appCode,
})
// G-X1 BS-47 重名 suggest (含 <appCode> 前缀建议, 启用需 fetchExistingLists)
const fixCtx = await fetchExistingLists(c, c.appCode)
const cmdFix = runCommandAutoFix(opts as unknown as Record<string, unknown>, fixCtx)
if (cmdFix.silent.length > 0) {
Object.assign(opts, cmdFix.opts)
}
+80 -46
View File
@@ -12,12 +12,14 @@ 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 落盘
interface Opts {
json?: boolean
keyword?: string
flat?: boolean
includeActions?: boolean
verbose?: boolean
}
export function buildMenuListCommand(): Command {
@@ -29,61 +31,93 @@ export function buildMenuListCommand(): Command {
// 修复 (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)
.action(async (opts: Opts) => {
// 输出过滤: 默认静默 (quiet mode), --verbose 走完整日志, --json 走原始 JSON
setupOutputFilter(opts)
const c = await JnpfClient.fromToken()
// 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) || []
const startTime = Date.now()
let cmdError: string | undefined
let cmdSummary: Record<string, unknown> = {}
// --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')
}
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) || []
if (opts.json) {
printJson({
systemMenus: list,
...(opts.includeActions ? { formActionsMenus: actionsMenus, formActionsMeta: actionsMeta } : {}),
})
return
}
// --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,
}
log.info(`当前 app 共 ${list.length} 个菜单项`)
console.log('ID FULL_NAME ENCODE URL')
console.log('-'.repeat(100))
for (const m of list as Record<string, unknown>[]) {
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.json) {
printJson({
systemMenus: list,
...(opts.includeActions ? { formActionsMenus: actionsMenus, formActionsMeta: actionsMeta } : {}),
})
return
}
if (opts.includeActions) {
console.log('')
log.info(`当前 app 共 ${list.length} 个菜单项`)
console.log('ID FULL_NAME ENCODE URL')
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}`)
for (const m of list as Record<string, unknown>[]) {
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}`)
}
}
}
} 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,
})
}
})
+4 -5
View File
@@ -26,7 +26,7 @@ import {
getPortalList,
} from '../../webapi/portal.ts'
import { initWebapi as initDictWebapi, loadDict } from '../../webapi/dict.ts'
import { runCommandAutoFix } from '../_auto_fix.ts' // v2.1+ (2026-07-21): 跨命令 auto-fix pipeline
import { runCommandAutoFix, fetchExistingLists } from '../_auto_fix.ts' // v2.1+ (2026-07-21): 跨命令 auto-fix pipeline
import { setupOutputFilter, printCommandEnd } from '../_output_filter.ts' // v2.1+ (2026-07-21): 输出过滤 + CommandLog 落盘
interface CreateOpts {
@@ -145,10 +145,9 @@ export function buildPortalCreateCommand(): Command {
const c = await JnpfClient.fromToken()
const startTime = Date.now()
// v2.1+ (2026-07-21): 命令级 auto-fix pipeline
const cmdFix = runCommandAutoFix(opts as unknown as Record<string, unknown>, {
appCode: c.appCode,
})
// v2.1+ (2026-07-21): 命令级 auto-fix pipeline (G-X1 启用 — 含 <appCode> 前缀建议)
const fixCtx = await fetchExistingLists(c, c.appCode)
const cmdFix = runCommandAutoFix(opts as unknown as Record<string, unknown>, fixCtx)
if (cmdFix.silent.length > 0) {
Object.assign(opts, cmdFix.opts)
}
+5 -5
View File
@@ -11,7 +11,7 @@ import { log, printJson } from '../../core/log.ts'
import { validateRoleCreate } from './_validate.ts'
import { enhanceFromBackend, formatErrorLine } from '../_error_codes.ts'
import { initWebapi, loadRole } from '../../webapi/role.ts'
import { runCommandAutoFix } from '../_auto_fix.ts' // v2.1+ (2026-07-21): 跨命令 auto-fix pipeline (替代原 inline autoStripEnCode)
import { runCommandAutoFix, fetchExistingLists } from '../_auto_fix.ts' // v2.1+ (2026-07-21): 跨命令 auto-fix pipeline (替代原 inline autoStripEnCode)
import { setupOutputFilter, printCommandEnd } from '../_output_filter.ts' // v2.1+ (2026-07-21): 输出过滤 + CommandLog 落盘
import { lookupRoleIdByEnCode } from './_lookup.ts'
@@ -42,10 +42,10 @@ export function buildRoleCreateCommand(): Command {
await initWebapi(c)
// v2.1+ (2026-07-21): 命令级 auto-fix pipeline (替代原 inline autoStripEnCode)
const cmdFix = runCommandAutoFix(opts as unknown as Record<string, unknown>, {
existingRoles: [],
appCode: c.appCode,
})
// S-X1 enCode strip silent (BS-新38)
// G-X1 BS-47 重名 suggest (启用需 fetchExistingLists)
const fixCtx = await fetchExistingLists(c, c.appCode)
const cmdFix = runCommandAutoFix(opts as unknown as Record<string, unknown>, fixCtx)
if (cmdFix.silent.length > 0) {
Object.assign(opts, cmdFix.opts)
}
+3 -2
View File
@@ -12,7 +12,7 @@ import { encryptByMd5 } from '../../core/crypto.ts'
import { initWebapi, loadUser } from '../../webapi/user.ts'
import { validateUserCreate } from './_validate.ts'
import { enhanceFromBackend, formatErrorLine } from '../_error_codes.ts'
import { runCommandAutoFix } from '../_auto_fix.ts' // v2.1+ (2026-07-21): 跨命令 auto-fix pipeline
import { runCommandAutoFix, fetchExistingLists } from '../_auto_fix.ts' // v2.1+ (2026-07-21): 跨命令 auto-fix pipeline
import { setupOutputFilter, printCommandEnd } from '../_output_filter.ts' // v2.1+ (2026-07-21): 输出过滤 + CommandLog 落盘
interface CreateOpts {
@@ -51,8 +51,9 @@ export function buildUserCreateCommand(): Command {
await initWebapi(c)
// v2.1+ (2026-07-21): 命令级 auto-fix pipeline (account ↔ enCode, realName ↔ fullName)
const fixCtx = await fetchExistingLists(c, c.appCode)
const cmdFix = runCommandAutoFix(opts as unknown as Record<string, unknown>, {
appCode: c.appCode,
...fixCtx,
fieldAliases: { enCode: 'account', fullName: 'realName' },
})
if (cmdFix.silent.length > 0) {
+4 -9
View File
@@ -30,7 +30,7 @@ import { autoLayoutFlowXml, isLayoutNeeded } from './_autoLayout.ts'
import { initWebapi, loadWorkflow } from '../../webapi/workflow.ts'
import { validateWorkflowCreate } from './_validate.ts'
import { enhanceFromBackend, formatErrorLine } from '../_error_codes.ts'
import { runCommandAutoFix } from '../_auto_fix.ts' // v2.1+ (2026-07-21): enCode/fullName strip 已统一到 runCommandAutoFix (commands/_auto_fix.ts), 不再 inline 调 autoStripEnCode/autoStripFullName (替代原 line 96-112 的 inline 调用 + warn log, BS-新38/BS-新52).
import { runCommandAutoFix, fetchExistingLists } from '../_auto_fix.ts' // v2.1+ (2026-07-21): enCode/fullName strip 已统一到 runCommandAutoFix (commands/_auto_fix.ts), 不再 inline 调 autoStripEnCode/autoStripFullName (替代原 line 96-112 的 inline 调用 + warn log, BS-新38/BS-新52).
interface CreateOpts {
fullName?: string
@@ -98,16 +98,11 @@ export function buildWorkflowCreateCommand(): Command {
// v2.1+ (2026-07-21): 命令级 auto-fix pipeline (跨命令通用)
// S-X1 enCode strip silent (BS-新38)
// S-X2 fullName soften silent (BS-新52)
// G-X1 BS-47 重名 suggest (含 appCode 前缀建议)
// G-X1 BS-47 重名 suggest (含 appCode 前缀建议, 启用 G-X1 需 fetchExistingLists)
// 替代原 line 96-112 的 inline autoStripEnCode/autoStripFullName + WARN 日志
// (Round 12-13 drift loop fix, 详见 commands/_auto_fix.ts:runCommandAutoFix + ADR-0010 §3)
const cmdFix = runCommandAutoFix(opts as unknown as Record<string, unknown>, {
// G-X1 (BS-47 重名 suggest) 跨命令通用 — 此处提供空列表, 保持 silent 修正可用即可
// 后续接入 menu/dict/di 等命令时, 把 existingForms/Dicts/Menus/Roles 喂进来启用 G-X1
existingForms: [],
existingDicts: [],
appCode: c.appCode,
})
const fixCtx = await fetchExistingLists(c, c.appCode)
const cmdFix = runCommandAutoFix(opts as unknown as Record<string, unknown>, fixCtx)
if (cmdFix.silent.length > 0) {
Object.assign(opts, cmdFix.opts)
}
+58 -23
View File
@@ -9,13 +9,14 @@ 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.ts'
import { setupOutputFilter, printCommandEnd } from './_output.ts'
interface ListOpts {
category?: string
todo?: string
pageSize?: string
json?: boolean
verbose?: boolean
}
export function buildWorkflowListCommand(): Command {
@@ -29,28 +30,62 @@ export function buildWorkflowListCommand(): Command {
.action(async (opts: ListOpts) => {
setupOutputFilter(opts)
const c = await JnpfClient.fromToken()
const todo = Number(opts.todo || '0')
const path = todo > 0
? `/workflow/operator/List/${todo}`
: `/workflow/template${opts.category ? `?category=${opts.category}` : ''}`
const r = await c.get<{ list?: { id: string; fullName: string; enCode?: string; category?: string; flowId?: string; enabledMark?: number; status?: number }[] }>(path, {
currentPage: 1,
pageSize: opts.pageSize,
})
if (r.code !== 200) { log.error(`workflow list 失败: ${r.msg}`); process.exit(1) }
const list = r.data?.list || []
if (opts.json) { printJson(r.data); return }
log.info(`${path} 共 ${list.length} 条`)
// v0.12+ jxcj-2026-06-29 fix: 多输出一列 FLOW_ID (TemplateJsonEntity.id = 最新 version id)
// 作用: launchFlow / actionLaunchFlow 用 template=FLOW_ID, 不要用 ID (TemplateEntity.id)
console.log('ID FLOW_ID FULL_NAME ENCODE CATEGORY')
console.log('-'.repeat(120))
for (const t of list) {
console.log(`${String(t.id || '').padEnd(36)}${String(t.flowId || '').padEnd(36)}${String(t.fullName || '').padEnd(22)}${String(t.enCode || '').padEnd(22)}${t.category || ''}`)
}
if (list.some((t) => t.id !== t.flowId)) {
log.info(` 💡 launchFlow / actionLaunchFlow 需用 FLOW_ID (≠ ID):`)
log.info(` dacli workflow launch --id=<FLOW_ID> ...`)
const startTime = Date.now()
let cmdError: string | undefined
let cmdSummary: Record<string, unknown> = {}
try {
const todo = Number(opts.todo || '0')
const path = todo > 0
? `/workflow/operator/List/${todo}`
: `/workflow/template${opts.category ? `?category=${opts.category}` : ''}`
const r = await c.get<{ list?: { id: string; fullName: string; enCode?: string; category?: string; flowId?: string; enabledMark?: number; status?: number }[]; msg?: string }>(path, {
currentPage: 1,
pageSize: opts.pageSize,
})
if (r.code !== 200) {
cmdError = r.msg || `code=${r.code}`
log.error(`workflow list 失败: ${cmdError}`)
// v2.1+ (2026-07-21): 错误路径落 CommandLog
printCommandEnd({
command: 'workflow list',
appCode: c.appCode,
result: 'failure',
error: cmdError,
summary: { path, category: opts.category, todo },
duration_ms: Date.now() - startTime,
verbose: opts.verbose,
json: opts.json,
})
process.exit(1)
}
const list = r.data?.list || []
cmdSummary = { path, total: list.length, category: opts.category, todo }
if (opts.json) { printJson(r.data); return }
log.info(`${path} 共 ${list.length} 条`)
// v0.12+ jxcj-2026-06-29 fix: 多输出一列 FLOW_ID (TemplateJsonEntity.id = 最新 version id)
// 作用: launchFlow / actionLaunchFlow 用 template=FLOW_ID, 不要用 ID (TemplateEntity.id)
console.log('ID FLOW_ID FULL_NAME ENCODE CATEGORY')
console.log('-'.repeat(120))
for (const t of list) {
console.log(`${String(t.id || '').padEnd(36)}${String(t.flowId || '').padEnd(36)}${String(t.fullName || '').padEnd(22)}${String(t.enCode || '').padEnd(22)}${t.category || ''}`)
}
if (list.some((t) => t.id !== t.flowId)) {
log.info(` 💡 launchFlow / actionLaunchFlow 需用 FLOW_ID (≠ ID):`)
log.info(` dacli workflow launch --id=<FLOW_ID> ...`)
}
} finally {
// v2.1+ (2026-07-21): 落 CommandLog (L3) — list 类查询历史可追溯
printCommandEnd({
command: 'workflow list',
appCode: c.appCode,
result: cmdError ? 'failure' : 'success',
error: cmdError,
summary: cmdSummary,
duration_ms: Date.now() - startTime,
verbose: opts.verbose,
json: opts.json,
})
}
})