616 lines
31 KiB
TypeScript
616 lines
31 KiB
TypeScript
/**
|
|
* commands/menu/create.ts — 创建菜单
|
|
*
|
|
* v0.6 重写: 优先用 web 真路径 (POST /api/visualdev/Base/{formId}/Actions/Module).
|
|
* - 体现 prompt §2.1 "复用 web 源码" 初心
|
|
* - 后端自动构造 moduleId/propertyJson/urlAddress/pageAddress 等所有字段
|
|
* - 移植自 web/views/onlineDev/formDesign/components/CreateMenuModal.vue handleSubmit (line ~120)
|
|
*
|
|
* 两种模式:
|
|
* A) 挂表单菜单 (--formId 给) — 走 web Actions/Module 高级 API
|
|
* B) 普通菜单 (目录/外链) — 走 POST /api/system/Menu 低级 API
|
|
*
|
|
* Actions/Module body (来自 CreateMenuModal.vue:99-119):
|
|
* {
|
|
* pc: 1, // 桌面端发布
|
|
* app: 0, // 移动端不发布 (默认)
|
|
* pcModuleParentId: ["0"], // 顶级 (数组, 可挂多个父)
|
|
* appModuleParentId: [],
|
|
* platformRelease: '{"pc":1,"app":0}'
|
|
* }
|
|
*
|
|
* 关键: 顶级父 menuId 用 "0" (web 端通过 getMenuSelectorFilter 拿默认根).
|
|
*/
|
|
import { Command } from 'commander'
|
|
import { JnpfClient } from '../../core/client.ts'
|
|
import { installHelpHook } from '../../core/help.ts'
|
|
import { log, printJson } from '../../core/log.ts'
|
|
import { loadContextSafe } from '../_precheck.ts'
|
|
import { runGuards, handleGuardResult } from '../_blindspot_guards.ts'
|
|
import { validateMenuCreate, type MenuNodeLite, type FormLite } from './_validate.ts'
|
|
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 { autoStripEnCode, autoStripFullName } from '../_encode_validator.ts'
|
|
|
|
interface Opts {
|
|
fullName: string
|
|
enCode?: string
|
|
formId?: string
|
|
parentId?: string
|
|
pcParents?: string
|
|
appParents?: string
|
|
pc?: boolean
|
|
app?: boolean
|
|
type?: string
|
|
urlAddress?: string
|
|
icon?: string
|
|
/** v0.21+ BS-drift-M-1 fix: 手动设 propertyJson.moduleId (D-9/D-12 找不到 form 时 fallback) */
|
|
moduleId?: string
|
|
/** v0.21+ BS-drift-M-2 fix: 手动设 sortCode (默认 0, 拖拽排序丢失 baseline 顺序) */
|
|
sortCode?: string
|
|
/** v0.11 新增: 支持 App 菜单 (web Form.vue 下拉 Web/App 二选一) */
|
|
category?: string
|
|
json?: boolean
|
|
}
|
|
|
|
export function buildMenuCreateCommand(): Command {
|
|
const cmd = new Command('create')
|
|
.description('创建菜单. --formId 给则走 web 真路径 Actions/Module, 否则走低级 POST /system/Menu')
|
|
// v0.12+ BS-New-8 fix (2026-06-30 jxcj): --fullName 改为可选 (Mode A 走 Actions/Module 时自动从 form.info.fullName 拿)
|
|
.option('--fullName <n>', '菜单中文名 (Mode A: 不传则自动从 form.info.fullName 拿; Mode B: 必填)')
|
|
.option('--enCode <e>', '菜单英文编码 (默认=fullName)')
|
|
.option('--formId <f>', '关联 form id (挂表单菜单时给 → 走 Actions/Module)')
|
|
.option('--pcParents <ids>', '挂表单时桌面端父菜单 id 列表 (逗号分隔, 默认 "0" 顶级)')
|
|
.option('--appParents <ids>', '挂表单时移动端父菜单 id 列表 (逗号分隔, 默认空 = 不发布)')
|
|
.option('--no-pc', '挂表单时不发布桌面端 (默认 true)')
|
|
.option('--app', '挂表单时发布移动端 (默认 false)', false)
|
|
.option('--parentId <p>', '低级模式: 父菜单 id', '-1')
|
|
.option('--type <t>', '低级模式 type: 1=目录 2=Vue扩展 3=VisualDev 7=外链', '1')
|
|
.option('--urlAddress <u>', '低级模式: URL')
|
|
.option('--icon <i>', '低级模式: 图标')
|
|
// v0.21+ BS-drift-M-1 fix: 手动设 propertyJson.moduleId
|
|
// 场景: D-9/D-12 找不到 form 时 (cross-app 引用, form 在其他 system), 用户手动指定 moduleId
|
|
.option('--moduleId <id>', '低级模式: propertyJson.moduleId (默认空, 走 D-9/D-12 自动填)')
|
|
// v0.21+ BS-drift-M-2 fix: 手动设 sortCode (默认 0)
|
|
.option('--sortCode <n>', '低级模式: sortCode 排序 (默认 0)', '0')
|
|
// v0.11 新增: 支持 App 菜单 (默认 Web)
|
|
.option('--category <c>', '菜单分类 (Web | App, 默认 Web)', 'Web')
|
|
.option('--json', '原始 JSON 输出', false)
|
|
.action(async (opts: Opts) => {
|
|
const c = await JnpfClient.fromToken()
|
|
|
|
// v0.21+ (Round 12 BS-新38): enCode 含 `-`/`_` 自动 strip + WARN
|
|
if (opts.enCode) {
|
|
const _encStrip = autoStripEnCode(opts.enCode)
|
|
if (_encStrip.wasStriped) {
|
|
log.warn(`! autoStrip enCode: ${_encStrip.original} → ${_encStrip.value} (BS-新38, 下次别用 - 或 _)`)
|
|
opts.enCode = _encStrip.value
|
|
}
|
|
}
|
|
|
|
// v0.21+ R14 fix (BS-新52): fullName 含 space/parens 自动 strip + WARN
|
|
if (opts.fullName) {
|
|
const _fnStrip = autoStripFullName(opts.fullName)
|
|
if (_fnStrip.wasStriped) {
|
|
log.warn(`! autoStrip fullName: ${_fnStrip.original} → ${_fnStrip.value} (BS-新52, 下次别用空格/括号/标点)`)
|
|
opts.fullName = _fnStrip.value
|
|
}
|
|
}
|
|
|
|
// P3.1: 第二层防御 — blindspot guard (BS-4/5/8/47/50 等)
|
|
// - ERROR → exit 2 (与 pre-check 一致)
|
|
// - WARN → 仅打印, 不阻断
|
|
// - context 加载失败时跳过 (容错)
|
|
const guardCtx = await loadContextSafe(c)
|
|
if (guardCtx.warning) log.warn(guardCtx.warning)
|
|
handleGuardResult('menu create', runGuards(guardCtx.ctx, {
|
|
fullName: opts.fullName,
|
|
enCode: opts.enCode,
|
|
formId: opts.formId,
|
|
}, 'menu create'))
|
|
|
|
// v0.12+ BS-New-8 fix (2026-06-30 jxcj): --fullName 没传时, 自动从 form.info 拿 (在 step machine 前)
|
|
// 根因: step machine 校验 fullName 必填, 但 Mode A 走 web Actions/Module 应自动推导
|
|
// 镜像: web CreateMenuModal.vue:62-68 handleSubmit 自动 form.fullName → menu.fullName
|
|
// 修: 提前 fetch form, 用 form.fullName 填充 opts.fullName (再走 step machine 校验)
|
|
if (opts.formId && (!opts.fullName || !opts.enCode)) {
|
|
try {
|
|
const fR = await c.get<{ data?: { fullName?: string; enCode?: string } }>(`/visualdev/Base/${opts.formId}`)
|
|
const fData = (fR.data as { fullName?: string; enCode?: string } | undefined) || {}
|
|
if (!opts.fullName && fData.fullName) {
|
|
opts.fullName = fData.fullName
|
|
log.info(` BS-New-8: --fullName 未传, 自动从 form.info.fullName 拿 = "${opts.fullName}"`)
|
|
}
|
|
if (!opts.enCode && fData.enCode) {
|
|
opts.enCode = fData.enCode
|
|
log.info(` BS-New-8: --enCode 未传, 自动从 form.info.enCode 拿 = "${opts.enCode}"`)
|
|
}
|
|
} catch (e) {
|
|
log.warn(` BS-New-8 自动取 form.info 失败: ${(e as Error).message?.slice(0, 80)}`)
|
|
}
|
|
if (!opts.fullName) {
|
|
log.error('--formId 模式: --fullName 必填 (form.info 没拿到 fullName, 请手动 --fullName=...)')
|
|
process.exit(2)
|
|
}
|
|
if (!opts.enCode) {
|
|
log.error('--formId 模式: --enCode 必填 (form.info 没拿到 enCode, 请手动 --enCode=...)')
|
|
process.exit(2)
|
|
}
|
|
}
|
|
|
|
// v0.11d+ step machine 校验 (镜像 web Form.vue handleSubmit L230-258 + 后端 ModuleController create L172-190)
|
|
// 在发 API 前暴露问题, AI 不用等后端 400 才发现 (4 step 聚合错误)
|
|
await runStepMachine(c, opts)
|
|
|
|
// BS-E10 (Round 8 P1): urlAddress 全平台唯一, 重复会 400 "The address cannot be duplicated"
|
|
// step 0 拦截: 拉 menu list 查重, 冲突时 WARN (不阻断, 让用户决定是否复用 url)
|
|
if (opts.urlAddress && !opts.formId) {
|
|
try {
|
|
await initWebapi(c)
|
|
const listResp = (await loadMenu.getMenuList({})) as unknown
|
|
const list = (listResp as any)?.data || (listResp as any)?.list || []
|
|
const conflicts = list.filter((m: any) => m.urlAddress === opts.urlAddress)
|
|
if (conflicts.length > 0) {
|
|
const ids = conflicts.map((c: any) => `${c.fullName}(${c.id})`).join(', ')
|
|
log.warn(`BS-E10: urlAddress="${opts.urlAddress}" 已存在 (${conflicts.length} 条: ${ids})`)
|
|
log.warn(` 后端会 400 'The address cannot be duplicated', 建议: 删除旧 menu 或换 urlAddress`)
|
|
}
|
|
} catch (e) {
|
|
log.warn(`BS-E10: 查 menu urlAddress 失败 (${(e as Error).message?.slice(0, 80)}), 跳过预校验`)
|
|
}
|
|
}
|
|
|
|
// 模式 A: 挂表单菜单 — 走 web 真路径
|
|
if (opts.formId) {
|
|
// v0.12+ BS-New-8 fix: --fullName 没传时, 自动从 form.info 拿
|
|
if (!opts.fullName) {
|
|
try {
|
|
const fR = await c.get<{ data?: { fullName?: string; enCode?: string } }>(`/visualdev/Base/${opts.formId}`)
|
|
const fData = (fR.data as { fullName?: string; enCode?: string } | undefined) || {}
|
|
if (fData.fullName) {
|
|
opts.fullName = fData.fullName
|
|
log.info(` BS-New-8: --fullName 未传, 自动从 form.info.fullName 拿 = "${opts.fullName}"`)
|
|
}
|
|
if (!opts.enCode && fData.enCode) {
|
|
opts.enCode = fData.enCode
|
|
log.info(` BS-New-8: --enCode 未传, 自动从 form.info.enCode 拿 = "${opts.enCode}"`)
|
|
}
|
|
} catch (e) {
|
|
log.warn(` BS-New-8 自动取 form.info 失败: ${(e as Error).message?.slice(0, 80)}`)
|
|
}
|
|
}
|
|
if (!opts.fullName) {
|
|
log.error('--formId 模式: --fullName 必填 (form.info 没拿到 fullName)')
|
|
process.exit(2)
|
|
}
|
|
// D-4 (盲点 40 防御): form webType=4 (视图) 走 Actions/Module 会 400, 自动 fallback 低级 API
|
|
let formWebType = 0
|
|
let formEnCode = ''
|
|
try {
|
|
const formR = await c.get<{ data?: { webType?: string | number; enCode?: string } }>(`/visualdev/Base/${opts.formId}`)
|
|
const fData = (formR.data as { webType?: string | number; enCode?: string } | undefined) || {}
|
|
formWebType = Number(fData.webType || 0)
|
|
formEnCode = fData.enCode || ''
|
|
if (formWebType === 4) {
|
|
log.warn(`D-4: form webType=4 (视图), Actions/Module 走不通, 自动 fallback 低级 API`)
|
|
// 走低级 API, 把菜单挂上
|
|
const lowBody: Record<string, unknown> = {
|
|
fullName: opts.fullName,
|
|
enCode: opts.enCode || formEnCode,
|
|
parentId: opts.parentId && opts.parentId !== '-1' ? opts.parentId : '836286140288869573', // 没传父, 用第一个 Web 根
|
|
type: 3, // VisualDev
|
|
enabledMark: 1,
|
|
sortCode: 0,
|
|
// v0.11 修复: 用 opts.category (默认 Web), 支持 --category=App
|
|
category: opts.category || 'Web',
|
|
linkTarget: '_self',
|
|
// v0.11 修复: web Form.vue:281-291 — type=3 属表单类 → is*Authorize=1
|
|
isButtonAuthorize: 1,
|
|
isColumnAuthorize: 1,
|
|
isDataAuthorize: 1,
|
|
isFormAuthorize: 1,
|
|
icon: opts.icon || 'icon-ym icon-ym-generator',
|
|
propertyJson: `{"moduleId":"${opts.formId}","iconBackgroundColor":"","isTree":0,"webType":4}`,
|
|
urlAddress: `model/${formEnCode || opts.enCode}`,
|
|
pageAddress: `model/${formEnCode || opts.enCode}`,
|
|
}
|
|
// 自动从 SelectorFilter 找 pc 父菜单
|
|
if (lowBody.parentId === '836286140288869573') {
|
|
const sel = await c.get<{ list?: { id: string; type: number }[] }>('/system/Menu/SelectorFilter/0', { category: 'Web' })
|
|
const root = sel.data?.list?.find((m) => m.type === 0)
|
|
if (root) lowBody.parentId = root.id
|
|
}
|
|
log.info(`POST /system/Menu (D-4 fallback) ${lowBody.enCode} type=3 webType=4`)
|
|
const r = await c.postJson<{ id?: string }>('/system/Menu', lowBody)
|
|
if (r.code !== 200) {
|
|
log.error(`D-4 fallback menu create 失败 code=${r.code}: ${r.msg}`)
|
|
if (opts.json) printJson(r)
|
|
process.exit(1)
|
|
}
|
|
// B-19 fix: D-4 视图菜单也不返 id, 用 lookup 反查
|
|
const d4MenuId = await lookupMenuIdByEnCode(formEnCode || opts.enCode || opts.fullName)
|
|
log.ok(`✓ 视图菜单创建成功 (formId=${opts.formId}, webType=4): id=${d4MenuId || r.data?.id || '(unknown)'} (B-19)`)
|
|
if (opts.json) printJson({ id: d4MenuId, formId: opts.formId, ...(r.data || {}) })
|
|
return
|
|
}
|
|
} catch (e) {
|
|
log.warn(`D-4: GET form webType 失败 (${(e as Error).message?.slice(0, 80)}), 继续走 Actions/Module`)
|
|
}
|
|
|
|
const pc = opts.pc === false ? 0 : 1
|
|
const app = opts.app ? 1 : 0
|
|
if (!pc && !app) {
|
|
log.error('至少一个发布平台 (pc / app), 当前都是 0')
|
|
process.exit(2)
|
|
}
|
|
// v0.7.1 fix (盲点 23 续): 不传 --pcParents 时, 自动从 /system/Menu/SelectorFilter/0
|
|
// 拉当前 app 的根目录菜单当 parent (web 端 getMenuSelectorFilter({category:'Web'}, '0') 同款)
|
|
// 旧默认 '0' 在 tds 等应用下不存在 → 报 "找不到该上级"
|
|
// v0.8.2 修复 (2026-06-19, tdd1 实战发现): type===0 是"应用系统"节点 (parentId:-1), 不是真菜单.
|
|
// 真菜单应该是 type===1 (目录). 优先 type===1, 没则递归 children
|
|
let pcParents: string[] = opts.pcParents ? opts.pcParents.split(',').filter(Boolean) : []
|
|
if (pc && pcParents.length === 0) {
|
|
const sel = await c.get<{
|
|
list?: { id: string; type: number; children?: { id: string; type: number }[] }[]
|
|
}>('/system/Menu/SelectorFilter/0', { category: 'Web' })
|
|
// 递归找第一个 type===1 的菜单 (目录)
|
|
const findMenu = (
|
|
items: { id: string; type: number; children?: { id: string; type: number; children?: any }[] }[] | undefined,
|
|
): string | null => {
|
|
if (!items) return null
|
|
for (const it of items) {
|
|
if (it.type === 1) return it.id
|
|
const child = findMenu(it.children)
|
|
if (child) return child
|
|
}
|
|
return null
|
|
}
|
|
const root = findMenu(sel.data?.list)
|
|
if (root) {
|
|
pcParents = [root]
|
|
log.info(`自动发现父菜单 (Web 目录): id=${root}`)
|
|
} else {
|
|
log.warn('SelectorFilter 未返 Web 菜单, 用默认 "0" (Actions/Module 可能报"找不到该上级")')
|
|
pcParents = ['0']
|
|
}
|
|
}
|
|
const appParents = opts.appParents ? opts.appParents.split(',').filter(Boolean) : []
|
|
const body = {
|
|
pc,
|
|
app,
|
|
pcModuleParentId: pcParents,
|
|
appModuleParentId: appParents,
|
|
platformRelease: JSON.stringify({ pc, app }),
|
|
}
|
|
log.info(`POST /visualdev/Base/${opts.formId}/Actions/Module (web 真路径)`)
|
|
const r = await c.postJson(`/visualdev/Base/${opts.formId}/Actions/Module`, body)
|
|
if (r.code !== 200) {
|
|
// v0.8.2 修复 (2026-06-19, tdd1 实战发现): 当 pcParents 非空但 Actions/Module 报"名称重复",
|
|
// 实为 JNPF 在指定父菜单下检测到同名 (可能软删除/全局). 重试用空 pcParents (顶级)
|
|
const needRetry =
|
|
r.code === 400 && /名称重复|name.*repeat|enCode.*repeated/i.test(r.msg || '')
|
|
if (needRetry && pcParents.length > 0 && pcParents[0] !== '0') {
|
|
log.warn(` ↳ Actions/Module "${r.msg}", 重试用空 pcParents (顶级)`)
|
|
const retryBody = { ...body, pcModuleParentId: [] }
|
|
const rr = await c.postJson(`/visualdev/Base/${opts.formId}/Actions/Module`, retryBody)
|
|
if (rr.code === 200) {
|
|
log.ok(`✓ 菜单发布成功 (重试后顶级, formId=${opts.formId}, pc=${pc}, app=${app})`)
|
|
log.ok(' ↳ 后端已自动构造 moduleId/propertyJson/urlAddress/pageAddress + 给当前角色授权')
|
|
if (opts.json) printJson(rr)
|
|
return
|
|
}
|
|
log.error(` ↳ 重试仍失败 code=${rr.code}: ${rr.msg}`)
|
|
}
|
|
// P0-4 fix (2026-07-16 jxcj 实战): Actions/Module 报"找不到该上级" (code=400) 时,
|
|
// 实为 pcParents=[...] 找不到有效父菜单 (SelectorFilter 自动发现失效 / 跨 app 引用).
|
|
// 自动 fallback 低级 POST /system/Menu 路径 (Mode B), 用 form 默认值 (parentId=-1, type=3, icon=form).
|
|
// 用户显式传 --icon/--parentId/--type 高级参数时优先尊重.
|
|
// 镜像 plan.md §6 修复方向: e.code === 400 && e.msg.includes('找不到该上级') → lowLevelPath()
|
|
const needFallbackLow =
|
|
r.code === 400 && /找不到该上级/.test(r.msg || '')
|
|
if (needFallbackLow) {
|
|
log.warn(`⚠ P0-4: Actions/Module 失败 (${r.msg}), 自动 fallback 低级 POST /system/Menu 路径`)
|
|
// 拉 form enCode 拼 urlAddress + propertyJson (镜像 Mode B D-9 逻辑)
|
|
let fallbackEnCode = opts.enCode || ''
|
|
try {
|
|
if (!fallbackEnCode) {
|
|
const fR = await c.get<{ data?: { enCode?: string } }>(`/visualdev/Base/${opts.formId}`)
|
|
fallbackEnCode = (fR.data as { enCode?: string } | undefined)?.enCode || opts.fullName || ''
|
|
}
|
|
} catch {
|
|
fallbackEnCode = fallbackEnCode || opts.fullName || ''
|
|
}
|
|
// 复用 Mode B 路径: 强制 type=3 (VisualDev), icon=form 默认 (用户 --icon 优先), parentId=低级默认 (用户 --parentId 优先)
|
|
const fallbackOpts: Opts = {
|
|
...opts,
|
|
type: '3',
|
|
icon: opts.icon || 'icon-ym icon-ym-form',
|
|
// parentId 保留 opts.parentId (用户显式值 或 commander 默认 '-1')
|
|
urlAddress: opts.urlAddress || `model/${fallbackEnCode}`,
|
|
}
|
|
log.info(` ↳ fallback params: parentId=${fallbackOpts.parentId} type=3 icon=${fallbackOpts.icon} urlAddress=${fallbackOpts.urlAddress}`)
|
|
// 直接调用 Mode B 实现 (low-level path)
|
|
await runLowLevelPath(c, fallbackOpts)
|
|
return
|
|
}
|
|
log.error(`menu create (Actions/Module) 失败 code=${r.code}: ${r.msg}`)
|
|
// v0.11e+ Phase A1: 后端错误增强 — 自动从 msg 提取 ErrorCode
|
|
const enhanced = enhanceFromBackend(r.msg || '', 'menu', { entity: 'menu' })
|
|
log.error(` ${formatErrorLine(enhanced, { step: 3, stepName: '后端API' })}`)
|
|
if (opts.json) printJson(r)
|
|
process.exit(1)
|
|
}
|
|
log.ok(`✓ 菜单发布成功 (formId=${opts.formId}, pc=${pc}, app=${app})`)
|
|
log.ok(' ↳ 后端已自动构造 moduleId/propertyJson/urlAddress/pageAddress + 给当前角色授权')
|
|
// B-19 fix: 模式 A Actions/Module 不返 id, 用 lookup 反查 (镜像 B-15 dict)
|
|
// 后端 menu enCode 默认 = form enCode, 用 form enCode 查
|
|
let menuId: string | null = null
|
|
try {
|
|
const formR = await c.get<{ data?: { enCode?: string } }>(`/visualdev/Base/${opts.formId}`)
|
|
const fData = (formR.data as { enCode?: string } | undefined) || {}
|
|
const formEnCode = fData.enCode || opts.fullName
|
|
menuId = await lookupMenuIdByEnCode(formEnCode)
|
|
} catch {
|
|
// 拉 form 失败也不阻断 (lookup 仍按 fullName 查)
|
|
menuId = await lookupMenuIdByEnCode(opts.fullName)
|
|
}
|
|
log.ok(` ↳ 菜单 id=${menuId || '(unknown)'} (B-19 反查自 ModuleBySystem)`)
|
|
if (opts.json) printJson({ id: menuId, formId: opts.formId, fullName: opts.fullName })
|
|
return
|
|
}
|
|
|
|
// 模式 B: 低级 POST /system/Menu (目录/外链等) — 复用 runLowLevelPath
|
|
// P0-4: Mode A Actions/Module "找不到该上级" 失败时也走这个函数 (强制 type=3, icon=form 默认)
|
|
await runLowLevelPath(c, opts)
|
|
return
|
|
})
|
|
|
|
installHelpHook(cmd, {
|
|
purpose: '创建菜单. 挂表单菜单 (--formId) 走 web 真路径 Actions/Module, 后端自动处理所有字段. v0.11d+ 加 step machine 校验 (4 step 镜像 web Form.vue + 后端 ModuleController.create, 聚合错误, AI 不用去浏览器试错)',
|
|
required: { '--fullName': '中文名' },
|
|
optional: {
|
|
'--formId': '关联 form id (走 web Actions/Module 高级 API)',
|
|
'--pcParents': '桌面端父菜单 ids (逗号分隔, 默认 "0" 顶级)',
|
|
'--no-pc': '不发布桌面端',
|
|
'--app': '同时发布移动端',
|
|
'--enCode': '英文编码 (低级模式用)',
|
|
'--type': '低级模式 type',
|
|
'--parentId': '低级模式父 id',
|
|
'--urlAddress': '低级模式 URL',
|
|
},
|
|
example: [
|
|
'# 挂表单菜单 (推荐 web 真路径)',
|
|
'dacli menu create --fullName="员工培训" --formId=835141398800901061',
|
|
'# 挂在指定父菜单',
|
|
'dacli menu create --fullName="员工培训" --formId=xxx --pcParents=父menuId1,父menuId2',
|
|
'# 顶级目录',
|
|
'dacli menu create --fullName="人事管理" --enCode=hr --type=1',
|
|
],
|
|
source: {
|
|
api: 'POST /api/visualdev/Base/{formId}/Actions/Module (挂表单) / POST /api/system/Menu (普通)',
|
|
ref: 'web/views/onlineDev/formDesign/components/CreateMenuModal.vue + web/views/permission/menu/Form.vue (后端: jnpf/.../ModuleController.java:172-190)',
|
|
},
|
|
notes: [
|
|
'v0.11d+ step machine (镜像 web Form.vue handleSubmit + 后端 ModuleController create):',
|
|
' step 0 基础信息: fullName 必填 + enCode 正则 + type 合法 + icon 必填 (低级模式)',
|
|
' step 1 表单关联: --formId 模式: form 存在 + state=1 已发布 (镜像 web fetchFeatureList isRelease=1)',
|
|
' step 2 父菜单+路径: parentId/pcParents 存在 + 类型合法 (type=1 目录, 不能 type=3 当 parent)',
|
|
' + 自动构造 pageAddress (镜像 Form.vue:238-243 type→路由前缀)',
|
|
' step 3 唯一性预校验: fullName/enCode/urlAddress 唯一 (镜像 ModuleController.java:179-187)',
|
|
'挂表单菜单优先 --formId, 后端自动给当前用户角色授权 + 构造 moduleId/propertyJson',
|
|
'web 端 getReleaseMenu 可查是否已发布',
|
|
'前端 storage 缓存可能 1-2s 延迟才看到新菜单, 重登/F5 兜底',
|
|
],
|
|
})
|
|
return cmd
|
|
}
|
|
|
|
/**
|
|
* v0.21+ P0-4 (2026-07-16 jxcj 实战): 低级 POST /system/Menu 路径 — Mode B 主路径 + Mode A "找不到该上级" 自动 fallback 共用
|
|
*
|
|
* 用法:
|
|
* - Mode B 主路径 (目录/外链等): `dacli menu create --fullName=X --type=1`
|
|
* - Mode A fallback (P0-4): `Actions/Module` 报 code=400 "找不到该上级" 时自动调用, 强制 type=3, icon='icon-ym icon-ym-form'
|
|
*
|
|
* 镜像: web/views/permission/menu/Form.vue handleSubmit (后端: jnpf/.../MenuController.java)
|
|
* + D-9/D-12 自动拉 form 拼 propertyJson.moduleId (BS-46/BS-50 修复)
|
|
* + BS-drift-M-1: --moduleId 覆盖 (跨 app 引用 form)
|
|
* + BS-drift-M-2: --sortCode 透传 (默认 0)
|
|
*/
|
|
async function runLowLevelPath(c: JnpfClient, opts: Opts): Promise<void> {
|
|
// v0.12+ BS-New-8: Mode B fullName 仍必填 (后端 MenuCrForm 必填, 且没有 form 可推导)
|
|
if (!opts.fullName) {
|
|
log.error('--fullName 必填 (低级模式, 目录/外链等)')
|
|
process.exit(2)
|
|
}
|
|
const enCode = opts.enCode || opts.fullName
|
|
const type = parseInt(opts.type || '1', 10)
|
|
const icon = opts.icon ?? (type === 1 ? 'icon-ym icon-ym-folder' : '')
|
|
|
|
// D-9 (BS-46 修复): 低级 mode 接收 --formId, 自动拉 form 详情拼 urlAddress + propertyJson
|
|
let resolvedUrl = opts.urlAddress
|
|
// v0.21+ R14 fix BS-新41: 表单类菜单 type ∈ [3, 4, 9, 11] 都应注入 moduleId
|
|
const isFormMenuType = [3, 4, 9, 11].includes(type as number)
|
|
|
|
let resolvedPage = opts.urlAddress
|
|
let propertyJson = '{"moduleId":"","iconBackgroundColor":"","isTree":0}'
|
|
|
|
if (opts.formId && isFormMenuType) {
|
|
// 拉 form 拿 enCode + columnData 自动填
|
|
try {
|
|
const formR = await c.get<{ data?: { enCode?: string; columnData?: string; webType?: string | number } }>(`/visualdev/Base/${opts.formId}`)
|
|
const fData = (formR.data as { enCode?: string; columnData?: string; webType?: string | number } | undefined) || {}
|
|
const formEnCode = fData.enCode || ''
|
|
const formWebType = Number(fData.webType || 0)
|
|
resolvedUrl = resolvedUrl || `model/${formEnCode}`
|
|
resolvedPage = resolvedPage || resolvedUrl
|
|
propertyJson = JSON.stringify({
|
|
moduleId: opts.formId,
|
|
iconBackgroundColor: '',
|
|
isTree: 0,
|
|
webType: formWebType,
|
|
})
|
|
log.info(`D-9: 自动拉 form (enCode=${formEnCode}, webType=${formWebType}) 拼 propertyJson.moduleId=${opts.formId}`)
|
|
} catch (e) {
|
|
log.warn(`D-9: GET form ${opts.formId} 失败 (${(e as Error).message?.slice(0, 80)}), 走默认 propertyJson`)
|
|
}
|
|
} else if (!opts.formId && isFormMenuType && resolvedUrl?.startsWith('model/')) {
|
|
// D-12 修复 (2026-06-23 jxcj E2E 复盘): type=3 + urlAddress=model/xxx 但没传 --formId
|
|
const modelEnCode = resolvedUrl.replace(/^model\//, '')
|
|
try {
|
|
const formR = await c.get<{ list?: { id: string; enCode: string; webType?: number | string }[] }>('/visualdev/Base', { keyword: modelEnCode, currentPage: 1, pageSize: 5 })
|
|
const forms = (formR.data as { list?: { id: string; enCode: string; webType?: number | string }[] } | undefined)?.list || []
|
|
const matched = forms.find(f => f.enCode === modelEnCode)
|
|
if (matched) {
|
|
const formWebType = Number(matched.webType || 0)
|
|
propertyJson = JSON.stringify({
|
|
moduleId: matched.id,
|
|
iconBackgroundColor: '',
|
|
isTree: 0,
|
|
webType: formWebType,
|
|
})
|
|
log.info(`D-12: urlAddress=model/${modelEnCode} 但未传 --formId, 自动从 keyword 查询并填 moduleId=${matched.id}`)
|
|
} else {
|
|
log.warn(`D-12: urlAddress=model/${modelEnCode} 但未找到 form, 建议传 --formId=X 或用 --formId 走 Actions/Module (避免浏览器层列表空)`)
|
|
}
|
|
} catch (e) {
|
|
log.warn(`D-12: GET form by enCode 失败 (${(e as Error).message?.slice(0, 80)})`)
|
|
}
|
|
}
|
|
|
|
// v0.21+ BS-drift-M-1 fix: 手动 --moduleId 覆盖 D-9/D-12 自动查找结果
|
|
if (opts.moduleId && isFormMenuType) {
|
|
const existing = JSON.parse(propertyJson) as Record<string, unknown>
|
|
existing.moduleId = opts.moduleId
|
|
propertyJson = JSON.stringify(existing)
|
|
log.info(`BS-drift-M-1 fix: --moduleId=${opts.moduleId} 覆盖 propertyJson.moduleId (type=${type})`)
|
|
}
|
|
|
|
// v0.11 修复: web Form.vue:281-291 条件化 is*Authorize
|
|
const isFormType = [2, 3, 4, 9, 11].includes(type)
|
|
const body: Record<string, unknown> = {
|
|
fullName: opts.fullName,
|
|
enCode,
|
|
parentId: opts.parentId || '-1',
|
|
type,
|
|
enabledMark: 1,
|
|
sortCode: parseInt(opts.sortCode || '0', 10),
|
|
category: opts.category || 'Web',
|
|
linkTarget: '_self',
|
|
isButtonAuthorize: isFormType ? 1 : 0,
|
|
isColumnAuthorize: isFormType ? 1 : 0,
|
|
isDataAuthorize: isFormType ? 1 : 0,
|
|
isFormAuthorize: isFormType ? 1 : 0,
|
|
icon,
|
|
propertyJson,
|
|
}
|
|
if (type === 7 && !opts.urlAddress) {
|
|
log.error('type=7 (外链) 必须传 --urlAddress')
|
|
process.exit(2)
|
|
}
|
|
if (resolvedUrl) {
|
|
body.urlAddress = resolvedUrl
|
|
body.pageAddress = resolvedPage
|
|
}
|
|
log.info(`POST /system/Menu ${enCode} (type=${type})`)
|
|
const r = await c.postJson<{ id?: string }>('/system/Menu', body)
|
|
if (r.code !== 200) {
|
|
log.error(`menu create 失败 code=${r.code}: ${r.msg}`)
|
|
// v0.11e+ Phase A1: 后端错误增强 — 自动从 msg 提取 ErrorCode
|
|
const enhanced = enhanceFromBackend(r.msg || '', 'menu', { entity: 'menu' })
|
|
log.error(` ${formatErrorLine(enhanced, { step: 3, stepName: '后端API' })}`)
|
|
process.exit(1)
|
|
}
|
|
// B-19 fix: JNPF POST /system/Menu 返 {data:null}, 反查真实 id (B-15 dict 镜像)
|
|
let menuId: string | null = (r.data?.id as string | undefined) || null
|
|
if (!menuId) {
|
|
menuId = await lookupMenuIdByEnCode(enCode)
|
|
}
|
|
log.ok(`✓ 创建: id=${menuId || '(unknown)'} enCode=${enCode}`)
|
|
if (opts.json) printJson({ id: menuId, enCode, ...body })
|
|
}
|
|
|
|
/**
|
|
* v0.11d+ step machine 校验 (4 步镜像 web Form.vue + 后端 ModuleController)
|
|
* 在发 API 前暴露问题, 聚合错误一次报, AI 不用去浏览器试错
|
|
*
|
|
* 镜像原型:
|
|
* - web Form.vue:230-258 handleSubmit (state mutation + validate)
|
|
* - web Form.vue:88-182 schemas (12 字段 rules)
|
|
* - jnpf ModuleController.java:172-190 create (后端校验链)
|
|
*
|
|
* 校验失败 → 输出 {ok, steps} JSON + exit 1
|
|
* 校验通过 → 不阻断, 继续原有 create 逻辑 (D-4/D-9/D-12 等)
|
|
*/
|
|
async function runStepMachine(c: JnpfClient, opts: Opts): Promise<void> {
|
|
// 1. 拉全树 (供 step 2/3 用)
|
|
let menuTree: MenuNodeLite[] = []
|
|
try {
|
|
const tree = await fetchMenuTree(c)
|
|
menuTree = tree as MenuNodeLite[]
|
|
} catch (e) {
|
|
// 拉树失败不阻断 (step 3 跳过查重), 仅 warn
|
|
log.warn(`step machine: 拉全树失败 (${(e as Error).message?.slice(0, 80)}), 跳过 step 3 唯一性预校验`)
|
|
}
|
|
|
|
// 2. --formId 模式: 拉 form 详情 (供 step 1 用)
|
|
let form: FormLite | null = null
|
|
if (opts.formId) {
|
|
try {
|
|
const r = await c.get<{ data?: Record<string, unknown> }>(`/visualdev/Base/${opts.formId}`)
|
|
const d = (r.data || {}) as Record<string, unknown>
|
|
form = {
|
|
id: String(d.id || opts.formId),
|
|
enCode: (d.enCode as string | undefined) || undefined,
|
|
fullName: (d.fullName as string | undefined) || undefined,
|
|
webType: Number(d.webType || 0),
|
|
state: Number((d.state as number | undefined) ?? 0),
|
|
enabledMark: Number((d.enabledMark as number | undefined) ?? 1),
|
|
}
|
|
} catch (e) {
|
|
log.warn(`step machine: 拉 form 详情失败 (${(e as Error).message?.slice(0, 80)}), 走默认值`)
|
|
}
|
|
}
|
|
|
|
// 3. 跑 4 step 校验
|
|
const type = parseInt(opts.type || (opts.formId ? '3' : '1'), 10)
|
|
const formIdMode = !!opts.formId
|
|
const result = validateMenuCreate({
|
|
fullName: opts.fullName,
|
|
enCode: opts.enCode,
|
|
type,
|
|
icon: opts.icon,
|
|
formId: opts.formId,
|
|
form,
|
|
parentId: opts.parentId,
|
|
pcParents: opts.pcParents ? opts.pcParents.split(',').filter(Boolean) : undefined,
|
|
urlAddressUserInput: opts.urlAddress,
|
|
formIdMode,
|
|
menuTree,
|
|
})
|
|
|
|
// 4. 输出结果 (聚合错误 / 全部通过)
|
|
if (!result.ok) {
|
|
const allErrors = result.steps.flatMap((s) =>
|
|
s.errors.map((e) => ({ step: s.step, stepName: s.stepName, ...e })),
|
|
)
|
|
log.error(`✗ step machine 校验失败 (${allErrors.length} 个错误):`)
|
|
for (const e of allErrors) {
|
|
log.error(` [step ${e.step} ${e.stepName}] ${e.field || '?'}: ${e.message}`)
|
|
}
|
|
if (opts.json) {
|
|
printJson({ ok: false, validation: result.steps, errors: allErrors })
|
|
}
|
|
process.exit(1)
|
|
}
|
|
|
|
// 校验通过 — 记录关键构造结果 (供调试)
|
|
log.info(
|
|
`✓ step machine 校验通过 (4/4): menuEnCode=${result.menuEnCode}` +
|
|
(result.pageAddress ? `, pageAddress=${result.pageAddress}` : '') +
|
|
(result.urlAddress ? `, urlAddress=${result.urlAddress}` : ''),
|
|
)
|
|
}
|