weaver-e10-builder 1.6.14 → 1.6.16

package/dist/services/actionflow/workflow_compiler.js

@@ -3,15 +3,15 @@
  * 对齐 Python 版 core/workflow_compiler.py（黄金参照）。
  * 第 1 期聚焦：ApproveTrigger / ActionEbAdd / ActionEbUpdate / ActionEbDelete / Output 的编译主链。
  */
-import { genSfId, normalizeNumericFrontId } from './id_generator.js';
+import { genSfId, requireContextFieldId } from './id_generator.js';
+import { applyLoopContext, collectLoopPaths } from './loop_context.js';
 import { normalizeWorkflowRequestLevel } from './workflow_request_level.js';
 import fs from 'node:fs';
 import { get, getCompiler, getNodePost } from './components/index.js';
 import { applyFormFieldSettingOptions, buildEsbFormDataDto, buildEsbFormField, } from './components/form_data_builder.js';
 import { findInMetadata, getTargetFormFields, getTargetDataSourceFields, getWorkflowDetailNames, getTargetDetailFields, getWorkflowDetailFields, getWorkflowFieldIds, workflowFieldId, getWorkflowContextFields, getWorkflowContextFieldsByKey } from './runtime_metadata.js';
-import { buildPersonFormula, buildAssignBean, attachEsbAssign, resolveEnumConstant, resolveParamKey, resolveSourceFieldLabel, resolveSourceFieldType, normalizeConstantAssignment, lookupTargetFieldMeta, formulaFixedForAssignSwitch, formulaSystemVar, formulaContext, assignFlatContextDirect, getFormulaFn, formulaFunction, contextTableNameForRoot, normalizeContextParamKey, resolveFormSettingBasisParentName, contextMetaForReference, resolvedContextRoot, protocolParamKey, } from './formula_service.js';
+import { buildPersonFormula, buildAssignBean, attachEsbAssign, resolveEnumConstant, resolveParamKey, resolveSourceFieldLabel, resolveSourceFieldType, normalizeConstantAssignment, lookupTargetFieldMeta, formulaFixedForAssignSwitch, formulaSystemVar, formulaContext, assignFlatContextDirect, getFormulaFn, formulaFunction, contextTableNameForRoot, normalizeContextParamKey, resolveFormSettingBasisParentName, contextMetaForReference, resolvedContextRoot, protocolParamKey, resolveContextSource, } from './formula_service.js';
 import { buildFormulaReference, buildUpdateFieldCondition, resolveUpdateBasisChild } from './components/action_eb_update_compiler.js';
-import { resolveCustomTriggerDtoId } from './custom_trigger_context.js';
 import { resolveSystemParameter, isDateSystemParameter } from './system_params.js';
 import { conditionFieldFamily, filterFieldType, normalizeFilterOperator, conditionOperatorOverride, resolveFormCtx, buildFilterContextFormula, } from './filter_rules.js';
 import { getStepBranches } from './step_branches.js';
@@ -321,7 +321,7 @@ function handleSpecial(draftKey, special, val, result, meta, appId, idx, eventId
                         ? { _context_original_param_key: String(resolvedUpdateContext.paramKey) }
                         : {}),
                 };
-                result.updateId = assignFlatContextDirect(resolved, label, String(eventId || val.source || '0'), appId, 'string', pn, updateMeta, val._resolvedContext?.fieldId);
+                result.updateId = assignFlatContextDirect(resolved, label, resolveContextSource(val, eventId), appId, 'string', pn, updateMeta, val._resolvedContext?.fieldId);
                 // esbAssign.wId 指向当前数据动作节点（设计器动态赋值定位用），与 filterInput 修复同源。
                 attachEsbAssign(result.updateId, meta, String(eventId || val.source || '0'));
             }
