weaver-e10-builder 1.2.3 → 1.2.5

package/dist/services/actionflow/preflight_service.js

@@ -3,8 +3,9 @@ import * as workflowSource from './workflow_source.js';
 import * as personSource from './person_source.js';
 import * as contextSource from './context_source.js';
 import * as hrmSource from './hrm_source.js';
+import { completeEbuilder, pickEbuilderBrowserRow } from './ebuilder_source.js';
 import { resolveHttpBindings } from './http_source.js';
-import { registerTargetFormFields, registerTargetDetailFields, registerWorkflowFieldIds, registerWorkflowContextFields, getWorkflowFieldIds, getWorkflowDetailFields, getWorkflowDetailNames, getTargetFormFields, } from './runtime_metadata.js';
+import { registerTargetFormFields, registerTargetDetailFields, registerWorkflowFieldIds, registerWorkflowContextFields, getWorkflowFieldIds, getWorkflowDetailFields, getWorkflowDetailNames, getTargetFormFields, getTargetDetailFields, } from './runtime_metadata.js';
 // workflow_id → 目标表单 id（进程缓存）
 const FORM_ID_CACHE = {};
 import { ContextStore, PlatformContextProvider } from './context_provider.js';
@@ -522,6 +523,128 @@ export async function resolveFixedPeople(plan, client) {
         (plan._autoResources ??= []).push(...records);
     return records;
 }
