weaver-e10-builder 1.2.5 → 1.5.1

package/dist/services/actionflow/workflow_compiler.js

@@ -3,12 +3,13 @@
  * 对齐 Python 版 core/workflow_compiler.py（黄金参照）。
  * 第 1 期聚焦：ApproveTrigger / ActionEbAdd / ActionEbUpdate / ActionEbDelete / Output 的编译主链。
  */
-import { genSfId } from './id_generator.js';
+import { genSfId, normalizeNumericFrontId } 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, buildAssignBean, attachEsbAssign, resolveEnumConstant, resolveParamKey, resolveSourceFieldLabel, resolveSourceFieldType, normalizeConstantAssignment, lookupTargetFieldMeta, formulaFixedForAssignSwitch, formulaSystemVar, formulaContext, assignFlatContextDirect, getFormulaFn, formulaFunction, } from './formula_service.js';
+import { buildPersonFormula, buildSettingEntry, buildAssignBean, attachEsbAssign, resolveEnumConstant, resolveParamKey, resolveSourceFieldLabel, resolveSourceFieldType, normalizeConstantAssignment, lookupTargetFieldMeta, formulaFixedForAssignSwitch, formulaSystemVar, formulaContext, assignFlatContextDirect, getFormulaFn, formulaFunction, contextRootForComponent, contextTableNameForRoot, normalizeContextParamKey, } 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';
 import { conditionFieldFamily, filterFieldType, normalizeFilterOperator, conditionOperatorOverride, resolveFormCtx, buildFilterContextFormula, } from './filter_rules.js';
 import { getStepBranches } from './step_branches.js';
@@ -224,7 +225,11 @@ function handleSpecial(draftKey, special, val, result, meta, appId, idx, eventId
                 if (!wfName)
                     wfName = String(meta?._upstream_form_name || '');
                 const pn = wfName ? `${wfName}.${label}` : label;
-                result.updateId = assignFlatContextDirect(resolved, label, String(eventId || val.source || '0'), appId, 'string', pn, meta);
+                const sourceComponent = String(val._resolvedContext?.componentType || val.componentType || '');
+                const updateMeta = sourceComponent === 'CustomTrigger'
+                    ? { ...(meta || {}), _context_component_type: sourceComponent }
+                    : meta;
+                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'));
             }
@@ -279,18 +284,25 @@ function handleSpecial(draftKey, special, val, result, meta, appId, idx, eventId
         result.filterInput = buildFilterInput(result, val, meta, appId, componentType);
     }
     else if (special === '_bizWorkflowPath' && val && typeof val === 'object') {
-        const wfId = String(val.id || '');
-        let formIds = val.formIds;
-        if (!Array.isArray(formIds))
-            formIds = val.formId || val.objId ? [String(val.formId || val.objId)] : [];
-        result.workflowPath = [{
-                bridgeService: 'ebuilder', relateFormTypes: ['WEA_EBUILDER'],
-                name: String(val.name || val.text || ''),
-                formIds: formIds.filter(Boolean).map(String),
-                id: wfId,
-                createFlowId: String(val.createFlowId || wfId),
-                workflowtype: String(val.workflowtype ?? val.workflowType ?? appId ?? ''),
-            }];
+        const workflowRows = Array.isArray(val) ? val : [val];
+        result.workflowPath = workflowRows
+            .filter((item) => item && typeof item === 'object' && !Array.isArray(item))
+            .map((item) => {
+            // ApproveCreateDTO 接收前端完整的 WorkflowPathBrowser 对象；只归一化
+            // 后端保存必需的别名，不能重建对象后丢掉 version/status/分权等字段。
+            const workflow = JSON.parse(JSON.stringify(item));
+            const wfId = String(workflow.id || workflow.createFlowId || '');
+            let formIds = workflow.formIds;
+            if (!Array.isArray(formIds))
+                formIds = workflow.formId || workflow.objId ? [String(workflow.formId || workflow.objId)] : [];
+            workflow.id = wfId;
+            workflow.formIds = formIds.filter(Boolean).map(String);
+            workflow.createFlowId = String(workflow.createFlowId || wfId);
+            workflow.workflowtype = String(workflow.workflowtype ?? workflow.workflowType ?? appId ?? '');
+            workflow.bridgeService ??= 'ebuilder';
+            workflow.relateFormTypes ??= ['WEA_EBUILDER'];
+            return workflow;
+        });
     }
     else if (special === '_bizRequestName') {
         if (typeof val === 'string' && val.trim())
@@ -306,7 +318,10 @@ function handleSpecial(draftKey, special, val, result, meta, appId, idx, eventId
             else {
                 const wfId = String(meta?._workflow_id || '');
                 const rqKey = resolveParamKey(wfId, String(val.key ?? val.value ?? ''));
-                result.requestName = formulaContext('', rqKey, { name: String(val.label || '') });
+                result.requestName = formulaContext('', rqKey, {
+                    name: String(val.label || ''),
+                    frontId: val._resolvedContext?.fieldId || val.frontId || val.fieldId,
+                });
                 attachEsbAssign(result.requestName, meta, String(eventId || ''));
             }
         }
@@ -375,7 +390,7 @@ function handleBasisValue(val, result, meta, appId, eventId) {
             comId: srcId, newParentName: bvParent,
         };
         const bvf = {
-            frontId: bvId, formulaType: bvfType, name: bvLabel, businessId: fBiz, id: fId,
+            frontId: normalizeNumericFrontId(bvId, '依据值 FormulaBean.frontId'), formulaType: bvfType, name: bvLabel, businessId: fBiz, id: fId,
             source: srcId, type: '3', value: `FormData.${bvKey}`, childs: [], config: bvfConfig, parentId: '0',
         };
         // 依据值公式同样需要 esbAssign.wId 指向当前数据动作节点（设计器动态赋值定位用）。
@@ -1076,6 +1091,7 @@ function conditionFormulaType(right, shape, sourceId) {
             name: String(right?.label || right?.name || key),
             fieldType: shape.formulaType,
             componentType: String(right?.componentType || right?.comType || 'ApproveTrigger'),
+            frontId: right?._resolvedContext?.fieldId || right?._resolvedContext?.rawField?.id || right?.frontId || right?.fieldId,
         });
         bean.businessId = String(right?.businessId || bean.businessId || '0');
         return bean;
