@steedos-labs/plugin-workflow 3.0.0-beta.9 → 3.0.1-beta.1

package/main/default/routes/api_workflow_engine.router.js

@@ -13,9 +13,9 @@ const objectql = require('@steedos/objectql');
 const _ = require('lodash');
 const Fiber = function(fun){console.log('TODO Fiber...')}
 const { excuteTriggers } = require('../utils/trigger');
-const { getStep } = require('../uuFlowManager');
+const { getStep } = require('../uuflowManager');
 const UUFlowManager = require('../manager/uuflow_manager');
-
+const afterHook = require('./afterHook');
 /**
  * 审批中提交申请单
  * body {
@@ -53,7 +53,7 @@ const UUFlowManager = require('../manager/uuflow_manager');
     ]
  * }
  */
-router.post('/api/workflow/engine', requireAuthentication, async function (req, res) {
+router.post('/api/workflow/engine', requireAuthentication, afterHook, async function (req, res) {
     try {
         let userSession = req.user;
         const spaceId = userSession.spaceId;
@@ -80,7 +80,7 @@ router.post('/api/workflow/engine', requireAuthentication, async function (req,
         }
 
         try {
-            const instance = UUFlowManager.workflow_engine(approve_from_client, userSession, userId);
+            const instance = await UUFlowManager.workflow_engine(approve_from_client, userSession, userId);
             // afterStepSubmit
             await excuteTriggers({ when: 'afterStepSubmit', userId, flowId, insId });
             // afterEnd

package/main/default/routes/api_workflow_flow_version.router.js

@@ -0,0 +1,61 @@
+const express = require("express");
+const router = express.Router();
+const { requireAuthentication } = require("@steedos/auth");
+const _ = require('lodash');
+const { getCollection } = require('../utils/collection');
+router.get('/api/workflow/flow/:flowId/version/:versionId', requireAuthentication, async function (req, res) {
+    try {
+        const { flowId, versionId } = req.params;
+        const flowsColl = await getCollection('flows');
+
+        const flow = await flowsColl.aggregate([
+        {
+            $match: {
+            "_id": flowId
+            }
+        },
+        {
+            $project: {
+            name: 1,
+            current_no: 1,
+            versionData: {
+                $cond: {
+                if: { $eq: ["$current._id", versionId] },
+                then: "$current",
+                else: {
+                    $arrayElemAt: [
+                    {
+                        $filter: {
+                        input: "$historys",
+                        as: "history",
+                        cond: { $eq: ["$$history._id", versionId] }
+                        }
+                    },
+                    0
+                    ]
+                }
+                }
+            }
+            }
+        },
+        {
+            $match: {
+            "versionData": { $ne: null }
+            }
+        },
+        { $limit: 1 } // 限制只返回一个文档
+        ]).next();
+
+        if (flow) {
+        res.status(200).send(flow.versionData);
+        } else {
+        res.status(404).send({ message: "流程版本未找到" });
+        }
+    } catch (error) {
+        console.error('Unexpected error:', error);
+        res.status(500).send({
+            error: error.message
+        });
+    }
+});
+exports.default = router;

package/main/default/routes/api_workflow_form_version.router.js

@@ -0,0 +1,61 @@
+const express = require("express");
+const router = express.Router();
+const { requireAuthentication } = require("@steedos/auth");
+const _ = require('lodash');
+const { getCollection } = require('../utils/collection');
+router.get('/api/workflow/form/:formId/version/:versionId', requireAuthentication, async function (req, res) {
+    try {
+        const { formId, versionId } = req.params;
+        const formsColl = await getCollection('forms');
+
+        const form = await formsColl.aggregate([
+        {
+            $match: {
+            "_id": formId
+            }
+        },
+        {
+            $project: {
+            name: 1,
+            current_no: 1,
+            versionData: {
+                $cond: {
+                if: { $eq: ["$current._id", versionId] },
+                then: "$current",
+                else: {
+                    $arrayElemAt: [
+                    {
+                        $filter: {
+                        input: "$historys",
+                        as: "history",
+                        cond: { $eq: ["$$history._id", versionId] }
+                        }
+                    },
+                    0
+                    ]
+                }
+                }
+            }
+            }
+        },
+        {
+            $match: {
+            "versionData": { $ne: null }
+            }
+        },
+        { $limit: 1 } // 限制只返回一个文档
+        ]).next();
+
+        if (form) {
+        res.status(200).send(form.versionData);
+        } else {
+        res.status(404).send({ message: "流程版本未找到" });
+        }
+    } catch (error) {
+        console.error('Unexpected error:', error);
+        res.status(500).send({
+            error: error.message
+        });
+    }
+});
+exports.default = router;

package/main/default/routes/api_workflow_instance_return.router.js

@@ -1,201 +1,198 @@
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-09-15 13:09:51
- * @LastEditors: sunhaolin@hotoa.com
- * @LastEditTime: 2023-01-14 11:22:30
+ * @LastEditors: 孙浩林 sunhaolin@steedos.com
+ * @LastEditTime: 2025-10-05 15:05:13
  * @Description: 
  */
 const express = require("express");
 const router = express.Router();
 const { requireAuthentication } = require("@steedos/auth");
 const _ = require('lodash');
-const Fiber = function(fun){console.log('TODO Fiber...')}
 const pushManager = require('../manager/push_manager');
-const objectql = require('@steedos/objectql');
 const {
     update_instance_tasks,
     insert_instance_tasks
 } = require('../manager/instance_tasks_manager')
 const UUFlowManager = require('../manager/uuflow_manager');
+const { getCollection, _makeNewID } = require('../utils/collection');
+
 router.post('/api/workflow/v2/instance/return', requireAuthentication, async function (req, res) {
     try {
         let userSession = req.user;
         const { approve, reason } = req.body;
 
-        Fiber(async function () {
-            try {
-                var approve_values, b, current_step, current_user, current_user_info, flow, ins, instance, instance_id, last_trace, newTrace, new_inbox_users, now, pre_step, pre_trace, r, rest_counter_users, setObj, space_id, traces;
-                current_user = userSession.userId;
-                instance_id = approve.instance;
-                ins = UUFlowManager.getInstance(instance_id);
-                space_id = ins.space;
-                if (ins.state !== "pending" || !ins.inbox_users.includes(current_user)) {
-                    throw new Error("不符合退回条件");
-                }
-                if (approve.type === "cc" && ins.cc_users.includes(current_user)) {
-                    throw new Error("不符合退回条件");
-                }
-                if (ins.traces.length < 2) {
-                    throw new Error("不符合退回条件");
-                }
-                flow = UUFlowManager.getFlow(ins.flow);
-                pre_trace = ins.traces[ins.traces.length - 2];
-                pre_step = UUFlowManager.getStep(ins, flow, pre_trace.step);
-                if (pre_step.step_type === "counterSign") {
-                    throw new Error("不符合退回条件");
-                }
-                last_trace = _.last(ins.traces);
-                current_step = UUFlowManager.getStep(ins, flow, last_trace.step);
-                if (current_step.step_type !== "submit" && current_step.step_type !== "sign" && current_step.step_type !== "counterSign") {
-                    throw new Error("不符合退回条件");
-                }
-                if (approve.trace !== last_trace._id) {
-                    throw new Error("不符合退回条件");
-                }
-                new_inbox_users = new Array;
-                _.each(pre_trace.approves, function (a) {
-                    if ((!a.type || a.type === "draft" || a.type === "reassign") && (!a.judge || a.judge === "submitted" || a.judge === "approved" || a.judge === "rejected")) {
-                        return new_inbox_users.push(a.user);
-                    }
-                });
-                if (_.isEmpty(new_inbox_users)) {
-                    throw new Error("未找到下一步处理人，退回失败");
+        const instancesCollection = await getCollection('instances');
+        const usersCollection = await getCollection('users');
+
+        var approve_values, b, current_step, current_user, current_user_info, flow, ins, instance, instance_id, last_trace, newTrace, new_inbox_users, now, pre_step, pre_trace, r, rest_counter_users, setObj, space_id, traces;
+        current_user = userSession.userId;
+        instance_id = approve.instance;
+        ins = await UUFlowManager.getInstance(instance_id);
+        space_id = ins.space;
+        if (ins.state !== "pending" || !ins.inbox_users.includes(current_user)) {
+            throw new Error("不符合退回条件");
+        }
+        if (approve.type === "cc" && ins.cc_users.includes(current_user)) {
+            throw new Error("不符合退回条件");
+        }
+        if (ins.traces.length < 2) {
+            throw new Error("不符合退回条件");
+        }
+        flow = await UUFlowManager.getFlow(ins.flow);
+        pre_trace = ins.traces[ins.traces.length - 2];
+        pre_step = await UUFlowManager.getStep(ins, flow, pre_trace.step);
+        if (pre_step.step_type === "counterSign") {
+            throw new Error("不符合退回条件");
+        }
+        last_trace = _.last(ins.traces);
+        current_step = await UUFlowManager.getStep(ins, flow, last_trace.step);
+        if (current_step.step_type !== "submit" && current_step.step_type !== "sign" && current_step.step_type !== "counterSign") {
+            throw new Error("不符合退回条件");
+        }
+        if (approve.trace !== last_trace._id) {
+            throw new Error("不符合退回条件");
+        }
+        new_inbox_users = new Array;
+        _.each(pre_trace.approves, function (a) {
+            if ((!a.type || a.type === "draft" || a.type === "reassign") && (!a.judge || a.judge === "submitted" || a.judge === "approved" || a.judge === "rejected")) {
+                return new_inbox_users.push(a.user);
+            }
+        });
+        if (_.isEmpty(new_inbox_users)) {
+            throw new Error("未找到下一步处理人，退回失败");
+        }
+        traces = ins.traces;
+        approve_values = await UUFlowManager.getApproveValues(approve.values || {}, current_step.permissions, ins.form, ins.form_version);
+        setObj = new Object;
+        now = new Date;
+        rest_counter_users = new Array;
+        _.each(traces, function (t) {
+            if (t._id === last_trace._id) {
+                if (!t.approves) {
+                    t.approves = new Array;
                 }
-                traces = ins.traces;
-                approve_values = UUFlowManager.getApproveValues(approve.values || {}, current_step.permissions, ins.form, ins.form_version);
-                setObj = new Object;
-                now = new Date;
-                rest_counter_users = new Array;
-                _.each(traces, function (t) {
-                    if (t._id === last_trace._id) {
-                        if (!t.approves) {
-                            t.approves = new Array;
-                        }
-                        _.each(t.approves, function (a, idx) {
-                            if ((!a.type || a.type === "reassign") && (!a.judge || a.judge === "submitted" || a.judge === "approved" || a.judge === "rejected" || a.judge === "readed") && a.is_finished !== true) {
-                                setObj['traces.$.approves.' + idx + '.finish_date'] = now;
-                                setObj['traces.$.approves.' + idx + '.read_date'] = now;
-                                setObj['traces.$.approves.' + idx + '.is_error'] = false;
-                                setObj['traces.$.approves.' + idx + '.is_read'] = true;
-                                setObj['traces.$.approves.' + idx + '.is_finished'] = true;
-                                setObj['traces.$.approves.' + idx + '.cost_time'] = now - a.start_date;
-                                setObj['traces.$.approves.' + idx + '.values'] = approve_values;
-                                if (a.handler === current_user) {
-                                    setObj['traces.$.approves.' + idx + '.judge'] = "returned";
-                                    return setObj['traces.$.approves.' + idx + '.description'] = reason;
-                                } else {
-                                    return rest_counter_users.push(a.handler);
-                                }
-                            }
-                        });
-                        setObj['traces.$.is_finished'] = true;
-                        setObj['traces.$.finish_date'] = true;
-                        return setObj['traces.$.judge'] = "returned";
-                    }
-                });
-                ins.values = _.extend(ins.values || {}, approve_values);
-                newTrace = new Object;
-                newTrace._id = _makeNewID();
-                newTrace.instance = instance_id;
-                newTrace.previous_trace_ids = [last_trace._id];
-                newTrace.is_finished = false;
-                newTrace.step = pre_trace.step;
-                newTrace.name = pre_trace.name;
-                newTrace.start_date = now;
-                newTrace.due_date = UUFlowManager.getDueDate(pre_step.timeout_hours, space_id);
-                newTrace.approves = [];
-                _.each(new_inbox_users, function (next_step_user_id, idx) {
-                    var agent, handler_id, handler_info, newApprove, next_step_space_user, next_step_user_org_info, user_info;
-                    newApprove = new Object;
-                    newApprove._id = _makeNewID();
-                    newApprove.instance = instance_id;
-                    newApprove.trace = newTrace._id;
-                    newApprove.is_finished = false;
-                    newApprove.user = next_step_user_id;
-                    user_info = db.users.findOne(next_step_user_id, {
-                        fields: {
-                            name: 1
+                _.each(t.approves, function (a, idx) {
+                    if ((!a.type || a.type === "reassign") && (!a.judge || a.judge === "submitted" || a.judge === "approved" || a.judge === "rejected" || a.judge === "readed") && a.is_finished !== true) {
+                        setObj['traces.$.approves.' + idx + '.finish_date'] = now;
+                        setObj['traces.$.approves.' + idx + '.read_date'] = now;
+                        setObj['traces.$.approves.' + idx + '.is_error'] = false;
+                        setObj['traces.$.approves.' + idx + '.is_read'] = true;
+                        setObj['traces.$.approves.' + idx + '.is_finished'] = true;
+                        setObj['traces.$.approves.' + idx + '.cost_time'] = now - a.start_date;
+                        setObj['traces.$.approves.' + idx + '.values'] = approve_values;
+                        if (a.handler === current_user) {
+                            setObj['traces.$.approves.' + idx + '.judge'] = "returned";
+                            return setObj['traces.$.approves.' + idx + '.description'] = reason;
+                        } else {
+                            return rest_counter_users.push(a.handler);
                         }
-                    });
-                    newApprove.user_name = user_info.name;
-                    handler_id = next_step_user_id;
-                    handler_info = user_info;
-                    agent = UUFlowManager.getAgent(space_id, next_step_user_id);
-                    if (agent) {
-                        new_inbox_users[idx] = agent;
-                        handler_id = agent;
-                        handler_info = db.users.findOne({
-                            _id: agent
-                        }, {
-                            fields: {
-                                name: 1
-                            }
-                        });
-                        newApprove.agent = agent;
-                    }
-                    newApprove.handler = handler_id;
-                    newApprove.handler_name = handler_info.name;
-                    next_step_space_user = UUFlowManager.getSpaceUser(space_id, handler_id);
-                    next_step_user_org_info = UUFlowManager.getSpaceUserOrgInfo(next_step_space_user);
-                    newApprove.handler_organization = next_step_user_org_info["organization"];
-                    newApprove.handler_organization_name = next_step_user_org_info["organization_name"];
-                    newApprove.handler_organization_fullname = next_step_user_org_info["organization_fullname"];
-                    newApprove.start_date = now;
-                    newApprove.is_read = false;
-                    newApprove.is_error = false;
-                    newApprove.values = new Object;
-                    UUFlowManager.setRemindInfo(ins.values, newApprove);
-                    return newTrace.approves.push(newApprove);
-                });
-                setObj.inbox_users = new_inbox_users;
-                setObj.state = "pending";
-                ins.outbox_users.push(current_user);
-                setObj.outbox_users = _.uniq(ins.outbox_users);
-                setObj.modified = now;
-                setObj.modified_by = current_user;
-                setObj.values = ins.values;
-                setObj.current_step_name = pre_trace.name;
-                r = db.instances.update({
-                    _id: instance_id,
-                    'traces._id': last_trace._id
-                }, {
-                    $set: setObj
-                });
-                // 更新当前记录
-                update_instance_tasks(instance_id, last_trace._id, approve._id)
-                b = db.instances.update({
-                    _id: instance_id
-                }, {
-                    $push: {
-                        traces: newTrace
                     }
                 });
-                // 生成新记录
-                insert_instance_tasks(instance_id, newTrace._id, newTrace.approves[0]._id)
-                if (r && b) {
-                    pushManager.send_message_to_specifyUser("current_user", current_user);
-                    instance = UUFlowManager.getInstance(instance_id);
-                    current_user_info = db.users.findOne(current_user);
-                    pushManager.send_instance_notification("return_pending_inbox", instance, reason, current_user_info);
-                    _.each(rest_counter_users, function (user_id) {
-                        return pushManager.send_message_to_specifyUser("current_user", user_id);
-                    });
-                    pushManager.triggerWebhook(instance.flow, instance, {}, 'return', current_user, instance.inbox_users);
+                setObj['traces.$.is_finished'] = true;
+                setObj['traces.$.finish_date'] = true;
+                return setObj['traces.$.judge'] = "returned";
+            }
+        });
+        ins.values = _.extend(ins.values || {}, approve_values);
+        newTrace = new Object;
+        newTrace._id = _makeNewID();
+        newTrace.instance = instance_id;
+        newTrace.previous_trace_ids = [last_trace._id];
+        newTrace.is_finished = false;
+        newTrace.step = pre_trace.step;
+        newTrace.name = pre_trace.name;
+        newTrace.start_date = now;
+        newTrace.due_date = await UUFlowManager.getDueDate(pre_step.timeout_hours, space_id);
+        newTrace.approves = [];
+        for (const [idx, next_step_user_id] of new_inbox_users.entries()) {
+            var agent, handler_id, handler_info, newApprove, next_step_space_user, next_step_user_org_info, user_info;
+            newApprove = new Object;
+            newApprove._id = _makeNewID();
+            newApprove.instance = instance_id;
+            newApprove.trace = newTrace._id;
+            newApprove.is_finished = false;
+            newApprove.user = next_step_user_id;
+            user_info = await usersCollection.findOne({ _id: next_step_user_id }, {
+                projection: {
+                    name: 1
                 }
-                res.status(200).send({});
-            } catch (error) {
-                console.error(error);
-                res.status(200).send({
-                    error: error.message
+            });
+            newApprove.user_name = user_info.name;
+            handler_id = next_step_user_id;
+            handler_info = user_info;
+            agent = await UUFlowManager.getAgent(space_id, next_step_user_id);
+            if (agent) {
+                new_inbox_users[idx] = agent;
+                handler_id = agent;
+                handler_info = await usersCollection.findOne({ _id: agent }, {
+                    projection: {
+                        name: 1
+                    }
                 });
+                newApprove.agent = agent;
             }
+            newApprove.handler = handler_id;
+            newApprove.handler_name = handler_info.name;
+            next_step_space_user = await UUFlowManager.getSpaceUser(space_id, handler_id);
+            next_step_user_org_info = await UUFlowManager.getSpaceUserOrgInfo(next_step_space_user);
+            newApprove.handler_organization = next_step_user_org_info["organization"];
+            newApprove.handler_organization_name = next_step_user_org_info["organization_name"];
+            newApprove.handler_organization_fullname = next_step_user_org_info["organization_fullname"];
+            newApprove.start_date = now;
+            newApprove.is_read = false;
+            newApprove.is_error = false;
+            newApprove.values = new Object;
+            await UUFlowManager.setRemindInfo(ins.values, newApprove);
+            newTrace.approves.push(newApprove);
+        };
+        setObj.inbox_users = new_inbox_users;
+        setObj.state = "pending";
+        ins.outbox_users.push(current_user);
+        setObj.outbox_users = _.uniq(ins.outbox_users);
+        setObj.modified = now;
+        setObj.modified_by = current_user;
+        setObj.values = ins.values;
+        setObj.current_step_name = pre_trace.name;
+        r = await instancesCollection.updateOne({
+            _id: instance_id,
+            'traces._id': last_trace._id
+        }, {
+            $set: setObj
+        });
+        // 更新当前记录
+        await update_instance_tasks(instance_id, last_trace._id, approve._id)
+        b = await instancesCollection.updateOne({
+            _id: instance_id,
+        }, {
+            $push: {
+                traces: newTrace
+            }
+        });
+        // 生成新记录
+        await insert_instance_tasks(instance_id, newTrace._id, newTrace.approves[0]._id)
+        if (r && b) {
+            await pushManager.send_message_to_specifyUser("current_user", current_user);
+            instance = await UUFlowManager.getInstance(instance_id);
+            current_user_info = await usersCollection.findOne({ _id: current_user });
+            await pushManager.send_instance_notification("return_pending_inbox", instance, reason, current_user_info);
+            for (const user_id of rest_counter_users) {
+                await pushManager.send_message_to_specifyUser("current_user", user_id);
+            }
+            await pushManager.triggerWebhook(instance.flow, instance, {}, 'return', current_user, instance.inbox_users);
+        }
 
-        }).run()
-
+        res.status(200).send({
+            status: 0,
+            msg: '',
+            data: {}
+        });
     } catch (error) {
         console.error(error);
         res.status(200).send({
-            error: error.message
+            status: 0,
+            msg: error.message,
+            data: {}
         });
     }
 });

package/main/default/routes/api_workflow_next_step_users.router.js

@@ -83,11 +83,16 @@ router.post('/api/workflow/v2/nextStepUsers', requireAuthentication, async funct
                         var
                             userField = nextStep.approver_user_field,
                             userFieldValue = values[userField];
-                        if (userField.is_multiselect) { //如果多选，以userFieldValue值为Array
-                            nextStepUsers = await WorkflowManager.getUsers(spaceId, userFieldValue);
-                        } else {
-                            nextStepUsers.push(await WorkflowManager.getUser(spaceId, userFieldValue));
+                        if(userFieldValue){
+                            if (_.isArray(userFieldValue)) { //如果多选，以userFieldValue值为Array
+                                nextStepUsers = await WorkflowManager.getUsers(spaceId, userFieldValue);
+                            } else {
+                                nextStepUsers.push(await WorkflowManager.getUser(spaceId, userFieldValue));
+                            }
+                        }else {
+                            error = "FIELD_VALUE_EMPTY";
                         }
+                        
                         break;
                     case 'orgField':
                         var
@@ -96,7 +101,7 @@ router.post('/api/workflow/v2/nextStepUsers', requireAuthentication, async funct
                             orgField = nextStep.approver_org_field,
                             orgFieldValue = values[orgField];
                         if (orgFieldValue) {
-                            if (orgField.is_multiselect) { //如果多选，以orgFieldValue值为Array
+                            if (_.isArray(orgFieldValue)) { //如果多选，以orgFieldValue值为Array
                                 orgs = await WorkflowManager.getOrganizations(orgFieldValue);
                                 orgChildrens = await WorkflowManager.getOrganizationsChildrens(spaceId, orgFieldValue);
                             } else {
@@ -105,7 +110,7 @@ router.post('/api/workflow/v2/nextStepUsers', requireAuthentication, async funct
                             }
                             nextStepUsers = await WorkflowManager.getOrganizationsUsers(spaceId, orgChildrens);
 
-                            orgFieldUsers = await WorkflowManager.getOrganizationsUsers(spaceId, orgs);
+                            const orgFieldUsers = await WorkflowManager.getOrganizationsUsers(spaceId, orgs);
 
                             nextStepUsers = nextStepUsers.concat(orgFieldUsers);
 
@@ -131,7 +136,7 @@ router.post('/api/workflow/v2/nextStepUsers', requireAuthentication, async funct
                             userFieldValue = values[userField],
                             approverRoleIds = nextStep.approver_roles;
                         if (userFieldValue) {
-                            if (userField.is_multiselect) { //如果多选，以userFieldValue值为Array
+                            if (_.isArray(userFieldValue)) { //如果多选，以userFieldValue值为Array
                                 nextStepUsers = await WorkflowManager.getRoleUsersByUsersAndRoles(spaceId, userFieldValue, approverRoleIds);
                             } else {
                                 nextStepUsers = await WorkflowManager.getRoleUsersByUsersAndRoles(spaceId, [userFieldValue], approverRoleIds);
@@ -153,7 +158,7 @@ router.post('/api/workflow/v2/nextStepUsers', requireAuthentication, async funct
                             approverRoleIds = nextStep.approver_roles;
 
                         if (orgFieldValue) {
-                            if (orgField.is_multiselect) { //如果多选，以orgFieldValue值为Array
+                            if (_.isArray(orgFieldValue)) { //如果多选，以orgFieldValue值为Array
                                 nextStepUsers = await WorkflowManager.getRoleUsersByOrgsAndRoles(spaceId, orgFieldValue, approverRoleIds);
                             } else {
                                 nextStepUsers = await WorkflowManager.getRoleUsersByOrgsAndRoles(spaceId, [orgFieldValue], approverRoleIds);