weaver-e10-builder 1.6.13 → 1.6.14

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

@@ -5,7 +5,7 @@ import type { CompilerContext } from './components/index.js';
  * silently compiling that copy produces an empty designer selection.  Refuse
  * the unsafe plan and require a target-side fixed value or an explicit mapper.
  */
-export declare function assertCompatibleEnumContextMapping(sourceKey: string, targetFieldId: string, result: Record<string, any>, meta: Record<string, any>): void;
+export declare function assertCompatibleEnumContextMapping(sourceKey: string, targetFieldId: string, result: Record<string, any>, meta: Record<string, any>, assignType?: string): void;
 export declare function compileComponentData(draftParams: Record<string, any>, componentType: string, ctx: CompilerContext, skipCompiler?: boolean): Record<string, any>;
 export declare function fillSetting(result: Record<string, any>, updates: any, mapping: any, constants: any, formula: any, meta: Record<string, any>, appId: string, eventId: string, eventName: string, componentType: string): void;
 export declare function buildFilterInput(result: Record<string, any>, val: any, meta: Record<string, any>, appId: string, componentType?: string, allowTree?: boolean): Record<string, any>;

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

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

package/dist/services/actionflow/workflow_compiler.js

@@ -127,7 +127,10 @@ function sourceFieldMeta(paramKey, meta) {
  * silently compiling that copy produces an empty designer selection.  Refuse
  * the unsafe plan and require a target-side fixed value or an explicit mapper.
  */
-export function assertCompatibleEnumContextMapping(sourceKey, targetFieldId, result, meta) {
+export function assertCompatibleEnumContextMapping(sourceKey, targetFieldId, result, meta, assignType) {
+    // 选项名称按目标字段名称匹配，不要求两张表的 valueKey 相同。
+    if (assignType === 'name')
+        return;
     const target = lookupTargetFieldMeta(targetFieldId, result);
     const source = sourceFieldMeta(sourceKey, meta);
     const sourceKind = String(source?.componentKey || source?.type || '');
@@ -631,7 +634,7 @@ export function fillSetting(result, updates, mapping, constants, formula, meta,
                     assignment.parentName = targetFieldId.parentName;
                 if (refDetail)
                     assignment.detailLabel = refDetail;
-                assertCompatibleEnumContextMapping(refKey, raw, result, meta || {});
+                assertCompatibleEnumContextMapping(refKey, raw, result, meta || {}, options.assignType);
                 const srcParamKey = String(assignment.paramKey || sourceKey);
                 const srcFt = resolveSourceFieldType(srcParamKey, meta);
                 const targetMeta = lookupTargetFieldMeta(raw, result);
@@ -876,12 +879,26 @@ export function buildFilterInput(result, val, meta, appId, componentType = '', a
     conditions.forEach((c, idx) => {
         if (!c || typeof c !== 'object')
             return;
-        const fieldId = String(c.field.id);
-        let label = c.field.label || c.field.name || fieldId;
+        const requestedFieldId = String(c.field.id);
+        let fieldId = requestedFieldId;
+        let label = c.field.label || c.field.name || '';
         let right = c.right ?? { type: 'fixed', value: '' };
-        const fmeta = fieldIndex[fieldId] || {};
+        let fmeta = fieldIndex[fieldId];
+        if (!fmeta && strictDataSourceCondition) {
+            const candidates = Object.values(fieldIndex);
+            const nameMatches = candidates.filter((field) => String(field._conditionFieldName ?? '') === requestedFieldId);
+            if (nameMatches.length === 1) {
+                fmeta = nameMatches[0];
+                fieldId = String(fmeta.id);
+            }
+            else {
+                const matches = nameMatches.length ? nameMatches : candidates.filter((field) => [field.text, field.showName, field.content].some((value) => String(value ?? '') === requestedFieldId));
+                const display = (matches.length ? matches : candidates.slice(0, 10)).map((field) => `${field.text || field.showName || field.name || field.id}(id=${field.id}, name=${field._conditionFieldName ?? field.name ?? ''})`).join('、');
+                throw new Error(`filterCondition 左侧字段 '${requestedFieldId}' ${matches.length > 1 ? '存在多个候选' : matches.length ? '不是字段 id' : '未匹配到字段'}；数据源 '${formId}' 的实时 ds/fields ${matches.length ? '候选' : '字段'}：${display || '无'}。请使用唯一的字段 id`);
+            }
+        }
         if (!fmeta || Object.keys(fmeta).length === 0) {
-            throw new Error(`filterCondition 左侧字段 id='${fieldId}' 不在目标表单 '${formId}' 的实时字段列表中`);
+            throw new Error(`filterCondition 左侧字段 id='${fieldId}' 不在数据源 '${formId}' 的实时字段列表中`);
         }
         const schema = fmeta.schema && typeof fmeta.schema === 'object' ? fmeta.schema : {};
         const rawFieldType = String(fmeta.type || fmeta.fieldType || schema.fieldType || 'String');
@@ -1031,10 +1048,7 @@ export function buildFilterInput(result, val, meta, appId, componentType = '', a
             }
         }
         const originBrowserType = String(fmeta.originBrowserType || (rawConfig && typeof rawConfig === 'object' ? rawConfig.originBrowserType : '') || (['select', 'reference'].includes(family) ? 'browser' : ''));
-        // e-builder 的条件编辑器并非只靠 id 回填左值。普通业务组件使用
-        // `field_<组件 id>` + 组件类型；但 Workflow 是一个数字 ID 的系统关联字段，
-        // 必须沿用原始 fieldId、原始存储类型 String，以及空 module/originBrowserType。
-        // 不能只按“数字 ID”这一条规则判断，否则设计器会把「关联流程」显示成“已删除”。
+        // 字段名必须来自实时元数据，不能按数字 ID 推导。
         const isNumericBusinessField = /^\d+$/.test(fieldId);
         const isWorkflowSystemField = String(compType).toLowerCase() === 'workflow';
         const needsFormFieldIdentity = isNumericBusinessField;
@@ -1045,9 +1059,9 @@ export function buildFilterInput(result, val, meta, appId, componentType = '', a
             || (fmeta.fieldConfig && typeof fmeta.fieldConfig === 'object' ? fmeta.fieldConfig.module : '')
             || (rawConfig && typeof rawConfig === 'object' ? rawConfig.module : '')
             || (isNumericBusinessField && !isWorkflowSystemField ? 'ebuilderform' : ''));
-        const fieldName = isWorkflowSystemField
-            ? fieldId
-            : (isNumericBusinessField ? `field_${fieldId}` : fieldId);
+        const fieldName = String(fmeta._conditionFieldName || fmeta.fieldName || (strictDataSourceCondition ? '' : fmeta.name) || '').trim();
+        if (!fieldName)
+            throw new Error(`数据源 '${formId}' 的字段 '${fieldId}' 未返回真实字段 name，无法生成筛选条件`);
         const storedFieldType = isWorkflowSystemField
             ? fieldType
             : (isNumericBusinessField ? compType : fieldType);