weaver-e10-builder 1.5.9 → 1.5.11

package/dist/commands/wf-form.js

@@ -11,7 +11,7 @@ import { randomUUID } from 'node:crypto';
 import { readFileSync } from 'node:fs';
 import { buildConditionDetail, resolveWorkflowEffect, readLinkageConfig } from '../services/form-linkage-condition.js';
 import { resolveFormulaRefs } from '../services/formula-detail.js';
-import { FLOW_ROUTE, assertAssignableTarget, buildAssignExpression, buildDrivingColumnsBody, buildDrivingEventsBody, buildFdEffect, buildFormulaLinkageName, buildFormulaSavePayload, buildLinkageApiUrl, buildLinkageDeleteBody, buildLinkageListBody, buildLinkageQueryBody, buildLinkageSavePayload, buildLinkageUpdatePayload, buildMonitorActions, buildPreCheckBody, describeColumn, extractEffect, extractTriggerState, findColumnById, isAssignableTarget, moduleColumnsOf, partitionDrivingColumns, resolveDrivingColumn, resolveDrivingEvent, summarizeLinkage, formatTriggerLine, targetDriftWarning, toBareLabel, } from '../services/form-formula-linkage.js';
+import { FLOW_ROUTE, assertAssignableTarget, buildAssignExpression, buildDrivingColumnsBody, buildDrivingEventsBody, buildFdEffect, buildFormulaLinkageName, buildFormulaSavePayload, buildLinkageApiUrl, buildLinkageDeleteBody, buildLinkageListBody, buildLinkageQueryBody, buildLinkageSavePayload, buildLinkageUpdatePayload, buildMonitorActions, buildPreCheckBody, buildTriggerSpecs, describeColumn, extractEffect, formatSpecsLine, isAssignableTarget, isWorkflowDimension, mergeMonitorActions, moduleColumnsOf, partitionDrivingColumns, resolveDrivingColumn, specsFromStoredTriggers, storedTriggers, summarizeLinkage, formatTriggerLine, targetDriftWarning, toBareLabel, } from '../services/form-formula-linkage.js';
 /** 流程表单选项配色（对齐浏览器抓包 styleConfig.OptionBackground，循环取用）。 */
 const OPTION_COLORS = ['#FFBD4F', '#FF716E', '#3BD8C3', '#5B8FF9', '#5AD8A6', '#F6BD16', '#E86452', '#6DC8EC', '#945FB9', '#FF99C3'];
 /**
@@ -2262,12 +2262,12 @@ export function registerWorkflowFormCommands(program) {
         }
     });
     flCmd.command('add')
-        .description('新增函数联动：事件 + 触发字段 + 赋值目标 + 公式')
+        .description('新增函数联动：触发时机（可多个）+ 触发字段 + 赋值目标 + 公式')
         .argument('<formId>', '流程表单 formId')
         .requiredOption('--target <field>', '赋值目标字段（被写入）')
         .requiredOption('--expression <expr>', '公式右侧函数体；也接受整段赋值式，或用 @文件 传长表达式')
-        .option('--event <event>', '触发事件（名称或 type，见 events），默认 changeField 值改变时', 'changeField')
-        .option('--trigger <fields...>', '触发字段，可多个')
+        .option('--event <event...>', '触发时机，**可多个**；每个可自带触发字段 —— 「名称或 type」或「类型:字段,字段」。默认 changeField 值改变时', ['changeField'])
+        .option('--trigger <fields...>', '触发字段，可多个。作用于**没有自带字段**的字段级触发时机')
         .option('--effect <dimension>', '生效维度: form=当前表单（默认）/ formLayout=表单布局 / workFlow=当前工作流 / includeNode=选择节点')
         .option('--workflow-id <id>', '流程 ID（refId，也是 workFlow/includeNode 的取值来源；不给按 formId 兜底）')
         .option('--node <node>', 'includeNode 的节点（id 或节点名）')
@@ -2286,22 +2286,21 @@ export function registerWorkflowFormCommands(program) {
             const ebb = { ebbusinessid: formId };
             const refId = cmdOpts.workflowId || formId;
             const { events, columns, source } = await wfLinkageContext(client, baseUrl, formId, cmdOpts.workflowId);
-            const event = resolveDrivingEvent(events, cmdOpts.event);
             const targetCol = resolveDrivingColumn(columns, cmdOpts.target, FLOW_ROUTE);
             assertAssignableTarget(targetCol, FLOW_ROUTE);
             const drift = targetDriftWarning(targetCol, FLOW_ROUTE);
             if (drift)
                 console.error(`  ⚠ ${drift}`);
-            const triggerCols = (cmdOpts.trigger || []).map((t) => resolveDrivingColumn(columns, t, FLOW_ROUTE));
-            if (!event.selectColumn && triggerCols.length) {
-                console.error(`  ⚠ 事件「${event.name}」是表单级的，不需要触发字段，--trigger 已忽略`);
-            }
-            const monitorActions = buildMonitorActions(event, triggerCols);
+            const built = buildTriggerSpecs(events, columns, cmdOpts.event, cmdOpts.trigger || [], FLOW_ROUTE);
+            const specs = built.specs;
+            for (const w of built.warnings)
+                console.error(`  ⚠ ${w}`);
+            const monitorActions = buildMonitorActions(specs);
             const { effect } = await wfEffectOf(client, baseUrl, formId, cmdOpts);
             const { expression, stripped } = buildAssignExpression(targetCol, readExpressionArg(cmdOpts.expression));
             if (stripped)
                 console.error('  ℹ 表达式自带赋值式，已按 --target 校验左侧并沿用右侧');
-            console.error(`  联动: ${effect.effectName} / ${event.name} ← ${triggerCols.map((c) => toBareLabel(c)).join('、') || '（表单级）'} → 填 ${toBareLabel(targetCol)}(${targetCol.id})`);
+            console.error(`  联动: ${effect.effectName} / ${formatSpecsLine(specs)} → 填 ${toBareLabel(targetCol)}(${targetCol.id})`);
             // 这条路由的 parameter **不带 appId 键**，所以 ctx 里不给 appId
             const parsed = resolveFormulaRefs(expression, {
                 mainFields: source.mainFields, detailTables: source.detailTables,
@@ -2353,10 +2352,13 @@ export function registerWorkflowFormCommands(program) {
                 success: true, linkageId, excelId, formId, refId, effect: effect.effectName,
                 expression: s.expression || parsed.normalizedExpression,
                 target: { id: targetCol.id, name: toBareLabel(targetCol) },
-                event: event.type, triggers: triggerCols.map((c) => ({ id: c.id, name: toBareLabel(c) })),
+                events: specs.map((sp) => ({
+                    type: sp.event.type, name: sp.event.name,
+                    triggers: sp.cols.map((c) => ({ id: String(c.id), name: toBareLabel(c) })),
+                })),
             };
             console.log(opts.json ? JSON.stringify(out, null, 2)
-                : `函数联动已创建: [${linkageId}] ${effect.effectName} / ${event.name} ← ${triggerCols.map((c) => toBareLabel(c)).join('、') || '（表单级）'} → ${toBareLabel(targetCol)}`);
+                : `函数联动已创建: [${linkageId}] ${effect.effectName} / ${formatSpecsLine(specs)} → ${toBareLabel(targetCol)}`);
         }
         catch (e) {
             console.error(`新增函数联动失败: ${e.message}`);
@@ -2364,11 +2366,11 @@ export function registerWorkflowFormCommands(program) {
         }
     });
     flCmd.command('update')
-        .description('改已有函数联动的触发条件/生效维度/名称/启停（不传的项沿用现有）')
+        .description('改已有函数联动的触发时机/生效维度/名称/启停（不给 --event/--trigger 就原样沿用现有的触发时机）')
         .argument('<formId>', '流程表单 formId')
         .argument('<linkageId>', '联动 ID')
-        .option('--event <event>', '改触发事件')
-        .option('--trigger <fields...>', '改触发字段')
+        .option('--event <event...>', '改触发时机，可多个（写法同 add：可带 --event 类型:字段,字段）。不给则沿用现有')
+        .option('--trigger <fields...>', '改触发字段（作用于记录里的字段级触发时机）。不给则沿用现有')
         .option('--effect <dimension>', '改生效维度: form / formLayout / workFlow / includeNode')
         .option('--workflow-id <id>', '流程 ID（refId；不给沿用记录里的）')
         .option('--node <node>', 'includeNode 的节点')
@@ -2386,26 +2388,38 @@ export function registerWorkflowFormCommands(program) {
             const ebb = { ebbusinessid: formId };
             const record = await wfReadLinkage(client, baseUrl, formId, linkageId, cmdOpts.workflowId);
             const refId = String(record?.refId || cmdOpts.workflowId || formId);
-            const cur = extractTriggerState(record);
-            const { events, columns } = await wfLinkageContext(client, baseUrl, formId, cmdOpts.workflowId);
-            const event = resolveDrivingEvent(events, cmdOpts.event || cur.eventType);
-            const triggerInput = cmdOpts.trigger?.length ? cmdOpts.trigger : cur.triggerIds;
-            const triggerCols = [];
-            for (const t of triggerInput) {
-                const col = findColumnById(columns, t) || (() => { try {
-                    return resolveDrivingColumn(columns, t, FLOW_ROUTE);
-                }
-                catch {
-                    return undefined;
-                } })();
-                if (!col)
-                    throw new Error(`触发字段「${t}」在当前表单里找不到了（可能已被删除）。用 wf-form formula-linkage columns 复核`);
-                triggerCols.push(col);
-            }
-            const monitorActions = buildMonitorActions(event, triggerCols);
+            const curEffect = extractEffect(record);
             const effect = cmdOpts.effect
                 ? (await wfEffectOf(client, baseUrl, formId, cmdOpts)).effect
-                : extractEffect(record);
+                : curEffect;
+            // 在「表单/布局」与「工作流/节点」之间换维度时，可用事件整个换了一套；不给 --event 就会存出
+            // 一条「事件是工作流事件、维度却是当前表单」的坏规则 —— 当场拦下
+            if (isWorkflowDimension(curEffect?.effectType) !== isWorkflowDimension(effect?.effectType)
+                && !cmdOpts.event?.length) {
+                throw new Error('生效维度在「当前表单/表单布局」与「当前工作流/选择节点」之间切换时，必须同时用 --event 指定新维度下可用的触发时机');
+            }
+            let specs = null;
+            const wantEvents = !!cmdOpts.event?.length;
+            const wantTrigger = !!cmdOpts.trigger?.length;
+            if (wantEvents || wantTrigger) {
+                const { events, columns } = await wfLinkageContext(client, baseUrl, formId, cmdOpts.workflowId);
+                if (wantEvents) {
+                    const built = buildTriggerSpecs(events, columns, cmdOpts.event, cmdOpts.trigger || [], FLOW_ROUTE);
+                    specs = built.specs;
+                    for (const w of built.warnings)
+                        console.error(`  ⚠ ${w}`);
+                }
+                else {
+                    // 只给 --trigger：触发时机沿用记录里的（记录自己说了算哪些是字段级），只换字段
+                    const built = specsFromStoredTriggers(storedTriggers(record), events, columns, cmdOpts.trigger || []);
+                    specs = built.specs;
+                    if (!built.overrideApplied)
+                        console.error('  ⚠ 记录里没有字段级触发时机，--trigger 已忽略');
+                }
+            }
+            // ⚠ 两个都没给就**原样透传**读回的 monitorActions —— 早先这里是拿 `actions[0]` 重建，
+            // 一条挂了多个触发时机的规则改个名字就会把其余触发时机静默抹掉
+            const monitorActions = specs ? mergeMonitorActions(record?.monitorActions || [], specs) : (record?.monitorActions || []);
             let linkageState = record?.linkageState !== false;
             if (cmdOpts.state) {
                 const v = String(cmdOpts.state).toLowerCase();
@@ -2422,9 +2436,15 @@ export function registerWorkflowFormCommands(program) {
                 throw new Error(`更新失败: ${res?.msg || '未知错误'}`);
             await client.post(`${baseUrl}${buildLinkageApiUrl(FLOW_ROUTE, 'preCheck')}`, buildPreCheckBody(FLOW_ROUTE, { formId, linkageIds: [linkageId], refId }), ebb);
             const after = summarizeLinkage(await wfReadLinkage(client, baseUrl, formId, linkageId, refId));
-            const out = { success: true, linkageId, name: after.name, state: after.state, effect: wfEffectLabel(after.effect), event: after.eventNames.join('、'), triggers: after.triggerNames };
+            // 触发时机数量对不上就是被平台吞了 —— 这种静默丢失必须当场喊出来
+            const want = monitorActions.map((a) => String(a?.actionType || '')).filter(Boolean).join(',');
+            const got = after.triggers.map((t) => t.eventType).join(',');
+            if (want !== got) {
+                console.error(`  ⚠ 回读的触发时机与提交的不一致，以平台为准\n      提交: ${want || '（空）'}\n      回读: ${got || '（空）'}`);
+            }
+            const out = { success: true, linkageId, name: after.name, state: after.state, effect: wfEffectLabel(after.effect), events: after.triggers };
             console.log(opts.json ? JSON.stringify(out, null, 2)
-                : `函数联动已更新: [${linkageId}] ${after.name} (${after.state ? '启用' : '停用'})  ${wfEffectLabel(after.effect)} / ${after.eventNames.join('、')} ← ${after.triggerNames.join('、')}`);
+                : `函数联动已更新: [${linkageId}] ${after.name} (${after.state ? '启用' : '停用'})  ${wfEffectLabel(after.effect)} / ${formatTriggerLine(after)}`);
         }
         catch (e) {
             console.error(`更新函数联动失败: ${e.message}`);