+function isDynamicAssignment(value) {
+    const kind = String(value?.kind ?? value?.assignmentKind ?? '').toLowerCase();
+    return ['context', 'reference', 'system_variable', 'variable', 'constant', 'function', 'formula', 'query_result', 'transform'].includes(kind);
+}
+function isEbuilderField(field) {
+    return String(field?.componentKey || field?.fieldConfig?.componentKey || '').toLowerCase() === 'ebuilder';
+}
+/** 从固定值中取出需要送给 Browser 搜索的名称。 */
+function fixedBrowserSearchValue(value) {
+    if (isDynamicAssignment(value))
+        return null;
+    const outer = value && typeof value === 'object' && value.kind === 'fixed' ? value.value : value;
+    const raw = outer && typeof outer === 'object' && 'value' in outer && !('id' in outer)
+        ? outer.value : outer;
+    if (raw && typeof raw === 'object') {
+        const id = raw.id ?? raw.value ?? raw.dataId ?? raw.objId;
+        const name = raw.name ?? raw.showName ?? raw.content ?? raw.text ?? raw.label;
+        if (id != null)
+            return { name: String(name || ''), hasId: true };
+        return name ? { name: String(name), hasId: false } : null;
+    }
+    if (raw == null || String(raw).trim() === '')
+        return null;
+    return { name: String(raw).trim(), hasId: false };
+}
+/**
+ * e-builder 关联字段的固定值必须是 Browser 对象，而不是名称字符串。
+ * 设计器按名称输入时，先通过当前表单/字段的 complete 接口补齐真实 id 和显示名，
+ * 再交给通用公式编译器生成 fixvalue。
+ */
+export async function resolveEbuilderFixedValues(plan, client) {
+    const records = [];
+    const requestCache = new Map();
+    const resolveValue = async (container, key, field, formId, rawValue, path, detailFields) => {
+        if (!isEbuilderField(field) || isDynamicAssignment(rawValue))
+            return;
+        const targetField = detailFields?.[String(key)] || field;
+        if (!isEbuilderField(targetField))
+            return;
+        const search = fixedBrowserSearchValue(rawValue);
+        if (!search || search.hasId)
+            return;
+        const fieldId = String(targetField.id || key);
+        const cacheKey = `${formId}:${fieldId}:${search.name}`;
+        let browser = requestCache.get(cacheKey);
+        if (!browser) {
+            const rows = await completeEbuilder(client, { objId: formId, fieldId, searchValue: search.name });
+            browser = pickEbuilderBrowserRow(rows, search.name);
+            requestCache.set(cacheKey, browser);
+        }
+        if (rawValue && typeof rawValue === 'object' && rawValue.kind === 'fixed') {
+            rawValue.value = browser;
+        }
+        else if (rawValue && typeof rawValue === 'object' && 'value' in rawValue && !('id' in rawValue)) {
+            rawValue.value = browser;
+            rawValue.label = browser.name;
+        }
+        else if (rawValue && typeof rawValue === 'object') {
+            container[key] = browser;
+        }
+        else {
+            container[key] = { kind: 'fixed', value: browser };
+        }
+        records.push({ path, resourceType: 'ebuilder_browser', value: { id: browser.id, name: browser.name }, reason: 'Ebuilder 关联字段固定值已通过当前字段 Browser 接口补全真实 id 和显示名' });
+    };
+    const walk = async (steps) => {
+        for (const step of steps || []) {
+            if (!step || typeof step !== 'object')
+                continue;
+            const params = step.params || {};
+            const form = stepFormRef(step);
+            const formId = String(form?.id || '');
+            const fields = formId ? getTargetFormFields()[formId] || {} : {};
+            if (formId && params && typeof params === 'object') {
+                const constants = params.constants;
+                if (constants && typeof constants === 'object' && !Array.isArray(constants)) {
+                    for (const [fieldId, value] of Object.entries(constants)) {
+                        const normalizedId = String(fieldId).replace(/^[+-]/, '');
+                        await resolveValue(constants, fieldId, fields[normalizedId], formId, value, `${step.type}.params.constants.${fieldId}`);
+                    }
+                }
+                // ActionEbAdd/Update 的旧格式 setting/updates 也会进入同一个固定值编译器。
+                // 在归一化成 FormulaBean 之前补全，避免旧格式绕过 Ebuilder Browser 查询。
+                for (const assignmentKey of ['setting', 'updates']) {
+                    const assignments = params[assignmentKey];
+                    if (!Array.isArray(assignments))
+                        continue;
+                    for (const [index, item] of assignments.entries()) {
+                        if (!item || typeof item !== 'object' || item.value === undefined)
+                            continue;
+                        const fieldRef = item.field ?? item.formField ?? item.fieldId;
+                        const fieldId = String(fieldRef && typeof fieldRef === 'object'
+                            ? (fieldRef.id ?? fieldRef.key ?? '') : (fieldRef ?? ''));
+                        const field = fieldRef && typeof fieldRef === 'object' && fieldRef.componentKey
+                            ? fieldRef : fields[fieldId];
+                        await resolveValue(item, 'value', field, formId, item.value, `${step.type}.params.${assignmentKey}[${index}].value`);
+                    }
+                }
+                for (const item of Array.isArray(params.detail) ? params.detail : []) {
+                    if (!item || typeof item !== 'object')
+                        continue;
+                    const detailTableId = String(item.detailTableId || item.tableId || item.table || '');
+                    const detailFields = getTargetDetailFields()[formId]?.[detailTableId] || {};
+                    const detailConstants = item.constants;
+                    if (detailConstants && typeof detailConstants === 'object' && !Array.isArray(detailConstants)) {
+                        for (const [fieldId, value] of Object.entries(detailConstants)) {
+                            await resolveValue(detailConstants, fieldId, fields[String(fieldId)] || detailFields[String(fieldId)], formId, value, `${step.type}.params.detail[${detailTableId}].constants.${fieldId}`, detailFields);
+                        }
+                    }
+                }
+            }
+            for (const branch of getStepBranches(step) || [])
+                await walk(branch?.actions || []);
+            if (Array.isArray(step.actions))
+                await walk(step.actions);
+        }
+    };
+    await walk(plan.actions || []);
+    if (records.length)
+        (plan._autoResources ??= []).push(...records);
+    return records;
+}
 /** 委托流程的两张设置表在每个租户都有独立字段 ID，生成前必须实时读取。 */
 export async function resolveEntrustFields(plan, client, errors) {
     for (const step of walkPlanSteps(plan.actions || [])) {
@@ -703,6 +826,28 @@ export function checkSourceReferences(plan, eventContextFields, errors, availabl
             }
         }
     };
+    const checkReference = (value, where) => {
+        if (Array.isArray(value)) {
+            for (const [index, item] of value.entries())
+                checkReference(item, `${where}[${index}]`);
+            return;
+        }
+        if (!value || typeof value !== 'object')
+            return;
+        const kind = String(value.kind || value.assignmentKind || '').toLowerCase();
+        if (kind === 'query_result')
+            return;
+        if (kind === 'context' || kind === 'reference') {
+            checkSourceKey(String(value.paramKey || value.key || value.fieldKey || ''), where);
+            return;
+        }
+        if (value.assign)
+            checkReference(value.assign, `${where}.assign`);
+        if (Array.isArray(value.args))
+            checkReference(value.args, `${where}.args`);
+        if (Array.isArray(value.fields))
+            checkReference(value.fields, `${where}.fields`);
+    };
     const walk = (steps, prefix = 'actions') => {
         for (const [idx, step] of (steps || []).entries()) {
             if (!step || typeof step !== 'object')
@@ -734,8 +879,14 @@ export function checkSourceReferences(plan, eventContextFields, errors, availabl
                         }
                     }
                     for (const [di, det] of (params.detail || []).entries()) {
-                        if (det && typeof det === 'object')
+                        if (det && typeof det === 'object') {
                             checkMapping(det.mapping, `${path}.detail[${di}].mapping`);
+                            checkReference(det.basisValue, `${path}.detail[${di}].basisValue`);
+                            checkReference(det.rowId, `${path}.detail[${di}].rowId`);
+                            for (const [ci, condition] of (det.updateFieldCondition?.updateField || []).entries()) {
+                                checkReference(condition?.assign ?? condition?.value, `${path}.detail[${di}].updateFieldCondition.updateField[${ci}]`);
+                            }
+                        }
                     }
                 }
             }
