weaver-e10-builder 1.6.14 → 1.6.16

package/dist/commands/form-base-setting.js

@@ -0,0 +1,191 @@
+import { AuthSession } from '../core/auth.js';
+import { ApiClient } from '../core/client.js';
+import { resolveFormId } from '../services/form-id.js';
+import { parseOnOff } from '../services/form-permission-edit.js';
+import { BASE_SETTING_PARTS, MODE_VALUE_LABELS, optionsOf, readBaseSetting, setBaseSetting, } from '../services/form-base-setting.js';
+function partLabel(part) {
+    return part === 'data' ? '数据设置' : '字段设置';
+}
+function attrOf(option) {
+    return option.replace(/-([a-z])/g, (_, c) => c.toUpperCase());
+}
+/** 该键是不是某段的「设置类型」；缺键等价于读取系统设置。 */
+function isModeKey(part, key) {
+    return optionsOf(part).some((o) => o.section?.modeKey === key);
+}
+function formatValue(part, change, which) {
+    const value = change[which];
+    if (change.auto)
+        return MODE_VALUE_LABELS[String(value)] ?? '读取系统设置';
+    const spec = optionsOf(part).find((o) => o.option === change.option);
+    if (value === undefined) {
+        if (isModeKey(part, change.key))
+            return '读取系统设置';
+        if (spec?.kind === 'boolean')
+            return '继承系统设置';
+        return '-';
+    }
+    if (spec?.kind === 'enum')
+        return spec.values?.[String(value)] ?? String(value);
+    if (value === true)
+        return '开';
+    if (value === false)
+        return '关';
+    return String(value);
+}
+async function context(program, appId, objId) {
+    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);
+    if (!formId)
+        throw new Error(`无法获取表单 formId（objId=${objId}）`);
+    return { opts, client, baseUrl, formId };
+}
+function showValue(value) {
+    return typeof value === 'object' ? JSON.stringify(value) : String(value);
+}
+function assertPart(value) {
+    if (value === undefined)
+        return undefined;
+    if (!BASE_SETTING_PARTS.includes(value)) {
+        throw new Error(`--part 仅支持 ${BASE_SETTING_PARTS.join(' / ')}`);
+    }
+    return value;
+}
+/** 收集本次点名的设置（CLI 选项名 → 值），并确定它属于哪一段。 */
+function collectOptions(all, raw, explicitPart) {
+    const provided = [];
+    for (const { part, options } of all) {
+        for (const spec of options) {
+            const value = raw[attrOf(spec.option)];
+            if (value === undefined)
+                continue;
+            let parsed;
+            if (spec.kind === 'boolean') {
+                parsed = parseOnOff(value, `--${spec.option}`);
+            }
+            else {
+                const v = String(value);
+                if (!Object.keys(spec.values || {}).includes(v)) {
+                    throw new Error(`--${spec.option} 只接受 ${Object.keys(spec.values || {}).join(' / ')}`);
+                }
+                parsed = v;
+            }
+            provided.push({ part, spec, value: parsed });
+        }
+    }
+    if (!provided.length) {
+        throw new Error('至少指定一项设置；可用：`form base-setting set --help`');
+    }
+    const parts = new Set(provided.map((p) => p.part));
+    if (parts.size > 1) {
+        throw new Error(`不能同时改多段设置：${[...parts].map(partLabel).join(' / ')}，请分开执行或加 --part`);
+    }
+    const inferred = [...parts][0];
+    if (explicitPart && explicitPart !== inferred) {
+        throw new Error(`--${provided[0].spec.option} 属于「${partLabel(inferred)}」，不是「${partLabel(explicitPart)}」`);
+    }
+    const values = {};
+    for (const p of provided)
+        values[p.spec.option] = p.value;
+    return { part: explicitPart ?? inferred, values };
+}
+export function registerFormBaseSettingCommands(form, program) {
+    const baseSetting = form.command('base-setting')
+        .description('表单功能设置：字段设置（浏览框数据获取最新标题）/ 数据设置（字段联动、明细表按钮等）');
+    const all = BASE_SETTING_PARTS.map((part) => ({ part, options: optionsOf(part) }));
+    baseSetting.command('get')
+        .description('查看表单功能设置当前值')
+        .argument('<objId>', '表单 objId')
+        .argument('<appId>', '应用 ID')
+        .option('--part <p>', '设置分段：field 字段设置（默认）/ data 数据设置')
+        .option('--json', 'JSON 输出')
+        .action(async (objId, appId, raw) => {
+        try {
+            const part = assertPart(raw.part) ?? 'field';
+            const ctx = await context(program, appId, objId);
+            const setting = await readBaseSetting(ctx.client, ctx.baseUrl, appId, objId, ctx.formId, part);
+            const values = {};
+            for (const spec of optionsOf(part)) {
+                values[spec.option] = spec.kind === 'boolean' ? setting[spec.key] === true : setting[spec.key];
+            }
+            if (raw.json || ctx.opts.json) {
+                console.log(JSON.stringify({
+                    objId, appId, formId: ctx.formId, part, values, setting,
+                }, null, 2));
+                return;
+            }
+            console.log(`表单 ${objId} 功能设置·${partLabel(part)}`);
+            for (const spec of optionsOf(part)) {
+                const value = setting[spec.key];
+                const isMode = spec.section?.modeKey === spec.key;
+                const inherited = !isMode && spec.section && setting[spec.section.modeKey] !== 'custom';
+                const shown = inherited
+                    ? '继承系统设置'
+                    : spec.kind === 'boolean'
+                        ? (value === true ? '开' : '关')
+                        : value === undefined
+                            ? (isMode ? '读取系统设置' : '-')
+                            : (spec.values?.[String(value)] ?? String(value));
+                console.log(`  ${spec.label.padEnd(20)} ${shown}   (${spec.key})`);
+            }
+            for (const [key, value] of Object.entries(setting)) {
+                if (optionsOf(part).some((o) => o.key === key))
+                    continue;
+                console.log(`  ${key.padEnd(28)} ${showValue(value)}`);
+            }
+        }
+        catch (error) {
+            console.error(error.message);
+            process.exitCode = 1;
+        }
+    });
+    const set = baseSetting.command('set')
+        .description('修改表单功能设置：只改点名的项，其余键原样回写，保存后回读校验')
+        .argument('<objId>', '表单 objId')
+        .argument('<appId>', '应用 ID')
+        .option('--part <p>', '设置分段：field 字段设置（默认）/ data 数据设置；不给则按选项推断');
+    for (const { part, options } of all) {
+        for (const spec of options) {
+            const placeholder = spec.kind === 'boolean' ? '<on|off>' : `<${Object.keys(spec.values || {}).join('|')}>`;
+            set.option(`--${spec.option} ${placeholder}`, `${spec.label}（${partLabel(part)}：${spec.key}）`);
+        }
+    }
+    set.option('--json', 'JSON 输出');
+    set.action(async (objId, appId, raw) => {
+        try {
+            const explicitPart = assertPart(raw.part);
+            const picked = collectOptions(all, raw, explicitPart);
+            const ctx = await context(program, appId, objId);
+            const result = await setBaseSetting(ctx.client, ctx.baseUrl, appId, objId, ctx.formId, picked.part, picked.values);
+            if (raw.json || ctx.opts.json) {
+                console.log(JSON.stringify({
+                    objId, appId, formId: ctx.formId, part: result.part,
+                    unchanged: result.unchanged, changes: result.changes,
+                }, null, 2));
+                return;
+            }
+            if (result.unchanged) {
+                const names = optionsOf(result.part)
+                    .filter((o) => picked.values[o.option] !== undefined)
+                    .map((o) => `${o.label}已是目标值`);
+                console.log(`${names.join('；')}，未修改`);
+                return;
+            }
+            for (const change of result.changes) {
+                const suffix = change.auto
+                    ? '（自动切换，该段为读取系统设置时单项不生效）'
+                    : '（已回读校验）';
+                console.log(`${change.label}：${formatValue(result.part, change, 'from')} → ${formatValue(result.part, change, 'to')}${suffix}`);
+            }
+        }
+        catch (error) {
+            console.error(error.message);
+            process.exitCode = 1;
+        }
+    });
+}

