weaver-e10-builder 1.2.5 → 1.5.2

package/dist/services/formula-detail.d.ts

@@ -34,26 +34,69 @@
  *
  * 明细引用的参数对象需带 `sFormId`(明细表 id) + `sFormName`(明细表名)。
  * 字段结构统一从 getEbField 取（主表 main + 明细 detail）。
+ *
+ * ## 模块字段（系统字段）
+ *
+ * `{主表.主表数据id}`、`{主表.当前日期}` 这类引用**不在** getEbField 的 main/detail 里，
+ * 得由调用方通过可选参数 `moduleColumns` 传进来（目前只有函数联动会传，来源是
+ * `linkage/findFormDrivingColumns` 的模块字段桶）。
+ *
+ * 下发时**一律写成裸标签**（`{主表.主表数据id}`）—— 语义键写法 `[formDataId]` 也会被归一到标签形态，
+ * 与平台落库的 `expressSql` 一致。不传 `moduleColumns` 时，模块字段仍按「未找到字段」报错（原有行为不变）。
+ *
+ * ## 选项引用（三段式）`{主表.性别.男}`
+ *
+ * 第三段是**选项名** —— 指「性别」字段里那个叫「男」的选项。
+ *
+ * 平台比的是**选项对象**，不是选项名的字符串：参数里带的是选项的 **`valueKey`**
+ * （`fieldType:"option"` + `id`=valueKey + `middleFieldIds`=[字段id]，没有 `fieldId`/`title`）。
+ *
+ * 因此 `{主表.性别}=='男'` 这种写法**恒不成立** —— 它拿字段的 valueKey 去比字符串「男」。
+ * 要命的是平台**照收、不报错、回 200**，写完看着全绿、结果永远不对，所以解析时专门对
+ * 「选项型字段 vs 字符串字面量」出声警告。
+ *
+ * ⚠ 三段式**不能按第一个点切**：那样字段会变成 `性别.男`，然后报「未找到字段 性别.男」——
+ * 这正是「CLI 写不出选项比较」的老毛病（读得出来、写不回去）。必须整段切开数段数。
  */
 import type { ApiClient } from '../core/client.js';
 export interface FormulaParam {
     dataTemplateId: string;
-    fieldId: string;
-    formId: string;
+    /** 业务字段有；**选项参数没有这个键** —— 平台靠 `middleFieldIds` 定位它属于哪个字段。 */
+    fieldId?: string;
+    formId?: string;
     module: string;
     properKey: string;
     sFormId?: string;
     sFormName?: string;
-    title: string;
+    title?: string;
     name: string;
-    appId: string;
-    id: null;
+    /** eb 表那条路由必给；流程表单的函数联动报文里没有这个键，就留空。 */
+    appId?: string;
+    /** 业务字段是 `null`；**选项参数是选项的 `valueKey`**。 */
+    id: string | null;
+    fieldType?: string;
+    direct?: boolean;
+    del?: boolean;
+    middleFieldIds?: string[];
+    directFormId?: string;
+    parent?: string;
+    formulaParentVarList?: unknown[];
+    dataSourceField?: boolean;
+    repeat?: boolean;
+    groupData?: boolean;
 }
 /** 一处字段引用。 */
 export interface FormulaRef {
     /** 表名。`{主表.x}` → `'主表'`；`[x]` 这种不带表名的写法 → `null`（待按字段名反查）。 */
     table: string | null;
     field: string;
+    /**
+     * 选项引用 `{主表.性别.男}` 的**第三段**：选项名。普通字段引用没有这一段。
+     *
+     * ⚠ 必须写**完整三段**才有这段：`[性别.男]` 只有两段，仍按「明细表.字段名」读 ——
+     * 方括号的两段式是既有写法，二者无法区分，不给它开后门。
+     */
+    option?: string;
     /** 原文，报错回显用。 */
     raw: string;
     /** 在表达式中的起止位置，供归一化改写。 */
@@ -77,6 +120,10 @@ export interface FormulaParseResult {
  * - `{主表.字段名}` / `{明细表名.字段名}` —— 平台存储格式
  * - `[字段名]` / `[表名.字段名]` —— 设计器编辑器的写法
  *
+ * **三段式是「选项引用」**：`{主表.性别.男}` 指「性别」字段里那个叫「男」的**选项**，
+ * 不是某个叫「性别.男」的字段。按第一个点切分会把字段读成 `性别.男`，然后报「未找到字段」——
+ * 那正是「用 CLI 表达不了选项比较」的老毛病（参数要的是选项的 valueKey，平台比的是选项对象）。
+ *
  * 重复出现**不去重** —— 每个出现位置都要单独一个参数（见文件头说明）。
  * 不做字符串字面量剔除：公式里写 `"["` 这种极端情况不在支持范围，误判会在解析阶段
  * 报「未找到字段」，比静默错绑安全。
@@ -90,5 +137,50 @@ export declare function parseFormulaRefs(expression: string): FormulaRef[];
  * 报错说的是真话：我们替用户要了个数字。
  */
 export declare function defaultReturnType(fieldKey: string | undefined): string;
-export declare function buildFormulaParameters(client: ApiClient, baseUrl: string, objId: string, appId: string, formId: string, expression: string): Promise<FormulaParseResult>;
+/**
+ * 模块字段（系统字段）。只有函数联动那条链路会用到 —— 普通公式的字段来源是 `getEbField`，
+ * 里面没有这些字段。
+ *
+ * 三种键的约定（来自 `linkage/findFormDrivingColumns` 的模块字段桶）：
+ * - `id`：**语义键**（`formDataId` / `current_date` / `system_operator_department_id`），不是雪花 id
+ * - `name`：裸中文标签（`主表数据id`），表达式里写的就是它
+ * - `descType`：**全大写**（`TEXT` / `DATE` / `OBJECT`），可直接当 `properKey` 用
+ *
+ * 业务字段恰好相反：`id` 是雪花、`descType` 是驼峰（`Text` / `Money`）。
+ */
+export interface FormulaModuleColumn {
+    id: string;
+    name: string;
+    descType: string;
+}
+/** 业务字段与模块字段的字段来源。两条路由（eb 表的 `getEbField`、流程表单的 `getConfig`）
+ *  各自映射成这个形状，解析核只认它。 */
+export interface FormulaRefContext {
+    /** 主表字段。元素形状沿用 `getEbField` 的 `{ id, showName, dataKey, componentKey }`，明细则用 `name`。 */
+    mainFields: any[];
+    /** 明细表：`{ detailTableId, tableName, fields: [] }`。 */
+    detailTables: any[];
+    moduleColumns?: FormulaModuleColumn[];
+    formId: string;
+    /** 公式参数的 `module`。eb 表 = `ebuilderform`；流程表单的函数联动 = `ebuildercard`。 */
+    module: string;
+    /** 给了才写 `appId` 键；`undefined` = 整个键不出现（流程表单那条路由就是这样）。 */
+    appId?: string;
+    /** 报错里指路的命令名，形如 `wf-form formula-linkage columns`。 */
+    hint?: string;
+}
+/**
+ * 引用解析与参数构建的**纯核** —— 不碰网络，字段来源由调用方注入。
+ *
+ * 两条路由共用它（eb 表的字段来源是 `getEbField`，流程表单是 `getConfig`），所以这里只放
+ * **与路由无关**的规则：方括号归一化成花括号、逐出现位置各给一份参数、明细引用带
+ * `sFormId`/`sFormName`、模块字段一律写裸标签、业务字段与模块字段撞名时业务字段胜出。
+ */
+export declare function resolveFormulaRefs(expression: string, ctx: FormulaRefContext): FormulaParseResult;
+/**
+ * eb 表那条路由：先取字段来源（`getEbField`）再调解析核。
+ *
+ * @param moduleColumns 模块字段（系统字段）候选。只有函数联动会传；**不传时行为与加这个参数之前完全一致**。
+ */
+export declare function buildFormulaParameters(client: ApiClient, baseUrl: string, objId: string, appId: string, formId: string, expression: string, moduleColumns?: FormulaModuleColumn[]): Promise<FormulaParseResult>;
 //# sourceMappingURL=formula-detail.d.ts.map

package/dist/services/formula-detail.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"formula-detail.d.ts","sourceRoot":"","sources":["../../src/services/formula-detail.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AACH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAEnD,MAAM,WAAW,YAAY;IAC3B,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,EAAE,EAAE,IAAI,CAAC;CACV;AAED,cAAc;AACd,MAAM,WAAW,UAAU;IACzB,8DAA8D;IAC9D,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,gBAAgB;IAChB,GAAG,EAAE,MAAM,CAAC;IACZ,yBAAyB;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,kBAAkB;IACjC,UAAU,EAAE,YAAY,EAAE,CAAC;IAC3B,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,kCAAkC;IAClC,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB;;;OAGG;IACH,oBAAoB,EAAE,MAAM,CAAC;CAC9B;AAED;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,MAAM,GAAG,UAAU,EAAE,CAkBjE;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAKtE;AAED,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAClC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAC5C,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,kBAAkB,CAAC,CAgG7B"}
+{"version":3,"file":"formula-detail.d.ts","sourceRoot":"","sources":["../../src/services/formula-detail.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2DG;AACH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAEnD,MAAM,WAAW,YAAY;IAC3B,cAAc,EAAE,MAAM,CAAC;IACvB,6DAA6D;IAC7D,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,wCAAwC;IACxC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,4CAA4C;IAC5C,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;IAElB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,oBAAoB,CAAC,EAAE,OAAO,EAAE,CAAC;IACjC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,cAAc;AACd,MAAM,WAAW,UAAU;IACzB,8DAA8D;IAC9D,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd;;;;;OAKG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,gBAAgB;IAChB,GAAG,EAAE,MAAM,CAAC;IACZ,yBAAyB;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,kBAAkB;IACjC,UAAU,EAAE,YAAY,EAAE,CAAC;IAC3B,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,kCAAkC;IAClC,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB;;;OAGG;IACH,oBAAoB,EAAE,MAAM,CAAC;CAC9B;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,MAAM,GAAG,UAAU,EAAE,CAwBjE;AAqDD;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAKtE;AAED;;;;;;;;;;GAUG;AACH,MAAM,WAAW,mBAAmB;IAClC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB;AAqCD;wBACwB;AACxB,MAAM,WAAW,iBAAiB;IAChC,wFAAwF;IACxF,UAAU,EAAE,GAAG,EAAE,CAAC;IAClB,sDAAsD;IACtD,YAAY,EAAE,GAAG,EAAE,CAAC;IACpB,aAAa,CAAC,EAAE,mBAAmB,EAAE,CAAC;IACtC,MAAM,EAAE,MAAM,CAAC;IACf,uEAAuE;IACvE,MAAM,EAAE,MAAM,CAAC;IACf,yDAAyD;IACzD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,sDAAsD;IACtD,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAKD;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,iBAAiB,GAAG,kBAAkB,CAyKjG;AAED;;;;GAIG;AACH,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAClC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAC5C,UAAU,EAAE,MAAM,EAClB,aAAa,CAAC,EAAE,mBAAmB,EAAE,GACpC,OAAO,CAAC,kBAAkB,CAAC,CAa7B"}

package/dist/services/formula-detail.js

@@ -3,6 +3,10 @@
  * - `{主表.字段名}` / `{明细表名.字段名}` —— 平台存储格式
  * - `[字段名]` / `[表名.字段名]` —— 设计器编辑器的写法
  *
+ * **三段式是「选项引用」**：`{主表.性别.男}` 指「性别」字段里那个叫「男」的**选项**，
+ * 不是某个叫「性别.男」的字段。按第一个点切分会把字段读成 `性别.男`，然后报「未找到字段」——
+ * 那正是「用 CLI 表达不了选项比较」的老毛病（参数要的是选项的 valueKey，平台比的是选项对象）。
+ *
  * 重复出现**不去重** —— 每个出现位置都要单独一个参数（见文件头说明）。
  * 不做字符串字面量剔除：公式里写 `"["` 这种极端情况不在支持范围，误判会在解析阶段
  * 报「未找到字段」，比静默错绑安全。
@@ -15,11 +19,17 @@ export function parseFormulaRefs(expression) {
         const inner = (m[1] ?? m[2] ?? '').trim();
         if (!inner)
             continue;
-        const dot = inner.indexOf('.');
-        const hasTable = dot > 0 && dot < inner.length - 1;
+        // 按点切段（最多三段：表 / 字段 / 选项）。字段名带点的情形在这套平台里不存在，
+        // 而「第一个点之后全是字段名」会把三段式读坏，所以这里必须整段切开看。
+        // ⚠ 选项引用必须写**完整三段**：`[性别.男]` 只有两段，仍然按「明细表.字段名」读 ——
+        //   这与既有的方括号写法天然撞车，没法从段数之外再区分，所以不给它开后门。
+        const parts = inner.split('.').map((s) => s.trim());
+        const hasTable = parts.length >= 2 && parts[0] !== '' && parts[1] !== '';
+        const tail = hasTable ? parts.slice(2).join('.').trim() : '';
         refs.push({
-            table: hasTable ? inner.slice(0, dot).trim() : null,
-            field: (hasTable ? inner.slice(dot + 1) : inner).trim(),
+            table: hasTable ? parts[0] : null,
+            field: hasTable ? parts[1] : inner,
+            ...(hasTable && tail ? { option: tail } : {}),
             raw: m[0],
             index: m.index,
             length: m[0].length,
@@ -27,6 +37,52 @@ export function parseFormulaRefs(expression) {
     }
     return refs;
 }
+/** 选项型控件的 componentKey —— 这些字段的值是选项，能写三段式引用。 */
+const OPTION_FIELD_KEYS = ['Select', 'SelectMultiple', 'RadioBox', 'CheckBox'];
+function isOptionField(field) {
+    return OPTION_FIELD_KEYS.includes(String(field?.componentKey || field?.fieldKey || field?.type || ''));
+}
+/**
+ * 取字段的选项表。`getEbField` 把选项放在 **`fieldConfig.options`**（`{name, valueKey, …}`）；
+ * 其余几个位置是别的路由/老版本留下的可能落点，一并兜住，取到第一个非空数组为止。
+ */
+function optionsOf(field) {
+    const cands = [
+        field?.fieldConfig?.options,
+        field?.otherPropertiesObj?.options,
+        Array.isArray(field?.selectData) ? field.selectData : field?.selectData?.options,
+    ];
+    for (const c of cands)
+        if (Array.isArray(c) && c.length)
+            return c;
+    return [];
+}
+/**
+ * 选项的参数对象（形状实测自设计器落库的报文）。
+ *
+ * ⚠ `id` 是选项的 **valueKey**，不是选项记录自己的 id —— 同一份数据里这两个值相邻但不同
+ * （`valueKey=…7601` / 记录 `id=…2674`），发错了平台不报错，只是永远比对不上。
+ * 平台比的是**选项对象**，不是选项名的字符串，所以这种引用**没有 `fieldId`/`title`/`appId`**。
+ */
+function buildOptionParam(fieldId, optionName, optionValueKey, properKey, formId, module) {
+    return {
+        parent: '',
+        properKey,
+        formulaParentVarList: [],
+        dataTemplateId: '',
+        module,
+        direct: true,
+        del: false,
+        middleFieldIds: [fieldId],
+        dataSourceField: false,
+        repeat: false,
+        name: optionName,
+        directFormId: formId,
+        id: optionValueKey,
+        fieldType: 'option',
+        groupData: false,
+    };
+}
 /**
  * 按目标字段的类型给出合适的公式返回类型。
  *
@@ -42,7 +98,48 @@ export function defaultReturnType(fieldKey) {
         return 'Date';
     return 'String';
 }
-export async function buildFormulaParameters(client, baseUrl, objId, appId, formId, expression) {
+/**
+ * 反查模块字段。**命中多条不取首条**，返回候选让调用方报错 ——
+ * 语义键 `name` 的标签就叫「名称」，与业务字段撞名是可预期的。
+ */
+function findModuleColumn(moduleColumns, name) {
+    if (!moduleColumns?.length)
+        return {};
+    const byId = moduleColumns.filter((c) => c.id === name);
+    if (byId.length)
+        return byId.length === 1 ? { col: byId[0] } : { candidates: byId };
+    const byName = moduleColumns.filter((c) => c.name === name);
+    if (byName.length)
+        return byName.length === 1 ? { col: byName[0] } : { candidates: byName };
+    return {};
+}
+/**
+ * 参数对象拼装。业务字段与模块字段共用这一处，将来补平台默认键只改这里。
+ * `module` 与 `appId` 由路由决定：`appId` 为 `undefined` 时**整个键不出现**
+ * —— 流程表单那条路由的 parameter 里就没有这个键，写个空串是另一回事。
+ */
+function buildParam(src, formId, module, appId) {
+    return {
+        dataTemplateId: '', fieldId: src.fieldId, formId, module,
+        properKey: src.properKey,
+        ...(src.sFormId ? { sFormId: src.sFormId, sFormName: src.sFormName } : {}),
+        title: src.title, name: src.name,
+        ...(appId === undefined ? {} : { appId }),
+        id: null,
+    };
+}
+/** 没给 `hint` 时的兜底指路。 */
+const DEFAULT_COLUMNS_HINT = 'form formula-linkage columns';
+/**
+ * 引用解析与参数构建的**纯核** —— 不碰网络，字段来源由调用方注入。
+ *
+ * 两条路由共用它（eb 表的字段来源是 `getEbField`，流程表单是 `getConfig`），所以这里只放
+ * **与路由无关**的规则：方括号归一化成花括号、逐出现位置各给一份参数、明细引用带
+ * `sFormId`/`sFormName`、模块字段一律写裸标签、业务字段与模块字段撞名时业务字段胜出。
+ */
+export function resolveFormulaRefs(expression, ctx) {
+    const { mainFields, detailTables, moduleColumns, formId, module, appId } = ctx;
+    const hint = ctx.hint || DEFAULT_COLUMNS_HINT;
     const errors = [];
     const warnings = [];
     const parameters = [];
@@ -53,15 +150,6 @@ export async function buildFormulaParameters(client, baseUrl, objId, appId, form
         // 早期版本在这里直接报错退出，把「平台允许的用法」当成非法输入拦掉了。
         warnings.push('表达式中没有字段引用（纯常量公式）。平台允许这种写法，将按原样保存。');
     }
-    // getEbField 取主表 + 明细结构（主表字段用于反查不带表名的 `[字段]`）
-    let mainFields = [];
-    let detailTables = [];
-    try {
-        const eb = await client.post(`${baseUrl}/api/bs/esb/setting/component/getEbField`, { tableId: objId, appId });
-        mainFields = eb?.data?.main || [];
-        detailTables = eb?.data?.detail || [];
-    }
-    catch { /* 拉取失败由解析报错兜底 */ }
     const mainFind = (name) => mainFields.find((f) => String(f.id) === name || f.showName === name || f.dataKey === name);
     const detailOf = (table) => detailTables.find((d) => d.tableName === table || String(d.detailTableId) === table);
     const fieldIn = (dt, name) => (dt?.fields || []).find((x) => String(x.id) === name || x.showName === name || x.dataKey === name);
@@ -71,6 +159,7 @@ export async function buildFormulaParameters(client, baseUrl, objId, appId, form
     for (const ref of refs) {
         let table = ref.table;
         let resolved;
+        let moduleCol = null;
         if (table === '主表' || table === null) {
             resolved = mainFind(ref.field);
             if (!resolved && table === null) {
@@ -87,6 +176,23 @@ export async function buildFormulaParameters(client, baseUrl, objId, appId, form
             }
             if (resolved && (table === null || table === '主表')) {
                 table = '主表';
+                // 业务字段赢了同名的模块字段：不报错、不静默换源，只提示一句怎么强制指定
+                const sameName = moduleColumns?.filter((c) => c.name === ref.field) || [];
+                if (sameName.length) {
+                    warnings.push(`「${ref.field}」已按业务字段解析；若要引用系统模块字段，请写成 [${sameName[0].id}]`);
+                }
+            }
+            // 主表里没有 → 找模块字段（调用方没传 moduleColumns 时这里恒不命中，等价于原有报错）
+            if (!resolved) {
+                const hit = findModuleColumn(moduleColumns, ref.field);
+                if (hit.candidates) {
+                    errors.push(`模块字段「${ref.field}」有多个候选（${hit.candidates.map((c) => c.id).join('、')}），请写成 [<语义键>] 指明是哪个`);
+                    continue;
+                }
+                if (hit.col) {
+                    moduleCol = hit.col;
+                    table = '主表';
+                }
             }
         }
         else {
@@ -98,29 +204,86 @@ export async function buildFormulaParameters(client, baseUrl, objId, appId, form
             resolved = fieldIn(dt, ref.field);
             table = dt.tableName;
         }
-        if (!resolved) {
+        if (!resolved && !moduleCol) {
             const where = ref.table === '主表' ? '主表' : ref.table ? `明细表「${ref.table}」` : '主表或任一明细表';
             const avail = ref.table && ref.table !== '主表'
                 ? (detailOf(ref.table)?.fields || []).map((x) => x.showName).join(', ')
                 : mainFields.map((x) => x.showName).join(', ');
-            errors.push(`在${where}中未找到字段: "${ref.field}"，可用: ${avail}`);
+            // 传了 moduleColumns 才提示模块字段写法；没传时错误文案与加这个参数之前逐字相同
+            const moduleHint = moduleColumns?.length
+                ? `；若是系统模块字段（${moduleColumns.slice(0, 3).map((c) => c.name).join('、')} 等），可写成 [<语义键>]，语义键见 ${hint}`
+                : '';
+            errors.push(`在${where}中未找到字段: "${ref.field}"，可用: ${avail}${moduleHint}`);
             continue;
         }
+        // ── 护栏：选项型字段 与 **字符串字面量** 比较 ──────────────────────
+        // 选项存的是 valueKey，拿它跟选项**名字**比**恒不成立**；而平台照收、不报错、回 200 ——
+        // 这是最容易被写出来、又最难查的错法（写完看着全绿，只是结果永远不对）。
+        // 不阻断（表达式最终合不合法由平台定），但必须出声。
+        if (resolved && !ref.option && isOptionField(resolved)) {
+            const lit = /^\s*(==|!=)\s*(['"])([^'"]*)\2/.exec(expression.slice(ref.index + ref.length));
+            if (lit) {
+                // 建议按**字面量本身**去找同名的选项（`'女'` 就建议「女」），找不到才退而拿第一个当例子。
+                const opts = optionsOf(resolved);
+                const matched = opts.find((o) => String(o.name) === lit[3]);
+                const suggest = matched ? matched.name : (opts[0] ? opts[0].name : '<选项名>');
+                warnings.push(`「${ref.field}」是选项型控件，这里却拿它跟字符串 ${lit[2]}${lit[3]}${lit[2]} 比较 —— `
+                    + '选项存的是 valueKey，与选项名比**恒不成立**，平台也不报错。正确写法是引用选项本身：'
+                    + `{${ref.table || '主表'}.${ref.field}.${suggest}}`);
+            }
+        }
+        // ── 选项引用 `{主表.性别.男}` ─────────────────────────────────
+        // 平台比的是**选项对象**（参数里带选项的 valueKey），不是选项名的字符串 ——
+        // 所以这种引用必须解析出 valueKey，光把三段式原样发下去是不行的。
+        let optionHit = null;
+        if (ref.option) {
+            if (moduleCol) {
+                errors.push(`模块字段「${moduleCol.name}」没有选项，不能写成 {${ref.table || '主表'}.${moduleCol.name}.${ref.option}}`);
+                continue;
+            }
+            const opts = optionsOf(resolved);
+            if (!opts.length) {
+                errors.push(`字段「${ref.field}」不是选项型控件（${resolved.componentKey || resolved.fieldKey || '未知类型'}），`
+                    + `不能写成 {${ref.table || '主表'}.${ref.field}.${ref.option}}`);
+                continue;
+            }
+            const byName = opts.filter((o) => String(o.name) === ref.option);
+            const hit = byName.length ? byName : opts.filter((o) => String(o.valueKey) === ref.option);
+            if (!hit.length) {
+                errors.push(`字段「${ref.field}」里没有选项「${ref.option}」，可选: ${opts.map((o) => o.name).join(', ')}`);
+                continue;
+            }
+            if (hit.length > 1) {
+                errors.push(`选项「${ref.option}」在字段「${ref.field}」里有多个同名候选，请改用它的 valueKey 指定`);
+                continue;
+            }
+            optionHit = hit[0];
+        }
         // 走到这里 table 必然已定型：要么 '主表'，要么是某个明细表名（带表名的引用校验过、不带表名的已反查过）
         const tableName = table;
         const isDetail = tableName !== '主表';
         const dt = isDetail ? detailOf(tableName) : null;
-        parameters.push({
-            dataTemplateId: '', fieldId: String(resolved.id), formId, module: 'ebuilderform',
-            properKey: resolved.componentKey || resolved.fieldKey || 'Text',
-            ...(dt ? { sFormId: String(dt.detailTableId), sFormName: dt.tableName } : {}),
-            title: resolved.showName || resolved.title || ref.field,
-            name: resolved.showName || resolved.field || ref.field,
-            appId, id: null,
-        });
-        refNames.push(`${table}.${ref.field}`);
+        // 归一化用的字段名：模块字段与选项一律写**裸标签**（`{主表.主表数据id}` / `{主表.性别.男}`），
+        // 与平台落库形态一致，免得用户写 [formDataId] 时下发一个平台不认的 `{主表.formDataId}`
+        const normField = moduleCol ? moduleCol.name : optionHit ? `${ref.field}.${optionHit.name}` : ref.field;
+        if (moduleCol) {
+            parameters.push(buildParam({ fieldId: moduleCol.id, properKey: moduleCol.descType, title: moduleCol.name, name: moduleCol.name }, formId, module, appId));
+        }
+        else if (optionHit) {
+            parameters.push(buildOptionParam(String(resolved.id), String(optionHit.name), String(optionHit.valueKey), resolved.componentKey || resolved.fieldKey || 'Select', formId, module));
+        }
+        else {
+            parameters.push(buildParam({
+                fieldId: String(resolved.id),
+                properKey: resolved.componentKey || resolved.fieldKey || 'Text',
+                title: resolved.showName || resolved.title || ref.field,
+                name: resolved.showName || resolved.field || ref.field,
+                ...(dt ? { sFormId: String(dt.detailTableId), sFormName: dt.tableName } : {}),
+            }, formId, module, appId));
+        }
+        refNames.push(`${table}.${normField}`);
         pieces.push(expression.slice(cursor, ref.index));
-        pieces.push(`{${table}.${ref.field}}`);
+        pieces.push(`{${table}.${normField}}`);
         cursor = ref.index + ref.length;
     }
     pieces.push(expression.slice(cursor));
@@ -129,4 +292,23 @@ export async function buildFormulaParameters(client, baseUrl, objId, appId, form
         normalizedExpression: errors.length ? expression : pieces.join(''),
     };
 }
+/**
+ * eb 表那条路由：先取字段来源（`getEbField`）再调解析核。
+ *
+ * @param moduleColumns 模块字段（系统字段）候选。只有函数联动会传；**不传时行为与加这个参数之前完全一致**。
+ */
+export async function buildFormulaParameters(client, baseUrl, objId, appId, formId, expression, moduleColumns) {
+    // getEbField 取主表 + 明细结构（主表字段用于反查不带表名的 `[字段]`）
+    let mainFields = [];
+    let detailTables = [];
+    try {
+        const eb = await client.post(`${baseUrl}/api/bs/esb/setting/component/getEbField`, { tableId: objId, appId });
+        mainFields = eb?.data?.main || [];
+        detailTables = eb?.data?.detail || [];
+    }
+    catch { /* 拉取失败由解析报错兜底 */ }
+    return resolveFormulaRefs(expression, {
+        mainFields, detailTables, moduleColumns, formId, module: 'ebuilderform', appId,
+    });
+}
 //# sourceMappingURL=formula-detail.js.map

package/dist/services/formula-detail.js.map

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

package/dist/services/matrix-rows.d.ts

@@ -0,0 +1,43 @@
+import type { ApiClient } from '../core/client.js';
+/**
+ * HRM 矩阵数据行的形状处理。
+ *
+ * 平台的 `data/save` 收的是：
+ *   { matrixId, rowData: [ { id?, data: [ {dataIndex, conditionAble, value: ["<实体ID>"]} ] } ] }
+ *
+ * 两个要点：
+ *
+ * 1. **带 `id` 是改，不带是增。** 行 id 用 `matrix data list` 拿。同步型矩阵（`syncType=1`，
+ *    如部门矩阵）的行是组织架构同步出来的、不可增删，**行 id 就是部门 id**；手工维护的矩阵
+ *    行 id 是平台发号的雪花。
+ *
+ * 2. **平台整行覆盖**，不是按列合并。只给值列去改一行，条件列会被清空 —— 所以改行时必须
+ *    先读回该行、把没给的列补上再发。
+ */
+/** 简写数据行里代表「行 id」的键。列键（configId）全是数字串，不会与这两个撞。 */
+export declare const ROW_ID_KEYS: string[];
+/** 拆出简写行里的「行 id」与各列值。 */
+export declare function splitMatrixRow(row: any): {
+    rowId?: string;
+    cells: Record<string, any>;
+};
+/**
+ * 统一成 ID 字符串数组。
+ * 两种写法都收：`["<实体ID>"]`（提交用）与 `[{id:"<实体ID>",...}]`（`data list` 读回的实体对象）。
+ */
+export declare function toIdList(v: any): string[];
+/** 这一行没给、但列定义里有的列。改行时这些列必须从现有行补回来。 */
+export declare function missingMatrixColumns(row: any, allColumns: string[]): string[];
+/** 行里给了但矩阵没有的列 —— 多半是 configId 抄错了，要报出来而不是静默发出去。 */
+export declare function unknownMatrixColumns(row: any, allColumns: string[]): string[];
+/**
+ * 把一行简写展开成平台要的形状。
+ *
+ * 带了 `rowId` 且该行缺列时，必须传 `existingRow`（该行的现有数据）—— 缺的列会从它取值补上，
+ * 否则会被平台整行覆盖清空。`existingRow` 里的值是 `data list` 读回的实体对象数组，
+ * 由 [[toIdList]] 统一成 ID。
+ */
+export declare function buildMatrixRow(row: any, conditionIds: Set<string>, allColumns: string[], existingRow?: any | null): any;
+/** 按行 id 取一行。`data/page` 没有按行 id 过滤的入参，只能翻页找。 */
+export declare function fetchMatrixRow(client: ApiClient, baseUrl: string, matrixId: string, rowId: string): Promise<any | null>;
+//# sourceMappingURL=matrix-rows.d.ts.map

package/dist/services/matrix-rows.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"matrix-rows.d.ts","sourceRoot":"","sources":["../../src/services/matrix-rows.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAEnD;;;;;;;;;;;;;;GAcG;AAEH,kDAAkD;AAClD,eAAO,MAAM,WAAW,UAAkB,CAAC;AAE3C,yBAAyB;AACzB,wBAAgB,cAAc,CAAC,GAAG,EAAE,GAAG,GAAG;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;CAAE,CAYvF;AAED;;;GAGG;AACH,wBAAgB,QAAQ,CAAC,CAAC,EAAE,GAAG,GAAG,MAAM,EAAE,CAOzC;AAED,sCAAsC;AACtC,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAG7E;AAED,oDAAoD;AACpD,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAG7E;AAED;;;;;;GAMG;AACH,wBAAgB,cAAc,CAC5B,GAAG,EAAE,GAAG,EACR,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,EACzB,UAAU,EAAE,MAAM,EAAE,EACpB,WAAW,CAAC,EAAE,GAAG,GAAG,IAAI,GACvB,GAAG,CAqBL;AAED,iDAAiD;AACjD,wBAAsB,cAAc,CAClC,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAClE,OAAO,CAAC,GAAG,GAAG,IAAI,CAAC,CAerB"}

package/dist/services/matrix-rows.js

@@ -0,0 +1,104 @@
+/**
+ * HRM 矩阵数据行的形状处理。
+ *
+ * 平台的 `data/save` 收的是：
+ *   { matrixId, rowData: [ { id?, data: [ {dataIndex, conditionAble, value: ["<实体ID>"]} ] } ] }
+ *
+ * 两个要点：
+ *
+ * 1. **带 `id` 是改，不带是增。** 行 id 用 `matrix data list` 拿。同步型矩阵（`syncType=1`，
+ *    如部门矩阵）的行是组织架构同步出来的、不可增删，**行 id 就是部门 id**；手工维护的矩阵
+ *    行 id 是平台发号的雪花。
+ *
+ * 2. **平台整行覆盖**，不是按列合并。只给值列去改一行，条件列会被清空 —— 所以改行时必须
+ *    先读回该行、把没给的列补上再发。
+ */
+/** 简写数据行里代表「行 id」的键。列键（configId）全是数字串，不会与这两个撞。 */
+export const ROW_ID_KEYS = ['rowId', 'id'];
+/** 拆出简写行里的「行 id」与各列值。 */
+export function splitMatrixRow(row) {
+    const cells = {};
+    let rowId;
+    for (const [k, v] of Object.entries(row || {})) {
+        if (ROW_ID_KEYS.includes(k)) {
+            const s = String(v ?? '').trim();
+            if (s)
+                rowId = s;
+            continue;
+        }
+        cells[k] = v;
+    }
+    return { rowId, cells };
+}
+/**
+ * 统一成 ID 字符串数组。
+ * 两种写法都收：`["<实体ID>"]`（提交用）与 `[{id:"<实体ID>",...}]`（`data list` 读回的实体对象）。
+ */
+export function toIdList(v) {
+    if (v === undefined || v === null || v === '')
+        return [];
+    const arr = Array.isArray(v) ? v : [v];
+    return arr
+        .map((e) => (e && typeof e === 'object' ? e.id : e))
+        .map((e) => String(e ?? '').trim())
+        .filter(Boolean);
+}
+/** 这一行没给、但列定义里有的列。改行时这些列必须从现有行补回来。 */
+export function missingMatrixColumns(row, allColumns) {
+    const given = new Set(Object.keys(splitMatrixRow(row).cells));
+    return allColumns.filter((c) => !given.has(c));
+}
+/** 行里给了但矩阵没有的列 —— 多半是 configId 抄错了，要报出来而不是静默发出去。 */
+export function unknownMatrixColumns(row, allColumns) {
+    const cols = new Set(allColumns);
+    return Object.keys(splitMatrixRow(row).cells).filter((k) => !cols.has(k));
+}
+/**
+ * 把一行简写展开成平台要的形状。
+ *
+ * 带了 `rowId` 且该行缺列时，必须传 `existingRow`（该行的现有数据）—— 缺的列会从它取值补上，
+ * 否则会被平台整行覆盖清空。`existingRow` 里的值是 `data list` 读回的实体对象数组，
+ * 由 [[toIdList]] 统一成 ID。
+ */
+export function buildMatrixRow(row, conditionIds, allColumns, existingRow) {
+    const { rowId, cells } = splitMatrixRow(row);
+    const merged = Object.entries(cells);
+    if (rowId) {
+        const given = new Set(Object.keys(cells));
+        for (const col of allColumns) {
+            if (given.has(col))
+                continue;
+            // 没给又没得补的列留空数组：与平台「整行覆盖」的语义一致，也避免发 undefined。
+            merged.push([col, existingRow ? toIdList(existingRow[col]) : []]);
+        }
+    }
+    return {
+        ...(rowId ? { id: rowId } : {}),
+        data: merged.map(([configId, v]) => ({
+            dataIndex: configId,
+            conditionAble: conditionIds.has(configId),
+            value: toIdList(v),
+        })),
+    };
+}
+/** 按行 id 取一行。`data/page` 没有按行 id 过滤的入参，只能翻页找。 */
+export async function fetchMatrixRow(client, baseUrl, matrixId, rowId) {
+    const size = 500;
+    const maxPages = 20;
+    for (let page = 1; page <= maxPages; page++) {
+        const res = await client.post(`${baseUrl}/api/bs/hrm/matrix2/data/page`, {
+            matrixId, current: page, pageSize: size,
+        });
+        const p = res?.data || {};
+        const rows = p.data || p.records || p.datas || [];
+        const hit = rows.find((r) => String(r.id) === String(rowId));
+        if (hit)
+            return hit;
+        if (rows.length < size)
+            return null; // 没有更多页
+        if (typeof p.total === 'number' && p.total <= page * size)
+            return null; // 已翻到底
+    }
+    return null;
+}
+//# sourceMappingURL=matrix-rows.js.map