weaver-e10-builder 1.6.0 → 1.6.4

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