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

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

@@ -15,7 +15,7 @@ const Fiber = function(fun){console.log('TODO Fiber...')}
 const { excuteTriggers } = require('../utils/trigger');
 const { getStep } = require('../uuflowManager');
 const UUFlowManager = require('../manager/uuflow_manager');
-
+const afterHook = require('./afterHook');
 /**
  * 审批中提交申请单
  * body {
@@ -53,7 +53,7 @@ const UUFlowManager = require('../manager/uuflow_manager');
     ]
  * }
  */
-router.post('/api/workflow/engine', requireAuthentication, async function (req, res) {
+router.post('/api/workflow/engine', requireAuthentication, afterHook, async function (req, res) {
     try {
         let userSession = req.user;
         const spaceId = userSession.spaceId;
@@ -80,7 +80,7 @@ router.post('/api/workflow/engine', requireAuthentication, async function (req,
         }
 
         try {
-            const instance = UUFlowManager.workflow_engine(approve_from_client, userSession, userId);
+            const instance = await UUFlowManager.workflow_engine(approve_from_client, userSession, userId);
             // afterStepSubmit
             await excuteTriggers({ when: 'afterStepSubmit', userId, flowId, insId });
             // afterEnd

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

@@ -0,0 +1,61 @@
+const express = require("express");
+const router = express.Router();
+const { requireAuthentication } = require("@steedos/auth");
+const _ = require('lodash');
+const { getCollection } = require('../utils/collection');
+router.get('/api/workflow/flow/:flowId/version/:versionId', requireAuthentication, async function (req, res) {
+    try {
+        const { flowId, versionId } = req.params;
+        const flowsColl = await getCollection('flows');
+
+        const flow = await flowsColl.aggregate([
+        {
+            $match: {
+            "_id": flowId
+            }
+        },
+        {
+            $project: {
+            name: 1,
+            current_no: 1,
+            versionData: {
+                $cond: {
+                if: { $eq: ["$current._id", versionId] },
+                then: "$current",
+                else: {
+                    $arrayElemAt: [
+                    {
+                        $filter: {
+                        input: "$historys",
+                        as: "history",
+                        cond: { $eq: ["$$history._id", versionId] }
+                        }
+                    },
+                    0
+                    ]
+                }
+                }
+            }
+            }
+        },
+        {
+            $match: {
+            "versionData": { $ne: null }
+            }
+        },
+        { $limit: 1 } // 限制只返回一个文档
+        ]).next();
+
+        if (flow) {
+        res.status(200).send(flow.versionData);
+        } else {
+        res.status(404).send({ message: "流程版本未找到" });
+        }
+    } catch (error) {
+        console.error('Unexpected error:', error);
+        res.status(500).send({
+            error: error.message
+        });
+    }
+});
+exports.default = router;

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

@@ -0,0 +1,61 @@
+const express = require("express");
+const router = express.Router();
+const { requireAuthentication } = require("@steedos/auth");
+const _ = require('lodash');
+const { getCollection } = require('../utils/collection');
+router.get('/api/workflow/form/:formId/version/:versionId', requireAuthentication, async function (req, res) {
+    try {
+        const { formId, versionId } = req.params;
+        const formsColl = await getCollection('forms');
+
+        const form = await formsColl.aggregate([
+        {
+            $match: {
+            "_id": formId
+            }
+        },
+        {
+            $project: {
+            name: 1,
+            current_no: 1,
+            versionData: {
+                $cond: {
+                if: { $eq: ["$current._id", versionId] },
+                then: "$current",
+                else: {
+                    $arrayElemAt: [
+                    {
+                        $filter: {
+                        input: "$historys",
+                        as: "history",
+                        cond: { $eq: ["$$history._id", versionId] }
+                        }
+                    },
+                    0
+                    ]
+                }
+                }
+            }
+            }
+        },
+        {
+            $match: {
+            "versionData": { $ne: null }
+            }
+        },
+        { $limit: 1 } // 限制只返回一个文档
+        ]).next();
+
+        if (form) {
+        res.status(200).send(form.versionData);
+        } else {
+        res.status(404).send({ message: "流程版本未找到" });
+        }
+    } catch (error) {
+        console.error('Unexpected error:', error);
+        res.status(500).send({
+            error: error.message
+        });
+    }
+});
+exports.default = router;

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/api_workflow_relocate.router.js

@@ -12,6 +12,7 @@ const objectql = require('@steedos/objectql');
 const { excuteTriggers } = require('../utils/trigger');
 const { getStep } = require('../uuflowManager');
 const UUFlowManager = require('../manager/uuflow_manager');
+const afterHook = require('./afterHook');
 /**
  * 重定位申请单
  * body {
@@ -22,7 +23,7 @@ const UUFlowManager = require('../manager/uuflow_manager');
  *   ]
  * }
  */
-router.post('/api/workflow/relocate', requireAuthentication, async function (req, res) {
+router.post('/api/workflow/relocate', requireAuthentication, afterHook, async function (req, res) {
     try {
         let userSession = req.user;
         const spaceId = userSession.spaceId;

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.0",
+  "version": "3.0.1-beta.2",
   "main": "package.service.js",
   "license": "MIT",
   "scripts": {