@steedos-labs/plugin-workflow 3.0.1-beta.6 → 3.0.1-beta.7

package/main/default/methods/trace_approve_cc.js

@@ -2,6 +2,7 @@
 const { getCollection, _makeNewID } = require('../utils/collection');
 const UUFlowManager = require('../manager/uuflow_manager.js');
 const pushManager = require('../manager/push_manager.js');
+const approveManager = require('../manager/approve_manager.js');
 const {
     update_instance_tasks,
     insert_instance_tasks,
@@ -106,7 +107,7 @@ module.exports = {
         }
 
         setObj.modified = new Date();
-        setObj.modified_by = this.userId;
+        setObj.modified_by = ctx.userId;
 
         await instancesCollection.updateOne({
             _id: ins_id,
@@ -191,15 +192,19 @@ module.exports = {
         return true;
     },
 
-    /**
-    cc_submit: function (ins_id, description, myApprove, ccHasEditPermission) {
+    cc_submit: async function (ins_id, description, myApprove, ccHasEditPermission, ctx = {}) {
+        const db = {
+            instances: await getCollection('instances'),
+            forms: await getCollection('forms'),
+            users: await getCollection('users')
+        };
         var setObj = {};
 
-        var instance = db.instances.findOne(ins_id);
+        var instance = await db.instances.findOne({_id: ins_id});
         var traces = instance.traces;
-        var current_user_id = this.userId;
+        var current_user_id = ctx.userId;
 
-        var flow = uuflowManager.getFlow(instance.flow);
+        var flow = await UUFlowManager.getFlow(instance.flow);
         var values = myApprove.values || {};
 
         var approve_id = myApprove._id;
@@ -223,20 +228,13 @@ module.exports = {
                             '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)
+                            var step = await UUFlowManager.getStep(instance, flow, t.step);
+                            approveDoc['values'] = await 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) {
@@ -244,14 +242,14 @@ module.exports = {
                                 upobj[key_str + key] = approveDoc[key]
                             }
                         }
-                        db.instances.update({
+                        await db.instances.updateOne({
                             _id: ins_id,
                             'traces._id': t._id
                         }, {
                             $set: upobj
                         })
                         // 更新
-                        update_instance_tasks(ins_id, a.trace, a._id, approveDoc)
+                        await update_instance_tasks(ins_id, a.trace, a._id, approveDoc)
                         is_finished = true;
                     }
                 }
@@ -262,19 +260,19 @@ module.exports = {
         if (myApprove && is_finished) {
 
             setObj.modified = new Date();
-            setObj.modified_by = this.userId;
+            setObj.modified_by = ctx.userId;
 
             if (ccHasEditPermission && myApprove && !myTrace.is_finished) {
-                var ins = uuflowManager.getInstance(ins_id);
-                var updated_values = uuflowManager.getUpdatedValues(ins, approve_id);
+                var ins = await UUFlowManager.getInstance(ins_id);
+                var updated_values = await UUFlowManager.getUpdatedValues(ins, approve_id);
                 setObj.values = updated_values;
-                setObj.name = uuflowManager.getInstanceName(instance);
+                setObj.name = await UUFlowManager.getInstanceName(instance);
                 // 计算extras
-                var form = db.forms.findOne(instance.form);
-                setObj.extras = uuflowManager.caculateExtras(setObj.values, form, instance.form_version);
+                var form = await db.forms.findOne({ _id : instance.form});
+                setObj.extras = await UUFlowManager.caculateExtras(setObj.values, form, instance.form_version);
             }
 
-            db.instances.update({
+            await db.instances.updateOne({
                 _id: ins_id,
                 cc_users: current_user_id
             }, {
@@ -289,7 +287,7 @@ module.exports = {
                 }
             });
 
-            db.instances.update({
+            await db.instances.updateOne({
                 _id: ins_id,
             }, {
                 $pull: {
@@ -297,31 +295,35 @@ module.exports = {
                 }
             });
 
-            uuflowManager.updateCCcount(ins_id)
+            await UUFlowManager.updateCCcount(ins_id)
 
-            instance = db.instances.findOne(ins_id);
+            const instance = await db.instances.findOne({ _id: ins_id});
 
-            current_user_info = db.users.findOne(current_user_id);
+            const current_user_info = await db.users.findOne({ _id: 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]);
+                await 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);
+            await pushManager.send_message_to_specifyUser("current_user", current_user_id);
 
-            flow_id = instance.flow;
+            const flow_id = instance.flow;
             // 如果已经配置webhook并已激活则触发
-            pushManager.triggerWebhook(flow_id, instance, myApprove, 'cc_submit', current_user_id, []);
+            await pushManager.triggerWebhook(flow_id, instance, myApprove, 'cc_submit', current_user_id, []);
         }
 
         return true;
     },
 
-    cc_remove: function (instanceId, approveId) {
+    cc_remove: async function (instanceId, approveId) {
+        const db = {
+            instances: await getCollection('instances'),
+        };
+
         var setObj = {};
 
-        var instance = db.instances.findOne(instanceId, {
-            fields: {
+        var instance = await db.instances.findOne({_id: instanceId}, {
+            projection: {
                 traces: 1,
                 cc_users: 1
             }
@@ -360,17 +362,17 @@ module.exports = {
         })
 
         setObj.modified = new Date();
-        setObj.modified_by = this.userId;
+        setObj.modified_by = ctx.userId;
 
         if (multi > 1) {
-            db.instances.update({
+            await db.instances.updateOne({
                 _id: instanceId,
                 'traces._id': trace_id
             }, {
                 $set: setObj
             });
         } else {
-            db.instances.update({
+            await db.instances.updateOne({
                 _id: instanceId,
                 'traces._id': trace_id
             }, {
@@ -381,23 +383,24 @@ module.exports = {
             });
         }
 
-        uuflowManager.updateCCcount(instanceId)
+        await UUFlowManager.updateCCcount(instanceId)
 
-        remove_instance_tasks(approveId)
+        await remove_instance_tasks(approveId)
 
 
-        pushManager.send_message_to_specifyUser("current_user", remove_user_id);
+        await 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)
+    batch_cancel_cc: async function (instance_id, approve_ids) {
+        const db = {
+            instances: await getCollection('instances'),
+        };
 
         var setObj = {};
 
-        var instance = db.instances.findOne(instance_id, {
-            fields: {
+        var instance = await db.instances.findOne(instance_id, {
+            projection: {
                 traces: 1,
                 cc_users: 1
             }
@@ -426,15 +429,15 @@ module.exports = {
             return;
 
         setObj.modified = new Date();
-        setObj.modified_by = this.userId;
+        setObj.modified_by = ctx.userId;
 
-        db.instances.update({
+        await db.instances.updateOne({
             _id: instance_id
         }, {
             $set: setObj,
         });
         for (const ruId of remove_user_ids) {
-            db.instances.update({
+            await db.instances.updateOne({
                 _id: instance_id,
                 cc_users: ruId
             }, {
@@ -443,7 +446,7 @@ module.exports = {
                 }
             });
         }
-        db.instances.update({
+        await db.instances.updateOne({
             _id: instance_id,
         }, {
             $pull: {
@@ -451,23 +454,27 @@ module.exports = {
             }
         });
 
-        uuflowManager.updateCCcount(instance_id)
+        await UUFlowManager.updateCCcount(instance_id)
 
-        direct_remove_many_instance_tasks(removeApproveIds)
+        await direct_remove_many_instance_tasks(removeApproveIds)
 
-        remove_user_ids.forEach(function (u_id) {
-            pushManager.send_message_to_specifyUser("current_user", u_id);
-        })
+        for (const u_id of remove_user_ids) {
+            await pushManager.send_message_to_specifyUser("current_user", u_id);
+        }
         return true;
     },
 
-    cc_save: function (ins_id, description, myApprove, ccHasEditPermission) {
+    cc_save: async function (ins_id, description, myApprove, ccHasEditPermission) {
+        const db = {
+            instances: await getCollection('instances'),
+            forms: await getCollection('forms'),
+        };
         var setObj = {};
         const approveDoc = {}
 
-        var instance = db.instances.findOne(ins_id);
+        var instance = await db.instances.findOne({ _id: ins_id});
         var traces = instance.traces;
-        var current_user_id = this.userId;
+        var current_user_id = ctx.userId;
 
         var trace_id = myApprove.trace;
         var approve_id = myApprove._id;
@@ -481,14 +488,14 @@ module.exports = {
 
         var myTrace;
 
-        traces.forEach(function (t) {
+        for (const t of traces) {
             if (t.approves) {
-                t.approves.forEach(function (a, idx) {
+                for (const [idx, a] of t.approves.entries()) {
                     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({
+                        await db.instances.update({
                             _id: ins_id,
                             'traces._id': t._id
                         }, {
@@ -496,9 +503,9 @@ module.exports = {
                         })
 
                     }
-                });
+                };
             }
-        })
+        }
 
         var index = 0;
         var currentStepId;
@@ -527,18 +534,18 @@ module.exports = {
 
             var key_str = 'traces.$.approves.' + index + '.';
 
-            var flow = uuflowManager.getFlow(instance.flow);
+            var flow = await UUFlowManager.getFlow(instance.flow);
 
-            var step = uuflowManager.getStep(instance, flow, currentStepId);
+            var step = UUFlowManager.getStep(instance, flow, currentStepId);
 
-            var permissions_values = uuflowManager.getApproveValues(myApprove.values, step.permissions, instance.form, instance.form_version);
+            var permissions_values = await 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);
+            var form = await db.forms.findOne({ _id: instance.form });
+            setObj.extras = await UUFlowManager.caculateExtras(setObj.values, form, instance.form_version);
             approveDoc['extras'] = setObj.extras
 
             if (!_.isEmpty(change_values)) {
@@ -554,18 +561,18 @@ module.exports = {
                 approveDoc['values_history'] = values_history
             }
 
-            setObj.name = uuflowManager.getInstanceName(instance)
+            setObj.name = await UUFlowManager.getInstanceName(instance)
             approveDoc['instance_name'] = setObj.name
         }
 
         updateObj.$set = setObj;
 
-        db.instances.update({
+        await db.instances.updateOne({
             _id: ins_id,
             'traces._id': myApprove.trace
         }, updateObj);
-        update_instance_tasks(ins_id, myApprove.trace, myApprove._id, approveDoc)
+        await update_instance_tasks(ins_id, myApprove.trace, myApprove._id, approveDoc)
         return true;
     }
-     */
+
 }

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

@@ -58,7 +58,7 @@ amis_schema: |-
                   }
               },
               "confirmText": "${'CustomLabels.confirm_delete' | t}",
