weaver-e10-builder 1.0.4-beta → 1.0.7-beta

package/dist/commands/form-add-detail-table.d.ts

@@ -0,0 +1,3 @@
+import { Command } from 'commander';
+export declare function registerFormAddDetailTableCommands(form: Command, program: Command): void;
+//# sourceMappingURL=form-add-detail-table.d.ts.map

package/dist/commands/form-add-detail-table.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"form-add-detail-table.d.ts","sourceRoot":"","sources":["../../src/commands/form-add-detail-table.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA0EpC,wBAAgB,kCAAkC,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,CA+ExF"}

package/dist/commands/form-add-detail-table.js

@@ -0,0 +1,153 @@
+import { AuthSession } from '../core/auth.js';
+import { ApiClient } from '../core/client.js';
+import { toSubTableName } from '../utils/column-name.js';
+import { normalizeDetailTableChildren } from '../services/form-create.js';
+/**
+ * form add-detail-table — 在**已存在**的表上添加明细子表。
+ *
+ * 机制（抓包+实测 2026-08-24，mulinquan objId 1306406206799339521）：
+ *   明细子表必须走 saveSubForm 建子表定义（saveFormFieldNew 不是建子表端点，见 form.ts:455 注释）。
+ *   但 saveSubForm 只建子表定义，**空子表 getConfig/getEbField 都读不到**（平台过滤空子表）。
+ *   所以必须先加至少一个字段进子表，子表才在 getConfig 出现，initLayout 才能放 DetailTable 组件。
+ *
+ * 三步：
+ *   1. generatorIds(size=1) → subFormId
+ *   2. POST /api/ebuilder/form/form/field/manage/saveSubForm?apid={appId}
+ *      body: {physicalTable:true, subFormId, type:"DetailTable", dataKey, tableName,
+ *             formTable:{id:formId, form:{id:subFormId, name, order:"0.00"}}, customParam:{appId,objId}, module:"ebuilderform"}
+ *      header ebbusinessid=formId
+ *   3. saveFormFieldNew 加首字段（关键：formTableId 省略！传主formId会报「不存在formTable记录」；
+ *      省略后平台靠 subFormId 自动建子表 formTable 记录）
+ *      POST /api/ebuilder/form/form/field/manage/saveFormFieldNew?apid={appId}
+ *      body: {formId, module:"ebuilderform", customParam:{appId,objId}, jsonObj: stringify({type:"Text", fieldId, subFormId, ...无formTableId})}
+ *   4.（可选 --init）form layout init：getFormLayout→getConfig(现含 DetailTable)→initLayout 自动放 DetailTable 组件（EXCEL 结构平台生成，不用手抠）
+ *
+ * 后续字段用 `form add-field --sub-form-id <subFormId>`（子表有字段后 getEbField 能查到，发空 formTableId 也 200）。
+ */
+const FIELD_MANAGE = '/api/ebuilder/form/form/field/manage';
+async function resolveFormId(client, baseUrl, appId, objId) {
+    const formList = await client.get(`${baseUrl}/api/bs/ebuilder/form/obj/getList/${appId}?apid=${appId}`, { ebbusinessid: appId });
+    const formInfo = (formList?.data || []).find((f) => String(f.id) === String(objId));
+    const formId = formInfo?.formId || '';
+    if (!formId)
+        throw new Error(`无法获取 formId，请确认 objId=${objId} appId=${appId}`);
+    return formId;
+}
+/** initLayout 重建布局（放 DetailTable 组件）。复刻 form-layout-init.ts 的逻辑。 */
+async function initLayoutPlace(client, baseUrl, appId, objId, formId) {
+    const ebb = { ebbusinessid: formId };
+    // getFormLayout → layoutId/layoutType/layoutMultiId
+    const meta = await client.post(`${baseUrl}/api/ebuilder/form/builder/getFormLayout`, {
+        formId, module: 'ebuilderform', customParam: {}, formTableIdList: [],
+        designerParam: { onlyLayout: false, convert: false }, form: { id: formId },
+    }, ebb);
+    const fl = meta?.data?.formLayout || {};
+    const flm = meta?.data?.formLayoutMultiple || {};
+    const layoutId = fl.id || '';
+    if (!layoutId)
+        throw new Error('无法获取 layoutId');
+    const layoutType = flm.layoutType || 'EXCEL';
+    // getConfig → configs（含 DetailTable，因已加首字段）
+    const cfgRes = await client.post(`${baseUrl}/api/ebuilder/form/form/view/relate/getConfig`, {
+        formId, module: 'ebuilderform', apiModule: 'ebuilder/form',
+        layoutId, customParam: { terminal: '', objId: formId },
+        initMode: 5, groupFieldIds: [], designerParam: { sourceModule: 'ebuilderform' },
+    }, ebb);
+    const configs = normalizeDetailTableChildren((cfgRes?.data?.configs || []).map((c) => ({
+        ...c, display: c.system ? c.display : true, show: c.system ? c.show : true,
+    })));
+    const styleTemplateId = layoutType === 'FLOW' ? '820000000000000001' : '700000000000000008';
+    const initRes = await client.post(`${baseUrl}/api/ebuilder/form/form/view/relate/initLayout?apid=${encodeURIComponent(appId)}`, {
+        formId, module: 'ebuilderform', apiModule: 'ebuilder/form', layoutId, generateCollapse: true,
+        styleTemplateId, styleTemplateType: 1, configs, addLayout: false, ecodeType: ['js', 'css'],
+        initMode: '1', customParam: { terminal: '', objId: formId },
+        formLayoutMultiple: { isSys: true, id: flm.id || '', name: flm.name || '', terminalType: 'PC', layoutType },
+        designerParam: { onlyLayout: false },
+    }, ebb);
+    if (initRes?.code !== 200 || !initRes?.status)
+        throw new Error(`initLayout 失败: ${initRes?.msg}`);
+    return initRes?.data?.pageLayouts?.[0]?.comps?.length || initRes?.data?.formLayout?.pageLayouts?.[0]?.comps?.length || 0;
+}
+export function registerFormAddDetailTableCommands(form, program) {
+    form.command('add-detail-table')
+        .description('在已存在的表上添加明细子表（saveSubForm 建子表 + 加首字段使其可见；--init 放入布局）')
+        .argument('<objId>', '主表 objId')
+        .argument('<appId>', '应用 ID')
+        .argument('<name>', '明细表名')
+        .argument('[firstFieldName]', '首字段名（强烈建议传；空子表平台过滤不可见，加首字段后才在布局可放）')
+        .option('--data-key <k>', '子表物理表名/dataKey（默认自动 uf_拼音_随机）')
+        .option('--init', '创建后跑 layout init 把 DetailTable 组件放入布局（否则子表已建但未放进布局，需手动 init）')
+        .option('--first-field-type <t>', '首字段类型（默认 Text）')
+        .action(async (objId, appId, name, firstFieldName, o) => {
+        try {
+            const opts = program.opts();
+            const auth = await AuthSession.fromOptions(opts);
+            if (!auth)
+                throw new Error('无法加载认证');
+            const client = new ApiClient(auth);
+            const baseUrl = auth.getBaseUrl();
+            const formId = await resolveFormId(client, baseUrl, appId, objId);
+            const ebb = { ebbusinessid: formId };
+            // 1. generatorIds → subFormId
+            const gen = await client.post(`${baseUrl}/api/form/local/generatorIds?size=1&apid=${appId}`, {});
+            const subFormId = gen?.data?.generatorIds?.[0];
+            if (!subFormId)
+                throw new Error('生成 subFormId 失败');
+            const dataKey = o.dataKey || toSubTableName(name);
+            // 2. saveSubForm
+            const subBody = {
+                physicalTable: true, order: 0, subFormId, type: 'DetailTable',
+                customParam: { appId, objId }, module: 'ebuilderform',
+                dataKey, tableName: dataKey,
+                formTable: { id: formId, form: { id: subFormId, name, order: '0.00' } },
+            };
+            const subRes = await client.post(`${baseUrl}${FIELD_MANAGE}/saveSubForm?apid=${appId}`, subBody, ebb);
+            if (subRes?.code !== 200 || !subRes?.status)
+                throw new Error(`saveSubForm 失败: ${subRes?.msg}`);
+            console.error(`  子表已建: subFormId=${subFormId}  name=${name}  dataKey=${dataKey}`);
+            // 3. 加首字段（formTableId 省略，平台靠 subFormId 自动建子表 formTable 记录）
+            let firstFieldId = '';
+            if (firstFieldName) {
+                const fgen = await client.post(`${baseUrl}/api/form/local/generatorIds?size=1&apid=${appId}`, {});
+                firstFieldId = fgen?.data?.generatorIds?.[0] || '';
+                const ftype = o.firstFieldType || 'Text';
+                const jsonObj = {
+                    type: ftype, title: firstFieldName, fieldId: firstFieldId,
+                    groupId: '-1', formId, showOrder: '0.00',
+                    dataKey: toSubTableName(firstFieldName).replace(/^uf_/, ''),
+                    columnName: toSubTableName(firstFieldName).replace(/^uf_/, ''),
+                    componentKey: ftype, subFormId,
+                    // 关键：不带 formTableId（省略）。传主 formId 会报「不存在formTable记录」。
+                };
+                const fRes = await client.post(`${baseUrl}${FIELD_MANAGE}/saveFormFieldNew?apid=${appId}`, {
+                    formId, module: 'ebuilderform', customParam: { appId, objId }, jsonObj: JSON.stringify(jsonObj),
+                }, ebb);
+                if (fRes?.code !== 200 || !fRes?.status)
+                    throw new Error(`加首字段失败: ${fRes?.msg}`);
+                console.error(`  首字段已加: ${firstFieldName} (${firstFieldId})`);
+            }
+            else {
+                console.error('  ⚠ 未传首字段名：子表已建但空子表 getConfig 读不到，需手动加字段后才可在布局 init 放置');
+            }
+            // 4.（可选）layout init 放 DetailTable 组件
+            let compCount = 0;
+            if (o.init) {
+                if (!firstFieldName)
+                    throw new Error('--init 需配合首字段名（空子表 initLayout 放不了 DetailTable）');
+                compCount = await initLayoutPlace(client, baseUrl, appId, objId, formId);
+                console.error(`  布局已 init: 组件 ${compCount} 个（含 DetailTable）`);
+            }
+            console.log(opts.json
+                ? JSON.stringify({ success: true, objId, subFormId, name, dataKey, firstFieldId, initComps: compCount || undefined }, null, 2)
+                : `明细子表已建: ${name}  subFormId=${subFormId}${firstFieldName ? `  首字段=${firstFieldName}` : ''}${o.init ? `  已 init 放入布局` : '  (未 init，跑 form layout init 放置)'}`);
+            if (!opts.json && !o.init) {
+                console.log('  后续加字段: e10-cli form add-field <objId> <appId> <字段名> <类型> --sub-form-id ' + subFormId);
+            }
+        }
+        catch (e) {
+            console.error(`添加明细子表失败: ${e.message}`);
+            process.exitCode = 1;
+        }
+    });
+}
+//# sourceMappingURL=form-add-detail-table.js.map

