@steedos-labs/plugin-workflow 3.0.11 → 3.0.13

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

@@ -450,6 +450,7 @@ const FlowversionAPI = {
         let query = req.query;
         let instance_id = query.instance_id;
         let direction = query.direction || 'TD';
+        let noAutoFit = query.noAutoFit === '1' || query.noAutoFit === 'true';
         const allowDirections = ['TB', 'BT', 'RL', 'LR', 'TD'];
         if (!_.includes(allowDirections, direction)) {
             return this.writeResponse(res, 500, "Invalid direction. The value of direction should be in ['TB', 'BT', 'RL', 'LR', 'TD']");
@@ -619,6 +620,7 @@ const FlowversionAPI = {
 						});
 						$(function(){
 							var graphNodes = ${JSON.stringify(graphSyntax)};
+							var noAutoFit = ${noAutoFit ? 'true' : 'false'};
 							//方便前面可以通过调用mermaid.currentNodes调式，特意增加currentNodes属性。
 							mermaid.currentNodes = graphNodes;
 							var graphSyntax = graphNodes.join("\\n");
@@ -634,12 +636,30 @@ const FlowversionAPI = {
 									callback(id);
 								}
 								bindFunctions(element[0]);
+								
+								// 修复SVG左侧内容被裁剪的问题
+								if(!noAutoFit) {
+									setTimeout(function() {
+										var svg = $("svg");
+										if(svg.length > 0) {
+											// 关键修复：允许SVG溢出显示,解决左侧节点被裁剪的问题
+											svg.css('overflow', 'visible');
+										}
+									}, 50);
+								}
 							};
 							mermaid.render(id, graphSyntax, insertSvg, element[0]);
+							
+							var currentZoom = 1;
 							var zoomSVG = function(zoom){
-								var currentWidth = $("svg").width();
-								var newWidth = currentWidth * zoom;
-								$("svg").css("maxWidth",newWidth + "px").width(newWidth);
+								var svg = $("svg");
+								currentZoom = currentZoom * zoom;
+								var baseWidth = svg.data('baseWidth') || svg.width();
+								if(!svg.data('baseWidth')) {
+									svg.data('baseWidth', baseWidth);
+								}
+								var newWidth = baseWidth * currentZoom;
+								svg.css("maxWidth",newWidth + "px").width(newWidth);
 							}
 							//支持鼠标滚轮缩放画布
 							$(window).on("mousewheel",function(event){

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

@@ -11,6 +11,8 @@ const { requireAuthentication } = require("@steedos/auth");
 const _ = require('lodash');
 const objectql = require('@steedos/objectql');
 const UUFlowManager = require('../manager/uuflow_manager');
+const HandlersManager = require('../manager/handlers_manager');
+const WorkflowManager = require('../manager/workflow_manager');
 
 const getFlowVersion = (flow, flowVersionId) => {
     if (flow.current._id === flowVersionId) {
@@ -53,7 +55,7 @@ const isSkipStep = function (instance, step) {
     return _.includes(instance.skip_steps, step._id)
 }
 
-const getNextSteps = async (flow, flowVersionId, instance, currentStep, judge, autoFormDoc, fields, showSkipStep) => {
+const getNextSteps = async (flow, flowVersionId, instance, currentStep, judge, autoFormDoc, fields, showSkipStep, userId) => {
     if (!currentStep)
         return;
 
@@ -149,42 +151,39 @@ const getNextSteps = async (flow, flowVersionId, instance, currentStep, judge, a
     //去除重复
     nextSteps = _.compact(_.uniqBy(nextSteps, 'id'));
 
-    let condition_next_steps = [];
-    for (const nextStep of nextSteps) {
+    const conditionResults = await Promise.all(nextSteps.map(async (nextStep) => {
         if (nextStep.step_type == "condition") {
-            if (!judge && nextStep.step_type == 'sign') {
-                judge = 'approved';
+            let currentJudge = judge;
+            if (!currentJudge && nextStep.step_type == 'sign') {
+                currentJudge = 'approved';
             }
-            const conditionSteps = await getNextSteps(flow, flowVersionId, instance, nextStep, judge, autoFormDoc, fields, showSkipStep);
-            condition_next_steps = condition_next_steps.concat(conditionSteps);
+            return await getNextSteps(flow, flowVersionId, instance, nextStep, currentJudge, autoFormDoc, fields, showSkipStep, userId);
         }
-    }
+        return [];
+    }));
+    const condition_next_steps = _.flatten(conditionResults);
 
     nextSteps = nextSteps.concat(condition_next_steps);
 
-    let rev_nextSteps = [];
-
-    for (const nextStep of nextSteps) {
+    const skipStepPromises = nextSteps.map(async (nextStep) => {
         if (nextStep.step_type != "condition") {
             if (!showSkipStep && isSkipStep(instance, nextStep)) {
-                if (!judge && nextStep.step_type == 'sign') {
-                    judge = 'approved';
-                }
-                let nextStepsAfterSkipStep = await getNextSteps(flow, flowVersionId, instance, nextStep, judge, autoFormDoc, fields, showSkipStep);
-                let stepsWithOutCurrentStep = [];
-                for (const s of nextStepsAfterSkipStep) {
-                    if (currentStep.id == s.id) {
-                        continue;
-                    }
-                    stepsWithOutCurrentStep.push(s);
+                let currentJudge = judge;
+                if (!currentJudge && nextStep.step_type == 'sign') {
+                    currentJudge = 'approved';
                 }
+                let nextStepsAfterSkipStep = await getNextSteps(flow, flowVersionId, instance, nextStep, currentJudge, autoFormDoc, fields, showSkipStep, userId);
                 // 后续步骤不应包含当前步骤
-                rev_nextSteps = rev_nextSteps.concat(stepsWithOutCurrentStep);
+                return nextStepsAfterSkipStep.filter(s => currentStep.id != s.id);
             } else {
-                rev_nextSteps.push(nextStep);
+                return [nextStep];
             }
         }
-    }
+        return [];
+    });
+
+    const nestedSteps = await Promise.all(skipStepPromises);
+    let rev_nextSteps = _.flatten(nestedSteps);
 
     //去除重复
     rev_nextSteps = _.compact(_.uniqBy(rev_nextSteps, 'id'));
@@ -193,17 +192,98 @@ const getNextSteps = async (flow, flowVersionId, instance, currentStep, judge, a
     if (currentStep.step_type == "counterSign" && rev_nextSteps.length > 1 && !currentStep.oneClickRejection) {
         rev_nextSteps = [];
     }
+
+    // 如果步骤的 always_enter_step (始终进入此步骤（默认选中，历史流程如果未配置，也是选中）) 值为false，那么需要运行脚本 enter_step_condition (步骤条件)
+    // 如结果中包含条件节点则需要继续计算条件节点下一步
+    const needRemoveSteps = {}, needAddSteps = {};
+    await Promise.all(rev_nextSteps.map(step => 
+         caculateNextStepsByEnterStepCondition(flow, flowVersionId, instance, step, autoFormDoc, fields, needRemoveSteps, needAddSteps, userId)
+    ));
+    if (!_.isEmpty(needRemoveSteps) && !_.isEmpty(needAddSteps)) {
+        for (const id in needAddSteps) {
+            if (Object.hasOwnProperty.call(needAddSteps, id)) {
+                const index = rev_nextSteps.findIndex(item => item.id == id)
+                if (-1 === index) {
+                    rev_nextSteps.push(needAddSteps[id])
+                }
+            }
+        }
+        for (const id in needRemoveSteps) {
+            if (Object.hasOwnProperty.call(needRemoveSteps, id)) {
+                const index = rev_nextSteps.findIndex(item => item.id == id)
+                if (-1 != index) {
+                    rev_nextSteps.splice(index, 1)
+                }
+            }
+        }
+        var conditionNextSteps = new Array();
+            
+        for (const [idx, nextStep] of rev_nextSteps.entries()) {
+            if (nextStep.step_type == "condition") {
+                if(!judge && nextStep.step_type == 'sign'){
+                    judge = 'approved'
+                }
+                conditionNextSteps = conditionNextSteps.concat(await getNextSteps(instance, nextStep, judge, autoFormDoc, fields, showSkipStep, userId));
+                // 移除条件节点
+                rev_nextSteps.splice(idx, 1)
+            }
+        }
+        rev_nextSteps = rev_nextSteps.concat(conditionNextSteps);
+        //去除重复
+        rev_nextSteps = _.compact(_.uniqBy(rev_nextSteps, 'id'));
+    }
+
     return rev_nextSteps;
 }
 
+async function caculateNextStepsByEnterStepCondition(flow, flowVersionId, instance, step, autoFormDoc, fields, needRemoveSteps = {}, needAddSteps = {}, userId) {
+    if (false === step.always_enter_step) {
+        const stepId = step.id;
+        // 获取step处理人
+        const users = await HandlersManager.getHandlers(instance._id, stepId, userId);
+        const spaceId = instance.space;
+        const approvers = await Promise.all(users.map(user => WorkflowManager.getFormulaUserObject(spaceId, user)));
+
+        let enterStepCondition = step.enter_step_condition;
+        const fieldValues = await UUFlowManager.initFormulaValues(instance, autoFormDoc);
+        fieldValues.step = {
+            ...step,
+            approvers
+        };
+        fieldValues.loginUserId = userId; // 当前登录用户
+        if (!UUFlowManager.isAmisFormula(enterStepCondition)) {
+            throw new Error('Not Amis Formula, Contact Admin Please.')
+        }
+        let result = UUFlowManager.calculateConditionWithAmis(fieldValues, enterStepCondition);
+        if (false === result) {
+            needRemoveSteps[step.id] = step;
+            if (step.lines && step.lines.length > 0) {
+                const toStepIds = step.lines.map(function(s){ return s.to_step});
+                await Promise.all(toStepIds.map(async (stepId) => {
+                    const s = getStep(flow, flowVersionId, stepId);
+                    if (s) {
+                        await caculateNextStepsByEnterStepCondition(flow, flowVersionId, instance, s, autoFormDoc, fields, needRemoveSteps, needAddSteps, userId);
+                    }
+                }));
+            }
+        } else {
+            needAddSteps[step.id] = step;
+        }
+    } else {
+        needAddSteps[step.id] = step;
+    }
+}
+
+
 router.post('/api/workflow/v2/nextStep', requireAuthentication, async function (req, res) {
     try {
         const userSession = req.user;
+        const { userId } = userSession;
         const { instanceId, flowId, step, judge, values, flowVersionId } = req.body;
         const flow = await objectql.getObject('flows').findOne(flowId);
         const instance = await objectql.getObject('instances').findOne(instanceId);
         
-        const resNextSteps = await getNextSteps(flow, flowVersionId, instance, step, judge, values);
+        const resNextSteps = await getNextSteps(flow, flowVersionId, instance, step, judge, values, null, null, userId);
         res.status(200).send({
             'nextSteps': resNextSteps
         });
@@ -228,17 +308,18 @@ const calcSteps = async function(instance, flow, flowVersionId, formFields, valu
 	
 	_steps.push(step);
 	try {
-        var nextSteps = await getNextSteps(flow, flowVersionId, instance, step, judge, values);
-        for (const nextStep of nextSteps) {
+        var nextSteps = await getNextSteps(flow, flowVersionId, instance, step, judge, values, null, null, instance.submitter);
+        const recursiveResults = await Promise.all(nextSteps.map(async (nextStep) => {
             try {
                 if (!_.includes(track, nextStep._id)) {
-                    const __steps = await calcSteps(instance, flow, flowVersionId, formFields, values, nextStep, track.concat(_.map(_steps, '_id')));
-                    _steps = _steps.concat(__steps)
+                    return await calcSteps(instance, flow, flowVersionId, formFields, values, nextStep, track.concat(_.map(_steps, '_id')));
                 }
             } catch (e) {
                 console.log(e)
             }
-        }
+            return [];
+        }));
+        _steps = _steps.concat(_.flatten(recursiveResults));
     } catch (error) {
         console.log(error)
     }
@@ -266,6 +347,30 @@ router.post('/api/workflow/v2/nextSteps', requireAuthentication, async function
     }
 })
 
+router.get('/api/workflow/v2/get_instance_steps/:instanceId', requireAuthentication, async function (req, res) {
+    try {
+        const { instanceId } = req.params;
+        if(instanceId === 'none'){
+            return res.status(200).send({ status: 0 });
+        }
+        const instance = await objectql.getObject('instances').findOne(instanceId);
+        if(!instance){
+            return res.status(200).send({
+                error: 'not find instance'
+            });
+        }
+        return res.status(200).send({ status: 0, data: {
+            step_approve: instance.step_approve,
+            skip_steps: instance.skip_steps
+        } });
+    } catch (error) {
+        console.error(error);
+        res.status(200).send({
+            error: error.message
+        });
+    }
+})
+
 router.post('/api/workflow/v2/set_instance_steps', requireAuthentication, async function (req, res) {
     try {
         const userSession = req.user;

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

@@ -14,6 +14,23 @@ const { excuteTriggers } = require('../utils/trigger');
 const objectql = require('@steedos/objectql');
 const WorkflowManager = require('../manager/workflow_manager');
 const UUFlowManager = require('../manager/uuflow_manager');
+
+const getFieldName = (fields, fieldId)=>{
+    const field = _.find(fields, (item)=>{
+        return item._id === fieldId
+    });
+    return field?.code || fieldId
+}
+
+const getFieldValue = (values, code)=>{
+    return values[code]
+}
+
+const getFormFieldValue = (fields, values, fieldId)=>{
+    const code = getFieldName(fields, fieldId);
+    return getFieldValue(values, code);
+}
+
 /**
  * 计算下一步处理人
  * body {
@@ -41,8 +58,15 @@ router.post('/api/workflow/v2/nextStepUsers', requireAuthentication, async funct
         } = req.body;
 
         let instance = await UUFlowManager.getInstance(insId);
-        let flow = await UUFlowManager.getFlow(instance.flow);
-        let nextStep = await UUFlowManager.getStep(instance, flow, nextStepId);
+        const [flow, form] = await Promise.all([
+            UUFlowManager.getFlow(instance.flow),
+            UUFlowManager.getForm(instance.form)
+        ]);
+        const [formVersion, nextStep] = await Promise.all([
+            UUFlowManager.getFormVersion(form, instance.form_version),
+            UUFlowManager.getStep(instance, flow, nextStepId)
+        ]);
+        const formFields = formVersion.fields;
         switch (nextStep.step_type) {
             case 'start':
                 var applicantId = instance.applicant;
@@ -82,7 +106,7 @@ router.post('/api/workflow/v2/nextStepUsers', requireAuthentication, async funct
                     case 'userField':
                         var
                             userField = nextStep.approver_user_field,
-                            userFieldValue = values[userField];
+                            userFieldValue = getFormFieldValue(formFields, values, userField);
                         if(userFieldValue){
                             if (_.isArray(userFieldValue)) { //如果多选，以userFieldValue值为Array
                                 nextStepUsers = await WorkflowManager.getUsers(spaceId, userFieldValue);
@@ -90,7 +114,7 @@ router.post('/api/workflow/v2/nextStepUsers', requireAuthentication, async funct
                                 nextStepUsers.push(await WorkflowManager.getUser(spaceId, userFieldValue));
                             }
                         }else {
-                            error = "FIELD_VALUE_EMPTY";
+                            error = "请先填写表单值";
                         }
                         
                         break;
@@ -99,7 +123,7 @@ router.post('/api/workflow/v2/nextStepUsers', requireAuthentication, async funct
                             orgs,
                             orgChildrens,
                             orgField = nextStep.approver_org_field,
-                            orgFieldValue = values[orgField];
+                            orgFieldValue = getFormFieldValue(formFields, values, orgField);
                         if (orgFieldValue) {
                             if (_.isArray(orgFieldValue)) { //如果多选，以orgFieldValue值为Array
                                 orgs = await WorkflowManager.getOrganizations(orgFieldValue);
@@ -118,7 +142,7 @@ router.post('/api/workflow/v2/nextStepUsers', requireAuthentication, async funct
                                 error = "ORG_NO_MEMBERS";
                             }
                         } else {
-                            error = "FIELD_VALUE_EMPTY";
+                            error = "请先填写表单值";
                         }
 
                         break;
@@ -133,7 +157,7 @@ router.post('/api/workflow/v2/nextStepUsers', requireAuthentication, async funct
                     case 'userFieldRole':
                         var
                             userField = nextStep.approver_user_field,
-                            userFieldValue = values[userField],
+                            userFieldValue = getFormFieldValue(formFields, values, userField),
                             approverRoleIds = nextStep.approver_roles;
                         if (userFieldValue) {
                             if (_.isArray(userFieldValue)) { //如果多选，以userFieldValue值为Array
@@ -146,7 +170,7 @@ router.post('/api/workflow/v2/nextStepUsers', requireAuthentication, async funct
                                 error = "ROLE_NO_MEMBERS";
                             }
                         } else {
-                            error = "FIELD_VALUE_EMPTY";
+                            error = "请先填写表单值";
                         }
 
 
@@ -154,7 +178,7 @@ router.post('/api/workflow/v2/nextStepUsers', requireAuthentication, async funct
                     case 'orgFieldRole':
                         var
                             orgField = nextStep.approver_org_field,
-                            orgFieldValue = values[orgField],
+                            orgFieldValue = getFormFieldValue(formFields, values, orgField),
                             approverRoleIds = nextStep.approver_roles;
 
                         if (orgFieldValue) {
@@ -168,7 +192,7 @@ router.post('/api/workflow/v2/nextStepUsers', requireAuthentication, async funct
                                 error = "ROLE_NO_MEMBERS";
                             }
                         } else {
-                            error = "FIELD_VALUE_EMPTY";
+                            error = "请先填写表单值";
                         }
                         break;
                     default:
@@ -214,4 +238,33 @@ router.post('/api/workflow/v2/nextStepUsers', requireAuthentication, async funct
         });
     }
 });
+
+router.post('/api/workflow/v2/nextStepUsersValue', requireAuthentication, async function (req, res) {
+    try {
+        let userSession = req.user;
+        const userId = userSession.userId;
+        const spaceId = userSession.spaceId;
+        var error = "";
+
+        if (!spaceId) {
+            throw new Error('缺少参数')
+        }
+
+        const { instanceId, nextStepId } = req.body;
+
+        let instance = await UUFlowManager.getInstance(instanceId);
+        const step_approve = instance.step_approve || {};
+        const newNextUsers = step_approve[nextStepId] || []
+        res.status(200).send({
+            'value': newNextUsers,
+            'error': error
+        });
+    } catch (error) {
+        console.error(error);
+        res.status(200).send({
+            error: error.message
+        });
+    }
+});
+
 exports.default = router;

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

@@ -114,7 +114,7 @@ router.post('/api/workflow/nextStepUsers', requireAuthentication, async function
                                 error = "ORG_NO_MEMBERS";
                             }
                         } else {
-                            error = "FIELD_VALUE_EMPTY";
+                            error = "请先填写表单值";
                         }
 
                         break;
@@ -142,7 +142,7 @@ router.post('/api/workflow/nextStepUsers', requireAuthentication, async function
                                 error = "ROLE_NO_MEMBERS";
                             }
                         } else {
-                            error = "FIELD_VALUE_EMPTY";
+                            error = "请先填写表单值";
                         }
 
 
@@ -164,7 +164,7 @@ router.post('/api/workflow/nextStepUsers', requireAuthentication, async function
                                 error = "ROLE_NO_MEMBERS";
                             }
                         } else {
-                            error = "FIELD_VALUE_EMPTY";
+                            error = "请先填写表单值";
                         }
                         break;
                     default:

package/main/default/services/instance.service.js

@@ -166,15 +166,7 @@ module.exports = {
                 case 'monitor':
                     filter.push(['state', 'in', ["pending", "completed"]]);
                     if(!is_space_admin){
-                        const flowIds = await new Promise(function (resolve, reject) {
-                            Fiber(function () {
-                                try {
-                                    resolve(WorkflowManager.getMyAdminOrMonitorFlows(spaceId, userId));
-                                } catch (error) {
-                                    reject(error);
-                                }
-                            }).run()
-                        })
+                        const flowIds = await WorkflowManager.getMyAdminOrMonitorFlows(spaceId, userId);
                         if(flowId){
                             if(!_.includes(flowIds, flowId)){
                                 // filter.push([

package/package.json

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

package/public/workflow/index.css

@@ -51,7 +51,7 @@
 }
 
 .instance-box-tree .antd-TreeControl{
-    padding: 15px 0;
+    padding: 0;
 }
 /* .instance-box-tree .antd-TreeControl{
     padding: 0;
@@ -372,10 +372,10 @@ tbody .color-priority-muted *{
     z-index: 900;
 }
 
-.instances-sidebar-wrapper{
+/* .instances-sidebar-wrapper{
     overflow-y: auto;
     height: calc(100vh - 50px);
-}
+} */
 
 .steedos-instance-related-view-wrapper{
     .antd-Page-header{
@@ -400,4 +400,12 @@ tbody .color-priority-muted *{
   .steedos-amis-instance-view-body{
     margin: 20px 0 0 0 !important;
   }
-}
+
+  a[href]:after {
+    content: none !important;
+  }
+
+  .font-normal{
+    border: none !important;
+  }
+}