From e6a56f36a74d8875fbc1fefabc0048fda50d64d1 Mon Sep 17 00:00:00 2001 From: ssw Date: Thu, 25 Jun 2026 15:13:43 +0800 Subject: [PATCH] =?UTF-8?q?refactor(v0.11+):=20form=20import=207=20?= =?UTF-8?q?=E8=B0=83=E7=94=A8=20webapi=20=E5=8C=96=20(=E6=9C=80=E5=A4=A7?= =?UTF-8?q?=E6=9C=BA=E6=A2=B0=E9=87=8D=E6=9E=84)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Phase 1 审计 P0: - form/import.ts 8 调用 → 7 webapi + 1 c.postJson (system/DataModel 是不同模块) - 3 create + 3 getVisualDevList + 1 release - 累计 form 18 调用 webapi 化 (22 中) 未 webapi 化: - /system/DataModel/Table POST (在 dataModel webapi, 后续可切) - form/create.ts (4 调用, 复杂, 后续) Co-Authored-By: Claude --- src/commands/form/import.ts | 42 +++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/src/commands/form/import.ts b/src/commands/form/import.ts index f707aea..0d4b817 100644 --- a/src/commands/form/import.ts +++ b/src/commands/form/import.ts @@ -18,6 +18,7 @@ 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' import { browserVerify } from './_browser_verify.ts' interface ImportOpts { @@ -232,15 +233,17 @@ export function buildFormImportCommand(): Command { delete raw._exportedAt // ---- POST /visualdev/Base ---- - const r = await c.postJson(`/visualdev/Base`, raw) + // v0.11+ Phase 2: 改用 webapi (loadVisualDev.create) + await initWebapi(c) + const r = (await loadVisualDev.create(raw)) as { code?: number; msg?: string; data?: { id?: string } } let newId = '' let actualEnCode = newEnCode if (r.code === 200) { - // 走 list 反查 id (老逻辑) - const listR = await c.get<{ list: { id: string; enCode: string }[] }>('/visualdev/Base', { - keyword: newEnCode, - }) - newId = listR.data?.list.find((f) => f.enCode === newEnCode)?.id || '(unknown)' + // 走 list 反查 id (webapi create 已返 id, 但稳妥起见仍 list 二次确认) + const listR = (await loadVisualDev.getVisualDevList({ keyword: newEnCode })) as { + list?: { id: string; enCode: string }[] + } + newId = listR.list?.find((f) => f.enCode === newEnCode)?.id || '(unknown)' } else if (r.code === 400 && /Encoding cannot be repeated|enCode.*repeated|编码.*重复/i.test(r.msg || '')) { // v0.8.2 修盲点 #?: JNPF 跨 app enCode **全局唯一**, 重复时返回 400 但**不**自动重命名 // (v0.8.1 旧版把 400 当失败直接 exit, 实际无 form 创建, 用户拿不到 form) @@ -295,27 +298,29 @@ export function buildFormImportCommand(): Command { if (raw.columnData) raw.columnData = rewriteTableNameRefs(raw.columnData) if (raw.appColumnData) raw.appColumnData = rewriteTableNameRefs(raw.appColumnData) } - const r2 = await c.postJson(`/visualdev/Base`, raw) + // v0.11+ Phase 2: 改用 webapi + const r2 = (await loadVisualDev.create(raw)) as { code?: number; msg?: string; data?: { id?: string } } if (r2.code === 200) { actualEnCode = renameTo log.ok(` ↳ 自动重命名后导入成功 (enCode=${renameTo})`) - const listR = await c.get<{ list: { id: string; enCode: string }[] }>('/visualdev/Base', { - keyword: renameTo, - }) - newId = listR.data?.list.find((f) => f.enCode === renameTo)?.id || '(unknown)' + const listR = (await loadVisualDev.getVisualDevList({ keyword: renameTo })) as { + list?: { id: string; enCode: string }[] + } + newId = listR.list?.find((f) => f.enCode === renameTo)?.id || '(unknown)' } else if (r2.code === 400 && /name cannot be repeated|name.*重复|Database exception/i.test(r2.msg || '')) { // v0.8.2 修: 初次 POST 用了旧表名 (bdgz) 跨 app 冲突, 第二次 POST 用了新表名但表没建 → 报 Database exception // 修复: 在 retry 前用更新的 renameMap 重建物理表 log.warn(` ↳ 表名冲突需重建 (${r2.msg}), 用新映射重跑 autoTable`) await createDmTables(tableRenameMap) - const r3 = await c.postJson(`/visualdev/Base`, raw) + // v0.11+ Phase 2: 改用 webapi + const r3 = (await loadVisualDev.create(raw)) as { code?: number; msg?: string; data?: { id?: string } } if (r3.code === 200) { actualEnCode = renameTo log.ok(` ↳ 自动重命名 + 重建表后导入成功 (enCode=${renameTo})`) - const listR = await c.get<{ list: { id: string; enCode: string }[] }>('/visualdev/Base', { - keyword: renameTo, - }) - newId = listR.data?.list.find((f) => f.enCode === renameTo)?.id || '(unknown)' + const listR = (await loadVisualDev.getVisualDevList({ keyword: renameTo })) as { + list?: { id: string; enCode: string }[] + } + newId = listR.list?.find((f) => f.enCode === renameTo)?.id || '(unknown)' } else { log.error(`导入失败 code=${r3.code}: ${r3.msg} (auto-rename + 重建表后仍失败)`) process.exit(1) @@ -334,8 +339,9 @@ export function buildFormImportCommand(): Command { } if (opts.release && raw.type !== 4 && newId !== '(unknown)') { - const rr = await c.postJson(`/visualdev/Base/${newId}/Actions/Release`, {}) - if (rr.code === 200) log.ok('发布成功') + // v0.11+ Phase 2: 改用 webapi (loadVisualDev.release) + const rr = (await loadVisualDev.release(newId)) as { code?: number; msg?: string } + if (rr.code === 200 || rr.code === undefined) log.ok('发布成功') else log.warn(`发布失败 code=${rr.code}: ${rr.msg}`) }