weaver-e10-builder 1.0.2-beta

package/dist/commands/form.js

@@ -0,0 +1,2467 @@
+import { writeFileSync, existsSync, mkdirSync, readFileSync } from 'fs';
+import { AuthSession } from '../core/auth.js';
+import { ApiClient } from '../core/client.js';
+import { toColumnName, toTableName } from '../utils/column-name.js';
+import { createCustomPhysicalForm, addInitialFieldsToCustomPhysicalForm, placeholderFromFormat, reapplyGroupLayout } from '../services/form-create.js';
+import { getRichType, richIdUnits } from '../services/rich-types.js';
+/**
+ * componentKey 大小写归一：用户/示例常写 "Textarea"/"Ebuilder" 等小写变体，但代码各处
+ * `=== 'TextArea'`、storageFieldType 按 canonical 大小写匹配。不归一会导致 type 存成小写
+ * "Textarea"（FLOW 渲染器按 type 查组件查不到 → 多行文本在流式布局下渲染异常）、TextArea
+ * 分支（content/maxLen）漏跑。建表 create 和加字段 add-field 都用。
+ */
+const CK_CANON = {
+    textarea: 'TextArea', ebuilder: 'EBuilder', datetime: 'DateTime',
+    idcard: 'IDCard', mobile: 'Mobile', email: 'Email', phone: 'Phone',
+    employee: 'Employee', department: 'Department', location: 'Location',
+    switch: 'Switch', select: 'Select', checkbox: 'CheckBox', radiobox: 'RadioBox',
+    money: 'Money', number: 'Number', date: 'Date', text: 'Text',
+    daterange: 'DateRange', detailtable: 'DetailTable', city: 'City',
+};
+function canonComponentKey(ck) {
+    return CK_CANON[String(ck).toLowerCase()] || ck;
+}
+const SYSTEM_FIELD_IDS = new Set([
+    'name', 'creator', 'create_time', 'update_time', 'id',
+    'updater', 'data_status', 'flow_status', 'current_step',
+    'batchpubtags', 'batchmytags', 'operate', 'data_read_status',
+    'flow_system_number',
+]);
+// EBuilder dataTitle（关联字段标题栏）默认解析：优先字段名含「名称」的业务字段，无则第一个业务字段。
+// 需求：默认选带"名称"二字的字段（如 客户名称/类型名称），没有就默认选第一个。
+function defaultEBuilderDataTitle(fields) {
+    const isBiz = (id) => /^\d{15,}$/.test(id) && !SYSTEM_FIELD_IDS.has(id);
+    const biz = (fields || []).filter((f) => isBiz(String(f.fieldId ?? '')));
+    const byName = biz.find((f) => String(f.fieldName ?? f.title ?? '').includes('名称'));
+    return byName?.fieldId || biz[0]?.fieldId || 'name';
+}
+export function registerFormCommands(program) {
+    const form = program.command('form').description('表单管理');
+    form.command('read')
+        .description('读取表单字段结构')
+        .argument('<objId>', '表单 objId')
+        .argument('[dir]', '输出目录（可选，用于写入 memo.md）')
+        .option('--out <file>', '将 JSON 输出写入文件（UTF-8，避免终端编码问题）')
+        .option('--app-id <id>', '应用 ID（提供时自动获取 Select 字段的选项）')
+        .action(async (objId, dir, cmdOpts) => {
+        const opts = program.opts();
+        const auth = await AuthSession.fromOptions(opts);
+        if (!auth)
+            process.exit(1);
+        const client = new ApiClient(auth);
+        const baseUrl = auth.getBaseUrl();
+        // isReturnDetail='y' 让 getFields 返回 detailFields（按明细表分组的子表字段），否则只返 mainFields
+        const payload = { objId, userid: auth.userId, tenantKey: auth.tenantKey, isReturnDetail: 'y' };
+        const data = await client.post(`${baseUrl}/api/ebuilder/form/dataset/v1/getFields`, payload);
+        let fields = [];
+        let subFields = [];
+        let detailTables = [];
+        if (data) {
+            const d = data.data || data;
+            if (d?.mainFields)
+                fields = d.mainFields;
+            else if (Array.isArray(d))
+                fields = d;
+            // detailFields: [{ name, id, fields: [...] }]，每个明细字段带 fieldId/subFormId/subFormName
+            // 之前 form read 只读 mainFields 完全丢弃明细，配动作流/联动拿不到明细 fieldId
+            if (Array.isArray(d?.detailFields)) {
+                detailTables = d.detailFields;
+                for (const dt of detailTables) {
+                    const dtName = dt.name || dt.subFormName || '(未命名明细表)';
+                    for (const sf of (dt.fields || [])) {
+                        // 标注所属明细表名/subFormName，渲染与 memo 都用得上
+                        if (!sf.subFormName)
+                            sf.subFormName = dtName;
+                        subFields.push(sf);
+                    }
+                }
+            }
+        }
+        // If appId provided, fetch formId and then get options for Select fields
+        let formId = '';
+        if (cmdOpts?.appId) {
+            try {
+                // Get formId from appId
+                const listData = await client.get(`${baseUrl}/api/bs/ebuilder/form/obj/getList/${cmdOpts.appId}?apid=${cmdOpts.appId}`, { ebbusinessid: cmdOpts.appId });
+                const formInfo = (listData?.data || []).find((f) => f.id === objId);
+                formId = formInfo?.formId || '';
+                if (formId) {
+                    // Fetch options for Select/RadioBox/CheckBox fields (skip system fields with string IDs)
+                    // 主表 + 明细表（子表）字段都取：之前只遍历主表，子表 Select 的 options 一直拿不到
+                    const fetchOptions = async (f) => {
+                        const ftype = f.fieldType || f.fieldKey || '';
+                        const isOptionField = ftype === 'Select' || ftype === 'RadioBox' || ftype === 'CheckBox';
+                        // Use fieldId (actual field ID) not id (sequence number), and skip non-numeric IDs (system fields)
+                        if (!isOptionField || !f.fieldId || !/^\d+$/.test(String(f.fieldId)))
+                            return;
+                        try {
+                            const fieldData = await client.post(`${baseUrl}/api/ebuilder/form/form/field/manage/getFormField`, {
+                                module: 'ebuilderform',
+                                formTableField: {
+                                    formField: {
+                                        id: String(f.fieldId),
+                                        form: { id: formId },
+                                    },
+                                },
+                            }, { ebbusinessid: formId });
+                            const options = fieldData?.data?.options || [];
+                            if (options.length > 0) {
+                                f.options = options.map((o) => ({ valueKey: o.valueKey, name: o.name }));
+                            }
+                        }
+                        catch { /* ignore individual field failures */ }
+                    };
+                    for (const f of fields)
+                        await fetchOptions(f);
+                    for (const f of subFields)
+                        await fetchOptions(f);
+                }
+            }
+            catch { /* ignore */ }
+        }
+        const allFields = [...fields, ...subFields];
+        // 布局属性补读（T12）：readOnly/required/hidden 在 getFields/getFormField 都不返回，
+        // 但布局 getConfig 里有（CLI 建表时写入的布局属性）。按字段 id 合并进输出。
+        if (formId) {
+            try {
+                const preLayout = await client.post(`${baseUrl}/api/ebuilder/form/builder/getFormLayout`, { formId, module: 'ebuilderform', customParam: {}, formTableIdList: [],
+                    designerParam: { onlyLayout: false, convert: false }, form: { id: formId } }, { ebbusinessid: formId });
+                const layoutId = preLayout?.data?.formLayout?.id || '';
+                if (layoutId) {
+                    const cfgRes = await client.post(`${baseUrl}/api/ebuilder/form/form/view/relate/getConfig`, { formId, module: 'ebuilderform', apiModule: 'ebuilder/form', layoutId,
+                        customParam: { terminal: '', objId: formId }, initMode: 5, groupFieldIds: [],
+                        designerParam: { sourceModule: 'ebuilderform' } }, { ebbusinessid: formId });
+                    const attrByFieldId = {};
+                    for (const c of (cfgRes?.data?.configs || []))
+                        attrByFieldId[String(c.id)] = c;
+                    for (const f of allFields) {
+                        const c = attrByFieldId[String(f.fieldId)];
+                        if (!c)
+                            continue;
+                        if (c.readOnly !== undefined)
+                            f.readOnly = c.readOnly;
+                        if (c.required !== undefined)
+                            f.required = c.required;
+                        if (c.show !== undefined)
+                            f.hidden = !c.show;
+                    }
+                }
+            }
+            catch { /* 布局属性补读失败不影响主流程 */ }
+        }
+        if (cmdOpts?.out) {
+            // Write JSON to file with UTF-8 encoding, bypassing terminal encoding
+            writeFileSync(cmdOpts.out, JSON.stringify(allFields, null, 2), 'utf-8');
+            console.error(`已写入: ${cmdOpts.out}（主表 ${fields.length} + 明细表 ${subFields.length}）`);
+        }
+        else if (opts.json) {
+            console.log(JSON.stringify(allFields, null, 2));
+        }
+        else {
+            console.log(`表单 ${objId} 共 ${fields.length} 个主表字段${subFields.length ? ` + ${subFields.length} 个明细表字段` : ''}:`);
+            for (const f of fields) {
+                if (SYSTEM_FIELD_IDS.has(f.fieldId))
+                    continue;
+                console.log(`  [${f.fieldKey || f.fieldType}] ${f.fieldName}  (fieldId: ${f.fieldId || f.id})`);
+                if (f.options)
+                    console.log(`    选项: ${JSON.stringify(f.options)}`);
+            }
+            if (subFields.length) {
+                console.log(`  -- 明细表字段 --`);
+                for (const f of subFields) {
+                    if (SYSTEM_FIELD_IDS.has(f.fieldId))
+                        continue;
+                    const parent = f.subFormName || '';
+                    console.log(`  [${f.fieldKey || f.fieldType}] ${f.fieldName}  (fieldId: ${f.fieldId || f.id}${parent ? `, 明细表: ${parent}` : ''})`);
+                    if (f.options)
+                        console.log(`    选项: ${JSON.stringify(f.options)}`);
+                }
+            }
+        }
+        // Write memo.md if dir specified
+        if (dir && allFields.length > 0) {
+            if (!existsSync(dir))
+                mkdirSync(dir, { recursive: true });
+            let memo = `## 表单\n- 表单ID：${objId}\n`;
+            for (const f of fields) {
+                if (SYSTEM_FIELD_IDS.has(f.fieldId))
+                    continue;
+                memo += `- 字段名称：${f.fieldName}, 字段类型：${f.fieldKey}, 字段id:${f.fieldId || f.id}\n`;
+                if (f.fieldOptions)
+                    memo += `  选项：${JSON.stringify(f.fieldOptions)}\n`;
+            }
+            if (subFields.length) {
+                memo += `\n### 明细表字段\n`;
+                for (const f of subFields) {
+                    if (SYSTEM_FIELD_IDS.has(f.fieldId))
+                        continue;
+                    memo += `- 字段名称：${f.fieldName}, 字段类型：${f.fieldKey}, 字段id:${f.fieldId}${f.subFormName ? `, 明细表:${f.subFormName}` : ''}\n`;
+                    if (f.fieldOptions)
+                        memo += `  选项：${JSON.stringify(f.fieldOptions)}\n`;
+                }
+            }
+            memo += '- 字段名称：数据ID, 字段类型：Number, 字段id:id\n';
+            writeFileSync(`${dir}/memo.md`, memo, 'utf-8');
+            console.error('表单信息已记录于 memo.md');
+        }
+    });
+    form.command('list')
+        .description('列出应用下的表单')
+        .argument('<appId>', '应用 ID')
+        .option('--out <file>', '将 JSON 输出写入文件（UTF-8）')
+        .action(async (appId, cmdOpts) => {
+        const opts = program.opts();
+        const auth = await AuthSession.fromOptions(opts);
+        if (!auth)
+            process.exit(1);
+        const client = new ApiClient(auth);
+        const baseUrl = auth.getBaseUrl();
+        const data = await client.get(`${baseUrl}/api/bs/ebuilder/form/obj/getList/${appId}?apid=${appId}`, { ebbusinessid: appId });
+        if (data?.code !== 200 || !data?.status) {
+            console.error(`查询失败: ${data?.msg || '未知错误'}`);
+            process.exit(1);
+        }
+        const forms = data.data || [];
+        if (cmdOpts?.out) {
+            writeFileSync(cmdOpts.out, JSON.stringify(forms, null, 2), 'utf-8');
+            console.error(`已写入: ${cmdOpts.out}`);
+        }
+        else if (opts.json) {
+            console.log(JSON.stringify(forms, null, 2));
+        }
+        else {
+            console.log(`共 ${forms.length} 个表单:`);
+            for (const f of forms) {
+                console.log(`  ${f.id?.padEnd(22)} ${f.formName || ''}`);
+            }
+        }
+    });
+    form.command('create')
+        .description('创建表单')
+        .argument('<appId>', '应用 ID')
+        .argument('<name>', '表单名称')
+        .argument('[dir]', '输出目录（可选，记录 memo.md）')
+        .requiredOption('--fields <json>', '字段定义 JSON 文件路径（如 @fields.json），格式：[{"componentKey":"Text","fieldName":"姓名"}]')
+        .option('--no-menu', '不自动添加台账菜单（默认建表后自动加）')
+        .option('--layout <type>', '表单布局类型：FLOW(流式)/EXCEL(表格，缺省)。布局类型建表后不可切换', 'EXCEL')
+        .action(async (appId, name, dir, cmdOpts) => {
+        const opts = program.opts();
+        const auth = await AuthSession.fromOptions(opts);
+        if (!auth)
+            process.exit(1);
+        const client = new ApiClient(auth);
+        const baseUrl = auth.getBaseUrl();
+        const { randomUUID } = await import('crypto');
+        // Fields are required — parse from file (must start with @)
+        if (!cmdOpts.fields.startsWith('@')) {
+            console.error('--fields 必须为文件路径（以 @ 开头），如 --fields @fields.json');
+            process.exit(1);
+        }
+        const filePath = cmdOpts.fields.slice(1);
+        if (!existsSync(filePath)) {
+            console.error(`文件不存在: ${filePath}`);
+            process.exit(1);
+        }
+        let fieldDefs;
+        try {
+            fieldDefs = JSON.parse(readFileSync(filePath, 'utf-8'));
+        }
+        catch {
+            console.error('--fields 文件 JSON 解析失败');
+            process.exit(1);
+        }
+        if (!Array.isArray(fieldDefs) || fieldDefs.length === 0) {
+            console.error('--fields 必须是非空数组');
+            process.exit(1);
+        }
+        // Normalize: accept fieldType as componentKey alias (add-field/read use "fieldType"),
+        // and options (string[]) as a shorthand for fieldOptions:[{name}].
+        // componentKey 大小写归一（canonComponentKey）：用户/示例常写 "Textarea"/"Ebuilder" 等，
+        // 但 storageFieldType 与各 `=== 'TextArea'` 分支按 canonical 大小写匹配，不归一会导致 type 存成
+        // 小写 "Textarea"（FLOW 渲染异常）、TextArea 分支（content/maxLen）漏跑。
+        fieldDefs = fieldDefs.map((f) => {
+            const out = { ...f };
+            if (!out.componentKey && out.fieldType)
+                out.componentKey = out.fieldType;
+            if (out.componentKey)
+                out.componentKey = canonComponentKey(out.componentKey);
+            if (Array.isArray(out.options) && !out.fieldOptions) {
+                out.fieldOptions = out.options.map((o) => typeof o === 'string' ? { name: o } : o);
+            }
+            // DetailTable 子字段的 options 同样归一化：之前只转顶层，子表 Select 用 options 简写时
+            // Step 7b 找不到 fieldOptions，子表选项配不上（布局 + 选项配置两处都依赖 fieldOptions）
+            if (out.componentKey === 'DetailTable' && Array.isArray(out.formFields)) {
+                out.formFields = out.formFields.map((sf) => {
+                    const so = { ...sf };
+                    if (so.componentKey)
+                        so.componentKey = canonComponentKey(so.componentKey);
+                    if (Array.isArray(so.options) && !so.fieldOptions) {
+                        so.fieldOptions = so.options.map((o) => typeof o === 'string' ? { name: o } : o);
+                    }
+                    return so;
+                });
+            }
+            return out;
+        });
+        for (const f of fieldDefs) {
+            if (!f.componentKey) {
+                console.error(`字段 "${f.fieldName}" 缺少 componentKey（或 fieldType）`);
+                process.exit(1);
+            }
+        }
+        const makeField = (fid, fname, ck, row, col, fieldOptions, isDetail, subFields) => {
+            const x = col * 950;
+            const y = 35 + row * 52;
+            // DetailTable 父字段：照真实 createFormWithFormLayout payload 构造（明细表=表格列布局，label 在顶部、
+            // 子字段为列）。之前用主表那套（columnSpan:0.5/labelPosition:'left'）导致明细渲染成左右。
+            if (isDetail) {
+                const dtX = 297, dtW = 1295, dtH = 41;
+                return {
+                    fieldId: fid, fieldName: fname, componentKey: 'DetailTable',
+                    fieldOptions: [],
+                    row, columnSpan: 1, labelSpan: 0, labelPosition: 'top',
+                    required: false, readOnly: false,
+                    totalWidth: dtW, textAlign: 'center',
+                    coords: { x: dtX, y, w: dtW, h: dtH },
+                    formFields: subFields || [],
+                    actionButton: 10, selectAllSpan: 0.05, sequenceSpan: 0.05, isTotal: false,
+                    actionButtonAlign: 'left', titleEnabled: false, innerSpan: 0,
+                    isAddForRelation: false, format: 'yyyy-MM-dd', isCopyUpload: false,
+                    richEditor: false, creatByAI: true, detailTable: true,
+                    xInterval: [dtX, dtX + dtW], yInterval: [y, y + dtH],
+                };
+            }
+            // 主表字段：完整样式（与真实 payload 主字段一致）
+            const f = {
+                row, columnSpan: 0.5, labelSpan: 0.42, labelPosition: 'left',
+                required: false, readOnly: false, cellHeight: 36, cellWidth: 260,
+                backgroundColor: '#e7f3fc', totalWidth: 450, textColor: '#000000',
+                labelLineColor: '#90badd', textSize: 14, textAlign: 'left',
+                kvCoords: { x, y, w: 450, h: 33 },
+                contentLineColor: '#90badd',
+                labelLineStyle: { top: 1, right: 1, bottom: 1, left: 1 },
+                contentLineStyle: { top: 1, right: 1, bottom: 1, left: 1 },
+                sequenceSpan: 0, titleEnabled: false, innerSpan: 0,
+                isAddForRelation: false, format: 'yyyy-MM-dd', isCopyUpload: false,
+                richEditor: false, creatByAI: true,
+                detailTable: false,
+                fieldId: fid, fieldName: fname, componentKey: ck,
+                coords: { x, y, w: 450, h: 33 }, createBy: 0,
+            };
+            if (fieldOptions) {
+                f.fieldOptions = fieldOptions.map(o => ({ id: randomUUID().slice(0, 8), label: o.name, value: o.valueKey || randomUUID().slice(0, 8) }));
+            }
+            // EBuilder association field
+            if (ck === 'EBuilder') {
+                f.sformId = '';
+                f.dataTitle = '';
+                f.formName = '';
+                f.virtualForm = false;
+                f.displayType = 'line';
+                f.isAddForRelation = true;
+                f.viewDataDetail = true;
+                f.pcDisplaySelectedCount = { type: 'default' };
+                f.mobileDisplaySelectedCount = { type: 'default' };
+                f.quickAddParams = [];
+                f.relateViewData = [];
+                f.relateField = null;
+                f.virtualTable = false;
+                f.richEditor = false;
+            }
+            return f;
+        };
+        const buildSubFields = (subDefs) => subDefs.map((sf, si) => {
+            const sfid = randomUUID().slice(0, 8);
+            // 照真实 payload 明细子字段构造：表格列单元格，textAlign:center，无 labelPosition/labelSpan/kvCoords，
+            // cellWidth 每列不同（这里用默认 140），coords 小。之前用主表样式导致明细左右。
+            const cellW = 140;
+            const sx = 297 + si * (cellW + 10);
+            const sub = {
+                required: false, readOnly: false,
+                cellHeight: 41, cellWidth: cellW,
+                backgroundColor: '#e7f3fc', totalWidth: cellW, textColor: '#000000',
+                labelLineColor: '#90badd', textSize: 14, textAlign: 'center',
+                contentLineColor: '#90badd',
+                labelLineStyle: { top: 1, right: 1, bottom: 1, left: 1 },
+                contentLineStyle: { top: 1, right: 1, bottom: 1, left: 1 },
+                sequenceSpan: 0, titleEnabled: false, innerSpan: 0,
+                isAddForRelation: false, format: 'yyyy-MM-dd', isCopyUpload: false,
+                richEditor: false, creatByAI: true, detailTable: false,
+                fieldId: sfid, fieldName: sf.fieldName, componentKey: sf.componentKey,
+                coords: { x: sx, y: 435, w: 33, h: 20 }, createBy: 0,
+            };
+            if (sf.fieldOptions) {
+                sub.fieldOptions = sf.fieldOptions.map(o => ({ id: randomUUID().slice(0, 8), label: o.name, value: o.valueKey || randomUUID().slice(0, 8) }));
+            }
+            return sub;
+        });
+        // 真实 createFormWithFormLayout payload 证明平台无字段数/payload 大小限制（20 主字段 + 10 子字段一次调用成功）。
+        // 之前的 MAX_INITIAL_FIELDS=10 分批是多余且有害的——把超出的 DetailTable 推进 saveFormFieldNew 分批路径，
+        // 而那不是建子表的端点，导致多明细表丢失。故所有字段一次性进 layout，DetailTable 置末。
+        const initialDefs = [
+            ...fieldDefs.filter(f => f.componentKey !== 'DetailTable'),
+            ...fieldDefs.filter(f => f.componentKey === 'DetailTable'),
+        ];
+        const formFields = [];
+        let rowIdx = 0;
+        const sortedDefs = initialDefs;
+        for (const f of sortedDefs) {
+            const fid = randomUUID().slice(0, 8);
+            const isDetail = f.componentKey === 'DetailTable';
+            const isEBuilder = f.componentKey === 'EBuilder';
+            const subFields = isDetail && f.formFields ? buildSubFields(f.formFields) : undefined;
+            // DetailTable takes full width (colSpan 2), other fields alternate cols
+            const col = isDetail ? 0 : rowIdx % 2;
+            const field = makeField(fid, f.fieldName, f.componentKey, Math.floor(rowIdx / 2), col, f.fieldOptions, isDetail, subFields);
+            // Pass through field properties that the API natively supports
+            if (f.required !== undefined)
+                field.required = f.required;
+            if (f.readOnly !== undefined)
+                field.readOnly = f.readOnly;
+            if (f.unique !== undefined)
+                field.unique = f.unique;
+            // EBuilder association: set target form properties
+            if (isEBuilder) {
+                if (f.sformId)
+                    field.sformId = f.sformId;
+                if (f.dataTitle)
+                    field.dataTitle = f.dataTitle;
+                if (f.formName)
+                    field.formName = f.formName;
+            }
+            field.dataKey = toColumnName(f.fieldName);
+            field.columnName = field.dataKey;
+            formFields.push(field);
+            // DetailTable occupies 2 rows of layout space
+            rowIdx += isDetail ? 2 : 1;
+        }
+        const tableName = 'uf_' + toTableName(name);
+        const totalRows = Math.ceil(formFields.length / 2);
+        const maxY = 35 + totalRows * 52 + 100;
+        const payload = {
+            system: false, refresh: false, tokenLongWarning: false, streamClosed: false,
+            layoutThemeType: 0, colNums: 2,
+            pageLayout: { sidePadding: 0.05, centerPadding: 0 },
+            supportTableType: ['physical'], mainTablePrefix: 'uf_',
+            createMenu: true, formNameLabelId: '', formTitleLabelId: '',
+            tableType: 'physical', groupId: '-1',
+            cost: { id: 'ebform.script', totalTimeMillis: 0, roots: [] },
+            actualClass: 'com.weaver.ebuilder.form.ai.entity.create.form.AiImg2FormResponse',
+            formName: name, formTitle: name, appId,
+            groups: [{
+                    id: 'group0', formFields, innerSpan: 0, closeCollapse: false,
+                    border: {
+                        border: '1px solid #90badd', borderTop: '1px solid #90badd',
+                        borderBottom: '1px solid #90badd', borderLeft: '1px solid #90badd',
+                        borderRight: '1px solid #90badd',
+                    },
+                    virtualGroup: true, yInterval: [0, maxY + 43],
+                }],
+            origShape: [maxY + 43, 1892],
+            formValues: { formName: name, formTitle: name, tableName, tableType: 'physical' },
+        };
+        // Use standard creation flow for controllable table names
+        const tableSuffix = toTableName(name);
+        const layoutType = String(cmdOpts.layout || 'EXCEL').toUpperCase();
+        if (layoutType !== 'FLOW' && layoutType !== 'EXCEL') {
+            console.error(`--layout 只支持 FLOW(流式) 或 EXCEL(表格)，收到: ${cmdOpts.layout}`);
+            process.exit(1);
+        }
+        let objId = '';
+        let formId = '';
+        let fieldGroups = [];
+        try {
+            const result = await createCustomPhysicalForm(client, baseUrl, appId, name, tableSuffix, false, layoutType);
+            objId = result.objId;
+            formId = result.formId;
+            console.error(`表单已创建，ID: ${objId}` + (formId ? `  formId: ${formId}` : ''));
+            if (result.storageType === 'share') {
+                console.error(`  存储类型: 共享表(无独立物理表名)`);
+            }
+            else {
+                console.error(`  数据库表名: ${result.tableName}`);
+            }
+            // Create fields and layout
+            const fieldDefsForStandard = fieldDefs.map(f => ({
+                componentKey: f.componentKey, fieldName: f.fieldName,
+                required: f.required, readOnly: f.readOnly, unique: f.unique,
+                hidden: f.hidden, formFields: f.formFields,
+                precision: f.precision, pointSize: f.pointSize,
+                percent: f.percent, defaultValue: f.defaultValue,
+                group: f.group, multiple: f.multiple,
+                singleRow: f.singleRow,
+                // 文本最大长度（Text 缺省 100、TextArea 缺省 4000）+ 日期精度 format（Date/DateTime）需透传，
+                // 否则 fields.json 标注的 maxLen/format 被丢（bug：长度默认 100 不生效、日期精度丢失）。
+                maxLen: f.maxLen, format: f.format,
+            }));
+            const fieldResult = await addInitialFieldsToCustomPhysicalForm(client, baseUrl, appId, objId, formId, fieldDefsForStandard, auth.tenantKey, layoutType);
+            fieldGroups = fieldResult.fieldGroups || [];
+            console.error(`  字段+布局已写入: ${fieldDefsForStandard.length} 个字段`);
+            const detailTables = fieldResult.detailTables || [];
+            for (const dt of detailTables) {
+                console.error(`  明细表: ${dt.definition.fieldName}  subFormId: ${dt.subFormId}`);
+            }
+        }
+        catch (e) {
+            console.error(`创建失败: ${e.message}`);
+            // Clean up the empty form shell so failed creates don't leave orphans.
+            if (objId) {
+                try {
+                    await client.get(`${baseUrl}/api/bs/ebuilder/form/obj/delete/${objId}?apid=${appId}&objId=${objId}`, { ebbusinessid: appId });
+                    console.error(`  已清理空表壳: ${objId}`);
+                }
+                catch { /* best effort */ }
+            }
+            process.exit(1);
+        }
+        // Auto-set permission: 所有人可查看
+        try {
+            const permPayload = [{
+                    belong: 'obj',
+                    belongId: objId,
+                    codeType: 'obj',
+                    rightType: '1',
+                    orgType: 'all',
+                    orgId: '0',
+                    orgName: '所有人',
+                    orgTypeName: '所有人',
+                    layoutOrder: 0,
+                    isPcMobileSameLayout: '0',
+                    creatorRelated: '0',
+                    orgVirtualType: '',
+                    excludeObj: '',
+                    exportDetails: 0,
+                }];
+            const permRes = await client.post(`${baseUrl}/api/bs/ebuilder/form/permission/addRight?objId=${objId}&apid=${appId}`, permPayload, { ebbusinessid: appId });
+            if (permRes?.code === 200 && permRes?.status) {
+                console.error('  权限已设置: 所有人可查看');
+            }
+        }
+        catch (e) {
+            console.error(`  权限设置失败: ${e.message}`);
+        }
+        // Resolve formId once for both EBuilder and relateFrom steps
+        let resolvedFormId = formId || '';
+        const resolveFormId = async () => {
+            if (!resolvedFormId) {
+                const formList = await client.get(`${baseUrl}/api/bs/ebuilder/form/obj/getList/${appId}?apid=${appId}`, { ebbusinessid: appId });
+                const formInfo = (formList?.data || []).find((f) => f.id === objId);
+                resolvedFormId = formInfo?.formId || '';
+            }
+            return resolvedFormId;
+        };
+        // Step 2: EBuilder fields need follow-up binding to target forms.
+        // 无 sformId 的 EBuilder 会被建成裸关联字段（isAddForRelation=false，无目标表），
+        // 这是"关联ebuilder不对"的常见来源，明确警告避免静默。
+        const ebNoTarget = fieldDefs.filter(f => f.componentKey === 'EBuilder' && !f.sformId);
+        if (ebNoTarget.length > 0) {
+            console.error(`  ⚠ ${ebNoTarget.length} 个 EBuilder 字段缺少 sformId，将建成无关联裸字段:`);
+            for (const f of ebNoTarget)
+                console.error(`    - ${f.fieldName}（需在 fields.json 指定 sformId=<目标表单objId> 与 dataTitle=<显示字段>）`);
+        }
+        const ebFields = fieldDefs.filter(f => f.componentKey === 'EBuilder' && f.sformId);
+        if (ebFields.length > 0) {
+            console.error(`  绑定 ${ebFields.length} 个 EBuilder 关联字段...`);
+            // Resolve target form names and field IDs from sformId
+            const formList = await client.get(`${baseUrl}/api/bs/ebuilder/form/obj/getList/${appId}?apid=${appId}`, { ebbusinessid: appId });
+            const allForms = formList?.data || [];
+            const formNameById = new Map();
+            for (const fm of allForms) {
+                formNameById.set(fm.id, fm.formName || fm.name || fm.id);
+            }
+            // Resolve dataTitle: if not a numeric field ID, look up target form fields
+            const targetFieldCache = new Map(); // sformId → mainFields（保持 getFields 顺序）
+            const loadTargetFields = async (sformId) => {
+                if (!targetFieldCache.has(sformId)) {
+                    try {
+                        const fd = await client.post(`${baseUrl}/api/ebuilder/form/dataset/v1/getFields`, {
+                            objId: sformId, userid: auth.userId, tenantKey: auth.tenantKey,
+                        });
+                        targetFieldCache.set(sformId, fd?.data?.mainFields || []);
+                    }
+                    catch {
+                        targetFieldCache.set(sformId, []);
+                    }
+                }
+                return targetFieldCache.get(sformId);
+            };
+            const resolveDataTitle = async (sformId, dataTitle) => {
+                // If already a numeric ID (like "1293009997708083201"), use as-is
+                if (/^\d{15,}$/.test(dataTitle))
+                    return dataTitle;
+                const fields = await loadTargetFields(sformId);
+                // Special case: "name" → 优先字段名含「名称」的业务字段，无则第一个业务字段
+                if (dataTitle === 'name')
+                    return defaultEBuilderDataTitle(fields);
+                // Try exact match first, then partial match（按名称查目标表字段）
+                const nameMap = new Map(fields.map((f) => [f.fieldName, f.fieldId]));
+                return nameMap.get(dataTitle) || [...nameMap.entries()].find(([k]) => k.includes(dataTitle))?.[1] || 'name';
+            };
+            await resolveFormId();
+            if (!resolvedFormId) {
+                const formList = await client.get(`${baseUrl}/api/bs/ebuilder/form/obj/getList/${appId}?apid=${appId}`, { ebbusinessid: appId });
+                const formInfo = (formList?.data || []).find((f) => f.id === objId);
+                resolvedFormId = formInfo?.formId || '';
+            }
+            // Use getFormFieldPage to get full field info including columnName
+            const fieldData = await client.post(`${baseUrl}/api/ebuilder/form/dataset/v1/getFields`, {
+                objId, userid: auth.userId, tenantKey: auth.tenantKey,
+            });
+            const allFields = fieldData?.data?.mainFields || [];
+            let detailFieldsEB = [];
+            try {
+                const dtRes = await client.post(`${baseUrl}/api/ebuilder/form/form/field/manage/getFormFieldPage?apid=${appId}`, {
+                    pageNo: 1, pageSize: 50, module: 'ebuilderform',
+                    customParam: { appId, objId },
+                    formFieldSearchEntity: { isDelete: 0, status: 'enable', formId: resolvedFormId },
+                }, { ebbusinessid: resolvedFormId });
+                detailFieldsEB = dtRes?.data?.pageDatas?.result || dtRes?.data?.data?.records || dtRes?.data?.data || dtRes?.data?.records || [];
+            }
+            catch { /* fallback */ }
+            const formTableId = detailFieldsEB[0]?.formTableId || '';
+            const fieldByName = new Map();
+            for (const f of allFields) {
+                const df = detailFieldsEB.find((d) => d.fieldId === f.fieldId);
+                const colName = df?.columnName || df?.dataKey || '';
+                fieldByName.set(f.fieldName, {
+                    fieldId: f.fieldId,
+                    dataKey: colName,
+                    columnName: colName,
+                    formTableId: df?.formTableId || formTableId,
+                });
+            }
+            // Update each EBuilder field with target form association
+            for (const ef of ebFields) {
+                const finfo = fieldByName.get(ef.fieldName);
+                if (!finfo) {
+                    console.error(`    警告: 找不到字段 "${ef.fieldName}"，跳过`);
+                    continue;
+                }
+                // 目标表单业务字段（关联浏览弹窗显示列候选，去系统字段 fieldId 非数字）。
+                // 注意：用 ef.sformId 查目标表，不能复用源表的 allFields。
+                let targetBizFields = [];
+                try {
+                    const tfd = await client.post(`${baseUrl}/api/ebuilder/form/dataset/v1/getFields`, {
+                        objId: ef.sformId, userid: auth.userId, tenantKey: auth.tenantKey,
+                    });
+                    // 默认显示列最多 5 个（去系统字段后取前 5 个业务字段）；fields.json 显式写 displayColumns 不受此限制
+                    targetBizFields = (tfd?.data?.mainFields || [])
+                        .filter((f) => /^\d+$/.test(String(f.fieldId)))
+                        .map((f) => ({ id: String(f.fieldId), name: String(f.fieldName || f.title || '') }))
+                        .slice(0, 5);
+                }
+                catch { /* 目标表查询失败则显示列留空 */ }
+                const jsonObj = {
+                    formTableId: finfo.formTableId,
+                    isAllFormData: false,
+                    viewDataDetail: true,
+                    quickAddParams: [],
+                    groupId: '-1',
+                    hasDisplayFormat: false,
+                    openRelateView: false,
+                    title: ef.fieldName, type: 'EBuilder',
+                    dataCount: 0,
+                    dataKey: finfo.columnName,
+                    systemField: true,
+                    columnTypeSwitch: false,
+                    appId,
+                    formName: ef.formName || formNameById.get(ef.sformId || '') || ef.sformId || '',
+                    relateViewData: [],
+                    singleEdit: true,
+                    componentKey: 'Ebuilder',
+                    typeLen: 64,
+                    fieldId: finfo.fieldId, formId: resolvedFormId,
+                    virtualTable: false,
+                    columnType: 'VARCHAR',
+                    displayType: 'line',
+                    isDefault: false,
+                    dataTitle: await resolveDataTitle(ef.sformId || '', ef.dataTitle || 'name'),
+                    showOrder: 0,
+                    isAddForRelation: true,
+                    sformId: ef.sformId,
+                    columnName: finfo.columnName,
+                    content: [],
+                    formEntity: {},
+                    filterQueryParams: '{}',
+                    filterParams: '{}',
+                    relateField: null,
+                    virtualForm: false,
+                    isSingle: ef.multiple ? false : true,
+                    isUnique: true,
+                    // 关联浏览弹窗显示列：缺省自动用目标表全部业务字段（去系统字段）；
+                    // fields.json 写 displayColumns 可指定字段名列表
+                    ffDisplayColumns: Array.isArray(ef.displayColumns) && ef.displayColumns.length
+                        ? ef.displayColumns
+                            .map((name) => targetBizFields.find((f) => f.name === name))
+                            .filter((f) => !!f)
+                        : targetBizFields,
+                };
+                const payload = {
+                    formId: resolvedFormId, module: 'ebuilderform',
+                    customParam: { appId, objId },
+                    jsonObj: JSON.stringify(jsonObj),
+                };
+                const updateRes = await client.post(`${baseUrl}/api/ebuilder/form/form/field/manage/saveFormFieldNew?apid=${appId}`, payload, { ebbusinessid: resolvedFormId });
+                if (updateRes?.code === 200 && updateRes?.status) {
+                    console.error(`    已关联: ${ef.fieldName} → ${ef.sformId}`);
+                    // 关联浏览弹窗显示列：Step2 直接带 ffDisplayColumns 进 jsonObj 不落库，
+                    // 需用 getFormField 的完整字段配置 + ffDisplayColumns 单独 save（对齐 ebuilder-columns）。
+                    try {
+                        const gf = await client.post(`${baseUrl}/api/ebuilder/form/form/field/manage/getFormField`, { module: 'ebuilderform', formTableField: { formField: { id: finfo.fieldId, form: { id: resolvedFormId } } } }, { ebbusinessid: resolvedFormId });
+                        const full = gf?.data || {};
+                        if (full.fieldId && Array.isArray(jsonObj.ffDisplayColumns) && jsonObj.ffDisplayColumns.length) {
+                            await client.post(`${baseUrl}/api/ebuilder/form/form/field/manage/saveFormFieldNew?apid=${appId}`, { formId: resolvedFormId, module: 'ebuilderform', customParam: { appId, objId }, jsonObj: JSON.stringify({ ...full, ffDisplayColumns: jsonObj.ffDisplayColumns }) }, { ebbusinessid: resolvedFormId });
+                        }
+                    }
+                    catch (e) {
+                        console.error(`    关联显示列设置失败: ${e.message}`);
+                    }
+                }
+                else {
+                    console.error(`    关联失败: ${ef.fieldName} — ${updateRes?.msg || '未知错误'}`);
+                }
+            }
+        }
+        // Step 3: Configure ffRelateField for fields that auto-fill from EBuilder records
+        const relateFields = fieldDefs.filter(f => f.relateFrom?.ebuilderField && f.relateFrom?.sourceFieldId);
+        if (relateFields.length > 0) {
+            console.error(`  绑定 ${relateFields.length} 个字段联动...`);
+            await resolveFormId();
+            // Re-fetch fields to get updated IDs (EBuilder binding may have changed things)
+            const rfFieldData = await client.post(`${baseUrl}/api/ebuilder/form/dataset/v1/getFields`, {
+                objId, userid: auth.userId, tenantKey: auth.tenantKey,
+            });
+            const rfAllFields = rfFieldData?.data?.mainFields || [];
+            // Use getFormFieldPage to get full field info including columnName
+            let detailFields = [];
+            try {
+                const dtRes = await client.post(`${baseUrl}/api/ebuilder/form/form/field/manage/getFormFieldPage?apid=${appId}`, {
+                    pageNo: 1, pageSize: 50, module: 'ebuilderform',
+                    customParam: { appId, objId },
+                    formFieldSearchEntity: { isDelete: 0, status: 'enable', formId: resolvedFormId },
+                }, { ebbusinessid: resolvedFormId });
+                detailFields = dtRes?.data?.pageDatas?.result || dtRes?.data?.data?.records || dtRes?.data?.data || dtRes?.data?.records || [];
+            }
+            catch { /* fallback */ }
+            const rfByName = new Map();
+            const rfFormTableId = detailFields[0]?.formTableId || '';
+            for (const f of rfAllFields) {
+                const df = detailFields.find((d) => d.fieldId === f.fieldId);
+                const colName = df?.columnName || df?.dataKey || '';
+                rfByName.set(f.fieldName, {
+                    fieldId: f.fieldId,
+                    dataKey: colName,
+                    columnName: colName,
+                    formTableId: df?.formTableId || rfFormTableId,
+                });
+            }
+            // Resolve formId if not already have it
+            await resolveFormId();
+            for (const rf of relateFields) {
+                const myInfo = rfByName.get(rf.fieldName);
+                const ebInfo = rfByName.get(rf.relateFrom.ebuilderField);
+                if (!myInfo) {
+                    console.error(`    警告: 找不到字段 "${rf.fieldName}"，跳过联动`);
+                    continue;
+                }
+                if (!ebInfo) {
+                    console.error(`    警告: 找不到关联字段 "${rf.relateFrom.ebuilderField}"，跳过联动`);
+                    continue;
+                }
+                const jsonObj = {
+                    formTableId: myInfo.formTableId,
+                    groupId: '-1', isUnique: false,
+                    hasDisplayFormat: false,
+                    title: rf.fieldName,
+                    type: rf.componentKey === 'Text' ? 'Text' : rf.componentKey,
+                    dataCount: 0,
+                    dataKey: myInfo.columnName,
+                    systemField: true,
+                    readonlyTransLink: false,
+                    columnTypeSwitch: false,
+                    singleEdit: true,
+                    componentKey: rf.componentKey,
+                    typeLen: rf.componentKey === 'Text' ? 100 : 10,
+                    fieldId: myInfo.fieldId,
+                    maxLen: rf.componentKey === 'Text' ? 100 : undefined,
+                    formId: resolvedFormId,
+                    ffRelateField: {
+                        component: { key: rf.componentKey },
+                        isField: true,
+                        title: rf.relateFrom.sourceFieldId,
+                        key: rf.relateFrom.sourceFieldId,
+                        isMultiple: false,
+                        fieldId: ebInfo.fieldId,
+                    },
+                    columnType: 'VARCHAR',
+                    isDefault: false,
+                    unique: false,
+                    showOrder: 0,
+                    columnName: myInfo.columnName,
+                    content: [],
+                    formEntity: {},
+                };
+                const payload = {
+                    formId: resolvedFormId,
+                    module: 'ebuilderform',
+                    customParam: { appId, objId },
+                    jsonObj: JSON.stringify(jsonObj),
+                };
+                const updateRes = await client.post(`${baseUrl}/api/ebuilder/form/form/field/manage/saveFormFieldNew?apid=${appId}`, payload, { ebbusinessid: resolvedFormId });
+                if (updateRes?.code === 200 && updateRes?.status) {
+                    console.error(`    已联动: ${rf.fieldName} ← ${rf.relateFrom.ebuilderField}.${rf.relateFrom.sourceFieldId}`);
+                }
+                else {
+                    console.error(`    联动失败: ${rf.fieldName} — ${updateRes?.msg || '未知错误'}`);
+                }
+            }
+        }
+        // Step 5: Configure Employee/Department fields — isSingle 必须经 saveFormFieldNew 重保存落库
+        // （batch/save 初建不带 isSingle 到 layout comp）。之前只对 defaultValue:true 的跑 → 没标默认值
+        // 的 Employee/Department 漏 isSingle → 平台默认多选（bug：标记单选仍多选）。现对所有 Employee/Department
+        // 跑设 isSingle；defaultExtend（默认当前用户/部门）仅 defaultValue:true 时加。
+        const personFields = fieldDefs.filter(f => f.componentKey === 'Employee' || f.componentKey === 'Department');
+        if (personFields.length > 0) {
+            const withDefault = personFields.filter(f => f.defaultValue === true);
+            console.error(`  配置 ${personFields.length} 个 人员/部门 字段 isSingle${withDefault.length ? `（其中 ${withDefault.length} 个带默认当前用户/部门）` : ''}...`);
+            await resolveFormId();
+            // Reuse already fetched field details from snDetailFields or refetch
+            let perDetailFields = [];
+            try {
+                const dtRes = await client.post(`${baseUrl}/api/ebuilder/form/form/field/manage/getFormFieldPage?apid=${appId}`, {
+                    pageNo: 1, pageSize: 50, module: 'ebuilderform',
+                    customParam: { appId, objId },
+                    formFieldSearchEntity: { isDelete: 0, status: 'enable', formId: resolvedFormId },
+                }, { ebbusinessid: resolvedFormId });
+                perDetailFields = dtRes?.data?.pageDatas?.result || dtRes?.data?.data?.records || dtRes?.data?.data || dtRes?.data?.records || [];
+            }
+            catch { /* fallback */ }
+            const perFieldData = await client.post(`${baseUrl}/api/ebuilder/form/dataset/v1/getFields`, {
+                objId, userid: auth.userId, tenantKey: auth.tenantKey,
+            });
+            const perAllFields = perFieldData?.data?.mainFields || [];
+            for (const pf of personFields) {
+                // 排除同名系统字段（fieldId 非数字，如 creator/create_time），优先自定义字段
+                const perField = perAllFields.find((f) => f.fieldName === pf.fieldName && /^\d+$/.test(String(f.fieldId)));
+                const perDetail = perDetailFields.find((d) => d.fieldId === perField?.fieldId);
+                if (!perField)
+                    continue;
+                const colName = perDetail?.columnName || perDetail?.dataKey || '';
+                const colType = perDetail?.columnType || 'BIGINT';
+                const isDept = pf.componentKey === 'Department';
+                const typeLabel = isDept ? 'Department' : 'Employee';
+                const labelCN = isDept ? '部门' : '人员';
+                const jsonObj = {
+                    type: typeLabel,
+                    title: pf.fieldName,
+                    isSingle: pf.multiple ? false : true,
+                    allList: [],
+                    componentList: [],
+                    displayType: 'space',
+                    viewDataDetail: true,
+                    showDimension: true,
+                    pcDisplaySelectedCount: { type: 'default' },
+                    mobileDisplaySelectedCount: { type: 'default' },
+                    formTableId: perDetail?.formTableId || '',
+                    dataKey: colName,
+                    columnName: colName,
+                    fieldId: perField.fieldId,
+                    formId: resolvedFormId,
+                    showOrder: '0.00',
+                    groupId: '-1',
+                    columnType: colType,
+                    isUnique: true,
+                };
+                // 默认当前用户/部门仅 fields.json defaultValue:true 时配（否则不自动配默认值）
+                if (pf.defaultValue === true) {
+                    jsonObj.defaultExtend = { type: 'current', relation: 'current', virtualId: '1' };
+                }
+                const payload2 = {
+                    formId: resolvedFormId,
+                    module: 'ebuilderform',
+                    customParam: { appId, objId },
+                    jsonObj: JSON.stringify(jsonObj),
+                };
+                const updateRes2 = await client.post(`${baseUrl}/api/ebuilder/form/form/field/manage/saveFormFieldNew?apid=${appId}`, payload2, { ebbusinessid: resolvedFormId });
+                if (updateRes2?.code === 200 && updateRes2?.status) {
+                    console.error(`    已配置: ${pf.fieldName} isSingle=${pf.multiple ? false : true}${pf.defaultValue === true ? ` + 默认当前${labelCN}` : ''}`);
+                }
+                else {
+                    console.error(`    配置失败: ${pf.fieldName} — ${updateRes2?.msg || '未知错误'}`);
+                }
+            }
+        }
+        // Step 6: Configure Date/DateTime fields with default current date.
+        // DateTime 日期-时间：format 带时间，时间默认时:分（yyyy-MM-dd HH:mm 不含秒）。
+        const dateFields = fieldDefs.filter(f => f.componentKey === 'Date' || f.componentKey === 'DateTime');
+        if (dateFields.length > 0) {
+            console.error(`  配置 ${dateFields.length} 个 日期/日期时间 字段精度与默认值...`);
+            await resolveFormId();
+            let dtDetailFields = [];
+            try {
+                const dtRes = await client.post(`${baseUrl}/api/ebuilder/form/form/field/manage/getFormFieldPage?apid=${appId}`, {
+                    pageNo: 1, pageSize: 50, module: 'ebuilderform',
+                    customParam: { appId, objId },
+                    formFieldSearchEntity: { isDelete: 0, status: 'enable', formId: resolvedFormId },
+                }, { ebbusinessid: resolvedFormId });
+                dtDetailFields = dtRes?.data?.pageDatas?.result || dtRes?.data?.data?.records || dtRes?.data?.data || dtRes?.data?.records || [];
+            }
+            catch { /* fallback */ }
+            const dtFieldData = await client.post(`${baseUrl}/api/ebuilder/form/dataset/v1/getFields`, {
+                objId, userid: auth.userId, tenantKey: auth.tenantKey,
+            });
+            const dtAllFields = dtFieldData?.data?.mainFields || [];
+            for (const df of dateFields) {
+                // 排除同名系统字段（fieldId 非数字），优先自定义字段
+                const dtField = dtAllFields.find((f) => f.fieldName === df.fieldName && /^\d+$/.test(String(f.fieldId)));
+                const dtDetail = dtDetailFields.find((d) => d.fieldId === dtField?.fieldId);
+                if (!dtField)
+                    continue;
+                const colName = dtDetail?.columnName || dtDetail?.dataKey || '';
+                // Date 默认精度 年月日（yyyy-MM-dd，对齐浏览器抓包）；DateTime 默认带时:分（yyyy-MM-dd HH:mm 不含秒）。
+                // 默认值不填（isDefault:false）；fields.json 写 format 覆盖精度、defaultValue:true 配动态当天默认值。
+                // 日期限制：minField 最早不得早于 / maxField 最晚不得晚于另一字段（对齐抓包 min.dateField.checkValue）。
+                const dtIsDt = df.componentKey === 'DateTime';
+                const dtFmt = df.format || (dtIsDt ? 'yyyy-MM-dd HH:mm' : 'yyyy-MM-dd');
+                const dtHasDefault = df.defaultValue === true;
+                const dtMinTargetId = df.minField ? dtAllFields.find((f) => f.fieldName === df.minField)?.fieldId : '';
+                const dtMaxTargetId = df.maxField ? dtAllFields.find((f) => f.fieldName === df.maxField)?.fieldId : '';
+                const jsonObj = {
+                    type: 'Date', title: df.fieldName,
+                    placeholder: placeholderFromFormat(dtFmt),
+                    earlyDate: false, lateDate: false,
+                    earlyType: 'currentDay', lateType: 'currentDay',
+                    format: dtFmt,
+                    isSystemDate: false,
+                    timePanelStyle: { type: 'system' },
+                    isDefault: dtHasDefault,
+                    ...(dtHasDefault ? { defaultExtend: { date: { type: 'current' }, time: { customValue: '00:00', type: 'custom' } } } : {}),
+                    ...(dtMinTargetId ? { min: { type: 'dateField', checkValue: String(dtMinTargetId) }, earlyDate: true } : {}),
+                    ...(dtMaxTargetId ? { max: { type: 'dateField', checkValue: String(dtMaxTargetId) }, lateDate: true } : {}),
+                    formTableId: dtDetail?.formTableId || '',
+                    dataKey: colName, columnName: colName,
+                    fieldId: dtField.fieldId, formId: resolvedFormId,
+                    showOrder: '0.00', groupId: '-1',
+                };
+                const payload = {
+                    formId: resolvedFormId, module: 'ebuilderform',
+                    customParam: { appId, objId },
+                    jsonObj: JSON.stringify(jsonObj),
+                };
+                const updateRes = await client.post(`${baseUrl}/api/ebuilder/form/form/field/manage/saveFormFieldNew?apid=${appId}`, payload, { ebbusinessid: resolvedFormId });
+                if (updateRes?.code === 200 && updateRes?.status) {
+                    console.error(`    已配置: ${df.fieldName} 精度 ${dtFmt}${dtHasDefault ? ' + 默认当前日期' : ''}`);
+                }
+                else {
+                    console.error(`    配置失败: ${df.fieldName} — ${updateRes?.msg || '未知错误'}`);
+                }
+            }
+        }
+        // Step 6b: Number/Money 千分位与大写（isDelimiter/isCapital/capitalFormat）。
+        // batch/save 建字段不落这些高级属性，需 saveFormFieldNew 补（对齐 Date Step6）。
+        const numMoneyFields = fieldDefs.filter(f => f.componentKey === 'Number' || f.componentKey === 'Money');
+        if (numMoneyFields.length > 0) {
+            console.error(`  配置 ${numMoneyFields.length} 个 数字/金额 千分位与大写...`);
+            try {
+                const nmFieldData = await client.post(`${baseUrl}/api/ebuilder/form/dataset/v1/getFields`, {
+                    objId, userid: auth.userId, tenantKey: auth.tenantKey,
+                });
+                const nmAllFields = nmFieldData?.data?.mainFields || [];
+                for (const nf of numMoneyFields) {
+                    const nmField = nmAllFields.find((f) => f.fieldName === nf.fieldName && /^\d+$/.test(String(f.fieldId)));
+                    if (!nmField)
+                        continue;
+                    const nmGf = await client.post(`${baseUrl}/api/ebuilder/form/form/field/manage/getFormField`, {
+                        module: 'ebuilderform', formTableField: { formField: { id: nmField.fieldId, form: { id: resolvedFormId } } },
+                    }, { ebbusinessid: resolvedFormId });
+                    const nmFull = nmGf?.data || {};
+                    if (!nmFull.fieldId)
+                        continue;
+                    // 千分位：Money 默认开（delimiter:false 关闭）、Number 默认关（delimiter:true 开启）
+                    const nmIsDelim = nf.componentKey === 'Money' ? nf.delimiter !== false : nf.delimiter === true;
+                    const nmIsCap = nf.capital === true;
+                    const nmPatched = {
+                        ...nmFull,
+                        isDelimiter: nmIsDelim,
+                        isCapital: nmIsCap,
+                        capitalFormat: 'onlyUpperCase',
+                        capitalSetting: 'system',
+                        capitalPosition: 'outside',
+                        capitalPrecision: 'yuan',
+                        isExchangeRates: false,
+                    };
+                    const nmUp = await client.post(`${baseUrl}/api/ebuilder/form/form/field/manage/saveFormFieldNew?apid=${appId}`, {
+                        formId: resolvedFormId, module: 'ebuilderform', customParam: { appId, objId },
+                        jsonObj: JSON.stringify(nmPatched),
+                    }, { ebbusinessid: resolvedFormId });
+                    if (nmUp?.code === 200 && nmUp?.status) {
+                        console.error(`    已配置: ${nf.fieldName}${nmIsDelim ? ' 千分位' : ''}${nmIsCap ? ' 大写' : ''}`);
+                    }
+                    else {
+                        console.error(`    配置失败: ${nf.fieldName} — ${nmUp?.msg || '未知错误'}`);
+                    }
+                }
+            }
+            catch (e) {
+                console.error(`  千分位/大写配置异常: ${e.message}`);
+            }
+        }
+        // Step 7: Configure Select/RadioBox/CheckBox field options and defaults
+        const optionFields = fieldDefs.filter(f => f.fieldOptions && f.fieldOptions.length > 0
+            && (f.componentKey === 'Select' || f.componentKey === 'RadioBox' || f.componentKey === 'CheckBox'));
+        if (optionFields.length > 0) {
+            await resolveFormId();
+            console.error(`  配置 ${optionFields.length} 个选项字段...`);
+            // Generate option IDs
+            const optIdCount = optionFields.reduce((sum, f) => sum + (f.fieldOptions?.length || 0), 0);
+            const genData = await client.post(`${baseUrl}/api/form/local/generatorIds?size=${optIdCount + 1}&apid=${appId}`, {});
+            const genIds = genData?.data?.generatorIds || [];
+            let genIdx = 0;
+            // Read existing physical column names from the data source so that
+            // re-saving the field (to attach options) does NOT overwrite the
+            // build-time column. Without this, saveFormFieldNew reassigns a
+            // platform `f_<id>` column and clobbers our `zt_`/`mc_` naming.
+            const dsFieldCol = new Map();
+            try {
+                const dsForm = new FormData();
+                for (const [k, v] of Object.entries({
+                    groupId: 'weaver-ebuilder-form-service', sourceId: objId, sourceType: 'LOGIC',
+                    detailFieldsGroup: 'true', enableMerge: 'true', needTableName: 'true', params: '[]',
+                }))
+                    dsForm.append(k, v);
+                const dsRes = await client.postMultipart(`${baseUrl}/api/ebuilder/common/ds/fields`, dsForm, { ebbusinessid: appId });
+                for (const f of (Array.isArray(dsRes?.data) ? dsRes.data : [])
+                    .flatMap((g) => g?.fields ?? [])
+                    .filter((f) => !f?.isDetailtable)) {
+                    if (f.physicalField && !/[一-龥]/.test(String(f.physicalField))) {
+                        dsFieldCol.set(String(f.id), String(f.physicalField));
+                    }
+                }
+            }
+            catch { /* non-critical: fall back to toColumnName */ }
+            for (const ofd of optionFields) {
+                try {
+                    // Find the field's actual fieldId from the form
+                    const fieldsRes = await client.post(`${baseUrl}/api/ebuilder/form/dataset/v1/getFields`, { objId, userid: auth.userId, tenantKey: auth.tenantKey });
+                    const mainFields = fieldsRes?.data?.mainFields || [];
+                    const targetField = mainFields.find(f => f.fieldName === ofd.fieldName);
+                    if (!targetField) {
+                        console.error(`    ⚠ 未找到字段: ${ofd.fieldName}`);
+                        genIdx += ofd.fieldOptions.length;
+                        continue;
+                    }
+                    const { randomUUID } = await import('crypto');
+                    const defaultVk = ofd.defaultValue;
+                    const options = ofd.fieldOptions.map((o, i) => {
+                        const optId = genIds[genIdx++] || String(Date.now() + i);
+                        return {
+                            other: false,
+                            selectionId: optId,
+                            defOption: defaultVk ? (o.valueKey === defaultVk) : false,
+                            styleConfig: {}, archive: false, divisionBranch: false,
+                            subCompanyCatalogues: [], dataCount: i === 0 ? ofd.fieldOptions.length : 0,
+                            score: '0', uid: randomUUID(), children: [], extra: {},
+                            name: o.name, isLimit: false,
+                            valueKey: optId,
+                            componentKey: 'Option', order: i, fieldId: targetField.fieldId,
+                        };
+                    });
+                    // Use the EXISTING physical column name from the data source (build-time
+                    // value) so we don't overwrite it. Fall back to toColumnName (pinyin
+                    // initials + dup) only if the data source didn't return one.
+                    const existingCol = dsFieldCol.get(String(targetField.fieldId));
+                    const fieldDataKey = existingCol || toColumnName(ofd.fieldName);
+                    // 下拉多选是独立类型 SelectMultiple（非 Select+开关）。Select + multiple → type/componentKey=SelectMultiple
+                    const isSelectMulti = ofd.componentKey === 'Select' && ofd.multiple === true;
+                    const optCompKey = isSelectMulti ? 'SelectMultiple' : ofd.componentKey;
+                    const jsonObj = {
+                        formTableId: targetField.formTableId || '', hideScore: true,
+                        groupId: '-1', hasDisplayFormat: false,
+                        title: ofd.fieldName, type: optCompKey, dataCount: 1,
+                        dataKey: fieldDataKey,
+                        systemField: true, columnTypeSwitch: false, options,
+                        showType: ofd.componentKey, singleEdit: true,
+                        componentKey: optCompKey, typeLen: 20,
+                        fieldId: targetField.fieldId, formId: resolvedFormId,
+                        columnType: 'VARCHAR', hasChild: false, showOrder: 9,
+                        columnName: existingCol || fieldDataKey,
+                    };
+                    const payload = {
+                        formId: resolvedFormId, module: 'ebuilderform',
+                        customParam: { appId, objId },
+                        jsonObj: JSON.stringify(jsonObj),
+                    };
+                    const optRes = await client.post(`${baseUrl}/api/ebuilder/form/form/field/manage/saveFormFieldNew?apid=${appId}`, payload, { ebbusinessid: resolvedFormId });
+                    if (optRes?.code === 200 && optRes?.status) {
+                        const matchedOpt = defaultVk
+                            ? ofd.fieldOptions.find(o => o.valueKey === defaultVk)
+                            : null;
+                        const defMsg = matchedOpt ? ` (默认: ${matchedOpt.name})` : '';
+                        console.error(`    已配置: ${ofd.fieldName} ${ofd.fieldOptions.length} 个选项${defMsg}`);
+                    }
+                    else {
+                        console.error(`    配置失败: ${ofd.fieldName} — ${optRes?.msg || '未知错误'}`);
+                    }
+                }
+                catch (e) {
+                    console.error(`    配置异常: ${ofd.fieldName} — ${e.message}`);
+                }
+            }
+        }
+        // Step 7b: 明细表子字段的 Select/RadioBox/CheckBox 选项。
+        // Step 7 只处理主表字段，子字段选项从不配置 → 明细表 Select 无选项。
+        const detailOptionDefs = fieldDefs
+            .filter(f => f.componentKey === 'DetailTable' && Array.isArray(f.formFields))
+            .flatMap(dt => (dt.formFields || [])
+            .filter(sf => sf.fieldOptions && sf.fieldOptions.length > 0
+            && (sf.componentKey === 'Select' || sf.componentKey === 'RadioBox' || sf.componentKey === 'CheckBox'))
+            .map(sf => ({ ...sf, __detailTable: dt.fieldName })));
+        if (detailOptionDefs.length > 0) {
+            await resolveFormId();
+            console.error(`  配置 ${detailOptionDefs.length} 个明细子字段选项...`);
+            // 1. getFields(isReturnDetail='y') 拿子字段 fieldId/subFormId；子表 formTableId 从布局取
+            let subFieldMap = new Map();
+            let subFormTableId = '';
+            try {
+                const dfRes = await client.post(`${baseUrl}/api/ebuilder/form/dataset/v1/getFields`, {
+                    objId, userid: auth.userId, tenantKey: auth.tenantKey, isReturnDetail: 'y',
+                });
+                for (const dt of (dfRes?.data?.detailFields || [])) {
+                    const dtName = dt.name || dt.subFormName || '';
+                    for (const sf of (dt.fields || []))
+                        subFieldMap.set(`${dtName}/${sf.fieldName}`, sf);
+                }
+                const layoutRes = await client.post(`${baseUrl}/api/ebuilder/form/builder/getFormLayout`, {
+                    formId: resolvedFormId, module: 'ebuilderform', customParam: {}, formTableIdList: [],
+                    designerParam: { onlyLayout: false, convert: false }, form: { id: resolvedFormId },
+                }, { ebbusinessid: resolvedFormId });
+                const pages = (layoutRes?.data?.formLayoutMultiple?.pageLayouts || layoutRes?.data?.formLayout?.pageLayouts || []);
+                for (const p of pages) {
+                    for (const c of (p.comps || [])) {
+                        if (String(c.type) === 'DetailTable')
+                            subFormTableId = c.config?.formTableId || '';
+                    }
+                }
+            }
+            catch { /* 拿不到就跳过 */ }
+            // 2. 生成选项 ID
+            const subOptCount = detailOptionDefs.reduce((s, sf) => s + (sf.fieldOptions?.length || 0), 0);
+            const subGen = await client.post(`${baseUrl}/api/form/local/generatorIds?size=${subOptCount + 1}&apid=${appId}`, {});
+            const subGenIds = subGen?.data?.generatorIds || [];
+            let subGenIdx = 0;
+            for (const sfDef of detailOptionDefs) {
+                try {
+                    const sf = subFieldMap.get(`${sfDef.__detailTable}/${sfDef.fieldName}`);
+                    if (!sf) {
+                        console.error(`    ⚠ 未找到明细子字段: ${sfDef.__detailTable}.${sfDef.fieldName}`);
+                        subGenIdx += sfDef.fieldOptions.length;
+                        continue;
+                    }
+                    const subFieldId = String(sf.fieldId);
+                    const subFormId = String(sf.subFormId || '');
+                    // 读子字段当前信息（拿 dataKey/columnName，保存时保留列名）
+                    let cur = {};
+                    try {
+                        const gf = await client.post(`${baseUrl}/api/ebuilder/form/form/field/manage/getFormField`, {
+                            module: 'ebuilderform',
+                            formTableField: { formField: { id: subFieldId, form: { id: resolvedFormId } } },
+                        }, { ebbusinessid: resolvedFormId });
+                        cur = gf?.data || {};
+                    }
+                    catch { /* best effort */ }
+                    // getFormField 读不到该子字段（字段尚未提交/查询失败）时跳过，避免用最小 jsonObj 覆盖破坏
+                    if (!cur?.fieldId) {
+                        console.error(`    ⚠ 未读到子字段 ${sfDef.fieldName}（fieldId=${subFieldId}），跳过选项配置`);
+                        subGenIdx += sfDef.fieldOptions.length;
+                        continue;
+                    }
+                    const dataKey = cur.dataKey || toColumnName(sfDef.fieldName);
+                    const { randomUUID } = await import('crypto');
+                    const options = sfDef.fieldOptions.map((o, i) => {
+                        const optId = subGenIds[subGenIdx++] || String(Date.now() + i);
+                        return {
+                            other: false, selectionId: optId, defOption: false,
+                            styleConfig: {}, archive: false, divisionBranch: false,
+                            subCompanyCatalogues: [], dataCount: i === 0 ? sfDef.fieldOptions.length : 0,
+                            score: '0', uid: randomUUID(), children: [], extra: {},
+                            name: o.name, isLimit: false, valueKey: optId,
+                            componentKey: 'Option', order: i, fieldId: subFieldId,
+                        };
+                    });
+                    const jsonObj = {
+                        formTableId: subFormTableId || cur.formTableId || '', hideScore: true, groupId: '-1',
+                        hasDisplayFormat: false, title: sfDef.fieldName, type: sfDef.componentKey, dataCount: 1,
+                        dataKey, systemField: true, columnTypeSwitch: false, options,
+                        showType: sfDef.componentKey, singleEdit: true, componentKey: sfDef.componentKey, typeLen: 20,
+                        fieldId: subFieldId, formId: resolvedFormId, columnType: 'VARCHAR',
+                        hasChild: false, showOrder: 9, columnName: dataKey, subFormId,
+                    };
+                    const payload = {
+                        formId: resolvedFormId, module: 'ebuilderform',
+                        customParam: { appId, objId },
+                        jsonObj: JSON.stringify(jsonObj),
+                    };
+                    const optRes = await client.post(`${baseUrl}/api/ebuilder/form/form/field/manage/saveFormFieldNew?apid=${appId}`, payload, { ebbusinessid: resolvedFormId });
+                    if (optRes?.code === 200 && optRes?.status) {
+                        console.error(`    已配置: 明细子字段 ${sfDef.fieldName} ${sfDef.fieldOptions.length} 个选项`);
+                    }
+                    else {
+                        console.error(`    配置失败: ${sfDef.fieldName} — ${optRes?.msg || '未知错误'}`);
+                    }
+                }
+                catch (e) {
+                    console.error(`    配置异常: ${sfDef.fieldName} — ${e.message}`);
+                }
+            }
+        }
+        // Step 8: 字段公式（fields.json 的 formula 属性 → 创建公式并绑定到目标字段）。
+        // 公式语法与 `form formula set --expression` 一致：{主表.字段名} 引用其他字段。
+        // 扁平化：主表字段 formula + 明细子字段 formula（明细子字段嵌在 DetailTable.formFields，
+        // 不扁平会被 fieldDefs.filter 漏掉，导致明细公式建表时不绑定，需事后 form formula set 补）
+        const formulaDefs = [];
+        for (const f of fieldDefs) {
+            if (f.componentKey === 'DetailTable' && Array.isArray(f.formFields)) {
+                for (const sf of f.formFields) {
+                    if (sf.formula)
+                        formulaDefs.push({ fieldName: String(sf.fieldName), formula: sf.formula, detailTable: String(f.fieldName) });
+                }
+            }
+            else if (f.formula) {
+                formulaDefs.push({ fieldName: String(f.fieldName), formula: f.formula });
+            }
+        }
+        if (formulaDefs.length > 0) {
+            await resolveFormId();
+            console.error(`  配置 ${formulaDefs.length} 个字段公式...`);
+            let allFields = [];
+            let detailFields = [];
+            try {
+                const fRes = await client.post(`${baseUrl}/api/ebuilder/form/dataset/v1/getFields`, {
+                    objId, userid: auth.userId, tenantKey: auth.tenantKey, isReturnDetail: 'y',
+                });
+                allFields = fRes?.data?.mainFields || [];
+                // detailFields: [{ name, id, fields:[{fieldName,fieldId,fieldKey,...}] }]（公式可引用明细字段，如 SUM({付款信息.付款金额})）
+                detailFields = fRes?.data?.detailFields || [];
+            }
+            catch { /* 读不到字段则公式会报"引用字段不存在" */ }
+            for (const fd of formulaDefs) {
+                try {
+                    const formula = (typeof fd.formula === 'string')
+                        ? { expression: fd.formula, returnType: 'Number' }
+                        : (fd.formula || {});
+                    const expression = formula.expression || formula.formulaExpress || '';
+                    if (!expression) {
+                        console.error(`    ⚠ ${fd.fieldName} 公式表达式为空`);
+                        continue;
+                    }
+                    // 目标字段：主表字段查 allFields，明细子字段查所属明细表的 fields（带 detailTable 标记）
+                    let targetField;
+                    if (fd.detailTable) {
+                        const dt = detailFields.find((d) => d.name === fd.detailTable || String(d.id) === fd.detailTable);
+                        targetField = dt && (dt.fields || []).find((f) => f.fieldName === fd.fieldName && /^\d+$/.test(String(f.fieldId)));
+                    }
+                    else {
+                        targetField = allFields.find((f) => f.fieldName === fd.fieldName && /^\d+$/.test(String(f.fieldId)));
+                    }
+                    if (!targetField) {
+                        console.error(`    ⚠ 未找到公式目标字段: ${fd.detailTable ? fd.detailTable + '.' : ''}${fd.fieldName}`);
+                        continue;
+                    }
+                    const targetFieldId = String(targetField.fieldId);
+                    // 解析 {主表.字段名} / {明细表名.字段名} 引用（不去重：同一字段引用多次时每个出现位置
+                    // 都要一个参数，否则平台报「参数列表与执行语句不一致」）
+                    const refRegex = /\{(?:主表|([^.}]+))\.([^}]+)\}/g;
+                    const refNames = [];
+                    let rm;
+                    while ((rm = refRegex.exec(expression)) !== null) {
+                        const table = rm[1] ? rm[1].trim() : '主表';
+                        const field = rm[2].trim();
+                        refNames.push({ table, field });
+                    }
+                    const parameters = [];
+                    let refMissing = false;
+                    for (const ref of refNames) {
+                        let rf;
+                        if (ref.table === '主表') {
+                            rf = allFields.find((f) => f.fieldName === ref.field || f.title === ref.field || String(f.fieldId) === ref.field);
+                        }
+                        else {
+                            const dt = detailFields.find((d) => d.name === ref.table || String(d.id) === ref.table);
+                            rf = dt && (dt.fields || []).find((f) => f.fieldName === ref.field || String(f.fieldId) === ref.field);
+                        }
+                        if (!rf) {
+                            console.error(`    ⚠ 公式引用字段不存在: ${ref.table}.${ref.field}`);
+                            refMissing = true;
+                            break;
+                        }
+                        const param = {
+                            fieldId: String(rf.fieldId), formId: resolvedFormId, module: 'ebuilderform',
+                            properKey: rf.fieldKey || rf.type || 'Text', title: rf.title || rf.fieldName,
+                            name: rf.fieldName || rf.title, appId, id: null,
+                        };
+                        if (ref.table !== '主表') {
+                            const dt = detailFields.find((d) => d.name === ref.table || String(d.id) === ref.table);
+                            if (dt) {
+                                param.sFormId = String(dt.id);
+                                param.sFormName = dt.name;
+                            }
+                        }
+                        parameters.push(param);
+                    }
+                    if (refMissing)
+                        continue;
+                    const formulaName = formula.name || `公式_${fd.fieldName}`;
+                    const savePayload = {
+                        expressSql: expression, name: formulaName, parameters,
+                        returnType: formula.returnType || 'Number', validateType: 'normal',
+                        referenceType: 'assign',
+                        extendParam: JSON.stringify({ exceptIds: targetFieldId, createType: 'once' }),
+                        formulaId: null, dataSources: [], formulaType: 'normal',
+                        mainDataSource: [null], tempVariableList: [], nameAuto: false,
+                        module: 'ebuilderform', multiFuncSepType: 1,
+                    };
+                    const saveRes = await client.post(`${baseUrl}/api/excel/formula/save`, savePayload);
+                    if (!saveRes?.resultJson?.excute) {
+                        console.error(`    公式保存失败: ${saveRes?.resultJson?.error || saveRes?.msg || '未知错误'}`);
+                        continue;
+                    }
+                    const expressId = saveRes.resultJson.id;
+                    // 浏览器实测绑定分两步：
+                    //   a) saveFormFieldNew 重存该字段，jsonObj 带 ffExpress（字段↔公式关联）
+                    //   b) saveSourceForm 注册公式源（sourceForms + filter.fieldId 指明目标字段）
+                    try {
+                        const gf = await client.post(`${baseUrl}/api/ebuilder/form/form/field/manage/getFormField`, {
+                            module: 'ebuilderform',
+                            formTableField: { formField: { id: targetFieldId, form: { id: resolvedFormId } } },
+                        }, { ebbusinessid: resolvedFormId });
+                        const cur = gf?.data || {};
+                        // 读不到目标字段时跳过绑定（公式已创建，避免用最小 jsonObj 覆盖破坏字段）
+                        if (!cur?.fieldId) {
+                            console.error(`    ⚠ 未读到目标字段 ${fd.fieldName}（fieldId=${targetFieldId}），公式已创建但未绑定`);
+                            continue;
+                        }
+                        const bindJson = { ...cur, ffExpress: { id: expressId, name: formulaName } };
+                        const bindRes = await client.post(`${baseUrl}/api/ebuilder/form/form/field/manage/saveFormFieldNew?apid=${appId}`, {
+                            formId: resolvedFormId, module: 'ebuilderform',
+                            customParam: { appId, objId },
+                            jsonObj: JSON.stringify(bindJson),
+                        }, { ebbusinessid: resolvedFormId });
+                        if (bindRes?.code !== 200 || !bindRes?.status) {
+                            console.error(`    公式绑定失败: ${fd.fieldName} — ${bindRes?.msg || '未知错误'}`);
+                            continue;
+                        }
+                        await client.post(`${baseUrl}/api/excel/formula/library/saveSourceForm`, {
+                            sourceForms: [{ id: resolvedFormId, module: 'ebuilderform' }],
+                            expressId,
+                            filter: { fieldId: targetFieldId },
+                        });
+                        console.error(`    已配置: ${fd.fieldName} 公式 ${expression}`);
+                    }
+                    catch (e) {
+                        console.error(`    公式绑定异常: ${fd.fieldName} — ${e.message}`);
+                    }
+                }
+                catch (e) {
+                    console.error(`    公式配置异常: ${fd.fieldName} — ${e.message}`);
+                }
+            }
+        }
+        // Auto-add 台账 (data-list) menu — unless --no-menu
+        let menuId = null;
+        // 字段分组分配：放到所有 saveFormFieldNew（选项 Step7/公式 Step8/关联/流水号等）
+        // 之后做——这些重保存会重置 field.groupId，先分配会被冲掉。此处是最后写入，保住分组归属。
+        if (fieldGroups.length > 0) {
+            try {
+                for (const g of fieldGroups) {
+                    await client.post(`${baseUrl}/api/ebuilder/form/form/field/manage/updateFormFieldGroup?apid=${appId}`, { module: 'ebuilderform', formFieldGroup: { id: g.groupId }, form: { id: formId },
+                        fieldList: g.fieldIds.map((id) => ({ id })), customParam: { appId, objId } }, { ebbusinessid: formId });
+                }
+                console.error(`  字段分组已分配: ${fieldGroups.map((g) => `${g.name}(${g.fieldIds.length})`).join(', ')}`);
+                // 分组分配后重新 initLayout：平台新版 initLayout 据 saveFieldGroup 分组记录自动生成
+                // Collapse 容器，但 create 流程里 initLayout 发生在分配之前，需分配后再跑一次（对齐浏览器
+                // 抓包 payload：configs 平铺、分组字段前置、无 groupFieldIds、styleTemplateId=007）。
+                try {
+                    const reapplied = await reapplyGroupLayout(client, baseUrl, appId, formId, objId, new Set(fieldGroups.flatMap((g) => g.fieldIds)), cmdOpts.layout);
+                    if (reapplied)
+                        console.error('  分组布局已重排');
+                }
+                catch (e) {
+                    console.error(`  分组布局重排失败: ${e.message}`);
+                }
+            }
+            catch (e) {
+                console.error(`  字段分组分配失败: ${e.message}（分组已建，字段未分配，可在设计器手动拖入分组）`);
+            }
+        }
+        if (cmdOpts.menu !== false) {
+            try {
+                const { addFormTableViewMenu } = await import('./menu.js');
+                menuId = await addFormTableViewMenu(client, baseUrl, appId, objId, name);
+                console.error(`  台账菜单已添加${menuId ? ` (id=${menuId})` : ''}`);
+            }
+            catch (e) {
+                console.error(`  台账菜单添加失败: ${e.message}（可用 \`e10-cli menu add-table ${appId} ${objId}\` 手动补加）`);
+            }
+        }
+        // Fallback: some on-prem environments don't auto-generate the default
+        // nListView display columns (tableField stays empty → empty 台账). Patch
+        // it here so the 台账 actually shows fields. No-op when already populated
+        // (cloud envs auto-generate); never overwrites user-configured columns.
+        try {
+            const { ensureDefaultListDisplayFields } = await import('../services/form-table-view.js');
+            const ensured = await ensureDefaultListDisplayFields(client, baseUrl, appId, objId);
+            if (ensured.ensured) {
+                console.error(`  显示列已兜底补全: ${ensured.visibleFieldCount} 列（环境未自动生成，CLI 补加）`);
+            }
+        }
+        catch (e) {
+            console.error(`  显示列兜底失败: ${e.message}（可用 \`e10-cli form table-view ensure ${objId} ${appId}\` 手动补加）`);
+        }
+        if (opts.json) {
+            console.log(JSON.stringify({ objId, name, menuId }));
+        }
+        else {
+            console.log(`完成: ${objId}`);
+        }
+    });
+    const linkageCmd = form.command('linkage').description('表单字段显隐联动管理');
+    linkageCmd.command('add')
+        .description('添加字段显隐联动规则')
+        .argument('<appId>', '应用 ID')
+        .argument('<objId>', '表单 objId')
+        .argument('<name>', '联动规则名称')
+        .requiredOption('--config <json>', '联动配置 JSON（@文件路径），格式见文档')
+        .action(async (appId, objId, name, cmdOpts) => {
+        const opts = program.opts();
+        const auth = await AuthSession.fromOptions(opts);
+        if (!auth)
+            process.exit(1);
+        const client = new ApiClient(auth);
+        const baseUrl = auth.getBaseUrl();
+        // Parse config
+        let configStr = cmdOpts.config;
+        if (configStr.startsWith('@')) {
+            const { readFileSync, existsSync } = await import('fs');
+            const filePath = configStr.slice(1);
+            if (!existsSync(filePath)) {
+                console.error(`配置文件不存在: ${filePath}`);
+                process.exit(1);
+            }
+            configStr = readFileSync(filePath, 'utf-8');
+        }
+        let config;
+        try {
+            config = JSON.parse(configStr);
+        }
+        catch {
+            console.error('JSON 解析失败');
+            process.exit(1);
+        }
+        // 校验联动 prop：必填且平台支持 hide/show/edit/readonly/required/hideLine（隐藏行，抓包实测平台枚举是 hideLine；
+        // hideRow 保留兼容旧写法）
+        const SUPPORTED_PROPS = ['hide', 'show', 'edit', 'readonly', 'required', 'hideLine', 'hideRow'];
+        const missingProps = (config.actions || []).filter((a) => !a.prop);
+        const invalidProps = (config.actions || [])
+            .filter((a) => a.prop)
+            .map((a) => a.prop)
+            .filter((p) => !SUPPORTED_PROPS.includes(String(p)));
+        if (missingProps.length > 0 || invalidProps.length > 0) {
+            if (missingProps.length > 0) {
+                console.error(`联动 action 缺少 prop（联动效果类型必填）`);
+            }
+            if (invalidProps.length > 0) {
+                console.error(`联动 prop 不支持: ${[...new Set(invalidProps)].join(', ')}`);
+                console.error(`  平台支持: ${SUPPORTED_PROPS.join(', ')}`);
+            }
+            process.exit(1);
+        }
+        // Get formId from appId
+        const listData = await client.get(`${baseUrl}/api/bs/ebuilder/form/obj/getList/${appId}?apid=${appId}`, { ebbusinessid: appId });
+        const formInfo = (listData?.data || []).find((f) => f.id === objId);
+        const formId = formInfo?.formId || '';
+        if (!formId) {
+            console.error('无法获取 formId，请确认 appId 和 objId 正确');
+            process.exit(1);
+        }
+        // Build payload
+        const payload = {
+            fdEffect: {
+                formId,
+                effectModule: 'ebuilderform',
+                effectType: 'form',
+                effectName: '当前表单',
+                optionList: [{ effectValue: formId, effectName: '当前表单' }],
+            },
+            condition: {
+                targetId: formId,
+                targetName: formInfo?.formName || '表单',
+                targetModule: 'ebuilderform',
+                conditionType: 'FIELD',
+                conditionDetails: config.conditions.map((c) => ({
+                    targetId: c.fieldId,
+                    detailSymbol: c.operator || 'EQUAL',
+                    sourceType: 'CONSTANT',
+                    sourceContent: JSON.stringify({
+                        formField: { id: c.fieldId },
+                        ...(c.options ? { dataOptions: c.options } : { content: c.value }),
+                    }),
+                })),
+                formulaId: '',
+                formulaName: '',
+            },
+            linkageDetails: config.actions.map((a) => ({
+                formId,
+                id: '0',
+                linkageObj: 'field',
+                linkageProp: a.prop, // hide, show, edit, readonly, required, hideRow
+                linkageShowValue: a.fields.map((f) => ({
+                    dataKey: f.dataKey || '',
+                    groupName: '表单字段',
+                    address: f.isDetail ? '明细表' : '主表',
+                    addressType: f.isDetail ? 'detail' : 'form',
+                    groupId: 'formField',
+                    name: f.name,
+                    descType: f.fieldType || '',
+                    id: f.fieldId,
+                    content: f.name,
+                    desc: f.desc || '',
+                })),
+                detailOptions: [],
+            })),
+            module: 'ebuilderform',
+            formId,
+            refId: formId,
+            enableState: '1',
+            linkageName: name,
+            customParam: { appId, objId },
+        };
+        const data = await client.post(`${baseUrl}/api/ebuilder/form/form/setting/viewlinkage/add?apid=${appId}`, payload, { ebbusinessid: formId });
+        if (data?.code === 200 && data?.status) {
+            const linkageId = data?.data || '';
+            console.log(opts.json
+                ? JSON.stringify({ success: true, linkageId, name })
+                : `联动规则已添加: ${name}` + (linkageId ? ` (id: ${linkageId})` : ''));
+        }
+        else {
+            console.error(`添加失败: ${data?.msg || '未知错误'}`);
+            process.exit(1);
+        }
+    });
+    form.command('field-options')
+        .description('给已有 Select/RadioBox/CheckBox 字段设置选项和默认值')
+        .argument('<objId>', '表单 objId')
+        .argument('<appId>', '应用 ID')
+        .argument('<fieldId>', '字段 fieldId')
+        .requiredOption('--options <json>', '选项列表：[{"name":"高","valueKey":"xxx"}...] 或 @文件路径')
+        .option('--default <valueKey>', '默认选项 valueKey')
+        .action(async (objId, appId, fieldId, cmdOpts) => {
+        const opts = program.opts();
+        const auth = await AuthSession.fromOptions(opts);
+        if (!auth)
+            process.exit(1);
+        const client = new ApiClient(auth);
+        const baseUrl = auth.getBaseUrl();
+        // Get formId
+        const formList = await client.get(`${baseUrl}/api/bs/ebuilder/form/obj/getList/${appId}?apid=${appId}`, { ebbusinessid: appId });
+        const formInfo = (formList?.data || []).find((f) => f.id === objId);
+        const formId = formInfo?.formId || '';
+        const formTableId = formInfo?.formTableId || '';
+        if (!formId) {
+            console.error('无法获取 formId');
+            process.exit(1);
+        }
+        // Parse options
+        let optStr = cmdOpts.options;
+        if (optStr.startsWith('@')) {
+            const { readFileSync, existsSync } = await import('fs');
+            if (!existsSync(optStr.slice(1))) {
+                console.error('选项文件不存在');
+                process.exit(1);
+            }
+            optStr = readFileSync(optStr.slice(1), 'utf-8');
+        }
+        let optionDefs;
+        try {
+            optionDefs = JSON.parse(optStr);
+        }
+        catch {
+            console.error('选项 JSON 解析失败');
+            process.exit(1);
+        }
+        if (!Array.isArray(optionDefs) || optionDefs.length === 0) {
+            console.error('--options 必须是非空数组');
+            process.exit(1);
+        }
+        // Get current field info for title, dataKey etc.
+        let currentField = {};
+        try {
+            const fData = await client.post(`${baseUrl}/api/ebuilder/form/form/field/manage/getFormField`, { module: 'ebuilderform', formTableField: { formField: { id: fieldId, form: { id: formId } } } }, { ebbusinessid: formId });
+            currentField = fData?.data || {};
+        }
+        catch { /* best effort */ }
+        // Build options with defOption
+        const { randomUUID } = await import('crypto');
+        // valueKey 统一由平台生成（与 form create 一致）。已有数据的字段系统会拒绝修改（保险），
+        // 所以无需保留旧 key：能改的字段必然没数据，全新生成最安全、也绝不会踩 selectionId 的 parseLong。
+        // 用户显式传纯数字 valueKey 时尊重（进阶用），非数字忽略并告警。
+        const isNumeric = (vk) => vk !== undefined && vk !== null && vk !== '' && /^\d+$/.test(String(vk));
+        let genIds = [];
+        try {
+            const genRes = await client.post(`${baseUrl}/api/form/local/generatorIds?size=${optionDefs.length + 1}&apid=${appId}`, {});
+            genIds = genRes?.data?.generatorIds || [];
+        }
+        catch { /* fallback to timestamp */ }
+        const options = optionDefs.map((o, i) => {
+            // 优先级：纯数字 valueKey > 平台新 ID > 时间戳兜底
+            let valueKey = isNumeric(o.valueKey) ? String(o.valueKey) : '';
+            if (!valueKey)
+                valueKey = genIds[i] || String(Date.now() + i);
+            if (o.valueKey && !isNumeric(o.valueKey)) {
+                console.error(`  ⚠ ${o.name}: 忽略非数字 valueKey "${o.valueKey}"（平台 selectionId 只接受数字），已重新生成 ${valueKey}`);
+            }
+            return {
+                other: false,
+                selectionId: valueKey,
+                defOption: cmdOpts.default === valueKey,
+                styleConfig: {}, archive: false, divisionBranch: false, subCompanyCatalogues: [],
+                dataCount: i === 0 ? optionDefs.length : 0,
+                score: '0', uid: randomUUID(), children: [], extra: {},
+                name: o.name, isLimit: false, valueKey,
+                componentKey: 'Option', order: i, fieldId,
+            };
+        });
+        // Build updated field jsonObj — merge with current field to keep title/dataKey
+        const jsonObj = {
+            ...currentField,
+            formTableId,
+            options,
+            showType: 'Select',
+            singleEdit: true,
+            componentKey: 'Select',
+            typeLen: 20,
+            fieldId,
+            formId,
+            columnType: 'VARCHAR',
+            hasChild: false,
+            hideScore: true,
+            groupId: currentField.groupId || '-1',
+            hasDisplayFormat: currentField.hasDisplayFormat ?? false,
+            title: currentField.title || '',
+            dataCount: currentField.dataCount || 1,
+            dataKey: currentField.dataKey || '',
+            systemField: currentField.systemField ?? true,
+            columnTypeSwitch: currentField.columnTypeSwitch ?? false,
+            showOrder: currentField.showOrder || 9,
+            columnName: currentField.columnName || '',
+        };
+        const payload = {
+            formId, module: 'ebuilderform',
+            customParam: { appId, objId },
+            jsonObj: JSON.stringify(jsonObj),
+        };
+        const data = await client.post(`${baseUrl}/api/ebuilder/form/form/field/manage/saveFormFieldNew?apid=${appId}`, payload, { ebbusinessid: formId });
+        if (data?.code === 200 && data?.status) {
+            const saved = options.map(o => ({ name: o.name, valueKey: o.valueKey }));
+            const defMsg = cmdOpts.default ? ` (默认: ${saved.find(o => o.valueKey === cmdOpts.default)?.name || cmdOpts.default})` : '';
+            if (opts.json) {
+                console.log(JSON.stringify({ success: true, fieldId, options: saved, default: cmdOpts.default }, null, 2));
+            }
+            else {
+                console.log(`字段选项已更新: ${options.length} 个选项${defMsg}`);
+                // 回显 valueKey，方便后续 --default / form data add 用
+                for (const o of saved)
+                    console.log(`  ${o.name} => ${o.valueKey}`);
+            }
+        }
+        else {
+            console.error(`更新失败: ${data?.msg || '未知错误'}`);
+            process.exit(1);
+        }
+    });
+    form.command('add-field')
+        .description('给表单添加字段')
+        .argument('<objId>', '表单 objId')
+        .argument('<appId>', '应用 ID')
+        .argument('<fieldName>', '字段名')
+        .argument('<fieldType>', '字段类型')
+        .argument('[title]', '字段标题')
+        .option('--sform-id <id>', '关联的目标表单 objId（仅 EBuilder 类型）')
+        .option('--data-title <field>', '目标表单的显示字段名（仅 EBuilder；缺省 name=目标表含"名称"的字段，无则第一个业务字段）')
+        .option('--form-name <name>', '目标表单名称（仅 EBuilder 类型，可选）')
+        .option('--format <fmt>', '日期精度格式（Date/DateTime/DateRange），如 yyyy-MM-dd、yyyy-MM-dd HH:mm')
+        .option('--min-field <field>', 'Date/DateTime 日期限制：最早不得早于该字段（字段名，min.dateField）')
+        .option('--max-field <field>', 'Date/DateTime 日期限制：最晚不得晚于该字段（字段名，max.dateField）')
+        .option('--precision <n>', '小数位数（Number/Money 类型，缺省 Number=0 整数、Money=2、百分比=1）')
+        .option('--percent', 'Number 百分比显示（numberType=percentage）')
+        .option('--default <value>', 'Number/Money 默认值（content + isDefault，如 工时单价默认 1000）')
+        .option('--delimiter', 'Number/Money 千分位（Money 默认开，--no-delimiter 关闭）')
+        .option('--capital', 'Number/Money 大写金额显示')
+        .option('--sub-form-id <id>', '明细表 subFormId（在指定明细表里加字段）')
+        .option('--multiple', '多选（人员/部门/EBuilder/Browser/下拉Select，默认单选。下拉多选=SelectMultiple 类型）')
+        .option('--max-len <n>', '文本最大长度（Text 缺省 100、TextArea 缺省 4000）')
+        .option('--single-row', '独占一行显示（布局 singleRow:true，其余字段仍两列）')
+        .action(async (objId, appId, fieldName, fieldType, title, cmdOptsRaw) => {
+        // fieldType 大小写归一（与建表一致）：用户常传 "Textarea"/"Ebuilder"，不归一则 type 存小写
+        // "Textarea"（FLOW 渲染异常）、TextArea 分支漏跑。
+        fieldType = canonComponentKey(fieldType);
+        const opts = program.opts();
+        const auth = await AuthSession.fromOptions(opts);
+        if (!auth)
+            process.exit(1);
+        const client = new ApiClient(auth);
+        const baseUrl = auth.getBaseUrl();
+        // Get formId from objId
+        const formList = await client.get(`${baseUrl}/api/bs/ebuilder/form/obj/getList/${appId}?apid=${appId}`, { ebbusinessid: appId });
+        const formInfo = (formList?.data || []).find((f) => f.id === objId);
+        const formId = formInfo?.formId || '';
+        const formTableId = formInfo?.formTableId || '';
+        if (!formId) {
+            console.error('无法获取 formId，请确认 objId 和 appId 正确');
+            process.exit(1);
+        }
+        // DateRange 需要 3 个字段 ID（主 + 开始 + 结束），普通字段 1 个，富组件按 richIdUnits
+        const isDateRange = fieldType === 'DateRange' || fieldType === 'DateInterval';
+        const idCount = isDateRange ? 3 : richIdUnits(fieldType, {});
+        const genData = await client.post(`${baseUrl}/api/form/local/generatorIds?size=${idCount}&apid=${appId}`, {});
+        const genIds = genData?.data?.generatorIds || [];
+        const fieldId = genIds[0] || String(Date.now());
+        const startId = genIds[1] || '';
+        const endId = genIds[2] || '';
+        const cmdOpts = cmdOptsRaw || {};
+        const sformId = cmdOpts.sformId || '';
+        const dataTitle = cmdOpts.dataTitle || '';
+        const formName = cmdOpts.formName || '';
+        // Generate column name: pinyin initials + timestamp suffix
+        const colName = toColumnName(fieldName);
+        // Build jsonObj based on field type
+        const jsonObj = {
+            type: fieldType,
+            title: title || fieldName,
+            formTableId, fieldId, groupId: '-1', formId,
+            showOrder: '0.00',
+            dataKey: colName,
+            columnName: colName,
+        };
+        // 明细表字段：--sub-form-id 时 formTableId 用明细表的，jsonObj 带 subFormId
+        if (cmdOpts.subFormId) {
+            const eb = await client.post(`${baseUrl}/api/bs/esb/setting/component/getEbField`, { tableId: objId, appId });
+            const dt = (eb?.data?.detail || []).find((d) => String(d.detailTableId) === String(cmdOpts.subFormId));
+            if (!dt) {
+                console.error(`未找到明细表 subFormId=${cmdOpts.subFormId}`);
+                process.exit(1);
+            }
+            Object.assign(jsonObj, { subFormId: cmdOpts.subFormId });
+            const detailFormTableId = dt.fields?.[0]?.formTableId || '';
+            if (detailFormTableId)
+                jsonObj.formTableId = detailFormTableId;
+        }
+        // 富组件：映射到平台真实 type/componentKey + 附加配置（对齐 batch/save/formField 抓包）。
+        // 之前 jsonObj 只有 type 没有 componentKey → 平台 FormFieldDto.getComponentKey() 为 null → NPE。
+        const rich = getRichType(fieldType);
+        if (rich) {
+            jsonObj.type = rich.platformType;
+            jsonObj.componentKey = rich.platformComponentKey;
+            if (rich.build) {
+                const extra = richIdUnits(fieldType, {}) - 1;
+                let extraIds = [];
+                if (extra > 0) {
+                    const extraRes = await client.post(`${baseUrl}/api/form/local/generatorIds?size=${extra}&apid=${appId}`, {});
+                    extraIds = (extraRes?.data?.generatorIds || []).map(String);
+                }
+                const extraCfg = await rich.build({
+                    def: { multiple: cmdOpts.multiple }, fieldId, formId, formTableId, dataKey: colName, columnName: colName,
+                    showOrder: '0.00', extraIds,
+                });
+                Object.assign(jsonObj, extraCfg);
+            }
+        }
+        // 非富组件也补 componentKey（平台要求，否则 FormFieldDto.getComponentKey() 为 null → NPE）。
+        // 富组件已在上方设置 platformComponentKey；此处 fallback 到类型名（平台对常见类型有归一容错）。
+        if (!jsonObj.componentKey)
+            jsonObj.componentKey = fieldType;
+        // Number/Money decimal precision: --precision 指定，缺省 Number=0 整数、Money=2、百分比=1
+        // 百分比：--percent → numberType=percentage；默认值：--default → content+isDefault
+        // 实测：设默认值必须连 isDelimiter/stepMode/step/isCapital 一起，否则平台丢默认（只设 content+isDefault 不落库）
+        if (fieldType === 'Number' || fieldType === 'Money') {
+            const defaultPrec = fieldType === 'Money' ? '2' : '0';
+            const isPercent = fieldType === 'Number' && cmdOpts.percent === true;
+            // 注意：commander 把 --default 映射到 opts.default（非 defaultValue）
+            const hasDefault = cmdOpts.default !== undefined && cmdOpts.default !== null && cmdOpts.default !== '';
+            // 千分位：Money 默认开（--no-delimiter 关闭）、Number 默认关（--delimiter 开启）
+            const isDelim = fieldType === 'Money' ? cmdOpts.delimiter !== false : cmdOpts.delimiter === true;
+            const isCap = cmdOpts.capital === true;
+            const patch = {
+                pointSize: cmdOpts.precision !== undefined ? cmdOpts.precision : (isPercent ? '1' : defaultPrec),
+                isDefault: hasDefault,
+                isDelimiter: isDelim,
+                isCapital: isCap,
+                capitalFormat: 'onlyUpperCase',
+                capitalPosition: 'outside',
+                capitalSetting: 'system',
+                capitalPrecision: 'yuan',
+                isExchangeRates: false,
+            };
+            if (fieldType === 'Number')
+                patch.numberType = isPercent ? 'percentage' : 'number';
+            // content 始终带（无默认值时空串）——浏览器抓包 Number 字段 getFormField 恒有 content:""，
+            // 缺 content 在 FLOW 渲染异常（与多行文本同因）。
+            if (fieldType === 'Number')
+                patch.content = hasDefault ? String(cmdOpts.default) : '';
+            if (hasDefault) {
+                patch.stepMode = false;
+                patch.step = 1;
+            }
+            Object.assign(jsonObj, patch);
+        }
+        if (fieldType === 'TextArea') {
+            // 多行文本：对齐浏览器抓包——content 恒 ""（无默认值时空串）、maxLen=4000。
+            // 缺 content 在 FLOW 渲染异常；maxLen 不发则前端最大长度回显异常。
+            Object.assign(jsonObj, { content: '', maxLen: 4000 });
+        }
+        if (fieldType === 'EInvoice') {
+            Object.assign(jsonObj, {
+                isSingle: false,
+                invoiceType: 1,
+            });
+            delete jsonObj.maxLen;
+            delete jsonObj.unique;
+            delete jsonObj.scan;
+            delete jsonObj.readonlyTransLink;
+        }
+        else if (fieldType === 'Date' || fieldType === 'DateTime') {
+            // 日期：默认精度 年月日（yyyy-MM-dd，对齐浏览器抓包）；DateTime：默认带时:分（yyyy-MM-dd HH:mm 不含秒）。
+            // 默认值不填（isDefault:false）；--format 覆盖精度。
+            const isDt = fieldType === 'DateTime';
+            const fmt = cmdOpts.format || (isDt ? 'yyyy-MM-dd HH:mm' : 'yyyy-MM-dd');
+            Object.assign(jsonObj, {
+                type: 'Date',
+                format: fmt,
+                placeholder: placeholderFromFormat(fmt),
+                timePanelStyle: { type: 'system' },
+                isDefault: false,
+            });
+            // 日期限制：--min-field 最早不得早于 / --max-field 最晚不得晚于另一字段（对齐抓包 min.dateField）。
+            // 目标字段 fieldId 从 getFields mainFields 按字段名解析。
+            if (cmdOpts.minField || cmdOpts.maxField) {
+                try {
+                    const tfd = await client.post(`${baseUrl}/api/ebuilder/form/dataset/v1/getFields`, {
+                        objId, userid: auth.userId, tenantKey: auth.tenantKey,
+                    });
+                    const tfields = tfd?.data?.mainFields || [];
+                    const minTarget = cmdOpts.minField ? tfields.find((f) => f.fieldName === cmdOpts.minField)?.fieldId : '';
+                    const maxTarget = cmdOpts.maxField ? tfields.find((f) => f.fieldName === cmdOpts.maxField)?.fieldId : '';
+                    if (minTarget) {
+                        jsonObj.min = { type: 'dateField', checkValue: String(minTarget) };
+                        jsonObj.earlyDate = true;
+                    }
+                    if (maxTarget) {
+                        jsonObj.max = { type: 'dateField', checkValue: String(maxTarget) };
+                        jsonObj.lateDate = true;
+                    }
+                }
+                catch { /* 解析失败则不加限制 */ }
+            }
+            delete jsonObj.maxLen;
+            delete jsonObj.unique;
+            delete jsonObj.scan;
+            delete jsonObj.readonlyTransLink;
+        }
+        else if (fieldType === 'City') {
+            // 城市/地区选择（对齐浏览器 payload：region 模式 + 系统级联层级 + 字母索引）
+            Object.assign(jsonObj, {
+                isSingle: false,
+                levelSetting: 'system',
+                isDefault: false,
+                useLetterIndex: true,
+                mode: 'region',
+            });
+            delete jsonObj.maxLen;
+            delete jsonObj.unique;
+            delete jsonObj.scan;
+            delete jsonObj.readonlyTransLink;
+        }
+        else if (fieldType === 'EBuilder') {
+            if (!sformId) {
+                console.error('EBuilder 类型必须指定 --sform-id（目标表单 objId）');
+                process.exit(1);
+            }
+            // Resolve formName from target form if not provided
+            let resolvedFormName = formName;
+            if (!resolvedFormName) {
+                try {
+                    const tlist = await client.get(`${baseUrl}/api/bs/ebuilder/form/obj/getList/${appId}?apid=${appId}`, { ebbusinessid: appId });
+                    const tf = (tlist?.data || []).find((f) => String(f.id) === String(sformId));
+                    resolvedFormName = tf?.formName || tf?.name || sformId;
+                }
+                catch {
+                    resolvedFormName = sformId;
+                }
+            }
+            // Resolve dataTitle：纯数字 fieldId 直接用；'name'/字段名 → 查目标表字段。
+            // 未传 --data-title 时按 name 处理：默认优先字段名含「名称」的业务字段（如 客户名称/类型名称），无则第一个业务字段。
+            let resolvedDataTitle = dataTitle || 'name';
+            if (!/^\d{15,}$/.test(resolvedDataTitle)) {
+                try {
+                    const tfd = await client.post(`${baseUrl}/api/ebuilder/form/dataset/v1/getFields`, {
+                        objId: sformId, userid: auth.userId, tenantKey: auth.tenantKey,
+                    });
+                    const tfields = tfd?.data?.mainFields || [];
+                    if (resolvedDataTitle === 'name') {
+                        resolvedDataTitle = defaultEBuilderDataTitle(tfields);
+                    }
+                    else {
+                        const m = tfields.find((f) => f.fieldName === resolvedDataTitle)
+                            || tfields.find((f) => String(f.fieldName || '').includes(resolvedDataTitle));
+                        resolvedDataTitle = m?.fieldId || resolvedDataTitle;
+                    }
+                }
+                catch { /* 解析失败保留原值 */ }
+            }
+            Object.assign(jsonObj, {
+                sformId,
+                dataTitle: resolvedDataTitle || 'name',
+                formName: resolvedFormName,
+                virtualForm: false,
+                displayType: 'line',
+                isAddForRelation: true,
+                isSingle: cmdOpts.multiple ? false : true, // 默认单选；--multiple 多选
+                viewDataDetail: true,
+                pcDisplaySelectedCount: { type: 'default' },
+                mobileDisplaySelectedCount: { type: 'default' },
+                quickAddParams: [],
+                relateViewData: [],
+                relateField: null,
+                appId,
+                virtualTable: false,
+            });
+        }
+        else if (fieldType === 'Flow') {
+            // 浏览-流程字段（对齐浏览器 payload：type=Flow + relateExt.module=workflow）
+            if (!sformId) {
+                console.error('Flow 类型必须指定 --sform-id（目标流程绑定的表单 objId）');
+                process.exit(1);
+            }
+            let resolvedFormName = formName;
+            if (!resolvedFormName) {
+                try {
+                    const tlist = await client.get(`${baseUrl}/api/bs/ebuilder/form/obj/getList/${appId}?apid=${appId}`, { ebbusinessid: appId });
+                    const tf = (tlist?.data || []).find((f) => String(f.id) === String(sformId));
+                    resolvedFormName = tf?.formName || tf?.name || sformId;
+                }
+                catch {
+                    resolvedFormName = sformId;
+                }
+            }
+            Object.assign(jsonObj, {
+                isAddForRelation: true,
+                sformId,
+                formName: resolvedFormName,
+                conditionOperate: 'and',
+                filterParams: '{}',
+                filterQueryParams: '{}',
+                columnFields: [],
+                displayType: 'line',
+                viewDataDetail: true,
+                pcDisplaySelectedCount: { type: 'default' },
+                mobileDisplaySelectedCount: { type: 'default' },
+                relateExt: { module: 'workflow' },
+                relateField: null,
+                quickAddParams: [],
+            });
+        }
+        else if (isDateRange) {
+            // 日期区间：补 start/end 两个 DateComponent + rangeInterval（对齐浏览器 payload）
+            const format = cmdOpts.format || 'yyyy-MM-dd';
+            const rangeTitle = title || fieldName;
+            const start = {
+                componentKey: 'DateComponent', content: '', describe: '', earlyDate: 'false',
+                format, isDefault: 'false', lateDate: 'false',
+                placeholder: placeholderFromFormat(format),
+                position: '', relateMultiple: 'false', required: 'false', size: 'medium',
+                title: `${rangeTitle}(开始时间)`, fieldId: startId,
+                min: { type: 'currentHour' }, max: { type: 'currentHour' },
+            };
+            const end = { ...start, title: `${rangeTitle}(结束时间)`, fieldId: endId };
+            Object.assign(jsonObj, {
+                isDefault: false,
+                start, end,
+                hasDisplayFormat: true,
+                rangeInterval: { limitType: 'max', timeUnit: 'day' },
+            });
+        }
+        else if (fieldType === 'IDCard') {
+            // 身份证号：平台原生简单字段，浏览器抓包 payload 极简（type/title/formTableId/dataKey/
+            // columnName/fieldId/formId/showOrder/groupId 即全部）——无 componentKey、无文本长度配置。
+            delete jsonObj.componentKey;
+            delete jsonObj.maxLen;
+            delete jsonObj.unique;
+            delete jsonObj.scan;
+            delete jsonObj.readonlyTransLink;
+        }
+        else {
+            // 文本最大长度：--max-len 指定，缺省 Text=100、TextArea=4000（对齐浏览器抓包；TextArea 在上面分支已设 content:""）
+            const defaultMaxLen = fieldType === 'TextArea' ? 4000 : 100;
+            const maxLen = cmdOpts.maxLen !== undefined ? Number(cmdOpts.maxLen) : defaultMaxLen;
+            Object.assign(jsonObj, {
+                maxLen: Number.isFinite(maxLen) && maxLen > 0 ? maxLen : defaultMaxLen,
+                unique: false, scan: false,
+                readonlyTransLink: false,
+            });
+        }
+        // 人员/部门多选：默认单选，--multiple 改多选（isSingle:false）。EBuilder 已在上文分支设过。
+        if (fieldType === 'Employee' || fieldType === 'Department') {
+            jsonObj.isSingle = cmdOpts.multiple ? false : true;
+        }
+        // 下拉多选是独立类型 SelectMultiple（非 Select + 开关）。浏览器抓包：type:"SelectMultiple"，
+        // 无 componentKey/maxLen/unique/scan（else 分支给 Select 加的 junk 要清掉），options 单独配。
+        if (fieldType === 'Select' && cmdOpts.multiple) {
+            jsonObj.type = 'SelectMultiple';
+            jsonObj.componentKey = 'SelectMultiple';
+            delete jsonObj.maxLen;
+            delete jsonObj.unique;
+            delete jsonObj.scan;
+            delete jsonObj.readonlyTransLink;
+        }
+        const payload = {
+            formId, module: 'ebuilderform',
+            customParam: { appId, objId },
+            jsonObj: JSON.stringify(jsonObj),
+        };
+        const data = await client.post(`${baseUrl}/api/ebuilder/form/form/field/manage/saveFormFieldNew?apid=${appId}`, payload, { ebbusinessid: formId });
+        if (data?.code === 200 && data?.status) {
+            const msg = opts.json ? JSON.stringify({ fieldId, fieldName }) : `字段已添加: ${fieldName} (fieldId=${fieldId})`;
+            console.log(msg);
+            // 关联浏览弹窗显示列：add-field 的 EBuilder 字段自动配 ffDisplayColumns = 目标表全部业务字段（去系统字段），
+            // 对齐 create Step2。直接带 ffDisplayColumns 进 jsonObj 不落库，需 getFormField 完整配置 + 单独 save。
+            if (fieldType === 'EBuilder' && sformId) {
+                try {
+                    const tfd = await client.post(`${baseUrl}/api/ebuilder/form/dataset/v1/getFields`, {
+                        objId: sformId, userid: auth.userId, tenantKey: auth.tenantKey,
+                    });
+                    // 默认显示列最多 5 个（去系统字段后取前 5 个业务字段）
+                    const bizCols = (tfd?.data?.mainFields || [])
+                        .filter((f) => /^\d+$/.test(String(f.fieldId)))
+                        .map((f) => ({ id: String(f.fieldId), name: String(f.fieldName || f.title || '') }))
+                        .slice(0, 5);
+                    if (bizCols.length) {
+                        const gf = await client.post(`${baseUrl}/api/ebuilder/form/form/field/manage/getFormField`, { module: 'ebuilderform', formTableField: { formField: { id: fieldId, form: { id: formId } } } }, { ebbusinessid: formId });
+                        const full = gf?.data || {};
+                        if (full.fieldId) {
+                            await client.post(`${baseUrl}/api/ebuilder/form/form/field/manage/saveFormFieldNew?apid=${appId}`, { formId, module: 'ebuilderform', customParam: { appId, objId }, jsonObj: JSON.stringify({ ...full, ffDisplayColumns: bizCols }) }, { ebbusinessid: formId });
+                            console.error(`  关联显示列已自动配置 (${bizCols.length} 列)`);
+                        }
+                    }
+                }
+                catch (e) {
+                    console.error(`  关联显示列设置失败: ${e.message}`);
+                }
+            }
+            // Always relayout so new field appears in the form
+            console.error('  重新生成布局...');
+            try {
+                const preLayout = await client.post(`${baseUrl}/api/ebuilder/form/builder/getFormLayout`, {
+                    formId, module: 'ebuilderform', customParam: {}, formTableIdList: [],
+                    designerParam: { onlyLayout: false, convert: false }, form: { id: formId },
+                }, { ebbusinessid: formId });
+                const layoutId = preLayout?.data?.formLayout?.id || '';
+                const layoutMultiId = preLayout?.data?.formLayout?.multipleLayoutId || '';
+                const layoutName = preLayout?.data?.formLayoutMultiple?.name || preLayout?.data?.formLayout?.name || '';
+                const layoutType = preLayout?.data?.formLayoutMultiple?.layoutType || 'EXCEL';
+                const configRes = await client.post(`${baseUrl}/api/ebuilder/form/form/view/relate/getConfig`, {
+                    formId, module: 'ebuilderform', apiModule: 'ebuilder/form',
+                    layoutId, customParam: { terminal: '', objId: formId },
+                    initMode: 5, groupFieldIds: [], designerParam: { sourceModule: 'ebuilderform' },
+                }, { ebbusinessid: formId });
+                const rawConfigs = configRes?.data?.configs || [];
+                // saveFormFieldNew fields may not appear in getConfig — manually append
+                const CK = {
+                    Text: 'Text', Textarea: 'TextArea', Number: 'NumberComponent', Money: 'Money',
+                    Date: 'DateComponent', DateTime: 'DateComponent', Select: 'Select', CheckBox: 'CheckBox', RadioBox: 'RadioBox',
+                    Employee: 'Employee', Department: 'Department', EBuilder: 'Ebuilder',
+                    Phone: 'Phone', Email: 'Email', Mobile: 'Mobile', Location: 'Location', Switch: 'Switch', IDCard: 'IDCard',
+                };
+                const newFieldConfig = {
+                    id: fieldId, name: title || fieldName,
+                    componentKey: jsonObj.componentKey || CK[fieldType] || fieldType,
+                    display: true, show: true, readOnly: false,
+                    required: false, disableEdit: false, singleRow: cmdOpts.singleRow === true,
+                    isDelete: false, type: fieldType, dataKey: colName,
+                };
+                const existingIds = new Set(rawConfigs.map((c) => String(c.id)));
+                if (cmdOpts.subFormId) {
+                    // 明细字段：加进对应 DetailTable 的 children（明细字段嵌在 DetailTable 里，不是顶层）
+                    const dtComp = rawConfigs.find((c) => String(c.id) === String(cmdOpts.subFormId) && c.type === 'DetailTable');
+                    if (dtComp) {
+                        const childIds = new Set((dtComp.children || []).map((x) => String(x.id)));
+                        if (!childIds.has(fieldId)) {
+                            dtComp.children = dtComp.children || [];
+                            dtComp.children.push({ ...newFieldConfig, showOrder: dtComp.children.length });
+                        }
+                    }
+                    else {
+                        console.error(`  ⚠ 布局里未找到明细表 subFormId=${cmdOpts.subFormId}，字段已加但未进布局`);
+                    }
+                }
+                else if (!existingIds.has(fieldId)) {
+                    rawConfigs.push({ ...newFieldConfig, showOrder: rawConfigs.length });
+                }
+                const configs = rawConfigs.map((c) => ({
+                    ...c,
+                    display: c.system ? c.display : true,
+                    show: c.system ? c.show : true,
+                    // 新加字段 saveFormFieldNew 后 getConfig 返回 readOnly:true（未铺列默认），
+                    // existingIds 命中时 newFieldConfig(readOnly:false) 会被丢弃，这里强制覆盖回 false，
+                    // 否则任何 add-field 新字段（Text/Employee/EBuilder 都中招）默认不可编辑。
+                    ...(String(c.id) === String(fieldId) ? { readOnly: false } : {}),
+                }));
+                await client.post(`${baseUrl}/api/ebuilder/form/form/view/relate/initLayout?apid=${appId}`, {
+                    formId, module: 'ebuilderform', apiModule: 'ebuilder/form',
+                    layoutId, generateCollapse: true,
+                    styleTemplateId: layoutType === 'FLOW' ? '820000000000000001' : '700000000000000008', styleTemplateType: 1,
+                    configs, addLayout: false, ecodeType: ['js', 'css'],
+                    initMode: '1', customParam: { terminal: '', objId: formId },
+                    formLayoutMultiple: { isSys: true, id: layoutMultiId, name: layoutName, terminalType: 'PC', layoutType },
+                    designerParam: { onlyLayout: false },
+                }, { ebbusinessid: formId });
+                console.error('  布局已更新');
+            }
+            catch (e) {
+                console.error(`  布局更新失败: ${e.message}`);
+            }
+        }
+        else {
+            console.error(`添加失败: ${data?.msg || JSON.stringify(data) || '未知错误'}`);
+            process.exit(1);
+        }
+    });
+    form.command('edit-field')
+        .description('编辑已有字段的属性')
+        .argument('<objId>', '表单 objId')
+        .argument('<appId>', '应用 ID')
+        .argument('<fieldId>', '字段 ID')
+        .option('--title <title>', '修改字段标题')
+        .option('--required', '设为必填')
+        .option('--no-required', '取消必填')
+        .option('--sform-id <id>', 'EBuilder 关联的目标表单 objId（更新关联）')
+        .option('--data-title <field>', '目标表单显示字段名/fieldId（默认 name=目标表含"名称"的字段，无则第一个业务字段）')
+        .option('--form-name <name>', '目标表单名称（默认查目标表单名）')
+        .option('--relate-from <fieldName>', 'EBuilder 字段名：选关联记录后自动带出值到当前字段')
+        .option('--relate-from-source <fieldId>', '目标表单源字段 fieldId（复制哪个字段的值）')
+        .option('--multiple', '设为多选（人员/部门/EBuilder/Browser）')
+        .option('--no-multiple', '设为单选（人员/部门/EBuilder/Browser）')
+        .action(async (objId, appId, fieldId, editOpts) => {
+        const opts = program.opts();
+        const auth = await AuthSession.fromOptions(opts);
+        if (!auth)
+            process.exit(1);
+        const client = new ApiClient(auth);
+        const baseUrl = auth.getBaseUrl();
+        // Get formId — try getList first, fall back to searching by fieldId
+        let formId = '';
+        let resolvedObjId = objId;
+        const formList = await client.get(`${baseUrl}/api/bs/ebuilder/form/obj/getList/${appId}?apid=${appId}`, { ebbusinessid: appId });
+        const formInfo = (formList?.data || []).find((f) => String(f.id) === String(objId));
+        formId = formInfo?.formId || '';
+        // If not found in getList (e.g. workflow sub-table objId), search by fieldId
+        if (!formId) {
+            const pageRes = await client.post(`${baseUrl}/api/ebuilder/form/form/field/manage/getFormFieldPage?apid=${appId}`, {
+                pageNo: 1, pageSize: 100, module: 'ebuilderform',
+                customParam: { appId },
+                formFieldSearchEntity: { isDelete: 0, status: 'enable' },
+            }, { ebbusinessid: appId });
+            const records = pageRes?.data?.pageDatas?.result || pageRes?.data?.data?.records || pageRes?.data?.data || [];
+            const match = records.find((r) => String(r.fieldId) === String(fieldId));
+            if (match?.formId) {
+                formId = match.formId;
+                // Find the correct objId for this form (for saveFormFieldNew payload)
+                const matchForm = (formList?.data || []).find((f) => f.formId === formId);
+                if (matchForm)
+                    resolvedObjId = matchForm.id;
+            }
+        }
+        if (!formId) {
+            console.error('无法获取 formId，请确认 fieldId 和 appId 正确');
+            process.exit(1);
+        }
+        // Get formTableId for the payload
+        const formTableId = formInfo?.formTableId || '';
+        // Try to get current field config, but if it fails (e.g. workflow sub-table),
+        // construct a minimal jsonObj from known parameters
+        let jsonObj = null;
+        try {
+            const fieldDetailRes = await client.post(`${baseUrl}/api/ebuilder/form/form/field/manage/getFormFieldPage?apid=${appId}`, {
+                pageNo: 1, pageSize: 200, module: 'ebuilderform',
+                customParam: { appId },
+                formFieldSearchEntity: { isDelete: 0, status: 'enable', formId },
+            }, { ebbusinessid: formId });
+            const records = fieldDetailRes?.data?.pageDatas?.result || fieldDetailRes?.data?.data?.records || fieldDetailRes?.data?.data || [];
+            const fieldDetail = records.find((r) => String(r.fieldId) === String(fieldId));
+            if (fieldDetail?.jsonObj) {
+                jsonObj = typeof fieldDetail.jsonObj === 'string'
+                    ? JSON.parse(fieldDetail.jsonObj)
+                    : fieldDetail.jsonObj;
+                if (fieldDetail.formId)
+                    formId = fieldDetail.formId;
+            }
+        }
+        catch { /* fall through to minimal jsonObj */ }
+        if (!jsonObj) {
+            // Couldn't get field via getFormFieldPage — try getFields
+            const fieldsRes = await client.post(`${baseUrl}/api/ebuilder/form/dataset/v1/getFields`, {
+                objId: resolvedObjId, userid: auth.userId, tenantKey: auth.tenantKey,
+            });
+            const allFields = [...(fieldsRes?.data?.mainFields || []), ...(fieldsRes?.data?.subFields || [])];
+            const gf = allFields.find((f) => String(f.fieldId) === String(fieldId));
+            let colName = gf?.columnName || gf?.dataKey || '';
+            if (!colName || /[^\x00-\x7F]/.test(colName)) {
+                // 中文/空 columnName（getFields 对 EBuilder 不返回 columnName）：用拼音首字母，
+                // 不用 fld_<id>（否则物理列变 fld_xxx，破坏"数据库字段名=首字母拼音"约定）
+                colName = toColumnName(String(gf?.fieldName || '')) || 'fld_' + fieldId.slice(-8);
+            }
+            jsonObj = {
+                type: gf?.fieldKey || gf?.fieldType || 'Text',
+                title: gf?.fieldName || '',
+                fieldId, formId, groupId: '-1',
+                formTableId: gf?.formTableId || formTableId,
+                showOrder: '0.00',
+                dataKey: colName, columnName: colName,
+                optionSerials: [],
+            };
+        }
+        // 兜底补 componentKey：saveFormFieldNew 要求（getComponentKey() 为 null 会 NPE）。
+        // getFields 兜底路径建不出 componentKey，这里按类型映射补上。
+        if (!jsonObj.componentKey) {
+            const CK = {
+                Date: 'DateComponent', DateTime: 'DateComponent', Text: 'Text', Textarea: 'TextArea', Number: 'NumberComponent',
+                Money: 'Money', Select: 'Select', CheckBox: 'CheckBox', RadioBox: 'RadioBox',
+                Employee: 'Employee', Department: 'Department', EBuilder: 'Ebuilder',
+                Phone: 'Phone', Email: 'Email', Mobile: 'Mobile', Location: 'Location', Switch: 'Switch', IDCard: 'IDCard',
+            };
+            jsonObj.componentKey = CK[jsonObj.type] || jsonObj.type;
+        }
+        // Apply title change
+        if (editOpts.title) {
+            jsonObj.title = editOpts.title;
+        }
+        // Apply required
+        if (editOpts.required) {
+            jsonObj.required = true;
+        }
+        else if (editOpts.noRequired) {
+            jsonObj.required = false;
+        }
+        // Apply EBuilder association update（对齐 create Step 2 的 EBuilder 绑定 jsonObj 结构）。
+        // 触发条件：--sform-id 换关联，或 --multiple/--no-multiple 切多选（无 --sform-id 时从
+        // getFormLayout 拉现有关联 sformId/dataTitle/formName，缺了重保存会丢关联）。
+        const isEbEdit = ['EBuilder', 'Ebuilder'].includes(jsonObj.type) && (editOpts.sformId || editOpts.dataTitle !== undefined || editOpts.multiple !== undefined);
+        if (isEbEdit) {
+            let sformId = editOpts.sformId || '';
+            let fallbackDataTitle = '';
+            let fallbackFormName = '';
+            // getFields 对 EBuilder 不返回 columnName/dataKey，兜底会按字段名算坏 dataKey
+            //（中文名+数字 → "2"）。从 getFormLayout 拉完整 config，补 sformId + dataKey/columnName。
+            if (!sformId || !jsonObj.dataKey || /[一-龥]/.test(String(jsonObj.dataKey))) {
+                try {
+                    const layoutRes = await client.post(`${baseUrl}/api/ebuilder/form/builder/getFormLayout`, { formId, module: 'ebuilderform', customParam: {}, formTableIdList: [],
+                        designerParam: { onlyLayout: false, convert: false }, form: { id: formId } }, { ebbusinessid: formId });
+                    const lPages = layoutRes?.data?.formLayout?.pageLayouts || layoutRes?.data?.pageLayouts || [];
+                    const lComps = (lPages || []).flatMap((p) => Array.isArray(p.comps) ? p.comps : []);
+                    const full = lComps.find((c) => String(c?.config?.fieldId) === String(fieldId) || String(c?.id) === String(fieldId))?.config;
+                    if (full?.sformId) {
+                        sformId = sformId || full.sformId;
+                        fallbackDataTitle = fallbackDataTitle || full.dataTitle || '';
+                        fallbackFormName = fallbackFormName || full.formName || '';
+                    }
+                    if (full?.dataKey) {
+                        jsonObj.dataKey = full.dataKey;
+                        if (full.columnName)
+                            jsonObj.columnName = full.columnName;
+                    }
+                }
+                catch { /* 拿不到关联则只切多选 */ }
+            }
+            if (sformId) {
+                // 解析 dataTitle：纯数字 fieldId 直接用；'name' → 优先字段名含「名称」的业务字段，无则第一个；否则按名称查目标表字段
+                let dataTitle = editOpts.dataTitle || fallbackDataTitle || 'name';
+                if (!/^\d{15,}$/.test(dataTitle)) {
+                    try {
+                        const tfd = await client.post(`${baseUrl}/api/ebuilder/form/dataset/v1/getFields`, {
+                            objId: sformId, userid: auth.userId, tenantKey: auth.tenantKey,
+                        });
+                        const tfields = tfd?.data?.mainFields || [];
+                        if (dataTitle === 'name') {
+                            dataTitle = defaultEBuilderDataTitle(tfields);
+                        }
+                        else {
+                            const m = tfields.find(f => f.fieldName === dataTitle)
+                                || tfields.find(f => String(f.fieldName || '').includes(dataTitle));
+                            dataTitle = m?.fieldId || dataTitle;
+                        }
+                    }
+                    catch { /* 解析失败保留原值 */ }
+                }
+                // formName 默认查目标表单名
+                let formName = editOpts.formName || fallbackFormName || '';
+                if (!formName) {
+                    try {
+                        const tlist = await client.get(`${baseUrl}/api/bs/ebuilder/form/obj/getList/${appId}?apid=${appId}`, { ebbusinessid: appId });
+                        const tf = (tlist?.data || []).find((f) => String(f.id) === String(sformId));
+                        formName = tf?.formName || tf?.name || sformId;
+                    }
+                    catch {
+                        formName = sformId;
+                    }
+                }
+                jsonObj.type = 'EBuilder';
+                jsonObj.componentKey = 'Ebuilder';
+                jsonObj.sformId = sformId;
+                jsonObj.dataTitle = dataTitle;
+                jsonObj.formName = formName;
+                jsonObj.appId = appId;
+                jsonObj.isAddForRelation = true;
+                jsonObj.viewDataDetail = true;
+                jsonObj.displayType = 'line';
+                jsonObj.virtualForm = false;
+                jsonObj.virtualTable = false;
+                jsonObj.isSingle = editOpts.multiple ? false : true; // 默认单选；--multiple 多选
+                jsonObj.isUnique = true;
+                jsonObj.relateField = null;
+                jsonObj.relateViewData = jsonObj.relateViewData || [];
+                jsonObj.quickAddParams = jsonObj.quickAddParams || [];
+            }
+            else if (editOpts.multiple !== undefined) {
+                // 拿不到关联：只切多选，不动关联配置
+                jsonObj.isSingle = editOpts.multiple ? false : true;
+            }
+        }
+        // 多选切换（人员/部门/Browser）：--multiple 多选 / --no-multiple 单选。
+        // EBuilder 已在上文分支处理。
+        if (!['EBuilder', 'Ebuilder'].includes(jsonObj.type) && editOpts.multiple !== undefined) {
+            jsonObj.isSingle = editOpts.multiple ? false : true;
+        }
+        // Apply relateFrom（值带出 / ffRelateField）：选 EBuilder 关联记录后自动带出目标表单字段值。
+        // ffRelateField 不在字段的 getFormFieldPage record / otherProperties 里，由平台存到关联配置中。
+        if (editOpts.relateFrom) {
+            // 找 EBuilder 字段（从 getFormFieldPage）
+            const ebRecord = await (async () => {
+                try {
+                    const r2 = await client.post(`${baseUrl}/api/ebuilder/form/form/field/manage/getFormFieldPage?apid=${appId}`, {
+                        pageNo: 1, pageSize: 200, module: 'ebuilderform',
+                        customParam: { appId },
+                        formFieldSearchEntity: { isDelete: 0, status: 'enable', formId },
+                    }, { ebbusinessid: formId });
+                    const recs = r2?.data?.pageDatas?.result || r2?.data?.data?.records || r2?.data?.data || [];
+                    return recs.find((r) => r.title === editOpts.relateFrom || r.fieldName === editOpts.relateFrom);
+                }
+                catch {
+                    return null;
+                }
+            })();
+            if (!ebRecord || !ebRecord.fieldId || !ebRecord.sformId) {
+                console.error(`    警告: 找不到 EBuilder 字段 "${editOpts.relateFrom}" 或其 sformId，跳过 relateFrom 配置`);
+            }
+            else {
+                const sourceFieldId = editOpts.relateFromSource || '';
+                // 从目标表单查源字段名（ffRelateField.title）
+                let sourceTitle = sourceFieldId;
+                try {
+                    const tfd = await client.post(`${baseUrl}/api/ebuilder/form/dataset/v1/getFields`, {
+                        objId: ebRecord.sformId, userid: auth.userId, tenantKey: auth.tenantKey,
+                    });
+                    const tf = tfd?.data?.mainFields || [];
+                    const sf = tf.find((f) => String(f.fieldId) === String(sourceFieldId));
+                    if (sf)
+                        sourceTitle = sf.fieldName || sourceFieldId;
+                }
+                catch { /* 留 fieldId 兜底 */ }
+                jsonObj.ffRelateField = {
+                    component: { key: jsonObj.type || 'Text' },
+                    isField: true,
+                    title: sourceTitle,
+                    key: sourceFieldId,
+                    isMultiple: false,
+                    fieldId: ebRecord.fieldId,
+                };
+            }
+        }
+        const payload = {
+            formId, module: 'ebuilderform',
+            customParam: { appId, objId: resolvedObjId },
+            jsonObj: JSON.stringify(jsonObj),
+        };
+        const data = await client.post(`${baseUrl}/api/ebuilder/form/form/field/manage/saveFormFieldNew?apid=${appId}`, payload, { ebbusinessid: formId });
+        if (data?.code === 200 && data?.status) {
+            const changes = [];
+            if (editOpts.title)
+                changes.push(`title="${editOpts.title}"`);
+            if (editOpts.required)
+                changes.push('required');
+            if (editOpts.noRequired)
+                changes.push('!required');
+            if (editOpts.sformId)
+                changes.push(`EBuilder→${editOpts.sformId}`);
+            if (editOpts.dataTitle !== undefined)
+                changes.push(`dataTitle=${editOpts.dataTitle}`);
+            if (editOpts.relateFrom)
+                changes.push(`relateFrom ${editOpts.relateFrom}→${editOpts.relateFromSource || ''}`);
+            if (editOpts.multiple !== undefined)
+                changes.push(editOpts.multiple ? 'multiple' : '!multiple');
+            const msg = opts.json ? JSON.stringify({ fieldId, changes }) : `字段已更新: ${fieldId} (${changes.join(', ') || 'no changes'})`;
+            console.log(msg);
+        }
+        else {
+            console.error(`编辑失败: ${data?.msg || '未知错误'}`);
+            process.exit(1);
+        }
+    });
+    form.command('delete')
+        .description('删除表单')
+        .argument('<objId>', '表单 objId')
+        .argument('<appId>', '应用 ID')
+        .action(async (objId, appId) => {
+        const opts = program.opts();
+        const auth = await AuthSession.fromOptions(opts);
+        if (!auth)
+            process.exit(1);
+        const client = new ApiClient(auth);
+        const baseUrl = auth.getBaseUrl();
+        const data = await client.get(`${baseUrl}/api/bs/ebuilder/form/obj/delete/${objId}?apid=${appId}&objId=${objId}`, { ebbusinessid: appId });
+        if (data?.code === 200 && data?.status) {
+            const msg = opts.json ? JSON.stringify({ success: true, objId }) : `表单已删除: ${objId}`;
+            console.log(msg);
+        }
+        else {
+            console.error(`删除失败: ${data?.msg || '未知错误'}`);
+            process.exit(1);
+        }
+    });
+    form.command('list-view')
+        .description('查看表单的台账/数据列表')
+        .argument('<objId>', '表单 objId')
+        .argument('<appId>', '应用 ID')
+        .action(async (objId, appId) => {
+        const opts = program.opts();
+        const auth = await AuthSession.fromOptions(opts);
+        if (!auth)
+            process.exit(1);
+        const client = new ApiClient(auth);
+        const baseUrl = auth.getBaseUrl();
+        const data = await client.post(`${baseUrl}/api/bs/ebuilder/form/list/getNList?apid=${appId}&appId=${appId}&tpaid=${objId}&objId=${objId}`, { objId });
+        if (data?.code !== 200 || !data?.status) {
+            console.error(`查询失败: ${data?.msg || '未知错误'}`);
+            process.exit(1);
+        }
+        const lists = data?.data || [];
+        if (opts.json) {
+            console.log(JSON.stringify(lists, null, 2));
+        }
+        else {
+            console.log(`表单 ${objId} 共 ${lists.length} 个台账：`);
+            for (const l of lists) {
+                console.log(`  [${l.id}] ${l.name || '(未命名)'}  viewType=${l.viewType}`);
+            }
+        }
+    });
+    return form;
+}
+//# sourceMappingURL=form.js.map