weaver-e10-builder 1.5.12 → 1.5.13

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, 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, } 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';
@@ -318,11 +318,16 @@ function handleSpecial(draftKey, special, val, result, meta, appId, idx, eventId
                 result.requestName = buildFormulaReference(val, { meta, appId, eventId, componentType });
             }
             else {
+                const contextRoot = String(val._resolvedContext?.tablePrimaryKey || meta?._context_table_primary_key || '').trim();
+                if (!contextRoot) {
+                    throw new Error(`ApproveCreate.requestName 上下文 '${String(val.key ?? val.value ?? '')}' 缺少实时上下文 tablePrimaryKey，拒绝猜测上下文根`);
+                }
                 const wfId = String(meta?._workflow_id || '');
                 const rqKey = resolveParamKey(wfId, String(val.key ?? val.value ?? ''));
                 result.requestName = formulaContext('', rqKey, {
                     name: String(val.label || ''),
                     frontId: val._resolvedContext?.fieldId || val.frontId || val.fieldId,
+                    meta: { ...meta, _context_table_primary_key: contextRoot },
                 });
                 attachEsbAssign(result.requestName, meta, String(eventId || ''));
             }
@@ -364,7 +369,7 @@ function handleBasisValue(val, result, meta, appId, eventId) {
         if (keyIndex[arrKey] && !keyIndex[bvKey])
             bvKey = arrKey;
     }
-    const basisRoot = resolvedContextRoot(resolved, sourceComponent, sourceComponent === 'CustomTrigger' ? contextRootForComponent('CustomTrigger') : 'FormData');
+    const basisRoot = resolvedContextRoot(resolved, sourceComponent);
     bvKey = protocolParamKey(sourceComponent === 'CustomTrigger' ? normalizeContextParamKey(bvKey, sourceComponent) : bvKey, basisRoot, sourceComponent);
     if (bvKey) {
         const idx = bvKey.lastIndexOf('.');
@@ -1110,11 +1115,18 @@ function conditionFormulaType(right, shape, sourceId) {
         const key = String(raw || '').replace(/^(FormData|ApprovalData)\./, '');
         if (!key)
             throw new Error('Condition 动态右值必须提供 paramKey/key/value 或完整 formula');
+        const componentType = String(right?.componentType || right?.comType || right?._resolvedContext?.componentType || 'ApproveTrigger');
+        const contextRoot = String(right?._resolvedContext?.tablePrimaryKey || right?.tablePrimaryKey || '').trim();
+        if (!contextRoot && componentType !== 'CustomTrigger') {
+            throw new Error(`Condition 右值 '${key}' 缺少 getComponentContext 返回的 tablePrimaryKey，拒绝猜测上下文根`);
+        }
         const bean = formulaContext(String(right?.source || right?.comId || sourceId), key, {
             name: String(right?.label || right?.name || key),
             fieldType: shape.formulaType,
-            componentType: String(right?.componentType || right?.comType || 'ApproveTrigger'),
+            componentType,
             frontId: right?._resolvedContext?.fieldId || right?._resolvedContext?.rawField?.id || right?.frontId || right?.fieldId,
+            meta: contextRoot ? { _context_table_primary_key: contextRoot } : undefined,
+            requireResolvedRoot: true,
         });
         bean.businessId = String(right?.businessId || bean.businessId || '0');
         return bean;
@@ -1176,19 +1188,19 @@ function buildSingleConditionDetail(condition, sourceId, meta = null) {
         comType = 'EnquiryForm';
     }
     else if (rawField) {
+        const contextRoot = String(rawField.tablePrimaryKey || rawField.contextGroup || '').trim();
+        if (!contextRoot) {
+            throw new Error(`Condition.left.key='${requestedFieldKey}' 的实时上下文缺少 tablePrimaryKey，拒绝猜测 ApprovalData/FormData`);
+        }
         paramKeyId = String(rawField.paramKey);
-        valueId = `ApprovalData.${paramKeyId}`;
+        valueId = `${contextRoot}.${paramKeyId}`;
         comType = 'ApproveTrigger';
     }
     else if (fieldId && workflowId && fieldId !== fieldKey) {
-        paramKeyId = `${workflowId}.${fieldId}`;
-        valueId = `FormData.${workflowId}.${fieldId}`;
-        comType = 'ApproveTrigger';
+        throw new Error(`Condition.left.key='${requestedFieldKey}' 未返回实时上下文分组，拒绝猜测 FormData`);
     }
     else {
-        paramKeyId = fieldKey;
-        valueId = fieldKey ? `FormData.${fieldKey}` : '';
-        comType = 'EbGetDataById';
+        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));
@@ -1208,8 +1220,8 @@ function buildSingleConditionDetail(condition, sourceId, meta = null) {
             selectType: '-1', id: customFieldId, source: contextWId, type: '3', value: valueId,
             config: {
                 paramKey: paramKeyId, isMultCom: false, comType, parentComId: '0',
-                fieldInfo: { paramKey: paramKeyId, tablePrimaryKey: rawField ? 'ApprovalData' : 'FormData' },
-                tableName: rawField ? '流程数据' : '表单数据', paramType: shape.formulaType, parentName: contextDisplayName, multName: '', multKey: '',
+                fieldInfo: { paramKey: paramKeyId, tablePrimaryKey: rawField ? String(rawField.tablePrimaryKey || rawField.contextGroup) : '' },
+                tableName: rawField ? String(rawField.tableName || (String(rawField.tablePrimaryKey || rawField.contextGroup) === 'ApprovalData' ? '流程数据' : '表单数据')) : '', paramType: shape.formulaType, parentName: contextDisplayName, multName: '', multKey: '',
                 multTypeObj: { allName: contextDisplayName, currentName: contextDisplayName, currentParamKey: valueId, allParamKey: valueId },
                 comId: contextWId, newParentName: contextDisplayName,
             },
@@ -1341,7 +1353,7 @@ export function buildSettingDetail(nodeData, detailItems, meta, appId, eventId,
             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 basisContextRoot = resolvedContextRoot(resolved, sourceComponent);
             const basisTableName = String(resolved.tableName || contextTableNameForRoot(basisContextRoot));
             bvKey = protocolParamKey(isCustomTriggerSource ? normalizeContextParamKey(bvKey, 'CustomTrigger') : bvKey, basisContextRoot, sourceComponent);
             if (bvKey && !bvKey.includes('[]')) {