weaver-e10-builder 1.5.10 → 1.5.11

package/dist/commands/workflow-subprocess.js

@@ -26,24 +26,27 @@ import { buildConditionChildrens, saveWorkflowCondition } from '../services/cond
  */
 const BASE = '/api/bs/workflow/pathdef/subWf';
 const COND_BASE = '/api/workflow/pathdef/rule/condition';
-const TRI_TIME_LABELS = { LEAVE_NODE: '离开节点', ENTER_NODE: '进入节点' };
+const TRI_TIME_LABELS = { LEAVE_NODE: '离开节点', ARRIVE_NODE: '到达节点' };
 const TRI_TYPE_LABELS = { AUTO: '自动触发', MANUAL: '手动触发' };
-const TRI_SOURCE_TYPE_LABELS = { MAIN: '主表', SUB: '明细' };
+const TRI_SOURCE_TYPE_LABELS = { MAIN: '主表', DETAIL: '明细表' };
 const CREATOR_TYPE_LABELS = {
     MAIN_REQ_CREATOR: '主流程发起人',
     MAIN_NODE_OPERATOR: '主流程当前节点操作人',
     FIELD: '指定字段值',
 };
 /** 读节点全部子流程配置（getSetList.data.data） */
-async function fetchSetList(client, baseUrl, workflowId, nodeId) {
-    const res = await client.get(`${baseUrl}${BASE}/getSetList?workflowId=${workflowId}&nodeId=${nodeId}`);
+async function fetchSetList(client, baseUrl, workflowId, nodeId = '') {
+    const qs = new URLSearchParams({ workflowId });
+    if (nodeId)
+        qs.set('nodeId', nodeId);
+    const res = await client.get(`${baseUrl}${BASE}/getSetList?${qs}`);
     if (res?.code !== 200 || !res?.status)
         throw new Error(`读取子流程配置失败: ${res?.msg || '未知错误'}`);
     return res?.data?.data || [];
 }
 /** getSetList 记录里仅属于响应的字段（回写 saveSet 时剔除，避免后端误解析） */
 const RESP_ONLY_KEYS = new Set([
-    'detailSet', 'triNodeName', 'triTimeName', 'triTypeName', 'subWfName',
+    'detailSet', 'triNodeName', 'triTimeName', 'triTypeName', 'triOperationName', 'subWfName',
     'creator', 'createTime', 'updateTime',
 ]);
 /** 新建 saveSet 的默认字段（对齐抓包 template） */
@@ -90,6 +93,67 @@ async function borrowTenantKey(client, baseUrl, workflowId, nodeId) {
         return '';
     }
 }
