weaver-e10-builder 1.5.2 → 1.5.4

package/dist/services/actionflow/param_group_dto.js

@@ -0,0 +1,181 @@
+import { genSfId } from './id_generator.js';
+const REQUEST_TABLES = ['Params', 'Header', 'Body'];
+const MAPPING_TABLES = ['Body', 'Header', 'StatusCode'];
+function clone(value) {
+    return JSON.parse(JSON.stringify(value));
+}
+function missingId(value) {
+    return value === undefined || value === null || String(value).trim() === '' || String(value).trim() === '0';
+}
+function nativeId(value) {
+    const id = String(value ?? '').trim();
+    return missingId(id) || !/^\d+$/.test(id) ? genSfId() : id;
+}
+function asIdList(value) {
+    return Array.isArray(value) ? value.filter((item) => !missingId(item)).map(String) : [];
+}
+function normalizeParamRows(rawRows, tableName) {
+    const rows = rawRows.map((raw, index) => {
+        if (!raw || typeof raw !== 'object' || Array.isArray(raw)) {
+            throw new Error(`${tableName}.tableData[${index}] 必须是 ParamBean 对象`);
+        }
+        const sourceId = raw.id ?? raw.paramId;
+        const sourceKey = missingId(sourceId) ? `__row_${index}` : String(sourceId);
+        const parentSourceId = raw.parentId === undefined || raw.parentId === null || String(raw.parentId) === ''
+            ? '' : String(raw.parentId);
+        return { raw: clone(raw), sourceId: sourceKey, parentSourceId, id: nativeId(sourceId) };
+    });
+    const idMap = new Map(rows.map((item) => [item.sourceId, item.id]));
+    const rowMap = new Map(rows.map((item) => [item.sourceId, item]));
+    const pathBySource = (sourceId, visiting = new Set()) => {
+        const current = rowMap.get(sourceId);
+        if (!current)
+            return '';
+        if (visiting.has(sourceId))
+            throw new Error(`${tableName}.tableData 存在循环 parentId: ${sourceId}`);
+        visiting.add(sourceId);
+        const parentPath = current.parentSourceId ? pathBySource(current.parentSourceId, visiting) : '';
+        visiting.delete(sourceId);
+        const paramName = String(current.raw.paramName ?? current.raw.showName ?? current.raw.paramKey ?? '').trim();
+        return `${parentPath ? `${parentPath}.` : ''}${paramName}${current.raw.arrs ? '[]' : ''}`;
+    };
+    const normalized = rows.map(({ raw, sourceId, parentSourceId, id }, index) => {
+        const paramName = String(raw.paramName ?? raw.showName ?? raw.paramKey ?? '').trim();
+        if (!paramName)
+            throw new Error(`${tableName}.tableData[${index}].paramName 不能为空`);
+        if (parentSourceId && !idMap.has(parentSourceId)) {
+            throw new Error(`${tableName}.tableData[${index}].parentId '${parentSourceId}' 不在同一张表的字段中`);
+        }
+        // ParamBean 是后端保存 DTO。value、fieldType、type、formulaType 等是语义计划
+        // 或前端展示字段，不能代替 ParamBean 的 paramType/dataType。
+        const row = { ...raw };
+        delete row.value;
+        delete row.fieldType;
+        delete row.type;
+        delete row.formulaType;
+        delete row.paramTypeString;
+        delete row.dataTypeSting;
+        delete row.paramId;
+        row.id = id;
+        if (parentSourceId)
+            row.parentId = idMap.get(parentSourceId);
+        else
+            delete row.parentId;
+        row.paramName = paramName;
+        row.showName = String(raw.showName ?? paramName);
+        row.paramType = String(raw.paramType || 'string');
+        row.dataType = String(raw.dataType || 'attribute');
+        row.arrs = Boolean(raw.arrs);
+        row.required = raw.required === undefined ? true : Boolean(raw.required);
+        // 与 ParamService#getParamKey 保持一致：路径由 parentId、paramName、arrs 计算，
+        // 不信任计划中可能遗留的 value/paramKey。
+        row.paramKey = pathBySource(sourceId);
+        return row;
+    });
+    return normalized;
+}
+function normalizeTable(raw, index, allowedNames, mapping) {
+    if (!raw || typeof raw !== 'object' || Array.isArray(raw)) {
+        throw new Error(`参数表[${index}] 必须是对象`);
+    }
+    const name = String(raw.name || '').trim();
+    if (!allowedNames.includes(name)) {
+        throw new Error(`参数表[${index}].name 必须是 ${allowedNames.join('、')}`);
+    }
+    if (!Array.isArray(raw.tableData)) {
+        throw new Error(`参数表[${index}].tableData 必须是数组`);
+    }
+    const table = {
+        displayOrder: index,
+        primaryKey: nativeId(raw.primaryKey),
+        name,
+        tableId: nativeId(raw.tableId),
+        tableData: normalizeParamRows(raw.tableData, name),
+        deleteIds: asIdList(raw.deleteIds),
+    };
+    if (raw.customData !== undefined)
+        table.customData = typeof raw.customData === 'string'
+            ? raw.customData : JSON.stringify(raw.customData);
+    if (mapping)
+        table.mappingTableId = nativeId(raw.mappingTableId);
+    if (raw.basisValue !== undefined)
+        table.basisValue = raw.basisValue;
+    return table;
+}
+function normalizeGroup(raw, allowedNames, mapping) {
+    if (!raw || typeof raw !== 'object' || Array.isArray(raw)) {
+        throw new Error(`${mapping ? 'ParamGroupMappingBean' : 'ParamGroupSettingBean'} 必须是对象`);
+    }
+    if (!Array.isArray(raw.tables) || raw.tables.length === 0) {
+        throw new Error('参数分组 tables 不能为空');
+    }
+    const sourceTables = raw.tables.map((table, index) => ({ table, index }));
+    const seenNames = new Set();
+    for (const item of sourceTables) {
+        const name = String(item.table?.name || '').trim();
+        if (seenNames.has(name))
+            throw new Error(`参数分组不能重复配置 ${name} 表`);
+        seenNames.add(name);
+    }
+    const tables = allowedNames
+        .map((name) => sourceTables.find((item) => String(item.table?.name || '').trim() === name)?.table)
+        .filter(Boolean)
+        .map((table, index) => normalizeTable(table, index, allowedNames, mapping));
+    if (!tables.some((table) => table.tableData.length > 0)) {
+        throw new Error(`${mapping ? '参数映射' : 'WebHookTrigger.request'} 至少要有一个${mapping ? '字段' : '请求参数字段'}`);
+    }
+    const result = { id: nativeId(raw.id), tables };
+    if (mapping)
+        result.mappingId = nativeId(raw.mappingId);
+    // WebHook 请求前端对象会带 mappingId，但 ParamGroupSettingBean 本身没有此属性；
+    // 只在调用方明确提供且不是 0 时保留，兼容设计器回显，不让 0 进入后端保存链路。
+    else if (!missingId(raw.mappingId))
+        result.mappingId = nativeId(raw.mappingId);
+    if (raw.moduleKey !== undefined)
+        result.moduleKey = raw.moduleKey;
+    if (raw.paramType !== undefined)
+        result.paramType = raw.paramType;
+    if (raw.interfaceId !== undefined)
+        result.interfaceId = raw.interfaceId;
+    return result;
+}
+export function normalizeParamGroupSetting(raw) {
+    return normalizeGroup(raw, REQUEST_TABLES, false);
+}
+export function normalizeParamGroupMapping(raw) {
+    return normalizeGroup(raw, MAPPING_TABLES, true);
+}
+/**
+ * ServerlessAction 使用的是单表 ParamMappingBean，而不是 ParamGroupMappingBean。
+ * request/response 的字段仍然遵循同一套 ParamBean 规则，但要保留前端
+ * ParamSetting 组件的 tableId、mappingTableId、deleteIds 等原生字段。
+ */
+function normalizeStandaloneParamBean(raw, mapping, label) {
+    if (!raw || typeof raw !== 'object' || Array.isArray(raw)) {
+        throw new Error(`ServerlessAction.${label} 必须是平台原生参数对象`);
+    }
+    if (!Array.isArray(raw.tableData)) {
+        throw new Error(`ServerlessAction.${label}.tableData 必须是数组`);
+    }
+    const result = {
+        ...clone(raw),
+        primaryKey: raw.primaryKey === undefined || raw.primaryKey === null ? '' : String(raw.primaryKey),
+        name: String(raw.name ?? ''),
+        tableId: nativeId(raw.tableId),
+        tableData: normalizeParamRows(raw.tableData, label),
+    };
+    if (mapping) {
+        result.mappingTableId = nativeId(raw.mappingTableId);
+    }
+    else {
+        delete result.mappingTableId;
+    }
+    return result;
+}
+export function normalizeParamMappingBean(raw) {
+    return normalizeStandaloneParamBean(raw, true, 'request');
+}
+export function normalizeParamSettingBean(raw) {
+    return normalizeStandaloneParamBean(raw, false, 'response');
+}
+//# sourceMappingURL=param_group_dto.js.map

