@steedos-labs/plugin-workflow 3.0.1-beta.1 → 3.0.1-beta.2

package/main/default/manager/uuflow_manager.js

@@ -607,6 +607,8 @@ UUFlowManager.calculateConditionWithAmis = function (values, condition_str) {
 UUFlowManager.calculateCondition = function (values, condition_str) {
     try {
         const __values = values;
+
+        condition_str = condition_str.replace(/\=/g, "==").replace(/\>==/g, ">=").replace(/\<==/g, "<=").replace(/\======/g, "===").replace(/\====/g, "==");
         
         // Helper functions for condition calculation
         const sum = (subform_field) => {
@@ -666,7 +668,7 @@ UUFlowManager.calculateCondition = function (values, condition_str) {
         
         return eval(condition_str);
     } catch (error) {
-        console.error(error.stack);
+        console.error(error.stack, condition_str);
         return false;
     }
 };

package/main/default/routes/amis_form_design.ejs

@@ -31,6 +31,22 @@
 
     let comp = document.querySelector("builder-fiddle");
 
+    const getArgumentsList = (func)=>{
+      let funcString;
+      if (typeof func === 'function') {
+        funcString = func.toString();
+      } else {
+        funcString = func;
+      }
+      const regExp = /function\s*\w*\(([\s\S]*?)\)/;
+      if (regExp.test(funcString)) {
+        const argList = RegExp.$1.split(',');
+        return argList.map(arg => arg.replace(/\s/g, ''));
+      } else {
+        return [];
+      }
+    }
+
     const loadPage = async () => {
       //settings结果集同样加入formId
       const { assetUrls, rootUrl, userId, tenantId, authToken, id, formId } = settings;
@@ -182,6 +198,7 @@
           break;
         case "number":
           tpl.type = "input-number";
+          tpl.precision=2
           break;
         case "date":
           tpl.type = "input-date";
@@ -279,22 +296,22 @@
           tpl.options = getSelectOptions(field);
           break;
         case "odata":
-		  console.log('field', field);
+		      const argsName = getArgumentsList(field.filters);
           var labelField = field.formula.substr(1, field.formula.length - 2);
           labelField = labelField.substr(labelField.indexOf(".") + 1);
 		  // 加入odata标签以示区别 把field-老表单设计器的元素加入
           tpl.type = "select";
-		  tpl.description = field.description
-		  tpl.detail_url = field.detail_url
-		  tpl.filters = field.filters
-		  tpl.formula = field.formula
-		  tpl.is_list_display = field.is_list_display
-		  tpl.is_multiselect = field.is_multiselect
-		  tpl.is_required = field.is_required
-		  tpl.is_searchable = field.is_searchable
-		  tpl.is_wide = field.is_wide
-		  tpl.search_field = field.search_field
-		  tpl._id = field._id
+          tpl.description = field.description
+          tpl.detail_url = field.detail_url
+          tpl.filters = field.filters
+          tpl.formula = field.formula
+          tpl.is_list_display = field.is_list_display
+          tpl.is_multiselect = field.is_multiselect
+          tpl.is_required = field.is_required
+          tpl.is_searchable = field.is_searchable
+          tpl.is_wide = field.is_wide
+          tpl.search_field = field.search_field
+          tpl._id = field._id
           // tpl.labelField = labelField;
           // tpl.valueField = "_value";
           tpl.source = {
@@ -308,21 +325,45 @@
               Authorization: "Bearer ${context.tenantId},${context.authToken}",
             },
             adaptor: `
-            payload.data = {
-              options: _.map(payload.value, (item)=>{
-                const value = item;
-                item["@label"] = item["${labelField}"]
-                delete item['@odata.editLink'];
-                delete item['@odata.etag'];
-                delete item['@odata.id'];
-                return {
-                  label: item["@label"],
-                  value: value
+              payload.data = {
+                options: _.map(payload.value, (item)=>{
+                  const value = item;
+                  item["@label"] = item["${labelField}"]
+                  delete item['@odata.editLink'];
+                  delete item['@odata.etag'];
+                  delete item['@odata.id'];
+                  return {
+                    label: item["@label"],
+                    value: value
+                  }
+                })
+              }
+              return payload;
+            `,
+            requestAdaptor: `
+              const filters = ${_.replace(field.filters, /_.pluck/g, '_.map')};
+              const url = ${field.url}
+              if(filters){
+                console.log('filters', filters);
+                const joinKey = field.url.indexOf('?') > 0 ? '&' : '?';
+                if(filters.startsWith('function(') || filters.startsWith('function (')){
+                  const argsName = ${JSON.stringify(argsName)};
+                  const fun = eval('_fun='+filters);
+                  const funArgs = [];
+                  for(const item of argsName){
+                    funArgs.push(context[item])
+                  }
+                  api.url = url + joinKey + "$filter=" + fun.apply({}, funArgs)
+                }else{
+                  api.url = url + joinKey + "$filter=" + filters
                 }
-              })
-            }
-            return payload;
-          `
+              }else{
+                api.url = url  
+              }
+              api.query = {};
+              return api;
+            `,
+            trackExpression: _.join(_.map(argsName, (item)=>{return `\${${item}|json}`}), '-')
           };
           break;
         case "html":

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

@@ -194,7 +194,7 @@ router.post('/api/workflow/v2/nextStepUsers', requireAuthentication, async funct
         
         let nextUserIds = _.map(finalNextStepUsers, 'id');
         await excuteTriggers({ when: 'cacluateNextStepUsers', userId: userId, flowId: instance.flow, insId: insId, nextStep: nextStep, nextUserIds });
-        let nextUsersDocs = await objectql.getObject('space_users').find({ filters: [ ['user', 'in', nextUserIds] ], fields: ['name','user'] });
+        let nextUsersDocs = await objectql.getObject('space_users').find({ filters: [ ['space', '=', spaceId], ['user', 'in', nextUserIds] ], fields: ['name','user'] });
         let newNextUsers = [];
         for(const doc of nextUsersDocs) {
             newNextUsers.push({

package/main/default/routes/flow_form_design.ejs

@@ -72,6 +72,22 @@
       deployText: "<%=locale%>" === 'zh-CN' ? '发布': 'Deploy',
     };
 
+    const getArgumentsList = (func)=>{
+      let funcString;
+      if (typeof func === 'function') {
+        funcString = func.toString();
+      } else {
+        funcString = func;
+      }
+      const regExp = /function\s*\w*\(([\s\S]*?)\)/;
+      if (regExp.test(funcString)) {
+        const argList = RegExp.$1.split(',');
+        return argList.map(arg => arg.replace(/\s/g, ''));
+      } else {
+        return [];
+      }
+    }
+
     let comp = document.querySelector("builder-fiddle");
 
     // set the modal menu element
@@ -283,6 +299,7 @@
           break;
         case "number":
           tpl.type = "input-number";
+          tpl.precision=2
           break;
         case "date":
           tpl.type = "input-date";
@@ -380,7 +397,7 @@
           tpl.options = getSelectOptions(field);
           break;
         case "odata":
-          console.log('field', field);
+          const argsName = getArgumentsList(field.filters);
           var labelField = field.formula.substr(1, field.formula.length - 2);
           labelField = labelField.substr(labelField.indexOf(".") + 1);
           // 加入odata标签以示区别 把field-老表单设计器的元素加入
@@ -400,30 +417,52 @@
           // tpl.valueField = "_value";
           tpl.source = {
             //判断该field.url是否为http开头
-            url: startsWith(field.url, "http")
-              ? field.url
-              : `\${context.rootUrl}${field.url}`,
+            url: field.url,
             method: "get",
             dataType: "json",
             headers: {
               Authorization: "Bearer ${context.tenantId},${context.authToken}",
             },
             adaptor: `
-            payload.data = {
-              options: _.map(payload.value, (item)=>{
-                const value = item;
-                item["@label"] = item["${labelField}"]
-                delete item['@odata.editLink'];
-                delete item['@odata.etag'];
-                delete item['@odata.id'];
-                return {
-                  label: item["@label"],
-                  value: value
+              payload.data = {
+                options: _.map(payload.value, (item)=>{
+                  const value = item;
+                  item["@label"] = item["${labelField}"]
+                  delete item['@odata.editLink'];
+                  delete item['@odata.etag'];
+                  delete item['@odata.id'];
+                  return {
+                    label: item["@label"],
+                    value: value
+                  }
+                })
+              }
+              return payload;
+            `,
+            requestAdaptor: `
+              const filters = ${_.replace(field.filters, /_.pluck/g, '_.map')};
+              const url = ${field.url}
+              if(filters){
+                console.log('filters', filters);
+                const joinKey = field.url.indexOf('?') > 0 ? '&' : '?';
+                if(filters.startsWith('function(') || filters.startsWith('function (')){
+                  const argsName = ${JSON.stringify(argsName)};
+                  const fun = eval('_fun='+filters);
+                  const funArgs = [];
+                  for(const item of argsName){
+                    funArgs.push(context[item])
+                  }
+                  api.url = url + joinKey + "$filter=" + fun.apply({}, funArgs)
+                }else{
+                  api.url = url + joinKey + "$filter=" + filters
                 }
-              })
-            }
-            return payload;
-          `
+              }else{
+                api.url = url  
+              }
+              api.query = {};
+              return api;
+            `,
+            trackExpression: _.join(_.map(argsName, (item)=>{return `\${${item}|json}`}), '-')
           };
           break;
         case "html":

package/package.json

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