weaver-e10-builder 1.6.4 → 1.6.5

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

@@ -9,7 +9,7 @@ import { get, getCompiler, getNodePost } from './components/index.js';
 import { applyFormFieldSettingOptions, buildEsbFormDataDto, buildEsbFormField, } from './components/form_data_builder.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 { buildFormulaReference, buildUpdateFieldCondition, resolveUpdateBasisChild } from './components/action_eb_update_compiler.js';
 import { resolveCustomTriggerDtoId } from './custom_trigger_context.js';
 import { resolveSystemParameter, isDateSystemParameter } from './system_params.js';
 import { conditionFieldFamily, filterFieldType, normalizeFilterOperator, conditionOperatorOverride, resolveFormCtx, buildFilterContextFormula, } from './filter_rules.js';
@@ -180,7 +180,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, hasBasisValue);
+                    handleSpecial(draftKey, t, val, result, meta, appId, actionIndex, eventNodeId, componentType, eventName, hasBasisValue, params.basisValue);
                 }
                 catch (e) {
                     if (!lenient)
@@ -258,7 +258,7 @@ function normalizeEventFormDataTrigger(result, params, componentType) {
         result.triggerType = 'sequence';
 }
 // ── _handle_special ─────────────────────────────────────────
-function handleSpecial(draftKey, special, val, result, meta, appId, idx, eventId, componentType, eventName, hasBasisValue = false) {
+function handleSpecial(draftKey, special, val, result, meta, appId, idx, eventId, componentType, eventName, hasBasisValue = false, basisValue = undefined) {
     if (special === '_person' && val && typeof val === 'object' && !Array.isArray(val)) {
         const contract = get(componentType) || {};
         const personTarget = contract.personTarget ?? 'person';
@@ -278,6 +278,16 @@ function handleSpecial(draftKey, special, val, result, meta, appId, idx, eventId
                 attachEsbAssign(result.updateId, meta, String(eventId || ''));
                 return;
             }
+            const basisChild = resolveUpdateBasisChild(val, basisValue);
+            if (basisChild) {
+                result.updateId = buildAssignBean({
+                    ...val,
+                    basisParamKey: basisChild.basisParamKey,
+                    basisType: basisChild.basisType,
+                }, 'updateId', String(val?.fieldType || val?.valueType || 'string'), meta, appId, eventId);
+                attachEsbAssign(result.updateId, meta, String(eventId || val?.source || '0'));
+                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 || '');
@@ -319,7 +329,7 @@ function handleSpecial(draftKey, special, val, result, meta, appId, idx, eventId
         }
     }
     else if (special === '_updateFieldCondition') {
-        const condition = buildUpdateFieldCondition(val, { meta, appId, eventId, componentType });
+        const condition = buildUpdateFieldCondition(val, { meta, appId, eventId, componentType, basisValue });
         result.updateFieldCondition = condition;
         (result.setting ??= {}).updateFieldCondition = JSON.parse(JSON.stringify(condition));
         result.updateCondition = (condition.updateField || []).filter((it) => it && typeof it === 'object' && it.fieldKey).map((it) => String(it.fieldKey));
@@ -843,7 +853,9 @@ export function buildFilterInput(result, val, meta, appId, componentType = '', a
     const fieldIndex = {};
     // ActionEbDelete 的前端 ConditionSet 与查询/定时组件共用 dataSource
     // 字段选择器；条件左值必须来自 ds/fields，不能仅依赖 getEbField。
-    const strictDataSourceCondition = ['ActionEbDelete', 'EnquiryForm', 'TimeBatchTrigger', 'DateTrigger'].includes(componentType);
+    const strictDataSourceCondition = [
+        'ActionEbDelete', 'ActionEbUpdate', 'EnquiryForm', 'TimeBatchTrigger', 'DateTrigger',
+    ].includes(componentType);
     if (!strictDataSourceCondition) {
         for (const f of form.fields || [])
             fieldIndex[String(f.id || '')] = f;
@@ -1173,6 +1185,62 @@ function conditionFieldShape(workflowId, fieldKey, fieldLabel) {
         return { family: 'list', prefix: 'List', formulaType: 'json' };
     return { family: 'string', prefix: 'String', formulaType: 'string' };
 }
+function conditionFormulaShape(left, workflowId, fieldKey, fieldLabel) {
+    const kind = String(left?.kind || left?.assignmentKind || left?.type || '').trim().toLowerCase();
+    if (kind !== 'function' && kind !== 'formula')
+        return conditionFieldShape(workflowId, fieldKey, fieldLabel);
+    const resultType = String(left?.resultType || left?.fieldType || left?.valueType || '').trim().toLowerCase();
+    if (['int', 'integer', 'number', 'double', 'float', 'money', 'decimal'].includes(resultType)) {
+        return { family: 'number', prefix: 'Number', formulaType: 'double' };
+    }
+    if (['datetime', 'date', 'time'].includes(resultType)) {
+        const prefix = resultType === 'datetime' ? 'DateTime' : resultType[0].toUpperCase() + resultType.slice(1);
+        return { family: resultType, prefix, formulaType: resultType };
+    }
+    if (['bool', 'boolean'].includes(resultType))
+        return { family: 'bool', prefix: 'Bool', formulaType: 'bool' };
+    return { family: 'string', prefix: 'String', formulaType: 'string' };
+}
+function conditionFunctionBean(left, fieldLabel, shape, meta, sourceId) {
+    const bean = buildAssignBean(left, fieldLabel, shape.formulaType, meta, String(meta?._app_id || ''), sourceId);
+    // 条件编辑器的 FunctionItem 与普通赋值 FormulaBean 使用同一棵 childs
+    // 树，但前端保留 config 为对象、resultType 为结果类型；普通赋值组件则
+    // 会把 config 序列化成字符串。saveCondition 只会持久化前者，后者会被
+    // 接受但在 getExpressionBean 回读时丢掉整个叶子。
+    let config = {};
+    if (typeof bean.config === 'string') {
+        try {
+            config = JSON.parse(bean.config);
+        }
+        catch {
+            config = {};
+        }
+    }
+    else if (bean.config && typeof bean.config === 'object') {
+        config = { ...bean.config };
+    }
+    const conditionType = shape.family === 'number' ? 'number' : shape.formulaType;
+    const normalized = {
+        ...bean,
+        formulaType: conditionType,
+        resultType: conditionType,
+        fieldType: conditionType,
+        config: {
+            originId: String(config.originId || ''),
+            paramSize: String(config.paramSize ?? bean.childs?.length ?? 0),
+            paramType: conditionType,
+            functionType: config.functionType || conditionType,
+            detail: Array.isArray(bean.detail) ? bean.detail : [],
+        },
+    };
+    if (config.excelFunc && typeof config.excelFunc === 'object')
+        normalized.config.excelFunc = config.excelFunc;
+    delete normalized.configObject;
+    delete normalized.applicationId;
+    delete normalized.parentId;
+    delete normalized.sortWeight;
+    return normalized;
+}
 function conditionRelationCode(value) {
     const relation = String(value ?? 'and').trim().toLowerCase();
     return ['2', 'or', '||', '或'].includes(relation) ? 2 : 1;
@@ -1240,8 +1308,14 @@ function buildSingleConditionDetail(condition, sourceId, meta = null) {
     if (!condition || typeof condition !== 'object')
         return {};
     const left = condition.left || {};
-    const requestedFieldKey = String(left.key || left.value || '').trim();
-    const requestedLabel = String(left.label || left.name || requestedFieldKey || '').trim();
+    const leftKind = String(left.kind || left.assignmentKind || left.type || '').trim().toLowerCase();
+    const functionLeft = leftKind === 'function' || leftKind === 'formula';
+    const leftArgs = Array.isArray(left.args) ? left.args : (Array.isArray(left.arguments) ? left.arguments : []);
+    const contextArg = functionLeft
+        ? leftArgs.find((arg) => ['context', 'dynamic', 'formfield', 'form_field'].includes(String(arg?.kind || arg?.assignmentKind || arg?.type || '').toLowerCase()))
+        : null;
+    const requestedFieldKey = String(contextArg?.paramKey || contextArg?.key || left.key || left.value || '').trim();
+    const requestedLabel = String(contextArg?.label || contextArg?.name || left.label || left.name || requestedFieldKey || '').trim();
     const operator = String(condition.operator || '').trim().toLowerCase();
     const workflowId = meta && typeof meta === 'object' ? String(meta._workflow_id || '') : '';
     // 条件计划允许使用完整 paramKey、paramName、真实字段 id 或界面显示名；统一回到
@@ -1262,7 +1336,7 @@ function buildSingleConditionDetail(condition, sourceId, meta = null) {
             throw new Error(`Condition.left.key='${requestedFieldKey}' 未在流程 '${workflowId}' 的实时上下文中找到。请传完整 paramKey、字段显示名或 getComponentContext 返回的字段对象。`);
         }
     }
-    const shape = conditionFieldShape(workflowId, fieldKey, fieldLabel);
+    const shape = conditionFormulaShape(left, workflowId, fieldKey, fieldLabel);
     const opt = CONDITION_OPT_CODE_MAP[operator];
     if (!opt)
         throw new Error(`Condition 操作符 '${condition.operator}' 不支持`);
@@ -1309,10 +1383,13 @@ function buildSingleConditionDetail(condition, sourceId, meta = null) {
     const customFieldBiz = genSfId();
     // 流程字段需保留“流程 ID.字段名”的上下文显示路径，规则编辑器才能定位来源。
     const contextDisplayName = rawField && workflowId ? `${workflowId}.${fieldLabel}` : fieldLabel;
+    const leftFormula = functionLeft
+        ? conditionFunctionBean(left, fieldLabel, shape, meta || {}, contextWId)
+        : null;
     const leftOperand = {
         expressionBaseId: baseId, [`${shape.prefix}CompareOptionLeft`]: opt, dataValueId: dvId,
         elementValue2Id: ev2, elementValue1Id: ev1, selectType: 97,
-        customFieldType: {
+        customFieldType: leftFormula || {
             paramType: shape.formulaType, formulaType: shape.formulaType, name: fieldLabel, businessId: customFieldBiz,
             selectType: '-1', id: customFieldId, source: contextWId, type: '3', value: valueId,
             config: {
@@ -1422,6 +1499,7 @@ function buildDetailRowId(value, meta, appId, eventId, nodeType) {
 export function buildSettingDetail(nodeData, detailItems, meta, appId, eventId, nodeType) {
     if (!Array.isArray(detailItems))
         return;
+    const assignmentMode = String((get(nodeType) || {}).assignmentContextMode || '');
     const detailOut = [];
     for (const item of detailItems) {
         if (!item || typeof item !== 'object' || !item.detailTableId)
@@ -1435,7 +1513,9 @@ export function buildSettingDetail(nodeData, detailItems, meta, appId, eventId,
         }
         const ele = { detailTableId: String(item.detailTableId) };
         if (item.updateFieldCondition && typeof item.updateFieldCondition === 'object') {
-            ele.updateFieldCondition = buildUpdateFieldCondition(item.updateFieldCondition, { meta, appId, eventId: String(eventId), componentType: nodeType });
+            ele.updateFieldCondition = buildUpdateFieldCondition(item.updateFieldCondition, {
+                meta, appId, eventId: String(eventId), componentType: nodeType, basisValue: item.basisValue,
+            });
         }
         else {
             ele.updateFieldCondition = { updateField: [] };
@@ -1525,6 +1605,10 @@ export function buildSettingDetail(nodeData, detailItems, meta, appId, eventId,
         }
         const mapping = item.mapping || {};
         const constants = item.constants || {};
+        const detailBasisParamKey = String(item.basisValue?.paramKey || item.basisValue?.key || '').trim();
+        const detailBasisType = String(item.basisValue?.basisType || 'formSetting');
+        const isDetailBasisDescendant = (sourceParamKey) => Boolean(detailBasisParamKey && (sourceParamKey === detailBasisParamKey
+            || sourceParamKey.startsWith(`${detailBasisParamKey}.`)));
         const detailTargetFormId = String((nodeData.targetForm || {}).id || '');
         const targetDetailFields = detailTargetFormId
             ? (getTargetDetailFields()[detailTargetFormId] || {})[String(item.detailTableId)] || {}
@@ -1553,16 +1637,39 @@ export function buildSettingDetail(nodeData, detailItems, meta, appId, eventId,
                     const refKey = String(targetFieldId.paramKey || sourceKey);
                     const refLabel = String(targetFieldId.label || sourceKey);
                     const refDetail = String(targetFieldId.detailLabel || '');
+                    const basisDescendant = isDetailBasisDescendant(refKey);
                     const declaredKind = String(targetFieldId.kind || targetFieldId.assignmentKind || 'context');
                     assignment = {
                         ...(targetFieldId.assignment && typeof targetFieldId.assignment === 'object' ? targetFieldId.assignment : {}),
                         kind: declaredKind, paramKey: refKey, label: refLabel,
                     };
+                    // 明细字段同样必须沿用 getComponentContext 的真实来源元数据。
+                    // 不能因为进入 detail 分支就只保留 paramKey；否则
+                    // assignFlatEsbChild 无法得到 WebHook 的 Body 根和真实字段 ID。
+                    for (const key of ['scope', 'contextScope', 'componentType', 'tablePrimaryKey', 'tableName', 'frontId', 'fieldType', 'valueType']) {
+                        if (targetFieldId[key] !== undefined)
+                            assignment[key] = targetFieldId[key];
+                    }
+                    if (targetFieldId._resolvedContext && typeof targetFieldId._resolvedContext === 'object') {
+                        assignment._resolvedContext = { ...targetFieldId._resolvedContext };
+                    }
+                    if (targetFieldId.source !== undefined)
+                        assignment.source = targetFieldId.source;
+                    if (targetFieldId.comId !== undefined)
+                        assignment.comId = targetFieldId.comId;
+                    if (targetFieldId.fieldId !== undefined)
+                        assignment.fieldId = targetFieldId.fieldId;
+                    if (targetFieldId.parentName !== undefined)
+                        assignment.parentName = targetFieldId.parentName;
                     if (refDetail)
                         assignment.detailLabel = refDetail;
+                    if (basisDescendant) {
+                        assignment.basisParamKey = detailBasisParamKey;
+                        assignment.basisType = detailBasisType;
+                    }
                     const targetMeta = targetDetailFields[raw] || {};
                     const targetType = String(targetMeta.componentKey || targetMeta.type || 'Text');
-                    eleData[raw] = buildEsbFormField(raw, assignment, targetType, meta, appId, eventId, operate, nodeType, true, '', options);
+                    eleData[raw] = buildEsbFormField(raw, assignment, targetType, meta, appId, eventId, operate, nodeType, true, basisDescendant ? assignmentMode : '', options);
                 }
                 else {
                     let raw = String(targetFieldId);
@@ -1575,9 +1682,14 @@ export function buildSettingDetail(nodeData, detailItems, meta, appId, eventId,
                         raw = raw.slice(1);
                     }
                     assignment = { kind: 'context', paramKey: String(sourceKey), label: resolveSourceFieldLabel(String(sourceKey), meta, String(sourceKey)) };
+                    const basisDescendant = isDetailBasisDescendant(String(sourceKey));
+                    if (basisDescendant) {
+                        assignment.basisParamKey = detailBasisParamKey;
+                        assignment.basisType = detailBasisType;
+                    }
                     const targetMeta = targetDetailFields[raw] || {};
                     const targetType = String(targetMeta.componentKey || targetMeta.type || 'Text');
-                    eleData[raw] = buildEsbFormField(raw, assignment, targetType, meta, appId, eventId, operate, nodeType, true, '');
+                    eleData[raw] = buildEsbFormField(raw, assignment, targetType, meta, appId, eventId, operate, nodeType, true, basisDescendant ? assignmentMode : '');
                 }
             }
         }
@@ -1625,6 +1737,8 @@ export function buildSettingDetail(nodeData, detailItems, meta, appId, eventId,
         // 组件按新增明细处理。ActionEbUpdate 则保留用户明确选择的策略。
         if (item.operateType)
             ele.operateType = String(item.operateType);
+        else if (['ApproveSave', 'ApproveCommit', 'ApproveSendBack'].includes(nodeType))
+            ele.operateType = 'default';
         else if (nodeType !== 'ActionEbAdd' && nodeType !== 'ActionEbUpdate')
             ele.operateType = 'insert';
         if (item.updateType)
@@ -1727,8 +1841,7 @@ export function convertNode(draftAction, isEvent = false, meta = null, appId = '
         // ApproveCreateComponent#save 使用这些 DTO 字段；它们不能依赖前端默认值。
         nodeData.module ??= 'workflow';
         nodeData.applicationId ??= String(appId);
-        nodeData.dataId ??= [];
-        nodeData.rejectToNodeId ??= [];
+        nodeData.isNextFlow ??= '1';
     }
     const pendingMapping = nodeData._pending_mapping;
     delete nodeData._pending_mapping;
@@ -1749,7 +1862,10 @@ export function convertNode(draftAction, isEvent = false, meta = null, appId = '
         delete nodeData.setting;
         const main = (setting || {}).main || {};
         const detailOut = (setting || {}).detail || [];
-        nodeData.formData = buildEsbFormDataDto(main, detailOut);
+        // 表单设置的 dataDrWithCalc 属于 EsbFormDataDto，不是 ApproveSaveDto 顶层字段。
+        const dataDrWithCalc = nodeData.dataDrWithCalc ?? false;
+        delete nodeData.dataDrWithCalc;
+        nodeData.formData = buildEsbFormDataDto(main, detailOut, { dataDrWithCalc: Boolean(dataDrWithCalc) });
         // ApproveCreateDTO 没有使用 fields；目标字段仅用于编译 mapping，不能写入保存 DTO。
         if (nodeType !== 'ApproveCreate') {
             const fieldsMetaKey = String(formDataPayload.fieldsMetaKey || '_bizFields');
@@ -1770,7 +1886,10 @@ export function convertNode(draftAction, isEvent = false, meta = null, appId = '
     }
     else if (formDataPayload && typeof formDataPayload === 'object') {
         // 声明 formDataPayload 的组件即使没有字段映射，也显式携带表单数据容器。
-        nodeData.formData ??= buildEsbFormDataDto();
+        const dataDrWithCalc = nodeData.dataDrWithCalc ?? false;
+        delete nodeData.dataDrWithCalc;
+        nodeData.formData ??= buildEsbFormDataDto({}, [], { dataDrWithCalc: Boolean(dataDrWithCalc) });
+        nodeData.formData.dataDrWithCalc = Boolean(dataDrWithCalc);
         if (nodeType !== 'ApproveCreate')
             nodeData.fields ??= { main: [], detail: [] };
         nodeData.formDataId ??= genSfId();
@@ -1940,11 +2059,12 @@ export function convertNode(draftAction, isEvent = false, meta = null, appId = '
 export function convertCondition(draftAction, meta = null, appId = '', actionIndex = 0, eventId = '', previousNodeId = '0', lenient = false) {
     const node = convertNode(draftAction, false, meta, appId, actionIndex, eventId, '', previousNodeId, lenient);
     const branches = getStepBranches(draftAction);
+    const executeMethod = String(draftAction.params?.executeMethod ?? node.data.executeMethod ?? '1');
+    if (!['1', '2'].includes(executeMethod))
+        throw new Error(`Condition.executeMethod 不支持 '${executeMethod}'，请使用 1 或 2`);
+    node.data.executeMethod = executeMethod;
     if (!branches || branches.length === 0) {
-        node.data.trueBranchActions = [];
-        node.data.falseBranchActions = [];
-        node.data.otherConditionBranch = [];
-        return node;
+        throw new Error('Condition.branches 不能为空');
     }
     const conditionalBranches = [];
     let elseBranchActions = null;
@@ -1955,12 +2075,20 @@ export function convertCondition(draftAction, meta = null, appId = '', actionInd
             cond = {};
         const isElse = cond.type === 'else';
         const hasRealCond = !isElse && hasConditionExpression(cond);
+        if (hasRealCond && elseBranchActions !== null)
+            throw new Error(`Condition.branches[${i}] 条件分支不能位于其他情况之后`);
+        if (!hasRealCond && elseBranchActions !== null)
+            throw new Error(`Condition.branches[${i}] 只允许一个其他情况分支`);
+        if (!hasRealCond && !isElse && Object.keys(cond).length)
+            throw new Error(`Condition.branches[${i}] 条件为空或不完整`);
         const bacts = [];
         let branchPreviousId = '0';
         for (const a of branch.actions || []) {
-            if (a.type === 'Output')
-                continue;
-            const branchNode = convertNode(a, false, meta, appId, i, eventId, '', branchPreviousId, lenient);
+            const branchNode = a?.type === 'Condition'
+                ? convertCondition(a, meta, appId, i, eventId, branchPreviousId, lenient)
+                : a?.type === 'MultipleExecution'
+                    ? convertMultipleExecution(a, meta, appId, i, eventId, '', branchPreviousId, lenient)
+                    : convertNode(a, false, meta, appId, i, eventId, '', branchPreviousId, lenient);
             bacts.push(branchNode);
             branchPreviousId = branchNode.wId;
         }
@@ -1972,6 +2100,8 @@ export function convertCondition(draftAction, meta = null, appId = '', actionInd
                 elseBranchActions = bacts;
         }
     }
+    if (!conditionalBranches.length)
+        throw new Error('Condition 排他或包容分支至少需要一个有效条件');
     const trueBranchActions = conditionalBranches.length ? conditionalBranches[0][1] : [];
     const falseBranchActions = elseBranchActions || [];
     const otherBranchActions = [];
@@ -2125,6 +2255,7 @@ export function convert(draft, appId = '', sceneId = '', metadataPath = '', leni
     let draftEvent = draft.event || {};
     let draftActions = draft.actions || [];
     meta._scene_id = String(sceneId || '');
+    meta._app_id = String(appId || '');
     meta._http_response_fields = collectHttpResponseFields(draft.actions || []);
     meta._componentOptions = draft._componentOptions && typeof draft._componentOptions === 'object'
         ? draft._componentOptions