package/dist/commands/form-add-detail-table.js.map

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

package/dist/commands/form-association.d.ts

@@ -0,0 +1,3 @@
+import { Command } from 'commander';
+export declare function registerFormAssociationCommands(form: Command, program: Command): void;
+//# sourceMappingURL=form-association.d.ts.map

package/dist/commands/form-association.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"form-association.d.ts","sourceRoot":"","sources":["../../src/commands/form-association.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAuFpC,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,CA8LrF"}

package/dist/commands/form-association.js

@@ -0,0 +1,299 @@
+import { existsSync, readFileSync } from 'node:fs';
+import { AuthSession } from '../core/auth.js';
+import { ApiClient } from '../core/client.js';
+import { lzwCompress } from '../core/lzw.js';
+import { fetchFields, buildConditionTree, resolveValueFieldRefs } from './form-list-utils.js';
+/**
+ * form association — 表单关联页签管理（数据关联）。
+ *
+ * scaffold-apis 文档：ebuilder-form/references/ebuilder-form/ebuilder-form-association.md
+ * 基础路径 /api/bs/ebuilder/form/association
+ *
+ * 关联页签的「条件过滤」= associationPermissions[].condition.rootdata（条件树）。
+ * 读写不对称（抓包+实测）：
+ *   - 读 getDataAssociationById/{id}  → rootdata 是明文 JSON（直接 parse）
+ *   - 写 saveOrUpdate                → rootdata 必须 LZW 压缩（后端 decryptByLZ 解密）
+ *   - getListByObjId                 → 列表视图，不返回 permissions 的 rootdata（读条件用 detail）
+ * 条件树结构与 list-filter config.filter 同构，复用 buildConditionTree（datas[] + conditions）。
+ * save 时后端会规范化树（丢 key/parentNode/rootStr，补 filterIsNull/formInfo 等），条件语义保留。
+ */
+const BASE = '/api/bs/ebuilder/form/association';
+function parseRules(input) {
+    let value = input;
+    if (value.startsWith('@')) {
+        const file = value.slice(1);
+        if (!existsSync(file))
+            throw new Error(`规则文件不存在: ${file}`);
+        value = readFileSync(file, 'utf-8');
+    }
+    let parsed;
+    try {
+        parsed = JSON.parse(value);
+    }
+    catch {
+        throw new Error('--rules 不是有效 JSON');
+    }
+    if (!Array.isArray(parsed))
+        throw new Error('--rules 必须是 JSON 数组');
+    return parsed;
+}
+/** 读单个关联详情（明文 rootdata） */
+async function fetchAssociation(client, baseUrl, appId, associationId) {
+    const res = await client.get(`${baseUrl}${BASE}/getDataAssociationById/${associationId}?apid=${appId}`, { ebbusinessid: appId });
+    if (res?.code !== 200 || !res?.status)
+        throw new Error(`读取关联失败: ${res?.msg || '未知错误'}`);
+    return res?.data || {};
+}
+/** 解析明文 rootdata → 可读条件列表 */
+function decodeConditions(rootdata) {
+    let tree = null;
+    if (rootdata) {
+        try {
+            tree = JSON.parse(rootdata);
+        }
+        catch {
+            tree = null;
+        }
+    }
+    const rules = (tree?.datas || []).filter((d) => d?.type === 'condition').map((d) => {
+        const c = d.conditions || {};
+        const sel = c.selectValue;
+        const val = sel && typeof sel === 'object' ? sel.content : c.value;
+        return {
+            field: d.text || '',
+            fieldId: String(d.id || '').replace(/^field_/, ''),
+            operator: c.func || '',
+            value: val ?? '',
+            text: c.text ?? '',
+        };
+    });
+    return { rules, tree };
+}
+/** 定位 permission：--perm 为数字→1-based 序号；否则按 selectedType 匹配首个 */
+function findPermission(perms, permSelector) {
+    if (/^\d+$/.test(permSelector)) {
+        const idx = Number(permSelector) - 1;
+        if (idx < 0 || idx >= perms.length)
+            throw new Error(`--perm 序号 ${permSelector} 越界（共 ${perms.length} 条权限）`);
+        return { perm: perms[idx], index: idx };
+    }
+    const idx = perms.findIndex((p) => p.selectedType === permSelector);
+    if (idx < 0)
+        throw new Error(`未找到 selectedType="${permSelector}" 的权限；现有: ${perms.map((p) => p.selectedType).join('/').replace(/\/$/, '(无)')}`);
+    return { perm: perms[idx], index: idx };
+}
+export function registerFormAssociationCommands(form, program) {
+    const assoc = form.command('association').description('表单关联页签管理（数据关联 + 条件过滤）');
+    // ─── LIST ─────────────────────────────────────────────
+    assoc.command('list')
+        .description('查询表单下全部关联页签（getListByObjId，不含条件详情）')
+        .argument('<objId>', '表单 objId')
+        .argument('<appId>', '应用 ID')
+        .action(async (objId, appId) => {
+        try {
+            const opts = program.opts();
+            const auth = await AuthSession.fromOptions(opts);
+            if (!auth)
+                throw new Error('无法加载认证');
+            const client = new ApiClient(auth);
+            const baseUrl = auth.getBaseUrl();
+            const res = await client.get(`${baseUrl}${BASE}/getListByObjId?objId=${objId}&apid=${appId}&pageName=`, { ebbusinessid: appId });
+            if (res?.code !== 200 || !res?.status)
+                throw new Error(`查询失败: ${res?.msg}`);
+            const datas = res?.data?.datas || [];
+            if (opts.json) {
+                console.log(JSON.stringify({ total: datas.length, datas }, null, 2));
+                return;
+            }
+            if (!datas.length) {
+                console.log('无关联页签');
+                return;
+            }
+            console.log(`共 ${datas.length} 个关联页签:`);
+            for (const d of datas) {
+                console.log(`  [${d.id}] ${d.pageName || '(未命名)'}  open=${d.open}  order=${d.order ?? ''}  selected=${d.selected}`);
+            }
+        }
+        catch (e) {
+            console.error(`查询关联失败: ${e.message}`);
+            process.exitCode = 1;
+        }
+    });
+    // ─── GET ─────────────────────────────────────────────
+    assoc.command('get')
+        .description('查看关联详情（含每条权限的条件过滤，明文解析）')
+        .argument('<objId>', '表单 objId')
+        .argument('<appId>', '应用 ID')
+        .argument('<associationId>', '关联 ID')
+        .action(async (objId, appId, associationId) => {
+        try {
+            const opts = program.opts();
+            const auth = await AuthSession.fromOptions(opts);
+            if (!auth)
+                throw new Error('无法加载认证');
+            const client = new ApiClient(auth);
+            const baseUrl = auth.getBaseUrl();
+            const d = await fetchAssociation(client, baseUrl, appId, associationId);
+            const perms = d.associationPermissions || [];
+            if (opts.json) {
+                const out = { ...d, associationPermissions: perms.map((p) => {
+                        const { rules } = decodeConditions(p?.condition?.rootdata);
+                        return { selectedType: p.selectedType, name: p.name, dataid: p.dataid, rules };
+                    }) };
+                console.log(JSON.stringify(out, null, 2));
+                return;
+            }
+            console.log(`关联 [${d.id}] ${d.pageName}  open=${d.open}  objId=${d.objId}`);
+            console.log(`权限条数: ${perms.length}`);
+            perms.forEach((p, i) => {
+                const { rules } = decodeConditions(p?.condition?.rootdata);
+                console.log(`\n  权限 ${i + 1}: selectedType=${p.selectedType} name=${p.name || ''} dataid=${p.dataid}`);
+                if (!rules.length) {
+                    console.log(`    （无条件过滤）`);
+                }
+                else {
+                    for (const r of rules)
+                        console.log(`    - ${r.field} (${r.fieldId}) ${r.operator} ${JSON.stringify(r.value)}${r.text ? ` [${r.text}]` : ''}`);
+                }
+            });
+        }
+        catch (e) {
+            console.error(`查看关联失败: ${e.message}`);
+            process.exitCode = 1;
+        }
+    });
+    // ─── SET-CONDITION ────────────────────────────────────
+    assoc.command('set-condition')
+        .description('设置关联某条权限的条件过滤（read-modify-write：读→重建条件树→LZW压缩→saveOrUpdate）')
+        .argument('<objId>', '表单 objId')
+        .argument('<appId>', '应用 ID')
+        .argument('<associationId>', '关联 ID')
+        .requiredOption('--perm <n|type>', '目标权限：1-based 序号 或 selectedType(user/all 等)')
+        .requiredOption('--rules <json|@file>', '条件数组 JSON 或 @文件；每项 {fieldId,func,value,text?}  func 见 list-filter（contains/等于eq/不等于neq/属于aggregate/不属于unaggregate/大于gt/小于lt/区间range/为空empty/不为空nempty/以...开头startWith/以...结尾endWith）')
+        .option('--logic <and|or>', '多条件关系', 'and')
+        .action(async (objId, appId, associationId, raw) => {
+        try {
+            const opts = program.opts();
+            const auth = await AuthSession.fromOptions(opts);
+            if (!auth)
+                throw new Error('无法加载认证');
+            const client = new ApiClient(auth);
+            const baseUrl = auth.getBaseUrl();
+            const isJson = opts.json;
+            const inputs = parseRules(raw.rules);
+            if (!inputs.length)
+                throw new Error('--rules 至少 1 条条件');
+            const logic = raw.logic === 'or' ? 'or' : 'and';
+            // 1. 读关联详情（明文 rootdata）
+            const detail = await fetchAssociation(client, baseUrl, appId, associationId);
+            const perms = detail.associationPermissions || [];
+            if (!perms.length)
+                throw new Error('该关联无权限条目，无法设置条件');
+            const { index } = findPermission(perms, raw.perm);
+            // 2. 校验条件字段 + 解析 valueField 引用
+            const fields = await fetchFields(client, baseUrl, objId);
+            const conds = inputs.map((r) => ({
+                fieldId: String(r.fieldId),
+                func: r.func,
+                value: r.value,
+                text: r.text,
+                valueField: r.valueField,
+            }));
+            for (const c of conds) {
+                if (!fields.find((f) => String(f.id) === String(c.fieldId))) {
+                    throw new Error(`条件字段 ${c.fieldId} 在表单 ${objId} 中不存在`);
+                }
+            }
+            await resolveValueFieldRefs(client, baseUrl, appId, objId, conds, fields);
+            // 3. 构造明文条件树（与 list-filter 同构）
+            const treeStr = buildConditionTree(conds, fields, objId, true);
+            // relationship: and→'1' / or→'2'（buildConditionTree 默认 '1'，or 时覆盖）
+            let treeObj = null;
+            try {
+                treeObj = JSON.parse(treeStr);
+            }
+            catch {
+                treeObj = null;
+            }
+            if (logic === 'or' && treeObj)
+                treeObj.relationship = '2';
+            // 4. 所有权限的 rootdata 一并 LZW 压缩（写时必须压缩；未改的也压其明文）
+            const saveBody = JSON.parse(JSON.stringify(detail));
+            saveBody.associationPermissions = perms.map((p, i) => {
+                const np = JSON.parse(JSON.stringify(p));
+                const plain = i === index ? (treeStr || '') : (p?.condition?.rootdata || '');
+                // 明文空（无条件）→ 空树；否则压缩
+                const compressed = plain ? lzwCompress(plain) : '';
+                np.condition = { ...(np.condition || {}), rootdata: compressed };
+                return np;
+            });
+            // 5. saveOrUpdate（带 id 更新，保留所有原字段）
+            const resp = await client.post(`${baseUrl}${BASE}/saveOrUpdate?apid=${appId}&tpaid=${objId}&objId=${objId}`, saveBody, { ebbusinessid: appId });
+            if (resp?.code !== 200 || !resp?.status)
+                throw new Error(`保存失败: ${resp?.msg}`);
+            // 6. 读回验证（目标权限条件数与输入一致）
+            const after = await fetchAssociation(client, baseUrl, appId, associationId);
+            const afterPerms = after.associationPermissions || [];
+            const { rules: afterRules } = decodeConditions(afterPerms[index]?.condition?.rootdata);
+            if (afterRules.length !== inputs.length) {
+                throw new Error(`回读条件数不一致: 期望 ${inputs.length}, 实际 ${afterRules.length}`);
+            }
+            if (isJson) {
+                console.log(JSON.stringify({ success: true, associationId, permIndex: index + 1, logic, rules: afterRules }, null, 2));
+            }
+            else {
+                console.log('关联条件过滤已保存并回读验证');
+                console.log(`  关联: ${associationId}  权限 ${index + 1} (selectedType=${afterPerms[index]?.selectedType})`);
+                console.log(`  条件逻辑: ${logic}  规则数: ${afterRules.length}`);
+                for (const r of afterRules)
+                    console.log(`  - ${r.field} (${r.fieldId}) ${r.operator} ${JSON.stringify(r.value)}${r.text ? ` [${r.text}]` : ''}`);
+            }
+        }
+        catch (e) {
+            console.error(`设置关联条件失败: ${e.message}`);
+            process.exitCode = 1;
+        }
+    });
+    // ─── CLEAR-CONDITION ──────────────────────────────────
+    assoc.command('clear-condition')
+        .description('清空关联某条权限的条件过滤')
+        .argument('<objId>', '表单 objId')
+        .argument('<appId>', '应用 ID')
+        .argument('<associationId>', '关联 ID')
+        .requiredOption('--perm <n|type>', '目标权限：1-based 序号 或 selectedType')
+        .action(async (objId, appId, associationId, raw) => {
+        try {
+            const opts = program.opts();
+            const auth = await AuthSession.fromOptions(opts);
+            if (!auth)
+                throw new Error('无法加载认证');
+            const client = new ApiClient(auth);
+            const baseUrl = auth.getBaseUrl();
+            const detail = await fetchAssociation(client, baseUrl, appId, associationId);
+            const perms = detail.associationPermissions || [];
+            const { index } = findPermission(perms, raw.perm);
+            const saveBody = JSON.parse(JSON.stringify(detail));
+            saveBody.associationPermissions = perms.map((p, i) => {
+                const np = JSON.parse(JSON.stringify(p));
+                // 目标权限置空条件树；其余压缩其明文
+                const plain = i === index ? '' : (p?.condition?.rootdata || '');
+                np.condition = { ...(np.condition || {}), rootdata: plain ? lzwCompress(plain) : '' };
+                return np;
+            });
+            const resp = await client.post(`${baseUrl}${BASE}/saveOrUpdate?apid=${appId}&tpaid=${objId}&objId=${objId}`, saveBody, { ebbusinessid: appId });
+            if (resp?.code !== 200 || !resp?.status)
+                throw new Error(`清空失败: ${resp?.msg}`);
+            const after = await fetchAssociation(client, baseUrl, appId, associationId);
+            const afterPerms = after.associationPermissions || [];
+            const { rules } = decodeConditions(afterPerms[index]?.condition?.rootdata);
+            if (rules.length)
+                throw new Error(`清空后仍存在 ${rules.length} 条条件`);
+            console.log(opts.json ? JSON.stringify({ success: true, associationId, permIndex: index + 1 }) : `已清空关联 ${associationId} 权限 ${index + 1} 的条件过滤`);
+        }
+        catch (e) {
+            console.error(`清空关联条件失败: ${e.message}`);
+            process.exitCode = 1;
+        }
+    });
+}
+//# sourceMappingURL=form-association.js.map

