fix(menu): menu list --include-actions 合并 visualdev/Base form Actions/Module 菜单 (BS-53)
web formDesign 自动挂菜单走 POST /visualdev/Base/{formId}/Actions/Module, 数据存
visualdev/Base.releases, 不在 system/Menu 树. 之前 dacli menu list 只看 /system/Menu/ModuleBySystem
看不到 form-driven 菜单 (jxcj 28 form 全部漏).
修复:
- list.ts: 新增 --include-actions flag, 调 fetchAllFormReleasedMenus
- _helpers.ts: fetchAllFormReleasedMenus 遍历 /visualdev/Base (paged 1000), 逐个
调 getReleaseMenu, 收 pcIsRelease=1 + pcReleaseName / appIsRelease=1 + appReleaseName,
跨 form 同名去重, 单 form 失败跳过 (catch + failed++), 进度回调 onProgress
- list.ts: 输出末尾加 Actions/Module 段, 列出 formId/formEnCode/PC|APP/菜单路径
单测: tests/unit/menu_actions.test.ts (4/4 PASS) - 覆盖 list 调用顺序 / PC+APP 收集
/ 失败 form 跳过 / 跨 form 去重 / onProgress 回调
实测:
- jxcj: --include-actions 扫 28 form, 0 失败, 28 条 PC 菜单 (含 '数据要素人工智能创新大赛
管理平台/大赛管理/大赛信息表' 等 28 个 web formDesign 自动挂的菜单)
- developSystem: 扫 4 form, 1 条 PC 菜单 (跨应用测试表单)
- 默认 (不带 --include-actions) 行为不变 (向后兼容)
API 端点修正: 拉 form 列表用 /visualdev/Base, 不是 /visualdev/Base/list
(后者只返 enableFlow=1 的工作流 form, 见 form/list.ts:24 既有注释)
🤖 Generated with [Claude Code](https://claude.com/claude-code)
Co-Authored-By: Claude <[email protected]>
This commit is contained in:
1 parent
13a3b209d4
commit
e8fd646808
3 files changed
+305
-7
No files matched your search
@@ -71,6 +71,66 @@ export async function fetchFormReleasedMenus(c: JnpfClient, formId: string): Pro
|
||||
return { pcIds, appIds, raw: d }
|
||||
}
|
||||
|
||||
/** 单个 form 的 Actions/Module 注册菜单记录 (v0.10+ --include-actions 用)
|
||||
* 注意: JNPF getReleaseMenu API 不返回 pcReleaseId/appReleaseId (只返名称和 isRelease 标志)
|
||||
* 所以这里用 pcName/appName ("父菜单/子菜单" 路径字符串) 作为结果, 真实 id 在 system/Menu 树里可通过 fullName 路径反查 */
|
||||
export interface FormReleasedMenu {
|
||||
formId: string
|
||||
formEnCode: string
|
||||
formFullName?: string
|
||||
pcName?: string
|
||||
appName?: string
|
||||
pcIsRelease?: number
|
||||
appIsRelease?: number
|
||||
platformRelease?: string
|
||||
}
|
||||
|
||||
/** 遍历所有 form, 调 getReleaseMenu 收集 Actions/Module 注册的菜单 (合并去重, 失败容错)
|
||||
* - 数据源: visualdev/Base 表 releases 字段, 通过 GET /visualdev/Base/{formId}/getReleaseMenu 查
|
||||
* - pcReleaseName / appReleaseName 是 "父菜单/子菜单" 路径字符串
|
||||
* - 单 form 失败不影响整体 (catch 后跳过) */
|
||||
export async function fetchAllFormReleasedMenus(
|
||||
c: JnpfClient,
|
||||
opts: { onProgress?: (done: number, total: number) => void } = {},
|
||||
): Promise<{ menus: FormReleasedMenu[]; scanned: number; failed: number }> {
|
||||
// 1. 拉所有 form (paged) — 注意: 必须用 /visualdev/Base, 不是 /list (后者只返工作流 form, 见 form/list.ts:24)
|
||||
const formList = await c.get<{ list?: Array<{ id: string; enCode?: string; fullName?: string }> }>(
|
||||
'/visualdev/Base',
|
||||
{ currentPage: 1, pageSize: 1000 },
|
||||
)
|
||||
const forms = formList.data?.list || []
|
||||
|
||||
const menus: FormReleasedMenu[] = []
|
||||
const seen = new Set<string>()
|
||||
let failed = 0
|
||||
for (let i = 0; i < forms.length; i++) {
|
||||
const f = forms[i]
|
||||
const fId = String(f.id)
|
||||
if (!fId) continue
|
||||
opts.onProgress?.(i + 1, forms.length)
|
||||
try {
|
||||
const r = await c.get<{
|
||||
pcReleaseName?: string; appReleaseName?: string
|
||||
pcIsRelease?: number; appIsRelease?: number
|
||||
platformRelease?: string
|
||||
}>(`/visualdev/Base/${fId}/getReleaseMenu`)
|
||||
const d = r.data || {}
|
||||
// pcIsRelease/appIsRelease 是 1=已注册, 0/null=未注册
|
||||
if (d.pcIsRelease === 1 && d.pcReleaseName) {
|
||||
const k = `pc:${d.pcReleaseName}`
|
||||
if (!seen.has(k)) { seen.add(k); menus.push({ formId: fId, formEnCode: f.enCode || '', formFullName: f.fullName, pcName: d.pcReleaseName, pcIsRelease: d.pcIsRelease, platformRelease: d.platformRelease }) }
|
||||
}
|
||||
if (d.appIsRelease === 1 && d.appReleaseName) {
|
||||
const k = `app:${d.appReleaseName}`
|
||||
if (!seen.has(k)) { seen.add(k); menus.push({ formId: fId, formEnCode: f.enCode || '', formFullName: f.fullName, appName: d.appReleaseName, appIsRelease: d.appIsRelease, platformRelease: d.platformRelease }) }
|
||||
}
|
||||
} catch {
|
||||
failed++
|
||||
}
|
||||
}
|
||||
return { menus, scanned: forms.length, failed }
|
||||
}
|
||||
|
||||
/** DELETE 失败兜底: 自动调 Actions/Module pc=0 app=0 (走 unrelease 流程)
|
||||
* 返回: {deleted: bool, method: 'delete'|'unrelease', error?: string} */
|
||||
export async function deleteOrFallback(c: JnpfClient, menuId: string, opts: {fallback?: boolean} = {}): Promise<{deleted: boolean; method: 'delete' | 'unrelease' | 'noop'; error?: string}> {
|
||||
|
||||
@@ -1,14 +1,23 @@
|
||||
/**
|
||||
* commands/menu/list.ts — 菜单列表 (按 system)
|
||||
*
|
||||
* API: GET /api/system/Menu/ModuleBySystem 或 /api/system/Menu?keyword=
|
||||
* API:
|
||||
* - GET /api/system/Menu/ModuleBySystem (默认: system/Menu 表的树)
|
||||
* - GET /api/visualdev/Base/list (--include-actions: 拉 form 列表)
|
||||
* - GET /api/visualdev/Base/{id}/getReleaseMenu (--include-actions: 拉每个 form 的 Actions/Module 注册)
|
||||
*/
|
||||
import { Command } from 'commander'
|
||||
import { JnpfClient } from '../../core/client.ts'
|
||||
import { installAiHelpHook } from '../../core/help.ts'
|
||||
import { log, printJson } from '../../core/log.ts'
|
||||
import { fetchAllFormReleasedMenus, type FormReleasedMenu } from './_helpers.ts'
|
||||
|
||||
interface Opts { json?: boolean; keyword?: string; flat?: boolean }
|
||||
interface Opts {
|
||||
json?: boolean
|
||||
keyword?: string
|
||||
flat?: boolean
|
||||
includeActions?: boolean
|
||||
}
|
||||
|
||||
export function buildMenuListCommand(): Command {
|
||||
const cmd = new Command('list')
|
||||
@@ -16,13 +25,34 @@ export function buildMenuListCommand(): Command {
|
||||
.option('--keyword <k>', '按名称搜索')
|
||||
.option('--flat', '不按树形打印, 直接平铺', false)
|
||||
.option('--json', '原始 JSON 输出', false)
|
||||
.option('--include-actions', '也列出 form 通过 Actions/Module 自动注册的菜单 (visualdev/Base 表, 不在 system/Menu 树里)', false)
|
||||
.action(async (opts: Opts) => {
|
||||
const c = await JnpfClient.fromToken()
|
||||
// /ModuleBySystem 自动按请求头 App-Code 过滤
|
||||
const r = await c.get<unknown>('/system/Menu/ModuleBySystem', { keyword: opts.keyword })
|
||||
if (r.code !== 200) { log.error(`menu list 失败: ${r.msg}`); process.exit(1) }
|
||||
if (opts.json) { printJson(r.data); return }
|
||||
const list = (Array.isArray(r.data) ? r.data : (r.data as { list?: unknown[] })?.list) || []
|
||||
|
||||
// --include-actions: 合并 visualdev/Base 的 form-driven 菜单
|
||||
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')
|
||||
}
|
||||
|
||||
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))
|
||||
@@ -32,15 +62,45 @@ export function buildMenuListCommand(): Command {
|
||||
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}`)
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
installAiHelpHook(cmd, {
|
||||
purpose: '列出当前 app 的菜单树 (按请求头 App-Code 过滤).',
|
||||
required: {},
|
||||
optional: { '--keyword': '搜索关键字', '--flat': '平铺打印' },
|
||||
example: 'dacli menu list',
|
||||
source: { api: 'GET /api/system/Menu/ModuleBySystem' },
|
||||
notes: ['先 dacli app switch --appCode=X 切到目标应用, 才能看到对应菜单'],
|
||||
optional: {
|
||||
'--keyword': '搜索关键字',
|
||||
'--flat': '平铺打印',
|
||||
'--include-actions': '合并 form Actions/Module 自动注册的菜单 (visualdev/Base 表, 不在 system/Menu 树里)',
|
||||
},
|
||||
example: 'dacli menu list --include-actions',
|
||||
source: {
|
||||
api: 'GET /api/system/Menu/ModuleBySystem (默认) / GET /api/visualdev/Base + /visualdev/Base/{id}/getReleaseMenu (--include-actions)',
|
||||
web: 'web/src/api/onlineDev/visualDev.ts (getReleaseMenu) + web/src/views/onlineDev/formDesign/CreateMenuModal.vue',
|
||||
},
|
||||
notes: [
|
||||
'先 dacli app switch --appCode=X 切到目标应用, 才能看到对应菜单',
|
||||
'默认只列 system/Menu 树; web formDesign 自动挂的菜单在 visualdev/Base 表, 需 --include-actions 才显示',
|
||||
],
|
||||
})
|
||||
return cmd
|
||||
}
|
||||
@@ -0,0 +1,178 @@
|
||||
/**
|
||||
* unit/menu_actions.test.ts — fetchAllFormReleasedMenus 单测
|
||||
*
|
||||
* 覆盖:
|
||||
* - 拉 /visualdev/Base 拿 form 列表
|
||||
* - 逐个 form 调 /visualdev/Base/{id}/getReleaseMenu
|
||||
* - pcIsRelease=1 + pcReleaseName → 收一条 PC 记录
|
||||
* - 同一菜单名 (pc/app) 多次出现要去重
|
||||
* - 单 form 失败不影响整体 (catch 后跳过, failed++ 计数)
|
||||
* - pcIsRelease=0/null 的 form 不入结果
|
||||
*/
|
||||
import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'
|
||||
import { fetchAllFormReleasedMenus } from '../../src/commands/menu/_helpers.ts'
|
||||
import { JnpfClient } from '../../src/core/client.ts'
|
||||
|
||||
interface CapturedCall {
|
||||
url: string
|
||||
method: string
|
||||
}
|
||||
|
||||
let calls: CapturedCall[] = []
|
||||
let stubbed: ReturnType<typeof vi.fn> | null = null
|
||||
|
||||
beforeEach(() => {
|
||||
calls = []
|
||||
stubbed = vi.fn(async (url: string, init?: RequestInit) => {
|
||||
const method = init?.method || 'GET'
|
||||
calls.push({ url, method })
|
||||
|
||||
// /visualdev/Base → 返 form 列表 (注意: 必须排除 /visualdev/Base/{id}/getReleaseMenu)
|
||||
if (url.includes('/visualdev/Base') && !url.includes('/getReleaseMenu')) {
|
||||
return {
|
||||
text: async () => JSON.stringify({
|
||||
code: 200,
|
||||
msg: 'ok',
|
||||
data: {
|
||||
list: [
|
||||
{ id: 'F1', enCode: 'jxcj_competition', fullName: '赛事' },
|
||||
{ id: 'F2', enCode: 'jxcj_player', fullName: '选手' },
|
||||
{ id: 'F3', enCode: 'jxcj_draft', fullName: '草稿' }, // pcIsRelease=0
|
||||
{ id: 'F4', enCode: 'jxcj_broken', fullName: '坏' }, // getReleaseMenu 抛错
|
||||
],
|
||||
},
|
||||
}),
|
||||
} as Response
|
||||
}
|
||||
|
||||
// 单 form getReleaseMenu
|
||||
const m = url.match(/\/visualdev\/Base\/(F[1-4])\/getReleaseMenu/)
|
||||
if (m) {
|
||||
const fid = m[1]
|
||||
if (fid === 'F4') {
|
||||
// 模拟网络异常
|
||||
throw new Error('network error')
|
||||
}
|
||||
if (fid === 'F3') {
|
||||
// 模拟未发布
|
||||
return {
|
||||
text: async () => JSON.stringify({ code: 200, msg: 'ok', data: { pcIsRelease: 0, appIsRelease: 0 } }),
|
||||
} as Response
|
||||
}
|
||||
// F1: PC released; F2: APP released
|
||||
if (fid === 'F1') {
|
||||
return {
|
||||
text: async () => JSON.stringify({
|
||||
code: 200, msg: 'ok',
|
||||
data: {
|
||||
pcIsRelease: 1,
|
||||
pcReleaseName: '赛事管理/赛事列表',
|
||||
appIsRelease: 0,
|
||||
},
|
||||
}),
|
||||
} as Response
|
||||
}
|
||||
if (fid === 'F2') {
|
||||
return {
|
||||
text: async () => JSON.stringify({
|
||||
code: 200, msg: 'ok',
|
||||
data: {
|
||||
pcIsRelease: 0,
|
||||
appIsRelease: 1,
|
||||
appReleaseName: '选手管理/选手列表',
|
||||
},
|
||||
}),
|
||||
} as Response
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
text: async () => JSON.stringify({ code: 404, msg: 'unmocked' }),
|
||||
} as Response
|
||||
})
|
||||
vi.stubGlobal('fetch', stubbed)
|
||||
})
|
||||
|
||||
afterEach(() => {
|
||||
vi.unstubAllGlobals()
|
||||
})
|
||||
|
||||
function makeClient(): JnpfClient {
|
||||
const c = new JnpfClient({
|
||||
baseUrl: 'http://127.0.0.1:30000/api',
|
||||
appCode: 'jxcj',
|
||||
account: 'admin',
|
||||
password: 'x',
|
||||
})
|
||||
c.token = 'mock-token'
|
||||
return c
|
||||
}
|
||||
|
||||
describe('fetchAllFormReleasedMenus', () => {
|
||||
it('遍历 form 列表, 收集 pc/app release, 失败 form 跳过', async () => {
|
||||
const c = makeClient()
|
||||
const r = await fetchAllFormReleasedMenus(c)
|
||||
|
||||
// 扫了 4 个 form, 1 个失败 (F4)
|
||||
expect(r.scanned).toBe(4)
|
||||
expect(r.failed).toBe(1)
|
||||
// F1 → PC, F2 → APP, F3/F4 → 跳过
|
||||
expect(r.menus.length).toBe(2)
|
||||
|
||||
const pc = r.menus.find((m) => m.pcName)
|
||||
const app = r.menus.find((m) => m.appName)
|
||||
expect(pc?.formId).toBe('F1')
|
||||
expect(pc?.formEnCode).toBe('jxcj_competition')
|
||||
expect(pc?.pcName).toBe('赛事管理/赛事列表')
|
||||
expect(pc?.pcIsRelease).toBe(1)
|
||||
|
||||
expect(app?.formId).toBe('F2')
|
||||
expect(app?.formEnCode).toBe('jxcj_player')
|
||||
expect(app?.appName).toBe('选手管理/选手列表')
|
||||
})
|
||||
|
||||
it('调用顺序: 先 list, 然后逐个 getReleaseMenu', async () => {
|
||||
const c = makeClient()
|
||||
await fetchAllFormReleasedMenus(c)
|
||||
|
||||
// 1 次 list + 4 次 getReleaseMenu
|
||||
const listCall = calls.find((c) => c.url.includes('/visualdev/Base') && !c.url.includes('/getReleaseMenu'))
|
||||
expect(listCall).toBeTruthy()
|
||||
const getCalls = calls.filter((c) => /\/visualdev\/Base\/(F[1-4])\/getReleaseMenu/.test(c.url))
|
||||
expect(getCalls.length).toBe(4)
|
||||
})
|
||||
|
||||
it('同一菜单名 (跨 form) 去重', async () => {
|
||||
const dedupStub = vi.fn(async (url: string) => {
|
||||
if (url.includes('/visualdev/Base') && !url.includes('/getReleaseMenu')) {
|
||||
return { text: async () => JSON.stringify({ code: 200, msg: 'ok', data: { list: [
|
||||
{ id: 'F1', enCode: 'a' },
|
||||
{ id: 'F2', enCode: 'b' },
|
||||
] } }) } as Response
|
||||
}
|
||||
if (/\/visualdev\/Base\/(F[12])\/getReleaseMenu/.test(url)) {
|
||||
return { text: async () => JSON.stringify({ code: 200, msg: 'ok', data: {
|
||||
pcIsRelease: 1, pcReleaseName: 'SAME/PC/PATH',
|
||||
appIsRelease: 1, appReleaseName: 'SAME/APP/PATH',
|
||||
} }) } as Response
|
||||
}
|
||||
return { text: async () => JSON.stringify({ code: 404 }) } as Response
|
||||
})
|
||||
vi.stubGlobal('fetch', dedupStub)
|
||||
const c = makeClient()
|
||||
const r = await fetchAllFormReleasedMenus(c)
|
||||
expect(r.menus.length).toBe(2) // pc 1 条 + app 1 条 (各去重一次)
|
||||
expect(r.menus.find((m) => m.pcName === 'SAME/PC/PATH')).toBeTruthy()
|
||||
expect(r.menus.find((m) => m.appName === 'SAME/APP/PATH')).toBeTruthy()
|
||||
})
|
||||
|
||||
it('onProgress 回调被调用', async () => {
|
||||
const c = makeClient()
|
||||
const progress: Array<[number, number]> = []
|
||||
await fetchAllFormReleasedMenus(c, {
|
||||
onProgress: (done, total) => progress.push([done, total]),
|
||||
})
|
||||
expect(progress.length).toBe(4)
|
||||
expect(progress[progress.length - 1]).toEqual([4, 4])
|
||||
})
|
||||
})
|
||||
Reference in new issue
Block a user