weaver-e10-builder 1.5.7 → 1.5.9

package/dist/services/actionflow/workflow_compiler.js

@@ -8,7 +8,7 @@ import fs from 'node:fs';
 import { get, getCompiler, getNodePost } from './components/index.js';
 import { buildEsbFormDataDto, buildEsbFormField } from './components/form_data_builder.js';
 import { findInMetadata, getTargetFormFields, 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, contextRootForComponent, contextTableNameForRoot, normalizeContextParamKey, } from './formula_service.js';
+import { buildPersonFormula, buildAssignBean, attachEsbAssign, resolveEnumConstant, resolveParamKey, resolveSourceFieldLabel, resolveSourceFieldType, normalizeConstantAssignment, lookupTargetFieldMeta, formulaFixedForAssignSwitch, formulaSystemVar, formulaContext, assignFlatContextDirect, getFormulaFn, formulaFunction, contextRootForComponent, contextTableNameForRoot, normalizeContextParamKey, resolveFormSettingBasisParentName, contextMetaForReference, resolvedContextRoot, protocolParamKey, } from './formula_service.js';
 import { buildFormulaReference, buildUpdateFieldCondition } from './components/action_eb_update_compiler.js';
 import { resolveCustomTriggerDtoId } from './custom_trigger_context.js';
 import { resolveSystemParameter, isDateSystemParameter } from './system_params.js';