@@ -1297,6 +1313,11 @@ export function buildSettingDetail(nodeData, detailItems, meta, appId, eventId,
         if (item.basisValue && typeof item.basisValue === 'object') {
             const bvVal = item.basisValue;
             let bvKey = String(bvVal.paramKey || bvVal.key || '').trim();
+            const isCustomTriggerSource = String(meta?._context_component_type || meta?._upstream_component_type || '') === 'CustomTrigger';
+            const basisContextRoot = isCustomTriggerSource ? contextRootForComponent('CustomTrigger') : 'FormData';
+            const basisTableName = contextTableNameForRoot(basisContextRoot);
+            if (isCustomTriggerSource)
+                bvKey = normalizeContextParamKey(bvKey, 'CustomTrigger');
             if (bvKey && !bvKey.includes('[]')) {
                 const wfId = String(meta?._workflow_id || '');
                 const keyIndex = wfId ? getWorkflowContextFieldsByKey()[wfId] || {} : {};
@@ -1314,16 +1335,28 @@ export function buildSettingDetail(nodeData, detailItems, meta, appId, eventId,
                         prefix = String(meta._upstream_form_name || '');
                 }
                 const parentName = prefix ? `${prefix}.${bvLabel}[]` : `${bvLabel}[]`;
-                const bvSubformId = bvKey.includes('[]') ? bvKey.split('[]')[0].includes('.') ? bvKey.split('[]')[0].slice(bvKey.split('[]')[0].lastIndexOf('.') + 1) : bvKey : bvKey;
+                // CustomTrigger 的明细依据值也是表维度上下文，frontId 必须取
+                // CustFormTableDto.id，不能把 detail1 这类 paramKey 尾段直接当成 ID。
+                const customTriggerTableId = isCustomTriggerSource
+                    ? resolveCustomTriggerDtoId(bvKey, meta?._custom_trigger_data, 'table')
+                    : '';
+                const legacyBvSubformId = bvKey.includes('[]')
+                    ? bvKey.split('[]')[0].includes('.')
+                        ? bvKey.split('[]')[0].slice(bvKey.split('[]')[0].lastIndexOf('.') + 1)
+                        : bvKey
+                    : bvKey;
+                // CustomTrigger 无法定位 DTO 表对象时按统一规则留空；不能回退到
+                // detail1 这类业务 paramKey，否则既不是真实 ID，也会触发数字校验。
+                const bvSubformId = isCustomTriggerSource ? customTriggerTableId : legacyBvSubformId;
                 ele.basisValue = {
-                    frontId: bvSubformId,
+                    frontId: normalizeNumericFrontId(bvSubformId, '明细依据值 FormulaBean.frontId'),
                     formulaType: bvType,
                     name: bvLabel,
                     businessId: appId,
                     id: genSfId(),
                     source: String(eventId),
                     type: '3',
-                    value: `FormData.${bvKey}`,
+                    value: `${basisContextRoot}.${bvKey}`,
                     childs: [],
                     config: {
                         paramKey: bvKey,
@@ -1335,12 +1368,13 @@ export function buildSettingDetail(nodeData, detailItems, meta, appId, eventId,
                         multKey: '',
                         multTypeObj: {
                             allName: parentName, currentName: parentName,
-                            currentParamKey: `FormData.${bvKey}`, allParamKey: `FormData.${bvKey}`,
+                            currentParamKey: `${basisContextRoot}.${bvKey}`, allParamKey: `${basisContextRoot}.${bvKey}`,
                         },
                         comId: String(eventId),
-                        comType: 'ApproveTrigger',
+                        comType: isCustomTriggerSource ? 'CustomTrigger' : 'ApproveTrigger',
                         newParentName: parentName,
-                        fieldInfo: { paramKey: bvKey, tablePrimaryKey: 'FormData' },
+                        tableName: basisTableName,
+                        fieldInfo: { paramKey: bvKey, tablePrimaryKey: basisContextRoot },
                     },
                     parentId: '0',
                 };
@@ -1506,6 +1540,13 @@ export function convertNode(draftAction, isEvent = false, meta = null, appId = '
         parentId: '0',
     };
     const nodeData = node.data || {};
+    if (nodeType === 'ApproveCreate') {
+        // ApproveCreateComponent#save 使用这些 DTO 字段；它们不能依赖前端默认值。
+        nodeData.module ??= 'workflow';
+        nodeData.applicationId ??= String(appId);
+        nodeData.dataId ??= [];
+        nodeData.rejectToNodeId ??= [];
+    }
     const pendingMapping = nodeData._pending_mapping;
     delete nodeData._pending_mapping;
     const pendingConstants = nodeData._pending_constants;
@@ -1525,15 +1566,18 @@ export function convertNode(draftAction, isEvent = false, meta = null, appId = '
         delete nodeData.setting;
         const main = (setting || {}).main || {};
         const detailOut = (setting || {}).detail || [];
-        nodeData.formData = { main, detail: detailOut, dataDrWithCalc: false };
-        const fieldsMetaKey = String(formDataPayload.fieldsMetaKey || '_bizFields');
-        let bizFields = meta && typeof meta === 'object' ? (meta[fieldsMetaKey] || {}) : {};
-        if (!bizFields || Object.keys(bizFields).length === 0)
-            bizFields = draftAction.params?.[fieldsMetaKey] || {};
-        nodeData.fields = {
-            main: bizFields && typeof bizFields === 'object' ? (bizFields.main || []) : [],
-            detail: bizFields && typeof bizFields === 'object' ? (bizFields.detail || []) : [],
-        };
+        nodeData.formData = { main, detail: detailOut, dataDrWithCalc: false, deleteMainFields: [] };
+        // ApproveCreateDTO 没有使用 fields；目标字段仅用于编译 mapping，不能写入保存 DTO。
+        if (nodeType !== 'ApproveCreate') {
+            const fieldsMetaKey = String(formDataPayload.fieldsMetaKey || '_bizFields');
+            let bizFields = meta && typeof meta === 'object' ? (meta[fieldsMetaKey] || {}) : {};
+            if (!bizFields || Object.keys(bizFields).length === 0)
+                bizFields = draftAction.params?.[fieldsMetaKey] || {};
+            nodeData.fields = {
+                main: bizFields && typeof bizFields === 'object' ? (bizFields.main || []) : [],
+                detail: bizFields && typeof bizFields === 'object' ? (bizFields.detail || []) : [],
+            };
+        }
     }
     else if (pendingDetail && !(pendingMapping || pendingConstants || pendingFormula)) {
         // 只有明细表赋值（无主表 mapping/constants）：先 _fill_setting 生成空 main + setting，再放回 detail。
@@ -1543,8 +1587,9 @@ export function convertNode(draftAction, isEvent = false, meta = null, appId = '
     }
     else if (formDataPayload && typeof formDataPayload === 'object') {
         // 声明 formDataPayload 的组件即使没有字段映射，也显式携带表单数据容器。
-        nodeData.formData ??= { main: {}, detail: [], dataDrWithCalc: false };
-        nodeData.fields ??= { main: [], detail: [] };
+        nodeData.formData ??= { main: {}, detail: [], dataDrWithCalc: false, deleteMainFields: [] };
+        if (nodeType !== 'ApproveCreate')
+            nodeData.fields ??= { main: [], detail: [] };
         nodeData.formDataId ??= genSfId();
     }
     else if ((pendingMapping || pendingConstants || pendingFormula) && !('setting' in nodeData)) {
@@ -1673,7 +1718,9 @@ export function convertNode(draftAction, isEvent = false, meta = null, appId = '
         // saveDesign 需要 fields 明确登记组件配置的可持久化字段。
         // 手工添加的 EnquiryForm 等节点都会带这组字段；仅发送 data
         // 会导致后端保存后无法按 data.id 读取配置，前端回显为全部必填为空。
-        node.fields = Object.keys(node.data || {});
+        // ApproveCreate 直接对应 ApproveCreateDTO，后端不接收该字段。
+        if (nodeType !== 'ApproveCreate')
+            node.fields = Object.keys(node.data || {});
         delete node.componentId;
         // 保留上面依据 previousNodeId 建立的 sources。组件目录壳只补前端元数据，
         // 不能把非首节点重新变成起始节点，否则平台会拒绝“有两个起始执行组件”。
@@ -1691,6 +1738,13 @@ export function convertNode(draftAction, isEvent = false, meta = null, appId = '
     if (postNode) {
         node = postNode(node, { draftAction, meta: meta || {}, appId, eventNodeId, isEvent });
     }
+    // ApproveCreateDTO 的保存请求不需要 fields；同时清掉可能由目录元数据或
+    // 旧编译结果带入的同名字段，避免它出现在最终请求 JSON 中。
+    if (nodeType === 'ApproveCreate') {
+        delete node.fields;
+        if (node.data && typeof node.data === 'object')
+            delete node.data.fields;
+    }
     return node;
 }
 // ── convert_condition ───────────────────────────────────────