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

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

@@ -1,75 +1,24 @@
 {
   "type": "page",
-  "title": "Welcome to Steedos",
   "body": [
     {
       "type": "service",
-      "pageGridClassName": "h-full m-0",
+      "className": "h-full",
       "body": [
         {
-          "type": "steedos-object-listview",
-          "objectApiName": "instances",
-          "columnsTogglable": false,
-          "filterVisible": true,
-          "visibleOn": "${!!!flowId}",
-          "showHeader": true,
-          "id": "u:d29cef0d1007",
-          "showDisplayAs": true,
-          "className": "h-full w-full bg-white",
-          "hiddenColumnOperation": true,
-          "formFactor": "LARGE",
-          "headerToolbarItems": [
-            {
-              "type": "button",
-              "label": "",
-              "icon": "fa fa-bars",
-              "className": "bg-white p-2 rounded border-gray-300 text-gray-500",
-              "align": "right",
-              "onEvent": {
-                "click": {
-                  "actions": [
-                    {
-                      "actionType": "custom",
-                      "script": "console.log(event.target);document.querySelector('.instances-customPage').classList.toggle('instances-sidebar-open');if(window.innerWidth < 768){document.querySelector('.isInset').classList.toggle('inset-0')}"
-                    }
-                  ]
-                }
-              },
-              "id": "u:115e270cae4d"
-            }
-          ],
-          "listName": "completed",
-          "rebuildOn": "${flowId || categoryId}",
-          "adaptor": "//在列表上加流程表单字段时，group和user需要特殊处理\nif (api.body.self.listName == \"monitor\") {\n  _.each(payload.data.rows, function (item, index) {\n    if (item.values) {\n      const form_fields = api.body.self.form_fields;\n      _.each(item.values, function (field, field_code) {\n        const form_field = _.find(form_fields, { code: field_code });\n        if (form_field && form_field.type == \"group\") {\n          if (form_field.is_multiselect) {\n            item.values[field_code] = field && field.length > 0 ? _.map(field, 'fullname').toString() : \"\";\n          } else {\n            item.values[field_code] = field ? field.fullname : \"\";\n          }\n        } else if (form_field && form_field.type == \"user\") {\n          if (form_field.is_multiselect) {\n            item.values[field_code] = field && field.length > 0 ? _.map(field, 'name').toString() : \"\";\n          } else {\n            item.values[field_code] = field ? field.name : \"\";\n          }\n        }\n      })\n    }\n  })\n}\n",
-          "crudDataFilter": "if (data && data.flowId && (data.listName == 'inbox' || 'monitor') && window.innerWidth > 768) {\r\n  var api = {\r\n    url: \"${context.rootUrl}/graphql\",\r\n    method: \"post\",\r\n    dataType: \"json\",\r\n    data: {\r\n      \"query\": '{flow: flows__findOne(id:\"' + data.flowId + '\"){form__expand{current}}}'\r\n    },\r\n    headers: {\r\n      Authorization:\r\n        \"Bearer ${context.tenantId},${context.authToken}\",\r\n    },\r\n  };\r\n  return env.fetcher(api).then((result) => {\r\n    if (result.data && result.data.flow && result.data.flow.form__expand.current.fields && result.data.flow.form__expand.current.fields.length > 0) {\r\n      let fields = result.data.flow.form__expand.current.fields;\r\n      fields.forEach(function (field) {\r\n        if (field.is_list_display) {\r\n          crud.columns.push({\r\n            \"name\": \"values.\" + field.code,\r\n            \"label\": field.name || field.code,\r\n            \"width\": \"unset\",\r\n            \"type\": \"text\",\r\n            \"className\": \" whitespace-nowrap\",\r\n            \"static\": true,\r\n            \"options\": null\r\n          });\r\n        }\r\n      })\r\n      let schemaApiService = data._scoped.parent.getComponentById(\"instances_list_service\");\r\n      schemaApiService && schemaApiService.setData({ form_fields: fields, isFlowDataDone: true });\r\n      // crud.api.sendOn = \"this.isFlowDataDone\";\r\n    }\r\n    return crud;\r\n  });\r\n} else {\r\n  let schemaApiService = data._scoped.parent.getComponentById(\"instances_list_service\");\r\n  schemaApiService && schemaApiService.setData({ isFlowDataDone: true });\r\n  // crud.api.sendOn = \"this.isFlowDataDone\";\r\n return crud;\r\n}\r\n"
-        },
-        {
-          "type": "service",
-          "visibleOn": "${!!flowId}",
-          "schemaApi":  {
-            "url": "/graphql?flowId=${flowId}&categoryId=${categoryId}",
-            "method": "post",
-            "data": {
-              "query": "{flow: flows__findOne(id:\"${flowId}\"){form__expand{current}}}"
-            },
-            "adaptor": "const schema = window.SteedosWorkflow.Instance.getListViewSchema(payload.data.flow); return schema;"
-          }
-        },
-        {
-          "type": "action",
+          "type": "wrapper",
+          "size": "none",
+          "className": "flex flex-1 overflow-hidden h-full",
           "body": [
             {
-              "type": "action",
-              "className": {
-                "mobileCss": "${window:innerWidth < 768}",
-                "pcCss": "${window:innerWidth > 768}",
-                "instances-sidebar-wrapper px-0 fixed z-20 h-full h-fill ease-in-out duration-300 flex flex-col overflow-y-auto bg-white block -translate-x-0 py-0": "true"
-              },
+              "type": "wrapper",
+              "size": "none",
+              "className": "instances-sidebar-wrapper flex-shrink-0 min-w-[240px] overflow-y-auto sm:rounded shadow bg-white my-4 ml-4 mr-1 lg:order-first lg:flex lg:flex-col ",
               "body": [
                 {
                   "type": "service",
                   "id": "u:aa4f4dc5f439",
-                  "className": "w-full h-full border-r",
+                  "className": "bg-none",
                   "onEvent": {
                     "@data.changed.instances": {
                       "actions": [
@@ -92,7 +41,7 @@
                       "hideRoot": true,
                       "showIcon": true,
                       "initiallyOpen": false,
-                      "value": "${CONCATENATE('/app/', appId, '/', objectName, '/grid/', listViewId, '?additionalFilters=', additionalFilters,'&flowId=',flowId,'&categoryId=',categoryId)}",
+                      "value": "${value}",
                       "size": "md",
                       "onEvent": {
                         "change": {
@@ -108,7 +57,7 @@
                             },
                             {
                               "actionType": "custom",
-                              "script": "if (window.innerWidth < 768) { document.querySelector('.instances-customPage').classList.remove('instances-sidebar-open'); document.querySelector('.isInset').classList.remove('inset-0') }\n//获取上一次的flowId和categoryId\nconst lastFlowId = event.data.flowId;\nconst lastCategoryId = event.data.categoryId;\n//从value中获取最新的flowId\nvar flowIdRegex = /&flowId=([^&]+)/;\nvar flowIdMatch = event.data.value.match(flowIdRegex);\nconst flowId = flowIdMatch && flowIdMatch.length > 0 ? flowIdMatch[1] : \"\";\n//从value中获取最新的categoryId\nvar categoryIdRegex = /&categoryId=([^&]+)/;\nvar categoryIdMatch = event.data.value.match(categoryIdRegex);\nconst categoryId = categoryIdMatch && categoryIdMatch.length > 0 ? categoryIdMatch[1] : \"\";\n//获取上一次的listname和最新的listname\nconst lastListName = event.data.listName;\nconst listName = event.data.value.split('?')[0].split('instances/grid/')[1];\n//切换流程时清除过滤条件\nif (lastListName == \"monitor\" && listName == \"monitor\" && (flowId != lastFlowId || categoryId != lastCategoryId)) {\n  listViewPropsStoreKey = window.location.pathname + \"/crud\";\n  sessionStorage.removeItem(listViewPropsStoreKey);\n  sessionStorage.removeItem(listViewPropsStoreKey + \"/query\");\n}"
+                              "script": "if (window.innerWidth < 768) { document.querySelector('.instances-customPage').classList.remove('instances-sidebar-open'); }\n//获取上一次的flowId和categoryId\nconst lastFlowId = event.data.flowId;\nconst lastCategoryId = event.data.categoryId;\n//从value中获取最新的flowId\nvar flowIdRegex = /&flowId=([^&]+)/;\nvar flowIdMatch = event.data.value.match(flowIdRegex);\nconst flowId = flowIdMatch && flowIdMatch.length > 0 ? flowIdMatch[1] : \"\";\n//从value中获取最新的categoryId\nvar categoryIdRegex = /&categoryId=([^&]+)/;\nvar categoryIdMatch = event.data.value.match(categoryIdRegex);\nconst categoryId = categoryIdMatch && categoryIdMatch.length > 0 ? categoryIdMatch[1] : \"\";\n//获取上一次的listname和最新的listname\nconst lastListName = event.data.listName;\nconst listName = event.data.value.split('?')[0].split('instances/grid/')[1];\n//切换流程时清除过滤条件\nif (lastListName == \"monitor\" && listName == \"monitor\" && (flowId != lastFlowId || categoryId != lastCategoryId)) {\n  listViewPropsStoreKey = window.location.pathname + \"/crud\";\n  sessionStorage.removeItem(listViewPropsStoreKey);\n  sessionStorage.removeItem(listViewPropsStoreKey + \"/query\");\n}"
                             },
                             {
                               "actionType": "setValue",
@@ -141,7 +90,8 @@
                           {
                             "type": "tpl",
                             "className": "flex-1 w-6/12",
-                            "tpl": "${label}"
+                            "tpl": "${label}",
+                            "id": "u:9dee51f00db4"
                           },
                           {
                             "type": "tpl",
@@ -156,9 +106,11 @@
                               "mode": "text",
                               "text": "${tag | toInt}",
                               "overflowCount": 999
-                            }
+                            },
+                            "id": "u:2329cd1fecc2"
                           }
-                        ]
+                        ],
+                        "id": "u:545154bcc334"
                       },
                       "unfoldedLevel": 2,
                       "source": "${options}"
@@ -170,29 +122,96 @@
                     "headers": {
                       "Authorization": "Bearer ${context.tenantId},${context.authToken}"
                     },
-                    "messages": {}
+                    "messages": {},
+                    "adaptor": "payload.data.value = window.location.pathname + decodeURIComponent(window.location.search); return payload;"
                   },
-                  "messages": {}
+                  "messages": {},
+                  "dsType": "api"
                 }
-              ]
-            }
-          ],
-          "onEvent": {
-            "click": {
-              "actions": [
+              ],
+              "id": "u:fd659f5c3657",
+              "isFixedHeight": false,
+              "isFixedWidth": false
+            },
+            {
+              "type": "button",
+              "className": "instances-sidebar-overlay",
+              "id": "u:773b1d00aab2",
+              "visibleOn": "${isMobile}",
+              "body": [],
+              "onEvent": {
+                "click": {
+                  "actions": [
+                    {
+                      "actionType": "custom",
+                      "script": "document.querySelector('.instances-customPage').classList.toggle('instances-sidebar-open');"
+                    }
+                  ]
+                }
+              }
+            },
+            {
+              "type": "wrapper",
+              "size": "none",
+              "className": "flex-1 focus:outline-none lg:order-last w-96",
+              "body": [
                 {
-                  "actionType": "custom",
-                  "script": " if(window.innerWidth < 768){ document.querySelector('.instances-customPage').classList.remove('instances-sidebar-open');document.querySelector('.isInset').classList.remove('inset-0') }"
+                  "type": "steedos-object-listview",
+                  "objectApiName": "instances",
+                  "columnsTogglable": false,
+                  "filterVisible": true,
+                  "visibleOn": "${!!!flowId}",
+                  "showHeader": true,
+                  "id": "u:d29cef0d1007",
+                  "showDisplayAs": true,
+                  "hiddenColumnOperation": true,
+                  "formFactor": "LARGE",
+                  "headerToolbarItems": [
+                    {
+                      "type": "button",
+                      "label": "",
+                      "align": "left",
+                      "icon": "fa fa-bars",
+                      "className": "bg-white p-2 rounded border-gray-300 text-gray-500",
+                      "onEvent": {
+                        "click": {
+                          "actions": [
+                            {
+                              "actionType": "custom",
+                              "script": "document.querySelector('.instances-customPage').classList.toggle('instances-sidebar-open');"
+                            }
+                          ]
+                        }
+                      },
+                      "id": "u:6f237cc36419"
+                    }
+                  ],
+                  "listName": "completed",
+                  "rebuildOn": "${flowId || categoryId}",
+                  "adaptor": "//在列表上加流程表单字段时，group和user需要特殊处理\nif (api.body.self.listName == \"monitor\") {\n  _.each(payload.data.rows, function (item, index) {\n    if (item.values) {\n      const form_fields = api.body.self.form_fields;\n      _.each(item.values, function (field, field_code) {\n        const form_field = _.find(form_fields, { code: field_code });\n        if (form_field && form_field.type == \"group\") {\n          if (form_field.is_multiselect) {\n            item.values[field_code] = field && field.length > 0 ? _.map(field, 'fullname').toString() : \"\";\n          } else {\n            item.values[field_code] = field ? field.fullname : \"\";\n          }\n        } else if (form_field && form_field.type == \"user\") {\n          if (form_field.is_multiselect) {\n            item.values[field_code] = field && field.length > 0 ? _.map(field, 'name').toString() : \"\";\n          } else {\n            item.values[field_code] = field ? field.name : \"\";\n          }\n        }\n      })\n    }\n  })\n}\n",
+                  "crudDataFilter": "if (data && data.flowId && (data.listName == 'inbox' || 'monitor') && window.innerWidth > 768) {\r\n  var api = {\r\n    url: \"${context.rootUrl}/graphql\",\r\n    method: \"post\",\r\n    dataType: \"json\",\r\n    data: {\r\n      \"query\": '{flow: flows__findOne(id:\"' + data.flowId + '\"){form__expand{current}}}'\r\n    },\r\n    headers: {\r\n      Authorization:\r\n        \"Bearer ${context.tenantId},${context.authToken}\",\r\n    },\r\n  };\r\n  return env.fetcher(api).then((result) => {\r\n    if (result.data && result.data.flow && result.data.flow.form__expand.current.fields && result.data.flow.form__expand.current.fields.length > 0) {\r\n      let fields = result.data.flow.form__expand.current.fields;\r\n      fields.forEach(function (field) {\r\n        if (field.is_list_display) {\r\n          crud.columns.push({\r\n            \"name\": \"values.\" + field.code,\r\n            \"label\": field.name || field.code,\r\n            \"width\": \"unset\",\r\n            \"type\": \"text\",\r\n            \"className\": \" whitespace-nowrap\",\r\n            \"static\": true,\r\n            \"options\": null\r\n          });\r\n        }\r\n      })\r\n      let schemaApiService = data._scoped.parent.getComponentById(\"instances_list_service\");\r\n      schemaApiService && schemaApiService.setData({ form_fields: fields, isFlowDataDone: true });\r\n      // crud.api.sendOn = \"this.isFlowDataDone\";\r\n    }\r\n    return crud;\r\n  });\r\n} else {\r\n  let schemaApiService = data._scoped.parent.getComponentById(\"instances_list_service\");\r\n  schemaApiService && schemaApiService.setData({ isFlowDataDone: true });\r\n  // crud.api.sendOn = \"this.isFlowDataDone\";\r\n return crud;\r\n}\r\n"
+                },
+                {
+                  "type": "service",
+                  "visibleOn": "${!!flowId && listName == 'monitor'}",
+                  "schemaApi": {
+                    "url": "/graphql?flowId=${flowId}&categoryId=${categoryId}",
+                    "method": "post",
+                    "data": {
+                      "query": "{flow: flows__findOne(id:\"${flowId}\"){form__expand{current}}}"
+                    },
+                    "adaptor": "const schema = window.SteedosWorkflow.Instance.getListViewSchema(payload.data.flow); return schema;"
+                  },
+                  "id": "u:30c21a4ee7cb",
+                  "dsType": "api"
                 }
-              ]
+              ],
+              "id": "u:ca495ec221e7"
             }
-          },
-          "className": {
-            "absolute isInset": "true"
-          }
+          ],
+          "id": "u:9526a450d59b"
         }
       ],
