weaver-e10-builder 1.6.13 → 1.6.15

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

@@ -87,6 +87,14 @@ export declare function normalizeShowDataSourceFields(response: any, formId: str
  * options 使用，通常是 [{ id, content, type }]，不是 { fields: [...] }。
  */
 export declare function normalizeDataSourceSelectorFields(response: any, formId: string): any[];
+/**
+ * 归一化 /api/ebuilder/common/ds/fields 的字段对象。
+ *
+ * EnquiryForm 的 filterInput 左值必须使用数据源字段选择器返回的实时元数据；
+ * getEbField 只适合表单字段校验，部分租户不会带齐 componentKey、formInfo、
+ * sformId 和物理字段信息。这里只补齐编译器读取的别名，不改变平台原对象。
+ */
+export declare function normalizeDataSourceField(field: any, formId: string): any;
 export declare function syncEventResourcesToDraft(draft: Record<string, any>, plan: Record<string, any>): void;
 export declare function syncFixedPeopleToDraft(draft: Record<string, any>, plan: Record<string, any>): void;
 export declare function syncBizFieldsToDraft(draft: Record<string, any>, plan: Record<string, any>): void;

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":"AAAA;;;GAGG;AACH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AA6DtD;;;;GAIG;AACH,wBAAgB,6BAA6B,CAAC,QAAQ,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,GAAG,GAAG,EAAE,CAiCpF;AAED,uCAAuC;AACvC,wBAAsB,2BAA2B,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAiB9G;AAgFD,gEAAgE;AAChE,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAKjF;AAOD,uEAAuE;AACvE,wBAAsB,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CA8D1H;AAqCD,2CAA2C;AAC3C,wBAAsB,2BAA2B,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CA0B7G;AAED,4EAA4E;AAC5E,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CA+LxG;AAED,+BAA+B;AAC/B,wBAAsB,2BAA2B,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAe9G;AAsCD,yCAAyC;AACzC,wBAAsB,wCAAwC,CAC5D,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,GACjF,OAAO,CAAC,IAAI,CAAC,CAuEf;AAED,iCAAiC;AACjC,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAyErG;AAkBD,oDAAoD;AACpD,wBAAsB,6BAA6B,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAgDhH;AAwBD,qDAAqD;AACrD,wBAAsB,yBAAyB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CA4D5G;AAkCD,4CAA4C;AAC5C,wBAAsB,2BAA2B,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAsB9G;AAqDD;;;GAGG;AACH,wBAAsB,2BAA2B,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CA8C9G;AAmGD,0DAA0D;AAC1D,wBAAsB,kCAAkC,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CA8DrH;AAkBD;;;;GAIG;AACH,wBAAsB,0BAA0B,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAmF7G;AAED,0CAA0C;AAC1C,wBAAsB,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CA+CxH;AAED,mDAAmD;AACnD,wBAAsB,sBAAsB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA4FnK;AAED,4CAA4C;AAC5C,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,kBAAkB,EAAE,GAAG,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,gBAAgB,GAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM,GAAG,IAAI,CAiI9J;AAoPD;;;;;;;;;GASG;AACH,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACzB,kBAAkB,EAAE,GAAG,EAAE,EACzB,YAAY,GAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM,GACrC,IAAI,CAsKN;AAED;;;;GAIG;AACH,wBAAgB,iCAAiC,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,kBAAkB,EAAE,GAAG,EAAE,GAAG,IAAI,CAwD5G;AAID,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CASnG;AAED,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAsBrG;AAED;uDACuD;AACvD,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAgBlG;AAsED;;;;;;GAMG;AACH,wBAAgB,6BAA6B,CAAC,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,GAAG,GAAG,EAAE,CAkClF;AAED;;;;;GAKG;AACH,wBAAgB,iCAAiC,CAAC,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,GAAG,GAAG,EAAE,CAiBtF;AAED;;;;;;GAMG;AACH,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,GAAG,GAAG,CAsBxE;AAED,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAMrG;AAED,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAsClG;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAYhG;AAED,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAcpG;AAED,uDAAuD;AACvD,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAiBtG;AAoGD,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,OAAO,CAAC;IACf,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACnC,YAAY,CAAC,EAAE,GAAG,EAAE,CAAC;IACrB,aAAa,CAAC,EAAE,GAAG,EAAE,CAAC;CACvB;AAiCD,kCAAkC;AAClC,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,eAAe,CAAC,CAulB5H"}

package/dist/services/actionflow/preflight_service.js

@@ -18,6 +18,7 @@ import { get as getComponent } from './components/index.js';
 import { getStepBranches } from './step_branches.js';
 import { normalizeParamGroupSetting } from './param_group_dto.js';
 import { genSfId } from './id_generator.js';
+import { OPTION_FIELD_COMPONENT_KEYS } from './option_field_types.js';
 // 表单字段进程缓存
 const FORM_FIELDS_CACHE = {};
 const FORM_LIST_CACHE = {};
@@ -389,7 +390,9 @@ export async function resolveTargetForms(plan, client) {
                         collect(branch.actions || []);
                 }
             }
