weaver-e10-builder 1.2.3 → 1.2.5

package/dist/services/actionflow/workflow_compiler.js

@@ -599,6 +599,7 @@ export function fillSetting(result, updates, mapping, constants, formula, meta,
         dataDrWithCalc: false,
         main,
         detail: [],
+        deleteMainFields: [],
         updateFieldCondition: { updateField: [] },
     };
 }
@@ -1244,6 +1245,32 @@ export function buildConditionDetail(condition, sourceId, meta = null) {
     };
 }
 // ── _build_setting_detail ───────────────────────────────────
+function buildDetailRowId(value, meta, appId, eventId, nodeType) {
+    if (!value || typeof value !== 'object')
+        throw new Error('明细 rowId 必须是固定值、上下文或其他动态赋值对象');
+    const raw = value.assign ?? value.value ?? value;
+    let assign;
+    if (raw && typeof raw === 'object' && (raw.type || raw.formulaType) && !raw.kind)
+        assign = { ...raw };
+    else
+        assign = buildFormulaReference(raw, { meta, appId, eventId, componentType: nodeType });
+    attachEsbAssign(assign, meta, eventId);
+    const assignId = String(value.assignId || assign.id || genSfId());
+    const fieldId = value.id ?? value.primaryId ?? assignId;
+    return {
+        id: String(fieldId),
+        primaryId: value.primaryId == null ? String(fieldId) : value.primaryId,
+        original: false,
+        assign,
+        assignId,
+        operate: value.operate || 'OPERATE_EQUAL',
+        assignType: value.assignType || '',
+        fieldType: value.fieldType || 'Text',
+        switchType: value.switchType || (String(assign.type || assign.formulaType) === '1' ? 'fixvalue' : 'assign'),
+        multiSelect: value.multiSelect === true,
+        fieldKey: 'rowId',
+    };
+}
 export function buildSettingDetail(nodeData, detailItems, meta, appId, eventId, nodeType) {
     if (!Array.isArray(detailItems))
         return;
@@ -1251,6 +1278,13 @@ export function buildSettingDetail(nodeData, detailItems, meta, appId, eventId,
     for (const item of detailItems) {
         if (!item || typeof item !== 'object' || !item.detailTableId)
             continue;
+        if (nodeType === 'ActionEbAdd') {
+            const strategyKeys = ['operateType', 'updateType', 'updateFieldCondition', 'updatePolicy', 'rowId'];
+            const configured = strategyKeys.filter((key) => item[key] !== undefined && item[key] !== null && item[key] !== '');
+            if (configured.length) {
+                throw new Error(`ActionEbAdd.detail 明细策略固定为新增，不支持 ${configured.join('、')}；请使用 ActionEbUpdate`);
+            }
+        }
         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 });
@@ -1262,7 +1296,14 @@ export function buildSettingDetail(nodeData, detailItems, meta, appId, eventId,
         // 明细项依据值：引用整个明细表，source=event 节点 id, frontId=明细表 id。
         if (item.basisValue && typeof item.basisValue === 'object') {
             const bvVal = item.basisValue;
-            const bvKey = String(bvVal.paramKey || bvVal.key || '').trim();
+            let bvKey = String(bvVal.paramKey || bvVal.key || '').trim();
+            if (bvKey && !bvKey.includes('[]')) {
+                const wfId = String(meta?._workflow_id || '');
+                const keyIndex = wfId ? getWorkflowContextFieldsByKey()[wfId] || {} : {};
+                const arrayKey = `${bvKey}[]`;
+                if (keyIndex[arrayKey] && !keyIndex[bvKey])
+                    bvKey = arrayKey;
+            }
             const bvLabel = String(bvVal.label || bvVal.name || bvKey);
             if (bvKey) {
                 const bvType = resolveSourceFieldType(bvKey, meta);
@@ -1278,6 +1319,7 @@ export function buildSettingDetail(nodeData, detailItems, meta, appId, eventId,
                     frontId: bvSubformId,
                     formulaType: bvType,
                     name: bvLabel,
+                    businessId: appId,
                     id: genSfId(),
                     source: String(eventId),
                     type: '3',
@@ -1306,6 +1348,10 @@ export function buildSettingDetail(nodeData, detailItems, meta, appId, eventId,
         }
         const mapping = item.mapping || {};
         const constants = item.constants || {};
+        const detailTargetFormId = String((nodeData.targetForm || {}).id || '');
+        const targetDetailFields = detailTargetFormId
+            ? (getTargetDetailFields()[detailTargetFormId] || {})[String(item.detailTableId)] || {}
+            : {};
         if (mapping && typeof mapping === 'object' && !Array.isArray(mapping)) {
             for (const [sourceKey, targetFieldIdRaw] of Object.entries(mapping)) {
                 const targetFieldId = targetFieldIdRaw;
@@ -1326,10 +1372,16 @@ 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 || '');
-                    assignment = { kind: 'context', paramKey: refKey, label: refLabel };
+                    const declaredKind = String(targetFieldId.kind || targetFieldId.assignmentKind || 'context');
+                    assignment = {
+                        ...(targetFieldId.assignment && typeof targetFieldId.assignment === 'object' ? targetFieldId.assignment : {}),
+                        kind: declaredKind, paramKey: refKey, label: refLabel,
+                    };
                     if (refDetail)
                         assignment.detailLabel = refDetail;
-                    eleData[raw] = buildSettingEntry(raw, assignment, 'Text', meta, appId, eventId, operate, nodeType, true, '');
+                    const targetMeta = targetDetailFields[raw] || {};
+                    const targetType = String(targetMeta.componentKey || targetMeta.type || 'Text');
+                    eleData[raw] = buildSettingEntry(raw, assignment, targetType, meta, appId, eventId, operate, nodeType, true, '');
                 }
                 else {
                     let raw = String(targetFieldId);
@@ -1342,16 +1394,20 @@ 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)) };
-                    eleData[raw] = buildSettingEntry(raw, assignment, 'Text', meta, appId, eventId, operate, nodeType, true, '');
+                    const targetMeta = targetDetailFields[raw] || {};
+                    const targetType = String(targetMeta.componentKey || targetMeta.type || 'Text');
+                    eleData[raw] = buildSettingEntry(raw, assignment, targetType, meta, appId, eventId, operate, nodeType, true, '');
                 }
             }
         }
         if (constants && typeof constants === 'object' && !Array.isArray(constants)) {
             for (const [targetFieldIdRaw, valueRaw] of Object.entries(constants)) {
                 const targetFieldId = String(targetFieldIdRaw);
-                const value = valueRaw;
+                const targetMeta = targetDetailFields[targetFieldId] || {};
+                const value = resolveEnumConstant(valueRaw, targetMeta);
                 const [assignment, ft] = normalizeConstantAssignment(value, 'Text');
-                eleData[targetFieldId] = buildSettingEntry(targetFieldId, assignment, ft, meta, appId, eventId, 'OPERATE_EQUAL', nodeType, true, '');
+                const targetType = String(targetMeta.componentKey || targetMeta.type || ft);
+                eleData[targetFieldId] = buildSettingEntry(targetFieldId, assignment, targetType, meta, appId, eventId, 'OPERATE_EQUAL', nodeType, true, '');
             }
         }
         const formula = item.formula || {};