package/dist/commands/form-browser-definition.js

@@ -599,4 +599,3 @@ export function registerFormBrowserDefinitionCommands(program) {
         output({ success: true, fieldId: r.controlId, tabs: saved });
     }));
 }
-//# sourceMappingURL=form-browser-definition.js.map

package/dist/commands/form-browser-scope-rules.js

@@ -142,4 +142,3 @@ export async function compileRule(client, baseUrl, targetFormId, fields, rule, s
         _rootKey: rootKey,
     };
 }
-//# sourceMappingURL=form-browser-scope-rules.js.map

package/dist/commands/form-browser-scope-tree.js

@@ -112,4 +112,3 @@ export async function compileBrowserScopeTree(input, layout, client, base, sourc
         throw new Error('根节点须为包含 logic 和 children[] 的条件组');
     return { ...tree, isNewFilter: true, version: 1, showFilterIsNull: false };
 }
-//# sourceMappingURL=form-browser-scope-tree.js.map

package/dist/commands/form-button-actions-cmd.js

@@ -306,4 +306,3 @@ export function registerFormButtonActionCommands(btnCmd, program) {
         }
     });
 }
-//# sourceMappingURL=form-button-actions-cmd.js.map

package/dist/commands/form-button-permission-cmd.js

@@ -129,4 +129,3 @@ export function registerFormButtonPermissionCommands(btnCmd, program) {
         }
     });
 }
-//# sourceMappingURL=form-button-permission-cmd.js.map

package/dist/commands/form-button-props-cmd.js

@@ -233,4 +233,3 @@ export function registerFormButtonPropsCommands(btnCmd, program) {
         }
     });
 }
-//# sourceMappingURL=form-button-props-cmd.js.map

package/dist/commands/form-button.js

@@ -487,4 +487,3 @@ export function registerFormButtonCommands(form, program) {
     registerFormButtonPermissionCommands(btnCmd, program);
     registerFormButtonActionCommands(btnCmd, program);
 }
-//# sourceMappingURL=form-button.js.map

package/dist/commands/form-code.js

@@ -276,4 +276,3 @@ export function registerFormCodeCommands(parent, program, target) {
         });
     }
 }
