weaver-e10-builder 1.6.4 → 1.6.6

package/dist/services/actionflow/preflight_service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"preflight_service.d.ts","sourceRoot":"","sources":["../../../src/services/actionflow/preflight_service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"preflight_service.d.ts","sourceRoot":"","sources":["../../../src/services/actionflow/preflight_service.ts"],"names":[],"mappings":"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"}

package/dist/services/actionflow/preflight_service.js

@@ -4,6 +4,7 @@ import * as personSource from './person_source.js';
 import * as contextSource from './context_source.js';
 import * as hrmSource from './hrm_source.js';
 import * as documentSource from './document_source.js';
+import * as classifiedProtectionSource from './classified_protection_source.js';
 import * as browserSource from './browser_source.js';
 import * as logicFlowSource from './logicflow_source.js';
 import { completeEbuilder, pickEbuilderBrowserRow } from './ebuilder_source.js';
@@ -37,6 +38,11 @@ function buttonName(row) {
     return String(row?.name ?? row?.content ?? row?.text ?? '').trim();
 }
 function supportsTriggerBefore(row) {
+    // 前端 eventButton/index.tsx 的简单模式只筛选 buttonKey=save/editSave，
+    // 并把它们固定映射为 buttonLocation=before；这类响应没有 needTriggerBefore。
+    const buttonKey = String(row?.buttonKey || '').trim();
+    if (buttonKey === 'save' || buttonKey === 'editSave')
+        return true;
     const value = row?.needTriggerBefore;
     return value === true || value === 1 || value === '1' || String(value).toLowerCase() === 'true';
 }
@@ -555,6 +561,111 @@ function walkPlanSteps(value) {
     walk(value);
     return steps[Symbol.iterator]();
 }
+function fixedAssignmentValue(value) {
+    if (typeof value === 'string' || typeof value === 'number')
+        return { fixed: true, value };
+    if (!value || typeof value !== 'object' || Array.isArray(value))
+        return { fixed: false };
+    const kind = String(value.kind ?? value.assignmentKind ?? '').toLowerCase();
+    if (kind && !['fixed', 'literal'].includes(kind))
+        return { fixed: false };
+    let config = value.config;
+    if (typeof config === 'string') {
+        try {
+            config = JSON.parse(config);
+        }
+        catch {
+            config = {};
+        }
+    }
+    if (String(config?.switchType || '').toLowerCase() === 'assign')
+        return { fixed: false };
+    if (kind === 'fixed' || kind === 'literal')
+        return { fixed: true, value: value.value ?? config?.originValue };
+    if (String(value.type || '') === '1' || String(config?.switchType || '').toLowerCase() === 'fixvalue') {
+        return { fixed: true, value: config?.originValue ?? value.value ?? value.name };
+    }
+    if (value.value !== undefined && !value.type && !value.formulaType)
+        return { fixed: true, value: value.value };
+    return { fixed: false };
+}
+/** 对齐新建流程前端：读取密级选项，补默认密级/有效期，并校验固定密级。 */
+export async function resolveApproveCreateClassifiedProtection(plan, client, errors, warnings) {
+    const steps = [...walkPlanSteps({ actions: plan.actions || [] })].filter((step) => step.type === 'ApproveCreate');
+    if (!steps.length)
+        return;
+    const hasExplicitValue = steps.some((step) => step.params?.secretLevel != null || step.params?.secretLevelValidity != null);
+    let config;
+    try {
+        config = await classifiedProtectionSource.getClassifiedProtectionConfig(client);
+    }
+    catch (error) {
+        const message = `新建流程密级选项查询失败：${String(error?.message || error)}`;
+        if (hasExplicitValue)
+            errors.push(`${message}；无法校验已配置的密级。`);
+        else
+            warnings.push(`${message}；本次不补前端默认密级。`);
+        return;
+    }
+    if (!config.isOpenClassification) {
+        if (hasExplicitValue)
+            errors.push('当前租户未启用密级保护，但新建流程配置了 secretLevel/secretLevelValidity。');
+        return;
+    }
+    if (!config.resourceOptionInfo.length) {
+        if (hasExplicitValue)
+            errors.push('密级保护已启用，但接口没有返回可用密级选项。');
+        else
+            warnings.push('密级保护已启用，但接口没有返回密级选项，无法按前端逻辑填入默认密级。');
+        return;
+    }
+    for (const step of steps) {
+        const params = step.params ??= {};
+        const path = `ApproveCreate${step.name ? ` '${step.name}'` : ''}`;
+        let selected;
+        const rawSecret = params.secretLevel;
+        if (rawSecret == null || rawSecret === '') {
+            selected = config.resourceOptionInfo[0];
+            params.secretLevel = { kind: 'fixed', value: String(selected.id), valueType: 'string' };
+            (plan._autoResources ??= []).push({
+                path: `${path}.secretLevel`, resourceType: 'classified_protection_option',
+                value: { id: String(selected.id), name: String(selected.content || selected.name || '') },
+                reason: '按前端新建流程组件逻辑，未指定密级时默认选择 resourceOptionInfo 第一项',
+            });
+        }
+        else {
+            const literal = fixedAssignmentValue(rawSecret);
+            if (!literal.fixed) {
+                continue;
+            }
+            const wanted = String(literal.value ?? '').trim();
+            const matches = config.resourceOptionInfo.filter((option) => String(option.id) === wanted || String(option.content ?? option.name ?? '').trim() === wanted);
+            if (matches.length !== 1) {
+                errors.push(`${path}.secretLevel 固定值 '${wanted}' 未能在当前租户密级选项中唯一匹配（匹配数: ${matches.length}）；请提供真实选项 ID 或名称。`);
+                continue;
+            }
+            selected = matches[0];
+            params.secretLevel = { kind: 'fixed', value: String(selected.id), valueType: 'string' };
+            if (String(literal.value) !== String(selected.id)) {
+                (plan._autoResources ??= []).push({
+                    path: `${path}.secretLevel`, resourceType: 'classified_protection_option',
+                    value: { id: String(selected.id), name: String(selected.content || selected.name || '') },
+                    reason: '将密级名称解析为当前租户真实选项 ID',
+                });
+            }
+        }
+        const validityMode = String(selected?.secretLevelValidityShowType || 'hidden');
+        if (validityMode !== 'hidden' && (params.secretLevelValidity == null || params.secretLevelValidity === '')
+            && selected?.defaultSecretLevelValidity != null && selected.defaultSecretLevelValidity !== '') {
+            params.secretLevelValidity = { kind: 'fixed', value: String(selected.defaultSecretLevelValidity), valueType: 'string' };
+            (plan._autoResources ??= []).push({
+                path: `${path}.secretLevelValidity`, resourceType: 'classified_protection_validity',
+                value: String(selected.defaultSecretLevelValidity),
+                reason: '按前端所选密级的 defaultSecretLevelValidity 填充保密期限',
+            });
+        }
+    }
+}
 /** 把显式固定人员展开为当前租户 Browser 对象。 */
 export async function resolveFixedPeople(plan, client) {
     const records = [];
@@ -586,6 +697,13 @@ export async function resolveFixedPeople(plan, client) {
                 const raw = container[key];
                 if (raw == null)
                     continue;
+                // SendMessage.receiver 是“提醒对象”联合类型。只有人员对象需要人员 Browser；
+                // 全员、部门、分部、角色等由各自对象类型处理，不能误走 resourceData。
+                if (componentType === 'SendMessage' && key === 'receiver' && raw && typeof raw === 'object') {
+                    const receiverType = String(raw.objectType || raw.targetType || raw.type || '').toLowerCase();
+                    if (receiverType && !['user', 'person', 'personnel', 'resource'].includes(receiverType))
+                        continue;
+                }
                 const fixedArray = raw && typeof raw === 'object' && raw.kind === 'fixed' && Array.isArray(raw.value);
                 const values = fixedArray ? raw.value : (Array.isArray(raw) ? raw : [raw]);
                 if (values.some((item) => item && typeof item === 'object' && item.type && item.config && !item.kind))
@@ -1305,13 +1423,18 @@ export async function resolveEntrustFields(plan, client, errors) {
         }
     }
 }
-/** ApproveCreate 新建流程：调 getWfField 拿目标流程真实表单字段。 */
+/** 新建、保存、提交、退回流程都按实时流程定义读取主表与明细字段，映射只接受真实字段 ID。 */
 export async function resolveBizCreateFields(step, plan, client, errors, path) {
     const params = (step.params || {});
+    const componentType = String(step.type || 'ApproveCreate');
+    const operationName = {
+        ApproveCreate: '新建流程', ApproveSave: '保存流程',
+        ApproveCommit: '提交流程', ApproveSendBack: '退回流程',
+    }[componentType] || componentType;
     const wfPath = Array.isArray(params.workflowPath) ? (params.workflowPath[0] || {}) : (params.workflowPath || {});
     const wfId = String(wfPath.id || wfPath.createFlowId || '');
     if (!wfId) {
-        errors.push(`${path}.params.workflowPath.id 缺失 (新建流程必须指定目标流程)`);
+        errors.push(`${path}.params.workflowPath.id 缺失 (${operationName}必须指定目标流程)`);
         return;
     }
     try {
@@ -1352,7 +1475,7 @@ export async function resolveBizCreateFields(step, plan, client, errors, path) {
                         wfPath.formIds = formIds;
                 }
                 if (!formIds.length) {
-                    errors.push(`${path}.params.workflowPath.formIds 缺失: getWfField 未返回目标流程主表 formId，无法安全保存新建流程；请确认目标流程已绑定表单。`);
+                    errors.push(`${path}.params.workflowPath.formIds 缺失: getWfField 未返回目标流程主表 formId，无法安全${operationName}；请确认目标流程已绑定表单。`);
                 }
                 const allFieldIds = new Set(bizFields.main.map((f) => f.id));
                 for (const dt of bizFields.detail) {
@@ -1378,6 +1501,13 @@ export async function resolveBizCreateFields(step, plan, client, errors, path) {
                             errors.push(`${path}.params.constants['${targetFid}'] 目标字段不存在于目标流程 '${wfId}' 的表单字段中`);
                     }
                 }
+                const formulas = params.formula || {};
+                if (formulas && typeof formulas === 'object') {
+                    for (const targetFid of Object.keys(formulas)) {
+                        if (!allFieldIds.has(String(targetFid)))
+                            errors.push(`${path}.params.formula['${targetFid}'] 目标字段不存在于目标流程 '${wfId}' 的表单字段中`);
+                    }
+                }
                 for (const [di, ditem] of (params.detail || []).entries()) {
                     if (!ditem || typeof ditem !== 'object')
                         continue;
@@ -1389,6 +1519,10 @@ export async function resolveBizCreateFields(step, plan, client, errors, path) {
                         if (tid2 && !allFieldIds.has(tid2))
                             errors.push(`${path}.params.detail[${di}].mapping['${sk}'] 目标字段 '${tid2}' 不存在于目标流程 '${wfId}' 的表单字段中 (明细表子字段 id 必须实时查全量, 禁止推算)`);
                     }
+                    for (const targetFid of Object.keys(ditem.formula || {})) {
+                        if (!allFieldIds.has(String(targetFid)))
+                            errors.push(`${path}.params.detail[${di}].formula['${targetFid}'] 目标字段不存在于目标流程 '${wfId}' 的表单字段中`);
+                    }
                 }
             }
         }
@@ -1518,12 +1652,15 @@ export function checkSourceReferences(plan, eventContextFields, errors, availabl
                     }
                 }
             }
