weaver-e10-builder 1.5.12 → 1.5.14

package/dist/commands/form.js

@@ -3,8 +3,9 @@ import { AuthSession } from '../core/auth.js';
 import { ApiClient } from '../core/client.js';
 import { parseLayoutJson } from '../services/form-layout-source/json.js';
 import { toColumnName, toTableName, resolveFieldKeys } from '../utils/column-name.js';
-import { createCustomPhysicalForm, applyInitialFieldsToNewForm, placeholderFromFormat, reapplyGroupLayout, queryFormStorageSetting } from '../services/form-create.js';
+import { createCustomPhysicalForm, applyInitialFieldsToNewForm, collectDetailEBuilderFields, defaultSwitchOptions, placeholderFromFormat, reapplyGroupLayout, queryFormStorageSetting } from '../services/form-create.js';
 import { getRichType, richIdUnits, BROWSER_KINDS } from '../services/rich-types.js';
+import { BROWSER_BEAN_SEARCH, browserBeanRows, resolveBrowserByName } from '../services/browser.js';
 import { dropFieldComponents, prepareLayoutForSave } from '../services/form-field-drop.js';
 import { describeEditBaseFailure, resolveEditBase as resolveEditBasePure } from '../services/form-edit-base.js';
 import { applyFieldPatches, platformFieldShape } from '../services/form-field-patch.js';
@@ -22,6 +23,7 @@ import { resolveFormRecord, resolveFormId, appendThirdPartyForms, resolveObjIdBy
 import { FIELD_TYPE_CHOICES, canonComponentKey, assertFieldType, normalizeFieldDef } from '../services/form-field-validate.js';
 import { listFormTables, readFieldRecords, mapFieldsToTables } from '../services/form-physical-table.js';
 import { buildFormulaParameters, defaultReturnType } from '../services/formula-detail.js';
+import { assertViewLinkageFormulaFunctions, loadViewLinkageFunctions } from '../services/form-view-linkage-functions.js';
 import { registerOptionTemplateCommand } from './form-option-template.js';
 import { registerFormObjMetaCommands } from './form-obj-meta.js';
 import { prepareSourceLayoutInputs, restoreSourceLayoutAfterCreate } from '../services/form-layout-source/creation.js';
@@ -310,6 +312,19 @@ export function registerFormCommands(program) {
             }
         }
     });
+    form.command('browser-source')
+        .description('检索当前环境可用的关联浏览数据源（含自定义浏览框）')
+        .option('--keyword <name>', '按名称关键词检索', '')
+        .action(async (o) => {
+        const auth = await AuthSession.fromOptions(program.opts());
+        if (!auth)
+            throw new Error('无法加载认证');
+        const client = new ApiClient(auth);
+        const res = await client.get(`${auth.getBaseUrl()}${BROWSER_BEAN_SEARCH}?searchValue=${encodeURIComponent(o.keyword)}`);
+        if (res?.code !== 200 || res?.status === false)
+            throw new Error(res?.msg || '浏览数据源检索失败');
+        console.log(JSON.stringify(browserBeanRows(res).map((b) => ({ id: b.id, name: b.name, module: b.module, type: b.type })), null, 2));
+    });
     form.command('create')
         .description('创建表单')
         .argument('<appId>', '应用 ID')
