@nocobase/plugin-workflow-manual 2.0.0-alpha.9 → 2.0.0-beta.10

package/dist/locale/uk-UA.json

@@ -0,0 +1,36 @@
+{
+  "All pass": "All pass",
+  "Any pass": "Any pass",
+  "Anyone pass": "Anyone pass",
+  "Assignee": "Assignee",
+  "Assignees": "Assignees",
+  "Collaboratively": "Collaboratively",
+  "Configure user interface": "Configure user interface",
+  "Continue the process": "Continue the process",
+  "Could be used for manually submitting data, and determine whether to continue or exit. Workflow will generate a todo item for assigned user when it reaches a manual node, and continue processing after user submits the form.": "Could be used for manually submitting data, and determine whether to continue or exit. Workflow will generate a todo item for assigned user when it reaches a manual node, and continue processing after user submits the form.",
+  "Create record form": "Create record form",
+  "Custom form": "Custom form",
+  "Data record": "Data record",
+  "Each user has own task": "Each user has own task",
+  "Everyone shares one task": "Everyone shares one task",
+  "Everyone should pass": "Everyone should pass",
+  "Field name existed in form": "Field name existed in form",
+  "Filter settings": "Filter settings",
+  "Manual": "Manual",
+  "My manual tasks": "My manual tasks",
+  "Negotiation": "Negotiation",
+  "Please check one of your update record form, and add at least one filter condition in form settings.": "Please check one of your update record form, and add at least one filter condition in form settings.",
+  "Save temporarily": "Save temporarily",
+  "Separately": "Separately",
+  "Task": "Task",
+  "Task node": "Task node",
+  "Task title": "Task title",
+  "Terminate the process": "Terminate the process",
+  "Title of each task item. Default to node title.": "Title of each task item. Default to node title.",
+  "Unprocessed": "Unprocessed",
+  "Update record form": "Update record form",
+  "User interface": "User interface",
+  "Values preset in this form will override user submitted ones when continue or reject.": "Values preset in this form will override user submitted ones when continue or reject.",
+  "View user interface": "View user interface",
+  "Workflow todos": "Workflow todos"
+}

package/dist/locale/vi-VN.json

@@ -0,0 +1,36 @@
+{
+  "All pass": "Tất cả thông qua",
+  "Any pass": "Bất kỳ thông qua",
+  "Anyone pass": "Bất kỳ ai thông qua",
+  "Assignee": "Người được giao",
+  "Assignees": "Những người được giao",
+  "Collaboratively": "Hợp tác",
+  "Configure user interface": "Cấu hình giao diện người dùng",
+  "Continue the process": "Tiếp tục quy trình",
+  "Could be used for manually submitting data, and determine whether to continue or exit. Workflow will generate a todo item for assigned user when it reaches a manual node, and continue processing after user submits the form.": "Có thể được sử dụng để gửi dữ liệu thủ công và xác định xem có tiếp tục hay thoát. Quy trình sẽ tạo một mục việc cần làm cho người dùng được chỉ định khi đến nút thủ công và tiếp tục xử lý sau khi người dùng gửi biểu mẫu.",
+  "Create record form": "Tạo biểu mẫu bản ghi",
+  "Custom form": "Biểu mẫu tùy chỉnh",
+  "Data record": "Bản ghi dữ liệu",
+  "Each user has own task": "Mỗi người dùng có nhiệm vụ riêng",
+  "Everyone shares one task": "Mọi người chia sẻ một nhiệm vụ",
+  "Everyone should pass": "Mọi người phải thông qua",
+  "Field name existed in form": "Tên trường đã tồn tại trong biểu mẫu",
+  "Filter settings": "Cài đặt bộ lọc",
+  "Manual": "Thủ công",
+  "My manual tasks": "Nhiệm vụ thủ công của tôi",
+  "Negotiation": "Thương lượng",
+  "Please check one of your update record form, and add at least one filter condition in form settings.": "Vui lòng kiểm tra một trong các biểu mẫu cập nhật bản ghi của bạn và thêm ít nhất một điều kiện lọc trong cài đặt biểu mẫu.",
+  "Save temporarily": "Lưu tạm thời",
+  "Separately": "Riêng biệt",
+  "Task": "Nhiệm vụ",
+  "Task node": "Nút nhiệm vụ",
+  "Task title": "Tiêu đề nhiệm vụ",
+  "Terminate the process": "Kết thúc quy trình",
+  "Title of each task item. Default to node title.": "Tiêu đề của mỗi mục nhiệm vụ. Mặc định là tiêu đề nút.",
+  "Unprocessed": "Chưa xử lý",
+  "Update record form": "Cập nhật biểu mẫu bản ghi",
+  "User interface": "Giao diện người dùng",
+  "Values preset in this form will override user submitted ones when continue or reject.": "Các giá trị đã đặt trước trong biểu mẫu này sẽ ghi đè lên những giá trị người dùng gửi khi tiếp tục hoặc từ chối.",
+  "View user interface": "Xem giao diện người dùng",
+  "Workflow todos": "Công việc cần làm của quy trình"
+}

