weaver-e10-builder 1.5.6 → 1.5.7

package/dist/services/actionflow/workflow_compiler.js

@@ -6,8 +6,9 @@
 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, buildSettingEntry, buildAssignBean, attachEsbAssign, resolveEnumConstant, resolveParamKey, resolveSourceFieldLabel, resolveSourceFieldType, normalizeConstantAssignment, lookupTargetFieldMeta, formulaFixedForAssignSwitch, formulaSystemVar, formulaContext, assignFlatContextDirect, getFormulaFn, formulaFunction, contextRootForComponent, contextTableNameForRoot, normalizeContextParamKey, } from './formula_service.js';
+import { buildPersonFormula, 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';
@@ -443,7 +444,7 @@ export function fillSetting(result, updates, mapping, constants, formula, meta,
                 const sourceType = field.type ?? '';
                 fieldType = { String: 'Text', string: 'Text', Number: 'NumberComponent', number: 'NumberComponent' }[sourceType] ?? (sourceType || 'Text');
             }
-            main[String(fid)] = buildSettingEntry(String(fid), u, fieldType, meta, appId, String(eventId), 'OPERATE_EQUAL', componentType, false, assignmentMode);
+            main[String(fid)] = buildEsbFormField(String(fid), u, fieldType, meta, appId, String(eventId), 'OPERATE_EQUAL', componentType, false, assignmentMode);
         }
     }
     if (mapping && typeof mapping === 'object' && !Array.isArray(mapping)) {
@@ -456,7 +457,7 @@ export function fillSetting(result, updates, mapping, constants, formula, meta,
                     const tfid = String(targetFieldId.target || '');
                     if (!tfid)
                         throw new Error(`mapping 系统变量值缺少目标字段 id: 应传 {'target':'<目标字段id>', 'systemValue':'currentUser'}`);
-                    main[tfid] = buildSettingEntry(tfid, { kind: 'system_variable', key: svKey }, 'Text', meta, appId, String(eventId), 'OPERATE_EQUAL', componentType, false, assignmentMode);
+                    main[tfid] = buildEsbFormField(tfid, { kind: 'system_variable', key: svKey }, 'Text', meta, appId, String(eventId), 'OPERATE_EQUAL', componentType, false, assignmentMode);
                     continue;
                 }
                 const declaredKind = String(targetFieldId.kind || targetFieldId.assignmentKind || 'context');
@@ -512,7 +513,7 @@ export function fillSetting(result, updates, mapping, constants, formula, meta,
                 const srcFt = resolveSourceFieldType(srcParamKey, meta);
                 const targetMeta = lookupTargetFieldMeta(raw, result);
                 const targetFt = String(targetMeta?.componentKey || targetMeta?.type || srcFt || 'Text');
-                main[raw] = buildSettingEntry(raw, assignment, targetFt, meta, appId, String(eventId), operate, componentType, false, assignmentMode);
+                main[raw] = buildEsbFormField(raw, assignment, targetFt, meta, appId, String(eventId), operate, componentType, false, assignmentMode);
             }
             else {
                 let raw = String(targetFieldId);
@@ -530,7 +531,7 @@ export function fillSetting(result, updates, mapping, constants, formula, meta,
                 const srcFt = resolveSourceFieldType(refKey, meta);
                 const targetMeta = lookupTargetFieldMeta(raw, result);
                 const targetFt = String(targetMeta?.componentKey || targetMeta?.type || srcFt || 'Text');
-                main[raw] = buildSettingEntry(raw, assignment, targetFt, meta, appId, String(eventId), operate, componentType, false, assignmentMode);
+                main[raw] = buildEsbFormField(raw, assignment, targetFt, meta, appId, String(eventId), operate, componentType, false, assignmentMode);
             }
         }
     }