+/** 不同子流程的详情接口返回浏览器对象；保存表格时应还原为 ID 字符串。 */
+function browserIds(value) {
+    if (Array.isArray(value))
+        return value.map((v) => String(v?.id ?? v?.dataId ?? v ?? '')).filter(Boolean).join(',');
+    return value == null ? '' : String(value);
+}
+function normalizeDiffRoute(row) {
+    return { ...row, id: String(row.id || ''), diffFieldValue: browserIds(row.diffFieldValue), subWfId: browserIds(row.subWfId), isAdd: false };
+}
+function parseDiffValues(raw) {
+    const values = raw.split(',').map((v) => v.trim());
+    if (!values.length || values.some((v) => !/^\d+$/.test(v)) || new Set(values).size !== values.length) {
+        throw new Error('匹配值须为不重复的浏览器选项 ID，多个用逗号分隔');
+    }
+    return values.join(',');
+}
+async function fetchDiffConfig(client, baseUrl, workflowId, subSetId, detailSetId, subWfId = '') {
+    const qs = new URLSearchParams({ setId: subSetId, detailSetId, workflowId, subWfId });
+    const res = await client.get(`${baseUrl}${BASE}/getDetailSetInfo?${qs}`);
+    if (res?.code !== 200 || !res?.status)
+        throw new Error(`读取不同子流程设置失败: ${res?.msg || '未知错误'}`);
+    const body = res?.data?.data;
+    if (!body || typeof body !== 'object')
+        throw new Error('不同子流程详情缺少默认设置');
+    const rawRoutes = res?.data?.diffSubWfData?.data;
+    if (!Array.isArray(rawRoutes))
+        throw new Error('不同子流程详情缺少路由表，停止写入以免覆盖已有路由');
+    return {
+        defaultSet: body, routes: rawRoutes.map(normalizeDiffRoute),
+        sourceFieldId: String(res?.data?.ebuilderFieldProps?.config?.fieldId || ''),
+    };
+}
+async function fetchDiffRecord(client, baseUrl, workflowId, nodeId, subSetId) {
+    const list = await fetchSetList(client, baseUrl, workflowId, nodeId);
+    const rec = list.find((s) => String(s.id) === subSetId);
+    if (!rec)
+        throw new Error(`未找到子流程配置 ${subSetId}`);
+    if (!rec.diffWf)
+        throw new Error(`配置 ${subSetId} 未开启“触发不同子流程”`);
+    return rec;
+}
+async function saveDiffTable(client, baseUrl, workflowId, subSetId, defaultSet, routes, endpoint) {
+    const body = {
+        stopCreateNode: false, autoShow: 0, createForAnyone: false, delOldSubRequest: 1,
+        readMainNodeType: 'ALL', readSubNodeType: 'ALL', readParalleNodeType: 'ALL',
+        readMainCommentParam: [], readSubCommentParam: [], readParalleCommentParam: [],
+        initDefaultVal: false, splitField: false, splitUnit: false, dataSrc: 0,
+        deleteType: 0, readMain: false, readParalle: false, readSub: false,
+        readMainComment: false, readParalleComment: false, readSubComment: false,
+        createNodeCanDel: false,
+        ...defaultSet, workflowId, subSetId, moduleType: 'workflow', diffWf: true,
+        diffFieldValue: '-1', subWfId: browserIds(defaultSet.subWfId),
+        readMainNodes: browserIds(defaultSet.readMainNodes),
+        readSubNodes: browserIds(defaultSet.readSubNodes),
+        readParalleNodes: browserIds(defaultSet.readParalleNodes),
+        diffSubWfTableDatas: routes.map((row) => ({ ...normalizeDiffRoute(row), isAdd: Boolean(row.isAdd) })),
+    };
+    const res = await client.post(`${baseUrl}${BASE}/${endpoint}`, body);
+    if (res?.code !== 200 || !res?.status)
+        throw new Error(`保存不同子流程路由失败: ${res?.msg || '未知错误'}`);
+}
 export function registerWorkflowSubProcessCommands(wf, program) {
     const subWf = wf.command('sub-process').description('子流程配置（在节点上调用另一流程：读 / 建 / 条件 / 映射 / 明细 / 删）');
     // ─── LIST ───────────────────────────────────────────
@@ -160,6 +224,9 @@ export function registerWorkflowSubProcessCommands(wf, program) {
             console.log(`子流程配置 [${rec.id}] ${rec.triName}`);
             console.log(`  子流程: ${rec.subWfName || rec.subWfId} (${rec.subWfId})  ${rec.enable ? '✅启用' : '⛔停用'}`);
             console.log(`  触发: ${TRI_TYPE_LABELS[rec.triType] || rec.triType}  ${TRI_TIME_LABELS[rec.triTime] || rec.triTime}  源=${TRI_SOURCE_TYPE_LABELS[rec.triSourceType] || rec.triSourceType}(${rec.triSource})  模式=${rec.triMode}`);
+            if (rec.triOperation || rec.triOperation2) {
+                console.log(`  节点操作: ${rec.triOperation || '(无)'} / ${rec.triOperation2 || '(无)'}`);
+            }
             console.log(`  延时: ${rec.timeDay || 0}天${rec.timeHour || 0}时${rec.timeMinute || 0}分  once=${rec.triOnce}  splitDetail=${rec.splitDetail}  groupSplit=${rec.groupSplit}  diffWf=${rec.diffWf}`);
             console.log(`  触发条件: ${ruleId ? `ruleId=${ruleId}` : '（无）'}${rec.ruleName ? `  ${rec.ruleName}` : ''}`);
             if (condRecords.length) {
@@ -168,10 +235,12 @@ export function registerWorkflowSubProcessCommands(wf, program) {
             }
             const ds = rec.detailSet;
             if (ds) {
+                const detailRes = await client.get(`${baseUrl}${BASE}/getDetailSetInfo?${new URLSearchParams({ setId: subSetId, detailSetId: String(ds.id), workflowId, subWfId: String(rec.subWfId || '') })}`);
+                const detail = detailRes?.code === 200 && detailRes?.status ? detailRes?.data?.data || ds : ds;
                 console.log(`  明细设置 (id=${ds.id}):`);
-                console.log(`    创建人: ${CREATOR_TYPE_LABELS[ds.creatorType] || ds.creatorType}${ds.creatorValue ? ` (${ds.creatorValue})` : ''}`);
-                console.log(`    读意见: 主=${ds.readMain} 并行=${ds.readParalle} 子=${ds.readSub}  读意见正文: 主=${ds.readMainComment} 并行=${ds.readParalleComment} 子=${ds.readSubComment}`);
-                console.log(`    delOldSubRequest=${ds.delOldSubRequest}  autoShow=${ds.autoShow}  initDefaultVal=${ds.initDefaultVal}  dataRuleId=${ds.dataRuleId || '(无映射)'}`);
+                console.log(`    创建人: ${CREATOR_TYPE_LABELS[detail.creatorType] || detail.creatorType}${detail.creatorValue ? ` (${detail.creatorValue})` : ''}`);
+                console.log(`    读意见: 主=${detail.readMain} 并行=${detail.readParalle} 子=${detail.readSub}  读意见正文: 主=${detail.readMainComment} 并行=${detail.readParalleComment} 子=${detail.readSubComment}`);
+                console.log(`    delOldSubRequest=${detail.delOldSubRequest}  autoShow=${detail.autoShow}  initDefaultVal=${detail.initDefaultVal}  dataRuleId=${detail.dataRuleId || '(无映射)'}`);
             }
         }
         catch (e) {
@@ -184,20 +253,24 @@ export function registerWorkflowSubProcessCommands(wf, program) {
         .description('新建/更新子流程主配置（saveSet；新建无 --id，更新带 --id 读-改-写）')
         .argument('<workflowId>', '主流程 ID')
         .argument('<nodeId>', '节点 ID')
-        .requiredOption('--sub-wf <id>', '子流程 ID（系统里已存在的普通流程）')
+        .option('--sub-wf <id>', '子流程 ID（普通模式必填；不同子流程模式在路由中指定）')
         .requiredOption('--name <n>', '配置名（triName）')
         .option('--id <subSetId>', '主配置 ID（更新时传；不传=新建）')
-        .option('--tri-time <v>', '触发时间点: LEAVE_NODE(离开节点,默认；其它取值未验证)')
+        .option('--tri-time <v>', '触发时机: LEAVE_NODE(离开节点,默认) / ARRIVE_NODE(到达节点)')
+        .option('--tri-moment <v>', '触发时间: NOW(立即,默认) / DELAY(固定延迟)')
         .option('--tri-type <v>', '触发类型: AUTO(自动,默认；MANUAL 未验证)')
         .option('--tri-mode <v>', '触发模式 (默认 ALL；其它取值未验证)')
-        .option('--tri-source-type <v>', '触发源类型: MAIN(主表,默认；SUB 未验证)')
-        .option('--tri-source <objId>', '触发源（主表 objId）')
+        .option('--tri-source-type <v>', '触发源类型: MAIN(主表,默认) / DETAIL(明细表)')
+        .option('--tri-source <id>', '触发源：MAIN 传主表 objId；DETAIL 传明细表 subFormId')
+        .option('--tri-operation <v>', '上一节点操作: LAST_NODE_APPRIVE(批准) / LAST_NODE_REJECT(退回)')
+        .option('--tri-operation2 <v>', '操作结果: APPRIVE(批准) / REJECT(退回)')
         .option('--enable', '启用（默认停用）')
         .option('--disable', '停用')
         .option('--tri-once', '只触发一次')
-        .option('--split-detail <v>', '拆分明细 (默认 TRI_DATA)')
+        .option('--split-detail <v>', '触发明细赋值: TRI_DATA(触发数据,默认) / ALL_DATA(全部数据)')
         .option('--group-split', '分组拆分')
         .option('--diff-wf', '不同流程')
+        .option('--diff-field-id <fieldId>', '触发不同子流程的可区分字段 ID（--diff-wf 时必填）')
         .option('--time-day <n>', '延时天')
         .option('--time-hour <n>', '延时时')
         .option('--time-minute <n>', '延时分')
@@ -209,10 +282,42 @@ export function registerWorkflowSubProcessCommands(wf, program) {
                 throw new Error('无法加载认证');
             const client = new ApiClient(auth);
             const baseUrl = auth.getBaseUrl();
+            if (o.triSourceType && !['MAIN', 'DETAIL'].includes(o.triSourceType)) {
+                throw new Error('--tri-source-type 只支持 MAIN 或 DETAIL；明细表触发请使用 DETAIL');
+            }
+            if (o.enable && o.disable)
+                throw new Error('--enable 和 --disable 不能同时使用');
+            if (o.triOperation && !['LAST_NODE_APPRIVE', 'LAST_NODE_REJECT'].includes(o.triOperation)) {
+                throw new Error('--tri-operation 只支持 LAST_NODE_APPRIVE 或 LAST_NODE_REJECT');
+            }
+            if (o.triOperation2 && !['APPRIVE', 'REJECT'].includes(o.triOperation2)) {
+                throw new Error('--tri-operation2 只支持 APPRIVE 或 REJECT');
+            }
+            if (Boolean(o.triOperation) !== Boolean(o.triOperation2)) {
+                throw new Error('--tri-operation 与 --tri-operation2 应同时设置');
+            }
+            if (o.triOperation && ((o.triOperation === 'LAST_NODE_APPRIVE' && o.triOperation2 !== 'APPRIVE') ||
+                (o.triOperation === 'LAST_NODE_REJECT' && o.triOperation2 !== 'REJECT'))) {
+                throw new Error('节点触发操作取值不匹配：批准对应 APPRIVE，退回对应 REJECT');
+            }
+            if (o.splitDetail && !['TRI_DATA', 'ALL_DATA'].includes(o.splitDetail)) {
+                throw new Error('--split-detail 只支持 TRI_DATA 或 ALL_DATA');
+            }
+            if (o.triTime && !['LEAVE_NODE', 'ARRIVE_NODE'].includes(o.triTime)) {
+                throw new Error('--tri-time 只支持 LEAVE_NODE 或 ARRIVE_NODE');
+            }
+            if (o.triMoment && !['NOW', 'DELAY'].includes(o.triMoment)) {
+                throw new Error('--tri-moment 只支持 NOW 或 DELAY');
+            }
+            for (const [label, raw] of [['--time-day', o.timeDay], ['--time-hour', o.timeHour], ['--time-minute', o.timeMinute]]) {
+                if (raw != null && (!/^\d+$/.test(raw) || !Number.isSafeInteger(Number(raw)))) {
+                    throw new Error(`${label} 必须是非负整数`);
+                }
+            }
             let body;
             if (o.id) {
                 // 更新：读-改-写（保留原字段，剔除响应专用字段）
-                const list = await fetchSetList(client, baseUrl, workflowId, nodeId);
+                const list = await fetchSetList(client, baseUrl, workflowId);
                 const rec = list.find((s) => String(s.id) === String(o.id));
                 if (!rec)
                     throw new Error(`未找到子流程配置 ${o.id}`);
@@ -220,6 +325,12 @@ export function registerWorkflowSubProcessCommands(wf, program) {
                 for (const k of Object.keys(body))
                     if (RESP_ONLY_KEYS.has(k))
                         delete body[k];
+                if (rec.diffWf && !o.diffFieldId) {
+                    const info = await fetchDiffConfig(client, baseUrl, workflowId, String(rec.id), String(rec.detailSet?.id || ''), String(rec.subWfId || ''));
+                    if (!info.sourceFieldId)
+                        throw new Error('无法从详情接口还原可区分字段 ID，请显式传 --diff-field-id');
+                    body.diffFieldId = info.sourceFieldId;
+                }
             }
             else {
                 // 新建：默认 template + 借用 tenantKey（无则省略）
@@ -232,10 +343,13 @@ export function registerWorkflowSubProcessCommands(wf, program) {
             body.workflowId = workflowId;
             body.triNodeId = nodeId;
             body.multiTriNodeId = nodeId;
-            body.subWfId = o.subWf;
+            if (o.subWf)
+                body.subWfId = o.subWf;
             body.triName = o.name;
             if (o.triTime)
                 body.triTime = o.triTime;
+            if (o.triMoment)
+                body.triMoment = o.triMoment;
             if (o.triType)
                 body.triType = o.triType;
             if (o.triMode)
@@ -244,6 +358,17 @@ export function registerWorkflowSubProcessCommands(wf, program) {
                 body.triSourceType = o.triSourceType;
             if (o.triSource)
                 body.triSource = o.triSource;
+            if (o.triOperation)
+                body.triOperation = o.triOperation;
+            if (o.triOperation2)
+                body.triOperation2 = o.triOperation2;
+            if (body.triSourceType === 'DETAIL' && !body.triSource) {
+                throw new Error('明细表触发需要 --tri-source <明细表 subFormId>');
+            }
+            if (body.triSourceType === 'DETAIL') {
+                body.triOperation ??= 'LAST_NODE_APPRIVE';
+                body.triOperation2 ??= 'APPRIVE';
+            }
             if (o.enable)
                 body.enable = true;
             if (o.disable)
@@ -256,25 +381,216 @@ export function registerWorkflowSubProcessCommands(wf, program) {
                 body.groupSplit = true;
             if (o.diffWf)
                 body.diffWf = true;
+            if (o.diffFieldId)
+                body.diffFieldId = o.diffFieldId;
+            if (body.diffWf) {
+                if (!body.diffFieldId || !body.triSource)
+                    throw new Error('触发不同子流程需要 --diff-field-id <字段ID> 和 --tri-source <表单/明细表ID>');
+                // 设计器同时提交以来源表 ID 为键的区分字段，保持与 saveSet 报文一致。
+                if (!o.id)
+                    body[String(body.triSource)] = body.diffFieldId;
+            }
+            else if (!body.subWfId) {
+                throw new Error('普通子流程触发需要 --sub-wf <子流程ID>');
+            }
             if (o.timeDay != null)
                 body.timeDay = Number(o.timeDay);
             if (o.timeHour != null)
                 body.timeHour = Number(o.timeHour);
             if (o.timeMinute != null)
                 body.timeMinute = Number(o.timeMinute);
+            if (!o.triMoment && (o.timeDay != null || o.timeHour != null || o.timeMinute != null)) {
+                body.triMoment = 'DELAY';
+                body.triTimeType = 'FINALVAL';
+            }
+            if (body.triMoment === 'DELAY' && !Number(body.timeDay || 0) && !Number(body.timeHour || 0) && !Number(body.timeMinute || 0)) {
+                throw new Error('固定延迟触发需要 --time-day、--time-hour 或 --time-minute 指定非零时长');
+            }
             const res = await client.post(`${baseUrl}${BASE}/saveSet`, body);
             if (res?.code !== 200 || !res?.status)
                 throw new Error(`保存失败: ${res?.msg}`);
             const id = res?.data?.id || o.id || '';
+            if (!id)
+                throw new Error('保存接口未返回子流程配置 ID，无法回读校验');
+            const savedList = await fetchSetList(client, baseUrl, workflowId);
+            const saved = savedList.find((s) => String(s.id) === String(id));
+            if (!saved)
+                throw new Error(`保存后未能读回子流程配置 ${id}`);
+            if (String(saved.triNodeId || '') !== nodeId || String(saved.multiTriNodeId || '') !== nodeId) {
+                throw new Error(`触发节点未完整生效：期望 ${nodeId}，读回 triNodeId=${saved.triNodeId || ''}、multiTriNodeId=${saved.multiTriNodeId || ''}`);
+            }
+            if (saved.triSourceType !== body.triSourceType ||
+                ((o.triSource || body.triSourceType === 'DETAIL') && String(saved.triSource || '') !== String(body.triSource || ''))) {
+                throw new Error(`触发来源未生效：请求 ${body.triSourceType}(${body.triSource || ''})，读回 ${saved.triSourceType}(${saved.triSource || ''})`);
+            }
+            if (body.triSourceType === 'DETAIL' && (saved.triOperation !== body.triOperation || saved.triOperation2 !== body.triOperation2)) {
+                throw new Error(`节点触发操作未生效：请求 ${body.triOperation}/${body.triOperation2}，读回 ${saved.triOperation || ''}/${saved.triOperation2 || ''}`);
+            }
+            if (saved.triMoment !== body.triMoment || saved.splitDetail !== body.splitDetail) {
+                throw new Error('触发时间或明细赋值未按请求保存，请用 sub-process get 核对');
+            }
+            if (body.diffWf && (!saved.diffWf || !saved.diffFieldId)) {
+                throw new Error('“触发不同子流程”或区分字段未在保存后读回');
+            }
+            if (o.enable || o.disable) {
+                const enabled = Boolean(o.enable);
+                const statusRes = await client.post(`${baseUrl}${BASE}/updateStatus?id=${encodeURIComponent(String(id))}&enable=${enabled}&workflowId=${encodeURIComponent(workflowId)}`, {});
+                if (statusRes?.code !== 200 || !statusRes?.status)
+                    throw new Error(`更新启停状态失败: ${statusRes?.msg}`);
+                const statusList = await fetchSetList(client, baseUrl, workflowId);
+                const status = statusList.find((s) => String(s.id) === String(id));
+                if (!status || Boolean(status.enable) !== enabled)
+                    throw new Error(`启停状态未生效：期望 ${enabled ? '启用' : '停用'}`);
+            }
             console.log(opts.json
-                ? JSON.stringify({ success: true, id, workflowId, nodeId, subWfId: o.subWf, name: o.name }, null, 2)
-                : `子流程主配置已${o.id ? '更新' : '新建'}: id=${id}  ${o.name}  → ${o.subWf}`);
+                ? JSON.stringify({ success: true, id, workflowId, nodeId, subWfId: saved.subWfId, diffWf: saved.diffWf, name: o.name }, null, 2)
+                : `子流程主配置已${o.id ? '更新' : '新建'}: id=${id}  ${o.name}  → ${saved.diffWf ? '按字段路由' : saved.subWfId}`);
         }
         catch (e) {
             console.error(`保存子流程主配置失败: ${e.message}`);
             process.exitCode = 1;
         }
     });
+    // ─── DIFF-ROUTE（按区分字段触发不同子流程）────────────
+    const diffRoute = subWf.command('diff-route').description('按字段触发不同子流程：路由列表、新增、修改、删除及默认子流程');
+    async function diffContext(workflowId, nodeId, subSetId) {
+        const auth = await AuthSession.fromOptions(program.opts());
+        if (!auth)
+            throw new Error('无法加载认证');
+        const client = new ApiClient(auth);
+        const baseUrl = auth.getBaseUrl();
+        const rec = await fetchDiffRecord(client, baseUrl, workflowId, nodeId, subSetId);
+        const config = await fetchDiffConfig(client, baseUrl, workflowId, subSetId, String(rec.detailSet?.id || ''), String(rec.subWfId || ''));
+        return { client, baseUrl, rec, ...config };
+    }
+    diffRoute.command('list')
+        .description('查看默认子流程和字段值路由（同时输出路由 ID）')
+        .argument('<workflowId>').argument('<nodeId>').argument('<subSetId>')
+        .action(async (workflowId, nodeId, subSetId) => {
+        try {
+            const { rec, defaultSet, routes, sourceFieldId } = await diffContext(workflowId, nodeId, subSetId);
+            const result = { subSetId, diffFieldId: sourceFieldId || rec.diffFieldId, defaultSubWfId: browserIds(defaultSet.subWfId), routes: routes.map((r) => ({ id: r.id, values: r.diffFieldValue, subWfId: r.subWfId })) };
+            if (program.opts().json)
+                console.log(JSON.stringify(result, null, 2));
+            else {
+                console.log(`区分字段: ${result.diffFieldId}  默认子流程: ${result.defaultSubWfId || '(未设置)'}`);
+                for (const r of result.routes)
+                    console.log(`  [${r.id}] ${r.values} → ${r.subWfId}`);
+            }
+        }
+        catch (e) {
+            console.error(`读取不同子流程路由失败: ${e.message}`);
+            process.exitCode = 1;
+        }
+    });
+    diffRoute.command('default')
+        .description('设置未命中字段值时使用的默认子流程')
+        .argument('<workflowId>').argument('<nodeId>').argument('<subSetId>')
+        .requiredOption('--sub-wf <id>', '默认子流程 ID')
+        .action(async (workflowId, nodeId, subSetId, o) => {
+        try {
+            const { client, baseUrl, defaultSet, routes, rec } = await diffContext(workflowId, nodeId, subSetId);
+            if (!routes.length)
+                throw new Error('请先用 diff-route add --default-sub-wf 同时建立首条路由和默认子流程');
+            await saveDiffTable(client, baseUrl, workflowId, subSetId, { ...defaultSet, subWfId: o.subWf, id: defaultSet.id || rec.detailSet?.id }, routes, 'saveDefaultSubWfSet');
+            const updatedRec = await fetchDiffRecord(client, baseUrl, workflowId, nodeId, subSetId);
+            const fresh = await fetchDiffConfig(client, baseUrl, workflowId, subSetId, String(updatedRec.detailSet?.id || ''), o.subWf);
+            if (browserIds(fresh.defaultSet.subWfId) !== o.subWf)
+                throw new Error('默认子流程保存后读回不一致');
+            console.log(`默认子流程已设置: ${o.subWf}`);
+        }
+        catch (e) {
+            console.error(`设置默认子流程失败: ${e.message}`);
+            process.exitCode = 1;
+        }
+    });
+    diffRoute.command('add')
+        .description('新增一条字段值到子流程的路由；--values 传平台选项 ID')
+        .argument('<workflowId>').argument('<nodeId>').argument('<subSetId>')
+        .requiredOption('--values <ids>', '一个或多个匹配值 ID，逗号分隔')
+        .requiredOption('--sub-wf <id>', '目标子流程 ID')
+        .option('--default-sub-wf <id>', '首次建路由时同时指定默认子流程 ID')
+        .action(async (workflowId, nodeId, subSetId, o) => {
+        try {
+            const values = parseDiffValues(o.values);
+            const { client, baseUrl, defaultSet, routes, rec } = await diffContext(workflowId, nodeId, subSetId);
+            if (!browserIds(defaultSet.subWfId) && !o.defaultSubWf)
+                throw new Error('首条路由需要 --default-sub-wf <默认子流程ID>');
+            const used = new Set(routes.flatMap((r) => r.diffFieldValue.split(',')));
+            if (values.split(',').some((v) => used.has(v)))
+                throw new Error('匹配值已在其它路由中使用');
+            const idRes = await client.get(`${baseUrl}${BASE}/getDiffSubWfTableId`);
+            const routeId = String(idRes?.data || '');
+            if (idRes?.code !== 200 || !idRes?.status || !/^\d+$/.test(routeId))
+                throw new Error('无法取得新路由 ID');
+            await saveDiffTable(client, baseUrl, workflowId, subSetId, { ...defaultSet, subWfId: o.defaultSubWf || defaultSet.subWfId, id: defaultSet.id || rec.detailSet?.id }, [
+                ...routes, { id: routeId, diffFieldValue: values, subWfId: o.subWf, isAdd: true },
+            ], 'saveDefaultSubWfSet');
+            const updatedRec = await fetchDiffRecord(client, baseUrl, workflowId, nodeId, subSetId);
+            const fresh = await fetchDiffConfig(client, baseUrl, workflowId, subSetId, String(updatedRec.detailSet?.id || ''), String(updatedRec.subWfId || ''));
+            const saved = fresh.routes.find((r) => r.id === routeId);
+            if (!saved || saved.diffFieldValue !== values || saved.subWfId !== o.subWf)
+                throw new Error(`路由 ${routeId} 保存后读回不一致`);
+            if (o.defaultSubWf && browserIds(fresh.defaultSet.subWfId) !== o.defaultSubWf)
+                throw new Error('默认子流程保存后读回不一致');
+            console.log(`不同子流程路由已新增: [${routeId}] ${values} → ${o.subWf}`);
+        }
+        catch (e) {
+            console.error(`新增不同子流程路由失败: ${e.message}`);
+            process.exitCode = 1;
+        }
+    });
+    diffRoute.command('update')
+        .description('原位修改已有路由的匹配值或目标子流程，保留路由 ID')
+        .argument('<workflowId>').argument('<nodeId>').argument('<subSetId>').argument('<routeId>')
+        .option('--values <ids>', '新的匹配值 ID，逗号分隔')
+        .option('--sub-wf <id>', '新的目标子流程 ID')
+        .action(async (workflowId, nodeId, subSetId, routeId, o) => {
+        try {
+            if (!o.values && !o.subWf)
+                throw new Error('至少提供 --values 或 --sub-wf');
+            const { client, baseUrl, defaultSet, routes, rec } = await diffContext(workflowId, nodeId, subSetId);
+            const row = routes.find((r) => r.id === routeId);
+            if (!row)
+                throw new Error(`未找到路由 ${routeId}`);
+            const values = o.values ? parseDiffValues(o.values) : row.diffFieldValue;
+            const used = new Set(routes.filter((r) => r.id !== routeId).flatMap((r) => r.diffFieldValue.split(',')));
+            if (values.split(',').some((v) => used.has(v)))
+                throw new Error('匹配值已在其它路由中使用');
+            const subWfId = o.subWf || row.subWfId;
+            await saveDiffTable(client, baseUrl, workflowId, subSetId, { ...defaultSet, id: defaultSet.id || rec.detailSet?.id }, routes.map((r) => r.id === routeId ? { ...r, diffFieldValue: values, subWfId } : r), 'saveDetailSet');
+            const fresh = await fetchDiffConfig(client, baseUrl, workflowId, subSetId, String(rec.detailSet?.id || ''), String(rec.subWfId || ''));
+            const saved = fresh.routes.find((r) => r.id === routeId);
+            if (!saved || saved.diffFieldValue !== values || saved.subWfId !== subWfId)
+                throw new Error(`路由 ${routeId} 修改后读回不一致`);
+            console.log(`不同子流程路由已修改: [${routeId}] ${values} → ${subWfId}`);
+        }
+        catch (e) {
+            console.error(`修改不同子流程路由失败: ${e.message}`);
+            process.exitCode = 1;
+        }
+    });
+    diffRoute.command('delete')
+        .description('删除指定路由行（不删除子流程本身）')
+        .argument('<workflowId>').argument('<nodeId>').argument('<subSetId>').argument('<routeId>')
+        .action(async (workflowId, nodeId, subSetId, routeId) => {
+        try {
+            const { client, baseUrl, routes, rec } = await diffContext(workflowId, nodeId, subSetId);
+            if (!routes.some((r) => r.id === routeId))
+                throw new Error(`未找到路由 ${routeId}`);
+            const res = await client.post(`${baseUrl}${BASE}/deleteDiffSubWfSet`, { diffSubWfSetId: [routeId], workflowId });
+            if (res?.code !== 200 || !res?.status)
+                throw new Error(`删除路由失败: ${res?.msg || '未知错误'}`);
+            const fresh = await fetchDiffConfig(client, baseUrl, workflowId, subSetId, String(rec.detailSet?.id || ''), String(rec.subWfId || ''));
+            if (fresh.routes.some((r) => r.id === routeId))
+                throw new Error(`路由 ${routeId} 删除后仍可读到`);
+            console.log(`不同子流程路由已删除: ${routeId}`);
+        }
+        catch (e) {
+            console.error(`删除不同子流程路由失败: ${e.message}`);
+            process.exitCode = 1;
+        }
+    });
     // ─── SET-CONDITION（触发条件）────────────────────────
     subWf.command('set-condition')
         .description('设置子流程触发条件（复用 workflow 条件构建器，source=7）→ 回填 saveSet.ruleId')
@@ -359,7 +675,8 @@ export function registerWorkflowSubProcessCommands(wf, program) {
         .requiredOption('--sub-wf <id>', '子流程 ID')
         .requiredOption('--map <pairs...>', '映射 srcField:targetField[:name]（可多个）')
         .option('--field-mapping-id <id>', '映射记录 ID（更新传；不传=新建）')
-        .option('--tri-source <objId>', '主表 objId（写 dataSrc/triSource 联动用，可选）')
+        .option('--tri-source <objId>', '保留兼容参数：主表 objId')
+        .option('--detail-source <subFormId>', '明细逐行触发时的来源明细表 subFormId（写入映射上下文）')
         .action(async (workflowId, o) => {
         try {
             const opts = program.opts();
@@ -382,6 +699,10 @@ export function registerWorkflowSubProcessCommands(wf, program) {
                 srcModuleType: 'WORKFLOW', otherParams: { showSysFieldDetailTableId: '' },
                 targetWorkflowId: o.subWf, data, workflowId: o.subWf,
             };
+            if (o.detailSource) {
+                body.subRequestByDetailTrigger = o.detailSource;
+                body.otherParams.showSysFieldDetailTableId = o.detailSource;
+            }
             if (o.fieldMappingId)
                 body.fieldMappingId = o.fieldMappingId;
             const res = await client.post(`${baseUrl}${BASE}/saveSubFieldMappingTable`, body);
@@ -427,10 +748,14 @@ export function registerWorkflowSubProcessCommands(wf, program) {
             const ds = rec.detailSet;
             if (!ds)
                 throw new Error('该配置无内嵌 detailSet，无法更新');
+            // 不同子流程的默认路由使用独立详情接口，不能写普通 saveDetailSet。
+            const diffConfig = rec.diffWf
+                ? await fetchDiffConfig(client, baseUrl, workflowId, subSetId, String(ds.id), String(rec.subWfId || ''))
+                : null;
             const [ctype, cval] = o.creator.split(':');
             if (!ctype)
                 throw new Error(`--creator 格式错误: ${o.creator}（应为 type:fieldId）`);
-            const body = JSON.parse(JSON.stringify(ds));
+            const body = JSON.parse(JSON.stringify(diffConfig?.defaultSet || ds));
             // 联动：subSetId, subWfId, workflowId, moduleType 用主配置的值
             body.subSetId = String(rec.id);
             body.subWfId = rec.subWfId;
@@ -453,9 +778,34 @@ export function registerWorkflowSubProcessCommands(wf, program) {
                 body.initDefaultVal = true;
             if (o.dataRuleId)
                 body.dataRuleId = o.dataRuleId;
-            const res = await client.post(`${baseUrl}${BASE}/saveDetailSet`, body);
+            if (rec.diffWf) {
+                body.diffWf = true;
+                body.diffFieldValue = '-1';
+                body.triSource = rec.triSource;
+                body.diffFieldId = diffConfig?.sourceFieldId || rec.diffFieldId;
+            }
+            const endpoint = rec.diffWf ? 'saveDiffSubWfDetailSet' : 'saveDetailSet';
+            // 设计器的不同子流程详情接口从 URL 查询参数取值；普通详情接口接收 JSON。
+            const saveUrl = rec.diffWf
+                ? `${baseUrl}${BASE}/${endpoint}?${new URLSearchParams(Object.entries(body).reduce((query, [key, value]) => {
+                    if (value == null || typeof value === 'object')
+                        return query;
+                    query[key] = String(value);
+                    return query;
+                }, {}))}`
+                : `${baseUrl}${BASE}/${endpoint}`;
+            const res = await client.post(saveUrl, rec.diffWf ? {} : body);
             if (res?.code !== 200 || !res?.status)
                 throw new Error(`保存明细设置失败: ${res?.msg}`);
+            if (o.dataRuleId) {
+                const fresh = await client.get(`${baseUrl}${BASE}/getDetailSetInfo?${new URLSearchParams({ setId: subSetId, detailSetId: String(ds.id), workflowId, subWfId: String(rec.subWfId || '') })}`);
+                if (fresh?.code !== 200 || !fresh?.status)
+                    throw new Error(`字段映射读回失败: ${fresh?.msg || '未知错误'}`);
+                const savedRuleId = String(fresh?.data?.data?.dataRuleId || '');
+                if (savedRuleId !== o.dataRuleId) {
+                    throw new Error(`字段映射未生效：期望 dataRuleId=${o.dataRuleId}，读回 ${savedRuleId || '(无)'}`);
+                }
+            }
             console.log(opts.json
                 ? JSON.stringify({ success: true, subSetId, detailSetId: ds.id, creatorType: ctype, creatorValue: cval || '' }, null, 2)
                 : `明细设置已保存: detailSetId=${ds.id}  创建人=${CREATOR_TYPE_LABELS[ctype] || ctype}${cval ? `(${cval})` : ''}`);