-            if (step.type === 'ApproveCreate') {
+            if (['ApproveCreate', 'ApproveSave', 'ApproveCommit', 'ApproveSendBack'].includes(String(step.type))) {
                 if (params && typeof params === 'object') {
                     checkMapping(params.mapping, `${path}.mapping`);
+                    checkReference(params.formula, `${path}.formula`);
                     for (const [di, det] of (params.detail || []).entries()) {
-                        if (det && typeof det === 'object')
+                        if (det && typeof det === 'object') {
                             checkMapping(det.mapping, `${path}.detail[${di}].mapping`);
+                            checkReference(det.formula, `${path}.detail[${di}].formula`);
+                        }
                     }
                 }
             }
@@ -1789,14 +1926,112 @@ function expandLoopDataContext(step, store) {
     if (Object.keys(expanded).length)
         store.merge(expanded, 'MultipleExecution');
 }
-/** 显式 mapping 也必须带实时显示名（label）。 */
-export function hydrateMappingLabels(plan, eventContextFields) {
-    const labelByParamKey = {};
-    for (const field of eventContextFields) {
-        if (field && typeof field === 'object' && field.paramKey) {
-            labelByParamKey[String(field.paramKey)] = String(field.showName || field.paramName || '');
+/**
+ * 显式 mapping 必须带实时显示名和完整上下文。
+ *
+ * mapping 的旧写法把来源 paramKey 放在对象 key 上，例如：
+ * { "paymentTerms[].paymentNote": "<目标字段ID>" }。
+ * hydrateContextReferences 只能遍历值，无法从这个 key 上给后续编译器
+ * 回填 _resolvedContext，导致明细分支进入 assignFlatEsbChild 时丢失
+ * WebHook 的 Body 根。这里在预检阶段把 key 规范化为对象，并复用
+ * getComponentContext 返回的真实字段元数据；不根据 paramKey 猜 fieldId/root。
+ */
+export function hydrateMappingLabels(plan, eventContextFields, eventContext = {}) {
+    const runtimeFields = Object.values(eventContext || {}).filter((field) => (field && typeof field === 'object' && field.type !== 'context_group' && field.paramKey));
+    // eventContextFields 已经经过 resolveContextGroupRoot 归一化，优先使用它，
+    // 避免 parsePlatformContext 的原始 numeric primaryKey 覆盖 WebHook 的逻辑根 Body。
+    const contextFields = [...(eventContextFields || []), ...runtimeFields];
+    const fieldsByParamKey = new Map();
+    const addField = (key, field) => {
+        const normalized = String(key || '').trim();
+        if (!normalized)
+            return;
+        const bucket = fieldsByParamKey.get(normalized) || [];
+        if (!bucket.some((item) => String(item?.id ?? '') === String(field?.id ?? '') && String(item?.paramKey ?? '') === String(field?.paramKey ?? ''))) {
+            bucket.push(field);
         }
-    }
+        fieldsByParamKey.set(normalized, bucket);
+    };
+    for (const field of contextFields) {
+        if (!field || typeof field !== 'object' || !field.paramKey)
+            continue;
+        const paramKey = String(field.paramKey);
+        const root = String(field.tablePrimaryKey || field.contextGroup || '').trim();
+        addField(paramKey, field);
+        if (root && !paramKey.startsWith(`${root}.`))
+            addField(`${root}.${paramKey}`, field);
+        if (root && paramKey.startsWith(`${root}.`))
+            addField(paramKey.slice(root.length + 1), field);
+    }
+    const findField = (key) => {
+        const requested = String(key || '').trim();
+        if (!requested)
+            return null;
+        const direct = fieldsByParamKey.get(requested) || [];
+        if (direct.length === 1)
+            return direct[0];
+        if (direct.length > 1)
+            return null;
+        const stripped = requested.replace(/^(?:Params|Header|Body)\./, '');
+        const matches = fieldsByParamKey.get(stripped) || [];
+        return matches.length === 1 ? matches[0] : null;
+    };
+    const resolvedContext = (field) => {
+        if (!field || typeof field !== 'object')
+            return undefined;
+        const rawField = field.raw && typeof field.raw === 'object' ? field.raw : field;
+        const tablePrimaryKey = String(field.tablePrimaryKey || field.contextGroup || rawField.tablePrimaryKey || '').trim();
+        const fieldId = field.id ?? rawField.id ?? rawField.paramId;
+        if (!tablePrimaryKey || fieldId === undefined || fieldId === null || String(fieldId).trim() === '')
+            return undefined;
+        const paramKey = String(field.paramKey || rawField.paramKey || '').trim();
+        return {
+            fieldId: String(fieldId),
+            fieldType: String(field.fieldType || field.paramType || rawField.fieldType || rawField.paramType || 'string'),
+            label: String(field.label || field.showName || field.paramName || rawField.showName || rawField.paramName || paramKey),
+            componentType: String(field.componentType || 'WebHookTrigger'),
+            dimension: String(field.dimension || rawField.dimension || 'field'),
+            tablePrimaryKey,
+            tableName: String(field.tableName || rawField.tableName || tablePrimaryKey),
+            tableKey: String(field.tableKey || field.contextGroup || tablePrimaryKey),
+            parentName: String(field.parentName || rawField.parentName || ''),
+            paramKey,
+            multKey: String(field.multKey || rawField.multKey || ''),
+            multName: String(field.multName || rawField.multName || ''),
+            isMultCom: Boolean(field.isMultCom ?? rawField.isMultCom),
+            parentComId: String(field.parentComId || rawField.parentComId || ''),
+            comId: String(field.comId || rawField.comId || ''),
+            rawField: { ...rawField },
+        };
+    };
+    const labelOf = (field, fallback) => String(field?.label || field?.showName || field?.paramName || field?.raw?.showName || field?.raw?.paramName || fallback);
+    const enrichTarget = (sourceKey, target) => {
+        const requestedKey = target && typeof target === 'object' && !Array.isArray(target)
+            ? String(target.paramKey || target.key || sourceKey)
+            : String(sourceKey);
+        const field = findField(requestedKey);
+        const label = labelOf(field, requestedKey);
+        if (target && typeof target === 'object' && !Array.isArray(target)) {
+            const declaredKind = String(target.kind || target.assignmentKind || 'context');
+            if (declaredKind !== 'query_result') {
+                target.paramKey ??= requestedKey;
+                target.label ??= label;
+                if (!target._resolvedContext && field) {
+                    const resolved = resolvedContext(field);
+                    if (resolved)
+                        target._resolvedContext = resolved;
+                }
+            }
+            return target;
+        }
+        if (!field)
+            return target;
+        const normalized = { target: String(target), paramKey: requestedKey, label };
+        const resolved = resolvedContext(field);
+        if (resolved)
+            normalized._resolvedContext = resolved;
+        return normalized;
+    };
     const hydrate = (steps) => {
         for (const step of steps || []) {
             if (!step || typeof step !== 'object')
@@ -1805,16 +2040,7 @@ export function hydrateMappingLabels(plan, eventContextFields) {
             const mapping = params && typeof params === 'object' ? params.mapping : null;
             if (mapping && typeof mapping === 'object') {
                 for (const [sourceKey, target] of Object.entries(mapping)) {
-                    const label = labelByParamKey[String(sourceKey)] || '';
-                    if (!label)
-                        continue;
-                    if (target && typeof target === 'object') {
-                        target.paramKey ??= String(sourceKey);
-                        target.label ??= label;
-                    }
-                    else {
-                        mapping[sourceKey] = { target: String(target), paramKey: String(sourceKey), label };
-                    }
+                    mapping[sourceKey] = enrichTarget(String(sourceKey), target);
                 }
             }
             if (params && typeof params === 'object') {
@@ -1822,17 +2048,7 @@ export function hydrateMappingLabels(plan, eventContextFields) {
                     if (!detail || typeof detail !== 'object' || typeof detail.mapping !== 'object')
                         continue;
                     for (const [sourceKey, target] of Object.entries(detail.mapping)) {
-                        const sourceParamKey = target && typeof target === 'object' ? String(target.paramKey || sourceKey) : String(sourceKey);
-                        const label = labelByParamKey[sourceParamKey] || '';
-                        if (!label)
-                            continue;
-                        if (target && typeof target === 'object') {
-                            target.paramKey ??= sourceParamKey;
-                            target.label ??= label;
-                        }
-                        else {
-                            detail.mapping[sourceKey] = { target: String(target), paramKey: sourceParamKey, label };
-                        }
+                        detail.mapping[sourceKey] = enrichTarget(String(sourceKey), target);
                     }
                 }
             }
@@ -1976,6 +2192,79 @@ export function syncQueryFieldsToDraft(draft, plan) {
     for (let i = 0; i < pa.length && i < da.length; i++)
         syncStep(pa[i], da[i]);
 }
+/**
+ * 收集计划里明确引用到指定数据源的输出字段。
+ * 字段 ID 只从 context/query_result 引用对象读取，随后必须和实时字段接口结果匹配；
+ * 不从展示名或 paramKey 尾段单独推导新字段。
+ */
+function referencedDataSourceFieldIds(plan, sourceStep, sourceId) {
+    const ids = new Set();
+    const componentType = String(sourceStep.type || '');
+    const sourceRefs = new Set([sourceStep.ref, sourceStep.id, sourceStep.nodeId]
+        .map((value) => String(value || '').trim()).filter(Boolean));
+    const pending = [plan.actions || [], plan.event || {}];
+    const seen = new WeakSet();
+    while (pending.length) {
+        const value = pending.pop();
+        if (!value || typeof value !== 'object')
+            continue;
+        if (seen.has(value))
+            continue;
+        seen.add(value);
+        if (Array.isArray(value)) {
+            pending.push(...value);
+            continue;
+        }
+        const kind = String(value.kind || value.assignmentKind || value.type || '').toLowerCase();
+        if (kind === 'query_result') {
+            const source = String(value.source || value.sourceRef || '').trim();
+            const formId = String(value.formId || '').trim();
+            if ((source && sourceRefs.has(source)) || (!source && formId === sourceId)) {
+                const fieldId = String(value.fieldId || '').trim();
+                if (fieldId) {
+                    // 分组查询的输出别名由 EnquiryForm.groupMessage 的真实配置决定；
+                    // 将别名反向映射到该配置中的源字段，确保源字段也进入 queryFields。
+                    const groupMessage = Array.isArray(sourceStep.params?.groupMessage) ? sourceStep.params.groupMessage : [];
+                    let isAggregateAlias = false;
+                    for (const item of groupMessage) {
+                        const field = String(item?.field || '').trim();
+                        const aggregator = String(item?.aggregator || '').trim().toLowerCase();
+                        if (field && aggregator && fieldId === `s_${aggregator}_${field}`) {
+                            ids.add(field);
+                            isAggregateAlias = true;
+                        }
+                    }
+                    if (!isAggregateAlias)
+                        ids.add(fieldId);
+                }
+            }
+        }
+        if (kind === 'context' || kind === 'platform_context') {
+            const key = String(value.paramKey || value.key || '').trim();
+            if (componentType === 'DateTrigger' && key.startsWith('dataResponse.')) {
+                const fieldId = key.slice('dataResponse.'.length).split(/[.\[\]]/)[0].trim();
+                if (fieldId)
+                    ids.add(fieldId);
+            }
+            else if (sourceId) {
+                const roots = [`${sourceId}.`, `FormData.${sourceId}.`, `FormData.${sourceId}[`, `SelectParams.${sourceId}.`];
+                const root = roots.find((candidate) => key.startsWith(candidate));
+                if (root) {
+                    const suffix = key.slice(root.length).split(/[.\[\]]/).filter(Boolean);
+                    const fieldId = suffix[suffix.length - 1] || '';
+                    if (fieldId)
+                        ids.add(fieldId);
+                }
+            }
+        }
+        pending.push(...Object.values(value));
+    }
+    return [...ids];
+}
+function canonicalQueryFieldId(value) {
+    const id = String(value || '').trim();
+    return id.startsWith('field_') ? id.slice('field_'.length) : id;
+}
 /**
  * 归一化 showDataSourceFields 的返回值。
  *
@@ -2144,7 +2433,7 @@ export function syncBizFieldsToDraft(draft, plan) {
         const pa = planActions[i], da = draftActions[i];
         if (!pa || !da || typeof pa !== 'object' || typeof da !== 'object')
             continue;
-        if (pa.type !== 'ApproveCreate')
+        if (!['ApproveCreate', 'ApproveSave', 'ApproveCommit', 'ApproveSendBack'].includes(String(pa.type)))
             continue;
         const pp = pa.params;
         if (!pp || typeof pp !== 'object' || !pp._bizFields)
@@ -2332,6 +2621,7 @@ export async function preflightContext(plan, appId, client) {
         return { valid: false, errors: ['event must be an object'], contextStore: {} };
     }
     await fillRequiredTriggerOperator(plan, client);
+    await resolveApproveCreateClassifiedProtection(plan, client, errors, warnings);
     await resolveFixedPeople(plan, client);
     try {
         await resolveFixedWorkflowInstances(plan, client);
@@ -2387,7 +2677,7 @@ export async function preflightContext(plan, appId, client) {
         // 忽略
     }
     // EventButton 的 targetForm 可能只提供表单 id；先完成 targetForm 的实时归属回填，
-    // 再按前端 getButtonList 校验真实按钮以及 before 能力。
+    // 再按前端 ebuilderButton 浏览器校验真实按钮以及 before 能力。
     try {
         const buttonResources = await resolveEventButtonSelection(plan, client);
         if (buttonResources.length)
@@ -2405,11 +2695,16 @@ export async function preflightContext(plan, appId, client) {
                 const tf = stepFormRef(step);
                 if (tf && tf.id) {
                     const formId = String(tf.id);
-                    // 删除表单数据的前端 ConditionSet 也绑定 dataSource 字段选择器，
-                    // 条件左值必须和前端一样来自 /api/ebuilder/common/ds/fields。
-                    const strictConditionSource = ['ActionEbDelete', 'EnquiryForm', 'TimeBatchTrigger', 'DateTrigger'].includes(step.type);
+                    // 删除表单数据、更新表单数据的条件编辑器，以及数据源查询/定时触发
+                    // 组件都绑定 dataSource 字段选择器；条件左值必须和前端一样来自
+                    // /api/ebuilder/common/ds/fields，不能回退到 getEbField。
+                    const isActionEbUpdateCondition = step.type === 'ActionEbUpdate'
+                        && String((step.params || {}).opType || 'updateData') === 'updateData';
+                    const strictConditionSource = [
+                        'ActionEbDelete', 'EnquiryForm', 'TimeBatchTrigger', 'DateTrigger',
+                    ].includes(step.type) || isActionEbUpdateCondition;
                     const sourceProtocol = formSource.actionflowDataSourceProtocol(tf);
-                    // 数据源查询/触发组件的字段不是普通 EB 表单字段：
+                    // 严格条件来源的字段不是普通 EB 表单字段：
                     // 它们必须来自 /api/ebuilder/common/ds/fields，不能先调用 getEbField。
                     let fields = strictConditionSource ? [] : await getFormFieldsFull(formId, client, tf);
                     if (!strictConditionSource)
@@ -2418,7 +2713,7 @@ export async function preflightContext(plan, appId, client) {
                     // 查询组件偶尔会只保留系统字段，筛选编辑器因此把业务字段标成“已删除”。
                     const params = step.params && typeof step.params === 'object' ? step.params : (step.params = {});
                     if (['ActionEbDelete', 'EnquiryForm', 'TimeBatchTrigger', 'DateTrigger'].includes(step.type)
-                        || (step.type === 'ActionEbUpdate' && ['updateData', 'fieldUpdate'].includes(String(params.opType || 'updateData')))) {
+                        || (step.type === 'ActionEbUpdate' && String(params.opType || 'updateData') === 'updateData')) {
                         // EnquiryForm/条件更新的筛选条件左值必须来自数据源字段选择器，
                         // 而不是只用 getEbField 的表单字段对象。后者经常缺少数据源侧的
                         // name/formInfo/sformId，会导致设计器把条件字段显示为“已删除”
@@ -2528,20 +2823,30 @@ export async function preflightContext(plan, appId, client) {
                             if (!id)
                                 continue;
                             byId.set(id, field);
-                            // 兼容旧 plan/API 返回不带 field_ 前缀的裸字段 ID，
-                            // 但最终一定替换成当前租户字段选择器的真实 ID。
-                            byId.set(id.startsWith('field_') ? id.slice('field_'.length) : `field_${id}`, field);
+                            const canonicalId = canonicalQueryFieldId(id);
+                            if (!byId.has(canonicalId))
+                                byId.set(canonicalId, field);
                         }
                         const requested = Array.isArray(params.queryFields) && params.queryFields.length ? params.queryFields : null;
                         if (requested) {
-                            params.queryFields = requested.map((field) => {
-                                const live = byId.get(String(field?.id || ''));
-                                return live ? { ...live, ...field, id: String(live.id) } : { ...field };
-                            });
+                            params.queryFields = requested.map((field, fieldIndex) => {
+                                const requestedId = String(field?.id || '');
+                                const live = byId.get(requestedId) || byId.get(canonicalQueryFieldId(requestedId));
+                                if (!live) {
+                                    errors.push(`${step.type}.queryFields[${fieldIndex}].id='${requestedId}' 未匹配到 showDataSourceFields 返回的真实字段。`);
+                                    return null;
+                                }
+                                // 平台返回的完整字段对象是权威值；plan 只保留显式选择，不得用简写 DTO 覆盖元数据。
+                                return { ...field, ...live, id: String(live.id) };
+                            }).filter(Boolean);
                         }
                         else if (selectable.length) {
                             params.queryFields = selectable;
                         }
+                        else if (['EnquiryForm', 'TimeBatchTrigger', 'DateTrigger'].includes(step.type)) {
+                            params.queryFields = [];
+                            errors.push(`${step.type}.queryFields: showDataSourceFields 未返回可选字段，拒绝用其他字段接口或本地默认值拼造输出字段。`);
+                        }
                         else {
                             const mainFields = fields
                                 .filter((field) => String(field.subFormId ?? '-1') === '-1')
@@ -2556,6 +2861,23 @@ export async function preflightContext(plan, appId, client) {
                                 return true;
                             });
                         }
+                        // queryFields 不只是展示配置：getComponentContext 会据此裁剪运行时上下文。
+                        // 把后续动态映射明确引用的字段并入查询集，并要求它们能在当前租户字段接口中命中。
+                        const requiredFieldIds = referencedDataSourceFieldIds(plan, step, formId);
+                        const queryFields = Array.isArray(params.queryFields) ? params.queryFields : (params.queryFields = []);
+                        const selectedIds = new Set(queryFields.map((field) => canonicalQueryFieldId(field?.id)));
+                        for (const requiredId of requiredFieldIds) {
+                            const live = byId.get(requiredId) || byId.get(canonicalQueryFieldId(requiredId));
+                            if (!live) {
+                                errors.push(`${step.type}.queryFields 缺少动态引用字段 '${requiredId}'，且该字段未在当前 showDataSourceFields 返回结果中找到。`);
+                                continue;
+                            }
+                            const canonicalId = canonicalQueryFieldId(live.id);
+                            if (selectedIds.has(canonicalId))
+                                continue;
+                            queryFields.push({ ...live });
+                            selectedIds.add(canonicalId);
+                        }
                     }
                 }
             }
@@ -2769,7 +3091,7 @@ export async function preflightContext(plan, appId, client) {
         }
     }
     // 显式 mapping 补实时显示名
-    hydrateMappingLabels(plan, eventContextFields);
+    hydrateMappingLabels(plan, eventContextFields, eventContext);
     hydrateWorkflowProvenanceMappings(plan, eventContextFields);
     hydrateLoopCycleTimes(plan, eventContextFields);
     // finalOutput 不属于 actions，但其 CustFormDetailDto.formulaValue 也可能
@@ -2783,6 +3105,18 @@ export async function preflightContext(plan, appId, client) {
     // 逐节点查上下文 + ApproveCreate 目标字段
     const walk = async (steps, branchStore, prefix) => {
         for (const [index, step] of (steps || []).entries()) {
+            // Output 是终止节点，不是可查询上下文的动作组件；分支里的 Output
+            // 仍需把提醒内容中的上下文公式回填，但不能把它送到
+            // getComponentContext，否则它没有 EventButton 上游元数据，会误报
+            // triggerFlag 只能用于 EventButton。
+            if (step?.type === 'Output') {
+                const eventContextGroup = Object.values(branchStore.asDict()).find((value) => (value && typeof value === 'object' && value.type === 'context_group' && value.component));
+                hydrateContextReferences([step], branchStore.asDict(), {
+                    id: 'event_1',
+                    type: String(eventContextGroup?.component || event.type || ''),
+                });
+                continue;
+            }
             const path = `${prefix}[${index}]`;
             let result;
             try {
@@ -2821,7 +3155,7 @@ export async function preflightContext(plan, appId, client) {
                 hydrateLoopSourceReferences(step, branchStore.asDict());
                 await walk(step.actions || [], new ContextStore(branchStore.asDict()), `${path}.actions`);
             }
-            else if (step.type === 'ApproveCreate') {
+            else if (['ApproveCreate', 'ApproveSave', 'ApproveCommit', 'ApproveSendBack'].includes(String(step.type))) {
                 await resolveBizCreateFields(step, plan, client, errors, path);
             }
         }