weaver-e10-builder 1.6.15 → 1.7.0

package/dist/services/actionflow/preflight_service.js

@@ -10,13 +10,50 @@ import * as logicFlowSource from './logicflow_source.js';
 import { completeEbuilder, pickEbuilderBrowserRow } from './ebuilder_source.js';
 import { resolveHttpBindings } from './http_source.js';
 import { registerTargetFormFields, registerTargetDetailFields, registerWorkflowFieldIds, registerWorkflowContextFields, getWorkflowFieldIds, getWorkflowDetailFields, getWorkflowDetailNames, getTargetFormFields, getTargetDetailFields, replaceTargetDataSourceFields, } from './runtime_metadata.js';
+// 循环数据的子字段来自已读取的来源上下文；按父字段 ID 展开，不查询字段名称。
+export function expandLoopContext(step, loopContext) {
+    const mode = String(step.params?.cycleMode || '1');
+    if (mode !== '3' && mode !== '4')
+        return;
+    const selected = step.params?.[mode === '3' ? 'detailData' : 'batchDetailData'];
+    const resolved = selected?._resolvedContext;
+    const sourceRows = resolved?.tableContext?.tableData;
+    const selectedId = String(resolved?.fieldId || '');
+    const group = Object.values(loopContext).find((entry) => entry?.type === 'context_group' && String(entry.primaryKey) === 'CycleParams');
+    if (!selectedId || !Array.isArray(sourceRows) || !group)
+        return;
+    const rootId = mode === '3' ? '744564088747180033' : '744564088747180034';
+    const prefix = mode === '3' ? 'cycle.dataDetail' : 'cycle.dataDetail[]';
+    const queue = [{ id: selectedId, key: prefix }];
+    const seen = new Set([selectedId]);
+    while (queue.length) {
+        const parent = queue.shift();
+        for (const row of sourceRows) {
+            if (String(row?.parentId || '') !== parent.id || !row?.id || seen.has(String(row.id)))
+                continue;
+            const suffix = String(row.paramKey || '').split('.').pop();
+            if (!suffix)
+                continue;
+            const key = `${parent.key}.${suffix}`;
+            const raw = { ...row, paramKey: key, parentId: parent.id === selectedId ? rootId : parent.id };
+            const field = { key, paramKey: key, id: String(row.id), label: String(row.showName || row.paramName || suffix), name: String(row.paramName || row.showName || suffix), type: String(row.paramType || 'string'), value: key, group: 'CycleParams', tablePrimaryKey: 'CycleParams', tableName: String(group.name || ''), componentType: 'MultipleExecution', parentName: '', raw };
+            loopContext[key] = field;
+            loopContext[`CycleParams.${key}`] = field;
+            group.fields.push(raw);
+            raw.parentName = getParentName1(group.fields, raw.id);
+            field.parentName = raw.parentName;
+            seen.add(String(row.id));
+            queue.push({ id: String(row.id), key });
+        }
+    }
+}
 // workflow_id → 目标表单 id（进程缓存）
 const FORM_ID_CACHE = {};
-import { ContextStore, PlatformContextProvider } from './context_provider.js';
+import { ContextStore, PlatformContextProvider, getParentName1 } from './context_provider.js';
 import { hydrateContextReferences, hydrateQueryResultReferences, queryNodeContext, resolveContextGroupRoot, } from './context_preflight.js';
 import { get as getComponent } from './components/index.js';
 import { getStepBranches } from './step_branches.js';
-import { normalizeParamGroupSetting } from './param_group_dto.js';
+import { normalizeParamGroupSetting, normalizeParamSettingBean, normalizeParamMappingBean, prepareNativeParamMapping, paramDtoNeedsAllocation, remapParamInputBasisIds, prepareResultSetParamDtos } from './param_group_dto.js';
 import { genSfId } from './id_generator.js';
 import { OPTION_FIELD_COMPONENT_KEYS } from './option_field_types.js';
 // 表单字段进程缓存
@@ -1580,9 +1617,7 @@ export function checkSourceReferences(plan, eventContextFields, errors, availabl
             realKeys.add(pk);
             realKeys.add(pk.replace(/\[\]$/, ''));
         }
