weaver-e10-builder 1.5.15 → 1.6.0

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

@@ -1 +1 @@
-{"version":3,"file":"system_params.d.ts","sourceRoot":"","sources":["../../../src/services/actionflow/system_params.ts"],"names":[],"mappings":"AAAA,qEAAqE;AAwBrE,eAAO,MAAM,oBAAoB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAQvD,CAAC;AAEF,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,GAAG,GAAG,MAAM,CAIzD;AAkBD,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,GAAG,GAAG,OAAO,CAGzD"}
+{"version":3,"file":"system_params.d.ts","sourceRoot":"","sources":["../../../src/services/actionflow/system_params.ts"],"names":[],"mappings":"AAAA,qEAAqE;AA0BrE,eAAO,MAAM,oBAAoB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAQvD,CAAC;AAEF,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,GAAG,GAAG,MAAM,CAIzD;AAmBD,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,GAAG,GAAG,OAAO,CAGzD"}

package/dist/services/actionflow/system_params.js

@@ -16,6 +16,8 @@ const TOKENS = new Set([
     '{lastdayinthismonth}', '{month}', '{day}', '{hour}', '{minute}', '{second}',
     '{dateweek}', '{weekinmonth}', '{weekinyear}', '{week}', '{mon}', '{tue}', '{wed}',
     '{thu}', '{fri}', '{sat}', '{sun}',
+    '{esbflowid}', '{batchkey}', '{empty}',
+    '{newlineSymbol}', '{horizontalTab}', '{returningSymbol}', '{doubleQuotation}', '{singleQuotation}',
 ]);
 const OFFSET_TOKEN = /^\{(?:date|year|yearhalf|yearquarter|yearmonth|weekinyear|mon|tue|wed|thu|fri|sat|sun):[+-]\d+\}$/;
 const RECENT_TOKEN = /^\{(?:recentdays|recentmonths|recentyears):-\d+\}$/;
@@ -45,7 +47,8 @@ const NON_DATE_TOKENS = new Set([
     '{allsubcompanyid2}', '{allsubcompanyid3}', '{allsupcompanyid0}', '{allsupcompanyid1}',
     '{allsupcompanyid2}', '{allsupcompanyid3}', '{supcompanymanageableorganize}', '{firstlevelsubcompanyid}',
     '{firstlevelsubcompanyname}', '{topsubcompanynodeid}', '{tenantkey}', '{roleid}', '{rolename}',
-    '{securitylevel}', '{compuuid}', '{wechatopenid}',
+    '{securitylevel}', '{compuuid}', '{wechatopenid}', '{esbflowid}', '{batchkey}', '{empty}',
+    '{newlineSymbol}', '{horizontalTab}', '{returningSymbol}', '{doubleQuotation}', '{singleQuotation}',
 ]);
 const DATE_TOKENS = new Set([...TOKENS].filter((t) => !NON_DATE_TOKENS.has(t)));
 export function isDateSystemParameter(value) {

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"trigger_common.d.ts","sourceRoot":"","sources":["../../../src/services/actionflow/trigger_common.ts"],"names":[],"mappings":"AAMA,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE;IAAE,eAAe,EAAE,OAAO,CAAA;CAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAc5H;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,GAAG,GAAG,EAAE,CAU3E;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,GAAG,GAAG,GAAG,EAAE,CAMvD"}
+{"version":3,"file":"trigger_common.d.ts","sourceRoot":"","sources":["../../../src/services/actionflow/trigger_common.ts"],"names":[],"mappings":"AAOA,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE;IAAE,eAAe,EAAE,OAAO,CAAA;CAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAmB5H;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,GAAG,GAAG,EAAE,CAU3E;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,GAAG,GAAG,GAAG,EAAE,CAMvD"}

package/dist/services/actionflow/trigger_common.js

@@ -3,18 +3,27 @@
  * 对齐 Python 版 core/trigger_common.py（黄金参照）。
  */
 import { defaultQueryFieldsAll } from './query_field_defaults.js';
