weaver-e10-builder 1.1.9 → 1.2.3

package/dist/services/form-virtual.js

@@ -0,0 +1,331 @@
+const FIELD_MANAGE = '/api/ebuilder/form/form/field/manage';
+export const VIRTUAL_SOURCE_ID_ERROR = '当前数据源主键字段类型不支持，主键字段类型需要数字/文本类型且值唯一，建议重新查询一列并起别名作为主键字段使用。';
+function unwrap(response) {
+    return (response?.data ?? response);
+}
+function assertOk(response, action) {
+    if (response?.code !== undefined && (response.code !== 200 || response.status === false)) {
+        throw new Error(`${action}失败: ${response?.msg || '接口返回异常'}`);
+    }
+}
+function sourceFamily(field) {
+    const source = String(field.sourceFieldType || '').toLowerCase();
+    const type = String(field.type || field.componentKey || '').toLowerCase();
+    if (source.includes('string') || source.includes('文本') || ['text', 'textarea'].includes(type))
+        return 'string';
+    if (source.includes('number') || source.includes('数值') || ['number', 'money', 'numbercomponent'].includes(type))
+        return 'number';
+    if (source.includes('date') || source.includes('日期') || ['date', 'datetime', 'datecomponent'].includes(type))
+        return 'date';
+    return 'complex';
+}
+function recommendedType(field) {
+    const raw = String(field.type || field.componentKey || '');
+    if (raw === 'NumberComponent')
+        return 'Number';
+    if (raw === 'DateComponent')
+        return 'Date';
+    if (raw === 'Ebuilder')
+        return 'EBuilder';
+    if (raw)
+        return raw;
+    const family = sourceFamily(field);
+    if (family === 'string')
+        return 'Text';
+    if (family === 'number')
+        return 'Number';
+    if (family === 'date')
+        return 'Date';
+    throw new Error(`来源字段「${field.sourceFieldTitle || field.title || field.dataKey}」缺少可识别的字段类型`);
+}
+const COMPATIBLE = {
+    string: new Set(['Text', 'TextArea']),
+    number: new Set(['Number', 'Money']),
+    date: new Set(['Date', 'DateTime']),
+};
+export function assertVirtualFieldCompatibility(field, targetType) {
+    const family = sourceFamily(field);
+    const current = recommendedType(field);
+    if (family === 'complex') {
+        if (targetType !== current && targetType !== String(field.componentKey || '')) {
+            throw new Error(`字段「${field.sourceFieldTitle || field.title || field.dataKey}」是复杂字段 ${current}，必须保留来源组件类型`);
+        }
+        return;
+    }
+    if (!COMPATIBLE[family]?.has(targetType)) {
+        throw new Error(`字段「${field.sourceFieldTitle || field.title || field.dataKey}」来源类型为 ${field.sourceFieldType || current}，不能改为 ${targetType}`);
+    }
+}
+function applyDisplayType(field, type, selection) {
+    const out = { ...field, type };
+    delete out.currentLevel;
+    delete out.columnType;
+    delete out.columnName;
+    delete out.typeLen;
+    delete out.dataCount;
+    delete out.groupName;
+    if (type === 'Text') {
+        out.componentKey = 'Text';
+        out.maxLen = selection.maxLen ?? field.maxLen ?? 100;
+        out.unique = false;
+        out.scan = false;
+        out.readonlyTransLink = false;
+    }
+    else if (type === 'TextArea') {
+        out.componentKey = 'TextArea';
+        out.content = '';
+        out.height = field.height ?? 3;
+        out.maxLen = selection.maxLen ?? field.maxLen ?? 4000;
+    }
+    else if (type === 'Number' || type === 'Money') {
+        out.componentKey = 'NumberComponent';
+        out.type = 'Number';
+        out.numberType = 'number';
+        out.pointSize = String(selection.precision ?? field.pointSize ?? (type === 'Money' ? 2 : 0));
+        out.isDelimiter = type === 'Money';
+        out.isDefault = false;
+        out.capitalPosition = 'outside';
+        out.capitalSetting = 'system';
+        out.capitalPrecision = 'yuan';
+        out.capitalFormat = 'onlyUpperCase';
+    }
+    else if (type === 'Date' || type === 'DateTime') {
+        out.componentKey = 'DateComponent';
+        out.type = 'Date';
+        out.format = selection.format || field.format || (type === 'DateTime' ? 'yyyy-MM-dd HH:mm' : 'yyyy-MM-dd');
+        out.placeholder = '年-月-日';
+        out.earlyDate = false;
+        out.lateDate = false;
+        out.earlyType = 'currentDay';
+        out.lateType = 'currentDay';
+        out.isSystemDate = false;
+        out.timePanelStyle = { type: 'system' };
+        out.isDefault = false;
+    }
+    return out;
+}
+export function selectVirtualFields(candidates, selections, formId = '0') {
+    const used = new Set();
+    return selections.map((input, index) => {
+        const selection = typeof input === 'string' ? { sourceField: input } : input;
+        const key = String(selection.sourceField || selection.virtualFieldId || selection.dataKey || '');
+        if (!key)
+            throw new Error(`第 ${index + 1} 个字段缺少 sourceField/dataKey/virtualFieldId`);
+        const field = candidates.find((item) => [item.dataKey, item.virtualFieldId, item.sourceFieldTitle, item.title]
+            .some(value => String(value || '') === key));
+        if (!field)
+            throw new Error(`数据源中找不到字段「${key}」`);
+        const identity = String(field.virtualFieldId || field.dataKey);
+        if (used.has(identity))
+            throw new Error(`字段「${key}」重复选择`);
+        used.add(identity);
+        const targetType = selection.componentKey || recommendedType(field);
+        assertVirtualFieldCompatibility(field, targetType);
+        const result = applyDisplayType(field, targetType, selection);
+        result.title = selection.fieldName || field.sourceFieldTitle || field.title || key;
+        result.sourceFieldTitle = field.sourceFieldTitle || field.title || key;
+        result.dataKey = field.dataKey;
+        result.virtualFieldId = field.virtualFieldId || field.dataKey;
+        result.sourceFieldType = field.sourceFieldType;
+        result.fieldId = String(field.fieldId);
+        result.formId = formId;
+        result.groupId = '-1';
+        result.showOrder = index;
+        return result;
+    });
+}
+export class VirtualFormService {
+    client;
+    baseUrl;
+    constructor(client, baseUrl) {
+        this.client = client;
+        this.baseUrl = baseUrl;
+    }
+    async listGroups(sourceType, appId = 'default', showSqlDataset = true) {
+        const response = await this.client.get(`${this.baseUrl}/api/ebuilder/common/ds/group?sourceType=${encodeURIComponent(sourceType)}&showSqlDataset=${showSqlDataset}&appId=${encodeURIComponent(appId)}`);
+        assertOk(response, '读取数据源分组');
+        return unwrap(response) || [];
+    }
+    async listSources(groupId, sourceType, options = {}) {
+        const form = new FormData();
+        form.set('appId', options.appId || 'default');
+        form.set('name', options.name || '');
+        form.set('pageNo', String(options.pageNo || 1));
+        form.set('pageSize', String(options.pageSize || 20));
+        form.set('groupId', groupId);
+        form.set('sourceType', sourceType);
+        form.set('dataUsage', '');
+        const response = await this.client.postMultipart(`${this.baseUrl}/api/ebuilder/common/ds/listByPage`, form);
+        assertOk(response, '读取数据源列表');
+        return unwrap(response);
+    }
+    async listDatasetGroups(rootId = '-98') {
+        const response = await this.client.post(`${this.baseUrl}/api/datasearch/common/browser/leftData/eteamsBrowser`, {
+            browserMultiple: false, id: rootId, nodeData: { id: rootId, isLeaf: false, content: rootId === '-99' ? '数据开发' : '数据准备' },
+        });
+        assertOk(response, '读取数据加工分组');
+        return unwrap(response)?.data || [];
+    }
+    async listDatasets(groupId, options = {}) {
+        const response = await this.client.post(`${this.baseUrl}/api/datasearch/common/browser/data/eteamsBrowser`, {
+            browserMultiple: false,
+            current: options.pageNo || 1,
+            pageSize: options.pageSize || 20,
+            formDatas: {},
+            quickSearchDatas: options.name ? { eteamsTableName: options.name } : {},
+            type: 'and',
+            leftTreeSelectedId: groupId,
+            leftTreeSelectedData: { id: groupId, isLeaf: true, content: '' },
+        });
+        assertOk(response, '读取数据加工列表');
+        return unwrap(response);
+    }
+    async datasetInfo(datasetId) {
+        const response = await this.client.post(`${this.baseUrl}/api/dw/dataset/getDatasetById`, { datasetId });
+        const data = unwrap(response);
+        if (!data?.id)
+            throw new Error(`无法读取数据集 ${datasetId}`);
+        return data;
+    }
+    async sourceInfo(appId, contextObjId, source) {
+        if (source.sourceType === 'ETEAMS')
+            return this.datasetInfo(source.sourceId);
+        const response = await this.client.post(`${this.baseUrl}${FIELD_MANAGE}/datasourcefield/getDataSourceBaseInfo?apid=${encodeURIComponent(appId)}`, {
+            module: 'ebuilderform', dataSourceType: source.sourceType, dataSourceGroup: source.sourceGroup,
+            dataSourceId: source.sourceId, customParam: { appId, objId: contextObjId },
+        });
+        assertOk(response, '读取数据源信息');
+        return unwrap(response);
+    }
+    async checkSource(appId, contextObjId, source) {
+        const query = new URLSearchParams({ appId, sourceType: source.sourceType, groupId: source.sourceGroup, sourceId: source.sourceId, objId: contextObjId });
+        const response = await this.client.get(`${this.baseUrl}/api/bs/ebuilder/form/vform/checkDataSourceIdField?${query}`);
+        assertOk(response, '校验数据源主键');
+        return Boolean(unwrap(response)?.isExistsId);
+    }
+    async sourceFields(appId, contextObjId, source, formId = '0') {
+        const body = {
+            module: 'ebuilderform', dataSourceId: source.sourceId, dataSourceType: source.sourceType,
+            dataSourceGroup: source.sourceGroup, customParam: { appId, objId: contextObjId },
+        };
+        if (formId !== '0')
+            Object.assign(body, { formId, updateType: '0' });
+        const response = await this.client.post(`${this.baseUrl}${FIELD_MANAGE}/listFormFieldJsonByDataSource?apid=${encodeURIComponent(appId)}`, body);
+        assertOk(response, '读取数据源字段');
+        return unwrap(response)?.fieldList || [];
+    }
+    async buildSourceCustom(appId, contextObjId, source) {
+        const info = await this.sourceInfo(appId, contextObjId, source);
+        const name = source.sourceName || info.name || info.tableText || source.sourceId;
+        if (source.sourceType === 'ETEAMS') {
+            return {
+                dataPermissions: [{ objId: source.sourceId, type: 'all_data' }], id: source.sourceId, text: name,
+                type: 'ETEAMS', groupId: source.sourceGroup, isPhysical: true, usage: '', objType: '',
+                datasetType: source.datasetType || info.type || 'sql', isNew: true, hasLocal: false, rankMark: true,
+            };
+        }
+        const base = {
+            id: source.sourceId, text: name, type: 'LOGIC', groupId: source.sourceGroup,
+            isPhysical: source.isPhysical ?? info.isPhysical ?? false, usage: info.usage || 'all',
+            detailTable: Boolean(info.detailTable), objType: info.objType || info.otherParams?.objType || '',
+            module: source.sourceModule || info.serviceMark || info.otherParams?.serviceMark || '',
+        };
+        if (source.sourceGroup === 'weaver-ebuilder-form-service') {
+            base.module = 'ebuilder';
+            base.appId = source.sourceAppId || info.appId || appId;
+            base.ebuilderDataConfig = { dataSetup: { dataSource: 'ALL', dataPermission: 'HAVE_PERMISSION_DATA' }, type: 'FORM' };
+            base.isFormModuleSelected = true;
+        }
+        return base;
+    }
+    async initializeLayout(appId, formId, layoutType, fieldSelections) {
+        const ebb = { ebbusinessid: formId };
+        const meta = await this.client.post(`${this.baseUrl}/api/ebuilder/form/form/builder/getFormLayout?formId=${encodeURIComponent(formId)}&apid=${encodeURIComponent(appId)}`, {
+            formId, module: 'ebuilderform', layoutId: '', customParam: { terminal: '', objId: formId },
+            designerParam: { onlyLayout: false, convert: false }, form: { id: formId },
+        }, ebb);
+        assertOk(meta, '读取虚拟表布局');
+        const formLayout = unwrap(meta)?.formLayout || {};
+        const multiple = unwrap(meta)?.formLayoutMultiple || {};
+        const configResponse = await this.client.post(`${this.baseUrl}/api/ebuilder/form/form/view/relate/getConfig?apid=${encodeURIComponent(appId)}`, {
+            formId, module: 'ebuilderform', apiModule: 'ebuilder/form', layoutId: formLayout.id,
+            customParam: { terminal: '', objId: formId }, initMode: 5, groupFieldIds: [],
+            designerParam: { sourceModule: 'ebuilderform' },
+        }, ebb);
+        assertOk(configResponse, '读取虚拟表布局字段');
+        const byName = new Map(fieldSelections.map(f => [f.fieldName || f.sourceField || f.dataKey || '', f]));
+        const configs = (unwrap(configResponse)?.configs || []).map((config) => {
+            if (config.system)
+                return { ...config, display: false, show: false, readOnly: true };
+            const selection = byName.get(config.name) || byName.get(config.dataKey) || {};
+            return {
+                ...config, display: selection.hidden !== true, show: selection.hidden !== true,
+                readOnly: selection.readOnly !== false, required: Boolean(selection.required),
+                singleRow: Boolean(selection.singleRow),
+            };
+        });
+        const response = await this.client.post(`${this.baseUrl}/api/ebuilder/form/form/view/relate/initLayout?apid=${encodeURIComponent(appId)}`, {
+            formId, module: 'ebuilderform', apiModule: 'ebuilder/form', layoutId: formLayout.id,
+            generateCollapse: true, styleTemplateId: layoutType === 'FLOW' ? '820000000000000001' : '700000000000000008',
+            styleTemplateType: 1, configs, addLayout: false, ecodeType: ['js', 'css'],
+            customParam: { terminal: '', objId: formId },
+            formLayoutMultiple: { isSys: true, id: multiple.id, name: multiple.name, terminalType: 'PC', layoutType },
+            designerParam: { onlyLayout: false }, initMode: '5', groupFieldIds: [],
+        }, ebb);
+        assertOk(response, '初始化虚拟表布局');
+        return unwrap(response);
+    }
+    async create(appId, contextObjId, name, source, selections, layoutType) {
+        if (!(await this.checkSource(appId, contextObjId, source)))
+            throw new Error(VIRTUAL_SOURCE_ID_ERROR);
+        const candidates = await this.sourceFields(appId, contextObjId, source);
+        const fields = selectVirtualFields(candidates, selections, '0');
+        const sourceCustom = await this.buildSourceCustom(appId, contextObjId, source);
+        const response = await this.client.post(`${this.baseUrl}${FIELD_MANAGE}/batch/save/formField?apid=${encodeURIComponent(appId)}`, {
+            form: {
+                dataSourceId: source.sourceId, dataSourceType: source.sourceType, dataSourceGroup: source.sourceGroup,
+                name, layoutType: layoutType === 'FLOW' ? 'simple' : 'advanced', isAdvance: layoutType === 'EXCEL', customParam: sourceCustom,
+            },
+            module: 'ebuilderform', formId: '0', customParam: { appId, groupId: '-1', objId: contextObjId },
+            forms: [], ids: [], delSubFormIds: [], delFormTableIdList: [],
+            jsonObjList: fields.map(field => JSON.stringify(field)), replaceFieldIdMap: {},
+        }, { ebbusinessid: appId });
+        assertOk(response, '创建虚拟表');
+        const data = unwrap(response);
+        const obj = data?.ebCustomResult?.obj || data?.obj || {};
+        const form = data?.form || {};
+        const objId = String(obj.id || form.targetId || '');
+        const formId = String(form.id || obj.formId || '');
+        if (!objId || !formId)
+            throw new Error('虚拟表创建成功但未返回 objId/formId');
+        await this.initializeLayout(appId, formId, layoutType, selections.filter((v) => typeof v !== 'string'));
+        return { objId, formId, defaultListId: String(obj.defaultListId || ''), name, source, fieldCount: fields.length, layoutType };
+    }
+    async read(appId, objId) {
+        const list = await this.client.get(`${this.baseUrl}/api/bs/ebuilder/form/obj/getList/${encodeURIComponent(appId)}?apid=${encodeURIComponent(appId)}&objId=${encodeURIComponent(objId)}`, { ebbusinessid: appId });
+        assertOk(list, '读取虚拟表');
+        const objects = unwrap(list) || [];
+        const object = objects.find(item => String(item.id) === String(objId));
+        if (!object)
+            throw new Error(`找不到虚拟表 objId=${objId}`);
+        const formId = String(object.formId || '');
+        const fieldsResponse = await this.client.post(`${this.baseUrl}${FIELD_MANAGE}/get/field/configs?apid=${encodeURIComponent(appId)}`, {
+            module: 'ebuilderform', formId, needDataCount: false, needOrderProperties: false,
+            needSubForm: true, needAllFields: false, componentKeys: [], customParam: { appId, objId },
+        }, { ebbusinessid: formId });
+        assertOk(fieldsResponse, '读取虚拟表字段');
+        return { ...object, isVirtual: object.tableType === 'vform' || object.isVirtual === true, fields: unwrap(fieldsResponse)?.fieldConfigs || [] };
+    }
+    async addFields(appId, objId, formId, source, selections) {
+        const candidates = await this.sourceFields(appId, objId, source, formId);
+        const fields = selectVirtualFields(candidates, selections, formId);
+        const response = await this.client.post(`${this.baseUrl}${FIELD_MANAGE}/batch/save/formField?apid=${encodeURIComponent(appId)}`, {
+            updateType: '0', module: 'ebuilderform', formId, customParam: { appId, objId },
+            forms: [], ids: [], delSubFormIds: [], delFormTableIdList: [],
+            jsonObjList: fields.map(field => JSON.stringify(field)), replaceFieldIdMap: {},
+        }, { ebbusinessid: formId });
+        assertOk(response, '增加虚拟表字段');
+        return { objId, formId, added: fields.map(field => ({ fieldId: field.fieldId, name: field.title, dataKey: field.dataKey })) };
+    }
+}
+//# sourceMappingURL=form-virtual.js.map

