weaver-e10-builder 1.6.16 → 1.7.0

package/dist/services/form-field-dataset.js

@@ -0,0 +1,180 @@
+/**
+ * 统一读表单字段（数据源服务 `ds/fields`）。
+ *
+ * ## 为什么不用 `dataset/v1/getFields`
+ *
+ * 那个接口在当前平台分支对 ebuilder 表单只返回系统字段（业务字段一条都不回），
+ * `form read`、建表时的选项/EBuilder 绑定等全部读不到字段。字段本身没问题，
+ * 是入口选错了。
+ *
+ * 数据源服务（`weaver-datasource`）的 `ds/fields` 才是统一的字段来源：
+ *
+ * ```
+ * POST /api/{module}/{submodule}/ds/fields   （multipart）
+ *   groupId=<数据源分组> sourceId=<objId> sourceType=<类型>
+ *   detailFieldsGroup=true needChild=true enableMerge=false needTableName=true params=[]
+ * → data[] 每张表一组
+ *     group.fields[]  主表字段 + 系统字段 + 明细表占位（isDetailtable:true）
+ *       明细占位自带 `fields[]`（明细字段）
+ * ```
+ *
+ * eBuilder 表单走 `groupId=weaver-ebuilder-form-service` + `sourceType=LOGIC`
+ * （数据源服务内部把 FORM 数据源路由到这一组，见 `DsFieldGroupServiceImpl`）。
+ * 其它表单类型可通过参数传各自的 sourceType/groupId —— 这里不做 EB 专用假设。
+ *
+ * 字段对象里有：`id`（fieldId）、`text`（显示名）、`type`（String/Number/...）、
+ * `compType`（Text/Money/Component）、`multiSelect`、`physicalField`（dataKey/列名）、
+ * `subTableId`（明细字段所属 subFormId）。正好覆盖旧 getFields 的字段集，且带明细。
+ *
+ * 旧接口保留为**兜底**：`ds/fields` 失败或返回空时回退，老环境不回归。
+ */
+export const EBUILDER_DATASOURCE_GROUP = 'weaver-ebuilder-form-service';
+export const EBUILDER_SOURCE_TYPE = 'LOGIC';
+function text(value) {
+    return value === undefined || value === null ? '' : String(value);
+}
+function parseMaybeJson(value) {
+    if (typeof value !== 'string')
+        return value;
+    const s = value.trim();
+    if (!s || !(s.startsWith('{') || s.startsWith('[')))
+        return value;
+    try {
+        return JSON.parse(s);
+    }
+    catch {
+        return value;
+    }
+}
+/** 数据源服务的一条字段 → 旧 getFields 形状（外加 dataKey/columnName）。 */
+export function normalizeDatasetField(field, subFormId = '') {
+    const raw = field && typeof field === 'object' ? field : {};
+    const fieldId = text(raw.id ?? raw.fieldId);
+    const physical = text(raw.physicalField);
+    const config = parseMaybeJson(raw.config);
+    const cfg = config && typeof config === 'object' && !Array.isArray(config) ? config : {};
+    return {
+        id: fieldId,
+        fieldId,
+        fieldName: text(raw.text ?? raw.fieldShowName ?? raw.title ?? raw.name ?? fieldId),
+        fieldType: text(raw.type ?? raw.fieldType ?? cfg.type),
+        fieldKey: text(raw.compType ?? raw.componentKey ?? cfg.componentKey),
+        multiSelect: Boolean(raw.multiSelect ?? cfg.multiSelect ?? cfg.isSingle === false),
+        subFormId: text(subFormId || raw.subTableId || cfg.subFormId),
+        dataKey: text(physical || cfg.dataKey),
+        columnName: text(physical || cfg.columnName),
+        config,
+        raw,
+    };
+}
+/**
+ * `ds/fields` 返回的 group 列表 → 主表字段 + 明细表分组。
+ *
+ * 明细表有两种形态：字段列表里带 `isDetailtable:true` 的占位（本环境），
+ * 或独立的表对象（部分数据源）；两种都收。
+ */
+export function normalizeDatasetFields(groups) {
+    const mainFields = [];
+    const detailFields = [];
+    const pushDetail = (tableId, name, fields) => {
+        const tableName = text(name);
+        detailFields.push({
+            id: text(tableId),
+            name: tableName,
+            subFormName: tableName,
+            fields: (fields || []).map((f) => {
+                const mapped = normalizeDatasetField(f, text(tableId));
+                if (tableName)
+                    mapped.subFormName = tableName;
+                return mapped;
+            }),
+        });
+    };
+    for (const group of groups || []) {
+        for (const field of (group?.fields || [])) {
+            if (field?.isDetailtable === true) {
+                pushDetail(field.id, field.name, field.fields || []);
+            }
+            else if (Array.isArray(field?.fields)
+                && (field?.isDetailtable === true || field?.mainTable === false || field?.text === undefined)) {
+                // 独立表对象形态：id/name + fields[]（没有字段显示名 text）
+                pushDetail(field.id, field.name, field.fields);
+            }
+            else {
+                mainFields.push(normalizeDatasetField(field));
+            }
+        }
+        // 部分环境直接以表对象分组返回（group 自身就是主表），避免漏掉
+        if (!Array.isArray(group?.fields) && Array.isArray(group?.children)) {
+            mainFields.push(...(group.children || []).map((f) => normalizeDatasetField(f)));
+        }
+    }
+    return { mainFields, detailFields };
+}
+function legacyResult(data) {
+    const mainFields = Array.isArray(data?.mainFields) ? data.mainFields : [];
+    const detailFields = Array.isArray(data?.detailFields) ? data.detailFields : [];
+    const subFields = detailFields.flatMap((d) => d?.fields || []);
+    return {
+        mainFields,
+        detailFields,
+        subFields,
+        data: { mainFields, detailFields },
+        source: 'legacy',
+    };
+}
+/**
+ * 读表单字段：优先数据源服务（主表 + 明细 + 系统字段），失败回退旧 `dataset/v1/getFields`。
+ *
+ * 明细字段结构对齐旧接口：`detailFields[].fields[]`，每条带 `fieldName`/`fieldId`/`subFormId`。
+ */
+export async function readFormFields(client, baseUrl, opts) {
+    try {
+        const form = new FormData();
+        const entries = {
+            groupId: opts.groupId || EBUILDER_DATASOURCE_GROUP,
+            sourceId: text(opts.objId),
+            sourceType: opts.sourceType || EBUILDER_SOURCE_TYPE,
+            detailFieldsGroup: 'true',
+            needChild: 'true',
+            enableMerge: 'false',
+            needTableName: 'true',
+            params: '[]',
+        };
+        if (opts.appId)
+            entries.appId = text(opts.appId);
+        for (const [k, v] of Object.entries(entries))
+            form.append(k, v);
+        const res = client.postMultipart
+            ? await client.postMultipart(`${baseUrl}/api/ebuilder/common/ds/fields`, form, opts.appId ? { ebbusinessid: opts.appId } : {})
+            : null;
+        if (res?.code === 200) {
+            const { mainFields, detailFields } = normalizeDatasetFields(Array.isArray(res.data) ? res.data : []);
+            if (mainFields.length || detailFields.length) {
+                return {
+                    mainFields,
+                    detailFields,
+                    subFields: detailFields.flatMap((d) => d.fields),
+                    data: { mainFields, detailFields },
+                    source: 'datasource',
+                };
+            }
+        }
+    }
+    catch {
+        // 落到旧接口兜底
+    }
+    try {
+        const legacy = await client.post(`${baseUrl}/api/ebuilder/form/dataset/v1/getFields`, {
+            objId: opts.objId,
+            userid: opts.userId,
+            tenantKey: opts.tenantKey,
+            isReturnDetail: 'y',
+        });
+        return legacyResult(legacy?.data || {});
+    }
+    catch {
+        return legacyResult({});
+    }
+}
+//# sourceMappingURL=form-field-dataset.js.map

