weaver-e10-builder 1.0.10-beta → 1.0.12-beta

package/dist/commands/skill.js

@@ -0,0 +1,112 @@
+import { cpSync, existsSync, readdirSync, readFileSync } from 'node:fs';
+import { fileURLToPath } from 'node:url';
+import { resolve } from 'node:path';
+import { provisionInstalledSkills } from '../services/skill-provision.js';
+/**
+ * skill 文档/模板取用命令组。
+ *
+ * 背景：skill 包（Tencent 市场）只允许两级目录，深目录文档树（references/、
+ * actionflows/references/、assets/）随 npm 包发布（skill-docs/）。
+ * - `skill copy [目录]`：全量拷到工作区（模板/工作副本用），直接放出 references/ 等，无 skill-docs 壳。
+ * - `skill sync`：探测本机已装 skill（~/.claude/skills、~/.workbuddy/skills、~/.codex/skills），
+ *   把文档树自动拷进对应 skill 目录——AI 直接读 skill 自带文档，无需手动拷贝。
+ *
+ * skill-docs 与编译产物 dist/ 同级：packages/cli/skill-docs（安装后同样在
+ * node_modules/weaver-e10-builder/ 下），因此相对 dist/ 向上两级解析即可。
+ */
+const SKILL_DOCS_DIR = fileURLToPath(new URL('../../skill-docs/', import.meta.url));
+const PKG_JSON_URL = new URL('../../package.json', import.meta.url);
+function pkgVersion() {
+    try {
+        return JSON.parse(readFileSync(PKG_JSON_URL, 'utf-8')).version;
+    }
+    catch {
+        return 'unknown';
+    }
+}
+function countFiles(dir) {
+    let n = 0;
+    for (const e of readdirSync(dir, { withFileTypes: true })) {
+        n += e.isDirectory() ? countFiles(resolve(dir, e.name)) : 1;
+    }
+    return n;
+}
+export function registerSkillCommands(program) {
+    const skill = program
+        .command('skill')
+        .description('skill 文档/模板取用：查文档根 / 拷到工作区 / 同步到已装 skill');
+    skill
+        .command('root')
+        .description('打印 skill-docs 文档根目录绝对路径（文档版本 = CLI 版本）')
+        .action(() => {
+        if (!existsSync(SKILL_DOCS_DIR)) {
+            console.error(`[ERROR] skill-docs 不存在: ${SKILL_DOCS_DIR}`);
+            console.error('       请确认安装的 weaver-e10-builder 版本包含 skill-docs（≥ 1.0.12-beta）。');
+            process.exit(1);
+        }
+        console.log(SKILL_DOCS_DIR.replace(/[\\/]+$/, ''));
+        console.log(`版本: ${pkgVersion()}`);
+    });
+    skill
+        .command('copy')
+        .description('全量拷贝文档+模板到本地 <目标>（默认当前目录），直接放出 references/ actionflows/ assets/ SKILL.md')
+        .argument('[target]', '目标目录（默认当前目录）')
+        .action((target) => {
+        if (!existsSync(SKILL_DOCS_DIR)) {
+            console.error(`[ERROR] skill-docs 不存在: ${SKILL_DOCS_DIR}`);
+            console.error('       请确认安装的 weaver-e10-builder 版本包含 skill-docs（≥ 1.0.12-beta）。');
+            process.exit(1);
+        }
+        const dest = resolve(target || process.cwd());
+        const srcRoot = SKILL_DOCS_DIR.replace(/[\\/]+$/, '');
+        // 防呆：目标 = 源本身或其内部（在 CLI 包/仓库目录内运行且未指定目标）会递归自拷贝。
+        if (dest === srcRoot || dest.startsWith(srcRoot + '/') || dest.startsWith(srcRoot + '\\')) {
+            console.error(`[ERROR] 目标目录 ${dest} 就是文档源目录本身。`);
+            console.error('       你在 CLI 包目录内运行且未指定目标。请换一个目录：e10-cli skill copy <目标目录>');
+            process.exit(1);
+        }
+        // 把源内所有条目摊到目标根，不带 skill-docs/ 壳——AI 读到的路径就是干净的 references/... 等
+        let n = 0;
+        for (const entry of readdirSync(SKILL_DOCS_DIR, { withFileTypes: true })) {
+            const s = resolve(SKILL_DOCS_DIR, entry.name);
+            cpSync(s, resolve(dest, entry.name), { recursive: true, force: true });
+            n += entry.isDirectory() ? countFiles(resolve(dest, entry.name)) : 1;
+        }
+        console.log(`✅ 已拷贝 ${n} 个文件 → ${dest}`);
+        console.log(`   文档根: ${dest}（references/、actionflows/、assets/、SKILL.md）`);
+        console.log(`   文档版本 = CLI 版本 ${pkgVersion()}；若 skill 标注版本与 e10-cli --version 不符，先升级 CLI 再拷。`);
+    });
+    skill
+        .command('sync')
+        .description('探测已安装的 skill（~/.claude/skills、~/.workbuddy/skills、~/.codex/skills 等），把文档树自动拷进对应 skill 目录')
+        .option('--target <dir>', '额外指定的 skill 安装根目录，可重复', collect, [])
+        .action((cmdOpts) => {
+        const results = provisionInstalledSkills(SKILL_DOCS_DIR, pkgVersion(), cmdOpts.target || []);
+        if (!results.length) {
+            console.log('未检测到已安装的 weaver-e10-builder skill。');
+            console.log('  已检查: ~/.claude/skills、~/.workbuddy/skills、~/.codex/skills');
+            console.log('  装好 skill 后再跑一次，或 --target <安装根目录> 手动指定。');
+            return;
+        }
+        let copied = 0;
+        for (const r of results) {
+            if (r.action === 'copied') {
+                console.log(`✅ 已把文档同步到 ${r.skillDir}（版本 ${pkgVersion()}）`);
+                copied++;
+            }
+            else if (r.action === 'current')
+                console.log(`已是最新，跳过 ${r.skillDir}`);
+            else
+                console.log(`⚠️ 同步失败 ${r.skillDir}`);
+        }
+        if (copied) {
+            console.log('  装好后 AI 直接读 skill 目录内的 references/，无需手动拷贝。');
+        }
+    });
+    return skill;
+}
+/** commander 重复 --target 收集为数组 */
+function collect(value, prev) {
+    return [...prev, value];
+}
+//# sourceMappingURL=skill.js.map

