npm - weaver-e10-builder - Versions diffs - 1.6.15 → 1.6.16 - Mend

weaver-e10-builder 1.6.15 → 1.6.16

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (1890) hide show

package/dist/services/actionflow/formula_service.js CHANGED Viewed

@@ -2,8 +2,7 @@
  * 动态赋值的字段引用、公式树与资源对象构造。
  * 对齐 Python 版 core/formula_service.py（黄金参照）。
  */
-import { genSfId, normalizeNumericFrontId } from './id_generator.js';
-import { resolveCustomTriggerDtoId } from './custom_trigger_context.js';
+import { genSfId, requireContextFieldId } from './id_generator.js';
 import { resolveSystemParameter } from './system_params.js';
 import { findFunction } from './functions_catalog.js';
 import { getWorkflowContextFields, getWorkflowContextFieldsByKey, getWorkflowDetailNames, getTargetFormFields, findInMetadata, workflowFieldId, } from './runtime_metadata.js';
@@ -283,6 +282,7 @@ export function contextMetaForReference(meta, reference, componentType = '') {
     copy('tableName', '_context_table_name');
     copy('tableKey', '_context_table_key');
     copy('paramKey', '_context_original_param_key');
+    copy('fieldId', '_context_original_field_id');
     copy('parentName', '_context_original_parent_name');
     copy('multKey', '_context_mult_key');
     copy('multName', '_context_mult_name');
@@ -332,7 +332,7 @@ export function protocolParamKey(paramKey, root, componentType) {
         || isComponentContextRoot(root)) {
         return raw.startsWith(`${root}.`) ? raw.slice(root.length + 1) : raw;
     }
-    return raw.replace(/^(?:FormData|ApprovalData|SelectParams)\./, '');
+    return raw.replace(/^(?:FormData|ApprovalData|SelectParams|CycleParams)\./, '');
 }
 function customTriggerTables(meta) {
     return meta && Array.isArray(meta._custom_trigger_data?.tableList)
@@ -502,14 +502,6 @@ function alignContextParentName(paramKey, parentName, fieldLabel, meta = null, o
     }
     return labels.join('.');
 }