@@ -549,7 +550,7 @@ export function fillSetting(result, updates, mapping, constants, formula, meta,
             // 固定枚举值的外层 fieldType 必须是目标组件类型（例如 Select），
             // 与手工保存 JSON 一致；使用默认 Text 会导致设计器下拉回显为空。
             const targetFieldType = String(fieldMeta?.componentKey || fieldMeta?.type || ft);
-            main[tfid] = buildSettingEntry(tfid, assignment, targetFieldType, meta, appId, String(eventId), operateC, componentType, false, assignmentMode);
+            main[tfid] = buildEsbFormField(tfid, assignment, targetFieldType, meta, appId, String(eventId), operateC, componentType, false, assignmentMode);
         }
     }
     if (formula && typeof formula === 'object' && !Array.isArray(formula)) {
@@ -560,7 +561,7 @@ export function fillSetting(result, updates, mapping, constants, formula, meta,
             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);
+                main[String(targetFieldId)] = buildEsbFormField(String(targetFieldId), fspec, targetFieldType, meta, appId, String(eventId), 'OPERATE_EQUAL', componentType, false, assignmentMode);
                 continue;
             }
             const op = fspec.op || 'add';
@@ -609,15 +610,11 @@ export function fillSetting(result, updates, mapping, constants, formula, meta,
             main[fidS] = { formFieldKey: '', value: { original: false, operate: 'OPERATE_EQUAL', fieldKey: fidS, multiSelect: false } };
         }
     }
-    result.setting = {
+    result.setting = buildEsbFormDataDto(main, [], {
         opType: result.opType ?? 'insert',
         updatePolicy: result.updatePolicy ?? 'ALL',
-        dataDrWithCalc: false,
-        main,
-        detail: [],
-        deleteMainFields: [],
         updateFieldCondition: { updateField: [] },
-    };
+    });
 }
 // ── filter 筛选条件树 ───────────────────────────────────────
 function isFilterGroup(value) {
@@ -1416,7 +1413,7 @@ export function buildSettingDetail(nodeData, detailItems, meta, appId, eventId,
                         assignment.detailLabel = refDetail;
                     const targetMeta = targetDetailFields[raw] || {};
                     const targetType = String(targetMeta.componentKey || targetMeta.type || 'Text');
-                    eleData[raw] = buildSettingEntry(raw, assignment, targetType, meta, appId, eventId, operate, nodeType, true, '');
+                    eleData[raw] = buildEsbFormField(raw, assignment, targetType, meta, appId, eventId, operate, nodeType, true, '');
                 }
                 else {
                     let raw = String(targetFieldId);
@@ -1431,7 +1428,7 @@ export function buildSettingDetail(nodeData, detailItems, meta, appId, eventId,
                     assignment = { kind: 'context', paramKey: String(sourceKey), label: resolveSourceFieldLabel(String(sourceKey), meta, String(sourceKey)) };
                     const targetMeta = targetDetailFields[raw] || {};
                     const targetType = String(targetMeta.componentKey || targetMeta.type || 'Text');
-                    eleData[raw] = buildSettingEntry(raw, assignment, targetType, meta, appId, eventId, operate, nodeType, true, '');
+                    eleData[raw] = buildEsbFormField(raw, assignment, targetType, meta, appId, eventId, operate, nodeType, true, '');
                 }
             }
         }
@@ -1442,7 +1439,7 @@ export function buildSettingDetail(nodeData, detailItems, meta, appId, eventId,
                 const value = resolveEnumConstant(valueRaw, targetMeta);
                 const [assignment, ft] = normalizeConstantAssignment(value, 'Text');
                 const targetType = String(targetMeta.componentKey || targetMeta.type || ft);
-                eleData[targetFieldId] = buildSettingEntry(targetFieldId, assignment, targetType, meta, appId, eventId, 'OPERATE_EQUAL', nodeType, true, '');
+                eleData[targetFieldId] = buildEsbFormField(targetFieldId, assignment, targetType, meta, appId, eventId, 'OPERATE_EQUAL', nodeType, true, '');
             }
         }
         const formula = item.formula || {};
