weaver-e10-builder 1.0.10-beta → 1.0.11-beta

package/dist/services/actionflow/workflow_compiler.js

@@ -7,7 +7,7 @@ import { genSfId } from './id_generator.js';
 import fs from 'node:fs';
 import { get, getCompiler, getNodePost } from './components/index.js';
 import { findInMetadata, getTargetFormFields, getWorkflowDetailNames, getTargetDetailFields, getWorkflowDetailFields, getWorkflowFieldIds, workflowFieldId, getWorkflowContextFields, getWorkflowContextFieldsByKey } from './runtime_metadata.js';
-import { buildPersonFormula, buildSettingEntry, attachEsbAssign, resolveEnumConstant, resolveParamKey, resolveSourceFieldLabel, resolveSourceFieldType, normalizeConstantAssignment, lookupTargetFieldMeta, formulaFixedForAssignSwitch, formulaSystemVar, formulaContext, assignFlatContext, assignFlatContextDirect, getFormulaFn, formulaFunction, } from './formula_service.js';
+import { buildPersonFormula, buildSettingEntry, buildAssignBean, attachEsbAssign, resolveEnumConstant, resolveParamKey, resolveSourceFieldLabel, resolveSourceFieldType, normalizeConstantAssignment, lookupTargetFieldMeta, formulaFixedForAssignSwitch, formulaSystemVar, formulaContext, assignFlatContext, assignFlatContextDirect, getFormulaFn, formulaFunction, } from './formula_service.js';
 import { buildFormulaReference, buildUpdateFieldCondition } from './components/action_eb_update_compiler.js';
 import { resolveSystemParameter, isDateSystemParameter } from './system_params.js';
 import { conditionFieldFamily, filterFieldType, normalizeFilterOperator, conditionOperatorOverride, resolveFormCtx, buildFilterContextFormula, } from './filter_rules.js';
@@ -264,6 +264,9 @@ function handleSpecial(draftKey, special, val, result, meta, appId, idx, eventId
                 const rawSystem = val.systemValue || val.key;
                 result.requestName = formulaSystemVar(rawSystem);
             }
