weaver-e10-builder 1.6.12 → 1.6.14

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

@@ -0,0 +1,3 @@
+/** 编译参数映射中选择的「依据值(参数行)」下级。 */
+export declare function buildParamMappingBasisFormula(rows: any[], target: any, item: any, appId: string): Record<string, any>;
+//# sourceMappingURL=param_mapping_basis.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"param_mapping_basis.d.ts","sourceRoot":"","sources":["../../../src/services/actionflow/param_mapping_basis.ts"],"names":[],"mappings":"AAEA,8BAA8B;AAC9B,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAkDrH"}

package/dist/services/actionflow/param_mapping_basis.js

@@ -0,0 +1,61 @@
+import { genSfId, normalizeNumericFrontId } from './id_generator.js';
+/** 编译参数映射中选择的「依据值(参数行)」下级。 */
+export function buildParamMappingBasisFormula(rows, target, item, appId) {
+    const reference = item.value;
+    if (!reference || typeof reference !== 'object' || String(reference.kind || reference.assignmentKind) !== 'context') {
+        throw new Error('参数映射依据值下级必须选择上下文字段');
+    }
+    const selector = String(item.basisParamId || item.basisParamKey || '').trim();
+    const candidates = rows.filter((row) => String(row.id || '') === selector || String(row.paramKey || '') === selector);
+    if (!selector || candidates.length !== 1)
+        throw new Error(`参数映射依据行 '${selector}' 未在 tableData 中唯一匹配`);
+    const basis = candidates[0];
+    let parentId = String(target.parentId || '');
+    const seen = new Set();
+    while (parentId && parentId !== String(basis.id)) {
+        if (seen.has(parentId))
+            throw new Error('参数映射存在循环父子关系');
+        seen.add(parentId);
+        parentId = String(rows.find((row) => String(row.id) === parentId)?.parentId || '');
+    }
+    if (parentId !== String(basis.id))
+        throw new Error('参数映射依据行必须是目标参数的上级');
+    const formula = basis.formulaData;
+    const context = String(formula?.type) === '8' ? formula.childs?.[0] : formula;
+    if (!context || !['3', '10'].includes(String(context.type)))
+        throw new Error('参数映射依据行需要先设置上下文或依据值赋值');
+    const basisConfig = String(context.type) === '10' ? context.config : context;
+    const basisSource = String(basisConfig?.source || '').trim();
+    const selectedSource = String(reference.source || reference.comId || '').trim();
+    if (basisSource && selectedSource && !['event', 'event_1', 'trigger'].includes(selectedSource) && basisSource !== selectedSource) {
+        throw new Error('参数映射依据行与来源字段属于不同的上下文节点');
+    }
+    const basisPath = String(String(context.type) === '10' ? basisConfig?.paramKey : basisConfig?.config?.paramKey || basisConfig?.paramKey || '').trim();
+    const resolved = reference._resolvedContext || {};
+    const sourcePath = String(resolved.paramKey || '').trim();
+    if (!sourcePath)
+        throw new Error('参数映射依据值字段缺少上下文接口返回的 paramKey');
+    const root = String(resolved.tablePrimaryKey || '').trim();
+    const stripRoot = (path) => root && path.startsWith(`${root}.`) ? path.slice(root.length + 1) : path;
+    const parentPath = stripRoot(basisPath);
+    const fieldPath = stripRoot(sourcePath);
+    const relative = fieldPath === parentPath ? 'esbAssignSelf' : fieldPath.startsWith(`${parentPath}.`) ? fieldPath.slice(parentPath.length + 1) : '';
+    if (!parentPath || !relative)
+        throw new Error(`来源字段 '${sourcePath}' 不属于依据值 '${basisPath}'`);
+    const fieldId = normalizeNumericFrontId(resolved.fieldId || resolved.rawField?.id, '参数映射依据值字段 frontId');
+    if (!fieldId)
+        throw new Error(`来源字段 '${sourcePath}' 缺少真实 ParamBean.id`);
+    const selected = `${basis.id}#${relative}`;
+    const name = String(reference.label || resolved.label || reference.name || resolved.rawField?.showName || sourcePath);
+    const fieldType = String(resolved.fieldType || resolved.rawField?.paramType || reference.valueType || target.paramType || 'string');
+    return {
+        id: genSfId(), name, value: selected, type: '10', fieldType, formulaType: fieldType,
+        applicationId: String(appId || ''), childs: [], parentId: '0',
+        config: {
+            frontId: fieldId, paramKey: fieldPath, basisType: 'paramSetting', switchType: `sub#${basis.id}`,
+            level: 1, id: selected, source: basisSource, formulaVersion: 'V1',
+            value: basisConfig.value, config: basisConfig.config, originValue: selected, content: name,
+        },
+    };
+}
+//# sourceMappingURL=param_mapping_basis.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"param_mapping_basis.js","sourceRoot":"","sources":["../../../src/services/actionflow/param_mapping_basis.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAErE,8BAA8B;AAC9B,MAAM,UAAU,6BAA6B,CAAC,IAAW,EAAE,MAAW,EAAE,IAAS,EAAE,KAAa;IAC9F,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC;IAC7B,IAAI,CAAC,SAAS,IAAI,OAAO,SAAS,KAAK,QAAQ,IAAI,MAAM,CAAC,SAAS,CAAC,IAAI,IAAI,SAAS,CAAC,cAAc,CAAC,KAAK,SAAS,EAAE,CAAC;QACpH,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;IACxC,CAAC;IACD,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC9E,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,GAAQ,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,CAAC,KAAK,QAAQ,IAAI,MAAM,CAAC,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,KAAK,QAAQ,CAAC,CAAC;IAC3H,IAAI,CAAC,QAAQ,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,YAAY,QAAQ,sBAAsB,CAAC,CAAC;IACtG,MAAM,KAAK,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;IAC5B,IAAI,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC;IAC7C,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,OAAO,QAAQ,IAAI,QAAQ,KAAK,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC;QACjD,IAAI,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;QACxD,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACnB,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAQ,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,QAAQ,CAAC,EAAE,QAAQ,IAAI,EAAE,CAAC,CAAC;IAC1F,CAAC;IACD,IAAI,QAAQ,KAAK,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;IACxE,MAAM,OAAO,GAAG,KAAK,CAAC,WAAW,CAAC;IAClC,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;IAC9E,IAAI,CAAC,OAAO,IAAI,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;IACtG,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;IAC7E,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,EAAE,MAAM,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC7D,MAAM,cAAc,GAAG,MAAM,CAAC,SAAS,CAAC,MAAM,IAAI,SAAS,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAChF,IAAI,WAAW,IAAI,cAAc,IAAI,CAAC,CAAC,OAAO,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,WAAW,KAAK,cAAc,EAAE,CAAC;QACjI,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAC5C,CAAC;IACD,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,IAAI,WAAW,EAAE,QAAQ,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACtJ,MAAM,QAAQ,GAAG,SAAS,CAAC,gBAAgB,IAAI,EAAE,CAAC;IAClD,MAAM,UAAU,GAAG,MAAM,CAAC,QAAQ,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC1D,IAAI,CAAC,UAAU;QAAE,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;IACjE,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC3D,MAAM,SAAS,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC7G,MAAM,UAAU,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC;IACxC,MAAM,SAAS,GAAG,SAAS,CAAC,UAAU,CAAC,CAAC;IACxC,MAAM,QAAQ,GAAG,SAAS,KAAK,UAAU,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC,GAAG,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACnJ,IAAI,CAAC,UAAU,IAAI,CAAC,QAAQ;QAAE,MAAM,IAAI,KAAK,CAAC,SAAS,UAAU,aAAa,SAAS,GAAG,CAAC,CAAC;IAC5F,MAAM,OAAO,GAAG,uBAAuB,CAAC,QAAQ,CAAC,OAAO,IAAI,QAAQ,CAAC,QAAQ,EAAE,EAAE,EAAE,mBAAmB,CAAC,CAAC;IACxG,IAAI,CAAC,OAAO;QAAE,MAAM,IAAI,KAAK,CAAC,SAAS,UAAU,qBAAqB,CAAC,CAAC;IACxE,MAAM,QAAQ,GAAG,GAAG,KAAK,CAAC,EAAE,IAAI,QAAQ,EAAE,CAAC;IAC3C,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,CAAC,KAAK,IAAI,QAAQ,CAAC,KAAK,IAAI,SAAS,CAAC,IAAI,IAAI,QAAQ,CAAC,QAAQ,EAAE,QAAQ,IAAI,UAAU,CAAC,CAAC;IACtH,MAAM,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,SAAS,IAAI,QAAQ,CAAC,QAAQ,EAAE,SAAS,IAAI,SAAS,CAAC,SAAS,IAAI,MAAM,CAAC,SAAS,IAAI,QAAQ,CAAC,CAAC;IACpI,OAAO;QACL,EAAE,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS;QACnF,aAAa,EAAE,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,GAAG;QAC7D,MAAM,EAAE;YACN,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,cAAc,EAAE,UAAU,EAAE,OAAO,KAAK,CAAC,EAAE,EAAE;YAC/F,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,cAAc,EAAE,IAAI;YACjE,KAAK,EAAE,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI;SAC3F;KACF,CAAC;AACJ,CAAC"}

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

