weaver-e10-builder 1.2.2 → 1.2.5

package/dist/commands/menu.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"menu.d.ts","sourceRoot":"","sources":["../../src/commands/menu.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAgB9C;;;;GAIG;AACH,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAClF,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CA4CxB;AAED;;;;GAIG;AACH,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GACtF,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAmCxB;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CA2K3D"}
+{"version":3,"file":"menu.d.ts","sourceRoot":"","sources":["../../src/commands/menu.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAgF9C;;;;GAIG;AACH,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAClF,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CA4CxB;AAED;;;;GAIG;AACH,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GACtF,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAmCxB;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAmS3D"}

package/dist/commands/menu.js

@@ -1,5 +1,40 @@
 import { AuthSession } from '../core/auth.js';
 import { ApiClient } from '../core/client.js';
+import { buildRenameNavigation, diffMenuGuard, findMenus, isSystemMenu, nestedCount, pickMenuBucket, similarMenus, } from '../services/menu-catalog.js';
+/**
+ * 拉全量菜单树并展开。**必须是全量**：分页或只取顶层会把嵌套菜单漏掉，
+ * 调用方据此说「这个应用没有这个菜单」就是假否定。
+ */
+async function fetchMenuTree(client, baseUrl, appId) {
+    const url = `${baseUrl}/api/cusapp/app/allMenus?appId=${appId}&terminalType=PC&isFront=0&domain=${encodeURIComponent(baseUrl)}`;
+    const data = await client.get(url, { ebbusinessid: appId });
+    if (data?.code !== 200)
+        return { ok: false, msg: data?.msg || '未知错误' };
+    const { nodes, bucket } = pickMenuBucket(data?.data || {});
+    return { ok: true, nodes, bucket };
+}
+async function confirmMenuCreated(client, baseUrl, appId, match) {
+    const tree = await fetchMenuTree(client, baseUrl, appId);
+    if (!tree.ok)
+        return { state: 'unreadable', msg: tree.msg };
+    const hit = tree.nodes.filter(match);
+    if (!hit.length)
+        return { state: 'missing' };
+    return { state: 'found', node: hit[hit.length - 1] };
+}
+/** 回读确认的统一文案与退出码：只有 `found` 才算成功，另两态各自说清「为什么不能算成功」。 */
+function requireMenuConfirmed(confirm, label) {
+    if (confirm.state === 'missing') {
+        console.error(`已提交，但回读不到${label} —— 该应用的菜单里没有它，请不要当作添加成功。`);
+        console.error('  可能原因：该应用本身不是可挂菜单的应用（有些应用连菜单列表都读不出来）。请在设计器里核对。');
+        process.exit(1);
+    }
+    if (confirm.state === 'unreadable') {
+        console.error(`已提交，但该应用的菜单读不回来（${confirm.msg}），无法回读确认 —— 请在设计器里核对${label}是否真的加上了。`);
+        process.exit(1);
+    }
+    return confirm.node;
+}
 /** Shared "所有人" shareMap block for menu navigation. */
 function allShareMap() {
     return [{
@@ -112,30 +147,129 @@ export function registerMenuCommands(program) {
         if (!auth)
             process.exit(1);
         const client = new ApiClient(auth);
-        const url = `${auth.getBaseUrl()}/api/cusapp/app/allMenus?appId=${appId}&terminalType=PC&isFront=0&domain=${encodeURIComponent(auth.getBaseUrl())}`;
-        const data = await client.get(url, { ebbusinessid: appId });
-        if (data?.code !== 200) {
-            console.error(`查询失败: ${data?.msg || '未知错误'}`);
+        const tree = await fetchMenuTree(client, auth.getBaseUrl(), appId);
+        if (!tree.ok) {
+            console.error(`查询失败: ${tree.msg}`);
             process.exit(1);
         }
-        const inner = data?.data || {};
-        const menus = inner.ebAppMenus || inner.cusAppMenus || [];
-        const items = menus.map((m) => ({
-            id: m.id || '',
-            name: m.content || m.menuName || m.alias || '',
-            pageType: m.pageType || '',
-            url: m.menuUrl || m.pageId || '',
+        const { nodes } = tree;
+        // **递归展开**：菜单是棵树（实测嵌套到三层）。只列顶层会让调用方误判「没有这个菜单」。
+        const items = nodes.map((n) => ({
+            id: n.id,
+            name: n.name,
+            pageType: n.pageType,
+            url: n.menuUrl || n.pageId,
+            // 新增键；上面四个保持原样，既有消费方不受影响
+            parentId: n.parentId,
+            depth: n.depth,
         }));
         if (opts.json) {
             console.log(JSON.stringify(items, null, 2));
         }
+        else if (!items.length) {
+            console.log(`应用 ${appId} 下没有任何菜单。`);
+        }
         else {
-            console.log(`共 ${items.length} 个菜单:`);
-            for (const m of items) {
-                console.log(`  ${m.id.padEnd(22)} ${m.name.padEnd(20)} ${m.pageType.padEnd(8)} ${m.url}`);
+            const nested = nestedCount(nodes);
+            console.log(`共 ${items.length} 个菜单${nested ? `（含 ${nested} 个嵌套）` : ''}:`);
+            for (const n of nodes) {
+                const indent = '  '.repeat(n.depth + 1);
+                console.log(`${indent}${n.id.padEnd(22)} ${n.name.padEnd(20)} ${n.pageType.padEnd(8)} ${n.menuUrl || n.pageId}`);
             }
         }
     });
+    menu.command('rename')
+        .description('重命名已有菜单（菜单是棵树，名称在嵌套里也能改）')
+        .argument('<appId>', '应用 ID')
+        .argument('<menu>', '菜单 ID 或名称（名称在同一应用内重复时必须改用 ID）')
+        .argument('<newName>', '新名称')
+        .action(async (appId, menuRef, newName) => {
+        const opts = program.opts();
+        const auth = await AuthSession.fromOptions(opts);
+        if (!auth)
+            process.exit(1);
+        const client = new ApiClient(auth);
+        const baseUrl = auth.getBaseUrl();
+        const tree = await fetchMenuTree(client, baseUrl, appId);
+        if (!tree.ok) {
+            console.error(`查询失败: ${tree.msg}`);
+            process.exit(1);
+        }
+        const { nodes } = tree;
+        const hits = findMenus(nodes, menuRef);
+        if (!hits.length) {
+            // 这里能断言「没有」是因为上面拿的是**全量递归**结果 —— 没取到才等于不存在
+            console.error(`应用 ${appId} 下找不到菜单「${menuRef}」（已在整个菜单树里查找，共 ${nodes.length} 个节点，含嵌套）。`);
+            const like = similarMenus(nodes, menuRef);
+            if (like.length) {
+                console.error('  名称相近的有:');
+                for (const n of like)
+                    console.error(`    ${n.id}  ${n.name}  [${n.pageType}]`);
+            }
+            process.exit(1);
+        }
+        if (hits.length > 1) {
+            console.error(`名称「${menuRef}」在同一应用下有 ${hits.length} 条，无法确定改哪一个，请改用菜单 ID。`);
+            for (const n of hits)
+                console.error(`    ${n.id}  [${n.pageType}] ${n.menuUrl || n.pageId}`);
+            process.exit(1);
+        }
+        const target = hits[0];
+        if (isSystemMenu(target)) {
+            console.error(`「${target.name}」是平台系统菜单（pageType=${target.pageType}），不支持改名。`);
+            process.exit(1);
+        }
+        if (!target.pageType || target.pageType === 'EMPTY') {
+            console.error(`菜单「${target.name}」没有绑定页面（pageType=${target.pageType || '空'}），改名没有意义，已中止。`);
+            process.exit(1);
+        }
+        if (target.name === newName) {
+            console.log(opts.json ? JSON.stringify({ success: true, unchanged: true, id: target.id, name: newName }) : `菜单「${newName}」名称本来就是它，无需改动。`);
+            return;
+        }
+        const navigation = buildRenameNavigation(target, newName, appId);
+        const { body, boundary } = ApiClient.buildMultipart({
+            appId,
+            navigation: JSON.stringify(navigation),
+            isThirdParty: 'true',
+            terminalType: 'PC',
+        });
+        const res = await client.post(`${baseUrl}/api/cusapp/app/savePublishMenu`, body, {
+            'content-type': `multipart/form-data; boundary=${boundary}`,
+            ebbusinessid: appId,
+            referer: `${baseUrl}/sp/ebdapp/build/${appId}`,
+        });
+        if (res?.code !== 200) {
+            console.error(`改名失败: ${res?.msg || '未知错误'}`);
+            process.exit(1);
+        }
+        // 回读校验：**名字变了**且**别的字段一个都没动**，两条都成立才算成功。
+        // 只认「返回 200」曾经放过写坏菜单的报文（LINK 被写成 EMPTY）。
+        const after = await fetchMenuTree(client, baseUrl, appId);
+        if (!after.ok) {
+            console.error('改名已提交，但回读失败，无法确认结果 —— 请在页面上核对菜单。');
+            process.exit(1);
+        }
+        const nowNode = after.nodes.find((n) => n.id === target.id);
+        if (!nowNode) {
+            console.error('改名已提交，但回读时该菜单不见了 —— 请在页面上核对。');
+            process.exit(1);
+        }
+        if (nowNode.name !== newName) {
+            console.error(`改名未生效: 回读仍是「${nowNode.name}」。`);
+            process.exit(1);
+        }
+        const broken = diffMenuGuard(target, nowNode);
+        if (broken.length) {
+            console.error('⚠ 改名生效了，但以下字段被服务端改动了（可能已影响菜单可用性）:');
+            for (const b of broken)
+                console.error(`    ${b}`);
+            process.exit(1);
+        }
+        console.log(opts.json
+            ? JSON.stringify({ success: true, id: target.id, from: target.name, to: newName })
+            : `菜单已改名: 「${target.name}」→「${newName}」 (id=${target.id})\n  回读校验: 名称已生效，其余字段无变化`);
+    });
     menu.command('add')
         .description('添加菜单项')
         .argument('<name>', '菜单名称')
@@ -190,14 +324,15 @@ export function registerMenuCommands(program) {
             ebbusinessid: appId,
             referer: `${auth.getBaseUrl()}/sp/ebdapp/build/${appId}/viewport/`,
         });
-        if (data?.code === 200) {
-            const msg = opts.json ? JSON.stringify({ success: true, name, path: pagePath }) : `菜单「${name}」已添加 → ${pagePath}`;
-            console.log(msg);
-        }
-        else {
+        if (data?.code !== 200) {
             console.error(`添加失败: ${data?.msg || '未知错误'}`);
             process.exit(1);
         }
+        const confirm = await confirmMenuCreated(client, auth.getBaseUrl(), appId, (n) => n.name === name);
+        const n = requireMenuConfirmed(confirm, `菜单「${name}」`);
+        console.log(opts.json
+            ? JSON.stringify({ success: true, name, path: pagePath, menuId: n.id, parentId: n.parentId, depth: n.depth })
+            : `菜单「${name}」已添加 → ${pagePath} (id=${n.id}${n.depth > 0 ? `, 位于第 ${n.depth} 层` : ''})`);
     });
     menu.command('delete')
         .description('删除菜单项')
@@ -236,8 +371,14 @@ export function registerMenuCommands(program) {
         const client = new ApiClient(auth);
         try {
             const menuId = await addFormTableViewMenu(client, auth.getBaseUrl(), appId, objId, name);
-            const msg = opts.json ? JSON.stringify({ success: true, menuId, appId, objId }) : `台账菜单已添加${menuId ? ` (id=${menuId})` : ''}`;
-            console.log(msg);
+            if (!menuId) {
+                console.error('已提交，但服务端没有返回菜单 ID，无法回读确认 —— 请在设计器里核对台账菜单是否加上了。');
+                process.exit(1);
+            }
+            const n = requireMenuConfirmed(await confirmMenuCreated(client, auth.getBaseUrl(), appId, (x) => x.id === String(menuId)), `台账菜单 (id=${menuId})`);
+            console.log(opts.json
+                ? JSON.stringify({ success: true, menuId: n.id, appId, objId, name: n.name })
+                : `台账菜单已添加: ${n.name} (id=${n.id})`);
         }
         catch (e) {
             console.error(`添加失败: ${e.message}`);
@@ -257,8 +398,14 @@ export function registerMenuCommands(program) {
         const client = new ApiClient(auth);
         try {
             const menuId = await addFormStartMenu(client, auth.getBaseUrl(), appId, formObjId, name);
-            const msg = opts.json ? JSON.stringify({ success: true, menuId, appId, formObjId }) : `发起菜单已添加${menuId ? ` (id=${menuId})` : ''}`;
-            console.log(msg);
+            if (!menuId) {
+                console.error('已提交，但服务端没有返回菜单 ID，无法回读确认 —— 请在设计器里核对发起菜单是否加上了。');
+                process.exit(1);
+            }
+            const n = requireMenuConfirmed(await confirmMenuCreated(client, auth.getBaseUrl(), appId, (x) => x.id === String(menuId)), `发起菜单 (id=${menuId})`);
+            console.log(opts.json
+                ? JSON.stringify({ success: true, menuId: n.id, appId, formObjId, name: n.name })
+                : `发起菜单已添加: ${n.name} (id=${n.id})`);
         }
         catch (e) {
             console.error(`添加失败: ${e.message}`);

package/dist/commands/menu.js.map

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

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

@@ -5,6 +5,7 @@ import { ApiClient } from '../core/client.js';
  *  供 `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?: {
+    layoutId?: string;
     styleTemplate?: string;
     readOnly?: boolean;
     required?: boolean;

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;AAEpC,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AA+K9C;;;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,CAsDzE;AAWD,yCAAyC;AACzC,UAAU,SAAS;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAChG,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,OAAO,CAAC;IAAC,cAAc,CAAC,EAAE,OAAO,CAAC;IAC/D,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxE,yEAAyE;IACzE,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/C,uDAAuD;IACvD,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED;;;;;GAKG;AACH,eAAO,MAAM,eAAe,aAG1B,CAAC;AAEH;;;;;GAKG;AACH,wBAAsB,iBAAiB,CACrC,MAAM,EAAE,SAAS,GAAG,IAAI,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EACtF,KAAK,EAAE,MAAM,GAAG,SAAS,EAAE,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GACvE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAwGlC;AAED,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CA+5CtE"}
+{"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;AAmM9C;;;gHAGgH;AAChH,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAClD,CAAC,GAAE;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,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,EAC9I,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,CAiEzE;AAWD,yCAAyC;AACzC,UAAU,SAAS;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAChG,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,OAAO,CAAC;IAAC,cAAc,CAAC,EAAE,OAAO,CAAC;IAC/D,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxE,yEAAyE;IACzE,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/C,uDAAuD;IACvD,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED;;;;;GAKG;AACH,eAAO,MAAM,eAAe,aAG1B,CAAC;AAEH;;;;;GAKG;AACH,wBAAsB,iBAAiB,CACrC,MAAM,EAAE,SAAS,GAAG,IAAI,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EACtF,KAAK,EAAE,MAAM,GAAG,SAAS,EAAE,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GACvE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAwGlC;AAED,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAg6CtE"}

package/dist/commands/wf-form.js

@@ -41,15 +41,30 @@ function canon(ck) {
     };
     return m[ck.toLowerCase()] || ck;
 }
-async function getLayoutMeta(client, baseUrl, formId) {
-    const res = await client.post(`${baseUrl}${ROUTE}/builder/getFormLayout`, {
+/**
+ * 读布局元信息。不传 `layoutMultiId` 读**默认布局**；传了则定位到那一套。
+ *
+ * 注意返回的两个 id 不是一回事：`layoutMultiId` 是布局列表里的 id（对外用它），
+ * `layoutId` 是**运行时 id**（initLayout 的 `layoutId` 要的是这个，实测等于 multiId+1）。
+ */
+async function getLayoutMeta(client, baseUrl, formId, layoutMultiId) {
+    const body = {
         formId, module: MODULE, customParam: {}, formTableIdList: [],
         designerParam: { onlyLayout: false, convert: false }, form: { id: formId },
-    }, { ebbusinessid: formId });
+    };
+    if (layoutMultiId)
+        body.layoutMultiId = layoutMultiId;
+    const res = await client.post(`${baseUrl}${ROUTE}/builder/getFormLayout`, body, { ebbusinessid: formId });
     if (res?.code !== 200 || !res?.status)
         throw new Error(`getFormLayout 失败: ${res?.msg}`);
     const fl = res.data?.formLayout || {}, flm = res.data?.formLayoutMultiple || {};
-    return { layoutId: fl.id || '', layoutMultiId: flm.id || '', layoutName: flm.name || '', layoutType: flm.layoutType || 'FLOW' };
+    if (layoutMultiId && String(flm.id || '') !== String(layoutMultiId)) {
+        throw new Error(`按 layoutMultiId=${layoutMultiId} 定位不到布局（返回 ${flm.id || '空'}）。为避免误改默认布局，已中止。`);
+    }
+    return {
+        layoutId: fl.id || '', layoutMultiId: flm.id || '', layoutName: flm.name || '',
+        layoutType: flm.layoutType || 'FLOW', terminalType: flm.terminalType || 'PC',
+    };
 }
 async function readConfigs(client, baseUrl, formId) {
     const meta = await getLayoutMeta(client, baseUrl, formId);
@@ -65,14 +80,17 @@ async function readConfigs(client, baseUrl, formId) {
 /** 读取运行时布局（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) {
+async function fetchRuntimeSingleRows(client, baseUrl, formId, layoutMultiId) {
     // 读失败**必须抛错**：这里返回空 Set 等于「运行时一个 singleRow 都没有」，
     // 后面的 initLayout 就会把用户已配的「独占一行」整批冲掉（历史上出过这个事故）。
     // 宁可整条命令失败，也不静默丢配置。
-    const res = await client.post(`${baseUrl}${ROUTE}/builder/getFormLayout`, {
+    const body = {
         formId, module: MODULE, customParam: {}, formTableIdList: [],
         designerParam: { onlyLayout: false, convert: false }, form: { id: formId },
-    }, { ebbusinessid: formId });
+    };
+    if (layoutMultiId)
+        body.layoutMultiId = layoutMultiId;
+    const res = await client.post(`${baseUrl}${ROUTE}/builder/getFormLayout`, body, { ebbusinessid: formId });
     if (res?.code !== 200 || !res?.status) {
         throw new Error(`读取运行时布局失败（getFormLayout）: ${res?.msg || '未知错误'}；已中止，未改动布局`);
     }
@@ -182,13 +200,19 @@ async function fetchFormGroups(client, baseUrl, formId) {
  *  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);
+    const defMeta = await getLayoutMeta(client, baseUrl, formId);
+    // 目标布局：`--layout-id` 指定则写那一套，否则就是默认布局本身
+    const meta = o.layoutId ? await getLayoutMeta(client, baseUrl, formId, o.layoutId) : defMeta;
     if (!meta.layoutId)
         throw new Error('无法获取 layoutId');
     // 保留字段分组：getConfig/initLayout 带 groupFieldIds，否则 Collapse 折叠被冲掉
     const groupIds = await fetchFormGroups(client, baseUrl, formId);
+    // ⚠️ configs **一律从默认布局取**，哪怕这次要写的是另一套布局。
+    // 实测：拿目标布局自己的 runtime id 去 getConfig 也能回一份 configs（字段数看着一样），
+    // 但拿它 initLayout **写不进目标布局** —— 接口回 200、回读 `comps: 0`，静默失败。
+    // 换成默认布局那份立刻落库。别改成 meta.layoutId。
     const cfgRes = await client.post(`${baseUrl}${ROUTE}/view/relate/getConfig`, {
-        formId, module: MODULE, apiModule: 'workflow/form', layoutId: meta.layoutId,
+        formId, module: MODULE, apiModule: 'workflow/form', layoutId: defMeta.layoutId,
         customParam: { terminal: '', objId: formId }, initMode: 5, groupFieldIds: groupIds,
         designerParam: { sourceModule: MODULE },
     }, ebb);
@@ -211,8 +235,14 @@ export async function initWorkflowFormLayout(client, baseUrl, formId, o = {}, ho
         }
         return out;
     }));
-    // 合并运行时已保存的 singleRow（getConfig 不带，防 initLayout 冲掉独占一行）
+    // 合并运行时已保存的 singleRow（getConfig 不带，防 initLayout 冲掉独占一行）。
+    // 默认布局与目标布局**两份都并进来**：configs 取自默认布局，但独占一行可能任一侧配过，
+    // 只读一份就会把另一侧已配的冲掉。多并一份没有副作用（singleRow 只是布局属性）。
     const initSrSet = await fetchRuntimeSingleRows(client, baseUrl, formId);
+    if (meta.layoutMultiId && meta.layoutMultiId !== defMeta.layoutMultiId) {
+        for (const id of await fetchRuntimeSingleRows(client, baseUrl, formId, meta.layoutMultiId))
+            initSrSet.add(id);
+    }
     mergeRuntimeSingleRow(configs, initSrSet);
     // 介入点：add-field --single-row 在此给新加字段单标 singleRow（早于 applyLoneSingleRows，让其 orphan 逻辑接得住）
     if (hooks.preLayout)
@@ -228,7 +258,7 @@ export async function initWorkflowFormLayout(client, baseUrl, formId, o = {}, ho
         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 },
+        formLayoutMultiple: { isSys: true, id: meta.layoutMultiId, name: meta.layoutName, terminalType: meta.terminalType, layoutType: meta.layoutType },
         designerParam: { onlyLayout: false },
     }, ebb);
     if (initRes?.code !== 200 || !initRes?.status)
@@ -1780,7 +1810,7 @@ export function registerWorkflowFormCommands(program) {
                 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 },
+                formLayoutMultiple: { isSys: true, id: meta.layoutMultiId, name: meta.layoutName, terminalType: meta.terminalType, layoutType: meta.layoutType },
                 designerParam: { onlyLayout: false },
             }, ebb);
             if (initRes?.code !== 200 || !initRes?.status)
@@ -1880,6 +1910,7 @@ export function registerWorkflowFormCommands(program) {
     layoutCmd.command('init')
         .description('初始化/重建流程表单布局（initLayout）：按 layoutType 选模板（FLOW 默认）+ 设字段 readOnly/required/singleRow')
         .argument('<formId>', '流程表单 formId')
+        .option('--layout-id <id>', '要重建哪一套布局（formLayoutMultiple.id，即节点独立布局的 layoutId）；不传 = 默认布局')
         .option('--style-template <name|id>', '样式模板 id（默认按 layoutType：FLOW=820...01 / EXCEL=700...08）')
         .option('--read-only', '字段只读')
         .option('--required', '字段必填')
@@ -1985,7 +2016,7 @@ export function registerWorkflowFormCommands(program) {
                 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 },
+                formLayoutMultiple: { isSys: true, id: meta.layoutMultiId, name: meta.layoutName, terminalType: meta.terminalType, layoutType: meta.layoutType },
                 designerParam: { onlyLayout: false },
             }, ebb);
             if (initRes?.code !== 200 || !initRes?.status)