weaver-e10-builder 1.6.4 → 1.6.5

package/dist/services/actionflow/formula_service.js

@@ -779,68 +779,158 @@ export function buildPersonObject(personId, personName) {
         name: pname, id: pid, position: '', department: '', mainId: pid, cid: '', statusCode: 'normal',
     };
 }
+const SEND_MESSAGE_OBJECT_TYPE_ALIASES = {
+    user: 'resource', personnel: 'resource', person: 'resource', resource: 'resource',
+    dept: 'department', department: 'department',
+    company: 'subcompany', subcompany: 'subcompany',
+    role: 'role', group: 'group', position: 'position',
+    employeescope: 'employeeScope', employee_scope: 'employeeScope',
+    employeeshare: 'employeeShare', employee_share: 'employeeShare',
+    employeeorganization: 'employeeOrganization', employee_organization: 'employeeOrganization',
+    external: 'external', all: 'all', allexternal: 'allExternal', all_external: 'allExternal',
+};
+const SEND_MESSAGE_OBJECT_TYPES = new Set([
+    'resource', 'department', 'subcompany', 'role', 'group', 'position',
+    'employeeScope', 'employeeShare', 'employeeOrganization', 'external', 'all', 'allExternal',
+]);
+function normalizeSendMessageObjectType(receiver) {
+    const declaredType = String(receiver.type || '').toLowerCase();
+    const rawType = String(receiver.objectType || receiver.targetType
+        || (declaredType === 'context' || declaredType === 'reference' || declaredType === 'user_reference' ? 'resource' : receiver.type)
+        || 'user');
+    const normalized = SEND_MESSAGE_OBJECT_TYPE_ALIASES[rawType.toLowerCase()] || rawType;
+    if (!SEND_MESSAGE_OBJECT_TYPES.has(normalized)) {
+        throw new Error(`SendMessage.receiver.type 不支持对象类型：${rawType}`);
+    }
+    return normalized;
+}
+function sendMessageObjectValueField(objectType) {
+    return objectType === 'resource' ? 'obj_id' : `obj_id_${objectType}`;
+}
+function sendMessageObjectOrigin(objectType, item, id, name) {
+    const supplied = item.originValue ?? item.browserValue ?? item.browserObject ?? item.raw;
+    if (supplied && typeof supplied === 'object' && !Array.isArray(supplied))
+        return supplied;
+    if (objectType === 'resource' || objectType === 'external')
+        return buildPersonObject(id, name);
+    // 固定值只提供 id/name 时，补齐各类 Browser 至少需要的通用展示字段；
+    // 如果调用方传了真实 Browser 对象，上面的 supplied 分支会完整保留它。
+    return {
+        id, name, content: name, title: name, contentDesc: name,
+        isLeaf: true, leaf: true, stopDepartment: false,
+        ...(objectType === 'department' || objectType === 'subcompany' ? { departmentId: id } : {}),
+        ...(objectType === 'position' ? { position: name } : {}),
+    };
+}
+function sendMessageObjectFormula(objectType, item, appId) {
+    const supplied = item.formula || item.formulaData || item.objectFormula;
+    if (supplied && typeof supplied === 'object' && !Array.isArray(supplied))
+        return supplied;
+    if (item.formulaType || (item.type && item.config && Object.prototype.hasOwnProperty.call(item, 'value'))) {
+        return item;
+    }
+    const id = String(item.id ?? item.value ?? '').trim();
+    const name = String(item.name ?? item.label ?? item.content ?? id).trim();
+    if (!id)
+        return {};
+    return {
+        formulaType: 'string', name: id, id: genSfId(), position: genSfId(), type: '1',
+        applicationId: String(appId), value: id, fieldType: 'string',
+        config: { switchType: 'fixvalue', originValue: [sendMessageObjectOrigin(objectType, item, id, name)] },
+    };
+}
+function sendMessageDynamicObjectFormula(receiver, objectType, meta, appId, sourceId) {
+    const kind = String(receiver.kind || receiver.assignmentKind || '').toLowerCase();
+    const rawType = String(receiver.type || '').toLowerCase();
+    const dynamicKind = kind || (rawType === 'context' || rawType === 'reference' || rawType === 'user_reference' ? rawType : '');
+    if (!dynamicKind || dynamicKind === 'fixed')
+        return null;
+    const key = String(receiver.paramKey || receiver.key
+        || (dynamicKind === 'context' || dynamicKind === 'reference' || dynamicKind === 'user_reference' ? receiver.id : '')
+        || '').trim();
+    if (!key)
+        return null;
+    const label = String(receiver.label || receiver.name || key);
+    const formula = dynamicKind === 'system_variable'
+        ? formulaSystemVar(key)
+        : buildAssignBean({ kind: dynamicKind === 'reference' || dynamicKind === 'user_reference' ? 'context' : dynamicKind, paramKey: key, label, ...receiver }, key, 'string', meta, appId, sourceId);
+    return { formula, targetId: key };
+}
 export function buildShareList(receiver, meta, appId = '', eventId = '') {
     if (!receiver || typeof receiver !== 'object')
         return [];
-    const objType = String(receiver.type || 'user');
-    if (objType === 'context' || objType === 'user_reference') {
-        const key = String(receiver.key || receiver.paramKey || receiver.id || '');
-        if (!key)
-            return [];
-        const label = String(receiver.label || receiver.name || key);
-        // 接收人同样属于动态赋值：必须保留真实触发组件、字段 id 和参数路径，
-        // 不能复用默认 ApproveTrigger 壳，否则定时/表单触发器会在设计器中被误判。
-        const objIdFormula = buildAssignBean({ kind: 'context', paramKey: key, label }, key, 'string', meta, appId, String(eventId || genSfId()));
+    // 前端 authDataParam.sourceId 是提醒对象所属来源的独立 ID，不是画布触发节点 ID。
+    const sourceId = String(receiver.sourceId || genSfId());
+    const objectType = normalizeSendMessageObjectType(receiver);
+    if (objectType === 'all' || objectType === 'allExternal') {
+        const targetType = objectType === 'all' ? 11 : 1101;
         return [{
-                sourceId: String(eventId || genSfId()), permissionId: 'esb', permissionType: 1, objType: 'resource',
-                user_type: '1', targetId: key, sourceType: 1, targetType: 1, id: genSfId(), obj_id: objIdFormula,
+                sourceId, permissionId: 'esb', permissionType: 1,
+                user_type: String(receiver.userType || '1'),
+                targetId: 0,
+                sourceType: 1, targetType, id: genSfId(), objType: objectType,
+                ...(receiver.seclevel && typeof receiver.seclevel === 'object'
+                    ? { seclevel: receiver.seclevel }
+                    : objectType === 'all' ? { seclevel: { min: 0, max: 100 } } : {}),
             }];
     }
-    const objtypeForDesigner = objType === 'user' ? 'resource' : objType;
-    if (objType === 'all' || objType === 'allExternal') {
-        return [{
-                sourceId: String(eventId || genSfId()), permissionId: 'esb', permissionType: 1,
-                objType: objtypeForDesigner, sourceType: 1, targetType: 1, id: genSfId(),
-            }];
+    const valueField = sendMessageObjectValueField(objectType);
+    const dynamic = sendMessageDynamicObjectFormula(receiver, objectType, meta, appId, sourceId);
+    if (dynamic) {
+        const entry = {
+            sourceId, permissionId: 'esb', permissionType: 1, objType: objectType,
+            targetId: dynamic.targetId, sourceType: 1, targetType: 1, id: genSfId(),
+            [valueField]: dynamic.formula,
+        };
+        if (objectType === 'resource')
+            entry.user_type = String(receiver.userType || '1');
+        return [entry];
     }
-    const valueField = objType === 'user' ? 'obj_id' : `obj_id_${objType}`;
-    let persons = receiver.persons;
+    // 前端 transMultData 会把 type=8 多选公式拆成多条 shareList；CLI 也支持
+    // 直接传 formula/formulaData，避免把前端 multipleSelect 容器原样塞进单条记录。
+    const container = receiver.formula || receiver.formulaData || receiver.objectFormula;
+    const containerChildren = container && String(container.type) === '8' && Array.isArray(container.childs)
+        ? container.childs : [];
+    const singleFormula = container && String(container.type) !== '8' && typeof container === 'object'
+        ? container : null;
+    let persons = receiver.persons || receiver.values || receiver.items || receiver.objects;
     if (!Array.isArray(persons)) {
         const pid = String(receiver.id ?? '').trim();
         const pname = String(receiver.name ?? receiver.label ?? '').trim();
         persons = pid ? [{ id: pid, name: pname }] : [];
     }
+    if (!persons.length && containerChildren.length)
+        persons = containerChildren.map((formula) => ({ formula }));
+    if (!persons.length && singleFormula)
+        persons = [{ formula: singleFormula }];
     if (!persons.length)
         return [];
     const userType = String(receiver.userType || '1');
     let seclevel = receiver.seclevel;
     if (Array.isArray(seclevel) && seclevel.length === 2)
         seclevel = { min: parseInt(String(seclevel[0]), 10), max: parseInt(String(seclevel[1]), 10) };
-    const roleLevel = objType === 'role' ? String(receiver.roleLevel || '') : '';
-    const positionLevel = objType === 'position' ? String(receiver.positionLevel || '') : '';
-    const positionLevelSubcompany = objType === 'position' ? receiver.positionLevelSubcompany : null;
-    const positionLevelDepartment = objType === 'position' ? receiver.positionLevelDepartment : null;
-    const positionAttribute = objType === 'position' ? receiver.positionAttribute : null;
-    const departmentAttribute = objType === 'department' || objType === 'subcompany' ? receiver.departmentAttribute : null;
+    const roleLevel = objectType === 'role' ? String(receiver.roleLevel ?? receiver.role_level ?? '') : '';
+    const positionLevel = objectType === 'position' ? String(receiver.positionLevel ?? receiver.position_level ?? '') : '';
+    const positionLevelSubcompany = objectType === 'position' ? (receiver.positionLevelSubcompany ?? receiver.position_level_subcompany) : null;
+    const positionLevelDepartment = objectType === 'position' ? (receiver.positionLevelDepartment ?? receiver.position_level_department) : null;
+    const positionAttribute = objectType === 'position' ? (receiver.positionAttribute ?? receiver.position_attribute) : null;
+    const departmentAttribute = objectType === 'department' || objectType === 'subcompany'
+        ? (receiver.departmentAttribute ?? receiver.department_attribute) : null;
     const shareList = [];
     for (const p of persons) {
-        const pid = String(p.id ?? '').trim();
+        const formula = sendMessageObjectFormula(objectType, p, appId);
+        const pid = String(p.id ?? p.value ?? formula.value ?? '').trim();
         const pname = String(p.name ?? p.label ?? pid).trim();
-        if (!pid)
+        if (!pid && !formula.value)
             continue;
-        const personObj = buildPersonObject(pid, pname);
-        const objIdFormula = {
-            formulaType: 'string', name: pid, id: genSfId(), position: genSfId(), type: '1',
-            applicationId: String(appId), value: pid, fieldType: 'string',
-            config: { switchType: 'fixvalue', originValue: [personObj] },
-        };
+        const targetId = pid || String(formula.value || '');
         const entry = {
-            sourceId: String(eventId || genSfId()), permissionId: 'esb', permissionType: 1,
-            objType: objtypeForDesigner, targetId: pid, sourceType: 1, targetType: 1, id: genSfId(),
+            sourceId, permissionId: 'esb', permissionType: 1,
+            objType: objectType, targetId, sourceType: 1, targetType: 1, id: genSfId(),
         };
-        if (objType === 'user')
+        if (objectType === 'resource')
             entry.user_type = userType;
-        entry[valueField] = objIdFormula;
+        entry[valueField] = formula;
         if (seclevel && typeof seclevel === 'object')
             entry.seclevel = seclevel;
         if (roleLevel)
@@ -855,6 +945,11 @@ export function buildShareList(receiver, meta, appId = '', eventId = '') {
             entry.position_attribute = positionAttribute;
         if (Array.isArray(departmentAttribute) && departmentAttribute.length)
             entry.department_attribute = departmentAttribute;
+        if (objectType === 'employeeOrganization') {
+            const fixValueType = p.fixValueType ?? p.originTargetType ?? p.entityType ?? receiver.fixValueType;
+            if (fixValueType)
+                entry.fixValueType = String(fixValueType);
+        }
         shareList.push(entry);
     }
     return shareList;
@@ -2074,6 +2169,27 @@ export function buildSettingEntry(fieldId, assignment, fieldType = 'Text', meta
             ? ref._resolvedContext : {};
         const resolvedComponentType = String(resolvedContext.componentType || sourceComponent || '').trim();
         const resolvedTableRoot = String(resolvedContext.tablePrimaryKey || '').trim();
+        const basisParamKey = String(ref?.basisParamKey || ref?.basisValue?.paramKey || '').trim();
+        const basisType = String(ref?.basisType || ref?.config?.basisType || 'formSetting');
+        const isBasisDescendant = Boolean(basisParamKey && (String(key) === basisParamKey
+            || String(key).startsWith(`${basisParamKey}.`)));
+        if (detailMode && isBasisDescendant && String(key).includes('[].')) {
+            const pkeyFull = String(resolvedContext.paramKey || key);
+            const detailParent = String(resolvedContext.parentName || '').trim();
+            const detailLabel = detailParent.includes('[]')
+                ? detailParent.slice(0, detailParent.indexOf('[]') + 2)
+                : (basisParamKey.split('[]')[0].split('.').pop() || basisParamKey);
+            flat = assignFlatEsbChild(pkeyFull, String(label || key), String(src), appId, ft, undefined, detailLabel, String(meta._upstream_workflow_name || ''), resolvedComponentType || sourceComponent, contextMetaForReference(meta, ref, resolvedComponentType || sourceComponent), resolvedContext, basisParamKey, basisType);
+            switchT = 'sub';
+            attachEsbAssign(flat, meta, String(src));
+            return {
+                formFieldKey: '',
+                value: {
+                    original: false, operate, switchType: 'sub', fieldKey: fieldId, assignType: '',
+                    fieldType, assignId: String(flat.id || ''), assign: flat, multiSelect: false,
+                },
+            };
+        }
         // 只有平台明确返回“表单/流程上下文 + 表单触发组件”时，才走
         // EsbFormDataDto 的明细子字段协议。数组形状本身不能证明它是表单明细；
         // 例如 GetDocumentInfo 的 attachmentInfos[].id 仍是 Response 上下文，