package/dist/services/form-field-dataset.js.map

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

package/dist/services/form-field-drop.d.ts

@@ -0,0 +1,72 @@
+/**
+ * 从表单布局里摘掉指定字段的组件 —— 删字段前的必经一步。
+ *
+ * 平台不允许删「仍被布局引用」的字段，所以删字段要先把组件从布局摘掉再删。
+ * 这套逻辑 eb 表与流程表单共用（只是各自的端点模块不同）。
+ *
+ * ⚠️ **一个字段在布局里通常是两个组件**：字段本体 + 它的 InternalTitle 标签。
+ * 两者靠 `config.associatedId` 配对 —— 标签自己的 `fieldId` 是它的组件 id，
+ * 只有 `associatedId` 指向字段。所以必须**两个键都看**：
+ * 写成 `fieldId || associatedId` 会因为标签的 fieldId 有值而短路，漏掉标签、在布局里留下孤儿。
+ */
+/** 布局里的一个组件（宽松类型：平台回读结构很宽，只用到 config 上的几个键）。 */
+export interface LayoutComp {
+    config?: {
+        fieldId?: unknown;
+        associatedId?: unknown;
+        subFormId?: unknown;
+        /** EXCEL 布局的位置信息：`nodeId` 是本组件自己的节点 id，`parent` 指向所属容器/明细表的 nodeId。 */
+        excel?: {
+            nodeId?: unknown;
+            parent?: unknown;
+            [k: string]: unknown;
+        };
+        [k: string]: unknown;
+    };
+    fieldId?: unknown;
+    refBusinessId?: unknown;
+    children?: LayoutComp[];
+    [k: string]: unknown;
+}
+/** 一页布局。`comps` 是顶层组件，容器组件还有 `children`；`config.workbook` 是 EXCEL 版式数据。 */
+export interface LayoutPage {
+    comps?: LayoutComp[];
+    config?: {
+        workbook?: Record<string, any>;
+        [k: string]: unknown;
+    };
+    [k: string]: unknown;
+}
+/** 某个组件是否属于这些字段（本体或它的标题标签）。 */
+export declare function compBelongsToField(comp: LayoutComp | undefined, fieldIds: Set<string>): boolean;
+/**
+ * 就地摘除 `pageLayouts` 里属于 `fieldIds` 的组件（含容器 children）。
+ * 返回摘掉的组件数 —— 调用方据此判断「布局里到底有没有这些字段」，避免误存一个没变的布局。
+ */
+export declare function dropFieldComponents(pageLayouts: LayoutPage[], fieldIds: Iterable<string>): number;
+/**
+ * 就地摘除 `pageLayouts` 里属于某张**明细表**的组件 —— 删明细表前的必经一步。
+ *
+ * 与删字段同一个成因（平台不允许删「仍被布局引用」的明细表），但组件不是按字段配对的：
+ *
+ * - **本体**：`type === 'DetailTable'`，靠 `config.associatedId`（或 `refBusinessId`）指向 subFormId。
+ * - **子字段组件**：明细字段的组件**不是**挂在明细表的 `children` 里，而是与它平级躺在同一层
+ *   comps 中，靠 `config.excel.parent === 明细表组件的 config.excel.nodeId` 认亲。
+ *   每列还是「本体 + InternalTitle 标签」一对。
+ *
+ * 摘完之后**还要清 `config.workbook`**：明细表组件在里头占一张自己的 sheet（键就是组件 id），
+ * 表单那页 `Sheet1` 的 cells 里也有它的格子。服务端接受带着这些残留的保存（照存不误），
+ * 但会在设计器里留下幽灵 —— 所以要一并删掉。
+ *
+ * 返回摘掉的组件数；0 = 布局里没有这张明细表（调用方据此决定要不要继续）。
+ */
+export declare function dropDetailTableComponents(pageLayouts: LayoutPage[], subFormId: string): number;
+/**
+ * 清掉布局上会导致保存失败的派生键，并补 `formId`。
+ *
+ * `pageLayoutEncodes` / `formStyleEncodes` 是回读带出来的编码串，原样回写会被服务端拒。
+ * 注意：这是「裸 pageLayouts」保存路径的约束；布局源码写入走 pageLayoutEncodes，
+ * 见 services/form-code.ts 的 buildLayoutSaveRequest。
+ */
+export declare function prepareLayoutForSave<T extends Record<string, any>>(formLayout: T, formId: string): T;
+//# sourceMappingURL=form-field-drop.d.ts.map

