@steedos-labs/plugin-workflow 3.0.58 → 3.0.60

package/src/instance_record_queue.js

@@ -195,17 +195,132 @@ const getRecordFieldValue = async function (oField, wField, ofValue, wfValue, sp
     let value;
     var oFieldType = oField.data_type || oField.type;
     // 表单选人选组字段 至 对象 lookup master_detail类型字段同步
-    if (['user', 'group'].includes(wField.type) && ['lookup', 'master_detail'].includes(oFieldType)
-        && (['users', 'organizations'].includes(oField.reference_to) || ('space_users' == oField.reference_to && 'user' == oField.reference_to_field))) {
-        if (!_.isEmpty(wfValue)) {
-            if (oField.multiple && wField.is_multiselect) {
-                value = _.compact(_.pluck(wfValue, 'id'))
-            } else if (!oField.multiple && !wField.is_multiselect) {
-                value = wfValue.id
+    if (['lookup', 'master_detail'].includes(oFieldType) && !_.isEmpty(wfValue)) {
+        // 检查是否是表单的 member/memberMulti 类型字段（对应对象的 users reference_to）
+        if ((wField.type === 'user' || wField.code === 'member' || wField.code === 'memberMulti') &&
+            ['users', 'space_users'].includes(oField.reference_to)) {
+            let referToField = oField.reference_to_field || '_id'
+
+            // 判断是否是新对象格式：{id, name, ...} 或 [{id, name, ...}]
+            let isNewObjectFormat = false;
+            if (Array.isArray(wfValue)) {
+                // 数组格式：检查第一个元素是否有 id 属性
+                isNewObjectFormat = wfValue.length > 0 && typeof wfValue[0] === 'object' && wfValue[0] !== null && wfValue[0].id;
+            } else if (typeof wfValue === 'object' && wfValue !== null) {
+                // 对象格式：检查是否有 id 属性（不是 _id）
+                isNewObjectFormat = wfValue.id || wfValue._id;
+            }
+
+            if (isNewObjectFormat) {
+                // 处理新对象格式：{id, name, sort_no, organization, organizations, hr, roles}
+                if (Array.isArray(wfValue)) {
+                    // 多选：数组对象格式
+                    if (oField.multiple) {
+                        value = _.compact(_.pluck(wfValue, wfValue[0]?.id ? 'id' : '_id'))
+                    } else {
+                        // 单选但是数组：取第一个
+                        value = wfValue.length > 0 ? (wfValue[0].id || wfValue[0]._id) : null
+                    }
+                } else {
+                    // 单选：对象格式
+                    const idValue = wfValue.id || wfValue._id;
+                    if (oField.multiple) {
+                        // 多选但是单个对象：包装成数组
+                        value = idValue ? [idValue] : null;
+                    } else {
+                        // 单选对象
+                        value = referToField === '_id' && wfValue._id ? wfValue._id : (referToField === '_id' ? wfValue.id : wfValue[referToField])
+                    }
+                }
+            }
+            // 处理字符串格式：直接的 ID 或 ID 字符串（和 lookup 字段一样的值）
+            else if (typeof wfValue === 'string') {
+                // 字符串：可能是单个 ID 或逗号分隔的 ID 列表
+                if (oField.multiple) {
+                    // 多选：返回原字符串或转换为数组
+                    value = wfValue.includes(',') ? wfValue.split(',').map(v => v.trim()) : wfValue;
+                } else {
+                    // 单选：返回第一个 ID
+                    value = wfValue.includes(',') ? wfValue.split(',')[0].trim() : wfValue;
+                }
+            }
+            // 处理数组格式：字符串数组
+            else if (Array.isArray(wfValue)) {
+                // 字符串数组：["user1", "user2"]
+                const stringArray = wfValue.filter(v => typeof v === 'string');
+                if (stringArray.length > 0) {
+                    if (oField.multiple) {
+                        value = stringArray;
+                    } else {
+                        value = stringArray[0];
+                    }
+                }
+            }
+        }
+        // 检查是否是表单的 org/orgMulti 类型字段（对应对象的 organizations reference_to）
+        else if ((wField.type === 'group' || wField.code === 'org' || wField.code === 'orgMulti') &&
+                 oField.reference_to === 'organizations') {
+            let referToField = oField.reference_to_field || '_id'
+
+            // 判断是否是新对象格式：{id, name, fullname} 或 [{id, name, fullname}]
+            let isNewObjectFormat = false;
+            if (Array.isArray(wfValue)) {
+                // 数组格式：检查第一个元素是否有 id 属性
+                isNewObjectFormat = wfValue.length > 0 && typeof wfValue[0] === 'object' && wfValue[0] !== null && wfValue[0].id;
+            } else if (typeof wfValue === 'object' && wfValue !== null) {
+                // 对象格式：检查是否有 id 属性（不是 _id）
+                isNewObjectFormat = wfValue.id || wfValue._id;
+            }
+
+            if (isNewObjectFormat) {
+                // 处理新对象格式：{id, name, fullname}
+                if (Array.isArray(wfValue)) {
+                    // 多选：数组对象格式
+                    if (oField.multiple) {
+                        value = _.compact(_.pluck(wfValue, wfValue[0]?.id ? 'id' : '_id'))
+                    } else {
+                        // 单选但是数组：取第一个
+                        value = wfValue.length > 0 ? (wfValue[0].id || wfValue[0]._id) : null
+                    }
+                } else {
+                    // 单选：对象格式
+                    const idValue = wfValue.id || wfValue._id;
+                    if (oField.multiple) {
+                        // 多选但是单个对象：包装成数组
+                        value = idValue ? [idValue] : null;
+                    } else {
+                        // 单选对象
+                        value = referToField === '_id' && wfValue._id ? wfValue._id : (referToField === '_id' ? wfValue.id : wfValue[referToField])
+                    }
+                }
+            }
+            // 处理字符串格式：直接的 ID 或 ID 字符串（和 lookup 字段一样的值）
+            else if (typeof wfValue === 'string') {
+                // 字符串：可能是单个 ID 或逗号分隔的 ID 列表
+                if (oField.multiple) {
+                    // 多选：返回原字符串或转换为数组
+                    value = wfValue.includes(',') ? wfValue.split(',').map(v => v.trim()) : wfValue;
+                } else {
+                    // 单选：返回第一个 ID
+                    value = wfValue.includes(',') ? wfValue.split(',')[0].trim() : wfValue;
+                }
+            }
+            // 处理数组格式：字符串数组
+            else if (Array.isArray(wfValue)) {
+                // 字符串数组：["org1", "org2"]
+                const stringArray = wfValue.filter(v => typeof v === 'string');
+                if (stringArray.length > 0) {
+                    if (oField.multiple) {
+                        value = stringArray;
+                    } else {
+                        value = stringArray[0];
+                    }
+                }
             }
         }
     }
     else if (!oField.multiple && ['lookup', 'master_detail'].includes(oFieldType) && _.isString(oField.reference_to) && _.isString(wfValue)) {
+        // 当是对象类型的 member/org 字段时，应该已在上面处理了，这里只处理字符串值
         var oCollection = objectql.getObject(oField.reference_to)
         var referObjectNameFieldKey = await getObjectNameFieldKey(oField.reference_to);
         if (oCollection && referObjectNameFieldKey) {
@@ -793,16 +908,31 @@ InstanceRecordQueue.syncValues = async function (field_map_back, values, ins, ob
     for (const tfc of _.uniq(tableFieldCodes)) {
         var c = JSON.parse(tfc);
         obj[c.object_table_field_code] = [];
+        const tableFields = objectFields[c.object_table_field_code] && objectFields[c.object_table_field_code].children
+            ? objectFields[c.object_table_field_code].children
+            : [];
+
         for (const tr of values[c.workflow_table_field_code]) {
             var newTr = {};
-            _.each(tr, function (v, k) {
-                tableFieldMap.forEach(function (tfm) {
+            for (const [k, v] of Object.entries(tr)) {
+                var matched = false;
+                for (const tfm of tableFieldMap) {
                     if (tfm.workflow_field == (c.workflow_table_field_code + '.$.' + k)) {
                         var oTdCode = tfm.object_field.split('.$.')[1];
-                        newTr[oTdCode] = v;
+                        var oField = _.find(tableFields, f => f.name === oTdCode);
+                        var wField = getFormField(formFields, k);
+
+                        // 调用 getRecordFieldValue 进行字段值转换，而不是直接赋值
+                        if (oField && wField) {
+                            newTr[oTdCode] = await getRecordFieldValue(oField, wField, null, v, spaceId, enableAmisform);
+                        } else {
+                            newTr[oTdCode] = v;
+                        }
+                        matched = true;
+                        break;
                     }
-                })
-            })
+                }
+            }
             if (!_.isEmpty(newTr)) {
                 obj[c.object_table_field_code].push(newTr);
             }

package/src/rests/badgeRecalcExecute.js

@@ -65,12 +65,10 @@ async function recalcUserBadge(userId, dryRun, categoriesCol, spaceUsersCol, opt
                 if (categoryIds.length === 0) continue;
 
                 const categoryBadge = await count_instance_tasks({
-                    filters: [
-                        ['handler', '=', userId],
-                        ['is_finished', '=', false],
-                        ['space', '=', spaceId],
-                        ['category', 'in', categoryIds],
-                    ]
+                    handler: userId,
+                    is_finished: false,
+                    space: spaceId,
+                    category: { $in: categoryIds },
                 });
 
                 badgeValue[appName] = categoryBadge;
@@ -79,11 +77,9 @@ async function recalcUserBadge(userId, dryRun, categoriesCol, spaceUsersCol, opt
 
         // 2. Total workflow badge for this space
         const taskCount = await count_instance_tasks({
-            filters: [
-                ['handler', '=', userId],
-                ['is_finished', '=', false],
-                ['space', '=', spaceId],
-            ]
+            handler: userId,
+            is_finished: false,
+            space: spaceId,
         });
         badgeValue.workflow = taskCount;