@steedos-labs/plugin-workflow 3.0.1-beta.4 → 3.0.1-beta.5

package/main/default/manager/uuflow_manager.js

@@ -4161,6 +4161,7 @@ UUFlowManager.draft_save_instance = async function (ins, userId) {
         flows: await getCollection('flows'),
         forms: await getCollection('forms'),
         users: await getCollection('users'),
+        space_users: await getCollection('space_users'),
         organizations: await getCollection('organizations'),
     };
 

package/main/default/objects/instances/buttons/instance_return.button.yml

@@ -77,7 +77,7 @@ amis_schema: |-
                                                                       "&": "$$",
                                                                       "record": "${record}"
                                                                   },
-                                                                  "requestAdaptor": "const record = api.data.record;\napi.data = {\n  reason: api.data.reason,\n  approve: {\n    instance: record._id,\n    type: record.approve.type,\n    trace: record.approve.trace,\n    values: record.approve.values\n  }\n}\nreturn api;"
+                                                                  "requestAdaptor": "const record = api.data.record;\napi.data = {\n  reason: api.data.reason,\n  approve: {\n    _id: record.approve._id,\n    instance: record._id,\n    type: record.approve.type,\n    trace: record.approve.trace,\n    values: record.approve.values\n  }\n}\nreturn api;"
                                                               },
                                                               "messages": {}
                                                           },

package/main/default/pages/instance_detail.page.amis.json

@@ -26,6 +26,7 @@
           "hideRoot": true,
           "showIcon": true,
           "initiallyOpen": false,
