@steedos-labs/plugin-workflow 3.0.0-beta.28 → 3.0.0-beta.30

package/main/default/objectTranslations/instances.en/instances.en.objectTranslation.yml

@@ -0,0 +1,212 @@
+name: instances
+label: Request
+description: 
+fields:
+  name:
+    label: Name
+    help: 
+    description: 
+  flow:
+    label: Workflow
+    help: 
+    description: 
+  flow_version:
+    label: Workflow Version
+    help: 
+    description: 
+  form:
+    label: Form
+    help: 
+    description: 
+  form_version:
+    label: Form Version
+    help: 
+    description: 
+  submitter:
+    label: Submitter
+    help: 
+    description: 
+  submitter_name:
+    label: Submitter's Name
+    help: 
+    description: 
+  submit_date:
+    label: Submit Date
+    help: 
+    description: 
+  applicant:
+    label: Applicant
+    help: 
+    description: 
+  applicant_name:
+    label: Applicant's Name
+    help: 
+    description: 
+  applicant_organization:
+    label: Applicant Department
+    help: 
+    description: 
+  applicant_organization_name:
+    label: Applicant Department's Name
+    help: 
+    description: 
+  applicant_organization_fullname:
+    label: Applicant Department's Fullname
+    help: 
+    description: 
+  code:
+    label: Code
+    help: 
+    description: 
+  values:
+    label: Field Values
+    help: 
+    description: 
+  inbox_users:
+    label: Inbox Users
+    help: 
+    description: 
+  outbox_users:
+    label: Outbox Users
+    help: 
+    description: 
+  traces:
+    label: Processing Traces
+    help: 
+    description: 
+  attachments:
+    label: Attachments
+    help: 
+    description: 
+  flow_name:
+    label: Workflow Name
+    help: 
+    description: 
+  category_name:
+    label: Category Name
+    help: 
+    description: 
+  category:
+    label: Category
+    help: 
+    description: 
+  state:
+    label: Processing State
+    help: 
+    options:
+      - label: Draft
+        value: draft
+      - label: Pending
+        value: pending
+      - label: Completed
+        value: completed
+    description: 
+  is_archived:
+    label: Archived
+    help: 
+    description: 
+  is_deleted:
+    label: Deleted
+    help: 
+    description: 
+  related_instances:
+    label: Related Instances
+    help: 
+    description: 
+  record_ids:
+    label: Record IDs
+    help: 
+    description: 
+  record_ids.$.o:
+    label: 
+    help: 
+    description: 
+  record_ids.$.ids:
+    label: 
+    help: 
+    description: 
+  current_step_auto_submit:
+    label: Auto Submit if Time Out
+    help: 
+    description: 
+  current_step_name:
+    label: Current Step Name
+    help: 
+    description: 
+  applicant_company:
+    label: Applicant's Division
+    help: 
+    description: 
+  cc_count:
+    label: CC Count
+    help: 
+    description: 
+listviews:
+  all:
+    label: All
+  inbox:
+    label: Inbox
+  outbox:
+    label: Outbox
+  draft:
+    label: Draft
+  pending:
+    label: In Progress
+  completed:
+    label: Finished
+  monitor:
+    label: Monitor
+actions:
+  view_instance:
+    label: View Instance
+  instance_terminate:
+    label: Cancel Request
+  instance_save:
+    label: Save
+  instance_related:
+    label: Linked requests
+  instance_distribute:
+    label: Distribute
+  instance_submit:
+    label: Submit
+  instance_forward:
+    label: Request Forward
+  instance_cc:
+    label: Carbon Copy
+  instance_relocate:
+    label: Relocate
+  instance_new:
+    label: New Request
+  instance_delete:
+    label: Delete
+  instance_delete_many:
+    label: Delete
+CustomLabels:
+  instance_action_new_dialog_title: Please select the process
+  instance_action_new_dialog_msg_success: Created successfully!
+  instance_action_new_dialog_msg_failed: Created failed!
+  instance_action_delete_many_msg_not_select: Please select at least one record
+  instance_action_instance_save_msg_success: Temporary storage successful
+  instance_action_instance_save_msg_failed: Temporary storage failed
+  instance_action_instance_distribute_dialog_sub_title: Distribute the currently selected file to the new process and continue to execute the approval operation
+  instance_action_instance_distribute_dialog_field_process: Process name
+  instance_action_instance_distribute_dialog_field_users: Distribute to
+  instance_action_instance_distribute_dialog_field_description: Description
+  instance_action_instance_distribute_dialog_field_to_self: Distribute it to yourself too
+  instance_action_instance_distribute_dialog_field_to_attachment: Save the original form as an attachment
+  instance_action_instance_distribute_dialog_field_related: Automatically create associated files
+  instance_action_instance_cc_dialog_title_prefix: "Current Step:"
+  instance_action_instance_cc_dialog_field_users: Carbon Copy To
+  instance_action_instance_cc_dialog_field_description: Carbon Copy Description
+  instance_action_instance_cc_dialog_sub_title: Forward the currently selected file to the new process and continue to execute the approval operation.
+  instance_action_terminate_dialog_title: Cancel Request
+  instance_action_terminate_dialog_content: Please fill in the reasons for canceling the application
+  instance_action_terminate_dialog_msg_success: The cancellation application has been successful!
+  instance_action_terminate_dialog_msg_failed: The cancellation application failed.
+  instance_action_instance_relocate_dialog_title: Relocate
+  instance_action_instance_relocate_dialog_title_prefix: "Current Step:"
+  instance_action_instance_relocate_dialog_field_reason: Please fill in the reasons for the Relocating
+  instance_action_relocate_dialog_msg_success: Relocated successful
+  instance_action_relocate_dialog_msg_failed: Relocated failed
+  instance_action_instance_save_msg_upgraded: The workflow has been upgraded. The page will refresh automatically.
+