package/dist/locale/zh-CN.json

@@ -1,35 +1,36 @@
 {
-  "Manual": "人工处理",
-  "Could be used for manually submitting data, and determine whether to continue or exit. Workflow will generate a todo item for assigned user when it reaches a manual node, and continue processing after user submits the form.": "可用于人工提交数据，并决定是否继续或退出流程。工作流在执行到人工节点时会为被指派的用户生成待办事项，直到用户提交对应表单后继续处理该流程。",
-  "Values preset in this form will override user submitted ones when continue or reject.": "表单中预设的字段值会在用户提交继续或拒绝时覆盖相应字段的值。",
+  "All pass": "全部通过",
+  "Any pass": "任意通过",
+  "Anyone pass": "任何一人通过即通过",
   "Assignee": "负责人",
   "Assignees": "负责人",
-  "User interface": "操作界面",
+  "Collaboratively": "协作处理",
   "Configure user interface": "配置界面",
-  "View user interface": "查看界面",
-  "Separately": "分别处理",
+  "Continue the process": "继续流程",
+  "Could be used for manually submitting data, and determine whether to continue or exit. Workflow will generate a todo item for assigned user when it reaches a manual node, and continue processing after user submits the form.": "可用于人工提交数据，并决定是否继续或退出流程。工作流在执行到人工节点时会为被指派的用户生成待办事项，直到用户提交对应表单后继续处理该流程。",
+  "Create record form": "新增数据表单",
+  "Custom form": "自定义表单",
+  "Data record": "数据记录",
   "Each user has own task": "每个人处理各自的任务",
-  "Collaboratively": "协作处理",
   "Everyone shares one task": "所有人共享同一个任务",
-  "Negotiation": "协商机制",
-  "All pass": "全部通过",
   "Everyone should pass": "每个人通过才通过",
-  "Any pass": "任意通过",
-  "Anyone pass": "任何一人通过即通过",
   "Field name existed in form": "表单中已有对应标识的字段",
-  "Continue the process": "继续流程",
-  "Terminate the process": "终止流程",
-  "Save temporarily": "暂存",
-  "Custom form": "自定义表单",
-  "Data record": "数据记录",
-  "Create record form": "新增数据表单",
-  "Update record form": "更新数据表单",
   "Filter settings": "筛选设置",
-  "Workflow todos": "工作流待办",
-  "Task node": "任务节点",
-  "Unprocessed": "未处理",
-  "Please check one of your update record form, and add at least one filter condition in form settings.": "请检查您的其中的更新数据表单，并在表单设置中至少添加一个筛选条件。",
+  "Manual": "人工处理",
   "My manual tasks": "我的人工任务",
+  "Negotiation": "协商机制",
+  "Please check one of your update record form, and add at least one filter condition in form settings.": "请检查您的其中的更新数据表单，并在表单设置中至少添加一个筛选条件。",
+  "Save temporarily": "暂存",
+  "Separately": "分别处理",
+  "Task": "Task",
+  "Task node": "任务节点",
   "Task title": "任务名称",
-  "Title of each task item. Default to node title.": "每项任务的名称。默认为节点名称。"
-}
+  "Terminate the process": "终止流程",
+  "Title of each task item. Default to node title.": "每项任务的名称。默认为节点名称。",
+  "Unprocessed": "未处理",
+  "Update record form": "更新数据表单",
+  "User interface": "操作界面",
+  "Values preset in this form will override user submitted ones when continue or reject.": "表单中预设的字段值会在用户提交继续或拒绝时覆盖相应字段的值。",
+  "View user interface": "查看界面",
+  "Workflow todos": "工作流待办"
+}

package/dist/locale/zh-TW.json

@@ -0,0 +1,36 @@
+{
+  "All pass": "All pass",
+  "Any pass": "Any pass",
+  "Anyone pass": "Anyone pass",
+  "Assignee": "Assignee",
+  "Assignees": "Assignees",
+  "Collaboratively": "Collaboratively",
+  "Configure user interface": "Configure user interface",
+  "Continue the process": "Continue the process",
+  "Could be used for manually submitting data, and determine whether to continue or exit. Workflow will generate a todo item for assigned user when it reaches a manual node, and continue processing after user submits the form.": "Could be used for manually submitting data, and determine whether to continue or exit. Workflow will generate a todo item for assigned user when it reaches a manual node, and continue processing after user submits the form.",
+  "Create record form": "Create record form",
+  "Custom form": "Custom form",
+  "Data record": "Data record",
+  "Each user has own task": "Each user has own task",
+  "Everyone shares one task": "Everyone shares one task",
+  "Everyone should pass": "Everyone should pass",
+  "Field name existed in form": "Field name existed in form",
+  "Filter settings": "Filter settings",
+  "Manual": "Manual",
+  "My manual tasks": "My manual tasks",
+  "Negotiation": "Negotiation",
+  "Please check one of your update record form, and add at least one filter condition in form settings.": "Please check one of your update record form, and add at least one filter condition in form settings.",
+  "Save temporarily": "Save temporarily",
+  "Separately": "Separately",
+  "Task": "Task",
+  "Task node": "Task node",
+  "Task title": "Task title",
+  "Terminate the process": "Terminate the process",
+  "Title of each task item. Default to node title.": "Title of each task item. Default to node title.",
+  "Unprocessed": "Unprocessed",
+  "Update record form": "Update record form",
+  "User interface": "User interface",
+  "Values preset in this form will override user submitted ones when continue or reject.": "Values preset in this form will override user submitted ones when continue or reject.",
+  "View user interface": "View user interface",
+  "Workflow todos": "Workflow todos"
+}