package/dist/services/form-field-drop.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"form-field-drop.d.ts","sourceRoot":"","sources":["../../src/services/form-field-drop.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,gDAAgD;AAChD,MAAM,WAAW,UAAU;IACzB,MAAM,CAAC,EAAE;QACP,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,YAAY,CAAC,EAAE,OAAO,CAAC;QACvB,SAAS,CAAC,EAAE,OAAO,CAAC;QACpB,uEAAuE;QACvE,KAAK,CAAC,EAAE;YAAE,MAAM,CAAC,EAAE,OAAO,CAAC;YAAC,MAAM,CAAC,EAAE,OAAO,CAAC;YAAC,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;SAAE,CAAC;QACrE,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;KACtB,CAAC;IACF,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,EAAE,UAAU,EAAE,CAAC;IACxB,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;CACtB;AAED,2EAA2E;AAC3E,MAAM,WAAW,UAAU;IACzB,KAAK,CAAC,EAAE,UAAU,EAAE,CAAC;IACrB,MAAM,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAAC,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;IAClE,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;CACtB;AAED,+BAA+B;AAC/B,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,UAAU,GAAG,SAAS,EAAE,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,OAAO,CAK/F;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,UAAU,EAAE,EAAE,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,GAAG,MAAM,CAqBjG;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,yBAAyB,CAAC,WAAW,EAAE,UAAU,EAAE,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CA6C9F;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,GAAG,CAAC,CAMpG"}