package/dist/services/form-virtual.js.map

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

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

@@ -1,12 +1,39 @@
 /**
  * 公式表达式引用解析（主表 + 明细表）。
  *
- * 公式 expressSql 里的字段引用支持两种语法：
- * - `{主表.字段名}` — 主表字段
- * - `{明细表名.字段名}` — 明细表字段（如 `{行程明细.行程开始时间}`）
+ * ## 引用语法：两套写法，一套存储
  *
- * 明细引用的参数对象需带 `sFormId`(明细表 id) + `sFormName`(明细表名)（浏览器实测）。
- * 字段结构统一从 getEbField 取（主表 main + 明细 detail，含 detailTableId/tableName/fields）。
+ * 平台**存**的是花括号：`{主表.字段名}` / `{明细表名.字段名}`，配一份 `parameters` 参数表。
+ * 而设计器的公式编辑器**显示和输入**用的是方括号：`[字段名]`（截图对照：
+ * `CONCAT([通知], 当前日期)`），保存时由编辑器自己转回花括号 + 参数。
+ *
+ * 所以方括号是**编辑器那层的写法**，不是服务端语法。直接把它发给保存接口的后果实测如下：
+ *
+ * | 发送 | 参数表 | 结果 |
+ * |---|---|---|
+ * | `[主表名称]` | 带上 | ❌「参数列表与执行语句不一致」 |
+ * | `[主表名称]` | 空 | ⚠️ 保存成功，但平台记录的参数数 = 0 —— **字段其实没接上，静默失效** |
+ * | `{主表.主表名称}` | 带上 | ✅ 参数数 = 1 |
+ *
+ * 第二行是最坑的：看着保存成功，实际是个死引用。因此本模块**只接受方括号作为输入写法，
+ * 一律归一化成花括号后再下发**，绝不把 `[x]` 原样发给平台。
+ *
+ * ## 参数必须逐个出现位置各一份（不去重）
+ *
+ * 同一字段在表达式里出现两次，就必须给**两个**参数对象：
+ *
+ * ```
+ * CONCAT({主表.主表名称}, "—", {主表.主表名称})
+ *   参数 1 个 → ❌ 参数列表与执行语句不一致
+ *   参数 2 个 → ✅ 平台记录参数数 = 2
+ * ```
+ *
+ * 早期版本在这里做了去重，等于「同一字段引用两次」必失败。
+ *
+ * ## 明细引用
+ *
+ * 明细引用的参数对象需带 `sFormId`(明细表 id) + `sFormName`(明细表名)。
+ * 字段结构统一从 getEbField 取（主表 main + 明细 detail）。
  */
 import type { ApiClient } from '../core/client.js';
 export interface FormulaParam {
@@ -22,10 +49,46 @@ export interface FormulaParam {
     appId: string;
     id: null;
 }
+/** 一处字段引用。 */
+export interface FormulaRef {
+    /** 表名。`{主表.x}` → `'主表'`；`[x]` 这种不带表名的写法 → `null`（待按字段名反查）。 */
+    table: string | null;
+    field: string;
+    /** 原文，报错回显用。 */
+    raw: string;
+    /** 在表达式中的起止位置，供归一化改写。 */
+    index: number;
+    length: number;
+}
 export interface FormulaParseResult {
     parameters: FormulaParam[];
     refNames: string[];
     errors: string[];
+    /** 不阻断保存、但该让用户知道的（如零引用的纯常量公式）。 */
+    warnings: string[];
+    /**
+     * 归一化后的表达式：方括号引用已改写成 `{表.字段}`。
+     * **保存时必须用这个**，不能用用户原样输入。
+     */
+    normalizedExpression: string;
 }
+/**
+ * 扫出表达式里的全部字段引用，**两种写法都认**：
+ * - `{主表.字段名}` / `{明细表名.字段名}` —— 平台存储格式
+ * - `[字段名]` / `[表名.字段名]` —— 设计器编辑器的写法
+ *
+ * 重复出现**不去重** —— 每个出现位置都要单独一个参数（见文件头说明）。
+ * 不做字符串字面量剔除：公式里写 `"["` 这种极端情况不在支持范围，误判会在解析阶段
+ * 报「未找到字段」，比静默错绑安全。
+ */
+export declare function parseFormulaRefs(expression: string): FormulaRef[];
+/**
+ * 按目标字段的类型给出合适的公式返回类型。
+ *
+ * 此前 fields.json 里 `formula` 写成字符串时**一律按 `Number` 提交**，
+ * 于是「给单行文本挂公式」必然被平台拒（「公式计算结果必须为: 数字」）——
+ * 报错说的是真话：我们替用户要了个数字。
+ */
+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>;
 //# 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;;;;;;;;;GASG;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,MAAM,WAAW,kBAAkB;IACjC,UAAU,EAAE,YAAY,EAAE,CAAC;IAC3B,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;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,CAqE7B"}
+{"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"}

package/dist/services/formula-detail.js

@@ -1,66 +1,132 @@
+/**
+ * 扫出表达式里的全部字段引用，**两种写法都认**：
+ * - `{主表.字段名}` / `{明细表名.字段名}` —— 平台存储格式
+ * - `[字段名]` / `[表名.字段名]` —— 设计器编辑器的写法
+ *
+ * 重复出现**不去重** —— 每个出现位置都要单独一个参数（见文件头说明）。
+ * 不做字符串字面量剔除：公式里写 `"["` 这种极端情况不在支持范围，误判会在解析阶段
+ * 报「未找到字段」，比静默错绑安全。
+ */
+export function parseFormulaRefs(expression) {
+    const refs = [];
+    const re = /\{([^{}]+)\}|\[([^\[\]]+)\]/g;
+    let m;
+    while ((m = re.exec(expression)) !== null) {
+        const inner = (m[1] ?? m[2] ?? '').trim();
+        if (!inner)
+            continue;
+        const dot = inner.indexOf('.');
+        const hasTable = dot > 0 && dot < inner.length - 1;
+        refs.push({
+            table: hasTable ? inner.slice(0, dot).trim() : null,
+            field: (hasTable ? inner.slice(dot + 1) : inner).trim(),
+            raw: m[0],
+            index: m.index,
+            length: m[0].length,
+        });
+    }
+    return refs;
+}
+/**
+ * 按目标字段的类型给出合适的公式返回类型。
+ *
+ * 此前 fields.json 里 `formula` 写成字符串时**一律按 `Number` 提交**，
+ * 于是「给单行文本挂公式」必然被平台拒（「公式计算结果必须为: 数字」）——
+ * 报错说的是真话：我们替用户要了个数字。
+ */
+export function defaultReturnType(fieldKey) {
+    const k = String(fieldKey || '');
+    if (/^(Number|Money|Percentage)/.test(k))
+        return 'Number';
+    if (/^(Date|DateTime|Time)/.test(k))
+        return 'Date';
+    return 'String';
+}
 export async function buildFormulaParameters(client, baseUrl, objId, appId, formId, expression) {
     const errors = [];
+    const warnings = [];
     const parameters = [];
     const refNames = [];
-    // 1. 解析 {主表.x} 或 {明细表名.x}
-    const refRegex = /\{(?:主表|([^.}]+))\.([^}]+)\}/g;
-    const refs = [];
-    let m;
-    while ((m = refRegex.exec(expression)) !== null) {
-        const table = m[1] ? m[1].trim() : '主表';
-        const field = m[2].trim();
-        if (!refs.some((r) => r.table === table && r.field === field))
-            refs.push({ table, field });
-    }
+    const refs = parseFormulaRefs(expression);
     if (refs.length === 0) {
-        errors.push('表达式中未找到 {主表.字段名} 或 {明细表名.字段名} 引用');
-        return { parameters, refNames, errors };
+        // 纯常量公式（如 CONCAT("甲","乙")）平台**接受**，实测保存成功且参数为空。
+        // 早期版本在这里直接报错退出，把「平台允许的用法」当成非法输入拦掉了。
+        warnings.push('表达式中没有字段引用（纯常量公式）。平台允许这种写法，将按原样保存。');
     }
