@tachybase/plugin-workflow-approval 0.23.41 → 0.23.47

package/dist/client/usage/h5/todos/component/TabApprovalItem.d.ts

@@ -1,3 +1,2 @@
-import React from 'react';
-export declare const TabApprovalItem: React.MemoExoticComponent<import("@tachybase/schema").ReactFC<unknown>>;
+export declare const TabApprovalItem: import("react").MemoExoticComponent<import("@tachybase/schema").ReactFC<unknown>>;
 export declare const changeWorkflowNoticeService: (api: any, t: any, cm: any, compile: any, input: any, setData: any, params: any, filter: any, user: any) => void;

package/dist/externalVersion.js

@@ -1,18 +1,18 @@
 module.exports = {
-  "@tachybase/client": "0.23.41",
-  "@tachybase/module-workflow": "0.23.41",
-  "@tachybase/server": "0.23.41",
+  "@tachybase/client": "0.23.47",
+  "@tachybase/module-workflow": "0.23.47",
+  "@tachybase/server": "0.23.47",
   "lodash": "4.17.21",
   "react": "18.3.1",
-  "@tachybase/schema": "0.23.41",
+  "@tachybase/schema": "0.23.47",
   "antd": "5.22.5",
-  "@tachybase/actions": "0.23.41",
-  "@tachybase/database": "0.23.41",
-  "@tachybase/data-source": "0.23.41",
-  "@tachybase/module-ui-schema": "0.23.41",
-  "@tachybase/utils": "0.23.41",
+  "@tachybase/actions": "0.23.47",
+  "@tachybase/database": "0.23.47",
+  "@tachybase/data-source": "0.23.47",
+  "@tachybase/module-ui-schema": "0.23.47",
+  "@tachybase/utils": "0.23.47",
   "sequelize": "6.37.5",
-  "@tachybase/components": "0.23.41",
+  "@tachybase/components": "0.23.47",
   "@ant-design/icons": "5.3.7",
   "ahooks": "3.8.4",
   "react-router-dom": "6.28.1"

package/dist/locale/en-US.json

@@ -34,6 +34,7 @@
   "Approval Summary": "Approval Summary",
   "Approval applications": "Approval applications",
   "Approval blocks": "Approval blocks",
+  "Approval flow": "Approval flow",
   "Approval process": "Approval process",
   "Approval todos": "Approval todos",
   "ApprovalCarbonCopy": "Approval:CarbonCopy",
@@ -225,6 +226,7 @@
   "Repeat mode": "Repeat mode",
   "Resource": "Resource",
   "Resubmit": "Resubmit",
+  "Retry": "Retry",
   "Return": "Return",
   "Returnable": "Returnable",
   "Returned": "Returned",

package/dist/locale/zh-CN.json

@@ -34,12 +34,13 @@
   "Apply new": "发起新申请",
   "Approval": "审批",
   "Approval Carbon Copy": "审批抄送",
-  "Approval ID": "单据编号",
+  "Approval ID": "审批编号",
   "Approval Launch": "审批发起",
   "Approval Summary": "审批摘要",
   "Approval applications": "审批申请",
   "Approval blocks": "审批卡片",
   "Approval event": "审批事件",
+  "Approval flow": "审批流",
   "Approval process": "审批处理",
   "Approval todos": "审批待办",
   "ApprovalCarbonCopy": "审批:抄送",
@@ -272,6 +273,7 @@
   "Resolved": "完成",
   "Resource": "数据表",
   "Resubmit": "复制",
+  "Retry": "重试",
   "Retry needed": "需重试",
   "Return": "退回",
   "Returnable": "可退回",

package/dist/server/actions/approvals.js

@@ -39,7 +39,7 @@ var import_status = require("../constants/status");
 var import_tools = require("../tools");
 const approvals = {
   async create(context, next) {
-    const { status, collectionName, data, workflowId } = context.action.params.values ?? {};
+    const { status, collectionName, data, workflowKey } = context.action.params.values ?? {};
     const [dataSourceName, cName] = (0, import_data_source.parseCollectionName)(collectionName);
     const dataSource = context.app.dataSourceManager.dataSources.get(dataSourceName);
     if (!dataSource) {
@@ -50,9 +50,12 @@ const approvals = {
       return context.throw(400, `Collection "${cName}" not found`);
     }
     const workflow = await context.db.getRepository("workflows").findOne({
-      filterByTk: workflowId
+      filter: {
+        key: workflowKey,
+        enabled: true
+      }
     });
-    if (!(workflow == null ? void 0 : workflow.enabled)) {
+    if (!workflow) {
       return context.throw(400, "Current workflow not found or disabled, please refresh and try again");
     }
     if (status !== import_status.APPROVAL_STATUS.DRAFT) {
@@ -88,6 +91,7 @@ const approvals = {
         data: instance,
         dataKey: values[collection.filterTargetKey],
         workflowKey: workflow.key,
+        workflowId: workflow.id,
         applicantRoleName: context.state.currentRole,
         summary
       }
@@ -291,13 +295,16 @@ const approvals = {
     }
     const assignees = approval.records.map((record) => record.userId);
     for (const userId of assignees) {
+      const [dataSourceName] = (0, import_data_source.parseCollectionName)(approval.collectionName);
+      const collection = this.workflow.app.dataSourceManager.dataSources.get(dataSourceName).collectionManager.getCollection(approval.collectionName);
       const message = {
         userId,
         title: `{{t("Approval", { ns: '${import_constants.NAMESPACE}' })}}`,
         content: `{{t("{{user}} reminder", { ns: "${import_constants.NAMESPACE}", user: "${approval.createdBy.nickname}" })}}`,
         collectionName: approval.collectionName,
         jsonContent: approval.summary,
-        schemaName: (_c = approval.workflow) == null ? void 0 : _c.config.applyDetail
+        schemaName: (_c = approval.workflow) == null ? void 0 : _c.config.applyDetail,
+        dataKey: approval.data[collection.filterTargetKey]
       };
       context.app.messageManager.sendMessage(+userId, message);
     }

package/dist/server/instructions/Approval.js

@@ -84,13 +84,16 @@ class ApprovalInstruction extends import_module_workflow.Instruction {
       }
     );
     for (const userId of assignees) {
+      const [dataSourceName] = (0, import_data_source.parseCollectionName)(approval.collectionName);
+      const collection = this.workflow.app.dataSourceManager.dataSources.get(dataSourceName).collectionManager.getCollection(approval.collectionName);
       const message = {
         userId,
         title: '{{t("Approval", { ns: "@tachybase/plugin-workflow-approval" })}}',
         content: "",
         collectionName: approval.collectionName,
         jsonContent: approval.summary,
-        schemaName: node.config.applyDetail
+        schemaName: node.config.applyDetail,
+        dataKey: approval.data[collection.filterTargetKey]
       };
       this.workflow.app.messageManager.sendMessage(+userId, message);
     }

package/dist/server/instructions/ApprovalCarbonCopy.js

@@ -20,6 +20,7 @@ __export(ApprovalCarbonCopy_exports, {
   default: () => ApprovalCarbonCopyInstruction
 });
 module.exports = __toCommonJS(ApprovalCarbonCopy_exports);
+var import_data_source = require("@tachybase/data-source");
 var import_module_workflow = require("@tachybase/module-workflow");
 var import_constants = require("../../common/constants");
 var import_status = require("../constants/status");
@@ -68,13 +69,16 @@ class ApprovalCarbonCopyInstruction extends import_module_workflow.Instruction {
           transaction: processor.transaction
         });
         for (const userId of targetPersonList) {
+          const [dataSourceName] = (0, import_data_source.parseCollectionName)(approval.collectionName);
+          const collection = this.workflow.app.dataSourceManager.dataSources.get(dataSourceName).collectionManager.getCollection(approval.collectionName);
           const message = {
             userId,
             title: '{{t("Approval Carbon Copy", { ns: "@tachybase/plugin-workflow-approval" })}}',
             content: "",
             jsonContent: approval.summary,
             collectionName: approval.collectionName,
-            schemaName: node.config.showCarbonCopyDetail
+            schemaName: node.config.showCarbonCopyDetail,
+            dataKey: approval.data[collection.filterTargetKey]
           };
           this.workflow.app.messageManager.sendMessage(+userId, message);
         }

package/dist/server/plugin.js

@@ -40,7 +40,6 @@ var import_Approval = __toESM(require("./instructions/Approval"));
 var import_ApprovalCarbonCopy = __toESM(require("./instructions/ApprovalCarbonCopy"));
 var import_Approval2 = __toESM(require("./triggers/Approval"));
 class PluginWorkflowApproval extends import_server.Plugin {
-  workflow;
   afterAdd() {
   }
   beforeLoad() {

package/dist/server/triggers/Approval.js

@@ -28,155 +28,154 @@ var import_sequelize = require("sequelize");
 var import_status = require("../constants/status");
 var import_tools = require("../tools");
 var import_tools2 = require("./tools");
-class ApprovalTrigger extends import_module_workflow.Trigger {
-  static TYPE = "approval";
-  sync = false;
-  triggerHandler = async (approval, { transaction }) => {
-    const workflow = await approval.getWorkflow({
-      where: {
-        id: approval.get("workflowId"),
-        type: ApprovalTrigger.TYPE,
-        enabled: true,
-        "config.collection": approval.collectionName
-      },
-      transaction
-    });
-    const isChangedStatus = approval.changed("status");
-    const isAllowStatusList = [import_status.APPROVAL_STATUS.DRAFT, import_status.APPROVAL_STATUS.SUBMITTED, import_status.APPROVAL_STATUS.RESUBMIT].includes(
-      approval.status
-    );
-    const previousApprovalStatus = approval.previous("status");
-    const currentApprovalStatus = approval.status;
-    const forbiddenList = [
-      [import_status.APPROVAL_STATUS.SUBMITTED, import_status.APPROVAL_STATUS.DRAFT],
-      // 撤回情况
-      [void 0, import_status.APPROVAL_STATUS.DRAFT]
-      // 保存草稿情况
-    ];
-    const isForbiddenWhenStatusChange = forbiddenList.some(
-      ([prev, curr]) => prev === previousApprovalStatus && curr === currentApprovalStatus
-    );
-    if (!workflow || !isChangedStatus || !isAllowStatusList || isForbiddenWhenStatusChange) {
-      return;
-    }
-    const [dataSourceName, collectionName] = (0, import_data_source.parseCollectionName)(approval.collectionName);
-    const { repository } = this.workflow.app.dataSourceManager.dataSources.get(dataSourceName).collectionManager.getCollection(collectionName);
-    const data = await repository.findOne({
-      filterByTk: approval.get("dataKey"),
-      appends: workflow.config.appends,
-      transaction: this.workflow.useDataSourceTransaction(dataSourceName, transaction)
-    });
-    this.workflow.trigger(
-      workflow,
-      {
-        data: (0, import_module_workflow.toJSON)(data),
-        approvalId: approval.id,
-        applicantRoleName: approval.applicantRoleName,
-        summary: (0, import_tools.getSummary)({
-          summaryConfig: workflow.config.summary,
-          data
-        }),
-        collectionName: approval.collectionName
-      },
-      { transaction }
-    );
-  };
-  onExecutionCreate = async (execution, { transaction }) => {
-    const workflow = await execution.getWorkflow({ transaction });
-    if (workflow.type !== ApprovalTrigger.TYPE) {
-      return;
-    }
-    const { approvalId, data, summary, collectionName } = execution.context;
-    const ApprovalExecutionRepo = this.workflow.db.getRepository("approvalExecutions");
-    const approvalExecution = await ApprovalExecutionRepo.create({
-      values: {
-        approvalId,
-        executionId: execution.id,
-        status: execution.status,
-        snapshot: data,
-        summary,
-        collectionName
-      },
-      transaction
-    });
-    const ApprovalsRepo = this.workflow.db.getRepository("approvals");
-    await ApprovalsRepo.update({
-      filterByTk: approvalId,
-      values: { latestExecutionId: approvalExecution.id },
-      transaction
-    });
-  };
-  onExecutionUpdate = async (execution, { transaction }) => {
-    if (!execution.workflow) {
-      execution.workflow = await execution.getWorkflow({ transaction });
-    }
-    if (!execution.status || execution.workflow.type !== ApprovalTrigger.TYPE) {
-      return;
-    }
-    const approvalExecution = await this.workflow.db.getRepository("approvalExecutions").findOne({
-      filter: {
-        executionId: execution.id,
-        approvalId: execution.context.approvalId
-      },
-      appends: ["approval"],
-      transaction
-    });
-    const { approval } = approvalExecution;
-    if (![import_status.APPROVAL_STATUS.SUBMITTED, import_status.APPROVAL_STATUS.PROCESSING].includes(approval.status)) {
-      return;
-    }
-    let status = import_status.APPROVAL_STATUS.APPROVED;
-    if (execution.status === import_module_workflow.EXECUTION_STATUS.RESOLVED) {
-      const [approvalNodeJob] = await execution.getJobs({
+const _ApprovalTrigger = class _ApprovalTrigger extends import_module_workflow.Trigger {
+  constructor(workflow) {
+    super(workflow);
+    this.sync = false;
+    this.triggerHandler = async (approval, { transaction }) => {
+      const workflow = await approval.getWorkflow({
         where: {
-          status: {
-            [import_sequelize.Op.ne]: import_module_workflow.JOB_STATUS.PENDING
-          }
+          id: approval.get("workflowId"),
+          type: _ApprovalTrigger.TYPE,
+          enabled: true,
+          "config.collection": approval.collectionName
         },
-        include: [
-          {
-            association: "node",
-            where: {
-              type: "approval"
-            },
-            required: true
-          }
-        ],
-        order: [["updatedAt", "DESC"]],
-        limit: 1,
         transaction
       });
-      if (approvalNodeJob && import_tools2.ApprovalJobStatusMap[approvalNodeJob.result] != null) {
-        status = import_tools2.ApprovalJobStatusMap[approvalNodeJob.result];
+      const isChangedStatus = approval.changed("status");
+      const isAllowStatusList = [import_status.APPROVAL_STATUS.DRAFT, import_status.APPROVAL_STATUS.SUBMITTED, import_status.APPROVAL_STATUS.RESUBMIT].includes(
+        approval.status
+      );
+      const previousApprovalStatus = approval.previous("status");
+      const currentApprovalStatus = approval.status;
+      const forbiddenList = [
+        [import_status.APPROVAL_STATUS.SUBMITTED, import_status.APPROVAL_STATUS.DRAFT],
+        // 撤回情况
+        [void 0, import_status.APPROVAL_STATUS.DRAFT]
+        // 保存草稿情况
+      ];
+      const isForbiddenWhenStatusChange = forbiddenList.some(
+        ([prev, curr]) => prev === previousApprovalStatus && curr === currentApprovalStatus
+      );
+      if (!workflow || !isChangedStatus || !isAllowStatusList || isForbiddenWhenStatusChange) {
+        return;
       }
-    } else {
-      if (import_tools2.ExecutionStatusMap[execution.status] != null) {
-        status = import_tools2.ExecutionStatusMap[execution.status];
+      const [dataSourceName, collectionName] = (0, import_data_source.parseCollectionName)(approval.collectionName);
+      const { repository } = this.workflow.app.dataSourceManager.dataSources.get(dataSourceName).collectionManager.getCollection(collectionName);
+      const data = await repository.findOne({
+        filterByTk: approval.get("dataKey"),
+        appends: workflow.config.appends,
+        transaction: this.workflow.useDataSourceTransaction(dataSourceName, transaction)
+      });
+      this.workflow.trigger(
+        workflow,
+        {
+          data: (0, import_module_workflow.toJSON)(data),
+          approvalId: approval.id,
+          applicantRoleName: approval.applicantRoleName,
+          summary: (0, import_tools.getSummary)({
+            summaryConfig: workflow.config.summary,
+            data
+          }),
+          collectionName: approval.collectionName
+        },
+        { transaction }
+      );
+    };
+    this.onExecutionCreate = async (execution, { transaction }) => {
+      const workflow = await execution.getWorkflow({ transaction });
+      if (workflow.type !== _ApprovalTrigger.TYPE) {
+        return;
       }
-    }
-    await approval.update({ status }, { transaction });
-    await approvalExecution.update({ status: execution.status }, { transaction });
-  };
-  middleware = async (context, next) => {
-    if (!context.action) {
-      return;
-    }
-    const {
-      resourceName,
-      actionName,
-      params: { triggerWorkflows }
-    } = context.action;
-    if (resourceName === "workflows" && actionName === "trigger") {
-      return this.workflowTriggerAction(context, next);
-    }
-    await next();
-    if (!triggerWorkflows || !["create", "update"].includes(actionName)) {
-      return;
-    }
-    this.collectionTriggerAction(context);
-  };
-  constructor(workflow) {
-    super(workflow);
+      const { approvalId, data, summary, collectionName } = execution.context;
+      const ApprovalExecutionRepo = this.workflow.db.getRepository("approvalExecutions");
+      const approvalExecution = await ApprovalExecutionRepo.create({
+        values: {
+          approvalId,
+          executionId: execution.id,
+          status: execution.status,
+          snapshot: data,
+          summary,
+          collectionName
+        },
+        transaction
+      });
+      const ApprovalsRepo = this.workflow.db.getRepository("approvals");
+      await ApprovalsRepo.update({
+        filterByTk: approvalId,
+        values: { latestExecutionId: approvalExecution.id },
+        transaction
+      });
+    };
+    this.onExecutionUpdate = async (execution, { transaction }) => {
+      if (!execution.workflow) {
+        execution.workflow = await execution.getWorkflow({ transaction });
+      }
+      if (!execution.status || execution.workflow.type !== _ApprovalTrigger.TYPE) {
+        return;
+      }
+      const approvalExecution = await this.workflow.db.getRepository("approvalExecutions").findOne({
+        filter: {
+          executionId: execution.id,
+          approvalId: execution.context.approvalId
+        },
+        appends: ["approval"],
+        transaction
+      });
+      const { approval } = approvalExecution;
+      if (![import_status.APPROVAL_STATUS.SUBMITTED, import_status.APPROVAL_STATUS.PROCESSING].includes(approval.status)) {
+        return;
+      }
+      let status = import_status.APPROVAL_STATUS.APPROVED;
+      if (execution.status === import_module_workflow.EXECUTION_STATUS.RESOLVED) {
+        const [approvalNodeJob] = await execution.getJobs({
+          where: {
+            status: {
+              [import_sequelize.Op.ne]: import_module_workflow.JOB_STATUS.PENDING
+            }
+          },
+          include: [
+            {
+              association: "node",
+              where: {
+                type: "approval"
+              },
+              required: true
+            }
+          ],
+          order: [["updatedAt", "DESC"]],
+          limit: 1,
+          transaction
+        });
+        if (approvalNodeJob && import_tools2.ApprovalJobStatusMap[approvalNodeJob.result] != null) {
+          status = import_tools2.ApprovalJobStatusMap[approvalNodeJob.result];
+        }
+      } else {
+        if (import_tools2.ExecutionStatusMap[execution.status] != null) {
+          status = import_tools2.ExecutionStatusMap[execution.status];
+        }
+      }
+      await approval.update({ status }, { transaction });
+      await approvalExecution.update({ status: execution.status }, { transaction });
+    };
+    this.middleware = async (context, next) => {
+      if (!context.action) {
+        return;
+      }
+      const {
+        resourceName,
+        actionName,
+        params: { triggerWorkflows }
+      } = context.action;
+      if (resourceName === "workflows" && actionName === "trigger") {
+        return this.workflowTriggerAction(context, next);
+      }
+      await next();
+      if (!triggerWorkflows || !["create", "update"].includes(actionName)) {
+        return;
+      }
+      this.collectionTriggerAction(context);
+    };
     const { db } = workflow.app;
     db.on("approvals.afterSave", this.triggerHandler);
     db.on("executions.afterCreate", this.onExecutionCreate);
@@ -192,7 +191,7 @@ class ApprovalTrigger extends import_module_workflow.Trigger {
     const workflowRepo = this.workflow.db.getRepository("workflows");
     const workflows = await workflowRepo.find({
       filter: {
-        type: ApprovalTrigger.TYPE,
+        type: _ApprovalTrigger.TYPE,
         key: triggers.map((trigger) => trigger[0]),
         current: true,
         enabled: true
@@ -239,7 +238,7 @@ class ApprovalTrigger extends import_module_workflow.Trigger {
     const triggers = triggerWorkflows.split(",").map((trigger) => trigger.split("!"));
     const triggersKeysMap = new Map(triggers);
     const workflows = Array.from(this.workflow.enabledCache.values()).filter(
-      (item) => item.type === ApprovalTrigger.TYPE && triggersKeysMap.has(item.key)
+      (item) => item.type === _ApprovalTrigger.TYPE && triggersKeysMap.has(item.key)
     );
     for (const workflow of workflows) {
       const [dataSourceName, collectionName] = (0, import_data_source.parseCollectionName)(workflow.config.collection);
@@ -315,4 +314,6 @@ class ApprovalTrigger extends import_module_workflow.Trigger {
       applyForm: result["x-uid"]
     };
   }
-}
+};
+_ApprovalTrigger.TYPE = "approval";
+let ApprovalTrigger = _ApprovalTrigger;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tachybase/plugin-workflow-approval",
   "displayName": "Approval",
-  "version": "0.23.41",
+  "version": "0.23.47",
   "description": "Approval base in Workflow",
   "keywords": [
     "Approval",
@@ -25,16 +25,16 @@
     "sequelize": "^6.37.5"
   },
   "peerDependencies": {
-    "@tachybase/actions": "0.23.41",
-    "@tachybase/client": "0.23.41",
-    "@tachybase/components": "0.23.41",
-    "@tachybase/data-source": "0.23.41",
-    "@tachybase/database": "0.23.41",
-    "@tachybase/module-workflow": "0.23.41",
-    "@tachybase/schema": "0.23.41",
-    "@tachybase/server": "0.23.41",
-    "@tachybase/test": "0.23.41",
-    "@tachybase/utils": "0.23.41"
+    "@tachybase/actions": "0.23.47",
+    "@tachybase/components": "0.23.47",
+    "@tachybase/client": "0.23.47",
+    "@tachybase/database": "0.23.47",
+    "@tachybase/data-source": "0.23.47",
+    "@tachybase/module-workflow": "0.23.47",
+    "@tachybase/schema": "0.23.47",
+    "@tachybase/server": "0.23.47",
+    "@tachybase/utils": "0.23.47",
+    "@tachybase/test": "0.23.47"
   },
   "description.zh-CN": "审批系统是一个强大的BPM工具，为业务流程自动化提供基础支持，同时具备高度灵活性和可扩展性，确保审批流程的效率和合规性，助力企业释放创新潜力。",
   "displayName.zh-CN": "审批",