weaver-e10-builder 1.5.15 → 1.5.16

package/dist/services/form-layout-insert.js

@@ -23,7 +23,15 @@ import { appendCellsForNewComps } from './form-layout-grid.js';
  * `isSingle`/`viewDataDetail`，Number 有 `pointSize`/`isDelimiter`/`capitalFormat`…
  * 按类型名拼一个出来，等于把这些键逐个猜一遍，猜错不报错、只是渲染异常。
  * 所以这里**只抄同表同 `componentKey` 的现成 comp**（顶层键 + 布局层键整套照抄），
- * 再覆盖字段定义那一部分。表里没有同类型的 → **明确报错**，不硬凑。
+ * 再覆盖字段定义那一部分。表里没有同类型的 → 用平台按该字段生成的模板合成
+ * （主表在 `comps[]`、明细在 `childs[].comps` / `comps[].children`，见 `form-field-template`）；
+ * 连模板都拿不到才明确报错，不硬凑。
+ *
+ * ## FLOW 明细字段要包一层容器
+ *
+ * 明细表里**一个字段一个 `InternalContainer`**，`DetailTable.flow.linkedNodes` 逐个登记。
+ * 新字段直接挂到第一个容器会与已有字段共容器（列宽/渲染错位），所以 FLOW 明细走
+ * `buildFlowDetailContainer` 新建容器；EXCEL 明细没有容器，仍是顶层 comp + 网格格。
  *
  * ## EXCEL 还要补网格（`form-layout-grid`）
  *
@@ -106,6 +114,60 @@ function detailScopeNodeId(comps, subFormId) {
         && (c.config?.flow?.isCanvas === true || c.type === 'InternalContainer'));
     return String(canvas?.config?.flow?.nodeId ?? flowNodeId) || null;
 }
