From 7ffad3e20cf5d49f91b2dcf6fc94d32ad664724e Mon Sep 17 00:00:00 2001 From: ssw Date: Tue, 7 Jul 2026 15:24:33 +0800 Subject: [PATCH] =?UTF-8?q?fix(delete):=20BS-=E6=96=B074=20cascade=20?= =?UTF-8?q?=E7=AB=AF=E7=82=B9=E7=94=A8=20web=20=E7=AB=AF=20delMenu=20(DELE?= =?UTF-8?q?TE=20/Menu/{id})?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 用户反馈 2026-07-07: "看看 web 源码, webapi 已经有的应该直接 import" 复核发现 2 处端点选错: 1. getMenuList({moduleId: id}) — moduleId 参数被忽略 web 端: GET /api/system/Menu/ModuleBySystem, 后端按 systemId 过滤, 不按 moduleId 修复: 拉所有菜单后客户端过滤 propertyJson.moduleId === formId 2. c2.postJson('/system/Menu/Delete', {id: m.id}) — 错! web 端 delMenu(id): defHttp.delete({url: \`${Api.Prefix}/${id}\`}) 正确: c2.del(\`/system/Menu/${m.id}\`) (DELETE 方法, URL 含 id) 测试 (test_audit_bs71_74.ts 5/5 PASS). Co-Authored-By: Claude --- src/commands/form/delete.ts | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/src/commands/form/delete.ts b/src/commands/form/delete.ts index 064bc3d..a528110 100644 --- a/src/commands/form/delete.ts +++ b/src/commands/form/delete.ts @@ -39,19 +39,30 @@ export function buildFormDeleteCommand(): Command { else log.warn(` ↳ UnModule 返回 code=${unr.code}: ${unr.msg?.slice(0, 60)}`) // 2. 查关联 menu + 真正删除 (BS-新74 增强, 避免菜单残留) + // web 端 getMenuList(/Menu/ModuleBySystem) 按 systemId 过滤, 不按 moduleId. + // form 关联的 menu 存在 propertyJson.moduleId 里, 需客户端过滤. const { initWebapi, loadMenu } = await import('../../webapi/menu.ts') await initWebapi(c2) - const menuList = (await loadMenu.getMenuList({ moduleId: id })) as { - list?: Array<{ id?: string; fullName?: string; enCode?: string }> + const menuList = (await loadMenu.getMenuList({})) as { + list?: Array<{ id?: string; fullName?: string; enCode?: string; propertyJson?: string }> } - const relatedMenus = menuList?.list || [] + const relatedMenus = (menuList?.list || []).filter((m: any) => { + if (!m.propertyJson) return false + try { + const pj = JSON.parse(m.propertyJson) + return pj.moduleId === id + } catch { return false } + }) if (relatedMenus.length === 0) { - log.info(' ↳ 无关联菜单, 跳过菜单删除') + log.info(' ↳ 无关联菜单 (propertyJson.moduleId === formId), 跳过菜单删除') } else { log.info(` ↳ 找到 ${relatedMenus.length} 个关联菜单, 逐个删除`) for (const m of relatedMenus) { try { - const del = await c2.postJson('/system/Menu/Delete', { id: m.id }) + // v0.19+ BS-新74 修正: web 端 delMenu 用 DELETE /api/system/Menu/{id} + // 镜像 web 端 menu.ts: defHttp.delete({ url: `${Api.Prefix}/${id}` }) + // 不是 POST + body {id: ...} (那是错的) + const del = await c2.del(`/system/Menu/${m.id}`) if (del.code === 200) log.ok(` ↳ 删菜单 id=${m.id} (${m.fullName || m.enCode || '?'})`) else log.warn(` ↳ 删菜单 id=${m.id} 失败 code=${del.code}: ${del.msg?.slice(0, 60)}`) } catch (e) {