-//# sourceMappingURL=form-code.js.map

package/dist/commands/form-data.js

@@ -382,4 +382,3 @@ export function registerFormDataCommands(form, program) {
         }
     });
 }
-//# sourceMappingURL=form-data.js.map

package/dist/commands/form-ebuilder-columns.js

@@ -93,4 +93,3 @@ export function registerFormEBuilderColumnsCommands(form, program) {
         console.log(action);
     });
 }
-//# sourceMappingURL=form-ebuilder-columns.js.map

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

@@ -132,4 +132,3 @@ export function registerFormEBuilderFilterCommands(form, program) {
         }
     });
 }
-//# sourceMappingURL=form-ebuilder-filter.js.map

package/dist/commands/form-ebuilder-scope.js

@@ -355,4 +355,3 @@ export function registerFormEBuilderScopeCommands(form, program) {
         }
     });
 }
-//# sourceMappingURL=form-ebuilder-scope.js.map

package/dist/commands/form-engine-linkage.js

@@ -196,4 +196,3 @@ export function registerFormEngineLinkageCommands(program) {
         console.log(JSON.stringify({ success: true, deleted: id }));
     }));
 }
-//# sourceMappingURL=form-engine-linkage.js.map

package/dist/commands/form-field-lang.js

@@ -109,4 +109,3 @@ export function registerFormFieldLangCommands(form, program) {
             console.log(`字段多语言已设置: 中文="${zh}"，English="${en}"`);
     });
 }
-//# sourceMappingURL=form-field-lang.js.map

package/dist/commands/form-field-linkage.js

@@ -2,7 +2,7 @@
 import { resolveFormRecord } from '../services/form-id.js';
 import { AuthSession } from '../core/auth.js';
 import { ApiClient } from '../core/client.js';
-import { genSfId, normalizeNumericFrontId } from '../services/actionflow/id_generator.js';
+import { genSfId, requireContextFieldId } from '../services/actionflow/id_generator.js';
 // 查询条件的算子与字段类型族：与动作流 EnquiryForm 共用同一套（filter_rules.ts）。
 import { conditionFieldFamily, normalizeFilterOperator } from '../services/actionflow/filter_rules.js';
 // 生效维度/触发时机与函数联动共用同一套解析，避免两处各写一份。
@@ -138,6 +138,53 @@ export function buildFieldLinkageUpdatePayload(record, p) {
         customParam: { appId: p.appId, objId: p.objId },
     };
 }
