weaver-e10-builder 1.5.13 → 1.5.15

package/dist/services/actionflow/formula_service.js

@@ -500,7 +500,10 @@ function alignContextParentName(paramKey, parentName, fieldLabel, meta = null, o
  */
 function resolveFrontendMultPath(paramKey, parentName, meta = null) {
     const baseParamKey = String(meta?._context_original_param_key || paramKey || '');
-    const selectedParamKey = String(meta?._context_selected_param_key || '');
+    const selectedParamKeyRaw = String(meta?._context_selected_param_key || '');
+    const selectedParamKey = selectedParamKeyRaw
+        ? protocolParamKey(selectedParamKeyRaw, String(meta?._context_table_primary_key || ''), String(meta?._context_component_type || meta?._upstream_component_type || ''))
+        : '';
     const baseParentName = String(meta?._context_original_parent_name || parentName || '');
     const multKey = String(meta?._context_mult_key || '');
     const multName = String(meta?._context_mult_name || '');
@@ -918,20 +921,16 @@ export function buildPersonFormula(personRef, meta, appId = '', forSendMessage =
     }
     let child;
     if (ptype === 'context') {
-        const ckey = String(personRef.key || personRef.paramKey || pid || '');
-        const src = String(meta._upstream_w_id || '');
-        const wfId = String(meta._workflow_id || '');
-        const pk = resolveParamKey(wfId, ckey);
-        const ft = resolveSourceFieldType(pk, meta);
-        const disp = String(personRef.label || personRef.name || ckey);
-        let pname = String(meta._upstream_workflow_name || '');
-        if (!pname)
-            pname = String(meta._upstream_form_name || '');
-        const full = pname ? `${pname}.${disp}` : `表单数据.${disp}`;
-        const personSourceMeta = personRef._resolvedContext?.componentType === 'CustomTrigger'
-            ? { ...(meta || {}), _context_component_type: 'CustomTrigger' }
-            : meta;
-        child = assignFlatContextDirect(pk, disp, src, appId, ft, full, personSourceMeta, personRef._resolvedContext?.fieldId || personRef.frontId || personRef.fieldId);
+        // 人员只是目标字段类型，不应拥有一套独立的上下文解析规则。
+        // 与文本、日期、附件等动态赋值一样，统一交给 buildAssignBean 消费
+        // getComponentContext 回填的 _resolvedContext（尤其是 tablePrimaryKey）。
+        const contextRef = {
+            ...personRef,
+            kind: 'context',
+            paramKey: String(personRef.key || personRef.paramKey || pid || ''),
+            label: String(personRef.label || personRef.name || personRef.key || personRef.paramKey || pid || ''),
+        };
+        child = buildAssignBean(contextRef, 'person', 'string', meta, appId, String(meta._upstream_w_id || eventId || ''));
     }
     else {
         child = formulaSystemVar('{userid}');
@@ -1641,7 +1640,10 @@ export function assignFlatContextDirect(paramKey, fieldLabel, sourceId, appId, f
         ? (apiParamKey
             ? protocolParamKey(apiParamKey, parameterTable, componentType)
             : protocolParamKey(requestedPkey, parameterTable, componentType))
-        : requestedPkey.replace(/^(?:FormData|ApprovalData|SelectParams)\./, '');
+        // 所有设计器上下文根都只在 FormulaBean.value / fieldInfo 中补回。
+        // 内部路径必须先去根，否则传入 `FormData.xxx` 时会再次拼成
+        // `FormData.FormData.xxx`。这条规则对所有动态赋值共用，不区分人员。
+        : protocolParamKey(requestedPkey, contextRoot, componentType);
     const multPath = resolveFrontendMultPath(pkey, parentName || `表单数据.${fieldLabel}`, meta);
     const currentPkey = multPath.paramKey;
     const pname = alignContextParentName(currentPkey, multPath.parentName, fieldLabel, meta, { componentType });
@@ -2068,9 +2070,23 @@ export function buildSettingEntry(fieldId, assignment, fieldType = 'Text', meta
                 },
             };
         }
-        if (String(key).includes('[].') || String(key).includes('[]. ')) {
-            const workflowId = String(meta._workflow_id || '');
-            const pkeyFull = !String(key).startsWith(workflowId + '.') ? (workflowId ? `${workflowId}.${String(key)}` : String(key)) : String(key);
+        const resolvedContext = ref?._resolvedContext && typeof ref._resolvedContext === 'object'
+            ? ref._resolvedContext : {};
+        const resolvedComponentType = String(resolvedContext.componentType || sourceComponent || '').trim();
+        const resolvedTableRoot = String(resolvedContext.tablePrimaryKey || '').trim();
+        // 只有平台明确返回“表单/流程上下文 + 表单触发组件”时，才走
+        // EsbFormDataDto 的明细子字段协议。数组形状本身不能证明它是表单明细；
+        // 例如 GetDocumentInfo 的 attachmentInfos[].id 仍是 Response 上下文，
+        // 应继续走普通上下文 FormulaBean。
+        const isFormDetailContext = (['EventFormData', 'EventButton', 'TimeBatchTrigger', 'DateTrigger', 'ApproveTrigger'].includes(resolvedComponentType)
+            && ['FormData', 'ApprovalData'].includes(resolvedTableRoot));
+        if ((String(key).includes('[].') || String(key).includes('[]. ')) && isFormDetailContext) {
+            // 字段来源必须以 getComponentContext 回填的真实元数据为准，不能根据
+            // 当前 workflowId 或 `[].` 形状拼接一个表单根节点。
+            const pkeyFull = String(resolvedContext.paramKey || '').trim();
+            if (!pkeyFull || !String(resolvedContext.tablePrimaryKey || '').trim()) {
+                throw new Error(`[context] 数组字段 '${String(key)}' 缺少 getComponentContext 返回的真实 paramKey/tablePrimaryKey，拒绝推断表单明细来源`);
+            }
             const subLabel = String(label || key);
             let detailLabel = String((ref && typeof ref === 'object') ? (ref.detailLabel || ref.parentName || '') : '');
             if (!detailLabel)