weaver-e10-builder 1.6.5 → 1.6.6

package/dist/commands/menu.js

@@ -1,20 +1,20 @@
 import { AuthSession } from '../core/auth.js';
 import { ApiClient } from '../core/client.js';
-import { allShareMap, buildAddNavigation, buildMoveNavigation, buildOrderNavigation, buildRenameNavigation, diffMenuGuard, findMenus, isMenuInSubtree, isSystemMenu, nestedCount, pickMenuBucket, pickParentId, resolveMenuShowOrder, showOrderOf, siblingIndex, siblingMenus, similarMenus, } from '../services/menu-catalog.js';
+import { allShareMap, buildAddNavigation, buildMoveNavigation, buildOpenModeNavigation, buildOrderNavigation, buildRenameNavigation, diffMenuGuard, findMenus, isMenuInSubtree, isSystemMenu, nestedCount, openModeOf, pickMenuBucket, pickParentId, resolveMenuShowOrder, resolveOpenMode, showOrderOf, terminalTypeOf, siblingIndex, siblingMenus, similarMenus, } from '../services/menu-catalog.js';
 /**
  * 拉全量菜单树并展开。**必须是全量**：分页或只取顶层会把嵌套菜单漏掉，
  * 调用方据此说「这个应用没有这个菜单」就是假否定。
  */