+/** 查询真实的 EnquiryForm 上下文，取选中参数行 id，不能用数据源字段 id 冒充。 */
+export async function hydrateEnquiryFieldIds(client, baseUrl, appId, objId, formName, fields) {
+    const queryFields = fields.map((field) => ({ id: esbFieldIdOf(field), content: String(field.fieldName), formId: objId, fieldGroup: { name: formName, id: objId } }));
+    const response = await client.post(`${baseUrl}/api/bs/esb/setting/component/getComponentContext`, {
+        type: 'EnquiryForm', data: {
+            currentApplication: appId, applicationId: appId, type: 'EnquiryForm', opType: 'list',
+            dataSource: { id: objId, text: formName, type: 'LOGIC', groupId: 'weaver-ebuilder-form-service', isPhysical: true, usage: 'all', detailTable: false, objType: 'physical', module: 'ebuilder', appId },
+            queryFields,
+        },
+    });
+    if (response?.code !== 200 || !Array.isArray(response.data))
+        throw new Error(`查询 ${formName} 组件上下文失败：${response?.msg || '未返回参数'}`);
+    const rows = response.data.filter((group) => String(group?.primaryKey || '') === 'FormData').flatMap((group) => Array.isArray(group?.tableData) ? group.tableData : []);
+    const findId = (paramKey) => {
+        const matches = rows.filter((row) => String(row?.paramKey || '') === paramKey);
+        if (matches.length !== 1)
+            throw new Error(`查询上下文中 '${paramKey}' 未唯一匹配，请确认选择的字段`);
+        return requireContextFieldId(matches[0].id, `上下文字段 '${paramKey}' frontId`);
+    };
+    for (const field of fields)
+        field.contextFieldId = findId(`${objId}[].${esbFieldIdOf(field)}`);
+    const tables = rows.filter((row) => String(row?.paramKey || '') === `${objId}[]`);
+    if (tables.length > 1)
+        throw new Error(`查询上下文中 '${objId}[]' 存在多个表参数`);
+    return tables.length ? requireContextFieldId(tables[0].id, `查询结果表 '${objId}' frontId`) : '';
+}
+export async function hydrateLinkageEventFieldIds(client, baseUrl, appId, formId, formName, allFields, selected) {
+    if (!selected.length)
+        return;
+    const fields = allFields.filter((field) => /^\d+$/.test(String(field.fieldId))).map((field) => ({
+        id: String(field.fieldId), orderNum: 1, paramName: field.dataKey || field.fieldKey || '', showName: field.fieldName,
+        paramType: 'string', multipleSelect: field.multiSelect === true || field.multiSelect === 'true', componentKey: field.fieldKey || '', required: false,
+    }));
+    const response = await client.post(`${baseUrl}/api/bs/esb/setting/component/getComponentContext`, {
+        type: 'FieldLinkage', data: { ownForm: [{ id: formId, name: formName }], ownModule: 'ebuilderform', ownApplication: [{ id: appId, name: appId }], formFields: [{ id: genSfId(), formId, showName: formName, orderNum: 0, fields, main: true }] },
+    });
+    if (response?.code !== 200 || !Array.isArray(response.data))
+        throw new Error(`查询字段联动触发上下文失败：${response?.msg || '未返回参数'}`);
+    const rows = response.data.filter((group) => String(group?.primaryKey || '') === 'FormData').flatMap((group) => Array.isArray(group?.tableData) ? group.tableData : []);
+    for (const field of selected) {
+        const key = `${formId}.${String(field.fieldId)}`;
+        const matches = rows.filter((row) => String(row?.paramKey || '') === key);
+        if (matches.length !== 1)
+            throw new Error(`字段联动上下文 '${key}' 未唯一匹配`);
+        field.contextFieldId = requireContextFieldId(matches[0].id, `字段联动 '${key}' frontId`);
+    }
+}
 async function getFormId(client, baseUrl, appId, objId) {
     const f = await resolveFormRecord(client, baseUrl, appId, objId);
     if (!f?.formId)
@@ -588,6 +635,12 @@ export function registerFormFieldLinkageCommands(form, program) {
             console.error('需要 --hops 或 --source-form/--query-field');
             process.exit(1);
         }
+        for (const hop of hops) {
+            const selected = { fieldName: hop.queryFieldName, esbId: hop.queryEsbId, contextFieldId: '' };
+            await hydrateEnquiryFieldIds(client, baseUrl, appId, hop.srcFormObjId, hop.srcFormName, [selected]);
+            hop.contextFieldId = selected.contextFieldId;
+        }
+        await hydrateLinkageEventFieldIds(client, baseUrl, appId, selfFormId, selfFormName, selfFields, [triggerField]);
         // orgId
         const formRes = await client.post(`${baseUrl}/api/ebuilder/form/form/formmanage/getForm?apid=${appId}`, { module: 'ebuilderform', form: { id: selfFormId }, baseSettingPartType: 'basic', customParam: { appId, objId } }, { ebbusinessid: selfFormId });
         const orgId = String(formRes?.data?.form?.orgId || '');
@@ -604,7 +657,7 @@ export function registerFormFieldLinkageCommands(form, program) {
         const sceneId = String(appRes?.data?.activeVersion || '');
         console.error(`  ESB app: ${esbAppId}  scene: ${sceneId}`);
         // 2. saveDesign（FieldLinkage + N EnquiryForm chained + Output）
-        const design = buildSaveDesign({ esbAppId, sceneId, lightId: FIELD_LINKAGE_LIGHT_ID, appName: linkageName, selfFormId, selfFormName, appId, orgId, triggerFieldId: triggerField.fieldId, triggerFieldName: triggerField.fieldName, triggerFieldKey: triggerField.fieldKey || '', selfFields, hops, targetFieldId: targetField.fieldId, targetFieldKey: targetField.fieldKey || '' });
+        const design = buildSaveDesign({ esbAppId, sceneId, lightId: FIELD_LINKAGE_LIGHT_ID, appName: linkageName, selfFormId, selfFormName, appId, orgId, triggerFieldId: triggerField.fieldId, triggerContextId: triggerField.contextFieldId, triggerFieldName: triggerField.fieldName, triggerFieldKey: triggerField.fieldKey || '', selfFields, hops, targetFieldId: targetField.fieldId, targetFieldKey: targetField.fieldKey || '' });
         const designRes = await client.post(`${baseUrl}${ESB_DESIGN_API}/saveDesign`, design, { ebbusinessid: esbAppId });
         if (designRes?.code !== 200 || !designRes?.status) {
             console.error(`saveDesign 失败: ${designRes?.msg}`);
@@ -656,7 +709,7 @@ function buildOutputFormulaValue(p) {
         dataType: 'attribute', arrs: false, paramTypeString: 'STRING', dataTypeSting: 'ATTRIBUTE',
         formulaId: '0', name: String(p.srcField.fieldName), source: p.sourceWId,
         value: `FormData.${p.srcFormObjId}[${rowRef}].${sid}`, type: '3', formulaType: 'string',
-        frontId: genSfId(), businessId: genSfId(), id: formulaId, applicationId: p.esbAppId,
+        frontId: requireContextFieldId(p.srcField.contextFieldId, `查询结果字段 '${p.srcField.fieldName}' frontId`), businessId: genSfId(), id: formulaId, applicationId: p.esbAppId,
         childs: [{
                 formulaType: 'string', name: '0', id: genSfId(), position: rowRef,
                 type: '1', value: '0', childs: [],
@@ -692,12 +745,12 @@ function buildSaveDesign(p) {
         const isFormRef = i === 0; // 第一跳过滤引用本表触发字段（form field），后续跳引用前一跳查询结果（query result）
         // 过滤值引用
         const filterValue = isFormRef
-            ? { paramKey: `${p.selfFormId}.${p.triggerFieldId}`, paramName: p.triggerFieldId, showName: p.triggerFieldName, paramType: 'string', dataType: 'node', arrs: false, paramTypeString: 'STRING', dataTypeSting: 'NODE', paramId: p.triggerFieldId, name: p.triggerFieldName, source: eventId, value: formDataTrigger, type: '3', formulaType: 'string', frontId: normalizeNumericFrontId(p.triggerFieldId, '字段联动 FormulaBean.frontId'), config: { paramKey: `${p.selfFormId}.${p.triggerFieldId}`, paramType: 'string', parentName: `${p.selfFormName}.${p.triggerFieldName}`, newParentName: `${p.selfFormName}.${p.triggerFieldName}`, comId: eventId, isMultCom: false, tableName: '表单数据', fieldInfo: { tablePrimaryKey: 'FormData', paramKey: `${p.selfFormId}.${p.triggerFieldId}` } }, applicationId: p.esbAppId, fieldType: 'string' }
+            ? { paramKey: `${p.selfFormId}.${p.triggerFieldId}`, paramName: p.triggerFieldId, showName: p.triggerFieldName, paramType: 'string', dataType: 'node', arrs: false, paramTypeString: 'STRING', dataTypeSting: 'NODE', paramId: p.triggerFieldId, name: p.triggerFieldName, source: eventId, value: formDataTrigger, type: '3', formulaType: 'string', frontId: requireContextFieldId(p.triggerContextId, '字段联动 FormulaBean.frontId'), config: { paramKey: `${p.selfFormId}.${p.triggerFieldId}`, paramType: 'string', parentName: `${p.selfFormName}.${p.triggerFieldName}`, newParentName: `${p.selfFormName}.${p.triggerFieldName}`, comId: eventId, isMultCom: false, tableName: '表单数据', fieldInfo: { tablePrimaryKey: 'FormData', paramKey: `${p.selfFormId}.${p.triggerFieldId}` } }, applicationId: p.esbAppId, fieldType: 'string' }
             : (() => {
                 const prevHop = p.hops[i - 1];
                 const bizId = genSfId();
                 const pk = `${prevHop.srcFormObjId}[].${prevHop.queryEsbId}`;
-                return { paramKey: pk, paramName: prevHop.queryEsbId, showName: prevHop.queryFieldName, paramType: 'string', dataType: 'attribute', arrs: false, paramTypeString: 'STRING', dataTypeSting: 'ATTRIBUTE', formulaId: '0', name: prevHop.queryFieldName, source: prevWId, value: `FormData.${prevHop.srcFormObjId}[${bizId}].${prevHop.queryEsbId}`, type: '3', formulaType: 'string', config: { paramKey: pk, paramType: 'string', parentName: `${prevHop.srcFormName}[].${prevHop.queryFieldName}`, newParentName: `${prevHop.srcFormName}[].${prevHop.queryFieldName}`, comId: prevWId, isMultCom: false, tableName: '表单数据', fieldInfo: { tablePrimaryKey: 'FormData', paramKey: pk }, switchType: 'assign' }, applicationId: p.esbAppId, fieldType: 'string' };
+                return { paramKey: pk, paramName: prevHop.queryEsbId, showName: prevHop.queryFieldName, paramType: 'string', dataType: 'attribute', arrs: false, paramTypeString: 'STRING', dataTypeSting: 'ATTRIBUTE', formulaId: '0', name: prevHop.queryFieldName, source: prevWId, value: `FormData.${prevHop.srcFormObjId}[${bizId}].${prevHop.queryEsbId}`, type: '3', formulaType: 'string', frontId: requireContextFieldId(prevHop.contextFieldId, '查询结果字段 frontId'), config: { paramKey: pk, paramType: 'string', parentName: `${prevHop.srcFormName}[].${prevHop.queryFieldName}`, newParentName: `${prevHop.srcFormName}[].${prevHop.queryFieldName}`, comId: prevWId, isMultCom: false, tableName: '表单数据', fieldInfo: { tablePrimaryKey: 'FormData', paramKey: pk }, switchType: 'assign' }, applicationId: p.esbAppId, fieldType: 'string' };
             })();
         enquiryActions.push({
             id: eqWId, wId: eqWId, nodeType: 'Normal', comType: 'EnquiryForm', type: 'EnquiryForm',
@@ -728,7 +781,7 @@ function buildSaveDesign(p) {
             outputStatus: '1', pageAction: '0', reminder: '0', fixedData: [], triggerFlag: false, nextAction: false, customOutputData: '', currentApplication: p.esbAppId,
             fieldLinkCustomParamSetting: {
                 customId: '', formType: 'output', businessModule: '',
-                tableList: [{ id: genSfId(), formId: p.selfFormId, showName: p.selfFormName, orderNum: 0, main: true, isMain: true, fields: [{ id: genSfId(), paramName: '', showName: '', paramType: 'string', isRequired: false, fieldComments: '', skipNull: '0', assignFieldId: p.targetFieldId, fieldPath: `${p.selfFormId}.${p.targetFieldId}`, fieldType: 'Ebuilder', formulaValue: buildOutputFormulaValue({ srcFormObjId: lastHop.srcFormObjId, srcFormName: lastHop.srcFormName, srcField: { fieldId: lastHop.queryFieldId, fieldName: lastHop.queryFieldName, esbId: lastHop.queryEsbId }, sourceWId: prevWId, esbAppId: p.esbAppId }) }] }],
+                tableList: [{ id: genSfId(), formId: p.selfFormId, showName: p.selfFormName, orderNum: 0, main: true, isMain: true, fields: [{ id: genSfId(), paramName: '', showName: '', paramType: 'string', isRequired: false, fieldComments: '', skipNull: '0', assignFieldId: p.targetFieldId, fieldPath: `${p.selfFormId}.${p.targetFieldId}`, fieldType: 'Ebuilder', formulaValue: buildOutputFormulaValue({ srcFormObjId: lastHop.srcFormObjId, srcFormName: lastHop.srcFormName, srcField: { fieldId: lastHop.queryFieldId, fieldName: lastHop.queryFieldName, esbId: lastHop.queryEsbId, contextFieldId: lastHop.contextFieldId }, sourceWId: prevWId, esbAppId: p.esbAppId }) }] }],
                 deleteTableIds: [], appId: p.esbAppId,
             }, applicationId: p.esbAppId,
         },
@@ -768,7 +821,7 @@ function buildContextFormula(field, srcFormObjId, srcFormName, eqWId) {
     return {
         paramType: 'string', formulaType: 'string', name: String(field.fieldName),
         businessId: genSfId(), selectType: '-1', id: genSfId(), source: eqWId, type: '3',
-        value: valuePath,
+        value: valuePath, frontId: requireContextFieldId(field.contextFieldId, '查询结果条件字段 frontId'),
         config: {
             paramKey, isMultCom: false, comType: 'EnquiryForm', parentComId: '0',
             fieldInfo: { paramKey, tablePrimaryKey: 'FormData' },
@@ -817,7 +870,7 @@ function buildSelfContextFormula(field, selfFormId, selfFormName, eventId, esbAp
         paramTypeString: 'STRING', dataTypeSting: 'NODE', paramId: fid,
         hideParamNameInSelect: false, hideParam: false, readonlyParam: false, sensitiveFlag: false, newdata: false,
         parentName, name: String(field.fieldName),
-        source: eventId, value: valuePath, type: '3', formulaType: 'string', frontId: fid,
+        source: eventId, value: valuePath, type: '3', formulaType: 'string', frontId: requireContextFieldId(field.contextFieldId, '字段联动上下文 frontId'),
         config: {
             paramKey, paramType: 'string', parentName, newParentName: parentName,
             multKey: '', multName: '',
@@ -953,6 +1006,12 @@ async function updatePreconditionOrExit(p) {
         const srcFields = await getFormFields(p.client, p.baseUrl, srcObjId, p.auth.userId, p.auth.tenantKey);
         const selfFields = await getFormFields(p.client, p.baseUrl, p.objId, p.auth.userId, p.auth.tenantKey);
         const conds = parsePreconditionListOrExit(p.precondition || [], srcFields, selfFields);
+        const sourceRefs = conds.flatMap((condition) => [condition.field, ...(condition.refField && !condition.refSelf ? [condition.refField] : [])]);
+        const ownerAppId = String(design.event?.data?.ownApplication?.[0]?.id || enquiry?.data?.dataSource?.appId || '');
+        if (!ownerAppId)
+            throw new Error('字段联动未返回所属应用 ID，无法查询组件上下文');
+        await hydrateEnquiryFieldIds(p.client, p.baseUrl, ownerAppId, srcObjId, srcFormName, [...new Set(sourceRefs)]);
+        await hydrateLinkageEventFieldIds(p.client, p.baseUrl, ownerAppId, String(design.event?.data?.ownForm?.[0]?.id || p.record?.formId || ''), String(design.event?.data?.ownForm?.[0]?.name || ''), selfFields, conds.filter((condition) => condition.refSelf && condition.refField).map((condition) => condition.refField));
         const info = await savePreconditionOrExit({
             client: p.client, baseUrl: p.baseUrl, conds,
             srcFormObjId: srcObjId, srcFormName, eqWId: String(enquiry.wId),
@@ -1001,6 +1060,7 @@ async function addQuickLinkage(p) {
         const refField = c.literal && c.literal.startsWith('@') ? findFieldId(selfFields, c.literal.slice(1)) : undefined;
         return { field: c.field, func: c.func, literal: refField ? undefined : c.literal, range: c.range, refField };
     });
+    const preconditions = cmdOpts.precondition.length ? parsePreconditionListOrExit(cmdOpts.precondition, srcFields, selfFields) : [];
     const assigns = cmdOpts.assign.map(parseAssignExpr);
     const assignPairs = assigns.map(a => {
         const t = splitAssignTarget(a.target);
@@ -1039,12 +1099,18 @@ async function addQuickLinkage(p) {
             ...queryNames,
             ...assigns.map(a => a.src),
             ...[...basis.values()].map((f) => f.fieldName),
+            ...preconditions.flatMap((condition) => [condition.field.fieldName, ...(condition.refField && !condition.refSelf ? [condition.refField.fieldName] : [])]),
         ])];
     const queryFields = queryFieldList.map(n => findFieldId(srcFields, n, { allowSystem: true }));
     if (queryFields.length === 0) {
         console.error('需要 --query-fields 或 --assign 指定查询字段');
         process.exit(1);
     }
+    const sourceTableContextId = await hydrateEnquiryFieldIds(client, baseUrl, appId, cmdOpts.sourceForm, srcFormName, queryFields);
+    await hydrateLinkageEventFieldIds(client, baseUrl, appId, selfFormId, selfFormName, selfFields, [...condList, ...preconditions].filter((item) => item.refField && (item.refSelf || !('refSelf' in item))).map((item) => item.refField));
+    if (assignPairs.some((item) => item.subForm && !basis.has(item.subForm.id)) && !sourceTableContextId) {
+        throw new Error('查询结果上下文未返回表参数的真实 ID，无法设置明细依据值');
+    }
     // orgId：ESB app 必须归属机构，否则 saveDesign 失败
     const formRes = await client.post(`${baseUrl}/api/ebuilder/form/form/formmanage/getForm?apid=${appId}`, { module: 'ebuilderform', form: { id: selfFormId }, baseSettingPartType: 'basic', customParam: { appId, objId } }, { ebbusinessid: selfFormId });
     const orgId = String(formRes?.data?.form?.orgId || '');
@@ -1065,13 +1131,13 @@ async function addQuickLinkage(p) {
     const design = buildQuickSaveDesign({
         esbAppId, sceneId, lightId: FIELD_LINKAGE_LIGHT_ID, appName: linkageName,
         selfFormId, selfFormName, appId, selfFields,
-        srcFormObjId: cmdOpts.sourceForm, srcFormName, srcTableName,
+        srcFormObjId: cmdOpts.sourceForm, srcFormName, srcTableName, sourceTableContextId,
         conditions: condList,
         queryFields, assigns: assignPairs,
         details: selfDetails, basis,
     });
-    if (cmdOpts.precondition.length > 0) {
-        const conds = parsePreconditionListOrExit(cmdOpts.precondition, srcFields, selfFields);
+    if (preconditions.length > 0) {
+        const conds = preconditions;
         const info = await savePreconditionOrExit({
             client, baseUrl, conds,
             srcFormObjId: String(cmdOpts.sourceForm), srcFormName,
@@ -1235,7 +1301,7 @@ export function buildQuickSaveDesign(p) {
                 paramType: 'string', dataType: 'node', arrs: false, paramTypeString: 'STRING', dataTypeSting: 'NODE',
                 paramId: rfId, name: String(rf.fieldName), source: eventId,
                 value: `FormData.${p.selfFormId}.${rfId}`, type: '3', formulaType: 'string',
-                frontId: normalizeNumericFrontId(rfId, '字段联动 FormulaBean.frontId'),
+                frontId: requireContextFieldId(rf.contextFieldId, '字段联动 FormulaBean.frontId'),
                 config: {
                     paramKey: `${p.selfFormId}.${rfId}`, paramType: 'string',
                     parentName: `${p.selfFormName}.${rf.fieldName}`, newParentName: `${p.selfFormName}.${rf.fieldName}`,
@@ -1321,7 +1387,7 @@ export function buildQuickSaveDesign(p) {
                     fieldType: 'string', formulaType: 'string', applicationId: p.esbAppId, switchType: 'sub',
                     config: {
                         originValue: 'esbAssignSelf', switchType: 'sub', id: 'esbAssignSelf',
-                        content: `${sf.fieldName}(依据值本身)`, source: eqWId, frontId: genSfId(),
+                        content: `${sf.fieldName}(依据值本身)`, source: eqWId, frontId: requireContextFieldId(sf.contextFieldId, '依据值字段 frontId'),
                         value: `FormData.${p.srcFormObjId}[].${sid}`, paramKey,
                         config: baseFormulaValue(sf).config, level: 0, basisType: 'formSetting',
                     },
@@ -1346,7 +1412,7 @@ export function buildQuickSaveDesign(p) {
             hideParamNameInSelect: false, hideParam: false, readonlyParam: false, sensitiveFlag: false, newdata: false,
             parentName: `${p.srcFormName}[].${field.fieldName}`, name: String(field.fieldName),
             source: eqWId, value: `FormData.${p.srcFormObjId}[].${fid}`, type: '3', formulaType: 'string',
-            frontId: genSfId(),
+            frontId: requireContextFieldId(field.contextFieldId, '依据值字段 frontId'),
             config: {
                 paramKey, paramType: 'string',
                 parentName: `${p.srcFormName}[].${field.fieldName}`, newParentName: `${p.srcFormName}[].${field.fieldName}`,
@@ -1385,7 +1451,7 @@ export function buildQuickSaveDesign(p) {
         newParentName: srcTableParentName,
     });
     const buildTableBasisValue = () => ({
-        frontId: p.srcFormObjId,
+        frontId: requireContextFieldId(p.sourceTableContextId, '查询结果表 frontId'),
         formulaType: 'json',
         name: srcTableLabel,
         businessId: genSfId(),
@@ -1416,7 +1482,7 @@ export function buildQuickSaveDesign(p) {
                 value: sid,
                 childs: [],
                 config: {
-                    frontId: genSfId(),
+                    frontId: requireContextFieldId(sf.contextFieldId, '依据值下级字段 frontId'),
                     paramKey: `${p.srcFormObjId}[].${sid}`,
                     basisType: 'formSetting',
                     switchType: 'sub',
@@ -1491,4 +1557,3 @@ export function buildQuickSaveDesign(p) {
         addIds: [], deleteActions: [], version: 0, delCheckMsg: [], addCheckMsg: [], assistLayer: '{"nodes":[],"layout":{}}', versionConfig: '{}', saveNewVersion: false, lightId: p.lightId, initData: '', secretKey: '', operateType: '', appName: p.appName,
     };
 }
-//# sourceMappingURL=form-field-linkage.js.map

package/dist/commands/form-formula-linkage.js

@@ -624,4 +624,3 @@ export function registerFormFormulaLinkageCommands(form, program) {
             console.error(`  ⚠ 服务端回显 ${deleted.length} 条（${deleted.join(', ')}），与请求的 ${linkageIds.length} 条对不上，请用 list 复核`);
     });
 }
-//# sourceMappingURL=form-formula-linkage.js.map

package/dist/commands/form-formula.js

@@ -297,4 +297,3 @@ function safeParse(s) {
         return {};
     }
 }
-//# sourceMappingURL=form-formula.js.map

package/dist/commands/form-layout-code-reviewed.js

@@ -61,4 +61,3 @@ export function registerFormLayoutCodeReviewedCommands(parent, program, module)
             process.exitCode = 1;
     });
 }
-//# sourceMappingURL=form-layout-code-reviewed.js.map

package/dist/commands/form-layout-describe.js

@@ -55,4 +55,3 @@ export function registerFormLayoutDescribeCommand(form, program) {
         }
     });
 }
-//# sourceMappingURL=form-layout-describe.js.map

package/dist/commands/form-layout-detail-settings.js

@@ -33,4 +33,3 @@ export function registerDetailSettingsCommands(form, program) {
         });
     }
 }
-//# sourceMappingURL=form-layout-detail-settings.js.map

package/dist/commands/form-layout-diff.js

@@ -45,4 +45,3 @@ export function registerFormLayoutDiffCommand(form, program) {
             process.exitCode = 2;
     });
 }
-//# sourceMappingURL=form-layout-diff.js.map

package/dist/commands/form-layout-document.js

@@ -78,4 +78,3 @@ export function registerFormLayoutDocumentCommands(form, program) {
             process.exitCode = 1;
     });
 }
-//# sourceMappingURL=form-layout-document.js.map

package/dist/commands/form-layout-edit.js

@@ -48,4 +48,3 @@ export function registerFormLayoutEditCommand(form, program) {
             process.exitCode = 1;
     });
 }
-//# sourceMappingURL=form-layout-edit.js.map

package/dist/commands/form-layout-init-reviewed.js

@@ -75,4 +75,3 @@ export function registerFormLayoutInitReviewedCommands(form, program) {
         }
     });
 }
-//# sourceMappingURL=form-layout-init-reviewed.js.map

package/dist/commands/form-layout-init.js

@@ -154,4 +154,3 @@ export function registerFormLayoutInitCommands(form, program) {
         console.log(`  字段覆盖: ${overrides.length ? overrides.join(', ') : '保留已有设置'}`);
     });
 }
-//# sourceMappingURL=form-layout-init.js.map

package/dist/commands/form-layout-restore.js

@@ -237,4 +237,3 @@ export function registerFormLayoutRestoreCommands(form, program) {
             process.exitCode = 1;
     });
 }
-//# sourceMappingURL=form-layout-restore.js.map

package/dist/commands/form-layout-template-advanced.js

@@ -112,4 +112,3 @@ export function registerFormLayoutTemplateAdvancedCommands(program) {
         console.log(JSON.stringify(await (await service()).updateGrid(id, patch), null, 2));
     });
 }
-//# sourceMappingURL=form-layout-template-advanced.js.map

package/dist/commands/form-layout-template-catalog.js

@@ -42,4 +42,3 @@ export function registerFormLayoutTemplateCatalogCommands(program) {
             enabled: Number(row.templateStatus) === 1, style }, null, 2));
     });
 }
-//# sourceMappingURL=form-layout-template-catalog.js.map

package/dist/commands/form-layout-template-easy.js

@@ -56,4 +56,3 @@ export function registerFormLayoutTemplateEasyCommands(program) {
     easy.command('delete').description('批量删除自定义简易模板').argument('<ids...>')
         .action(async (ids) => console.log(JSON.stringify(await (await service()).delete(ids), null, 2)));
 }
-//# sourceMappingURL=form-layout-template-easy.js.map

package/dist/commands/form-layout.js

@@ -466,4 +466,3 @@ export function registerFormLayoutCommands(form, program) {
         }
     });
 }
-//# sourceMappingURL=form-layout.js.map

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

@@ -181,4 +181,3 @@ export function registerFormListClickCommands(form, program) {
         }
     });
 }
-//# sourceMappingURL=form-list-click.js.map

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

@@ -302,4 +302,3 @@ export function registerListColumnsCommand(form, program) {
         }
     });
 }
-//# sourceMappingURL=form-list-columns.js.map