@tachybase/plugin-workflow-approval 1.6.0 → 1.6.3

package/dist/server/triggers/Approval.js

@@ -32,15 +32,29 @@ const _ApprovalTrigger = class _ApprovalTrigger extends import_module_workflow.T
     super(workflow);
     this.sync = false;
     this.triggerHandler = async (approval, { transaction }) => {
-      const workflow = await approval.getWorkflow({
+      let workflow = await approval.getWorkflow({
         where: {
           id: approval.get("workflowId"),
-          type: _ApprovalTrigger.TYPE,
           enabled: true,
+          type: _ApprovalTrigger.TYPE,
           "config.collection": approval.collectionName
         },
         transaction
       });
+      if (!workflow && approval.get("workflowKey")) {
+        workflow = await this.workflow.db.getRepository("workflows").findOne({
+          filter: {
+            key: approval.get("workflowKey"),
+            enabled: true,
+            type: _ApprovalTrigger.TYPE,
+            "config.collection": approval.collectionName
+          },
+          transaction
+        });
+        if (workflow) {
+          await approval.update({ workflowId: workflow.id }, { transaction, hooks: false });
+        }
+      }
       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
@@ -175,26 +189,26 @@ const _ApprovalTrigger = class _ApprovalTrigger extends import_module_workflow.T
       await approval.update({ status }, { transaction });
       await approvalExecution.update({ status: execution.status }, { transaction });
     };
-    this.middleware = async (context, next) => {
-      if (!context.action) {
+    this.middleware = async (ctx, next) => {
+      if (!ctx.action) {
         return;
       }
       const {
         resourceName,
         actionName,
         params: { triggerWorkflows, beforeWorkflows }
-      } = context.action;
+      } = ctx.action;
       if (beforeWorkflows) {
-        this.collectionTriggerAction(context, beforeWorkflows);
+        this.collectionTriggerAction(ctx, beforeWorkflows);
       }
       if (resourceName === "workflows" && actionName === "trigger") {
-        return this.workflowTriggerAction(context, next);
+        return this.workflowTriggerAction(ctx, next);
       }
       await next();
       if (!triggerWorkflows || !["create", "update"].includes(actionName)) {
         return;
       }
-      this.collectionTriggerAction(context, triggerWorkflows);
+      this.collectionTriggerAction(ctx, triggerWorkflows);
     };
     const { db } = workflow.app;
     db.on("approvals.afterSave", this.triggerHandler);
@@ -202,10 +216,10 @@ const _ApprovalTrigger = class _ApprovalTrigger extends import_module_workflow.T
     db.on("executions.afterUpdate", this.onExecutionUpdate);
     workflow.app.use(this.middleware, { tag: "workflow-trigger", after: "dataSource" });
   }
-  async workflowTriggerAction(context, next) {
-    const { triggerWorkflows, values } = context.action.params;
+  async workflowTriggerAction(ctx, next) {
+    const { triggerWorkflows, values } = ctx.action.params;
     if (!triggerWorkflows) {
-      return context.throw(400);
+      return ctx.throw(400);
     }
     const triggers = triggerWorkflows.split(",").map((trigger) => trigger.split("!"));
     const workflowRepo = this.workflow.db.getRepository("workflows");
@@ -217,7 +231,7 @@ const _ApprovalTrigger = class _ApprovalTrigger extends import_module_workflow.T
         enabled: true
       }
     });
-    context.status = 202;
+    ctx.status = 202;
     await next();
     workflows.forEach(async (workflow) => {
       const trigger = triggers.find((trigger2) => trigger2[0] === workflow.key);
@@ -229,7 +243,7 @@ const _ApprovalTrigger = class _ApprovalTrigger extends import_module_workflow.T
           // createdBy: currentUser.id,
           // updatedById: currentUser.id,
         },
-        context
+        context: ctx
       });
       const approvalRepo = this.workflow.db.getRepository("approvals");
       await approvalRepo.create({
@@ -250,12 +264,12 @@ const _ApprovalTrigger = class _ApprovalTrigger extends import_module_workflow.T
             app: this.workflow.app
           })
         },
-        context
+        context: ctx
       });
     });
   }