-      "className": "h-full w-full p-0 m-0",
       "id": "instances_list_service",
       "onEvent": {
         "@data.changed.steedos_keyvalues": {
@@ -211,46 +230,64 @@
         }
       },
       "data": {
+        "isMobile": "${window:innerWidth <= 768}",
         "isFlowDataDone": false
-      }
+      },
+      "dsType": "api"
     }
   ],
   "regions": [
     "body"
   ],
   "data": {
-    "objectName": "instance_tasks",
+    "objectName": "instances",
     "initialValues": {},
     "title": "",
-    "context": {
-      "rootUrl": "http://127.0.0.1:5000",
-      "tenantId": "644484b7aff6100247b3e6cf",
-      "userId": "6c017281-b966-49fe-aa2b-f09b835feed7",
-      "authToken": "ec7b993f86f01162b471f17d9063241beb7c57987a45d40f911e40269ca2e21b8f806cba87de7be1a07c41"
-    }
+    "context": {}
   },
-  "id": "u:7e20ab64163e",
+  "id": "u:b7167e2fcaf0",
+  "name": "page_instances_list",
+  "bodyClassName": "p-0",
   "asideResizor": false,
   "pullRefresh": {
     "disabled": true
   },
-  "bodyClassName": {
-    "p-0 instances-customPage instances-sidebar": "true",
-    "pc instances-sidebar-open instances-minwidth": "${window:innerWidth > 768}"
+  "className": {
+    "instances-customPage h-full": true,
+    "instances-list-mobile": "${window:innerWidth < 768}",
+    "instances-list-pc instances-sidebar-open": "${window:innerWidth > 768}"
   },
+  "style": {},
+  "dsType": "api",
   "css": {
-    ".instances-customPage.instances-sidebar.instances-sidebar-open.pc": {
-      "margin-left": "240px"
+    ".instances-customPage.instances-list-mobile .instances-sidebar-wrapper": {
+      "z-index": "601",
+      "top": "50px",
+      "left": "0px",
+      "bottom": "0px",
+      "position": "fixed",
+      "margin": "0px"
+    },
+    ".instances-customPage.instances-list-mobile .instances-sidebar-overlay": {
+      "z-index": "600",
+      "position": "fixed",
+      "bottom": "0px",
+      "right": "0px",
+      "left": "0px",
+      "top": "50px",
+      "display": "none"
     },
-    ".instances-sidebar-wrapper": {
+    ".instances-customPage.instances-list-mobile.instances-sidebar-open .instances-sidebar-overlay": {
+      "display": "block"
+    },
+    ".instances-customPage .instances-sidebar-wrapper": {
       "transition": "0.5s ease transform",
       "will-change": "transform",
       "transform": "translate(-100%,0)",
       "-webkit-transform": "translate(-100%,0)",
       "-moz-transform": "translate(-100%,0)",
       "-ms-transform": "translate(-100%,0)",
-      "-o-transform": "translate(-100%,0)",
-      "width": "240px"
+      "-o-transform": "translate(-100%,0)"
     },
     ".instances-customPage.instances-sidebar-open .instances-sidebar-wrapper": {
       "transform": "translate(0,0)",
@@ -259,20 +296,19 @@
       "-ms-transform": "translate(0,0)",
       "-o-transform": "translate(0,0)"
     },
-    ".pcCss": {
-      "top": "90px",
-      "left": "0px"
-    },
-    ".sidebar .pcCss": {
-      "left": "220px"
-    },
-    ".mobileCss": {
-      "top": "50px",
-      "left": "0px",
-      "padding-bottom": "65px"
+    ".instances-customPage.instances-list-pc .instances-sidebar-wrapper": {
+      "min-width": "0px",
+      "width": "0px"
     },
-    ".instances-minwidth": {
-      "min-width": "388px"
+    ".instances-customPage.instances-list-pc.instances-sidebar-open .instances-sidebar-wrapper": {
+      "min-width": "240px"
+    }
+  },
+  "themeCss": {
+    "baseControlClassName": {
+      "padding-and-margin:default": {
+        "padding": "${displayAs == 'grid'?'':'0px'}"
+      }
     }
   }
 }

package/main/default/routes/afterHook.js

@@ -0,0 +1,34 @@
+const afterHook = (req, res, next) => {
+  res.on('finish', () => {
+    if (req.url.includes('/api/workflow/v2/approve/save')) {
+      const { approve } = req.body;
+      const ins_id = approve.instance;
+      broker.call('objectql.update', {
+        objectName: 'instances',
+        id: ins_id,
+        doc: {},
+      })
+    }else if(req.url.includes('/api/workflow/engine')){
+        var hashData = req.body;
+        const approve_from_client = hashData['Approvals'][0];
+        const ins_id = approve_from_client.instance;
+        broker.call('objectql.update', {
+            objectName: 'instances',
+            id: ins_id,
+            doc: {},
+        })
+    }else if(req.ulr.includes('/api/workflow/relocate')){
+        var hashData = req.body;
+        const instance_from_client = hashData['Instances'][0];
+        const ins_id = instance_from_client._id;
+        broker.call('objectql.update', {
+            objectName: 'instances',
+            id: ins_id,
+            doc: {},
+        })
+    }
+  });
+  next();
+};
+
+module.exports = afterHook;

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

@@ -3,6 +3,7 @@ const objectql = require("@steedos/objectql");
 const _ = require('underscore');
 const bodyParser = require('body-parser');
 const steedosI18n = require("@steedos/i18n");
+const lodash = require('lodash');
 const { _makeNewID, getCollection } = require('../utils/collection');
 
 const designerManager = require('../utils/designerManager');
@@ -83,6 +84,7 @@ router.get('/am/designer/startup', async function (req, res) {
 router.post('/am/forms', async function (req, res) {
     try {
         let userId = req.user.userId;
+        let language = req.user.language;
         let data = req.body;
         let formCollection = await getCollection('forms');
         let flowCollection = await getCollection('flows');
@@ -151,11 +153,56 @@ router.post('/am/forms', async function (req, res) {
                 modified_by: userId,
                 fields: form["current"]["fields"]
             };
+            let amis_schema = null;
             if (objectName) {
                 current.fields = Object.values(formFields).concat(tables);
+                amis_schema = {
+                    type: 'steedos-flow-form',
+                    id: "instanceForm",
+                    name: newForm.name,
+                    label: newForm.name,
+                    description: newForm.description,
+                    className: "steedos-flow-form steedos-flow-layout-page",
+                    body: []
+                }
+
+                const getFieldEditTpl = async (field) => {
+                    if(field.steedos_field){
+                        const config = field.steedos_field;
+                        if(config.type === 'formula' || config.type === 'summary'){
+                            if(config.data_type == 'boolean'){
+                                config.type = "checkbox"
+                            }else if(config.data_type == 'number' || config.data_type == 'currency' ){
+                                config.type = 'number'
+                            }else if(config.data_type == 'percent'){
+                                config.type = "number"
+                            }else {
+                                config.type = config.data_type
+                            }
+                        }
+                        if(config.type === 'autonumber'){
+                            config.type = "text"
+                        }
+                        return {
+                            type: `sfield-${lodash.toLower(lodash.camelCase(field.steedos_field.type))}`,
+                            config: config
+                        }
+                    }
+                }
+
+                if (current.fields) {
+                    for (let i = 0; i < current.fields.length; i++) {
+                        const temp = await getFieldEditTpl(current.fields[i]);
+                        if (temp) {
+                            amis_schema.body.push(temp);
+                        }
+                    }
+                }
             }
             newForm.current = current;
             newForm.historys = [];
+            newForm.amis_schema = amis_schema ? JSON.stringify(amis_schema) : amis_schema
+            newForm.current.amis_schema = newForm.amis_schema;
             await objectql.getObject('forms').insert(newForm);
             const insertedForm = await formCollection.findOne({_id: newForm._id})
             insertedForms.push(insertedForm);
@@ -181,7 +228,7 @@ router.post('/am/forms', async function (req, res) {
                 name: form["name"],
                 app: form["app"],
                 category: form["category"],
-                enable_amisform: useAmis
+                enable_amisform: false
             }
             if (companyId) {
                 flow.company_id = companyId;
@@ -208,7 +255,7 @@ router.post('/am/forms', async function (req, res) {
             flow.perms = flowPerms;
             let flow_current = {
                 _id: _makeNewID(),
-                steps: await designerManager.makeSteps(userId, newForm.current.fields),
+                steps: await designerManager.makeSteps(userId, newForm.current.fields, language),
                 _rev: 1,
                 flow: flow._id,
                 form_version: form["current"]["id"],

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

@@ -1,15 +1,15 @@
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-09-15 13:09:51
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-02-07 18:12:15
+ * @LastEditors: 孙浩林 sunhaolin@steedos.com
+ * @LastEditTime: 2025-10-03 15:11:56
  * @Description: 
  */
 const express = require("express");
 const router = express.Router();
 const { requireAuthentication } = require("@steedos/auth");
 const objectql = require('@steedos/objectql')
-const _ = require('lodash');
+const { cc_do } = require('../methods/trace_approve_cc');
 
 router.post('/api/workflow/v2/cc_do', requireAuthentication, async function (req, res) {
     try {
@@ -17,15 +17,8 @@ router.post('/api/workflow/v2/cc_do', requireAuthentication, async function (req
         const { instanceId, traceId, approveId, usersId, description } = req.body;
         const approve = await objectql.getSteedosSchema().broker.call('instance.getApprove', {instanceId, traceId, approveId})
         try {
-            Meteor.call('cc_do', approve, usersId, description, {userId: userSession.userId}, (error, result)=>{
-                if(error){
-                    res.status(200).send({
-                        error: error.message
-                    });
-                }else{
-                    res.status(200).send(result); 
-                }
-            })
+            const result = await cc_do(approve, usersId, description, {userId: userSession.userId})
+            res.status(200).send(result);
         } catch (error) {
             console.error(error);
             res.status(200).send({

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

@@ -1,8 +1,8 @@
 /*
  * @Author: baozhoutao@steedos.com
  * @Date:  2023-03-18 15:05:39
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-03-18 15:25:49
+ * @LastEditors: 孙浩林 sunhaolin@steedos.com
+ * @LastEditTime: 2025-10-08 09:35:17
  * @Description: 
  */
 const express = require("express");
@@ -13,9 +13,14 @@ const _ = require('lodash');
 
 router.get('/api/workflow/v2/flow_permissions/:flow', requireAuthentication, async function (req, res) {
     let userSession = req.user;
+    const { is_space_admin } = userSession;
     const { flow } = req.params;
     try {
         const permissions = await PermissionManager.getFlowPermissions(flow, userSession.userId);
+        // 工作区管理员默认对流程有管理权限
+        if (is_space_admin && !_.includes(permissions, 'admin')) {
+            permissions.push('admin');
+        }
         res.status(200).send({
             permissions: permissions
         })