@steedos-labs/plugin-workflow 3.0.59 → 3.0.61

package/main/default/objects/instances/listviews/monitor.listview.yml

@@ -23,6 +23,19 @@ filters: !!js/function |
       });
       return result.filter;
     }
+requestAdaptor: |-
+  var searchFlow = selfData.__searchable__flow;
+  var flowIds = [];
+  if (searchFlow) {
+    flowIds = Array.isArray(searchFlow) ? searchFlow.slice() : [searchFlow];
+  }
+  flowIds = flowIds.filter(function(id) { return !!id; });
+  try {
+    window.postMessage({
+      type: 'page.dataProvider.setData',
+      data: { monitorExportFlowIds: flowIds.length > 0 ? flowIds : '' }
+    }, '*');
+  } catch(e) {}
 sort: [['submit_date','desc']]
 searchable_fields:
   - field: flow

package/main/default/objects/instances/listviews/outbox.listview.yml

@@ -0,0 +1,36 @@
+name: outbox
+label: 已审批
+columns:
+  - field: name
+    wrap: true
+    width: 300
+  - submitter_name
+  - submit_date
+  - flow_name
+  - current_step_name
+  - modified
+mobile_columns:
+  - name
+  - flow_name
+  - current_step_name
+  - submitter_name
+  - modified
+filter_scope: space
+filters: !!js/function |
+    function(filters, data){
+      var result = Steedos.authRequest(`/api/workflow/v2/\${data.listName}/filter?app=\${data.appId}&additionalFilters=\${data.additionalFilters || ""}`, {
+          type: 'get', async: false
+      });
+      return result.filter;
+    }
+sort: [['modified','desc']]
+searchable_fields:
+  - field: flow
+  - field: name
+  - field: submitter_name
+  - field: applicant_organization_name
+  - field: submit_date
+  - field: instance_state
+extra_columns:
+  - extras
+disableSwitch: true

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