+/** FLOW 明细字段的包裹容器 type。 */
+const CONTAINER_TYPE = 'InternalContainer';
+/**
+ * 为 FLOW 明细字段造一个**独立的 `InternalContainer`**（设计器 `completeSubConfigData` 的结构）：
+ * 容器 `flow = { parent: 明细表 nodeId, nodes: [字段 nodeId], isCanvas: true, linkedNodes: {} }`，
+ * 字段 `flow.parent = 容器 nodeId`。
+ *
+ * 为什么必须包一层：平台里**一个明细字段一个容器**，明细表的 `flow.linkedNodes` 逐个登记容器。
+ * 直接把字段挂到第一个容器上会让两个字段共容器（设计器渲染和列宽都会错位）。
+ *
+ * `ids` 仅供单测注入；正常路径自动生成。
+ */
+export function buildFlowDetailContainer(comps, subFormId, fieldComp, ids = {}) {
+    const dt = comps.find((c) => c?.type === DETAIL_TYPE
+        && String(c?.config?.associatedId ?? c?.config?.subFormId ?? '') === String(subFormId));
+    const dtFlow = dt?.config?.flow;
+    const fieldNodeId = String(fieldComp?.config?.flow?.nodeId ?? '');
+    if (!dtFlow?.nodeId || !fieldNodeId)
+        return null;
+    const parentNodeId = String(dtFlow.nodeId);
+    // 抄同作用域的现成容器（类型专有/样式/结构键都在它身上）；没有就造最小骨架。
+    const tpl = comps.find((c) => c?.type === CONTAINER_TYPE && String(c?.config?.flow?.parent ?? '') === parentNodeId);
+    const nodeId = ids.nodeId || genFlowNodeId();
+    const container = tpl
+        ? JSON.parse(JSON.stringify(tpl))
+        : {
+            id: '', type: CONTAINER_TYPE,
+            config: {
+                componentKey: 'Container', name: '列', title: '容器',
+                layout: { canDel: true, hidden: false, selected: false },
+            },
+        };
+    container.id = ids.compId || hexId(16);
+    container.config = {
+        ...(container.config || {}),
+        flow: {
+            ...(tpl?.config?.flow || {}),
+            parent: parentNodeId,
+            nodes: [fieldNodeId],
+            linkedNodes: {},
+            isCanvas: true,
+            nodeId,
+        },
+    };
+    // 容器不是字段，别把模板容器上可能残留的字段身份键带过去
+    for (const k of ['fieldId', 'associatedId', 'subFormId', 'titleLabelId', 'labelObj'])
+        delete container.config[k];
+    fieldComp.config = { ...(fieldComp.config || {}) };
+    fieldComp.config.flow = { ...(fieldComp.config?.flow || {}), parent: nodeId, isCanvas: false };
+    const linked = dtFlow.linkedNodes && typeof dtFlow.linkedNodes === 'object' ? dtFlow.linkedNodes : {};
+    const numeric = Object.keys(linked).map(Number).filter((n) => Number.isInteger(n) && n >= 0);
+    const linkedKey = String(numeric.length ? Math.max(...numeric) + 1 : 0);
+    return { container, linkedKey, nodeId };
+}
 /**
  * 把新字段的 comp 对构造出来（纯函数，不碰网络）。
  *
@@ -398,14 +460,32 @@ export async function insertFieldIntoLayout(client, baseUrl, formId, input) {
                     comp.config[k] = v;
             }
         }
-        // FLOW 明细字段挂在明细容器内的画布下：除了写 parent，还要把新 nodeId 登记进画布的
-        // `nodes` 列表，否则设计器按 nodes 遍历时看不到这个字段。
-        const flowCanvasNodeId = input.subFormId
-            ? detailScopeNodeId(pageLayouts[0].comps || [], input.subFormId)
+        // FLOW 明细字段要**独占一个 InternalContainer**：容器挂到明细表、字段挂到容器、
+        // 再把容器登记进 DetailTable.flow.linkedNodes（设计器就是这么构造的）。
+        const comps = pageLayouts[0].comps || [];
+        const flowDetail = Boolean(input.subFormId) && !built.value.config?.excel;
+        const detailContainer = flowDetail
+            ? buildFlowDetailContainer(comps, String(input.subFormId), built.value)
             : null;
-        pageLayouts[0].comps.push(...toPush);
-        if (flowCanvasNodeId) {
-            const canvas = pageLayouts[0].comps.find((c) => String(c?.config?.flow?.nodeId || '') === flowCanvasNodeId);
+        // 兜底（构造失败）：老路径把 nodeId 登记进第一个画布，至少设计器能看到字段。
+        const flowCanvasNodeId = input.subFormId && !detailContainer
+            ? detailScopeNodeId(comps, input.subFormId)
+            : null;
+        if (detailContainer)
+            comps.push(detailContainer.container);
+        comps.push(...toPush);
+        if (detailContainer) {
+            const dt = comps.find((c) => c?.type === DETAIL_TYPE
+                && String(c?.config?.associatedId ?? c?.config?.subFormId ?? '') === String(input.subFormId));
+            if (dt?.config?.flow) {
+                const linked = dt.config.flow.linkedNodes && typeof dt.config.flow.linkedNodes === 'object'
+                    ? dt.config.flow.linkedNodes : {};
+                linked[detailContainer.linkedKey] = detailContainer.nodeId;
+                dt.config.flow.linkedNodes = linked;
+            }
+        }
+        else if (flowCanvasNodeId) {
+            const canvas = comps.find((c) => String(c?.config?.flow?.nodeId || '') === flowCanvasNodeId);
             const nodes = canvas?.config?.flow?.nodes;
             if (canvas && Array.isArray(nodes)) {
                 for (const comp of toPush) {

package/dist/services/form-layout-insert.js.map

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

package/dist/services/form-list-search-custom.d.ts

@@ -0,0 +1,25 @@
+export interface CustomSearchOption {
+    name: string;
+    id?: string;
+    default?: boolean;
+    /** 完整条件树，或已保存条目的原始 conditionData。 */
+    conditionData?: Record<string, unknown> | string;
+    /** 与 form list-filter 相同的条件数组。 */
+    conditions?: Array<Record<string, unknown>>;
+    relation?: 'and' | 'or';
+    /** 系统选项的真实 sysOptionKey，例如 myFollow。 */
+    systemOption?: string;
+}
+export interface CustomSearchConfig {
+    name: string;
+    id?: string;
+    required?: boolean;
+    selection?: 'single' | 'multiple';
+    position?: '0' | '1';
+    showArchiveOption?: boolean;
+    options: CustomSearchOption[];
+}
+export declare function readCustomSearchConfig(input: string): CustomSearchConfig;
+export declare function customSearchIdsNeeded(config: CustomSearchConfig, existing?: any): number;
+export declare function buildCustomSearchEntry(config: CustomSearchConfig, kind: 'common' | 'group', ids: string[], existing?: any): any;
+//# sourceMappingURL=form-list-search-custom.d.ts.map

