@steedos-labs/plugin-workflow 3.0.58 → 3.0.60

package/main/default/manager/uuflowManagerForInitApproval.js

@@ -100,45 +100,115 @@ const getFieldOdataValue = async (objName, id, referenceToFieldName) => {
     return;
 };
 
-const getSelectUserValue = (userId, spaceId) => {
-    const su = Creator.getCollection('space_users').findOne({ space: spaceId, user: userId });
-    su.id = userId;
-    return su;
+const getSelectUserValue = async (userId, spaceId) => {
+    const coll = await getCollection('space_users');
+    const su = await coll.findOne({ space: spaceId, user: userId });
+    if (su) {
+        su.id = userId;
+        return su;
+    }
+    return null;
 };
 
-const getSelectUserValues = (userIds, spaceId) => {
+const getSelectUserValues = async (userIds, spaceId) => {
     const sus = [];
-    if (_.isArray(userIds)) {
-        _.each(userIds, (userId) => {
-            const su = getSelectUserValue(userId, spaceId);
-            if (su) {
-                sus.push(su);
+
+    // 处理多种输入格式
+    if (!userIds) {
+        return sus;
+    }
+
+    let idArray = [];
+    if (typeof userIds === 'string') {
+        // 字符串：单个 ID 或逗号分隔的 ID 列表
+        idArray = userIds.includes(',')
+            ? userIds.split(',').map(id => id.trim()).filter(id => id)
+            : [userIds];
+    } else if (Array.isArray(userIds)) {
+        // 数组：可能是字符串数组或对象数组
+        idArray = userIds.map(item => {
+            if (typeof item === 'string') {
+                return item.trim();
+            } else if (typeof item === 'object' && item !== null) {
+                // 对象格式：{id, ...} 或 {_id, ...} 或 {user, ...}
+                return item.id || item._id || item.user;
             }
-        });
+            return null;
+        }).filter(id => id);
+    } else if (typeof userIds === 'object' && userIds !== null) {
+        // 单个对象：{id, ...}
+        const userId = userIds.id || userIds._id || userIds.user;
+        if (userId) {
+            idArray = [userId];
+        }
     }
+
+    // 获取用户详细信息
+    for (const userId of idArray) {
+        const su = await getSelectUserValue(userId, spaceId);
+        if (su) {
+            sus.push(su);
+        }
+    }
+
     return sus;
 };
 
-const getSelectOrgValue = (orgId, spaceId) => {
-    const org = Creator.getCollection('organizations').findOne(orgId, { fields: { _id: 1, name: 1, fullname: 1 } });
-    org.id = orgId;
-    return org;
+const getSelectOrgValue = async (orgId, spaceId) => {
+    const coll = await getCollection('organizations');
+    const org = await coll.findOne(orgId, { fields: { _id: 1, name: 1, fullname: 1 } });
+    if (org) {
+        org.id = orgId;
+        return org;
+    }
+    return null;
 };
 
-const getSelectOrgValues = (orgIds, spaceId) => {
+const getSelectOrgValues = async (orgIds, spaceId) => {
     const orgs = [];
-    if (_.isArray(orgIds)) {
-        _.each(orgIds, (orgId) => {
-            const org = getSelectOrgValue(orgId, spaceId);
-            if (org) {
-                orgs.push(org);
+
+    // 处理多种输入格式
+    if (!orgIds) {
+        return orgs;
+    }
+
+    let idArray = [];
+    if (typeof orgIds === 'string') {
+        // 字符串：单个 ID 或逗号分隔的 ID 列表
+        idArray = orgIds.includes(',')
+            ? orgIds.split(',').map(id => id.trim()).filter(id => id)
+            : [orgIds];
+    } else if (Array.isArray(orgIds)) {
+        // 数组：可能是字符串数组或对象数组
+        idArray = orgIds.map(item => {
+            if (typeof item === 'string') {
+                return item.trim();
+            } else if (typeof item === 'object' && item !== null) {
+                // 对象格式：{id, ...} 或 {_id, ...}
+                return item.id || item._id;
             }
-        });
+            return null;
+        }).filter(id => id);
+    } else if (typeof orgIds === 'object' && orgIds !== null) {
+        // 单个对象：{id, ...}
+        const orgId = orgIds.id || orgIds._id;
+        if (orgId) {
+            idArray = [orgId];
+        }
+    }
+
+    // 获取组织详细信息
+    for (const orgId of idArray) {
+        const org = await getSelectOrgValue(orgId, spaceId);
+        if (org) {
+            orgs.push(org);
+        }
     }
+
     return orgs;
 };
 
-const getFileFieldValue = (recordFieldId, fType) => {
+const getFileFieldValue = async (recordFieldId, fType) => {
     if (_.isEmpty(recordFieldId)) {
         return;
     }
@@ -154,7 +224,8 @@ const getFileFieldValue = (recordFieldId, fType) => {
     } else {
         query = { _id: { $in: recordFieldId } };
     }
-    const files = Creator.Collections[`cfs.${collection}.filerecord`].find(query);
+    const coll = await getCollection(`cfs.${collection}.filerecord`);
+    const files = await coll.find(query).toArray();
     const value = [];
     files.forEach((f) => {
         const newFile = new FS.File();
@@ -200,27 +271,26 @@ const getInstanceFieldValue = (objField, formField, record, object_field, spaceI
             odataFieldValue = getFieldOdataValue(referenceToObjectName, recordFieldValue, referenceToFieldName);
         }
         value = odataFieldValue;
-    } else if (formField && objField && ['user', 'group'].includes(formField.type) && ['lookup', 'master_detail'].includes(objField.type) && (['users', 'organizations'].includes(objField.reference_to) || ('space_users' == objField.reference_to && 'user' == objField.reference_to_field))) {
+    }
+    // 对象的 lookup/master_detail 字段（users/space_users reference_to）→ 审批单的 member/memberMulti 字段
+    else if (formField && objField && (formField.type === 'user' || formField.code === 'member' || formField.code === 'memberMulti')
+        && ['lookup', 'master_detail'].includes(objField.type)
+        && ['users', 'space_users'].includes(objField.reference_to)) {
         if (!_.isEmpty(recordFieldValue)) {
-            let selectFieldValue;
-            if (formField.type == 'user') {
-                if (objField.multiple && formField.is_multiselect) {
-                    selectFieldValue = getSelectUserValues(recordFieldValue, spaceId);
-                } else if (!objField.multiple && !formField.is_multiselect) {
-                    selectFieldValue = getSelectUserValue(recordFieldValue, spaceId);
-                }
-            } else if (formField.type == 'group') {
-                if (objField.multiple && formField.is_multiselect) {
-                    selectFieldValue = getSelectOrgValues(recordFieldValue, spaceId);
-                } else if (!objField.multiple && !formField.is_multiselect) {
-                    selectFieldValue = getSelectOrgValue(recordFieldValue, spaceId);
-                }
-            }
-            if (selectFieldValue) {
-                value = selectFieldValue;
-            }
+            // recordFieldValue 可能是字符串、字符数组、或 ID 数组，都统一处理
+            value = getSelectUserValues(recordFieldValue, spaceId);
+        }
+    }
+    // 对象的 lookup/master_detail 字段（organizations reference_to）→ 审批单的 org/orgMulti 字段
+    else if (formField && objField && (formField.type === 'group' || formField.code === 'org' || formField.code === 'orgMulti')
+        && ['lookup', 'master_detail'].includes(objField.type)
+        && objField.reference_to === 'organizations') {
+        if (!_.isEmpty(recordFieldValue)) {
+            // recordFieldValue 可能是字符串、字符数组、或 ID 数组，都统一处理
+            value = getSelectOrgValues(recordFieldValue, spaceId);
         }
-    } else if (formField && objField && formField.type == 'date' && recordFieldValue) {
+    }
+    else if (formField && objField && formField.type == 'date' && recordFieldValue) {
         value = uuflowManagerForInitApproval.formatDate(recordFieldValue);
     } else if (formField && objField && formField.type == 'time' && recordFieldValue) {
         value = uuflowManagerForInitApproval.formatTime(recordFieldValue);
@@ -256,7 +326,7 @@ const checkRequiredDetails = (requiredDetails, masterRecord) => {
 
 const uuflowManagerForInitApproval = {};
 
-uuflowManagerForInitApproval.check_authorization = (req) => {
+uuflowManagerForInitApproval.check_authorization = async (req) => {
     const query = req.query;
     const userId = query["X-User-Id"];
     const authToken = query["X-Auth-Token"];
@@ -265,17 +335,22 @@ uuflowManagerForInitApproval.check_authorization = (req) => {
         throw new Error(401, 'Unauthorized');
     }
 
-    const hashedToken = Accounts._hashLoginToken(authToken);
-    const user = Meteor.users.findOne({
-        _id: userId,
-        "services.resume.loginTokens.hashedToken": hashedToken
-    });
+    // 使用 objectql 查询 users 对象
+    try {
+        const users = await objectql.getObject('users').find({
+            filters: [['_id', '=', userId]],
+            fields: ['_id', 'username']
+        });
+
+        if (!users || users.length === 0) {
+            throw new Error(401, 'Unauthorized');
+        }
 
-    if (!user) {
+        const user = users[0];
+        return user;
+    } catch (error) {
         throw new Error(401, 'Unauthorized');
     }
-
-    return user;
 };
 
 uuflowManagerForInitApproval.getSpace = async (space_id) => {
@@ -710,38 +785,47 @@ uuflowManagerForInitApproval.evalFieldMapScript = (field_map_script, objectName,
     return {};
 };
 
-uuflowManagerForInitApproval.initiateAttach = (recordIds, spaceId, insId, approveId) => {
-    Creator.Collections['cms_files'].find({
+uuflowManagerForInitApproval.initiateAttach = async (recordIds, spaceId, insId, approveId) => {
+    const cfsColl = await getCollection('cms_files');
+    const cfsFileRecordColl = await getCollection('cfs.files.filerecord');
+
+    const cmsFiles = await cfsColl.find({
         space: spaceId,
         parent: recordIds
-    }).forEach((cf) => {
-        _.each(cf.versions, (versionId, idx) => {
-            const f = Creator.Collections['cfs.files.filerecord'].findOne(versionId);
-            const newFile = new FS.File();
-            newFile.attachData(f.createReadStream('files'), {
-                type: f.original.type
-            }, (err) => {
-                if (err) {
-                    throw new Error(err.error, err.reason);
-                }
-                newFile.name(f.name());
-                newFile.size(f.size());
-                const metadata = {
-                    owner: f.metadata.owner,
-                    owner_name: f.metadata.owner_name,
-                    space: spaceId,
-                    instance: insId,
-                    approve: approveId,
-                    parent: cf._id
-                };
-                if (idx === 0) {
-                    metadata.current = true;
-                }
-                newFile.metadata = metadata;
-                cfs.instances.insert(newFile);
-            });
-        });
-    });
+    }).toArray();
+
+    for (const cf of cmsFiles) {
+        for (let idx = 0; idx < cf.versions.length; idx++) {
+            const versionId = cf.versions[idx];
+            const f = await cfsFileRecordColl.findOne(versionId);
+
+            if (f) {
+                const newFile = new FS.File();
+                newFile.attachData(f.createReadStream('files'), {
+                    type: f.original.type
+                }, (err) => {
+                    if (err) {
+                        throw new Error(err.error, err.reason);
+                    }
+                    newFile.name(f.name());
+                    newFile.size(f.size());
+                    const metadata = {
+                        owner: f.metadata.owner,
+                        owner_name: f.metadata.owner_name,
+                        space: spaceId,
+                        instance: insId,
+                        approve: approveId,
+                        parent: cf._id
+                    };
+                    if (idx === 0) {
+                        metadata.current = true;
+                    }
+                    newFile.metadata = metadata;
+                    cfs.instances.insert(newFile);
+                });
+            }
+        }
+    }
     return;
 };
 
@@ -757,28 +841,38 @@ uuflowManagerForInitApproval.initiateRecordInstanceInfo = async (recordIds, insI
     return;
 };
 
-uuflowManagerForInitApproval.initiateRelatedRecordInstanceInfo = (relatedTablesInfo, insId, spaceId) => {
-    _.each(relatedTablesInfo, (tableItems, relatedObjectName) => {
-        const relatedCollection = Creator.getCollection(relatedObjectName, spaceId);
-        _.each(tableItems, (item) => {
-            relatedCollection.direct.update(item._table._id, {
-                $set: {
-                    instances: [{
-                        _id: insId,
-                        state: 'draft'
-                    }],
-                    _table: item._table
+uuflowManagerForInitApproval.initiateRelatedRecordInstanceInfo = async (relatedTablesInfo, insId, spaceId) => {
+    for (const [relatedObjectName, tableItems] of Object.entries(relatedTablesInfo)) {
+        const relatedColl = await getCollection(relatedObjectName);
+        for (const item of tableItems) {
+            await relatedColl.updateOne(
+                { _id: item._table._id },
+                {
+                    $set: {
+                        instances: [{
+                            _id: insId,
+                            state: 'draft'
+                        }],
+                        _table: item._table
+                    }
                 }
-            });
-        });
-    });
+            );
+        }
+    }
     return;
 };
 
 uuflowManagerForInitApproval.checkIsInApproval = async (recordIds, spaceId) => {
     const record = await objectFindOne(recordIds.o, { filters: [['_id', '=', recordIds.ids[0]]], fields: ['instances'] });
-    if (record && record.instances && record.instances[0].state !== 'completed' && Creator.Collections.instances.find(record.instances[0]._id).count() > 0) {
-        throw new Error('error!', "此记录已发起流程正在审批中，待审批结束方可发起下一次审批！");
+    if (record && record.instances && record.instances[0].state !== 'completed') {
+        // 使用 objectql 查询 instances 集合
+        const instances = await objectql.getObject('instances').find({
+            filters: [['_id', '=', record.instances[0]._id]],
+            fields: ['_id']
+        });
+        if (instances && instances.length > 0) {
+            throw new Error('error!', "此记录已发起流程正在审批中，待审批结束方可发起下一次审批！");
+        }
     }
     return;
 };

package/main/default/manager/uuflow_manager.js

@@ -4493,6 +4493,7 @@ UUFlowManager.relocate = async function (instance_from_client, current_user_info
 
     // Verify permissions
     const permissions = await PermissionManager.getFlowPermissions(instance.flow, current_user);
+
     const space = await db.spaces.findOne(
         { _id: instance.space },
         { projection: { admins: 1 } }
@@ -4560,9 +4561,9 @@ UUFlowManager.relocate = async function (instance_from_client, current_user_info
                         let signShowApproveId = null;
 
                         for (let l = sameTraces.length - 1; l >= 0; l--) {
-                            const found = sameTraces[l].approves.find(a => 
-                                a.user === traces[i].approves[h].user && 
-                                a.judge !== "terminated" && 
+                            const found = sameTraces[l].approves.find(a =>
+                                a.user === traces[i].approves[h].user &&
+                                a.judge !== "terminated" &&
                                 a.description
                             );
                             if (found) {
@@ -4725,7 +4726,7 @@ UUFlowManager.relocate = async function (instance_from_client, current_user_info
     setObj.traces = traces;
 
     // Update instance
-    const updateOperation = setObj.state === 'completed' 
+    const updateOperation = setObj.state === 'completed'
         ? { $set: setObj }
         : { $set: setObj, $unset: { finish_date: 1 } };
 
@@ -4739,46 +4740,44 @@ UUFlowManager.relocate = async function (instance_from_client, current_user_info
         await remove_many_instance_tasks(finishedApproveIds);
         if (newTrace.approves?.length) {
             await insert_many_instance_tasks(
-                instance_id, 
-                newTrace._id, 
+                instance_id,
+                newTrace._id,
                 newTrace.approves.map(a => a._id)
             );
         }
 
         const updatedInstance = await UUFlowManager.getInstance(instance_id);
 
-        // Send notifications
-        await pushManager.send_message_current_user(current_user_info);
-        await Promise.all(not_in_inbox_users
-            .filter(user_id => user_id !== current_user)
-            .map(user_id => pushManager.send_message_to_specifyUser("current_user", user_id))
-        );
-
+        // Send notifications (并行)
         const notifyUsers = [...new Set([
             updatedInstance.applicant,
             updatedInstance.submitter,
             ...(updatedInstance.outbox_users || [])
         ])];
 
-        await Promise.all(notifyUsers.map(user_id => 
-            pushManager.send_message_to_specifyUser("current_user", user_id)
-        ));
-
-        await pushManager.send_instance_notification(
-            "reassign_new_inbox_users", 
-            updatedInstance, 
-            relocate_comment, 
-            current_user_info
-        );
-
-        await pushManager.triggerWebhook(
-            updatedInstance.flow, 
-            updatedInstance, 
-            {}, 
-            'relocate', 
-            current_user, 
-            updatedInstance.inbox_users
-        );
+        await Promise.all([
+            pushManager.send_message_current_user(current_user_info),
+            ...not_in_inbox_users
+                .filter(user_id => user_id !== current_user)
+                .map(user_id => pushManager.send_message_to_specifyUser("current_user", user_id)),
+            ...notifyUsers.map(user_id =>
+                pushManager.send_message_to_specifyUser("current_user", user_id)
+            ),
+            pushManager.send_instance_notification(
+                "reassign_new_inbox_users",
+                updatedInstance,
+                relocate_comment,
+                current_user_info
+            ),
+            pushManager.triggerWebhook(
+                updatedInstance.flow,
+                updatedInstance,
+                {},
+                'relocate',
+                current_user,
+                updatedInstance.inbox_users
+            )
+        ]);
     }
 
     return result;

package/main/default/objectTranslations/instances.en/instances.en.objectTranslation.yml

@@ -181,6 +181,8 @@ actions:
     label: Delete
   instance_delete_many:
     label: Delete
+  instance_export:
+    label: Export
 CustomLabels:
   instance_action_new_dialog_title: Please select the process
   instance_action_new_dialog_msg_success: Created successfully!
@@ -209,4 +211,11 @@ CustomLabels:
   instance_action_relocate_dialog_msg_success: Relocated successful
   instance_action_relocate_dialog_msg_failed: Relocated failed
   instance_action_instance_save_msg_upgraded: The workflow has been upgraded. The page will refresh automatically.
+  instance_export_tooltip: Export to Excel after selecting a workflow
+  instance_export_msg_no_flow: Please select a workflow to export
+  instance_export_msg_max_flow: Export up to 5 workflows at a time
+  instance_export_this_month: This Month
+  instance_export_last_month: Last Month
+  instance_export_this_year: This Year
+  instance_export_all: All
 

package/main/default/objectTranslations/instances.zh-CN/instances.zh-CN.objectTranslation.yml

@@ -179,6 +179,8 @@ actions:
     label: 新建
   instance_delete_many:
     label: 删除
+  instance_export:
+    label: 导出
 CustomLabels:
   instance_action_new_dialog_title: 请选择流程
   instance_action_new_dialog_msg_success: 创建成功！
@@ -207,3 +209,10 @@ CustomLabels:
   instance_action_relocate_dialog_msg_success: 重定位成功
   instance_action_relocate_dialog_msg_failed: 重定位失败
   instance_action_instance_save_msg_upgraded: 流程已升级，页面将自动刷新。
+  instance_export_tooltip: 选择流程后可导出为Excel
+  instance_export_msg_no_flow: 请先选择要导出的流程
+  instance_export_msg_max_flow: 最多导出5个流程
+  instance_export_this_month: 本月
+  instance_export_last_month: 上月
+  instance_export_this_year: 本年度
+  instance_export_all: 所有

package/main/default/objects/instance_tasks/buttons/instance_new.button.js

@@ -9,6 +9,9 @@ module.exports = {
         if (data && data._isRelated) {
             return false;
         }
+        if (typeof Builder !== 'undefined' && Builder.settings && Builder.settings.STEEDOS_PUBLIC_WORKFLOW_READONLY === 'true'){
+            return false;
+        }
         return true;
     }
 }

package/main/default/objects/instance_tasks/buttons/instance_new.button.yml

@@ -56,7 +56,7 @@ amis_schema: |-
                                                         },
                                                         {
                                                             "actionType": "custom",
-                                                            "script": "\nconst {instance, appId, objectName} = event.data;\nconsole.log(`instance===`);doAction({\n  actionType: 'link',\n  args: {\n    blank: false,\n    url: `/app/${appId}/instances/view/${instance._id}?side_object=instances&side_listview_id=draft&additionalFilters=&flowId=&categoryId=`\n  }\n});\n"
+                                                            "script": "\nconst {instance, appId, objectName} = event.data;\nconsole.log(`instance===`);doAction({\n  actionType: 'link',\n  args: {\n    blank: false,\n    link: `/app/${appId}/instances/view/${instance._id}?side_object=instances&side_listview_id=draft&additionalFilters=&flowId=&categoryId=`\n  }\n});\n"
                                                         },
                                                         {
                                                         "componentId": "",

package/main/default/objects/instances/buttons/instance_cc.button.yml

@@ -15,6 +15,7 @@ amis_schema: |-
                               "actionType": "dialog",
                               "dialog": {
                                   "type": "dialog",
+                                  "className": "instance-action-dialog",
                                   "title": "${'CustomAction.instances.instance_cc' | t}",
                                   "body": [
                                       {

package/main/default/objects/instances/buttons/instance_delete.button.yml

@@ -48,7 +48,7 @@ amis_schema: |-
                   }
               },
               "confirmText": "${'CustomLabels.confirm_delete' | t}",
-              "hiddenOn": "!(record.box == 'draft' || (record.box == 'monitor'  && context.user.is_space_admin) \n      || (_.includes(record.flow.perms.users_can_admin, context.user.userId) \n          || _.intersection(record.flow.perms.orgs_can_admin, context.user.organizations_parents) > 0)\n || (record.box == 'inbox' && record.state == 'draft' && record.forward_from_instance))"
+              "hiddenOn": "(window.Builder && window.Builder.settings && window.Builder.settings.STEEDOS_PUBLIC_WORKFLOW_READONLY === 'true') || !(record.box == 'draft' || (record.box == 'monitor'  && context.user.is_space_admin) \n      || (_.includes(record.flow.perms.users_can_admin, context.user.userId) \n          || _.intersection(record.flow.perms.orgs_can_admin, context.user.organizations_parents) > 0)\n || (record.box == 'inbox' && record.state == 'draft' && record.forward_from_instance))"
           }
       ],
       "regions": [

package/main/default/objects/instances/buttons/instance_distribute.button.yml

@@ -21,6 +21,7 @@ amis_schema: |-
                 "actionType": "dialog",
                 "dialog": {
                   "type": "dialog",
+                  "className": "instance-action-dialog",
                   "size": "lg",
                   "showLoading": true,
                   "title": {
@@ -299,7 +300,7 @@ amis_schema: |-
             "weight": 0
           }
         },
-        "hiddenOn": "!(record.box === 'inbox' && record.step.allowDistribute == true)"
+        "hiddenOn": "!(record.box === 'inbox' && record.step.allowDistribute == true) || (window.Builder && window.Builder.settings && window.Builder.settings.STEEDOS_PUBLIC_WORKFLOW_READONLY === 'true')"
       }
     ],
     "regions": [

package/main/default/objects/instances/buttons/instance_export.button.js

@@ -1,10 +1,5 @@
 module.exports = {
     instance_exportVisible: function (object_name, record_id, record_permissions, data) {
-        var box = data.listName;
-        var flowId = data.flowId;
-        if (box === "monitor" && flowId) {
-            return true;
-        }
-        return false;
+        return data.listName === "monitor";
     }
 }