@@ -571,6 +586,8 @@ export function registerFormCommands(program) {
         let objId = '';
         let formId = '';
         let fieldGroups = [];
+        /** 明细表定义 → 建出来的 subFormId（明细 EBuilder 关联绑定要用）。 */
+        let detailTables = [];
         try {
             const result = await createCustomPhysicalForm(client, baseUrl, appId, name, requestedTableName, false, layoutType);
             objId = result.objId;
@@ -586,6 +603,7 @@ export function registerFormCommands(program) {
             // services/form-create.ts 的 applyInitialFieldsToNewForm，「专项建表」共用同一条链。
             const fieldResult = await applyInitialFieldsToNewForm(client, baseUrl, appId, objId, formId, fieldDefs, { tenantKey: auth.tenantKey, layoutType, systemOverrides });
             fieldGroups = fieldResult.fieldGroups;
+            detailTables = fieldResult.detailTables || [];
         }
         catch (e) {
             console.error(`创建失败: ${e.message}`);
@@ -637,15 +655,22 @@ export function registerFormCommands(program) {
         // Step 2: EBuilder fields need follow-up binding to target forms.
         // 无 sformId 的 EBuilder 会被建成裸关联字段（isAddForRelation=false，无目标表），
         // 这是"关联ebuilder不对"的常见来源，明确警告避免静默。
-        const ebNoTarget = fieldDefs.filter(f => f.componentKey === 'EBuilder' && !f.sformId);
+        // 明细表里的 EBuilder 子字段也要绑定 —— 它们不在 fieldDefs 顶层，必须从 DetailTable.formFields 里取。
+        // 只靠下面的顶层循环，明细 EBuilder 会建成`isAddForRelation=false`、没有 sformId/formName 的裸字段。
+        const detailEbDefs = collectDetailEBuilderFields(fieldDefs);
+        const ebNoTarget = [
+            ...fieldDefs.filter(f => f.componentKey === 'EBuilder' && !f.sformId),
+            ...detailEbDefs.filter((f) => !f.sformId).map((f) => ({ ...f, fieldName: `${f.detailName}.${f.fieldName}` })),
+        ];
         if (ebNoTarget.length > 0) {
             console.error(`  ⚠ ${ebNoTarget.length} 个 EBuilder 字段缺少 sformId，将建成无关联裸字段:`);
             for (const f of ebNoTarget)
                 console.error(`    - ${f.fieldName}（需在 fields.json 指定 sformId=<目标表单objId> 与 dataTitle=<显示字段>）`);
         }
         const ebFields = fieldDefs.filter(f => f.componentKey === 'EBuilder' && f.sformId);
-        if (ebFields.length > 0) {
-            console.error(`  绑定 ${ebFields.length} 个 EBuilder 关联字段...`);
+        const detailEbFields = detailEbDefs.filter((f) => f.sformId);
+        if (ebFields.length > 0 || detailEbFields.length > 0) {
+            console.error(`  绑定 ${ebFields.length + detailEbFields.length} 个 EBuilder 关联字段...`);
             // Resolve target form names and field IDs from sformId
             const formList = await client.get(`${baseUrl}/api/bs/ebuilder/form/obj/getList/${appId}?apid=${appId}`, { ebbusinessid: appId });
             const allForms = formList?.data || [];
@@ -807,6 +832,81 @@ export function registerFormCommands(program) {
                     console.error(`    关联失败: ${ef.fieldName} — ${updateRes?.msg || '未知错误'}`);
                 }
             }
+            // 明细表子字段：创建时不在主表字段记录里，按 subFormId 单独读回再补关联。
+            // 用 getFormField 的完整记录做底保存 —— 只发少数字段会把 subFormId / formTableId 等冲掉。
+            if (detailEbFields.length > 0) {
+                const subFormIdByDetail = new Map(detailTables.map((dt) => [String(dt.definition?.fieldName ?? ''), String(dt.subFormId ?? '')]));
+                const childRowsCache = new Map();
+                const childRowsOf = async (subFormId) => {
+                    if (!childRowsCache.has(subFormId)) {
+                        const r = await client.post(`${baseUrl}/api/ebuilder/form/form/field/manage/getFormFieldPage?apid=${appId}`, {
+                            pageNo: 1, pageSize: 500, module: 'ebuilderform',
+                            customParam: { appId, objId },
+                            formFieldSearchEntity: { isDelete: 0, status: 'enable', formId: resolvedFormId, subFormId },
+                        }, { ebbusinessid: resolvedFormId });
+                        childRowsCache.set(subFormId, r?.data?.pageDatas?.result || r?.data?.data?.records || r?.data?.data || []);
+                    }
+                    return childRowsCache.get(subFormId);
+                };
+                for (const ef of detailEbFields) {
+                    const subFormId = subFormIdByDetail.get(String(ef.detailName)) || '';
+                    if (!subFormId) {
+                        console.error(`    警告: 找不到明细表「${ef.detailName}」的 subFormId，跳过 ${ef.fieldName}`);
+                        continue;
+                    }
+                    const rows = await childRowsOf(subFormId);
+                    const hits = rows.filter((r) => String(r.title ?? r.fieldName ?? '') === String(ef.fieldName));
+                    if (hits.length !== 1) {
+                        console.error(`    警告: 明细表「${ef.detailName}」里${hits.length ? '有多个' : '找不到'}「${ef.fieldName}」，无法绑定，跳过`);
+                        continue;
+                    }
+                    const child = hits[0];
+                    const gf = await client.post(`${baseUrl}/api/ebuilder/form/form/field/manage/getFormField`, { module: 'ebuilderform', formTableField: { formField: { id: child.fieldId, form: { id: resolvedFormId } } } }, { ebbusinessid: resolvedFormId });
+                    const full = gf?.data || child;
+                    let targetBizFields = [];
+                    try {
+                        const tfd = await client.post(`${baseUrl}/api/ebuilder/form/dataset/v1/getFields`, {
+                            objId: ef.sformId, userid: auth.userId, tenantKey: auth.tenantKey,
+                        });
+                        targetBizFields = (tfd?.data?.mainFields || [])
+                            .filter((f) => /^\d+$/.test(String(f.fieldId)))
+                            .map((f) => ({ id: String(f.fieldId), name: String(f.fieldName || f.title || '') }))
+                            .slice(0, 5);
+                    }
+                    catch { /* 目标表查询失败则显示列留空 */ }
+                    const jsonObj = {
+                        ...full,
+                        formId: resolvedFormId,
+                        sformId: ef.sformId,
+                        formName: ef.formName || formNameById.get(ef.sformId || '') || ef.sformId || '',
+                        dataTitle: await resolveDataTitle(ef.sformId || '', ef.dataTitle || 'name'),
+                        appId,
+                        isAddForRelation: true,
+                        displayType: 'line',
+                        viewDataDetail: true,
+                        quickAddParams: [],
+                        relateViewData: [],
+                        relateField: null,
+                        virtualForm: false,
+                        virtualTable: false,
+                        type: 'EBuilder',
+                        componentKey: 'Ebuilder',
+                        isSingle: ef.multiple ? false : true,
+                        ffDisplayColumns: Array.isArray(ef.displayColumns) && ef.displayColumns.length
+                            ? ef.displayColumns
+                                .map((name) => targetBizFields.find((f) => f.name === name))
+                                .filter((f) => !!f)
+                            : targetBizFields,
+                    };
+                    const res = await client.post(`${baseUrl}/api/ebuilder/form/form/field/manage/saveFormFieldNew?apid=${appId}`, { formId: resolvedFormId, module: 'ebuilderform', customParam: { appId, objId }, jsonObj: JSON.stringify(jsonObj) }, { ebbusinessid: resolvedFormId });
+                    if (res?.code === 200 && res?.status) {
+                        console.error(`    已关联: ${ef.detailName}.${ef.fieldName} → ${ef.sformId}`);
+                    }
+                    else {
+                        console.error(`    关联失败: ${ef.detailName}.${ef.fieldName} — ${res?.msg || '未知错误'}`);
+                    }
+                }
+            }
         }
         // Step 2a: Select 绑定选项预设模板（fields.json optionTemplate 属性）。
         // 建表时字段已建成裸 Select（无选项），此处补 templateId/templateName/publicTemplate:false/options:[]。
@@ -1768,13 +1868,121 @@ export function registerFormCommands(program) {
         }
     });
     const linkageCmd = form.command('linkage').description('表单字段显隐联动管理');
+    const linkageBase = '/api/ebuilder/form/form/setting/viewlinkage';
+    async function readLinkage(client, baseUrl, appId, objId, formId, id) {
+        const res = await client.get(`${baseUrl}${linkageBase}/id?${new URLSearchParams({ id, formId, module: 'ebuilderform', apid: appId })}`);
+        if (res?.code !== 200 || !res?.status || !res?.data || String(res.data.id) !== id) {
+            throw new Error(`读取显示属性联动 ${id} 失败: ${res?.msg || '未找到规则'}`);
+        }
+        if (String(res.data.formId) !== formId)
+            throw new Error(`规则 ${id} 不属于表单 ${objId}`);
+        return res.data;
+    }
+    async function readLinkageLayoutTargets(client, baseUrl, appId, objId, formId) {
+        const res = await client.post(`${baseUrl}/api/ebuilder/form/common/browser/complete/form_dataDrivenColumn?apid=${appId}`, {
+            browserMultiple: true, formId, module: 'ebuilderform', groupId: 'layoutComponent',
+            makeComplexField: true, openTab: false, scenarioType: 'VIEW_LINKAGE_TARGET',
+            notComponentKeyList: ['DividingLine', 'ColumnPanel', 'MultiTypeField', 'WPSEditor'],
+            needI18n: true, newly: 1, searchValue: '', customParam: { appId, objId },
+        });
+        if (res?.code !== 200 || !res?.status || !Array.isArray(res?.data?.data)) {
+            throw new Error(`查询布局组件失败: ${res?.msg || '未返回组件列表'}`);
+        }
+        return res.data.data;
+    }
+    async function resolveLayoutActions(client, baseUrl, appId, objId, formId, actions) {
+        if (!actions.some((action) => action.linkageObj === 'layout'))
+            return actions;
+        const targets = await readLinkageLayoutTargets(client, baseUrl, appId, objId, formId);
+        return actions.map((action) => action.linkageObj !== 'layout' ? action : {
+            ...action,
+            fields: action.fields.map((field) => {
+                const target = targets.find((item) => String(item.id) === String(field.id));
+                if (!target)
+                    throw new Error(`布局组件 ${field.id} 不在当前表单的可选列表中`);
+                return target;
+            }),
+        });
+    }
+    function checkLinkageActions(actions) {
+        if (!Array.isArray(actions) || actions.length === 0)
+            throw new Error('至少配置一项联动变更对象 actions[]');
+        const props = {
+            field: ['hide', 'show', 'edit', 'readonly', 'required', 'hideLine', 'hideRow'],
+            option: ['hide', 'disabled'],
+            detail: ['hide', 'show', 'edit', 'readonly', 'hideLine', 'hideRow'],
+            layout: ['hide', 'show', 'hideLine'],
+        };
+        for (const action of actions) {
+            const obj = action.linkageObj || 'field';
+            if (!props[obj])
+                throw new Error(`联动对象 ${obj} 暂无已确认的保存结构；支持 field / option / detail / layout`);
+            if (!props[obj].includes(action.prop))
+                throw new Error(`${obj} 不支持效果 ${action.prop}；可用 ${props[obj].join('/')}`);
+            if (!Array.isArray(action.fields) || !action.fields.length)
+                throw new Error(`${obj} 效果需指定 fields[]`);
+            if (obj === 'layout' && action.fields.some((field) => !field.id)) {
+                throw new Error('布局组件目标需在 fields[] 中提供可选列表返回的 id');
+            }
+            if (obj === 'option' && (!Array.isArray(action.options) || !action.options.length)) {
+                throw new Error('选项目标需指定 options[]（fieldId、optionId、optionName）');
+            }
+            for (const option of action.options || []) {
+                if (!option.fieldId || !option.optionId || !option.optionName) {
+                    throw new Error('options[] 每项需包含 fieldId、optionId、optionName');
+                }
+            }
+        }
+    }
+    async function resolveLinkageFormula(client, baseUrl, appId, objId, formId, config) {
+        if (config.formulaId) {
+            if (!config.formulaName)
+                throw new Error('引用已有公式需同时提供 formulaName');
+            const detail = await client.post(`${baseUrl}/api/excel/formula/detail`, { formulaId: config.formulaId });
+            const existing = detail?.resultJson?.data;
+            if (!detail?.resultJson?.excute || !existing?.expressSql)
+                throw new Error('无法读取已有公式表达式，已停止绑定显示属性联动');
+            if (String(existing.returnType || '').toLowerCase() !== 'boolean')
+                throw new Error('显示属性联动引用的已有公式必须返回 Boolean');
+            assertViewLinkageFormulaFunctions(String(existing.expressSql), await loadViewLinkageFunctions(client, baseUrl));
+            return { id: String(config.formulaId), name: String(config.formulaName) };
+        }
+        if (!config.formula)
+            return undefined;
+        const expression = String(config.formula).trim();
+        assertViewLinkageFormulaFunctions(expression, await loadViewLinkageFunctions(client, baseUrl));
+        const parsed = await buildFormulaParameters(client, baseUrl, objId, appId, formId, expression);
+        if (parsed.errors.length)
+            throw new Error(`公式引用无效: ${parsed.errors.join('; ')}`);
+        for (const warning of parsed.warnings)
+            console.error(`  ⚠ ${warning}`);
+        const name = String(config.formulaName || `显示属性联动公式_${Date.now()}`);
+        const res = await client.post(`${baseUrl}/api/excel/formula/save`, {
+            expressSql: parsed.normalizedExpression, name, parameters: parsed.parameters,
+            returnType: 'Boolean', validateType: 'normal', referenceType: 'check',
+            extendParam: JSON.stringify({ isFormViewLinkage: true }), formulaId: null,
+            dataSources: [], formulaType: 'normal', mainDataSource: [null],
+            tempVariableList: [], nameAuto: false, module: 'ebuilderform', multiFuncSepType: 1,
+        });
+        if (res?.returnInfo?.state === 'VERIFY_REQUIRED' || res?.securityCheckResult === false) {
+            throw new Error('公式保存需要二次验证，联动规则尚未保存；请完成平台验证后再试');
+        }
+        if (!res?.resultJson?.excute || !res?.resultJson?.id || res?.resultJson?.returnType !== 'Boolean') {
+            throw new Error(`布尔公式保存失败: ${res?.resultJson?.error || res?.msg || '未返回有效 Boolean 公式'}`);
+        }
+        console.error(`  布尔公式已保存: ${res.resultJson.id}（若后续联动保存失败，请用 formulaId/formulaName 复用）`);
+        return { id: String(res.resultJson.id), name };
+    }
     linkageCmd.command('add')
         .description('添加字段显隐联动规则')
         .argument('<appId>', '应用 ID')
         .argument('<objId>', '表单 objId')
         .argument('<name>', '联动规则名称')
         .requiredOption('--config <json>', '联动配置 JSON（@文件路径），格式见文档')
+        .option('--disabled', '新建时停用（默认启用）')
         .action(async (appId, objId, name, cmdOpts) => {
+        if (name.length > 200)
+            throw new Error('联动名称不能超过 200 字');
         const opts = program.opts();
         const auth = await AuthSession.fromOptions(opts);
         if (!auth)
@@ -1790,23 +1998,15 @@ export function registerFormCommands(program) {
             console.error(e.message);
             process.exit(1);
         }
-        // 校验联动 prop：必填且平台支持 hide/show/edit/readonly/required/hideLine（隐藏行，抓包实测平台枚举是 hideLine；
-        // hideRow 保留兼容旧写法）
-        const SUPPORTED_PROPS = ['hide', 'show', 'edit', 'readonly', 'required', 'hideLine', 'hideRow'];
-        const missingProps = (config.actions || []).filter((a) => !a.prop);
-        const invalidProps = (config.actions || [])
-            .filter((a) => a.prop)
-            .map((a) => a.prop)
-            .filter((p) => !SUPPORTED_PROPS.includes(String(p)));
-        if (missingProps.length > 0 || invalidProps.length > 0) {
-            if (missingProps.length > 0) {
-                console.error(`联动 action 缺少 prop（联动效果类型必填）`);
-            }
-            if (invalidProps.length > 0) {
-                console.error(`联动 prop 不支持: ${[...new Set(invalidProps)].join(', ')}`);
-                console.error(`  平台支持: ${SUPPORTED_PROPS.join(', ')}`);
-            }
-            process.exit(1);
+        checkLinkageActions(config.actions || []);
+        if (config.conditions !== undefined && (config.formula || config.formulaId)) {
+            throw new Error('简易条件 conditions 与函数条件 formula/formulaId 不能同时指定');
+        }
+        if (!config.formula && !config.formulaId && !Array.isArray(config.conditions)) {
+            throw new Error('请提供 conditions[] 或 Boolean 公式');
+        }
+        if (Array.isArray(config.conditions) && config.conditions.length === 0) {
+            throw new Error('简易条件 conditions[] 至少包含一项');
         }
         // Get formId from appId
         const formInfo = await resolveFormRecord(client, baseUrl, appId, objId);
@@ -1820,27 +2020,231 @@ export function registerFormCommands(program) {
         // 不看设计器实际报文就想不到的约束。
         const formName = formInfo?.formName || formInfo?.objName || '表单';
         const effect = await resolveEffect(client, baseUrl, formId, formName, config.effect);
+        const formula = await resolveLinkageFormula(client, baseUrl, appId, objId, formId, config);
+        const actions = await resolveLayoutActions(client, baseUrl, appId, objId, formId, config.actions || []);
         const { payload, warnings } = buildLinkageAddPayload({
             appId, objId, formId, formName, name,
             conditions: config.conditions || [],
             detailType: config.detailType,
-            actions: config.actions || [],
-            effect,
+            actions,
+            effect, formula, enableState: cmdOpts.disabled ? '0' : '1',
         });
         for (const w of warnings)
             console.error(`  ⚠ ${w}`);
         const data = await addLinkage(client, baseUrl, appId, formId, payload);
         if (data?.code === 200 && data?.status) {
-            const linkageId = data?.data || '';
+            // add 的 data 在部分环境是成功标记 1，并非规则 ID；从列表按名称回查唯一记录。
+            const listed = await client.post(`${baseUrl}${linkageBase}/queryByPages?apid=${appId}`, {
+                formId, module: 'ebuilderform', linkageTypeList: ['template', 'sql'],
+                customParam: { appId, objId }, pageNo: 1, pageSize: 50,
+            }, { ebbusinessid: appId });
+            const matches = listed?.code === 200 && listed?.status
+                ? (listed?.data?.result || []).filter((item) => item.linkageName === name) : [];
+            const linkageId = matches.length === 1 ? String(matches[0].id) : '';
             console.log(opts.json
                 ? JSON.stringify({ success: true, linkageId, name })
-                : `联动规则已添加: ${name}` + (linkageId ? ` (id: ${linkageId})` : ''));
+                : `联动规则已添加: ${name}` + (linkageId ? ` (id: ${linkageId})` : '；请用 linkage list 核对 ID'));
         }
         else {
             console.error(`添加失败: ${data?.msg || '未知错误'}`);
             process.exit(1);
         }
     });
+    linkageCmd.command('get')
+        .description('读取单条显示属性联动规则详情')
+        .argument('<appId>').argument('<objId>').argument('<id>')
+        .action(async (appId, objId, id) => {
+        try {
+            const opts = program.opts();
+            const auth = await AuthSession.fromOptions(opts);
+            if (!auth)
+                throw new Error('无法加载认证');
+            const client = new ApiClient(auth);
+            const form = await resolveFormRecord(client, auth.getBaseUrl(), appId, objId);
+            const formId = String(form?.formId || '');
+            if (!formId)
+                throw new Error('无法获取 formId');
+            const record = await readLinkage(client, auth.getBaseUrl(), appId, objId, formId, id);
+            console.log(opts.json ? JSON.stringify(record, null, 2)
+                : `${record.linkageName} (${id}) ${record.enableState === '1' ? '启用' : '停用'}；条件=${record.condition?.conditionType || '未知'}；目标=${(record.linkageDetails || []).length} 项`);
+        }
+        catch (e) {
+            console.error(`读取显示属性联动失败: ${e.message}`);
+            process.exitCode = 1;
+        }
+    });
+    linkageCmd.command('layout-targets')
+        .description('查询当前表单可作为显示属性联动目标的布局组件')
+        .argument('<appId>').argument('<objId>')
+        .action(async (appId, objId) => {
+        try {
+            const auth = await AuthSession.fromOptions(program.opts());
+            if (!auth)
+                throw new Error('无法加载认证');
+            const client = new ApiClient(auth);
+            const baseUrl = auth.getBaseUrl();
+            const form = await resolveFormRecord(client, baseUrl, appId, objId);
+            const formId = String(form?.formId || '');
+            if (!formId)
+                throw new Error('无法获取 formId');
+            const targets = await readLinkageLayoutTargets(client, baseUrl, appId, objId, formId);
+            console.log(JSON.stringify(targets, null, 2));
+        }
+        catch (e) {
+            console.error(`查询布局联动目标失败: ${e.message}`);
+            process.exitCode = 1;
+        }
+    });
+    linkageCmd.command('state')
+        .description('启用或停用显示属性联动规则')
+        .argument('<appId>').argument('<objId>').argument('<id>')
+        .requiredOption('--set <on|off>', 'on=启用，off=停用')
+        .action(async (appId, objId, id, cmdOpts) => {
+        try {
+            const state = cmdOpts.set === 'on' ? '1' : cmdOpts.set === 'off' ? '0' : '';
+            if (!state)
+                throw new Error('--set 只能为 on 或 off');
+            const auth = await AuthSession.fromOptions(program.opts());
+            if (!auth)
+                throw new Error('无法加载认证');
+            const client = new ApiClient(auth);
+            const baseUrl = auth.getBaseUrl();
+            const form = await resolveFormRecord(client, baseUrl, appId, objId);
+            const formId = String(form?.formId || '');
+            if (!formId)
+                throw new Error('无法获取 formId');
+            await readLinkage(client, baseUrl, appId, objId, formId, id);
+            const res = await client.post(`${baseUrl}${linkageBase}/updateEnableStateByEntity?apid=${appId}`, { formId, id, enableState: state, customParam: { appId, objId } }, { ebbusinessid: formId });
+            if (res?.code !== 200 || !res?.status)
+                throw new Error(res?.msg || '保存失败');
+            const saved = await readLinkage(client, baseUrl, appId, objId, formId, id);
+            if (String(saved.enableState) !== state)
+                throw new Error('启停状态保存后读回不一致');
+            console.log(`显示属性联动已${state === '1' ? '启用' : '停用'}: ${saved.linkageName} (${id})`);
+        }
+        catch (e) {
+            console.error(`切换显示属性联动失败: ${e.message}`);
+            process.exitCode = 1;
+        }
+    });
+    linkageCmd.command('update')
+        .description('读取并修改已有显示属性联动；未指定内容保持原样')
+        .argument('<appId>').argument('<objId>').argument('<id>')
+        .option('--name <text>', '新名称')
+        .option('--config <json>', '需替换的条件、目标或生效范围 JSON（@文件或内联）')
+        .action(async (appId, objId, id, cmdOpts) => {
+        try {
+            if (!cmdOpts.name && !cmdOpts.config)
+                throw new Error('至少提供 --name 或 --config');
+            if (cmdOpts.name && cmdOpts.name.length > 200)
+                throw new Error('联动名称不能超过 200 字');
+            const auth = await AuthSession.fromOptions(program.opts());
+            if (!auth)
+                throw new Error('无法加载认证');
+            const client = new ApiClient(auth);
+            const baseUrl = auth.getBaseUrl();
+            const form = await resolveFormRecord(client, baseUrl, appId, objId);
+            const formId = String(form?.formId || '');
+            if (!formId)
+                throw new Error('无法获取 formId');
+            const old = await readLinkage(client, baseUrl, appId, objId, formId, id);
+            // 详情响应还含展示/统计字段；更新接口只接收设计器提交的规则主体。
+            const payload = JSON.parse(JSON.stringify({
+                fdEffect: old.fdEffect, condition: old.condition, linkageDetails: old.linkageDetails,
+                module: 'ebuilderform', formId, refId: formId, id,
+                enableState: old.enableState, linkageName: old.linkageName,
+                customParam: { appId, objId },
+            }));
+            const config = cmdOpts.config ? readLinkageConfig(cmdOpts.config) : {};
+            if (config.actions !== undefined)
+                checkLinkageActions(config.actions);
+            if (config.conditions !== undefined && (config.formula || config.formulaId)) {
+                throw new Error('简易条件 conditions 与函数条件 formula/formulaId 不能同时指定');
+            }
+            if (config.conditions !== undefined && (!Array.isArray(config.conditions) || config.conditions.length === 0)) {
+                throw new Error('简易条件 conditions[] 至少包含一项');
+            }
+            const formula = config.formula || config.formulaId
+                ? await resolveLinkageFormula(client, baseUrl, appId, objId, formId, config) : undefined;
+            const actions = config.actions === undefined ? []
+                : await resolveLayoutActions(client, baseUrl, appId, objId, formId, config.actions);
+            const generated = buildLinkageAddPayload({
+                appId, objId, formId, formName: String(form?.formName || form?.objName || '表单'),
+                name: cmdOpts.name || old.linkageName, conditions: config.conditions || [],
+                actions, detailType: config.detailType, formula,
+            });
+            for (const warning of generated.warnings)
+                console.error(`  ⚠ ${warning}`);
+            if (cmdOpts.name)
+                payload.linkageName = cmdOpts.name;
+            if (config.effect !== undefined)
+                payload.fdEffect = await resolveEffect(client, baseUrl, formId, String(form?.formName || form?.objName || '表单'), config.effect).then((effect) => ({
+                    ...generated.payload.fdEffect, effectType: effect.effectType, effectName: effect.effectName,
+                    optionList: [{ effectValue: effect.effectValue, effectName: effect.optionName || effect.effectName }],
+                }));
+            if (config.conditions !== undefined || formula) {
+                payload.condition = { ...old.condition, ...generated.payload.condition };
+            }
+            else if (config.detailType !== undefined) {
+                payload.condition.detailType = config.detailType;
+            }
+            if (config.actions !== undefined)
+                payload.linkageDetails = generated.payload.linkageDetails;
+            payload.id = id;
+            payload.formId = formId;
+            payload.refId = formId;
+            payload.module = 'ebuilderform';
+            payload.customParam = { appId, objId };
+            const res = await client.post(`${baseUrl}${linkageBase}/update?apid=${appId}`, payload, { ebbusinessid: formId });
+            if (res?.code !== 200 || !res?.status)
+                throw new Error(res?.msg || '保存失败');
+            const saved = await readLinkage(client, baseUrl, appId, objId, formId, id);
+            if (cmdOpts.name && saved.linkageName !== cmdOpts.name)
+                throw new Error('规则名称保存后读回不一致');
+            if (formula && String(saved.condition?.formulaId || '') !== formula.id)
+                throw new Error('函数条件保存后读回不一致');
+            if (config.detailType && saved.condition?.detailType !== config.detailType)
+                throw new Error('条件关系保存后读回不一致');
+            if (config.actions && (saved.linkageDetails || []).length !== config.actions.length)
+                throw new Error('变更对象数量保存后读回不一致');
+            console.log(`显示属性联动已修改: ${saved.linkageName} (${id})`);
+        }
+        catch (e) {
+            console.error(`修改显示属性联动失败: ${e.message}`);
+            process.exitCode = 1;
+        }
+    });
+    linkageCmd.command('delete')
+        .description('删除当前表单的一条显示属性联动规则')
+        .argument('<appId>').argument('<objId>').argument('<id>')
+        .action(async (appId, objId, id) => {
+        try {
+            const auth = await AuthSession.fromOptions(program.opts());
+            if (!auth)
+                throw new Error('无法加载认证');
+            const client = new ApiClient(auth);
+            const baseUrl = auth.getBaseUrl();
+            const form = await resolveFormRecord(client, baseUrl, appId, objId);
+            const formId = String(form?.formId || '');
+            if (!formId)
+                throw new Error('无法获取 formId');
+            await readLinkage(client, baseUrl, appId, objId, formId, id);
+            const query = new URLSearchParams({ ids: id, formId, module: 'ebuilderform', apid: appId });
+            const res = await client.get(`${baseUrl}${linkageBase}/deleteByIds?${query}`);
+            if (res?.code !== 200 || !res?.status || res?.data === 0)
+                throw new Error(res?.msg || '删除失败');
+            const check = await client.get(`${baseUrl}${linkageBase}/id?${new URLSearchParams({ id, formId, module: 'ebuilderform', apid: appId })}`);
+            if (check?.code === 200 && check?.status && String(check?.data?.id || '') === id
+                && check.data.deleteType !== '1' && check.data.deleteType !== 1 && check.data.deleteType !== true) {
+                throw new Error(`规则 ${id} 删除后仍可读到，请核查`);
+            }
+            console.log(`显示属性联动规则已删除: ${id}`);
+        }
+        catch (e) {
+            console.error(`删除显示属性联动失败: ${e.message}`);
+            process.exitCode = 1;
+        }
+    });
     linkageCmd.command('list')
         .description('查看显隐联动规则列表（回读条件/动作/启用状态）')
         .argument('<appId>', '应用 ID')
@@ -1865,19 +2269,31 @@ export function registerFormCommands(program) {
             formId, module: 'ebuilderform', linkageTypeList: ['template', 'sql'],
             customParam: { appId, objId }, pageNo: 1, pageSize: 50,
         };
-        if (cmdOpts.keyword)
-            body.keyword = cmdOpts.keyword;
         const res = await client.post(`${baseUrl}/api/ebuilder/form/form/setting/viewlinkage/queryByPages?apid=${appId}`, body, { ebbusinessid: appId });
         if (res?.code !== 200 || !res?.status) {
             console.error(`查询失败: ${res?.msg || '未知错误'}`);
             process.exit(1);
         }
-        const list = res?.data?.result || [];
+        // 该接口的 keyword 不是字符串 DTO，直接传文本会触发反序列化错误；按名称在读回结果中过滤。
+        let list = res?.data?.result || [];
+        if (cmdOpts.keyword) {
+            const total = Number(res?.data?.totalCount || list.length);
+            for (let pageNo = 2; pageNo <= Math.ceil(total / body.pageSize); pageNo++) {
+                const page = await client.post(`${baseUrl}${linkageBase}/queryByPages?apid=${appId}`, { ...body, pageNo }, { ebbusinessid: appId });
+                if (page?.code !== 200 || !page?.status) {
+                    console.error(`第 ${pageNo} 页查询失败: ${page?.msg || '未知错误'}`);
+                    process.exitCode = 1;
+                    return;
+                }
+                list = list.concat(page?.data?.result || []);
+            }
+            list = list.filter((item) => String(item.linkageName || '').includes(cmdOpts.keyword));
+        }
         if (opts.json) {
             console.log(JSON.stringify(list, null, 2));
         }
         else {
-            console.log(`共 ${res?.data?.totalCount ?? list.length} 条联动规则:`);
+            console.log(`共 ${cmdOpts.keyword ? list.length : (res?.data?.totalCount ?? list.length)} 条联动规则:`);
             for (const x of list) {
                 const en = x.enableState === '1' ? '启用' : '停用';
                 console.log(`  [${x.id}] ${x.linkageName} (${en})`);
@@ -2051,6 +2467,7 @@ export function registerFormCommands(program) {
         .option('--data-title <field>', '目标表单的显示字段名（仅 EBuilder；缺省 name=目标表含"名称"的字段，无则第一个业务字段）')
         .option('--form-name <name>', '目标表单名称（仅 EBuilder 类型，可选）')
         .option('--browser-type <type>', `通用浏览类型：${BROWSER_KINDS.join('、')}`)
+        .option('--browser-name <name>', '按名称精确指定浏览数据源（含自定义浏览框）；优先于 --browser-type')
         .option('--browser-form-source <source>', '表单浏览数据源：business 或 ebuilder（仅 --browser-type form）')
         .option('--format <fmt>', '日期精度格式（Date/DateTime/DateRange），如 yyyy-MM-dd、yyyy-MM-dd HH:mm')
         .option('--min-field <field>', 'Date/DateTime 日期限制：最早不得早于该字段（字段名，min.dateField）')
@@ -2105,6 +2522,12 @@ export function registerFormCommands(program) {
         const endId = genIds[2] || '';
         const labelFieldId = genIds[idCount] || String(Date.now());
         const cmdOpts = cmdOptsRaw || {};
+        if (cmdOpts.browserName) {
+            if (fieldType !== 'Browser' && fieldType !== 'RelateBrowser') {
+                throw new Error('--browser-name 仅适用于 Browser/RelateBrowser 字段');
+            }
+            cmdOpts.browserType = await resolveBrowserByName(client, baseUrl, cmdOpts.browserName, { ebbusinessid: formId });
+        }
         const sformId = cmdOpts.sformId || '';
         const dataTitle = cmdOpts.dataTitle || '';
         const formName = cmdOpts.formName || '';
@@ -2191,7 +2614,7 @@ export function registerFormCommands(program) {
                         console.error('  本表还没有这个类型，改用平台给的字段模板合成组件...');
                         placed = await insertFieldIntoLayout(client, baseUrl, formId, { ...insertArgs, fieldTypeTemplate: tpl });
                     }
-                    console.error(`  布局已更新: excel[${placed.row},${placed.col}]（增量插入，未重建）`);
+                    console.error(`  布局已更新: ${placed.row ? `excel[${placed.row},${placed.col}]` : 'FLOW'}（增量插入，未重建）`);
                     // 网格补格这类「改成功了但不干净」的情况要让人看见，不能闷掉。
                     for (const w of placed.warnings)
                         console.error(`  ⚠ ${w}`);
@@ -2285,6 +2708,29 @@ export function registerFormCommands(program) {
                     console.error(`  布局更新失败: ${e.message}`);
                 }
             }
+            // 开关：布局写入会把字段 options 冲回空（模板 comp 里没有选项），
+            // 必须在布局之后按完整记录补一次 开启=1 / 关闭=0。
+            if (fieldType === 'Switch') {
+                try {
+                    const gf = await client.post(`${baseUrl}/api/ebuilder/form/form/field/manage/getFormField`, { module: 'ebuilderform', formTableField: { formField: { id: fieldId, form: { id: formId } } } }, { ebbusinessid: formId });
+                    const full = gf?.data || {};
+                    if (full.fieldId) {
+                        const ogen = await client.post(`${baseUrl}/api/form/local/generatorIds?size=2&apid=${appId}`, {});
+                        const optionIds = (ogen?.data?.generatorIds || []).map(String);
+                        const ores = await client.post(`${baseUrl}/api/ebuilder/form/form/field/manage/saveFormFieldNew?apid=${appId}`, {
+                            formId, module: 'ebuilderform', customParam: { appId, objId },
+                            jsonObj: JSON.stringify({ ...full, options: defaultSwitchOptions(fieldId, optionIds) }),
+                        }, { ebbusinessid: formId });
+                        if (ores?.code === 200 && ores?.status)
+                            console.error('  开关默认选项已配置: 开启=1 / 关闭=0');
+                        else
+                            console.error(`  ⚠ 开关默认选项未确认保存: ${ores?.msg || '未知错误'}`);
+                    }
+                }
+                catch (e) {
+                    console.error(`  ⚠ 开关默认选项配置失败: ${e.message}`);
+                }
+            }
         }
         else {
             console.error(`添加失败: ${data?.msg || JSON.stringify(data) || '未知错误'}`);