package/main/default/objectTranslations/instances.zh-CN/instances.zh-CN.objectTranslation.yml

@@ -0,0 +1,209 @@
+name: instances
+label: 审批单
+description: 
+fields:
+  name:
+    label: 文件标题
+    help: 
+    description: 
+  flow:
+    label: 流程
+    help: 
+    description: 
+  flow_version:
+    label: 流程版本号
+    help: 
+    description: 
+  form:
+    label: 表单
+    help: 
+    description: 
+  form_version:
+    label: 表单版本号
+    help: 
+    description: 
+  submitter:
+    label: 提交人
+    help: 
+    description: 
+  submitter_name:
+    label: 提交人姓名
+    help: 
+    description: 
+  submit_date:
+    label: 提交日期
+    help: 
+    description: 
+  applicant:
+    label: 申请人
+    help: 
+    description: 
+  applicant_name:
+    label: 申请人姓名
+    help: 
+    description: 
+  applicant_organization:
+    label: 申请人部门
+    help: 
+    description: 
+  applicant_organization_name:
+    label: 申请人部门名称
+    help: 
+    description: 
+  applicant_organization_fullname:
+    label: 申请人部门全称
+    help: 
+    description: 
+  code:
+    label: 公式
+    help: 
+    description: 
+  values:
+    label: 审批单字段
+    help: 
+    description: 
+  inbox_users:
+    label: 待办处理人
+    help: 
+    description: 
+  outbox_users:
+    label: 已办处理人
+    help: 
+    description: 
+  traces:
+    label: 步骤审批
+    help: 
+    description: 
+  attachments:
+    label: 附件
+    help: 
+    description: 
+  flow_name:
+    label: 流程名
+    help: 
+    description: 
+  category_name:
+    label: 流程分类
+    help: 
+    description: 
+  category:
+    label: 流程分类
+    help: 
+    description: 
+  state:
+    label: 审批单状态
+    help: 
+    options:
+      - label: 草稿
+        value: draft
+      - label: 进行中
+        value: pending
+      - label: 已完成
+        value: completed
+    description: 
+  is_archived:
+    label: 已归档
+    help: 
+    description: 
+  is_deleted:
+    label: 已删除
+    help: 
+    description: 
+  related_instances:
+    label: 相关审批单
+    help: 
+    description: 
+  record_ids:
+    label: 记录ID
+    help: 
+    description: 
+  record_ids.$.o:
+    label: 
+    help: 
+    description: 
+  record_ids.$.ids:
+    label: 
+    help: 
+    description: 
+  current_step_auto_submit:
+    label: 当前步骤超时自动流转
+    help: 
+    description: 
+  current_step_name:
+    label: 当前步骤
+    help: 
+    description: 
+  applicant_company:
+    label: 申请人所属分部
+    help: 
+    description: 
+  cc_count:
+    label: 传阅数
+    help: 
+    description: 
+listviews:
+  all:
+    label: 所有
+  inbox:
+    label: 待办文件
+  outbox:
+    label: 已办文件
+  draft:
+    label: 草稿
+  pending:
+    label: 进行中
+  completed:
+    label: 已完成
+  monitor:
+    label: 监控箱
+actions:
+  view_instance:
+    label: 查看审批单
+  instance_terminate:
+    label: 取消申请
+  instance_save:
+    label: 保存
+  instance_related:
+    label: 关联文件
+  instance_distribute:
+    label: 分发
+  instance_submit:
+    label: 发送
+  instance_forward:
+    label: 转发
+  instance_cc:
+    label: 传阅
+  instance_relocate:
+    label: 重定位
+  instance_new:
+    label: 新建
+  instance_delete_many:
+    label: 删除
+CustomLabels:
+  instance_action_new_dialog_title: 请选择流程
+  instance_action_new_dialog_msg_success: 创建成功！
+  instance_action_new_dialog_msg_failed: 创建失败！
+  instance_action_delete_many_msg_not_select: 请至少选择一条记录
+  instance_action_instance_save_msg_success: 暂存成功
+  instance_action_instance_save_msg_failed: 暂存失败
+  instance_action_instance_distribute_dialog_sub_title: 将当前选中的文件分发到新的流程，继续执行审批操作
+  instance_action_instance_distribute_dialog_field_process: 流程名称
+  instance_action_instance_distribute_dialog_field_users: 分发对象
+  instance_action_instance_distribute_dialog_field_description: 备注
+  instance_action_instance_distribute_dialog_field_to_self: 同时分发给自己
+  instance_action_instance_distribute_dialog_field_to_attachment: 将原表单存储为附件
+  instance_action_instance_distribute_dialog_field_related: 自动创建关联文件
+  instance_action_instance_cc_dialog_title_prefix: 当前步骤：
+  instance_action_instance_cc_dialog_field_users: 传阅对象
+  instance_action_instance_cc_dialog_field_description: 传阅说明
+  instance_action_instance_cc_dialog_sub_title: 将当前选中的文件转发到新的流程，继续执行审批操作
+  instance_action_terminate_dialog_title: 取消申请
+  instance_action_terminate_dialog_content: 请填写取消申请的理由
+  instance_action_terminate_dialog_msg_success: 取消申请成功！
+  instance_action_terminate_dialog_msg_failed: 取消申请失败
+  instance_action_instance_relocate_dialog_title: 重定位
+  instance_action_instance_relocate_dialog_title_prefix: 当前步骤：
+  instance_action_instance_relocate_dialog_field_reason: 请填写重定位的理由
+  instance_action_relocate_dialog_msg_success: 重定位成功
+  instance_action_relocate_dialog_msg_failed: 重定位失败
+  instance_action_instance_save_msg_upgraded: 流程已升级，页面将自动刷新。