package/dist/commands/skill.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"skill.js","sourceRoot":"","sources":["../../src/commands/skill.ts"],"names":[],"mappings":"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"}

package/dist/commands/wf-form.d.ts

@@ -1,3 +1,21 @@
 import { Command } from 'commander';
+import { ApiClient } from '../core/client.js';
+/** 初始化/重建流程表单布局（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 declare function initWorkflowFormLayout(client: ApiClient, baseUrl: string, formId: string, o?: {
+    styleTemplate?: string;
+    readOnly?: boolean;
+    required?: boolean;
+    singleRow?: boolean;
+    generateCollapse?: boolean;
+}, hooks?: {
+    preLayout?: (configs: any[]) => void;
+}): Promise<{
+    layoutType: string;
+    styleTemplateId: string;
+    comps: number;
+}>;
 export declare function registerWorkflowFormCommands(program: Command): Command;
 //# sourceMappingURL=wf-form.d.ts.map

package/dist/commands/wf-form.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wf-form.d.ts","sourceRoot":"","sources":["../../src/commands/wf-form.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA8GpC,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CA2+CtE"}
+{"version":3,"file":"wf-form.d.ts","sourceRoot":"","sources":["../../src/commands/wf-form.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AA0J9C;;;gHAGgH;AAChH,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAClD,CAAC,GAAE;IAAE,aAAa,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAAC,SAAS,CAAC,EAAE,OAAO,CAAC;IAAC,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAAO,EAC3H,KAAK,GAAE;IAAE,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,KAAK,IAAI,CAAA;CAAO,GACnD,OAAO,CAAC;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CAkDzE;AAOD,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CA42CtE"}

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)
@@ -1697,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}`);