@@ -15,6 +15,8 @@ export declare function resolveEventButtonSelection(plan: Record<string, any>, c
 export declare function stepFormRef(step: Record<string, any>): Record<string, any> | null;
 /** 查 form-fields 返回完整字段列表（id/showName/componentKey/paramType），进程缓存。 */
 export declare function getFormFieldsFull(formId: string, client: ApiClient, tf?: Record<string, any> | null): Promise<any[]>;
+/** 删除和条件更新只解析 EB 表单，不使用数据源各分类的 Browser。 */
+export declare function resolveFormConditionTargets(plan: Record<string, any>, client: ApiClient): Promise<void>;
 /** 回填 plan 里 targetForm 缺失的 groupId/name/text/groupName。返回无法解析的表单 id 列表。 */
 export declare function resolveTargetForms(plan: Record<string, any>, client: ApiClient): Promise<string[]>;
 /** 为必填的表单定时触发器补一个当前租户真实操作人。 */
@@ -85,6 +87,14 @@ export declare function normalizeShowDataSourceFields(response: any, formId: str
  * options 使用，通常是 [{ id, content, type }]，不是 { fields: [...] }。
  */
 export declare function normalizeDataSourceSelectorFields(response: any, formId: string): any[];
+/**
+ * 归一化 /api/ebuilder/common/ds/fields 的字段对象。
+ *
+ * EnquiryForm 的 filterInput 左值必须使用数据源字段选择器返回的实时元数据；
+ * getEbField 只适合表单字段校验，部分租户不会带齐 componentKey、formInfo、
+ * sformId 和物理字段信息。这里只补齐编译器读取的别名，不改变平台原对象。
+ */
+export declare function normalizeDataSourceField(field: 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":"AAAA;;;GAGG;AACH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AA6DtD;;;;GAIG;AACH,wBAAgB,6BAA6B,CAAC,QAAQ,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,GAAG,GAAG,EAAE,CAiCpF;AAED,uCAAuC;AACvC,wBAAsB,2BAA2B,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAiB9G;AAgFD,gEAAgE;AAChE,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAKjF;AAOD,uEAAuE;AACvE,wBAAsB,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CA8D1H;AAqCD,2CAA2C;AAC3C,wBAAsB,2BAA2B,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CA0B7G;AAED,4EAA4E;AAC5E,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CA+LxG;AAED,+BAA+B;AAC/B,wBAAsB,2BAA2B,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAe9G;AAsCD,yCAAyC;AACzC,wBAAsB,wCAAwC,CAC5D,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,GACjF,OAAO,CAAC,IAAI,CAAC,CAuEf;AAED,iCAAiC;AACjC,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAyErG;AAkBD,oDAAoD;AACpD,wBAAsB,6BAA6B,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAgDhH;AAwBD,qDAAqD;AACrD,wBAAsB,yBAAyB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CA4D5G;AAkCD,4CAA4C;AAC5C,wBAAsB,2BAA2B,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAsB9G;AAqDD;;;GAGG;AACH,wBAAsB,2BAA2B,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CA8C9G;AAmGD,0DAA0D;AAC1D,wBAAsB,kCAAkC,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CA8DrH;AAkBD;;;;GAIG;AACH,wBAAsB,0BAA0B,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAmF7G;AAED,0CAA0C;AAC1C,wBAAsB,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CA+CxH;AAED,mDAAmD;AACnD,wBAAsB,sBAAsB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA4FnK;AAED,4CAA4C;AAC5C,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,kBAAkB,EAAE,GAAG,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,gBAAgB,GAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM,GAAG,IAAI,CAiI9J;AAgPD;;;;;;;;;GASG;AACH,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACzB,kBAAkB,EAAE,GAAG,EAAE,EACzB,YAAY,GAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM,GACrC,IAAI,CAsKN;AAED;;;;GAIG;AACH,wBAAgB,iCAAiC,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,kBAAkB,EAAE,GAAG,EAAE,GAAG,IAAI,CAwD5G;AAID,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CASnG;AAED,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAsBrG;AAED;uDACuD;AACvD,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAgBlG;AAsED;;;;;;GAMG;AACH,wBAAgB,6BAA6B,CAAC,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,GAAG,GAAG,EAAE,CAkClF;AAED;;;;;GAKG;AACH,wBAAgB,iCAAiC,CAAC,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,GAAG,GAAG,EAAE,CAiBtF;AAED;;;;;;GAMG;AACH,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,GAAG,GAAG,CAsBxE;AAED,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAMrG;AAED,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAsClG;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAYhG;AAED,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAcpG;AAED,uDAAuD;AACvD,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAiBtG;AAoGD,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,OAAO,CAAC;IACf,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACnC,YAAY,CAAC,EAAE,GAAG,EAAE,CAAC;IACrB,aAAa,CAAC,EAAE,GAAG,EAAE,CAAC;CACvB;AAiCD,kCAAkC;AAClC,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,eAAe,CAAC,CAulB5H"}

package/dist/services/actionflow/preflight_service.js

@@ -15,10 +15,10 @@ const FORM_ID_CACHE = {};
 import { ContextStore, PlatformContextProvider } from './context_provider.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';
+import { OPTION_FIELD_COMPONENT_KEYS } from './option_field_types.js';
 // 表单字段进程缓存
 const FORM_FIELDS_CACHE = {};
 const FORM_LIST_CACHE = {};
@@ -241,9 +241,7 @@ export async function getFormFieldsFull(formId, client, tf) {
     catch {
         // 查询失败返回空，由调用方判定
     }
-    // getEbField 在部分租户/版本只返回空 data 或直接请求失败，但动作流
-    // 设计器的 ds/fields 仍能返回完整的主表和明细字段。这里仅作为动作流
-    // 预检的字段元数据兜底，不修改表单数据或表单设计接口。
+    // 保持原有字段查询兼容；条件字段始终由各自的实时选择器单独登记。
     if (!fields.length) {
         try {
             const fallback = await formSource.dataSourceFields(client, formId);
@@ -263,7 +261,7 @@ export async function getFormFieldsFull(formId, client, tf) {
             }
         }
         catch {
-            // 两个字段接口都不可用时仍返回空，由动作流预检给出可定位错误。
+            // 查询失败时保持空字段列表，由预检报告。
         }
     }
     FORM_FIELDS_CACHE[formId] = fields;
@@ -303,6 +301,41 @@ function findTfGroup(plan, formId) {
     };
     return search(plan.actions || []);
 }
+function usesFormConditionFields(step) {
+    return step?.type === 'ActionEbDelete' || (step?.type === 'ActionEbUpdate'
+        && String(step?.params?.opType || 'updateData') === 'updateData');
+}
+/** 删除和条件更新只解析 EB 表单，不使用数据源各分类的 Browser。 */
+export async function resolveFormConditionTargets(plan, client) {
+    for (const step of walkPlanSteps(plan.actions || [])) {
+        if (!usesFormConditionFields(step))
+            continue;
+        const ref = step.params?.targetForm;
+        if (!ref || typeof ref !== 'object' || Array.isArray(ref))
+            throw new Error(`${step.type}.targetForm 缺少目标表单`);
+        const id = String(ref.id || ref.tableId || '').trim();
+        const groupId = String(ref.groupId || ref.appId || '').trim();
+        if (id && groupId && (ref.name || ref.text) && ref.groupName) {
+            ref.id = id;
+            ref.groupId = groupId;
+            continue;
+        }
+        const keyword = id || String(ref.name || ref.text || '').trim();
+        if (!keyword)
+            throw new Error(`${step.type}.targetForm 缺少表单 ID 或名称，无法查询所属应用`);
+        const result = await formSource.searchForms(client, keyword, groupId ? { appId: groupId } : {});
+        const hits = result.hits.filter((hit) => (!id || hit.objId === id) && (!groupId || hit.appId === groupId));
+        if (result.truncated || hits.length !== 1 || !hits[0].appId) {
+            throw new Error(`${step.type}.targetForm 未能唯一确定表单及所属应用：${keyword}（匹配 ${hits.length} 项）`);
+        }
+        const hit = hits[0];
+        ref.id = hit.objId;
+        ref.groupId = hit.appId;
+        ref.name ||= hit.name;
+        ref.text ||= hit.name;
+        ref.groupName ||= hit.appName;
+    }
+}
 /** 回填 plan 里 targetForm 缺失的 groupId/name/text/groupName。返回无法解析的表单 id 列表。 */
 export async function resolveTargetForms(plan, client) {
     const normalizeRef = (ref) => {
@@ -344,7 +377,7 @@ export async function resolveTargetForms(plan, client) {
         for (const step of steps || []) {
             if (!step || typeof step !== 'object')
                 continue;
-            if (['ActionEbAdd', 'ActionEbUpdate', 'ActionEbDelete', 'ActionEbRecover', 'ActionEbSaveVersion', 'EbGetDataById'].includes(step.type)) {
+            if (!usesFormConditionFields(step) && ['ActionEbAdd', 'ActionEbUpdate', 'ActionEbDelete', 'ActionEbRecover', 'ActionEbSaveVersion', 'EbGetDataById'].includes(step.type)) {
                 const tf = (step.params || {}).targetForm;
                 if (tf && typeof tf === 'object' && tf.id) {
                     if (!tf.groupId || !tf.name || !tf.text || !tf.groupName)
@@ -357,7 +390,9 @@ export async function resolveTargetForms(plan, client) {
                         collect(branch.actions || []);
                 }
             }
-            if (['EventFormData', 'EventButton', 'TimeBatchTrigger', 'DateTrigger', 'EnquiryForm'].includes(step.type)) {
+            // 这三类数据源已由 resolveActionflowDataSources 通过实时 Browser 解析；
+            // Browser.groupId 是服务组而不是应用 ID，不再走旧表单归属查询。
+            if (['EventFormData', 'EventButton'].includes(step.type)) {
                 const ds = (step.params || {}).dataSource || (step.params || {}).targetForm;
                 if (ds && typeof ds === 'object' && ds.id) {
                     if (needsLegacyFormResolution(ds) && (!ds.groupId || !ds.name || !ds.text || !ds.groupName))
@@ -366,7 +401,7 @@ export async function resolveTargetForms(plan, client) {
             }
         }
     };
-    if (event && typeof event === 'object') {
+    if (event && typeof event === 'object' && !['TimeBatchTrigger', 'DateTrigger'].includes(String(event.type || ''))) {
         const ep = event.params || {};
         if (ep && typeof ep === 'object') {
             const es = ep.targetForm || ep.dataSource;
@@ -420,12 +455,12 @@ export async function resolveTargetForms(plan, client) {
                 continue;
             const params = step.params || {};
             if (params && typeof params === 'object') {
-                if (['ActionEbAdd', 'ActionEbUpdate', 'ActionEbDelete', 'ActionEbRecover', 'ActionEbSaveVersion', 'EbGetDataById'].includes(step.type)) {
+                if (!usesFormConditionFields(step) && ['ActionEbAdd', 'ActionEbUpdate', 'ActionEbDelete', 'ActionEbRecover', 'ActionEbSaveVersion', 'EbGetDataById'].includes(step.type)) {
                     const tf = params.targetForm;
                     if (tf && typeof tf === 'object' && tf.groupId)
                         groupIds.add(String(tf.groupId));
                 }
-                if (['EventFormData', 'EventButton', 'TimeBatchTrigger', 'DateTrigger', 'EnquiryForm'].includes(step.type)) {
+                if (['EventFormData', 'EventButton'].includes(step.type)) {
                     const ds = params.dataSource || params.targetForm;
                     if (ds && typeof ds === 'object' && ds.groupId)
                         groupIds.add(String(ds.groupId));
@@ -440,7 +475,7 @@ export async function resolveTargetForms(plan, client) {
         }
     };
     collectGroups(plan.actions || []);
-    if (event && typeof event === 'object') {
+    if (event && typeof event === 'object' && !['TimeBatchTrigger', 'DateTrigger'].includes(String(event.type || ''))) {
         const ep = event.params || {};
         if (ep && typeof ep === 'object') {
             const es = ep.targetForm || ep.dataSource;
@@ -482,7 +517,7 @@ export async function resolveTargetForms(plan, client) {
                             tf.groupName = info.groupName;
                     }
                 }
-                if (['EventFormData', 'EventButton', 'TimeBatchTrigger', 'DateTrigger', 'EnquiryForm'].includes(step.type)) {
+                if (['EventFormData', 'EventButton'].includes(step.type)) {
                     const ds = (step.params || {}).dataSource || (step.params || {}).targetForm;
                     if (ds && typeof ds === 'object' && String(ds.id || '') === fid) {
                         ds.groupId = info.groupId;
@@ -503,7 +538,7 @@ export async function resolveTargetForms(plan, client) {
             }
         };
         patch(plan.actions || []);
-        if (event && typeof event === 'object') {
+        if (event && typeof event === 'object' && !['TimeBatchTrigger', 'DateTrigger'].includes(String(event.type || ''))) {
             const ep = event.params || {};
             if (ep && typeof ep === 'object') {
                 const es = ep.targetForm || ep.dataSource;
@@ -2009,10 +2044,30 @@ export function hydrateMappingLabels(plan, eventContextFields, eventContext = {}
     };
     const labelOf = (field, fallback) => String(field?.label || field?.showName || field?.paramName || field?.raw?.showName || field?.raw?.paramName || fallback);
     const enrichTarget = (sourceKey, target) => {
-        const requestedKey = target && typeof target === 'object' && !Array.isArray(target)
+        let requestedKey = target && typeof target === 'object' && !Array.isArray(target)
             ? String(target.paramKey || target.key || sourceKey)
             : String(sourceKey);
-        const field = findField(requestedKey);
+        let field = findField(requestedKey);
+        const kind = String(target?.kind || target?.assignmentKind || 'context');
+        const sourceComponent = String(field?.componentKey || field?.raw?.componentKey || '');
+        // 依据值下级由 fieldSet.matchMode 控制匹配方式，优先于普通赋值的 assignType。
+        const matchMode = String(target?.fieldSet?.matchMode || target?.fieldOptions?.fieldSet?.matchMode || '');
+        const matchByName = matchMode
+            ? matchMode === 'optionName'
+            : String(target?.assignType || target?.fieldOptions?.assignType || '') === 'name';
+        if (matchByName && kind === 'context' && field && OPTION_FIELD_COMPONENT_KEYS.has(sourceComponent)
+            && !requestedKey.endsWith('_name')) {
+            // 只使用实时上下文确实返回的名称字段，不能靠后缀伪造引用。
+            const nameField = findField(`${requestedKey}_name`);
+            if (!nameField)
+                throw new Error(`选项名称赋值的来源 '${requestedKey}' 未返回唯一的名称上下文字段，请查询组件上下文并指定名称字段`);
+            requestedKey = String(nameField.paramKey);
+            field = nameField;
+            target.paramKey = requestedKey;
+            target.label = labelOf(field, requestedKey);
+            delete target._resolvedContext;
+            delete target.frontId;
+        }
         const label = labelOf(field, requestedKey);
         if (target && typeof target === 'object' && !Array.isArray(target)) {
             const declaredKind = String(target.kind || target.assignmentKind || 'context');
@@ -2040,6 +2095,43 @@ export function hydrateMappingLabels(plan, eventContextFields, eventContext = {}
             if (!step || typeof step !== 'object')
                 continue;
             const params = step.params || {};
+            // 其他复用表单设置的组件可能使用 fieldAssignments 或平台 DTO，
+            // 而不是 e-builder 的 mapping。只处理明确携带选项匹配设置的上下文引用。
+            const hydrateSettingRefs = (value) => {
+                if (!value || typeof value !== 'object')
+                    return;
+                if (Array.isArray(value)) {
+                    value.forEach(hydrateSettingRefs);
+                    return;
+                }
+                const entry = value.value;
+                if (entry && typeof entry === 'object' && entry.assign && typeof entry.assign === 'object'
+                    && String(entry.assign.kind || entry.assign.assignmentKind || '') === 'context') {
+                    const ref = entry.assign;
+                    const originalKey = String(ref.paramKey || ref.key || '');
+                    const enriched = enrichTarget(String(ref.paramKey || ref.key || ''), {
+                        ...ref, assignType: entry.assignType, fieldSet: entry.fieldSet,
+                    });
+                    for (const key of ['paramKey', 'label', '_resolvedContext', 'frontId']) {
+                        if (enriched[key] !== undefined)
+                            ref[key] = enriched[key];
+                        else if (key === 'frontId' && enriched.paramKey !== originalKey)
+                            delete ref.frontId;
+                    }
+                }
+                if (String(value.kind || value.assignmentKind || '') === 'context'
+                    && (value.assignType || value.fieldSet || value.fieldOptions)) {
+                    enrichTarget(String(value.paramKey || value.key || ''), value);
+                }
+                for (const child of Object.values(value))
+                    hydrateSettingRefs(child);
+            };
+            if (params.fieldAssignments)
+                hydrateSettingRefs(params.fieldAssignments);
+            for (const key of ['setting', 'settingCommon', 'settingType', 'formSetting', 'settingId']) {
+                if (params[key] && typeof params[key] === 'object')
+                    hydrateSettingRefs(params[key]);
+            }
             const mapping = params && typeof params === 'object' ? params.mapping : null;
             if (mapping && typeof mapping === 'object') {
                 for (const [sourceKey, target] of Object.entries(mapping)) {
@@ -2265,8 +2357,7 @@ function referencedDataSourceFieldIds(plan, sourceStep, sourceId) {
     return [...ids];
 }
 function canonicalQueryFieldId(value) {
-    const id = String(value || '').trim();
-    return id.startsWith('field_') ? id.slice('field_'.length) : id;
+    return String(value || '').trim();
 }
 /**
  * 归一化 showDataSourceFields 的返回值。
@@ -2344,7 +2435,7 @@ export function normalizeDataSourceSelectorFields(response, formId) {
  * getEbField 只适合表单字段校验，部分租户不会带齐 componentKey、formInfo、
  * sformId 和物理字段信息。这里只补齐编译器读取的别名，不改变平台原对象。
  */
-function normalizeDataSourceField(field, formId) {
+export function normalizeDataSourceField(field, formId) {
     if (!field || typeof field !== 'object')
         return field;
     let config = field.config;
@@ -2363,8 +2454,10 @@ function normalizeDataSourceField(field, formId) {
     return {
         ...field,
         id,
+        // 区分接口原始 name 与下面仅用于展示/兼容的合成 name。
+        ...(field.name !== undefined && field.name !== null && String(field.name).trim() ? { _conditionFieldName: String(field.name) } : {}),
         showName: String(field.showName || field.text || field.name || field.content || id),
-        name: String(field.name || (id && /^\d+$/.test(id) ? `field_${id}` : field.text || id)),
+        name: field.name === undefined || field.name === null ? '' : String(field.name),
         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'),
@@ -2712,13 +2805,14 @@ export async function preflightContext(plan, appId, client) {
         return { valid: false, errors, warnings, contextStore: store.asDict() };
     // 回填 targetForm 缺失的 groupId/name
     try {
+        await resolveFormConditionTargets(plan, client);
         const unresolvedForms = await resolveTargetForms(plan, client);
         for (const fid of unresolvedForms) {
             errors.push(`targetForm.id='${fid}' 未在平台表单中找到, 无法确定所属应用(groupId). 请用 form-applications + form-list 确认表单真实存在.`);
         }
     }
-    catch {
-        // 忽略
+    catch (error) {
+        errors.push(`目标表单查询失败: ${String(error?.message || error)}`);
     }
     // EventButton 的 targetForm 可能只提供表单 id；先完成 targetForm 的实时归属回填，
     // 再按前端 ebuilderButton 浏览器校验真实按钮以及 before 能力。
@@ -2731,11 +2825,11 @@ export async function preflightContext(plan, appId, client) {
         errors.push(`EventButton 按钮查询/执行前能力校验失败: ${String(error?.message || error)}`);
     }
     // 查并登记所有目标表单字段元数据（转换前必须有 fieldType/componentKey）
-    const hydrateFilterFields = async (steps) => {
+    const hydrateFilterFields = async (steps, formConditionOnly = false) => {
         for (const step of steps || []) {
             if (!step || typeof step !== 'object')
                 continue;
-            if (['ActionEbAdd', 'ActionEbUpdate', 'ActionEbDelete', 'ActionEbRecover', 'ActionEbSaveVersion', 'EbGetDataById', 'EnquiryForm', 'TimeBatchTrigger', 'EventFormData', 'EventButton', 'DateTrigger'].includes(step.type)) {
+            if ((!formConditionOnly || usesFormConditionFields(step)) && ['ActionEbAdd', 'ActionEbUpdate', 'ActionEbDelete', 'EnquiryForm', 'TimeBatchTrigger', 'EventFormData', 'EventButton', 'DateTrigger'].includes(step.type)) {
                 const tf = stepFormRef(step);
                 if (tf && tf.id) {
                     const formId = String(tf.id);
@@ -2744,28 +2838,23 @@ export async function preflightContext(plan, appId, client) {
                     // /api/ebuilder/common/ds/fields，不能回退到 getEbField。
                     const isActionEbUpdateCondition = step.type === 'ActionEbUpdate'
                         && String((step.params || {}).opType || 'updateData') === 'updateData';
+                    const isFormCondition = usesFormConditionFields(step);
+                    const isButtonCondition = step.type === 'EventButton' && Boolean(step.params?.filter);
+                    // 表单数据触发沿用前端按字段变化的既有查询；其余仅表单设置使用 getEbField。
+                    const needsEbFields = ['ActionEbAdd', 'ActionEbUpdate', 'EventFormData'].includes(step.type);
                     const strictConditionSource = [
                         'ActionEbDelete', 'EnquiryForm', 'TimeBatchTrigger', 'DateTrigger',
-                    ].includes(step.type) || isActionEbUpdateCondition;
-                    const sourceProtocol = formSource.actionflowDataSourceProtocol(tf);
-                    // 删除/条件更新的 ConditionSet 绑定的是目标 e-builder 表单 Browser，
-                    // 与数据源查询/定时触发器不同：ds/fields 必须传应用 groupId、表单 sourceId
-                    // 和 sourceType=FORM（前端 ConditionSet 的实际请求协议）。
-                    const conditionFieldProtocol = step.type === 'ActionEbDelete' || isActionEbUpdateCondition
-                        ? {
-                            groupId: String(tf.groupId || tf.appId || ''),
-                            sourceType: 'FORM',
-                        }
-                        : sourceProtocol;
+                    ].includes(step.type) || isActionEbUpdateCondition || isButtonCondition;
+                    const sourceProtocol = isFormCondition || isButtonCondition ? null : formSource.actionflowDataSourceProtocol(tf);
                     // 严格条件来源的字段不是普通 EB 表单字段：
                     // 它们必须来自 /api/ebuilder/common/ds/fields，不能先调用 getEbField。
-                    let fields = strictConditionSource ? [] : await getFormFieldsFull(formId, client, tf);
-                    if (!strictConditionSource)
+                    let fields = needsEbFields ? await getFormFieldsFull(formId, client, tf) : [];
+                    if (!strictConditionSource && needsEbFields)
                         await hydrateReferenceFilterFields(plan, client, formId, tf, fields);
                     // “默认全选”必须在计划层固化为实时字段列表。仅在编译期依赖全局缓存时，
                     // 查询组件偶尔会只保留系统字段，筛选编辑器因此把业务字段标成“已删除”。
                     const params = step.params && typeof step.params === 'object' ? step.params : (step.params = {});
-                    if (['ActionEbDelete', 'EnquiryForm', 'TimeBatchTrigger', 'DateTrigger'].includes(step.type)
+                    if (['ActionEbDelete', 'EnquiryForm', 'TimeBatchTrigger', 'DateTrigger'].includes(step.type) || isButtonCondition
                         || (step.type === 'ActionEbUpdate' && String(params.opType || 'updateData') === 'updateData')) {
                         // EnquiryForm/条件更新的筛选条件左值必须来自数据源字段选择器，
                         // 而不是只用 getEbField 的表单字段对象。后者经常缺少数据源侧的
@@ -2773,7 +2862,9 @@ export async function preflightContext(plan, appId, client) {
                         // 或保存时静默丢弃。
                         let dataSourceFields = [];
                         try {
-                            const dataSourceResponse = await formSource.dataSourceFields(client, formId, true, conditionFieldProtocol);
+                            const dataSourceResponse = isFormCondition || isButtonCondition
+                                ? await formSource.formConditionFields(client, String(tf.groupId || tf.appId || ''), formId)
+                                : await formSource.dataSourceFields(client, formId, true, sourceProtocol);
                             dataSourceFields = normalizeShowDataSourceFields(dataSourceResponse, formId)
                                 .map((field) => normalizeDataSourceField(field, formId))
                                 .filter((field) => Boolean(field?.id));
@@ -2781,20 +2872,24 @@ export async function preflightContext(plan, appId, client) {
                                 replaceTargetDataSourceFields(formId, dataSourceFields);
                             if (strictConditionSource) {
                                 fields = dataSourceFields;
-                                await hydrateReferenceFilterFields(plan, client, formId, tf, fields);
+                                if (!isFormCondition && !isButtonCondition)
+                                    await hydrateReferenceFilterFields(plan, client, formId, tf, fields);
                             }
-                            if (dataSourceFields.length)
+                            if (dataSourceFields.length && step.type !== 'ActionEbUpdate')
                                 registerTargetFormFields(formId, dataSourceFields);
-                            if (strictConditionSource && sourceProtocol.kind !== 'data_processing' && !dataSourceFields.length) {
+                            if (strictConditionSource && !dataSourceFields.length) {
                                 errors.push(`${step.type}.filterCondition: /api/ebuilder/common/ds/fields 未返回数据源字段，拒绝使用 getEbField 生成条件左值。`);
                             }
                         }
                         catch (error) {
-                            if (strictConditionSource && sourceProtocol.kind !== 'data_processing') {
+                            if (strictConditionSource) {
                                 replaceTargetDataSourceFields(formId, []);
                                 errors.push(`${step.type}.filterCondition: /api/ebuilder/common/ds/fields 查询失败，拒绝使用 getEbField 生成条件左值：${String(error?.message || error)}`);
                             }
                         }
+                        // 删除和条件更新不配置数据源查询的 queryFields，也不请求 showDataSourceFields。
+                        if (isFormCondition || isButtonCondition)
+                            continue;
                         if (step.type === 'EnquiryForm') {
                             const groupFields = Array.isArray(params.groupFields) ? params.groupFields : [];
                             const groupMessage = Array.isArray(params.groupMessage) ? params.groupMessage : [];
@@ -2810,7 +2905,6 @@ export async function preflightContext(plan, appId, client) {
                                         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 未返回可选字段，拒绝凭空生成分组字段。');
@@ -2850,7 +2944,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, true, sourceProtocol);
+                                    const full = await formSource.dataSourceFields(client, formId, true, sourceProtocol ?? undefined);
                                     const walkPhysical = (items) => {
                                         for (const item of items || []) {
                                             if (item?.physicalTable)
@@ -2904,9 +2998,8 @@ export async function preflightContext(plan, appId, client) {
                             const mainFields = fields
                                 .filter((field) => String(field.subFormId ?? '-1') === '-1')
                                 .map((field) => ({ formId, parseMark: Boolean(field.parseMark ?? true), id: String(field.id), content: String(field.showName || field.name || field.id) }));
-                            const defaults = defaultQueryFieldsAll(formId);
                             const seen = new Set();
-                            params.queryFields = [...mainFields, ...defaults].filter((field) => {
+                            params.queryFields = mainFields.filter((field) => {
                                 const id = String(field?.id || '');
                                 if (!id || seen.has(id))
                                     return false;
@@ -2937,9 +3030,11 @@ export async function preflightContext(plan, appId, client) {
             if (step.type === 'Condition') {
                 for (const branch of getStepBranches(step) || []) {
                     if (branch && typeof branch === 'object')
-                        await hydrateFilterFields(branch.actions || []);
+                        await hydrateFilterFields(branch.actions || [], formConditionOnly);
                 }
             }
+            if (step.type === 'MultipleExecution' && Array.isArray(step.actions))
+                await hydrateFilterFields(step.actions, true);
         }
     };
     await hydrateFilterFields([event]);
@@ -3211,6 +3306,13 @@ export async function preflightContext(plan, appId, client) {
             // 后替换为真实节点 ID，且不再错误退回到触发器组件类型。
             const sourceRef = String(step.ref || step.id || `context_${path.replace(/[^A-Za-z0-9_]/g, '_')}`);
             step.ref ??= sourceRef;
+            try {
+                hydrateMappingLabels({ actions: steps.slice(index + 1) }, [], result.context);
+            }
+            catch (e) {
+                errors.push(String(e?.message || e));
+                return;
+            }
             hydrateContextReferences(steps.slice(index + 1), result.context, { id: sourceRef, type: String(step.type || '') });
             if (step.type === 'EnquiryForm') {
                 // 预检拿到的上下文包含平台生成的字段实例 id；回填到后续