@steedos-labs/plugin-workflow 3.0.0-beta.29 → 3.0.0-beta.31

package/main/default/client/instance.client.js

@@ -45,7 +45,7 @@ window.SteedosWorkflow.InstanceTask = {
             "showHeader": true,
             "id": "u:d29cef0d1007",
             "showDisplayAs": true,
-            "className": "h-full w-full bg-white instance-tasks-list",
+            "className": "h-full w-full instance-tasks-list",
             "hiddenColumnOperation": true,
             "formFactor": "LARGE",
             "headerToolbarItems": [
@@ -113,7 +113,7 @@ window.SteedosWorkflow.Instance = {
           "showHeader": true,
           "id": "u:d29cef0d1007",
           "showDisplayAs": true,
-          "className": "h-full w-full bg-white",
+          "className": "h-full w-full",
           "hiddenColumnOperation": true,
           "formFactor": "LARGE",
           "headerToolbarItems": [

package/main/default/manager/import.js

@@ -295,6 +295,19 @@ async function objectWorkflow(spaceId, flowId, objectName, doc) {
     }
 }
 
+// 如果没有name字段，则给name赋值code
+function addFieldName(fields) {
+    return _.map(fields, function (f) {
+        if (!f.name && f.code) {
+            f.name = f.code;
+        }
+        if (f.type === 'section' || f.type === 'table') {
+            f.fields = addFieldName(f.fields);
+        }
+        return f;
+    });
+}
+
 async function workflow(uid, spaceId, form, enabled, company_id, options = {}) {
     const { upgrade = false, formId: upgradeFormId, flowId: upgradeFlowId } = options;
     const new_form_ids = [];
@@ -395,6 +408,8 @@ async function workflow(uid, spaceId, form, enabled, company_id, options = {}) {
         form.modified = form.created;
         form.modified_by = uid;
         form.historys = [];
+
+        const fields = addFieldName(form.current?.fields || []);
         
         form.current = {
             _id: _makeNewID(),
@@ -404,7 +419,7 @@ async function workflow(uid, spaceId, form, enabled, company_id, options = {}) {
             created_by: uid,
             modified: new Date(),
             modified_by: uid,
-            fields: form.current?.fields || [],
+            fields: fields,
             form_script: form.current?.form_script || '',
             name_forumla: form.current?.name_forumla || ''
         };

package/main/default/manager/push_manager.js

@@ -5,6 +5,8 @@ const { getObject } = objectql;
 const { t } = require('@steedos/i18n');
 const { map } = require('lodash');
 
+const WebhookQueue = require('../../../src/webhook_queue')
+
 const uuflowManager = {
     getFlow: async function (flow_id, options = {}) {
         if (process.env.STEEDOS_DEBUG) {
@@ -613,6 +615,12 @@ pushManager.send_message_by_raix_push = async function (data, lang) {
             from: from,
             to: toUsers
         })
+
+        await objectql.getSteedosSchema().broker.emit('push.send', {
+            message: notificationDoc,
+            from: from,
+            to: toUsers
+        })
         
 
         // data["toUsers"].forEach(userId => {
@@ -854,7 +862,7 @@ pushManager.triggerWebhook = async function (flowId, instance, currentApprove, a
         cfsInstances: await getCollection('cfs.instances.filerecord')
     };
   
-    instance.attachments = (await cfsInstances.find({ 'metadata.instance': instance._id }).toArray()) || [];
+    instance.attachments = (await db.cfsInstances.find({ 'metadata.instance': instance._id }).toArray()) || [];
 
     const fromUser = await db.users.findOne({ "_id": fromUserId }, { fields: { _id: 1, username: 1 } }) || {};
     const fromSpaceUser = await db.space_users.findOne({ "user": fromUserId }, { fields: { mobile: 1, email: 1 } }) || {};
@@ -880,12 +888,12 @@ pushManager.triggerWebhook = async function (flowId, instance, currentApprove, a
     for (const w of webhooks) {
         WebhookQueue.send({
             instance,
-            currentApprove,
-            payloadUrl: w.payload_url,
-            contentType: w.content_type,
+            current_approve: currentApprove,
+            payload_url: w.payload_url,
+            content_type: w.content_type,
             action,
-            fromUser,
-            toUsers: toUsers || []
+            from_user: fromUser,
+            to_users: toUsers || []
         });
     }
 };

package/main/default/methods/trace_approve_cc.js

@@ -0,0 +1,568 @@
+
+const { getCollection, _makeNewID } = require('../utils/collection');
+const UUFlowManager = require('../manager/uuflow_manager.js');
+const pushManager = require('../manager/push_manager.js');
+const {
+    update_instance_tasks,
+    insert_instance_tasks,
+    remove_instance_tasks,
+    direct_remove_many_instance_tasks
+} = require('../manager/instance_tasks_manager')
+
+module.exports = {
+    cc_do: async function (approve, cc_user_ids, description, ctx = {}) {
+        var setObj = {};
+        var ins_id = approve.instance;
+        var trace_id = approve.trace;
+        var approve_id = approve._id;
+
+        const instancesCollection = await getCollection('instances');
+        const usersCollection = await getCollection('users');
+        const spaceUsersCollection = await getCollection('space_users');
+        const organizationsCollection = await getCollection('organizations');
+
+        const instance = await instancesCollection.findOne({ _id: ins_id }, {
+            projection: {
+                space: 1,
+                traces: 1,
+                cc_users: 1,
+                values: 1
+            }
+        });
+        var current_user_id = ctx.userId || this.userId;
+        var space_id = instance.space;
+        var new_approves = [];
+
+        const from_user = await usersCollection.findOne({ _id: current_user_id })
+        const from_user_name = from_user.name;
+
+        for (const [idx, userId] of cc_user_ids.entries()) {
+
+            const user = await usersCollection.findOne({ _id: userId }, {
+                projection: {
+                    name: 1
+                }
+            })
+
+            const space_user = await spaceUsersCollection.findOne({ user: userId, space: space_id }, {
+                projection: {
+                    organization: 1
+                }
+            })
+
+            var org_id = space_user.organization;
+
+            const organization = await organizationsCollection.findOne({ _id: org_id }, {
+                projection: {
+                    name: 1,
+                    fullname: 1
+                }
+            })
+
+            var agent = await UUFlowManager.getAgent(space_id, userId);
+            var handler_id = userId;
+            var handler_info = user;
+            var handler_space_user = space_user;
+            var handler_org_info = organization;
+            if (agent) {
+                handler_id = agent;
+                handler_info = await usersCollection.findOne({ _id: agent }, {
+                    projection: {
+                        name: 1
+                    }
+                })
+
+                handler_space_user = await UUFlowManager.getSpaceUser(space_id, agent);
+                handler_org_info = await UUFlowManager.getSpaceUserOrgInfo(handler_space_user);
+                cc_user_ids[idx] = agent;
+            }
+            var appr = {
+                '_id': _makeNewID(),
+                'instance': ins_id,
+                'trace': trace_id,
+                'is_finished': false,
+                'user': userId,
+                'user_name': user.name,
+                'handler': handler_id,
+                'handler_name': handler_info.name,
+                'handler_organization': handler_space_user.organization,
+                'handler_organization_name': handler_org_info.name,
+                'handler_organization_fullname': handler_org_info.fullname,
+                'type': 'cc',
+                'start_date': new Date(),
+                'is_read': false,
+                'from_user': current_user_id,
+                'from_user_name': from_user_name,
+                'opinion_fields_code': approve.opinion_fields_code,
+                'sign_field_code': (approve.opinion_fields_code && approve.opinion_fields_code.length == 1) ? approve.opinion_fields_code[0] : "",
+                'from_approve_id': approve_id,
+                'cc_description': description
+            };
+            if (agent) {
+                appr.agent = agent;
+            }
+            await UUFlowManager.setRemindInfo(instance.values, appr)
+            new_approves.push(appr);
+        }
+
+        setObj.modified = new Date();
+        setObj.modified_by = this.userId;
+
+        await instancesCollection.updateOne({
+            _id: ins_id,
+            'traces._id': trace_id
+        }, {
+            $set: setObj,
+            $push: {
+                'traces.$.approves': {
+                    $each: new_approves
+                },
+                cc_users: {
+                    $each: cc_user_ids
+                }
+            },
+            $inc: {
+                cc_count: cc_user_ids.length
+            }
+        });
+        // 新增记录
+        for (const a of new_approves) {
+            await insert_instance_tasks(ins_id, trace_id, a._id)
+        }
+
+        const updatedInstance = await instancesCollection.findOne({ _id: ins_id });
+
+        await pushManager.send_instance_notification("trace_approve_cc", updatedInstance, "", from_user, cc_user_ids);
+
+        flow_id = instance.flow;
+        approve.cc_user_ids = cc_user_ids; // 记录下本次传阅的人员ID作为hook接口中的参数
+        // 如果已经配置webhook并已激活则触发
+        await pushManager.triggerWebhook(flow_id, instance, approve, 'cc_do', current_user_id, cc_user_ids)
+        return true;
+    },
+
+    /**
+    cc_read: function (approve) {
+        var setObj = {};
+        var ins_id = approve.instance;
+        var trace_id = approve.trace;
+        var approve_id = approve._id;
+        var instance = db.instances.findOne(ins_id, {
+            fields: {
+                traces: 1
+            }
+        });
+        var current_user_id = this.userId;
+        var current_trace = _.find(instance.traces, function (t) {
+            return t._id == trace_id;
+        })
+
+        var index = 0;
+
+        current_trace.approves.forEach(function (a, idx) {
+            if (approve_id == a._id && a.type == 'cc' && a.handler == current_user_id && !a.is_read) {
+                index = idx;
+            }
+        });
+
+        // setObj['traces.$.approves.' + index + '.is_read'] = true;
+        // setObj['traces.$.approves.' + index + '.read_date'] = new Date();
+        const key_str = 'traces.$.approves.' + index + '.';
+        const approveDoc = {
+            is_read: true,
+            read_date: new Date()
+        }
+        for (const key in approveDoc) {
+            if (Object.hasOwnProperty.call(approveDoc, key)) {
+                setObj[key_str + key] = approveDoc[key]
+            }
+        }
+
+
+        db.instances.update({
+            _id: ins_id,
+            'traces._id': trace_id
+        }, {
+            $set: setObj
+        });
+        update_instance_tasks(ins_id, trace_id, current_trace.approves[index]._id, approveDoc)
+        return true;
+    },
+
+    cc_submit: function (ins_id, description, myApprove, ccHasEditPermission) {
+        var setObj = {};
+
+        var instance = db.instances.findOne(ins_id);
+        var traces = instance.traces;
+        var current_user_id = this.userId;
+
+        var flow = uuflowManager.getFlow(instance.flow);
+        var values = myApprove.values || {};
+
+        var approve_id = myApprove._id;
+
+        var myTrace;
+
+        var is_finished; // 传阅正真结束的标记
+
+        for (let tidx = 0; tidx < traces.length; tidx++) {
+            const t = traces[tidx];
+            if (t.approves) {
+                for (let aidx = 0; aidx < t.approves.length; aidx++) {
+                    const a = t.approves[aidx];
+                    if (approve_id == a._id && a.type == 'cc' && a.handler == current_user_id && a.is_finished == false) {
+                        var upobj = {};
+                        var key_str = 'traces.$.approves.' + aidx + '.';
+                        const approveDoc = {
+                            'is_finished': true,
+                            'is_read': true,
+                            'finish_date': new Date(),
+                            'judge': "submitted",
+                            'cost_time': new Date() - a.start_date,
+                        }
+                        // upobj[key_str + 'is_finished'] = true;
+                        // upobj[key_str + 'is_read'] = true;
+                        // upobj[key_str + 'finish_date'] = new Date();
+                        // upobj[key_str + 'judge'] = "submitted";
+                        // upobj[key_str + 'cost_time'] = new Date() - a.start_date;
+                        if (approve_id == a._id && !t.is_finished && ccHasEditPermission) {
+                            myTrace = t;
+                            var step = uuflowManager.getStep(instance, flow, t.step);
+                            // upobj[key_str + "values"] = uuflowManager.getApproveValues(values, step["permissions"], instance.form, instance.form_version)
+                            approveDoc['values'] = uuflowManager.getApproveValues(values, step["permissions"], instance.form, instance.form_version)
+                        }
+                        //设置意见，意见只添加到最后一条approve中
+                        if (approve_id == a._id) {
+                            // upobj[key_str + 'description'] = description;
+                            approveDoc['description'] = description
+                        }
+                        for (const key in approveDoc) {
+                            if (Object.hasOwnProperty.call(approveDoc, key)) {
+                                upobj[key_str + key] = approveDoc[key]
+                            }
+                        }
+                        db.instances.update({
+                            _id: ins_id,
+                            'traces._id': t._id
+                        }, {
+                            $set: upobj
+                        })
+                        // 更新
+                        update_instance_tasks(ins_id, a.trace, a._id, approveDoc)
+                        is_finished = true;
+                    }
+                }
+            }
+
+        }
+
+        if (myApprove && is_finished) {
+
+            setObj.modified = new Date();
+            setObj.modified_by = this.userId;
+
+            if (ccHasEditPermission && myApprove && !myTrace.is_finished) {
+                var ins = uuflowManager.getInstance(ins_id);
+                var updated_values = uuflowManager.getUpdatedValues(ins, approve_id);
+                setObj.values = updated_values;
+                setObj.name = uuflowManager.getInstanceName(instance);
+                // 计算extras
+                var form = db.forms.findOne(instance.form);
+                setObj.extras = uuflowManager.caculateExtras(setObj.values, form, instance.form_version);
+            }
+
+            db.instances.update({
+                _id: ins_id,
+                cc_users: current_user_id
+            }, {
+                $set: setObj,
+                $unset: {
+                    'cc_users.$': true
+                },
+                $addToSet: {
+                    outbox_users: {
+                        $each: [current_user_id, myApprove.user]
+                    }
+                }
+            });
+
+            db.instances.update({
+                _id: ins_id,
+            }, {
+                $pull: {
+                    cc_users: null
+                }
+            });
+
+            uuflowManager.updateCCcount(ins_id)
+
+            instance = db.instances.findOne(ins_id);
+
+            current_user_info = db.users.findOne(current_user_id);
+            //传阅提交不通知传阅者
+            if (false && description && myApprove && myApprove.from_user) {
+                pushManager.send_instance_notification("trace_approve_cc_submit", instance, "", current_user_info, [myApprove.from_user]);
+            }
+
+            pushManager.send_message_to_specifyUser("current_user", current_user_id);
+
+            flow_id = instance.flow;
+            // 如果已经配置webhook并已激活则触发
+            pushManager.triggerWebhook(flow_id, instance, myApprove, 'cc_submit', current_user_id, []);
+        }
+
+        return true;
+    },
+
+    cc_remove: function (instanceId, approveId) {
+        var setObj = {};
+
+        var instance = db.instances.findOne(instanceId, {
+            fields: {
+                traces: 1,
+                cc_users: 1
+            }
+        });
+        var traces = instance.traces;
+        var trace_id, remove_user_id, multi = false;
+
+        traces.forEach(function (t) {
+            if (t.approves) {
+                t.approves.forEach(function (a, idx) {
+                    if (a._id == approveId) {
+                        trace_id = a.trace;
+                        remove_user_id = a.handler;
+                        setObj['traces.$.approves.' + idx + '.judge'] = 'terminated';
+                        setObj['traces.$.approves.' + idx + '.is_finished'] = true;
+                        setObj['traces.$.approves.' + idx + '.finish_date'] = new Date();
+                        setObj['traces.$.approves.' + idx + '.is_read'] = true;
+                        setObj['traces.$.approves.' + idx + '.read_date'] = new Date();
+                    }
+                });
+            }
+        })
+
+        if (!trace_id || !remove_user_id)
+            return;
+
+        var multi = 0;
+        traces.forEach(function (t) {
+            if (t.approves) {
+                t.approves.forEach(function (a) {
+                    if (a.handler == remove_user_id && a.type == 'cc' && a.is_finished == false) {
+                        multi++;
+                    }
+                });
+            }
+        })
+
+        setObj.modified = new Date();
+        setObj.modified_by = this.userId;
+
+        if (multi > 1) {
+            db.instances.update({
+                _id: instanceId,
+                'traces._id': trace_id
+            }, {
+                $set: setObj
+            });
+        } else {
+            db.instances.update({
+                _id: instanceId,
+                'traces._id': trace_id
+            }, {
+                $set: setObj,
+                $pull: {
+                    cc_users: remove_user_id
+                }
+            });
+        }
+
+        uuflowManager.updateCCcount(instanceId)
+
+        remove_instance_tasks(approveId)
+
+
+        pushManager.send_message_to_specifyUser("current_user", remove_user_id);
+        return true;
+    },
+
+    batch_cancel_cc: function (instance_id, approve_ids) {
+        check(instance_id, String)
+        check(approve_ids, Array)
+
+        var setObj = {};
+
+        var instance = db.instances.findOne(instance_id, {
+            fields: {
+                traces: 1,
+                cc_users: 1
+            }
+        });
+        var traces = instance.traces;
+        var remove_user_ids = [];
+        var removeApproveIds = []
+
+        traces.forEach(function (t, tIdx) {
+            if (t.approves) {
+                t.approves.forEach(function (a, idx) {
+                    if (approve_ids.includes(a._id)) {
+                        removeApproveIds.push(a._id)
+                        remove_user_ids.push(a.user);
+                        setObj['traces.' + tIdx + '.approves.' + idx + '.judge'] = 'terminated';
+                        setObj['traces.' + tIdx + '.approves.' + idx + '.is_finished'] = true;
+                        setObj['traces.' + tIdx + '.approves.' + idx + '.finish_date'] = new Date();
+                        setObj['traces.' + tIdx + '.approves.' + idx + '.is_read'] = true;
+                        setObj['traces.' + tIdx + '.approves.' + idx + '.read_date'] = new Date();
+                    }
+                });
+            }
+        })
+
+        if (_.isEmpty(remove_user_ids))
+            return;
+
+        setObj.modified = new Date();
+        setObj.modified_by = this.userId;
+
+        db.instances.update({
+            _id: instance_id
+        }, {
+            $set: setObj,
+        });
+        for (const ruId of remove_user_ids) {
+            db.instances.update({
+                _id: instance_id,
+                cc_users: ruId
+            }, {
+                $unset: {
+                    'cc_users.$': true
+                }
+            });
+        }
+        db.instances.update({
+            _id: instance_id,
+        }, {
+            $pull: {
+                cc_users: null
+            }
+        });
+
+        uuflowManager.updateCCcount(instance_id)
+
+        direct_remove_many_instance_tasks(removeApproveIds)
+
+        remove_user_ids.forEach(function (u_id) {
+            pushManager.send_message_to_specifyUser("current_user", u_id);
+        })
+        return true;
+    },
+
+    cc_save: function (ins_id, description, myApprove, ccHasEditPermission) {
+        var setObj = {};
+        const approveDoc = {}
+
+        var instance = db.instances.findOne(ins_id);
+        var traces = instance.traces;
+        var current_user_id = this.userId;
+
+        var trace_id = myApprove.trace;
+        var approve_id = myApprove._id;
+
+        var current_trace = _.find(traces, function (t) {
+            return t._id == trace_id;
+        });
+        var current_approve = _.find(current_trace.approves, function (a) {
+            return a._id == approve_id;
+        });
+
+        var myTrace;
+
+        traces.forEach(function (t) {
+            if (t.approves) {
+                t.approves.forEach(function (a, idx) {
+                    if (a.handler == current_user_id && a.type == 'cc' && a.is_finished == false) {
+                        var upobj = {};
+                        upobj['traces.$.approves.' + idx + '.judge'] = "submitted";
+                        upobj['traces.$.approves.' + idx + '.read_date'] = new Date();
+                        db.instances.update({
+                            _id: ins_id,
+                            'traces._id': t._id
+                        }, {
+                            $set: upobj
+                        })
+
+                    }
+                });
+            }
+        })
+
+        var index = 0;
+        var currentStepId;
+
+        //设置意见，意见只添加到最后一条approve中
+        traces.forEach(function (t) {
+            if (myApprove && t._id === myApprove.trace) {
+                currentStepId = t.step;
+                myTrace = t;
+                if (t.approves) {
+                    t.approves.forEach(function (a, idx) {
+                        if (a._id === myApprove._id) {
+                            index = idx;
+                        }
+                    });
+                }
+            }
+        });
+
+        setObj['traces.$.approves.' + index + '.description'] = description;
+        approveDoc['description'] = description
+
+        var updateObj = {};
+
+        if (ccHasEditPermission && myApprove && !myTrace.is_finished) {
+
+            var key_str = 'traces.$.approves.' + index + '.';
+
+            var flow = uuflowManager.getFlow(instance.flow);
+
+            var step = uuflowManager.getStep(instance, flow, currentStepId);
+
+            var permissions_values = uuflowManager.getApproveValues(myApprove.values, step.permissions, instance.form, instance.form_version);
+
+            var change_values = approveManager.getChangeValues(instance.values, permissions_values);
+
+            setObj.values = _.extend((instance.values || {}), permissions_values);
+            // 计算extras
+            var form = db.forms.findOne(instance.form);
+            setObj.extras = uuflowManager.caculateExtras(setObj.values, form, instance.form_version);
+            approveDoc['extras'] = setObj.extras
+
+            if (!_.isEmpty(change_values)) {
+                var pushObj = {};
+                pushObj[key_str + 'values_history'] = {
+                    values: change_values,
+                    create: new Date()
+                }
+                updateObj.$push = pushObj;
+
+                const values_history = current_approve.values_history || []
+                values_history.push(pushObj[key_str + 'values_history'])
+                approveDoc['values_history'] = values_history
+            }
+
+            setObj.name = uuflowManager.getInstanceName(instance)
+            approveDoc['instance_name'] = setObj.name
+        }
+
+        updateObj.$set = setObj;
+
+        db.instances.update({
+            _id: ins_id,
+            'traces._id': myApprove.trace
+        }, updateObj);
+        update_instance_tasks(ins_id, myApprove.trace, myApprove._id, approveDoc)
+        return true;
+    }
+     */
+}