package/dist/services/form-field-drop.js

@@ -124,3 +124,4 @@ export function prepareLayoutForSave(formLayout, formId) {
         out.formId = formId;
     return out;
 }
+//# sourceMappingURL=form-field-drop.js.map

package/dist/services/form-field-drop.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"form-field-drop.js","sourceRoot":"","sources":["../../src/services/form-field-drop.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAyBH,+BAA+B;AAC/B,MAAM,UAAU,kBAAkB,CAAC,IAA4B,EAAE,QAAqB;IACpF,MAAM,GAAG,GAAG,IAAI,EAAE,MAAM,IAAI,EAAE,CAAC;IAC/B,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,OAAO,IAAI,IAAI,EAAE,OAAO,IAAI,EAAE,CAAC,CAAC;IACvD,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC;IAC7C,OAAO,CAAC,GAAG,KAAK,EAAE,IAAI,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,KAAK,EAAE,IAAI,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;AACpF,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,mBAAmB,CAAC,WAAyB,EAAE,QAA0B;IACvF,MAAM,MAAM,GAAG,IAAI,GAAG,EAAU,CAAC;IACjC,KAAK,MAAM,EAAE,IAAI,QAAQ;QAAE,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;IAClD,IAAI,OAAO,GAAG,CAAC,CAAC;IAEhB,MAAM,IAAI,GAAG,CAAC,KAAmB,EAAgB,EAAE,CACjD,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;QACjB,IAAI,kBAAkB,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,CAAC;YAClC,OAAO,EAAE,CAAC;YACV,OAAO,KAAK,CAAC;QACf,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;IAEL,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE,CAAC;QAC/B,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC;YAAE,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC9D,KAAK,MAAM,IAAI,IAAI,IAAI,EAAE,KAAK,IAAI,EAAE,EAAE,CAAC;YACrC,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC;gBAAE,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACzE,CAAC;IACH,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;;;;;;;;;;;;;;GAeG;AACH,MAAM,UAAU,yBAAyB,CAAC,WAAyB,EAAE,SAAiB;IACpF,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;IACjC,IAAI,OAAO,GAAG,CAAC,CAAC;IAEhB,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE,CAAC;QAC/B,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC;YAAE,SAAS;QAE1C,MAAM,MAAM,GAAG,CAAC,IAAgB,EAAW,EAAE,CAC3C,MAAM,CAAC,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC,KAAK,aAAa;YAC1C,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,IAAI,EAAE,CAAC,KAAK,MAAM;gBAClD,MAAM,CAAC,IAAI,EAAE,aAAa,IAAI,EAAE,CAAC,KAAK,MAAM;gBAC5C,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,IAAI,EAAE,CAAC,KAAK,MAAM,CAAC,CAAC;QAEtD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACzC,IAAI,CAAC,MAAM,CAAC,MAAM;YAAE,SAAS;QAE7B,oDAAoD;QACpD,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,IAAI,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;QACjG,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAClD,MAAM,CAAC,MAAM,CAAC,CAAE,CAAC,EAAE,MAAM,EAAE,IAAY,EAAE,WAAW,IAAI,EAAE,CAA4B,CAAC;aACpF,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QACzD,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;YACnC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;gBAAC,OAAO,EAAE,CAAC;gBAAC,OAAO,KAAK,CAAC;YAAC,CAAC;YAC3C,IAAI,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC;gBAAC,OAAO,EAAE,CAAC;gBAAC,OAAO,KAAK,CAAC;YAAC,CAAC;YACnF,IAAI,MAAM,CAAC,CAAC,EAAE,IAAI,IAAI,EAAE,CAAC,KAAK,mBAAmB;gBAC7C,cAAc,CAAC,GAAG,CAAC,MAAM,CAAE,CAAC,EAAE,MAAM,EAAE,IAAY,EAAE,MAAM,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC;gBAAC,OAAO,EAAE,CAAC;gBAAC,OAAO,KAAK,CAAC;YAAC,CAAC;YACpG,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;QAEH,2DAA2D;QAC3D,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,EAAE,QAA2C,CAAC;QAC1E,IAAI,CAAC,QAAQ;YAAE,SAAS;QACxB,KAAK,MAAM,IAAI,IAAI,MAAM,EAAE,CAAC;YAC1B,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;YACrC,IAAI,CAAC,MAAM;gBAAE,SAAS;YACtB,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAC;YACxB,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC5C,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC;oBAAE,SAAS;gBAC3C,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,CAC9B,CAAC,IAAS,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,IAAI,EAAE,CAAC,KAAK,MAAM,CACrE,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,oBAAoB,CAAgC,UAAa,EAAE,MAAc;IAC/F,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC;IACnD,OAAO,GAAG,CAAC,iBAAiB,CAAC;IAC7B,OAAO,GAAG,CAAC,gBAAgB,CAAC;IAC5B,IAAI,CAAC,GAAG,CAAC,MAAM;QAAE,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC;IACrC,OAAO,GAAG,CAAC;AACb,CAAC"}

