weaver-e10-builder 1.6.15 → 1.6.16

package/dist/services/actionflow/components/approve_trigger.js

@@ -239,4 +239,3 @@ export function buildApproveTriggerConfigs(draftParams) {
         return buildApproveTriggerConfig(merged);
     });
 }
-//# sourceMappingURL=approve_trigger.js.map

package/dist/services/actionflow/components/approve_trigger_compiler.js

@@ -17,4 +17,3 @@ export function approveTriggerCompiler(draftParams, ctx) {
     }
     return result;
 }
-//# sourceMappingURL=approve_trigger_compiler.js.map

package/dist/services/actionflow/components/assign_var.js

@@ -130,4 +130,3 @@ export const REDUCE_VAR_COMPONENT = {
 export function reduceVarCompiler(draftParams, _ctx) {
     return compileNumericVariableData(draftParams, 'int');
 }
-//# sourceMappingURL=assign_var.js.map

package/dist/services/actionflow/components/condition.js

@@ -21,4 +21,3 @@ export const CONDITION_COMPONENT = {
     runtimeContext: { inputs: ['FormData'], outputs: [] },
     dataFields: {},
 };
-//# sourceMappingURL=condition.js.map

package/dist/services/actionflow/components/custom_set_form.js

@@ -1,6 +1,5 @@
 import { genSfId } from '../id_generator.js';
 import { buildFormulaReference } from './action_eb_update_compiler.js';
-import { resolveCustomTriggerDtoId } from '../custom_trigger_context.js';
 import { uniqueMachineKey } from '../machine_key.js';
 /**
  * 归一化 CustSetFormDto。
@@ -67,17 +66,10 @@ export function normalizeCustSetFormDto(raw, ctx, formType) {
                 const isFormulaBean = formulaValue && typeof formulaValue === 'object'
                     && (formulaValue.type || formulaValue.formulaType || formulaKind);
                 const formulaComponent = String(formulaValue?._resolvedContext?.componentType || ctx.meta?._upstream_component_type || 'Output');
-                const customFrontId = formulaComponent === 'CustomTrigger'
-                    ? resolveCustomTriggerDtoId(formulaValue?.paramKey ?? formulaValue?.key ?? formulaValue?.fieldKey ?? formulaValue?.value, ctx.meta?._custom_trigger_data, formulaValue?._resolvedContext?.dimension)
-                    : '';
-                const formulaWithCustomId = customFrontId || formulaValue;
-                const formulaInput = customFrontId && formulaValue && typeof formulaValue === 'object'
-                    ? { ...formulaValue, frontId: customFrontId, _resolvedContext: { ...(formulaValue._resolvedContext || {}), componentType: formulaComponent, fieldId: customFrontId } }
-                    : formulaWithCustomId;
                 field.formulaValue = formulaValue === undefined
                     ? undefined
                     : isFormulaBean
-                        ? buildFormulaReference(formulaInput, {
+                        ? buildFormulaReference(formulaValue, {
                             meta: ctx.meta,
                             appId: ctx.appId,
                             eventId: ctx.eventNodeId,
@@ -98,4 +90,3 @@ export function normalizeCustSetFormDto(raw, ctx, formType) {
         appId: String(ctx.appId || ''),
     };
 }
-//# sourceMappingURL=custom_set_form.js.map

package/dist/services/actionflow/components/custom_trigger.js

@@ -46,4 +46,3 @@ export function customTriggerCompiler(draftParams, ctx) {
     result.type = 'CustomTrigger';
     return result;
 }
-//# sourceMappingURL=custom_trigger.js.map

package/dist/services/actionflow/components/date_trigger.js

@@ -139,4 +139,3 @@ export function dateTriggerCompiler(draftParams, ctx) {
     }
     return result;
 }
-//# sourceMappingURL=date_trigger.js.map

package/dist/services/actionflow/components/dml_execute.js

@@ -1,4 +1,5 @@
-import { genSfId, normalizeNumericFrontId } from '../id_generator.js';
+import { genSfId } from '../id_generator.js';
+import { prepareResultSetParamDtos } from '../param_group_dto.js';
 import { buildFormulaReference } from './action_eb_update_compiler.js';
 const DATASET_MODULE = 'ESB';
 const DATASET_TYPE = 'out_offline_tool';
@@ -98,8 +99,6 @@ function normalizeFieldSet(raw, ctx) {
         const assign = values.map((value, pos) => {
             if (value && typeof value === 'object' && (value.type || value.formulaType) && !value.kind && !value.assignmentKind) {
                 const bean = { ...value };
-                if (Object.prototype.hasOwnProperty.call(bean, 'frontId'))
-                    bean.frontId = normalizeNumericFrontId(bean.frontId, 'DMLExecute FormulaBean.frontId');
                 return bean;
             }
             try {
@@ -165,7 +164,7 @@ export function dmlExecuteCompiler(draftParams, ctx) {
     if (result.resultSets !== undefined && result.resultSets !== null) {
         if (!Array.isArray(result.resultSets))
             throw new Error('DMLExecute.resultSets 必须是数组');
-        result.resultSets = result.resultSets.map((item, index) => {
+        result.resultSets = prepareResultSetParamDtos(result.resultSets).map((item, index) => {
             if (!item || typeof item !== 'object')
                 throw new Error(`DMLExecute.resultSets[${index}] 必须是对象`);
             const name = String(item.name ?? '').trim();
@@ -181,4 +180,3 @@ export function dmlExecuteCompiler(draftParams, ctx) {
     result.sqlContentDw = dw;
     return result;
 }
-//# sourceMappingURL=dml_execute.js.map

package/dist/services/actionflow/components/document_actions.js

@@ -1,7 +1,6 @@
 import { buildPersonFormula, formulaFixedForAssignSwitch } from '../formula_service.js';
 import { compileFormDataDtoAssignments } from './form_data_builder.js';
 import { buildFormulaReference } from './action_eb_update_compiler.js';
-import { normalizeNumericFrontId } from '../id_generator.js';
 const personSource = [{
         properties: ['operator', 'operatorId', 'applicant', 'employeeId', 'subscriber'], module: 'core.person_source',
         lookups: ['resourceData'], purpose: '解析人员 Browser 对象', fallback: 'real_candidate_only',
@@ -25,8 +24,6 @@ function formula(value, ctx, person = false) {
     const type = value && typeof value === 'object' ? String(value.type ?? '') : '';
     if (value && typeof value === 'object' && ['1', '3', '4', '5', '6', '8', '9', '10'].includes(type) && !value.kind) {
         const bean = { ...value };
-        if (Object.prototype.hasOwnProperty.call(bean, 'frontId'))
-            bean.frontId = normalizeNumericFrontId(bean.frontId, '文档 FormulaBean.frontId');
         return bean;
     }
     if (person && value && typeof value === 'object') {
@@ -495,4 +492,3 @@ export const documentActionComponents = [
     DOCUMENT_SAVE_COMPONENT, DOCUMENT_DELETE_COMPONENT, FILE_FOLDER_SAVE_COMPONENT, DOCUMENT_REVERT_COMPONENT, DOCUMENT_COPY_COMPONENT, DOCUMENT_MOVE_COMPONENT,
     DOCUMENT_SUBSCRIPTION_APPROVE_COMPONENT, DOCUMENT_SUBSCRIPTION_SEND_BACK_COMPONENT, DOCUMENT_SUBSCRIPTION_WITHDRAW_COMPONENT, DOCUMENT_SUBSCRIPTION_COMPONENT, ATTACHMENT_COPY_COMPONENT,
 ];
-//# sourceMappingURL=document_actions.js.map

package/dist/services/actionflow/components/eb_get_data_by_id.js

@@ -68,4 +68,3 @@ export function ebGetDataByIdCompiler(draftParams, ctx) {
     result.type = 'EbGetDataById';
     return result;
 }
-//# sourceMappingURL=eb_get_data_by_id.js.map

package/dist/services/actionflow/components/enquiry_form.js

@@ -163,4 +163,3 @@ export function enquiryFormCompiler(draftParams, ctx) {
     }
     return result;
 }
-//# sourceMappingURL=enquiry_form.js.map

package/dist/services/actionflow/components/event_button.js

@@ -31,4 +31,3 @@ export const EVENT_BUTTON_COMPONENT = {
     triggerType: 'EBTrigger',
     triggerTypeName: 'e-Builder事件触发',
 };
-//# sourceMappingURL=event_button.js.map

package/dist/services/actionflow/components/event_form_data.js

@@ -28,4 +28,3 @@ export const EVENT_FORM_DATA_COMPONENT = {
     triggerType: 'EBTrigger',
     triggerTypeName: 'e-Builder事件触发',
 };
-//# sourceMappingURL=event_form_data.js.map

package/dist/services/actionflow/components/form_data_builder.js

@@ -1,6 +1,6 @@
 import { buildSettingEntry } from '../formula_service.js';
 import { defaultOptionAssignType } from '../option_field_types.js';
-import { genSfId, normalizeNumericFrontId } from '../id_generator.js';
+import { genSfId, requireContextFieldId } from '../id_generator.js';
 /**
  * Normalize the field-level options used by set-formdata.  The semantic CLI
  * accepts these beside an assignment, while the saved DTO keeps them under
@@ -160,7 +160,7 @@ function objectValue(value) {
     return value && typeof value === 'object' && !Array.isArray(value) ? value : {};
 }
 /** 从字段编译结果里的真实依据值下级公式提取源明细元数据。 */
-function detailBasisFromEntry(entry, ctx, scope, tableName) {
+function detailBasisFromEntry(entry, assignment, ctx, scope, tableName) {
     const candidates = [];
     const visit = (value, seen = new Set()) => {
         if (!value || typeof value !== 'object' || seen.has(value))
@@ -198,8 +198,30 @@ function detailBasisFromEntry(entry, ctx, scope, tableName) {
         throw new Error(`${scope}.fieldAssignments.detail[${tableName}] 的来源字段缺少完整的表单明细依据值元数据`);
     }
     const basisParamKey = path.slice(prefix.length);
-    const sourceTableToken = basisParamKey.slice(0, basisParamKey.indexOf('[]')).split('.').filter(Boolean).pop() || '';
-    const frontId = normalizeNumericFrontId(sourceTableToken, `${scope}.fieldAssignments.detail 依据值 frontId`);
+    const parentIds = new Set();
+    const findBasisId = (value) => {
+        if (Array.isArray(value)) {
+            value.forEach(findBasisId);
+            return;
+        }
+        if (!value || typeof value !== 'object')
+            return;
+        const resolved = objectValue(value._resolvedContext);
+        if (String(resolved.tablePrimaryKey || '') === tablePrimaryKey) {
+            const rows = Array.isArray(resolved.tableContext?.tableData) ? resolved.tableContext.tableData : [];
+            for (const row of rows) {
+                if (String(row?.paramKey || '') === basisParamKey && row.id !== undefined && row.id !== null && String(row.id) !== '')
+                    parentIds.add(String(row.id));
+            }
+        }
+        for (const [key, child] of Object.entries(value))
+            if (key !== '_resolvedContext')
+                findBasisId(child);
+    };
+    findBasisId(assignment);
+    if (parentIds.size !== 1)
+        throw new Error(`${scope}.fieldAssignments.detail[${tableName}] 未能从来源上下文唯一确定明细表字段 ID`);
+    const frontId = requireContextFieldId([...parentIds][0], `${scope}.fieldAssignments.detail 依据值 frontId`);
     const parentName = String(config.parentName || config.newParentName || '').trim();
     const sourceId = String(config.comId || bean.config?.source || '').trim();
     const componentType = String(config.comType || '').trim();
@@ -312,7 +334,7 @@ export function buildFormDataSetting(assignments, schema, ctx, options = {}) {
                 const field = findField(table.fields || [], String(key), `${scope}.fieldAssignments.detail[${String(configured.table.tableName || detailTableId)}]`);
                 const entry = buildEsbFormField(String(field.id), value, String(field.componentKey || field.type || 'Text'), ctx.meta, ctx.appId, ctx.eventNodeId, 'OPERATE_EQUAL', scope, true, '', settingOptions(value));
                 data[String(field.id)] = entry;
-                const candidate = detailBasisFromEntry(entry, ctx, scope, String(configured.table.tableName || detailTableId));
+                const candidate = detailBasisFromEntry(entry, value, ctx, scope, String(configured.table.tableName || detailTableId));
                 if (candidate) {
                     const basisIdentity = (value) => JSON.stringify([
                         value.value, value.frontId, value.source, value.config?.paramKey,
@@ -337,4 +359,3 @@ export function buildFormDataSetting(assignments, schema, ctx, options = {}) {
     }
     return buildEsbFormDataDto(main, detail, { dataDrWithCalc: options.dataDrWithCalc ?? false });
 }
-//# sourceMappingURL=form_data_builder.js.map

package/dist/services/actionflow/components/hrm_actions.js

@@ -1,6 +1,6 @@
 import { buildAssignBean, buildPersonFormula, formulaFixedForAssignSwitch, ftNorm } from '../formula_service.js';
 import { buildFormDataSetting } from './form_data_builder.js';
-import { genSfId, normalizeNumericFrontId } from '../id_generator.js';
+import { genSfId } from '../id_generator.js';
 const personSource = [{
         properties: ['operators', 'personList', 'person'], module: 'core.person_source', lookups: ['resourceData'],
         purpose: '解析当前租户人员 Browser 原对象', fallback: 'real_candidate_only',
@@ -8,8 +8,6 @@ const personSource = [{
 function personFormula(value, ctx, field, multiple = false) {
     if (value && typeof value === 'object' && String(value.type ?? '') === '1' && !value.kind) {
         const bean = { ...value };
-        if (Object.prototype.hasOwnProperty.call(bean, 'frontId'))
-            bean.frontId = normalizeNumericFrontId(bean.frontId, '人员 FormulaBean.frontId');
         return bean;
     }
     const values = Array.isArray(value) ? value : [value];
@@ -251,4 +249,3 @@ export function hrmActionCompiler(type, draft, ctx) {
     result.type = type;
     return result;
 }
-//# sourceMappingURL=hrm_actions.js.map

package/dist/services/actionflow/components/http.js

@@ -213,4 +213,3 @@ export function httpCompiler(draftParams, ctx) {
     result.type = params.type;
     return result;
 }
-//# sourceMappingURL=http.js.map

package/dist/services/actionflow/components/index.js

@@ -121,6 +121,7 @@ COMPILERS.set('EnquiryForm', enquiryFormCompiler);
 COMPILERS.set('SendMessage', sendMessageCompiler);
 COMPILERS.set('MeetingCreate', meetingCreateCompiler);
 COMPILERS.set('ScheduleCreate', scheduleCreateCompiler);
+COMPILERS.set('MultipleExecution', multipleExecutionCompiler);
 COMPILERS.set('ApproveTrigger', approveTriggerCompiler);
 COMPILERS.set('CustomTrigger', customTriggerCompiler);
 COMPILERS.set('WebHookTrigger', webHookTriggerCompiler);
@@ -129,7 +130,6 @@ COMPILERS.set('InnerMQSend', innerMqSendCompiler);
 COMPILERS.set('InnerMQListener', innerMqListenerCompiler);
 for (const [type, compiler] of Object.entries(workflowCompilers))
     COMPILERS.set(type, compiler);
-COMPILERS.set('MultipleExecution', multipleExecutionCompiler);
 COMPILERS.set('LogicFlowSet', logicFlowSetCompiler);
 COMPILERS.set('DMLExecute', dmlExecuteCompiler);
 COMPILERS.set('Http', httpCompiler);
@@ -163,4 +163,3 @@ export function listTypes(nodeRole) {
     }
     return [...COMPONENTS.keys()];
 }
-//# sourceMappingURL=index.js.map

package/dist/services/actionflow/components/inner_mq_listener.js

@@ -21,7 +21,7 @@ export const INNER_MQ_LISTENER_COMPONENT = {
         },
         receiveParams: {
             required: false,
-            description: '接收参数设置。使用前端字段表保存的 ParamSettingBean（tableId + tableData）；没有业务接收字段时省略。',
+            description: '接收参数设置。使用前端字段表保存的 ParamSettingBean（tableId + tableData）；明细数组以 paramType=json、dataType=node、arrs=true 的父参数行表示，下级参数用 parentId 指向父行 id。下游字段及依据值先查询实际组件上下文，不根据参数名推导 ID。',
             valueType: 'platform_param_setting',
             valueShape: 'object',
         },
@@ -87,4 +87,3 @@ export function innerMqListenerCompiler(draftParams, ctx) {
         result.receiveParams = receiveParams;
     return result;
 }
-//# sourceMappingURL=inner_mq_listener.js.map

package/dist/services/actionflow/components/inner_mq_send.js

@@ -1,5 +1,6 @@
 import { buildAssignBean, buildSettingEntry, formulaContainerString, formulaFixedForAssignSwitch } from '../formula_service.js';
 import { buildParamMappingBasisFormula } from '../param_mapping_basis.js';
+import { prepareNativeParamMapping, paramDtoNeedsAllocation, remapParamInputBasisIds } from '../param_group_dto.js';
 export const INNER_MQ_SEND_COMPONENT = {
     type: 'InnerMQSend',
     nodeRole: 'action',
@@ -55,7 +56,10 @@ export function innerMqSendCompiler(draftParams, ctx) {
     if (draftParams.sendParams === undefined || draftParams.sendParams === null || typeof draftParams.sendParams !== 'object' || Array.isArray(draftParams.sendParams)) {
         throw new Error('InnerMQSend.sendParams 必须是平台 ParamMappingBean 对象');
     }
-    const params = { ...draftParams, queueName: undefined, inputParams: undefined };
+    const prepared = paramDtoNeedsAllocation(draftParams.sendParams, true)
+        ? prepareNativeParamMapping(draftParams.sendParams) : draftParams.sendParams;
+    const inputParams = remapParamInputBasisIds(draftParams.sendParams, prepared, draftParams.inputParams);
+    const params = { ...draftParams, sendParams: prepared, queueName: undefined, inputParams: undefined };
     const result = ctx.compileGeneric(params, 'InnerMQSend', ctx);
     if (rawQueueName && typeof rawQueueName === 'object' && !Array.isArray(rawQueueName)) {
         const kind = String(rawQueueName.kind || rawQueueName.assignmentKind || '');
@@ -79,7 +83,7 @@ export function innerMqSendCompiler(draftParams, ctx) {
         const sendParams = JSON.parse(JSON.stringify(result.sendParams));
         const rows = Array.isArray(sendParams.tableData) ? sendParams.tableData : [];
         const seen = new Set();
-        const assignments = draftParams.inputParams.map((item, index) => ({ item, index })).sort((a, b) => String(a.item?.paramKey || '').split('.').length - String(b.item?.paramKey || '').split('.').length);
+        const assignments = inputParams.map((item, index) => ({ item, index })).sort((a, b) => String(a.item?.paramKey || '').split('.').length - String(b.item?.paramKey || '').split('.').length);
         for (const { index, item } of assignments) {
             if (!item || typeof item !== 'object' || Array.isArray(item))
                 throw new Error(`InnerMQSend.inputParams[${index}] 必须是对象`);
@@ -114,4 +118,3 @@ export function innerMqSendCompiler(draftParams, ctx) {
     result.type = 'InnerMQSend';
     return result;
 }
-//# sourceMappingURL=inner_mq_send.js.map

package/dist/services/actionflow/components/logic_flow_set.js

@@ -148,4 +148,3 @@ export const logicFlowSetPostNode = (node) => {
     node.isOpen = false;
     return node;
 };
-//# sourceMappingURL=logic_flow_set.js.map

package/dist/services/actionflow/components/meeting_create.js

@@ -39,4 +39,3 @@ export const MEETING_CREATE_COMPONENT = {
 export function meetingCreateCompiler(draftParams, ctx) {
     return mapMeetingCreate(draftParams, ctx.meta, ctx.appId, ctx.eventNodeId);
 }
-//# sourceMappingURL=meeting_create.js.map