weaver-e10-builder 1.0.3-beta → 1.0.7-beta

package/dist/commands/workflow.js

@@ -443,11 +443,13 @@ export function registerWorkflowCommands(program) {
         .argument('<workflowId>', '流程 ID')
         .argument('<nodeId>', '节点 ID')
         .argument('[keyword]', '人员/角色关键词（--type form 时不需要）', '')
-        .option('--type <type>', '操作者类型: user(指定人) / role(指定角色) / dept(指定部门) / position(指定岗位) / all(所有人) / free(自由选择) / superior(发起人上级) / prev-node(上一节点) / form(表单相关人员) / matrix(矩阵对应)', 'user')
+        .option('--type <type>', '操作者类型: user(指定人) / role(指定角色) / dept(指定部门) / position(指定岗位) / all(所有人) / free(自由选择) / superior(发起人上级) / initiator(流程发起人本人) / prev-node(上一节点) / form(表单相关人员) / matrix(矩阵对应)', 'user')
         .option('--source <formObjId>', '表单 ID（--type form 时必填）')
         .option('--target <fieldId>', '人员字段 ID（--type form 时必填）')
         .option('--condition <json>', '筛选条件 JSON / @文件（--type form 时可选）')
-        .option('--sign-order <order>', '签署顺序: 会签(默认) / 非会签 / 竞签 / 依次处理 / 抄送 / 抄送需批注', '会签')
+        .option('--sign-order <order>', '签署顺序: 会签(默认) / 非会签 / 竞签 / 依次处理(默认倒序) / 抄送 / 抄送需批注', '会签')
+        .option('--execute-order <spec>', '依次处理的执行顺序码: 2-2 人员显示顺序-倒序(默认) / 2-1 正序 / 1-1,2-2 安全级别正序+人员显示倒序', '')
+        .option('--dept-scope <scope>', '指定部门的范围: 本部门 / 本及下级(默认)', '本及下级')
         .option('--orders <orders>', '批次号（两位小数，如 0.00 / 1.00）', '0.00')
         .option('--workflow-form <objId>', '流程绑定的表单 objId（valueFieldId 引用字段时在此表单查找）')
         .option('--matrix-id <id>', '矩阵 ID（--type matrix 必填）')
@@ -455,11 +457,15 @@ export function registerWorkflowCommands(program) {
         .option('--matrix-rule <rules...>', '矩阵条件映射规则。格式: "条件configId:数据来源type:匹配operate:维度virtualId"。type: 0=指定部门/1=发起人部门/5=当前操作人部门。operate: 1=本部门/2=本及下级/3=本及上级/49=逐级向上/67=本及下级逐级向上')
         .option('--batch-condition <expr>', '批次条件表达式（--type matrix 可选）')
         .option('--append', '追加操作者组（不清空节点已有操作者组；默认是清空后全量重建）')
+        .option('--segment', '片段节点操作者（内部 workflowId 用 -99999999；nodeId 传片段节点 id）')
         .action(async (workflowId, nodeId, keyword, cmdOpts) => {
         const opts = program.opts();
         const auth = await AuthSession.fromOptions(opts);
         if (!auth)
             process.exit(1);
+        // 片段节点操作者走 workflowId=-99999999 变体（抓包确认 saveOperatorGroup isPub=1）
+        if (cmdOpts.segment)
+            workflowId = '-99999999';
         const client = new ApiClient(auth);
         const baseUrl = auth.getBaseUrl();
         // 追加模式（--append）下提示语用「追加」，否则「设置」
@@ -487,16 +493,19 @@ export function registerWorkflowCommands(program) {
         let itemLevel = '';
         let includeType = '';
         let includeTypeCN = '';
-        const isSuperior = cmdOpts.type === 'superior';
+        const isSuperior = cmdOpts.type === 'superior' || cmdOpts.type === 'initiator';
         if (isSuperior) {
-            // Superior type: no keyword needed, fixed fields
+            // 发起人上级(superior) / 流程发起人本人(initiator)：无 keyword，固定字段。
+            // 区别（抓包 2026-08-24）：本人 includeType=12+itemName=本人+isSuportVirtualId/openProjectOrganization=true；
+            //   上级 includeType=13+itemName=直接上级+这两个 false。
+            const isInitiator = cmdOpts.type === 'initiator';
             targetId = '';
-            targetName = '直接上级';
+            targetName = isInitiator ? '本人' : '直接上级';
             groupType = '流程发起人';
             groupTypeId = '114';
-            itemName = '直接上级';
-            // Build payload directly — superior has no browserData
-            console.error(`  操作者: 发起人上级 (直接上级) 类型: ${groupType}`);
+            itemName = isInitiator ? '本人' : '直接上级';
+            // Build payload directly — superior/initiator has no browserData
+            console.error(`  操作者: ${isInitiator ? '流程发起人(本人)' : '发起人上级(直接上级)'} 类型: ${groupType}`);
             const rg = await client.post(`${baseUrl}/api/bs/workflow/pathdef/nodeOperator/getLayoutConfigInfo`, {
                 groupId: '', workflowId, nodeId, sourceType: '1', isOperatorRuleAuth: true,
             });
@@ -504,8 +513,10 @@ export function registerWorkflowCommands(program) {
             const payload = {
                 workflowId, nodeId, groupId: '', isCreate: '', reserveGroupId,
                 itemDatas: [{
-                        includeType: '13',
-                        includeTypeCN: '上级',
+                        includeType: isInitiator ? '12' : '13',
+                        includeTypeCN: isInitiator ? '本人' : '上级',
+                        virtualId: '',
+                        virtualIdCN: '',
                         objLevelType: '1',
                         objLevelTypeCN: '全部机构',
                         objectId: '1',
@@ -530,8 +541,8 @@ export function registerWorkflowCommands(program) {
                         condition: '',
                         groupCondition: '',
                         level: '',
-                        isSuportVirtualId: false,
-                        openProjectOrganization: false,
+                        isSuportVirtualId: isInitiator,
+                        openProjectOrganization: isInitiator,
                         isExtendType: 0,
                     }],
                 oldGroupName: '',
@@ -543,9 +554,10 @@ export function registerWorkflowCommands(program) {
             };
             const data = await client.post(`${baseUrl}/api/bs/workflow/pathdef/nodeOperator/saveOperatorGroup`, payload);
             if (data?.code === 200 && data?.status) {
+                const label = isInitiator ? '流程发起人(本人)' : '发起人上级(直接上级)';
                 const msg = opts.json
-                    ? JSON.stringify({ success: true, workflowId, nodeId, operator: '直接上级', type: groupType, append: !!cmdOpts.append })
-                    : `${verb}: 发起人上级(直接上级) → 节点 ${nodeId}`;
+                    ? JSON.stringify({ success: true, workflowId, nodeId, operator: label, type: groupType, append: !!cmdOpts.append })
+                    : `${verb}: ${label} → 节点 ${nodeId}`;
                 console.log(msg);
             }
             else {
@@ -698,16 +710,38 @@ export function registerWorkflowCommands(program) {
                 };
                 ebFormConditionCn = `( ${cond.fieldName || cond.fieldId} ${funcMap[cond.func] || cond.func} '${valueDesc}' )`;
             }
-            const signOrder = cmdOpts.signOrder === '或签' ? '2' : '1';
-            const signOrderCN = cmdOpts.signOrder === '或签' ? '或签' : '会签';
+            // 表单相关人员签署顺序：与 user/role 分支同码（会签1/非会签0/竞签0+competeSignOrder/依次2/抄送3/抄送需批注4）。
+            // 或签 当作竞签（表单字段多人"任一人签"语义一致）。
+            const formSignOrderMap = {
+                '会签': { code: '1', cn: '会签' },
+                '非会签': { code: '0', cn: '非会签' },
+                '竞签': { code: '0', cn: '非会签', competeSignOrder: '1', competeSignOrderCN: '竞签' },
+                '或签': { code: '0', cn: '非会签', competeSignOrder: '1', competeSignOrderCN: '竞签' },
+                '依次处理': { code: '2', cn: '依次逐个处理', executeOrders: '2-2', executeOrdersCN: '人员显示顺序-倒序' },
+                '抄送': { code: '3', cn: '抄送' },
+                '抄送需批注': { code: '4', cn: '抄送' },
+            };
+            const fso = formSignOrderMap[cmdOpts.signOrder || '会签'] || formSignOrderMap['会签'];
+            if (cmdOpts.executeOrder) {
+                const EC = { '2-2': '人员显示顺序-倒序', '2-1': '人员显示顺序-正序', '1-1': '安全级别-正序', '1-2': '安全级别-倒序', '1-1,2-2': '安全级别-正序,人员显示顺序-倒序', '1-1,2-1': '安全级别-正序,人员显示顺序-正序' };
+                fso.executeOrders = cmdOpts.executeOrder;
+                fso.executeOrdersCN = EC[cmdOpts.executeOrder] || cmdOpts.executeOrder;
+            }
+            const signOrder = fso.code;
+            const signOrderCN = fso.cn;
             // Try to get form name and field name via API
             let sourceIdCN = '';
             let targetIdCN = '';
             try {
                 const formFields = await client.post(`${baseUrl}/api/ebuilder/form/dataset/v1/getFields`, {
-                    objId: cmdOpts.source, userid: auth.userId, tenantKey: auth.tenantKey,
+                    objId: cmdOpts.source, userid: auth.userId, tenantKey: auth.tenantKey, isReturnDetail: 'y',
                 });
-                const allFields = [...(formFields?.data?.mainFields || []), ...(formFields?.data?.subFields || [])];
+                // 主表 + 明细字段都纳入（明细字段在 detailFields 里，含 subFormId）
+                const allFields = [
+                    ...(formFields?.data?.mainFields || []),
+                    ...(formFields?.data?.subFields || []),
+                    ...(formFields?.data?.detailFields || []).flatMap((dt) => dt.fields || []),
+                ];
                 const targetField = allFields.find((f) => f.fieldId === cmdOpts.target || f.id === cmdOpts.target);
                 if (targetField) {
                     targetIdCN = targetField.fieldName || targetField.name || '';
@@ -723,6 +757,8 @@ export function registerWorkflowCommands(program) {
             const itemData = {
                 signOrder,
                 signOrderCN,
+                ...(fso.competeSignOrder ? { competeSignOrder: fso.competeSignOrder, competeSignOrderCN: fso.competeSignOrderCN } : {}),
+                ...(fso.executeOrders ? { executeOrders: fso.executeOrders, executeOrdersCN: fso.executeOrdersCN } : {}),
                 isOut: false,
                 isSaveHrmOperator: false,
                 id: '1',
@@ -784,25 +820,43 @@ export function registerWorkflowCommands(program) {
                     console.error('--type dept 需要部门关键词');
                     process.exit(1);
                 }
-                const deptRes = await client.post(`${baseUrl}/api/workflow/pathdef/common/browser/complete/department`, {
-                    browserMultiple: true, virtualType: 'All', showSanYuan: true, newly: 0, searchValue: keyword,
-                });
-                const dept = deptRes?.data?.data?.[0];
-                if (!dept) {
-                    console.error(`未找到部门: ${keyword}`);
+                // keyword 支持逗号分隔多部门；逐个解析
+                const deptNames = keyword.split(',').map((s) => s.trim()).filter(Boolean);
+                if (!deptNames.length) {
+                    console.error('--type dept 需要部门关键词');
+                    process.exit(1);
+                }
+                const depts = [];
+                const missingDepts = [];
+                for (const dn of deptNames) {
+                    const deptRes = await client.post(`${baseUrl}/api/workflow/pathdef/common/browser/complete/department`, {
+                        browserMultiple: true, virtualType: 'All', showSanYuan: true, newly: 0, searchValue: dn,
+                    });
+                    const d = deptRes?.data?.data?.[0];
+                    if (!d) {
+                        missingDepts.push(dn);
+                        continue;
+                    }
+                    depts.push(d);
+                }
+                if (missingDepts.length) {
+                    console.error(`未找到部门: ${missingDepts.join(',')}`);
                     process.exit(1);
                 }
+                // 部门范围：本部门(1, 单个部门内会签) / 本及下级(2, 默认)
+                const includeType = cmdOpts.deptScope === '本部门' ? '1' : '2';
+                const includeTypeCN = includeType === '1' ? '本部门' : '本部门及下级部门';
                 groupType = '指定部门';
                 groupTypeId = '102';
-                itemName = dept.name || keyword;
-                itemData.hrmOperators = dept.id || '';
-                itemData.hrmOperatorsCN = dept.name || '';
-                itemData.includeType = '2';
-                itemData.includeTypeCN = '本部门及下级部门';
+                itemName = depts.map((d) => `${d.name}(${includeTypeCN})`).join(',');
+                itemData.hrmOperators = depts.map((d) => d.id).join(',');
+                itemData.hrmOperatorsCN = depts.map((d) => d.name).join(',');
+                itemData.includeType = includeType;
+                itemData.includeTypeCN = includeTypeCN;
                 itemData.level = '10~90';
                 itemData.itemLevel = '10~90';
-                itemData.hrmBrowserDataDtos = [{ id: dept.id, name: dept.name, _entityType: 'department' }];
-                console.error(`  操作者: ${dept.name} (${dept.id})  类型: 指定部门(包含下级)`);
+                itemData.hrmBrowserDataDtos = depts.map((d) => ({ id: d.id, name: d.name, _entityType: 'department' }));
+                console.error(`  操作者: ${depts.map((d) => d.name).join(',')}  类型: 指定部门(${includeTypeCN})`);
             }
             else if (cmdOpts.type === 'position') {
                 if (!keyword) {
@@ -861,11 +915,21 @@ export function registerWorkflowCommands(program) {
                 '会签': { code: '1', cn: '会签' },
                 '非会签': { code: '0', cn: '非会签' },
                 '竞签': { code: '0', cn: '非会签', competeSignOrder: '1', competeSignOrderCN: '竞签' },
-                '依次处理': { code: '2', cn: '依次处理', executeOrders: '1-1,2-2', executeOrdersCN: '安全级别-正序,人员显示顺序-倒序' },
+                '依次处理': { code: '2', cn: '依次逐个处理', executeOrders: '2-2', executeOrdersCN: '人员显示顺序-倒序' },
                 '抄送': { code: '3', cn: '抄送' },
                 '抄送需批注': { code: '4', cn: '抄送' },
             };
+            // executeOrders 顺序码 → 中文（依次处理时可 --execute-order 覆盖；默认 2-2 倒序）
+            const EXECUTE_ORDER_CN = {
+                '2-2': '人员显示顺序-倒序', '2-1': '人员显示顺序-正序',
+                '1-1': '安全级别-正序', '1-2': '安全级别-倒序',
+                '1-1,2-2': '安全级别-正序,人员显示顺序-倒序', '1-1,2-1': '安全级别-正序,人员显示顺序-正序',
+            };
             const so = signOrderMap[cmdOpts.signOrder || '会签'] || signOrderMap['会签'];
+            if (cmdOpts.executeOrder) {
+                so.executeOrders = cmdOpts.executeOrder;
+                so.executeOrdersCN = EXECUTE_ORDER_CN[cmdOpts.executeOrder] || cmdOpts.executeOrder;
+            }
             // Get reserveGroupId
             const rg = await client.post(`${baseUrl}/api/bs/workflow/pathdef/nodeOperator/getLayoutConfigInfo`, {
                 groupId: '', workflowId, nodeId, sourceType: '1', isOperatorRuleAuth: true,
@@ -1037,24 +1101,13 @@ export function registerWorkflowCommands(program) {
             includeTypeCN = '所有级别';
         }
         else {
-            // Search users
-            const userData = await client.post(`${baseUrl}/api/hrm/common/getEmployeeByKeyWords`, {
-                keyword,
-                searchType: 1,
-                searchCount: 1,
-                appDetachModule: 'EM',
-                disableAppDetach: 0,
-                pageNo: 1,
-                pageSize: 1,
-            });
-            if (userData?.code !== 200 || !userData?.data?.userList?.length) {
-                console.error(`未找到人员: ${keyword}`);
+            // Search users — keyword 支持逗号分隔多人员（一个节点多人，如 闫宇,吴鹏）
+            const names = keyword.split(',').map((s) => s.trim()).filter(Boolean);
+            if (!names.length) {
+                console.error('--type user 需要人员关键词');
                 process.exit(1);
             }
-            const emp = userData.data.userList[0];
-            targetId = emp.id || '';
-            targetName = emp.name || '';
-            browserData = {
+            const mkBrowserData = (emp) => ({
                 id: emp.id || '',
                 cid: emp.cid || emp.companyId || '',
                 userid: emp.userid || emp.userId || emp.id || '',
@@ -1075,11 +1128,30 @@ export function registerWorkflowCommands(program) {
                 mainId: emp.mainId || emp.id || '',
                 stopDepartment: false,
                 leaf: true,
-            };
+            });
+            const emps = [];
+            const missing = [];
+            for (const n of names) {
+                const userData = await client.post(`${baseUrl}/api/hrm/common/getEmployeeByKeyWords`, {
+                    keyword: n, searchType: 1, searchCount: 1, appDetachModule: 'EM', disableAppDetach: 0, pageNo: 1, pageSize: 1,
+                });
+                const emp = userData?.data?.userList?.[0];
+                if (!emp) {
+                    missing.push(n);
+                    continue;
+                }
+                emps.push(emp);
+            }
+            if (missing.length) {
+                console.error(`未找到人员: ${missing.join(',')}`);
+                process.exit(1);
+            }
+            targetId = emps.map((e) => e.id || '').join(',');
+            targetName = emps.map((e) => e.name || '').join(',');
+            browserDatas = emps.map(mkBrowserData);
             groupType = '指定人';
             groupTypeId = '101';
-            itemName = emp.name || '';
-            browserDatas = [browserData];
+            itemName = targetName;
         }
         console.error(`  操作者: ${targetName} (${targetId}) 类型: ${groupType}`);
         // 2. Get reserveGroupId from layout config
@@ -1092,11 +1164,16 @@ export function registerWorkflowCommands(program) {
             '会签': { code: '1', cn: '会签' },
             '非会签': { code: '0', cn: '非会签' },
             '竞签': { code: '0', cn: '非会签', competeSignOrder: '1', competeSignOrderCN: '竞签' },
-            '依次处理': { code: '2', cn: '依次处理', executeOrders: '1-1,2-2', executeOrdersCN: '安全级别-正序,人员显示顺序-倒序' },
+            '依次处理': { code: '2', cn: '依次逐个处理', executeOrders: '2-2', executeOrdersCN: '人员显示顺序-倒序' },
             '抄送': { code: '3', cn: '抄送' },
             '抄送需批注': { code: '4', cn: '抄送' },
         };
         const so = soMap[cmdOpts.signOrder || '会签'] || soMap['会签'];
+        if (cmdOpts.executeOrder) {
+            const EXEC_CN = { '2-2': '人员显示顺序-倒序', '2-1': '人员显示顺序-正序', '1-1': '安全级别-正序', '1-2': '安全级别-倒序', '1-1,2-2': '安全级别-正序,人员显示顺序-倒序', '1-1,2-1': '安全级别-正序,人员显示顺序-正序' };
+            so.executeOrders = cmdOpts.executeOrder;
+            so.executeOrdersCN = EXEC_CN[cmdOpts.executeOrder] || cmdOpts.executeOrder;
+        }
         const itemData = {
             hrmOperators: targetId,
             hrmOperatorsCN: targetName,
@@ -1414,7 +1491,7 @@ export function registerWorkflowCommands(program) {
         '1': '审批',
         '2': '确认/会签',
         '3': '归档',
-        '5': '投递',
+        '5': '投票',
         '7': '自动处理',
         '8': '等待',
         'forkstart': '分流点',
@@ -1568,6 +1645,7 @@ export function registerWorkflowCommands(program) {
         .argument('<xml>', '浏览器格式的 XML 或 @文件路径')
         .option('--delete-links <ids>', '要删除的连线 ID，逗号分隔')
         .option('--delete-nodes <ids>', '要删除的节点 ID，逗号分隔')
+        .option('--chart-src <n>', '图表来源：0=普通流程(默认) / 1=公用流转片段', '0')
         .action(async (workflowId, xmlArg, cmdOpts) => {
         const opts = program.opts();
         const auth = await AuthSession.fromOptions(opts);
@@ -1592,7 +1670,7 @@ export function registerWorkflowCommands(program) {
         // 不要转成 node_X/link_X——服务器解析不了会静默失败。直接回传浏览器格式 XML，
         // 仅对服务器不存在的 nodeId/linkId（新增节点/连线）注入 flag="add"。
         try {
-            const chartData = await client.postForm(`${baseUrl}/api/bs/workflow/pathdef/chart/getXml`, `workflowId=${workflowId}&keepTitle=undefined&showType=0`);
+            const chartData = await client.postForm(`${baseUrl}/api/bs/workflow/pathdef/chart/getXml`, `workflowId=${workflowId}&keepTitle=undefined&showType=0&chartSrc=${cmdOpts.chartSrc}`);
             const serverXml = chartData?.data?.xml || '';
             if (serverXml) {
                 const knownNodes = new Set([...serverXml.matchAll(/nodeId="(\d+)"/g)].map(m => m[1]));
@@ -1614,13 +1692,13 @@ export function registerWorkflowCommands(program) {
         catch { /* best effort */ }
         // Lock the chart for editing (browser does this before save)
         try {
-            await client.postForm(`${baseUrl}/api/bs/workflow/pathdef/chart/checkoutHeart`, `workflowId=${workflowId}&chartSrc=0`);
+            await client.postForm(`${baseUrl}/api/bs/workflow/pathdef/chart/checkoutHeart`, `workflowId=${workflowId}&chartSrc=${cmdOpts.chartSrc}`);
         }
         catch { /* best effort */ }
         // Base64-encode: standard base64 then replace + with $ (avoids form-decoding + as space)
         const xmlB64 = Buffer.from(xml).toString('base64').replace(/\+/g, '$');
         // Build form body — server expects unencoded JSON braces
-        const body = `workflowId=${workflowId}&deleteLinks=${cmdOpts.deleteLinks || ''}&deleteNodes=${cmdOpts.deleteNodes || ''}&groups={"col":[],"row":[]}&deleteGroups=&templateKey=0&chartSrc=0&showConditionName=false&showLinkName=false&isSaveBySkipLinkValidate=false&xml=${xmlB64}`;
+        const body = `workflowId=${workflowId}&deleteLinks=${cmdOpts.deleteLinks || ''}&deleteNodes=${cmdOpts.deleteNodes || ''}&groups={"col":[],"row":[]}&deleteGroups=&templateKey=0&chartSrc=${cmdOpts.chartSrc}&showConditionName=false&showLinkName=false&isSaveBySkipLinkValidate=false&xml=${xmlB64}`;
         const data = await client.postForm(`${baseUrl}/api/bs/workflow/pathdef/chart/saveLayout`, body);
         if (data?.code === 200 && data?.status) {
             const msg = opts.json