package/dist/services/form-field-patch.d.ts

@@ -0,0 +1,71 @@
+/**
+ * 字段级属性补丁：编辑/新增字段时把命令行选项落到 jsonObj 上。
+ *
+ * 抽成独立模块的原因：这几条规则**都不只是「赋个值」**——哪些类型适用、取值边界、
+ * 一次改几个键，都是平台侧定死的。散在 add-field / edit-field 两处早晚会走样
+ * （历史上 `add-field` 与 `edit-field` 改类型是否补附加配置就不一致过）。
+ *
+ * 所有写入都走 `saveFormFieldNew`，而它是**全量覆盖**：调用方必须已经拿完整基底，
+ * 本模块只负责按选项打补丁，不负责读回。
+ */
+/**
+ * **字段定义里没有 `maxLen` 这个属性**的类型。
+ *
+ * 这份名单不是猜的，来源是本仓 `add-field` 各类型分支里显式 `delete jsonObj.maxLen` 的那几处
+ * （IDCard / Date / DateTime / City / EInvoice / 下拉多选）—— 那是按平台实际结构定下来的。
+ * 对它们设长度会被平台丢弃或写进脏属性，所以直接拒。
+ */
+export declare const NO_MAX_LEN_TYPES: readonly ["IDCard", "Date", "DateTime", "Time", "City", "EInvoice", "SelectMultiple"];
+/** 支持「默认值」的类型（文本类写 content，数字类同键）。 */
+export declare const DEFAULT_VALUE_TYPES: readonly ["Text", "TextArea", "Number", "Money"];
+/**
+ * CLI 类型名 → **平台归一后的字段形状**（`type` / `componentKey` / 默认 `format`）。
+ *
+ * 为什么必须归一：`saveFormFieldNew` 要求 `componentKey` 非空，而平台接受的
+ * `componentKey` **不是 CLI 类型名**。同一个「日期时间」字段，平台存的是
+ * `type=Date` + `componentKey=DateComponent` + `format=yyyy-MM-dd HH:mm`；
+ * 送 `componentKey=Date`（哪怕 `type=DateTime`）直接 500 程序异常。
+ *
+ * 这张表不是推的，是拿真实租户读回来的 —— 建表路径建出来的字段，平台实际存什么就写什么。
+ * 只列**与类型名不同**的那几个，其余原样直通。
+ */
+export declare const PLATFORM_FIELD_SHAPES: Record<string, {
+    type: string;
+    componentKey: string;
+    format?: string;
+}>;
+/** 取某 CLI 类型对应要发送的平台形状；未登记的类型原样直通（`type`/`componentKey` 同为类型名）。 */
+export declare function platformFieldShape(cliType: string): {
+    type: string;
+    componentKey: string;
+    format?: string;
+};
+export interface FieldPatchOpts {
+    /** 文本最大长度（字符串形式，来自命令行）。 */
+    maxLen?: string;
+    /** 默认值。 */
+    defaultValue?: string;
+    /** 清空默认值。 */
+    clearDefault?: boolean;
+    /** 字段编码 dataKey。未同时给 `columnName` 时列名跟随（历史行为）。 */
+    dataKey?: string;
+    /** 数据库列名 columnName。**与 dataKey 是两个东西**，可分别指定。 */
+    columnName?: string;
+    /** 字段描述。 */
+    desc?: string;
+}
+export interface PatchOutcome {
+    /** 实际改动的键，供调用方打印。 */
+    applied: string[];
+    warnings: string[];
+    errors: string[];
+}
+/**
+ * 平台接口本身比设计器更宽容：`maxLen` 到 10000 都照收（65535 会被拒，
+ * 但报的是「表单字段已超限制，不能继续新增字段」——指的是加字段数，与长度无关）。
+ * 设计器的输入框上限定在 999，超过 999 命令行能写进去、设计器里编辑却不方便，
+ * 所以**只告警不拦**：不把「编辑器不便」伪造成「平台不允许」。
+ */
+export declare const MAX_LEN_UI_HINT = 999;
+export declare function applyFieldPatches(jsonObj: Record<string, any>, opts: FieldPatchOpts): PatchOutcome;
+//# sourceMappingURL=form-field-patch.d.ts.map