+          "virtualThreshold": 100000,
           "value": "/app/${appId}/${objectName}/grid/${listName}",
           "size": "md",
           "onEvent": {

package/main/default/pages/instance_tasks_detail.page.amis.json

@@ -31,6 +31,7 @@
               "hideRoot": true,
               "showIcon": true,
               "initiallyOpen": false,
+              "virtualThreshold": 100000,
               "value":"/app/${appId}/${objectName}/grid/${listName}",
               "size": "md",
               "onEvent": {

package/main/default/pages/instance_tasks_list.page.amis.json

@@ -36,6 +36,7 @@
                       "stacked": true,
                       "multiple": false,
                       "enableNodePath": false,
+                      "virtualThreshold": 100000,
                       "hideRoot": true,
                       "showIcon": true,
                       "initiallyOpen": false,

package/main/default/pages/instances_list.page.amis.json

@@ -41,6 +41,7 @@
                       "hideRoot": true,
                       "showIcon": true,
                       "initiallyOpen": false,
+                      "virtualThreshold": 100000,
                       "value": "${value}",
                       "size": "md",
                       "onEvent": {

package/main/default/routes/amis_form_design.ejs

@@ -238,15 +238,15 @@
         case "user":
           const useTpl = {
             "type": "steedos-field",
-            "id": "u:9f4486c22f52",
-            "field": JSON.stringify({
+            "id": `u:${field.code}`,
+            "config": {
               name: field.code,
               label: field.name,
               reference_to: "space_users",
               reference_to_field: 'user',
               multiple: field.is_multiselect,
               type: "lookup"
-            }),
+            },
           }
           // const useTpl = await lookupToAmis(
           // {
@@ -265,14 +265,14 @@
         case "group":
           const orgTpl = {
             "type": "steedos-field",
-            "id": "u:9f4486c22f52",
-            "field": JSON.stringify({
+            "id": `u:${field.code}`,
+            "config": {
               name: field.code,
               label: field.name,
               reference_to: "organizations",
               multiple: field.is_multiselect,
               type: "lookup"
-            })
+            }
           }
 
           // const orgTpl = await lookupToAmis(

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

@@ -11,59 +11,16 @@ const express = require('express');
 const router = express.Router();
 const { requireAuthentication } = require("@steedos/auth");
 const WorkflowManager = require('../manager/workflow_manager');
-const Fiber = function(fun){console.log('TODO Fiber...')}
-/**
-@api {post} /api/formula/users 获取用户
-@apiVersion 0.0.0
-@apiName /api/formula/users
-@apiGroup service-workflow
-@apiBody {String[]} userIds 用户ID
-@apiBody {String} spaceId 工作区ID
-@apiSuccessExample {json} Success-Response:
-    HTTP/1.1 200 OK
-    {
-        'spaceUsers': [],
-    }
-@apiErrorExample {json} Error-Response:
-    HTTP/1.1 200 OK
-    {
-      errors: ''
-    }
- */
-router.post('/api/formula/users', requireAuthentication, async function (req, res) {
+
+router.get('/api/formula/user/:userId', requireAuthentication, async function (req, res) {
     try {
         let userSession = req.user;
-        const userId = userSession.userId;
-        Fiber(async function () {
-            try {
-                var spaceId, spaceUsers, space_user, userIds;
-                userIds = req.body.userIds;
-                spaceId = req.body.spaceId;
-                spaceUsers = [];
-                space_user = db.space_users.findOne({
-                    user: userId,
-                    space: spaceId
-                }, {
-                    fields: {
-                        _id: 1
-                    }
-                });
-                if (!space_user) {
-                    return res.status(200).send({ 'errors': '无权限' });
-                }
-                if (!userIds || !spaceId) {
-                    return res.status(200).send({ 'errors': '缺少参数' });
-                }
-                spaceUsers = WorkflowManager.getFormulaUserObjects(spaceId, userIds);
 
-                res.status(200).send({ 'spaceUsers': spaceUsers });
-            } catch (e) {
-                console.error(e);
-                res.status(200).send({
-                    errors: [{ errorMessage: e.message }]
-                });
-            }
-        }).run()
+        const { userId } = req.params;
+        
+        const result = await WorkflowManager.getFormulaUserObject(userSession.spaceId, userId);
+
+        res.status(200).send(result);
     } catch (e) {
         res.status(200).send({
             errors: [{ errorMessage: e.message }]

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

@@ -119,116 +119,126 @@ const getCategoriesMonitor = async (userSession, req, currentUrl) => {
   let hasFlowsPer = userSession.is_space_admin;
   const { appId } = req.params;
   let output = [];
-  let data = {};
   let monitorIsUnfolded = false;
-  let categoriesData = await objectql.broker.call('api.graphql', {
-    query: `
-      query {
-        categories(filters:[["space", "=", "${userSession.spaceId}"]],sort:"sort_no desc"){
-          _id,
-          app__expand{
-            code
-          }
-        }
+
+  try {
+    // const sa = new Date().getTime();
+    const apps = await objectql.getObject('apps').find({filters: ['space', '=', userSession.spaceId], fields: ['_id', 'code']});
+    // console.log(`find apps`, new Date().getTime() - sa)
+    const appsMap = new Map(Object.entries(lodash.keyBy(apps, '_id')));
+    // const sc = new Date().getTime();
+    const categories = await objectql.getObject('categories').find({filters: ["space", "=", `${userSession.spaceId}`], sort: "sort_no desc"})
+    // console.log(`find categories`, new Date().getTime() - sc)
+    for (const item of categories) {
+      if(item.app){
+        item.app__expand = appsMap.get(item.app)
+      }else{
+        item.app__expand = {}
       }
-    `}
-  )
-  let currentAppCategories = [];
-  if(appId == "approve_workflow"){
-    currentAppCategories = categoriesData.data.categories;
-  }else{
-    currentAppCategories = lodash.filter(categoriesData.data.categories, (category) => {
-      if(category.app__expand?.code == appId) return true;
-      else return false;
-    })
-    if(currentAppCategories.length == 0) {
-      //如果没有任何分类绑定该app，则该app显示所有分类（该规则为审批王规则）
-      currentAppCategories = categoriesData.data.categories;
     }
-  }
-  let categoriesIds = lodash.map(currentAppCategories, '_id');
-  if (!hasFlowsPer) {
-    const flowIds = await WorkflowManager.getMyAdminOrMonitorFlows(userSession.spaceId, userSession.userId);
-    hasFlowsPer = flowIds && flowIds.length > 0;
-    if (hasFlowsPer) {
-      let query = `
-        query {
-          flows(filters:[["_id","in",${JSON.stringify(flowIds)}],"and",["category","in",${JSON.stringify(categoriesIds)}], "and", ["state", "=", "enabled"]],sort:"sort_no desc,name"){
-            _id,
-            name,
-            category__expand{_id,name}
-          }
-        }
-      `
-      data = await objectql.broker.call('api.graphql', {
-        query }
-      )
+
+    let currentAppCategories = [];
+    if(appId == "approve_workflow"){
+      currentAppCategories = categories;
+    }else{
+      currentAppCategories = lodash.filter(categories, (category) => {
+        if(category.app__expand?.code == appId) return true;
+        else return false;
+      })
+      if(currentAppCategories.length == 0) {
+        //如果没有任何分类绑定该app，则该app显示所有分类（该规则为审批王规则）
+        currentAppCategories = categories;
+      }
     }
-  } else {
-    data = await objectql.broker.call('api.graphql', {
-      query: `
-        query {
-          flows(filters:[["space", "=", "${userSession.spaceId}"],["category","in",${JSON.stringify(categoriesIds)}],["state", "=", "enabled"]],sort:"sort_no desc"){
-            _id,
-            name,
-            category__expand{_id,name}
-          }
+    let categoriesIds = lodash.map(currentAppCategories, '_id');
+    // console.log(`getCategoriesMonitor categoriesIds`, categoriesIds)
+    // console.log(`getCategoriesMonitor hasFlowsPer`, hasFlowsPer)
+    let flows = [];
+    if (!hasFlowsPer) {
+      const flowIds = await WorkflowManager.getMyAdminOrMonitorFlows(userSession.spaceId, userSession.userId);
+      hasFlowsPer = flowIds && flowIds.length > 0;
+      if (hasFlowsPer) {
+        flows = await objectql.getObject('flows').find({
+          filters: [["_id","in", flowIds],"and",["category","in", categoriesIds], "and", ["state", "=", "enabled"]],
+          fields: ['_id', 'name', 'category', 'sort_no'],
+          sort:"sort_no desc"
+        });
+      }
+    } else {
+      // const s1 = new Date().getTime();
+      flows = await objectql.getObject('flows').find({
+        filters:[["space", "=", userSession.spaceId],["category","in", categoriesIds],["state", "=", "enabled"]],
+        fields: ['_id', 'name', 'category', 'sort_no'],
+        sort:"sort_no desc"
+      })
+      // console.log(`find flows`, new Date().getTime() - s1)
+    }
+    if (flows.length > 0) {
+      const categoriesMap = new Map(Object.entries(lodash.keyBy(categories, '_id')));
+
+      for (const item of flows) {
+        if(item.category){
+          item.category__expand = categoriesMap.get(item.category)
+        }else{
+          item.category__expand = {}
         }
-      `}
-    )
-  }
-  if (data.data && data.data.flows && data.data.flows.length > 0) {
-    const categoryGroups = lodash.groupBy(data.data.flows, 'category__expand.name');
-    lodash.each(categoryGroups, (v, k) => {
-      const flowGroups = lodash.groupBy(v, 'name');
-      const flows = [];
-      const categoryValue = `/app/${appId}/instances/view/none?side_object=instances&side_listview_id=monitor&additionalFilters=['category','=',${v[0].category__expand?"'" + v[0].category__expand._id + "'":null}]&flowId=&categoryId=${v[0].category__expand && v[0].category__expand._id}`;
-      let categoryIsUnfolded = false;
-      lodash.each(flowGroups, (v2, k2) => {
-        const flowValue = `/app/${appId}/instances/view/none?side_object=instances&side_listview_id=monitor&additionalFilters=['flow','=','${v2[0]._id}']&flowId=${v2[0]._id}&categoryId=${v[0].category__expand && v[0].category__expand._id}`;
-        let flowIsUnfolded = false;
-        if(currentUrl == flowValue){
-          flowIsUnfolded = true;
+      }
+
+      const categoryGroups = lodash.groupBy(flows, 'category__expand.name');
+      lodash.each(categoryGroups, (v, k) => {
+        const flowGroups = lodash.groupBy(v, 'name');
+        const flows = [];
+        const categoryValue = `/app/${appId}/instances/view/none?side_object=instances&side_listview_id=monitor&additionalFilters=['category','=',${v[0].category__expand?"'" + v[0].category__expand._id + "'":null}]&flowId=&categoryId=${v[0].category__expand && v[0].category__expand._id}`;
+        let categoryIsUnfolded = false;
+        lodash.each(flowGroups, (v2, k2) => {
+          const flowValue = `/app/${appId}/instances/view/none?side_object=instances&side_listview_id=monitor&additionalFilters=['flow','=','${v2[0]._id}']&flowId=${v2[0]._id}&categoryId=${v[0].category__expand && v[0].category__expand._id}`;
+          let flowIsUnfolded = false;
+          if(currentUrl == flowValue){
+            flowIsUnfolded = true;
+            categoryIsUnfolded = true;
+            monitorIsUnfolded = true;
+          }
+          flows.push({
+            label: k2,
+            flow_name: k2,
+            options: {
+              level: 3,
+              value: v2[0]._id,
+              name: 'flow',
+              to: flowValue,
+            },
+            value: flowValue,
+            unfolded: flowIsUnfolded
+          })
+        })
+        if(currentUrl == categoryValue){
           categoryIsUnfolded = true;
           monitorIsUnfolded = true;
         }
-        flows.push({
-          label: k2,
-          flow_name: k2,
+        output.push({
+          label: k == 'null' || k == 'undefined' || !k? "未分类" : k,
+          children: flows,
+          category_name: k == 'null' || k == 'undefined' || !k ? "未分类" : k,
           options: {
-            level: 3,
-            value: v2[0]._id,
-            name: 'flow',
-            to: flowValue,
+            level: 2,
+            value: v[0].category__expand && v[0].category__expand._id,
+            name: 'category',
+            to: categoryValue,
           },
-          value: flowValue,
-          unfolded: flowIsUnfolded
+          value: categoryValue,
+          unfolded: categoryIsUnfolded
         })
       })
-      if(currentUrl == categoryValue){
-        categoryIsUnfolded = true;
-        monitorIsUnfolded = true;
-      }
-      output.push({
-        label: k == 'null' || k == 'undefined' || !k? "未分类" : k,
-        children: flows,
-        category_name: k == 'null' || k == 'undefined' || !k ? "未分类" : k,
-        options: {
-          level: 2,
-          value: v[0].category__expand && v[0].category__expand._id,
-          name: 'category',
-          to: categoryValue,
-        },
-        value: categoryValue,
-        unfolded: categoryIsUnfolded
-      })
-    })
-    output = lodash.sortBy(output, [function (o) {
-      return lodash.findIndex(categoriesData.data.categories, (e) => {
-        return e._id == o.options.value;
-      });
-    }]);
+      output = lodash.sortBy(output, [function (o) {
+        return lodash.findIndex(categories, (e) => {
+          return e._id == o.options.value;
+        });
+      }]);
+    }
+  } catch (error) {
+    console.log(error)
   }
+
   return {
     schema: output,
     hasFlowsPer: hasFlowsPer,
@@ -242,9 +252,15 @@ router.get('/api/:appId/workflow/nav', requireAuthentication, async function (re
     currentUrl = currentUrl.substring(currentUrl.indexOf("/app"));
     let userSession = req.user;
     const { appId } = req.params;
+    // const s1 = new Date().getTime();
     let inboxResult = await getCategoriesInbox(userSession, req, currentUrl);
+    // console.log(`inboxResult time`, new Date().getTime() - s1);
+    // const s2 = new Date().getTime();
     let monitorResult = await getCategoriesMonitor(userSession, req, currentUrl)
+    // console.log(`monitorResult time`, new Date().getTime() - s2);
+    // const s3 = new Date().getTime();
     let draftCount = await getDraftCount(userSession,req);
+    // console.log(`getDraftCount time`, new Date().getTime() - s3);
     
     var options = [
       {

package/main/default/routes/flow_form_design.ejs

@@ -289,6 +289,11 @@
           (field.is_list_display ? ' is_list_display' : '') +
           (field.is_searchable ? ' is_searchable' : '')
       };
+
+      if(field.formula){
+        tpl.value = `$${field.formula}`;
+      }
+
       switch (field.type) {
         case "input":
           if (field.is_textarea) {
@@ -339,15 +344,15 @@
         case "user":
           const useTpl = {
             "type": "steedos-field",
-            "id": "u:9f4486c22f52",
-            "field": JSON.stringify({
+            "id": `u:${field.code}`,
+            "config": {
               name: field.code,
               label: field.name,
               reference_to: "space_users",
               reference_to_field: 'user',
               multiple: field.is_multiselect,
               type: "lookup"
-            }),
+            },
           }
           // const useTpl = await lookupToAmis(
           // {
@@ -366,14 +371,14 @@
         case "group":
           const orgTpl = {
             "type": "steedos-field",
-            "id": "u:9f4486c22f52",
-            "field": JSON.stringify({
+            "id": `u:${field.code}`,
+            "config": {
               name: field.code,
               label: field.name,
               reference_to: "organizations",
               multiple: field.is_multiselect,
               type: "lookup"
-            })
+            }
           }
 
           // const orgTpl = await lookupToAmis(

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

@@ -158,7 +158,6 @@ function transformFormFields(amisField) {
         amisField = transformFormSField(amisField);
     };
 
-
     if(amisField.type === 'steedos-field'){
         const sfield = {
             _id: amisField.config.name,
@@ -171,7 +170,9 @@ function transformFormFields(amisField) {
             is_list_display: amisField.config.is_list_display,
             is_searchable: amisField.config.is_searchable,
             type: 'steedos-field',
-            config: amisField.config
+            config: amisField.config,
+            visibleOn: amisField.visibleOn,
+            requiredOn: amisField.requiredOn
         }
 
         let tempConfig = amisField.config;
@@ -195,7 +196,9 @@ function transformFormFields(amisField) {
         is_required: amisField.required == true ? true : false,
         is_multiselect: amisField.multiple == true ? true : false,
 		is_list_display: _.includes(amisField.className, "is_list_display"),
-        is_searchable: _.includes(amisField.className, "is_searchable")
+        is_searchable: _.includes(amisField.className, "is_searchable"),
+        visibleOn: amisField.visibleOn,
+        requiredOn: amisField.requiredOn
     }
 
     switch (amisField.type) {
@@ -461,6 +464,8 @@ function transformFormFields(amisField) {
 					is_wide: _.includes(amisField.className, "is_wide"),
 					is_list_display: _.includes(amisField.className, "is_list_display"),
 					is_searchable: _.includes(amisField.className, "is_searchable"),
+                    visibleOn: amisField.visibleOn,
+                    requiredOn: amisField.requiredOn
 				}
 
 				if (tempConfig.reference_to === "organizations") {
@@ -489,6 +494,8 @@ function transformFormFields(amisField) {
 					is_wide: _.includes(amisField.className, "is_wide"),
 					is_list_display: _.includes(amisField.className, "is_list_display"),
 					is_searchable: _.includes(amisField.className, "is_searchable"),
+                    visibleOn: amisField.visibleOn,
+                    requiredOn: amisField.requiredOn
 				}
 
 				if (tempField.reference_to === "organizations") {
@@ -503,6 +510,7 @@ function transformFormFields(amisField) {
 
     }
 
+
     return formFieldsItem
 }
 
@@ -531,7 +539,6 @@ module.exports = {
             const form = await objectql.getObject('forms').findOne(this.id);
             delete form.historys;
 
-
             // 数据库更新操作：将forms表current的fields字段更新为最终数组
             form.current.fields = getFinalFormFields(inputFields);
             form.current.amis_schema = this.doc.amis_schema;

package/package.json

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

package/public/workflow/index.css

@@ -370,4 +370,9 @@ tbody .color-priority-muted *{
 
 .steedos-amis-instance-view-body .approve-button{
     z-index: 900;
+}
+
+.instances-sidebar-wrapper{
+    overflow-y: auto;
+    height: calc(100vh - 82px);
 }