package/dist/services/form-list-search-custom.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"form-list-search-custom.d.ts","sourceRoot":"","sources":["../../src/services/form-list-search-custom.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,qCAAqC;IACrC,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC;IACjD,kCAAkC;IAClC,UAAU,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAC5C,QAAQ,CAAC,EAAE,KAAK,GAAG,IAAI,CAAC;IACxB,wCAAwC;IACxC,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,QAAQ,GAAG,UAAU,CAAC;IAClC,QAAQ,CAAC,EAAE,GAAG,GAAG,GAAG,CAAC;IACrB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,OAAO,EAAE,kBAAkB,EAAE,CAAC;CAC/B;AAED,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,MAAM,GAAG,kBAAkB,CAoBxE;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,kBAAkB,EAAE,QAAQ,CAAC,EAAE,GAAG,GAAG,MAAM,CAIxF;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,kBAAkB,EAC1B,IAAI,EAAE,QAAQ,GAAG,OAAO,EACxB,GAAG,EAAE,MAAM,EAAE,EACb,QAAQ,CAAC,EAAE,GAAG,GACb,GAAG,CAyDL"}

package/dist/services/form-list-search-custom.js

@@ -0,0 +1,98 @@
+import { readFileSync } from 'node:fs';
+export function readCustomSearchConfig(input) {
+    const raw = input.startsWith('@') ? readFileSync(input.slice(1), 'utf8') : input;
+    const config = JSON.parse(raw);
+    if (!config || typeof config !== 'object' || !String(config.name || '').trim())
+        throw new Error('自定义分类需要 name');
+    if (!Array.isArray(config.options) || !config.options.length)
+        throw new Error('自定义分类至少需要一项 options');
+    if (config.selection && !['single', 'multiple'].includes(config.selection))
+        throw new Error('selection 只能是 single 或 multiple');
+    if (config.position && !['0', '1'].includes(config.position))
+        throw new Error('position 只能是 0 或 1');
+    const names = new Set();
+    for (const option of config.options) {
+        if (!String(option.name || '').trim())
+            throw new Error('自定义选项缺少 name');
+        if (names.has(option.name))
+            throw new Error(`自定义选项名称重复：${option.name}`);
+        names.add(option.name);
+        if (option.systemOption && (option.conditionData || option.conditions))
+            throw new Error(`选项「${option.name}」不能同时设置 systemOption 和条件`);
+        if (option.conditionData && option.conditions)
+            throw new Error(`选项「${option.name}」不能同时设置 conditionData 和 conditions`);
+        if (option.systemOption && option.systemOption !== 'myFollow')
+            throw new Error(`未验证的系统选项：${option.systemOption}；当前只支持 myFollow`);
+    }
+    if (config.selection === 'single' && config.options.filter((option) => option.default).length > 1) {
+        throw new Error('单选分类最多只能有一个默认选项');
+    }
+    return config;
+}
+export function customSearchIdsNeeded(config, existing) {
+    const oldSets = existing?.listFilterDefaultSets?.listGroupSets || [];
+    return (config.id || existing?.id ? 0 : 1)
+        + config.options.filter((option) => !option.id && !oldSets.some((item) => item.setName === option.name && item.id)).length;
+}
+export function buildCustomSearchEntry(config, kind, ids, existing) {
+    const supply = [...ids];
+    const id = String(config.id || existing?.id || supply.shift() || '');
+    if (!/^\d+$/.test(id))
+        throw new Error('自定义分类需要平台生成的数字 ID');
+    const fieldId = `GroupCustom_${id}`;
+    const oldSets = existing?.listFilterDefaultSets?.listGroupSets || [];
+    const sets = config.options.map((option, index) => {
+        const prior = oldSets.find((item) => String(item.setName) === option.name);
+        const optionId = String(option.id || prior?.id || supply.shift() || '');
+        if (!/^\d+$/.test(optionId))
+            throw new Error(`选项「${option.name}」需要平台生成的数字 ID`);
+        const conditionData = option.systemOption
+            ? JSON.stringify({ type: 'pluginAdvice', customParams: { sysOptionKey: option.systemOption } })
+            : option.conditionData === undefined ? prior?.conditionData
+                : typeof option.conditionData === 'string' ? option.conditionData : JSON.stringify(option.conditionData);
+        if (kind === 'common' && !conditionData)
+            throw new Error(`常用搜索选项「${option.name}」缺少 conditionData 或 systemOption`);
+        return {
+            id: optionId,
+            showOrder: index,
+            setName: option.name,
+            ...(kind === 'common' ? { isChecked: option.default === undefined ? prior?.isChecked === true : option.default === true } : {}),
+            ...(conditionData ? { conditionData } : {}),
+            ...(option.systemOption ? { opType: 'SYSTEM' } : {}),
+        };
+    });
+    const archive = config.showArchiveOption === undefined
+        ? existing?.listFilterDefaultSets?.showArchiveOption ?? '1'
+        : config.showArchiveOption ? '1' : '0';
+    const multiSelect = config.selection === undefined
+        ? existing?.listFilterDefaultSets?.multiSelect ?? false
+        : config.selection === 'multiple';
+    if (kind === 'common') {
+        return {
+            ...(existing || {}), id, fieldId, fieldName: fieldId, componentKey: 'GroupCustom',
+            conditionType: [], config: {}, fieldShowName: config.name,
+            isQuick: config.position ?? existing?.isQuick ?? '0', showName: config.name, options: [],
+            listFilterDefaultSets: {
+                ...(existing?.listFilterDefaultSets || {}), listGroupSets: sets, listFilterSets: [],
+                multiSelect, startValue: '', startValueSpan: '', startDefaultLabel: '', endValue: '',
+                showArchiveOption: archive, searchContentFullMatches: false,
+            },
+            filterId: existing?.filterId || id, required: config.required === undefined ? existing?.required ?? 0 : config.required ? 1 : 0,
+        };
+    }
+    return {
+        ...(existing || {}), id, fieldId, name: fieldId, fieldName: fieldId,
+        componentKey: 'GroupCustom', showName: config.name, config: {},
+        showPosition: config.position ?? existing?.showPosition ?? '0', tabStyle: 'select',
+        listFilterDefaultSets: {
+            ...(existing?.listFilterDefaultSets || {}), listGroupSets: sets,
+            multiSelect: config.selection === undefined ? existing?.listFilterDefaultSets?.multiSelect ?? true : multiSelect,
+            enableFilter: existing?.listFilterDefaultSets?.enableFilter ?? 0,
+            enableShowCountNum: existing?.listFilterDefaultSets?.enableShowCountNum ?? 0,
+            showCountNumType: existing?.listFilterDefaultSets?.showCountNumType ?? 'notUpdate',
+            enableShowCountNumLimit: existing?.listFilterDefaultSets?.enableShowCountNumLimit ?? 0,
+            showArchiveOption: archive,
+        },
+    };
+}
+//# sourceMappingURL=form-list-search-custom.js.map