package/dist/services/form-field-patch.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"form-field-patch.d.ts","sourceRoot":"","sources":["../../src/services/form-field-patch.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH;;;;;;GAMG;AACH,eAAO,MAAM,gBAAgB,uFAEnB,CAAC;AAEX,sCAAsC;AACtC,eAAO,MAAM,mBAAmB,kDAAmD,CAAC;AAEpF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,qBAAqB,EAAE,MAAM,CAAC,MAAM,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,CAczG,CAAC;AAEF,mEAAmE;AACnE,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,CAE3G;AAED,MAAM,WAAW,cAAc;IAC7B,2BAA2B;IAC3B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW;IACX,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa;IACb,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,kDAAkD;IAClD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,kDAAkD;IAClD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,YAAY;IAC3B,qBAAqB;IACrB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAED;;;;;GAKG;AACH,eAAO,MAAM,eAAe,MAAM,CAAC;AAEnC,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,cAAc,GACjD,YAAY,CAsEd"}

package/dist/services/form-field-patch.js

@@ -128,3 +128,4 @@ export function applyFieldPatches(jsonObj, opts) {
     }
     return { applied, warnings, errors };
 }
+//# sourceMappingURL=form-field-patch.js.map

package/dist/services/form-field-patch.js.map

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

package/dist/services/form-field-template.d.ts

