weaver-e10-builder 1.5.16 → 1.6.4

package/dist/commands/form-ebuilder-scope.d.ts

@@ -1,3 +1,24 @@
 import { Command } from 'commander';
+import { ApiClient } from '../core/client.js';
+interface RuleInput {
+    field: string;
+    operator: string;
+    value?: unknown;
+    valueFrom?: 'currentFormField' | 'targetFormField';
+    valueField?: string;
+}
+interface TargetFieldMeta {
+    id: string;
+    name: string;
+    fieldType: string;
+    componentKey: string;
+    options?: Array<{
+        id: string;
+        name: string;
+    }>;
+}
+/** 编译单条规则为条件树 datas 元素 */
+export declare function compileRule(client: ApiClient, baseUrl: string, targetFormId: string, fields: TargetFieldMeta[], rule: RuleInput, sourceFields?: TargetFieldMeta[]): Promise<Record<string, any>>;
 export declare function registerFormEBuilderScopeCommands(form: Command, program: Command): void;
+export {};
 //# sourceMappingURL=form-ebuilder-scope.d.ts.map

package/dist/commands/form-ebuilder-scope.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form-ebuilder-scope.d.ts","sourceRoot":"","sources":["../../src/commands/form-ebuilder-scope.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAmPpC,wBAAgB,iCAAiC,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,CAkIvF"}
+{"version":3,"file":"form-ebuilder-scope.d.ts","sourceRoot":"","sources":["../../src/commands/form-ebuilder-scope.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAIpC,OAAO,EAAE,SAAS,EAAiB,MAAM,mBAAmB,CAAC;AAqC7D,UAAU,SAAS;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,SAAS,CAAC,EAAE,kBAAkB,GAAG,iBAAiB,CAAC;IACnD,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AA2BD,UAAU,eAAe;IACvB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,KAAK,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAC/C;AAgDD,0BAA0B;AAC1B,wBAAsB,WAAW,CAC/B,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,EAAE,IAAI,EAAE,SAAS,EACpG,YAAY,GAAE,eAAe,EAAO,GACnC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CA4E9B;AA8DD,wBAAgB,iCAAiC,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,CAoIvF"}

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

@@ -56,7 +56,7 @@ function tempKey(prefix) {
 }
 const SELECT_TYPE = 'SELECTION_OPTION';
 /** 编译单条规则为条件树 datas 元素 */
-async function compileRule(client, baseUrl, targetFormId, fields, rule) {
+export async function compileRule(client, baseUrl, targetFormId, fields, rule, sourceFields = []) {
     if (!rule.field)
         throw new Error('规则 field 不能为空');
     if (!rule.operator)
@@ -74,11 +74,35 @@ async function compileRule(client, baseUrl, targetFormId, fields, rule) {
             throw new Error(`条件 ${operator} 不接受 value`);
         }
     }
-    else if (rule.value === undefined) {
+    else if (!rule.valueFrom && rule.value === undefined) {
         throw new Error(`字段 ${field.name} 的条件 ${operator} 必须提供 value`);
     }
-    // 选项类：value=选项名 → 解析出 valueKey，填 selectValue + customBrowserValue + config.options
-    if (/^(Select|RadioBox|Radio|CheckBox|Checkbox|ComboSelect|Switch)$/i.test(compType)) {
+    if (rule.valueFrom) {
+        if (!['currentFormField', 'targetFormField'].includes(rule.valueFrom))
+            throw new Error(`未知 valueFrom: ${rule.valueFrom}`);
+        if (!rule.valueField)
+            throw new Error('字段引用须填写 valueField');
+        if (rule.value !== undefined)
+            throw new Error('字段引用与固定 value 不能同时填写');
+        if (operator === 'isnull' || operator === 'notnull')
+            throw new Error(`${operator} 不接受字段引用`);
+        const referenced = resolveField(rule.valueFrom === 'currentFormField' ? sourceFields : fields, rule.valueField);
+        const targetKind = /^(Ebuilder|Browser|RelateBrowser)$/i.test(compType) ? 'browser' : compType.toLowerCase();
+        if (targetKind !== 'browser')
+            throw new Error(`字段 ${field.name} 的字段引用目前仅验证了关联浏览字段`);
+        conditions.type = 'custombyhander';
+        conditions.value = referenced.name;
+        if (rule.valueFrom === 'currentFormField') {
+            conditions.selectValue = { id: 'varFileds', content: '变量字段', type: 'SELECTION_CUSTOM' };
+            conditions.customBrowserValue = [{ name: referenced.name, location: '主表', id: referenced.id, content: referenced.name }];
+        }
+        else {
+            conditions.selectValue = { id: 'tableFields', content: '本表字段', type: 'SELECTION_CUSTOM' };
+            conditions.customValue = `field_${referenced.id}`;
+            conditions.customBrowserValue = [];
+        }
+    }
+    else if (/^(Select|RadioBox|Radio|CheckBox|Checkbox|ComboSelect|Switch)$/i.test(compType)) {
         const requested = (Array.isArray(rule.value) ? rule.value : [rule.value]).map(String);
         const options = await getFieldOptions(client, baseUrl, targetFormId, field.id);
         const matched = requested.map((nameOrId) => {
@@ -100,6 +124,7 @@ async function compileRule(client, baseUrl, targetFormId, fields, rule) {
         conditions.selectValue = '';
         conditions.customBrowserValue = [];
     }
+    const browser = /^(Ebuilder)$/i.test(compType);
     return {
         isParent: false,
         parentNode: rootKey,
@@ -110,7 +135,8 @@ async function compileRule(client, baseUrl, targetFormId, fields, rule) {
         compType,
         type: 'condition',
         conditions,
-        config,
+        ...(browser ? { browserType: { module: 'ebuilder/form', type: 'ebuilder' } } : {}),
+        config: browser ? { name: field.name, componentKey: 'RelateBrowser', browserType: { module: 'ebuilder/form', type: 'ebuilder' } } : config,
         subTableId: '',
         key: nodeKey,
         _rootKey: rootKey,
@@ -161,12 +187,17 @@ function decodeRules(tree) {
         .map((d) => {
         const c = d.conditions || {};
         const sel = c.selectValue;
-        const val = sel && typeof sel === 'object' ? sel.content : c.value;
+        const val = sel?.id === 'varFileds'
+            ? c.customBrowserValue?.[0]?.content || c.value
+            : sel?.id === 'tableFields' ? c.value
+                : sel && typeof sel === 'object' ? sel.content : c.value;
         return {
             field: d.text || '',
             fieldId: String(d.id || '').replace(/^field_/, ''),
             operator: c.func || '',
             value: val ?? '',
+            ...(sel?.id === 'varFileds' ? { valueFrom: 'currentFormField', valueField: c.customBrowserValue?.[0]?.id } : {}),
+            ...(sel?.id === 'tableFields' ? { valueFrom: 'targetFormField', valueField: String(c.customValue || '').replace(/^field_/, '') } : {}),
         };
     });
 }
@@ -215,7 +246,7 @@ export function registerFormEBuilderScopeCommands(form, program) {
         .argument('<objId>', '源表单 objId')
         .argument('<appId>', '应用 ID')
         .argument('<fieldId>', '关联浏览字段 ID')
-        .requiredOption('--rules <json>', '规则数组 JSON 或 @文件；每项 {field,operator,value}')
+        .requiredOption('--rules <json>', '规则数组 JSON 或 @文件；每项 {field,operator,value}，或 {field,operator,valueFrom,valueField}')
         .option('--logic <and|or>', '多规则关系；默认保留现值', 'and')
         .option('--fill-null', '关联字段为空时是否填充（默认 false）')
         .action(async (objId, appId, fieldId, raw) => {
@@ -244,12 +275,14 @@ export function registerFormEBuilderScopeCommands(form, program) {
             if (!targetObjId)
                 throw new Error('字段缺少 sformId，不是有效的关联浏览字段');
             const targetFields = await getTargetFields(client, baseUrl, targetObjId, auth.userId, auth.tenantKey);
+            const sourceFields = inputs.some(r => r.valueFrom === 'currentFormField')
+                ? await getTargetFields(client, baseUrl, objId, auth.userId, auth.tenantKey) : [];
             const targetFormId = await resolveFormId(client, baseUrl, appId, targetObjId);
             const { record } = await readScope(client, baseUrl, formId, fieldId);
             const logic = (raw.logic === 'or' ? 'or' : 'and');
             const compiled = [];
             for (const r of inputs)
-                compiled.push(await compileRule(client, baseUrl, targetFormId, targetFields, r));
+                compiled.push(await compileRule(client, baseUrl, targetFormId, targetFields, r, sourceFields));
             const rootKey = compiled[0]?._rootKey || tempKey('1786944084');
             for (const c of compiled)
                 c.parentNode = rootKey;

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

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

package/dist/commands/form-field-linkage.d.ts

@@ -46,12 +46,17 @@ export declare function buildQuickSaveDesign(p: {
     selfFields: any[];
     srcFormObjId: string;
     srcFormName: string;
+    srcTableName?: string;
     conditions: QuickCondition[];
     queryFields: any[];
     assigns: QuickAssign[];
     /** 本表明细表；有明细目标时才会写进 formFields 与 Output.tableList。 */
     details: FormDetail[];
-    /** 明细表 id → 依据值字段（源表查询结果列）。 */
+    /**
+     * 明细表 id → 依据值字段（源表查询结果列）。
+     * **不给 = 依据值选「表」**（查询结果整表），这是设计器里写明细的常规形态；
+     * 只有显式 `--basis 明细表=源表字段` 才走字段级依据。
+     */
     basis: Map<string, any>;
 }): any;
 export {};

package/dist/commands/form-field-linkage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form-field-linkage.d.ts","sourceRoot":"","sources":["../../src/commands/form-field-linkage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAiBpC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AAqG3E,uDAAuD;AACvD,wBAAgB,8BAA8B,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,EAAE;IAC7D,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,OAAO,CAAC;IACzE,cAAc,EAAE,GAAG,EAAE,CAAC;IAAC,MAAM,CAAC,EAAE,aAAa,CAAC;IAC9C,uBAAuB;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;QAAE,eAAe,EAAE,MAAM,CAAC;QAAC,cAAc,EAAE,MAAM,CAAC;QAAC,YAAY,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAChG,GAAG,GAAG,CAwBN;AAYD,UAAU,UAAU;IAAG,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,GAAG,EAAE,CAAA;CAAE;AAsBhE,wBAAgB,gCAAgC,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,CA4WtF;AA2bD,UAAU,WAAW;IAAG,QAAQ,EAAE,GAAG,CAAC;IAAC,WAAW,EAAE,GAAG,CAAC;IAAC,OAAO,CAAC,EAAE,UAAU,CAAC;CAAE;AAoEhF,MAAM,WAAW,cAAc;IAC7B,KAAK,EAAE,GAAG,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,yDAAyD;IACzD,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,wBAAgB,oBAAoB,CAAC,CAAC,EAAE;IACtC,QAAQ,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IACpE,UAAU,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,GAAG,EAAE,CAAC;IAC3E,YAAY,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC;IAC1C,UAAU,EAAE,cAAc,EAAE,CAAC;IAC7B,WAAW,EAAE,GAAG,EAAE,CAAC;IAAC,OAAO,EAAE,WAAW,EAAE,CAAC;IAC3C,sDAAsD;IACtD,OAAO,EAAE,UAAU,EAAE,CAAC;IACtB,+BAA+B;IAC/B,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CACzB,GAAG,GAAG,CAuNN"}
+{"version":3,"file":"form-field-linkage.d.ts","sourceRoot":"","sources":["../../src/commands/form-field-linkage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAiBpC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AAqG3E,uDAAuD;AACvD,wBAAgB,8BAA8B,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,EAAE;IAC7D,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,OAAO,CAAC;IACzE,cAAc,EAAE,GAAG,EAAE,CAAC;IAAC,MAAM,CAAC,EAAE,aAAa,CAAC;IAC9C,uBAAuB;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;QAAE,eAAe,EAAE,MAAM,CAAC;QAAC,cAAc,EAAE,MAAM,CAAC;QAAC,YAAY,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAChG,GAAG,GAAG,CAwBN;AAgBD,UAAU,UAAU;IAAG,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,GAAG,EAAE,CAAA;CAAE;AAsBhE,wBAAgB,gCAAgC,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,CA4WtF;AAoeD,UAAU,WAAW;IAAG,QAAQ,EAAE,GAAG,CAAC;IAAC,WAAW,EAAE,GAAG,CAAC;IAAC,OAAO,CAAC,EAAE,UAAU,CAAC;CAAE;AAoEhF,MAAM,WAAW,cAAc;IAC7B,KAAK,EAAE,GAAG,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,yDAAyD;IACzD,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,wBAAgB,oBAAoB,CAAC,CAAC,EAAE;IACtC,QAAQ,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IACpE,UAAU,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,GAAG,EAAE,CAAC;IAC3E,YAAY,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAC;IACjE,UAAU,EAAE,cAAc,EAAE,CAAC;IAC7B,WAAW,EAAE,GAAG,EAAE,CAAC;IAAC,OAAO,EAAE,WAAW,EAAE,CAAC;IAC3C,sDAAsD;IACtD,OAAO,EAAE,UAAU,EAAE,CAAC;IACtB;;;;OAIG;IACH,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CACzB,GAAG,GAAG,CA6RN"}

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

@@ -142,7 +142,11 @@ async function getFormId(client, baseUrl, appId, objId) {
     const f = await resolveFormRecord(client, baseUrl, appId, objId);
     if (!f?.formId)
         throw new Error(`无法获取 formId，请确认 objId=${objId}`);
-    return { formId: String(f.formId), formName: f.formName || f.objName || f.name || '' };
+    return {
+        formId: String(f.formId),
+        formName: f.formName || f.objName || f.name || '',
+        tableName: String(f.tableName || ''),
+    };
 }
 /** 主表字段 + 明细表（字段联动可以把值写到明细表，需要 subFormId）。 */
 async function getFormMeta(client, baseUrl, objId, userId, tenantKey) {
@@ -475,7 +479,7 @@ export function registerFormFieldLinkageCommands(form, program) {
         .option('--condition <expr>', '查询条件：源表字段:算子:值；值写 @本表字段名 表示引用本表字段', collect, [])
         .option('--query-fields <list>', '查询字段：源表字段名，逗号分隔（不给则从 --assign 的源字段推导）')
         .option('--assign <expr>', '赋值：源表查询字段=本表目标字段（写「明细表名.字段名」则赋到明细表；可重复）', collect, [])
-        .option('--basis <expr>', '明细行依据：明细表名=源表字段名（可重复；不给则取该表第一个赋值的源字段）', collect, [])
+        .option('--basis <expr>', '明细行依据：明细表名=源表字段名（可重复；不给则用查询结果整表，即设计器里的「选表」）', collect, [])
         .option('--detail-mode <mode>', '主表联动明细表时: add=添加明细（默认）/ cover=覆盖明细 / update=更新明细')
         .option('--detail-add <mode>', '明细表添加行时: override=删除已联动出的明细再添加（默认）/ append=累计添加明细')
         .option('--fission <onoff>', '联动出的值继续触发联动: on（默认）/ off')
@@ -594,6 +598,46 @@ export function registerFormFieldLinkageCommands(form, program) {
         console.log(opts.json ? JSON.stringify({ success: true, linkageId, esbAppId, inFields: inF, outFields: outF }) : `字段联动已创建: [${linkageId}] ${cmdOpts.trigger}→${lastHop.queryFieldName}  in:${inF} out:${outF}`);
     });
 }
+/**
+ * Output 赋值公式：查询结果固定取第 0 行。
+ *
+ * 设计器按 `multTypeObj` 还原「设置查询数据」的取值方式：带节点 businessId 会显示成
+ * 「全部」，运行期拿到的是列表，赋不进单值字段；空下标 `[]` + childs 里的 `0`
+ * 才是「第 0 行」。查询条件是按数据 ID 精确过滤，结果最多一行，取第 0 行即可。
+ */
+function buildOutputFormulaValue(p) {
+    const sid = String(p.srcField.fieldId);
+    const paramKey = `${p.srcFormObjId}[].field_${sid}`;
+    const parentName = `${p.srcFormName}[].${p.srcField.fieldName}`;
+    const rowRef = genSfId();
+    const formulaId = genSfId();
+    return {
+        paramKey, paramName: `field_${sid}`, showName: String(p.srcField.fieldName), paramType: 'string',
+        dataType: 'attribute', arrs: false, paramTypeString: 'STRING', dataTypeSting: 'ATTRIBUTE',
+        formulaId: '0', name: String(p.srcField.fieldName), source: p.sourceWId,
+        value: `FormData.${p.srcFormObjId}[${rowRef}].field_${sid}`, type: '3', formulaType: 'string',
+        frontId: genSfId(), businessId: genSfId(), id: formulaId, applicationId: p.esbAppId,
+        childs: [{
+                formulaType: 'string', name: '0', id: genSfId(), position: rowRef,
+                type: '1', value: '0', childs: [],
+                config: { tempFormulaId: formulaId, tempId: genSfId(), formulaVersion: 'V1' },
+                parentId: formulaId,
+            }],
+        config: {
+            paramKey, paramType: 'string',
+            parentName, newParentName: parentName,
+            comId: p.sourceWId, isMultCom: false, tableName: '表单数据',
+            fieldInfo: { tablePrimaryKey: 'FormData', paramKey }, switchType: 'assign',
+            formulaVersion: 'V1', parentComId: 0, multName: '', multKey: '',
+            multTypeObj: {
+                currentName: parentName, allName: parentName,
+                currentParamKey: `FormData.${p.srcFormObjId}[].field_${sid}`,
+                allParamKey: `FormData.${p.srcFormObjId}[].field_${sid}`,
+            },
+        },
+        parentId: '0', switchType: 'assign',
+    };
+}
 // ─── saveDesign（FieldLinkage 触发 + N EnquiryForm 链式查询 + Output 赋值）───
 function buildSaveDesign(p) {
     const eventId = genSfId();
@@ -637,8 +681,6 @@ function buildSaveDesign(p) {
     // Output（赋值：最后一跳的查询结果 → 本表目标字段）
     const outWId = genSfId();
     const lastHop = p.hops[p.hops.length - 1];
-    const outBizId = genSfId();
-    const outParamKey = `${lastHop.srcFormObjId}[].field_${lastHop.queryFieldId}`;
     const outputAction = {
         id: outWId, wId: outWId, nodeType: 'Normal', comType: 'Output', type: 'Output',
         previousId: prevWId, parentId: '0', name: '设置赋值字段', isAdd: true, isOpen: false, componentName: '终止', attr: { icon: 'Icon-termination-1' }, isControl: true,
@@ -646,7 +688,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: { paramKey: outParamKey, paramName: `field_${lastHop.queryFieldId}`, showName: lastHop.queryFieldName, paramType: 'string', dataType: 'attribute', arrs: false, paramTypeString: 'STRING', dataTypeSting: 'ATTRIBUTE', formulaId: '0', name: lastHop.queryFieldName, source: prevWId, value: `FormData.${lastHop.srcFormObjId}[${outBizId}].field_${lastHop.queryFieldId}`, type: '3', formulaType: 'string', config: { paramKey: outParamKey, paramType: 'string', parentName: `${lastHop.srcFormName}[].${lastHop.queryFieldName}`, newParentName: `${lastHop.srcFormName}[].${lastHop.queryFieldName}`, comId: prevWId, isMultCom: false, tableName: '表单数据', fieldInfo: { tablePrimaryKey: 'FormData', paramKey: outParamKey }, switchType: 'assign' }, switchType: 'assign' } }] }],
+                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 }, sourceWId: prevWId, esbAppId: p.esbAppId }) }] }],
                 deleteTableIds: [], appId: p.esbAppId,
             }, applicationId: p.esbAppId,
         },
@@ -912,7 +954,7 @@ async function addQuickLinkage(p) {
         console.error('快捷配置需要至少一个 --condition');
         process.exit(1);
     }
-    const { formName: srcFormName } = await getFormId(client, baseUrl, appId, cmdOpts.sourceForm);
+    const { formName: srcFormName, tableName: srcTableName } = await getFormId(client, baseUrl, appId, cmdOpts.sourceForm);
     const srcFields = await getFormFields(client, baseUrl, cmdOpts.sourceForm, auth.userId, auth.tenantKey);
     const condList = cmdOpts.condition.map(expr => {
         const c = parseConditionExpr(expr, srcFields);
@@ -932,7 +974,7 @@ async function addQuickLinkage(p) {
         }
         return { srcField, targetField: findFieldId(detail.fields, t.field), subForm: detail };
     });
-    // 明细行依据：用户指定，缺省取该表第一个赋值的源字段（设计器里「依据值本身」那种配置）
+    // 明细行依据：显式 --basis 才走字段级；缺省由 buildQuickSaveDesign 用「选表」
     const basis = new Map();
     for (const expr of cmdOpts.basis || []) {
         const i = expr.indexOf('=');
@@ -948,10 +990,8 @@ async function addQuickLinkage(p) {
         }
         basis.set(detail.id, findFieldId(srcFields, expr.slice(i + 1).trim()));
     }
-    for (const a of assignPairs) {
-        if (a.subForm && !basis.has(a.subForm.id))
-            basis.set(a.subForm.id, a.srcField);
-    }
+    // 不给 --basis 时用「选表」作为明细行依据（查询结果整表），不再默认取第一个赋值源字段。
+    // 字段级依据只在显式 --basis 明细表=源表字段 时使用。
     const queryNames = cmdOpts.queryFields
         ? cmdOpts.queryFields.split(',').map(s => s.trim()).filter(Boolean)
         : [];
@@ -985,7 +1025,7 @@ async function addQuickLinkage(p) {
     const design = buildQuickSaveDesign({
         esbAppId, sceneId, lightId: FIELD_LINKAGE_LIGHT_ID, appName: linkageName,
         selfFormId, selfFormName, appId, selfFields,
-        srcFormObjId: cmdOpts.sourceForm, srcFormName,
+        srcFormObjId: cmdOpts.sourceForm, srcFormName, srcTableName,
         conditions: condList,
         queryFields, assigns: assignPairs,
         details: selfDetails, basis,
@@ -1209,23 +1249,10 @@ export function buildQuickSaveDesign(p) {
     };
     const outWId = genSfId();
     const mainTableId = genSfId();
-    const baseFormulaValue = (sf) => {
-        const sid = String(sf.fieldId);
-        const paramKey = `${p.srcFormObjId}[].field_${sid}`;
-        return {
-            paramKey, paramName: `field_${sid}`, showName: String(sf.fieldName), paramType: 'string',
-            dataType: 'attribute', arrs: false, paramTypeString: 'STRING', dataTypeSting: 'ATTRIBUTE',
-            formulaId: '0', name: String(sf.fieldName), source: eqWId,
-            value: `FormData.${p.srcFormObjId}[${genSfId()}].field_${sid}`, type: '3', formulaType: 'string',
-            config: {
-                paramKey, paramType: 'string',
-                parentName: `${p.srcFormName}[].${sf.fieldName}`, newParentName: `${p.srcFormName}[].${sf.fieldName}`,
-                comId: eqWId, isMultCom: false, tableName: '表单数据',
-                fieldInfo: { tablePrimaryKey: 'FormData', paramKey }, switchType: 'assign',
-            },
-            switchType: 'assign',
-        };
-    };
+    const baseFormulaValue = (sf) => buildOutputFormulaValue({
+        srcFormObjId: p.srcFormObjId, srcFormName: p.srcFormName, srcField: sf,
+        sourceWId: eqWId, esbAppId: p.esbAppId,
+    });
     /** 明细字段被赋的源字段正好是「依据值」时，设计器存的是 esbAssignSelf。 */
     const buildAssignField = (a, tableId, basisField) => {
         const sf = a.srcField;
@@ -1278,6 +1305,83 @@ export function buildQuickSaveDesign(p) {
             applicationId: p.esbAppId, businessId: genSfId(), fieldType: 'string',
         };
     };
+    // 「依据值 = 表」：设计器里选的是查询结果整表，而不是某个字段/数据ID。
+    // 明细赋值走 type=10：value 只写 field_<源字段>，config.value/config.config 指回整表结果。
+    const srcTableLabel = p.srcTableName ? `${p.srcFormName}(${p.srcTableName})` : p.srcFormName;
+    const srcTableParentName = `${srcTableLabel}[]`;
+    const srcTableValue = `FormData.${p.srcFormObjId}[]`;
+    const srcTableParamKey = `${p.srcFormObjId}[]`;
+    const buildSrcTableConfig = () => ({
+        paramKey: srcTableParamKey,
+        isMultCom: false,
+        comType: 'EnquiryForm',
+        switchType: 'assign',
+        parentComId: 0,
+        formulaVersion: 'V1',
+        fieldInfo: { paramKey: srcTableParamKey, tablePrimaryKey: 'FormData' },
+        tableName: '表单数据',
+        paramType: 'string',
+        parentName: srcTableParentName,
+        multName: '',
+        multKey: '',
+        multTypeObj: {
+            allName: srcTableParentName,
+            currentName: srcTableParentName,
+            currentParamKey: srcTableValue,
+            allParamKey: srcTableValue,
+        },
+        comId: eqWId,
+        newParentName: srcTableParentName,
+    });
+    const buildTableBasisValue = () => ({
+        frontId: p.srcFormObjId,
+        formulaType: 'json',
+        name: srcTableLabel,
+        businessId: genSfId(),
+        id: genSfId(),
+        source: eqWId,
+        type: '3',
+        applicationId: p.esbAppId,
+        value: srcTableValue,
+        childs: [],
+        config: buildSrcTableConfig(),
+        parentId: '0',
+    });
+    const buildTableBasisAssign = (a, tableId) => {
+        const sf = a.srcField;
+        const tf = a.targetField;
+        const sid = String(sf.fieldId);
+        return {
+            id: genSfId(), paramName: '', showName: '', paramType: 'string', isRequired: false,
+            fieldComments: '', skipNull: '1', assignFieldId: String(tf.fieldId),
+            fieldPath: `${tableId}.${tf.fieldId}`, fieldType: String(tf.fieldKey || 'Text'), switchType: 'sub',
+            formulaValue: {
+                formulaType: 'string',
+                name: String(sf.fieldName),
+                businessId: genSfId(),
+                id: genSfId(),
+                type: '10',
+                applicationId: p.esbAppId,
+                value: `field_${sid}`,
+                childs: [],
+                config: {
+                    frontId: genSfId(),
+                    paramKey: `${p.srcFormObjId}[].field_${sid}`,
+                    basisType: 'formSetting',
+                    switchType: 'sub',
+                    level: 1,
+                    id: `field_${sid}`,
+                    source: eqWId,
+                    formulaVersion: 'V1',
+                    value: srcTableValue,
+                    config: buildSrcTableConfig(),
+                    originValue: `field_${sid}`,
+                    content: String(sf.fieldName),
+                },
+                parentId: '0',
+            },
+        };
+    };
     const tableList = [{
             id: mainTableId, formId: p.selfFormId, showName: p.selfFormName, orderNum: 0,
             fields: p.assigns.filter(a => !a.subForm).map(a => buildAssignField(a, mainTableId)),
@@ -1289,11 +1393,14 @@ export function buildQuickSaveDesign(p) {
             continue;
         const detTableId = genSfId();
         const basisField = p.basis.get(det.id);
+        // 显式 --basis 才走字段级依据；缺省是「选表」。
         tableList.push({
             id: detTableId, formId: det.id, showName: det.name, orderNum: 1,
-            fields: detAssigns.map(a => buildAssignField(a, detTableId, basisField)),
+            fields: detAssigns.map(a => basisField
+                ? buildAssignField(a, detTableId, basisField)
+                : buildTableBasisAssign(a, detTableId)),
             main: false, isMain: false,
-            ...(basisField ? { basisValue: buildBasisValue(basisField) } : {}),
+            basisValue: basisField ? buildBasisValue(basisField) : buildTableBasisValue(),
         });
     }
     const detailFormFields = p.details