package/dist/services/actionflow/param_group_dto.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"param_group_dto.js","sourceRoot":"","sources":["../../../src/services/actionflow/param_group_dto.ts"],"names":[],"mappings":"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"}

package/dist/services/actionflow/preflight_service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"preflight_service.d.ts","sourceRoot":"","sources":["../../../src/services/actionflow/preflight_service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"preflight_service.d.ts","sourceRoot":"","sources":["../../../src/services/actionflow/preflight_service.ts"],"names":[],"mappings":"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"}

package/dist/services/actionflow/preflight_service.js

@@ -9,7 +9,7 @@ import { registerTargetFormFields, registerTargetDetailFields, registerWorkflowF
 // workflow_id → 目标表单 id（进程缓存）
 const FORM_ID_CACHE = {};
 import { ContextStore, PlatformContextProvider } from './context_provider.js';
-import { buildDateTriggerRuntimeContext, hydrateContextReferences, hydrateQueryResultReferences, queryNodeContext } from './context_preflight.js';
+import { buildDateTriggerRuntimeContext, buildWebhookRequestContext, hydrateContextReferences, hydrateQueryResultReferences, queryNodeContext } from './context_preflight.js';
 import { get as getComponent } from './components/index.js';
 import { defaultQueryFieldsAll } from './query_field_defaults.js';
 import { getStepBranches } from './step_branches.js';
@@ -943,13 +943,17 @@ function hydrateLoopCycleTimes(plan, eventContextFields) {
                         formula.label = label;
                         formula.valueType = String(field.paramType || field.fieldType || 'string');
                         formula.fieldType = String(field.paramType || field.fieldType || 'string');
+                        const componentType = String(field.componentType || field._context_component_type || 'ApproveTrigger');
+                        const tablePrimaryKey = componentType === 'CustomTrigger'
+                            ? 'SelectParams'
+                            : componentType === 'ApproveTrigger' ? 'ApprovalData' : 'FormData';
                         formula._resolvedContext = {
                             fieldId: String(field.id || field.paramId || ''),
                             fieldType: String(field.paramType || field.fieldType || 'string'),
                             label,
-                            componentType: 'ApproveTrigger',
-                            tablePrimaryKey: 'ApprovalData',
-                            tableName: '流程数据',
+                            componentType,
+                            tablePrimaryKey,
+                            tableName: tablePrimaryKey === 'SelectParams' ? '选择参数' : tablePrimaryKey === 'ApprovalData' ? '流程数据' : '表单数据',
                             parentName: workflowId ? `${workflowId}.${label}` : label,
                             rawField: { ...field },
                         };
@@ -997,6 +1001,9 @@ function hydrateCurrentLoopReferences(steps, context) {
                     tablePrimaryKey: 'CycleParams',
                     tableName: '循环参数',
                     parentName: `循环.${label}`,
+                    sourceComponentType: String(raw.sourceComponentType || ''),
+                    sourceTablePrimaryKey: String(raw.sourceTablePrimaryKey || ''),
+                    sourceTableName: String(raw.sourceTableName || ''),
                     sourceParamKey: String(raw.sourceParamKey || ''),
                     sourceComponentId: String(raw.sourceComponentId || ''),
                     rawField: raw,
@@ -1024,9 +1031,20 @@ function hydrateLoopSourceReferences(step, context) {
             continue;
         const raw = field.raw && typeof field.raw === 'object' ? field.raw : field;
         const label = String(field.label ?? raw.showName ?? raw.paramName ?? paramKey);
-        const isEnquiryList = /\[\]$/.test(paramKey);
-        const componentType = isEnquiryList ? 'EnquiryForm' : String(raw.componentType || 'ApproveTrigger');
-        const tablePrimaryKey = isEnquiryList ? 'FormData' : (componentType === 'ApproveTrigger' ? 'ApprovalData' : 'FormData');
+        const sourceGroup = field.type === 'context_group'
+            ? field
+            : field.group ? context[String(field.group)] : null;
+        const componentType = String(raw.sourceComponentType
+            || field.componentType
+            || field.component
+            || sourceGroup?.component
+            || raw.componentType
+            || (/\[\]$/.test(paramKey) ? 'EnquiryForm' : 'ApproveTrigger'));
+        const tablePrimaryKey = componentType === 'CustomTrigger'
+            ? 'SelectParams'
+            : componentType === 'ApproveTrigger' ? 'ApprovalData' : 'FormData';
+        const tableName = tablePrimaryKey === 'SelectParams' ? '选择参数'
+            : tablePrimaryKey === 'ApprovalData' ? '流程数据' : '表单数据';
         ref.paramKey = paramKey;
         ref.label = label;
         ref.valueType = String(field.type ?? raw.paramType ?? ref.valueType ?? 'json');
@@ -1037,7 +1055,7 @@ function hydrateLoopSourceReferences(step, context) {
             label,
             componentType,
             tablePrimaryKey,
-            tableName: tablePrimaryKey === 'ApprovalData' ? '流程数据' : '表单数据',
+            tableName,
             parentName: String(field.group || '').replace(/\.$/, '') || label,
             rawField: { ...raw },
         };
@@ -1075,6 +1093,21 @@ function expandLoopDataContext(step, store) {
     }
     if (!sourceFields.length)
         return;
+    const sourceGroup = source && source.type === 'context_group'
+        ? source
+        : source?.group ? context[String(source.group)] : null;
+    const sourceComponentType = String(ref._resolvedContext?.componentType
+        || ref.componentType
+        || source?.componentType
+        || source?.component
+        || sourceGroup?.component
+        || source?.raw?.sourceComponentType
+        || (/\[\]$/.test(sourceKey) ? 'EnquiryForm' : 'ApproveTrigger'));
+    const sourceTablePrimaryKey = sourceComponentType === 'CustomTrigger'
+        ? 'SelectParams'
+        : sourceComponentType === 'ApproveTrigger' ? 'ApprovalData' : 'FormData';
+    const sourceTableName = sourceTablePrimaryKey === 'SelectParams' ? '选择参数'
+        : sourceTablePrimaryKey === 'ApprovalData' ? '流程数据' : '表单数据';
     const prefix = mode === '4' ? 'cycle.dataDetail[]' : 'cycle.dataDetail';
     const expanded = {};
     for (const rawField of sourceFields) {
@@ -1097,6 +1130,9 @@ function expandLoopDataContext(step, store) {
             // 的 FormData[位置].字段。保留来源元数据供 FormulaBean 编译使用。
             sourceParamKey: rawKey,
             sourceComponentId: String(ref.source ?? ref.comId ?? ''),
+            sourceComponentType,
+            sourceTablePrimaryKey,
+            sourceTableName,
         };
         expanded[key] = {
             key,
@@ -1765,6 +1801,11 @@ export async function preflightContext(plan, appId, client) {
         const eventResult = await queryNodeContext(event, appId, 'event_1', store, provider, 'event', { allowPlannedDynamicResources });
         errors.push(...eventResult.errors);
         eventContext = eventResult.context;
+        const webhookContext = buildWebhookRequestContext(event);
+        if (Object.keys(webhookContext).length) {
+            store.merge(webhookContext, 'WebHookTrigger');
+            eventContext = { ...eventContext, ...webhookContext };
+        }
         // DateTrigger 的业务字段属于运行时 dataResponse 输出，不一定由
         // getComponentContext 静态接口返回；字段选择器已用实时元数据完成
         // queryFields 回填，因此这里补登记平台确定的运行时输出。
@@ -1791,7 +1832,7 @@ export async function preflightContext(plan, appId, client) {
                     eventFieldTypes[String(f.showName)] = String(f.componentKey);
                 if (f.showName) {
                     const pk = String(f.paramKey || '');
-                    eventContextFields.push({ ...f });
+                    eventContextFields.push({ ...f, componentType: f.componentType || v.component });
                     const idx = seenPk[String(f.showName)];
                     if (idx === undefined) {
                         seenPk[String(f.showName)] = eventSourceFields.length;
@@ -1801,6 +1842,7 @@ export async function preflightContext(plan, appId, client) {
                             paramType: String(f.paramType || '').toLowerCase(),
                             paramKey: pk,
                             id: String(f.id || ''),
+                            componentType: f.componentType || v.component,
                         });
                     }
                     else if (pk.endsWith('[]') && !String(eventSourceFields[idx].paramKey).endsWith('[]')) {
@@ -1892,8 +1934,8 @@ export async function preflightContext(plan, appId, client) {
     hydrateLoopCycleTimes(plan, eventContextFields);
     // finalOutput 不属于 actions，但其 CustFormDetailDto.formulaValue 也可能
     // 引用 CustomTrigger 的表/字段；提前回填 DTO 真实 id，供终止节点编译 FormulaBean。
-    if (event.type === 'CustomTrigger' && plan.finalOutput?.params && typeof plan.finalOutput.params === 'object') {
-        hydrateContextReferences([{ params: plan.finalOutput.params }], eventContext, { id: 'event_1', type: 'CustomTrigger' });
+    if (plan.finalOutput?.params && typeof plan.finalOutput.params === 'object') {
+        hydrateContextReferences([{ params: plan.finalOutput.params }], eventContext, { id: 'event_1', type: String(event.type || 'ApproveTrigger') });
     }
     if (errors.length) {
         return { valid: false, errors, warnings, contextStore: store.asDict() };