weaver-e10-builder 1.6.8 → 1.6.9

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

@@ -156,16 +156,60 @@ async function getFormMeta(client, baseUrl, objId, userId, tenantKey) {
         name: String(d.fields?.[0]?.subFormName || d.name || ''),
         fields: d.fields || [],
     })).filter((d) => /^\d+$/.test(d.id));
-    return { main: res?.data?.mainFields || [], details };
+    const main = await annotateEsbFieldIds(client, baseUrl, objId, res?.data?.mainFields || []);
+    return { main, details };
 }
 async function getFormFields(client, baseUrl, objId, userId, tenantKey) {
     return (await getFormMeta(client, baseUrl, objId, userId, tenantKey)).main;
 }
-function findFieldId(fields, name) {
-    const f = fields.find((x) => x.fieldName === name && /^\d+$/.test(String(x.fieldId)));
-    if (!f)
-        throw new Error(`字段 "${name}" 未找到`);
-    return f;
+/**
+ * 源表字段在 ESB 查询结果里的标识。
+ *
+ * 业务字段是 `field_<fieldId>`，**系统字段是裸 id**（「数据ID」= `id`、「标题」= `name`……）。
+ * 由平台 `getDataSourceFields` 给出，按显示名对上；拿不到就退回本地规则（系统字段没有
+ * ESB 标识时，调用方必须报错，不能拿 field_id 这种编出来的变量名去写设计）。
+ */
+const ESB_SOURCE_FIELDS_API = '/api/bs/esb/setting/component/getDataSourceFields';
+async function annotateEsbFieldIds(client, baseUrl, objId, fields) {
+    let esbList = [];
+    try {
+        const res = await client.post(`${baseUrl}${ESB_SOURCE_FIELDS_API}`, { sourceType: 'LOGIC', groupId: 'weaver-ebuilder-form-service', sourceId: objId }, { ebbusinessid: objId });
+        if (res?.code === 200 && Array.isArray(res.data))
+            esbList = res.data;
+    }
+    catch { /* 查询失败走本地规则 */ }
+    const byName = new Map(esbList.filter((f) => f?.content).map((f) => [String(f.content), f]));
+    return (fields || []).map((f) => {
+        const hit = byName.get(String(f.fieldName));
+        const fallback = /^\d+$/.test(String(f.fieldId)) ? `field_${f.fieldId}` : '';
+        return { ...f, esbId: String(hit?.id || fallback), esbDbFieldType: hit?.dbFieldType };
+    });
+}
+/** 源字段在 ESB 报文里的变量名；系统字段没有规范标识时报错，而不是拼一个假的。 */
+export function esbFieldIdOf(field) {
+    const id = String(field?.esbId ?? '');
+    if (id)
+        return id;
+    const fid = String(field?.fieldId ?? '');
+    if (/^\d+$/.test(fid))
+        return `field_${fid}`;
+    throw new Error(`字段「${field?.fieldName ?? fid}」不在该表单的 ESB 数据源字段里，无法作为联动字段使用`);
+}
+/**
+ * 按名称找字段。
+ *
+ * 默认只认业务字段（数值 fieldId）—— 触发字段/目标字段是「表单数据」本身，系统字段
+ * （数据ID/创建者等）不能当触发源或赋值落点。**带出侧**要允许系统字段，传 `allowSystem`。
+ */
+function findFieldId(fields, name, opts = {}) {
+    const matches = fields.filter((x) => x.fieldName === name || x.dataKey === name);
+    const f = matches.find((x) => opts.allowSystem === true || /^\d+$/.test(String(x.fieldId)));
+    if (f)
+        return f;
+    if (matches.length) {
+        throw new Error(`字段 "${name}" 是系统字段，不能作为触发字段或赋值目标；它可以作为查询/带出字段`);
+    }
+    throw new Error(`字段 "${name}" 未找到`);
 }
 export function registerFormFieldLinkageCommands(form, program) {
     const fl = form.command('field-linkage').description('字段联动（跨表带出赋值）：list / read / fields / add。本表字段间用公式赋值的是另一条链路，见 form formula-linkage');
@@ -535,15 +579,15 @@ export function registerFormFieldLinkageCommands(form, program) {
                 }
                 const { formId: sfFormId, formName: sfFormName } = await getFormId(client, baseUrl, appId, objId2);
                 const sfFields = await getFormFields(client, baseUrl, objId2, auth.userId, auth.tenantKey);
-                const qf = findFieldId(sfFields, fieldName);
-                hops.push({ srcFormObjId: objId2, srcFormId: sfFormId, srcFormName: sfFormName, queryFieldId: qf.fieldId, queryFieldName: qf.fieldName });
+                const qf = findFieldId(sfFields, fieldName, { allowSystem: true });
+                hops.push({ srcFormObjId: objId2, srcFormId: sfFormId, srcFormName: sfFormName, queryFieldId: qf.fieldId, queryFieldName: qf.fieldName, queryEsbId: esbFieldIdOf(qf) });
             }
         }
         else if (cmdOpts.sourceForm && cmdOpts.queryField) {
             const { formId: sfFormId, formName: sfFormName } = await getFormId(client, baseUrl, appId, cmdOpts.sourceForm);
             const sfFields = await getFormFields(client, baseUrl, cmdOpts.sourceForm, auth.userId, auth.tenantKey);
-            const qf = findFieldId(sfFields, cmdOpts.queryField);
-            hops = [{ srcFormObjId: cmdOpts.sourceForm, srcFormId: sfFormId, srcFormName: sfFormName, queryFieldId: qf.fieldId, queryFieldName: qf.fieldName }];
+            const qf = findFieldId(sfFields, cmdOpts.queryField, { allowSystem: true });
+            hops = [{ srcFormObjId: cmdOpts.sourceForm, srcFormId: sfFormId, srcFormName: sfFormName, queryFieldId: qf.fieldId, queryFieldName: qf.fieldName, queryEsbId: esbFieldIdOf(qf) }];
         }
         else {
             console.error('需要 --hops 或 --source-form/--query-field');
@@ -606,16 +650,17 @@ export function registerFormFieldLinkageCommands(form, program) {
  * 才是「第 0 行」。查询条件是按数据 ID 精确过滤，结果最多一行，取第 0 行即可。
  */
 function buildOutputFormulaValue(p) {
-    const sid = String(p.srcField.fieldId);
-    const paramKey = `${p.srcFormObjId}[].field_${sid}`;
+    // 系统字段（数据ID 等）在查询结果里的变量名是裸 id，不能套 `field_` 前缀。
+    const sid = esbFieldIdOf(p.srcField);
+    const paramKey = `${p.srcFormObjId}[].${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',
+        paramKey, paramName: 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',
+        value: `FormData.${p.srcFormObjId}[${rowRef}].${sid}`, type: '3', formulaType: 'string',
         frontId: genSfId(), businessId: genSfId(), id: formulaId, applicationId: p.esbAppId,
         childs: [{
                 formulaType: 'string', name: '0', id: genSfId(), position: rowRef,
@@ -631,8 +676,8 @@ function buildOutputFormulaValue(p) {
             formulaVersion: 'V1', parentComId: 0, multName: '', multKey: '',
             multTypeObj: {
                 currentName: parentName, allName: parentName,
-                currentParamKey: `FormData.${p.srcFormObjId}[].field_${sid}`,
-                allParamKey: `FormData.${p.srcFormObjId}[].field_${sid}`,
+                currentParamKey: `FormData.${p.srcFormObjId}[].${sid}`,
+                allParamKey: `FormData.${p.srcFormObjId}[].${sid}`,
             },
         },
         parentId: '0', switchType: 'assign',
@@ -656,8 +701,8 @@ function buildSaveDesign(p) {
             : (() => {
                 const prevHop = p.hops[i - 1];
                 const bizId = genSfId();
-                const pk = `${prevHop.srcFormObjId}[].field_${prevHop.queryFieldId}`;
-                return { paramKey: pk, paramName: `field_${prevHop.queryFieldId}`, 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}].field_${prevHop.queryFieldId}`, 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' };
+                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' };
             })();
         enquiryActions.push({
             id: eqWId, wId: eqWId, nodeType: 'Normal', comType: 'EnquiryForm', type: 'EnquiryForm',
@@ -669,7 +714,7 @@ function buildSaveDesign(p) {
                 dataSource: { id: hop.srcFormObjId, text: hop.srcFormName, type: 'LOGIC', groupId: 'weaver-ebuilder-form-service', isPhysical: true, usage: 'all', detailTable: false, objType: 'physical', module: 'ebuilder', appId: p.appId, isFormModuleSelected: true, enquiryId: -1 },
                 filterInput: { key: genSfId(), relationship: '1', isParent: true, isNewFilter: true, parentNode: '', datas: [{ isParent: false, parentNode: '', id: '5', fieldName: 'id', fieldType: 'String', optionType: '', text: '数据ID', objId: hop.srcFormObjId, compType: 'Text', type: 'condition', multiSelect: 'false', formInfo: { fieldId: '5' }, module: 'ebuilderform', mainField: true, subTableId: '', dbFieldType: 'Number', conditions: { func: 'eq', value: filterValue, text: filterValue.showName, isEsb: true, esbAssign: { wId: eqWId, textarea: false, withoutDftNum: true } } }], version: 1, filterIsNull: false, rootStr: `( 数据ID 等于 '${filterValue.showName}' )` },
                 authorityFlag: '0', opType: 'list',
-                queryFields: [{ id: `field_${hop.queryFieldId}`, content: hop.queryFieldName, parseMark: true, type: 'Ebuilder', fieldGroup: { name: hop.srcFormName, id: hop.srcFormObjId }, dbFieldType: 'NUMBER', otherParams: { objType: 'physical' }, formId: hop.srcFormObjId }],
+                queryFields: [{ id: hop.queryEsbId, content: hop.queryFieldName, parseMark: true, type: 'Ebuilder', fieldGroup: { name: hop.srcFormName, id: hop.srcFormObjId }, dbFieldType: 'NUMBER', otherParams: { objType: 'physical' }, formId: hop.srcFormObjId }],
                 type: 'EventButton', applicationId: p.esbAppId,
             },
             ignoreFlowCheck: true,
@@ -688,7 +733,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 }, 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 }, sourceWId: prevWId, esbAppId: p.esbAppId }) }] }],
                 deleteTableIds: [], appId: p.esbAppId,
             }, applicationId: p.esbAppId,
         },
