@steedos-labs/plugin-workflow 3.0.21 → 3.0.23

package/main/default/manager/handlers_manager.js

@@ -1,9 +1,9 @@
-
 const _ = require('underscore');
 
 const { getCollection } = require('../utils/collection');
 const { excuteTriggers } = require('../utils/trigger')
 const WorkflowManager = require('./workflow_manager');
+// const UUFlowManager = require('./uuflow_manager'); // Moved inside function to avoid circular dependency
 
 const getHandlersManager = {};
 
@@ -20,7 +20,7 @@ getHandlersManager.getHandlersByUsersAndRoles = async function (user_ids, role_i
                 approve_users = approve_users.concat(users);
             }
         } else {
-            throw new Error('error! user_id不合法不合法');
+            throw new Error('error! user_id不合法');
         }
     }
     
@@ -147,6 +147,7 @@ getHandlersManager.getHandlersByOrgAndRole = async function (org_id, role_id, sp
 };
 
 getHandlersManager.getHandlers = async function (instance_id, step_id, login_user_id) {
+    const UUFlowManager = require('./uuflow_manager');
     const instancesCollection = await getCollection('instances');
     const flowsCollection = await getCollection('flows');
     const formsCollection = await getCollection('forms');
@@ -287,7 +288,7 @@ getHandlersManager.getHandlers = async function (instance_id, step_id, login_use
             }
         }
         
-        const newest_values = await uuflowManager.getUpdatedValues(instance);
+        const newest_values = await UUFlowManager.getUpdatedValues(instance);
         let org_ids = [];
         let org_ids_names = [];
         
@@ -363,7 +364,7 @@ getHandlersManager.getHandlers = async function (instance_id, step_id, login_use
             }
         }
         
-        const newest_values = await uuflowManager.getUpdatedValues(instance);
+        const newest_values = await UUFlowManager.getUpdatedValues(instance);
         let org_ids = [];
         let org_ids_names = [];
         
@@ -468,7 +469,7 @@ getHandlersManager.getHandlers = async function (instance_id, step_id, login_use
             }
         }
         
-        const newest_values = await uuflowManager.getUpdatedValues(instance);
+        const newest_values = await UUFlowManager.getUpdatedValues(instance);
         let user_ids_names = [];
         
         if (newest_values[field_code]) {
@@ -484,14 +485,14 @@ getHandlersManager.getHandlers = async function (instance_id, step_id, login_use
         for (const user of user_ids_names) {
             const check_user_count = await spaceUsersCollection.find({
                 space: space_id,
-                user: user["id"]
+                user: _.isString(user) ? user : user["id"]
             }).count();
             
             if (check_user_count === 0) {
                 throw new Error('error! 人员ID不合法');
             }
             
-            user_ids.push(user["id"]);
+            user_ids.push(_.isString(user) ? user : user["id"]);
         }
         
         user_ids = _.uniq(user_ids);
@@ -548,7 +549,7 @@ getHandlersManager.getHandlers = async function (instance_id, step_id, login_use
             }
         }
         
-        const newest_values = await uuflowManager.getUpdatedValues(instance);
+        const newest_values = await UUFlowManager.getUpdatedValues(instance);
         let user_ids_names = [];
         
         if (newest_values[field_code]) {
@@ -560,18 +561,16 @@ getHandlersManager.getHandlers = async function (instance_id, step_id, login_use
         }
         
         let user_ids = [];
-        
         for (const user of user_ids_names) {
             const check_user_count = await spaceUsersCollection.find({
                 space: space_id,
-                user: user["id"]
+                user: _.isString(user) ? user : user["id"]
             }).count();
-            
             if (check_user_count === 0) {
                 throw new Error('error! 人员ID不合法');
             }
             
-            user_ids.push(user["id"]);
+            user_ids.push(_.isString(user) ? user : user["id"]);
         }
         
         users = _.uniq(user_ids);

package/main/default/manager/uuflow_manager.js

@@ -897,7 +897,7 @@ UUFlowManager.getNextSteps = async function (instance, flow, step, judge, values
                 }
                 else {
                     step_line_condition = step_line.condition.replace(reg, (vowel) => {
-                        return prefix + vowel.replace(/\{\s*/, "[\"").replace(/\s*\}/, "\"]").replace(/\s*\.\s*/g, "\"][\"");
+                        return prefix + vowel.replace(/\{\s*/, "[\"").replace(/\s*\}/, "\"]").replace(/\s*\.\s*/g, "\"]?.[\"");
                     });
                     allow = UUFlowManager.calculateCondition(__values, step_line_condition);
                 }
@@ -1029,6 +1029,9 @@ UUFlowManager.getNextSteps = async function (instance, flow, step, judge, values
             }
         }
     }
