weaver-e10-builder 1.0.7-beta → 1.0.8-beta

package/dist/commands/wf-form.js

@@ -31,6 +31,8 @@ function canon(ck) {
         textarea: 'TextArea', text: 'Text', number: 'Number', money: 'Money',
         date: 'Date', datetime: 'DateTime', select: 'Select', selectmultiple: 'SelectMultiple',
         employee: 'Employee', department: 'Department', browser: 'Browser',
+        file: 'FileComponent', filecomponent: 'FileComponent', upload: 'FileComponent', 附件: 'FileComponent',
+        ebuilder: 'Ebuilder', eb: 'Ebuilder', flow: 'Flow',
     };
     return m[ck.toLowerCase()] || ck;
 }
@@ -55,6 +57,52 @@ async function readConfigs(client, baseUrl, formId) {
         throw new Error(`getConfig 失败: ${cfg?.msg}`);
     return { ...meta, configs: normalizeDetailTableChildren(cfg?.data?.configs || []) };
 }
+/** 读取运行时布局（getFormLayout pageLayouts comps），返回 singleRow=true 的字段 ID 集合。
+ *  getConfig 的 configs 不带已保存的 singleRow（设计视图默认 false）；field-prop/group/layout init
+ *  重排前若不从运行时合并回来，独占一行字段会被 initLayout 冲掉（实测：group initLayout 后 客户地址 singleRow 丢失）。 */
+async function fetchRuntimeSingleRows(client, baseUrl, formId) {
+    try {
+        const res = await client.post(`${baseUrl}${ROUTE}/builder/getFormLayout`, {
+            formId, module: MODULE, customParam: {}, formTableIdList: [],
+            designerParam: { onlyLayout: false, convert: false }, form: { id: formId },
+        }, { ebbusinessid: formId });
+        const pls = res?.data?.formLayout?.pageLayouts || res?.data?.pageLayouts || [];
+        const comps = pls[0]?.comps || [];
+        const set = new Set();
+        const walk = (arr) => {
+            for (const x of arr) {
+                const cfg = x.config || x;
+                const fid = cfg.fieldId || cfg.id || x.id;
+                if (fid && cfg.singleRow === true)
+                    set.add(String(fid));
+                if (x.components?.length)
+                    walk(x.components);
+                if (x.children?.length)
+                    walk(x.children);
+            }
+        };
+        walk(comps);
+        return set;
+    }
+    catch {
+        return new Set();
+    }
+}
+/** 将运行时已保存的 singleRow 合并回 getConfig configs（递归含 Collapse children），保留独占一行不被重排冲掉。 */
+function mergeRuntimeSingleRow(configs, srSet) {
+    if (!srSet.size)
+        return;
+    const walk = (arr) => {
+        for (const c of arr) {
+            const fid = c.id || c.fieldId;
+            if (fid && srSet.has(String(fid)))
+                c.singleRow = true;
+            if (c.children?.length)
+                walk(c.children);
+        }
+    };
+    walk(configs);
+}
 async function genIds(client, baseUrl, n) {
     const r = await client.post(`${baseUrl}/api/form/local/generatorIds?size=${n}`, {});
     return (r?.data?.generatorIds || []).map(String);
@@ -93,9 +141,76 @@ export function registerWorkflowFormCommands(program) {
             process.exitCode = 1;
         }
     });
+    /** 构建字段 jsonObj（add-field / add-fields 共用）。返回未带 fieldId 的模板，调用方填 fieldId。 */
+    function buildFieldJsonObj(fieldName, fieldType, title, o, formId, fieldId) {
+        const ck = canon(fieldType);
+        const colName = toColumnName(fieldName);
+        const jsonObj = {
+            type: ck, title: title || fieldName, fieldId, groupId: '-1', formId, showOrder: '0.00',
+            dataKey: colName, columnName: colName,
+        };
+        if (o.singleRow === true)
+            jsonObj.singleRow = true;
+        if (o.subFormId)
+            jsonObj.subFormId = o.subFormId;
+        if (ck === 'Number' || ck === 'Money') {
+            const isPercent = ck === 'Number' && o.percent === true;
+            const hasDefault = o.default !== undefined && o.default !== null && o.default !== '';
+            Object.assign(jsonObj, {
+                pointSize: o.precision !== undefined ? o.precision : (isPercent ? '1' : (ck === 'Money' ? '2' : '0')),
+                isDefault: hasDefault, isDelimiter: ck === 'Money', isCapital: false,
+                capitalFormat: 'onlyUpperCase', capitalPosition: 'outside', capitalSetting: 'system',
+                capitalPrecision: 'yuan', isExchangeRates: false,
+                ...(ck === 'Number' ? { numberType: isPercent ? 'percentage' : 'number', content: hasDefault ? String(o.default) : '' } : {}),
+                ...(hasDefault ? { stepMode: false, step: 1 } : {}),
+            });
+        }
+        else if (ck === 'TextArea') {
+            Object.assign(jsonObj, { content: '', maxLen: 4000 });
+        }
+        else if (ck === 'Date' || ck === 'DateTime') {
+            const fmt = o.format || (ck === 'DateTime' ? 'yyyy-MM-dd HH:mm' : 'yyyy-MM-dd');
+            Object.assign(jsonObj, { type: 'Date', format: fmt, placeholder: placeholderFromFormat(fmt), timePanelStyle: { type: 'system' }, isDefault: false, earlyType: 'currentDay', lateType: 'currentDay' });
+            if (o.defaultCurrent) {
+                jsonObj.isDefault = true;
+                jsonObj.defaultExtend = { date: { type: 'current' }, time: { customValue: '00:00', type: 'custom' } };
+            }
+        }
+        else if (ck === 'Employee' || ck === 'Department' || ck === 'Browser') {
+            jsonObj.isSingle = o.multiple ? false : true;
+            if (o.defaultCurrent && ck === 'Employee') {
+                jsonObj.defaultExtend = { type: 'current', relation: 'current', virtualId: '1' };
+            }
+        }
+        else if (ck === 'Select') {
+            if (o.multiple) {
+                jsonObj.type = 'SelectMultiple';
+                jsonObj.componentKey = 'SelectMultiple';
+            }
+        }
+        else if (ck === 'EBuilder' || ck === 'Flow') {
+            // EBuilder 关联字段（浏览器抓包 saveFormFieldNew 实测格式）：type=EBuilder(大写EB)，
+            // 标准字段元数据（isAllFormData/hasDisplayFormat/openRelateView/dataCount/currentLevel/columnType/
+            // columnTypeSwitch/singleEdit/typeLen）+ displayType=space + isAddForRelation=false + sformId/dataTitle/formName
+            // + content/formEntity/filterQueryParams/filterParams（抓包含，filterParams 可能承载字段层筛选）。
+            Object.assign(jsonObj, {
+                isAllFormData: false, viewDataDetail: true, quickAddParams: [],
+                hasDisplayFormat: false, openRelateView: false,
+                dataCount: 0, currentLevel: '1', columnType: 'TEXT', columnTypeSwitch: false,
+                singleEdit: true, typeLen: 16, isAddForRelation: false, displayType: 'space',
+                sformId: o.sformId || '', dataTitle: o.dataTitle || 'name',
+                relateViewData: [], formName: o.formName || '', relateField: null,
+                content: [], formEntity: {}, filterQueryParams: '{}', filterParams: '{}',
+                virtualForm: false, appId: o.appId || '', virtualTable: false,
+            });
+        }
+        if (!jsonObj.componentKey)
+            jsonObj.componentKey = jsonObj.type;
+        return jsonObj;
+    }
     // ---------- wf-form add-field ----------
     wfForm.command('add-field')
-        .description('给流程表单加字段（Text/TextArea/Number/Money/Date/DateTime/Select/Employee/Department/Browser）')
+        .description('给流程表单加字段（Text/TextArea/Number/Money/Date/DateTime/Select/Employee/Department/Browser/EBuilder/Flow）')
         .argument('<formId>', '流程表单 formId')
         .argument('<fieldName>', '字段名')
         .argument('<fieldType>', '字段类型')
