@tachybase/plugin-workflow-approval 0.23.58 → 1.0.18

package/dist/client/usage/pc/block/initiations-table/CheckContent.schema.d.ts

@@ -23,6 +23,10 @@ export declare const getSchemaCheckContent: (params: any) => {
                                 noForm: boolean;
                             };
                         };
+                        timeline: {
+                            type: string;
+                            'x-component': string;
+                        };
                     };
                 };
             } & ({

package/dist/client/usage/pc/block/todos-table/CheckContent.schema.d.ts

@@ -20,6 +20,10 @@ export declare const getSchemaActionTodosContent: (params: any) => {
                         noForm: boolean;
                     };
                 };
+                timeline: {
+                    type: string;
+                    'x-component': string;
+                };
             };
         };
     } & ({

package/dist/client/usage/pc/common/ApprovalProcessTimeLine.view.d.ts

@@ -0,0 +1,4 @@
+export declare const ApprovalProcessTimeLine: (props: any) => import("react/jsx-runtime").JSX.Element;
+export declare const Process: ({ dataSource }: {
+    dataSource?: any[];
+}) => import("react/jsx-runtime").JSX.Element;

package/dist/externalVersion.js

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

package/dist/locale/zh-CN.json

@@ -384,6 +384,7 @@
   "Workflow todos": "工作流待办",
   "Workflow will be triggered before deleting succeeded.": "删除成功之前触发工作流。",
   "Workflow will be triggered before or after submitting succeeded based on workflow type.": "工作流会基于其类型在提交成功之前或之后触发。",
+  "Workflow will be triggered before or after submitting succeeded.": "工作流会在提交成功之前或之后触发。",
   "Workflow will be triggered directly once the button clicked, without data saving.": "按钮点击后直接触发工作流，但不会保存数据。",
   "comment": "备注",
   "concat": "连接",

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, workflowKey } = context.action.params.values ?? {};
+    const { status, collectionName, data, workflowId, workflowKey } = context.action.params.values ?? {};
     const [dataSourceName, cName] = (0, import_data_source.parseCollectionName)(collectionName);
     const dataSource = context.app.dataSourceManager.dataSources.get(dataSourceName);
     if (!dataSource) {
@@ -49,12 +49,19 @@ const approvals = {
     if (!collection) {
       return context.throw(400, `Collection "${cName}" not found`);
     }
-    const workflow = await context.db.getRepository("workflows").findOne({
-      filter: {
-        key: workflowKey,
-        enabled: true
-      }
-    });
+    let workflow;
+    if (workflowKey) {
+      workflow = await context.db.getRepository("workflows").findOne({
+        filter: {
+          key: workflowKey,
+          enabled: true
+        }
+      });
+    } else {
+      workflow = await context.db.getRepository("workflows").findOne({
+        filterByTk: workflowId
+      });
+    }
     if (!workflow) {
       return context.throw(400, "Current workflow not found or disabled, please refresh and try again");
     }

package/dist/server/triggers/Approval.d.ts

@@ -14,7 +14,7 @@ export default class ApprovalTrigger extends Trigger {
     middleware: (context: any, next: any) => Promise<any>;
     constructor(workflow: any);
     workflowTriggerAction(context: any, next: any): Promise<any>;
-    collectionTriggerAction(context: any): Promise<void>;
+    collectionTriggerAction(context: any, workflowList: any): Promise<void>;
     on(workflow: any): void;
     off(workflow: any): void;
     duplicateConfig(workflow: any, { transaction }: {

package/dist/server/triggers/Approval.js

@@ -49,10 +49,8 @@ const _ApprovalTrigger = class _ApprovalTrigger extends import_module_workflow.T
       const previousApprovalStatus = approval.previous("status");
       const currentApprovalStatus = approval.status;
       const forbiddenList = [
-        [import_status.APPROVAL_STATUS.SUBMITTED, import_status.APPROVAL_STATUS.DRAFT],
+        [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
@@ -165,8 +163,11 @@ const _ApprovalTrigger = class _ApprovalTrigger extends import_module_workflow.T
       const {
         resourceName,
         actionName,
-        params: { triggerWorkflows }
+        params: { triggerWorkflows, beforeWorkflows }
       } = context.action;
+      if (beforeWorkflows) {
+        this.collectionTriggerAction(context, beforeWorkflows);
+      }
       if (resourceName === "workflows" && actionName === "trigger") {
         return this.workflowTriggerAction(context, next);
       }
@@ -174,7 +175,7 @@ const _ApprovalTrigger = class _ApprovalTrigger extends import_module_workflow.T
       if (!triggerWorkflows || !["create", "update"].includes(actionName)) {
         return;
       }
-      this.collectionTriggerAction(context);
+      this.collectionTriggerAction(context, triggerWorkflows);
     };
     const { db } = workflow.app;
     db.on("approvals.afterSave", this.triggerHandler);
@@ -231,11 +232,10 @@ const _ApprovalTrigger = class _ApprovalTrigger extends import_module_workflow.T
       });
     });
   }
-  async collectionTriggerAction(context) {
-    const { triggerWorkflows = "" } = context.action.params;
+  async collectionTriggerAction(context, workflowList) {
     const dataSourceHeader = context.get("x-data-source") || "main";
     const approvalRepo = this.workflow.db.getRepository("approvals");
-    const triggers = triggerWorkflows.split(",").map((trigger) => trigger.split("!"));
+    const triggers = workflowList.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)

package/package.json

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