-    }
-    // 循环的 detailData/batchDetailData 可以来自前序 EnquiryForm、HTTP 等动作，
-    // 不只来自触发器。这里使用按拓扑查询后累积的上下文补充来源键；不接受
+    } // 不只来自触发器。这里使用按拓扑查询后累积的上下文补充来源键；不接受
     // 计划自行编造的字段，因为 availableContext 只来自平台 getComponentContext。
     for (const key of Object.keys(availableContext || {})) {
         if (key.startsWith('_source_'))
@@ -1657,21 +1692,7 @@ export function checkSourceReferences(plan, eventContextFields, errors, availabl
             if (['ActionEbAdd', 'ActionEbUpdate', 'ActionEbDelete', 'ActionEbRecover', 'ActionEbSaveVersion', 'EbGetDataById'].includes(step.type)) {
                 if (params && typeof params === 'object') {
                     const mapping = params.mapping;
-                    if (mapping && typeof mapping === 'object' && !Array.isArray(mapping)) {
-                        // 循环体字段来自 MultipleExecution 的 CycleParams，不属于最外层
-                        // 触发器流程上下文；它由循环节点查询后的 hydrateCurrentLoopReferences
-                        // 单独校验和补全，不能再按 workflowId 源字段检查。
-                        const topLevelMapping = Object.fromEntries(Object.entries(mapping).filter(([, value]) => {
-                            if (!value || typeof value !== 'object' || Array.isArray(value))
-                                return true;
-                            return String(value.scope ?? value.contextScope ?? '') !== 'current_loop'
-                                && String(value.assignment?.scope ?? value.assignment?.contextScope ?? '') !== 'current_loop';
-                        }));
-                        checkMapping(topLevelMapping, `${path}.mapping`);
-                    }
-                    else {
-                        checkMapping(mapping, `${path}.mapping`);
-                    }
+                    checkMapping(mapping, `${path}.mapping`);
                     const bv = params.basisValue;
                     if (bv && typeof bv === 'object') {
                         if (String(bv.kind || bv.assignmentKind || '') !== 'query_result') {
@@ -1702,15 +1723,6 @@ export function checkSourceReferences(plan, eventContextFields, errors, availabl
                     }
                 }
             }
-            if (step.type === 'MultipleExecution') {
-                for (const fieldName of ['cycleTimes', 'detailData', 'batchDetailData']) {
-                    const formula = params?.[fieldName];
-                    if (formula && typeof formula === 'object' && ['context', 'reference'].includes(String(formula.kind ?? formula.assignmentKind ?? ''))) {
-                        checkSourceKey(String(formula.paramKey || formula.key || formula.fieldKey || ''), `${path}.${fieldName}`);
-                    }
-                }
-                walk(step.actions || [], `${path}.actions`);
-            }
             if (step.type === 'Condition') {
                 for (const [bi, branch] of (getStepBranches(step) || []).entries()) {
                     if (branch && typeof branch === 'object')
@@ -1721,256 +1733,6 @@ export function checkSourceReferences(plan, eventContextFields, errors, availabl
     };
     walk(plan.actions || []);
 }
-function loopContextDescriptor(field, fallbackComponent = '') {
-    const componentType = String(field?.componentType || field?._context_component_type || fallbackComponent || 'ApproveTrigger');
-    const parameterTable = String(field?.tablePrimaryKey
-        || field?.tableKey
-        || field?._context_table_primary_key
-        || field?.raw?.tablePrimaryKey
-        || field?.raw?.tableKey
-        || field?.raw?.primaryKey
-        || '').trim();
-    const tablePrimaryKey = parameterTable
-        || (componentType === 'CustomTrigger' ? 'SelectParams' : componentType === 'ApproveTrigger' ? 'ApprovalData' : 'FormData');
-    const tableName = String(field?.tableName || field?.raw?.tableName || field?.raw?.name || (tablePrimaryKey === 'SelectParams'
-        ? '选择参数' : tablePrimaryKey === 'ApprovalData' ? '流程数据' : tablePrimaryKey));
-    return {
-        componentType,
-        tablePrimaryKey,
-        tableName,
-        parentName: String(field?.parentName || field?.newParentName || field?.label || field?.showName || field?.paramName || ''),
-    };
-}
-function hydrateLoopCycleTimes(plan, eventContextFields) {
-    const byKey = new Map();
-    for (const field of eventContextFields) {
-        if (field && typeof field === 'object' && field.paramKey)
-            byKey.set(String(field.paramKey), field);
-    }
-    const walk = (steps) => {
-        for (const step of steps || []) {
-            if (!step || typeof step !== 'object')
-                continue;
-            if (step.type === 'MultipleExecution') {
-                for (const fieldName of ['cycleTimes', 'detailData', 'batchDetailData']) {
-                    const formula = step.params?.[fieldName];
-                    const kind = String(formula?.kind ?? formula?.assignmentKind ?? '');
-                    if (!formula || typeof formula !== 'object' || !['context', 'reference'].includes(kind))
-                        continue;
-                    const paramKey = String(formula.paramKey ?? formula.key ?? formula.fieldKey ?? '');
-                    const field = byKey.get(paramKey);
-                    if (field) {
-                        const label = String(field.showName || field.paramName || paramKey);
-                        const workflowId = String(plan.event?.params?.workflowPath?.id || '');
-                        formula.paramKey = String(field.paramKey);
-                        formula.label = label;
-                        formula.valueType = String(field.paramType || field.fieldType || 'string');
-                        formula.fieldType = String(field.paramType || field.fieldType || 'string');
-                        const descriptor = loopContextDescriptor(field);
-                        formula._resolvedContext = {
-                            fieldId: String(field.id || field.paramId || ''),
-                            fieldType: String(field.paramType || field.fieldType || 'string'),
-                            label,
-                            componentType: descriptor.componentType,
-                            tablePrimaryKey: descriptor.tablePrimaryKey,
-                            tableName: descriptor.tableName,
-                            parentName: descriptor.parentName || (workflowId ? `${workflowId}.${label}` : label),
-                            rawField: { ...field },
-                        };
-                    }
-                }
-                walk(step.actions || []);
-            }
-            if (step.type === 'Condition')
-                for (const branch of getStepBranches(step) || [])
-                    walk(branch?.actions || []);
-        }
-    };
-    walk(plan.actions || []);
-}
-/**
- * 循环体里的 scope=current_loop 引用必须使用循环节点 getComponentContext 返回的
- * CycleParams 元数据。这里补 fieldId/类型/名称，供 FormulaBean 的 frontId 和
- * 配置字段直接复用；不将它误识别成流程表单 FormData。
- */
-function hydrateCurrentLoopReferences(steps, context, loopRef) {
-    const walkValue = (value) => {
-        if (Array.isArray(value)) {
-            for (const item of value)
-                walkValue(item);
-            return;
-        }
-        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];
-            if (field && typeof field === 'object') {
-                const raw = field.raw && typeof field.raw === 'object' ? field.raw : {};
-                const label = String(field.label ?? raw.showName ?? raw.paramName ?? paramKey);
-                const fieldType = String(field.type ?? raw.paramType ?? 'int');
-                value.paramKey = paramKey;
-                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}`,
-                    sourceComponentType: String(raw.sourceComponentType || ''),
-                    sourceTablePrimaryKey: String(raw.sourceTablePrimaryKey || ''),
-                    sourceTableName: String(raw.sourceTableName || ''),
-                    sourceParamKey: String(raw.sourceParamKey || ''),
-                    sourceComponentId: String(raw.sourceComponentId || ''),
-                    rawField: raw,
-                };
-            }
-        }
-        for (const child of Object.values(value))
-            walkValue(child);
-    };
-    for (const step of steps || [])
-        walkValue(step?.params || {});
-}
-/** 循环自身的列表来源也要回填实时字段 DTO，不能只保留语义上的 paramKey。 */
-function hydrateLoopSourceReferences(step, context) {
-    if (!step || step.type !== 'MultipleExecution')
-        return;
-    for (const fieldName of ['cycleTimes', 'detailData', 'batchDetailData']) {
-        const ref = step.params?.[fieldName];
-        const kind = String(ref?.kind ?? ref?.assignmentKind ?? '');
-        if (!ref || typeof ref !== 'object' || !['context', 'reference'].includes(kind))
-            continue;
-        const paramKey = String(ref.paramKey ?? ref.key ?? ref.fieldKey ?? '');
-        const field = context[paramKey];
-        if (!field || typeof field !== 'object')
-            continue;
-        const raw = field.raw && typeof field.raw === 'object' ? field.raw : field;
-        const label = String(field.label ?? raw.showName ?? raw.paramName ?? paramKey);
-        const sourceGroup = field.type === 'context_group'
-            ? field
-            : field.group ? context[String(field.group)] : null;
-        const componentType = String(raw.sourceComponentType
-            || field.componentType
-            || field.component
-            || sourceGroup?.component
-            || raw.componentType
-            || (/\[\]$/.test(paramKey) ? 'EnquiryForm' : 'ApproveTrigger'));
-        const descriptor = loopContextDescriptor(field, componentType);
-        const tablePrimaryKey = descriptor.tablePrimaryKey;
-        const tableName = descriptor.tableName;
-        ref.paramKey = paramKey;
-        ref.label = label;
-        ref.valueType = String(field.type ?? raw.paramType ?? ref.valueType ?? 'json');
-        ref.fieldType = String(field.type ?? raw.paramType ?? ref.fieldType ?? 'json');
-        ref._resolvedContext = {
-            fieldId: String(raw.id ?? raw.paramId ?? ref.frontId ?? paramKey),
-            fieldType: ref.fieldType,
-            label,
-            componentType,
-            tablePrimaryKey,
-            tableName,
-            parentName: descriptor.parentName || String(field.group || '').replace(/\.$/, '') || label,
-            rawField: { ...raw },
-        };
-    }
-}
-/**
- * 对齐设计器 MultipleExecution.getRequest：把列表来源的字段展开到
- * cycle.dataDetail（逐条）或 cycle.dataDetail[]（分批）下面。
- * 仅复制上游 getComponentContext 已返回的字段元数据，不猜字段 ID。
- */
-function expandLoopDataContext(step, store) {
-    if (!step || step.type !== 'MultipleExecution')
-        return;
-    const mode = String(step.params?.cycleMode ?? '1');
-    if (!['3', '4'].includes(mode))
-        return;
-    const ref = step.params?.[mode === '4' ? 'batchDetailData' : 'detailData'];
-    if (!ref || typeof ref !== 'object')
-        return;
-    const sourceKey = String(ref.paramKey ?? ref.key ?? ref.fieldKey ?? '');
-    const context = store.asDict();
-    const source = context[sourceKey];
-    let sourceFields = source && typeof source === 'object' && Array.isArray(source.fields) ? source.fields : [];
-    if (!sourceFields.length) {
-        // EnquiryForm 返回的列表根字段通常和所有字段一起挂在 FormData.fields，
-        // 根键本身只是一个普通字段对象，不带 fields 数组。
-        for (const group of Object.values(context)) {
-            if (!group || typeof group !== 'object' || !Array.isArray(group.fields))
-                continue;
-            if (group.fields.some((field) => String(field?.paramKey || '') === sourceKey)) {
-                sourceFields = group.fields;
-                break;
-            }
-        }
-    }
-    if (!sourceFields.length)
-        return;
-    const sourceGroup = source && source.type === 'context_group'
-        ? source
-        : source?.group ? context[String(source.group)] : null;
-    const sourceComponentType = String(ref._resolvedContext?.componentType
-        || ref.componentType
-        || source?.componentType
-        || source?.component
-        || sourceGroup?.component
-        || source?.raw?.sourceComponentType
-        || (/\[\]$/.test(sourceKey) ? 'EnquiryForm' : 'ApproveTrigger'));
-    const sourceDescriptor = loopContextDescriptor(source || {}, sourceComponentType);
-    const sourceTablePrimaryKey = sourceDescriptor.tablePrimaryKey;
-    const sourceTableName = sourceDescriptor.tableName;
-    const prefix = mode === '4' ? 'cycle.dataDetail[]' : 'cycle.dataDetail';
-    const expanded = {};
-    for (const rawField of sourceFields) {
-        if (!rawField || typeof rawField !== 'object')
-            continue;
-        const rawKey = String(rawField.paramKey || '');
-        if (!rawKey.startsWith(sourceKey))
-            continue;
-        const suffix = rawKey.slice(sourceKey.length);
-        if (!suffix.startsWith('.'))
-            continue;
-        const key = `${prefix}${suffix}`;
-        const field = {
-            ...rawField,
-            paramKey: key,
-            value: key,
-            group: 'CycleParams',
-            parentId: String(rawField.parentId || ''),
-            // 循环体里的业务字段最终不是 CycleParams 引用，而是上游列表
-            // 的 FormData[位置].字段。保留来源元数据供 FormulaBean 编译使用。
-            sourceParamKey: rawKey,
-            sourceComponentId: String(ref.source ?? ref.comId ?? ''),
-            sourceComponentType,
-            sourceTablePrimaryKey,
-            sourceTableName,
-        };
-        expanded[key] = {
-            key,
-            label: String(rawField.showName || rawField.paramName || suffix.slice(1)),
-            name: String(rawField.paramName || rawField.showName || suffix.slice(1)),
-            type: String(rawField.paramType || rawField.fieldType || 'string'),
-            value: key,
-            group: 'CycleParams',
-            description: String(rawField.description || ''),
-            raw: field,
-        };
-    }
-    if (Object.keys(expanded).length)
-        store.merge(expanded, 'MultipleExecution');
-}
 /**
  * 显式 mapping 必须带实时显示名和完整上下文。
  *
@@ -2226,8 +1988,6 @@ export function hydrateWorkflowProvenanceMappings(plan, eventContextFields) {
             if (step.type === 'Condition')
                 for (const [bi, branch] of (getStepBranches(step) || []).entries())
                     walk(branch?.actions || [], `${path}[${index}].branches[${bi}].actions`);
-            if (step.type === 'MultipleExecution')
-                walk(step.actions || [], `${path}[${index}].actions`);
         }
     };
     walk(plan.actions || [], 'actions');
@@ -2288,6 +2048,9 @@ export function syncQueryFieldsToDraft(draft, plan) {
             for (let j = 0; j < pa.length && j < da.length; j++)
                 syncStep(pa[j], da[j]);
         }
+        const pa = planStep.actions || [], da = draftStep.actions || [];
+        for (let i = 0; i < pa.length && i < da.length; i++)
+            syncStep(pa[i], da[i]);
     };
     syncStep(plan.event, draft.event);
     const pa = plan.actions || [], da = draft.actions || [];
@@ -3040,8 +2803,8 @@ export async function preflightContext(plan, appId, client) {
                         await hydrateFilterFields(branch.actions || [], formConditionOnly);
                 }
             }
-            if (step.type === 'MultipleExecution' && Array.isArray(step.actions))
-                await hydrateFilterFields(step.actions, true);
+            if (step.type === 'MultipleExecution')
+                await hydrateFilterFields(step.actions || [], formConditionOnly);
         }
     };
     await hydrateFilterFields([event]);
@@ -3134,6 +2897,9 @@ export async function preflightContext(plan, appId, client) {
                 event.params.request = normalizeParamGroupSetting(request);
             }
         }
+        if (String(event?.type || '') === 'InnerMQListener' && event?.params?.receiveParams) {
+            event.params.receiveParams = normalizeParamSettingBean(event.params.receiveParams);
+        }
         const eventResult = await queryNodeContext(event, appId, 'event_1', store, provider, 'event', { allowPlannedDynamicResources, strictComponentContext: true });
         errors.push(...eventResult.errors);
         eventContext = eventResult.context;
@@ -3272,7 +3038,6 @@ export async function preflightContext(plan, appId, client) {
     // 显式 mapping 补实时显示名
     hydrateMappingLabels(plan, eventContextFields, eventContext);
     hydrateWorkflowProvenanceMappings(plan, eventContextFields);
-    hydrateLoopCycleTimes(plan, eventContextFields);
     // finalOutput 不属于 actions，但其 CustFormDetailDto.formulaValue 也可能
     // 引用 CustomTrigger 的表/字段；提前回填 DTO 真实 id，供终止节点编译 FormulaBean。
     if (plan.finalOutput?.params && typeof plan.finalOutput.params === 'object') {
@@ -3297,6 +3062,32 @@ export async function preflightContext(plan, appId, client) {
                 continue;
             }
             const path = `${prefix}[${index}]`;
+            // 参数 ID 必须在首次 getComponentContext 前生成并写回计划，避免
+            // 预检和最终编译各自生成一套雪花 ID，导致后续 frontId 指向旧参数行。
+            try {
+                const params = step.params || {};
+                if (step.type === 'ServerlessAction') {
+                    if (params.request) {
+                        const original = params.request;
+                        params.request = normalizeParamMappingBean(original);
+                        params.inputParams = remapParamInputBasisIds(original, params.request, params.inputParams);
+                    }
+                    if (params.response)
+                        params.response = normalizeParamSettingBean(params.response);
+                }
+                else if (step.type === 'InnerMQSend' && paramDtoNeedsAllocation(params.sendParams, true)) {
+                    const original = params.sendParams;
+                    params.sendParams = prepareNativeParamMapping(original);
+                    params.inputParams = remapParamInputBasisIds(original, params.sendParams, params.inputParams);
+                }
+                else if (step.type === 'DMLExecute' && Array.isArray(params.resultSets)) {
+                    params.resultSets = prepareResultSetParamDtos(params.resultSets);
+                }
+            }
+            catch (error) {
+                errors.push(`${path}: ${String(error?.message || error)}`);
+                return;
+            }
             let result;
             try {
                 result = await queryNodeContext(step, appId, 'event_1', branchStore, provider, path, { allowPlannedDynamicResources, strictComponentContext: true });
@@ -3334,12 +3125,18 @@ export async function preflightContext(plan, appId, client) {
                 }
             }
             else if (step.type === 'MultipleExecution') {
-                // 循环体可以引用该循环刚返回的 CycleParams（当次循环）；先查询循环节点，
-                // 再携带其上下文进入循环体，不能把循环体当作独立主链处理。
-                expandLoopDataContext(step, branchStore);
-                hydrateCurrentLoopReferences(step.actions || [], branchStore.asDict(), sourceRef);
-                hydrateLoopSourceReferences(step, branchStore.asDict());
-                await walk(step.actions || [], new ContextStore(branchStore.asDict()), `${path}.actions`);
+                const children = Array.isArray(step.actions) ? step.actions : [];
+                if (!children.length) {
+                    errors.push(`${path}.actions 循环体不能为空`);
+                    return;
+                }
+                const counter = result.context['cycle.hasCycled'] || result.context['CycleParams.cycle.hasCycled'];
+                if (counter?.raw?.id || counter?.id)
+                    step._loopCounter = { id: String(counter.raw?.id || counter.id), paramKey: 'cycle.hasCycled', name: '已循环次数' };
+                expandLoopContext(step, result.context);
+                branchStore.merge(result.context, 'MultipleExecution');
+                hydrateContextReferences(children, result.context, { id: sourceRef, type: 'MultipleExecution' });
+                await walk(children, new ContextStore(branchStore.asDict()), `${path}.actions`);
             }
             else if (['ApproveCreate', 'ApproveSave', 'ApproveCommit', 'ApproveSendBack'].includes(String(step.type))) {
                 await resolveBizCreateFields(step, plan, client, errors, path);
@@ -3349,7 +3146,7 @@ export async function preflightContext(plan, appId, client) {
     await walk(plan.actions || [], store, 'actions');
     // 目标表单字段元数据在上面的 walk 中已完成（ApproveCreate 也会在此处
     // 拉取 _bizFields），现在统一处理所有 componentKey 对应的固定 Browser 值。
-    // 动态赋值、函数和循环引用由公式编译链继续处理，不在这里查询。
+    // 动态赋值和函数由公式编译链继续处理，不在这里查询。
     try {
         await resolveFormFieldBrowserFixedValues(plan, client);
     }