@@ -106,6 +221,12 @@ export function registerWorkflowFormCommands(program) {
         .option('--percent', 'Number 百分比显示（numberType=percentage）')
         .option('--default <value>', 'Number/Money 默认值')
         .option('--format <fmt>', '日期精度（Date 默认 yyyy-MM-dd / DateTime 默认 yyyy-MM-dd HH:mm）')
+        .option('--single-row', '独占一行显示（布局 singleRow:true，其余字段仍两列；对齐 eb 表 form add-field --single-row）')
+        .option('--default-current', '系统默认值：Date=当前日期 / Employee=创建人（对齐 eb 表 fields.json defaultValue:true）')
+        .option('--sform-id <objId>', 'EBuilder/Flow 关联的目标表单 objId（EBuilder 必填）')
+        .option('--app-id <appId>', '目标表单所属应用 appId（EBuilder 建议传，不传 formName 自动解析需要）')
+        .option('--data-title <field>', 'EBuilder 关联显示字段（默认 name；目标表含"名称"的字段或 fieldId）')
+        .option('--form-name <name>', '目标表单名称（不传自动解析）')
         .action(async (formId, fieldName, fieldType, title, o) => {
         try {
             const opts = program.opts();
@@ -120,43 +241,23 @@ export function registerWorkflowFormCommands(program) {
             const [fieldId] = await genIds(client, baseUrl, 1);
             if (!fieldId)
                 throw new Error('生成 fieldId 失败');
-            const jsonObj = {
-                type: ck, title: title || fieldName, fieldId, groupId: '-1', formId, showOrder: '0.00',
-                dataKey: colName, columnName: colName,
-            };
-            if (o.subFormId)
-                jsonObj.subFormId = o.subFormId; // 明细字段带 subFormId；formTableId 一律省略（流程表单无独立 formTableId）
-            if (ck === 'Number' || ck === 'Money') {
-                const isPercent = ck === 'Number' && o.percent === true;
-                const hasDefault = o.default !== undefined && o.default !== null && o.default !== '';
-                Object.assign(jsonObj, {
-                    pointSize: o.precision !== undefined ? o.precision : (isPercent ? '1' : (ck === 'Money' ? '2' : '0')),
-                    isDefault: hasDefault, isDelimiter: ck === 'Money', isCapital: false,
-                    capitalFormat: 'onlyUpperCase', capitalPosition: 'outside', capitalSetting: 'system',
-                    capitalPrecision: 'yuan', isExchangeRates: false,
-                    ...(ck === 'Number' ? { numberType: isPercent ? 'percentage' : 'number', content: hasDefault ? String(o.default) : '' } : {}),
-                    ...(hasDefault ? { stepMode: false, step: 1 } : {}),
-                });
-            }
-            else if (ck === 'TextArea') {
-                Object.assign(jsonObj, { content: '', maxLen: 4000 });
-            }
-            else if (ck === 'Date' || ck === 'DateTime') {
-                const fmt = o.format || (ck === 'DateTime' ? 'yyyy-MM-dd HH:mm' : 'yyyy-MM-dd');
-                Object.assign(jsonObj, { type: 'Date', format: fmt, placeholder: placeholderFromFormat(fmt), timePanelStyle: { type: 'system' }, isDefault: false });
-            }
-            else if (ck === 'Employee' || ck === 'Department' || ck === 'Browser') {
-                jsonObj.isSingle = o.multiple ? false : true;
-            }
-            else if (ck === 'Select') {
-                if (o.multiple) {
-                    jsonObj.type = 'SelectMultiple';
-                    jsonObj.componentKey = 'SelectMultiple';
+            // EBuilder 关联：校验 sformId，解析 formName（getList by appId）
+            if (ck === 'EBuilder' || ck === 'Flow') {
+                if (!o.sformId)
+                    throw new Error('EBuilder/Flow 类型必须传 --sform-id <目标表单 objId>');
+                if (!o.formName && o.appId) {
+                    try {
+                        const fl = await client.get(`${baseUrl}/api/bs/ebuilder/form/obj/getList/${o.appId}?apid=${o.appId}`, { ebbusinessid: o.appId });
+                        const tf = (fl?.data || []).find((f) => String(f.id) === String(o.sformId));
+                        if (tf?.formName || tf?.name)
+                            o.formName = tf.formName || tf.name;
+                    }
+                    catch { /* 留空兜底 */ }
                 }
-                // 选项需后续单独配（流程表单暂无 field-options 命令）
+                if (!o.formName)
+                    o.formName = o.sformId; // 兜底
             }
-            if (!jsonObj.componentKey)
-                jsonObj.componentKey = jsonObj.type;
+            const jsonObj = buildFieldJsonObj(fieldName, fieldType, title, o, formId, fieldId);
             const r = await client.post(`${baseUrl}${ROUTE}/field/manage/saveFormFieldNew`, { formId, module: MODULE, customParam: {}, jsonObj: JSON.stringify(jsonObj) }, ebb);
             if (r?.code !== 200 || !r?.status)
                 throw new Error(`加字段失败: ${r?.msg || '未知错误'}`);
@@ -170,6 +271,52 @@ export function registerWorkflowFormCommands(program) {
                 process.exitCode = 1;
                 return;
             }
+            // EBuilder/Flow 关联字段 follow-up：流程表单平台对从零构造的 jsonObj 不落 sformId/formName/appId/
+            // dataTitle/displayType（getFormField 读不到），需 getFormField 完整配置 + 补全关联信息 + ffDisplayColumns
+            // 二次 save 才落库（mulinquan/eteams 实测：full + sformId 二次 save 后回读 sformId 正确）。
+            // 对齐浏览器 saveFormFieldNew 格式：type=EBuilder / componentKey=Ebuilder(小写b) / displayType=space / isAddForRelation=false。
+            if (ck === 'EBuilder' || ck === 'Flow') {
+                try {
+                    const sform = o.sformId || jsonObj.sformId;
+                    if (sform) {
+                        const tfd = await client.post(`${baseUrl}/api/ebuilder/form/dataset/v1/getFields`, { objId: sform, userid: auth.userId, tenantKey: auth.tenantKey, isReturnDetail: 'y' });
+                        const displayCols = (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);
+                        const gf = await client.post(`${baseUrl}${ROUTE}/field/manage/getFormField`, { module: MODULE, formTableField: { formField: { id: fieldId, form: { id: formId } } } }, ebb);
+                        const full = gf?.data || {};
+                        if (full.fieldId) {
+                            const fullWithEb = {
+                                ...full,
+                                sformId: sform,
+                                appId: o.appId || full.appId || '',
+                                formName: o.formName || full.formName || '',
+                                dataTitle: o.dataTitle || 'name',
+                                displayType: 'space',
+                                isAddForRelation: false,
+                                componentKey: 'Ebuilder',
+                                type: 'EBuilder',
+                                content: full.content || [],
+                                formEntity: full.formEntity || {},
+                                filterQueryParams: full.filterQueryParams || '{}',
+                                filterParams: full.filterParams || '{}',
+                                virtualForm: false,
+                                virtualTable: false,
+                                ...(displayCols.length ? { ffDisplayColumns: displayCols } : {}),
+                            };
+                            await client.post(`${baseUrl}${ROUTE}/field/manage/saveFormFieldNew`, { formId, module: MODULE, customParam: {}, jsonObj: JSON.stringify(fullWithEb) }, ebb);
+                            if (displayCols.length)
+                                console.error(`  EBuilder 关联已配: ${o.formName || sform} → 显示列 ${displayCols.map((c) => c.name).join('/')}`);
+                            else
+                                console.error(`  EBuilder 关联已配: ${o.formName || sform}`);
+                        }
+                    }
+                }
+                catch (e) {
+                    console.error(`  ⚠ EBuilder 关联配置失败: ${e.message}`);
+                }
+            }
             console.log(opts.json
                 ? JSON.stringify({ success: true, formId, fieldId, fieldName, componentKey: jsonObj.componentKey, subFormId: o.subFormId || undefined }, null, 2)
                 : `字段已加: ${fieldName} (${jsonObj.componentKey}) fieldId=${fieldId}${o.subFormId ? ` (明细 ${o.subFormId})` : ''}${ck === 'Select' ? '  注:选项需单独配' : ''}`);
@@ -710,14 +857,97 @@ export function registerWorkflowFormCommands(program) {
             process.exitCode = 1;
         }
     });
+    // ---------- wf-form add-fields（批量）----------
+    wfForm.command('add-fields')
+        .description('批量加字段（@fields.json，末尾自动 layout init 重新布局）。JSON 数组，每项 {name,type,title?,subFormId?,multiple?,precision?,percent?,default?,format?,singleRow?,defaultCurrent?}')
+        .argument('<formId>', '流程表单 formId')
+        .argument('<fieldsJson>', '字段定义 JSON / @文件路径')
+        .option('--no-init', '跳过末尾自动 layout init（默认加完自动重排布局）')
+        .action(async (formId, fieldsJson, cmdOpts) => {
+        try {
+            const opts = program.opts();
+            const auth = await AuthSession.fromOptions(opts);
+            if (!auth)
+                throw new Error('无法加载认证');
+            const client = new ApiClient(auth);
+            const baseUrl = auth.getBaseUrl();
+            const ebb = { ebbusinessid: formId };
+            let str = fieldsJson;
+            if (str.startsWith('@')) {
+                const { readFileSync, existsSync } = await import('node:fs');
+                if (!existsSync(str.slice(1)))
+                    throw new Error('文件不存在');
+                str = readFileSync(str.slice(1), 'utf-8');
+            }
+            let defs;
+            try {
+                defs = JSON.parse(str);
+            }
+            catch {
+                throw new Error('fieldsJson 解析失败');
+            }
+            if (!Array.isArray(defs) || !defs.length)
+                throw new Error('fieldsJson 需为非空数组');
+            const ids = await genIds(client, baseUrl, defs.length);
+            let added = 0;
+            for (let i = 0; i < defs.length; i++) {
+                const d = defs[i];
+                if (!d.name || !d.type) {
+                    console.error(`  ⚠ 第 ${i + 1} 项缺 name/type，跳过`);
+                    continue;
+                }
+                const fieldId = ids[i];
+                const jsonObj = buildFieldJsonObj(d.name, d.type, d.title, d, formId, fieldId);
+                const r = await client.post(`${baseUrl}${ROUTE}/field/manage/saveFormFieldNew`, { formId, module: MODULE, customParam: {}, jsonObj: JSON.stringify(jsonObj) }, ebb);
+                if (r?.code === 200 && r?.status) {
+                    added++;
+                    console.error(`  + ${d.name} (${d.type}) fieldId=${fieldId}`);
+                }
+                else
+                    console.error(`  ✗ ${d.name} 失败: ${r?.msg || '未知错误'}`);
+            }
+            console.error(`已加 ${added}/${defs.length} 个字段`);
+            // 末尾自动 layout init（解决 add-field 不自动重新布局的缺口）
+            let compCount = 0;
+            if (cmdOpts.init !== false && added > 0) {
+                const meta = await getLayoutMeta(client, baseUrl, formId);
+                const cfg = await client.post(`${baseUrl}${ROUTE}/view/relate/getConfig`, {
+                    formId, module: MODULE, apiModule: 'workflow/form', layoutId: meta.layoutId,
+                    customParam: { terminal: '', objId: formId }, initMode: 5, groupFieldIds: [],
+                    designerParam: { sourceModule: MODULE },
+                }, ebb);
+                const configs = normalizeDetailTableChildren((cfg?.data?.configs || []).map((c) => ({ ...c, display: c.system ? c.display : true, show: c.system ? c.show : true })));
+                const styleTemplateId = meta.layoutType === 'FLOW' ? '820000000000000001' : '700000000000000008';
+                const initRes = await client.post(`${baseUrl}${ROUTE}/view/relate/initLayout`, {
+                    formId, module: MODULE, apiModule: 'workflow/form', layoutId: meta.layoutId, generateCollapse: true,
+                    styleTemplateId, styleTemplateType: 1, configs, addLayout: false, ecodeType: ['js', 'css'],
+                    initMode: '1', customParam: { terminal: '', objId: formId },
+                    formLayoutMultiple: { isSys: true, id: meta.layoutMultiId, name: meta.layoutName, terminalType: 'PC', layoutType: meta.layoutType },
+                    designerParam: { onlyLayout: false },
+                }, ebb);
+                compCount = initRes?.data?.pageLayouts?.[0]?.comps?.length || initRes?.data?.formLayout?.pageLayouts?.[0]?.comps?.length || 0;
+                console.error(`  布局已 init: 组件 ${compCount} 个`);
+            }
+            console.log(opts.json
+                ? JSON.stringify({ success: true, formId, added, total: defs.length, initComps: compCount || undefined }, null, 2)
+                : `批量加字段完成: ${added}/${defs.length} 个${cmdOpts.init !== false ? ` + 自动布局 ${compCount} 组件` : ''}`);
+        }
+        catch (e) {
+            console.error(`批量加字段失败: ${e.message}`);
+            process.exitCode = 1;
+        }
+    });
     // ---------- wf-form edit-field ----------
     wfForm.command('edit-field')
         .description('编辑流程表单已有字段（read-modify-write：getFormField 读全字段 → 改 → saveFormFieldNew 重存）')
         .argument('<formId>', '流程表单 formId')
-        .argument('<fieldId>', '字段 fieldId')
+        .argument('<fieldId>', '字段 fieldId（被带出的目标字段，如 联系方式）')
         .option('--title <title>', '修改字段标题')
         .option('--multiple', '设为多选（Employee/Department/Browser isSingle=false；Select→SelectMultiple）')
         .option('--single', '设为单选（反向）')
+        .option('--relate-from <关联字段>', 'EB关联带出：选 EBuilder 关联记录(如关联客户)后自动带出本字段值。传关联字段名/fieldId')
+        .option('--relate-from-source <源字段>', '目标表单的源字段(如客户信息表的联系方式)fieldId 或字段名，--relate-from 必填。传字段名需 --sform-id 解析')
+        .option('--sform-id <objId>', 'EBuilder 关联字段的目标表单 objId（流程表单 getConfig/getFormField 不返回 sformId；source 传字段名解析用）')
         .action(async (formId, fieldId, o) => {
         try {
             const opts = program.opts();
@@ -753,8 +983,58 @@ export function registerWorkflowFormCommands(program) {
                     throw new Error(`字段类型 ${t} 不支持多选切换（仅 Employee/Department/Browser/Select）`);
                 }
             }
+            // EB关联带出（ffRelateField）：选关联记录后自动带出目标表字段值
+            if (o.relateFrom) {
+                if (!o.relateFromSource)
+                    throw new Error('--relate-from 需配合 --relate-from-source <源字段名/fieldId>');
+                const { configs } = await readConfigs(client, baseUrl, formId);
+                const parseLayout = (f) => { try {
+                    return typeof f.layoutDetail === 'string' ? JSON.parse(f.layoutDetail) : (f.layoutDetail || {});
+                }
+                catch {
+                    return {};
+                } };
+                // 找 EBuilder 关联字段（关联客户）→ fieldId + sformId(目标表 objId)
+                const ebField = configs.find((c) => {
+                    const ld = parseLayout(c);
+                    const ck = c.componentKey || ld.componentKey || '';
+                    return /ebuilder|eb|flow/i.test(ck) && (c.name === o.relateFrom || String(c.id) === o.relateFrom || ld.dataKey === o.relateFrom);
+                });
+                if (!ebField)
+                    throw new Error(`未找到 EBuilder 关联字段 "${o.relateFrom}"`);
+                const ebLd = parseLayout(ebField);
+                // 目标表 objId：流程表单的 EBuilder 字段配置不返回 sformId（getConfig/getFormField 都不返），
+                // 所以需 --sform-id 显式传（与 ebuilder-scope 同款限制）；config 里有则优先用。
+                const sformId = o.sformId || ebField.sformId || ebLd.sformId || ebLd.virtualFormId || '';
+                // 从目标表查源字段（联系方式）→ fieldId + fieldName；source 传的是 fieldId 则免查直接可用
+                let srcFieldId = o.relateFromSource;
+                let srcTitle = o.relateFromSource;
+                const isId = /^\d+$/.test(String(o.relateFromSource));
+                if (!isId || sformId) {
+                    try {
+                        const tfd = await client.post(`${baseUrl}/api/ebuilder/form/dataset/v1/getFields`, { objId: sformId, userid: auth.userId, tenantKey: auth.tenantKey, isReturnDetail: 'y' });
+                        const tf = [...(tfd?.data?.mainFields || []), ...(tfd?.data?.detailFields || []).flatMap((d) => d.fields || [])];
+                        const sf = tf.find((f) => f.fieldName === o.relateFromSource || String(f.fieldId) === o.relateFromSource);
+                        if (sf) {
+                            srcFieldId = String(sf.fieldId);
+                            srcTitle = sf.fieldName || srcFieldId;
+                        }
+                    }
+                    catch { /* 留原值兜底 */ }
+                }
+                if (!/^\d+$/.test(String(srcFieldId))) {
+                    throw new Error(`源字段 "${o.relateFromSource}" 解析不到 fieldId（需 --sform-id <目标表单objId> 或直接传 fieldId）`);
+                }
+                if (!sformId)
+                    console.error(`  警告: 未提供 --sform-id，源字段按 fieldId 直传（title 用原值）`);
+                jsonObj.ffRelateField = {
+                    component: { key: jsonObj.type || 'Text' },
+                    isField: true, title: srcTitle, key: srcFieldId, isMultiple: false, fieldId: String(ebField.id),
+                };
+                changes.push(`relate-from=${o.relateFrom}→${srcTitle}(${srcFieldId})`);
+            }
             if (changes.length === 0)
-                throw new Error('未指定要修改的属性（--title / --multiple / --single）');
+                throw new Error('未指定要修改的属性（--title / --multiple / --single / --relate-from）');
             const r = await client.post(`${baseUrl}${ROUTE}/field/manage/saveFormFieldNew`, { formId, module: MODULE, customParam: {}, jsonObj: JSON.stringify(jsonObj) }, ebb);
             if (r?.code !== 200 || !r?.status)
                 throw new Error(`编辑失败: ${r?.msg || '未知错误'}`);
@@ -840,6 +1120,127 @@ export function registerWorkflowFormCommands(program) {
             process.exitCode = 1;
         }
     });
+    // ---------- wf-form ebuilder-scope（关联浏览数据范围）----------
+    // 流程表单 EBuilder 关联字段的浏览数据范围（如：关联客户时只选客户状态=启用的）。
+    // 抓包（mulinquan 2026-08-25）：businessModule="ebuildercard"（非 eb 表的 ebuilderform），
+    // businessId=workflowId（非 formId），formId=流程表单 formId，controlId=EBuilder 字段 fieldId，
+    // browserType="ebuilder/form_ebuilder"，scopeType="scopeSql"，scopeInfoRender=条件树 JSON 字符串。
+    wfForm.command('ebuilder-scope')
+        .description('关联浏览数据范围（如关联客户只选客户状态=启用）。--rule "目标表字段:操作:值"')
+        .argument('<formId>', '流程表单 formId')
+        .argument('<ebuilderFieldId>', 'EBuilder 关联字段 fieldId（controlId）')
+        .requiredOption('--workflow-id <wfId>', '工作流程 ID（businessId）')
+        .requiredOption('--sform-id <objId>', '目标表单 objId（EBuilder 关联的目标表，建字段时传的 --sform-id）')
+        .requiredOption('--rule <rule>', '筛选规则：目标表字段名:操作:值。操作 eq/neq/like/isnull/notnull。Select 值用选项名（如 客户状态:eq:启用）')
+        .action(async (formId, ebuilderFieldId, cmdOpts) => {
+        try {
+            const opts = program.opts();
+            const auth = await AuthSession.fromOptions(opts);
+            if (!auth)
+                throw new Error('无法加载认证');
+            const client = new ApiClient(auth);
+            const baseUrl = auth.getBaseUrl();
+            const sformId = cmdOpts.sformId;
+            const ebb = { ebbusinessid: formId };
+            // 1. 解析 rule：目标表字段名:操作:值
+            const [tgtFieldName, func, rawVal] = cmdOpts.rule.split(':');
+            if (!tgtFieldName || !func)
+                throw new Error('--rule 格式：字段名:操作:值（如 客户状态:eq:启用）');
+            // 2. 查目标表字段 → fieldId + fieldType + options（Select 解析选项 selectionId）
+            const tfd = await client.post(`${baseUrl}/api/ebuilder/form/dataset/v1/getFields`, { objId: sformId, userid: auth.userId, tenantKey: auth.tenantKey, isReturnDetail: 'y' });
+            const tgtFields = [...(tfd?.data?.mainFields || []), ...(tfd?.data?.detailFields || []).flatMap((d) => d.fields || [])];
+            const tf = tgtFields.find((f) => f.fieldName === tgtFieldName || String(f.fieldId) === tgtFieldName);
+            if (!tf)
+                throw new Error(`目标表 ${sformId} 未找到字段 "${tgtFieldName}"`);
+            const tgtFieldId = String(tf.fieldId);
+            const tgtFieldType = tf.fieldType || tf.componentKey || 'Text';
+            const tgtTitle = tf.fieldName || tgtFieldName;
+            // 目标表 formId：getFormField 拿选项需 formId（不是 objId）。从 EBuilder 字段配置读 appId → getList 解析
+            let tgtAppId = '';
+            try {
+                const ef = await client.post(`${baseUrl}${ROUTE}/field/manage/getFormField`, { module: MODULE, formTableField: { formField: { id: ebuilderFieldId, form: { id: formId } } } }, ebb);
+                tgtAppId = ef?.data?.appId || '';
+            }
+            catch { /* 无则跳过 */ }
+            let tgtFormId = sformId;
+            if (tgtAppId) {
+                try {
+                    const fl = await client.get(`${baseUrl}/api/bs/ebuilder/form/obj/getList/${tgtAppId}?apid=${tgtAppId}`, { ebbusinessid: tgtAppId });
+                    const fi = (fl?.data || []).find((f) => String(f.id) === String(sformId));
+                    if (fi?.formId)
+                        tgtFormId = String(fi.formId);
+                }
+                catch { /* 保持 sformId 兜底 */ }
+            }
+            // 3. 解析值：Select 用选项名（浏览器抓包：value=选项名 + config.options 名→id 映射，selectValue.id=selectionId）；
+            //    文本用字面值。businessModule/module 必须是 'workflow'（之前用 ebuildercard 平台不认）。
+            let selectValue = null;
+            let valueStr = rawVal || '';
+            let configOptions = [];
+            if (/Select|RadioBox|CheckBox/i.test(tgtFieldType) && rawVal) {
+                const gfOpts = await client.post(`${baseUrl}/api/ebuilder/form/form/field/manage/getFormField`, { module: 'ebuilderform', formTableField: { formField: { id: tgtFieldId, form: { id: tgtFormId } } } }, { ebbusinessid: tgtFormId });
+                const fopts = Array.isArray(gfOpts?.data?.options) ? gfOpts.data.options : [];
+                configOptions = fopts.map((o) => ({ name: o.name, id: String(o.selectionId || o.valueKey || o.id) }));
+                const opt = fopts.find((o) => o.name === rawVal || o.valueKey === rawVal || String(o.selectionId || o.id) === rawVal);
+                if (opt) {
+                    const selId = String(opt.selectionId || opt.valueKey || opt.id);
+                    selectValue = { id: selId, content: opt.name, type: 'SELECTION_OPTION' };
+                    valueStr = opt.name; // 存选项名，平台按 config.options 映射回 selectionId
+                }
+            }
+            // 4. 构建 scopeInfoRender 条件树（对齐浏览器抓包：conditions.type/text、config.options）
+            const rootKey = String(Date.now());
+            const nodeKey = String(Date.now() + 1);
+            const tree = {
+                key: rootKey, relationship: '1', isParent: true, isNewFilter: true, parentNode: '',
+                datas: [{
+                        isParent: false, parentNode: rootKey,
+                        id: `field_${tgtFieldId}`, fieldName: `field_${tgtFieldId}`,
+                        fieldType: tgtFieldType, text: tgtTitle, compType: tgtFieldType, type: 'condition',
+                        conditions: {
+                            func, value: valueStr, type: '', text: '',
+                            ...(selectValue ? { selectValue, customBrowserValue: [selectValue] } : {}),
+                            customValue: '',
+                        },
+                        config: configOptions.length ? { name: tgtTitle, options: configOptions, title: tgtTitle } : { name: tgtTitle, title: tgtTitle },
+                        subTableId: '', key: nodeKey,
+                    }],
+                version: 1, showFilterIsNull: false,
+            };
+            // 5. batchSave（module/businessModule 用 workflow，非 ebuildercard）。
+            // 更新须带现有 scope 记录 id（浏览器抓包实测：selectPage 读 → 拿 id → batchSave 带 id 更新；
+            // 不带 id 会新建/覆盖不对，平台读不到）。selectPage 读接口 POST /api/bcw/browserDataScope/selectPage。
+            let scopeId = '';
+            try {
+                const rd = await client.post(`${baseUrl}/api/bcw/browserDataScope/selectPage`, {
+                    businessId: cmdOpts.workflowId, businessModule: 'workflow',
+                    controlId: ebuilderFieldId, browserType: 'ebuilder/form_ebuilder',
+                    formId, module: 'workflow',
+                });
+                const rec = rd?.data?.records?.[0] || rd?.data?.data?.[0] || (Array.isArray(rd?.data) ? rd.data[0] : undefined);
+                if (rec?.id)
+                    scopeId = String(rec.id);
+            }
+            catch { /* 读失败按新建处理 */ }
+            const payload = [{
+                    businessId: cmdOpts.workflowId, businessModule: 'workflow',
+                    controlId: ebuilderFieldId, browserType: 'ebuilder/form_ebuilder',
+                    formId, module: 'workflow',
+                    scopeInfoRender: JSON.stringify(tree), scopeType: 'scopeSql',
+                    ...(scopeId ? { id: scopeId } : {}),
+                }];
+            const r = await client.post(`${baseUrl}/api/bcw/browserDataScope/batchSave`, payload);
+            if (r?.code !== 200 && !r?.status)
+                throw new Error(`保存失败: ${r?.msg || JSON.stringify(r).slice(0, 200)}`);
+            console.log(opts.json
+                ? JSON.stringify({ success: true, formId, ebuilderFieldId, workflowId: cmdOpts.workflowId, rule: cmdOpts.rule }, null, 2)
+                : `关联浏览范围已设置: ${tgtTitle} ${func} '${rawVal}'（EBuilder 字段 ${ebuilderFieldId}）`);
+        }
+        catch (e) {
+            console.error(`设置关联浏览范围失败: ${e.message}`);
+            process.exitCode = 1;
+        }
+    });
     // ---------- wf-form add-detail-table ----------
     wfForm.command('add-detail-table')
         .description('给流程表单加明细子表（saveSubForm 建子表 + 加首字段使其可见；--init 放入布局）')
@@ -932,8 +1333,284 @@ export function registerWorkflowFormCommands(program) {
             process.exitCode = 1;
         }
     });
+    // 落单/孤字段占满行（对齐 eb 表 form-create.ts：两列排布时「奇数个的最后一个」+「被 singleRow
+    // 挤落单的前一字段」自动 singleRow 独占整行，避免右列留白）。明细表恒 singleRow。
+    // 排布对象仅业务主字段；系统字段与 Fold/Collapse 分组容器原样保留（分组内字段由平台容器排布）。
+    function applyLoneSingleRows(configs) {
+        const isGroup = (c) => c.componentKey === 'Fold' || c.type === 'Collapse';
+        const isDetail = (c) => c.type === 'DetailTable' || c.componentKey === 'DataTable';
+        const isBusiness = (c) => !c.system && !isGroup(c) && !isDetail(c);
+        const mainFields = configs.filter(isBusiness);
+        const details = configs.filter(isDetail);
+        const others = configs.filter((c) => !isBusiness(c) && !isDetail(c));
+        const mainIds = mainFields.map((c) => String(c.id));
+        const detailIds = new Set(details.map((c) => String(c.id)));
+        // 奇数个最后一个落单 → 独占一行
+        const loneRowId = mainIds.length % 2 === 1 ? mainIds[mainIds.length - 1] : null;
+        // 落单兜底：模拟两列流，singleRow 字段位于 col=1 时其前一字段（col0 未配对）也标 singleRow
+        const orphanIds = new Set();
+        let col = 0;
+        let prevId = '';
+        for (const id of [...mainIds, ...details.map((c) => String(c.id))]) {
+            const c = mainFields.find((x) => String(x.id) === id) || details.find((x) => String(x.id) === id);
+            const isSingle = c?.singleRow === true || id === loneRowId || detailIds.has(id);
+            if (isSingle) {
+                if (col === 1 && prevId)
+                    orphanIds.add(prevId);
+                col = 0;
+            }
+            else {
+                col = col === 0 ? 1 : 0;
+            }
+            prevId = id;
+        }
+        const biz = mainFields.map((c) => ({
+            ...c,
+            singleRow: String(c.id) === loneRowId || c.singleRow === true || orphanIds.has(String(c.id)),
+        }));
+        const det = details.map((d) => ({ ...d, singleRow: true }));
+        return [...others, ...biz, ...det];
+    }
+    // 读表单现有字段分组 → refFieldIds（initLayout/getConfig 的 groupFieldIds）。
+    // getFieldGroupPage 返回全部主表字段，字段 formField.group 带 groupId+groupName；
+    // refFieldId = groupId - 1（平台先分配 layout config 再分配 formFieldGroup，顺序相连）。
+    // 用于 field-prop / layout init 重跑 initLayout 时保留 Collapse 折叠分组。
+    async function fetchFormGroups(client, baseUrl, formId) {
+        try {
+            const r = await client.post(`${baseUrl}${ROUTE}/field/manage/getFieldGroupPage`, { pageNo: 1, pageSize: 100, module: MODULE, formFieldSearchEntity: { formId }, customParam: {} }, { ebbusinessid: formId });
+            const list = r?.data?.pageDatas?.result || [];
+            const seen = new Set();
+            for (const f of list) {
+                const g = f?.formField?.group;
+                if (g?.id)
+                    seen.add(String(g.id));
+            }
+            return [...seen].map((id) => String(BigInt(id) - 1n));
+        }
+        catch {
+            return [];
+        }
+    }
+    // ---------- wf-form group（字段分组，对齐 eb 表）----------
+    // 流程表单字段分组（基本信息/系统设置等折叠容器）。三步接口（module=workflow，实测可用）：
+    //   ① saveFieldGroup       建分组 → data.group.id(formFieldGroup记录id) + refFieldId(layout Collapse id)
+    //   ② updateFormFieldGroup 分配字段（fieldList）
+    //   ③ initLayout            布局：configs 包 Collapse{id:refFieldId, componentKey:"Fold", type:"Collapse",
+    //                             dataKey:"f_"+refFieldId, children:[分组字段]} + 顶层 groupFieldIds:[refFieldId]
+    //   （对齐 eb 表 form-create.ts FLOW 分组结构 / 记忆 field-group-saveFieldGroup-api）
+    wfForm.command('group')
+        .description('字段分组（建分组/分配字段/布局 Collapse 折叠，对齐 eb 表）。一次建全部分组')
+        .argument('<formId>', '流程表单 formId')
+        .requiredOption('--groups <json>', '分组定义 JSON：{"分组名":["字段名或ID",...]}，可 @文件路径')
+        .action(async (formId, o) => {
+        try {
+            const opts = program.opts();
+            const auth = await AuthSession.fromOptions(opts);
+            if (!auth)
+                throw new Error('无法加载认证');
+            const client = new ApiClient(auth);
+            const baseUrl = auth.getBaseUrl();
+            const ebb = { ebbusinessid: formId };
+            let groupsJson = o.groups;
+            if (groupsJson.startsWith('@')) {
+                const { readFileSync, existsSync } = await import('fs');
+                const p = groupsJson.slice(1);
+                if (!existsSync(p))
+                    throw new Error(`文件不存在: ${p}`);
+                groupsJson = readFileSync(p, 'utf-8');
+            }
+            let groups;
+            try {
+                groups = JSON.parse(groupsJson);
+            }
+            catch {
+                throw new Error('--groups JSON 解析失败');
+            }
+            const entries = Object.entries(groups || {});
+            if (entries.length === 0)
+                throw new Error('--groups 为空');
+            // 名字 → 字段列表，无字段的分组也允许（空分组占位，后续 assign）
+            // 解析字段（主表字段名→fieldId；含明细字段名但分组只建议主表）
+            const { configs } = await readConfigs(client, baseUrl, formId);
+            const fieldByName = new Map();
+            const walk = (nodes) => { for (const c of nodes) {
+                if (c.name)
+                    fieldByName.set(String(c.name), c);
+                if (String(c.id))
+                    fieldByName.set(String(c.id), c);
+                if (c.children?.length)
+                    walk(c.children);
+            } };
+            walk(configs);
+            const resolveField = (ref) => fieldByName.get(String(ref)) || fieldByName.get(String(ref)) || null;
+            // ① 建全部分组（saveFieldGroup）
+            const created = [];
+            for (const [gname, fieldRefs] of entries) {
+                const sr = await client.post(`${baseUrl}${ROUTE}/field/manage/saveFieldGroup`, { module: MODULE, formFieldGroup: { groupName: gname, formId }, customParam: {} }, ebb);
+                if (sr?.code !== 200 || !sr?.status)
+                    throw new Error(`建分组「${gname}」失败: ${sr?.msg || '未知错误'}`);
+                const g = sr?.data?.group || {};
+                const fieldIds = [];
+                const missing = [];
+                for (const ref of (fieldRefs || [])) {
+                    const f = resolveField(ref);
+                    if (f)
+                        fieldIds.push(String(f.id));
+                    else
+                        missing.push(String(ref));
+                }
+                if (missing.length)
+                    console.error(`  ⚠ 分组「${gname}」未找到字段: ${missing.join(', ')}`);
+                created.push({ name: gname, groupId: String(g.id || ''), refFieldId: String(g.refFieldId || ''), fieldIds });
+                console.error(`  分组已建: ${gname} groupId=${g.id} refFieldId=${g.refFieldId}${fieldIds.length ? ` 字段×${fieldIds.length}` : '（空分组）'}`);
+            }
+            // ② 分配字段（updateFormFieldGroup）
+            for (const grp of created) {
+                if (!grp.fieldIds.length)
+                    continue;
+                const ur = await client.post(`${baseUrl}${ROUTE}/field/manage/updateFormFieldGroup`, { module: MODULE, formFieldGroup: { id: grp.groupId }, form: { id: formId }, fieldList: grp.fieldIds.map((id) => ({ id })), customParam: {} }, ebb);
+                if (ur?.code !== 200 || !ur?.status)
+                    console.error(`  ⚠ 分组「${grp.name}」分配字段失败: ${ur?.msg || '未知错误'}`);
+                else
+                    console.error(`  已分配: ${grp.name} ← ${grp.fieldIds.length} 字段`);
+            }
+            // ③ 布局：构建 Collapse configs + groupFieldIds → initLayout
+            const meta = await getLayoutMeta(client, baseUrl, formId);
+            if (!meta.layoutId)
+                throw new Error('无法获取 layoutId');
+            const cfgRes = await client.post(`${baseUrl}${ROUTE}/view/relate/getConfig`, {
+                formId, module: MODULE, apiModule: 'workflow/form', layoutId: meta.layoutId,
+                customParam: { terminal: '', objId: formId }, initMode: 5, groupFieldIds: [],
+                designerParam: { sourceModule: MODULE },
+            }, ebb);
+            if (cfgRes?.code !== 200 || !cfgRes?.status)
+                throw new Error(`getConfig 失败: ${cfgRes?.msg}`);
+            const allConfigs = JSON.parse(JSON.stringify(cfgRes?.data?.configs || []));
+            // 合并运行时已保存的 singleRow（getConfig 不带，防 initLayout 冲掉独占一行）
+            const allSrSet = await fetchRuntimeSingleRows(client, baseUrl, formId);
+            mergeRuntimeSingleRow(allConfigs, allSrSet);
+            // 找出被分组的主表字段 config（顶层非系统非明细），从平铺抽出包 Collapse
+            const groupFieldIdSet = new Set(created.flatMap((g) => g.fieldIds));
+            const collapsedFields = allConfigs.filter((c) => !c.system && c.type !== 'DetailTable' && c.componentKey !== 'DataTable' && groupFieldIdSet.has(String(c.id)));
+            const rest = allConfigs.filter((c) => collapsedFields.indexOf(c) === -1);
+            const groupFieldIds = [];
+            const collapses = [];
+            for (const grp of created) {
+                const children = collapsedFields.filter((c) => grp.fieldIds.includes(String(c.id)));
+                groupFieldIds.push(grp.refFieldId);
+                collapses.push({
+                    id: grp.refFieldId, name: grp.name, componentKey: 'Fold', display: true, show: true,
+                    readOnly: true, required: false, disableEdit: false, singleRow: false, isDelete: false,
+                    type: 'Collapse', typeDescribe: '分组', dataKey: `f_${grp.refFieldId}`,
+                    children,
+                });
+            }
+            // 落单/孤字段占满行（含分组内字段 singleRow 由平台 Collapse 自行排布，只对未分组字段算）
+            const finalConfigs = applyLoneSingleRows([...collapses, ...rest]);
+            const styleTemplateId = meta.layoutType === 'FLOW' ? '820000000000000001' : '700000000000000008';
+            const initRes = await client.post(`${baseUrl}${ROUTE}/view/relate/initLayout`, {
+                formId, module: MODULE, apiModule: 'workflow/form', layoutId: meta.layoutId,
+                generateCollapse: true, styleTemplateId, styleTemplateType: 1,
+                configs: finalConfigs, addLayout: false, ecodeType: ['js', 'css'], initMode: '1',
+                groupFieldIds,
+                customParam: { terminal: '', objId: formId },
+                formLayoutMultiple: { isSys: true, id: meta.layoutMultiId, name: meta.layoutName, terminalType: 'PC', layoutType: meta.layoutType },
+                designerParam: { onlyLayout: false },
+            }, ebb);
+            if (initRes?.code !== 200 || !initRes?.status)
+                throw new Error(`initLayout 失败: ${initRes?.msg}`);
+            const comps = initRes?.data?.pageLayouts?.[0]?.comps || initRes?.data?.formLayout?.pageLayouts?.[0]?.comps || [];
+            console.log(opts.json
+                ? JSON.stringify({ success: true, formId, groups: created.map((g) => ({ name: g.name, groupId: g.groupId, refFieldId: g.refFieldId, fieldCount: g.fieldIds.length })), comps: comps.length }, null, 2)
+                : `字段分组完成: ${created.length} 个分组，布局 ${comps.length} 组件`);
+        }
+        catch (e) {
+            console.error(`字段分组失败: ${e.message}`);
+            process.exitCode = 1;
+        }
+    });
     // ---------- wf-form layout init ----------
     const layoutCmd = wfForm.command('layout').description('布局管理');
+    // ---------- wf-form layout add（添加布局）----------
+    // 给流程表单新增一套布局（formLayoutMultiple 多布局，PC/移动端多套并存不覆盖）。
+    // 抓包（mulinquan 2026-08-25）：POST /api/workflow/core/form/layout/save
+    //   body: { module:'workflow', customParam:{workflowId, isNodeLayout:true},
+    //           formLayoutMultiple:{terminalType:'PC', name, labelObj:'{}', describe, layoutType:'FLOW'|'EXCEL'},
+    //           local:true, copyConfig:{formDataLinkage:true, excelLinkage:true}, formId }
+    //   → data.formLayoutMultiple.id = 新布局 layoutId。FLOW=流式 EXCEL=表格式（实测两种都成功）。
+    layoutCmd.command('add')
+        .description('添加一套新布局（layout/save）：FLOW 流式 / EXCEL 表格式，PC/移动端多套并存不覆盖。返回新布局 ID')
+        .argument('<formId>', '流程表单 formId')
+        .requiredOption('--name <name>', '布局名称（如 "项目立项流程PC1"）')
+        .option('--layout-type <type>', '布局类型：FLOW 流式(默认) / EXCEL 表格式', 'FLOW')
+        .option('--terminal-type <t>', '终端类型：PC(默认) / MOBILE', 'PC')
+        .option('--describe <text>', '布局描述', '')
+        .option('--workflow-id <id>', '工作流 ID（customParam.workflowId；不传用 formId 兜底，实测后端接受）')
+        .action(async (formId, o) => {
+        try {
+            const opts = program.opts();
+            const auth = await AuthSession.fromOptions(opts);
+            if (!auth)
+                throw new Error('无法加载认证');
+            const client = new ApiClient(auth);
+            const baseUrl = auth.getBaseUrl();
+            const ebb = { ebbusinessid: formId };
+            const layoutType = String(o.layoutType || 'FLOW').toUpperCase();
+            if (!['FLOW', 'EXCEL'].includes(layoutType))
+                throw new Error(`布局类型仅支持 FLOW(流式)/EXCEL(表格式)，收到: ${layoutType}`);
+            const body = {
+                module: MODULE,
+                customParam: { workflowId: o.workflowId || formId, isNodeLayout: true },
+                formLayoutMultiple: { terminalType: o.terminalType || 'PC', name: o.name, labelObj: '{}', describe: o.describe || '', layoutType },
+                local: true,
+                copyConfig: { formDataLinkage: true, excelLinkage: true },
+                formId,
+            };
+            const r = await client.post(`${baseUrl}${ROUTE}/layout/save`, body, ebb);
+            if (r?.code !== 200 || !r?.status)
+                throw new Error(`添加布局失败: ${r?.msg || '未知错误'}`);
+            const flm = r?.data?.formLayoutMultiple || {};
+            console.log(opts.json
+                ? JSON.stringify({ success: true, formId, layoutId: flm.id, layoutType, terminalType: o.terminalType || 'PC', name: o.name, versionId: flm.versionId, isDefault: flm.isDefault }, null, 2)
+                : `布局已添加: ${o.name}（${layoutType === 'FLOW' ? '流式' : '表格式'}）layoutId=${flm.id}${flm.isDefault ? ' 已设为默认' : ''}`);
+        }
+        catch (e) {
+            console.error(`添加布局失败: ${e.message}`);
+            process.exitCode = 1;
+        }
+    });
+    // ---------- wf-form layout delete（删除布局）----------
+    // 抓包（mulinquan 2026-08-25）：POST /api/bs/workflow/pathdef/form/layout/emptyNodeLayout
+    //   body: { layoutId, workflowId, terminal:'PC' } → data=true，**效果=从布局列表删除该布局**
+    //   （用户确认：emptyNodeLayout 实际就是把布局删掉，不是"保留布局清空节点"）。
+    layoutCmd.command('delete')
+        .description('删除一套布局（emptyNodeLayout：从布局列表移除）。传 layoutId（layout add 返回的 formLayoutMultiple.id）')
+        .argument('<formId>', '流程表单 formId')
+        .argument('<layoutId>', '要删除的布局 ID（wf-form layout add 返回的 layoutId）')
+        .option('--workflow-id <id>', '工作流 ID（不传用 formId 兜底）')
+        .option('--terminal <t>', '终端类型：PC(默认) / MOBILE', 'PC')
+        .action(async (formId, layoutId, o) => {
+        try {
+            const opts = program.opts();
+            const auth = await AuthSession.fromOptions(opts);
+            if (!auth)
+                throw new Error('无法加载认证');
+            const client = new ApiClient(auth);
+            const baseUrl = auth.getBaseUrl();
+            const r = await client.post(`${baseUrl}/api/bs/workflow/pathdef/form/layout/emptyNodeLayout`, {
+                layoutId, workflowId: o.workflowId || formId, terminal: o.terminal || 'PC',
+            });
+            if (r?.code !== 200 || !r?.status)
+                throw new Error(`删除布局失败: ${r?.msg || '未知错误'}`);
+            console.log(opts.json
+                ? JSON.stringify({ success: true, formId, layoutId, terminal: o.terminal || 'PC' }, null, 2)
+                : `布局已删除: ${layoutId}（${o.terminal || 'PC'}）`);
+        }
+        catch (e) {
+            console.error(`删除布局失败: ${e.message}`);
+            process.exitCode = 1;
+        }
+    });
     layoutCmd.command('init')
         .description('初始化/重建流程表单布局（initLayout）：按 layoutType 选模板（FLOW 默认）+ 设字段 readOnly/required/singleRow')
         .argument('<formId>', '流程表单 formId')
@@ -954,15 +1631,17 @@ export function registerWorkflowFormCommands(program) {
             const meta = await getLayoutMeta(client, baseUrl, formId);
             if (!meta.layoutId)
                 throw new Error('无法获取 layoutId');
+            // 保留字段分组：getConfig/initLayout 带 groupFieldIds，否则 Collapse 折叠被冲掉
+            const groupIds = await fetchFormGroups(client, baseUrl, formId);
             const cfgRes = await client.post(`${baseUrl}${ROUTE}/view/relate/getConfig`, {
                 formId, module: MODULE, apiModule: 'workflow/form', layoutId: meta.layoutId,
-                customParam: { terminal: '', objId: formId }, initMode: 5, groupFieldIds: [],
+                customParam: { terminal: '', objId: formId }, initMode: 5, groupFieldIds: groupIds,
                 designerParam: { sourceModule: MODULE },
             }, ebb);
             // 流程表单 FLOW 布局 getConfig 默认把业务字段 readOnly=true（锁死），init 时强制可编辑：
-            // 业务字段 readOnly=false / disableEdit=false（除非 --read-only 显式锁）；明细/系统字段保留。
+            // 业务字段 readOnly=false / disableEdit=false（除非 --read-only 显式锁）；明细/系统字段/Collapse 分组容器保留。
             const configs = normalizeDetailTableChildren((cfgRes?.data?.configs || []).map((c) => {
-                const isBusiness = !c.system && c.componentKey !== 'DataTable' && c.type !== 'DetailTable';
+                const isBusiness = !c.system && c.componentKey !== 'DataTable' && c.type !== 'DetailTable' && c.type !== 'Collapse' && c.componentKey !== 'Fold';
                 const out = { ...c, display: c.system ? c.display : true, show: c.system ? c.show : true };
                 if (isBusiness) {
                     out.readOnly = o.readOnly === true;
@@ -974,13 +1653,19 @@ export function registerWorkflowFormCommands(program) {
                 }
                 return out;
             }));
+            // 合并运行时已保存的 singleRow（getConfig 不带，防 initLayout 冲掉独占一行）
+            const initSrSet = await fetchRuntimeSingleRows(client, baseUrl, formId);
+            mergeRuntimeSingleRow(configs, initSrSet);
+            // 落单/孤字段占满行（对齐 eb 表）：奇数个最后一个 + 被 singleRow 挤落单的前一字段自动 singleRow
+            const finalConfigs = applyLoneSingleRows(configs);
             const styleTemplateId = o.styleTemplate
                 || (meta.layoutType === 'FLOW' ? '820000000000000001' : '700000000000000008');
             const initRes = await client.post(`${baseUrl}${ROUTE}/view/relate/initLayout`, {
                 formId, module: MODULE, apiModule: 'workflow/form', layoutId: meta.layoutId,
                 generateCollapse: o.generateCollapse !== false,
                 styleTemplateId: /^\d+$/.test(styleTemplateId) ? styleTemplateId : styleTemplateId, styleTemplateType: 1,
-                configs, addLayout: false, ecodeType: ['js', 'css'], initMode: '1',
+                configs: finalConfigs, addLayout: false, ecodeType: ['js', 'css'], initMode: '1',
+                groupFieldIds: groupIds,
                 customParam: { terminal: '', objId: formId },
                 formLayoutMultiple: { isSys: true, id: meta.layoutMultiId, name: meta.layoutName, terminalType: 'PC', layoutType: meta.layoutType },
                 designerParam: { onlyLayout: false },
@@ -997,6 +1682,103 @@ export function registerWorkflowFormCommands(program) {
             process.exitCode = 1;
         }
     });
+    // ---------- wf-form field-prop ----------
+    // 流程表单字段属性（必填/只读/可编辑/独占一行）。
+    // getConfig 顶层 configs 的 readOnly/required 只是字段设计视图（FLOW 模板默认全业务字段 readOnly=true）；
+    // 运行时布局看 initLayout 保存的 comps.config。initLayout 是唯一保存路径（saveConfig 实测 404）。
+    // 因此：getConfig 读 configs → 未指定业务字段强制可编辑（防 FLOW 锁死）→ 按名/ID 改指定字段 → initLayout 重存。
+    wfForm.command('field-prop')
+        .description('设置流程表单字段属性：必填/只读/可编辑/独占一行（getConfig 读 → 改 → initLayout 保存到运行时布局）')
+        .argument('<formId>', '流程表单 formId')
+        .option('--required <fields...>', '设为必填（required=true）')
+        .option('--no-required <fields...>', '取消必填（required=false）')
+        .option('--readonly <fields...>', '设为只读（readOnly=true, disableEdit=true）')
+        .option('--editable <fields...>', '设为可编辑（readOnly=false, disableEdit=false）')
+        .option('--single-row <fields...>', '独占一行（singleRow=true）')
+        .action(async (formId, o) => {
+        try {
+            const opts = program.opts();
+            const auth = await AuthSession.fromOptions(opts);
+            if (!auth)
+                throw new Error('无法加载认证');
+            const client = new ApiClient(auth);
+            const baseUrl = auth.getBaseUrl();
+            const ebb = { ebbusinessid: formId };
+            const meta = await getLayoutMeta(client, baseUrl, formId);
+            if (!meta.layoutId)
+                throw new Error('无法获取 layoutId');
+            // 保留字段分组：getConfig/initLayout 带 groupFieldIds，否则 Collapse 折叠被冲掉
+            const groupIds = await fetchFormGroups(client, baseUrl, formId);
+            // 读当前布局 configs（含明细 children + Collapse 分组）
+            const cfgRes = await client.post(`${baseUrl}${ROUTE}/view/relate/getConfig`, {
+                formId, module: MODULE, apiModule: 'workflow/form', layoutId: meta.layoutId,
+                customParam: { terminal: '', objId: formId }, initMode: 5, groupFieldIds: groupIds,
+                designerParam: { sourceModule: MODULE },
+            }, ebb);
+            if (cfgRes?.code !== 200 || !cfgRes?.status)
+                throw new Error(`getConfig 失败: ${cfgRes?.msg}`);
+            // 深拷贝 + 明细子字段归一为可编辑/非必填（防 DetailTable 子字段被模板锁死）
+            const configs = normalizeDetailTableChildren(JSON.parse(JSON.stringify(cfgRes?.data?.configs || [])));
+            // FLOW 模板默认业务字段 readOnly=true（锁死）→ 未指定的业务字段显式可编辑；
+            // Collapse 分组容器 / 系统字段 / 明细保留原样
+            for (const c of configs) {
+                if (!c.system && c.componentKey !== 'DataTable' && c.type !== 'DetailTable' && c.type !== 'Collapse' && c.componentKey !== 'Fold') {
+                    c.readOnly = false;
+                    c.disableEdit = false;
+                }
+            }
+            // 合并运行时已保存的 singleRow（getConfig 不带，防 initLayout 冲掉独占一行）
+            const srSet = await fetchRuntimeSingleRows(client, baseUrl, formId);
+            mergeRuntimeSingleRow(configs, srSet);
+            const apply = (refs, fn, label) => {
+                if (!refs || refs.length === 0)
+                    return;
+                const hit = [];
+                const walk = (nodes) => {
+                    for (const c of nodes) {
+                        if (refs.some(r => String(c.id) === r || c.name === r || c.title === r))
+                            hit.push(c);
+                        if (c.children?.length)
+                            walk(c.children);
+                    }
+                };
+                walk(configs);
+                for (const c of hit)
+                    fn(c);
+                if (hit.length)
+                    console.error(`  ${label}: ${hit.map((c) => c.name || c.title).join(', ')}`);
+                else
+                    console.error(`  ⚠ 未找到字段: ${refs.join(', ')}`);
+            };
+            apply(o.required, (c) => { c.required = true; }, '必填');
+            apply(o.noRequired, (c) => { c.required = false; }, '取消必填');
+            apply(o.readonly, (c) => { c.readOnly = true; c.disableEdit = true; }, '只读');
+            apply(o.editable, (c) => { c.readOnly = false; c.disableEdit = false; }, '可编辑');
+            apply(o.singleRow, (c) => { c.singleRow = true; }, '独占一行');
+            // 落单/孤字段占满行（对齐 eb 表）：奇数个最后一个 + 被 singleRow 挤落单的前一字段自动 singleRow
+            const finalConfigs = applyLoneSingleRows(configs);
+            const styleTemplateId = meta.layoutType === 'FLOW' ? '820000000000000001' : '700000000000000008';
+            const initRes = await client.post(`${baseUrl}${ROUTE}/view/relate/initLayout`, {
+                formId, module: MODULE, apiModule: 'workflow/form', layoutId: meta.layoutId,
+                generateCollapse: true, styleTemplateId, styleTemplateType: 1,
+                configs: finalConfigs, addLayout: false, ecodeType: ['js', 'css'], initMode: '1',
+                groupFieldIds: groupIds,
+                customParam: { terminal: '', objId: formId },
+                formLayoutMultiple: { isSys: true, id: meta.layoutMultiId, name: meta.layoutName, terminalType: 'PC', layoutType: meta.layoutType },
+                designerParam: { onlyLayout: false },
+            }, ebb);
+            if (initRes?.code !== 200 || !initRes?.status)
+                throw new Error(`initLayout 失败: ${initRes?.msg}`);
+            const comps = initRes?.data?.pageLayouts?.[0]?.comps || initRes?.data?.formLayout?.pageLayouts?.[0]?.comps || [];
+            console.log(opts.json
+                ? JSON.stringify({ success: true, formId, layoutType: meta.layoutType, comps: comps.length }, null, 2)
+                : `字段属性已保存: 布局 ${comps.length} 组件`);
+        }
+        catch (e) {
+            console.error(`设置字段属性失败: ${e.message}`);
+            process.exitCode = 1;
+        }
+    });
     return wfForm;
 }
 //# sourceMappingURL=wf-form.js.map