package/dist/services/form-list-search-custom.js.map

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

package/dist/services/form-list-search-group.d.ts

@@ -22,7 +22,7 @@ export declare const OPTION_COMPS: readonly ["Select", "RadioBox", "CheckBox"];
 export declare const BROWSER_COMPS: readonly ["Ebuilder", "EBuilder", "Browser", "Employee", "Department"];
 /** 日期类：分类项 = 时间粒度。 */
 export declare const DATE_COMPS: readonly ["DateComponent", "Date", "DateTime"];
-export type GroupFilterKind = 'option' | 'browser' | 'date' | 'system';
+export type GroupFilterKind = 'option' | 'browser' | 'date' | 'system' | 'custom';
 export declare const KIND_LABEL: Record<GroupFilterKind, string>;
 /** 日期可选的四种粒度，顺序即页面上的顺序。 */
 export declare const DATE_GRANULARITIES: readonly [{
@@ -42,7 +42,16 @@ export declare const DATE_GRANULARITIES: readonly [{
 export declare function isSystemColumn(col: any): boolean;
 /** 按 `compType` 判四档之一；认不出就报错（宁可早报，也不发一个错的 `dataType` 出去）。 */
 export declare function resolveGroupFilterKind(col: any): GroupFilterKind;
+/**
+ * `--position` → 条目 `showPosition`。
+ *
+ * 平台枚举（FieldSearch 前端）：`Top="0"`、`Left="1"` / `DropDown="1"`。
+ * 分类搜索新建条目默认就是 **0（顶部）**；1 表示左侧/下拉样式。
+ * 名称与数字都收，免得用户还要记码值。
+ */
 export declare function parseShowPosition(input: string | undefined): string;
+/** `--display` → 条目 `tabStyle`：平台枚举 `Tab="tab"`（平铺）/ `Select="select"`（下拉，缺省）。 */
+export declare function parseTabStyle(input: string | undefined): string | undefined;
 /** `--option-order default|field` → `optionOrderConfig` 的 `"0"` / `"1"`。 */
 export declare function parseOptionOrder(input: string | undefined): string;
 /** `--date-granularity year,month` → 校验并归一成粒度值数组（保序、去重）。 */
@@ -68,9 +77,15 @@ export interface FilterDefaultOptions {
      * **两份同一规则：勾上才发（=1），不勾整个键都不出现。**
      */
     onlyWithData?: boolean;
+    /**
+     * 「显示封存的选项」(`showArchiveOption`)：前端开关写 `"1"` / `"0"`。
+     * 缺省（undefined）= 与平台新建一致，发 `"1"`。
+     */
+    showArchive?: boolean;
     granularity?: string[];
     optionShow?: string[];
     optionDefault?: string[];
+    showArchiveOption?: boolean;
 }
 /**
  * 四档各自的 `listFilterDefaultSets`。
@@ -85,8 +100,10 @@ export interface FilterDefaultOptions {
  */
 export declare function buildFilterDefaultSets(col: any, kind: GroupFilterKind, opts?: FilterDefaultOptions): any;
 export interface BuildGroupFilterOptions extends FilterDefaultOptions {
-    /** `showPosition`：1 顶部（缺省）/ 0 下拉样式。 */
+    /** `showPosition`：0 顶部（缺省）/ 1 左侧 / 下拉样式（平台枚举 Top="0"、Left/DropDown="1"）。 */
     position?: string;
+    /** 分类搜索「显示方式」`tabStyle`：`tab`=平铺 / `select`=下拉（缺省）。 */
+    tabStyle?: string;
 }
 /**
  * 一条分类搜索条目。
@@ -95,6 +112,23 @@ export interface BuildGroupFilterOptions extends FilterDefaultOptions {
  * 加上按类型算出来的 `listFilterDefaultSets`。
  */
 export declare function buildGroupFilterEntry(col: any, opts?: BuildGroupFilterOptions): any;
+/** 自定义分类（GroupCustom）的组件键。它不是表单字段，条目只存一个引用。 */
+export declare const CUSTOM_GROUP_COMP = "GroupCustom";
+/**
+ * 自定义分类 id：平台前端用 `UUID(18,10)` 生成 18 位数字 id，**没有接口返回**
+ * （2026-10-23 读 FieldSearch 前端包确认）。这里按同样形状生成，并避开已有条目。
+ */
+export declare function genCustomGroupId(existing?: any[]): string;
+/**
+ * 一条「自定义分类」（GroupCustom）。
+ *
+ * 平台「添加分类」先建 `{fieldId:"-1", componentKey:"GroupCustom"}`，保存时由前端补 18 位 id，
+ * `fieldId = "GroupCustom_<id>"`；分类值 `listGroupSets` 初始为空，之后在设计器里配置。
+ * 这里按实测条目形状构造（含「显示方式」`tabStyle` 与「显示封存的选项」`showArchiveOption`）。
+ */
+export declare function buildCustomGroupFilterEntry(showName: string, opts?: BuildGroupFilterOptions & {
+    id?: string;
+}): any;
 /** 候选字段：`getNListConfig` 回包里的 `fieldUsage[0].fields[]`（含系统字段）。 */
 export declare function extractCandidateColumns(listConfig: any): any[];
 /** 按 fieldId 或字段名（`text`）找候选字段；重名报错，不猜。 */

package/dist/services/form-list-search-group.d.ts.map

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

package/dist/services/form-list-search-group.js

@@ -1,3 +1,4 @@
+import { randomInt } from 'node:crypto';
 /**
  * 台账「分类搜索」(`config.searchConditions.groupFilters`) 的取值与构造。
  *
@@ -27,6 +28,7 @@ export const KIND_LABEL = {
     browser: '浏览框',
     date: '日期',
     system: '系统字段',
+    custom: '自定义分类',
 };
 /** 日期可选的四种粒度，顺序即页面上的顺序。 */
 export const DATE_GRANULARITIES = [
@@ -48,6 +50,8 @@ export function resolveGroupFilterKind(col) {
     if (isSystemColumn(col))
         return 'system';
     const comp = String(col?.compType || col?.type || '');
+    if (comp === 'GroupCustom')
+        return 'custom';
     if (OPTION_COMPS.includes(comp))
         return 'option';
     if (DATE_COMPS.includes(comp))
@@ -57,11 +61,33 @@ export function resolveGroupFilterKind(col) {
     throw new Error(`字段「${col?.text ?? col?.id}」的类型 ${comp || '(未知)'} 不支持分类搜索。`
         + `目前支持：选项类 ${OPTION_COMPS.join('/')}、浏览框类 ${BROWSER_COMPS.join('/')}、日期类 ${DATE_COMPS.join('/')}，以及系统字段`);
 }
+/**
+ * `--position` → 条目 `showPosition`。
+ *
+ * 平台枚举（FieldSearch 前端）：`Top="0"`、`Left="1"` / `DropDown="1"`。
+ * 分类搜索新建条目默认就是 **0（顶部）**；1 表示左侧/下拉样式。
+ * 名称与数字都收，免得用户还要记码值。
+ */
 export function parseShowPosition(input) {
-    const v = String(input ?? '1').trim();
-    if (v !== '0' && v !== '1')
-        throw new Error(`--position 只认 0（下拉样式）或 1（顶部），收到「${input}」`);
-    return v;
+    const v = String(input ?? '0').trim();
+    const key = v.toLowerCase();
+    if (v === '0' || key === 'top' || v === '顶部')
+        return '0';
+    if (v === '1' || key === 'left' || key === 'dropdown' || v === '左侧' || v === '下拉' || v === '下拉样式')
+        return '1';
+    throw new Error(`--position 只认 0（顶部）或 1（左侧 / 下拉样式），收到「${input}」`);
+}
+/** `--display` → 条目 `tabStyle`：平台枚举 `Tab="tab"`（平铺）/ `Select="select"`（下拉，缺省）。 */
+export function parseTabStyle(input) {
+    const v = String(input ?? '').trim();
+    if (!v)
+        return undefined;
+    const key = v.toLowerCase();
+    if (key === 'tab' || v === '平铺')
+        return 'tab';
+    if (key === 'select' || v === '下拉' || v === '下拉样式')
+        return 'select';
+    throw new Error(`--display 只认「平铺」或「下拉」，收到「${input}」`);
 }
 /** `--option-order default|field` → `optionOrderConfig` 的 `"0"` / `"1"`。 */
 export function parseOptionOrder(input) {
@@ -166,6 +192,9 @@ export function buildDateGroupSets(granularity, checked) {
  * 不勾时无论选项还是浏览框都整个键都没有。
  */
 export function buildFilterDefaultSets(col, kind, opts = {}) {
+    if (kind === 'custom')
+        throw new Error('自定义分类请使用 --custom 配置');
+    const archive = (opts.showArchiveOption ?? opts.showArchive) === false ? '0' : '1';
     const showCount = opts.showCount !== false ? 1 : 0;
     const onlyWithData = opts.onlyWithData === true ? 1 : 0;
     const count = {
@@ -175,7 +204,7 @@ export function buildFilterDefaultSets(col, kind, opts = {}) {
     };
     if (kind === 'system') {
         // 系统字段那份最薄：只有四个键
-        return { listGroupSets: [], multiSelect: true, enableBrowserFilter: 0, showArchiveOption: '1' };
+        return { listGroupSets: [], multiSelect: true, enableBrowserFilter: 0, showArchiveOption: archive };
     }
     if (kind === 'option') {
         const sets = buildOptionGroupSets(col?.config?.options, opts.optionShow, opts.optionDefault);
@@ -187,7 +216,7 @@ export function buildFilterDefaultSets(col, kind, opts = {}) {
             ...(onlyWithData ? { enableFilter: 1 } : {}),
             ...count,
             enableBrowserFilter: 0,
-            showArchiveOption: '1',
+            showArchiveOption: archive,
         };
     }
     if (kind === 'date') {
@@ -205,7 +234,7 @@ export function buildFilterDefaultSets(col, kind, opts = {}) {
             enableBrowserFilter: 0,
             defaultValueType: '1',
             ...(defaultValue ? { defaultValue } : {}),
-            showArchiveOption: '1',
+            showArchiveOption: archive,
         };
     }
     // browser
@@ -218,7 +247,7 @@ export function buildFilterDefaultSets(col, kind, opts = {}) {
         ...count,
         optionOrderConfig: opts.optionOrder ?? '0',
         enableBrowserFilter: 0,
-        showArchiveOption: '1',
+        showArchiveOption: archive,
     };
 }
 /**
@@ -242,14 +271,64 @@ export function buildGroupFilterEntry(col, opts = {}) {
         text: col?.text,
         config: col?.config ?? {},
         expandMethod: '0',
-        showPosition: opts.position ?? '1',
-        tabStyle: 'select',
+        showPosition: opts.position ?? '0',
+        tabStyle: opts.tabStyle ?? 'select',
         objId: col?.objId,
         fieldType: col?.type,
         type: col?.type,
         listFilterDefaultSets: buildFilterDefaultSets(col, kind, opts),
     };
 }
+/** 自定义分类（GroupCustom）的组件键。它不是表单字段，条目只存一个引用。 */
+export const CUSTOM_GROUP_COMP = 'GroupCustom';
+/**
+ * 自定义分类 id：平台前端用 `UUID(18,10)` 生成 18 位数字 id，**没有接口返回**
+ * （2026-10-23 读 FieldSearch 前端包确认）。这里按同样形状生成，并避开已有条目。
+ */
+export function genCustomGroupId(existing = []) {
+    const taken = new Set(existing.flatMap((g) => [String(g?.id ?? ''), String(g?.fieldId ?? '')]));
+    for (let attempt = 0; attempt < 100; attempt++) {
+        let id = String(randomInt(1, 10));
+        for (let i = 0; i < 17; i++)
+            id += String(randomInt(0, 10));
+        if (!taken.has(id) && !taken.has(`${CUSTOM_GROUP_COMP}_${id}`))
+            return id;
+    }
+    throw new Error('生成自定义分类 id 失败：连续 100 次都与已有条目冲突');
+}
+/**
+ * 一条「自定义分类」（GroupCustom）。
+ *
+ * 平台「添加分类」先建 `{fieldId:"-1", componentKey:"GroupCustom"}`，保存时由前端补 18 位 id，
+ * `fieldId = "GroupCustom_<id>"`；分类值 `listGroupSets` 初始为空，之后在设计器里配置。
+ * 这里按实测条目形状构造（含「显示方式」`tabStyle` 与「显示封存的选项」`showArchiveOption`）。
+ */
+export function buildCustomGroupFilterEntry(showName, opts = {}) {
+    const name = String(showName ?? '').trim();
+    if (!name)
+        throw new Error('自定义分类名称不能为空');
+    const id = String(opts.id || genCustomGroupId());
+    const fieldId = `${CUSTOM_GROUP_COMP}_${id}`;
+    return {
+        id,
+        fieldId,
+        name: fieldId,
+        fieldName: fieldId,
+        componentKey: CUSTOM_GROUP_COMP,
+        showName: name,
+        showPosition: opts.position ?? '0',
+        tabStyle: opts.tabStyle ?? 'select',
+        listFilterDefaultSets: {
+            listGroupSets: [],
+            multiSelect: false,
+            tileOptionNoGroupConfig: { isShow: true },
+            enableShowCountNum: opts.showCount === false ? 0 : 1,
+            showCountNumType: opts.countUpdate === true ? 'withConditionUpdate' : 'notUpdate',
+            enableShowCountNumLimit: 0,
+            showArchiveOption: opts.showArchive === false ? '0' : '1',
+        },
+    };
+}
 /** 候选字段：`getNListConfig` 回包里的 `fieldUsage[0].fields[]`（含系统字段）。 */
 export function extractCandidateColumns(listConfig) {
     const arr = listConfig?.fieldUsage?.[0]?.fields;