@@ -373,7 +373,7 @@ function handleSpecial(draftKey, special, val, result, meta, appId, idx, eventId
         }
     }
     else if (special === '_filterInput') {
-        result.filterInput = buildFilterInput(result, val, meta, appId, componentType);
+        result.filterInput = buildFilterInput(result, val, { ...meta, _upstream_w_id: meta?._upstream_w_id || eventId }, appId, componentType);
     }
     else if (special === '_bizWorkflowPath' && val && typeof val === 'object') {
         const workflowRows = Array.isArray(val) ? val : [val];
@@ -414,9 +414,9 @@ function handleSpecial(draftKey, special, val, result, meta, appId, idx, eventId
                 }
                 const wfId = String(meta?._workflow_id || '');
                 const rqKey = resolveParamKey(wfId, String(val.key ?? val.value ?? ''));
-                result.requestName = formulaContext('', rqKey, {
+                result.requestName = formulaContext(resolveContextSource(val, eventId), rqKey, {
                     name: String(val.label || ''),
-                    frontId: val._resolvedContext?.fieldId || val.frontId || val.fieldId,
+                    frontId: val._resolvedContext?.fieldId || val._resolvedContext?.rawField?.id,
                     meta: { ...meta, _context_table_primary_key: contextRoot },
                 });
                 attachEsbAssign(result.requestName, meta, String(eventId || ''));
@@ -438,11 +438,14 @@ function handleSpecial(draftKey, special, val, result, meta, appId, idx, eventId
         result.dataSource = source;
     }
 }
+function basisSourceId(val, resolved, sourceComponent, eventId) {
+    return resolveContextSource({ ...val, _resolvedContext: resolved }, eventId);
+}
 function handleBasisValue(val, result, meta, appId, eventId) {
     if (!val || typeof val !== 'object')
         return;
     const resolved = val._resolvedContext && typeof val._resolvedContext === 'object' ? val._resolvedContext : {};
-    const sourceComponent = String(resolved.componentType || meta?._context_component_type || meta?._upstream_component_type || 'ApproveTrigger');
+    const sourceComponent = String(resolved.componentType || val.componentType || meta?._context_component_type || meta?._upstream_component_type || 'ApproveTrigger');
     const sourceMeta = contextMetaForReference(meta, val, sourceComponent);
     let bvKey = String(val.paramKey || val.key || val.value || resolved.paramKey || '').trim();
     let bvLabel = String(val.label || val.name || '');
@@ -473,17 +476,14 @@ function handleBasisValue(val, result, meta, appId, eventId) {
         result.basisValue = bvId;
         const fId = genSfId();
         const fBiz = genSfId();
-        const srcId = eventId || String(meta?._upstream_node_id || '');
+        const srcId = basisSourceId(val, resolved, sourceComponent, eventId);
         const wnBv = String(meta?._upstream_workflow_name || '');
         const resolvedParentName = String(resolved.parentName || '').replace(/^(?:FormData|ApprovalData|SelectParams)\./, '');
         const bvParent = resolvedParentName || (wnBv ? `${wnBv}.${bvLabel}[]` : `${bvLabel}[]`);
         const bvfType = String(resolved.fieldType || resolveSourceFieldType(bvKey, sourceMeta));
         const basisPath = `${basisRoot}.${bvKey}`;
-        const explicitId = String(resolved.fieldId || val.frontId || val.fieldId || '').trim();
-        const legacyId = /^\d+$/.test(tail) ? tail : bvKey;
-        const basisId = sourceComponent === 'CustomTrigger'
-            ? resolveCustomTriggerDtoId(bvKey, meta?._custom_trigger_data, String(resolved.dimension || 'table'))
-            : (sourceComponent === 'WebHookTrigger' && /^\d+$/.test(explicitId) ? explicitId : legacyId);
+        const explicitId = resolved.fieldId || resolved.rawField?.id;
+        const basisId = explicitId;
         const bvfConfig = {
             paramKey: bvKey, isMultCom: Boolean(resolved.isMultCom), comType: sourceComponent, switchType: 'assign', parentComId: 0, formulaVersion: 'V1',
             fieldInfo: { paramKey: bvKey, tablePrimaryKey: basisRoot },
@@ -495,7 +495,7 @@ function handleBasisValue(val, result, meta, appId, eventId) {
             comId: srcId, newParentName: bvParent,
         };
         const bvf = {
-            frontId: normalizeNumericFrontId(basisId, '依据值 FormulaBean.frontId'), formulaType: bvfType, name: bvLabel, businessId: fBiz, id: fId,
+            frontId: requireContextFieldId(basisId, '依据值 FormulaBean.frontId'), formulaType: bvfType, name: bvLabel, businessId: fBiz, id: fId,
             source: srcId, type: '3', value: basisPath, childs: [], config: bvfConfig, parentId: '0',
         };
         // 依据值公式同样需要 esbAssign.wId 指向当前数据动作节点（设计器动态赋值定位用）。
@@ -597,8 +597,6 @@ export function fillSetting(result, updates, mapping, constants, formula, meta,
                     paramKey: refKey,
                     label: refLabel,
                 };
-                // 保留循环体动态赋值的语义标记。它们不能丢失，否则
-                // buildSettingEntry 会把 CycleParams 错编译成普通 ApprovalData/FormData。
                 for (const key of ['scope', 'contextScope', 'componentType', 'tablePrimaryKey', 'tableName', 'frontId', 'fieldType', 'valueType']) {
                     if (targetFieldId[key] !== undefined)
                         assignment[key] = targetFieldId[key];
@@ -608,8 +606,7 @@ export function fillSetting(result, updates, mapping, constants, formula, meta,
                 // 必须把这个 id 继续带到 FormulaBean.frontId，不能让
                 // assignFlatContextDirect 退回 paramKey/paramName 尾段。
                 const selectedParamId = targetFieldId._resolvedContext?.fieldId
-                    || targetFieldId.frontId
-                    || targetFieldId.fieldId;
+                    || targetFieldId._resolvedContext?.rawField?.id;
                 if (selectedParamId !== undefined && selectedParamId !== null && String(selectedParamId).trim() !== '') {
                     assignment.frontId = String(selectedParamId);
                 }
@@ -1303,11 +1300,11 @@ function conditionFormulaType(right, shape, sourceId) {
         if (!contextRoot && componentType !== 'CustomTrigger') {
             throw new Error(`Condition 右值 '${key}' 缺少 getComponentContext 返回的 tablePrimaryKey，拒绝猜测上下文根`);
         }
-        const bean = formulaContext(String(right?.source || right?.comId || sourceId), key, {
+        const bean = formulaContext(resolveContextSource(right, sourceId), key, {
             name: String(right?.label || right?.name || key),
             fieldType: shape.formulaType,
             componentType,
-            frontId: right?._resolvedContext?.fieldId || right?._resolvedContext?.rawField?.id || right?.frontId || right?.fieldId,
+            frontId: right?._resolvedContext?.fieldId || right?._resolvedContext?.rawField?.id,
             meta: contextRoot ? { _context_table_primary_key: contextRoot } : undefined,
             requireResolvedRoot: true,
         });
@@ -1339,7 +1336,15 @@ function buildSingleConditionDetail(condition, sourceId, meta = null) {
     // 条件计划允许使用完整 paramKey、paramName、真实字段 id 或界面显示名；统一回到
     // workflow-context-fields 的原始字段，避免把 label/内部字段名拼成不存在的路径。
     const contextFields = workflowId ? Object.values(getWorkflowContextFields()[workflowId] || {}) : [];
-    const rawField = contextFields.find((field) => {
+    const selectedRef = contextArg || left;
+    const selectedContext = selectedRef?._resolvedContext && typeof selectedRef._resolvedContext === 'object'
+        ? selectedRef._resolvedContext : {};
+    const selectedRaw = selectedContext.rawField && typeof selectedContext.rawField === 'object' ? selectedContext.rawField : {};
+    const rawField = (selectedContext.paramKey && selectedContext.tablePrimaryKey ? {
+        ...selectedRaw, ...selectedContext,
+        id: selectedContext.fieldId || selectedRaw.id,
+        showName: selectedContext.label || selectedRaw.showName,
+    } : null) || contextFields.find((field) => {
         if (!field || typeof field !== 'object')
             return false;
         return [field.paramKey, field.paramName, field.showName, field.id, field.paramId]
@@ -1383,7 +1388,9 @@ function buildSingleConditionDetail(condition, sourceId, meta = null) {
         }
         paramKeyId = String(rawField.paramKey);
         valueId = `${contextRoot}.${paramKeyId}`;
-        comType = 'ApproveTrigger';
+        comType = String(selectedContext.componentType || selectedRef.componentType || rawField.componentType || '').trim();
+        if (!comType)
+            throw new Error(`Condition.left.key='${requestedFieldKey}' 缺少真实来源组件类型`);
     }
     else if (fieldId && workflowId && fieldId !== fieldKey) {
         throw new Error(`Condition.left.key='${requestedFieldKey}' 未返回实时上下文分组，拒绝猜测 FormData`);
@@ -1392,7 +1399,7 @@ function buildSingleConditionDetail(condition, sourceId, meta = null) {
         throw new Error(`Condition.left.key='${requestedFieldKey}' 未返回实时上下文分组，拒绝猜测 FormData`);
     }
     const upstreamWId = meta && typeof meta === 'object' ? String(meta._upstream_w_id || '') : '';
-    const contextWId = isEnquiryCount ? String(sourceId) : (upstreamWId || String(sourceId));
+    const contextWId = resolveContextSource(selectedRef, upstreamWId);
     // customFieldType.id/businessId 是条件编辑器中“本次选择上下文”的 FormulaBean
     // 实例 ID，不是业务字段 ID。真实字段身份只由 config.paramKey 承载。若把两者
     // 写成字段 id（例如 17），saveCondition 会返回 haveData=false，仅保留空骨架，
@@ -1421,7 +1428,7 @@ function buildSingleConditionDetail(condition, sourceId, meta = null) {
         },
     };
     if (needRight) {
-        leftOperand[`${shape.prefix}TextValueLeft`] = conditionFormulaType(right, shape, contextWId);
+        leftOperand[`${shape.prefix}TextValueLeft`] = conditionFormulaType(right, shape, upstreamWId);
     }
     const dataJson = JSON.stringify({
         sourceId: sourceId ? String(sourceId) : '-1',
@@ -1539,13 +1546,14 @@ export function buildSettingDetail(nodeData, detailItems, meta, appId, eventId,
             ele.updateFieldCondition = { updateField: [] };
         }
         const eleData = {};
-        // 明细项依据值：引用整个明细表，source=event 节点 id, frontId=明细表 id。
+        // 明细依据值指向提供上下文的节点。
         if (item.basisValue && typeof item.basisValue === 'object') {
             const bvVal = item.basisValue;
             const resolved = bvVal._resolvedContext && typeof bvVal._resolvedContext === 'object'
                 ? bvVal._resolvedContext : {};
-            const sourceComponent = String(resolved.componentType || meta?._context_component_type || meta?._upstream_component_type || 'ApproveTrigger');
+            const sourceComponent = String(resolved.componentType || bvVal.componentType || meta?._context_component_type || meta?._upstream_component_type || 'ApproveTrigger');
             const sourceMeta = contextMetaForReference(meta, bvVal, sourceComponent);
+            const sourceId = basisSourceId(bvVal, resolved, sourceComponent, String(eventId));
             let bvKey = String(bvVal.paramKey || bvVal.key || resolved.paramKey || '').trim();
             const isCustomTriggerSource = sourceComponent === 'CustomTrigger';
             const basisContextRoot = resolvedContextRoot(resolved, sourceComponent);
@@ -1563,46 +1571,25 @@ export function buildSettingDetail(nodeData, detailItems, meta, appId, eventId,
                 const bvType = String(resolved.fieldType || resolveSourceFieldType(bvKey, sourceMeta));
                 const resolvedParentName = String(resolved.parentName || '').replace(/^(?:FormData|ApprovalData|SelectParams)\./, '');
                 const parentName = resolvedParentName || resolveFormSettingBasisParentName(bvKey, bvLabel, sourceMeta);
-                // CustomTrigger 的明细依据值也是表维度上下文，frontId 必须取
-                // CustFormTableDto.id，不能把 detail1 这类 paramKey 尾段直接当成 ID。
-                const customTriggerTableId = isCustomTriggerSource
-                    ? resolveCustomTriggerDtoId(bvKey, meta?._custom_trigger_data, String(resolved.dimension || 'table'))
-                    : '';
-                const legacyBvSubformId = bvKey.includes('[]')
-                    ? bvKey.split('[]')[0].includes('.')
-                        ? bvKey.split('[]')[0].slice(bvKey.split('[]')[0].lastIndexOf('.') + 1)
-                        : bvKey
-                    : bvKey;
-                // CustomTrigger 无法定位 DTO 表对象时按统一规则留空；不能回退到
-                // detail1 这类业务 paramKey，否则既不是真实 ID，也会触发数字校验。
-                // WebHook 的明细依据值来自 ParamGroupSettingBean 的父参数行。
-                // 这里必须使用该行的真实 id；不能把 detailOne/detailTwo 这种
-                // paramKey 尾段误当作 FormulaBean.frontId。
-                const explicitBasisId = String(resolved.fieldId
-                    || bvVal.frontId
-                    || bvVal.fieldId
-                    || '').trim();
-                const isWebhookSource = sourceComponent === 'WebHookTrigger';
-                const bvSubformId = isCustomTriggerSource
-                    ? customTriggerTableId
-                    : isWebhookSource && /^\d+$/.test(explicitBasisId)
-                        ? explicitBasisId
-                        : legacyBvSubformId;
+                // 所有来源的明细依据值均使用已解析上下文中选中参数行的 id。
+                const explicitBasisId = resolved.fieldId || resolved.rawField?.id;
+                const bvSubformId = explicitBasisId;
                 const basisValuePath = `${basisContextRoot}.${bvKey}`;
                 ele.basisValue = {
-                    frontId: normalizeNumericFrontId(bvSubformId, '明细依据值 FormulaBean.frontId'),
+                    frontId: requireContextFieldId(bvSubformId, '明细依据值 FormulaBean.frontId'),
                     formulaType: bvType,
                     name: bvLabel,
                     businessId: appId,
                     id: genSfId(),
-                    source: String(eventId),
+                    source: sourceId,
                     type: '3',
                     value: basisValuePath,
                     childs: [],
                     config: {
                         paramKey: bvKey,
-                        paramType: bvType,
-                        isMultCom: false,
+                        // 明细依据值的 AssignSwitch 默认赋值类型是 string；公式本身仍保留来源类型。
+                        paramType: 'string',
+                        isMultCom: Boolean(resolved.isMultCom || sourceComponent === 'MultipleExecution'),
                         switchType: 'assign',
                         parentName,
                         multName: '',
@@ -1611,7 +1598,7 @@ export function buildSettingDetail(nodeData, detailItems, meta, appId, eventId,
                             allName: parentName, currentName: parentName,
                             currentParamKey: basisValuePath, allParamKey: basisValuePath,
                         },
-                        comId: String(eventId),
+                        comId: sourceId,
                         comType: sourceComponent,
                         newParentName: parentName,
                         tableName: basisTableName,
@@ -1810,7 +1797,7 @@ export function autoFillDetailMapping(eleData, item, targetFormId, meta, appId,
 // 后继续读取旧实体而触发空指针。
 //
 // 仅处理组件根 data.id：业务对象 Browser id、字段 id、FormulaBean.id、明细表 id、
-// 循环配置 id 等内部标识不在此集合内。
+// 其他组件配置的内部标识不在此集合内。
 const CREATE_WITHOUT_COMPONENT_DATA_ID = new Set([
     'EbGetDataById', 'WorkflowToDoc',
     'AlterPersonStatus', 'PersonnelOnboarding', 'HrmEmployeeUpdate', 'PersonnelAlterType',
@@ -1898,7 +1885,9 @@ export function convertNode(draftAction, isEvent = false, meta = null, appId = '
     }
     else if (pendingDetail && !(pendingMapping || pendingConstants || pendingFormula)) {
         // 只有明细表赋值（无主表 mapping/constants）：先 _fill_setting 生成空 main + setting，再放回 detail。
-        fillSetting(nodeData, undefined, undefined, undefined, undefined, meta || {}, appId, eventNodeId || nidStr, eventName, nodeType);
+        if (!nodeData.setting || typeof nodeData.setting !== 'object') {
+            fillSetting(nodeData, undefined, undefined, undefined, undefined, meta || {}, appId, eventNodeId || nidStr, eventName, nodeType);
+        }
         nodeData._pending_detail = pendingDetail;
     }
     else if (formDataPayload && typeof formDataPayload === 'object') {
@@ -2009,16 +1998,13 @@ export function convertNode(draftAction, isEvent = false, meta = null, appId = '
         }
     }
     // 设计器通过“添加操作”创建节点时，除平台执行 DTO 外还会保留组件目录项。
-    // 这套前端节点壳（尤其是 MultipleExecution 的 originId/options）决定容器
-    // 内部编辑能否被前端 Store 正确回写；只发 componentId 的后端简化节点会
-    // 造成循环内条件保存后显示为空。目录由运行时接口读取，避免租户硬编码。
     let catalogOption = !isEvent && meta && typeof meta === 'object'
         ? (meta._componentOptions || {})[nodeType]
         : undefined;
     if (catalogOption && typeof catalogOption === 'object') {
         const option = JSON.parse(JSON.stringify(catalogOption));
         option.content ??= option.actionName || option.eventName || '';
-        node.nodeType = nodeType === 'MultipleExecution' ? 'MultipleExecution' : 'Normal';
+        node.nodeType = 'Normal';
         node.comType = nodeType;
         node.previousId = String(previousNodeId || '0');
         node.isAdd = true;
@@ -2102,8 +2088,7 @@ export function convertCondition(draftAction, meta = null, appId = '', actionInd
         for (const a of branch.actions || []) {
             const branchNode = a?.type === 'Condition'
                 ? convertCondition(a, meta, appId, i, eventId, branchPreviousId, lenient)
-                : a?.type === 'MultipleExecution'
-                    ? convertMultipleExecution(a, meta, appId, i, eventId, '', branchPreviousId, lenient)
+                : a?.type === 'MultipleExecution' ? convertMultipleExecution(a, meta, appId, i, eventId, '', branchPreviousId, lenient)
                     : convertNode(a, false, meta, appId, i, eventId, '', branchPreviousId, lenient);
             bacts.push(branchNode);
             branchPreviousId = branchNode.wId;
@@ -2143,58 +2128,30 @@ export function convertCondition(draftAction, meta = null, appId = '', actionInd
     }
     return node;
 }
-/** 将简化计划中的循环体编译进 MultipleExecution.data.actions。 */
-export function convertMultipleExecution(draftAction, meta = null, appId = '', actionIndex = 0, eventId = '', eventName = '', previousNodeId = '0', lenient = false) {
-    const node = convertNode(draftAction, false, meta, appId, actionIndex, eventId, eventName, previousNodeId, lenient);
-    // 对齐前端 NodeConfig 的循环节点初始数据。data.id 不是画布 wId：它是循环组件
-    // 的配置数据标识；缺失时循环可显示，却无法持久化其中手工新增的条件或赋值。
-    node.data ??= {};
-    node.data.id ??= genSfId();
-    node.data.tempCycleMode ??= String(node.data.cycleMode ?? '1');
-    node.data.type ??= 'MultipleExecution';
-    node.data.applicationId ??= String(appId);
-    node.data.sceneId ??= String(meta?._scene_id || '');
-    node.data.multiParallelFlag ??= '0';
-    // 前端递归展开循环体时使用这两个路径标识构造循环内上下文；根循环为空，
-    // 循环体第一层以当前循环画布节点为 key。缺失会让手工编辑后的状态落回根链。
-    node.multKey ??= '';
-    node.multName ??= '';
-    const body = Array.isArray(draftAction.actions) ? draftAction.actions : [];
+export function convertMultipleExecution(draft, meta = null, appId = '', index = 0, eventId = '', eventName = '', previousId = '0', lenient = false) {
+    const node = convertNode(draft, false, meta, appId, index, eventId, eventName, previousId, lenient);
+    const body = Array.isArray(draft.actions) ? draft.actions.filter((item) => item?.type !== 'Output') : [];
     if (!body.length)
         throw new Error('MultipleExecution.actions 循环体不能为空');
-    const actions = [];
-    // 循环体首节点在画布中的 previousId 必须为 0；parentId 才是循环容器。
-    // 若把 sources 指向循环节点，前端回读会找不到循环内起始节点并将其画到循环外。
-    let bodyPreviousId = '0';
-    for (let index = 0; index < body.length; index++) {
-        const action = body[index];
-        if (action?.type === 'Output')
-            continue;
-        const bodyNode = action?.type === 'Condition'
-            ? convertCondition(action, meta, appId, index, eventId, bodyPreviousId, lenient)
-            : action?.type === 'MultipleExecution'
-                ? convertMultipleExecution(action, meta, appId, index, eventId, eventName, bodyPreviousId, lenient)
-                : convertNode(action, false, meta, appId, index, eventId, eventName, bodyPreviousId, lenient);
-        // 前端 dealBackData 展开 data.actions 后，依赖 parentId 将节点挂进循环画布；
-        // 缺失时会被当作主链节点，循环容器显示为空。
-        bodyNode.parentId = node.wId;
-        bodyNode.multKey = node.multKey ? `${node.multKey}.${node.wId}` : String(node.wId);
-        bodyNode.multName = node.multName ? `${node.multName}.${node.name}` : String(node.name);
-        bodyNode.ignoreFlowCheck = true;
-        // 前端以 sources[0] ? sources[0].wId : 0 还原 previousId。
-        // [{}] 会还原为 undefined，循环体找不到起始节点；首节点必须为空数组。
-        if (index === 0)
-            bodyNode.sources = [];
-        actions.push(bodyNode);
-        bodyPreviousId = bodyNode.wId;
-    }
-    if (!actions.length)
-        throw new Error('MultipleExecution.actions 循环体必须包含至少一个非 Output 动作');
-    node.data.actions = actions;
-    // convertNode 读取目录项时会先生成 fields，但 actions 是循环编译阶段
-    // 才挂入 data 的。保存接口依赖 fields 声明这些可持久化配置，否则
-    // 循环看起来能生成，平台回读/保存时会丢失循环体并可能返回 500。
-    node.fields = Object.keys(node.data || {});
+    node.nodeType = 'MultipleExecution';
+    node.comType = 'MultipleExecution';
+    node.data.id ??= genSfId();
+    node.data.applicationId = String(appId);
+    node.data.sceneId = String(meta?._scene_id || '');
+    const hasParallel = (items) => items.some((item) => item?.type === 'Condition' && String(item.params?.executeMethod || '1') === '2' || getStepBranches(item).some((branch) => hasParallel(branch.actions || [])) || Array.isArray(item?.actions) && hasParallel(item.actions));
+    node.data.multiParallelFlag = hasParallel(body) ? '1' : '0';
+    let prev = '0';
+    node.data.actions = body.map((item, i) => {
+        const child = item.type === 'Condition' ? convertCondition(item, meta, appId, i, eventId, prev, lenient)
+            : item.type === 'MultipleExecution' ? convertMultipleExecution(item, meta, appId, i, eventId, eventName, prev, lenient)
+                : convertNode(item, false, meta, appId, i, eventId, eventName, prev, lenient);
+        child.parentId = node.wId;
+        if (prev === '0')
+            child.sources = [];
+        prev = String(child.wId);
+        return child;
+    });
+    node.fields = Object.keys(node.data);
     return node;
 }
 // ── 辅助层 / 骨架 / 别名替换 ───────────────────────────────
@@ -2206,41 +2163,157 @@ export function buildAssistLayer(_event, _actions) {
 function registerRealNodeIds(draftNode, realNode, nodeIds) {
     const draftId = String(draftNode?.id ?? '');
     const realId = String(realNode?.id ?? '');
+    if (realId)
+        nodeIds[realId] = realId;
     if (draftId && realId)
         nodeIds[draftId] = realId;
     const ref = String(draftNode?.ref ?? '').trim();
     if (ref && realId)
         nodeIds[ref] = realId;
+    if (draftNode?.type === 'MultipleExecution') {
+        const drafts = (draftNode.actions || []).filter((item) => item?.type !== 'Output');
+        const actions = realNode?.data?.actions || [];
+        drafts.forEach((item, index) => registerRealNodeIds(item, actions[index] || {}, nodeIds));
+    }
+    if (draftNode?.type === 'Condition') {
+        const branches = getStepBranches(draftNode) || [];
+        let conditionalIndex = 0;
+        for (const branch of branches) {
+            const cond = branch?.condition || {};
+            const isConditional = cond.type !== 'else' && hasConditionExpression(cond);
+            const nodes = !isConditional ? realNode?.data?.falseBranchActions
+                : conditionalIndex++ === 0 ? realNode?.data?.trueBranchActions
+                    : realNode?.data?.otherConditionBranch?.[conditionalIndex - 2]?.branchActions;
+            (branch?.actions || []).forEach((item, index) => registerRealNodeIds(item, nodes?.[index], nodeIds));
+        }
+    }
 }
 function replaceFormulaSourceAliases(value, nodeIds) {
     if (value && typeof value === 'object' && !Array.isArray(value)) {
+        const replacePath = (path) => path.split('.').map((part) => {
+            const match = part.match(/^([^\[\]]+)(\[[^\]]*\])?$/);
+            return match && nodeIds[match[1]] ? `${nodeIds[match[1]]}${match[2] || ''}` : part;
+        }).join('.');
+        const replaceConfigPaths = (config) => {
+            if (!config || typeof config !== 'object')
+                return;
+            for (const key of ['multKey', 'multValue', 'paramKey'])
+                if (typeof config[key] === 'string')
+                    config[key] = replacePath(config[key]);
+            if (config.multTypeObj && typeof config.multTypeObj === 'object') {
+                for (const key of ['currentParamKey', 'allParamKey'])
+                    if (typeof config.multTypeObj[key] === 'string')
+                        config.multTypeObj[key] = replacePath(config.multTypeObj[key]);
+            }
+        };
         if (String(value.type) === '3' && 'formulaType' in value) {
             const source = value.source;
             if (typeof source === 'string' && source in nodeIds)
                 value.source = nodeIds[source];
+            if (typeof value.value === 'string')
+                value.value = replacePath(value.value);
+            if (typeof value.paramKey === 'string')
+                value.paramKey = replacePath(value.paramKey);
         }
         const cfg = value.config;
         if (typeof cfg === 'string') {
             try {
                 const cfgObj = JSON.parse(cfg);
-                if (cfgObj && typeof cfgObj === 'object' && typeof cfgObj.comId === 'string' && cfgObj.comId in nodeIds) {
-                    cfgObj.comId = nodeIds[cfgObj.comId];
-                    value.config = JSON.stringify(cfgObj);
+                if (cfgObj && typeof cfgObj === 'object') {
+                    let changed = false;
+                    if (typeof cfgObj.comId === 'string' && cfgObj.comId in nodeIds) {
+                        cfgObj.comId = nodeIds[cfgObj.comId];
+                        changed = true;
+                    }
+                    if (String(value.type) === '10' && typeof cfgObj.source === 'string' && cfgObj.source in nodeIds) {
+                        cfgObj.source = nodeIds[cfgObj.source];
+                        changed = true;
+                    }
+                    if (String(value.type) === '3') {
+                        replaceConfigPaths(cfgObj);
+                        changed = true;
+                    }
+                    if (changed)
+                        value.config = JSON.stringify(cfgObj);
                 }
             }
             catch { /* ignore */ }
         }
-        else if (cfg && typeof cfg === 'object' && typeof cfg.comId === 'string' && cfg.comId in nodeIds) {
-            cfg.comId = nodeIds[cfg.comId];
+        else if (cfg && typeof cfg === 'object') {
+            if (typeof cfg.comId === 'string' && cfg.comId in nodeIds)
+                cfg.comId = nodeIds[cfg.comId];
+            if (String(value.type) === '10' && typeof cfg.source === 'string' && cfg.source in nodeIds)
+                cfg.source = nodeIds[cfg.source];
+            if (String(value.type) === '3')
+                replaceConfigPaths(cfg);
+        }
+        for (const [key, child] of Object.entries(value)) {
+            if (key === 'conditionDataJson' && typeof child === 'string') {
+                try {
+                    const parsed = JSON.parse(child);
+                    replaceFormulaSourceAliases(parsed, nodeIds);
+                    value[key] = JSON.stringify(parsed);
+                }
+                catch { /* 非 JSON 条件由原有校验处理 */ }
+            }
+            else
+                replaceFormulaSourceAliases(child, nodeIds);
         }
-        for (const child of Object.values(value))
-            replaceFormulaSourceAliases(child, nodeIds);
     }
     else if (Array.isArray(value)) {
         for (const child of value)
             replaceFormulaSourceAliases(child, nodeIds);
     }
 }
+function validateBasisSources(value, nodeIds) {
+    if (Array.isArray(value)) {
+        value.forEach((child) => validateBasisSources(child, nodeIds));
+        return;
+    }
+    if (!value || typeof value !== 'object')
+        return;
+    if (String(value.type) === '3' && value.formulaType) {
+        const source = String(value.source || '');
+        if (!source || !nodeIds.has(source)) {
+            throw new Error(`动态赋值 '${String(value.name || value.value || '')}' 的来源组件无法解析，请指定真实的上游节点`);
+        }
+    }
+    for (const [key, child] of Object.entries(value)) {
+        if (key === 'conditionDataJson' && typeof child === 'string') {
+            let parsed;
+            try {
+                parsed = JSON.parse(child);
+            }
+            catch {
+                continue;
+            }
+            validateBasisSources(parsed, nodeIds);
+            continue;
+        }
+        if (['basisValueFormula', 'bassisValue', 'basisValue'].includes(key)
+            && child && typeof child === 'object' && !Array.isArray(child)
+            && String(child.type) === '3' && child.formulaType) {
+            const basis = child;
+            let config = basis.config || {};
+            if (typeof config === 'string') {
+                try {
+                    config = JSON.parse(config);
+                }
+                catch {
+                    config = {};
+                }
+            }
+            const source = String(basis.source || '');
+            const comId = String(config.comId || '');
+            const firstLoop = String(config.multKey || '').split('.')[0].replace(/\[\]$/, '');
+            const validLoopSource = Boolean(firstLoop && source === firstLoop && nodeIds.has(comId));
+            if (!source || !nodeIds.has(source) || (source !== comId && !validLoopSource)) {
+                throw new Error(`依据值 '${String(basis.name || basis.value || '')}' 的来源组件无法解析或与 comId 不一致，请指定真实的上游节点`);
+            }
+        }
+        validateBasisSources(child, nodeIds);
+    }
+}
 function buildSkeletonNode(actionType, previousNodeId, actionIndex = 0) {
     const comp = get(actionType) || {};
     const disp = comp.display || {};
@@ -2398,6 +2471,10 @@ export function convert(draft, appId = '', sceneId = '', metadataPath = '', leni
     registerRealNodeIds(draftEvent, eventNode, sourceNodeIds);
     draftActions.forEach((draftAction, idx) => registerRealNodeIds(draftAction, realActions[idx], sourceNodeIds));
     replaceFormulaSourceAliases(realActions, sourceNodeIds);
+    const loopPaths = new Map();
+    draftActions.forEach((draftAction, idx) => collectLoopPaths(draftAction, realActions[idx], loopPaths));
+    applyLoopContext(realActions, loopPaths, appId);
+    validateBasisSources(realActions, new Set(Object.values(sourceNodeIds)));
     const assist = buildAssistLayer(eventNode, realActions);
     const design = {
         appId: String(appId || ''),
@@ -2431,4 +2508,3 @@ export function coerceIdsToStr(obj) {
     return obj;
 }
 import { buildTriggerDataSource } from './trigger_common.js';
-//# sourceMappingURL=workflow_compiler.js.map

package/dist/services/actionflow/workflow_request_level.js

@@ -8,4 +8,3 @@ export function normalizeWorkflowRequestLevel(value, componentType) {
     }
     return result;
 }
-//# sourceMappingURL=workflow_request_level.js.map

package/dist/services/actionflow/workflow_source.js

@@ -98,4 +98,3 @@ export async function getWfField(client, workflowId) {
         query: { wfid: String(workflowId), module: 'workflow' },
     });
 }
-//# sourceMappingURL=workflow_source.js.map

package/dist/services/app-publish.js

@@ -438,4 +438,3 @@ export function resolveCategoryId(list, input) {
     const custom = list.find((t) => t.categoryType === 'custom') || list[0];
     return String(custom?.id || '');
 }
-//# sourceMappingURL=app-publish.js.map

package/dist/services/app-range.js

@@ -134,4 +134,3 @@ export async function resolveRangeTarget(client, baseUrl, entity, keyword) {
         throw new Error(`角色「${kw}」匹配到 ${hit.length} 条，请改用角色 ID`);
     throw new Error(`找不到角色「${kw}」（可按角色名或角色 id 传）`);
 }
-//# sourceMappingURL=app-range.js.map

package/dist/services/auth-resp-condition.js

@@ -103,4 +103,3 @@ export async function buildAuthRespCondition(condition, fields, independent, cli
         return { childrens: [], relation: 1, errors: [e.message] };
     }
 }
-//# sourceMappingURL=auth-resp-condition.js.map

package/dist/services/browser.js

@@ -66,4 +66,3 @@ export async function resolveBrowserByName(client, baseUrl, name, headers = {})
     }
     return toBrowserType(bean);
 }
-//# sourceMappingURL=browser.js.map

package/dist/services/condition-rules.js

@@ -46,4 +46,3 @@ export const FAMILY_OPS = {
     'Browser': ['等于', '不等于', '包含', '属于', '不包含', '不属于', '为空', '不为空', '包含子部门', '不包含子部门'],
     'Bool': ['是', '否'],
 };
-//# sourceMappingURL=condition-rules.js.map

package/dist/services/designer-css.js

@@ -160,4 +160,3 @@ export function genProbeId(length = 8) {
     const tail = randomBytes(Math.ceil((length - 1) / 2)).toString('hex').slice(0, length - 1);
     return 'abcdef'[randomInt(6)] + tail;
 }
-//# sourceMappingURL=designer-css.js.map

package/dist/services/designer-dataset.js

@@ -153,4 +153,3 @@ export function ensurePanelIds(comp) {
 export function repairComp(comp) {
     return [...ensureChartAxisIds(comp), ...ensurePanelIds(comp)];
 }
-//# sourceMappingURL=designer-dataset.js.map

package/dist/services/designer-event.js

@@ -309,4 +309,3 @@ export async function createRefreshCondition(client, base, compId, sqlWhere, app
     check(typeof id === 'string' && /^[1-9]\d*$/.test(id), '条件 ID 无效');
     return { saved: true, id, compId, sqlWhere };
 }
-//# sourceMappingURL=designer-event.js.map

package/dist/services/designer-source.js

@@ -142,4 +142,3 @@ export async function readPageSdkCatalog(client, base) {
     check(Array.isArray(categories) && categories.every(c => Array.isArray(c.functions)), '页面 SDK 文档结构不完整');
     return categories;
 }
-//# sourceMappingURL=designer-source.js.map