weaver-e10-builder 1.5.12 → 1.5.14

package/dist/services/actionflow/runtime_metadata.js

@@ -20,6 +20,9 @@ export function findInMetadata(meta, collection, draftRef) {
 // 转换器生成 paramKey/value 时替换为 id 格式。
 const WORKFLOW_FIELD_IDS = {};
 const TARGET_FORM_FIELDS = {};
+// 条件左值专用字段索引。EnquiryForm/TimeBatchTrigger/DateTrigger 必须只使用
+// /api/ebuilder/common/ds/fields 返回的数据源字段，不能混入 getEbField 字段。
+const TARGET_DATA_SOURCE_FIELDS = {};
 const WORKFLOW_CONTEXT_FIELDS = {};
 const WORKFLOW_CONTEXT_FIELDS_BY_KEY = {};
 const TARGET_DETAIL_FIELDS = {};
@@ -27,6 +30,7 @@ const WORKFLOW_DETAIL_FIELDS = {};
 const WORKFLOW_DETAIL_NAMES = {};
 export function getWorkflowFieldIds() { return WORKFLOW_FIELD_IDS; }
 export function getTargetFormFields() { return TARGET_FORM_FIELDS; }
+export function getTargetDataSourceFields() { return TARGET_DATA_SOURCE_FIELDS; }
 export function getWorkflowContextFields() { return WORKFLOW_CONTEXT_FIELDS; }
 export function getWorkflowContextFieldsByKey() { return WORKFLOW_CONTEXT_FIELDS_BY_KEY; }
 export function getTargetDetailFields() { return TARGET_DETAIL_FIELDS; }
@@ -61,6 +65,27 @@ export function registerTargetFormFields(formId, fields) {
         index[normalized.id] = normalized;
     }
 }