-              "hiddenOn": "!((record.box == 'draft' || record.box == 'monitor') \n  && (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     ) \n  || (record.box == 'inbox' && record.state == 'draft' && record.forward_from_instance))"
+              "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     ) \n  || (record.box == 'inbox' && record.state == 'draft' && record.forward_from_instance))"
           }
       ],
       "regions": [

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

@@ -17,7 +17,7 @@ amis_schema: |-
                                       "url": "/api/workflow/v2/instance/save",
                                       "method": "post",
                                       "sendOn": "",
-                                      "requestAdaptor": "var _SteedosUI$getRef$get, _approveValues$next_s;\nconst formValues = context._scoped.getComponentById(\"instance_form\").getValues();\nconst approveValues = (_SteedosUI$getRef$get = context._scoped.getComponentById(\"instance_approval\")) === null || _SteedosUI$getRef$get === void 0 ? void 0 : _SteedosUI$getRef$get.getValues();\nlet nextUsers = approveValues === null || approveValues === void 0 ? void 0 : approveValues.next_users;\nif (_.isString(nextUsers)) {\n  nextUsers = [approveValues.next_users];\n}\nconst instance = context.record;\nconst body = {\n  instance: {\n    _id: instance._id,\n    applicant: formValues.applicant,\n    submitter: formValues.submitter,\n    traces: [{\n      _id: instance.trace._id,\n      step: instance.step._id,\n      approves: [{\n        _id: instance.approve._id,\n        next_steps: [{\n          step: approveValues === null || approveValues === void 0 || (_approveValues$next_s = approveValues.next_step) === null || _approveValues$next_s === void 0 ? void 0 : _approveValues$next_s._id,\n          users: nextUsers\n        }],\n        description: approveValues === null || approveValues === void 0 ? void 0 : approveValues.suggestion,\n        values: formValues\n      }]\n    }]\n  }\n};\napi.data = body;\nreturn api;",
+                                      "requestAdaptor": "var _SteedosUI$getRef$get, _approveValues$next_s;\nconst formValues = context._scoped.getComponentById(\"instance_form\").getValues();const _formValues = JSON.parse(JSON.stringify(formValues)); if(_formValues){delete _formValues.__applicant} \nconst approveValues = (_SteedosUI$getRef$get = context._scoped.getComponentById(\"instance_approval\")) === null || _SteedosUI$getRef$get === void 0 ? void 0 : _SteedosUI$getRef$get.getValues();\nlet nextUsers = approveValues === null || approveValues === void 0 ? void 0 : approveValues.next_users;\nif (_.isString(nextUsers)) {\n  nextUsers = [approveValues.next_users];\n}\nconst instance = context.record;\nconst body = {\n  instance: {\n    _id: instance._id,\n    applicant: formValues.applicant.user,\n    submitter: formValues.submitter,\n    traces: [{\n      _id: instance.trace._id,\n      step: instance.step._id,\n      approves: [{\n        _id: instance.approve._id,\n        next_steps: [{\n          step: approveValues === null || approveValues === void 0 || (_approveValues$next_s = approveValues.next_step) === null || _approveValues$next_s === void 0 ? void 0 : _approveValues$next_s._id,\n          users: nextUsers\n        }],\n        description: approveValues === null || approveValues === void 0 ? void 0 : approveValues.suggestion,\n        values: _formValues\n      }]\n    }]\n  }\n};\napi.data = body;\nreturn api;",
                                       "adaptor": "if (payload.instance == \"upgraded\") { window.setTimeout(function(){ window.location.reload(); }, 2000); return {...payload, status: 1, msg: t('instance_action_instance_save_msg_upgraded')}; } \n return payload.instance === true ? {...payload, status: 0, msg: t('instance_action_instance_save_msg_success')} : {...payload, status: 1, msg: t('instance_action_instance_save_msg_failed')};",
                                       "headers": {
                                           "Authorization": "Bearer ${context.tenantId},${context.authToken}"

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

@@ -1,53 +1,26 @@
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2023-02-11 14:50:02
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-02-15 17:12:18
+ * @LastEditors: 孙浩林 sunhaolin@steedos.com
+ * @LastEditTime: 2025-12-04 09:45:50
  * @Description: 
  */
 const express = require("express");
 const router = express.Router();
 const { requireAuthentication } = require("@steedos/auth");
 const objectql = require('@steedos/objectql')
-const _ = require('lodash');
-const Fiber = function(fun){console.log('TODO Fiber...')}
 
-const { workflowMethods } = {name_todo: "@steedos/workflow"}
+const { cc_submit } = require('../methods/trace_approve_cc');
 
 router.post('/api/workflow/v2/cc_submit', requireAuthentication, async function (req, res) {
     try {
         let userSession = req.user;
         const { instanceId, traceId, approveId, description } = req.body;
-        const approve = await objectql.getSteedosSchema().broker.call('instance.getApprove', {instanceId, traceId, approveId});
-        Fiber(async function () {
-            try {
-                // Meteor.call('cc_submit', instanceId, description, myApprove, ccHasEditPermission, function (error, result) {})
-                //TODO
-                console.log('======cc_submit=====', instanceId, description, approve);
-                const ccHasEditPermission = false;
-                const result = workflowMethods.cc_submit.apply({
-                    userId: userSession.userId
-                }, [
-                    instanceId, description, approve, ccHasEditPermission])
-                res.status(200).send(result); 
-                // Meteor.call('cc_submit', instanceId, description, approve, ccHasEditPermission, (error, result)=>{
-                //     if(error){
-                //         res.status(200).send({
-                //             error: error.message
-                //         });
-                //     }else{
-                //         res.status(200).send(result); 
-                //     }
-                // })
-            } catch (error) {
-                console.error(error);
-                res.status(200).send({
-                    error: error.message
-                });
-            }
+        const approve = await objectql.getSteedosSchema().broker.call('instance.getApprove', { instanceId, traceId, approveId });
+        const ccHasEditPermission = false;
+        const result = await cc_submit(instanceId, description, approve, ccHasEditPermission, {userId: userSession.userId})
 
-        }).run()
-    
+        res.status(200).send(result);
     } catch (error) {
         console.error(error);
         res.status(200).send({

package/main/default/routes/flow_form_design.ejs

@@ -281,7 +281,7 @@
       }
 
       const tpl = {
-        label: field.name,
+        label: field.name || field.code,
         name: field.code,
         required: field.is_required,
         multiple: field.is_multiselect,
@@ -290,8 +290,8 @@
           (field.is_searchable ? ' is_searchable' : '')
       };
 
-      if(field.formula){
-        tpl.value = `$${field.formula}`;
+      if(field.default_value){
+        tpl.value = field.default_value;
       }
 
       switch (field.type) {
@@ -301,10 +301,16 @@
           } else {
             tpl.type = "input-text";
           }
+          if(field.formula){
+            tpl.value = `$${field.formula}`;
+          }
           break;
         case "number":
           tpl.type = "input-number";
-          tpl.precision=2
+          tpl.precision=field.digits || 0;
+          if(field.formula){
+            tpl.value = `$${field.formula}`;
+          }
           break;
         case "date":
           tpl.type = "input-date";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos-labs/plugin-workflow",
-  "version": "3.0.1-beta.6",
+  "version": "3.0.1-beta.7",
   "main": "package.service.js",
   "license": "MIT",
   "scripts": {