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

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

@@ -8,34 +8,91 @@
 const express = require("express");
 const router = express.Router();
 const { requireAuthentication } = require("@steedos/auth");
-const objectql = require('@steedos/objectql')
+const { getCollection } = require('../utils/collection');
 const _ = require('lodash');
-const Fiber = function(fun){console.log('TODO Fiber...')}
 
-router.get('/api/workflow/v2/get_object_workflows', requireAuthentication, async function (req, res) {
-    try {
-        let userSession = req.user;
-        const { spaceId, userId } = userSession;
-        Fiber(async function () {
-            try {
-                Meteor.call('object_workflows.get', spaceId, userId, (error, result)=>{
-                    if(error){
-                        res.status(200).send({
-                            error: error.message
+async function getObjectWorkflows(spaceId, userId) {
+    // 参数检查
+    if (typeof spaceId !== 'string') {
+        throw new Error('spaceId must be a string');
+    }
+    if (typeof userId !== 'string') {
+        throw new Error('userId must be a string');
+    }
+
+    // 获取space_users集合
+    const spaceUsersCollection = await getCollection('space_users');
+    const curSpaceUser = await spaceUsersCollection.findOne(
+        { space: spaceId, user: userId },
+        { projection: { organizations: 1 } }
+    );
+
+    if (!curSpaceUser) {
+        throw new Error('not-authorized');
+    }
+
+    // 获取organizations集合
+    const organizationsCollection = await getCollection('organizations');
+    const organizations = await organizationsCollection.find({
+        _id: {
+            $in: curSpaceUser.organizations
+        }
+    }, { projection: { parents: 1 } }).toArray();
+
+    // 获取object_workflows集合
+    const objectWorkflowsCollection = await getCollection('object_workflows');
+    let ows = await objectWorkflowsCollection.find(
+        { space: spaceId },
+        { projection: { object_name: 1, flow_id: 1, space: 1, sync_direction: 1 } }
+    ).toArray();
+
+    // 获取flows集合
+    const flowsCollection = await getCollection('flows');
+    
+    // 使用Promise.all并行处理每个工作流
+    ows = await Promise.all(ows.map(async (o) => {
+        const fl = await flowsCollection.findOne(
+            { _id: o.flow_id, state: 'enabled' },
+            { projection: { name: 1, perms: 1, forbid_initiate_instance: 1 } }
+        );
+
+        if (fl) {
+            o.flow_name = fl.name;
+            o.can_add = false;
+            o.forbid_initiate_instance = fl.forbid_initiate_instance;
+
+            const perms = fl.perms;
+            if (perms) {
+                if (perms.users_can_add && perms.users_can_add.includes(userId)) {
+                    o.can_add = true;
+                } else if (perms.orgs_can_add && perms.orgs_can_add.length > 0) {
+                    if (curSpaceUser && curSpaceUser.organizations && 
+                        _.intersection(curSpaceUser.organizations, perms.orgs_can_add).length > 0) {
+                        o.can_add = true;
+                    } else if (organizations) {
+                        o.can_add = _.some(organizations, (org) => {
+                            return org.parents && _.intersection(org.parents, perms.orgs_can_add).length > 0;
                         });
-                    }else{
-                        res.status(200).send(result); 
                     }
-                })
-            } catch (error) {
-                console.error(error);
-                res.status(200).send({
-                    error: error.message
-                });
+                }
             }
+        }
+        return o;
+    }));
 
-        }).run()
-    
+    // 过滤掉没有flow_name的工作流
+    ows = ows.filter(n => n.flow_name);
+
+    return ows;
+}
+
+
+router.get('/api/workflow/v2/get_object_workflows', requireAuthentication, async function (req, res) {
+    try {
+        let userSession = req.user;
+        const { spaceId, userId } = userSession;
+        const result = await getObjectWorkflows(spaceId, userId);
+        return res.status(200).send(result); 
     } catch (error) {
         console.error(error);
         res.status(200).send({

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

@@ -0,0 +1,73 @@
+/*
+ * @Author: 殷亮辉 yinlianghui@hotoa.com
+ * @Date: 2025-10-09 10:12:49
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2025-10-29 09:38:43
+ */
+const express = require("express");
+const router = express.Router();
+const { requireAuthentication } = require("@steedos/auth");
+const objectql = require('@steedos/objectql')
+// const { cc_do } = require('../methods/trace_approve_cc');
+const { getCollection } = require('../utils/collection');
+const { set_approve_have_read } = require('../methods/instance_approve');
+const { cc_read } = require('../methods/trace_approve_cc');
+// const InstanceManager = global.InstanceManager;
+const InstanceManager = require('../manager/instance_manager');
+
+router.post('/api/workflow/v2/set_have_read', requireAuthentication, async function (req, res) {
+    try {
+        let userSession = req.user;
+        if (!userSession) {
+            return res.status(200).send({
+                error: "unauthorized"
+            });
+        }
+        const userId = userSession.userId;
+        const { instanceTaskId, isRead } = req.body;
+        if (isRead){
+            return res.status(200).send({
+                success: true
+            });
+        }
+        const db = {
+            instances: await getCollection('instances'),
+            instance_tasks: await getCollection('instance_tasks')
+        };
+        const instance_task = await db.instance_tasks.findOne({
+            _id: instanceTaskId
+        }, {
+            fields: {
+                "instance": 1,
+                "is_read": 1,
+                "type": 1
+            }
+        });
+        if (instance_task.is_read){
+            return res.status(200).send({
+                success: true
+            });
+        }
+
+        const instanceId = instance_task.instance;
+        const ins = await db.instances.findOne({_id: instanceId});
+        var myApprove = InstanceManager.getCurrentApprove(ins, userId, instance_task.type);
+        if (instance_task.type == "cc") {
+            // 传阅
+            await cc_read(ins, myApprove, { userId });
+        }
+        else{
+            await set_approve_have_read(ins._id, myApprove.trace, myApprove._id, { userId });
+        }
+        return res.status(200).send({
+            success: true
+        });
+
+    } catch (error) {
+        console.error(error);
+        return res.status(200).send({
+            error: error.message
+        });
+    }
+});
+exports.default = router;

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

@@ -9,34 +9,33 @@ 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 uuflowManagerForInitApproval = require('../manager/uuflowManagerForInitApproval');
+const { getCollection } = require('../utils/collection');
 router.post('/api/object/workflow/drafts', requireAuthentication, async function (req, res) {
     try {
         let userSession = req.user;
         const { Instances } = req.body;
         const userId = userSession.userId;
         const inserted_instances = [];
-        Fiber(function () {
-            try {
-                _.each(Instances, (instance_from_client)=>{
-                    const new_ins_id = uuflowManagerForInitApproval.create_instance(instance_from_client, Object.assign({}, userSession, {_id: userSession.userId}))
+        const coll = await getCollection('instances');
+        try {
+            for (const instance_from_client of Instances) {
+                const new_ins_id = await uuflowManagerForInitApproval.create_instance(instance_from_client, Object.assign({}, userSession, {_id: userSession.userId}))
 
-                    new_ins = Creator.Collections.instances.findOne({ _id: new_ins_id }, { fields: { space: 1, flow: 1, flow_version: 1, form: 1, form_version: 1 } })
+                new_ins = await coll.findOne({ _id: new_ins_id }, { fields: { space: 1, flow: 1, flow_version: 1, form: 1, form_version: 1 } })
 
-                    inserted_instances.push(new_ins)
-                })
-                res.status(200).send({
-                    inserts: inserted_instances
-                });
-            } catch (error) {
-                console.error(error);
-                res.status(200).send({
-                    error: error.message
-                });
+                inserted_instances.push(new_ins)
             }
-
-        }).run()
+            
+            res.status(200).send({
+                inserts: inserted_instances
+            });
+        } catch (error) {
+            console.error(error);
+            res.status(200).send({
+                error: error.message
+            });
+        }
     
     } catch (error) {
         console.error(error);

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

@@ -8,8 +8,9 @@ const {
 const UUFlowManager = require('../manager/uuflow_manager');
 const { getCollection } = require('../utils/collection');
 const approveManager = require('../manager/approve_manager');
+const afterHook = require('./afterHook');
 
-router.post('/api/workflow/v2/approve/save', requireAuthentication, async function (req, res) {
+router.post('/api/workflow/v2/approve/save', requireAuthentication, afterHook, async function (req, res) {
     try {
         const userSession = req.user;
         const { approve } = req.body;