weaver-e10-builder 1.1.6 → 1.1.8

package/dist/services/actionflow/http_source.js

@@ -0,0 +1,261 @@
+import { validateHttpInputParams } from './http_input_params.js';
+import { getStepBranches } from './step_branches.js';
+function base(client) {
+    return client.getBaseUrl();
+}
+function query(values) {
+    return new URLSearchParams(values).toString();
+}
+function rows(response) {
+    const data = response?.data ?? response;
+    if (Array.isArray(data))
+        return data;
+    if (!data || typeof data !== 'object')
+        return [];
+    for (const key of ['data', 'displayData', 'rows', 'records', 'list']) {
+        if (Array.isArray(data[key]))
+            return data[key];
+    }
+    return [];
+}
+function detailData(response) {
+    const data = response?.data ?? response;
+    return data && typeof data === 'object' && !Array.isArray(data) ? data : {};
+}
+function idOf(item, ...keys) {
+    for (const key of keys) {
+        const value = item?.[key];
+        if (value !== undefined && value !== null && String(value).trim())
+            return String(value);
+    }
+    return '';
+}
+function nameOf(item) {
+    return String(item?.name ?? item?.content ?? item?.showName ?? item?.title ?? '').trim();
+}
+function httpResponseField(response, paramKey) {
+    const wanted = String(paramKey || '').trim();
+    if (!wanted)
+        return null;
+    for (const table of response?.tables || []) {
+        const tableName = String(table?.name || '').toLowerCase();
+        const group = tableName === 'body' ? 'responseBody' : tableName === 'header' ? 'responseHeader' : tableName === 'cookie' ? 'responseCookie' : String(table?.name || 'responseBody');
+        for (const field of table?.tableData || []) {
+            const key = String(field?.paramKey || '');
+            if (wanted === key || wanted === `${group}.${key}`)
+                return { field, group };
+        }
+    }
+    return null;
+}
+/** 校验并用接口详情中的真实名称回填 HTTP 上下文引用。 */
+export function normalizeHttpContextReferences(actions) {
+    const responses = new Map();
+    const collect = (steps) => {
+        for (const step of steps || []) {
+            if (!step || typeof step !== 'object')
+                continue;
+            if (step.type === 'Http') {
+                const response = step.params?.response;
+                for (const key of [step.ref, step.id]) {
+                    if (key !== undefined && key !== null && String(key))
+                        responses.set(String(key), response);
+                }
+            }
+            collect(Array.isArray(step.actions) ? step.actions : []);
+            for (const branch of getStepBranches(step))
+                collect(Array.isArray(branch?.actions) ? branch.actions : []);
+        }
+    };
+    collect(actions);
+    const validate = (steps, path) => {
+        for (const [index, step] of (steps || []).entries()) {
+            if (!step || typeof step !== 'object')
+                continue;
+            const stepPath = `${path}[${index}]`;
+            if (step.type === 'Http') {
+                for (const [paramIndex, item] of (step.params?.inputParams || []).entries()) {
+                    const value = item?.value;
+                    if (!value || value.kind !== 'context')
+                        continue;
+                    const source = String(value.source || '').trim();
+                    const field = httpResponseField(responses.get(source), String(value.paramKey || ''));
+                    if (!field) {
+                        throw new Error(`${stepPath}.params.inputParams[${paramIndex}] 引用了 ${source || '上游 HTTP 节点'} 的不存在响应字段 '${String(value.paramKey || '')}'；不能自行编造登录Token等字段，请以 interface-detail.response 为准`);
+                    }
+                    const live = field.field;
+                    value.label = String(live.showName || live.paramName || live.paramKey);
+                    value.responseFieldId = live.id !== undefined ? String(live.id) : undefined;
+                }
+            }
+            validate(Array.isArray(step.actions) ? step.actions : [], `${stepPath}.actions`);
+            for (const [branchIndex, branch] of getStepBranches(step).entries()) {
+                validate(Array.isArray(branch?.actions) ? branch.actions : [], `${stepPath}.branches[${branchIndex}].actions`);
+            }
+        }
+    };
+    validate(actions, 'actions');
+}
+/** 设计器 connector.icon 有时是 JSON 字符串，有时直接是对象/图标名。 */
+export function resolveHttpConnectorIcon(value) {
+    let icon = value;
+    if (typeof icon === 'string') {
+        const raw = icon.trim();
+        if (!raw)
+            return '';
+        try {
+            icon = JSON.parse(raw);
+        }
+        catch {
+            return raw;
+        }
+    }
+    if (icon && typeof icon === 'object') {
+        return String(icon.path ?? icon.icon ?? icon.name ?? '').trim();
+    }
+    return String(icon ?? '').trim();
+}
+/**
+ * 按当前租户解析完整 HTTP 绑定。名称/图标只来自当前 connector 列表，
+ * request/response/address/method 只来自当前 interface detail；不根据“E9”等名称猜 ID。
+ */
+export async function resolveHttpBinding(client, params) {
+    const systemId = String(params?.systemId ?? '').trim();
+    const resourceId = String(params?.resourceId ?? '').trim();
+    const interfaceId = String(params?.interfaceId ?? '').trim();
+    if (!systemId || !resourceId || !interfaceId) {
+        throw new Error('Http 必须同时提供当前租户的 systemId、resourceId、interfaceId，不能只填连接器/资源名称');
+    }
+    const connectorResponse = await httpConnectors(client);
+    const connectorRaw = rows(connectorResponse).find((item) => idOf(item, 'id', 'systemId', 'systemPk') === systemId);
+    if (!connectorRaw)
+        throw new Error(`当前租户 HTTP 连接器不存在: systemId=${systemId}；请重新读取 http-connectors，不能复用其他环境的连接器 ID`);
+    const resourceResponse = await httpResources(client, systemId);
+    const resourceRaw = rows(resourceResponse).find((item) => {
+        const rowId = idOf(item, 'id', 'resourceId', 'linkInfoId');
+        const owner = idOf(item, 'systemPk', 'systemId', 'system');
+        return rowId === resourceId && (!owner || owner === systemId);
+    });
+    if (!resourceRaw)
+        throw new Error(`连接器 '${nameOf(connectorRaw) || systemId}' 下不存在资源: resourceId=${resourceId}；当前环境可能没有这条连接信息`);
+    const interfaceResponse = await httpInterfaces(client, systemId, resourceId, interfaceId);
+    const interfaceRaw = rows(interfaceResponse).find((item) => idOf(item, 'id', 'interfaceId') === interfaceId);
+    if (!interfaceRaw)
+        throw new Error(`资源 '${nameOf(resourceRaw) || resourceId}' 下不存在接口: interfaceId=${interfaceId}；请重新读取 http-interfaces`);
+    const detailResponse = await httpInterfaceDetail(client, interfaceId);
+    const detail = detailData(detailResponse);
+    const detailSystemId = idOf(detail, 'systemId', 'systemPk');
+    const detailInterfaceId = idOf(detail, 'interfaceId', 'id');
+    if (detailSystemId && detailSystemId !== systemId)
+        throw new Error(`HTTP 接口详情归属异常: interfaceId=${interfaceId} 不属于 systemId=${systemId}`);
+    if (detailInterfaceId && detailInterfaceId !== interfaceId)
+        throw new Error(`HTTP 接口详情 ID 不一致: 请求=${interfaceId}，返回=${detailInterfaceId}`);
+    if (!detail.request || typeof detail.request !== 'object' || Array.isArray(detail.request)) {
+        throw new Error(`HTTP 接口 '${nameOf(interfaceRaw) || interfaceId}' 缺少原生 request 参数映射，已停止生成`);
+    }
+    return {
+        connector: { id: systemId, name: nameOf(connectorRaw), icon: resolveHttpConnectorIcon(connectorRaw.icon), raw: connectorRaw },
+        resource: { id: resourceId, name: nameOf(resourceRaw), raw: resourceRaw },
+        endpoint: { id: interfaceId, name: nameOf(interfaceRaw), raw: interfaceRaw },
+        detail,
+    };
+}
+/** 遍历动作分支并把当前租户 HTTP 目录信息写回计划，供预检与画布节点后处理使用。 */
+export async function resolveHttpBindings(plan, client) {
+    const records = [];
+    const walk = async (steps, path) => {
+        for (const [index, step] of (steps || []).entries()) {
+            if (!step || typeof step !== 'object')
+                continue;
+            const stepPath = `${path}[${index}]`;
+            if (String(step.type || '') === 'Http') {
+                const params = step.params && typeof step.params === 'object' ? step.params : (step.params = {});
+                const live = await resolveHttpBinding(client, params);
+                const detail = live.detail;
+                const sameNativeObject = (field) => {
+                    const supplied = params[field];
+                    const liveValue = detail[field];
+                    if (supplied === undefined || supplied === null || supplied === '')
+                        return true;
+                    if (!supplied || typeof supplied !== 'object' || Array.isArray(supplied)) {
+                        throw new Error(`${stepPath}.params.${field} 必须是当前接口详情返回的平台原生对象`);
+                    }
+                    const suppliedId = idOf(supplied, 'id', 'mappingId');
+                    const liveId = idOf(liveValue, 'id', 'mappingId');
+                    if (liveId && suppliedId !== liveId) {
+                        throw new Error(`${stepPath}.params.${field} 不属于当前接口详情；请重新读取 interface-detail，禁止混用其他环境的原生映射`);
+                    }
+                    return true;
+                };
+                sameNativeObject('request');
+                sameNativeObject('response');
+                // 这些字段是接口详情的回显值，不能信任计划里残留的旧环境地址/方法。
+                params.address = detail.address;
+                params.requestMethod = detail.requestMethod;
+                params.type = detail.type || live.endpoint.raw.interfaceType || 'http';
+                if (detail.selectMethod !== undefined)
+                    params.selectMethod = detail.selectMethod;
+                if (detail.soapVersion !== undefined)
+                    params.soapVersion = detail.soapVersion;
+                params.request ??= detail.request;
+                params.response ??= detail.response;
+                validateHttpInputParams(params.request, params.inputParams, `${stepPath}.params.inputParams`);
+                params._httpLive = {
+                    connectorName: live.connector.name,
+                    connectorIcon: live.connector.icon,
+                    resourceName: live.resource.name,
+                    interfaceName: live.endpoint.name,
+                    interfaceType: detail.type || live.endpoint.raw.type || '',
+                };
+                records.push({
+                    path: `${stepPath}.params`, resourceType: 'http_binding',
+                    value: { systemId: live.connector.id, systemName: live.connector.name, resourceId: live.resource.id, resourceName: live.resource.name, interfaceId: live.endpoint.id, interfaceName: live.endpoint.name },
+                    reason: 'HTTP 连接器、资源、接口及接口详情均从当前租户实时读取；标题和图标使用当前连接器目录',
+                });
+            }
+            if (String(step.type || '') === 'Condition') {
+                const branches = getStepBranches(step);
+                for (const [branchIndex, branch] of branches.entries()) {
+                    await walk(branch?.actions || [], `${stepPath}.branches[${branchIndex}].actions`);
+                }
+            }
+            if (Array.isArray(step.actions))
+                await walk(step.actions, `${stepPath}.actions`);
+        }
+    };
+    await walk(plan.actions || [], 'actions');
+    // 上下文引用必须落到上游接口详情真实存在的 response 字段；同时丢弃计划里
+    // 可能写入的臆造显示名，避免画布显示一个平台不存在的“登录Token”。
+    normalizeHttpContextReferences(plan.actions || []);
+    if (records.length)
+        (plan._autoResources ??= []).push(...records);
+    return records;
+}
+/** 当前租户的 HTTP 连接器，前端路径 connector/getConnetorNoPage?target=http。 */
+export async function httpConnectors(client) {
+    return client.get(`${base(client)}/api/bs/esb/setting/connector/getConnetorNoPage?target=http`);
+}
+/** 连接器下的连接信息/资源，原样返回平台分页 DTO。 */
+export async function httpResources(client, systemId) {
+    if (!String(systemId || '').trim())
+        throw new Error('http-resources 缺少 systemId');
+    return client.get(`${base(client)}/api/bs/esb/setting/resource/getResourceListPage?${query({
+        systemPk: String(systemId), status: '0', showDefalt: 'true', interfaceId: '', current: '1', pageSize: '100',
+    })}`);
+}
+/** 连接器/资源下的接口列表，原样返回平台分页 DTO。 */
+export async function httpInterfaces(client, systemId, resourceId = '', interfaceId = '') {
+    if (!String(systemId || '').trim())
+        throw new Error('http-interfaces 缺少 systemId');
+    return client.get(`${base(client)}/api/bs/esb/setting/interface/list?${query({
+        systemId: String(systemId), status: '0', showDefalt: 'true', current: '1', pageSize: '200',
+        linkInfoId: String(resourceId || ''), interfaceId: String(interfaceId || ''),
+    })}`);
+}
+/** 接口详情，包含 address/requestMethod/request/response/type 等 HTTP 组件原生字段。 */
+export async function httpInterfaceDetail(client, interfaceId) {
+    if (!String(interfaceId || '').trim())
+        throw new Error('http-interface-detail 缺少 interfaceId');
+    return client.get(`${base(client)}/api/bs/esb/setting/interface/getInterfaceInfo/${encodeURIComponent(String(interfaceId))}`);
+}
+//# sourceMappingURL=http_source.js.map

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"plan_constraints.d.ts","sourceRoot":"","sources":["../../../src/services/actionflow/plan_constraints.ts"],"names":[],"mappings":"AAAA,kBAAkB;AAiClB,wBAAgB,+BAA+B,CAAC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,CAM9F;AAED,kCAAkC;AAClC,wBAAgB,sCAAsC,CAAC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAMhG"}
+{"version":3,"file":"plan_constraints.d.ts","sourceRoot":"","sources":["../../../src/services/actionflow/plan_constraints.ts"],"names":[],"mappings":"AAAA,kBAAkB;AAoClB,wBAAgB,+BAA+B,CAAC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,CAM9F;AAED,kCAAkC;AAClC,wBAAgB,sCAAsC,CAAC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAMhG"}

