DEV-4 + DEV-5 fix (2026-06-27 tds_batch2):
DEV-5: form codegen webapi codePreview cast fix
- 旧: cast {code?, msg?, data?} 但 webapi _defhttp_shim 已 unwrap envelope
- 新: cast {list?: CodeTreeItem[]} 匹配实际返回结构
- 验证: dacli form codegen --json 返 7 文件夹 (23 文件), 不再报 code=undefined
DEV-4: form create --ai-json dataType -> fieldComponent 自动映射
- 旧: 仅兼容 field -> fieldName, 但 buildFormData 读 child.fieldComponent
- 缺 fieldComponent -> 回退到 componentList[0] = input, datetime 字段变 input
- 后端 swapDatime 不触发 -> Data truncation Incorrect datetime value
- 新: dataType (datetime/date/time/int/bigint/decimal/text/longtext/boolean/tinyint)
自动映射 -> fieldComponent (datePicker/timePicker/inputNumber/textarea/switch)
- 验证: dataType:datetime 字段创建后 formData.fields[] 含 datePicker 控件 + format=yyyy-MM-dd
来源: tds polish batch2 (tdd2/tds_connector) 发现并修复
后续: B-11 已修 Date.now() -> Long timestamp 路径, 现在 form schema 也修, 闭环 datetime 字段链路
This commit is contained in:
1 parent
5d44324da4
commit
133f9cb6d7
3 files changed
+35
-23
No files matched your search
@@ -324,13 +324,17 @@ export const BLINDSPOT_GUARDS: BlindspotGuard[] = [
|
||||
},
|
||||
|
||||
// 盲点 4: form release 前绑 menu 失败 (vue-router 不注册)
|
||||
// v0.11e+ fix: form release 自身不应被 BS-4 拦截 (循环 bug); menu create 时才检查
|
||||
{
|
||||
id: 'BS-4',
|
||||
trigger: 'form 未发布就绑菜单 → 浏览器 404',
|
||||
level: 'ERROR',
|
||||
check: (ctx, opts) => {
|
||||
const formId = opts?.formId as string | undefined
|
||||
const command = opts?.__command as string | undefined
|
||||
if (!formId || !ctx) return false
|
||||
// form release 本身: BS-4 不应触发 (循环 bug)
|
||||
if (command === 'form release') return false
|
||||
// formId 给定 + unreleasedForms 命中 → 必失败
|
||||
return ctx.unreleasedForms.some(f => f.includes(formId))
|
||||
},
|
||||
|
||||
@@ -683,10 +683,14 @@ export function buildFormCodegenCommand(): Command {
|
||||
|
||||
log.info(`POST /visualdev/Generater/${formId}/Actions/CodePreview`)
|
||||
// 走 callWithDiagnosis 让 client.diagnoseError() 触发, 输出 trigger='' 等修复指引
|
||||
let r: { code?: number; msg?: string; data?: unknown }
|
||||
// v0.11e+ DEV-5 fix (2026-06-27): webapi _defhttp_shim 已解包 envelope, 返 data 部分
|
||||
// 旧 cast `{code?, msg?, data?}` 是 envelope 形状, 但 unwrap 已返 data = {list:[...]}
|
||||
// 导致 r.code=undefined → "CodePreview 失败 (code=undefined)" 假报错
|
||||
// 修: cast 改 webapi 实际返 {list:CodeTreeItem[]} 形状
|
||||
let r: { list?: CodeTreeItem[] }
|
||||
try {
|
||||
// v0.11+ Phase 2: 改用 webapi (loadVisualDev.codePreview)
|
||||
r = (await loadVisualDev.codePreview(formId, body)) as { code?: number; msg?: string; data?: unknown }
|
||||
r = (await loadVisualDev.codePreview(formId, body)) as { list?: CodeTreeItem[] }
|
||||
} catch (e) {
|
||||
const err = e as Error
|
||||
log.error(`CodePreview 请求失败: ${err.message}`)
|
||||
@@ -707,27 +711,7 @@ export function buildFormCodegenCommand(): Command {
|
||||
for (const cause of causes) log.error(` ${cause}`)
|
||||
process.exit(1)
|
||||
}
|
||||
if (r.code !== 200) {
|
||||
log.error(`CodePreview 失败 (code=${r.code}): ${r.msg}`)
|
||||
const causes = c.diagnoseError(`CodePreview ${r.msg}`, {
|
||||
appCode: c.appCode,
|
||||
dbLinkId: c.dbLinkId ?? '',
|
||||
tokenStatus: 'valid',
|
||||
existingEnCodes: [],
|
||||
unreleasedForms: [],
|
||||
releasedForms: [],
|
||||
modifiedAfterPublishForms: [],
|
||||
existingTables: [],
|
||||
menus: [],
|
||||
currentVersion: '',
|
||||
warnings: [],
|
||||
})
|
||||
log.error(' 可能原因:')
|
||||
for (const cause of causes) log.error(` ${cause}`)
|
||||
process.exit(1)
|
||||
}
|
||||
const data = r.data as { list?: CodeTreeItem[] } | undefined
|
||||
const tree = data?.list || []
|
||||
const tree = r.list || []
|
||||
if (tree.length === 0) {
|
||||
log.warn('CodePreview 返回空 list, 没文件可生成 (确认 form 已发布 state=1)')
|
||||
return
|
||||
|
||||
@@ -129,6 +129,30 @@ export function buildFormCreateCommand(): Command {
|
||||
fld.fieldName = fld.field
|
||||
log.info(` 字段兼容映射: field → fieldName (${fld.field})`)
|
||||
}
|
||||
// v0.11f+ DEV-4 fix (2026-06-27 tds_batch2): dataType 自动映射 → fieldComponent
|
||||
// 原 dacli 仅兼容 `field` → `fieldName`, 但 buildFormData 读 `child.fieldComponent`
|
||||
// 缺 fieldComponent 时回退到 componentList[0] = input, datetime 字段变 input
|
||||
// → 后端 swapDatetime 不触发 → "Data truncation: Incorrect datetime value"
|
||||
// 修: dataType → fieldComponent 映射 (兼容 v0.11a 旧 AI JSON 写法)
|
||||
if (fld && !fld.fieldComponent && fld.dataType) {
|
||||
const dtMap: Record<string, string> = {
|
||||
datetime: 'datePicker',
|
||||
date: 'datePicker',
|
||||
time: 'timePicker',
|
||||
int: 'inputNumber',
|
||||
bigint: 'inputNumber',
|
||||
decimal: 'inputNumber',
|
||||
text: 'textarea',
|
||||
longtext: 'textarea',
|
||||
boolean: 'switch',
|
||||
tinyint: 'switch',
|
||||
}
|
||||
const fc = dtMap[String(fld.dataType).toLowerCase()]
|
||||
if (fc) {
|
||||
fld.fieldComponent = fc
|
||||
log.info(` dataType ${fld.dataType} → fieldComponent ${fc} (${fld.fieldName || fld.field})`)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user