weaver-e10-builder 1.0.9-beta → 1.0.11-beta

package/dist/commands/wf-form.js

@@ -103,6 +103,120 @@ function mergeRuntimeSingleRow(configs, srSet) {
     };
     walk(configs);
 }
+// 落单/孤字段占满行（对齐 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 [];
+    }
+}
+/** 初始化/重建流程表单布局（initLayout）：getConfig 读 → 强制业务字段 readOnly=false（防 FLOW 模板默认锁死）
+ *  → 合并运行时 singleRow → applyLoneSingleRows（落单/孤字段独占整行）→ initLayout 落库运行时布局。
+ *  供 `wf-form layout init` 与 `workflow create-workflow` 建后自动解锁、`wf-form add-field/add-fields/add-detail-table` 末尾重排复用。
+ *  hooks.preLayout: 在合并运行时 singleRow 之后、applyLoneSingleRows 之前介入（add-field --single-row 用此给新字段单标 singleRow）。 */
+export async function initWorkflowFormLayout(client, baseUrl, formId, o = {}, hooks = {}) {
+    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);
+    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);
+    // 流程表单 FLOW 布局 getConfig 默认把业务字段 readOnly=true（锁死），init 时强制可编辑：
+    // 业务字段 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' && 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;
+            out.disableEdit = false;
+            if (o.required !== undefined)
+                out.required = o.required;
+            if (o.singleRow !== undefined)
+                out.singleRow = o.singleRow;
+        }
+        return out;
+    }));
+    // 合并运行时已保存的 singleRow（getConfig 不带，防 initLayout 冲掉独占一行）
+    const initSrSet = await fetchRuntimeSingleRows(client, baseUrl, formId);
+    mergeRuntimeSingleRow(configs, initSrSet);
+    // 介入点：add-field --single-row 在此给新加字段单标 singleRow（早于 applyLoneSingleRows，让其 orphan 逻辑接得住）
+    if (hooks.preLayout)
+        hooks.preLayout(configs);
+    // 落单/孤字段占满行（对齐 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: 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 || [];
+    return { layoutType: meta.layoutType, styleTemplateId, comps: comps.length };
+}
 async function genIds(client, baseUrl, n) {
     const r = await client.post(`${baseUrl}/api/form/local/generatorIds?size=${n}`, {});
     return (r?.data?.generatorIds || []).map(String);
@@ -329,39 +443,26 @@ export function registerWorkflowFormCommands(program) {
                 ? 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' ? '  注:选项需单独配' : ''}`);
             // 末尾自动 layout init（解决 add-field 不自动重新布局的缺口，对齐 add-fields 批量）。
-            // 含 fetchRuntimeSingleRows 合并，防 init 冲掉已设的独占一行（singleRow）。
+            // 走 initWorkflowFormLayout：强制业务字段可编辑（防 FLOW 锁死）+ 合并运行时 singleRow + applyLoneSingleRows（落单独占整行）。
             if (o.init !== false) {
                 try {
-                    const initMeta = await getLayoutMeta(client, baseUrl, formId);
-                    const initCfg = await client.post(`${baseUrl}${ROUTE}/view/relate/getConfig`, {
-                        formId, module: MODULE, apiModule: 'workflow/form', layoutId: initMeta.layoutId,
-                        customParam: { terminal: '', objId: formId }, initMode: 5, groupFieldIds: [],
-                        designerParam: { sourceModule: MODULE },
-                    }, ebb);
-                    const initConfigs = normalizeDetailTableChildren((initCfg?.data?.configs || []).map((c) => ({ ...c, display: c.system ? c.display : true, show: c.system ? c.show : true })));
-                    const srSet = await fetchRuntimeSingleRows(client, baseUrl, formId);
-                    mergeRuntimeSingleRow(initConfigs, srSet);
-                    // --single-row：field jsonObj 的 singleRow 平台不落到 layout comp（getConfig 不带），
-                    // 显式给新加字段 config.singleRow=true（递归找 fieldId，含明细 children）。
-                    if (o.singleRow) {
-                        const walkSet = (arr) => { for (const c of arr) {
-                            if (String(c.id) === String(fieldId)) {
-                                c.singleRow = true;
-                                c.columnRatio = '12';
-                            }
-                            if (c.children?.length)
-                                walkSet(c.children);
-                        } };
-                        walkSet(initConfigs);
-                    }
-                    const styleTemplateId = initMeta.layoutType === 'FLOW' ? '820000000000000001' : '700000000000000008';
-                    await client.post(`${baseUrl}${ROUTE}/view/relate/initLayout`, {
-                        formId, module: MODULE, apiModule: 'workflow/form', layoutId: initMeta.layoutId, generateCollapse: true,
-                        styleTemplateId, styleTemplateType: 1, configs: initConfigs, addLayout: false, ecodeType: ['js', 'css'],
-                        initMode: '1', customParam: { terminal: '', objId: formId },
-                        formLayoutMultiple: { isSys: true, id: initMeta.layoutMultiId, name: initMeta.layoutName, terminalType: 'PC', layoutType: initMeta.layoutType },
-                        designerParam: { onlyLayout: false },
-                    }, ebb);
+                    await initWorkflowFormLayout(client, baseUrl, formId, {}, o.singleRow ? {
+                        preLayout: (cfgs) => {
+                            // --single-row：field jsonObj 的 singleRow 平台不落到 layout comp（getConfig 不带），
+                            // 显式给新加字段 config.singleRow=true（递归找 fieldId，含明细 children）。
+                            const walkSet = (arr) => {
+                                for (const c of arr) {
+                                    if (String(c.id) === String(fieldId)) {
+                                        c.singleRow = true;
+                                        c.columnRatio = '12';
+                                    }
+                                    if (c.children?.length)
+                                        walkSet(c.children);
+                                }
+                            };
+                            walkSet(cfgs);
+                        },
+                    } : undefined);
                     console.error(`  布局已 init`);
                 }
                 catch (e) {
@@ -956,25 +1057,17 @@ export function registerWorkflowFormCommands(program) {
             }
             console.error(`已加 ${added}/${defs.length} 个字段`);
             // 末尾自动 layout init（解决 add-field 不自动重新布局的缺口）
+            // 走 initWorkflowFormLayout：强制业务字段可编辑（防 FLOW 锁死）+ 合并运行时 singleRow + applyLoneSingleRows（落单独占整行）。
             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} 个`);
+                try {
+                    const r = await initWorkflowFormLayout(client, baseUrl, formId);
+                    compCount = r.comps;
+                    console.error(`  布局已 init: 组件 ${compCount} 个`);
+                }
+                catch (e) {
+                    console.error(`  布局 init 失败: ${e?.message || e}（字段已加，手动跑 wf-form layout init）`);
+                }
             }
             console.log(opts.json
                 ? JSON.stringify({ success: true, formId, added, total: defs.length, initComps: compCount || undefined }, null, 2)
@@ -1341,33 +1434,18 @@ export function registerWorkflowFormCommands(program) {
             if (o.init) {
                 if (!firstFieldName)
                     throw new Error('--init 需配合首字段名（空子表放不了 DetailTable）');
-                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) => {
-                    const isBusiness = !c.system && c.componentKey !== 'DataTable' && c.type !== 'DetailTable';
-                    const out = { ...c, display: c.system ? c.display : true, show: c.system ? c.show : true };
-                    if (isBusiness) {
-                        out.readOnly = false;
-                        out.disableEdit = false;
-                    } // FLOW 默认锁，强制可编辑
-                    return out;
-                }));
-                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);
-                if (initRes?.code !== 200 || !initRes?.status)
-                    throw new Error(`initLayout 失败: ${initRes?.msg}`);
-                compCount = initRes?.data?.pageLayouts?.[0]?.comps?.length || initRes?.data?.formLayout?.pageLayouts?.[0]?.comps?.length || 0;
-                console.error(`  布局已 init: 组件 ${compCount} 个（含 DetailTable）`);
+                // 走 initWorkflowFormLayout：强制业务字段可编辑 + applyLoneSingleRows（落单独占整行）+ 保留分组；
+                // DetailTable 由 normalizeDetailTableChildren 保留在 configs，applyLoneSingleRows 对明细恒 singleRow。
+                try {
+                    const r = await initWorkflowFormLayout(client, baseUrl, formId);
+                    compCount = r.comps;
+                    console.error(`  布局已 init: 组件 ${compCount} 个（含 DetailTable）`);
+                }
+                catch (e) {
+                    if (e?.message?.includes('initLayout'))
+                        throw e;
+                    throw new Error(`initLayout 失败: ${e?.message || e}`);
+                }
             }
             console.log(opts.json
                 ? JSON.stringify({ success: true, formId, subFormId, name, dataKey, firstFieldId, initComps: compCount || undefined }, null, 2)
@@ -1381,64 +1459,6 @@ 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)
@@ -1491,13 +1511,36 @@ export function registerWorkflowFormCommands(program) {
             } };
             walk(configs);
             const resolveField = (ref) => fieldByName.get(String(ref)) || fieldByName.get(String(ref)) || null;
-            // ① 建全部分组（saveFieldGroup）
+            // ① 建全部分组（saveFieldGroup，去重：同名复用避免重跑建重复分组——saveFieldGroup 不幂等）
+            const existingByName = new Map();
+            try {
+                const gr = await client.post(`${baseUrl}${ROUTE}/field/manage/getFieldGroupPage`, { pageNo: 1, pageSize: 100, module: MODULE, formFieldSearchEntity: { formId }, customParam: {} }, ebb);
+                for (const f of (gr?.data?.pageDatas?.result || [])) {
+                    const g = f?.formField?.group;
+                    if (g?.id && g?.groupName && !existingByName.has(g.groupName)) {
+                        existingByName.set(g.groupName, { groupId: String(g.id), refFieldId: String(BigInt(g.id) - 1n) });
+                    }
+                }
+            }
+            catch { /* 忽略，按无现有处理 */ }
             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 || {};
+                let groupId = '', refFieldId = '';
+                const ex = existingByName.get(gname);
+                if (ex) {
+                    groupId = ex.groupId;
+                    refFieldId = ex.refFieldId;
+                    console.error(`  分组复用: ${gname} groupId=${groupId} refFieldId=${refFieldId}`);
+                }
+                else {
+                    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 || {};
+                    groupId = String(g.id || '');
+                    refFieldId = String(g.refFieldId || '');
+                    console.error(`  分组已建: ${gname} groupId=${groupId} refFieldId=${refFieldId}`);
+                }
                 const fieldIds = [];
                 const missing = [];
                 for (const ref of (fieldRefs || [])) {
@@ -1509,8 +1552,7 @@ export function registerWorkflowFormCommands(program) {
                 }
                 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}` : '（空分组）'}`);
+                created.push({ name: gname, groupId, refFieldId, fieldIds });
             }
             // ② 分配字段（updateFormFieldGroup）
             for (const grp of created) {
@@ -1675,55 +1717,10 @@ export function registerWorkflowFormCommands(program) {
                 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);
-            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);
-            // 流程表单 FLOW 布局 getConfig 默认把业务字段 readOnly=true（锁死），init 时强制可编辑：
-            // 业务字段 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' && 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;
-                    out.disableEdit = false;
-                    if (o.required !== undefined)
-                        out.required = o.required;
-                    if (o.singleRow !== undefined)
-                        out.singleRow = o.singleRow;
-                }
-                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: 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 || [];
+            const r = await initWorkflowFormLayout(client, baseUrl, formId, o);
             console.log(opts.json
-                ? JSON.stringify({ success: true, formId, layoutType: meta.layoutType, styleTemplateId, comps: comps.length }, null, 2)
-                : `布局已初始化: 类型=${meta.layoutType} 模板=${styleTemplateId} 组件=${comps.length}`);
+                ? JSON.stringify({ success: true, formId, layoutType: r.layoutType, styleTemplateId: r.styleTemplateId, comps: r.comps }, null, 2)
+                : `布局已初始化: 类型=${r.layoutType} 模板=${r.styleTemplateId} 组件=${r.comps}`);
         }
         catch (e) {
             console.error(`初始化布局失败: ${e.message}`);