weaver-e10-builder 1.5.12 → 1.5.14

package/dist/services/actionflow/preflight_service.js

@@ -4,17 +4,20 @@ import * as personSource from './person_source.js';
 import * as contextSource from './context_source.js';
 import * as hrmSource from './hrm_source.js';
 import * as documentSource from './document_source.js';
+import * as browserSource from './browser_source.js';
+import * as logicFlowSource from './logicflow_source.js';
 import { completeEbuilder, pickEbuilderBrowserRow } from './ebuilder_source.js';
 import { resolveHttpBindings } from './http_source.js';
-import { registerTargetFormFields, registerTargetDetailFields, registerWorkflowFieldIds, registerWorkflowContextFields, getWorkflowFieldIds, getWorkflowDetailFields, getWorkflowDetailNames, getTargetFormFields, getTargetDetailFields, } from './runtime_metadata.js';
+import { registerTargetFormFields, registerTargetDetailFields, registerWorkflowFieldIds, registerWorkflowContextFields, getWorkflowFieldIds, getWorkflowDetailFields, getWorkflowDetailNames, getTargetFormFields, getTargetDetailFields, replaceTargetDataSourceFields, } from './runtime_metadata.js';
 // workflow_id → 目标表单 id（进程缓存）
 const FORM_ID_CACHE = {};
 import { ContextStore, PlatformContextProvider } from './context_provider.js';
-import { hydrateContextReferences, hydrateQueryResultReferences, queryNodeContext } from './context_preflight.js';
+import { hydrateContextReferences, hydrateQueryResultReferences, queryNodeContext, resolveContextGroupRoot, } 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';
 import { normalizeParamGroupSetting } from './param_group_dto.js';
+import { genSfId } from './id_generator.js';
 // 表单字段进程缓存
 const FORM_FIELDS_CACHE = {};
 const FORM_LIST_CACHE = {};