package/dist/commands/form-association.js.map

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

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

@@ -1 +1 @@
-{"version":3,"file":"form-list-filter.d.ts","sourceRoot":"","sources":["../../src/commands/form-list-filter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAMpC;;;;;GAKG;AACH,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,CA2E/E"}
+{"version":3,"file":"form-list-filter.d.ts","sourceRoot":"","sources":["../../src/commands/form-list-filter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAMpC;;;;;GAKG;AACH,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,CA6E/E"}

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

@@ -1,6 +1,6 @@
 import { AuthSession } from '../core/auth.js';
 import { ApiClient } from '../core/client.js';
-import { fetchFields, loadMobileConfig, buildConditionTree } from './form-list-utils.js';
+import { fetchFields, loadMobileConfig, buildConditionTree, resolveValueFieldRefs } from './form-list-utils.js';
 /**
  * 视图数据条件（list-filter）命令。
  * 走 saveNListConfig config.filter（明文条件树，非独立接口——同事 e10-list-view skill 实证：
@@ -13,7 +13,7 @@ export function registerListFilterCommand(form, program) {
         .argument('<objId>', '表单 objId')
         .argument('<appId>', '应用 ID')
         .argument('<listId>', '台账列表 ID')
-        .option('--add <json>', '设置视图数据条件: \'{"conditions":[{"fieldId":"...","func":"eq","value":"研发valueKey","text":"研发"}]}\'  func=eq 等于/notEq/in/like/gt/lt/between（单选Select实测用eq）')
+        .option('--add <json>', '设置视图数据条件: \'{"conditions":[{"fieldId":"...","func":"eq","value":"研发valueKey","text":"研发"}]}\'  func=eq 等于/notEq 不等于/in 属于/like 包含/gt 大于/lt 小于/range 区间（单选Select实测用eq）。值引用另一字段（field vs field）用 valueField（目标字段名或fieldId），如 \'{"conditions":[{"fieldId":"标题id","func":"eq","valueField":"申请日期"}]}\'')
         .option('--clear', '清空视图数据条件')
         .option('--pc-only', '目标明确只使用 PC；移动端配置不存在时允许继续')
         .option('--json', 'JSON 格式输出当前视图数据条件')
@@ -86,6 +86,8 @@ export function registerListFilterCommand(form, program) {
                     process.exit(1);
                 }
             }
+            // 解析 valueField（值引用另一字段）→ compareFormField 对象
+            await resolveValueFieldRefs(client, baseUrl, appId, objId, rule.conditions, fields);
             const treeStr = buildConditionTree(rule.conditions, fields, objId, true);
             cfg.filter = JSON.parse(treeStr); // 明文条件树对象存入 config.filter
         }

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"form-list-search-group.d.ts","sourceRoot":"","sources":["../../src/commands/form-list-search-group.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA4CpC,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,CAyEpF"}
+{"version":3,"file":"form-list-search-group.d.ts","sourceRoot":"","sources":["../../src/commands/form-list-search-group.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA4CpC,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,CAgFpF"}

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

@@ -17,7 +17,7 @@ import { loadMobileConfig } from './form-list-utils.js';
  * 仅支持选项类字段（Select/RadioBox/CheckBox，dataType:["dataOptionObj"]）；其他类型需抓包确认 dataType。
  */
 const OPTION_COMP = new Set(['Select', 'RadioBox', 'CheckBox']);
-function buildGroupFilter(t, objId) {
+function buildGroupFilter(t, objId, showPosition = '1') {
     const id = String(t.id);
     return {
         id, fieldId: id,
@@ -26,7 +26,7 @@ function buildGroupFilter(t, objId) {
         showName: t.text, fieldShowName: t.text, text: t.text,
         objId: t.objId || objId,
         fieldType: t.type, type: t.type,
-        expandMethod: '0', showPosition: '0', tabStyle: 'select',
+        expandMethod: '0', showPosition, tabStyle: 'select',
         config: {
             formId: t.browserParams?.formId, hideScore: true, groupId: '-1',
             dataType: ['dataOptionObj'], title: t.text, type: t.type,
@@ -44,6 +44,7 @@ export function registerListSearchGroupCommand(form, program) {
         .argument('<appId>', '应用 ID')
         .argument('<listId>', '台账列表 ID')
         .option('--add <fieldId>', '添加分类搜索字段（须为主表选项类字段：Select/RadioBox/CheckBox）')
+        .option('--position <0|1>', '显示位置：1=顶部（缺省，所有字段可用）/ 0=下拉样式（仅 Select 等下拉类型可用）', '1')
         .option('--remove <fieldId>', '按字段 ID 移除一条分类搜索')
         .option('--clear', '清空所有分类搜索')
         .option('--pc-only', '目标明确只使用 PC；移动端配置不存在时允许继续')
@@ -109,7 +110,13 @@ export function registerListSearchGroupCommand(form, program) {
                 console.error(`字段 ${cmdOpts.add} 已在分类搜索中`);
                 process.exit(1);
             }
-            sc.groupFilters = [...groupFilters, buildGroupFilter(t, objId)];
+            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（顶部）`);
+                process.exit(1);
+            }
+            sc.groupFilters = [...groupFilters, buildGroupFilter(t, objId, pos)];
+            console.error(`  已加分类搜索: ${t.text} (showPosition=${pos} ${pos === '1' ? '顶部' : '下拉'})`);
         }
         // 保存前读回真实移动端 mConfig 原样回传（仅改 PC config.searchConditions，移动端保持原样）
         const { mobileConfig, mobilePreserved } = await loadMobileConfig(client, baseUrl, appId, listId, cmdOpts.pcOnly);