package/dist/services/actionflow/plan_constraints.js

@@ -1,4 +1,5 @@
 /** 动作流级别的组合约束。 */
+import { getStepBranches } from './step_branches.js';
 const INNER_MQ_LISTENER = 'InnerMQListener';
 const INNER_MQ_SEND = 'InnerMQSend';
 function visitNode(node, types) {
@@ -10,8 +11,9 @@ function visitNode(node, types) {
         types.add(node.comType);
     if (Array.isArray(node.actions))
         node.actions.forEach((child) => visitNode(child, types));
-    if (Array.isArray(node.branches)) {
-        node.branches.forEach((branch) => {
+    const branches = getStepBranches(node);
+    if (branches.length) {
+        branches.forEach((branch) => {
             if (branch && typeof branch === 'object') {
                 if (Array.isArray(branch.actions))
                     branch.actions.forEach((child) => visitNode(child, types));

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

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

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

@@ -32,6 +32,14 @@ export declare function syncFormReferencesToDraft(draft: Record<string, any>, pl
 /** 将预检阶段补齐的“查询字段默认全选”同步到已归一化的 Draft。
  * 查询节点的 dataSource 会在编译器中改成服务 DTO，不能再依赖编译期缓存二次推导字段。 */
 export declare function syncQueryFieldsToDraft(draft: Record<string, any>, plan: Record<string, any>): void;
+/**
+ * 归一化 showDataSourceFields 的返回值。
+ *
+ * 设计器前端直接把该接口返回值当作数组使用；部分网关/旧版本则会包成
+ * { data: [...] }。生成器之前只读取 response.data，导致真实业务字段被
+ * 误判为不存在，查询节点最终只保存系统字段，后续动态赋值便显示“已删除”。
+ */
+export declare function normalizeShowDataSourceFields(response: any, formId: string): any[];
 export declare function syncEventResourcesToDraft(draft: Record<string, any>, plan: Record<string, any>): void;
 export declare function syncFixedPeopleToDraft(draft: Record<string, any>, plan: Record<string, any>): void;
 export declare function syncBizFieldsToDraft(draft: Record<string, any>, plan: Record<string, any>): void;

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

@@ -3,22 +3,15 @@ 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 { resolveHttpBindings } from './http_source.js';
 import { registerTargetFormFields, registerTargetDetailFields, registerWorkflowFieldIds, registerWorkflowContextFields, getWorkflowFieldIds, getWorkflowDetailFields, getWorkflowDetailNames, getTargetFormFields, } from './runtime_metadata.js';
 // workflow_id → 目标表单 id（进程缓存）
 const FORM_ID_CACHE = {};
 import { ContextStore, PlatformContextProvider } from './context_provider.js';
-import { queryNodeContext } from './context_preflight.js';
+import { hydrateQueryResultReferences, queryNodeContext } from './context_preflight.js';
 import { get as getComponent } from './components/index.js';
 import { defaultQueryFieldsAll } from './query_field_defaults.js';
-/** 计划 Condition 步骤的分支：兼容顶层 branches 与 params.branches（组件契约 params.branches）。
- * 编译器已认 params.branches，预检此前只读顶层导致漏检/误拒（D04）。 */
-function getStepBranches(step) {
-    const top = step && getStepBranches(step);
-    if (Array.isArray(top))
-        return top;
-    const inner = step && step.params && step.params.branches;
-    return Array.isArray(inner) ? inner : [];
-}
+import { getStepBranches } from './step_branches.js';
 // 表单字段进程缓存
 const FORM_FIELDS_CACHE = {};
 const FORM_LIST_CACHE = {};
@@ -678,7 +671,22 @@ export function checkSourceReferences(plan, eventContextFields, errors) {
             const path = `${prefix}[${idx}]`;
             if (['ActionEbAdd', 'ActionEbUpdate', 'ActionEbDelete', 'ActionEbRecover', 'ActionEbSaveVersion', 'EbGetDataById'].includes(step.type)) {
                 if (params && typeof params === 'object') {
-                    checkMapping(params.mapping, `${path}.mapping`);
+                    const mapping = params.mapping;
+                    if (mapping && typeof mapping === 'object' && !Array.isArray(mapping)) {
+                        // 循环体字段来自 MultipleExecution 的 CycleParams，不属于最外层
+                        // 触发器流程上下文；它由循环节点查询后的 hydrateCurrentLoopReferences
+                        // 单独校验和补全，不能再按 workflowId 源字段检查。
+                        const topLevelMapping = Object.fromEntries(Object.entries(mapping).filter(([, value]) => {
+                            if (!value || typeof value !== 'object' || Array.isArray(value))
+                                return true;
+                            return String(value.scope ?? value.contextScope ?? '') !== 'current_loop'
+                                && String(value.assignment?.scope ?? value.assignment?.contextScope ?? '') !== 'current_loop';
+                        }));
+                        checkMapping(topLevelMapping, `${path}.mapping`);
+                    }
+                    else {
+                        checkMapping(mapping, `${path}.mapping`);
+                    }
                     const bv = params.basisValue;
                     if (bv && typeof bv === 'object') {
                         if (String(bv.kind || bv.assignmentKind || '') !== 'query_result') {
@@ -958,7 +966,7 @@ export function syncFormReferencesToDraft(draft, plan) {
                     dp[key] = { ...ref };
             }
         }
-        const pb = planStep.branches, db = draftStep.branches;
+        const pb = getStepBranches(planStep), db = getStepBranches(draftStep);
         if (Array.isArray(pb) && Array.isArray(db)) {
             for (let i = 0; i < pb.length && i < db.length; i++) {
                 const pa2 = pb[i]?.actions || [], da2 = db[i]?.actions || [];
@@ -983,7 +991,7 @@ export function syncQueryFieldsToDraft(draft, plan) {
         if (Array.isArray(queryFields) && queryFields.length && draftStep.params && typeof draftStep.params === 'object') {
             draftStep.params.queryFields = queryFields.map((field) => ({ ...field }));
         }
-        const pb = planStep.branches || [], db = draftStep.branches || [];
+        const pb = getStepBranches(planStep), db = getStepBranches(draftStep);
         for (let i = 0; i < pb.length && i < db.length; i++) {
             const pa = pb[i]?.actions || [], da = db[i]?.actions || [];
             for (let j = 0; j < pa.length && j < da.length; j++)
@@ -995,6 +1003,51 @@ export function syncQueryFieldsToDraft(draft, plan) {
     for (let i = 0; i < pa.length && i < da.length; i++)
         syncStep(pa[i], da[i]);
 }
+/**
+ * 归一化 showDataSourceFields 的返回值。
+ *
+ * 设计器前端直接把该接口返回值当作数组使用；部分网关/旧版本则会包成
+ * { data: [...] }。生成器之前只读取 response.data，导致真实业务字段被
+ * 误判为不存在，查询节点最终只保存系统字段，后续动态赋值便显示“已删除”。
+ */
+export function normalizeShowDataSourceFields(response, formId) {
+    const root = Array.isArray(response)
+        ? response
+        : Array.isArray(response?.data)
+            ? response.data
+            : Array.isArray(response?.result)
+                ? response.result
+                : [];
+    const fields = [];
+    const visit = (items, inheritedFormId = String(formId), inheritedGroup = undefined) => {
+        for (const item of items || []) {
+            if (!item || typeof item !== 'object')
+                continue;
+            const itemFormId = String(item.formId || inheritedFormId || formId);
+            const group = item.fieldGroup || inheritedGroup || {
+                name: String(item.text || item.formName || item.name || ''),
+                id: itemFormId,
+            };
+            if (Array.isArray(item.fields)) {
+                for (const field of item.fields) {
+                    if (!field || typeof field !== 'object' || !field.id)
+                        continue;
+                    fields.push({
+                        ...field,
+                        formId: String(field.formId || itemFormId),
+                        // 接口返回的 fieldGroup 常只有 id；设计器保存业务字段还需要分组名称。
+                        // 合并而不是直接透传，避免平台把业务字段静默过滤成仅剩系统字段。
+                        fieldGroup: { ...(group || {}), ...(field.fieldGroup || {}) },
+                    });
+                }
+            }
+            if (Array.isArray(item.groups))
+                visit(item.groups, itemFormId, group);
+        }
+    };
+    visit(root);
+    return fields;
+}
 export function syncEventResourcesToDraft(draft, plan) {
     const pe = plan.event, de = draft.event;
     if (!pe || !de || typeof pe !== 'object' || typeof de !== 'object')
@@ -1034,8 +1087,8 @@ export function syncFixedPeopleToDraft(draft, plan) {
                 }
             }
         }
-        const planBranches = planStep.branches || [];
-        const draftBranches = draftStep.branches || [];
+        const planBranches = getStepBranches(planStep);
+        const draftBranches = getStepBranches(draftStep);
         for (let i = 0; i < planBranches.length && i < draftBranches.length; i++) {
             const planActions = planBranches[i]?.actions || [];
             const draftActions = draftBranches[i]?.actions || [];
@@ -1076,8 +1129,8 @@ export function syncEntrustFieldsToDraft(draft, plan) {
         if (planStep.type === 'ApproveEntrust' && planStep.params?._entrustFields && draftStep.params) {
             draftStep.params._entrustFields = planStep.params._entrustFields;
         }
-        const planBranches = planStep.branches || [];
-        const draftBranches = draftStep.branches || [];
+        const planBranches = getStepBranches(planStep);
+        const draftBranches = getStepBranches(draftStep);
         for (let i = 0; i < planBranches.length && i < draftBranches.length; i++) {
             const pa = planBranches[i]?.actions || [], da = draftBranches[i]?.actions || [];
             for (let j = 0; j < pa.length && j < da.length; j++)
@@ -1095,7 +1148,7 @@ export function syncHrmFieldSchemasToDraft(draft, plan) {
         if (['PersonnelOnboarding', 'HrmEmployeeUpdate'].includes(String(planStep.type)) && planStep.params?._hrmFieldSchema && draftStep.params) {
             draftStep.params._hrmFieldSchema = planStep.params._hrmFieldSchema;
         }
-        const planBranches = planStep.branches || [], draftBranches = draftStep.branches || [];
+        const planBranches = getStepBranches(planStep), draftBranches = getStepBranches(draftStep);
         for (let i = 0; i < planBranches.length && i < draftBranches.length; i++)
             syncSteps(planBranches[i]?.actions || [], draftBranches[i]?.actions || []);
         if (Array.isArray(planStep.actions) && Array.isArray(draftStep.actions))
@@ -1187,6 +1240,14 @@ export async function preflightContext(plan, appId, client) {
     await resolveFixedPeople(plan, client);
     await resolveEntrustFields(plan, client, errors);
     await resolveHrmFieldAssignments(plan, client, errors);
+    try {
+        await resolveHttpBindings(plan, client);
+    }
+    catch (e) {
+        errors.push(`HTTP 连接器实时校验失败: ${String(e?.message || e)}`);
+    }
+    if (errors.length)
+        return { valid: false, errors, warnings, contextStore: store.asDict() };
     // 回填 targetForm 缺失的 groupId/name
     try {
         const unresolvedForms = await resolveTargetForms(plan, client);
@@ -1212,23 +1273,35 @@ 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)) {
-                        // getEbField 用于类型/筛选校验；queryFields 必须以设计器自身
-                        // showDataSourceFields 的完整对象保存，否则后端会静默丢弃业务字段。
+                        // getEbField 用于类型/筛选校验；queryFields 必须采用设计器字段选择器
+                        // showDataSourceFields 返回的对象和字段 ID（业务字段通常是 field_<真实ID>），
+                        // 否则后端会静默丢弃业务字段。
                         let selectable = [];
                         try {
-                            const resp = await formSource.showDataSourceFields(client, formId, String(tf.groupId || ''), String(tf.type || 'FORM'));
-                            const groups = Array.isArray(resp?.data) ? resp.data : [];
-                            selectable = groups.flatMap((group) => Array.isArray(group?.fields)
-                                ? group.fields.map((field) => ({ ...field, formId: String(field.formId || group.formId || formId) }))
-                                : []);
+                            // EnquiryForm 编译后数据源的服务组固定为 weaver-ebuilder-form-service；
+                            // tf.groupId 是业务应用 ID，传它会得到空字段列表，进而把 queryFields 留成不完整的 plan 对象。
+                            const resp = await formSource.showDataSourceFields(client, formId, 'weaver-ebuilder-form-service', 'LOGIC');
+                            selectable = normalizeShowDataSourceFields(resp, formId);
                         }
                         catch {
                             // 接口异常时保留下方基于 getEbField 的降级；最终保存仍由平台严格校验。
                         }
-                        const byId = new Map(selectable.map((field) => [String(field.id || ''), field]));
+                        const byId = new Map();
+                        for (const field of selectable) {
+                            const id = String(field?.id || '');
+                            if (!id)
+                                continue;
+                            byId.set(id, field);
+                            // 兼容旧 plan/API 返回不带 field_ 前缀的裸字段 ID，
+                            // 但最终一定替换成当前租户字段选择器的真实 ID。
+                            byId.set(id.startsWith('field_') ? id.slice('field_'.length) : `field_${id}`, field);
+                        }
                         const requested = Array.isArray(params.queryFields) && params.queryFields.length ? params.queryFields : null;
                         if (requested) {
-                            params.queryFields = requested.map((field) => ({ ...(byId.get(String(field?.id || '')) || {}), ...field }));
+                            params.queryFields = requested.map((field) => {
+                                const live = byId.get(String(field?.id || ''));
+                                return live ? { ...live, ...field, id: String(live.id) } : { ...field };
+                            });
                         }
                         else if (selectable.length) {
                             params.queryFields = selectable;
@@ -1447,6 +1520,11 @@ export async function preflightContext(plan, appId, client) {
             errors.push(...result.errors);
             if (result.errors.length)
                 return;
+            if (step.type === 'EnquiryForm') {
+                // 预检拿到的上下文包含平台生成的字段实例 id；回填到后续
+                // query_result，编译 HTTP FormulaBean 时复用手工配置协议。
+                hydrateQueryResultReferences(steps.slice(index + 1), result.context, String(step.ref || step.name || step.id || ''));
+            }
             if (step.type === 'Condition') {
                 for (const [bi, branch] of (getStepBranches(step) || []).entries()) {
                     if (branch && typeof branch === 'object') {