-            if (['EventFormData', 'EventButton', 'TimeBatchTrigger', 'DateTrigger', 'EnquiryForm'].includes(step.type)) {
+            // 这三类数据源已由 resolveActionflowDataSources 通过实时 Browser 解析；
+            // Browser.groupId 是服务组而不是应用 ID，不再走旧表单归属查询。
+            if (['EventFormData', 'EventButton'].includes(step.type)) {
                 const ds = (step.params || {}).dataSource || (step.params || {}).targetForm;
                 if (ds && typeof ds === 'object' && ds.id) {
                     if (needsLegacyFormResolution(ds) && (!ds.groupId || !ds.name || !ds.text || !ds.groupName))
@@ -398,7 +401,7 @@ export async function resolveTargetForms(plan, client) {
             }
         }
     };
-    if (event && typeof event === 'object') {
+    if (event && typeof event === 'object' && !['TimeBatchTrigger', 'DateTrigger'].includes(String(event.type || ''))) {
         const ep = event.params || {};
         if (ep && typeof ep === 'object') {
             const es = ep.targetForm || ep.dataSource;
@@ -457,7 +460,7 @@ export async function resolveTargetForms(plan, client) {
                     if (tf && typeof tf === 'object' && tf.groupId)
                         groupIds.add(String(tf.groupId));
                 }
-                if (['EventFormData', 'EventButton', 'TimeBatchTrigger', 'DateTrigger', 'EnquiryForm'].includes(step.type)) {
+                if (['EventFormData', 'EventButton'].includes(step.type)) {
                     const ds = params.dataSource || params.targetForm;
                     if (ds && typeof ds === 'object' && ds.groupId)
                         groupIds.add(String(ds.groupId));
@@ -472,7 +475,7 @@ export async function resolveTargetForms(plan, client) {
         }
     };
     collectGroups(plan.actions || []);
-    if (event && typeof event === 'object') {
+    if (event && typeof event === 'object' && !['TimeBatchTrigger', 'DateTrigger'].includes(String(event.type || ''))) {
         const ep = event.params || {};
         if (ep && typeof ep === 'object') {
             const es = ep.targetForm || ep.dataSource;
@@ -514,7 +517,7 @@ export async function resolveTargetForms(plan, client) {
                             tf.groupName = info.groupName;
                     }
                 }
-                if (['EventFormData', 'EventButton', 'TimeBatchTrigger', 'DateTrigger', 'EnquiryForm'].includes(step.type)) {
+                if (['EventFormData', 'EventButton'].includes(step.type)) {
                     const ds = (step.params || {}).dataSource || (step.params || {}).targetForm;
                     if (ds && typeof ds === 'object' && String(ds.id || '') === fid) {
                         ds.groupId = info.groupId;
@@ -535,7 +538,7 @@ export async function resolveTargetForms(plan, client) {
             }
         };
         patch(plan.actions || []);
-        if (event && typeof event === 'object') {
+        if (event && typeof event === 'object' && !['TimeBatchTrigger', 'DateTrigger'].includes(String(event.type || ''))) {
             const ep = event.params || {};
             if (ep && typeof ep === 'object') {
                 const es = ep.targetForm || ep.dataSource;
@@ -1790,7 +1793,7 @@ function hydrateLoopCycleTimes(plan, eventContextFields) {
  * CycleParams 元数据。这里补 fieldId/类型/名称，供 FormulaBean 的 frontId 和
  * 配置字段直接复用；不将它误识别成流程表单 FormData。
  */
-function hydrateCurrentLoopReferences(steps, context) {
+function hydrateCurrentLoopReferences(steps, context, loopRef) {
     const walkValue = (value) => {
         if (Array.isArray(value)) {
             for (const item of value)
@@ -1799,6 +1802,10 @@ function hydrateCurrentLoopReferences(steps, context) {
         }
         if (!value || typeof value !== 'object')
             return;
+        if (value.type === 'MultipleExecution') {
+            walkValue(value.params || {});
+            return;
+        }
         if (String(value.scope ?? value.contextScope ?? '') === 'current_loop') {
             const paramKey = String(value.paramKey ?? value.key ?? value.fieldKey ?? '');
             const field = context[paramKey];
@@ -1810,11 +1817,14 @@ function hydrateCurrentLoopReferences(steps, context) {
                 value.label = label;
                 value.valueType = fieldType;
                 value.fieldType = fieldType;
+                value.source = loopRef;
+                value.comId = loopRef;
                 value._resolvedContext = {
                     fieldId: String(raw.id ?? raw.paramId ?? value.frontId ?? paramKey),
                     fieldType,
                     label,
                     componentType: 'MultipleExecution',
+                    comId: loopRef,
                     tablePrimaryKey: 'CycleParams',
                     tableName: '循环参数',
                     parentName: `循环.${label}`,
@@ -2041,10 +2051,30 @@ export function hydrateMappingLabels(plan, eventContextFields, eventContext = {}
     };
     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)
+        let requestedKey = target && typeof target === 'object' && !Array.isArray(target)
             ? String(target.paramKey || target.key || sourceKey)
             : String(sourceKey);
-        const field = findField(requestedKey);
+        let field = findField(requestedKey);
+        const kind = String(target?.kind || target?.assignmentKind || 'context');
+        const sourceComponent = String(field?.componentKey || field?.raw?.componentKey || '');
+        // 依据值下级由 fieldSet.matchMode 控制匹配方式，优先于普通赋值的 assignType。
+        const matchMode = String(target?.fieldSet?.matchMode || target?.fieldOptions?.fieldSet?.matchMode || '');
+        const matchByName = matchMode
+            ? matchMode === 'optionName'
+            : String(target?.assignType || target?.fieldOptions?.assignType || '') === 'name';
+        if (matchByName && kind === 'context' && field && OPTION_FIELD_COMPONENT_KEYS.has(sourceComponent)
+            && !requestedKey.endsWith('_name')) {
+            // 只使用实时上下文确实返回的名称字段，不能靠后缀伪造引用。
+            const nameField = findField(`${requestedKey}_name`);
+            if (!nameField)
+                throw new Error(`选项名称赋值的来源 '${requestedKey}' 未返回唯一的名称上下文字段，请查询组件上下文并指定名称字段`);
+            requestedKey = String(nameField.paramKey);
+            field = nameField;
+            target.paramKey = requestedKey;
+            target.label = labelOf(field, requestedKey);
+            delete target._resolvedContext;
+            delete target.frontId;
+        }
         const label = labelOf(field, requestedKey);
         if (target && typeof target === 'object' && !Array.isArray(target)) {
             const declaredKind = String(target.kind || target.assignmentKind || 'context');
@@ -2072,6 +2102,43 @@ export function hydrateMappingLabels(plan, eventContextFields, eventContext = {}
             if (!step || typeof step !== 'object')
                 continue;
             const params = step.params || {};
+            // 其他复用表单设置的组件可能使用 fieldAssignments 或平台 DTO，
+            // 而不是 e-builder 的 mapping。只处理明确携带选项匹配设置的上下文引用。
+            const hydrateSettingRefs = (value) => {
+                if (!value || typeof value !== 'object')
+                    return;
+                if (Array.isArray(value)) {
+                    value.forEach(hydrateSettingRefs);
+                    return;
+                }
+                const entry = value.value;
+                if (entry && typeof entry === 'object' && entry.assign && typeof entry.assign === 'object'
+                    && String(entry.assign.kind || entry.assign.assignmentKind || '') === 'context') {
+                    const ref = entry.assign;
+                    const originalKey = String(ref.paramKey || ref.key || '');
+                    const enriched = enrichTarget(String(ref.paramKey || ref.key || ''), {
+                        ...ref, assignType: entry.assignType, fieldSet: entry.fieldSet,
+                    });
+                    for (const key of ['paramKey', 'label', '_resolvedContext', 'frontId']) {
+                        if (enriched[key] !== undefined)
+                            ref[key] = enriched[key];
+                        else if (key === 'frontId' && enriched.paramKey !== originalKey)
+                            delete ref.frontId;
+                    }
+                }
+                if (String(value.kind || value.assignmentKind || '') === 'context'
+                    && (value.assignType || value.fieldSet || value.fieldOptions)) {
+                    enrichTarget(String(value.paramKey || value.key || ''), value);
+                }
+                for (const child of Object.values(value))
+                    hydrateSettingRefs(child);
+            };
+            if (params.fieldAssignments)
+                hydrateSettingRefs(params.fieldAssignments);
+            for (const key of ['setting', 'settingCommon', 'settingType', 'formSetting', 'settingId']) {
+                if (params[key] && typeof params[key] === 'object')
+                    hydrateSettingRefs(params[key]);
+            }
             const mapping = params && typeof params === 'object' ? params.mapping : null;
             if (mapping && typeof mapping === 'object') {
                 for (const [sourceKey, target] of Object.entries(mapping)) {
@@ -2297,8 +2364,7 @@ function referencedDataSourceFieldIds(plan, sourceStep, sourceId) {
     return [...ids];
 }
 function canonicalQueryFieldId(value) {
-    const id = String(value || '').trim();
-    return id.startsWith('field_') ? id.slice('field_'.length) : id;
+    return String(value || '').trim();
 }
 /**
  * 归一化 showDataSourceFields 的返回值。
@@ -2376,7 +2442,7 @@ export function normalizeDataSourceSelectorFields(response, formId) {
  * getEbField 只适合表单字段校验，部分租户不会带齐 componentKey、formInfo、
  * sformId 和物理字段信息。这里只补齐编译器读取的别名，不改变平台原对象。
  */
-function normalizeDataSourceField(field, formId) {
+export function normalizeDataSourceField(field, formId) {
     if (!field || typeof field !== 'object')
         return field;
     let config = field.config;
@@ -2395,8 +2461,10 @@ function normalizeDataSourceField(field, formId) {
     return {
         ...field,
         id,
+        // 区分接口原始 name 与下面仅用于展示/兼容的合成 name。
+        ...(field.name !== undefined && field.name !== null && String(field.name).trim() ? { _conditionFieldName: String(field.name) } : {}),
         showName: String(field.showName || field.text || field.name || field.content || id),
-        name: String(field.name || (id && /^\d+$/.test(id) ? `field_${id}` : field.text || id)),
+        name: field.name === undefined || field.name === null ? '' : String(field.name),
         componentKey: String(field.componentKey || config.componentKey || field.compType || field.type || ''),
         paramType: String(field.paramType || field.type || config.type || 'string').toLowerCase(),
         type: String(field.type || field.paramType || config.type || 'String'),
@@ -2844,7 +2912,6 @@ export async function preflightContext(plan, appId, client) {
                                         if (!id)
                                             continue;
                                         byId.set(id, field);
-                                        byId.set(id.startsWith('field_') ? id.slice('field_'.length) : `field_${id}`, field);
                                     }
                                     if (!selectorFields.length && (groupFields.length || groupMessage.length)) {
                                         errors.push('EnquiryForm.groupFields/groupMessage: /component/getDataSourceFields 未返回可选字段，拒绝凭空生成分组字段。');
@@ -3246,6 +3313,13 @@ export async function preflightContext(plan, appId, client) {
             // 后替换为真实节点 ID，且不再错误退回到触发器组件类型。
             const sourceRef = String(step.ref || step.id || `context_${path.replace(/[^A-Za-z0-9_]/g, '_')}`);
             step.ref ??= sourceRef;
+            try {
+                hydrateMappingLabels({ actions: steps.slice(index + 1) }, [], result.context);
+            }
+            catch (e) {
+                errors.push(String(e?.message || e));
+                return;
+            }
             hydrateContextReferences(steps.slice(index + 1), result.context, { id: sourceRef, type: String(step.type || '') });
             if (step.type === 'EnquiryForm') {
                 // 预检拿到的上下文包含平台生成的字段实例 id；回填到后续
@@ -3263,7 +3337,7 @@ export async function preflightContext(plan, appId, client) {
                 // 循环体可以引用该循环刚返回的 CycleParams（当次循环）；先查询循环节点，
                 // 再携带其上下文进入循环体，不能把循环体当作独立主链处理。
                 expandLoopDataContext(step, branchStore);
-                hydrateCurrentLoopReferences(step.actions || [], branchStore.asDict());
+                hydrateCurrentLoopReferences(step.actions || [], branchStore.asDict(), sourceRef);
                 hydrateLoopSourceReferences(step, branchStore.asDict());
                 await walk(step.actions || [], new ContextStore(branchStore.asDict()), `${path}.actions`);
             }