package/dist/server/Plugin.js

@@ -47,12 +47,10 @@ var import_constants = require("../common/constants");
 class Plugin_default extends import_server.Plugin {
   onTaskSave = async (task, { transaction }) => {
     const workflowPlugin = this.app.pm.get(import_plugin_workflow.default);
-    const workflowId = Array.from(workflowPlugin.enabledCache.keys());
     const ModelClass = task.constructor;
     const pending = await ModelClass.count({
       where: {
         userId: task.userId,
-        workflowId,
         status: import_constants.TASK_STATUS.PENDING
       },
       include: [
@@ -71,8 +69,7 @@ class Plugin_default extends import_server.Plugin {
     });
     const all = await ModelClass.count({
       where: {
-        userId: task.userId,
-        workflowId
+        userId: task.userId
       },
       col: "id",
       transaction
@@ -87,6 +84,9 @@ class Plugin_default extends import_server.Plugin {
     if (!execution.workflow) {
       execution.workflow = workflowPlugin.enabledCache.get(execution.workflowId) || await execution.getWorkflow({ transaction });
     }
+    if (!execution.workflow) {
+      return;
+    }
     if (!execution.workflow.nodes) {
       execution.workflow.nodes = await execution.workflow.getNodes({ transaction });
     }
@@ -113,8 +113,7 @@ class Plugin_default extends import_server.Plugin {
     const pendingCounts = await WorkflowManualTaskModel.count({
       where: {
         status: import_constants.TASK_STATUS.PENDING,
-        userId,
-        workflowId: execution.workflowId
+        userId
       },
       include: [
         {
@@ -132,8 +131,7 @@ class Plugin_default extends import_server.Plugin {
     });
     const allCounts = await WorkflowManualTaskModel.count({
       where: {
-        userId,
-        workflowId: execution.workflowId
+        userId
       },
       col: "id",
       group: ["userId"],
@@ -261,12 +259,11 @@ class Plugin_default extends import_server.Plugin {
       name: "workflowManualTasks",
       actions: jobActions
     });
-    this.app.acl.allow("workflowManualTasks", ["list", "listMine", "get", "submit"], "loggedIn");
+    this.app.acl.allow("workflowManualTasks", ["listMine", "get", "submit"], "loggedIn");
     const workflowPlugin = this.app.pm.get(import_plugin_workflow.default);
     workflowPlugin.registerInstruction("manual", import_ManualInstruction.default);
     this.db.on("workflowManualTasks.afterSave", this.onTaskSave);
     this.db.on("workflowManualTasks.afterDestroy", this.onTaskSave);
     this.db.on("executions.afterUpdate", this.onExecutionStatusChange);
-    this.db.on("workflows.afterUpdate", this.onWorkflowStatusChange);
   }
 }

package/package.json

@@ -1,13 +1,16 @@
 {
   "name": "@nocobase/plugin-workflow-manual",
   "displayName": "Workflow: Manual node",
+  "displayName.ru-RU": "Рабочий процесс: Узел ручной обработки",
   "displayName.zh-CN": "工作流：人工处理节点",
   "description": "Could be used for workflows which some of decisions are made by users.",
+  "description.ru-RU": "Может использоваться в рабочих процессах, где какие-то решения принимаются пользователями.",
   "description.zh-CN": "用于人工控制部分决策的流程。",
-  "version": "2.0.0-alpha.9",
+  "version": "2.0.0-beta.10",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/workflow-manual",
+  "homepage.ru-RU": "https://docs-ru.nocobase.com/handbook/workflow-manual",
   "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/workflow-manual",
   "devDependencies": {
     "@ant-design/icons": "5.x",
@@ -30,7 +33,7 @@
     "@nocobase/test": "2.x",
     "@nocobase/utils": "2.x"
   },
-  "gitHead": "4a9acf96f21a3aa35bccbd188b942595b09da0a9",
+  "gitHead": "9943dc4b0fdedcac3f304714b58635ae441e2560",
   "keywords": [
     "Workflow"
   ]