-export async function fetchMenuTree(client, baseUrl, appId) {
-    const url = `${baseUrl}/api/cusapp/app/allMenus?appId=${appId}&terminalType=PC&isFront=0&domain=${encodeURIComponent(baseUrl)}`;
+export async function fetchMenuTree(client, baseUrl, appId, terminal = 'PC') {
+    const url = `${baseUrl}/api/cusapp/app/allMenus?appId=${appId}&terminalType=${terminal}&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 };
 }
-export async function confirmMenuCreated(client, baseUrl, appId, match) {
-    const tree = await fetchMenuTree(client, baseUrl, appId);
+export async function confirmMenuCreated(client, baseUrl, appId, match, terminal = 'PC') {
+    const tree = await fetchMenuTree(client, baseUrl, appId, terminal);
     if (!tree.ok)
         return { state: 'unreadable', msg: tree.msg };
     const hit = tree.nodes.filter(match);
@@ -41,12 +41,12 @@ function requireMenuConfirmed(confirm, label) {
  * `--parent` 既收父菜单 ID 也收名称（名称在同一应用内重复时报错并列 ID，与 `menu rename` 同口径）。
  * `0` = 顶级菜单。需要算「同级最前面」时必须读菜单树；纯顶级、没给排序选项时不读。
  */
-export async function resolveMenuPlacement(client, baseUrl, appId, parentSpec, order) {
+export async function resolveMenuPlacement(client, baseUrl, appId, parentSpec, order, terminal = 'PC') {
     const raw = String(parentSpec ?? '').trim();
     const needTree = (raw !== '' && raw !== '0') || order.first === true || order.showOrder !== undefined;
     if (!needTree)
         return { parentId: '0', nodes: [] };
-    const tree = await fetchMenuTree(client, baseUrl, appId);
+    const tree = await fetchMenuTree(client, baseUrl, appId, terminal);
     if (tree.ok === false)
         throw new Error(`解析父菜单失败: ${tree.msg}`);
     const picked = pickParentId(tree.nodes, raw || '0');
@@ -75,6 +75,20 @@ export function requireMenuOrder(node, nodes, placement, label) {
         process.exit(1);
     }
 }
+/**
+ * 回读校验打开方式。读侧（`allMenus`）不一定带 `openMode`，所以分三态：
+ * 一致 / 不一致（硬失败）/ 读不到（提示无法核对，不冒充成功）。
+ */
+export function requireMenuOpenMode(node, expected, label) {
+    const raw = node.raw?.openMode;
+    if (raw === undefined || raw === null || String(raw) === '')
+        return 'unreadable';
+    if (String(raw) !== String(expected)) {
+        console.error(`已提交，但回读显示 ${label} 的打开方式是 ${raw}，不是请求的 ${expected} —— 打开方式没生效。`);
+        process.exit(1);
+    }
+    return 'verified';
+}
 /**
  * 回读确认菜单落在**指定的父菜单下**。只确认「这条菜单存在」是不够的 ——
  * `pid` 没生效时菜单照样建得出来，只是跑到了顶级，用户看到的正是「子菜单建不出来」。
@@ -91,7 +105,7 @@ export function requireMenuUnderParent(node, parentId, label) {
  * (the VIEWPORT pageId) via getViewlist, then savePublishMenu with pageType=VIEWPORT.
  * Returns the new menu id, or null on failure.
  */
-export async function addFormTableViewMenu(client, baseUrl, appId, objId, menuName, parentId = '0', showOrder) {
+export async function addFormTableViewMenu(client, baseUrl, appId, objId, menuName, parentId = '0', showOrder, extra = {}) {
     // 1. getViewlist → tableView id (the viewport pageId)
     const vl = await client.get(`${baseUrl}/api/bs/ebuilder/form/viewlist/getViewlist/${objId}?apid=${appId}&tpaid=${objId}&objId=${objId}`, { ebbusinessid: appId });
     const tableViews = vl?.data?.tableView?.detail || [];
@@ -101,7 +115,7 @@ export async function addFormTableViewMenu(client, baseUrl, appId, objId, menuNa
     const name = menuName || tv.name || '台账';
     // 2. build VIEWPORT navigation (matches browser payload)
     const navigation = {
-        content: name, id: '', openMode: '1', pid: parentId, type: '0',
+        content: name, id: '', openMode: resolveOpenMode(extra.openMode), pid: parentId, type: '0',
         filterCondition: {}, menuType: '1', params: [], showType: '1',
         defaultMenuSelect: false, defaultFrontEnable: '1',
         showOrder: showOrder === undefined ? 1 : Number(showOrder),
@@ -123,7 +137,7 @@ export async function addFormTableViewMenu(client, baseUrl, appId, objId, menuNa
         appId,
         navigation: JSON.stringify(navigation),
         isThirdParty: 'true',
-        terminalType: 'PC',
+        terminalType: extra.terminal ?? 'PC',
     });
     const res = await client.post(`${baseUrl}/api/cusapp/app/savePublishMenu`, body, {
         'content-type': `multipart/form-data; boundary=${boundary}`,
@@ -139,10 +153,10 @@ export async function addFormTableViewMenu(client, baseUrl, appId, objId, menuNa
  * the form's create page (pageType=LAYOUT, pageId=1_<formObjId>), which triggers the
  * bound workflow when the form has one. Matches browser savePublishMenu payload.
  */
-export async function addFormStartMenu(client, baseUrl, appId, formObjId, menuName, parentId = '0', showOrder) {
+export async function addFormStartMenu(client, baseUrl, appId, formObjId, menuName, parentId = '0', showOrder, extra = {}) {
     const name = menuName || '发起';
     const navigation = {
-        content: name, id: '', openMode: '1', pid: parentId, type: '0',
+        content: name, id: '', openMode: resolveOpenMode(extra.openMode), pid: parentId, type: '0',
         filterCondition: {}, menuType: '1', params: [], showType: '1',
         defaultMenuSelect: false, defaultFrontEnable: '1',
         showOrder: showOrder === undefined ? 1 : Number(showOrder),
@@ -166,7 +180,7 @@ export async function addFormStartMenu(client, baseUrl, appId, formObjId, menuNa
         appId,
         navigation: JSON.stringify(navigation),
         isThirdParty: 'true',
-        terminalType: 'PC',
+        terminalType: extra.terminal ?? 'PC',
     });
     const res = await client.post(`${baseUrl}/api/cusapp/app/savePublishMenu`, body, {
         'content-type': `multipart/form-data; boundary=${boundary}`,
@@ -183,13 +197,14 @@ export function registerMenuCommands(program) {
         .description('列出应用菜单（--raw 可打印原始报文，用于核查某一项到底存了什么）')
         .argument('<appId>', '应用 ID')
         .option('--raw [menuId]', '打印菜单的原始报文；给了菜单 ID 就只打印那一条')
+        .option('--terminal <t>', '终端: pc（缺省）/ mobile —— PC 与移动端是两套独立菜单')
         .action(async (appId, cmdOpts) => {
         const opts = program.opts();
         const auth = await AuthSession.fromOptions(opts);
         if (!auth)
             process.exit(1);
         const client = new ApiClient(auth);
-        const tree = await fetchMenuTree(client, auth.getBaseUrl(), appId);
+        const tree = await fetchMenuTree(client, auth.getBaseUrl(), appId, terminalTypeOf(cmdOpts.terminal));
         if (!tree.ok) {
             console.error(`查询失败: ${tree.msg}`);
             process.exit(1);
@@ -237,14 +252,16 @@ export function registerMenuCommands(program) {
         .argument('<appId>', '应用 ID')
         .argument('<menu>', '菜单 ID 或名称（名称在同一应用内重复时必须改用 ID）')
         .argument('<newName>', '新名称')
-        .action(async (appId, menuRef, newName) => {
+        .option('--terminal <t>', '终端: pc（缺省）/ mobile')
+        .action(async (appId, menuRef, newName, cmdOpts) => {
         const opts = program.opts();
         const auth = await AuthSession.fromOptions(opts);
         if (!auth)
             process.exit(1);
         const client = new ApiClient(auth);
         const baseUrl = auth.getBaseUrl();
-        const tree = await fetchMenuTree(client, baseUrl, appId);
+        const terminal = terminalTypeOf(cmdOpts.terminal);
+        const tree = await fetchMenuTree(client, baseUrl, appId, terminal);
         if (!tree.ok) {
             console.error(`查询失败: ${tree.msg}`);
             process.exit(1);
@@ -286,7 +303,7 @@ export function registerMenuCommands(program) {
             appId,
             navigation: JSON.stringify(navigation),
             isThirdParty: 'true',
-            terminalType: 'PC',
+            terminalType: terminal,
         });
         const res = await client.post(`${baseUrl}/api/cusapp/app/savePublishMenu`, body, {
             'content-type': `multipart/form-data; boundary=${boundary}`,
@@ -299,7 +316,7 @@ export function registerMenuCommands(program) {
         }
         // 回读校验：**名字变了**且**别的字段一个都没动**，两条都成立才算成功。
         // 只认「返回 200」曾经放过写坏菜单的报文（LINK 被写成 EMPTY）。
-        const after = await fetchMenuTree(client, baseUrl, appId);
+        const after = await fetchMenuTree(client, baseUrl, appId, terminal);
         if (!after.ok) {
             console.error('改名已提交，但回读失败，无法确认结果 —— 请在页面上核对菜单。');
             process.exit(1);
@@ -332,26 +349,30 @@ export function registerMenuCommands(program) {
         .option('--parent <pid>', '父菜单 ID 或名称（默认 0=顶级菜单）', '0')
         .option('--first', '排在同级菜单最前面')
         .option('--show-order <n>', '同级排序号（整数，越小越靠前；缺省 1）')
+        .option('--open-mode <mode>', '打开方式: default（默认窗口，缺省）/ new-window（新窗口）')
+        .option('--terminal <t>', '终端: pc（缺省）/ mobile')
         .action(async (name, pagePath, appId, cmdOpts) => {
         const opts = program.opts();
         const auth = await AuthSession.fromOptions(opts);
         if (!auth)
             process.exit(1);
+        const terminal = terminalTypeOf(cmdOpts.terminal);
         // Fix MSYS path mangling: Git Bash converts /sp/custom/... to D:/Program Files/Git/sp/...
         const msysMatch = pagePath.match(/^[A-Za-z]:[/\\].+?(\/sp\/.+)$/);
         if (msysMatch)
             pagePath = msysMatch[1];
         pagePath = '/' + pagePath.replace(/^\/+/, '');
         const client = new ApiClient(auth);
-        const placement = await resolveMenuPlacement(client, auth.getBaseUrl(), appId, cmdOpts.parent, cmdOpts);
+        const placement = await resolveMenuPlacement(client, auth.getBaseUrl(), appId, cmdOpts.parent, cmdOpts, terminal);
         const navigation = buildAddNavigation({
             name, appId, parentId: placement.parentId, pagePath, showOrder: placement.showOrder,
+            openMode: cmdOpts.openMode,
         });
         const { body, boundary } = ApiClient.buildMultipart({
             appId,
             navigation: JSON.stringify(navigation),
             isThirdParty: 'true',
-            terminalType: 'PC',
+            terminalType: terminal,
         });
         const url = `${auth.getBaseUrl()}/api/cusapp/app/savePublishMenu`;
         const data = await client.post(url, body, {
@@ -363,19 +384,23 @@ export function registerMenuCommands(program) {
             console.error(`添加失败: ${data?.msg || '未知错误'}`);
             process.exit(1);
         }
-        const confirm = await confirmMenuCreated(client, auth.getBaseUrl(), appId, (n) => n.name === name);
+        const confirm = await confirmMenuCreated(client, auth.getBaseUrl(), appId, (n) => n.name === name, terminal);
         const n = requireMenuConfirmed(confirm, `菜单「${name}」`);
         requireMenuUnderParent(n, placement.parentId, `菜单「${n.name}」`);
         if (confirm.state === 'found') {
             requireMenuOrder(n, confirm.nodes, { ...placement, first: cmdOpts.first }, `菜单「${n.name}」`);
         }
+        const openMode = cmdOpts.openMode === undefined ? undefined : resolveOpenMode(cmdOpts.openMode);
+        const openModeState = openMode === undefined ? undefined : requireMenuOpenMode(n, openMode, `菜单「${n.name}」`);
         const orderText = placement.showOrder === undefined ? '' : `, showOrder=${showOrderOf(n)}`;
+        const openModeText = openMode === undefined ? '' : `, openMode=${openMode}${openModeState === 'unreadable' ? '（读侧未返回，未核对）' : ''}`;
         console.log(opts.json
             ? JSON.stringify({
                 success: true, name, path: pagePath, menuId: n.id, parentId: n.parentId, depth: n.depth,
-                showOrder: placement.showOrder === undefined ? undefined : showOrderOf(n),
+                terminal, showOrder: placement.showOrder === undefined ? undefined : showOrderOf(n),
+                openMode,
             })
-            : `菜单「${name}」已添加 → ${pagePath} (id=${n.id}${n.depth > 0 ? `, 位于第 ${n.depth} 层` : ''}${orderText})`);
+            : `菜单「${name}」已添加 → ${pagePath} (id=${n.id}${n.depth > 0 ? `, 位于第 ${n.depth} 层` : ''}${orderText}${openModeText}${terminal === 'H5' ? ', 移动端' : ''})`);
     });
     menu.command('add-dir')
         .description('添加上级目录菜单 —— 空链接的纯分类节点，只用来给子菜单分组，点它不跳页面')
@@ -384,14 +409,16 @@ export function registerMenuCommands(program) {
         .option('--parent <pid>', '父菜单 ID 或名称（默认 0=顶级菜单）', '0')
         .option('--first', '排在同级菜单最前面')
         .option('--show-order <n>', '同级排序号（整数，越小越靠前；缺省 1）')
+        .option('--terminal <t>', '终端: pc（缺省）/ mobile')
         .action(async (appId, name, cmdOpts) => {
         const opts = program.opts();
         const auth = await AuthSession.fromOptions(opts);
         if (!auth)
             process.exit(1);
         const client = new ApiClient(auth);
+        const terminal = terminalTypeOf(cmdOpts.terminal);
         try {
-            const placement = await resolveMenuPlacement(client, auth.getBaseUrl(), appId, cmdOpts.parent, cmdOpts);
+            const placement = await resolveMenuPlacement(client, auth.getBaseUrl(), appId, cmdOpts.parent, cmdOpts, terminal);
             const navigation = buildAddNavigation({
                 name, appId, parentId: placement.parentId, linkless: true, showOrder: placement.showOrder,
             });
@@ -399,7 +426,7 @@ export function registerMenuCommands(program) {
                 appId,
                 navigation: JSON.stringify(navigation),
                 isThirdParty: 'true',
-                terminalType: 'PC',
+                terminalType: terminal,
             });
             const data = await client.post(`${auth.getBaseUrl()}/api/cusapp/app/savePublishMenu`, body, {
                 'content-type': `multipart/form-data; boundary=${boundary}`,
@@ -410,7 +437,7 @@ export function registerMenuCommands(program) {
                 console.error(`添加失败: ${data?.msg || '未知错误'}`);
                 process.exit(1);
             }
-            const confirm = await confirmMenuCreated(client, auth.getBaseUrl(), appId, (n) => n.name === name);
+            const confirm = await confirmMenuCreated(client, auth.getBaseUrl(), appId, (n) => n.name === name, terminal);
             const n = requireMenuConfirmed(confirm, `上级目录「${name}」`);
             requireMenuUnderParent(n, placement.parentId, `上级目录「${n.name}」`);
             if (confirm.state === 'found') {
@@ -439,6 +466,7 @@ export function registerMenuCommands(program) {
         .argument('<menu>', '菜单 ID 或名称（名称在同一应用内重复时必须改用 ID）')
         .option('--first', '排到同级最前面')
         .option('--show-order <n>', '设置同级排序号（整数，越小越靠前）')
+        .option('--terminal <t>', '终端: pc（缺省）/ mobile')
         .action(async (appId, menuRef, cmdOpts) => {
         const opts = program.opts();
         const auth = await AuthSession.fromOptions(opts);
@@ -446,11 +474,12 @@ export function registerMenuCommands(program) {
             process.exit(1);
         const client = new ApiClient(auth);
         const baseUrl = auth.getBaseUrl();
+        const terminal = terminalTypeOf(cmdOpts.terminal);
         try {
             if (cmdOpts.first !== true && cmdOpts.showOrder === undefined) {
                 throw new Error('需要 --first 或 --show-order <n>');
             }
-            const tree = await fetchMenuTree(client, baseUrl, appId);
+            const tree = await fetchMenuTree(client, baseUrl, appId, terminal);
             if (!tree.ok)
                 throw new Error(`读取菜单失败: ${tree.msg}`);
             const hits = findMenus(tree.nodes, menuRef);
@@ -474,7 +503,7 @@ export function registerMenuCommands(program) {
                 throw new Error('需要 --first 或 --show-order <n>');
             const navigation = buildOrderNavigation(target, newOrder, appId);
             const { body, boundary } = ApiClient.buildMultipart({
-                appId, navigation: JSON.stringify(navigation), isThirdParty: 'true', terminalType: 'PC',
+                appId, navigation: JSON.stringify(navigation), isThirdParty: 'true', terminalType: terminal,
             });
             const res = await client.post(`${baseUrl}/api/cusapp/app/savePublishMenu`, body, {
                 'content-type': `multipart/form-data; boundary=${boundary}`,
@@ -483,7 +512,7 @@ export function registerMenuCommands(program) {
             });
             if (res?.code !== 200)
                 throw new Error(`保存排序失败: ${res?.msg || '未知错误'}`);
-            const after = await fetchMenuTree(client, baseUrl, appId);
+            const after = await fetchMenuTree(client, baseUrl, appId, terminal);
             if (!after.ok)
                 throw new Error(`排序已提交，但回读失败（${after.msg}），请在设计器里核对`);
             const node = after.nodes.find((n) => n.id === target.id);
@@ -513,6 +542,76 @@ export function registerMenuCommands(program) {
             process.exit(1);
         }
     });
+    menu.command('open-mode')
+        .description('设置菜单打开方式：default=默认窗口 / new-window=新窗口')
+        .argument('<appId>', '应用 ID')
+        .argument('<menu>', '菜单 ID 或名称（名称在同一应用内重复时必须改用 ID）')
+        .argument('<mode>', 'default=默认窗口 / new-window=新窗口')
+        .option('--terminal <t>', '终端: pc（缺省）/ mobile')
+        .action(async (appId, menuRef, mode, cmdOpts) => {
+        const opts = program.opts();
+        const auth = await AuthSession.fromOptions(opts);
+        if (!auth)
+            process.exit(1);
+        const client = new ApiClient(auth);
+        const baseUrl = auth.getBaseUrl();
+        const terminal = terminalTypeOf(cmdOpts.terminal);
+        try {
+            const expected = resolveOpenMode(mode);
+            const tree = await fetchMenuTree(client, baseUrl, appId, terminal);
+            if (!tree.ok)
+                throw new Error(`读取菜单失败: ${tree.msg}`);
+            const hits = findMenus(tree.nodes, menuRef);
+            if (!hits.length)
+                throw new Error(`应用 ${appId} 下找不到菜单「${menuRef}」`);
+            if (hits.length > 1) {
+                throw new Error(`名称「${menuRef}」在同一应用下有 ${hits.length} 条，请改用菜单 ID：${hits.map((n) => n.id).join(' / ')}`);
+            }
+            const target = hits[0];
+            if (isSystemMenu(target))
+                throw new Error(`「${target.name}」是平台系统菜单（pageType=${target.pageType}），不支持调整打开方式`);
+            if (!target.pageType || target.pageType === 'EMPTY') {
+                throw new Error(`菜单「${target.name}」没有绑定页面（上级目录），打开方式没有意义`);
+            }
+            if (openModeOf(target) === expected) {
+                console.log(opts.json
+                    ? JSON.stringify({ success: true, unchanged: true, menuId: target.id, openMode: expected })
+                    : `菜单「${target.name}」的打开方式本来就是 ${expected === '2' ? '新窗口' : '默认窗口'}，无需改动。`);
+                return;
+            }
+            const navigation = buildOpenModeNavigation(target, expected, appId);
+            const { body, boundary } = ApiClient.buildMultipart({
+                appId, navigation: JSON.stringify(navigation), isThirdParty: 'true', terminalType: terminal,
+            });
+            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)
+                throw new Error(`保存打开方式失败: ${res?.msg || '未知错误'}`);
+            const after = await fetchMenuTree(client, baseUrl, appId, terminal);
+            if (!after.ok)
+                throw new Error(`已提交，但回读失败（${after.msg}），请在设计器里核对`);
+            const node = after.nodes.find((n) => n.id === target.id);
+            if (!node)
+                throw new Error('已提交，但回读时该菜单不见了');
+            const state = requireMenuOpenMode(node, expected, `菜单「${node.name}」`);
+            const broken = diffMenuGuard(target, node, ['openMode']);
+            if (broken.length) {
+                throw new Error(`打开方式生效了，但以下字段被服务端改动（可能影响菜单可用性）：${broken.join('；')}`);
+            }
+            const label = expected === '2' ? '新窗口' : '默认窗口';
+            console.log(opts.json
+                ? JSON.stringify({ success: true, menuId: node.id, openMode: expected, verified: state === 'verified' })
+                : `菜单「${node.name}」打开方式已改为「${label}」(openMode=${expected})`
+                    + (state === 'unreadable' ? '\n  注意: 菜单列表未返回 openMode，无法回读核对，请在设计器里确认一次。' : '\n  回读校验: 打开方式已生效，其余字段无变化'));
+        }
+        catch (e) {
+            console.error(`设置打开方式失败: ${e.message}`);
+            process.exit(1);
+        }
+    });
     menu.command('move')
         .description('移动已有菜单到另一个父级下（可同时调整同级排序）')
         .argument('<appId>', '应用 ID')
@@ -520,6 +619,7 @@ export function registerMenuCommands(program) {
         .requiredOption('--parent <pid>', '目标父菜单 ID 或名称（0=顶级菜单）')
         .option('--first', '移动到同级最前面')
         .option('--show-order <n>', '目标同级排序号（整数，越小越靠前）')
+        .option('--terminal <t>', '终端: pc（缺省）/ mobile')
         .action(async (appId, menuRef, cmdOpts) => {
         const opts = program.opts();
         const auth = await AuthSession.fromOptions(opts);
@@ -527,8 +627,9 @@ export function registerMenuCommands(program) {
             process.exit(1);
         const client = new ApiClient(auth);
         const baseUrl = auth.getBaseUrl();
+        const terminal = terminalTypeOf(cmdOpts.terminal);
         try {
-            const tree = await fetchMenuTree(client, baseUrl, appId);
+            const tree = await fetchMenuTree(client, baseUrl, appId, terminal);
             if (!tree.ok)
                 throw new Error(`读取菜单失败: ${tree.msg}`);
             const hits = findMenus(tree.nodes, menuRef);
@@ -574,7 +675,7 @@ export function registerMenuCommands(program) {
             }
             const navigation = buildMoveNavigation(target, parentId, appId, newOrder);
             const { body, boundary } = ApiClient.buildMultipart({
-                appId, navigation: JSON.stringify(navigation), isThirdParty: 'true', terminalType: 'PC',
+                appId, navigation: JSON.stringify(navigation), isThirdParty: 'true', terminalType: terminal,
             });
             const res = await client.post(`${baseUrl}/api/cusapp/app/savePublishMenu`, body, {
                 'content-type': `multipart/form-data; boundary=${boundary}`,
@@ -583,7 +684,7 @@ export function registerMenuCommands(program) {
             });
             if (res?.code !== 200)
                 throw new Error(`保存移动失败: ${res?.msg || '未知错误'}`);
-            const after = await fetchMenuTree(client, baseUrl, appId);
+            const after = await fetchMenuTree(client, baseUrl, appId, terminal);
             if (!after.ok)
                 throw new Error(`移动已提交，但回读失败（${after.msg}），请在设计器里核对`);
             const node = after.nodes.find((n) => n.id === target.id);
@@ -642,31 +743,36 @@ export function registerMenuCommands(program) {
         .option('--parent <pid>', '父菜单 ID 或名称（默认 0=顶级菜单）', '0')
         .option('--first', '排在同级菜单最前面')
         .option('--show-order <n>', '同级排序号（整数，越小越靠前；缺省 1）')
+        .option('--open-mode <mode>', '打开方式: default（默认窗口，缺省）/ new-window（新窗口）')
+        .option('--terminal <t>', '终端: pc（缺省）/ mobile')
         .action(async (appId, objId, name, cmdOpts) => {
         const opts = program.opts();
         const auth = await AuthSession.fromOptions(opts);
         if (!auth)
             process.exit(1);
         const client = new ApiClient(auth);
+        const terminal = terminalTypeOf(cmdOpts.terminal);
         try {
-            const placement = await resolveMenuPlacement(client, auth.getBaseUrl(), appId, cmdOpts.parent, cmdOpts);
-            const menuId = await addFormTableViewMenu(client, auth.getBaseUrl(), appId, objId, name, placement.parentId, placement.showOrder);
+            const placement = await resolveMenuPlacement(client, auth.getBaseUrl(), appId, cmdOpts.parent, cmdOpts, terminal);
+            const menuId = await addFormTableViewMenu(client, auth.getBaseUrl(), appId, objId, name, placement.parentId, placement.showOrder, { openMode: cmdOpts.openMode, terminal });
             if (!menuId) {
                 console.error('已提交，但服务端没有返回菜单 ID，无法回读确认 —— 请在设计器里核对台账菜单是否加上了。');
                 process.exit(1);
             }
-            const confirm = await confirmMenuCreated(client, auth.getBaseUrl(), appId, (x) => x.id === String(menuId));
+            const confirm = await confirmMenuCreated(client, auth.getBaseUrl(), appId, (x) => x.id === String(menuId), terminal);
             const n = requireMenuConfirmed(confirm, `台账菜单 (id=${menuId})`);
             requireMenuUnderParent(n, placement.parentId, `台账菜单「${n.name}」`);
             if (confirm.state === 'found') {
                 requireMenuOrder(n, confirm.nodes, { ...placement, first: cmdOpts.first }, `台账菜单「${n.name}」`);
             }
+            const openMode = cmdOpts.openMode === undefined ? undefined : resolveOpenMode(cmdOpts.openMode);
+            const openModeState = openMode === undefined ? undefined : requireMenuOpenMode(n, openMode, `台账菜单「${n.name}」`);
             console.log(opts.json
                 ? JSON.stringify({
                     success: true, menuId: n.id, appId, objId, name: n.name, parentId: n.parentId, depth: n.depth,
-                    showOrder: placement.showOrder === undefined ? undefined : showOrderOf(n),
+                    terminal, showOrder: placement.showOrder === undefined ? undefined : showOrderOf(n), openMode,
                 })
-                : `台账菜单已添加: ${n.name} (id=${n.id}${n.depth > 0 ? `, 位于第 ${n.depth} 层` : ''}${placement.showOrder === undefined ? '' : `, showOrder=${showOrderOf(n)}`})`);
+                : `台账菜单已添加: ${n.name} (id=${n.id}${n.depth > 0 ? `, 位于第 ${n.depth} 层` : ''}${placement.showOrder === undefined ? '' : `, showOrder=${showOrderOf(n)}`}${openMode === undefined ? '' : `, openMode=${openMode}${openModeState === 'unreadable' ? '（读侧未返回，未核对）' : ''}`}${terminal === 'H5' ? ', 移动端' : ''})`);
         }
         catch (e) {
             console.error(`添加失败: ${e.message}`);
@@ -681,31 +787,36 @@ export function registerMenuCommands(program) {
         .option('--parent <pid>', '父菜单 ID 或名称（默认 0=顶级菜单）', '0')
         .option('--first', '排在同级菜单最前面')
         .option('--show-order <n>', '同级排序号（整数，越小越靠前；缺省 1）')
+        .option('--open-mode <mode>', '打开方式: default（默认窗口，缺省）/ new-window（新窗口）')
+        .option('--terminal <t>', '终端: pc（缺省）/ mobile')
         .action(async (appId, formObjId, name, cmdOpts) => {
         const opts = program.opts();
         const auth = await AuthSession.fromOptions(opts);
         if (!auth)
             process.exit(1);
         const client = new ApiClient(auth);
+        const terminal = terminalTypeOf(cmdOpts.terminal);
         try {
-            const placement = await resolveMenuPlacement(client, auth.getBaseUrl(), appId, cmdOpts.parent, cmdOpts);
-            const menuId = await addFormStartMenu(client, auth.getBaseUrl(), appId, formObjId, name, placement.parentId, placement.showOrder);
+            const placement = await resolveMenuPlacement(client, auth.getBaseUrl(), appId, cmdOpts.parent, cmdOpts, terminal);
+            const menuId = await addFormStartMenu(client, auth.getBaseUrl(), appId, formObjId, name, placement.parentId, placement.showOrder, { openMode: cmdOpts.openMode, terminal });
             if (!menuId) {
                 console.error('已提交，但服务端没有返回菜单 ID，无法回读确认 —— 请在设计器里核对发起菜单是否加上了。');
                 process.exit(1);
             }
-            const confirm = await confirmMenuCreated(client, auth.getBaseUrl(), appId, (x) => x.id === String(menuId));
+            const confirm = await confirmMenuCreated(client, auth.getBaseUrl(), appId, (x) => x.id === String(menuId), terminal);
             const n = requireMenuConfirmed(confirm, `发起菜单 (id=${menuId})`);
             requireMenuUnderParent(n, placement.parentId, `发起菜单「${n.name}」`);
             if (confirm.state === 'found') {
                 requireMenuOrder(n, confirm.nodes, { ...placement, first: cmdOpts.first }, `发起菜单「${n.name}」`);
             }
+            const openMode = cmdOpts.openMode === undefined ? undefined : resolveOpenMode(cmdOpts.openMode);
+            const openModeState = openMode === undefined ? undefined : requireMenuOpenMode(n, openMode, `发起菜单「${n.name}」`);
             console.log(opts.json
                 ? JSON.stringify({
                     success: true, menuId: n.id, appId, formObjId, name: n.name, parentId: n.parentId, depth: n.depth,
-                    showOrder: placement.showOrder === undefined ? undefined : showOrderOf(n),
+                    terminal, showOrder: placement.showOrder === undefined ? undefined : showOrderOf(n), openMode,
                 })
-                : `发起菜单已添加: ${n.name} (id=${n.id}${n.depth > 0 ? `, 位于第 ${n.depth} 层` : ''}${placement.showOrder === undefined ? '' : `, showOrder=${showOrderOf(n)}`})`);
+                : `发起菜单已添加: ${n.name} (id=${n.id}${n.depth > 0 ? `, 位于第 ${n.depth} 层` : ''}${placement.showOrder === undefined ? '' : `, showOrder=${showOrderOf(n)}`}${openMode === undefined ? '' : `, openMode=${openMode}${openModeState === 'unreadable' ? '（读侧未返回，未核对）' : ''}`}${terminal === 'H5' ? ', 移动端' : ''})`);
         }
         catch (e) {
             console.error(`添加失败: ${e.message}`);