@@ -0,0 +1,76 @@
+/**
+ * **按字段取组件模板** —— 布局增量插入在「本表还没有这个类型」时的模板来源。
+ *
+ * ## 这条路解决的是什么
+ *
+ * `form-layout-insert` 的增量插入是**照现成的同类型 comp 克隆**的（布局层专有键 + 各类型
+ * 自己的键集，按类型名拼只能猜）。于是一张表里**第一次**加某个类型时会中止：
+ * 「本表还没有『Switch』类型的字段，没有可参照的组件模板」。
+ *
+ * 平台其实有现成的模板，只是不在布局里 —— 在 `getFormFieldExist` 的返回里。
+ *
+ * ## `getFormFieldExist` 给什么
+ *
+ * `POST /api/ebuilder/form/form/builder/getFormFieldExist`（body 里的 `formField.title` 传空串即
+ * 「本表单全部字段」）按分类返回字段的**面板形态**：
+ *
+ * ```
+ * { id: <fieldId>, name, higherLevelId, leftSideType: 'used', applyStyle, category, icon,
+ *   configPC: '[{ styleCategoryCompKey, package, prop, applyStyle, styleCategoryPackage,
+ *                type, config: { …该字段的完整配置… } }]' }
+ * ```
+ *
+ * `configPC[0]` 就是**平台按该字段定义生成的组件模板**：顶层键（按类型的样式键）与 config
+ * （含类型专有键）都给全了。拿一根 Switch 实测对照平台自己 `initLayout` 产出的 comp：
+ *
+ * | 键 | 平台 comp | 字段记录 | **configPC** |
+ * |---|---|---|---|
+ * | `switchType` | `"switch"` | `"switch"` | `"switch"` |
+ * | `childName` / `parentName` | `""` | **无** | `""` |
+ * | `hasChild` | `false` | **无** | `false` |
+ * | `options` | `[]` | **无** | `[]` |
+ * | `typeLen` | `1` | **无** | `1` |
+ *
+ * ⚠ **字段记录（`getFormFieldPage`）不够** —— 它缺 `childName`/`parentName`/`hasChild`/`options`/
+ * `typeLen` 这类**只存在于组件侧的默认值**。所以模板必须从这个接口拿，不能靠字段记录拼。
+ *
+ * ## 覆盖范围（2026-10-26 更正）
+ *
+ * - ✅ **主表字段**：新建的字段立刻就在返回里（`leftSideType: 'used'`），**本表从没有过的类型也有**。
+ * - ✅ **明细表字段**：分类「明细表」里 **`childs[]`**（每张子表一项，`id`=subFormId）→ `comps[]`，
+ *   第一条是 DetailTable 本身，其后是明细字段（`id`=fieldId），每条都带 `configPC`。
+ *   EXCEL 布局下明细字段则挂在顶层 `comps[].children`。设计器前端就是这么取的
+ *   （`UsedComponents`：FLOW 走 `childs[].comps`、EXCEL 走 `comps[].children`）。
+ *   曾经「明细字段拿不到」的结论是只解析了顶层 `comps` 得出的误判。
+ *
+ * `configPC` 仍是「按类型」的（`config.flow` 是空对象），作用域由调用方自己写；
+ * 主表同类型模板的借用逻辑保留，作为字段尚未出现在返回里时的兜底。
+ */
+/** `getFormFieldExist` 的返回里，一个字段对应的一条。 */
+export interface FieldTemplateEntry {
+    fieldId: string;
+    /** 组件模板的顶层键 + `config`（`configPC[0]`）。 */
+    comp: Record<string, any>;
+    /** 组件类型（`comp.type`）。 */
+    type: string;
+}
+/**
+ * 取本表单字段的组件模板，按 `fieldId` 索引。
+ *
+ * 主表字段在顶层 `comps[]`；明细字段 FLOW 在 `childs[].comps[]`、EXCEL 在 `comps[].children`，
+ * 三处都收（同一字段可能只在其中一处）。`DetailTable` 自身的那条跳过 —— 这张表是给字段用的。
+ */
+export declare function fetchFieldTypeTemplates(client: {
+    post: (url: string, body?: any, headers?: any) => Promise<any>;
+}, baseUrl: string, appId: string, formId: string): Promise<Map<string, FieldTemplateEntry>>;
+/** `configPC` 是**JSON 字符串**（设计器那边存的形态），解析失败当没有。 */
+export declare function parseConfigPC(raw: unknown): any[];
+/**
+ * 在模板表里找一个**指定类型**的模板（`fieldId` 命中不了时用）。
+ *
+ * 一般按 fieldId 就能命中（明细字段也有自己的条目）；这里保留按类型的兜底，
+ * 用于字段尚未出现在返回里的场景。`want` 是 `componentKey`（如 `Switch` /
+ * `NumberComponent`），对不上 `type` 时再比一次 `comp.config.componentKey`。
+ */
+export declare function findTemplateByType(templates: Map<string, FieldTemplateEntry>, want: string): FieldTemplateEntry | null;
+//# sourceMappingURL=form-field-template.d.ts.map

