weaver-e10-builder 1.5.16 → 1.6.4

package/dist/services/actionflow/preflight_service.js

@@ -22,6 +22,86 @@ import { genSfId } from './id_generator.js';
 const FORM_FIELDS_CACHE = {};
 const FORM_LIST_CACHE = {};
 const FORM_LAYOUT_ID_CACHE = {};
+function buttonRows(response) {
+    const data = response?.data ?? response;
+    for (const rows of [data?.data, data?.rows, data?.list, data?.records, data]) {
+        if (Array.isArray(rows))
+            return rows.filter((row) => row && typeof row === 'object');
+    }
+    return [];
+}
+function buttonId(row) {
+    return String(row?.id ?? row?.buttonId ?? row?.value ?? '').trim();
+}
+function buttonName(row) {
+    return String(row?.name ?? row?.content ?? row?.text ?? '').trim();
+}
+function supportsTriggerBefore(row) {
+    const value = row?.needTriggerBefore;
+    return value === true || value === 1 || value === '1' || String(value).toLowerCase() === 'true';
+}
+/**
+ * 按前端 EventButton 的真实按钮列表归一化按钮触发配置。
+ * 前端 eventButton/index.tsx 会用 needTriggerBefore 控制“执行前”下拉框，
+ * 因此 CLI 不能只校验 buttonLocation 枚举，还必须确认当前按钮确实支持 before。
+ */
+export function normalizeEventButtonSelection(selected, available) {
+    if (!Array.isArray(selected) || selected.length === 0) {
+        throw new Error('EventButton.buttonType 必须至少选择一个真实按钮');
+    }
+    if (!available.length) {
+        throw new Error('EventButton.buttonType 查询不到当前表单可绑定的真实按钮');
+    }
+    const byId = new Map(available
+        .map((row) => [buttonId(row), row])
+        .filter(([id]) => Boolean(id)));
+    return selected.map((item, index) => {
+        const requested = item && typeof item === 'object' ? item : {};
+        const id = String(requested.id || '').trim();
+        const location = String(requested.buttonLocation || '').trim();
+        if (!id)
+            throw new Error(`EventButton.buttonType[${index}].id 缺失；必须使用 form-buttons 返回的真实按钮 ID`);
+        if (!['before', 'after'].includes(location)) {
+            throw new Error(`EventButton.buttonType[${index}].buttonLocation 仅支持 before 或 after`);
+        }
+        const live = byId.get(id);
+        if (!live)
+            throw new Error(`EventButton.buttonType[${index}] 的按钮 ID '${id}' 不属于当前表单真实按钮列表`);
+        if (location === 'before' && !supportsTriggerBefore(live)) {
+            const name = buttonName(live) || String(requested.name || id);
+            throw new Error(`EventButton.buttonType[${index}] 按钮“${name}”不支持执行前触发（前端 needTriggerBefore 未开启）`);
+        }
+        return {
+            ...requested,
+            id,
+            // 以当前租户按钮列表的名称为准，避免计划中的旧名称被原样写回。
+            name: buttonName(live) || String(requested.name || '').trim(),
+            buttonLocation: location,
+            asyncExecution: requested.asyncExecution ?? false,
+        };
+    });
+}
+/** 查询并校验 EventButton 的真实按钮及“执行前”能力。 */
+export async function resolveEventButtonSelection(plan, client) {
+    const event = plan.event;
+    if (!event || typeof event !== 'object' || String(event.type || '') !== 'EventButton')
+        return [];
+    const params = event.params ??= {};
+    const targetForm = params.targetForm;
+    const formId = String(targetForm?.id || targetForm?.objId || '').trim();
+    const appId = String(targetForm?.groupId || targetForm?.appId || '').trim();
+    if (!formId || !appId)
+        throw new Error('EventButton.targetForm 必须包含真实表单 id 和 groupId，才能查询按钮列表');
+    const response = await formSource.getButtons(client, formId, appId);
+    const normalized = normalizeEventButtonSelection(params.buttonType, buttonRows(response));
+    params.buttonType = normalized;
+    return normalized.map((button) => ({
+        path: 'event.params.buttonType',
+        resourceType: 'ebuilder_button',
+        value: { id: button.id, name: button.name, buttonLocation: button.buttonLocation },
+        reason: '按钮已从当前租户表单按钮列表校验，执行前触发同时校验 needTriggerBefore',
+    }));
+}
 /** 取得计划选择的流程表单（objId），用于 Workflow 条件左值的关联对象元数据。 */
 async function resolveWorkflowFormObject(plan, client, groupId) {
     const eventParams = plan.event?.params || {};
@@ -106,6 +186,11 @@ export function stepFormRef(step) {
         ref = step.dataSource || step.targetForm;
     return ref && typeof ref === 'object' ? ref : null;
 }
+function needsLegacyFormResolution(ref) {
+    if (!ref || typeof ref !== 'object')
+        return false;
+    return formSource.actionflowDataSourceKind(ref) === 'ebuilder';
+}
 /** 查 form-fields 返回完整字段列表（id/showName/componentKey/paramType），进程缓存。 */
 export async function getFormFieldsFull(formId, client, tf) {
     if (formId in FORM_FIELDS_CACHE) {
@@ -269,7 +354,7 @@ export async function resolveTargetForms(plan, client) {
             if (['EventFormData', 'EventButton', 'TimeBatchTrigger', 'DateTrigger', 'EnquiryForm'].includes(step.type)) {
                 const ds = (step.params || {}).dataSource || (step.params || {}).targetForm;
                 if (ds && typeof ds === 'object' && ds.id) {
-                    if (!ds.groupId || !ds.name || !ds.text || !ds.groupName)
+                    if (needsLegacyFormResolution(ds) && (!ds.groupId || !ds.name || !ds.text || !ds.groupName))
                         unresolved.push(String(ds.id));
                 }
             }
@@ -280,7 +365,7 @@ export async function resolveTargetForms(plan, client) {
         if (ep && typeof ep === 'object') {
             const es = ep.targetForm || ep.dataSource;
             if (es && typeof es === 'object' && es.id) {
-                if (!es.groupId || !es.name || !es.text || !es.groupName)
+                if (needsLegacyFormResolution(es) && (!es.groupId || !es.name || !es.text || !es.groupName))
                     unresolved.push(String(es.id));
             }
         }
@@ -308,8 +393,10 @@ export async function resolveTargetForms(plan, client) {
     const groupForms = async (groupId) => {
         const idx = {};
         try {
-            const forms = await formSource.dsList(client, groupId);
-            for (const f of forms?.data || []) {
+            // 数据源 Browser 已废弃旧的 sourceType=FORM 列表协议；按前端 listByPage
+            // 使用 LOGIC + e-builder 服务组，避免预检阶段又走回旧接口。
+            const forms = await formSource.dsListByPage(client, 'ebuilder', { appId: groupId, pageSize: 500 });
+            for (const f of formSource.dataSourceRows(forms)) {
                 if (f && typeof f === 'object' && f.id) {
                     idx[String(f.id)] = { groupId, groupName: await applicationName(groupId), name: String(f.name || '') };
                 }
@@ -2270,6 +2357,14 @@ export async function preflightContext(plan, appId, client) {
     catch (error) {
         errors.push(`DocumentSave 目标文件夹查询失败: ${String(error?.message || error)}`);
     }
+    try {
+        // 三类数据源统一先走前端 Browser：已有真实 id 的引用只补协议，
+        // 仅提供名称时才调用对应的 EBUILDER/业务模块/数据准备接口检索。
+        await formSource.resolveActionflowDataSources(plan, client);
+    }
+    catch (error) {
+        errors.push(`动作流数据源 Browser 查询失败: ${String(error?.message || error)}`);
+    }
     await resolveEntrustFields(plan, client, errors);
     await resolveHrmFieldAssignments(plan, client, errors);
     await resolveHrmAlterTypeFieldAssignments(plan, client, errors);
@@ -2291,6 +2386,16 @@ export async function preflightContext(plan, appId, client) {
     catch {
         // 忽略
     }
+    // EventButton 的 targetForm 可能只提供表单 id；先完成 targetForm 的实时归属回填，
+    // 再按前端 getButtonList 校验真实按钮以及 before 能力。
+    try {
+        const buttonResources = await resolveEventButtonSelection(plan, client);
+        if (buttonResources.length)
+            (plan._autoResources ??= []).push(...buttonResources);
+    }
+    catch (error) {
+        errors.push(`EventButton 按钮查询/执行前能力校验失败: ${String(error?.message || error)}`);
+    }
     // 查并登记所有目标表单字段元数据（转换前必须有 fieldType/componentKey）
     const hydrateFilterFields = async (steps) => {
         for (const step of steps || []) {
@@ -2300,7 +2405,10 @@ export async function preflightContext(plan, appId, client) {
                 const tf = stepFormRef(step);
                 if (tf && tf.id) {
                     const formId = String(tf.id);
-                    const strictConditionSource = ['EnquiryForm', 'TimeBatchTrigger', 'DateTrigger'].includes(step.type);
+                    // 删除表单数据的前端 ConditionSet 也绑定 dataSource 字段选择器，
+                    // 条件左值必须和前端一样来自 /api/ebuilder/common/ds/fields。
+                    const strictConditionSource = ['ActionEbDelete', 'EnquiryForm', 'TimeBatchTrigger', 'DateTrigger'].includes(step.type);
+                    const sourceProtocol = formSource.actionflowDataSourceProtocol(tf);
                     // 数据源查询/触发组件的字段不是普通 EB 表单字段：
                     // 它们必须来自 /api/ebuilder/common/ds/fields，不能先调用 getEbField。
                     let fields = strictConditionSource ? [] : await getFormFieldsFull(formId, client, tf);
@@ -2309,7 +2417,7 @@ export async function preflightContext(plan, appId, client) {
                     // “默认全选”必须在计划层固化为实时字段列表。仅在编译期依赖全局缓存时，
                     // 查询组件偶尔会只保留系统字段，筛选编辑器因此把业务字段标成“已删除”。
                     const params = step.params && typeof step.params === 'object' ? step.params : (step.params = {});
-                    if (['EnquiryForm', 'TimeBatchTrigger', 'DateTrigger'].includes(step.type)
+                    if (['ActionEbDelete', 'EnquiryForm', 'TimeBatchTrigger', 'DateTrigger'].includes(step.type)
                         || (step.type === 'ActionEbUpdate' && ['updateData', 'fieldUpdate'].includes(String(params.opType || 'updateData')))) {
                         // EnquiryForm/条件更新的筛选条件左值必须来自数据源字段选择器，
                         // 而不是只用 getEbField 的表单字段对象。后者经常缺少数据源侧的
@@ -2317,7 +2425,7 @@ export async function preflightContext(plan, appId, client) {
                         // 或保存时静默丢弃。
                         let dataSourceFields = [];
                         try {
-                            const dataSourceResponse = await formSource.dataSourceFields(client, formId, true);
+                            const dataSourceResponse = await formSource.dataSourceFields(client, formId, true, sourceProtocol);
                             dataSourceFields = normalizeShowDataSourceFields(dataSourceResponse, formId)
                                 .map((field) => normalizeDataSourceField(field, formId))
                                 .filter((field) => Boolean(field?.id));
@@ -2329,12 +2437,12 @@ export async function preflightContext(plan, appId, client) {
                             }
                             if (dataSourceFields.length)
                                 registerTargetFormFields(formId, dataSourceFields);
-                            if (strictConditionSource && !dataSourceFields.length) {
+                            if (strictConditionSource && sourceProtocol.kind !== 'data_processing' && !dataSourceFields.length) {
                                 errors.push(`${step.type}.filterCondition: /api/ebuilder/common/ds/fields 未返回数据源字段，拒绝使用 getEbField 生成条件左值。`);
                             }
                         }
                         catch (error) {
-                            if (strictConditionSource) {
+                            if (strictConditionSource && sourceProtocol.kind !== 'data_processing') {
                                 replaceTargetDataSourceFields(formId, []);
                                 errors.push(`${step.type}.filterCondition: /api/ebuilder/common/ds/fields 查询失败，拒绝使用 getEbField 生成条件左值：${String(error?.message || error)}`);
                             }
@@ -2346,7 +2454,7 @@ export async function preflightContext(plan, appId, client) {
                                 || groupFields.length > 0 || groupMessage.length > 0;
                             if (needsGroupFieldLookup) {
                                 try {
-                                    const selectorResponse = await formSource.getDataSourceFields(client, String(tf.type || 'FORM'), String(tf.groupId || ''), formId);
+                                    const selectorResponse = await formSource.getDataSourceFields(client, sourceProtocol.sourceType, sourceProtocol.groupId, formId);
                                     const selectorFields = normalizeDataSourceSelectorFields(selectorResponse, formId);
                                     const byId = new Map();
                                     for (const field of selectorFields) {
@@ -2383,9 +2491,7 @@ export async function preflightContext(plan, appId, client) {
                         // 否则后端会静默丢弃业务字段。
                         let selectable = [];
                         try {
-                            // EnquiryForm 编译后数据源的服务组固定为 weaver-ebuilder-form-service；
-                            // tf.groupId 是业务应用 ID，传它会得到空字段列表，进而把 queryFields 留成不完整的 plan 对象。
-                            const resp = await formSource.showDataSourceFields(client, formId, 'weaver-ebuilder-form-service', 'LOGIC');
+                            const resp = await formSource.showDataSourceFields(client, formId, sourceProtocol.groupId, sourceProtocol.sourceType);
                             selectable = normalizeShowDataSourceFields(resp, formId);
                         }
                         catch {
@@ -2396,7 +2502,7 @@ export async function preflightContext(plan, appId, client) {
                             let physicalTable = String(selectable.find((f) => f?.physicalTable)?.physicalTable || fields.find((f) => f?.physicalTable)?.physicalTable || '');
                             if (!physicalTable) {
                                 try {
-                                    const full = await formSource.dataSourceFields(client, formId);
+                                    const full = await formSource.dataSourceFields(client, formId, true, sourceProtocol);
                                     const walkPhysical = (items) => {
                                         for (const item of items || []) {
                                             if (item?.physicalTable)