From ab7ed341544db7eb8faba75d90bc5537c5dbd333 Mon Sep 17 00:00:00 2001 From: ssw Date: Tue, 21 Jul 2026 20:20:55 +0800 Subject: [PATCH] =?UTF-8?q?feat(dacli):=20menu/update.ts=20=E5=AE=8C?= =?UTF-8?q?=E6=95=B4=20wrapCommand=20=E8=BF=81=E7=A7=BB=20(P6=204=20exit?= =?UTF-8?q?=20=E6=94=B6=E5=8F=A3)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 4 处 process.exit → ctx.fail(): - 缺 menuId (位置参数 + --id 都缺) - BS-49 expected-enCode 不匹配 (dirty check) - --propertyJson JSON 解析失败 - 后端 PUT code !== 200 (含 enhanceFromBackend 错误增强) 修改方式: Write 整文件重写. 与 form/update.ts 同模式 (BS-49 防覆盖 + dirty check + propertyJson 合并). 验证: - TS compile 0 新错误 (baseline 57 不变) - 73/73 单元测试 PASS --- src/commands/menu/update.ts | 239 +++++++++++++++++++----------------- 1 file changed, 125 insertions(+), 114 deletions(-) diff --git a/src/commands/menu/update.ts b/src/commands/menu/update.ts index cfb7e32..816cfa8 100644 --- a/src/commands/menu/update.ts +++ b/src/commands/menu/update.ts @@ -19,6 +19,7 @@ import { installHelpHook } from '../../core/help.ts' import { log, printJson } from '../../core/log.ts' import { initWebapi, loadMenu } from '../../webapi/menu.ts' import { enhanceFromBackend, formatErrorLine } from '../_error_codes.ts' +import { setupOutputFilter, addOutputOptions, wrapCommand } from '../_output_filter.ts' // v2.1+ 输出过滤; v2.2+ wrapCommand 收口 5c interface Opts { /** 菜单 id (位置参数, 主操作目标) */ @@ -48,6 +49,8 @@ interface Opts { /** 跳过 dirty check */ force?: boolean json?: boolean + /** v2.1+ (2026-07-21): --verbose, addOutputOptions 注入 */ + verbose?: boolean } export function buildMenuUpdateCommand(): Command { @@ -67,127 +70,135 @@ export function buildMenuUpdateCommand(): Command { .option('--propertyJson ', '直接覆盖 propertyJson JSON (高级)') .option('--expected-enCode ', '期望的 enCode (与 getInfo 对比, BS-49 防覆盖)') .option('--force', '跳过 dirty check, 强制覆盖 (慎用!)', false) - .option('--json', '原始 JSON 输出', false) + addOutputOptions(cmd) .action(async (opts: Opts) => { - // 1. 解析 menu id (位置参数优先, 否则 --id) - const pos = cmd.args[0] - const menuId = pos || opts.id - if (!menuId) { - log.error('必填: 菜单 id (位置参数 或 --id=...)') - cmd.help() - process.exit(2) - } - + setupOutputFilter(opts) const c = await JnpfClient.fromToken() - await initWebapi(c) - // 2. 拉原 menu (BS-49 dirty check + 合并未传字段) - log.info(`loadMenu.getInfo (menuId=${menuId})`) - const orig = (await loadMenu.getInfo(menuId)) as Record - log.info(`原 menu: enCode=${orig.enCode} fullName=${orig.fullName} urlAddress=${orig.urlAddress}`) - - // 3. dirty check (BS-49 防覆盖) - if (opts.expectedEnCode && opts.expectedEnCode !== String(orig.enCode || '')) { - if (!opts.force) { - log.error(`BS-49: --expected-enCode=${opts.expectedEnCode} 但当前 enCode=${orig.enCode}, 用 --force 强制覆盖`) - process.exit(2) - } - log.warn(` ⚠ --force 跳过 dirty check (enCode ${opts.expectedEnCode} → 实际 ${orig.enCode})`) - } - - // 4. 合并更新 (PUT 语义, 未传字段保留) - const body: Record = { ...orig, id: menuId } - if (opts.fullName) body.fullName = opts.fullName - if (opts.enCode) body.enCode = opts.enCode.replace(/\./g, '') // web Form.vue:234 menuEnCode.replace('.', '') - if (opts.urlAddress) body.urlAddress = opts.urlAddress - if (opts.pageAddress) body.pageAddress = opts.pageAddress - if (opts.parentId) body.parentId = opts.parentId - if (opts.type) body.type = parseInt(opts.type, 10) - if (opts.icon !== undefined) body.icon = opts.icon - if (opts.category) body.category = opts.category - - // 5. propertyJson 合并 (B-20 核心: BS-49 修复) - // web Form.vue:236-247 handleSubmit: dataForm.propertyJson.moduleId = moduleId - // if type=3/9 pageAddress = model/ (web) or /pages/.../dynamicModel (app) - let propertyJsonObj: Record = {} - const origPj = orig.propertyJson - if (typeof origPj === 'string') { - try { propertyJsonObj = JSON.parse(origPj) } catch { propertyJsonObj = {} } - } else if (origPj && typeof origPj === 'object') { - propertyJsonObj = { ...(origPj as Record) } - } - - // --propertyJson 高级覆盖 - if (opts.propertyJson) { + await wrapCommand({ + command: 'menu update', + appCode: c.appCode, + startTime: Date.now(), + verbose: opts.verbose, + json: opts.json, + fixes: [], + }, async (ctx) => { try { - propertyJsonObj = JSON.parse(opts.propertyJson) - log.info(` --propertyJson 直接覆盖`) - } catch (e) { - log.error(`--propertyJson JSON 解析失败: ${(e as Error).message}`) - process.exit(2) - } - } - - // --formEnCode 智能填 (B-20 杀手特性: BS-49 一键修复) - // 镜像 web Form.vue:281-294 onTypeChange + :313 if type in [3,11] webType = item.webType - if (opts.formEnCode) { - try { - const formList = (await c.get<{ list?: { id: string; enCode: string; webType?: number | string }[] }>('/visualdev/Base', { - keyword: opts.formEnCode, - currentPage: 1, - pageSize: 5, - })) - const matched = ((formList.data as { list?: { id: string; enCode: string; webType?: number | string }[] } | undefined)?.list || []) - .find(f => f.enCode === opts.formEnCode) - if (!matched) { - log.error(`--formEnCode=${opts.formEnCode} 找不到对应 form, 跳过 moduleId 自动填`) - } else { - propertyJsonObj.moduleId = matched.id - propertyJsonObj.webType = propertyJsonObj.webType ?? Number(matched.webType || 0) - // 自动拼 urlAddress / pageAddress (镜像 web Form.vue:238-243) - const menuEnc = (opts.enCode || String(orig.enCode || '')).replace(/\./g, '') - const newUrl = `model/${opts.formEnCode}` - if (!opts.urlAddress) body.urlAddress = newUrl - if (!opts.pageAddress) body.pageAddress = newUrl - log.info(` --formEnCode → moduleId=${matched.id} (webType=${matched.webType}) urlAddress=${body.urlAddress}`) + // 1. 解析 menu id (位置参数优先, 否则 --id) + const pos = cmd.args[0] + const menuId = pos || opts.id + if (!menuId) { + log.error('必填: 菜单 id (位置参数 或 --id=...)') + cmd.help() + return ctx.fail('必填: 菜单 id', { hasPos: !!pos, hasId: !!opts.id }) } + + await initWebapi(c) + + // 2. 拉原 menu (BS-49 dirty check + 合并未传字段) + log.info(`loadMenu.getInfo (menuId=${menuId})`) + const orig = (await loadMenu.getInfo(menuId)) as Record + log.info(`原 menu: enCode=${orig.enCode} fullName=${orig.fullName} urlAddress=${orig.urlAddress}`) + + // 3. dirty check (BS-49 防覆盖) + if (opts.expectedEnCode && opts.expectedEnCode !== String(orig.enCode || '')) { + if (!opts.force) { + log.error(`BS-49: --expected-enCode=${opts.expectedEnCode} 但当前 enCode=${orig.enCode}, 用 --force 强制覆盖`) + return ctx.fail(`BS-49: --expected-enCode 不匹配`, { menuId, expected: opts.expectedEnCode, actual: orig.enCode }) + } + log.warn(` ⚠ --force 跳过 dirty check (enCode ${opts.expectedEnCode} → 实际 ${orig.enCode})`) + } + + // 4. 合并更新 (PUT 语义, 未传字段保留) + const body: Record = { ...orig, id: menuId } + if (opts.fullName) body.fullName = opts.fullName + if (opts.enCode) body.enCode = opts.enCode.replace(/\./g, '') // web Form.vue:234 menuEnCode.replace('.', '') + if (opts.urlAddress) body.urlAddress = opts.urlAddress + if (opts.pageAddress) body.pageAddress = opts.pageAddress + if (opts.parentId) body.parentId = opts.parentId + if (opts.type) body.type = parseInt(opts.type, 10) + if (opts.icon !== undefined) body.icon = opts.icon + if (opts.category) body.category = opts.category + + // 5. propertyJson 合并 (B-20 核心: BS-49 修复) + let propertyJsonObj: Record = {} + const origPj = orig.propertyJson + if (typeof origPj === 'string') { + try { propertyJsonObj = JSON.parse(origPj) } catch { propertyJsonObj = {} } + } else if (origPj && typeof origPj === 'object') { + propertyJsonObj = { ...(origPj as Record) } + } + + if (opts.propertyJson) { + try { + propertyJsonObj = JSON.parse(opts.propertyJson) + log.info(` --propertyJson 直接覆盖`) + } catch (e) { + log.error(`--propertyJson JSON 解析失败: ${(e as Error).message}`) + return ctx.fail(`--propertyJson JSON 解析失败`, { menuId, error: (e as Error).message?.slice(0, 100) }) + } + } + + if (opts.formEnCode) { + try { + const formList = (await c.get<{ list?: { id: string; enCode: string; webType?: number | string }[] }>('/visualdev/Base', { + keyword: opts.formEnCode, + currentPage: 1, + pageSize: 5, + })) + const matched = ((formList.data as { list?: { id: string; enCode: string; webType?: number | string }[] } | undefined)?.list || []) + .find(f => f.enCode === opts.formEnCode) + if (!matched) { + log.error(`--formEnCode=${opts.formEnCode} 找不到对应 form, 跳过 moduleId 自动填`) + } else { + propertyJsonObj.moduleId = matched.id + propertyJsonObj.webType = propertyJsonObj.webType ?? Number(matched.webType || 0) + const menuEnc = (opts.enCode || String(orig.enCode || '')).replace(/\./g, '') + const newUrl = `model/${opts.formEnCode}` + if (!opts.urlAddress) body.urlAddress = newUrl + if (!opts.pageAddress) body.pageAddress = newUrl + log.info(` --formEnCode → moduleId=${matched.id} (webType=${matched.webType}) urlAddress=${body.urlAddress}`) + } + } catch (e) { + log.warn(`--formEnCode 拉 form 失败: ${(e as Error).message?.slice(0, 80)}`) + } + } + + if (opts.moduleId) { + propertyJsonObj.moduleId = opts.moduleId + } + + if (opts.type) { + const t = parseInt(opts.type, 10) + const isFormType = [2, 3, 4, 9, 11].includes(t) + body.isButtonAuthorize = isFormType ? 1 : 0 + body.isColumnAuthorize = isFormType ? 1 : 0 + body.isFormAuthorize = isFormType ? 1 : 0 + body.isDataAuthorize = isFormType ? 1 : 0 + log.info(` type=${t} → is*Authorize=${isFormType}`) + } + + body.propertyJson = JSON.stringify(propertyJsonObj) + log.info(` propertyJson=${body.propertyJson}`) + + // 6. PUT / 后端API + log.info(`loadMenu.update (menuId=${menuId})`) + const r = (await loadMenu.update(body)) as { code?: number; msg?: string; data?: unknown } + if (r.code !== 200 && r.code !== undefined) { + const enhanced = enhanceFromBackend(r.msg || '', 'menu', { entity: 'menu' }) + log.error(` ${formatErrorLine(enhanced, { step: 4, stepName: 'PUT 后端API' })}`) + if (opts.json) printJson(r) + return ctx.fail(`menu update 失败 (code=${r.code}): ${r.msg}`, { menuId, code: r.code }) + } + log.ok(`✓ 菜单更新成功 (id=${menuId}, enCode=${body.enCode})`) + log.ok(` ↳ urlAddress=${body.urlAddress} moduleId=${propertyJsonObj.moduleId || '(none)'}`) + const summary = { id: menuId, ...body, _propertyJsonParsed: propertyJsonObj } + if (opts.json) printJson(summary) + ctx.success(summary) } catch (e) { - log.warn(`--formEnCode 拉 form 失败: ${(e as Error).message?.slice(0, 80)}`) + ctx.fail(`menu update 失败: ${(e as Error).message?.slice(0, 200)}`) } - } - - // --moduleId 单独填 (高级) - if (opts.moduleId) { - propertyJsonObj.moduleId = opts.moduleId - } - - // type 改动 → 镜像 web Form.vue:281-294 onTypeChange 重置 is*Authorize - if (opts.type) { - const t = parseInt(opts.type, 10) - const isFormType = [2, 3, 4, 9, 11].includes(t) - body.isButtonAuthorize = isFormType ? 1 : 0 - body.isColumnAuthorize = isFormType ? 1 : 0 - body.isFormAuthorize = isFormType ? 1 : 0 - body.isDataAuthorize = isFormType ? 1 : 0 - log.info(` type=${t} → is*Authorize=${isFormType}`) - } - - // 序列化 propertyJson (web Form.vue:253 propertyJson: JSON.stringify(...)) - body.propertyJson = JSON.stringify(propertyJsonObj) - log.info(` propertyJson=${body.propertyJson}`) - - // 6. PUT / 后端API - log.info(`loadMenu.update (menuId=${menuId})`) - const r = (await loadMenu.update(body)) as { code?: number; msg?: string; data?: unknown } - if (r.code !== 200 && r.code !== undefined) { - const enhanced = enhanceFromBackend(r.msg || '', 'menu', { entity: 'menu' }) - log.error(` ${formatErrorLine(enhanced, { step: 4, stepName: 'PUT 后端API' })}`) - if (opts.json) printJson(r) - process.exit(1) - } - log.ok(`✓ 菜单更新成功 (id=${menuId}, enCode=${body.enCode})`) - log.ok(` ↳ urlAddress=${body.urlAddress} moduleId=${propertyJsonObj.moduleId || '(none)'}`) - if (opts.json) printJson({ id: menuId, ...body, _propertyJsonParsed: propertyJsonObj }) + }) }) installHelpHook(cmd, {