package/dist/services/form-field-template.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"form-field-template.d.ts","sourceRoot":"","sources":["../../src/services/form-field-template.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+CG;AAEH,0CAA0C;AAC1C,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,MAAM,CAAC;IAChB,0CAA0C;IAC1C,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,yBAAyB;IACzB,IAAI,EAAE,MAAM,CAAC;CACd;AAID;;;;;GAKG;AACH,wBAAsB,uBAAuB,CAC3C,MAAM,EAAE;IAAE,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;CAAE,EAC1E,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC,CAgC1C;AAED,mDAAmD;AACnD,wBAAgB,aAAa,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG,EAAE,CASjD;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,EAC1C,IAAI,EAAE,MAAM,GACX,kBAAkB,GAAG,IAAI,CAO3B"}

package/dist/services/form-field-template.js

@@ -115,3 +115,4 @@ export function findTemplateByType(templates, want) {
     }
     return null;
 }
+//# sourceMappingURL=form-field-template.js.map

package/dist/services/form-field-template.js.map

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

package/dist/services/form-field-validate.d.ts

@@ -0,0 +1,26 @@
+export declare function canonComponentKey(ck: string): string;
+/** 可用的字段类型 = 基础组件（CK_CANON 的值）∪ 富组件（RICH_TYPE_MAP 的键）∪ 上述补充。
+ * 导出仅为让测试能盯住"平台支持的合法类型不许漏登记"（漏了会被 assertFieldType 误杀）。 */
+export declare const FIELD_TYPE_CHOICES: string[];
+/**
+ * 校验字段类型名。不校验的话错类型会**直送服务器**，换回一段
+ * `Cannot invoke "ComponentType.name()" because ... getComponentKey() is null`——
+ * 既看不出哪错了，也看不出该填什么。这里先拦下来并列出可选值。
+ */
+export declare function assertFieldType(fieldType: string, where?: string): void;
+/**
+ * 校验选项定义。**键名必须是 `name` / `valueKey`**——写成 `{value,label}` 这类
+ * 不会被拦下，而是静默存成「没有名字的选项」（平台侧 fieldOptionName 为空），
+ * 之后 `form data add` 按选项名写数据会直接失效，且读回也看不出哪里错了。
+ */
+export declare function assertFieldOptions(fieldName: string, options: any[]): void;
+/**
+ * 把用户写的字段定义归一成平台认的形状：
+ * - `fieldType` → `componentKey`（两个名字都收）
+ * - componentKey 大小写归一
+ * - `options`（字符串数组简写）→ `fieldOptions: [{name}]`
+ *
+ * 顶层字段与明细子字段共用本函数，避免两边校验不一致。
+ */
+export declare function normalizeFieldDef(raw: any): any;
+//# sourceMappingURL=form-field-validate.d.ts.map

package/dist/services/form-field-validate.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"form-field-validate.d.ts","sourceRoot":"","sources":["../../src/services/form-field-validate.ts"],"names":[],"mappings":"AA2BA,wBAAgB,iBAAiB,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAEpD;AAmBD;0DAC0D;AAC1D,eAAO,MAAM,kBAAkB,EAAE,MAAM,EAI7B,CAAC;AAEX;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,SAAK,GAAG,IAAI,CAKnE;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,IAAI,CAgB1E;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,CAsB/C"}

package/dist/services/form-field-validate.js

@@ -118,3 +118,4 @@ export function normalizeFieldDef(raw) {
     }
     return out;
 }
+//# sourceMappingURL=form-field-validate.js.map

package/dist/services/form-field-validate.js.map

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