-  async collectionTriggerAction(context, workflowList) {
-    const dataSourceHeader = context.get("x-data-source") || "main";
+  async collectionTriggerAction(ctx, workflowList) {
+    const dataSourceHeader = ctx.get("x-data-source") || "main";
     const approvalRepo = this.workflow.db.getRepository("approvals");
     const triggers = workflowList.split(",").map((trigger) => trigger.split("!"));
     const triggersKeysMap = new Map(triggers);
@@ -265,7 +279,7 @@ const _ApprovalTrigger = class _ApprovalTrigger extends import_module_workflow.T
     for (const workflow of workflows) {
       const [dataSourceName, collectionName] = (0, import_server.parseCollectionName)(workflow.config.collection);
       const trigger = triggers.find((trigger2) => trigger2[0] === workflow.key);
-      const { body: data } = context;
+      const { body: data } = ctx;
       if (!data) {
         return;
       }
@@ -293,7 +307,7 @@ const _ApprovalTrigger = class _ApprovalTrigger extends import_module_workflow.T
             }
           }
         }
-        const collection = context.app.dataSourceManager.dataSources.get(dataSourceName).collectionManager.getCollection(collectionName);
+        const collection = ctx.tego.dataSourceManager.dataSources.get(dataSourceName).collectionManager.getCollection(collectionName);
         if (!collection || collection.model !== payload.constructor) {
           return;
         }
@@ -307,15 +321,15 @@ const _ApprovalTrigger = class _ApprovalTrigger extends import_module_workflow.T
             // updatedBy: currentUser.id,
             workflowId: workflow.id,
             workflowKey: workflow.key,
-            applicantRoleName: context.state.currentRole,
+            applicantRoleName: ctx.state.currentRole,
             summary: (0, import_tools.getSummary)({
               summaryConfig: workflow.config.summary,
               data: dataCurrent,
               collection,
-              app: context.app
+              app: ctx.app
             })
           },
-          context
+          context: ctx
         });
       });
     }

package/dist/server/utils.d.ts

@@ -1,3 +1,3 @@
 export declare function findUniqueObjects(sourceArray: any[], uniqueByArray: string[], compareByKey?: string, compareByFunc?: (a: any, b: any) => number): any[];
-export declare function getWorkflow(context: any, workflowId: any): Promise<any>;
-export declare function getWorkflowByKey(context: any, workflowKey: any): Promise<any>;
+export declare function getWorkflow(ctx: any, workflowId: any): Promise<any>;
+export declare function getWorkflowByKey(ctx: any, workflowKey: any): Promise<any>;

package/dist/server/utils.js

@@ -35,17 +35,17 @@ function findUniqueObjects(sourceArray = [], uniqueByArray, compareByKey = "", c
   result = Object.values(uniqueMap);
   return result;
 }
-async function getWorkflow(context, workflowId) {
+async function getWorkflow(ctx, workflowId) {
   if (workflowId) {
-    return await context.db.getRepository("workflows").findOne({
+    return await ctx.db.getRepository("workflows").findOne({
       filterByTk: workflowId
     });
   }
   return null;
 }
-async function getWorkflowByKey(context, workflowKey) {
+async function getWorkflowByKey(ctx, workflowKey) {
   if (workflowKey) {
-    return await context.db.getRepository("workflows").findOne({
+    return await ctx.db.getRepository("workflows").findOne({
       filter: {
         key: workflowKey,
         enabled: true

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tachybase/plugin-workflow-approval",
   "displayName": "Approval",
-  "version": "1.6.0",
+  "version": "1.6.3",
   "description": "Approval base in Workflow",
   "keywords": [
     "Approval",
@@ -9,11 +9,11 @@
   ],
   "main": "dist/server/index.js",
   "devDependencies": {
-    "@ant-design/icons": "^5.6.1",
-    "@tachybase/schema": "1.3.52",
-    "@tachybase/test": "1.3.52",
-    "@tego/client": "1.3.52",
-    "@tego/server": "1.3.52",
+    "@ant-design/icons": "^6.1.0",
+    "@tachybase/schema": "1.6.1",
+    "@tachybase/test": "1.6.1",
+    "@tego/client": "1.6.1",
+    "@tego/server": "1.6.1",
     "@types/file-saver": "^2.0.7",
     "@types/lodash": "^4.17.20",
     "ahooks": "^3.9.0",
@@ -27,9 +27,9 @@
     "react-i18next": "16.2.1",
     "react-router-dom": "6.28.1",
     "sequelize": "6.37.5",
-    "@tachybase/client": "1.6.0",
-    "@tachybase/module-workflow": "1.6.0",
-    "@tachybase/module-ui-schema": "1.6.0"
+    "@tachybase/module-workflow": "1.6.3",
+    "@tachybase/module-ui-schema": "1.6.3",
+    "@tachybase/client": "1.6.3"
   },
   "description.zh-CN": "审批系统是一个强大的BPM工具，为业务流程自动化提供基础支持，同时具备高度灵活性和可扩展性，确保审批流程的效率和合规性，助力企业释放创新潜力。",
   "displayName.zh-CN": "审批"