diff --git a/src/commands/form/_naming_convention.ts b/src/commands/form/_naming_convention.ts new file mode 100644 index 0000000..046ef16 --- /dev/null +++ b/src/commands/form/_naming_convention.ts @@ -0,0 +1,179 @@ +/** + * _naming_convention.ts — columnList / __vModel__ 命名规范适配 (BS-drift-1 解决) + * + * 问题: baseline columnList 命名 3 种风格并存, dacli --ai 始终输出 snake_case 语义名, + * 导致 0% 重叠 (严重漂移). + * - F_prefix (2/60): F_SortCode, F_Depname, F_Username + * - auto (34/60): comInputField101, billRuleField119 (JNPF 设计器默认) + * - snake (6/60): f_order_code, f_real_name (注意 baseline snake 都带 f_ 前缀) + * + * 解决: 检测 baseline 风格, 在 dacli form create 后重命名 columnList.prop + formData.__vModel__, + * 让重建 form 的命名规范跟 baseline 匹配. + * + * @author claude (2026-07-12) + */ + +export type NamingConvention = 'auto' | 'snake' | 'f_prefix' + +/** + * 检测 baseline form 使用的命名风格 + * + * 优先级: F_prefix > auto > snake > auto (fallback) + * - baseline 没有 columnList → 'auto' (JNPF 默认) + * + * @param baselineForm JNPF form schema (含 f_column_data) + * @returns NamingConvention + */ +export function detectNamingConvention(baselineForm: any): NamingConvention { + const cd = parseJsonSafe(baselineForm?.f_column_data) + const cols = cd?.columnList || [] + if (!cols.length) return 'auto' + + const props = cols.map((c: any) => c.prop).filter(Boolean) + const fCount = props.filter((p: string) => p.startsWith('F_')).length + const autoCount = props.filter((p: string) => + /^(comInput|comSelect|input|select|date|number|switch|radio|checkbox|table|cascader|upload|tree|area|popup|signature|rate|slider|color|organize|user|users|dep|post|area|group|relation|popupTable|popupSelect|billRule|component)Field\d+$/.test(p) + ).length + + if (fCount > 0) return 'f_prefix' + if (autoCount > 0) return 'auto' + // baseline snake 都带 f_ 前缀 (e.g. f_real_name) + return 'snake' +} + +/** + * 应用命名规范: 重命名 formData.fields[].__vModel__ + columnData.columnList[].prop + * + * 转换规则: + * - 'f_prefix': serial_num → F_SerialNum (UpperCamelCase + F_ 前缀) + * - 'auto': serial_num → comInputField1, comSelectField2... (按 jnpfKey 选类型前缀) + * - 'snake': serial_num → f_serial_num (加 f_ 前缀) + * + * @param formData formData 对象 (会被 mutate) + * @param columnData columnData 对象 (会被 mutate) + * @param convention 目标命名规范 + * @param startIndex auto 模式起始编号 (默认 1, 跟 JNPF 设计器对齐) + * @returns 重命名统计 { renamed, skipped } + */ +export function applyNamingConvention( + formData: any, + columnData: any, + convention: NamingConvention, + startIndex: number = 1, +): { renamed: number; skipped: number } { + const fields = formData?.fields || [] + const cols = columnData?.columnList || [] + const searchList = columnData?.searchList || [] + + let renamed = 0 + let skipped = 0 + let autoCounter = startIndex + + // 1) 收集 __vModel__ → 新名字 映射 + const renames: Record = {} + for (const f of fields) { + if (!f?.__vModel__) continue + const oldName = f.__vModel__ + if (oldName.startsWith('F_') && convention === 'f_prefix') { + skipped++; continue // 已经是 F_ 开头, 跳过 + } + if (convention === 'auto' && /^Field\d+$/.test(oldName)) { + skipped++; continue // 已经是 auto 风格, 跳过 + } + if (convention === 'snake' && oldName.startsWith('f_')) { + skipped++; continue // 已经有 f_ 前缀, 跳过 + } + const newName = convertName(oldName, f.__config__?.jnpfKey, convention, autoCounter) + if (convention === 'auto') autoCounter++ + renames[oldName] = newName + } + + // 2) 应用到 formData.fields[].__vModel__ + for (const f of fields) { + if (f.__vModel__ && renames[f.__vModel__]) { + f.__vModel__ = renames[f.__vModel__] + renamed++ + } + } + + // 3) 应用到 columnData.columnList[].prop + searchList[].__vModel__ + for (const c of cols) { + if (c.prop && renames[c.prop]) { + c.prop = renames[c.prop] + } + } + for (const s of searchList) { + if (s.__vModel__ && renames[s.__vModel__]) { + s.__vModel__ = renames[s.__vModel__] + } + } + + return { renamed, skipped } +} + +/** + * 单字段命名转换 + */ +function convertName( + oldName: string, + jnpfKey: string, + convention: NamingConvention, + autoIndex: number, +): string { + if (convention === 'f_prefix') { + // serial_num → F_SerialNum + const camel = toUpperCamel(oldName) + return `F_${camel}` + } + if (convention === 'snake') { + // serial_num → f_serial_num + return oldName.startsWith('f_') ? oldName : `f_${oldName}` + } + // auto: jnpfKey 决定类型前缀 + return `${getAutoPrefix(jnpfKey)}${autoIndex}` +} + +function toUpperCamel(snake: string): string { + return snake + .split('_') + .filter(Boolean) + .map(w => w[0].toUpperCase() + w.slice(1).toLowerCase()) + .join('') +} + +function getAutoPrefix(jnpfKey: string): string { + const map: Record = { + input: 'comInputField', + textarea: 'comInputField', + inputNumber: 'inputNumberField', + select: 'comSelectField', + radio: 'radioField', + checkbox: 'checkboxField', + switch: 'switchField', + datePicker: 'dateField', + timePicker: 'dateField', + cascader: 'cascaderField', + upload: 'uploadField', + uploadFz: 'uploadField', + treeSelect: 'treeSelectField', + relationForm: 'popupTableField', + popupSelect: 'popupSelectField', + popupTable: 'popupTableField', + organizeSelect: 'organizeField', + userSelect: 'userField', + depSelect: 'depField', + postSelect: 'postField', + rate: 'rateField', + slider: 'sliderField', + colorPicker: 'colorField', + signature: 'signatureField', + } + return map[jnpfKey] || 'componentField' +} + +function parseJsonSafe(s: any): any { + if (typeof s === 'string') { + try { return JSON.parse(s) } catch { return null } + } + return s +} \ No newline at end of file diff --git a/src/commands/form/create.ts b/src/commands/form/create.ts index abbb972..5c5b5bd 100644 --- a/src/commands/form/create.ts +++ b/src/commands/form/create.ts @@ -27,6 +27,7 @@ import { validateFormCreate } from './_validate.ts' import { enhanceFromBackend, formatErrorLine } from '../_error_codes.ts' import { loadAppContext } from '../app/context.ts' import { loadToken } from '../../core/config.ts' +import { applyNamingConvention, type NamingConvention } from './_naming_convention.ts' interface CreateOpts { fullName?: string @@ -221,6 +222,12 @@ export function buildFormCreateCommand(): Command { .option('--verify-timeout ', '浏览器验证超时 (默认 60s)', '60000') .option('--via ', '创建路径: api (默认, 走 POST /visualdev/Base) | ui (走 playwright 模拟人类操作, API 失败时兜底)', 'api') .option('--json', '原始 JSON 输出', false) + // BS-drift-1 (2026-07-12): columnList / __vModel__ 命名规范适配 + // auto = comInputField101, comSelectField102... (JNPF 设计器默认, baseline 34/60) + // snake = f_serial_num (带 f_ 前缀, baseline 6/60) + // f_prefix = F_SerialNum (UpperCamel + F_, baseline 2/60, 老 jnpf 2.x) + // 不传 = 默认 snake_case 语义名 (dacli --ai 旧行为, baseline 0/60) + .option('--column-naming