refactor(v0.11+): menu purge/unrelease 改用 webapi 镜像
Phase 1 审计标记 P0: - menu/purge → 走 loadVisualDev.getReleaseMenu + loadMenu.delMenu + loadVisualDev.createMenu - menu/unrelease → 走 loadVisualDev.createMenu (pc=0 app=0) - menu/releases 内部已用 fetchFormReleasedMenus 走 webapi (helper 已是 webapi 模式) 收益: - 消除 3 个文件 ~30 行 c.get/postJson/del 硬编码 - 跟 v0.11+ 镜像架构对齐 - create.ts 暂不重构 (复杂, 2 模式 + D-4/D-9/D-12 多层防御, 改动需 spec) Co-Authored-By: Claude <[email protected]>
This commit is contained in:
1 parent
c7b24eb932
commit
694619bd6e
3 files changed
+50
-40
No files matched your search
+29
-20
@@ -1,24 +1,22 @@
|
||||
/**
|
||||
* commands/menu/purge.ts — by formId 删除所有挂载菜单 (组合: getReleaseMenu + DELETE)
|
||||
*
|
||||
* 流程:
|
||||
* 1. GET /api/visualdev/Base/{formId}/getReleaseMenu 拿 pc/app 关联菜单 id
|
||||
* 2. 对每个 id 走 DELETE /api/system/Menu/{id} 删
|
||||
* 3. (可选) 同步 unrelease form (POST Actions/Module pc=0 app=0) 清掉 form 的挂载状态
|
||||
*
|
||||
* vs `dacli menu unrelease --formId=X`:
|
||||
* unrelease 只重置 form 的挂载状态 (form 还在), 不删菜单实体
|
||||
* purge 走 DELETE 真实删菜单, form 关联同步清除 (后端级联)
|
||||
*
|
||||
* 用途: 清理某 form 的全套挂载 (PC + APP + form 关联)
|
||||
* v0.11+ Phase 2 (2026-06-25): 改用 webapi 镜像
|
||||
* - loadVisualDev.getReleaseMenu (替代 c.get)
|
||||
* - loadMenu.delMenu (替代 c.del)
|
||||
*/
|
||||
import { Command } from 'commander'
|
||||
import { JnpfClient } from '../../core/client.ts'
|
||||
import { installAiHelpHook } from '../../core/help.ts'
|
||||
import { log } from '../../core/log.ts'
|
||||
import { fetchFormReleasedMenus } from './_helpers.ts'
|
||||
import { initWebapi as initMenuWebapi, loadMenu } from '../../webapi/menu.ts'
|
||||
|
||||
interface Opts { formId: string; yes?: boolean; unrelease?: boolean }
|
||||
interface Opts {
|
||||
formId: string
|
||||
yes?: boolean
|
||||
unrelease?: boolean
|
||||
}
|
||||
|
||||
export function buildMenuPurgeCommand(): Command {
|
||||
const cmd = new Command('purge')
|
||||
@@ -28,6 +26,7 @@ export function buildMenuPurgeCommand(): Command {
|
||||
.option('--yes', '跳过确认', false)
|
||||
.action(async (opts: Opts) => {
|
||||
const c = await JnpfClient.fromToken()
|
||||
await initMenuWebapi(c)
|
||||
const { pcIds, appIds } = await fetchFormReleasedMenus(c, opts.formId)
|
||||
const allIds = [...pcIds, ...appIds]
|
||||
if (!allIds.length) {
|
||||
@@ -35,12 +34,16 @@ export function buildMenuPurgeCommand(): Command {
|
||||
return
|
||||
}
|
||||
log.warn(`即将删除 ${allIds.length} 个菜单: ${allIds.join(', ')}`)
|
||||
if (!opts.yes) { log.warn('传 --yes 确认删除'); process.exit(2) }
|
||||
// 逐个 DELETE
|
||||
let ok = 0, fail = 0
|
||||
if (!opts.yes) {
|
||||
log.warn('传 --yes 确认删除')
|
||||
process.exit(2)
|
||||
}
|
||||
// 逐个 DELETE (走 loadMenu.delMenu webapi)
|
||||
let ok = 0,
|
||||
fail = 0
|
||||
for (const id of allIds) {
|
||||
const r = await c.del(`/system/Menu/${id}`)
|
||||
if (r.code === 200) {
|
||||
const r = (await loadMenu.delMenu(id)) as { code?: number; msg?: string }
|
||||
if (r.code === 200 || r.code === undefined) {
|
||||
log.ok(`✓ DELETE menu ${id}`)
|
||||
ok++
|
||||
} else {
|
||||
@@ -48,12 +51,17 @@ export function buildMenuPurgeCommand(): Command {
|
||||
fail++
|
||||
}
|
||||
}
|
||||
// 可选: unrelease form 状态
|
||||
// 可选: unrelease form 状态 (走 loadVisualDev.createMenu webapi)
|
||||
if (opts.unrelease) {
|
||||
const r = await c.postJson(`/visualdev/Base/${opts.formId}/Actions/Module`, {
|
||||
pc: 0, app: 0, pcModuleParentId: [], appModuleParentId: [],
|
||||
const { initWebapi: initVisualDevWebapi, loadVisualDev } = await import('../../webapi/visualDev.ts')
|
||||
await initVisualDevWebapi(c)
|
||||
const r = (await loadVisualDev.createMenu(opts.formId, {
|
||||
pc: 0,
|
||||
app: 0,
|
||||
pcModuleParentId: [],
|
||||
appModuleParentId: [],
|
||||
platformRelease: JSON.stringify({ pc: 0, app: 0 }),
|
||||
})
|
||||
})) as { code?: number; msg?: string }
|
||||
if (r.code === 200) log.ok(`✓ unrelease formId=${opts.formId}`)
|
||||
else log.warn(`unrelease 失败 (code=${r.code}): ${r.msg}`)
|
||||
}
|
||||
@@ -71,6 +79,7 @@ export function buildMenuPurgeCommand(): Command {
|
||||
ref: 'web/src/api/onlineDev/visualDev.ts:47 + web/src/api/system/menu.ts:32',
|
||||
},
|
||||
notes: [
|
||||
'v0.11+ 改用 webapi 镜像 (loadVisualDev.getReleaseMenu + loadMenu.delMenu + loadVisualDev.createMenu)',
|
||||
'vs unrelease: purge 真实删菜单, unrelease 只重置 form 关联',
|
||||
'pc + app 各 1 个菜单 (独立 id), 一起删',
|
||||
'--unrelease 同步清 form 端挂载状态 (form delete 前的标准流程)',
|
||||
|
||||
@@ -1,12 +1,8 @@
|
||||
/**
|
||||
* commands/menu/releases.ts — 查某 form 已发布的菜单
|
||||
*
|
||||
* API: GET /api/visualdev/Base/{id}/getReleaseMenu (web getReleaseMenu, 之前 dacli 缺)
|
||||
*
|
||||
* 用途:
|
||||
* - 诊断: 某 form 实际挂到了哪些菜单 (pc/app 各一个)?
|
||||
* - 配合 purge: 拿到 id 后 DELETE
|
||||
* - 配合 unrelease: 知道是哪 2 个菜单要清
|
||||
* v0.11+ Phase 2 (2026-06-25): 改用 webapi 镜像 (loadVisualDev.getReleaseMenu)
|
||||
* 替代 v0.10 直接 c.get('/visualdev/Base/{id}/getReleaseMenu')
|
||||
*/
|
||||
import { Command } from 'commander'
|
||||
import { JnpfClient } from '../../core/client.ts'
|
||||
@@ -14,7 +10,10 @@ import { installAiHelpHook } from '../../core/help.ts'
|
||||
import { log, printJson } from '../../core/log.ts'
|
||||
import { fetchFormReleasedMenus } from './_helpers.ts'
|
||||
|
||||
interface Opts { formId: string; json?: boolean }
|
||||
interface Opts {
|
||||
formId: string
|
||||
json?: boolean
|
||||
}
|
||||
|
||||
export function buildMenuReleasesCommand(): Command {
|
||||
const cmd = new Command('releases')
|
||||
@@ -24,7 +23,10 @@ export function buildMenuReleasesCommand(): Command {
|
||||
.action(async (opts: Opts) => {
|
||||
const c = await JnpfClient.fromToken()
|
||||
const { pcIds, appIds, raw } = await fetchFormReleasedMenus(c, opts.formId)
|
||||
if (opts.json) { printJson(raw); return }
|
||||
if (opts.json) {
|
||||
printJson(raw)
|
||||
return
|
||||
}
|
||||
log.info(`formId=${opts.formId} 已挂菜单:`)
|
||||
console.log(` pc : ${pcIds.length ? pcIds.join(', ') : '(无)'}`)
|
||||
console.log(` app : ${appIds.length ? appIds.join(', ') : '(无)'}`)
|
||||
|
||||
@@ -1,20 +1,18 @@
|
||||
/**
|
||||
* commands/menu/unrelease.ts — 取消表单菜单发布 (web 真路径)
|
||||
*
|
||||
* web 真行为 (CreateMenuModal.vue handleSubmit, pc=0 + app=0 仍可发):
|
||||
* POST /api/visualdev/Base/{formId}/Actions/Module
|
||||
* body: {pc:0, app:0, pcModuleParentId:[], appModuleParentId:[], platformRelease:'{"pc":0,"app":0}'}
|
||||
* 返 200 "Synchronization successful" — 删除已挂菜单 (前端 UI 有"至少一个平台"校验, 后端无)
|
||||
*
|
||||
* 用途: DELETE /api/system/Menu/{id} 报 "System abnormality" 时的兜底.
|
||||
* 只对 type=3 (VisualDev) + 已 pcIsRelease=1 的菜单有效, 普通目录/外链请直接用 menu delete.
|
||||
* v0.11+ Phase 2 (2026-06-25): 改用 webapi 镜像 (loadVisualDev.createMenu)
|
||||
* 替代 v0.10 直接 c.postJson('/visualdev/Base/{formId}/Actions/Module')
|
||||
*/
|
||||
import { Command } from 'commander'
|
||||
import { JnpfClient } from '../../core/client.ts'
|
||||
import { installAiHelpHook } from '../../core/help.ts'
|
||||
import { log } from '../../core/log.ts'
|
||||
import { initWebapi, loadVisualDev } from '../../webapi/visualDev.ts'
|
||||
|
||||
interface Opts { formId: string }
|
||||
interface Opts {
|
||||
formId: string
|
||||
}
|
||||
|
||||
export function buildMenuUnreleaseCommand(): Command {
|
||||
const cmd = new Command('unrelease')
|
||||
@@ -22,6 +20,7 @@ export function buildMenuUnreleaseCommand(): Command {
|
||||
.requiredOption('--formId <f>', '表单 id')
|
||||
.action(async (opts: Opts) => {
|
||||
const c = await JnpfClient.fromToken()
|
||||
await initWebapi(c)
|
||||
const body = {
|
||||
pc: 0,
|
||||
app: 0,
|
||||
@@ -29,9 +28,9 @@ export function buildMenuUnreleaseCommand(): Command {
|
||||
appModuleParentId: [] as string[],
|
||||
platformRelease: JSON.stringify({ pc: 0, app: 0 }),
|
||||
}
|
||||
log.info(`POST /visualdev/Base/${opts.formId}/Actions/Module pc=0 app=0`)
|
||||
const r = await c.postJson(`/visualdev/Base/${opts.formId}/Actions/Module`, body)
|
||||
if (r.code !== 200) {
|
||||
log.info(`loadVisualDev.createMenu (formId=${opts.formId}, pc=0 app=0)`)
|
||||
const r = (await loadVisualDev.createMenu(opts.formId, body)) as { code?: number; msg?: string }
|
||||
if (r.code !== 200 && r.code !== undefined) {
|
||||
log.error(`unrelease 失败 code=${r.code}: ${r.msg}`)
|
||||
process.exit(1)
|
||||
}
|
||||
@@ -45,7 +44,7 @@ export function buildMenuUnreleaseCommand(): Command {
|
||||
api: 'POST /api/visualdev/Base/{formId}/Actions/Module',
|
||||
ref: 'web/views/onlineDev/formDesign/components/CreateMenuModal.vue (前端有 pc/app 至少一个校验, 后端无)',
|
||||
},
|
||||
notes: ['仅适用于 type=3 VisualDev 菜单', '普通目录/外链请用 menu delete'],
|
||||
notes: ['v0.11+ 改用 webapi 镜像 (loadVisualDev.createMenu)', '仅适用于 type=3 VisualDev 菜单', '普通目录/外链请用 menu delete'],
|
||||
})
|
||||
return cmd
|
||||
}
|
||||
Reference in new issue
Block a user