weaver-e10-builder 1.5.7 → 1.5.10

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

@@ -1,50 +1,26 @@
 import { AuthSession } from '../core/auth.js';
 import { ApiClient } from '../core/client.js';
 import { loadMobileConfig } from './form-list-utils.js';
-/**
- * 分类搜索（list-search-group）命令。
- * 走 saveNListConfig config.searchConditions.groupFilters（视图级，明文；非同事说的页面级 layout/save）。
- * sjr 实测（2026-08-20 抓包）：groupFilter 条目结构——
- *   id/fieldId=字段id, name/fieldName=field_<id>, compType/componentKey/fieldType/type=组件类型,
- *   showName/fieldShowName/text=中文名, objId, expandMethod:"0", showPosition:"0", tabStyle:"select",
- *   config{formId(=tableField.browserParams.formId), hideScore:true, groupId:"-1", dataType:["dataOptionObj"],
- *     title, type, dataCount:0, selectedNum:"", dataKey(=physicalField), columnName(=physicalField),
- *     systemField:true, labelObj:{}, columnTypeSwitch:false, showOrder, placeholder:"", componentKey, fieldId},
- *   listFilterDefaultSets{listGroupSets:[], multiSelect:true, enableShowCountNum:1, showCountNumType:"notUpdate",
- *     enableShowCountNumLimit:0, enableBrowserFilter:0, showArchiveOption:"1"}
- * **产品边界**：分类搜索**不支持明细字段**（条目无 subTableId，仅主表字段）。传入明细字段 fieldId 会报错。
- * listGroupSets 留空数组（平台运行时据字段 options 生成，CLI 不造）。
- * 仅支持选项类字段（Select/RadioBox/CheckBox，dataType:["dataOptionObj"]）；其他类型需抓包确认 dataType。
- */
-const OPTION_COMP = new Set(['Select', 'RadioBox', 'CheckBox']);
-function buildGroupFilter(t, objId, showPosition = '1') {
-    const id = String(t.id);
-    return {
-        id, fieldId: id,
-        name: `field_${id}`, fieldName: `field_${id}`,
-        compType: t.compType, componentKey: t.compType,
-        showName: t.text, fieldShowName: t.text, text: t.text,
-        objId: t.objId || objId,
-        fieldType: t.type, type: t.type,
-        expandMethod: '0', showPosition, tabStyle: 'select',
-        config: {
-            formId: t.browserParams?.formId, hideScore: true, groupId: '-1',
-            dataType: ['dataOptionObj'], title: t.text, type: t.type,
-            dataCount: 0, selectedNum: '', dataKey: t.physicalField, columnName: t.physicalField,
-            systemField: true, labelObj: {}, columnTypeSwitch: false, showOrder: t.showOrder || 0, placeholder: '',
-            componentKey: t.compType, fieldId: id,
-        },
-        listFilterDefaultSets: { listGroupSets: [], multiSelect: true, enableShowCountNum: 1, showCountNumType: 'notUpdate', enableShowCountNumLimit: 0, enableBrowserFilter: 0, showArchiveOption: '1' },
-    };
+import { DATE_GRANULARITIES, KIND_LABEL, buildGroupFilterEntry, extractCandidateColumns, listGroupFilters, parseDateGranularity, parseOptionOrder, parseShowPosition, resolveCandidateColumn, resolveGroupFilterKind, resolveOptionKeys, } from '../services/form-list-search-group.js';
+/** 逗号分隔的名字列表（`--options 选项1,选项2`）。 */
+function nameList(v, acc) {
+    for (const part of String(v).split(/[,，]/).map((s) => s.trim()).filter(Boolean))
+        acc.push(part);
+    return acc;
 }
 export function registerListSearchGroupCommand(form, program) {
     form.command('list-search-group')
-        .description('查看/配置台账分类搜索（按选项字段分类筛选；仅主表字段，不支持明细）')
+        .description('查看/配置台账分类搜索（选项 / 浏览框 / 日期 / 系统字段；仅主表字段，不支持明细）')
         .argument('<objId>', '表单 objId')
         .argument('<appId>', '应用 ID')
         .argument('<listId>', '台账列表 ID')
-        .option('--add <fieldId>', '添加分类搜索字段（须为主表选项类字段：Select/RadioBox/CheckBox）')
-        .option('--position <0|1>', '显示位置：1=顶部（缺省，所有字段可用）/ 0=下拉样式（仅 Select 等下拉类型可用）', '1')
+        .option('--add <字段名或fieldId>', '加入分类搜索（已在里面则按本次参数重建那条）')
+        .option('--position <0|1>', '显示位置：1=顶部（缺省）/ 0=下拉样式', '1')
+        .option('--option-order <default|field>', '选项排序：default=默认排序（缺省）/ field=按字段属性设置（浏览框专有）')
+        .option('--no-show-count', '不显示统计数字（缺省显示）')
+        .option('--date-granularity <列表>', `日期粒度，逗号分隔：${DATE_GRANULARITIES.map((g) => g.name).join('/')}（缺省全要）`)
+        .option('--options <列表>', '只让这些选项出现，逗号分隔（选项类专有；缺省全部出现）', nameList, [])
+        .option('--default-options <列表>', '这些选项默认选中，逗号分隔', nameList, [])
         .option('--remove <fieldId>', '按字段 ID 移除一条分类搜索')
         .option('--clear', '清空所有分类搜索')
         .option('--pc-only', '目标明确只使用 PC；移动端配置不存在时允许继续')
@@ -64,7 +40,7 @@ export function registerListSearchGroupCommand(form, program) {
         }
         const cfg = getRes?.data || {};
         const sc = cfg.searchConditions || {};
-        const groupFilters = sc.groupFilters || [];
+        const groupFilters = listGroupFilters(cfg);
         if (!cmdOpts.add && !cmdOpts.remove && !cmdOpts.clear) {
             if (isJson) {
                 console.log(JSON.stringify(groupFilters, null, 2));
@@ -75,8 +51,10 @@ export function registerListSearchGroupCommand(form, program) {
                 return;
             }
             console.log(`分类搜索 (${groupFilters.length}):`);
-            for (const g of groupFilters)
-                console.log(`  - ${g.showName || g.text} (fieldId=${g.fieldId}, type=${g.type})`);
+            for (const g of groupFilters) {
+                const kind = kindOfEntry(g);
+                console.log(`  - ${g.showName || g.text} (fieldId=${g.fieldId}, ${g.fieldType || g.type}, ${KIND_LABEL[kind]}${kind === 'browser' ? `, 位置=${g.showPosition}` : ''})`);
+            }
             return;
         }
         if (cmdOpts.clear) {
@@ -91,34 +69,34 @@ export function registerListSearchGroupCommand(form, program) {
             }
         }
         else if (cmdOpts.add) {
-            // 边界：仅主表选项类字段
-            const tableField = cfg.tableField || [];
-            const t = tableField.find((f) => String(f.id) === String(cmdOpts.add));
-            if (!t) {
-                console.error(`字段 ${cmdOpts.add} 不在显示列中（分类搜索需先加入显示列：form list-columns --add）`);
-                process.exit(1);
-            }
-            if (t.subTableId && String(t.subTableId) !== '') {
-                console.error(`字段「${t.text}」是明细字段，分类搜索不支持明细字段（产品边界，仅主表）`);
-                process.exit(1);
-            }
-            if (!OPTION_COMP.has(t.compType || t.type)) {
-                console.error(`字段「${t.text}」类型 ${t.compType || t.type} 不支持分类搜索（仅选项类：Select/RadioBox/CheckBox）`);
-                process.exit(1);
-            }
-            if (groupFilters.find((g) => String(g.fieldId) === String(cmdOpts.add))) {
-                console.error(`字段 ${cmdOpts.add} 已在分类搜索中`);
+            const columns = extractCandidateColumns(cfg);
+            if (columns.length === 0) {
+                console.error('台账配置里没有候选字段（fieldUsage[0].fields 为空），无法解析字段');
                 process.exit(1);
             }
-            const pos = cmdOpts.position === '0' ? '0' : '1';
-            if (pos === '0' && t.compType !== 'Select') {
-                console.error(`字段「${t.text}」类型 ${t.compType || t.type} 不支持下拉样式(position=0)，仅 Select 可用；用 --position 1（顶部）`);
+            const col = resolveCandidateColumn(columns, cmdOpts.add);
+            if (col.subTableId && String(col.subTableId) !== '') {
+                console.error(`字段「${col.text}」是明细字段，分类搜索不支持明细字段（产品边界，仅主表）`);
                 process.exit(1);
             }
-            sc.groupFilters = [...groupFilters, buildGroupFilter(t, objId, pos)];
-            console.error(`  已加分类搜索: ${t.text} (showPosition=${pos} ${pos === '1' ? '顶部' : '下拉'})`);
+            const kind = resolveGroupFilterKind(col); // 类型不认会在这里报错
+            const buildOpts = {
+                position: parseShowPosition(cmdOpts.position),
+                optionOrder: parseOptionOrder(cmdOpts.optionOrder),
+                showCount: cmdOpts.showCount !== false,
+                granularity: parseDateGranularity(cmdOpts.dateGranularity),
+                optionShow: resolveOptionKeys(col?.config?.options, cmdOpts.options, '--options'),
+                optionDefault: resolveOptionKeys(col?.config?.options, cmdOpts.defaultOptions, '--default-options'),
+            };
+            const entry = buildGroupFilterEntry(col, buildOpts);
+            // 已在里面 → 就地替换那条（改配置走这里）；否则追加
+            const idx = groupFilters.findIndex((g) => String(g.fieldId) === String(entry.fieldId));
+            sc.groupFilters = idx >= 0
+                ? groupFilters.map((g, i) => (i === idx ? entry : g))
+                : [...groupFilters, entry];
+            const verb = idx >= 0 ? '已更新' : '已加入';
+            console.error(`  ${verb}分类搜索: ${col.text} (${KIND_LABEL[kind]}${kind === 'browser' ? `, 位置=${buildOpts.position}` : ''})`);
         }
-        // 保存前读回真实移动端 mConfig 原样回传（仅改 PC config.searchConditions，移动端保持原样）
         const { mobileConfig, mobilePreserved } = await loadMobileConfig(client, baseUrl, appId, listId, cmdOpts.pcOnly);
         const saveRes = await client.post(`${baseUrl}/api/bs/ebuilder/form/list/saveNListConfig?apid=${appId}`, {
             listId, appId, terminalType: 'PC', config: { ...cfg, searchConditions: sc }, mConfig: mobileConfig,
@@ -136,4 +114,16 @@ export function registerListSearchGroupCommand(form, program) {
         }
     });
 }
+/** 回读条目判类型：条目上没有 `fieldClassification`，只能按 `fieldType`/`type` 反推。 */
+function kindOfEntry(g) {
+    const t = String(g?.fieldType || g?.type || '');
+    if (['Select', 'RadioBox', 'CheckBox'].includes(t))
+        return 'option';
+    if (['DateComponent', 'Date', 'DateTime'].includes(t))
+        return 'date';
+    // 系统字段的 id 是语义键（"2"/"5" 这种），雪花 id 都很长
+    if (String(g?.fieldId ?? '').length < 15)
+        return 'system';
+    return 'browser';
+}
 //# sourceMappingURL=form-list-search-group.js.map

package/dist/commands/form-list-search-group.js.map

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

package/dist/commands/form-list-stats.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form-list-stats.d.ts","sourceRoot":"","sources":["../../src/commands/form-list-stats.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAMpC,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,CAoC9E"}
+{"version":3,"file":"form-list-stats.d.ts","sourceRoot":"","sources":["../../src/commands/form-list-stats.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAgBpC,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,CAiD9E"}

package/dist/commands/form-list-stats.js

@@ -2,6 +2,18 @@ import { readFileSync } from 'node:fs';
 import { AuthSession } from '../core/auth.js';
 import { ApiClient } from '../core/client.js';
 import { ListStatsService } from '../services/form-list-stats.js';
+/** `on|off` 三态：不传 = 不动该项。 */
+function parseOnOff(value, label) {
+    if (value === undefined)
+        return undefined;
+    const v = String(value).trim().toLowerCase();
+    if (['on', 'true', '1', 'yes'].includes(v))
+        return true;
+    if (['off', 'false', '0', 'no'].includes(v))
+        return false;
+    throw new Error(`${label} 只接受 on|off（收到「${value}」）`);
+}
+const splitIds = (value) => (value === undefined ? [] : String(value).split(',').map(s => s.trim()).filter(Boolean));
 export function registerListStatsCommand(form, program) {
     async function run(objId, appId, listId, work) {
         try {
@@ -18,16 +30,29 @@ export function registerListStatsCommand(form, program) {
             process.exitCode = 1;
         }
     }
-    const command = form.command('list-stats').description('查看/配置主表及明细顶部统计，保存后回读并校验移动端')
+    const command = form.command('list-stats').description('查看/配置主表及明细统计（统计项、启用状态、显示位置、加载方式、点击过滤），保存后回读并校验移动端')
         .argument('[objId]', '表单 objId').argument('[appId]', '应用 ID').argument('[listId]', '台账视图 ID')
-        .option('--add <json|@file>', '统计对象：{fieldId,type,name?,subFormId?,conditions?}；明细 count 可只填 type/subFormId')
+        .option('--add <json|@file>', '统计对象：{fieldId,type,name?,subFormId?,conditions?,enable?}；明细 count 可只填 type/subFormId；enable:false 建出来即停用')
         .option('--remove <statId>', '移除统计项 ID（operation:DELETE）')
+        .option('--enable <statIds>', '启用统计项（逗号分隔）')
+        .option('--disable <statIds>', '停用统计项（逗号分隔）')
+        .option('--position <code>', '显示位置：top 顶部显示 / topSimple 顶部简约显示 / topRight 右上角显示（也收中文标签）')
+        .option('--manual-load <on|off>', '手动加载统计值（开了就不进视图自动跑）')
+        .option('--filter-data <on|off>', '点击统计结果过滤列表数据')
         .option('--pc-only', '明确仅 PC 使用；移动端读取失败时允许继续')
         .option('--json', 'JSON 输出')
         .action((objId, appId, listId, raw) => run(objId, appId, listId, async (service) => {
         if (raw.add && raw.remove)
             throw new Error('--add 与 --remove 不能同时使用');
-        if (!raw.add && !raw.remove)
+        const panel = {
+            position: raw.position,
+            manualLoad: parseOnOff(raw.manualLoad, '--manual-load'),
+            filterData: parseOnOff(raw.filterData, '--filter-data'),
+        };
+        const enable = splitIds(raw.enable), disable = splitIds(raw.disable);
+        const editing = raw.add || raw.remove || raw.position !== undefined
+            || panel.manualLoad !== undefined || panel.filterData !== undefined || enable.length || disable.length;
+        if (!editing)
             return (await service.config()).listStatistics || {};
         const rules = [];
         if (raw.add) {
@@ -36,7 +61,7 @@ export function registerListStatsCommand(form, program) {
                 throw new Error('--add 必须为统计对象');
             rules.push(value);
         }
-        return service.save(rules, raw.remove ? [raw.remove] : [], raw.pcOnly);
+        return service.save(rules, raw.remove ? [raw.remove] : [], raw.pcOnly, { enable, disable, panel });
     }));
     command.command('detail').description('为指定明细子表批量配置选定数值字段求和及一项记录计数，重复运行复用同配置')
         .argument('<objId>', '来源表单 ID').argument('<appId>', '应用 ID').argument('<listId>', '视图 ID').argument('<subFormId>', '明细子表 ID')

package/dist/commands/form-list-stats.js.map

@@ -1 +1 @@
-{"version":3,"file":"form-list-stats.js","sourceRoot":"","sources":["../../src/commands/form-list-stats.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"form-list-stats.js","sourceRoot":"","sources":["../../src/commands/form-list-stats.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEvC,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAE9C,OAAO,EAAE,gBAAgB,EAAmC,MAAM,gCAAgC,CAAC;AAEnG,6BAA6B;AAC7B,SAAS,UAAU,CAAC,KAAyB,EAAE,KAAa;IAC1D,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAC1C,MAAM,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IAC7C,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;QAAE,OAAO,IAAI,CAAC;IACxD,IAAI,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;QAAE,OAAO,KAAK,CAAC;IAC1D,MAAM,IAAI,KAAK,CAAC,GAAG,KAAK,kBAAkB,KAAK,IAAI,CAAC,CAAC;AACvD,CAAC;AACD,MAAM,QAAQ,GAAG,CAAC,KAAc,EAAY,EAAE,CAAC,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;AAExI,MAAM,UAAU,wBAAwB,CAAC,IAAa,EAAE,OAAgB;IACtE,KAAK,UAAU,GAAG,CAAC,KAAa,EAAE,KAAa,EAAE,MAAc,EAAE,IAAiD;QAChH,IAAI,CAAC;YACH,IAAI,CAAC,KAAK,IAAI,CAAC,KAAK,IAAI,CAAC,MAAM;gBAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;YAC1E,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,EAAiB,CAAC,CAAC;YAC1E,IAAI,CAAC,IAAI;gBAAE,MAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,CAAC;YACrC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,gBAAgB,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,UAAU,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC;YAC9G,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAC/C,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAAC,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;QAAC,CAAC;IAC9E,CAAC;IACD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,WAAW,CAAC,mDAAmD,CAAC;SACxG,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,UAAU,EAAE,SAAS,CAAC;SAC5F,MAAM,CAAC,oBAAoB,EAAE,0GAA0G,CAAC;SACxI,MAAM,CAAC,mBAAmB,EAAE,4BAA4B,CAAC;SACzD,MAAM,CAAC,oBAAoB,EAAE,aAAa,CAAC;SAC3C,MAAM,CAAC,qBAAqB,EAAE,aAAa,CAAC;SAC5C,MAAM,CAAC,mBAAmB,EAAE,2DAA2D,CAAC;SACxF,MAAM,CAAC,wBAAwB,EAAE,qBAAqB,CAAC;SACvD,MAAM,CAAC,wBAAwB,EAAE,cAAc,CAAC;SAChD,MAAM,CAAC,WAAW,EAAE,wBAAwB,CAAC;SAC7C,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC;SAC3B,MAAM,CAAC,CAAC,KAAa,EAAE,KAAa,EAAE,MAAc,EAAE,GAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAC,OAAO,EAAC,EAAE;QAC5G,IAAI,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;QACtE,MAAM,KAAK,GAAe;YACxB,QAAQ,EAAE,GAAG,CAAC,QAAQ;YACtB,UAAU,EAAE,UAAU,CAAC,GAAG,CAAC,UAAU,EAAE,eAAe,CAAC;YACvD,UAAU,EAAE,UAAU,CAAC,GAAG,CAAC,UAAU,EAAE,eAAe,CAAC;SACxD,CAAC;QACF,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACrE,MAAM,OAAO,GAAG,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,QAAQ,KAAK,SAAS;eAC9D,KAAK,CAAC,UAAU,KAAK,SAAS,IAAI,KAAK,CAAC,UAAU,KAAK,SAAS,IAAI,MAAM,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC;QACzG,IAAI,CAAC,OAAO;YAAE,OAAO,CAAC,MAAM,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,cAAc,IAAI,EAAE,CAAC;QACnE,MAAM,KAAK,GAAgB,EAAE,CAAC;QAC9B,IAAI,GAAG,CAAC,GAAG,EAAE,CAAC;YACZ,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACtG,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;gBAAE,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;YAClG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACpB,CAAC;QACD,OAAO,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,GAAG,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;IACrG,CAAC,CAAC,CAAC,CAAC;IAEN,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,WAAW,CAAC,sCAAsC,CAAC;SAC1E,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,aAAa,EAAE,SAAS,CAAC;SAC5H,MAAM,CAAC,uBAAuB,EAAE,iCAAiC,CAAC;SAClE,MAAM,CAAC,sBAAsB,EAAE,QAAQ,EAAE,EAAE,CAAC;SAC5C,MAAM,CAAC,WAAW,EAAE,UAAU,CAAC;SAC/B,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC;SAC3B,MAAM,CAAC,CAAC,KAAa,EAAE,KAAa,EAAE,MAAc,EAAE,SAAiB,EAAE,GAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAC7G,KAAK,EAAC,OAAO,EAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,OAAO,CAAC,WAAW,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,UAAU,CAAC,EAAE,EAAE,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;AACxH,CAAC"}

package/dist/commands/form-list-utils.d.ts

@@ -20,6 +20,12 @@ export interface CondInput {
     text?: string;
     /** 值引用另一字段（field vs field，"当前变量"）：填目标字段名或 fieldId。设置后 value 自动构造为 compareFormField 对象 */
     valueField?: string;
+    /**
+     * 日期区间的**快捷档**（设计器「区间」旁边那排：今天 / 本周 / 今年 …，共 16 档）。
+     * 给了它就等价于 `func: "range"` + 当场算好的起止日期（见 `services/quick-date-range.ts`）——
+     * 设计器也是这么干的，存进去的是**死日期**，不是动态标记。可与 `func`/`value` 二选一，不能同时给。
+     */
+    quick?: string;
 }
 /**
  * 解析条件里的 valueField（值引用另一字段）→ 构造 compareFormField 对象。
@@ -41,7 +47,46 @@ export declare function resolveValueFieldRefs(client: {
  * @param fields    fetchFields 返回的字段表，用于补 fieldType/text/compType
  * @param objId     表单 objId
  * @param filterIsNull 统计 rootdata 用 false、视图数据条件 filter 用 true
+ * @param now 快捷档（`quick`）的基准时刻，默认当下；仅供测试注入
  * @returns JSON 字符串（空条件返回 ''）
  */
-export declare function buildConditionTree(conditions: CondInput[], fields: any[], objId: string, filterIsNull: boolean): string;
+/** 条件组：组内关系 + 子节点（子节点本身也可以是组，与顶层同构）。 */
+export interface CondGroup {
+    /** 组内关系：`and` / `or`（或码 `1` / `0`）。缺省 AND。 */
+    relation?: string;
+    conditions: CondNode[];
+}
+/** 条件树的节点：叶子条件，或一个条件组。**有 `conditions` 数组就是组**，否则按条件（认 `fieldId`）。 */
+export type CondNode = CondInput | CondGroup;
+export declare const isCondGroup: (n: any) => n is CondGroup;
+export declare function relationCode(raw: any, fallback: string): string;
+/**
+ * 渲染 `rootStr`。实测规则：**≥2 个孩子才套一层括号**，单个孩子直接用它的渲染结果
+ * （所以单条件条件是 `( 创建时间 区间 '…' )` 而不是双括号），组内按自己的关系码连接。
+ */
+export declare function renderCond(n: any): string;
+/** 树里（已构建的）所有叶子条件（供展示、后处理用）。 */
+export declare function condLeaves(node: any): any[];
+/** 入参节点数组 → 所有叶子条件（递归进组；供字段校验、值引用解析用）。 */
+export declare function inputLeaves(nodes: CondNode[]): CondInput[];
+export declare function buildConditionTree(conditions: CondNode[], fields: any[], objId: string, filterIsNull: boolean, opts?: {
+    now?: Date;
+    relation?: string;
+}): string;
+/**
+ * 把新条件**叠加**到已有条件树上（这是 `--add` 的语义：原地加，不整体覆盖）。
+ * 已有树为空/不存在时等价于新建。不给 `relation` 就沿用现有顶层关系。
+ */
+export declare function appendConditions(existing: any, nodes: CondNode[], fields: any[], objId: string, opts?: {
+    now?: Date;
+    relation?: string;
+}): any;
+/**
+ * 按字段 ID 摘条件（**该字段的所有条件都摘**；组被摘空就整组拿掉）。
+ * 同一个字段有多条条件时想只摘一条 —— 用 `--replace` 传整棵树。
+ */
+export declare function removeConditions(existing: any, targets: string[]): {
+    filter: any;
+    removed: number;
+};
 //# sourceMappingURL=form-list-utils.d.ts.map

package/dist/commands/form-list-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form-list-utils.d.ts","sourceRoot":"","sources":["../../src/commands/form-list-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAE9C;;;GAGG;AACH,wBAAsB,WAAW,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAYnG;AAED;;;;GAIG;AACH,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,SAAS,EACjB,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC;IAAE,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAAC,eAAe,EAAE,OAAO,CAAA;CAAE,CAAC,CAa1E;AAkCD,MAAM,WAAW,SAAS;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,yFAAyF;IACzF,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAwBD;;;;;;GAMG;AACH,wBAAsB,qBAAqB,CACzC,MAAM,EAAE;IAAE,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IAAC,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;CAAE,EACvH,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,UAAU,EAAE,SAAS,EAAE,EACvB,MAAM,EAAE,GAAG,EAAE,GACZ,OAAO,CAAC,IAAI,CAAC,CAyCf;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,kBAAkB,CAChC,UAAU,EAAE,SAAS,EAAE,EACvB,MAAM,EAAE,GAAG,EAAE,EACb,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,OAAO,GACpB,MAAM,CA0CR"}
+{"version":3,"file":"form-list-utils.d.ts","sourceRoot":"","sources":["../../src/commands/form-list-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAG9C;;;GAGG;AACH,wBAAsB,WAAW,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAYnG;AAED;;;;GAIG;AACH,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,SAAS,EACjB,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC;IAAE,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAAC,eAAe,EAAE,OAAO,CAAA;CAAE,CAAC,CAa1E;AAkCD,MAAM,WAAW,SAAS;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,yFAAyF;IACzF,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;;OAIG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAwBD;;;;;;GAMG;AACH,wBAAsB,qBAAqB,CACzC,MAAM,EAAE;IAAE,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IAAC,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;CAAE,EACvH,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,UAAU,EAAE,SAAS,EAAE,EACvB,MAAM,EAAE,GAAG,EAAE,GACZ,OAAO,CAAC,IAAI,CAAC,CAyCf;AAED;;;;;;;;;;;GAWG;AACH,wCAAwC;AACxC,MAAM,WAAW,SAAS;IACxB,8CAA8C;IAC9C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,QAAQ,EAAE,CAAC;CACxB;AACD,sEAAsE;AACtE,MAAM,MAAM,QAAQ,GAAG,SAAS,GAAG,SAAS,CAAC;AAC7C,eAAO,MAAM,WAAW,GAAI,GAAG,GAAG,KAAG,CAAC,IAAI,SAAyC,CAAC;AAIpF,wBAAgB,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAK/D;AA4DD;;;GAGG;AACH,wBAAgB,UAAU,CAAC,CAAC,EAAE,GAAG,GAAG,MAAM,CAKzC;AAED,gCAAgC;AAChC,wBAAgB,UAAU,CAAC,IAAI,EAAE,GAAG,GAAG,GAAG,EAAE,CAI3C;AAED,0CAA0C;AAC1C,wBAAgB,WAAW,CAAC,KAAK,EAAE,QAAQ,EAAE,GAAG,SAAS,EAAE,CAE1D;AAED,wBAAgB,kBAAkB,CAChC,UAAU,EAAE,QAAQ,EAAE,EACtB,MAAM,EAAE,GAAG,EAAE,EACb,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,OAAO,EACrB,IAAI,GAAE;IAAE,GAAG,CAAC,EAAE,IAAI,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAO,GAC3C,MAAM,CAQR;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,GAAG,EACb,KAAK,EAAE,QAAQ,EAAE,EACjB,MAAM,EAAE,GAAG,EAAE,EACb,KAAK,EAAE,MAAM,EACb,IAAI,GAAE;IAAE,GAAG,CAAC,EAAE,IAAI,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAO,GAC3C,GAAG,CAaL;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG;IAAE,MAAM,EAAE,GAAG,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAiBnG"}

package/dist/commands/form-list-utils.js

@@ -1,3 +1,4 @@
+import { resolveQuickDateRange } from '../services/quick-date-range.js';
 /**
  * 通过 multipart/form-data 的 ds/fields 接口拉取表单字段元数据。
  * 供 list-columns / list-search / list-stats / list-filter 等命令共用。
@@ -133,59 +134,151 @@ export async function resolveValueFieldRefs(client, baseUrl, appId, objId, condi
         delete c.valueField;
     }
 }
+export const isCondGroup = (n) => Array.isArray(n?.conditions);
+/** 关系码：实测 `1` = AND、`0` = OR（设计器把顶层切成 OR 时发的是 `"0"`）。 */
+const REL_CODES = { and: '1', '1': '1', or: '0', '0': '0' };
+export function relationCode(raw, fallback) {
+    if (raw === undefined || raw === null || raw === '')
+        return fallback;
+    const code = REL_CODES[String(raw).trim().toLowerCase()];
+    if (!code)
+        throw new Error(`未知的条件关系「${raw}」，只支持 and / or（或 1 / 0）`);
+    return code;
+}
+const relLabel = (code) => (String(code) === '0' ? 'OR' : 'AND');
+/** 叶子条件 → 树节点。 */
+function conditionNode(c, parentKey, key, fields, objId, now) {
+    const cf = fields.find((x) => String(x.id) === String(c.fieldId));
+    const fieldType = cf?.type || 'String';
+    const compType = cf?.compType || fieldType;
+    if (c.quick && (c.value !== undefined || c.valueField !== undefined || c.func !== undefined)) {
+        throw new Error(`条件 ${c.fieldId} 的 quick 不能与 func/value/valueField 同时使用：快捷档本身已经决定了区间`);
+    }
+    // 快捷档 → 当场算好的起止日期（设计器同样存死日期，见 services/quick-date-range.ts）
+    const quick = c.quick ? resolveQuickDateRange(c.quick, now) : null;
+    const func = quick ? 'range' : FUNC_NORMALIZE[c.func || 'eq'] || c.func || 'eq';
+    const isRange = func === 'range';
+    const isUnaggregate = func === 'unaggregate'; // 不属于：value 为逗号分隔字符串（抓包 "v1,v2,v3"）
+    const isSelect = ['Select', 'SelectMultiple'].includes(compType) || ['Select', 'SelectMultiple'].includes(fieldType);
+    const isDateNum = fieldType === 'Date' || fieldType === 'Number';
+    return {
+        isParent: false, parentNode: parentKey, key,
+        id: c.fieldId, fieldName: 'field_' + c.fieldId,
+        fieldType, text: cf?.text || c.fieldId,
+        optionType: '',
+        originBrowserType: isSelect ? 'browser' : '',
+        objId, compType, type: 'condition',
+        conditions: {
+            func,
+            // 快捷档直接落算好的区间；否则：对象 value（字段引用 {compareFormField,...}）原样保留；
+            // unaggregate 数组 join 成逗号串；range 保数组；其余转字符串
+            value: quick ?? (isRange ? c.value
+                : (isUnaggregate && Array.isArray(c.value) ? c.value.map(String).join(',')
+                    : (c.value && typeof c.value === 'object' ? c.value : String(c.value ?? '')))),
+            type: '',
+            text: isRange ? '' : (c.text || ''),
+            isEsb: false,
+        },
+        multiSelect: 'false', formInfo: { fieldId: c.fieldId },
+        module: 'ebuilderform', mainField: true, subTableId: '',
+        dbFieldType: 'String', isEdit: '0',
+        ...(isDateNum ? { formatType: '4' } : {}),
+        config: { fieldId: c.fieldId },
+    };
+}
+/** 把一组入参节点铺成 `datas` 数组：子节点的 `parentNode` 指向 `parentKey`。 */
+function childrenOf(nodes, parentKey, prefix, fields, objId, now) {
+    if (!Array.isArray(nodes) || nodes.length === 0)
+        throw new Error('条件组至少要有一个条件');
+    return nodes.map((n, i) => isCondGroup(n)
+        ? groupNode(n.conditions, parentKey, `${prefix}_${i + 1}`, relationCode(n.relation, '1'), fields, objId, now)
+        : conditionNode(n, parentKey, `${prefix}_${i + 1}`, fields, objId, now));
+}
+/** 一组节点 → 父节点（顶层与嵌套组同构：`isParent:true` + 自己的 `relationship` + `datas`）。 */
+function groupNode(nodes, parentKey, key, relation, fields, objId, now) {
+    return {
+        key, relationship: relation, isParent: true, parentNode: parentKey,
+        datas: childrenOf(nodes, key, key, fields, objId, now),
+    };
+}
 /**
- * 构造明文 JSON 条件树（平台 rootdata / config.filter 都用此结构）。
- * 实测：可直接发明文保存，读回也是明文，无需 LZW 编码。
- * func 用设计师 code（neq/range，非 notEq/between）；dbFieldType 抓包恒为 "String"；
- * Select 条件 originBrowserType="browser"；Date/Number 条件带 formatType="4"。
- * @param conditions 条件数组（多条件默认 AND，relationship:'1'）
- * @param fields    fetchFields 返回的字段表，用于补 fieldType/text/compType
- * @param objId     表单 objId
- * @param filterIsNull 统计 rootdata 用 false、视图数据条件 filter 用 true
- * @returns JSON 字符串（空条件返回 ''）
+ * 渲染 `rootStr`。实测规则：**≥2 个孩子才套一层括号**，单个孩子直接用它的渲染结果
+ * （所以单条件条件是 `( 创建时间 区间 '…' )` 而不是双括号），组内按自己的关系码连接。
  */
-export function buildConditionTree(conditions, fields, objId, filterIsNull) {
+export function renderCond(n) {
+    if (!n?.isParent)
+        return `( ${condRootStr(n)} )`;
+    const children = (n.datas || []).map(renderCond);
+    if (children.length <= 1)
+        return children[0] ?? '';
+    return `(${children.join(` ${relLabel(n.relationship)} `)})`;
+}
+/** 树里（已构建的）所有叶子条件（供展示、后处理用）。 */
+export function condLeaves(node) {
+    if (!node)
+        return [];
+    if (!node.isParent)
+        return [node];
+    return (node.datas || []).flatMap((d) => condLeaves(d));
+}
+/** 入参节点数组 → 所有叶子条件（递归进组；供字段校验、值引用解析用）。 */
+export function inputLeaves(nodes) {
+    return (nodes || []).flatMap((n) => (isCondGroup(n) ? inputLeaves(n.conditions) : [n]));
+}
+export function buildConditionTree(conditions, fields, objId, filterIsNull, opts = {}) {
     if (!Array.isArray(conditions) || conditions.length === 0)
         return '';
     const topKey = String(Date.now());
-    const datas = conditions.map((c, i) => {
-        const cf = fields.find((x) => String(x.id) === String(c.fieldId));
-        const fieldType = cf?.type || 'String';
-        const compType = cf?.compType || fieldType;
-        const func = FUNC_NORMALIZE[c.func || 'eq'] || c.func || 'eq';
-        const isRange = func === 'range';
-        const isUnaggregate = func === 'unaggregate'; // 不属于：value 为逗号分隔字符串（抓包 "v1,v2,v3"）
-        const isSelect = ['Select', 'SelectMultiple'].includes(compType) || ['Select', 'SelectMultiple'].includes(fieldType);
-        const isDateNum = fieldType === 'Date' || fieldType === 'Number';
-        return {
-            isParent: false, parentNode: topKey, key: topKey + (i + 1),
-            id: c.fieldId, fieldName: 'field_' + c.fieldId,
-            fieldType, text: cf?.text || c.fieldId,
-            optionType: '',
-            originBrowserType: isSelect ? 'browser' : '',
-            objId, compType, type: 'condition',
-            conditions: {
-                func,
-                // 对象 value（字段引用 {compareFormField,...}）原样保留；unaggregate 数组 join 成逗号串；range 保数组；其余转字符串
-                value: isRange ? c.value
-                    : (isUnaggregate && Array.isArray(c.value) ? c.value.map(String).join(',')
-                        : (c.value && typeof c.value === 'object' ? c.value : String(c.value ?? ''))),
-                type: '',
-                text: isRange ? '' : (c.text || ''),
-                isEsb: false,
-            },
-            multiSelect: 'false', formInfo: { fieldId: c.fieldId },
-            module: 'ebuilderform', mainField: true, subTableId: '',
-            dbFieldType: 'String', isEdit: '0',
-            ...(isDateNum ? { formatType: '4' } : {}),
-            config: { fieldId: c.fieldId },
-        };
-    });
-    const parts = datas.map((d) => `( ${condRootStr(d)} )`);
-    const rootStr = parts.length > 1 ? `(${parts.join(' AND ')})` : parts[0];
+    const top = groupNode(conditions, '', topKey, relationCode(opts.relation, '1'), fields, objId, opts.now);
     return JSON.stringify({
-        key: topKey, relationship: '1', isParent: true, isNewFilter: true, parentNode: '',
-        datas, version: 1, filterIsNull, isFilterSub: false, rootStr,
+        key: topKey, relationship: top.relationship, isParent: true, isNewFilter: true, parentNode: '',
+        datas: top.datas, version: 1, filterIsNull, isFilterSub: false, rootStr: renderCond(top),
+    });
+}
+/**
+ * 把新条件**叠加**到已有条件树上（这是 `--add` 的语义：原地加，不整体覆盖）。
+ * 已有树为空/不存在时等价于新建。不给 `relation` 就沿用现有顶层关系。
+ */
+export function appendConditions(existing, nodes, fields, objId, opts = {}) {
+    const usable = existing && typeof existing === 'object' && !Array.isArray(existing) && Array.isArray(existing.datas);
+    if (!usable)
+        return JSON.parse(buildConditionTree(nodes, fields, objId, true, opts));
+    const topKey = String(existing.key ?? Date.now());
+    const relation = relationCode(opts.relation, String(existing.relationship ?? '1'));
+    // 新节点直接挂到现有顶层下 —— 用现有顶层 key 当 parent，不能再套一层组，否则 parentNode 悬空
+    const added = childrenOf(nodes, topKey, `${topKey}_append`, fields, objId, opts.now);
+    const merged = {
+        ...existing, key: topKey, relationship: relation, isParent: true, parentNode: '',
+        datas: [...existing.datas, ...added], version: existing.version ?? 1,
+    };
+    merged.rootStr = renderCond(merged);
+    return merged;
+}
+/**
+ * 按字段 ID 摘条件（**该字段的所有条件都摘**；组被摘空就整组拿掉）。
+ * 同一个字段有多条条件时想只摘一条 —— 用 `--replace` 传整棵树。
+ */
+export function removeConditions(existing, targets) {
+    const wanted = new Set(targets.map((t) => String(t).trim()).filter(Boolean));
+    if (!existing || !Array.isArray(existing.datas) || !wanted.size)
+        return { filter: existing, removed: 0 };
+    let removed = 0;
+    const prune = (nodes) => nodes.filter((n) => {
+        if (n?.isParent) {
+            const kids = prune(n.datas || []);
+            if (!kids.length)
+                return false;
+            n.datas = kids;
+            return true;
+        }
+        if (wanted.has(String(n?.id))) {
+            removed += 1;
+            return false;
+        }
+        return true;
     });
+    const filter = { ...existing, datas: prune(existing.datas) };
+    filter.rootStr = renderCond(filter);
+    return { filter, removed };
 }
 //# sourceMappingURL=form-list-utils.js.map