@@ -350,7 +350,10 @@ function handleSpecial(draftKey, special, val, result, meta, appId, idx, eventId
 function handleBasisValue(val, result, meta, appId, eventId) {
     if (!val || typeof val !== 'object')
         return;
-    let bvKey = String(val.paramKey || val.key || val.value || '').trim();
+    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 sourceMeta = contextMetaForReference(meta, val, sourceComponent);
+    let bvKey = String(val.paramKey || val.key || val.value || resolved.paramKey || '').trim();
     let bvLabel = String(val.label || val.name || '');
     // 明细表依据值 paramKey 必须带 []（早期正确产物 FormData.{wfId}.{明细表id}[]）。
     // plan 允许省略 []，编译器检测上下文存在数组版本时自动补齐（真机验证 2026-08-19：漏 [] 前端定位不到明细表标红）。
@@ -361,6 +364,8 @@ function handleBasisValue(val, result, meta, appId, eventId) {
         if (keyIndex[arrKey] && !keyIndex[bvKey])
             bvKey = arrKey;
     }
+    const basisRoot = resolvedContextRoot(resolved, sourceComponent, sourceComponent === 'CustomTrigger' ? contextRootForComponent('CustomTrigger') : 'FormData');
+    bvKey = protocolParamKey(sourceComponent === 'CustomTrigger' ? normalizeContextParamKey(bvKey, sourceComponent) : bvKey, basisRoot, sourceComponent);
     if (bvKey) {
         const idx = bvKey.lastIndexOf('.');
         const bkHead = idx >= 0 ? bvKey.slice(0, idx) : '';
@@ -379,21 +384,28 @@ function handleBasisValue(val, result, meta, appId, eventId) {
         const fBiz = genSfId();
         const srcId = eventId || String(meta?._upstream_node_id || '');
         const wnBv = String(meta?._upstream_workflow_name || '');
-        const bvParent = wnBv ? `${wnBv}.${bvLabel}[]` : `${bvLabel}[]`;
-        const bvfType = resolveSourceFieldType(bvKey, meta);
+        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 bvfConfig = {
-            paramKey: bvKey, isMultCom: false, comType: 'ApproveTrigger', switchType: 'assign', parentComId: 0, formulaVersion: 'V1',
-            fieldInfo: { paramKey: bvKey, tablePrimaryKey: 'FormData' },
-            tableName: '表单数据', paramType: bvfType, parentName: bvParent, multName: '', multKey: '',
+            paramKey: bvKey, isMultCom: Boolean(resolved.isMultCom), comType: sourceComponent, switchType: 'assign', parentComId: 0, formulaVersion: 'V1',
+            fieldInfo: { paramKey: bvKey, tablePrimaryKey: basisRoot },
+            tableName: String(resolved.tableName || contextTableNameForRoot(basisRoot)), paramType: bvfType, parentName: bvParent, multName: '', multKey: '',
             multTypeObj: {
                 allName: bvParent, currentName: bvParent,
-                currentParamKey: `FormData.${bvKey}`, allParamKey: `FormData.${bvKey}`,
+                currentParamKey: basisPath, allParamKey: basisPath,
             },
             comId: srcId, newParentName: bvParent,
         };
         const bvf = {
-            frontId: normalizeNumericFrontId(bvId, '依据值 FormulaBean.frontId'), formulaType: bvfType, name: bvLabel, businessId: fBiz, id: fId,
-            source: srcId, type: '3', value: `FormData.${bvKey}`, childs: [], config: bvfConfig, parentId: '0',
+            frontId: normalizeNumericFrontId(basisId, '依据值 FormulaBean.frontId'), formulaType: bvfType, name: bvLabel, businessId: fBiz, id: fId,
+            source: srcId, type: '3', value: basisPath, childs: [], config: bvfConfig, parentId: '0',
         };
         // 依据值公式同样需要 esbAssign.wId 指向当前数据动作节点（设计器动态赋值定位用）。
         attachEsbAssign(bvf, meta, srcId);
@@ -490,6 +502,19 @@ export function fillSetting(result, updates, mapping, constants, formula, meta,
                     if (targetFieldId[key] !== undefined)
                         assignment[key] = targetFieldId[key];
                 }
+                // 参数设置组件的字段身份来自用户实际选中的 ParamBean。
+                // 预检会把该行的真实 id 写入 _resolvedContext.fieldId；映射编译时
+                // 必须把这个 id 继续带到 FormulaBean.frontId，不能让
+                // assignFlatContextDirect 退回 paramKey/paramName 尾段。
+                const selectedParamId = targetFieldId._resolvedContext?.fieldId
+                    || targetFieldId.frontId
+                    || targetFieldId.fieldId;
+                if (selectedParamId !== undefined && selectedParamId !== null && String(selectedParamId).trim() !== '') {
+                    assignment.frontId = String(selectedParamId);
+                }
+                if (targetFieldId._resolvedContext && typeof targetFieldId._resolvedContext === 'object') {
+                    assignment._resolvedContext = { ...targetFieldId._resolvedContext };
+                }
                 if (targetFieldId.source !== undefined)
                     assignment.source = targetFieldId.source;
                 if (targetFieldId.comId !== undefined)
@@ -1310,12 +1335,15 @@ export function buildSettingDetail(nodeData, detailItems, meta, appId, eventId,
         // 明细项依据值：引用整个明细表，source=event 节点 id, frontId=明细表 id。
         if (item.basisValue && typeof item.basisValue === 'object') {
             const bvVal = item.basisValue;
-            let bvKey = String(bvVal.paramKey || bvVal.key || '').trim();
-            const isCustomTriggerSource = String(meta?._context_component_type || meta?._upstream_component_type || '') === 'CustomTrigger';
-            const basisContextRoot = isCustomTriggerSource ? contextRootForComponent('CustomTrigger') : 'FormData';
-            const basisTableName = contextTableNameForRoot(basisContextRoot);
-            if (isCustomTriggerSource)
-                bvKey = normalizeContextParamKey(bvKey, 'CustomTrigger');
+            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 sourceMeta = contextMetaForReference(meta, bvVal, sourceComponent);
+            let bvKey = String(bvVal.paramKey || bvVal.key || resolved.paramKey || '').trim();
+            const isCustomTriggerSource = sourceComponent === 'CustomTrigger';
+            const basisContextRoot = resolvedContextRoot(resolved, sourceComponent, isCustomTriggerSource ? contextRootForComponent('CustomTrigger') : 'FormData');
+            const basisTableName = String(resolved.tableName || contextTableNameForRoot(basisContextRoot));
+            bvKey = protocolParamKey(isCustomTriggerSource ? normalizeContextParamKey(bvKey, 'CustomTrigger') : bvKey, basisContextRoot, sourceComponent);
             if (bvKey && !bvKey.includes('[]')) {
                 const wfId = String(meta?._workflow_id || '');
                 const keyIndex = wfId ? getWorkflowContextFieldsByKey()[wfId] || {} : {};
@@ -1325,18 +1353,13 @@ export function buildSettingDetail(nodeData, detailItems, meta, appId, eventId,
             }
             const bvLabel = String(bvVal.label || bvVal.name || bvKey);
             if (bvKey) {
-                const bvType = resolveSourceFieldType(bvKey, meta);
-                let prefix = '';
-                if (meta && typeof meta === 'object') {
-                    prefix = String(meta._upstream_workflow_name || '');
-                    if (!prefix)
-                        prefix = String(meta._upstream_form_name || '');
-                }
-                const parentName = prefix ? `${prefix}.${bvLabel}[]` : `${bvLabel}[]`;
+                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, 'table')
+                    ? resolveCustomTriggerDtoId(bvKey, meta?._custom_trigger_data, String(resolved.dimension || 'table'))
                     : '';
                 const legacyBvSubformId = bvKey.includes('[]')
                     ? bvKey.split('[]')[0].includes('.')
@@ -1345,7 +1368,20 @@ export function buildSettingDetail(nodeData, detailItems, meta, appId, eventId,
                     : bvKey;
                 // CustomTrigger 无法定位 DTO 表对象时按统一规则留空；不能回退到
                 // detail1 这类业务 paramKey，否则既不是真实 ID，也会触发数字校验。
-                const bvSubformId = isCustomTriggerSource ? customTriggerTableId : legacyBvSubformId;
+                // 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;
+                const basisValuePath = `${basisContextRoot}.${bvKey}`;
                 ele.basisValue = {
                     frontId: normalizeNumericFrontId(bvSubformId, '明细依据值 FormulaBean.frontId'),
                     formulaType: bvType,
@@ -1354,7 +1390,7 @@ export function buildSettingDetail(nodeData, detailItems, meta, appId, eventId,
                     id: genSfId(),
                     source: String(eventId),
                     type: '3',
-                    value: `${basisContextRoot}.${bvKey}`,
+                    value: basisValuePath,
                     childs: [],
                     config: {
                         paramKey: bvKey,
@@ -1366,10 +1402,10 @@ export function buildSettingDetail(nodeData, detailItems, meta, appId, eventId,
                         multKey: '',
                         multTypeObj: {
                             allName: parentName, currentName: parentName,
-                            currentParamKey: `${basisContextRoot}.${bvKey}`, allParamKey: `${basisContextRoot}.${bvKey}`,
+                            currentParamKey: basisValuePath, allParamKey: basisValuePath,
                         },
                         comId: String(eventId),
-                        comType: isCustomTriggerSource ? 'CustomTrigger' : 'ApproveTrigger',
+                        comType: sourceComponent,
                         newParentName: parentName,
                         tableName: basisTableName,
                         fieldInfo: { paramKey: bvKey, tablePrimaryKey: basisContextRoot },