weaver-e10-builder 1.5.11 → 1.5.13

package/dist/services/actionflow/formula_service.js

@@ -65,6 +65,14 @@ export function contextTableNameForRoot(root) {
                 : root && isComponentContextRoot(root) ? root
                     : '表单数据';
 }
+function requireResolvedContextRoot(meta, componentType, paramKey) {
+    const root = String(meta?._context_table_primary_key || '').trim();
+    if (root)
+        return root;
+    if (componentType === 'CustomTrigger')
+        return 'SelectParams';
+    throw new Error(`[context] 字段 '${paramKey}' 缺少 getComponentContext 返回的 tablePrimaryKey，拒绝猜测上下文根`);
+}
 /**
  * 自定义触发的来源 key 只保存业务路径，不能把公式根节点混进 paramKey。
  * 主表与明细表必须共用同一个主表路径，例如：
@@ -227,7 +235,7 @@ function resolveFormSettingSubKey(paramKey, meta) {
  */
 function resolveBasisSubKey(paramKey, basisParamKey, basisType, meta, resolved) {
     const kind = String(basisType || '').toLowerCase();
-    const root = resolvedContextRoot(resolved, String(resolved.componentType || meta?._context_component_type || ''), '');
+    const root = resolvedContextRoot(resolved, String(resolved.componentType || meta?._context_component_type || ''));
     const selected = protocolParamKey(String(paramKey || ''), root, String(resolved.componentType || meta?._context_component_type || ''));
     const basis = protocolParamKey(String(basisParamKey || ''), root, String(resolved.componentType || meta?._context_component_type || ''));
     if (!basis || selected === basis)
@@ -287,7 +295,7 @@ export function contextMetaForReference(meta, reference, componentType = '') {
         : normalizeContextParamKey(selectedRaw, type);
     return projected;
 }
-export function resolvedContextRoot(resolved, componentType, fallback = '') {
+export function resolvedContextRoot(resolved, componentType) {
     const supplied = String(resolved.tablePrimaryKey || '').trim();
     if (supplied)
         return supplied;
@@ -301,7 +309,9 @@ export function resolvedContextRoot(resolved, componentType, fallback = '') {
         if (SERVERLESS_CONTEXT_TABLES.has(key))
             return key;
     }
-    return fallback || contextRootForComponent(componentType);
+    if (componentType === 'CustomTrigger')
+        return 'SelectParams';
+    throw new Error(`[context] ${String(resolved.paramKey || resolved.key || '上下文字段')} 缺少 getComponentContext 返回的 tablePrimaryKey，拒绝按 ${componentType || '未知组件'} 猜测上下文根`);
 }
 export function protocolParamKey(paramKey, root, componentType) {
     const raw = String(paramKey || '');
@@ -572,7 +582,11 @@ export function formulaContext(sourceComponentId, fieldKey, opts = {}) {
     const fieldName = String(opts.name || fieldKey);
     const componentType = opts.componentType || 'ApproveTrigger';
     const fieldType = opts.fieldType || 'string';
-    const contextRoot = contextRootForComponent(componentType);
+    const resolvedRoot = String(opts.meta?._context_table_primary_key || '').trim();
+    if (opts.requireResolvedRoot && !resolvedRoot && componentType !== 'CustomTrigger') {
+        throw new Error(`[context] 字段 '${fieldKey}' 缺少 getComponentContext 返回的 tablePrimaryKey，拒绝猜测上下文根`);
+    }
+    const contextRoot = resolvedRoot || (componentType === 'CustomTrigger' ? 'SelectParams' : contextRootForComponent(componentType));
     const tableName = contextTableNameForRoot(contextRoot);
     const parentName = alignContextParentName(fieldKey, opts.parentName || fieldName, fieldName, opts.meta || null, { componentType });
     return {
@@ -873,11 +887,20 @@ export function buildPersonFormula(personRef, meta, appId = '', forSendMessage =
         return formulaFixed(pid || personRef.name || '');
     }
     if (directPerson) {
-        if (ptype === 'context')
+        if (ptype === 'context') {
+            const componentType = String(personRef._resolvedContext?.componentType || personRef.componentType || meta?._context_component_type || 'ApproveTrigger');
+            const contextRoot = String(personRef._resolvedContext?.tablePrimaryKey || meta?._context_table_primary_key || '').trim();
+            if (!contextRoot && componentType !== 'CustomTrigger') {
+                throw new Error(`[context] 人员字段 '${pid}' 缺少 getComponentContext 返回的 tablePrimaryKey，拒绝猜测上下文根`);
+            }
             return formulaContext('', pid, {
                 name: String(personRef.name || personRef.label || pid),
                 frontId: personRef.frontId || personRef.fieldId || personRef._resolvedContext?.fieldId,
+                componentType,
+                meta: contextRoot ? { ...meta, _context_table_primary_key: contextRoot } : meta,
+                requireResolvedRoot: true,
             });
+        }
         const pname = String(personRef.name || personRef.label || '');
         if (pid && pname && pid !== '{userid}' && pid !== 'currentUser') {
             const personObj = buildPersonObject(pid, pname);
@@ -1525,7 +1548,7 @@ export function assignFlatContext(paramKey, fieldLabel, sourceId, appId, fieldTy
     const fid = genSfId();
     const src = String(sourceId) || '0';
     const componentType = String(meta?._context_component_type || meta?._upstream_component_type || '');
-    const contextRoot = contextRootForComponent(componentType);
+    const contextRoot = requireResolvedContextRoot(meta, componentType, paramKey);
     const tableName = contextTableNameForRoot(contextRoot);
     const val = valueFull
         ? String(valueFull).replace(/^(?:FormData|ApprovalData|SelectParams)\./, `${contextRoot}.`)
@@ -1603,7 +1626,8 @@ export function assignFlatContextDirect(paramKey, fieldLabel, sourceId, appId, f
         return assignFlatHttpContext(httpMatch[2], fieldLabel, src, appId, fieldType, parentName, httpMatch[1], meta);
     }
     const componentType = String(meta?._context_component_type || meta?._upstream_component_type || '');
-    const contextRoot = String(meta?._context_table_primary_key || contextRootForComponent(componentType));
+    const explicitContextRoot = String(meta?._context_table_primary_key || '').trim();
+    const contextRoot = explicitContextRoot || requireResolvedContextRoot(meta, componentType, requestedPkey);
     const parameterContext = isParameterContext(componentType, requestedPkey, contextRoot);
     const parameterTable = parameterContext
         ? contextRoot
@@ -1644,7 +1668,13 @@ export function assignFlatContextDirect(paramKey, fieldLabel, sourceId, appId, f
     // 没有真实来源类型时才按旧规则把裸字段视为流程上下文。动作组件输出
     // （例如 GetDocumentInfo.documentInfo.name）同样可以是裸字段，不能因此被
     // 序列化成 ApprovalData/ApproveTrigger。
-    let isApproval = plainApprovalShape && !ctxComponentKey && resolvedSourceComponent === 'ApproveTrigger';
+    // getComponentContext 返回的分组根是权威值。即使来源组件是 ApproveTrigger，
+    // 业务表单字段也可能来自 FormData；只有完全没有真实分组根时才允许兼容旧的
+    // “裸字段默认 ApprovalData” 规则，避免把业务字段凭空提升到 ApprovalData。
+    let isApproval = !explicitContextRoot
+        && plainApprovalShape
+        && !ctxComponentKey
+        && resolvedSourceComponent === 'ApproveTrigger';
     if (pkey.startsWith('dataResponse.') && String(meta?._upstream_component_type || '') === 'DateTrigger')
         isApproval = false;
     if (isApproval && meta && typeof meta === 'object') {
@@ -1697,17 +1727,21 @@ export function assignFlatContextDirect(paramKey, fieldLabel, sourceId, appId, f
     return result;
 }
 function directContextMeta(meta, sourceComponent, sourceRef) {
-    if (sourceComponent !== 'CustomTrigger' && sourceComponent !== 'WebHookTrigger' && sourceComponent !== 'ServerlessAction')
-        return meta;
+    // 所有动态上下文字段都必须携带 getComponentContext 回填的分组根。
+    // 之前这里只投影 CustomTrigger/WebHook/Serverless，ApproveTrigger 的
+    // FormData 字段因此在 direct mapping 分支丢失根节点，随后被旧兜底规则
+    // 序列化成 ApprovalData。
     const resolved = sourceRef?._resolvedContext && typeof sourceRef._resolvedContext === 'object'
         ? sourceRef._resolvedContext : {};
+    const specialSource = ['CustomTrigger', 'WebHookTrigger', 'ServerlessAction'].includes(sourceComponent);
+    const hasResolvedRoot = Boolean(String(resolved.tablePrimaryKey || resolved.tableKey || '').trim());
+    // 没有预检元数据时保持旧的直编兼容路径；否则普通测试/旧调用方会被
+    // 人为补成 ApproveTrigger，上下文字段也会错误地进入严格 frontId 校验。
+    if (!specialSource && !hasResolvedRoot)
+        return meta;
     return {
         ...contextMetaForReference(meta, sourceRef, sourceComponent),
         _context_component_type: sourceComponent,
-        ...(['WebHookTrigger', 'ServerlessAction'].includes(sourceComponent) ? {
-            _context_table_primary_key: String(resolved.tablePrimaryKey || resolved.tableKey || meta?._context_table_primary_key || ''),
-            _context_table_name: String(resolved.tableName || meta?._context_table_name || ''),
-        } : {}),
     };
 }
 function assignFlatEsbChild(paramKey, fieldLabel, sourceId, appId, fieldType = 'string', detailParamKey = '', detailLabel = '', workflowName = '', componentType = 'ApproveTrigger', meta = null, resolvedContext = null, basisParamKey = '', basisType = 'formSetting') {
@@ -1717,9 +1751,7 @@ function assignFlatEsbChild(paramKey, fieldLabel, sourceId, appId, fieldType = '
     const sourceComponent = String(resolved.componentType || componentType || 'ApproveTrigger');
     // EsbFormDataDto/CustSetFormDto 的依据值下级协议使用表单设置根；
     // 只有 API 已回填 tablePrimaryKey 时才采用来源组件的实际参数根。
-    const contextRoot = resolvedContextRoot(resolved, sourceComponent, sourceComponent === 'CustomTrigger'
-        ? 'SelectParams'
-        : parameterContextRoot(paramKey, sourceComponent) || 'FormData');
+    const contextRoot = resolvedContextRoot(resolved, sourceComponent);
     const sourceMeta = contextMetaForReference(meta, { paramKey, _resolvedContext: resolved }, sourceComponent);
     const rawField = resolved.rawField && typeof resolved.rawField === 'object' ? resolved.rawField : {};
     const rawDetailPk = detailParamKey || basisParamKey || (paramKey.includes('[]') ? paramKey.slice(0, paramKey.indexOf('[]')) + '[]' : '');
@@ -1779,9 +1811,7 @@ function assignFlatEsbChild(paramKey, fieldLabel, sourceId, appId, fieldType = '
 function assignBasisFormulaArgument(paramKey, fieldLabel, sourceId, appId, fieldType, basisParamKey, basisType, meta, resolvedContext = {}) {
     const fid = genSfId();
     const sourceComponent = String(resolvedContext.componentType || meta?._context_component_type || meta?._upstream_component_type || 'ApproveTrigger');
-    const contextRoot = resolvedContextRoot(resolvedContext, sourceComponent, sourceComponent === 'CustomTrigger'
-        ? 'SelectParams'
-        : parameterContextRoot(paramKey, sourceComponent) || 'FormData');
+    const contextRoot = resolvedContextRoot(resolvedContext, sourceComponent);
     const selectedParamKey = protocolParamKey(String(paramKey), contextRoot, sourceComponent);
     const selectedBasisKey = protocolParamKey(String(basisParamKey), contextRoot, sourceComponent);
     const relative = selectedParamKey.startsWith(`${selectedBasisKey}.`)
@@ -1844,8 +1874,9 @@ function assignBasisFormulaArgument(paramKey, fieldLabel, sourceId, appId, field
 function formulaIndexedWorkflowDetailArgument(paramKey, fieldLabel, sourceId, appId, fieldType = 'string', detailLabel = '', meta = {}, resolvedFrontId = '', resolvedContext = {}) {
     const fid = genSfId();
     const sourceComponent = String(resolvedContext.componentType || meta?._context_component_type || meta?._upstream_component_type || 'ApproveTrigger');
+    const contextRoot = resolvedContextRoot(resolvedContext, sourceComponent);
     const parameterRoot = (sourceComponent === 'WebHookTrigger' || sourceComponent === 'ServerlessAction')
-        ? String(resolvedContext.tablePrimaryKey || resolvedContext.tableKey || meta?._context_table_primary_key || parameterContextRoot(paramKey, sourceComponent) || '')
+        ? contextRoot
         : '';
     const normalizedParamKey = parameterRoot
         ? protocolParamKey(String(paramKey), parameterRoot, sourceComponent)
@@ -1868,7 +1899,6 @@ function formulaIndexedWorkflowDetailArgument(paramKey, fieldLabel, sourceId, ap
     index.name = '0';
     index.position = genSfId();
     index.parentId = fid;
-    const contextRoot = parameterRoot || contextRootForComponent(sourceComponent);
     const tableName = parameterRoot
         ? String(resolvedContext.tableName || meta?._context_table_name || contextRoot)
         : contextTableNameForRoot(contextRoot);