@steedos-labs/plugin-workflow 3.0.0-beta.26 → 3.0.0-beta.28

package/main/default/manager/uuflow_manager.js

@@ -16,6 +16,7 @@ const pushManager = require('./push_manager');
 const { t } = require('@steedos/i18n')
 const moment = require('moment')
 const { getObject } = require('@steedos/objectql');
+const { evaluate } = require('amis-formula');
 
 const UUFlowManager = {};
 
@@ -556,6 +557,47 @@ UUFlowManager.isFlowSpaceMatched = function (flow, space_id) {
     }
 };
 
+const isAmisFormula = (formula) => {
+  // 有${}包裹的表达式就识别为amis公式
+  return /\$\{.+\}/.test(formula);
+};
+
+const runAmisFormula = function (formula, data) {
+    try {
+        const amisFormulaValue = evaluate(
+            formula,
+            Object.assign({}, data),
+            {},
+        );
+        if (formula === amisFormulaValue) {
+            throw new Error(
+                `Workflow Condition Step Amis formula "${formula}" evaluate failed "Function is not defined".`,
+            );
+        } else {
+            return amisFormulaValue;
+        }
+    } catch (e) {
+        throw new Error(
+            `Catch an error "${e.message}" while evaluate condition step amis formula "${formula}".`,
+        );
+    }
+}
+
+/**
+ * Calculate condition for conditional step
+ * @param {Object} values - Form values
+ * @param {String} condition_str - Condition string
+ * @returns {Boolean} Condition result
+ */
+UUFlowManager.calculateConditionWithAmis = function (values, condition_str) {
+    try {
+        return runAmisFormula(condition_str, values);
+    } catch (error) {
+        console.error(error.stack);
+        return false;
+    }
+};
+
 /**
  * Calculate condition for conditional step
  * @param {Object} values - Form values
@@ -829,10 +871,17 @@ UUFlowManager.getNextSteps = async function (instance, flow, step, judge, values
         
         for (const step_line of step.lines) {
             if (step_line.state === "submitted") {
-                const step_line_condition = step_line.condition.replace(reg, (vowel) => {
-                    return prefix + vowel.replace(/\{\s*/, "[\"").replace(/\s*\}/, "\"]").replace(/\s*\.\s*/g, "\"][\"");
-                });
-                const allow = UUFlowManager.calculateCondition(__values, step_line_condition);
+                let step_line_condition = step_line.condition;
+                let allow = false;
+                if (isAmisFormula(step_line_condition)) {
+                    allow = UUFlowManager.calculateConditionWithAmis(__values, step_line_condition);
+                }
+                else {
+                    step_line_condition = step_line.condition.replace(reg, (vowel) => {
+                        return prefix + vowel.replace(/\{\s*/, "[\"").replace(/\s*\}/, "\"]").replace(/\s*\.\s*/g, "\"][\"");
+                    });
+                    allow = UUFlowManager.calculateCondition(__values, step_line_condition);
+                }
                 if (allow) {
                     nextSteps.push(step_line.to_step);
                 }

package/main/default/manager/workflow_manager.js

@@ -246,7 +246,7 @@ WorkflowManager.getUser = async function (spaceId, userId, notNeedDetails) {
     }
 
     if (typeof userId !== 'string') {
-        return WorkflowManager.getUsers(spaceId, userId, notNeedDetails);
+        return await WorkflowManager.getUsers(spaceId, userId, notNeedDetails);
     }
 
     const spaceUsersCollection = await getCollection('space_users');

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

