From c98bf2b89c6369dbb3c8fc8b7e46dc07b710547f Mon Sep 17 00:00:00 2001 From: ssw Date: Thu, 25 Jun 2026 15:14:34 +0800 Subject: [PATCH] =?UTF-8?q?refactor(v0.11+):=20form=20create=204=20?= =?UTF-8?q?=E8=B0=83=E7=94=A8=20webapi=20=E5=8C=96=20(=E6=9C=80=E5=90=8E?= =?UTF-8?q?=E4=B8=80=E5=9D=97)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- src/commands/form/create.ts | 43 +++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/src/commands/form/create.ts b/src/commands/form/create.ts index 848da62..19222ca 100644 --- a/src/commands/form/create.ts +++ b/src/commands/form/create.ts @@ -16,6 +16,7 @@ import { initBuildFormData, buildFormData as webBuildFormData, isBuildFormDataLo import { wrapSimplifiedFields, buildTablesFromFields, toSimpleField, type FullField, type SimpleField } from './_simplify.ts' import { browserVerify } from './_browser_verify.ts' import { createFormViaUi } from './_create_ui.ts' +import { initWebapi, loadVisualDev } from '../../webapi/visualDev.ts' import { preCheckFormCreate, handlePreCheckResult } from '../_precheck.ts' import { loadContextSafe } from '../_precheck.ts' import { runGuards, handleGuardResult } from '../_blindspot_guards.ts' @@ -621,34 +622,33 @@ export function buildFormCreateCommand(): Command { 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, 失败不阻断主流程) const diagCtx = await loadAppContext().catch(() => null) - const r = await c.callWithDiagnosis( - () => c.postJson('/visualdev/Base', body), - diagCtx, - ) - if (r.code !== 200) { + // 注: webapi 路径下不再用 callWithDiagnosis (loadVisualDev.create 走 defHttp shim) + // L3 diagnose 仍可在 r.msg 上手工触发 (后续可加) + const r = (await loadVisualDev.create(body)) as { code?: number; msg?: string; data?: { id?: string } } + if (r.code !== 200 && r.code !== undefined) { log.error(`创建失败 (code=${r.code}): ${r.msg}`) if (opts.json) printJson(r) process.exit(1) } - // 拉 id (响应通常不回 id, 反查 list — 走 /visualdev/Base 全 form, 不走 /list 工作流子集) - const listR = await c.get<{ list: { id: string; enCode: string }[] }>('/visualdev/Base', { - keyword: opts.enCode, - }) - const newForm = listR.data?.list.find((f) => f.enCode === opts.enCode) + // 拉 id (响应通常不回 id, 反查 list — 走 webapi getVisualDevList) + const listR = (await loadVisualDev.getVisualDevList({ keyword: opts.enCode })) as { + list?: { id: string; enCode: string }[] + } + const newForm = listR.list?.find((f) => f.enCode === opts.enCode) const newId = newForm?.id || '(unknown)' log.ok(`创建成功: id=${newId} enCode=${opts.enCode}`) if (opts.autoRelease && type !== 4 && newId !== '(unknown)') { - log.info(`发布: POST /visualdev/Base/${newId}/Actions/Release (v0.7 修)`) - const rr = await c.callWithDiagnosis( - () => c.postJson(`/visualdev/Base/${newId}/Actions/Release`, {}), - diagCtx, - ) - if (rr.code === 200) log.ok('发布成功 (state=1)') + log.info(`loadVisualDev.release (formId=${newId}) (v0.7 修)`) + // v0.11+ Phase 2: 改用 webapi + const rr = (await loadVisualDev.release(newId)) as { code?: number; msg?: string } + if (rr.code === 200 || rr.code === undefined) log.ok('发布成功 (state=1)') else log.warn(`发布失败 (code=${rr.code}): ${rr.msg}`) } else if (opts.autoRelease && type === 4) { log.warn('type=4 视图自动跳过 release (会 400)') @@ -660,16 +660,17 @@ export function buildFormCreateCommand(): Command { log.error('--autoCreateMenu 必传 --menuParentId (用 dacli menu list --keyword=目录名 拿顶级目录 id)') if (opts.json) printJson({ id: newId, enCode: opts.enCode, type, webType, menuError: 'no parent' }) } 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 - const mr = await c.postJson(`/visualdev/Base/${newId}/Actions/Module`, { + const mr = (await loadVisualDev.createMenu(newId, { pc: 1, app: 0, pcModuleParentId: [opts.menuParentId], appModuleParentId: [], platformRelease: JSON.stringify({ pc: 1, app: 0 }), - }) - if (mr.code === 200) log.ok(`菜单挂载成功 (parentId=${opts.menuParentId})`) + })) as { code?: number; msg?: string } + if (mr.code === 200 || mr.code === undefined) log.ok(`菜单挂载成功 (parentId=${opts.menuParentId})`) else log.warn(`菜单挂载失败 (code=${mr.code}): ${mr.msg}`) } }