@@ -468,16 +471,22 @@ function walkPlanSteps(value) {
 /** 把显式固定人员展开为当前租户 Browser 对象。 */
 export async function resolveFixedPeople(plan, client) {
     const records = [];
-    for (const step of walkPlanSteps(plan.actions || [])) {
+    for (const step of walkPlanSteps({ event: plan.event, actions: plan.actions || [] })) {
         const componentType = String(step.type || '');
         const contract = getComponent(componentType);
-        const personKeys = Object.entries(contract?.params || {})
+        const personKeys = new Set(Object.entries(contract?.params || {})
             .filter(([, definition]) => String(definition?.referenceType || '').startsWith('user_assignment'))
-            .map(([key]) => key);
+            .map(([key]) => key));
+        for (const source of contract?.propertySources || []) {
+            if (source?.module === 'core.person_source' && source?.lookups?.includes('resourceData')) {
+                for (const key of source.properties || [])
+                    personKeys.add(String(key));
+            }
+        }
         // 会议字段在 meetingFields 中承载，属于组件特有嵌套结构，无法从顶层 params 推导。
         if (componentType === 'MeetingCreate')
-            personKeys.push('caller', 'contacter', 'hrmMembers');
-        if (!personKeys.length)
+            ['caller', 'contacter', 'hrmMembers'].forEach((key) => personKeys.add(key));
+        if (!personKeys.size)
             continue;
         const params = step.params || {};
         const fields = params.meetingFields;
@@ -490,7 +499,10 @@ export async function resolveFixedPeople(plan, client) {
                 const raw = container[key];
                 if (raw == null)
                     continue;
-                const values = Array.isArray(raw) ? raw : [raw];
+                const fixedArray = raw && typeof raw === 'object' && raw.kind === 'fixed' && Array.isArray(raw.value);
+                const values = fixedArray ? raw.value : (Array.isArray(raw) ? raw : [raw]);
+                if (values.some((item) => item && typeof item === 'object' && item.type && item.config && !item.kind))
+                    continue;
                 // 动态上下文/变量/常量/函数的 id 不是人员 id，不能送进
                 // resourceData 做 Browser 补全，否则会把合法动态赋值误报为人员不存在。
                 const dynamicKinds = new Set(['context', 'reference', 'system_variable', 'variable', 'constant', 'function', 'formula']);
@@ -499,19 +511,30 @@ export async function resolveFixedPeople(plan, client) {
                     continue;
                 if (values.length && values.every((item) => isBrowserPerson(item)))
                     continue;
-                if (!values.length || !values.every((item) => item && typeof item === 'object' && item.id))
+                if (!values.length)
                     continue;
                 const resolved = [];
                 for (const item of values) {
-                    const query = String(item.name || item.id);
+                    const fixed = item && typeof item === 'object' && item.kind === 'fixed' ? item.value : item;
+                    const id = fixed && typeof fixed === 'object' ? String(fixed.id || '').trim() : '';
+                    const name = fixed && typeof fixed === 'object'
+                        ? String(fixed.name || fixed.content || fixed.username || '').trim()
+                        : String(fixed || '').trim();
+                    if (!id && /^\d{10,}$/.test(name))
+                        throw new Error(`${componentType}.${key} 固定人员只有 id、没有名称；人员 Browser 必须按名称查询`);
+                    if (!name)
+                        throw new Error(`${componentType}.${key} 固定人员只有 id、没有名称；人员 Browser 必须按名称查询后校验 id`);
+                    const query = name;
                     const response = await personSource.resourceData(client, query, 1, 30);
                     const rows = response?.data?.data || [];
-                    const match = rows.find((r) => r && typeof r === 'object' && String(r.id) === String(item.id));
-                    if (!match)
-                        throw new Error(`${componentType}.${key} 的人员 id=${item.id} 不在当前租户人员浏览器中，无法生成可回显的 Browser 对象`);
-                    resolved.push(match);
+                    const matches = rows.filter((r) => r && typeof r === 'object'
+                        && String(r.name || r.content || r.username || '').trim() === name
+                        && (!id || String(r.id || '').trim() === id));
+                    if (matches.length !== 1)
+                        throw new Error(`${componentType}.${key} 未能按名称从人员 Browser 唯一匹配 '${name}'（匹配数: ${matches.length}）`);
+                    resolved.push(matches[0]);
                 }
-                container[key] = Array.isArray(raw) ? resolved : resolved[0];
+                container[key] = Array.isArray(raw) || fixedArray ? resolved : resolved[0];
                 records.push({
                     path: `${componentType}.${containerName}.${key}`,
                     resourceType: 'user_browser',
@@ -525,6 +548,227 @@ export async function resolveFixedPeople(plan, client) {
         (plan._autoResources ??= []).push(...records);
     return records;
 }
+function workflowRequestRows(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 workflowRequestId(row) {
+    return String(row?.id ?? row?.requestId ?? row?.requestid ?? row?.value ?? '').trim();
+}
+function workflowRequestName(row) {
+    return String(row?.name ?? row?.requestName ?? row?.requestname ?? row?.title ?? row?.content ?? row?.text ?? '').trim();
+}
+/** 固定 requestId/flag 只接受当前租户 wfcRequest 返回的流程实例。 */
+export async function resolveFixedWorkflowInstances(plan, client) {
+    const records = [];
+    const cache = new Map();
+    for (const step of walkPlanSteps(plan.actions || [])) {
+        const params = step.params;
+        if (!params || typeof params !== 'object')
+            continue;
+        const contract = getComponent(String(step.type || ''));
+        const instanceSource = (contract?.propertySources || []).find((source) => source?.module === 'core.workflow_source' && source?.lookups?.includes('workflowRequestComplete'));
+        if (!instanceSource)
+            continue;
+        for (const key of instanceSource.properties || []) {
+            const raw = params[key];
+            if (raw === undefined || raw === null || raw === '')
+                continue;
+            const fixedArray = raw && typeof raw === 'object' && raw.kind === 'fixed' && Array.isArray(raw.value);
+            const values = fixedArray ? raw.value : (Array.isArray(raw) ? raw : [raw]);
+            const resolved = [];
+            for (const value of values) {
+                if (isDynamicAssignment(value) || (value && typeof value === 'object' && value.type && value.config && !value.kind)) {
+                    resolved.push(value);
+                    continue;
+                }
+                const fixed = value && typeof value === 'object' && value.kind === 'fixed' ? value.value : value;
+                const id = typeof fixed === 'object' && fixed !== null ? workflowRequestId(fixed) : '';
+                const name = typeof fixed === 'object' && fixed !== null ? workflowRequestName(fixed) : String(fixed ?? '').trim();
+                if (!id && !name)
+                    throw new Error(`${step.type}.${key} 固定值缺少流程实例 id 或 name`);
+                if (!id && /^\d{10,}$/.test(name))
+                    throw new Error(`${step.type}.${key} 固定流程实例只有 id、没有名称；wfcRequest 必须按名称查询`);
+                if (!name)
+                    throw new Error(`${step.type}.${key} 固定流程实例只有 id、没有名称；wfcRequest 必须按名称查询后校验 id`);
+                const query = name;
+                let rows = cache.get(query);
+                if (!rows) {
+                    rows = workflowRequestRows(await workflowSource.workflowRequestComplete(client, query));
+                    cache.set(query, rows);
+                }
+                const matches = rows.filter((row) => id ? workflowRequestId(row) === id : workflowRequestName(row) === name);
+                if (matches.length !== 1)
+                    throw new Error(`${step.type}.${key} 未能从 wfcRequest 唯一匹配流程实例 '${id || name}'（匹配数: ${matches.length}）`);
+                const browser = matches[0];
+                resolved.push(browser);
+                records.push({
+                    path: `${step.type}.params.${key}`, resourceType: 'workflow_instance_browser',
+                    value: { id: workflowRequestId(browser), name: workflowRequestName(browser) },
+                    reason: '固定流程实例已通过当前租户 wfcRequest Browser 校验并补全',
+                });
+            }
+            params[key] = Array.isArray(raw) || fixedArray ? resolved : resolved[0];
+        }
+    }
+    if (records.length)
+        (plan._autoResources ??= []).push(...records);
+    return records;
+}
+function browserRows(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 browserId(row) {
+    return String(row?.id ?? row?.value ?? row?.fileid ?? row?.requestid ?? '').trim();
+}
+function browserNames(row) {
+    return [row?.name, row?.ruleName, row?.content, row?.title, row?.requestname, row?.username]
+        .filter((value) => value !== undefined && value !== null && String(value).trim())
+        .map((value) => String(value).trim());
+}
+function readObjectPath(value, path) {
+    return String(path).split('.').reduce((current, key) => current?.[key], value);
+}
+/** 根据组件声明的前端 Browser type/module，把固定名称补全成当前租户原对象。 */
+export async function resolveNamedFixedBrowsers(plan, client) {
+    const records = [];
+    const cache = new Map();
+    for (const step of walkPlanSteps({ event: plan.event, actions: plan.actions || [] })) {
+        const params = step.params;
+        if (!params || typeof params !== 'object')
+            continue;
+        const contract = getComponent(String(step.type || ''));
+        const sources = (contract?.propertySources || []).filter((source) => source?.module === 'core.browser_source' && source?.lookups?.includes('browserComplete') && source?.browser);
+        for (const source of sources) {
+            for (const key of source.properties || []) {
+                const raw = params[key];
+                if (raw === undefined || raw === null || raw === '')
+                    continue;
+                const configured = source.browser;
+                const fixedOnly = configured.fixedOnly === true;
+                const fixedArray = raw && typeof raw === 'object' && raw.kind === 'fixed' && Array.isArray(raw.value);
+                const values = fixedArray ? raw.value : (Array.isArray(raw) ? raw : [raw]);
+                const resolved = [];
+                for (const item of values) {
+                    if (fixedOnly && (isDynamicAssignment(item) || (item && typeof item === 'object' && item.type && item.config && !item.kind))) {
+                        throw new Error(`${step.type}.${key} 只支持固定 Browser 赋值，不支持动态公式或上下文引用`);
+                    }
+                    if (isDynamicAssignment(item) || (item && typeof item === 'object' && item.type && item.config && !item.kind)) {
+                        resolved.push(item);
+                        continue;
+                    }
+                    const fixed = item && typeof item === 'object' && item.kind === 'fixed' ? item.value : item;
+                    const id = fixed && typeof fixed === 'object' ? browserId(fixed) : '';
+                    const name = fixed && typeof fixed === 'object' ? (browserNames(fixed)[0] || '') : String(fixed ?? '').trim();
+                    if (!id && /^\d{10,}$/.test(name))
+                        throw new Error(`${step.type}.${key} 固定 Browser 只有 id、没有名称；必须按名称查询`);
+                    if (!name)
+                        throw new Error(`${step.type}.${key} 固定 Browser 只有 id、没有名称；必须按名称查询后校验 id`);
+                    const resolvedParams = { ...(configured.params || {}) };
+                    for (const [param, refs] of Object.entries(configured.paramRefs || {})) {
+                        const candidates = Array.isArray(refs) ? refs : [refs];
+                        const value = candidates.map((ref) => readObjectPath(params, ref)).find((candidate) => candidate !== undefined && candidate !== null && candidate !== '');
+                        if (value !== undefined)
+                            resolvedParams[param] = value;
+                    }
+                    const spec = { module: configured.module, type: configured.type, params: resolvedParams };
+                    const cacheKey = `${spec.module}\u0000${spec.type}\u0000${JSON.stringify(spec.params || {})}\u0000${name}`;
+                    let rows = cache.get(cacheKey);
+                    if (!rows) {
+                        rows = browserRows(await browserSource.browserComplete(client, spec, name));
+                        cache.set(cacheKey, rows);
+                    }
+                    const matches = rows.filter((row) => browserNames(row).includes(name) && (!id || browserId(row) === id));
+                    if (matches.length !== 1)
+                        throw new Error(`${step.type}.${key} 未能从 ${spec.module}/${spec.type} 唯一匹配固定值 '${name}'（匹配数: ${matches.length}）`);
+                    resolved.push(matches[0]);
+                    records.push({
+                        path: `${step.type}.params.${key}`,
+                        resourceType: `${spec.type}_browser`,
+                        value: { id: browserId(matches[0]), name: browserNames(matches[0])[0] || name },
+                        reason: `固定值已按名称通过 ${spec.module}/${spec.type} Browser 补全`,
+                    });
+                }
+                params[key] = Array.isArray(raw) || fixedArray ? resolved : resolved[0];
+            }
+        }
+    }
+    if (records.length)
+        (plan._autoResources ??= []).push(...records);
+    return records;
+}
+function mergeLogicFlowInputParams(detailInput, current) {
+    const currentRows = new Map();
+    if (current && typeof current === 'object' && Array.isArray(current.tableData)) {
+        for (const row of current.tableData) {
+            if (!row || typeof row !== 'object')
+                continue;
+            const key = String(row.paramKey ?? row.paramName ?? '');
+            if (key)
+                currentRows.set(key, row);
+        }
+    }
+    const tableData = Array.isArray(detailInput.tableData) ? detailInput.tableData.map((row) => {
+        const detailRow = row && typeof row === 'object' ? { ...row } : row;
+        const key = String(detailRow?.paramKey ?? detailRow?.paramName ?? '');
+        const previous = currentRows.get(key);
+        if (previous?.formulaData !== undefined)
+            detailRow.formulaData = previous.formulaData;
+        return detailRow;
+    }) : [];
+    const roots = tableData
+        .filter((row) => row && (row.parentId === undefined || row.parentId === null || String(row.parentId) === ''))
+        .map((row) => String(row.id ?? row.paramId ?? '').trim())
+        .filter(Boolean);
+    return {
+        primaryKey: current?.primaryKey !== undefined ? current.primaryKey : '',
+        name: current?.name !== undefined ? current.name : '',
+        tableId: String(current?.tableId || genSfId()),
+        mappingTableId: String(current?.mappingTableId || genSfId()),
+        tableData,
+        deleteIds: current?.deleteIds !== undefined ? current.deleteIds : null,
+        expandRowKeys: Array.isArray(current?.expandRowKeys) && current.expandRowKeys.length ? current.expandRowKeys : roots,
+        basisValue: current?.basisValue !== undefined ? current.basisValue : null,
+    };
+}
+/** 规则 Browser 选中后，从远程规则详情补齐 inputParams。 */
+export async function resolveLogicFlowInputParams(plan, client) {
+    const records = [];
+    for (const step of walkPlanSteps({ event: plan.event, actions: plan.actions || [] })) {
+        if (String(step.type || '') !== 'LogicFlowSet')
+            continue;
+        const params = step.params;
+        if (!params || typeof params !== 'object' || !Array.isArray(params.logicFlow) || !params.logicFlow.length)
+            continue;
+        const rule = params.logicFlow[0];
+        const ruleId = String(rule?.id || '').trim();
+        if (!ruleId)
+            throw new Error('LogicFlowSet.logicFlow[0] 缺少规则 ID，无法查询规则详情');
+        const response = await logicFlowSource.getLogicFlowInfo(client, ruleId);
+        const input = logicFlowSource.extractLogicFlowInput(response);
+        if (!input)
+            throw new Error(`LogicFlowSet 规则 '${ruleId}' 未返回 data.input，无法生成 inputParams`);
+        params.inputParams = mergeLogicFlowInputParams(input, params.inputParams);
+        records.push({
+            path: `${step.type}.params.inputParams`,
+            resourceType: 'logicflow_input_params',
+            value: { ruleId, tableData: params.inputParams.tableData },
+            reason: `规则详情接口已补齐规则 ${ruleId} 的 inputParams`,
+        });
+    }
+    if (records.length)
+        (plan._autoResources ??= []).push(...records);
+    return records;
+}
 function documentFolderRows(response) {
     const data = response && typeof response === 'object' && 'data' in response ? response.data : response;
     if (Array.isArray(data))
@@ -551,6 +795,8 @@ function fixedDocumentFolderSelector(value) {
     if (isDynamicAssignment(value))
         return null;
     const raw = value && typeof value === 'object' && value.kind === 'fixed' ? value.value : value;
+    if (typeof raw === 'string' && raw.trim())
+        return { id: '', name: raw.trim() };
     if (!raw || typeof raw !== 'object' || Array.isArray(raw))
         return null;
     if (raw.type && raw.config && !raw.kind) {
@@ -593,8 +839,6 @@ export async function resolveFixedDocumentFolders(plan, client) {
     });
     if (!targets.length)
         return records;
-    const rows = await documentSource.esbCreateFolderComponentFolder(client, '');
-    const folders = documentFolderRows(rows);
     const cache = new Map();
     for (const step of targets) {
         const params = step.params || {};
@@ -607,12 +851,15 @@ export async function resolveFixedDocumentFolders(plan, client) {
         if (!selector || (!selector.id && !selector.name)) {
             throw new Error('DocumentSave.fileFolder 固定值必须包含真实文件夹 id 或 name；不能凭空生成目录对象');
         }
+        if (!selector.name)
+            throw new Error('DocumentSave.fileFolder 固定文件夹只有 id、没有名称；必须按名称查询后校验 id');
         const cacheKey = `${selector.id}\u0000${selector.name}`;
         let matches = cache.get(cacheKey);
         if (!matches) {
-            matches = selector.id
-                ? folders.filter((folder) => documentFolderId(folder) === selector.id)
-                : folders.filter((folder) => documentFolderNames(folder).includes(selector.name));
+            const response = await documentSource.esbCreateFolderComponentFolder(client, selector.name);
+            const folders = documentFolderRows(response);
+            matches = folders.filter((folder) => documentFolderNames(folder).includes(selector.name)
+                && (!selector.id || documentFolderId(folder) === selector.id));
             cache.set(cacheKey, matches);
         }
         if (matches.length !== 1) {
@@ -638,6 +885,170 @@ function isDynamicAssignment(value) {
 function isEbuilderField(field) {
     return String(field?.componentKey || field?.fieldConfig?.componentKey || '').toLowerCase() === 'ebuilder';
 }
+function fieldConfig(field) {
+    let config = field?.fieldConfig ?? field?.config ?? {};
+    if (typeof config === 'string') {
+        try {
+            config = JSON.parse(config);
+        }
+        catch {
+            config = {};
+        }
+    }
+    return config && typeof config === 'object' && !Array.isArray(config) ? config : {};
+}
+/** 对齐前端 set-formdata/utils.ts 的 componentKey -> browserBean 映射。 */
+function formFieldBrowserSpec(field, form) {
+    const key = String(field?.componentKey || field?.fieldConfig?.componentKey || '').trim();
+    const config = fieldConfig(field);
+    const configured = config.browserType && typeof config.browserType === 'object' ? config.browserType : null;
+    if (key === 'RelateBrowser' && configured?.type && configured?.module) {
+        return { type: String(configured.type), module: String(configured.module), params: configured.params || {} };
+    }
+    if (key === 'Ebuilder')
+        return null; // 由 resolveEbuilderFixedValues 保留专用 header/formParam 协议。
+    const staticMap = {
+        Workflow: { type: 'wfcRequest', module: 'workflow' },
+        Department: { type: 'department', module: 'hrm' },
+        Subcompany: { type: 'subcompany', module: 'hrm' },
+        Employee: { type: 'resource', module: 'hrm' },
+        Mainline: { type: 'mainlineBrowser', module: 'project' },
+        Task: { type: 'taskBrowser', module: 'task' },
+        Document: { type: 'document', module: 'doc' },
+        AgendaComponent: { type: 'calendarBrowser', module: 'calendar' },
+        ClueComponent: { type: 'clue', module: 'crm' },
+        OrderComponent: { type: 'orderform', module: 'crm' },
+        WorkreportComponent: { type: 'planBrowser', module: 'plan' },
+        CompetitorComponent: { type: 'competitor', module: 'crm' },
+        KpiFlowComponent: { type: 'performanceBrowser', module: 'performance' },
+        QuoteComponent: { type: 'quote', module: 'crm' },
+        AttendComponent: { type: 'attendPermissionEmpsBrowser', module: 'attend' },
+        ODocReceiveComponent: { type: 'odocReceiveUnit', module: 'odoc' },
+        HrmGrade: { type: 'grade', module: 'hrm' },
+        HrmPosition: { type: 'position', module: 'hrm' },
+        CashBook: { type: 'cashbook', module: 'inc/book' },
+        RelateODoc: { type: 'odocRequest', module: 'odoc' },
+        EinvoiceComponent: { type: 'invoice', module: 'inc/biz' },
+        Invoice: { type: 'invoice', module: 'inc/biz' },
+        TreeSelect: { type: 'treeSelect', module: 'form' },
+    };
+    const hit = staticMap[key];
+    if (hit) {
+        const params = {};
+        if (key === 'TreeSelect') {
+            params.businessId = form.id || field.formId || '';
+            params.controlId = field.id || '';
+        }
+        return { ...hit, params };
+    }
+    // DataSource 的 browserBean 由 sourceModule 查前端 DataSourceType；
+    // 这里优先使用后端字段元数据已经展开的 browserType，再处理常见 sourceModule。
+    const sourceModule = String(field?.sourceModule || config.sourceModule || '').trim();
+    const dataSourceMap = {
+        vacation: { type: 'vacationTypeBrowser', module: 'attend/web' },
+        conferenceRoom: { type: 'mt_room', module: 'meeting' },
+        grade: { type: 'grade', module: 'hrm' },
+        position: { type: 'position', module: 'hrm' },
+        taskPriority: { type: 'taskPriorityBrowser', module: 'task' },
+        taskTypeForm: { type: 'taskTypeBrowser', module: 'task' },
+        mainlineStatus: { type: 'mainlineStatusBrowser', module: 'project' },
+        mainlinegroup: { type: 'mainlineGroupBrowser', module: 'project' },
+        templateId: { type: 'mainlineTemplateBrowser', module: 'project' },
+        secret: { type: 'calendarVisibleBrowser', module: 'calendar' },
+    };
+    const dataSource = dataSourceMap[sourceModule];
+    if (key === 'DataSource' && dataSource)
+        return { ...dataSource, params: config.params || {} };
+    return null;
+}
+function fixedFormBrowserValue(value) {
+    if (isDynamicAssignment(value))
+        return null;
+    const raw = value && typeof value === 'object' && value.kind === 'fixed' ? value.value : value;
+    if (raw && typeof raw === 'object') {
+        return {
+            id: String(raw.id ?? raw.value ?? raw.dataId ?? raw.objId ?? '').trim(),
+            name: String(raw.name ?? raw.showName ?? raw.content ?? raw.text ?? raw.title ?? raw.label ?? '').trim(),
+        };
+    }
+    const name = String(raw ?? '').trim();
+    return name ? { id: '', name } : null;
+}
+/** 表单字段固定值：按目标 componentKey 的 Browser 接口用名称匹配并校验可选 ID。 */
+export async function resolveFormFieldBrowserFixedValues(plan, client) {
+    const records = [];
+    const cache = new Map();
+    const resolveContainer = async (container, fields, form, path) => {
+        for (const [fieldId, value] of Object.entries(container || {})) {
+            const normalizedId = String(fieldId).replace(/^[+-]/, '');
+            const field = fields[normalizedId];
+            const spec = field && formFieldBrowserSpec(field, form);
+            if (!spec || value == null || value === '' || isDynamicAssignment(value))
+                continue;
+            const selected = fixedFormBrowserValue(value);
+            if (!selected)
+                continue;
+            if (!selected.name)
+                throw new Error(`${path}.${fieldId} 固定浏览值只有 id、没有名称；必须按名称查询后校验 id`);
+            if (!selected.id && /^\d{10,}$/.test(selected.name)) {
+                throw new Error(`${path}.${fieldId} 固定浏览值只有 id、没有名称；必须按名称查询`);
+            }
+            const params = { ...(spec.params || {}) };
+            const cacheKey = `${spec.module}\u0000${spec.type}\u0000${JSON.stringify(params)}\u0000${selected.name}`;
+            let rows = cache.get(cacheKey);
+            if (!rows) {
+                rows = browserRows(await browserSource.browserComplete(client, { ...spec, params }, selected.name));
+                cache.set(cacheKey, rows);
+            }
+            const matches = rows.filter((row) => browserNames(row).includes(selected.name)
+                && (!selected.id || browserId(row) === selected.id));
+            if (matches.length !== 1) {
+                throw new Error(`${path}.${fieldId} 未能从 ${spec.module}/${spec.type} 唯一匹配固定值 '${selected.name}'（匹配数: ${matches.length}）`);
+            }
+            const browser = matches[0];
+            if (value && typeof value === 'object' && value.kind === 'fixed')
+                value.value = browser;
+            else if (value && typeof value === 'object' && 'value' in value && !('id' in value))
+                value.value = browser;
+            else
+                container[fieldId] = { kind: 'fixed', value: browser };
+            records.push({
+                path: `${path}.${fieldId}`, resourceType: `${spec.type}_browser`,
+                value: { id: browserId(browser), name: browserNames(browser)[0] || selected.name },
+                reason: `表单字段 ${field?.componentKey} 固定值已按名称通过 ${spec.module}/${spec.type} Browser 补全`,
+            });
+        }
+    };
+    const walk = async (steps) => {
+        for (const step of steps || []) {
+            if (!step || typeof step !== 'object')
+                continue;
+            const params = step.params || {};
+            const form = stepFormRef(step) || {};
+            let fields = form.id ? getTargetFormFields()[String(form.id)] || {} : {};
+            if (!Object.keys(fields).length && params._bizFields?.main) {
+                fields = Object.fromEntries((params._bizFields.main || []).filter((f) => f?.id).map((f) => [String(f.id), f]));
+            }
+            if (Object.keys(fields).length && params.constants && typeof params.constants === 'object' && !Array.isArray(params.constants)) {
+                await resolveContainer(params.constants, fields, form, `${step.type}.params.constants`);
+            }
+            for (const item of Array.isArray(params.detail) ? params.detail : []) {
+                if (!item || typeof item !== 'object' || !item.constants)
+                    continue;
+                const detailFields = getTargetDetailFields()[String(form.id || '')]?.[String(item.detailTableId || item.tableId || '')] || {};
+                await resolveContainer(item.constants, detailFields, form, `${step.type}.params.detail[${item.detailTableId || item.tableId || ''}].constants`);
+            }
+            for (const branch of getStepBranches(step) || [])
+                await walk(branch?.actions || []);
+            if (Array.isArray(step.actions))
+                await walk(step.actions);
+        }
+    };
+    await walk([plan.event, ...(plan.actions || [])]);
+    if (records.length)
+        (plan._autoResources ??= []).push(...records);
+    return records;
+}
 /** 从固定值中取出需要送给 Browser 搜索的名称。 */
 function fixedBrowserSearchValue(value) {
     if (isDynamicAssignment(value))
@@ -825,7 +1236,11 @@ export async function resolveBizCreateFields(step, plan, client, errors, path) {
             if (data && typeof data === 'object') {
                 let main = Array.isArray(data.main) ? data.main : [];
                 const bizFields = {
+                    // 固定值浏览解析也依赖 fieldConfig/browserType/appId 等字段元数据，
+                    // 不能只保留 id/componentKey，否则 RelateBrowser/DataSource/Ebuilder
+                    // 会退化成普通字符串。
                     main: main.map((f) => ({
+                        ...f,
                         id: String(f.id || ''), showName: String(f.showName || ''),
                         componentKey: String(f.componentKey || ''), formId: String(f.formId || ''),
                         required: Boolean(f.required), custom: Boolean(f.custom), subFormId: String(f.subFormId || '-1'),
@@ -833,6 +1248,16 @@ export async function resolveBizCreateFields(step, plan, client, errors, path) {
                     detail: data.detail || [],
                 };
                 params._bizFields = bizFields;
+                for (const fid of new Set(main.map((f) => String(f?.formId || '')).filter(Boolean))) {
+                    const formId = String(fid);
+                    registerTargetFormFields(formId, main.filter((f) => String(f?.formId || '') === formId));
+                }
+                for (const detail of data.detail || []) {
+                    const detailFormId = String(detail?.formId || main.find((f) => f?.formId)?.formId || '');
+                    if (detailFormId && detail?.detailTableId) {
+                        registerTargetDetailFields(detailFormId, String(detail.detailTableId), detail.fields || []);
+                    }
+                }
                 let formIds = (wfPath.formIds ? (Array.isArray(wfPath.formIds) ? wfPath.formIds : [wfPath.formIds]) : []).map(String);
                 if (!formIds.length) {
                     formIds = [...new Set(main.map((f) => f && f.formId ? String(f.formId) : '').filter(Boolean))];
@@ -1509,6 +1934,30 @@ export function normalizeShowDataSourceFields(response, formId) {
     visit(root);
     return fields;
 }
+/**
+ * 归一化前端 /component/getDataSourceFields 的返回值。
+ *
+ * 该接口与 showDataSourceFields 不同，前端直接把返回数组作为 Select 的
+ * options 使用，通常是 [{ id, content, type }]，不是 { fields: [...] }。
+ */
+export function normalizeDataSourceSelectorFields(response, formId) {
+    const root = Array.isArray(response)
+        ? response
+        : Array.isArray(response?.data)
+            ? response.data
+            : Array.isArray(response?.result)
+                ? response.result
+                : [];
+    const direct = root
+        .filter((field) => field && typeof field === 'object' && field.id && !Array.isArray(field.fields))
+        .map((field) => ({
+        ...field,
+        id: String(field.id),
+        formId: String(field.formId || formId),
+        content: String(field.content || field.text || field.showName || field.name || field.id),
+    }));
+    return direct.length ? direct : normalizeShowDataSourceFields(response, formId);
+}
 /**
  * 归一化 /api/ebuilder/common/ds/fields 的字段对象。
  *
@@ -1797,6 +2246,24 @@ export async function preflightContext(plan, appId, client) {
     }
     await fillRequiredTriggerOperator(plan, client);
     await resolveFixedPeople(plan, client);
+    try {
+        await resolveFixedWorkflowInstances(plan, client);
+    }
+    catch (error) {
+        errors.push(`流程实例 Browser 查询失败: ${String(error?.message || error)}`);
+    }
+    try {
+        await resolveNamedFixedBrowsers(plan, client);
+    }
+    catch (error) {
+        errors.push(`固定值 Browser 查询失败: ${String(error?.message || error)}`);
+    }
+    try {
+        await resolveLogicFlowInputParams(plan, client);
+    }
+    catch (error) {
+        errors.push(`规则集详情查询失败: ${String(error?.message || error)}`);
+    }
     try {
         await resolveFixedDocumentFolders(plan, client);
     }
@@ -1833,8 +2300,12 @@ export async function preflightContext(plan, appId, client) {
                 const tf = stepFormRef(step);
                 if (tf && tf.id) {
                     const formId = String(tf.id);
-                    const fields = await getFormFieldsFull(formId, client, tf);
-                    await hydrateReferenceFilterFields(plan, client, formId, tf, fields);
+                    const strictConditionSource = ['EnquiryForm', 'TimeBatchTrigger', 'DateTrigger'].includes(step.type);
+                    // 数据源查询/触发组件的字段不是普通 EB 表单字段：
+                    // 它们必须来自 /api/ebuilder/common/ds/fields，不能先调用 getEbField。
+                    let fields = strictConditionSource ? [] : await getFormFieldsFull(formId, client, tf);
+                    if (!strictConditionSource)
+                        await hydrateReferenceFilterFields(plan, client, formId, tf, fields);
                     // “默认全选”必须在计划层固化为实时字段列表。仅在编译期依赖全局缓存时，
                     // 查询组件偶尔会只保留系统字段，筛选编辑器因此把业务字段标成“已删除”。
                     const params = step.params && typeof step.params === 'object' ? step.params : (step.params = {});
@@ -1844,18 +2315,70 @@ export async function preflightContext(plan, appId, client) {
                         // 而不是只用 getEbField 的表单字段对象。后者经常缺少数据源侧的
                         // name/formInfo/sformId，会导致设计器把条件字段显示为“已删除”
                         // 或保存时静默丢弃。
+                        let dataSourceFields = [];
                         try {
                             const dataSourceResponse = await formSource.dataSourceFields(client, formId, true);
-                            const dataSourceFields = normalizeShowDataSourceFields(dataSourceResponse, formId)
+                            dataSourceFields = normalizeShowDataSourceFields(dataSourceResponse, formId)
                                 .map((field) => normalizeDataSourceField(field, formId))
                                 .filter((field) => Boolean(field?.id));
+                            if (strictConditionSource)
+                                replaceTargetDataSourceFields(formId, dataSourceFields);
+                            if (strictConditionSource) {
+                                fields = dataSourceFields;
+                                await hydrateReferenceFilterFields(plan, client, formId, tf, fields);
+                            }
                             if (dataSourceFields.length)
                                 registerTargetFormFields(formId, dataSourceFields);
+                            if (strictConditionSource && !dataSourceFields.length) {
+                                errors.push(`${step.type}.filterCondition: /api/ebuilder/common/ds/fields 未返回数据源字段，拒绝使用 getEbField 生成条件左值。`);
+                            }
                         }
-                        catch {
-                            // 保留下方 showDataSourceFields/getEbField 降级；最终保存仍由平台校验。
+                        catch (error) {
+                            if (strictConditionSource) {
+                                replaceTargetDataSourceFields(formId, []);
+                                errors.push(`${step.type}.filterCondition: /api/ebuilder/common/ds/fields 查询失败，拒绝使用 getEbField 生成条件左值：${String(error?.message || error)}`);
+                            }
                         }
-                        // getEbField 用于类型/筛选校验；queryFields 必须采用设计器字段选择器
+                        if (step.type === 'EnquiryForm') {
+                            const groupFields = Array.isArray(params.groupFields) ? params.groupFields : [];
+                            const groupMessage = Array.isArray(params.groupMessage) ? params.groupMessage : [];
+                            const needsGroupFieldLookup = String(params.opType || 'list') === 'groupFields'
+                                || groupFields.length > 0 || groupMessage.length > 0;
+                            if (needsGroupFieldLookup) {
+                                try {
+                                    const selectorResponse = await formSource.getDataSourceFields(client, String(tf.type || 'FORM'), String(tf.groupId || ''), formId);
+                                    const selectorFields = normalizeDataSourceSelectorFields(selectorResponse, formId);
+                                    const byId = new Map();
+                                    for (const field of selectorFields) {
+                                        const id = String(field?.id || '');
+                                        if (!id)
+                                            continue;
+                                        byId.set(id, field);
+                                        byId.set(id.startsWith('field_') ? id.slice('field_'.length) : `field_${id}`, field);
+                                    }
+                                    if (!selectorFields.length && (groupFields.length || groupMessage.length)) {
+                                        errors.push('EnquiryForm.groupFields/groupMessage: /component/getDataSourceFields 未返回可选字段，拒绝凭空生成分组字段。');
+                                    }
+                                    for (const [key, items] of [['groupFields', groupFields], ['groupMessage', groupMessage]]) {
+                                        for (const [index, item] of items.entries()) {
+                                            const requestedId = String(item?.field || '');
+                                            const live = byId.get(requestedId);
+                                            if (!requestedId || !live) {
+                                                errors.push(`EnquiryForm.${key}[${index}].field='${requestedId}' 不在 /component/getDataSourceFields 返回的实时字段中。`);
+                                            }
+                                            else {
+                                                // 保留用户的行 id/aggregator，只把字段 ID 收敛为前端真实选项 ID。
+                                                item.field = String(live.id);
+                                            }
+                                        }
+                                    }
+                                }
+                                catch (error) {
+                                    errors.push(`EnquiryForm.groupFields/groupMessage: /component/getDataSourceFields 查询失败，拒绝生成分组字段：${String(error?.message || error)}`);
+                                }
+                            }
+                        }
+                        // 条件左值已经固定使用 ds/fields；queryFields 仍采用设计器字段选择器
                         // showDataSourceFields 返回的对象和字段 ID（业务字段通常是 field_<真实ID>），
                         // 否则后端会静默丢弃业务字段。
                         let selectable = [];
@@ -1866,7 +2389,7 @@ export async function preflightContext(plan, appId, client) {
                             selectable = normalizeShowDataSourceFields(resp, formId);
                         }
                         catch {
-                            // 接口异常时保留下方基于 getEbField 的降级；最终保存仍由平台严格校验。
+                            // 接口异常时不把 getEbField 混入条件左值；最终保存仍由平台严格校验。
                         }
                         if (step.type === 'EnquiryForm') {
                             const formName = String(tf.text || tf.name || fields.find((f) => f?.fieldGroup?.name)?.fieldGroup?.name || '表单数据');
@@ -2027,9 +2550,9 @@ export async function preflightContext(plan, appId, client) {
             for (const f of v.fields || []) {
                 if (!f || typeof f !== 'object')
                     continue;
-                const tablePrimaryKey = String(f.tablePrimaryKey || v.primaryKey || v.key || '').trim();
-                const tableName = String(f.tableName || v.name || v.label || tablePrimaryKey).trim();
                 const componentType = f.componentType || v.component;
+                const tablePrimaryKey = resolveContextGroupRoot(f, v, componentType);
+                const tableName = String(f.tableName || v.name || v.label || tablePrimaryKey).trim();
                 if (f.showName && f.componentKey)
                     eventFieldTypes[String(f.showName)] = String(f.componentKey);
                 if (f.showName) {
@@ -2198,6 +2721,15 @@ export async function preflightContext(plan, appId, client) {
         }
     };
     await walk(plan.actions || [], store, 'actions');
+    // 目标表单字段元数据在上面的 walk 中已完成（ApproveCreate 也会在此处
+    // 拉取 _bizFields），现在统一处理所有 componentKey 对应的固定 Browser 值。
+    // 动态赋值、函数和循环引用由公式编译链继续处理，不在这里查询。
+    try {
+        await resolveFormFieldBrowserFixedValues(plan, client);
+    }
+    catch (error) {
+        errors.push(`表单字段固定 Browser 查询失败: ${String(error?.message || error)}`);
+    }
     // 源字段硬性校验
     checkSourceReferences(plan, eventContextFields, errors, store.asDict());
     if (errors.length) {