-/**
- * 对齐 context/index.tsx onClick 的循环路径组装结果。
- *
- * 前端会根据当前循环是“当次”还是“历次”决定是否把 multKey/multName
- * 拼到字段前面。后端没有浏览器 sessionStorage，因此只消费编译/预检阶段
- * 已明确写入的 effectiveMultKey；没有该信息时保留接口返回的当前字段路径，
- * 不凭空把一个当次循环改成历次循环。
- */
 function resolveFrontendMultPath(paramKey, parentName, meta = null) {
     const baseParamKey = String(meta?._context_original_param_key || paramKey || '');
     const selectedParamKeyRaw = String(meta?._context_selected_param_key || '');
@@ -543,21 +535,12 @@ function resolveFrontendMultPath(paramKey, parentName, meta = null) {
 function addContextTableKey(paramKey, meta = null) {
     const tableKey = String(meta?._context_table_key || '').replace(/\.$/, '');
     const rawKey = String(paramKey || '');
-    if (!tableKey || ['FormData', 'ApprovalData', 'SelectParams'].includes(tableKey))
+    if (!tableKey || ['FormData', 'ApprovalData', 'SelectParams', 'CycleParams'].includes(tableKey))
         return rawKey;
     if (rawKey === tableKey || rawKey.startsWith(`${tableKey}.`))
         return rawKey;
     return `${tableKey}.${rawKey}`;
 }
-function resolveCustomTriggerFormulaFrontId(paramKey, resolved = {}, meta = null) {
-    const rawKey = String(paramKey || '');
-    const tableKey = String(resolved.tableKey || meta?._context_table_key || '');
-    const lookupKey = tableKey
-        && !rawKey.startsWith(`${tableKey}.`)
-        ? `${tableKey}.${rawKey}`
-        : rawKey;
-    return resolveCustomTriggerDtoId(lookupKey, meta?._custom_trigger_data, String(resolved.dimension || meta?._context_dimension || ''));
-}
 // ── Formula 对象生成器 ───────────────────────────────────────
 function makeConfigStr(config) {
     return JSON.stringify(config);
@@ -612,7 +595,7 @@ export function formulaContext(sourceComponentId, fieldKey, opts = {}) {
         source: sourceId,
         type: '3',
         value: `${contextRoot}.${fieldKey}`,
-        frontId: normalizeNumericFrontId(opts.frontId ?? fieldKey, 'FormulaBean.frontId'),
+        frontId: requireContextFieldId(opts.frontId, 'FormulaBean.frontId'),
         paramKey: String(fieldKey),
         paramType: fieldType,
         childs: [],
@@ -639,55 +622,6 @@ export function formulaContext(sourceComponentId, fieldKey, opts = {}) {
         sortWeight: 0.0,
     };
 }
-/**
- * 多次执行组件的“当次循环”上下文。它不是 FormData：平台返回的是 CycleParams，
- * 前端也依赖 comType/isMultCom 来显示“循环(当次循环)”。
- */
-export function formulaCurrentLoopContext(sourceComponentId, fieldKey, opts = {}) {
-    const fid = genSfId();
-    const sourceId = String(sourceComponentId || '0');
-    const fieldName = String(opts.name || fieldKey);
-    const fieldType = opts.fieldType || 'int';
-    const primaryKey = 'CycleParams';
-    const valuePath = `${primaryKey}.${fieldKey}`;
-    const parentName = String(opts.parentName || `循环.${fieldName}`);
-    const rawField = opts.rawField && typeof opts.rawField === 'object' ? opts.rawField : {};
-    const renderedFieldType = ['int', 'integer', 'long', 'double', 'number'].includes(String(fieldType).toLowerCase()) ? 'number' : ftNorm(fieldType);
-    // 前端 MultipleExecution.getRequest 使用平台固定的循环根字段 ID：
-    // 逐条循环为 744564088747180033，分批循环为 744564088747180034。
-    // 这两个值不是业务字段 ID；把上游列表字段 ID 放到 root FormulaBean 的
-    // frontId 会导致设计器仍能显示，但 saveDesign 在服务端校验时返回 500。
-    const loopRootFrontId = fieldKey === 'cycle.dataDetail[]'
-        ? '744564088747180034'
-        : fieldKey === 'cycle.dataDetail'
-            ? '744564088747180033'
-            : '';
-    return {
-        // 保留 getComponentContext 的原始字段信息；编辑器用这些字段回显参数路径。
-        ...rawField,
-        formulaType: ftNorm(fieldType), name: fieldName, businessId: String(opts.businessId || '0'),
-        // 前端在点击“循环（当次循环）”时额外生成 assignId，用它区分每个
-        // 当次循环引用；缺少时编辑器只显示类型，不能回显所属组件和参数路径。
-        assignId: genSfId(), id: fid, source: sourceId, type: '3', value: valuePath,
-        frontId: normalizeNumericFrontId(opts.frontId || loopRootFrontId || rawField.id || rawField.paramId || fieldKey, '循环 FormulaBean.frontId'),
-        paramId: String(rawField.paramId || opts.frontId || rawField.id || fieldKey),
-        paramName: String(rawField.paramName || fieldName),
-        showName: String(rawField.showName || fieldName),
-        parentName, paramKey: String(fieldKey), paramType: fieldType, fieldType: renderedFieldType,
-        childs: [],
-        config: {
-            // 这是赋值目标的类型（消息标题/内容为 string），与来源字段 paramType 分开。
-            paramKey: String(fieldKey), paramType: String(opts.targetFieldType || 'string'),
-            parentName, newParentName: parentName,
-            multKey: '', multName: '',
-            multTypeObj: { allName: parentName, currentName: parentName, currentParamKey: valuePath, allParamKey: valuePath },
-            comId: sourceId, isMultCom: true, tableName: '循环参数',
-            fieldInfo: { paramKey: String(fieldKey), tablePrimaryKey: primaryKey },
-            comType: 'MultipleExecution', parentComId: '0',
-        },
-        sortWeight: 0.0,
-    };
-}
 export function formulaSystemVar(varName = '{userid}') {
     const resolved = resolveSystemParameter(varName);
     const fid = genSfId();
@@ -713,7 +647,6 @@ export function formulaContainerString(childFormulas, valuePlaceholder = '', app
         c.position ??= genSfId();
         positions.push(String(c.position));
     }
-    const requiresEditorConfig = childFormulas.some((child) => child?.config && typeof child.config === 'object' && child.config.isMultCom === true);
     const config = { paramType: 'string', switchType: 'assign', formulaVersion: 'V1' };
     return {
         configObject: { paramType: 'string', switchType: 'assign' },
@@ -723,9 +656,7 @@ export function formulaContainerString(childFormulas, valuePlaceholder = '', app
         type: '8',
         applicationId: appId,
         value: valuePlaceholder || `textarea#${positions.join('#')}#`,
-        childs: childFormulas,
-        // 循环当次引用由设计器以对象 config 回显；普通 FormulaBean 仍保留历史字符串格式。
-        config: requiresEditorConfig ? { paramType: 'string', switchType: 'assign' } : makeConfigStr(config),
+        childs: childFormulas, config: makeConfigStr(config),
         parentId: 0,
         sortWeight: 0.0,
     };
@@ -1125,7 +1056,7 @@ export function buildPersonFormula(personRef, meta, appId = '', forSendMessage =
             }
             return formulaContext(resolveContextSource(personRef, eventId), pid, {
                 name: String(personRef.name || personRef.label || pid),
-                frontId: personRef.frontId || personRef.fieldId || personRef._resolvedContext?.fieldId,
+                frontId: personRef._resolvedContext?.fieldId || personRef._resolvedContext?.rawField?.id,
                 componentType,
                 meta: contextRoot ? { ...meta, _context_table_primary_key: contextRoot } : meta,
                 requireResolvedRoot: true,
@@ -1336,35 +1267,7 @@ function buildNamedFunctionBean(ref, fieldId, fieldType, meta, appId, defaultSou
     const childs = args.map((arg, index) => {
         const resolved = resolveFunctionArgument(arg, entry.detail[index], entry.name, index);
         const child = unwrapDynamicTextarea(resolved.value, `函数 '${entry.name}' 第 ${index + 1} 个参数`);
-        let normalizedChild = child;
-        // 预检阶段会把字段上下文挂到原始引用上；函数参数经过
-        // resolveFunctionArgument/unwrapDynamicTextarea 后仍需显式保留这份
-        // CustomTrigger 元数据，否则 buildAssignBean 只能看到字段名 d/e/f，
-        // 最终把字段名错误地写入 FormulaBean.frontId。
-        if (child && typeof child === 'object' && String(child.kind || child.assignmentKind || '') === 'context') {
-            const customData = meta?._custom_trigger_data;
-            const childKey = String(child.paramKey || child.key || '');
-            if (customData && childKey) {
-                const resolvedContext = child._resolvedContext && typeof child._resolvedContext === 'object'
-                    ? child._resolvedContext : {};
-                const fieldId = String(resolvedContext.fieldId
-                    || resolveCustomTriggerDtoId(childKey, customData, 'field')
-                    || child.frontId
-                    || '');
-                normalizedChild = {
-                    ...child,
-                    componentType: String(child.componentType || 'CustomTrigger'),
-                    frontId: fieldId,
-                    _resolvedContext: {
-                        ...resolvedContext,
-                        fieldId,
-                        componentType: 'CustomTrigger',
-                        paramKey: childKey,
-                        parentName: String(resolvedContext.parentName || child.parentName || ''),
-                    },
-                };
-            }
-        }
+        const normalizedChild = child;
         const argumentFieldType = [
             resolved.fieldType,
             child?.fieldType,
@@ -1376,56 +1279,6 @@ function buildNamedFunctionBean(ref, fieldId, fieldType, meta, appId, defaultSou
     });
     return formulaFunction(entry.id, entry.name, childs, formulaType, entry.excelFunc, entry.category || entry.resultType, entry.detail, appId, entry.paramSize);
 }
-/**
- * 把循环当前项的业务字段还原为上游列表的带索引上下文。
- * CustomTrigger 的列表数据来自 SelectParams，不能复用 EnquiryForm 的
- * query_result（FormData）；其他来源也沿用各自的上下文根节点。
- */
-function buildIndexedSourceContextFormula(sourceParamKey, fieldLabel, sourceId, appId, fieldType, resolved, meta) {
-    const marker = sourceParamKey.indexOf('[]');
-    if (marker < 0)
-        throw new Error(`[context] 循环列表来源 paramKey 缺少 []: ${sourceParamKey}`);
-    const componentType = String(resolved.sourceComponentType || resolved.componentType || 'EventFormData');
-    const contextRoot = String(resolved.sourceTablePrimaryKey || contextRootForComponent(componentType));
-    const tableName = String(resolved.sourceTableName || contextTableNameForRoot(contextRoot));
-    const position = genSfId();
-    const indexedParamKey = `${sourceParamKey.slice(0, marker)}[${position}]${sourceParamKey.slice(marker + 2)}`;
-    const rawField = resolved.rawField && typeof resolved.rawField === 'object' ? resolved.rawField : {};
-    const label = String(resolved.label || fieldLabel || rawField.showName || rawField.paramName || sourceParamKey);
-    const parentName = alignContextParentName(sourceParamKey, resolved.parentName || `${tableName}.${label}`, label, meta, { componentType });
-    const frontIdCandidate = componentType === 'CustomTrigger'
-        ? resolveCustomTriggerFormulaFrontId(sourceParamKey, resolved, meta)
-        : (resolved.fieldId ?? rawField.id ?? rawField.paramId ?? '');
-    const frontId = normalizeNumericFrontId(frontIdCandidate, '循环当前项上下文 FormulaBean.frontId');
-    const child = formulaFixed('0', 'string');
-    child.name = '0';
-    child.position = position;
-    const flat = {
-        ...rawField,
-        formulaType: ftNorm(fieldType), name: label, parentName,
-        businessId: appId || '', id: genSfId(), source: String(sourceId || '0'), type: '3',
-        value: `${contextRoot}.${indexedParamKey}`, frontId,
-        paramKey: sourceParamKey, paramType: fieldType, fieldType: ftNorm(fieldType),
-        childs: [child], parentId: '0',
-        config: {
-            paramKey: sourceParamKey, isMultCom: false, comType: componentType,
-            switchType: 'assign', parentComId: 0, formulaVersion: 'V1',
-            fieldInfo: { paramKey: sourceParamKey, tablePrimaryKey: contextRoot },
-            tableName, paramType: ftNorm(fieldType), parentName,
-            multName: '', multKey: '',
-            multTypeObj: {
-                allName: parentName, currentName: parentName,
-                currentParamKey: `${contextRoot}.${indexedParamKey}`,
-                allParamKey: `${contextRoot}.${sourceParamKey}`,
-            },
-            comId: String(sourceId || '0'), newParentName: parentName,
-        },
-    };
-    child.parentId = flat.id;
-    child.position = position;
-    attachEsbAssign(flat, meta, String(sourceId || '0'));
-    return flat;
-}
 export function buildAssignBean(raw, fieldId, fieldType, meta, appId, defaultSourceId = '') {
     if (!meta || typeof meta !== 'object')
         meta = {};
@@ -1449,56 +1302,12 @@ export function buildAssignBean(raw, fieldId, fieldType, meta, appId, defaultSou
         const label = src && typeof src === 'object' ? (src.label ?? src.name ?? key) : key;
         const sourceComponent = String(src?._resolvedContext?.componentType || src?.componentType || meta?._context_component_type || meta?._upstream_component_type || 'ApproveTrigger');
         key = normalizeContextParamKey(key, sourceComponent);
-        const isCurrentLoop = src && typeof src === 'object' && (String(src.scope ?? src.contextScope ?? '') === 'current_loop' ||
-            String(src.componentType ?? '') === 'MultipleExecution');
-        if (isCurrentLoop) {
-            if (!sourceId)
-                throw new Error('[context] 当次循环引用缺少所属循环 source');
-            const resolved = src._resolvedContext && typeof src._resolvedContext === 'object' ? src._resolvedContext : {};
-            // 循环中的业务字段要保留上游列表来源和索引位置。只有循环控制字段
-            // （例如 hasCycled）使用 CycleParams；把业务字段直接写成
-            // CycleParams.cycle.dataDetail 会让设计器丢失“数据源查询/字段”层级。
-            const sourceParamKey = String(resolved.sourceParamKey || '');
-            const sourceComponentId = String(resolved.sourceComponentId || '');
-            const listMarker = sourceParamKey.indexOf('[]');
-            if (sourceParamKey && sourceComponentId && listMarker >= 0) {
-                const sourceComponentType = String(resolved.sourceComponentType || resolved.sourceComponent || '');
-                if (sourceComponentType === 'CustomTrigger') {
-                    const sourceBean = buildIndexedSourceContextFormula(sourceParamKey, String(resolved.label ?? label), sourceComponentId, appId, String(resolved.fieldType ?? src.fieldType ?? src.valueType ?? fieldType), resolved, meta);
-                    return sourceBean;
-                }
-                const formId = sourceParamKey.slice(0, listMarker);
-                const sourceFieldKey = sourceParamKey.slice(listMarker + 2).replace(/^\./, '');
-                if (formId && sourceFieldKey) {
-                    const queryBean = buildAssignBean({
-                        kind: 'query_result', formId, fieldId: sourceFieldKey,
-                        source: sourceComponentId, label: String(resolved.label ?? label),
-                        valueType: String(resolved.fieldType ?? src.fieldType ?? src.valueType ?? fieldType),
-                        componentKey: resolved.rawField?.componentKey,
-                        componentName: resolved.rawField?.componentName,
-                        componentType: resolved.rawField?.componentType,
-                        description: resolved.rawField?.description,
-                        _resolvedContext: {
-                            fieldId: String(resolved.rawField?.id || resolved.fieldId || sourceFieldKey),
-                            label: String(resolved.label ?? label),
-                            rawField: resolved.rawField,
-                        },
-                    }, fieldId, fieldType, meta, appId, defaultSourceId);
-                    return queryBean;
-                }
-            }
-            return formulaCurrentLoopContext(String(sourceId), String(key), {
-                name: String(resolved.label ?? label), businessId: appId,
-                fieldType: String(resolved.fieldType ?? src.fieldType ?? src.valueType ?? 'int'),
-                frontId: String(resolved.fieldId ?? src.frontId ?? key),
-                parentName: String(resolved.parentName ?? `循环.${resolved.label ?? label}`),
-                rawField: resolved.rawField,
-                targetFieldType: fieldType,
-            });
-        }
         const wfId = String(meta._workflow_id || '');
         const resolvedKey = resolveParamKey(wfId, String(key));
         const resolved = src && typeof src._resolvedContext === 'object' ? src._resolvedContext : {};
+        if (sourceComponent === 'MultipleExecution' && (!resolved.fieldId || resolved.tablePrimaryKey !== 'CycleParams')) {
+            throw new Error(`[context] 循环字段 '${String(key)}' 缺少循环组件上下文返回的真实字段 ID 或分组`);
+        }
         const resolvedFieldTypeCandidate = [
             resolved.fieldType,
             resolved.rawField?.paramType,
@@ -1512,7 +1321,7 @@ export function buildAssignBean(raw, fieldId, fieldType, meta, appId, defaultSou
         const sourceFieldType = resolvedFieldType || resolveSourceFieldType(resolvedKey, meta) || 'string';
         // 批量新增的普通字段映射与函数参数使用不同的前端协议：前者是 type=10/sub，
         // 而函数里的明细字段必须是带索引子节点的 type=3 上下文引用。
-        if (resolvedKey.includes('[].')) {
+        if (resolvedKey.includes('[].') && sourceComponent !== 'MultipleExecution') {
             const detailLabel = String(src?.detailLabel || src?.parentName || '');
             const workflowName = String(meta._upstream_workflow_name || '');
             if (src?._formulaArgument) {
@@ -1524,11 +1333,9 @@ export function buildAssignBean(raw, fieldId, fieldType, meta, appId, defaultSou
                 // 查询结果是一层数组（formId[].fieldId），不能套用流程明细的
                 // workflowId.detailId[].fieldId 解析器。
                 if (/^[^\.\[]+\[\]\.[^\.\[]+$/.test(resolvedKey)) {
-                    return formulaIndexedQueryResultArgument(resolvedKey, String(label), String(sourceId), appId, String(sourceFieldType || fieldType || 'string'), detailLabel || '表单数据');
+                    return formulaIndexedQueryResultArgument(resolvedKey, String(label), String(sourceId), appId, String(sourceFieldType || fieldType || 'string'), detailLabel || '表单数据', resolved.fieldId || resolved.rawField?.id);
                 }
-                return formulaIndexedWorkflowDetailArgument(resolvedKey, String(label), String(sourceId), appId, String(sourceFieldType || fieldType || 'string'), detailLabel, contextMetaForReference(meta, src, sourceComponent), sourceComponent === 'CustomTrigger'
-                    ? String(resolved.fieldId || resolveCustomTriggerFormulaFrontId(resolvedKey, resolved, meta))
-                    : src?._resolvedContext?.fieldId, resolved);
+                return formulaIndexedWorkflowDetailArgument(resolvedKey, String(label), String(sourceId), appId, String(sourceFieldType || fieldType || 'string'), detailLabel, contextMetaForReference(meta, src, sourceComponent), resolved.fieldId || resolved.rawField?.id, resolved);
             }
             const child = assignFlatEsbChild(resolvedKey, String(label), String(sourceId), appId, String(sourceFieldType || fieldType || 'string'), undefined, detailLabel, workflowName, sourceComponent, contextMetaForReference(meta, src, sourceComponent), resolved, String(src?.basisParamKey || src?.basisValue?.paramKey || ''), String(src?.basisType || src?.config?.basisType || 'formSetting'));
             attachEsbAssign(child, meta, String(sourceId));
@@ -1558,7 +1365,9 @@ export function buildAssignBean(raw, fieldId, fieldType, meta, appId, defaultSou
         };
         const sourceName = String(resolved.parentName || meta._upstream_workflow_name || meta._upstream_form_name || '');
         const parentName = sourceName
-            ? (sourceName.endsWith(`.${String(label)}`) ? sourceName : `${sourceName}.${String(label)}`)
+            ? (sourceName === String(label) || sourceName === `${String(label)}[]`
+                || sourceName.endsWith(`.${String(label)}`) || sourceName.endsWith(`.${String(label)}[]`)
+                ? sourceName : `${sourceName}.${String(label)}`)
             : `表单数据.${String(label)}`;
         const multPath = resolveFrontendMultPath(String(key || resolvedKey), parentName, sourceMeta);
         sourceMeta._context_original_param_key = String(resolved.paramKey || resolvedKey);
@@ -1612,10 +1421,10 @@ export function buildAssignBean(raw, fieldId, fieldType, meta, appId, defaultSou
         const label = String(resolved.label ?? rawField.showName ?? rawField.paramName ?? ref?.label ?? queryFieldId);
         const parentName = String(resolved.parentName ?? ref?.parentName ?? `${ref?.tableName ?? '表单数据'}[].${label}`);
         const position = genSfId();
-        const realFieldId = resolved.fieldId ?? ref?.frontId;
+        const realFieldId = resolved.fieldId ?? rawField.id;
         if (realFieldId == null || String(realFieldId).trim() === '')
             throw new Error('[query_result] 缺少 getComponentContext 返回的字段 ID，无法生成 frontId');
-        const contextFieldInstanceId = normalizeNumericFrontId(realFieldId, '查询结果 FormulaBean.frontId');
+        const contextFieldInstanceId = requireContextFieldId(realFieldId, '查询结果 FormulaBean.frontId');
         const child = formulaFixed(String(index), 'string');
         child.name = String(index);
         child.position = position;
@@ -1808,19 +1617,12 @@ export function assignFlatContext(paramKey, fieldLabel, sourceId, appId, fieldTy
         parentName: alignedParentName, tempFormulaId: tempFormulaId || '',
     };
 }
-function assignFlatHttpContext(paramKey, fieldLabel, sourceId, appId, fieldType = 'string', parentName = '', tablePrimaryKey = 'responseBody', meta = null) {
+function assignFlatHttpContext(paramKey, fieldLabel, sourceId, appId, fieldType = 'string', parentName = '', tablePrimaryKey = 'responseBody', meta = null, resolvedFrontId = '') {
     const fid = genSfId();
     const key = String(paramKey);
     const table = String(tablePrimaryKey);
     const value = `${table}.${key}`;
     const pname = String(parentName || `响应数据.${fieldLabel}`);
-    const tail = key.includes('.') ? key.slice(key.lastIndexOf('.') + 1) : key;
-    const responseFields = meta && typeof meta === 'object' && meta._http_response_fields && typeof meta._http_response_fields === 'object'
-        ? meta._http_response_fields : {};
-    const sourceKey = String(sourceId || '');
-    const fieldMeta = responseFields[`${sourceKey}|${table}.${key}`]
-        || responseFields[`${sourceKey}|${key}`]
-        || responseFields[`${sourceKey}|${tail}`];
     return {
         formulaType: fieldType,
         name: String(fieldLabel),
@@ -1829,10 +1631,8 @@ function assignFlatHttpContext(paramKey, fieldLabel, sourceId, appId, fieldType
         source: String(sourceId) || '0',
         type: '3',
         value,
-        // 前端上下文项的 frontId 是响应参数行真实 id，不是 paramKey 尾段。
-        // 只有实时接口详情没有该行 id 时才退回尾段，避免把跨 HTTP 动态赋值
-        // 保存成“看似有值但平台无法定位”的公式。
-        frontId: normalizeNumericFrontId(fieldMeta?.id || fieldMeta?.frontId || tail, 'HTTP 响应 FormulaBean.frontId'),
+        // 前端上下文项的 frontId 是响应参数行真实 id。
+        frontId: requireContextFieldId(resolvedFrontId || meta?._context_original_field_id, 'HTTP 响应 FormulaBean.frontId'),
         paramKey: key,
         parentName: pname,
         childs: [],
@@ -1861,7 +1661,7 @@ export function assignFlatContextDirect(paramKey, fieldLabel, sourceId, appId, f
     const requestedPkey = String(paramKey);
     const httpMatch = requestedPkey.match(/^(responseBody|responseHeader|responseCookie|URL)\.(.+)$/);
     if (httpMatch) {
-        return assignFlatHttpContext(httpMatch[2], fieldLabel, src, appId, fieldType, parentName, httpMatch[1], meta);
+        return assignFlatHttpContext(httpMatch[2], fieldLabel, src, appId, fieldType, parentName, httpMatch[1], meta, resolvedFrontId);
     }
     const componentType = String(meta?._context_component_type || meta?._upstream_component_type || '');
     const explicitContextRoot = String(meta?._context_table_primary_key || '').trim();
@@ -1888,20 +1688,15 @@ export function assignFlatContextDirect(paramKey, fieldLabel, sourceId, appId, f
     const pname = alignContextParentName(currentPkey, multPath.parentName, fieldLabel, meta, { componentType });
     const tail = pkey.includes('.') ? pkey.slice(pkey.lastIndexOf('.') + 1).replace(/\[\]$/, '') : pkey.replace(/\[\]$/, '');
     const plainApprovalShape = !/^\d+$/.test(tail) && !pkey.includes('[].') && !pkey.includes('[]. ');
-    let frontId = '';
     let ctxComponentKey = '';
     const wfId = String(meta?._workflow_id || meta?._event_form_id || '');
     const ctxFields = wfId ? (getWorkflowContextFields()[wfId] || {}) : {};
-    const pkeyTail = currentPkey.includes('.') ? currentPkey.slice(currentPkey.lastIndexOf('.') + 1).replace(/\[\]$/, '') : currentPkey.replace(/\[\]$/, '');
     for (const field of Object.values(ctxFields)) {
         if (!field || typeof field !== 'object')
             continue;
         const candidate = String(field.paramKey || '');
-        const candTail = candidate.includes('.') ? candidate.slice(candidate.lastIndexOf('.') + 1).replace(/\[\]$/, '') : candidate.replace(/\[\]$/, '');
-        if (candidate !== currentPkey && candTail !== pkeyTail)
+        if (candidate !== currentPkey)
             continue;
-        if (String(field.id || ''))
-            frontId = String(field.id);
         ctxComponentKey = String(field.componentKey || '');
         break;
     }
@@ -1924,17 +1719,9 @@ export function assignFlatContextDirect(paramKey, fieldLabel, sourceId, appId, f
         if (formId && pkeyHead === formId)
             isApproval = false;
     }
-    // frontId 必须 = 字段 id（paramKey 尾段），设计器用它在字段浏览器里定位字段；
-    // 清空会导致设计器「动态赋值」找不到字段标红（真机验证 2026-08-19，场景12）。
-    const customFrontId = resolvedSourceComponent === 'CustomTrigger'
-        ? resolveCustomTriggerDtoId(addContextTableKey(currentPkey, meta), meta?._custom_trigger_data, String(meta?._context_dimension || ''))
-        : '';
-    const frontIdCandidate = resolvedSourceComponent === 'CustomTrigger'
-        // CustomTrigger 的 frontId 只能来自触发器 customData.tableList。
-        // 接口字段 id、paramKey 尾段和外部传入的临时 frontId 都不能兜底。
-        ? customFrontId
-        : (resolvedFrontId || frontId || pkeyTail);
-    frontId = normalizeNumericFrontId(frontIdCandidate, '上下文 FormulaBean.frontId');
+    // frontId 来自选中的真实上下文字段，不能由 paramKey 尾段推导。
+    const frontIdCandidate = resolvedFrontId || meta?._context_original_field_id;
+    const frontId = requireContextFieldId(frontIdCandidate, '上下文 FormulaBean.frontId');
     const prefix = isApproval ? 'ApprovalData' : (resolvedSourceComponent === 'CustomTrigger' ? 'SelectParams' : contextRoot);
     const valuePrefix = parameterContext ? '' : `${prefix}.`;
     const tableName = String(meta?._context_table_name || (parameterContext ? parameterTable : contextTableNameForRoot(prefix)));
@@ -2019,6 +1806,9 @@ function assignFlatEsbChild(paramKey, fieldLabel, sourceId, appId, fieldType = '
     const apiParamKey = String(resolved.paramKey
         || sourceMeta._context_original_param_key
         || protocolParamKey(paramKey, contextRoot, sourceComponent));
+    // Basis.onRowClick 使用选中下级的 originalId（上下文 ParamBean.id）。
+    const basisFrontId = requireContextFieldId(resolved.fieldId
+        || resolved.rawField?.id, '依据值下级 config.frontId');
     return {
         id: fid, name: String(fieldLabel), value: subId, type: '10', fieldType, formulaType: fieldType,
         paramType: fieldType,
@@ -2026,6 +1816,7 @@ function assignFlatEsbChild(paramKey, fieldLabel, sourceId, appId, fieldType = '
         config: {
             paramKey: apiParamKey, basisType: String(basisType || 'formSetting'), switchType: 'sub', level: 1,
             id: subId, source: src, formulaVersion: 'V1', value: detailVal,
+            ...(basisType === 'formSetting' ? { frontId: basisFrontId } : {}),
             config: {
                 paramKey: path.paramKey, isMultCom: Boolean(resolved.isMultCom), comType: sourceComponent, switchType: 'assign', parentComId: 0,
                 fieldInfo: { paramKey: detailPk, tablePrimaryKey: contextRoot },
@@ -2069,10 +1860,8 @@ function assignBasisFormulaArgument(paramKey, fieldLabel, sourceId, appId, field
     const parentName = String(resolvedContext.parentName
         || meta?._context_original_parent_name
         || fieldLabel);
-    const fieldId = String(resolvedContext.fieldId
-        || resolvedContext.rawField?.id
-        || resolvedContext.rawField?.paramId
-        || '');
+    const fieldId = requireContextFieldId(resolvedContext.fieldId
+        || resolvedContext.rawField?.id, '依据值下级 FormulaBean.frontId');
     const multKey = String(resolvedContext.multKey || meta?._context_mult_key || '');
     const comId = String(resolvedContext.comId || meta?._context_com_id || sourceId || '0');
     return {
@@ -2084,7 +1873,9 @@ function assignBasisFormulaArgument(paramKey, fieldLabel, sourceId, appId, field
         formulaType: fieldType,
         paramType: fieldType,
         applicationId: appId || '',
-        frontId: fieldId ? normalizeNumericFrontId(fieldId, '依据值下级 FormulaBean.frontId') : undefined,
+        ...(basisType !== 'formSetting' && fieldId
+            ? { frontId: requireContextFieldId(fieldId, '依据值下级 FormulaBean.frontId') }
+            : {}),
         config: {
             basisType: String(basisType || 'formSetting'),
             paramKey: selectedParamKey,
@@ -2154,7 +1945,7 @@ function formulaIndexedWorkflowDetailArgument(paramKey, fieldLabel, sourceId, ap
         type: '3',
         applicationId: appId || '',
         value: contextValue,
-        frontId: normalizeNumericFrontId(sourceComponent === 'CustomTrigger' ? resolvedFrontId : (resolvedFrontId || detailFieldId), '流程明细 FormulaBean.frontId'),
+        frontId: requireContextFieldId(resolvedFrontId, '流程明细 FormulaBean.frontId'),
         paramKey: normalizedParamKey,
         parentName,
         childs: [index],
@@ -2184,7 +1975,7 @@ function formulaIndexedWorkflowDetailArgument(paramKey, fieldLabel, sourceId, ap
     };
 }
 /** 查询结果数组字段作为函数参数时的设计器 FormulaBean。 */
-function formulaIndexedQueryResultArgument(paramKey, fieldLabel, sourceId, appId, fieldType = 'string', tableLabel = '表单数据') {
+function formulaIndexedQueryResultArgument(paramKey, fieldLabel, sourceId, appId, fieldType = 'string', tableLabel = '表单数据', resolvedFieldId = '') {
     const fid = genSfId();
     const match = String(paramKey).match(/^([^\.\[]+)\[\]\.([^\.\[]+)$/);
     if (!match)
@@ -2205,7 +1996,7 @@ function formulaIndexedQueryResultArgument(paramKey, fieldLabel, sourceId, appId
         type: '3',
         applicationId: appId || '',
         value,
-        frontId: normalizeNumericFrontId(fieldId, '查询结果明细 FormulaBean.frontId'),
+        frontId: requireContextFieldId(resolvedFieldId, '查询结果明细 FormulaBean.frontId'),
         paramKey: String(paramKey),
         parentName,
         childs: [index],
@@ -2291,24 +2082,11 @@ export function buildSettingEntry(fieldId, assignment, fieldType = 'Text', meta
         const src = resolveContextSource(ref, defaultSourceId);
         const sourceComponent = String(ref?._resolvedContext?.componentType || ref?.componentType || meta?._context_component_type || meta?._upstream_component_type || 'ApproveTrigger');
         key = normalizeContextParamKey(key, sourceComponent);
-        // 循环体内的上下文不是普通表单数据。设计器会把它保存为
-        // CycleParams.<paramKey>，并要求 comType/isMultCom 指向 MultipleExecution；
-        // 如果继续走下面的 direct/nested 分支，回读时会错误变成 FormData.<paramKey>。
-        const isCurrentLoop = ref && typeof ref === 'object' && (String(ref.scope ?? ref.contextScope ?? '') === 'current_loop' ||
-            String(ref.componentType ?? '') === 'MultipleExecution');
-        if (isCurrentLoop) {
-            flat = buildAssignBean({ ...ref, kind: 'context', source: src }, fieldId, fieldType, meta, appId, defaultSourceId);
-            switchT = 'assign';
-            return {
-                formFieldKey: '',
-                value: {
-                    original: false, operate, switchType: switchT, fieldKey: String(fieldId), assignType: '',
-                    fieldType, assignId: String(flat.id || assignId), multiSelect: false, assign: flat,
-                },
-            };
-        }
         const resolvedContext = ref?._resolvedContext && typeof ref._resolvedContext === 'object'
             ? ref._resolvedContext : {};
+        if (sourceComponent === 'MultipleExecution' && (!resolvedContext.fieldId || resolvedContext.tablePrimaryKey !== 'CycleParams')) {
+            throw new Error(`[context] 循环字段 '${String(key)}' 缺少循环组件上下文返回的真实字段 ID 或分组`);
+        }
         const resolvedComponentType = String(resolvedContext.componentType || sourceComponent || '').trim();
         const resolvedTableRoot = String(resolvedContext.tablePrimaryKey || '').trim();
         const basisParamKey = String(ref?.basisParamKey || ref?.basisValue?.paramKey || '').trim();
@@ -2370,7 +2148,7 @@ export function buildSettingEntry(fieldId, assignment, fieldType = 'Text', meta
             const workflowId = String(meta._workflow_id || '');
             const paramKeyFull = resolveParamKey(workflowId, String(key));
             const directMeta = directContextMeta(meta, sourceComponent, ref);
-            flat = assignFlatContextDirect(paramKeyFull, String(label || key), String(src), appId, ft, String(meta._upstream_workflow_name || ''), directMeta, ref?._resolvedContext?.fieldId || ref?.frontId || ref?.fieldId);
+            flat = assignFlatContextDirect(paramKeyFull, String(label || key), String(src), appId, ft, String(meta._upstream_workflow_name || ''), directMeta, ref?._resolvedContext?.fieldId || ref?._resolvedContext?.rawField?.id);
             switchT = 'assign';
         }
         else if (assignmentMode === 'nested' && operate === 'OPERATE_EQUAL') {
@@ -2417,7 +2195,7 @@ export function buildSettingEntry(fieldId, assignment, fieldType = 'Text', meta
                     else
                         directParent = `表单数据.${label || key}`;
                     const directMeta = directContextMeta(meta, sourceComponent, ref);
-                    flat = assignFlatContextDirect(pkey, String(label || key), String(src), appId, ft, directParent, directMeta, ref?._resolvedContext?.fieldId || ref?.frontId || ref?.fieldId);
+                    flat = assignFlatContextDirect(pkey, String(label || key), String(src), appId, ft, directParent, directMeta, ref?._resolvedContext?.fieldId || ref?._resolvedContext?.rawField?.id);
                     switchT = 'assign';
                 }
                 else {
@@ -2437,7 +2215,7 @@ export function buildSettingEntry(fieldId, assignment, fieldType = 'Text', meta
                 srcName = String(meta._upstream_form_name || '');
             const directParent = srcName ? `${srcName}.${label || key}` : `表单数据.${label || key}`;
             const directMeta = directContextMeta(meta, sourceComponent, ref);
-            flat = assignFlatContextDirect(pkey, String(label || key), String(src), appId, ft, directParent, directMeta, ref?._resolvedContext?.fieldId || ref?.frontId || ref?.fieldId);
+            flat = assignFlatContextDirect(pkey, String(label || key), String(src), appId, ft, directParent, directMeta, ref?._resolvedContext?.fieldId || ref?._resolvedContext?.rawField?.id);
             switchT = 'assign';
         }
     }
@@ -2528,4 +2306,3 @@ export function buildSettingEntry(fieldId, assignment, fieldType = 'Text', meta
         },
     };
 }
-//# sourceMappingURL=formula_service.js.map

package/dist/services/actionflow/functions_catalog.js CHANGED Viewed

@@ -11195,4 +11195,3 @@ export function findFunction(name, registry = FUNCTION_REGISTRY) {
     const key = String(name || "").toUpperCase();
     return registry.find((f) => f.name.toUpperCase() === key);
 }
-//# sourceMappingURL=functions_catalog.js.map

package/dist/services/actionflow/functions_source.js CHANGED Viewed

@@ -50,4 +50,3 @@ export function collectRequestedFunctionNames(value, out = new Set()) {
     }
     return [...out];
 }
-//# sourceMappingURL=functions_source.js.map

package/dist/services/actionflow/generation_service.js CHANGED Viewed

@@ -28,6 +28,10 @@ export function applicationInitContext(plan) {
     const event = plan.event || {};
     const params = event.params || {};
     const eventType = String(event.type || '');
+    // 定时器不自带表单来源；显式指定业务应用时，仍需挂到该应用的动作流列表。
+    if (eventType === 'SimpleScheduler' && plan.businessAppId) {
+        return { module: 'ebuilder', appSources: [{ module: 'ebuilder', businessObject: 'AppType', businessValue: String(plan.businessAppId) }] };
+    }
     // e-builder 表单触发的动作流应出现在对应应用详情的“ESB”页签。
     // 旧逻辑仅处理流程触发，导致定时批量/日期/表单事件虽能保存却丢失所属应用关联。
     if (['TimeBatchTrigger', 'DateTrigger', 'EventFormData', 'EventButton'].includes(eventType)) {
@@ -218,7 +222,7 @@ async function cleanupDuplicateGeneratedApplications(client, appId, marker) {
     }
 }
 export async function runGenerate(payload, client) {
-    const mode = payload.mode === 'stash' ? 'stash' : 'publish';
+    const mode = payload.mode === 'stash' ? 'stash' : payload.mode === 'disabled' ? 'disabled' : 'publish';
     let plan;
     try {
         plan = loadPlan(payload);
@@ -385,22 +389,16 @@ export async function runGenerate(payload, client) {
             message: '资源解析后的动作流预检未通过，未保存动作流；已回收本次动作流应用', ...cleanup,
         };
     }
-    // 6.0 读取当前租户的设计器组件目录。不能用本地固定 originId：手工添加
-    // MultipleExecution 时前端会把目录项写回节点，缺失后循环内部的条件编辑无法保存。
+    // 6.0 读取当前租户的设计器组件目录。
     try {
         const catalogResponse = await getComponentsForDesign(client);
         const catalogData = catalogResponse?.data ?? catalogResponse;
         const componentOptions = flattenComponentOptions(catalogData);
-        // 目前 MultipleExecution 已由真机证实必须使用目录壳；其他历史组件仍保留
-        // 兼容的后端 DTO 路径，目录暂时缺项不应阻塞它们的生成。
-        const requiredTypes = collectActionTypes(enrichedPlan.actions || [])
-            .filter((type) => type === 'MultipleExecution');
-        const missing = [...new Set(requiredTypes.filter((type) => !componentOptions[type]))];
-        if (missing.length) {
+        if (collectActionTypes(enrichedPlan.actions || []).includes('MultipleExecution') && !componentOptions.MultipleExecution) {
             return {
                 valid: false,
-                errors: [`当前租户设计器目录未返回组件: ${missing.join(', ')}`],
-                message: '组件目录预检失败，未生成可能无法编辑的动作流',
+                errors: ['当前租户设计器目录未返回循环组件'],
+                message: '组件目录预检失败，未生成动作流',
                 ...(await recycleFailedNewApplication(client, appId, appName)),
             };
         }
@@ -460,7 +458,7 @@ export async function runGenerate(payload, client) {
             workflowUrl: saved.workflowUrl,
             errors: saved.readBack.issues || ['保存后回读校验失败'],
             warnings: saved.readBack.unverified,
-            message: `${mode === 'stash' ? '暂存' : '保存并启用'}成功，但正式回读未通过；动作流已保留，请人工核验`,
+            message: `${mode === 'stash' ? '暂存' : mode === 'disabled' ? '保存（不启用）' : '保存并启用'}成功，但正式回读未通过；动作流已保留，请人工核验`,
             readBack: saved.readBack, readBackVerified: false, design,
         };
     }
@@ -535,4 +533,3 @@ function collectActionTypes(actions, out = []) {
     }
     return out;
 }
-//# sourceMappingURL=generation_service.js.map