@@ -1372,14 +1428,22 @@ export function buildSettingDetail(nodeData, detailItems, meta, appId, eventId,
         const targetFormId = String((nodeData.targetForm || {}).id || '');
         autoFillDetailMapping(eleData, item, targetFormId, meta, appId, eventId, nodeType);
         ele.data = eleData;
-        if (item.deleteFields)
-            ele.deleteFields = item.deleteFields;
+        ele.deleteFields = Array.isArray(item.deleteFields) ? item.deleteFields : [];
+        // EsbDetailForm 的明细操作值来自 ActionEbDlg：add/update/updateAdd/cover/delete/default。
+        // ActionEbAdd 没有明细操作选择器，不能写入不存在的 "insert"；缺省操作由 ADD
+        // 组件按新增明细处理。ActionEbUpdate 则保留用户明确选择的策略。
         if (item.operateType)
-            ele.operateType = item.operateType;
-        else
+            ele.operateType = String(item.operateType);
+        else if (nodeType !== 'ActionEbAdd' && nodeType !== 'ActionEbUpdate')
             ele.operateType = 'insert';
-        if (item.updateFieldCondition && typeof item.updateFieldCondition === 'object')
-            ele.updateFieldCondition = item.updateFieldCondition;
+        if (item.updateType)
+            ele.updateType = String(item.updateType);
+        if (item.updatePolicy !== undefined && item.updatePolicy !== null && item.updatePolicy !== '') {
+            ele.updatePolicy = String(item.updatePolicy);
+        }
+        if (item.rowId !== undefined && item.rowId !== null && item.rowId !== '') {
+            ele.rowId = buildDetailRowId(item.rowId, meta, appId, String(eventId), nodeType);
+        }
         detailOut.push(ele);
     }
     if (detailOut.length)
@@ -1815,20 +1879,25 @@ export function convert(draft, appId = '', sceneId = '', metadataPath = '', leni
         meta = JSON.parse(fs.readFileSync(metadataPath, 'utf-8'));
     if (!meta || typeof meta !== 'object')
         meta = {};
+    let draftEvent = draft.event || {};
+    let draftActions = draft.actions || [];
     meta._scene_id = String(sceneId || '');
     meta._http_response_fields = collectHttpResponseFields(draft.actions || []);
     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 || [];
+    // 事件上下文来源对所有事件类型都有效；CustomTrigger 没有 workflowId，
+    // 不能等到 workflowId 分支里再设置，否则其字段公式会被误判为 ApprovalData。
     const lenientWarnings = [];
     if ('resolvedPlan' in draft) {
         const rp = draft.resolvedPlan;
         draftEvent = rp.event || {};
         draftActions = rp.actions || [];
     }
+    // 事件上下文来源对所有事件类型都有效；CustomTrigger 没有 workflowId，
+    // 不能等到 workflowId 分支里再设置，否则其字段公式会被误判为 ApprovalData。
+    meta._upstream_component_type = String(draftEvent?.type || 'ApproveTrigger');
     const eventNode = convertNode(draftEvent, true, meta, appId);
     const eventId = eventNode.id;
     const eventName = String(eventNode.attr?.componentName || eventNode.data?.typeName || eventNode.name || '流程触发');
@@ -1873,7 +1942,6 @@ export function convert(draft, appId = '', sceneId = '', metadataPath = '', leni
                 eventFormId = workflowId;
         }
         meta._event_form_id = eventFormId;
-        meta._upstream_component_type = String(draftEvent?.type || 'ApproveTrigger');
         let wfName = '';
         if (Array.isArray(workflowPath) && workflowPath.length && workflowPath[0] && typeof workflowPath[0] === 'object')
             wfName = String(workflowPath[0].name || workflowPath[0].text || '');