@@ -1456,7 +1453,7 @@ export function buildSettingDetail(nodeData, detailItems, meta, appId, eventId,
                     continue;
                 const targetMeta = targetDetailFields[String(targetFieldId)] || {};
                 const targetType = String(targetMeta.componentKey || targetMeta.type || formulaSpec.resultType || 'Text');
-                eleData[String(targetFieldId)] = buildSettingEntry(String(targetFieldId), formulaSpec, targetType, meta, appId, eventId, 'OPERATE_EQUAL', nodeType, true, '');
+                eleData[String(targetFieldId)] = buildEsbFormField(String(targetFieldId), formulaSpec, targetType, meta, appId, eventId, 'OPERATE_EQUAL', nodeType, true, '');
             }
         }
         // detail 自动按名补全
@@ -1512,7 +1509,7 @@ export function autoFillDetailMapping(eleData, item, targetFormId, meta, appId,
         const assignment = { kind: 'context', paramKey: srcPk, label: tname };
         if (bvLabel)
             assignment.detailLabel = bvLabel;
-        eleData[tidS] = buildSettingEntry(tidS, assignment, String(tmeta.componentKey || tmeta.type || 'Text'), meta, appId, eventId, 'OPERATE_EQUAL', nodeType, true, '');
+        eleData[tidS] = buildEsbFormField(tidS, assignment, String(tmeta.componentKey || tmeta.type || 'Text'), meta, appId, eventId, 'OPERATE_EQUAL', nodeType, true, '');
     }
 }
 // ── convert_node ────────────────────────────────────────────
@@ -1567,7 +1564,7 @@ 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, deleteMainFields: [] };
+        nodeData.formData = buildEsbFormDataDto(main, detailOut);
         // ApproveCreateDTO 没有使用 fields；目标字段仅用于编译 mapping，不能写入保存 DTO。
         if (nodeType !== 'ApproveCreate') {
             const fieldsMetaKey = String(formDataPayload.fieldsMetaKey || '_bizFields');
@@ -1588,7 +1585,7 @@ export function convertNode(draftAction, isEvent = false, meta = null, appId = '
     }
     else if (formDataPayload && typeof formDataPayload === 'object') {
         // 声明 formDataPayload 的组件即使没有字段映射，也显式携带表单数据容器。
-        nodeData.formData ??= { main: {}, detail: [], dataDrWithCalc: false, deleteMainFields: [] };
+        nodeData.formData ??= buildEsbFormDataDto();
         if (nodeType !== 'ApproveCreate')
             nodeData.fields ??= { main: [], detail: [] };
         nodeData.formDataId ??= genSfId();
@@ -1639,7 +1636,7 @@ export function convertNode(draftAction, isEvent = false, meta = null, appId = '
                     continue;
                 const targetFieldMeta = lookupTargetFieldMeta(raw, nodeData);
                 const targetFieldType = String(targetFieldMeta?.componentKey || targetFieldMeta?.type || 'Text');
-                main[raw] = buildSettingEntry(raw, { kind: 'context', paramKey: String(sourceKey), label: String(sourceKey) }, targetFieldType, meta || {}, appId, eventNodeId || nidStr, operate, nodeType, false, assignmentMode);
+                main[raw] = buildEsbFormField(raw, { kind: 'context', paramKey: String(sourceKey), label: String(sourceKey) }, targetFieldType, meta || {}, appId, eventNodeId || nidStr, operate, nodeType, false, assignmentMode);
             }
         }
         if (pendingConstants && typeof pendingConstants === 'object') {
@@ -1656,7 +1653,7 @@ export function convertNode(draftAction, isEvent = false, meta = null, appId = '
                 rawV = resolveEnumConstant(rawV, targetFieldMeta);
                 const [assignment, ft] = normalizeConstantAssignment(rawV, 'Text');
                 const targetFieldType = String(targetFieldMeta?.componentKey || targetFieldMeta?.type || ft);
-                main[targetFieldId] = buildSettingEntry(targetFieldId, assignment, targetFieldType, meta || {}, appId, eventNodeId || nidStr, operateC, nodeType, false, assignmentMode);
+                main[targetFieldId] = buildEsbFormField(targetFieldId, assignment, targetFieldType, meta || {}, appId, eventNodeId || nidStr, operateC, nodeType, false, assignmentMode);
             }
         }
         nodeData.setting.main = main;