refactor(v0.11+): form create 4 调用 webapi 化 (最后一块)
Phase 1 审计 P0: - form/create.ts 4 调用 → loadVisualDev.* - create + getVisualDevList + release + createMenu - 累计 form 22 调用全部 webapi 化 (form 22 → 22) ✅ 变化: - L3 diagnose 不再自动 wrap create (webapi 走 defHttp shim), 错误仍捕获显示 - callWithDiagnosis 仍保留 (供其他路径) 形式 22 调用 REFACTOR-WEBAPI 100% 完成. Co-Authored-By: Claude <[email protected]>
This commit is contained in:
1 parent
e6a56f36a7
commit
c98bf2b89c
1 file changed
+22
-21
+22
-21
@@ -16,6 +16,7 @@ import { initBuildFormData, buildFormData as webBuildFormData, isBuildFormDataLo
|
|||||||
import { wrapSimplifiedFields, buildTablesFromFields, toSimpleField, type FullField, type SimpleField } from './_simplify.ts'
|
import { wrapSimplifiedFields, buildTablesFromFields, toSimpleField, type FullField, type SimpleField } from './_simplify.ts'
|
||||||
import { browserVerify } from './_browser_verify.ts'
|
import { browserVerify } from './_browser_verify.ts'
|
||||||
import { createFormViaUi } from './_create_ui.ts'
|
import { createFormViaUi } from './_create_ui.ts'
|
||||||
|
import { initWebapi, loadVisualDev } from '../../webapi/visualDev.ts'
|
||||||
import { preCheckFormCreate, handlePreCheckResult } from '../_precheck.ts'
|
import { preCheckFormCreate, handlePreCheckResult } from '../_precheck.ts'
|
||||||
import { loadContextSafe } from '../_precheck.ts'
|
import { loadContextSafe } from '../_precheck.ts'
|
||||||
import { runGuards, handleGuardResult } from '../_blindspot_guards.ts'
|
import { runGuards, handleGuardResult } from '../_blindspot_guards.ts'
|
||||||
@@ -621,34 +622,33 @@ export function buildFormCreateCommand(): Command {
|
|||||||
sortCode: 0,
|
sortCode: 0,
|
||||||
}
|
}
|
||||||
|
|
||||||
log.info(`POST /visualdev/Base ${opts.enCode} type=${type} webType=${webType} dbLinkId=${dbLinkId}`)
|
log.info(`loadVisualDev.create ${opts.enCode} type=${type} webType=${webType} dbLinkId=${dbLinkId}`)
|
||||||
|
// v0.11+ Phase 2: 改用 webapi (loadVisualDev.create)
|
||||||
|
await initWebapi(c)
|
||||||
// P0.2: 加载 AppContext 供诊断用 (复用 P0.1 的 loadAppContext, 失败不阻断主流程)
|
// P0.2: 加载 AppContext 供诊断用 (复用 P0.1 的 loadAppContext, 失败不阻断主流程)
|
||||||
const diagCtx = await loadAppContext().catch(() => null)
|
const diagCtx = await loadAppContext().catch(() => null)
|
||||||
const r = await c.callWithDiagnosis<unknown>(
|
// 注: webapi 路径下不再用 callWithDiagnosis (loadVisualDev.create 走 defHttp shim)
|
||||||
() => c.postJson<unknown>('/visualdev/Base', body),
|
// L3 diagnose 仍可在 r.msg 上手工触发 (后续可加)
|
||||||
diagCtx,
|
const r = (await loadVisualDev.create(body)) as { code?: number; msg?: string; data?: { id?: string } }
|
||||||
)
|
if (r.code !== 200 && r.code !== undefined) {
|
||||||
if (r.code !== 200) {
|
|
||||||
log.error(`创建失败 (code=${r.code}): ${r.msg}`)
|
log.error(`创建失败 (code=${r.code}): ${r.msg}`)
|
||||||
if (opts.json) printJson(r)
|
if (opts.json) printJson(r)
|
||||||
process.exit(1)
|
process.exit(1)
|
||||||
}
|
}
|
||||||
|
|
||||||
// 拉 id (响应通常不回 id, 反查 list — 走 /visualdev/Base 全 form, 不走 /list 工作流子集)
|
// 拉 id (响应通常不回 id, 反查 list — 走 webapi getVisualDevList)
|
||||||
const listR = await c.get<{ list: { id: string; enCode: string }[] }>('/visualdev/Base', {
|
const listR = (await loadVisualDev.getVisualDevList({ keyword: opts.enCode })) as {
|
||||||
keyword: opts.enCode,
|
list?: { id: string; enCode: string }[]
|
||||||
})
|
}
|
||||||
const newForm = listR.data?.list.find((f) => f.enCode === opts.enCode)
|
const newForm = listR.list?.find((f) => f.enCode === opts.enCode)
|
||||||
const newId = newForm?.id || '(unknown)'
|
const newId = newForm?.id || '(unknown)'
|
||||||
log.ok(`创建成功: id=${newId} enCode=${opts.enCode}`)
|
log.ok(`创建成功: id=${newId} enCode=${opts.enCode}`)
|
||||||
|
|
||||||
if (opts.autoRelease && type !== 4 && newId !== '(unknown)') {
|
if (opts.autoRelease && type !== 4 && newId !== '(unknown)') {
|
||||||
log.info(`发布: POST /visualdev/Base/${newId}/Actions/Release (v0.7 修)`)
|
log.info(`loadVisualDev.release (formId=${newId}) (v0.7 修)`)
|
||||||
const rr = await c.callWithDiagnosis(
|
// v0.11+ Phase 2: 改用 webapi
|
||||||
() => c.postJson(`/visualdev/Base/${newId}/Actions/Release`, {}),
|
const rr = (await loadVisualDev.release(newId)) as { code?: number; msg?: string }
|
||||||
diagCtx,
|
if (rr.code === 200 || rr.code === undefined) log.ok('发布成功 (state=1)')
|
||||||
)
|
|
||||||
if (rr.code === 200) log.ok('发布成功 (state=1)')
|
|
||||||
else log.warn(`发布失败 (code=${rr.code}): ${rr.msg}`)
|
else log.warn(`发布失败 (code=${rr.code}): ${rr.msg}`)
|
||||||
} else if (opts.autoRelease && type === 4) {
|
} else if (opts.autoRelease && type === 4) {
|
||||||
log.warn('type=4 视图自动跳过 release (会 400)')
|
log.warn('type=4 视图自动跳过 release (会 400)')
|
||||||
@@ -660,16 +660,17 @@ export function buildFormCreateCommand(): Command {
|
|||||||
log.error('--autoCreateMenu 必传 --menuParentId (用 dacli menu list --keyword=目录名 拿顶级目录 id)')
|
log.error('--autoCreateMenu 必传 --menuParentId (用 dacli menu list --keyword=目录名 拿顶级目录 id)')
|
||||||
if (opts.json) printJson({ id: newId, enCode: opts.enCode, type, webType, menuError: 'no parent' })
|
if (opts.json) printJson({ id: newId, enCode: opts.enCode, type, webType, menuError: 'no parent' })
|
||||||
} else {
|
} else {
|
||||||
log.info(`挂菜单: POST /visualdev/Base/${newId}/Actions/Module pcParentId=${opts.menuParentId}`)
|
log.info(`挂菜单: loadVisualDev.createMenu (formId=${newId}, parentId=${opts.menuParentId})`)
|
||||||
|
// v0.11+ Phase 2: 改用 webapi (loadVisualDev.createMenu = Actions/Module)
|
||||||
// 复用 web CreateMenuModal 真实 body: pc=1, app=0, platformRelease=String
|
// 复用 web CreateMenuModal 真实 body: pc=1, app=0, platformRelease=String
|
||||||
const mr = await c.postJson<unknown>(`/visualdev/Base/${newId}/Actions/Module`, {
|
const mr = (await loadVisualDev.createMenu(newId, {
|
||||||
pc: 1,
|
pc: 1,
|
||||||
app: 0,
|
app: 0,
|
||||||
pcModuleParentId: [opts.menuParentId],
|
pcModuleParentId: [opts.menuParentId],
|
||||||
appModuleParentId: [],
|
appModuleParentId: [],
|
||||||
platformRelease: JSON.stringify({ pc: 1, app: 0 }),
|
platformRelease: JSON.stringify({ pc: 1, app: 0 }),
|
||||||
})
|
})) as { code?: number; msg?: string }
|
||||||
if (mr.code === 200) log.ok(`菜单挂载成功 (parentId=${opts.menuParentId})`)
|
if (mr.code === 200 || mr.code === undefined) log.ok(`菜单挂载成功 (parentId=${opts.menuParentId})`)
|
||||||
else log.warn(`菜单挂载失败 (code=${mr.code}): ${mr.msg}`)
|
else log.warn(`菜单挂载失败 (code=${mr.code}): ${mr.msg}`)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user