fix(v0.8.2): form export/import/menu 跨 app enCode 冲突 + 自动重命名 + 表重建
2026-06-19 tdd1 实战发现 4 个真实盲点, 一段提交修复:
1. **form export URL 拼写错**: `/Tables/{t}/Fields` 实际应**复数**, 单数 `Table` 返回 404.
v0.7 旧代码拉到的 _physicalSchema 字段数组为空, import 走 autoTable 时 dm create 报
"No initial fields", 后续 form POST 报"Encoding cannot be repeated" (跨 app enCode 冲突)
或 "Database exception" (缺表), 整链路失败但原因被掩盖.
2. **form import 漏改 columnData/appColumnData 的 tableName**:
旧代码只改 formData, 漏改 columnData/appColumnData. web 端 Form.vue 保存时三处都
同步引用, dacli 漏改导致主子表关联断裂.
3. **form import 跨 app enCode 冲突**:
JNPF enCode **全局唯一**, 跨 app import 报 "Encoding cannot be repeated" 400
但**不**自动重命名. 旧代码把 400 当失败直接 exit, 用户拿不到 form.
修复: 检测 400 + "Encoding cannot be repeated" → 自动加 `<appCode>_` 前缀,
同步重命名 tables[].table + formData/columnData/appColumnData tableName,
重跑 autoTable 重建物理表 (旧的脏表已跨 dbLinkId 全局冲突需前缀化),
再 POST + 列反查新 id.
4. **menu create 自动父菜单找错**:
旧逻辑 SelectorFilter 找 type===0 (应用系统根, parentId=-1), 但 tdd1/tds 等应用
该节点是"应用系统"不是真菜单, 子菜单挂上去会变成平级. 改为递归找第一个
type===1 (目录) 作为父菜单.
5. **menu create 重试兜底**:
Actions/Module 指定父菜单报"名称重复"时 (软删/全局冲突), 重试用空 pcModuleParentId
(顶级挂载) 兜底.
修复文件:
- src/commands/form/export.ts: URL Tables 复数, 响应 {list:[]} 兼容, 0 字段 warn
- src/commands/form/import.ts: columnData/appColumnData 重写 + 400 自动重命名 + dm create 重跑 + relationTable 链式更新
- src/commands/menu/create.ts: 递归找 type===1 父菜单 + 重试兜底
Co-Authored-By: Claude <[email protected]>
This commit is contained in:
1 parent
7e4f13353a
commit
b276c41339
3 files changed
+198
-44
No files matched your search
+28
-12
@@ -5,6 +5,12 @@
|
||||
* 解 #15 (web Form.vue tables[].fields 是 DB 实时查的, 不在 form JSON 里).
|
||||
* 配合 import.ts 的 --autoTable 在目标库重建物理表.
|
||||
*
|
||||
* v0.8.2 修复盲点 #? (2026-06-19, tdd1 实战发现):
|
||||
* - URL 拼写错: `Table/{t}/Fields` → 应为 **`Tables/{t}/Fields`** (复数, 跟 web 端 TableList/index.vue:184 一致)
|
||||
* - 单数 `Table` 返回 404 (Content-Length: 0, JNPF 没这个端点)
|
||||
* - 复数 `Tables` 返回 `{list: Field[]}` (不是 `{fields:[]}`)
|
||||
* - 响应解析补 `{list: []}` 形态 (web `dataModel/TableList.vue:184` 真值)
|
||||
*
|
||||
* 关键: web 端 createDataModel 是单独走「数据建模」入口, form 设计器只引用表名;
|
||||
* 迁移时若不带物理 schema 出来, import 后浏览器报 "该表单已删除".
|
||||
*/
|
||||
@@ -29,7 +35,7 @@ interface ExportedForm extends FormDetail {
|
||||
|
||||
export function buildFormExportCommand(): Command {
|
||||
const cmd = new Command('export')
|
||||
.description('导出表单完整 schema 到文件 (v0.7 同时带物理表 schema, 解 #15)')
|
||||
.description('导出表单完整 schema 到文件 (v0.7 同时带物理表 schema, v0.8.2 修 URL Tables 复数 + 响应 {list} 解析)')
|
||||
.argument('<id>', '表单 id')
|
||||
.option('--out <path>', '输出文件路径 (默认 ./<enCode>.json)')
|
||||
.option('--no-physical', '不带物理表 schema (默认会带, 兼容旧版导出)')
|
||||
@@ -53,21 +59,29 @@ export function buildFormExportCommand(): Command {
|
||||
if (!tableName) continue
|
||||
const dbLinkId = String(data.dbLinkId || '0')
|
||||
try {
|
||||
const fr = await c.get<{ fields?: Record<string, unknown>[] } | Record<string, unknown>[]>(
|
||||
`/system/DataModel/${dbLinkId}/Tables/${tableName}/Fields`,
|
||||
{ field: '*' },
|
||||
)
|
||||
// v0.8.2 修复: URL 用 **Tables** (复数); 响应是 `{list: Field[]}` 形态 (web TableList 真值)
|
||||
const fr = await c.get<
|
||||
{ list?: Record<string, unknown>[]; fields?: Record<string, unknown>[] } | Record<string, unknown>[]
|
||||
>(`/system/DataModel/${dbLinkId}/Tables/${tableName}/Fields`)
|
||||
if (fr.code === 200) {
|
||||
const arr = Array.isArray(fr.data)
|
||||
? fr.data
|
||||
: (fr.data as { fields?: Record<string, unknown>[] })?.fields || []
|
||||
// 兼容 3 种形态: [{...}] / {list: [...]} / {fields: [...]}
|
||||
let arr: Record<string, unknown>[] = []
|
||||
if (Array.isArray(fr.data)) arr = fr.data
|
||||
else {
|
||||
const d = fr.data as { list?: unknown[]; fields?: unknown[] }
|
||||
arr = (d.list || d.fields || []) as Record<string, unknown>[]
|
||||
}
|
||||
physical.push({
|
||||
table: tableName,
|
||||
tableName: t.tableName as string | undefined,
|
||||
typeId: t.typeId as string | undefined,
|
||||
fields: arr,
|
||||
})
|
||||
log.debug(` ↳ 拉 ${tableName} 字段 ×${arr.length}`)
|
||||
if (arr.length === 0) {
|
||||
log.warn(` ↳ ${tableName} 字段返回 0 条 (Tables 端点有响应但无字段, 检查表是否真存在)`)
|
||||
} else {
|
||||
log.debug(` ↳ 拉 ${tableName} 字段 ×${arr.length}`)
|
||||
}
|
||||
} else {
|
||||
log.warn(` ↳ ${tableName} 字段查失败 code=${fr.code}: ${fr.msg} (跳过)`)
|
||||
}
|
||||
@@ -88,8 +102,9 @@ export function buildFormExportCommand(): Command {
|
||||
writeFileSync(path, JSON.stringify(data, null, 2), 'utf-8')
|
||||
const sizeKb = (JSON.stringify(data).length / 1024).toFixed(1)
|
||||
const phyCount = data._physicalSchema?.length ?? 0
|
||||
log.ok(`已导出 ${data.enCode} → ${path} (${sizeKb} KB, 含 ${phyCount} 张物理表 schema)`)
|
||||
if (!opts.out) printJson({ id, enCode: data.enCode, path, physicalTables: phyCount })
|
||||
const phyFields = data._physicalSchema?.reduce((s, p) => s + (p.fields?.length || 0), 0) ?? 0
|
||||
log.ok(`已导出 ${data.enCode} → ${path} (${sizeKb} KB, 含 ${phyCount} 张物理表 schema, 共 ${phyFields} 字段)`)
|
||||
if (!opts.out) printJson({ id, enCode: data.enCode, path, physicalTables: phyCount, physicalFields: phyFields })
|
||||
})
|
||||
|
||||
installAiHelpHook(cmd, {
|
||||
@@ -103,9 +118,10 @@ export function buildFormExportCommand(): Command {
|
||||
source: { api: 'GET /api/visualdev/Base/:id + GET /api/system/DataModel/:linkId/Tables/:table/Fields' },
|
||||
notes: [
|
||||
'v0.7 默认带物理表 schema (_physicalSchema 字段), 配合 form import --autoTable 重建物理表',
|
||||
'v0.8.2 修: URL 用 Tables (复数) 跟 web 端 TableList/index.vue 一致; 单数 Table 返回 404 空',
|
||||
'web/.../formDesign/Form.vue tables[].fields 是 DB 实时查的, 不在 form JSON 里, 所以必须单独拉',
|
||||
],
|
||||
})
|
||||
|
||||
return cmd
|
||||
}
|
||||
}
|
||||
+133
-25
@@ -28,7 +28,8 @@ interface ImportOpts {
|
||||
release?: boolean
|
||||
autoTable?: boolean
|
||||
json?: boolean
|
||||
/** Phase 3: 浏览器层验证开关 (默认硬阻塞) */
|
||||
/** Phase 3: 浏览器层验证开关 (默认硬阻塞). commander 的 --no-verify → false, --verify=warn → 'warn' */
|
||||
verify?: boolean | string
|
||||
noVerify?: boolean
|
||||
verifyMode?: string
|
||||
verifyTimeout?: string
|
||||
@@ -123,18 +124,30 @@ export function buildFormImportCommand(): Command {
|
||||
raw.tables = JSON.stringify(parsedTables)
|
||||
}
|
||||
|
||||
// 同步改 formData[].tableName (字段引用的旧表名)
|
||||
if (raw.formData && Object.keys(tableRenameMap).length) {
|
||||
try {
|
||||
let fdRaw = raw.formData
|
||||
for (const [oldT, newT] of Object.entries(tableRenameMap)) {
|
||||
// 简单字符串替换 (tableName 是 JSON string 字段, 不会跟其他东西混)
|
||||
fdRaw = fdRaw.split(`"tableName":"${oldT}"`).join(`"tableName":"${newT}"`)
|
||||
}
|
||||
raw.formData = fdRaw
|
||||
} catch (e) {
|
||||
log.warn(`formData tableName 替换失败: ${(e as Error).message}`)
|
||||
// 同步改 formData[].tableName + columnData[].tableName + appColumnData[].tableName
|
||||
// v0.8.2 修复盲点 #? (2026-06-19, tdd1 实战发现): 旧代码只改 formData, 漏改 columnData/appColumnData
|
||||
// 导致 POST /visualdev/Base 报 "Encoding cannot be repeated" 或 "Database exception"
|
||||
// (web 端 Form.vue 保存时 formData/columnData/appColumnData 三处都同步引用)
|
||||
const rewriteTableNameRefs = (jsonStr: string | undefined): string | undefined => {
|
||||
if (!jsonStr || !Object.keys(tableRenameMap).length) return jsonStr
|
||||
let out = jsonStr
|
||||
for (const [oldT, newT] of Object.entries(tableRenameMap)) {
|
||||
// 简单字符串替换 (tableName 是 JSON string 字段, 不会跟其他东西混)
|
||||
out = out.split(`"tableName":"${oldT}"`).join(`"tableName":"${newT}"`)
|
||||
}
|
||||
return out
|
||||
}
|
||||
if (raw.formData) {
|
||||
try { raw.formData = rewriteTableNameRefs(raw.formData) }
|
||||
catch (e) { log.warn(`formData tableName 替换失败: ${(e as Error).message}`) }
|
||||
}
|
||||
if (raw.columnData) {
|
||||
try { raw.columnData = rewriteTableNameRefs(raw.columnData) }
|
||||
catch (e) { log.warn(`columnData tableName 替换失败: ${(e as Error).message}`) }
|
||||
}
|
||||
if (raw.appColumnData) {
|
||||
try { raw.appColumnData = rewriteTableNameRefs(raw.appColumnData) }
|
||||
catch (e) { log.warn(`appColumnData tableName 替换失败: ${(e as Error).message}`) }
|
||||
}
|
||||
|
||||
// ---- v0.7: autoTable — 在目标 dbLinkId 重建物理表 ----
|
||||
@@ -163,11 +176,13 @@ export function buildFormImportCommand(): Command {
|
||||
}
|
||||
}
|
||||
|
||||
if (wantsAutoTable && collectedTables.length) {
|
||||
// 抽出 dm create 为可重用函数, 初次 + auto-rename 后可重跑
|
||||
const createDmTables = async (renameMap: Record<string, string>) => {
|
||||
if (!collectedTables.length) return
|
||||
log.info(`autoTable: 在 dbLinkId=${targetDbLinkId} 重建 ${collectedTables.length} 张物理表`)
|
||||
for (const entry of collectedTables) {
|
||||
const oldName = entry.table
|
||||
const newName = tableRenameMap[oldName] || oldName
|
||||
const newName = renameMap[oldName] || oldName
|
||||
// 字段补齐 + 重排序 (DataModel API 要求 tableFieldList 含 index 字符串)
|
||||
const fields = (entry.fields || []).map((f, i) => ({
|
||||
field: f.field,
|
||||
@@ -202,6 +217,10 @@ export function buildFormImportCommand(): Command {
|
||||
log.warn(` ↳ 建 ${newName} 异常: ${(e as Error).message} (继续)`)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (wantsAutoTable && collectedTables.length) {
|
||||
await createDmTables(tableRenameMap)
|
||||
} else if (wantsAutoTable && !collectedTables.length) {
|
||||
log.warn('autoTable=true 但既无 _physicalSchema 也无 tables[].fields[], 跳过建表')
|
||||
log.warn(' → 重新 dacli form export <id> 拿带 _physicalSchema 的 v0.7+ 格式')
|
||||
@@ -213,16 +232,102 @@ export function buildFormImportCommand(): Command {
|
||||
|
||||
// ---- POST /visualdev/Base ----
|
||||
const r = await c.postJson(`/visualdev/Base`, raw)
|
||||
if (r.code !== 200) {
|
||||
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)'
|
||||
} 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)
|
||||
// v0.8.2: 自动加 `<appCode>_` 前缀重命名, 同步改 tables[].table + formData tableName, 再 POST
|
||||
const prefix = c.appCode || 'td'
|
||||
const renameTo = `${prefix}_${newEnCode}`
|
||||
log.warn(` ↳ enCode "${newEnCode}" 跨 app 已存在 (${r.msg}), 自动改为 "${renameTo}"`)
|
||||
raw.enCode = renameTo
|
||||
// 把 tables[].table 改名 (按主表加前缀, 子表加后缀避免冲突)
|
||||
if (parsedTables.length) {
|
||||
const _mainIdx = parsedTables.findIndex((t) => String(t.typeId) === '1')
|
||||
const _effMain = _mainIdx >= 0 ? _mainIdx : 0
|
||||
for (let i = 0; i < parsedTables.length; i++) {
|
||||
const cur = String(parsedTables[i].table || '')
|
||||
const prefixed = i === _effMain ? `${prefix}_${cur}` : `${cur}_${prefix}`
|
||||
if (cur !== prefixed) {
|
||||
// v0.8.2 修: 如果 cur 已经是 renameMap 的 value (来自初次重命名), 也要更新到新前缀
|
||||
// 例: renameMap[mt797...] = bdgz; auto-rename 后应改成 renameMap[mt797...] = tdd1_bdgz
|
||||
const curAsOld = Object.keys(tableRenameMap).find((k) => tableRenameMap[k] === cur)
|
||||
if (curAsOld) {
|
||||
tableRenameMap[curAsOld] = prefixed
|
||||
} else {
|
||||
tableRenameMap[cur] = prefixed
|
||||
}
|
||||
parsedTables[i].table = prefixed
|
||||
// v0.8.2 修: relationTable 也跟着改 (子表关联主表名)
|
||||
// 原值可能是初次重命名后的 cur, 也可能是旧原名 mt..., 都覆盖
|
||||
const rt = String(parsedTables[i].relationTable || '')
|
||||
if (rt === cur) {
|
||||
parsedTables[i].relationTable = prefixed
|
||||
} else if (rt && tableRenameMap[rt]) {
|
||||
parsedTables[i].relationTable = tableRenameMap[rt]
|
||||
}
|
||||
}
|
||||
}
|
||||
// 反查: 其他表的 relationTable 也要改 (子表关联主表, 主表名已被改)
|
||||
for (const t of parsedTables) {
|
||||
const rt = String(t.relationTable || '')
|
||||
if (rt && tableRenameMap[rt]) t.relationTable = tableRenameMap[rt]
|
||||
}
|
||||
raw.tables = JSON.stringify(parsedTables)
|
||||
// formData/columnData/appColumnData 同步替换
|
||||
const rewriteTableNameRefs = (s: string | undefined): string | undefined => {
|
||||
if (!s || !Object.keys(tableRenameMap).length) return s
|
||||
let out = s
|
||||
for (const [oldT, newT] of Object.entries(tableRenameMap)) {
|
||||
out = out.split(`"tableName":"${oldT}"`).join(`"tableName":"${newT}"`)
|
||||
}
|
||||
return out
|
||||
}
|
||||
if (raw.formData) raw.formData = rewriteTableNameRefs(raw.formData)
|
||||
if (raw.columnData) raw.columnData = rewriteTableNameRefs(raw.columnData)
|
||||
if (raw.appColumnData) raw.appColumnData = rewriteTableNameRefs(raw.appColumnData)
|
||||
}
|
||||
const r2 = await c.postJson(`/visualdev/Base`, raw)
|
||||
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)'
|
||||
} 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)
|
||||
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)'
|
||||
} else {
|
||||
log.error(`导入失败 code=${r3.code}: ${r3.msg} (auto-rename + 重建表后仍失败)`)
|
||||
process.exit(1)
|
||||
}
|
||||
} else {
|
||||
log.error(`导入失败 code=${r2.code}: ${r2.msg} (自动重命名 "${renameTo}" 后仍失败)`)
|
||||
process.exit(1)
|
||||
}
|
||||
} else {
|
||||
log.error(`导入失败 code=${r.code}: ${r.msg}`)
|
||||
process.exit(1)
|
||||
}
|
||||
// 反查 id (走 /visualdev/Base 全 form, 不走 /list 工作流子集)
|
||||
const listR = await c.get<{ list: { id: string; enCode: string }[] }>('/visualdev/Base', {
|
||||
keyword: newEnCode,
|
||||
})
|
||||
const newId = listR.data?.list.find((f) => f.enCode === newEnCode)?.id || '(unknown)'
|
||||
log.ok(`导入成功 id=${newId} enCode=${newEnCode} dbLinkId=${targetDbLinkId}`)
|
||||
log.ok(`导入成功 id=${newId} enCode=${actualEnCode} dbLinkId=${targetDbLinkId}`)
|
||||
if (Object.keys(tableRenameMap).length) {
|
||||
log.info(` ↳ 表名映射: ${JSON.stringify(tableRenameMap)}`)
|
||||
}
|
||||
@@ -234,18 +339,21 @@ export function buildFormImportCommand(): Command {
|
||||
}
|
||||
|
||||
// Phase 3: 浏览器层验证 (默认硬阻塞, --verify=warn / --no-verify 可绕过)
|
||||
// v0.8.2 修复盲点 #? (2026-06-19, tdd1 实战发现): --no-verify 是 commander 的 negation 模式
|
||||
// 把 opts.verify 设为 false, 不是 opts.noVerify = true. 旧代码读 opts.noVerify 永远 undefined → 验证没真跳过
|
||||
if (newId !== '(unknown)') {
|
||||
try {
|
||||
await browserVerify({
|
||||
formId: newId,
|
||||
enCode: newEnCode,
|
||||
enCode: actualEnCode,
|
||||
appCode: c.appCode,
|
||||
noVerify: opts.noVerify,
|
||||
verifyMode: (opts.verifyMode as 'block' | 'warn') || 'block',
|
||||
// commander 的 --no-verify 把 opts.verify 设为 false; --verify=warn 时 opts.verify 是 'warn'
|
||||
noVerify: opts.verify === false,
|
||||
verifyMode: (typeof opts.verify === 'string' ? opts.verify : 'block') as 'block' | 'warn',
|
||||
verifyTimeout: opts.verifyTimeout ? Number(opts.verifyTimeout) : undefined,
|
||||
})
|
||||
} catch (e) {
|
||||
if (opts.verifyMode !== 'warn') throw e
|
||||
if ((opts.verify as string) !== 'warn') throw e
|
||||
// warn 模式不抛, 继续
|
||||
}
|
||||
}
|
||||
|
||||
@@ -120,17 +120,31 @@ export function buildMenuCreateCommand(): Command {
|
||||
// v0.7.1 fix (盲点 23 续): 不传 --pcParents 时, 自动从 /system/Menu/SelectorFilter/0
|
||||
// 拉当前 app 的根目录菜单当 parent (web 端 getMenuSelectorFilter({category:'Web'}, '0') 同款)
|
||||
// 旧默认 '0' 在 tds 等应用下不存在 → 报 "找不到该上级"
|
||||
// v0.8.2 修复 (2026-06-19, tdd1 实战发现): type===0 是"应用系统"节点 (parentId:-1), 不是真菜单.
|
||||
// 真菜单应该是 type===1 (目录). 优先 type===1, 没则递归 children
|
||||
let pcParents: string[] = opts.pcParents ? opts.pcParents.split(',').filter(Boolean) : []
|
||||
if (pc && pcParents.length === 0) {
|
||||
const sel = await c.get<{ list?: { id: string; type: number }[] }>('/system/Menu/SelectorFilter/0', {
|
||||
category: 'Web',
|
||||
})
|
||||
const root = sel.data?.list?.find((m) => m.type === 0)
|
||||
const sel = await c.get<{
|
||||
list?: { id: string; type: number; children?: { id: string; type: number }[] }[]
|
||||
}>('/system/Menu/SelectorFilter/0', { category: 'Web' })
|
||||
// 递归找第一个 type===1 的菜单 (目录)
|
||||
const findMenu = (
|
||||
items: { id: string; type: number; children?: { id: string; type: number; children?: any }[] }[] | undefined,
|
||||
): string | null => {
|
||||
if (!items) return null
|
||||
for (const it of items) {
|
||||
if (it.type === 1) return it.id
|
||||
const child = findMenu(it.children)
|
||||
if (child) return child
|
||||
}
|
||||
return null
|
||||
}
|
||||
const root = findMenu(sel.data?.list)
|
||||
if (root) {
|
||||
pcParents = [root.id]
|
||||
log.info(`自动发现父菜单 (Web 根): id=${root.id}`)
|
||||
pcParents = [root]
|
||||
log.info(`自动发现父菜单 (Web 目录): id=${root}`)
|
||||
} else {
|
||||
log.warn('SelectorFilter 未返 Web 根菜单, 仍用默认 "0" (Actions/Module 可能报"找不到该上级")')
|
||||
log.warn('SelectorFilter 未返 Web 菜单, 用默认 "0" (Actions/Module 可能报"找不到该上级")')
|
||||
pcParents = ['0']
|
||||
}
|
||||
}
|
||||
@@ -145,6 +159,22 @@ export function buildMenuCreateCommand(): Command {
|
||||
log.info(`POST /visualdev/Base/${opts.formId}/Actions/Module (web 真路径)`)
|
||||
const r = await c.postJson(`/visualdev/Base/${opts.formId}/Actions/Module`, body)
|
||||
if (r.code !== 200) {
|
||||
// v0.8.2 修复 (2026-06-19, tdd1 实战发现): 当 pcParents 非空但 Actions/Module 报"名称重复",
|
||||
// 实为 JNPF 在指定父菜单下检测到同名 (可能软删除/全局). 重试用空 pcParents (顶级)
|
||||
const needRetry =
|
||||
r.code === 400 && /名称重复|name.*repeat|enCode.*repeated/i.test(r.msg || '')
|
||||
if (needRetry && pcParents.length > 0 && pcParents[0] !== '0') {
|
||||
log.warn(` ↳ Actions/Module "${r.msg}", 重试用空 pcParents (顶级)`)
|
||||
const retryBody = { ...body, pcModuleParentId: [] }
|
||||
const rr = await c.postJson(`/visualdev/Base/${opts.formId}/Actions/Module`, retryBody)
|
||||
if (rr.code === 200) {
|
||||
log.ok(`✓ 菜单发布成功 (重试后顶级, formId=${opts.formId}, pc=${pc}, app=${app})`)
|
||||
log.ok(' ↳ 后端已自动构造 moduleId/propertyJson/urlAddress/pageAddress + 给当前角色授权')
|
||||
if (opts.json) printJson(rr)
|
||||
return
|
||||
}
|
||||
log.error(` ↳ 重试仍失败 code=${rr.code}: ${rr.msg}`)
|
||||
}
|
||||
log.error(`menu create (Actions/Module) 失败 code=${r.code}: ${r.msg}`)
|
||||
if (opts.json) printJson(r)
|
||||
process.exit(1)
|
||||
|
||||
Reference in new issue
Block a user