+
+    // rev_nextSteps 不能包含当前步骤
+    rev_nextSteps = rev_nextSteps.filter(ns => ns !== step._id);
     
     return _.uniq(rev_nextSteps);
 };

package/main/default/manager/workflow_manager.js

@@ -116,6 +116,18 @@ WorkflowManager.getRole = async function (spaceId, roleId) {
     });
 };
 
+WorkflowManager.getRoles = async function (spaceId, roleIds) {
+    if (!roleIds || !spaceId) {
+        return;
+    }
+
+    const flowRolesCollection = await getCollection('flow_roles');
+    return await flowRolesCollection.find({
+        _id: { $in: roleIds },
+        space: spaceId
+    }).toArray();
+};
+
 WorkflowManager.getSpacePositions = async function (spaceId) {
     const flowPositionsCollection = await getCollection('flow_positions');
     return await flowPositionsCollection.find({

package/main/default/pages/instance_tasks_detail.page.amis.json

@@ -1,6 +1,22 @@
 {
   "type": "page",
   "body": [
+    {
+      "type": "button",
+      "label": "刷新",
+      "className": "steedos-workflow-reload-btn hidden",
+      "onEvent": {
+        "click": {
+          "actions": [
+            {
+              "componentId": "u:d6db0c84f150",
+              "groupType": "component",
+              "actionType": "rebuild"
+            }
+          ]
+        }
+      }
+    },
     {
       "type": "wrapper",
       "className": "steedos-instance-detail-wrapper m-0 p-0 flex-1 focus:outline-none lg:order-last sm:m-4 shadow sm:rounded",

package/main/default/pages/page_instance_print.page.amis.json

@@ -182,7 +182,7 @@
     "body": [
         {
             "type": "wrapper",
-            "className": "steedos-instance-detail-wrapper m-0 p-0 flex-1 focus:outline-none lg:order-last sm:m-4 shadow sm:rounded",
+            "className": "steedos-instance-print-wrapper steedos-instance-detail-wrapper m-0 p-0 flex-1 focus:outline-none lg:order-last sm:m-4 shadow sm:rounded",
             "body": [
                 {
                     "type": "service",

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

@@ -7,7 +7,21 @@ const _ = require('lodash');
 router.delete('/api/workflow/v2/attachment/:instanceId/:id', requireAuthentication, async function (req, res) {
     try {
         const { instanceId, id} = req.params;
-        await getObject('cfs_instances_filerecord').delete(id);
+        const fileObject = getObject('cfs_instances_filerecord');
+        await fileObject.delete(id);
+
+        const files = await fileObject.find({
+            filters: [['metadata.parent', '=', instanceId]],
+            sort: 'uploadedAt desc', 
+            top: 1
+        });
+
+        if (files && files.length > 0) {
+            const current = files[0];
+            const metadata = Object.assign({}, current.metadata || {}, { current: true });
+            await fileObject.update(current._id, { metadata });
+        }
+
         res.status(200).send({
             status: 0
         })

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

@@ -39,7 +39,7 @@ const FlowversionAPI = {
         return str.replace(/\"/g, "&quot;").replace(/\n/g, "<br/>");
     },
 
-    getStepHandlerName: async function (step, insId) {
+    getStepHandlerName: async function (step, insId, instance) {
         const db = {
             users: await getCollection('users'),
             // flow_roles: await getCollection('flow_roles')
@@ -53,9 +53,22 @@ const FlowversionAPI = {
                 return stepHandlerName;
             }
             let userIds = await getHandlersManager.getHandlers(insId, stepId, loginUserId);
+            
+            // 如果没有找到处理人，从instance的step_approve中查找
+            if ((!userIds || userIds.length === 0) && instance?.step_approve && stepId) {
+                let stepApproveUserId = instance.step_approve[stepId];
+                if (stepApproveUserId) {
+                    if (typeof stepApproveUserId === 'string') {
+                        userIds = [stepApproveUserId];
+                    } else if (Array.isArray(stepApproveUserId)) {
+                        userIds = stepApproveUserId;
+                    }
+                }
+            }
+            
             let usersCol = db.users;
             let approverNames = [];
-            for (let userId of userIds) {
+            for (let userId of userIds || []) {
                 let user = await usersCol.findOne({ _id: userId }, { projection: { name: 1 } });
                 if (user) {
                     approverNames.push(user.name);
@@ -111,21 +124,22 @@ const FlowversionAPI = {
         return nodeStr;
     },
 
-    getStepName: async function (step, cachedStepNames, instance_id) {
+    getStepName: async function (step, cachedStepNames, instance_id, instance) {
         // 返回step节点名称，优先从缓存cachedStepNames中取，否则调用getStepLabel生成
         let cachedStepName = cachedStepNames[step._id];
         if (cachedStepName) {
             return cachedStepName;
         }
-        let stepHandlerName = await FlowversionAPI.getStepHandlerName(step, instance_id);
+        let stepHandlerName = await FlowversionAPI.getStepHandlerName(step, instance_id, instance);
         let stepName = FlowversionAPI.getStepLabel(step.name, stepHandlerName);
         cachedStepNames[step._id] = stepName;
         return stepName;
     },
 
-    generateStepsGraphSyntax: async function (steps, currentStepId, isConvertToString, direction, instance_id) {
+    generateStepsGraphSyntax: async function (steps, currentStepId, isConvertToString, direction, instance_id, instance) {
         let nodes = [`graph ${direction}`];
         let cachedStepNames = {};
+        let skipSteps = new Set(instance?.skip_steps || []);
         for (let step of steps) {
             let lines = step.lines;
             if (lines?.length) {
@@ -136,13 +150,17 @@ const FlowversionAPI = {
                         if (step.step_type === "condition") {
                             nodes.push(`	class ${step._id} condition;`);
                         }
-                        stepName = await FlowversionAPI.getStepName(step, cachedStepNames, instance_id);
+                        stepName = await FlowversionAPI.getStepName(step, cachedStepNames, instance_id, instance);
                     } else {
                         stepName = "";
                     }
+                    // Mark skipped steps
+                    if (skipSteps.has(step._id)) {
+                        nodes.push(`	class ${step._id} skip-step;`);
+                    }
                     // 原findPropertyByPK("_id",line.to_step)，转为find
                     let toStep = steps.find(s => s._id === line.to_step);
-                    let toStepName = await FlowversionAPI.getStepName(toStep, cachedStepNames, instance_id);
+                    let toStepName = await FlowversionAPI.getStepName(toStep, cachedStepNames, instance_id, instance);
                     nodes.push(`	${step._id}("${stepName}")-->${line.to_step}("${toStepName}")`);
                 }
             }
@@ -487,13 +505,13 @@ const FlowversionAPI = {
                 break;
             }
             default: {
-                let instance = await db.instances.findOne({ _id: instance_id }, { projection: { flow_version: 1, flow: 1, traces: { $slice: -1 } } });
+                let instance = await db.instances.findOne({ _id: instance_id }, { projection: { flow_version: 1, flow: 1, step_approve: 1, skip_steps: 1, traces: { $slice: -1 } } });
                 if (instance) {
                     let currentStepId = instance.traces?.[0]?.step;
                     let flowversion = await WorkflowManager.getInstanceFlowVersion(instance);
                     let steps = flowversion?.steps;
                     if (steps?.length) {
-                        graphSyntax = await FlowversionAPI.generateStepsGraphSyntax(steps, currentStepId, false, direction, instance_id);
+                        graphSyntax = await FlowversionAPI.generateStepsGraphSyntax(steps, currentStepId, false, direction, instance_id, instance);
                     } else {
                         error_msg = "没有找到当前申请单的流程步骤数据";
                     }
@@ -557,6 +575,20 @@ const FlowversionAPI = {
 							stroke: rgb(204, 204, 255);
 							stroke-width: 1px;
 						}
+						#flow-steps-svg .node.skip-step rect{
+							fill: #e8e8e8;
+							stroke: #999999;
+							stroke-width: 2px;
+							stroke-dasharray: 5, 5;
+							opacity: 0.7;
+						}
+						#flow-steps-svg .node.skip-step .step-name{
+							color: #666666;
+							text-decoration: line-through;
+						}
+						#flow-steps-svg .node.skip-step .step-handler-name{
+							color: #999999;
+						}
 						#flow-steps-svg .node .trace-handler-name{
 							color: #777;
 						}

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

@@ -401,7 +401,7 @@ router.post('/api/workflow/v2/set_instance_steps', requireAuthentication, async
                 skip_steps: stepId
             }
         }
-        await objectql.getObject('instances').update(instanceId, doc);
+        await objectql.getObject('instances').directUpdate(instanceId, doc);
 
         return res.status(200).send({ status: 0 });
     } catch (error) {

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

@@ -14,6 +14,7 @@ const { excuteTriggers } = require('../utils/trigger');
 const objectql = require('@steedos/objectql');
 const WorkflowManager = require('../manager/workflow_manager');
 const UUFlowManager = require('../manager/uuflow_manager');
+const { t } = require('@steedos/i18n');
 
 const getFieldName = (fields, fieldId)=>{
     const field = _.find(fields, (item)=>{
@@ -167,7 +168,8 @@ router.post('/api/workflow/v2/nextStepUsers', requireAuthentication, async funct
                             }
 
                             if (!nextStepUsers || nextStepUsers.length < 1) {
-                                error = "ROLE_NO_MEMBERS";
+                                const roles = await WorkflowManager.getRoles(instance.space, approverRoleIds);
+                                error = t('next_step_users_not_found.applicant_role', {role_name: _.join(_.map(roles, 'name'), ', ')}, userSession.language)
                             }
                         } else {
                             error = "请先填写表单值";
@@ -189,7 +191,10 @@ router.post('/api/workflow/v2/nextStepUsers', requireAuthentication, async funct
                             }
 
                             if (!nextStepUsers || nextStepUsers.length < 1) {
-                                error = "ROLE_NO_MEMBERS";
+                               
+                                const roles = await WorkflowManager.getRoles(instance.space, approverRoleIds);
+                                 console.log(`approverRoleIds`, approverRoleIds, roles)
+                                error = t('next_step_users_not_found.applicant_role', {role_name: _.join(_.map(roles, 'name'), ', ')}, userSession.language)
                             }
                         } else {
                             error = "请先填写表单值";

package/main/default/routes/flow_form_design.ejs

@@ -276,11 +276,31 @@
       if(field.steedos_field){
         return {
           type: `sfield-${_.toLower(_.camelCase(field.steedos_field.type))}`,
-          config: field.steedos_field
+          config: field.steedos_field,
+          _id: field._id
         }
       }
 
+      // Handle new approval_comments field format from migration
+      if(field.type === 'steedos-field' && field.config?.type === 'approval_comments'){
+        return {
+          type: 'sfield-approvalcomments',
+          _id: field._id || field.id,
+          label: field.config.label,
+          name: field.config.name,
+          required: field.is_required || field.required,
+          className: (field.is_wide ? 'is_wide' : '') +
+            (field.is_list_display ? ' is_list_display' : '') +
+            (field.is_searchable ? ' is_searchable' : ''),
+          id: field.id,
+          config: field.config,
+          visibleOn: field.visibleOn,
+          requiredOn: field.requiredOn
+        };
+      }
+
       const tpl = {
+        _id: field._id,
         label: field.name || field.code,
         name: field.code,
         required: field.is_required,

package/main/default/triggers/amis_form_design.trigger.js

@@ -1,6 +1,7 @@
 const _ = require('lodash');
 const desingerManager = require('../utils/designerManager');
 const objectql = require("@steedos/objectql");
+const auth = require("@steedos/auth");
 const { ObjectId } = require("mongodb");
 const AmisInputTypes = [
     //44个表单项
@@ -139,7 +140,6 @@ function getFinalFormFields(inputFields) {
         const temp = transformFormFields(amisField);
         finalFormFields.push(temp)
     })
-
     return finalFormFields
 }
 
@@ -160,7 +160,7 @@ function transformFormFields(amisField) {
 
     if(amisField.type === 'steedos-field'){
         const sfield = {
-            _id: amisField.config.name,
+            _id: amisField._id || amisField.config.name,
             code: amisField.config.name,
             name: amisField.config.label,
             is_wide: amisField.config.is_wide,
@@ -188,7 +188,7 @@ function transformFormFields(amisField) {
     };
 
     let formFieldsItem = {
-        _id: new ObjectId().toHexString(),
+        _id: amisField._id || new ObjectId().toHexString(),
         code: amisField.name || amisField.title,
         name: amisField.label || amisField.title,
         is_wide: _.includes(amisField.className, "is_wide"),
@@ -559,7 +559,9 @@ module.exports = {
             let updatedFlows = [];
             let userId = this.userId || this.doc?.modified_by;
             let spaceId = this.spaceId || this.doc?.space;
-            let roles = this.roles;
+
+            let userSession = await auth.getSessionByUserId(userId, spaceId)
+            let roles = userSession.roles;
             // 执行者的身份校验
             await desingerManager.checkSpaceUserBeforeUpdate(spaceId, userId, roles);
             // 更新表单

package/main/default/utils/designerManager.js

@@ -146,12 +146,11 @@ async function checkSpaceUserBeforeUpdate(spaceId, userId, roles) {
     let spaceUser = (await getObject('space_users').find({
         filters: `(space eq '${spaceId}') and (user eq '${userId}')`
     }))[0];
-
     if (!spaceUser) {
         throw new Error('该用户不存在于该工作区中');
     }
 
-    if (!roles.includes('workflow_admin')) { // 校验是否是单位管理员
+    if (!_.includes(roles, 'workflow_admin')) { // 校验是否是单位管理员
         throw new Error('该用户无操作权限');
     }
 };

package/package.json

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

package/public/workflow/index.css

@@ -505,6 +505,9 @@ tbody .color-priority-muted *{
     color: #40a9ff
 }
 
+.steedos-instance-print-wrapper .liquid-amis-container{
+    width: 190mm;
+}
 
 @media (max-width: 768px){
     /* 审批单详细页手机端附件预览按钮样式 */