@@ -1193,6 +1344,41 @@ export function normalizeShowDataSourceFields(response, formId) {
     visit(root);
     return fields;
 }
+/**
+ * 归一化 /api/ebuilder/common/ds/fields 的字段对象。
+ *
+ * EnquiryForm 的 filterInput 左值必须使用数据源字段选择器返回的实时元数据；
+ * getEbField 只适合表单字段校验，部分租户不会带齐 componentKey、formInfo、
+ * sformId 和物理字段信息。这里只补齐编译器读取的别名，不改变平台原对象。
+ */
+function normalizeDataSourceField(field, formId) {
+    if (!field || typeof field !== 'object')
+        return field;
+    let config = field.config;
+    if (typeof config === 'string') {
+        try {
+            config = JSON.parse(config);
+        }
+        catch {
+            config = {};
+        }
+    }
+    if (!config || typeof config !== 'object')
+        config = {};
+    const formInfo = field.formInfo && typeof field.formInfo === 'object' ? field.formInfo : {};
+    const id = String(field.id || '');
+    return {
+        ...field,
+        id,
+        showName: String(field.showName || field.text || field.name || field.content || id),
+        name: String(field.name || (id && /^\d+$/.test(id) ? `field_${id}` : field.text || id)),
+        componentKey: String(field.componentKey || config.componentKey || field.compType || field.type || ''),
+        paramType: String(field.paramType || field.type || config.type || 'string').toLowerCase(),
+        type: String(field.type || field.paramType || config.type || 'String'),
+        formId: String(field.formId || formInfo.formId || formId),
+        ...(field.layoutId || formInfo.layoutId ? { layoutId: String(field.layoutId || formInfo.layoutId) } : {}),
+    };
+}
 export function syncEventResourcesToDraft(draft, plan) {
     const pe = plan.event, de = draft.event;
     if (!pe || !de || typeof pe !== 'object' || typeof de !== 'object')
@@ -1419,7 +1605,23 @@ 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 (['EnquiryForm', 'TimeBatchTrigger', 'DateTrigger'].includes(step.type)
+                        || (step.type === 'ActionEbUpdate' && ['updateData', 'fieldUpdate'].includes(String(params.opType || 'updateData')))) {
+                        // EnquiryForm/条件更新的筛选条件左值必须来自数据源字段选择器，
+                        // 而不是只用 getEbField 的表单字段对象。后者经常缺少数据源侧的
+                        // name/formInfo/sformId，会导致设计器把条件字段显示为“已删除”
+                        // 或保存时静默丢弃。
+                        try {
+                            const dataSourceResponse = await formSource.dataSourceFields(client, formId, true);
+                            const dataSourceFields = normalizeShowDataSourceFields(dataSourceResponse, formId)
+                                .map((field) => normalizeDataSourceField(field, formId))
+                                .filter((field) => Boolean(field?.id));
+                            if (dataSourceFields.length)
+                                registerTargetFormFields(formId, dataSourceFields);
+                        }
+                        catch {
+                            // 保留下方 showDataSourceFields/getEbField 降级；最终保存仍由平台校验。
+                        }
                         // getEbField 用于类型/筛选校验；queryFields 必须采用设计器字段选择器
                         // showDataSourceFields 返回的对象和字段 ID（业务字段通常是 field_<真实ID>），
                         // 否则后端会静默丢弃业务字段。
@@ -1505,6 +1707,12 @@ export async function preflightContext(plan, appId, client) {
     };
     await hydrateFilterFields([event]);
     await hydrateFilterFields(plan.actions || []);
+    try {
+        await resolveEbuilderFixedValues(plan, client);
+    }
+    catch (error) {
+        errors.push(`Ebuilder 固定值补全失败: ${String(error?.message || error)}`);
+    }
     // 更新动作若无法拿到目标表字段，平台 saveDesign 会直接 500，这里硬拦截。
     const validateUpdateFields = (steps, prefix = 'actions') => {
         for (const [index, step] of (steps || []).entries()) {