@tachybase/plugin-workflow-approval 1.3.25 → 1.4.0

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

@@ -11,6 +11,13 @@ export declare const getSchemaCheckContent: (params: any) => {
                     title: string;
                     'x-component': string;
                     properties: {
+                        approvalInfo: {
+                            type: string;
+                            'x-component': string;
+                            'x-component-props': {
+                                approval: any;
+                            };
+                        };
                         detail: {
                             type: string;
                             'x-decorator': string;

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

@@ -8,6 +8,13 @@ export declare const getSchemaActionTodosContent: (params: any) => {
             title: string;
             'x-component': string;
             properties: {
+                approvalInfo: {
+                    type: string;
+                    'x-component': string;
+                    'x-component-props': {
+                        approval: any;
+                    };
+                };
                 detail: {
                     type: string;
                     'x-decorator': string;

package/dist/client/user-interface/pc/common/ApprovalInfo.d.ts

@@ -0,0 +1 @@
+export declare const ApprovalInfo: (props: any) => import("react/jsx-runtime").JSX.Element;

package/dist/client/user-interface/pc/common/notice-show-detail/NoticeDetail.schema.d.ts

@@ -1 +1 @@
-export declare const NoticeDetailContent: () => import("react/jsx-runtime").JSX.Element;
+export declare const NoticeDetailContent: (props: any) => import("react/jsx-runtime").JSX.Element;

package/dist/externalVersion.js

@@ -1,12 +1,12 @@
 module.exports = {
-  "@tachybase/client": "1.3.25",
-  "@tachybase/module-workflow": "1.3.25",
+  "@tachybase/client": "1.4.0",
+  "@tachybase/module-workflow": "1.4.0",
   "@tego/server": "1.3.52",
   "lodash": "4.17.21",
   "react": "18.3.1",
   "@tachybase/schema": "1.3.52",
   "antd": "5.22.5",
-  "@tachybase/module-ui-schema": "1.3.25",
+  "@tachybase/module-ui-schema": "1.4.0",
   "sequelize": "6.37.5",
   "@tego/client": "1.3.52",
   "@ant-design/icons": "5.6.1",

package/dist/locale/en-US.json

@@ -29,6 +29,7 @@
   "Apply new": "Apply new",
   "Approval": "Approval",
   "Approval Carbon Copy": "Approval Carbon Copy",
+  "Approval Code": "Approval Code",
   "Approval ID": "Approval ID",
   "Approval Launch": "Approval Launch",
   "Approval Summary": "Approval Summary",

package/dist/locale/zh-CN.json

@@ -34,6 +34,7 @@
   "Apply new": "发起新申请",
   "Approval": "审批",
   "Approval Carbon Copy": "审批抄送",
+  "Approval Code": "审批编号",
   "Approval ID": "审批编号",
   "Approval Launch": "审批发起",
   "Approval Summary": "审批摘要",

package/dist/server/actions/approvals.js

@@ -61,9 +61,30 @@ const approvals = {
       });
     }
     const { repository, model } = collection;
+    let dataToCreate = (0, import_server.traverseJSON)(data, { collection });
+    if (workflowKey) {
+      Object.values(collection.model.associations || {}).forEach((assocUnknown) => {
+        var _a, _b;
+        const assoc = assocUnknown;
+        if (assoc.foreignKey && Object.prototype.hasOwnProperty.call(dataToCreate, assoc.foreignKey)) {
+          delete dataToCreate[assoc.foreignKey];
+        }
+        if (assoc.associationType === "BelongsToMany" && assoc.as && Array.isArray(dataToCreate[assoc.as])) {
+          const targetKey = assoc.targetKey && typeof assoc.targetKey === "string" ? assoc.targetKey : (
+            // fallback: 一般为 target model 的主键
+            ((_a = assoc.target) == null ? void 0 : _a.primaryKeyAttribute) || ((_b = assoc.target) == null ? void 0 : _b.primaryKey) || "id"
+          );
+          dataToCreate[assoc.as].forEach((item) => {
+            if (item && typeof item === "object" && Object.prototype.hasOwnProperty.call(item, targetKey)) {
+              delete item[targetKey];
+            }
+          });
+        }
+      });
+    }
     const values = await repository.create({
       values: {
-        ...(0, import_server.traverseJSON)(data, { collection }),
+        ...dataToCreate,
         createdBy: context.state.currentUser.id,
         updatedBy: context.state.currentUser.id
       },
@@ -138,7 +159,7 @@ const approvals = {
     return import_server.actions.destroy(context, next);
   },
   async withdraw(context, next) {
-    var _a;
+    var _a, _b;
     const { filterByTk } = context.action.params;
     const repository = import_server.utils.getRepositoryFromParams(context);
     const approval = await repository.findOne({
@@ -161,6 +182,29 @@ const approvals = {
       },
       limit: 1
     });
+    if (!execution) {
+      return context.throw(404, "Execution not found! Please contact the administrator.");
+    }
+    if (!approval.workflow.enabled && ((_b = approval.workflow) == null ? void 0 : _b.key)) {
+      const latestWorkflow = await context.db.getRepository("workflows").findOne({
+        filter: {
+          key: approval.workflow.key,
+          enabled: true
+        },
+        order: [["updatedAt", "DESC"]]
+      });
+      if (latestWorkflow && approval.workflow.id !== latestWorkflow.id) {
+        approval.workflow = latestWorkflow;
+        await approval.update(
+          {
+            workflowId: latestWorkflow.id
+          },
+          {
+            transaction: context.transaction
+          }
+        );
+      }
+    }
     execution.workflow = approval.workflow;
     await context.db.sequelize.transaction(async (transaction) => {
       const records = await approval.getRecords({

package/dist/server/collections/approvalCarbonCopy.js

@@ -26,6 +26,7 @@ var approvalCarbonCopy_default = (0, import_server.defineCollection)({
   namespace: "workflow.approvalCarbonCopy",
   dumpRules: "required",
   name: import_constants.COLLECTION_NAME_APPROVAL_CARBON_COPY,
+  origin: "@tachybase/plugin-workflow-approval",
   createdBy: true,
   updatedBy: true,
   fields: [

package/dist/server/utils.d.ts

@@ -1 +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>;

package/dist/server/utils.js

@@ -17,7 +17,9 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var utils_exports = {};
 __export(utils_exports, {
-  findUniqueObjects: () => findUniqueObjects
+  findUniqueObjects: () => findUniqueObjects,
+  getWorkflow: () => getWorkflow,
+  getWorkflowByKey: () => getWorkflowByKey
 });
 module.exports = __toCommonJS(utils_exports);
 function findUniqueObjects(sourceArray = [], uniqueByArray, compareByKey = "", compareByFunc = (a, b) => a - b) {
@@ -33,7 +35,28 @@ function findUniqueObjects(sourceArray = [], uniqueByArray, compareByKey = "", c
   result = Object.values(uniqueMap);
   return result;
 }
+async function getWorkflow(context, workflowId) {
+  if (workflowId) {
+    return await context.db.getRepository("workflows").findOne({
+      filterByTk: workflowId
+    });
+  }
+  return null;
+}
+async function getWorkflowByKey(context, workflowKey) {
+  if (workflowKey) {
+    return await context.db.getRepository("workflows").findOne({
+      filter: {
+        key: workflowKey,
+        enabled: true
+      }
+    });
+  }
+  return null;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  findUniqueObjects
+  findUniqueObjects,
+  getWorkflow,
+  getWorkflowByKey
 });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tachybase/plugin-workflow-approval",
   "displayName": "Approval",
-  "version": "1.3.25",
+  "version": "1.4.0",
   "description": "Approval base in Workflow",
   "keywords": [
     "Approval",
@@ -24,12 +24,12 @@
     "file-saver": "^2.0.5",
     "jsonata": "^2.0.6",
     "lodash": "4.17.21",
-    "react-i18next": "15.2.0",
+    "react-i18next": "16.2.1",
     "react-router-dom": "6.28.1",
     "sequelize": "^6.37.5",
-    "@tachybase/client": "1.3.25",
-    "@tachybase/module-ui-schema": "1.3.25",
-    "@tachybase/module-workflow": "1.3.25"
+    "@tachybase/client": "1.4.0",
+    "@tachybase/module-workflow": "1.4.0",
+    "@tachybase/module-ui-schema": "1.4.0"
   },
   "description.zh-CN": "审批系统是一个强大的BPM工具，为业务流程自动化提供基础支持，同时具备高度灵活性和可扩展性，确保审批流程的效率和合规性，助力企业释放创新潜力。",
   "displayName.zh-CN": "审批"