+/**
+ * 替换条件左值的数据源字段索引。
+ *
+ * 与 registerTargetFormFields 分开，避免 getEbField 的字段缓存污染条件左值。
+ * 空数组也必须写入索引，表示本轮已查询但没有可用的数据源字段，禁止回退猜测。
+ */
+export function replaceTargetDataSourceFields(formId, fields) {
+    if (!formId)
+        return;
+    const index = {};
+    for (const field of fields || []) {
+        if (!field || typeof field !== 'object' || !field.id)
+            continue;
+        const normalized = { ...field };
+        normalized.id = String(field.id);
+        normalized.name ??= field.showName ?? '';
+        normalized.showName ??= field.name ?? '';
+        index[normalized.id] = normalized;
+    }
+    TARGET_DATA_SOURCE_FIELDS[String(formId)] = index;
+}
 /** 登记触发器上下文字段，保留真实 paramKey/componentKey/paramType。 */
 export function registerWorkflowContextFields(workflowId, fields) {
     if (!workflowId)

package/dist/services/actionflow/runtime_metadata.js.map

@@ -1 +1 @@
-{"version":3,"file":"runtime_metadata.js","sourceRoot":"","sources":["../../../src/services/actionflow/runtime_metadata.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"runtime_metadata.js","sourceRoot":"","sources":["../../../src/services/actionflow/runtime_metadata.ts"],"names":[],"mappings":"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"}

package/dist/services/actionflow/workflow_compiler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workflow_compiler.d.ts","sourceRoot":"","sources":["../../../src/services/actionflow/workflow_compiler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"workflow_compiler.d.ts","sourceRoot":"","sources":["../../../src/services/actionflow/workflow_compiler.ts"],"names":[],"mappings":"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"}

package/dist/services/actionflow/workflow_compiler.js

@@ -7,8 +7,8 @@ import { genSfId, normalizeNumericFrontId } from './id_generator.js';
 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 { findInMetadata, getTargetFormFields, getTargetDataSourceFields, 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, 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';
@@ -119,6 +119,11 @@ export function compileComponentData(draftParams, componentType, ctx, skipCompil
     }
     const mapping = comp.dataMapping || {};
     const result = JSON.parse(JSON.stringify(comp.defaultData || {}));
+    const hasBasisValue = Boolean(params.basisValue !== null
+        && params.basisValue !== undefined
+        && params.basisValue !== ''
+        && !(Array.isArray(params.basisValue) && params.basisValue.length === 0)
+        && !(params.basisValue && typeof params.basisValue === 'object' && Object.keys(params.basisValue).length === 0));
     for (const [draftKey, realKeysRaw] of Object.entries(mapping)) {
         const val = params[draftKey];
         if (val === null || val === undefined || val === '' || (Array.isArray(val) && val.length === 0) || (val && typeof val === 'object' && Object.keys(val).length === 0))
@@ -127,7 +132,7 @@ export function compileComponentData(draftParams, componentType, ctx, skipCompil
         for (const t of targets) {
             if (t.startsWith('_')) {
                 try {
-                    handleSpecial(draftKey, t, val, result, meta, appId, actionIndex, eventNodeId, componentType, eventName);
+                    handleSpecial(draftKey, t, val, result, meta, appId, actionIndex, eventNodeId, componentType, eventName, hasBasisValue);
                 }
                 catch (e) {
                     if (!lenient)
@@ -205,7 +210,7 @@ function normalizeEventFormDataTrigger(result, params, componentType) {
         result.triggerType = 'sequence';
 }
 // ── _handle_special ─────────────────────────────────────────
-function handleSpecial(draftKey, special, val, result, meta, appId, idx, eventId, componentType, eventName) {
+function handleSpecial(draftKey, special, val, result, meta, appId, idx, eventId, componentType, eventName, hasBasisValue = false) {
     if (special === '_person' && val && typeof val === 'object' && !Array.isArray(val)) {
         const contract = get(componentType) || {};
         const personTarget = contract.personTarget ?? 'person';
@@ -218,6 +223,13 @@ function handleSpecial(draftKey, special, val, result, meta, appId, idx, eventId
     }
     else if (special === '_updateId' || special === '_basisValueFormula') {
         if (special === '_updateId') {
+            // 普通按数据 ID 更新时，updateId 就是一个普通动态赋值。
+            // 只有配置依据值时，才需要使用依据值场景的扁平字段协议。
+            if (!hasBasisValue) {
+                result.updateId = buildFormulaReference(val, { meta, appId, eventId, componentType });
+                attachEsbAssign(result.updateId, meta, String(eventId || ''));
+                return;
+            }
             const wfId = String(meta?._workflow_id || '');
             if (val && typeof val === 'object' && (val.kind === 'context' || val.key || val.paramKey)) {
                 const key = String(val.paramKey || val.key || val.fieldKey || '');
@@ -227,10 +239,23 @@ function handleSpecial(draftKey, special, val, result, meta, appId, idx, eventId
                 if (!wfName)
                     wfName = String(meta?._upstream_form_name || '');
                 const pn = wfName ? `${wfName}.${label}` : label;
-                const sourceComponent = String(val._resolvedContext?.componentType || val.componentType || '');
-                const updateMeta = sourceComponent === 'CustomTrigger'
-                    ? { ...(meta || {}), _context_component_type: sourceComponent }
-                    : meta;
+                const sourceComponent = String(val._resolvedContext?.componentType || val.componentType || componentType || '');
+                // updateId 走 assignFlatContextDirect 的特殊分支，不能像普通
+                // formula 一样依赖外层节点 meta 推断上下文根。必须把前置
+                // getComponentContext 回填的真实根/字段身份一起传入，否则
+                // EventFormData 的 FormData 字段会在这里丢失根节点元数据。
+                const resolvedUpdateContext = val._resolvedContext && typeof val._resolvedContext === 'object'
+                    ? val._resolvedContext : {};
+                const updateMeta = {
+                    ...(meta || {}),
+                    _context_component_type: sourceComponent,
+                    ...(resolvedUpdateContext.tablePrimaryKey
+                        ? { _context_table_primary_key: String(resolvedUpdateContext.tablePrimaryKey) }
+                        : {}),
+                    ...(resolvedUpdateContext.paramKey
+                        ? { _context_original_param_key: String(resolvedUpdateContext.paramKey) }
+                        : {}),
+                };
                 result.updateId = assignFlatContextDirect(resolved, label, String(eventId || val.source || '0'), appId, 'string', pn, updateMeta, val._resolvedContext?.fieldId);
                 // esbAssign.wId 指向当前数据动作节点（设计器动态赋值定位用），与 filterInput 修复同源。
                 attachEsbAssign(result.updateId, meta, String(eventId || val.source || '0'));
@@ -318,11 +343,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 +394,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('.');
@@ -750,9 +780,18 @@ export function buildFilterInput(result, val, meta, appId, componentType = '', a
     const fctx = resolveFormCtx(result, meta, formId);
     const form = findInMetadata(meta, 'forms', { id: formId }) || {};
     const fieldIndex = {};
-    for (const f of form.fields || [])
-        fieldIndex[String(f.id || '')] = f;
-    Object.assign(fieldIndex, getTargetFormFields()[String(formId)] || {});
+    const strictDataSourceCondition = ['EnquiryForm', 'TimeBatchTrigger', 'DateTrigger'].includes(componentType);
+    if (!strictDataSourceCondition) {
+        for (const f of form.fields || [])
+            fieldIndex[String(f.id || '')] = f;
+    }
+    const targetFields = strictDataSourceCondition
+        ? getTargetDataSourceFields()[String(formId)]
+        : getTargetFormFields()[String(formId)];
+    if (strictDataSourceCondition && !targetFields) {
+        throw new Error(`${componentType}.filterCondition 未取得 /api/ebuilder/common/ds/fields 的实时字段，拒绝使用 getEbField 或其他来源生成条件左值`);
+    }
+    Object.assign(fieldIndex, targetFields || {});
     const datas = [];
     const timeStamp = String(Date.now());
     conditions.forEach((c, idx) => {
@@ -1110,11 +1149,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 +1222,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 +1254,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 +1387,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('[]')) {
@@ -1805,6 +1851,12 @@ export function convertNode(draftAction, isEvent = false, meta = null, appId = '
         if (node.data && typeof node.data === 'object')
             delete node.data.fields;
     }
+    // GetDocumentInfo 是新建动作节点。它的 data DTO 不带组件配置主键；
+    // 画布节点自身的 node.id/wId 仍用于连线，不能与 data.id 混淆。
+    // 放在所有目录/后处理之后，防止组件元数据再次注入 data.id。
+    if (nodeType === 'GetDocumentInfo' && node.data && typeof node.data === 'object') {
+        delete node.data.id;
+    }
     return node;
 }
 // ── convert_condition ───────────────────────────────────────