@@ -83,11 +83,16 @@ router.post('/api/workflow/v2/nextStepUsers', requireAuthentication, async funct
                         var
                             userField = nextStep.approver_user_field,
                             userFieldValue = values[userField];
-                        if (userField.is_multiselect) { //如果多选，以userFieldValue值为Array
-                            nextStepUsers = await WorkflowManager.getUsers(spaceId, userFieldValue);
-                        } else {
-                            nextStepUsers.push(await WorkflowManager.getUser(spaceId, userFieldValue));
+                        if(userFieldValue){
+                            if (_.isArray(userFieldValue)) { //如果多选，以userFieldValue值为Array
+                                nextStepUsers = await WorkflowManager.getUsers(spaceId, userFieldValue);
+                            } else {
+                                nextStepUsers.push(await WorkflowManager.getUser(spaceId, userFieldValue));
+                            }
+                        }else {
+                            error = "FIELD_VALUE_EMPTY";
                         }
+                        
                         break;
                     case 'orgField':
                         var
@@ -96,7 +101,7 @@ router.post('/api/workflow/v2/nextStepUsers', requireAuthentication, async funct
                             orgField = nextStep.approver_org_field,
                             orgFieldValue = values[orgField];
                         if (orgFieldValue) {
-                            if (orgField.is_multiselect) { //如果多选，以orgFieldValue值为Array
+                            if (_.isArray(orgFieldValue)) { //如果多选，以orgFieldValue值为Array
                                 orgs = await WorkflowManager.getOrganizations(orgFieldValue);
                                 orgChildrens = await WorkflowManager.getOrganizationsChildrens(spaceId, orgFieldValue);
                             } else {
@@ -105,7 +110,7 @@ router.post('/api/workflow/v2/nextStepUsers', requireAuthentication, async funct
                             }
                             nextStepUsers = await WorkflowManager.getOrganizationsUsers(spaceId, orgChildrens);
 
-                            orgFieldUsers = await WorkflowManager.getOrganizationsUsers(spaceId, orgs);
+                            const orgFieldUsers = await WorkflowManager.getOrganizationsUsers(spaceId, orgs);
 
                             nextStepUsers = nextStepUsers.concat(orgFieldUsers);
 
@@ -131,7 +136,7 @@ router.post('/api/workflow/v2/nextStepUsers', requireAuthentication, async funct
                             userFieldValue = values[userField],
                             approverRoleIds = nextStep.approver_roles;
                         if (userFieldValue) {
-                            if (userField.is_multiselect) { //如果多选，以userFieldValue值为Array
+                            if (_.isArray(userFieldValue)) { //如果多选，以userFieldValue值为Array
                                 nextStepUsers = await WorkflowManager.getRoleUsersByUsersAndRoles(spaceId, userFieldValue, approverRoleIds);
                             } else {
                                 nextStepUsers = await WorkflowManager.getRoleUsersByUsersAndRoles(spaceId, [userFieldValue], approverRoleIds);
@@ -153,7 +158,7 @@ router.post('/api/workflow/v2/nextStepUsers', requireAuthentication, async funct
                             approverRoleIds = nextStep.approver_roles;
 
                         if (orgFieldValue) {
-                            if (orgField.is_multiselect) { //如果多选，以orgFieldValue值为Array
+                            if (_.isArray(orgFieldValue)) { //如果多选，以orgFieldValue值为Array
                                 nextStepUsers = await WorkflowManager.getRoleUsersByOrgsAndRoles(spaceId, orgFieldValue, approverRoleIds);
                             } else {
                                 nextStepUsers = await WorkflowManager.getRoleUsersByOrgsAndRoles(spaceId, [orgFieldValue], approverRoleIds);

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

@@ -160,8 +160,8 @@ function transformFormFields(amisField) {
 
 
     if(amisField.type === 'steedos-field'){
-        return {
-            _id: new ObjectId().toHexString(),
+        const sfield = {
+            _id: amisField.config.name,
             code: amisField.config.name,
             name: amisField.config.label,
             is_wide: amisField.config.is_wide,
@@ -173,6 +173,17 @@ function transformFormFields(amisField) {
             type: 'steedos-field',
             config: amisField.config
         }
+
+        let tempConfig = amisField.config;
+
+        if (tempConfig.reference_to === "organizations") {
+            sfield.type = 'group'
+            sfield._type = 'steedos-field'
+        }else if(tempConfig.reference_to === "space_users" || tempConfig.reference_to === "users"){
+            sfield.type = 'user'
+            sfield._type = 'steedos-field'
+        }
+        return sfield;
     };
 
     let formFieldsItem = {
@@ -454,7 +465,7 @@ function transformFormFields(amisField) {
 
 				if (tempConfig.reference_to === "organizations") {
 					steedosField.type = 'group'
-				}else if(tempConfig.reference_to === "space_users"){
+				}else if(tempConfig.reference_to === "space_users" || tempConfig.reference_to === "user"){
 					//  && tempConfig.reference_to_field === 'user'
 					steedosField.type = 'user'
 				}else{

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@steedos-labs/plugin-workflow",
-  "version": "3.0.0-beta.26",
+  "version": "3.0.0-beta.28",
   "main": "package.service.js",
   "license": "MIT",
   "scripts": {
     "build": "tsc && webpack --config webpack.config.js",
     "build:watch": "tsc --watch",
-    "release": "npm publish --registry https://registry.npmjs.org && open https://npmmirror.com/sync/@steedos-labs/plugin-workflow && cnpm sync @steedos-labs/plugin-workflow"
+    "release": "yarn build && npm publish --registry https://registry.npmjs.org && open https://npmmirror.com/sync/@steedos-labs/plugin-workflow && cnpm sync @steedos-labs/plugin-workflow"
   },
   "dependencies": {
     "graphql-parse-resolve-info": "^4.12.3",