weaver-e10-builder 1.5.13 → 1.5.14

package/dist/commands/workflow.js

@@ -1,3 +1,4 @@
+import { getWorkflowContext } from '../services/workflow-context.js';
 import { readFileSync } from 'node:fs';
 import { buildMatrixRules, parseMatrixRuleInputs } from '../services/workflow-matrix-rule.js';
 import { AuthSession } from '../core/auth.js';
@@ -533,7 +534,6 @@ export function registerWorkflowCommands(program) {
         .option('--matrix-rules <json>', '矩阵条件对象数组或@文件，与--matrix-rule互斥。sourceField=条件列ID；type=field配targetField=表单字段ID，type=0配content=指定部门/分部ID数组；operate可选，默认本级')
         .option('--matrix-name <name>', '矩阵名称（显示标签用，未传则留空）')
         .option('--value-name <name>', '值字段显示名（缺省自动从值列取）')
-        .option('--batch-condition <expr>', '批次条件表达式（--type matrix 可选）')
         .option('--append', '追加操作者组（不清空节点已有操作者组；默认是清空后全量重建）')
         .option('--segment', '片段节点操作者（内部 workflowId 用 -99999999；nodeId 传片段节点 id）')
         .action(async (workflowId, nodeId, keyword, cmdOpts) => {
@@ -1154,8 +1154,7 @@ export function registerWorkflowCommands(program) {
             // Get reserveGroupId
             const reserveGroupId = await fetchReserveGroupId(client, baseUrl, workflowId, nodeId);
             const so = resolveSignOrder(SIGN_ORDER_MAP_BASIC, cmdOpts.signOrder);
-            const batchCond = cmdOpts.batchCondition || '';
-            const conditionDesc = batchCond ? `矩阵条件：${matrixRuleCondition}\\n批次条件：${batchCond}` : `矩阵条件：${matrixRuleCondition}`;
+            const conditionDesc = `矩阵条件：${matrixRuleCondition}`;
             // D09: 标签对齐平台真实 payload——矩阵名/值名列名尽量从矩阵配置取，缺省用显式参数/空
             const matrixName = cmdOpts.matrixName || '';
             const targetCN = cmdOpts.valueName || matrixValueName;
@@ -1180,7 +1179,7 @@ export function registerWorkflowCommands(program) {
                 isOpen: true, bigTypeId: 4,
                 conditionSourceId: '-1',
                 condition: conditionDesc,
-                groupCondition: batchCond,
+                groupCondition: '',
                 matrixRuleCondition,
                 isSuportVirtualId: false, openProjectOrganization: false, isExtendType: 0,
             };
@@ -2473,38 +2472,24 @@ export function registerWorkflowCommands(program) {
             // Select/SelectMultiple 字段常量赋值 customValue 必须存选项 valueKey：
             //   流程表单 Select valueKey=序号(0/1/2)；eb 表 Select valueKey=雪花id(=selectionId)。
             //   存选项名会导致设计器打开值空、actionName 值部分被清。
-            // 两类表单字段读取接口不同，需兼容：先 workflow 接口（流程表单），读不到再 eb 接口（eb 表关联流程）。
-            // formId 从 getDisplayLayoutForm 反查（流程表单=formId，eb 表=关联 eb 表 formId）。
+            // Existing workflow metadata determines the form API; never use failed requests as a type discriminator.
+            const context = await getWorkflowContext(client, baseUrl, wf);
+            const fid = context.formId;
             let customValue = value;
-            try {
-                const dl = await client.get(`${baseUrl}/api/bs/workflow/pathdef/nodeLayout/getDisplayLayoutForm?workflowId=${wf}&nodeId=${nodeId}`);
-                const fid = String(dl?.data?.formId || '');
-                if (fid && parsed.fieldId) {
-                    let f = {};
-                    // ① workflow 接口（流程表单 Select，valueKey=0/1/2）
-                    try {
-                        const gf = await client.post(`${baseUrl}/api/workflow/core/form/field/manage/getFormField`, { module: 'workflow', formTableField: { formField: { id: parsed.fieldId, form: { id: fid } } } }, { ebbusinessid: fid });
-                        f = gf?.data || {};
-                    }
-                    catch { /* try eb */ }
-                    // ② workflow 接口读不到 options（eb 流程字段在 eb 表）→ eb 接口（valueKey=雪花id）
-                    // eb 接口需 customParam:{objId}（用 formId 当 objId 即可读到 options，抓包确认）
-                    if (!Array.isArray(f.options) || f.options.length === 0) {
-                        try {
-                            const gf2 = await client.post(`${baseUrl}/api/ebuilder/form/form/field/manage/getFormField`, { module: 'ebuilderform', customParam: { objId: fid }, formTableField: { formField: { id: parsed.fieldId, form: { id: fid } } } }, { ebbusinessid: fid });
-                            f = gf2?.data || {};
-                        }
-                        catch { /* 保持 */ }
-                    }
-                    if (/select/i.test(String(f.type || f.componentKey || ''))) {
-                        const opts = Array.isArray(f.options) ? f.options : [];
-                        const hit = opts.find((o) => o.name === value);
-                        if (hit)
-                            customValue = String(hit.valueKey);
-                    }
+            if (parsed.fieldId) {
+                const eb = context.kind === 'ebuilder';
+                const gf = await client.post(`${baseUrl}${eb ? '/api/ebuilder/form' : '/api/workflow/core'}/form/field/manage/getFormField`, { module: eb ? 'ebuilderform' : 'workflow', ...(eb ? { customParam: { objId: fid } } : {}),
+                    formTableField: { formField: { id: parsed.fieldId, form: { id: fid } } } }, { ebbusinessid: fid });
+                if (gf?.code !== 200 || gf.status === false || !gf.data)
+                    throw Error('读取赋值字段失败，停止保存');
+                const f = gf.data;
+                if (/select/i.test(String(f.type || f.componentKey || ''))) {
+                    const opts = Array.isArray(f.options) ? f.options : [];
+                    const hit = opts.find((o) => o.name === value);
+                    if (hit)
+                        customValue = String(hit.valueKey);
                 }
             }
-            catch { /* 解析失败保持原值（非 Select 或字段读不到） */ }
             payload = {
                 workflowId: wf, objId: nodeId, triggerType: 'all',
                 data: [{