@@ -721,9 +766,9 @@ const CONDITION_OPT_CODE = {
  */
 /** 查询结果字段的上下文公式（条件左右两侧共用）。 */
 function buildContextFormula(field, srcFormObjId, srcFormName, eqWId) {
-    const fid = String(field.fieldId);
-    const paramKey = `${srcFormObjId}[].field_${fid}`;
-    const valuePath = `FormData.${srcFormObjId}[].field_${fid}`;
+    const fid = esbFieldIdOf(field);
+    const paramKey = `${srcFormObjId}[].${fid}`;
+    const valuePath = `FormData.${srcFormObjId}[].${fid}`;
     const parentName = `${srcFormName}[].${field.fieldName}`;
     return {
         paramType: 'string', formulaType: 'string', name: String(field.fieldName),
@@ -964,7 +1009,7 @@ async function addQuickLinkage(p) {
     const assigns = cmdOpts.assign.map(parseAssignExpr);
     const assignPairs = assigns.map(a => {
         const t = splitAssignTarget(a.target);
-        const srcField = findFieldId(srcFields, a.src);
+        const srcField = findFieldId(srcFields, a.src, { allowSystem: true });
         if (!t.table)
             return { srcField, targetField: findFieldId(selfFields, t.field) };
         const detail = selfDetails.find(d => d.name === t.table);
@@ -988,7 +1033,7 @@ async function addQuickLinkage(p) {
             console.error(`明细表 "${tableName}" 未找到`);
             process.exit(1);
         }
-        basis.set(detail.id, findFieldId(srcFields, expr.slice(i + 1).trim()));
+        basis.set(detail.id, findFieldId(srcFields, expr.slice(i + 1).trim(), { allowSystem: true }));
     }
     // 不给 --basis 时用「选表」作为明细行依据（查询结果整表），不再默认取第一个赋值源字段。
     // 字段级依据只在显式 --basis 明细表=源表字段 时使用。
@@ -1000,7 +1045,7 @@ async function addQuickLinkage(p) {
             ...assigns.map(a => a.src),
             ...[...basis.values()].map((f) => f.fieldName),
         ])];
-    const queryFields = queryFieldList.map(n => findFieldId(srcFields, n));
+    const queryFields = queryFieldList.map(n => findFieldId(srcFields, n, { allowSystem: true }));
     if (queryFields.length === 0) {
         console.error('需要 --query-fields 或 --assign 指定查询字段');
         process.exit(1);
@@ -1106,7 +1151,18 @@ function parseConditionExpr(expr, srcFields) {
     const j = rest.indexOf(':');
     const rawFunc = (j < 0 ? rest : rest.slice(0, j)).trim();
     let value = j < 0 ? '' : rest.slice(j + 1).trim();
-    const field = findFieldId(srcFields, fieldName);
+    const field = (() => {
+        try {
+            return findFieldId(srcFields, fieldName);
+        }
+        catch (error) {
+            // 条件/赋值前提只认业务字段：系统字段的 ESB 条件形状与业务字段不同，没验证过不写。
+            if (/系统字段/.test(error.message)) {
+                throw new Error(`--condition 的源表字段「${fieldName}」是系统字段，条件只支持业务字段`);
+            }
+            throw error;
+        }
+    })();
     const family = conditionFieldFamily(String(field.fieldKey || 'Text'), String(field.fieldType || field.type || ''));
     const multiSelect = field.multiSelect === true || String(field.multiSelect) === 'true';
     let func;
@@ -1240,7 +1296,7 @@ export function buildQuickSaveDesign(p) {
             filterInput: { key: filterKey, relationship: '1', isParent: true, isNewFilter: true, parentNode: '', datas, version: 1, filterIsNull: false, rootStr },
             authorityFlag: '0', opType: 'list',
             queryFields: p.queryFields.map(f => ({
-                id: `field_${f.fieldId}`, content: String(f.fieldName), parseMark: parseMarkOf(f.fieldKey),
+                id: esbFieldIdOf(f), content: String(f.fieldName), parseMark: parseMarkOf(f.fieldKey),
                 fieldGroup: { name: p.srcFormName, id: p.srcFormObjId }, formId: p.srcFormObjId,
             })),
             type: 'EventButton', applicationId: p.esbAppId,
@@ -1259,8 +1315,8 @@ export function buildQuickSaveDesign(p) {
         const tf = a.targetField;
         const isBasisSelf = !!basisField && String(basisField.fieldId) === String(sf.fieldId);
         if (a.subForm && isBasisSelf) {
-            const sid = String(sf.fieldId);
-            const paramKey = `${p.srcFormObjId}[].field_${sid}`;
+            const sid = esbFieldIdOf(sf);
+            const paramKey = `${p.srcFormObjId}[].${sid}`;
             return {
                 id: genSfId(), paramName: '', showName: '', paramType: 'string', isRequired: false,
                 fieldComments: '', skipNull: '1', assignFieldId: String(tf.fieldId),
@@ -1271,7 +1327,7 @@ export function buildQuickSaveDesign(p) {
                     config: {
                         originValue: 'esbAssignSelf', switchType: 'sub', id: 'esbAssignSelf',
                         content: `${sf.fieldName}(依据值本身)`, source: eqWId, frontId: genSfId(),
-                        value: `FormData.${p.srcFormObjId}[].field_${sid}`, paramKey,
+                        value: `FormData.${p.srcFormObjId}[].${sid}`, paramKey,
                         config: baseFormulaValue(sf).config, level: 0, basisType: 'formSetting',
                     },
                 },
@@ -1286,15 +1342,15 @@ export function buildQuickSaveDesign(p) {
         };
     };
     const buildBasisValue = (field) => {
-        const fid = String(field.fieldId);
-        const paramKey = `${p.srcFormObjId}[].field_${fid}`;
+        const fid = esbFieldIdOf(field);
+        const paramKey = `${p.srcFormObjId}[].${fid}`;
         return {
-            id: genSfId(), deleteType: 0, paramKey, paramName: `field_${fid}`, showName: String(field.fieldName),
-            paramType: 'string', dataType: 'attribute', arrs: false, required: false, description: `field_${fid}`,
+            id: genSfId(), deleteType: 0, paramKey, paramName: fid, showName: String(field.fieldName),
+            paramType: 'string', dataType: 'attribute', arrs: false, required: false, description: fid,
             paramTypeString: 'STRING', dataTypeSting: 'ATTRIBUTE', formulaId: '0',
             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}[].field_${fid}`, type: '3', formulaType: 'string',
+            source: eqWId, value: `FormData.${p.srcFormObjId}[].${fid}`, type: '3', formulaType: 'string',
             frontId: genSfId(),
             config: {
                 paramKey, paramType: 'string',
@@ -1350,7 +1406,7 @@ export function buildQuickSaveDesign(p) {
     const buildTableBasisAssign = (a, tableId) => {
         const sf = a.srcField;
         const tf = a.targetField;
-        const sid = String(sf.fieldId);
+        const sid = esbFieldIdOf(sf);
         return {
             id: genSfId(), paramName: '', showName: '', paramType: 'string', isRequired: false,
             fieldComments: '', skipNull: '1', assignFieldId: String(tf.fieldId),
@@ -1362,20 +1418,20 @@ export function buildQuickSaveDesign(p) {
                 id: genSfId(),
                 type: '10',
                 applicationId: p.esbAppId,
-                value: `field_${sid}`,
+                value: sid,
                 childs: [],
                 config: {
                     frontId: genSfId(),
-                    paramKey: `${p.srcFormObjId}[].field_${sid}`,
+                    paramKey: `${p.srcFormObjId}[].${sid}`,
                     basisType: 'formSetting',
                     switchType: 'sub',
                     level: 1,
-                    id: `field_${sid}`,
+                    id: sid,
                     source: eqWId,
                     formulaVersion: 'V1',
                     value: srcTableValue,
                     config: buildSrcTableConfig(),
-                    originValue: `field_${sid}`,
+                    originValue: sid,
                     content: String(sf.fieldName),
                 },
                 parentId: '0',