-    // 2. getEbField 取主表 + 明细结构
-    const mainFields = [];
-    const detailTables = [];
+    // getEbField 取主表 + 明细结构（主表字段用于反查不带表名的 `[字段]`）
+    let mainFields = [];
+    let detailTables = [];
     try {
         const eb = await client.post(`${baseUrl}/api/bs/esb/setting/component/getEbField`, { tableId: objId, appId });
-        mainFields.push(...(eb?.data?.main || []));
-        detailTables.push(...(eb?.data?.detail || []));
+        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);
+    /** 归一化：把每个引用改写成 `{表.字段}`。反查不到时保留原文（后续会报错）。 */
+    const pieces = [];
+    let cursor = 0;
     for (const ref of refs) {
-        refNames.push(`${ref.table}.${ref.field}`);
-        if (ref.table === '主表') {
-            const f = mainFind(ref.field);
-            if (!f) {
-                errors.push(`未找到主表字段: "${ref.field}"，可用: ${mainFields.map((x) => x.showName).join(', ')}`);
-                continue;
+        let table = ref.table;
+        let resolved;
+        if (table === '主表' || table === null) {
+            resolved = mainFind(ref.field);
+            if (!resolved && table === null) {
+                // 不带表名的 `[字段]`：主表没有就找明细表
+                const owners = detailTables.filter((d) => fieldIn(d, ref.field));
+                if (owners.length > 1) {
+                    errors.push(`字段「${ref.field}」在多个明细表中存在（${owners.map((d) => d.tableName).join('、')}），请写成 [明细表名.${ref.field}] 指明是哪个`);
+                    continue;
+                }
+                if (owners.length === 1) {
+                    table = owners[0].tableName;
+                    resolved = fieldIn(owners[0], ref.field);
+                }
+            }
+            if (resolved && (table === null || table === '主表')) {
+                table = '主表';
             }
-            parameters.push({
-                dataTemplateId: '', fieldId: String(f.id), formId, module: 'ebuilderform',
-                properKey: f.componentKey || 'Text',
-                title: f.showName || ref.field, name: f.showName || ref.field,
-                appId, id: null,
-            });
         }
         else {
-            const dt = detailTables.find((d) => d.tableName === ref.table);
+            const dt = detailOf(table);
             if (!dt) {
-                errors.push(`未找到明细表: "${ref.table}"，可用: ${detailTables.map((d) => d.tableName).join(', ')}`);
+                errors.push(`未找到明细表: "${table}"，可用: ${detailTables.map((d) => d.tableName).join(', ')}`);
                 continue;
             }
-            const f = (dt.fields || []).find((x) => String(x.id) === ref.field || x.showName === ref.field || x.dataKey === ref.field);
-            if (!f) {
-                errors.push(`明细表「${ref.table}」中未找到字段: "${ref.field}"，可用: ${(dt.fields || []).map((x) => x.showName).join(', ')}`);
-                continue;
-            }
-            parameters.push({
-                dataTemplateId: '', fieldId: String(f.id), formId, module: 'ebuilderform',
-                properKey: f.componentKey || 'Text',
-                sFormId: String(dt.detailTableId), sFormName: dt.tableName,
-                title: f.showName || ref.field, name: f.showName || ref.field,
-                appId, id: null,
-            });
+            resolved = fieldIn(dt, ref.field);
+            table = dt.tableName;
+        }
+        if (!resolved) {
+            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}`);
+            continue;
         }
+        // 走到这里 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}`);
+        pieces.push(expression.slice(cursor, ref.index));
+        pieces.push(`{${table}.${ref.field}}`);
+        cursor = ref.index + ref.length;
     }
-    return { parameters, refNames, errors };
+    pieces.push(expression.slice(cursor));
+    return {
+        parameters, refNames, errors, warnings,
+        normalizedExpression: errors.length ? expression : pieces.join(''),
+    };
 }
 //# sourceMappingURL=formula-detail.js.map