package/main/default/objects/flows/buttons/newimport.button.yml

@@ -63,7 +63,8 @@ amis_schema: |-
                                               "messages": {},
                                               "requestAdaptor": "api.url += api.body.global.spaceId\n\nif (api.body.company_id) {\n  api.url += \"&company_id=\" + api.body.company_id\n}\n\nreturn api;",
                                               "dataType": "json"
-                                          }
+                                          },
+                                          "reload": "listview_flows"
                                       }
                                   ],
                                   "showCloseButton": true,

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

@@ -18,7 +18,7 @@ amis_schema: |-
                                   "title": {
                                       "type": "tpl",
                                       "id": "u:0bce3c33b6e5",
-                                      "tpl": "<p>${'CustomAction.instances.instance_cc' | t}<a href=\"https://www.steedos.cn/docs/user/workflow#%E5%A6%82%E4%BD%95%E4%BC%A0%E9%98%85\" target=\"_blank\" rel=\"noopener\"> ?&nbsp;</a></p>"
+                                      "tpl": "<p>${'CustomAction.instances.instance_cc' | t}</p>"
                                   },
                                   "body": [
                                       {

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

@@ -18,7 +18,7 @@ amis_schema: |-
                                       "method": "post",
                                       "sendOn": "",
                                       "requestAdaptor": "var _SteedosUI$getRef$get, _approveValues$next_s;\nconst formValues = context._scoped.getComponentById(\"instance_form\").getValues();\nconst approveValues = (_SteedosUI$getRef$get = context._scoped.getComponentById(\"instance_approval\")) === null || _SteedosUI$getRef$get === void 0 ? void 0 : _SteedosUI$getRef$get.getValues();\nlet nextUsers = approveValues === null || approveValues === void 0 ? void 0 : approveValues.next_users;\nif (_.isString(nextUsers)) {\n  nextUsers = [approveValues.next_users];\n}\nconst instance = context.record;\nconst body = {\n  instance: {\n    _id: instance._id,\n    applicant: formValues.applicant,\n    submitter: formValues.submitter,\n    traces: [{\n      _id: instance.trace._id,\n      step: instance.step._id,\n      approves: [{\n        _id: instance.approve._id,\n        next_steps: [{\n          step: approveValues === null || approveValues === void 0 || (_approveValues$next_s = approveValues.next_step) === null || _approveValues$next_s === void 0 ? void 0 : _approveValues$next_s._id,\n          users: nextUsers\n        }],\n        description: approveValues === null || approveValues === void 0 ? void 0 : approveValues.suggestion,\n        values: formValues\n      }]\n    }]\n  }\n};\napi.data = body;\nreturn api;",
-                                      "adaptor": "return payload.instance === true ? {...payload, status: 0, msg: t('instance_action_instance_save_msg_success')} : {...payload, status: 1, msg: t('instance_action_instance_save_msg_failed')};",
+                                      "adaptor": "if (payload.instance == \"upgraded\") { window.setTimeout(function(){ window.location.reload(); }, 2000); return {...payload, status: 1, msg: t('instance_action_instance_save_msg_upgraded')}; } \n return payload.instance === true ? {...payload, status: 0, msg: t('instance_action_instance_save_msg_success')} : {...payload, status: 1, msg: t('instance_action_instance_save_msg_failed')};",
                                       "headers": {
                                           "Authorization": "Bearer ${context.tenantId},${context.authToken}"
                                       },

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

@@ -9,7 +9,6 @@ columns:
   - flow_name
   - current_step_name
   - modified
-  - is_archived
 mobile_columns:
   - name
   - flow_name

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_get_object_workflows.router.js

@@ -8,34 +8,91 @@
 const express = require("express");
 const router = express.Router();
 const { requireAuthentication } = require("@steedos/auth");
-const objectql = require('@steedos/objectql')
+const { getCollection } = require('../utils/collection');
 const _ = require('lodash');
-const Fiber = function(fun){console.log('TODO Fiber...')}
 
-router.get('/api/workflow/v2/get_object_workflows', requireAuthentication, async function (req, res) {
-    try {
-        let userSession = req.user;
-        const { spaceId, userId } = userSession;
-        Fiber(async function () {
-            try {
-                Meteor.call('object_workflows.get', spaceId, userId, (error, result)=>{
-                    if(error){
-                        res.status(200).send({
-                            error: error.message
+async function getObjectWorkflows(spaceId, userId) {
+    // 参数检查
+    if (typeof spaceId !== 'string') {
+        throw new Error('spaceId must be a string');
+    }
+    if (typeof userId !== 'string') {
+        throw new Error('userId must be a string');
+    }
+
+    // 获取space_users集合
+    const spaceUsersCollection = await getCollection('space_users');
+    const curSpaceUser = await spaceUsersCollection.findOne(
+        { space: spaceId, user: userId },
+        { projection: { organizations: 1 } }
+    );
+
+    if (!curSpaceUser) {
+        throw new Error('not-authorized');
+    }
+
+    // 获取organizations集合
+    const organizationsCollection = await getCollection('organizations');
+    const organizations = await organizationsCollection.find({
+        _id: {
+            $in: curSpaceUser.organizations
+        }
+    }, { projection: { parents: 1 } }).toArray();
+
+    // 获取object_workflows集合
+    const objectWorkflowsCollection = await getCollection('object_workflows');
+    let ows = await objectWorkflowsCollection.find(
+        { space: spaceId },
+        { projection: { object_name: 1, flow_id: 1, space: 1, sync_direction: 1 } }
+    ).toArray();
+
+    // 获取flows集合
+    const flowsCollection = await getCollection('flows');
+    
+    // 使用Promise.all并行处理每个工作流
+    ows = await Promise.all(ows.map(async (o) => {
+        const fl = await flowsCollection.findOne(
+            { _id: o.flow_id, state: 'enabled' },
+            { projection: { name: 1, perms: 1, forbid_initiate_instance: 1 } }
+        );
+
+        if (fl) {
+            o.flow_name = fl.name;
+            o.can_add = false;
+            o.forbid_initiate_instance = fl.forbid_initiate_instance;
+
+            const perms = fl.perms;
+            if (perms) {
+                if (perms.users_can_add && perms.users_can_add.includes(userId)) {
+                    o.can_add = true;
+                } else if (perms.orgs_can_add && perms.orgs_can_add.length > 0) {
+                    if (curSpaceUser && curSpaceUser.organizations && 
+                        _.intersection(curSpaceUser.organizations, perms.orgs_can_add).length > 0) {
+                        o.can_add = true;
+                    } else if (organizations) {
+                        o.can_add = _.some(organizations, (org) => {
+                            return org.parents && _.intersection(org.parents, perms.orgs_can_add).length > 0;
                         });
-                    }else{
-                        res.status(200).send(result); 
                     }
-                })
-            } catch (error) {
-                console.error(error);
-                res.status(200).send({
-                    error: error.message
-                });
+                }
             }
+        }
+        return o;
+    }));
 
-        }).run()
-    
+    // 过滤掉没有flow_name的工作流
+    ows = ows.filter(n => n.flow_name);
+
+    return ows;
+}
+
+
+router.get('/api/workflow/v2/get_object_workflows', requireAuthentication, async function (req, res) {
+    try {
+        let userSession = req.user;
+        const { spaceId, userId } = userSession;
+        const result = await getObjectWorkflows(spaceId, userId);
+        return res.status(200).send(result); 
     } catch (error) {
         console.error(error);
         res.status(200).send({

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

@@ -9,34 +9,33 @@ const express = require("express");
 const router = express.Router();
 const { requireAuthentication } = require("@steedos/auth");
 const _ = require('lodash');
-const Fiber = function(fun){console.log('TODO Fiber...')}
-
+const uuflowManagerForInitApproval = require('../manager/uuflowManagerForInitApproval');
+const { getCollection } = require('../utils/collection');
 router.post('/api/object/workflow/drafts', requireAuthentication, async function (req, res) {
     try {
         let userSession = req.user;
         const { Instances } = req.body;
         const userId = userSession.userId;
         const inserted_instances = [];
-        Fiber(function () {
-            try {
-                _.each(Instances, (instance_from_client)=>{
-                    const new_ins_id = uuflowManagerForInitApproval.create_instance(instance_from_client, Object.assign({}, userSession, {_id: userSession.userId}))
+        const coll = await getCollection('instances');
+        try {
+            for (const instance_from_client of Instances) {
+                const new_ins_id = await uuflowManagerForInitApproval.create_instance(instance_from_client, Object.assign({}, userSession, {_id: userSession.userId}))
 
-                    new_ins = Creator.Collections.instances.findOne({ _id: new_ins_id }, { fields: { space: 1, flow: 1, flow_version: 1, form: 1, form_version: 1 } })
+                new_ins = await coll.findOne({ _id: new_ins_id }, { fields: { space: 1, flow: 1, flow_version: 1, form: 1, form_version: 1 } })
 
-                    inserted_instances.push(new_ins)
-                })
-                res.status(200).send({
-                    inserts: inserted_instances
-                });
-            } catch (error) {
-                console.error(error);
-                res.status(200).send({
-                    error: error.message
-                });
+                inserted_instances.push(new_ins)
             }
-
-        }).run()
+            
+            res.status(200).send({
+                inserts: inserted_instances
+            });
+        } catch (error) {
+            console.error(error);
+            res.status(200).send({
+                error: error.message
+            });
+        }
     
     } catch (error) {
         console.error(error);