@steedos-labs/plugin-workflow 3.0.0-beta.27 → 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/package.json

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