+            else if (String(val.kind || val.assignmentKind || '') === 'function') {
+                result.requestName = buildAssignBean(val, 'requestName', String(val.fieldType || val.valueType || 'string'), meta, appId, String(eventId || ''));
+            }
             else {
                 const wfId = String(meta?._workflow_id || '');
                 const rqKey = resolveParamKey(wfId, String(val.key ?? val.value ?? ''));
@@ -414,7 +417,28 @@ export function fillSetting(result, updates, mapping, constants, formula, meta,
                 const refKey = String(targetFieldId.paramKey || sourceKey);
                 const refLabel = String(targetFieldId.label || resolveSourceFieldLabel(refKey, meta, String(sourceKey)));
                 const refDetail = String(targetFieldId.detailLabel || '');
-                const assignment = { kind: 'context', paramKey: refKey, label: refLabel };
+                const assignment = {
+                    ...(targetFieldId.assignment && typeof targetFieldId.assignment === 'object' ? targetFieldId.assignment : {}),
+                    kind: String(targetFieldId.kind || targetFieldId.assignmentKind || 'context'),
+                    paramKey: refKey,
+                    label: refLabel,
+                };
+                if (targetFieldId.source !== undefined)
+                    assignment.source = targetFieldId.source;
+                if (targetFieldId.comId !== undefined)
+                    assignment.comId = targetFieldId.comId;
+                if (targetFieldId.formId !== undefined)
+                    assignment.formId = targetFieldId.formId;
+                if (targetFieldId.queryFormId !== undefined)
+                    assignment.queryFormId = targetFieldId.queryFormId;
+                if (targetFieldId.fieldId !== undefined)
+                    assignment.fieldId = targetFieldId.fieldId;
+                if (targetFieldId.queryFieldId !== undefined)
+                    assignment.queryFieldId = targetFieldId.queryFieldId;
+                if (targetFieldId.index !== undefined)
+                    assignment.index = targetFieldId.index;
+                if (targetFieldId.parentName !== undefined)
+                    assignment.parentName = targetFieldId.parentName;
                 if (refDetail)
                     assignment.detailLabel = refDetail;
                 assertCompatibleEnumContextMapping(refKey, raw, result, meta || {});
@@ -463,6 +487,12 @@ export function fillSetting(result, updates, mapping, constants, formula, meta,
             const fspec = fspecRaw;
             if (!fspec || typeof fspec !== 'object')
                 continue;
+            if (String(fspec.kind || '') === 'function') {
+                const fieldMeta = lookupTargetFieldMeta(String(targetFieldId), result);
+                const targetFieldType = String(fieldMeta?.componentKey || fieldMeta?.type || fspec.resultType || 'Number');
+                main[String(targetFieldId)] = buildSettingEntry(String(targetFieldId), fspec, targetFieldType, meta, appId, String(eventId), 'OPERATE_EQUAL', componentType, false, assignmentMode);
+                continue;
+            }
             const op = fspec.op || 'add';
             const fields = fspec.fields || [];
             if (!fields.length)
@@ -477,7 +507,7 @@ export function fillSetting(result, updates, mapping, constants, formula, meta,
                 child.fieldType = 'number';
                 childs.push(child);
             }
-            const bean = formulaFunction(fnInfo.fnId, fnInfo.name, childs, 'double', op, fnInfo.functionType || 'operation', undefined, appId);
+            const bean = formulaFunction(fnInfo.fnId, fnInfo.name, childs, 'double', null, fnInfo.functionType || 'operation', undefined, appId);
             const flatId = bean.id || genSfId();
             const assign = Object.fromEntries(Object.entries(bean).filter(([k]) => !['configObject', 'childs', 'parentId', 'sortWeight', 'position'].includes(k)));
             if (bean.childs)
@@ -520,13 +550,13 @@ export function fillSetting(result, updates, mapping, constants, formula, meta,
 function isFilterGroup(value) {
     if (!value || typeof value !== 'object' || Array.isArray(value))
         return false;
-    const children = value.conditions ?? value.datas;
+    const children = value.conditions;
     if (!Array.isArray(children))
         return false;
     return !['left', 'right', 'field', 'operator', 'value', 'id', 'key', 'fieldName'].some((k) => k in value);
 }
 function filterGroupChildren(value) {
-    const children = value.conditions ?? value.datas ?? [];
+    const children = value.conditions ?? [];
     if (!Array.isArray(children))
         throw new Error('filterCondition 分组的 conditions 必须是数组');
     if (!children.length)
@@ -534,18 +564,18 @@ function filterGroupChildren(value) {
     return children;
 }
 function filterRelationship(value) {
-    const text = String(value ?? '1').trim().toLowerCase();
-    if (['1', 'and', '&&'].includes(text))
+    const text = String(value ?? '').trim().toLowerCase();
+    if (text === 'and')
         return '1';
-    if (['0', 'or', '||'].includes(text))
+    if (text === 'or')
         return '0';
-    throw new Error('filterCondition relationship 只支持 and/or（或 1/0）');
+    throw new Error('filterCondition relationship 只支持 and/or');
 }
 function containsFilterGroup(value) {
     if (isFilterGroup(value))
         return true;
     if (value && typeof value === 'object' && !Array.isArray(value)) {
-        const children = value.conditions ?? value.datas;
+        const children = value.conditions;
         if (Array.isArray(children))
             return children.some(containsFilterGroup);
         return false;
@@ -567,25 +597,58 @@ function rejectUnsupportedFilterModes(value) {
             rejectUnsupportedFilterModes(item);
     }
 }
+const CANONICAL_FILTER_OPERATORS = new Set([
+    'eq', 'neq', 'gt', 'lt', 'gte', 'lte', 'contains', 'uncontains',
+    'empty', 'nempty', 'range', 'aggregate', 'unaggregate',
+    'startWith', 'unStartWith', 'endWith', 'unEndWith', 'containedWith',
+]);
+const CANONICAL_FILTER_RIGHT_TYPES = new Set([
+    'fixed', 'system', 'context', 'formfield', 'selectdata',
+    'custombyhander', 'native', 'varfield', 'filterval',
+]);
+/** Validates the public semantic plan. Platform filterInput is built only after this boundary. */
+function assertCanonicalFilterPlan(value) {
+    if (!value || typeof value !== 'object' || Array.isArray(value)) {
+        throw new Error('filterCondition 必须是单个条件对象或 {relationship:"and|or",conditions:[...]}；不接受数组');
+    }
+    if (isFilterGroup(value)) {
+        if ('datas' in value)
+            throw new Error('filterCondition 条件组只接受 conditions，不接受 datas');
+        filterRelationship(value.relationship);
+        for (const child of filterGroupChildren(value))
+            assertCanonicalFilterPlan(child);
+        return;
+    }
+    if ('value' in value || 'left' in value || 'key' in value || 'id' in value) {
+        throw new Error('filterCondition 叶子只接受 field/operator/right；不接受 value、left、key 或 id');
+    }
+    const field = value.field;
+    if (!field || typeof field !== 'object' || Array.isArray(field) || !String(field.id ?? '').trim()) {
+        throw new Error('filterCondition field 必须是 {id,label} 对象');
+    }
+    const operator = String(value.operator ?? '').trim();
+    if (!CANONICAL_FILTER_OPERATORS.has(operator)) {
+        throw new Error(`filterCondition operator='${operator}' 不支持；请使用 eq/neq/gt/lt/gte/lte/contains/uncontains/empty/nempty/range`);
+    }
+    if (operator === 'empty' || operator === 'nempty')
+        return;
+    const right = value.right;
+    if (!right || typeof right !== 'object' || Array.isArray(right)) {
+        throw new Error('filterCondition 非空操作符必须使用 right 对象');
+    }
+    const rightType = String(right.type ?? '').trim().toLowerCase();
+    if (!CANONICAL_FILTER_RIGHT_TYPES.has(rightType)) {
+        throw new Error(`filterCondition right.type='${rightType}' 不支持；请使用 fixed/system/context/formField/selectData/customByHander/native/varField/filterVal`);
+    }
+}
 export function buildFilterInput(result, val, meta, appId, componentType = '', allowTree = true) {
     componentType = String(componentType || '');
+    assertCanonicalFilterPlan(val);
     if (allowTree && containsFilterGroup(val)) {
         return buildFilterTree(result, val, meta, appId, componentType);
     }
     const eventLocalFilter = (get(componentType) || {}).filterValueScope === 'local';
-    let conditions;
-    if (val && typeof val === 'object' && !Array.isArray(val)) {
-        if (val.condition && typeof val.condition === 'object')
-            conditions = [val.condition];
-        else if ('conditions' in val)
-            conditions = val.conditions;
-        else
-            conditions = [val];
-    }
-    else if (Array.isArray(val))
-        conditions = val;
-    else
-        conditions = [];
+    const conditions = [val];
     const formId = result.objId || (result.targetForm || {}).id || (result.dataSource || {}).id || (result.dataSource || {}).sourceId || '';
     const fctx = resolveFormCtx(result, meta, formId);
     const form = findInMetadata(meta, 'forms', { id: formId }) || {};
@@ -598,30 +661,9 @@ export function buildFilterInput(result, val, meta, appId, componentType = '', a
     conditions.forEach((c, idx) => {
         if (!c || typeof c !== 'object')
             return;
-        const left = c.left && typeof c.left === 'object' ? c.left : c;
-        let fieldId = '';
-        let label = '';
-        let right;
-        if (left.field && typeof left.field === 'object' && left.field.id) {
-            fieldId = String(left.field.id);
-            label = left.field.label || left.field.name || fieldId;
-            if (c.right && typeof c.right === 'object')
-                right = c.right;
-            else if (c.value && typeof c.value === 'object')
-                right = c.value;
-            else
-                right = { value: c.value ?? '' };
-        }
-        else if (left.key || left.id) {
-            fieldId = String(left.key ?? left.id ?? '');
-            label = left.label ?? left.name ?? '';
-            right = c.right ?? c.value ?? '';
-        }
-        else {
-            fieldId = '';
-            label = '';
-            right = '';
-        }
+        const fieldId = String(c.field.id);
+        let label = c.field.label || c.field.name || fieldId;
+        let right = c.right ?? { type: 'fixed', value: '' };
         const fmeta = fieldIndex[fieldId] || {};
         if (!fmeta || Object.keys(fmeta).length === 0) {
             throw new Error(`filterCondition 左侧字段 id='${fieldId}' 不在目标表单 '${formId}' 的实时字段列表中`);
@@ -645,26 +687,7 @@ export function buildFilterInput(result, val, meta, appId, componentType = '', a
         if (multiSelect === undefined && rawConfig && typeof rawConfig === 'object' && 'isSingle' in rawConfig)
             multiSelect = !Boolean(rawConfig.isSingle);
         const isMultiSelect = multiSelect === true || String(multiSelect).toLowerCase() === 'true';
-        if (right && typeof right === 'object' && right.kind === 'context' && !right.type) {
-            throw new Error("filterCondition 不支持 value.kind:'context'；请使用 right:{type:'context',paramKey:'<真实paramKey>',label:'<显示名>'}");
-        }
-        let rightType = right && typeof right === 'object' ? String(right.type || 'fixed').trim().toLowerCase() : 'fixed';
-        if (right && typeof right === 'object' && right.paramKey && !right.type) {
-            throw new Error("filterCondition 动态右值缺少 type:'context'；请使用 right:{type:'context',paramKey:'<真实paramKey>',label:'<显示名>'}");
-        }
-        if (['manual', 'constant', 'const'].includes(rightType))
-            rightType = 'fixed';
-        else if (['dynamic', 'assign', 'workflowfield', 'workflow_field'].includes(rightType))
-            rightType = 'context';
-        else if (['formfield', 'form_field'].includes(rightType))
-            rightType = 'formfield';
-        else if (['custom', 'custombyhandler'].includes(rightType))
-            rightType = 'custombyhander';
-        else if (['platform', 'condition'].includes(rightType))
-            rightType = 'native';
-        if (!['fixed', 'system', 'context', 'formfield', 'selectdata', 'custombyhander', 'native', 'varfield', 'filterval'].includes(rightType)) {
-            throw new Error(`filterCondition 右值 type='${rightType}' 不支持; 支持 fixed/manual/context/formField/selectData/customByHander/native/varField/filterVal`);
-        }
+        let rightType = String(right.type).trim().toLowerCase();
         // 原生「当前时间/当前日期」改写为系统参数（真机验证 2026-08-18）：平台 native type 列表不含 currentTime/currentDate
         // 等具体 token，原样透传后 conditionData.value="" 触发设计器「右值未配置」判断（外面能显示摘要，点进去空）。
         // 与 system_params 的 currentTime→{time}/currentDate→{date} 映射一致，落到 system 路径后走完整校验+value 非空。
@@ -705,7 +728,7 @@ export function buildFilterInput(result, val, meta, appId, componentType = '', a
         }
         const isContext = ['context', 'formfield', 'custombyhander'].includes(rightType);
         const isNative = ['native', 'varfield', 'filterval'].includes(rightType);
-        const filterValueType = String((right && typeof right === 'object' ? right.filterValueType : '') || c.filterValueType || '');
+        const filterValueType = String(right.filterValueType || '');
         const allowedOverride = conditionOperatorOverride(fmeta, family, compType, fieldId, filterValueType);
         let contextIsArray = false;
         let value;
@@ -722,7 +745,7 @@ export function buildFilterInput(result, val, meta, appId, componentType = '', a
             }
             value = rawValue;
         }
-        const func = normalizeFilterOperator(c.operator ?? 'eq', family, { contextIsArray, multiSelect: isMultiSelect, allowedOverride });
+        const func = normalizeFilterOperator(c.operator, family, { contextIsArray, multiSelect: isMultiSelect, allowedOverride });
         const isNullary = ['empty', 'nempty'].includes(func);
         if (isNullary)
             value = '';
@@ -808,15 +831,7 @@ export function buildFilterInput(result, val, meta, appId, componentType = '', a
 }
 function buildFilterTree(result, value, meta, appId, componentType) {
     rejectUnsupportedFilterModes(value);
-    let rootSource;
-    if (isFilterGroup(value))
-        rootSource = value;
-    else if (Array.isArray(value))
-        rootSource = { relationship: 'and', conditions: value };
-    else if (value && typeof value === 'object' && Array.isArray(value.conditions))
-        rootSource = value;
-    else
-        rootSource = { relationship: 'and', conditions: [value] };
+    const rootSource = value;
     const build = (source) => {
         if (isFilterGroup(source)) {
             return {
@@ -825,7 +840,7 @@ function buildFilterTree(result, value, meta, appId, componentType) {
                 parentNode: '', relationship: filterRelationship(source.relationship), key: '',
             };
         }
-        const compiled = buildFilterInput(result, [JSON.parse(JSON.stringify(source))], meta, appId, componentType, false);
+        const compiled = buildFilterInput(result, JSON.parse(JSON.stringify(source)), meta, appId, componentType, false);
         if (compiled.datas.length !== 1)
             throw new Error('filterCondition 叶子必须是单个有效条件');
         return compiled.datas[0];
@@ -1411,12 +1426,10 @@ export function convertNode(draftAction, isEvent = false, meta = null, appId = '
     }
     else {
         node.componentId = nidStr;
-        // 首节点（previousNodeId=event）通常不写 sources，平台对 ActionEb 等数据/动作组件自动接 event；
-        // 但 EnquiryForm 查询组件不适用该约定——漏 sources 会被平台判定为「起始执行组件」，
-        // 报「有两个起始执行组件」（真机验证 2026-08-27，sjrdemo 环境）。
-        const needsEventSource = nodeType === 'EnquiryForm' && ['', '0', String(eventNodeId)].includes(String(previousNodeId));
-        if (!['', '0', String(eventNodeId)].includes(String(previousNodeId)) || needsEventSource) {
-            node.sources = [{ wId: needsEventSource ? String(eventNodeId) : String(previousNodeId) }];
+        // 首个动作不写 sources；手工保存的场景 2 中 EnquiryForm 作为首动作也是无 sources。
+        // 后续节点一律显式指向前序节点，避免出现多个起始执行组件。
+        if (!['', '0', String(eventNodeId)].includes(String(previousNodeId))) {
+            node.sources = [{ wId: String(previousNodeId) }];
         }
     }
     // 设计器通过“添加操作”创建节点时，除平台执行 DTO 外还会保留组件目录项。
@@ -1589,6 +1602,9 @@ function registerRealNodeIds(draftNode, realNode, nodeIds) {
     const realId = String(realNode?.id ?? '');
     if (draftId && realId)
         nodeIds[draftId] = realId;
+    const ref = String(draftNode?.ref ?? '').trim();
+    if (ref && realId)
+        nodeIds[ref] = realId;
 }
 function replaceFormulaSourceAliases(value, nodeIds) {
     if (value && typeof value === 'object' && !Array.isArray(value)) {
@@ -1650,6 +1666,7 @@ export function convert(draft, appId = '', sceneId = '', metadataPath = '', leni
     meta._componentOptions = draft._componentOptions && typeof draft._componentOptions === 'object'
         ? draft._componentOptions
         : {};
+    meta._function_registry = Array.isArray(draft._functionRegistry) ? draft._functionRegistry : undefined;
     let draftEvent = draft.event || {};
     let draftActions = draft.actions || [];
     const lenientWarnings = [];