+import { actionflowDataSourceProtocol, normalizeActionflowDataSourceRef } from './form_source.js';
 export function buildTriggerDataSource(value, opts) {
-    const source = value && typeof value === 'object' && !Array.isArray(value) ? value : {};
+    const source = normalizeActionflowDataSourceRef(value);
     const sourceId = String(source.id || source.tableId || source.sourceId || '');
-    const groupId = String(source.groupId ?? source.appId ?? '-98');
+    const protocol = actionflowDataSourceProtocol(source);
+    const groupId = String(source.groupId ?? source.appId ?? (protocol.kind === 'business_module' ? protocol.groupId : '-98'));
+    const sourceType = String(source.type || source.sourceType || protocol.sourceType || 'FORM');
     const result = {
         isPhysical: true,
         physical: true,
         groupId,
         id: sourceId,
         text: String(source.text || source.name || ''),
-        type: String(source.type || 'FORM'),
+        type: sourceType,
     };
+    if (source.sourceId)
+        result.sourceId = String(source.sourceId);
+    if (source.dataSourceKind)
+        result.dataSourceKind = source.dataSourceKind;
+    if (source.queryServiceGroupId)
+        result.queryServiceGroupId = String(source.queryServiceGroupId);
     if (opts.includeSourceId)
         result.sourceId = sourceId;
     return [sourceId, groupId, result];

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

@@ -1 +1 @@
-{"version":3,"file":"trigger_common.js","sourceRoot":"","sources":["../../../src/services/actionflow/trigger_common.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAElE,MAAM,UAAU,sBAAsB,CAAC,KAAU,EAAE,IAAkC;IACnF,MAAM,MAAM,GAAG,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;IACxF,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC;IAC9E,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,KAAK,IAAI,KAAK,CAAC,CAAC;IAChE,MAAM,MAAM,GAAwB;QAClC,UAAU,EAAE,IAAI;QAChB,QAAQ,EAAE,IAAI;QACd,OAAO;QACP,EAAE,EAAE,QAAQ;QACZ,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC;QAC9C,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC;KACpC,CAAC;IACF,IAAI,IAAI,CAAC,eAAe;QAAE,MAAM,CAAC,QAAQ,GAAG,QAAQ,CAAC;IACrD,OAAO,CAAC,QAAQ,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;AACrC,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,KAAU,EAAE,QAAgB;IAClE,iCAAiC;IACjC,gDAAgD;IAChD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,qBAAqB,CAAC,QAAQ,CAAC,CAAC;IACxF,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACtH,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,IAAI,QAAQ,CAAC;QACvC,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,SAAS,IAAI,KAAK,CAAC;QAC3C,EAAE,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;QACnB,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,EAAE,CAAC;KACzC,CAAC,CAAC,CAAC;AACN,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,KAAU;IAC9C,MAAM,MAAM,GAAG,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAC3H,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACzF,EAAE,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;QACnB,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC;KAC3C,CAAC,CAAC,CAAC;AACN,CAAC"}
+{"version":3,"file":"trigger_common.js","sourceRoot":"","sources":["../../../src/services/actionflow/trigger_common.ts"],"names":[],"mappings":"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"}

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

@@ -6,7 +6,7 @@
 import { genSfId, normalizeNumericFrontId } from './id_generator.js';
 import fs from 'node:fs';
 import { get, getCompiler, getNodePost } from './components/index.js';
-import { buildEsbFormDataDto, buildEsbFormField } from './components/form_data_builder.js';
+import { applyFormFieldSettingOptions, buildEsbFormDataDto, buildEsbFormField, } from './components/form_data_builder.js';
 import { findInMetadata, getTargetFormFields, getTargetDataSourceFields, getWorkflowDetailNames, getTargetDetailFields, getWorkflowDetailFields, getWorkflowFieldIds, workflowFieldId, getWorkflowContextFields, getWorkflowContextFieldsByKey } from './runtime_metadata.js';
 import { buildPersonFormula, buildAssignBean, attachEsbAssign, resolveEnumConstant, resolveParamKey, resolveSourceFieldLabel, resolveSourceFieldType, normalizeConstantAssignment, lookupTargetFieldMeta, formulaFixedForAssignSwitch, formulaSystemVar, formulaContext, assignFlatContextDirect, getFormulaFn, formulaFunction, contextTableNameForRoot, normalizeContextParamKey, resolveFormSettingBasisParentName, contextMetaForReference, resolvedContextRoot, protocolParamKey, } from './formula_service.js';
 import { buildFormulaReference, buildUpdateFieldCondition } from './components/action_eb_update_compiler.js';
@@ -15,6 +15,54 @@ import { resolveSystemParameter, isDateSystemParameter } from './system_params.j
 import { conditionFieldFamily, filterFieldType, normalizeFilterOperator, conditionOperatorOverride, resolveFormCtx, buildFilterContextFormula, } from './filter_rules.js';
 import { getStepBranches } from './step_branches.js';
 const ENUM_COMPONENT_KEYS = new Set(['Select', 'RadioBox', 'Checkbox', 'MultiSelect', 'Radio']);
+const FIELD_SETTING_KEYS = new Set(['fieldSet', 'fieldOptions', 'assignType', 'assignTypeset', 'operate', 'operator', 'operation', 'multiSelect', 'original']);
+function fieldSettingOptions(raw) {
+    if (!raw || typeof raw !== 'object' || Array.isArray(raw))
+        return {};
+    const nested = raw.fieldOptions && typeof raw.fieldOptions === 'object' ? raw.fieldOptions : {};
+    const options = { ...nested };
+    for (const key of FIELD_SETTING_KEYS) {
+        if (key === 'fieldOptions')
+            continue;
+        if (raw[key] !== undefined)
+            options[key] = raw[key];
+    }
+    if (options.operator !== undefined && options.operate === undefined)
+        options.operate = options.operator;
+    if (options.operation !== undefined && options.operate === undefined)
+        options.operate = options.operation;
+    delete options.operator;
+    delete options.operation;
+    return options;
+}
+function hasFieldSettingOptions(raw) {
+    if (!raw || typeof raw !== 'object' || Array.isArray(raw))
+        return false;
+    return [...FIELD_SETTING_KEYS].some((key) => raw[key] !== undefined);
+}
+function fieldOperate(raw, fallback = 'OPERATE_EQUAL') {
+    const options = fieldSettingOptions(raw);
+    let operate = options.operate ? String(options.operate) : fallback;
+    const fieldSet = options.fieldSet;
+    // The frontend links the ignore-null switch to OPERATE_IGNORENULL when
+    // the field is otherwise using the ordinary equality operation.
+    if ((!options.operate || options.operate === 'OPERATE_EQUAL')
+        && fieldSet && typeof fieldSet === 'object' && fieldSet.ignoreNull === true) {
+        operate = 'OPERATE_IGNORENULL';
+    }
+    if (!['OPERATE_EQUAL', 'OPERATE_PLUS', 'OPERATE_MINUS', 'OPERATE_IGNORENULL'].includes(operate)) {
+        throw new Error(`字段赋值操作类型不支持“${operate}”；合法值为 OPERATE_EQUAL、OPERATE_PLUS、OPERATE_MINUS、OPERATE_IGNORENULL`);
+    }
+    return operate;
+}
+function unwrapValueSpec(raw) {
+    const options = fieldSettingOptions(raw);
+    if (raw && typeof raw === 'object' && !Array.isArray(raw)
+        && hasFieldSettingOptions(raw) && Object.prototype.hasOwnProperty.call(raw, 'value')) {
+        return { value: raw.value, options };
+    }
+    return { value: raw, options };
+}
 // 根触发节点的图标必须使用平台设计器实际保存的图标名。
 // 组件目录里的动作图标不能直接当作事件根节点图标；不同触发器也不一定共用同一个图标。
 const EVENT_ROOT_ICONS = {
@@ -479,6 +527,8 @@ export function fillSetting(result, updates, mapping, constants, formula, meta,
             if (!u || typeof u !== 'object')
                 continue;
             const field = u.field ?? u.formField ?? u.fieldId ?? genSfId();
+            const assignment = Object.prototype.hasOwnProperty.call(u, 'value') ? u.value : u;
+            const options = fieldSettingOptions(u);
             let fid = field;
             let fieldType = 'Text';
             if (field && typeof field === 'object') {
@@ -486,7 +536,7 @@ export function fillSetting(result, updates, mapping, constants, formula, meta,
                 const sourceType = field.type ?? '';
                 fieldType = { String: 'Text', string: 'Text', Number: 'NumberComponent', number: 'NumberComponent' }[sourceType] ?? (sourceType || 'Text');
             }
-            main[String(fid)] = buildEsbFormField(String(fid), u, fieldType, meta, appId, String(eventId), 'OPERATE_EQUAL', componentType, false, assignmentMode);
+            main[String(fid)] = buildEsbFormField(String(fid), assignment, fieldType, meta, appId, String(eventId), fieldOperate(u), componentType, false, assignmentMode, options);
         }
     }
     if (mapping && typeof mapping === 'object' && !Array.isArray(mapping)) {
@@ -494,12 +544,14 @@ export function fillSetting(result, updates, mapping, constants, formula, meta,
             const targetFieldId = targetFieldIdRaw;
             let operate = 'OPERATE_EQUAL';
             if (targetFieldId && typeof targetFieldId === 'object' && !Array.isArray(targetFieldId)) {
+                const options = fieldSettingOptions(targetFieldId);
+                operate = fieldOperate(targetFieldId);
                 if (targetFieldId.systemValue) {
                     const svKey = String(targetFieldId.systemValue);
                     const tfid = String(targetFieldId.target || '');
                     if (!tfid)
                         throw new Error(`mapping 系统变量值缺少目标字段 id: 应传 {'target':'<目标字段id>', 'systemValue':'currentUser'}`);
-                    main[tfid] = buildEsbFormField(tfid, { kind: 'system_variable', key: svKey }, 'Text', meta, appId, String(eventId), 'OPERATE_EQUAL', componentType, false, assignmentMode);
+                    main[tfid] = buildEsbFormField(tfid, { kind: 'system_variable', key: svKey }, 'Text', meta, appId, String(eventId), operate, componentType, false, assignmentMode, options);
                     continue;
                 }
                 const declaredKind = String(targetFieldId.kind || targetFieldId.assignmentKind || 'context');
@@ -509,13 +561,15 @@ export function fillSetting(result, updates, mapping, constants, formula, meta,
                 let raw = String(targetFieldId.target || targetFieldId.fieldId || '');
                 if (!raw)
                     throw new Error('ActionEbAdd.mapping 依据值下级值缺少目标字段 id');
-                if (raw.startsWith('+')) {
-                    operate = 'OPERATE_PLUS';
-                    raw = raw.slice(1);
-                }
-                else if (raw.startsWith('-')) {
-                    operate = 'OPERATE_MINUS';
-                    raw = raw.slice(1);
+                if (!targetFieldId.operate && !targetFieldId.operator && !targetFieldId.operation) {
+                    if (raw.startsWith('+')) {
+                        operate = 'OPERATE_PLUS';
+                        raw = raw.slice(1);
+                    }
+                    else if (raw.startsWith('-')) {
+                        operate = 'OPERATE_MINUS';
+                        raw = raw.slice(1);
+                    }
                 }
                 const refKey = String(targetFieldId.paramKey || sourceKey);
                 const refLabel = String(targetFieldId.label || resolveSourceFieldLabel(refKey, meta, String(sourceKey)));
@@ -568,7 +622,7 @@ export function fillSetting(result, updates, mapping, constants, formula, meta,
                 const srcFt = resolveSourceFieldType(srcParamKey, meta);
                 const targetMeta = lookupTargetFieldMeta(raw, result);
                 const targetFt = String(targetMeta?.componentKey || targetMeta?.type || srcFt || 'Text');
-                main[raw] = buildEsbFormField(raw, assignment, targetFt, meta, appId, String(eventId), operate, componentType, false, assignmentMode);
+                main[raw] = buildEsbFormField(raw, assignment, targetFt, meta, appId, String(eventId), operate, componentType, false, assignmentMode, options);
             }
             else {
                 let raw = String(targetFieldId);
@@ -593,9 +647,10 @@ export function fillSetting(result, updates, mapping, constants, formula, meta,
     if (constants && typeof constants === 'object' && !Array.isArray(constants)) {
         for (const [targetFieldId, value] of Object.entries(constants)) {
             const tfid = String(targetFieldId);
-            let operateC = 'OPERATE_EQUAL';
-            let rawV = value;
-            if (typeof value === 'string' && value.length > 1 && (value[0] === '+' || value[0] === '-')) {
+            const spec = unwrapValueSpec(value);
+            let operateC = fieldOperate(value);
+            let rawV = spec.value;
+            if (!hasFieldSettingOptions(value) && typeof value === 'string' && value.length > 1 && (value[0] === '+' || value[0] === '-')) {
                 operateC = value[0] === '+' ? 'OPERATE_PLUS' : 'OPERATE_MINUS';
                 rawV = value.slice(1);
             }
@@ -605,18 +660,20 @@ export function fillSetting(result, updates, mapping, constants, formula, meta,
             // 固定枚举值的外层 fieldType 必须是目标组件类型（例如 Select），
             // 与手工保存 JSON 一致；使用默认 Text 会导致设计器下拉回显为空。
             const targetFieldType = String(fieldMeta?.componentKey || fieldMeta?.type || ft);
-            main[tfid] = buildEsbFormField(tfid, assignment, targetFieldType, meta, appId, String(eventId), operateC, componentType, false, assignmentMode);
+            main[tfid] = buildEsbFormField(tfid, assignment, targetFieldType, meta, appId, String(eventId), operateC, componentType, false, assignmentMode, spec.options);
         }
     }
     if (formula && typeof formula === 'object' && !Array.isArray(formula)) {
         for (const [targetFieldId, fspecRaw] of Object.entries(formula)) {
-            const fspec = fspecRaw;
+            const fspec = fspecRaw && typeof fspecRaw === 'object' && fspecRaw.formula
+                ? fspecRaw.formula : fspecRaw;
+            const options = fieldSettingOptions(fspecRaw);
             if (!fspec || typeof fspec !== 'object')
                 continue;
             if (String(fspec.kind || '') === 'function') {
                 const fieldMeta = lookupTargetFieldMeta(String(targetFieldId), result);
                 const targetFieldType = String(fieldMeta?.componentKey || fieldMeta?.type || fspec.resultType || 'Number');
-                main[String(targetFieldId)] = buildEsbFormField(String(targetFieldId), fspec, targetFieldType, meta, appId, String(eventId), 'OPERATE_EQUAL', componentType, false, assignmentMode);
+                main[String(targetFieldId)] = buildEsbFormField(String(targetFieldId), fspec, targetFieldType, meta, appId, String(eventId), fieldOperate(fspecRaw), componentType, false, assignmentMode, options);
                 continue;
             }
             const op = fspec.op || 'add';
@@ -642,13 +699,16 @@ export function fillSetting(result, updates, mapping, constants, formula, meta,
                 assign.childs = bean.childs;
             assign.applicationId ??= String(appId);
             assign.id ??= String(flatId);
-            main[String(targetFieldId)] = {
+            const entry = {
                 formFieldKey: '',
                 value: {
-                    original: false, operate: 'OPERATE_EQUAL', switchType: 'assign', fieldKey: String(targetFieldId),
+                    original: false, operate: fieldOperate(fspecRaw), switchType: 'assign', fieldKey: String(targetFieldId),
                     assignType: '', multiSelect: false, fieldType: 'NumberComponent', assign, assignId: String(flatId),
                 },
             };
+            main[String(targetFieldId)] = applyFormFieldSettingOptions(entry, options, {
+                meta, appId, eventId, componentType, fieldType: 'NumberComponent',
+            });
         }
     }
     const contract = get(componentType) || {};
@@ -669,6 +729,7 @@ export function fillSetting(result, updates, mapping, constants, formula, meta,
         opType: result.opType ?? 'insert',
         updatePolicy: result.updatePolicy ?? 'ALL',
         updateFieldCondition: { updateField: [] },
+        dataDrWithCalc: result.dataDrWithCalc ?? false,
     });
 }
 // ── filter 筛选条件树 ───────────────────────────────────────
@@ -780,7 +841,9 @@ export function buildFilterInput(result, val, meta, appId, componentType = '', a
     const fctx = resolveFormCtx(result, meta, formId);
     const form = findInMetadata(meta, 'forms', { id: formId }) || {};
     const fieldIndex = {};
-    const strictDataSourceCondition = ['EnquiryForm', 'TimeBatchTrigger', 'DateTrigger'].includes(componentType);
+    // ActionEbDelete 的前端 ConditionSet 与查询/定时组件共用 dataSource
+    // 字段选择器；条件左值必须来自 ds/fields，不能仅依赖 getEbField。
+    const strictDataSourceCondition = ['ActionEbDelete', 'EnquiryForm', 'TimeBatchTrigger', 'DateTrigger'].includes(componentType);
     if (!strictDataSourceCondition) {
         for (const f of form.fields || [])
             fieldIndex[String(f.id || '')] = f;
@@ -1472,16 +1535,20 @@ export function buildSettingDetail(nodeData, detailItems, meta, appId, eventId,
                 let operate = 'OPERATE_EQUAL';
                 let assignment;
                 if (targetFieldId && typeof targetFieldId === 'object' && !Array.isArray(targetFieldId)) {
+                    const options = fieldSettingOptions(targetFieldId);
+                    operate = fieldOperate(targetFieldId);
                     let raw = String(targetFieldId.target || targetFieldId.fieldId || '');
                     if (!raw)
                         throw new Error('detail.mapping 依据值下级值缺少目标字段 id: 应传 {"target":"<目标明细字段id>", "paramKey":"<源paramKey>", ...}');
-                    if (raw.startsWith('+')) {
-                        operate = 'OPERATE_PLUS';
-                        raw = raw.slice(1);
-                    }
-                    else if (raw.startsWith('-')) {
-                        operate = 'OPERATE_MINUS';
-                        raw = raw.slice(1);
+                    if (!targetFieldId.operate && !targetFieldId.operator && !targetFieldId.operation) {
+                        if (raw.startsWith('+')) {
+                            operate = 'OPERATE_PLUS';
+                            raw = raw.slice(1);
+                        }
+                        else if (raw.startsWith('-')) {
+                            operate = 'OPERATE_MINUS';
+                            raw = raw.slice(1);
+                        }
                     }
                     const refKey = String(targetFieldId.paramKey || sourceKey);
                     const refLabel = String(targetFieldId.label || sourceKey);
@@ -1495,7 +1562,7 @@ export function buildSettingDetail(nodeData, detailItems, meta, appId, eventId,
                         assignment.detailLabel = refDetail;
                     const targetMeta = targetDetailFields[raw] || {};
                     const targetType = String(targetMeta.componentKey || targetMeta.type || 'Text');
-                    eleData[raw] = buildEsbFormField(raw, assignment, targetType, meta, appId, eventId, operate, nodeType, true, '');
+                    eleData[raw] = buildEsbFormField(raw, assignment, targetType, meta, appId, eventId, operate, nodeType, true, '', options);
                 }
                 else {
                     let raw = String(targetFieldId);
@@ -1518,10 +1585,17 @@ export function buildSettingDetail(nodeData, detailItems, meta, appId, eventId,
             for (const [targetFieldIdRaw, valueRaw] of Object.entries(constants)) {
                 const targetFieldId = String(targetFieldIdRaw);
                 const targetMeta = targetDetailFields[targetFieldId] || {};
-                const value = resolveEnumConstant(valueRaw, targetMeta);
+                const spec = unwrapValueSpec(valueRaw);
+                let rawValue = spec.value;
+                let operate = fieldOperate(valueRaw);
+                if (!hasFieldSettingOptions(valueRaw) && typeof rawValue === 'string' && rawValue.length > 1 && (rawValue[0] === '+' || rawValue[0] === '-')) {
+                    operate = rawValue[0] === '+' ? 'OPERATE_PLUS' : 'OPERATE_MINUS';
+                    rawValue = rawValue.slice(1);
+                }
+                const value = resolveEnumConstant(rawValue, targetMeta);
                 const [assignment, ft] = normalizeConstantAssignment(value, 'Text');
                 const targetType = String(targetMeta.componentKey || targetMeta.type || ft);
-                eleData[targetFieldId] = buildEsbFormField(targetFieldId, assignment, targetType, meta, appId, eventId, 'OPERATE_EQUAL', nodeType, true, '');
+                eleData[targetFieldId] = buildEsbFormField(targetFieldId, assignment, targetType, meta, appId, eventId, operate, nodeType, true, '', spec.options);
             }
         }
         const formula = item.formula || {};
@@ -1531,11 +1605,14 @@ export function buildSettingDetail(nodeData, detailItems, meta, appId, eventId,
                 ? (getTargetDetailFields()[detailTargetFormId] || {})[String(item.detailTableId)] || {}
                 : {};
             for (const [targetFieldId, formulaSpec] of Object.entries(formula)) {
-                if (!formulaSpec || typeof formulaSpec !== 'object')
+                const rawSpec = formulaSpec;
+                const actualSpec = rawSpec && typeof rawSpec === 'object' && rawSpec.formula ? rawSpec.formula : rawSpec;
+                const options = fieldSettingOptions(rawSpec);
+                if (!actualSpec || typeof actualSpec !== 'object')
                     continue;
                 const targetMeta = targetDetailFields[String(targetFieldId)] || {};
-                const targetType = String(targetMeta.componentKey || targetMeta.type || formulaSpec.resultType || 'Text');
-                eleData[String(targetFieldId)] = buildEsbFormField(String(targetFieldId), formulaSpec, targetType, meta, appId, eventId, 'OPERATE_EQUAL', nodeType, true, '');
+                const targetType = String(targetMeta.componentKey || targetMeta.type || actualSpec.resultType || 'Text');
+                eleData[String(targetFieldId)] = buildEsbFormField(String(targetFieldId), actualSpec, targetType, meta, appId, eventId, fieldOperate(rawSpec), nodeType, true, '', options);
             }
         }
         // detail 自动按名补全
@@ -1750,18 +1827,18 @@ export function convertNode(draftAction, isEvent = false, meta = null, appId = '
         if (pendingConstants && typeof pendingConstants === 'object') {
             for (const [targetFieldIdRaw, valueRaw] of Object.entries(pendingConstants)) {
                 const targetFieldId = String(targetFieldIdRaw);
-                const value = valueRaw;
-                let operateC = 'OPERATE_EQUAL';
-                let rawV = value;
-                if (typeof value === 'string' && value.length > 1 && (value[0] === '+' || value[0] === '-')) {
-                    operateC = value[0] === '+' ? 'OPERATE_PLUS' : 'OPERATE_MINUS';
-                    rawV = value.slice(1);
+                const spec = unwrapValueSpec(valueRaw);
+                let operateC = fieldOperate(valueRaw);
+                let rawV = spec.value;
+                if (!hasFieldSettingOptions(valueRaw) && typeof rawV === 'string' && rawV.length > 1 && (rawV[0] === '+' || rawV[0] === '-')) {
+                    operateC = rawV[0] === '+' ? 'OPERATE_PLUS' : 'OPERATE_MINUS';
+                    rawV = rawV.slice(1);
                 }
                 const targetFieldMeta = lookupTargetFieldMeta(targetFieldId, nodeData);
                 rawV = resolveEnumConstant(rawV, targetFieldMeta);
                 const [assignment, ft] = normalizeConstantAssignment(rawV, 'Text');
                 const targetFieldType = String(targetFieldMeta?.componentKey || targetFieldMeta?.type || ft);
-                main[targetFieldId] = buildEsbFormField(targetFieldId, assignment, targetFieldType, meta || {}, appId, eventNodeId || nidStr, operateC, nodeType, false, assignmentMode);
+                main[targetFieldId] = buildEsbFormField(targetFieldId, assignment, targetFieldType, meta || {}, appId, eventNodeId || nidStr, operateC, nodeType, false, assignmentMode, spec.options);
             }
         }
         nodeData.setting.main = main;