@@ -24,7 +24,7 @@ router.post("/api/workflow/v2/instance/terminate", requireAuthentication, async
     try {
         const userSession = req.user;
         const { terminate_reason, instance_id } = req.body;
-        
+
         if (!terminate_reason) {
             throw new Error("还未填写强制结束申请单的理由，操作失败");
         }
@@ -67,9 +67,9 @@ router.post("/api/workflow/v2/instance/terminate", requireAuthentication, async
 
         // Check permissions
         const permissions = await PermissionManager.getFlowPermissions(flow_id, current_user);
-        const hasPermission = permissions.includes("admin") || 
-                             space.admins.includes(current_user) || 
-                             instance.submitter === current_user || 
+        const hasPermission = permissions.includes("admin") ||
+                             space.admins.includes(current_user) ||
+                             instance.submitter === current_user ||
                              instance.applicant === current_user;
         if (!hasPermission) {
             throw new Error("无权终止此申请单");
@@ -147,7 +147,7 @@ router.post("/api/workflow/v2/instance/terminate", requireAuthentication, async
         const old_inbox_users = instance.inbox_users || [];
         const old_cc_users = instance.cc_users || [];
         const old_outbox_users = instance.outbox_users || [];
-        
+
         const tempUsers = [];
         instance_trace.approves.forEach(approve => {
             tempUsers.push(approve.user);
@@ -167,6 +167,7 @@ router.post("/api/workflow/v2/instance/terminate", requireAuthentication, async
 
         // Update instance
         const instancesCollection = await getCollection('instances');
+
         const result = await instancesCollection.updateOne(
             { _id: instance_id },
             { $set: setObj }
@@ -178,30 +179,28 @@ router.post("/api/workflow/v2/instance/terminate", requireAuthentication, async
 
             // Send notifications
             const updatedInstance = await UUFlowManager.getInstance(instance_id);
-            await pushManager.send_instance_notification(
-                "submit_terminate_applicant",
-                updatedInstance,
-                terminate_reason,
-                current_user_info
-            );
-
-            // Notify all involved users
+
+            // Send notifications + webhook (并行)
             const usersToNotify = _.uniq([...old_inbox_users, ...old_cc_users]);
-            await Promise.all(
-                usersToNotify.map(user_id => 
+            await Promise.all([
+                pushManager.send_instance_notification(
+                    "submit_terminate_applicant",
+                    updatedInstance,
+                    terminate_reason,
+                    current_user_info
+                ),
+                ...usersToNotify.map(user_id =>
                     pushManager.send_message_to_specifyUser("terminate_approval", user_id)
+                ),
+                pushManager.triggerWebhook(
+                    updatedInstance.flow,
+                    updatedInstance,
+                    {},
+                    "terminate",
+                    current_user,
+                    []
                 )
-            );
-
-            // Trigger webhook
-            await pushManager.triggerWebhook(
-                updatedInstance.flow,
-                updatedInstance,
-                {},
-                "terminate",
-                current_user,
-                []
-            );
+            ]);
         }
 
         res.status(200).send({});
@@ -213,4 +212,4 @@ router.post("/api/workflow/v2/instance/terminate", requireAuthentication, async
     }
 });
 
-exports.default = router;
+exports.default = router;

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

@@ -329,18 +329,19 @@ router.get('/api/:appId/workflow/nav', requireAuthentication, async function (re
       "icon": "fa fa-check"
     });
 
-    options.push({
-      "label": t('monitor', {}, userSession.language),
-      "icon": "fa fa-eye",
-      "options":{
-        "level":1,
-        "to": `/app/${appId}/instances/view/none?side_object=instances&side_listview_id=monitor&additionalFilters=`,
-      },
-      "value": `/app/${appId}/instances/view/none?side_object=instances&side_listview_id=monitor&additionalFilters=`,
-      "children": monitorResult.schema,
-      "unfolded": monitorResult.monitorIsUnfolded,
-      "visible": monitorResult.hasFlowsPer
-    });
+    if (monitorResult.hasFlowsPer) {
+      options.push({
+        "label": t('monitor', {}, userSession.language),
+        "icon": "fa fa-eye",
+        "options":{
+          "level":1,
+          "to": `/app/${appId}/instances/view/none?side_object=instances&side_listview_id=monitor&additionalFilters=`,
+        },
+        "value": `/app/${appId}/instances/view/none?side_object=instances&side_listview_id=monitor&additionalFilters=`,
+        "children": monitorResult.schema,
+        "unfolded": monitorResult.monitorIsUnfolded
+      });
+    }
 
     const myfileChildren = [];
     if (!isWorkflowReadonly) {

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

@@ -3,7 +3,7 @@
  * @Date: 2022-12-24 14:38:27
  * @LastEditors: 孙浩林 sunhaolin@steedos.com
  * @LastEditTime: 2025-10-08 14:50:07
- * @Description: 
+ * @Description:
  */
 'use strict';
 // @ts-check
@@ -49,10 +49,12 @@ router.post('/api/workflow/reassign', requireAuthentication, async function (req
         const spaceUsersCollection = await getCollection('space_users');
         const organizationsCollection = await getCollection('organizations');
 
-        for (const instance_from_client of hashData['Instances']) { 
+        for (const instance_from_client of hashData['Instances']) {
             var _users, approve_users_handlers, assignee_appr, current_space_user, current_user_organization, i, inbox_users, inbox_users_from_client, ins, instance, instance_id, last_trace, last_trace_from_client, new_inbox_users, not_in_inbox_users, now, permissions, r, reassign_reason, setObj, space, space_id;
             instance_id = instance_from_client['_id'];
+
             instance = await UUFlowManager.getInstance(instance_id);
+
             space_id = instance.space;
             // 验证instance为审核中状态
             await UUFlowManager.isInstancePending(instance);
@@ -66,7 +68,7 @@ router.post('/api/workflow/reassign', requireAuthentication, async function (req
             }
             // 验证login user_id对该流程有管理申请单的权限
             permissions = await PermissionManager.getFlowPermissions(instance.flow, current_user);
-            
+
             if ((!permissions.includes("admin")) && !is_space_admin) {
                 throw new Error("用户没有对当前流程的管理权限");
             }
@@ -191,6 +193,7 @@ router.post('/api/workflow/reassign', requireAuthentication, async function (req
                 last_trace.approves.push(new_appr);
                 newApproveIds.push(new_appr._id)
             };
+
             instance.outbox_users.push(current_user);
             instance.outbox_users = instance.outbox_users.concat(approve_users_handlers);
             setObj.outbox_users = _.uniq(instance.outbox_users);
@@ -213,25 +216,25 @@ router.post('/api/workflow/reassign', requireAuthentication, async function (req
 
             if (r) {
                 ins = await UUFlowManager.getInstance(instance_id);
-                // 给被删除的inbox_users 和 当前用户 发送push
-                await pushManager.send_message_current_user(current_user_info);
-                for (const user_id of not_in_inbox_users) {
-                    if (user_id !== current_user) {
-                        await pushManager.send_message_to_specifyUser("current_user", user_id);
-                    }
-                };
+
                 // 提取instances.outbox_users数组和填单人、申请人
                 _users = new Array;
                 _users.push(ins.applicant);
                 _users.push(ins.submitter);
                 _users = _.uniq(_users.concat(ins.outbox_users));
-                for (const user_id of _users) {
-                    await pushManager.send_message_to_specifyUser("current_user", user_id);
-                };
-                // 给新加入的inbox_users发送push message
-                await pushManager.send_instance_notification("reassign_new_inbox_users", ins, reassign_reason, current_user_info);
-                // 如果已经配置webhook并已激活则触发
-                await pushManager.triggerWebhook(ins.flow, ins, {}, 'reassign', current_user, ins.inbox_users);
+
+                // 所有通知+webhook 并行
+                await Promise.all([
+                    pushManager.send_message_current_user(current_user_info),
+                    ...not_in_inbox_users
+                        .filter(user_id => user_id !== current_user)
+                        .map(user_id => pushManager.send_message_to_specifyUser("current_user", user_id)),
+                    ..._users.map(user_id =>
+                        pushManager.send_message_to_specifyUser("current_user", user_id)
+                    ),
+                    pushManager.send_instance_notification("reassign_new_inbox_users", ins, reassign_reason, current_user_info),
+                    pushManager.triggerWebhook(ins.flow, ins, {}, 'reassign', current_user, ins.inbox_users)
+                ]);
             }
         };
 

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

@@ -30,7 +30,17 @@ router.get('/api/workflow/instances/redirect/:insId', requireAuthentication, asy
         if(ins.submitter === userId){
             redirectUrl = `/app/approve_workflow/instances/view/${insId}?side_object=instance_tasks&side_listview_id=${ins.state === 'completed' ? 'completed' : 'pending'}`
         }else{
-            redirectUrl = `/app/approve_workflow/instance_tasks/view/${insId}?side_object=instance_tasks&side_listview_id=outbox`
+            const tasks2 = await db.instance_tasks.find({
+                instance: insId,
+                is_finished: true,
+                handler: userId,
+                space: spaceId
+            }, {_id: 1}).toArray();
+            if(tasks2.length > 0){
+                redirectUrl = `/app/approve_workflow/instance_tasks/view/${tasks2[0]._id}?side_object=instance_tasks&side_listview_id=outbox`
+            }else{
+                redirectUrl = `/app/approve_workflow/instances/view/${insId}?side_object=instance_tasks&side_listview_id=outbox`
+            }
         }
     }
 

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

@@ -1,6 +1,6 @@
 /*
- * @Author: sunhaolin@hotoa.com 
- * @Date: 2022-03-26 10:49:51 
+ * @Author: sunhaolin@hotoa.com
+ * @Date: 2022-03-26 10:49:51
  * @Last Modified by: sunhaolin@hotoa.com
  * @Last Modified time: 2022-03-26 10:53:33
  */
@@ -18,7 +18,7 @@ const afterHook = require('./afterHook');
  * body {
  *   Instances: [
  *     {
- *       
+ *
  *     }
  *   ]
  * }
@@ -35,9 +35,12 @@ router.post('/api/workflow/relocate', requireAuthentication, afterHook, async fu
         const instance_from_client = hashData['Instances'][0];
         // beforeEnd
         const insId = instance_from_client._id;
+
         const instanceDoc = (await objectql.getObject('instances').find({ filters: [['_id', '=', insId]], fields: ['flow', 'flow_version'] }))[0];
+
         const flowId = instanceDoc.flow;
         const flowDoc = await objectql.getObject('flows').findOne(flowId);
+
         const next_step_id = instance_from_client["relocate_next_step"];
         const next_step = getStep(instanceDoc, flowDoc, next_step_id);
         const next_step_type = next_step["step_type"];
@@ -46,10 +49,12 @@ router.post('/api/workflow/relocate', requireAuthentication, afterHook, async fu
         }
 
         await UUFlowManager.relocate(instance_from_client, userSession)
+
         // afterEnd
         if (next_step_type === 'end') {
             await excuteTriggers({ when: 'afterEnd', userId, flowId, insId });
         }
+
         res.status(200).send({});
 
     } catch (e) {
@@ -58,4 +63,4 @@ router.post('/api/workflow/relocate', requireAuthentication, afterHook, async fu
         });
     }
 });
-exports.default = router;
+exports.default = router;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos-labs/plugin-workflow",
-  "version": "3.0.59",
+  "version": "3.0.61",
   "main": "package.service.js",
   "license": "MIT",
   "files": [