@tachybase/plugin-workflow-approval 1.5.0 → 1.6.0

package/dist/client/user-interface/h5/common/approval-columns/summary.column.d.ts

@@ -0,0 +1,7 @@
+import '../../style/style.css';
+interface ApprovalsSummaryProps {
+    value: any;
+    collectionName?: string;
+}
+export declare const ApprovalsSummary: (props: ApprovalsSummaryProps) => import("react/jsx-runtime").JSX.Element;
+export {};

package/dist/client/user-interface/h5/common/processSummary.d.ts

@@ -0,0 +1,14 @@
+interface SummaryItem {
+    label: string;
+    value: string | number | null | undefined;
+}
+/**
+ * 处理 summary 数据，兼容新旧两种格式
+ * @param summary - 可能是旧格式的对象或新格式的数组
+ * @param collectionName - 集合名称
+ * @param cm - CollectionManager 实例
+ * @param compile - 编译函数
+ * @returns 统一格式的 summary 数组
+ */
+export declare function processSummary(summary: any, collectionName: string, cm: any, compile: (value: any) => string): SummaryItem[];
+export {};

package/dist/client/user-interface/h5/todos/component/TabApprovalItem.d.ts

@@ -1,2 +1,2 @@
 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;
+export declare const changeWorkflowNoticeService: (api: any, t: any, cm: any, compile: any, input: any, setData: any, params: any, filter: any, user: any, page: any, setTotal: any) => void;

package/dist/common/constants.d.ts

@@ -5,3 +5,9 @@ export declare const COLLECTION_WORKFLOWS_NAME = "workflows";
 export declare const NAMESPACE = "workflow-approval";
 export declare const PLUGIN_NAME_APPROVAL = "approval";
 export declare const INSTRUCTION_TYPE_NAME_APPROVAL = "approval";
+export declare const SUMMARY_TYPE: {
+    readonly LITERAL: "literal";
+    readonly TABLE: "table";
+    readonly DATE: "date";
+    readonly ARRAY: "array";
+};

package/dist/common/constants.js

@@ -23,7 +23,8 @@ __export(constants_exports, {
   INSTRUCTION_TYPE_NAME_APPROVAL: () => INSTRUCTION_TYPE_NAME_APPROVAL,
   NAMESPACE: () => NAMESPACE,
   NOTICE_INSTRUCTION_NAMESPACE: () => NOTICE_INSTRUCTION_NAMESPACE,
-  PLUGIN_NAME_APPROVAL: () => PLUGIN_NAME_APPROVAL
+  PLUGIN_NAME_APPROVAL: () => PLUGIN_NAME_APPROVAL,
+  SUMMARY_TYPE: () => SUMMARY_TYPE
 });
 module.exports = __toCommonJS(constants_exports);
 const NOTICE_INSTRUCTION_NAMESPACE = "notice";
@@ -33,6 +34,16 @@ const COLLECTION_WORKFLOWS_NAME = "workflows";
 const NAMESPACE = "workflow-approval";
 const PLUGIN_NAME_APPROVAL = "approval";
 const INSTRUCTION_TYPE_NAME_APPROVAL = "approval";
+const SUMMARY_TYPE = {
+  LITERAL: "literal",
+  // 单个值
+  TABLE: "table",
+  // 表格
+  DATE: "date",
+  // 日期
+  ARRAY: "array"
+  // 数组
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   COLLECTION_NAME_APPROVAL_CARBON_COPY,
@@ -41,5 +52,6 @@ const INSTRUCTION_TYPE_NAME_APPROVAL = "approval";
   INSTRUCTION_TYPE_NAME_APPROVAL,
   NAMESPACE,
   NOTICE_INSTRUCTION_NAMESPACE,
-  PLUGIN_NAME_APPROVAL
+  PLUGIN_NAME_APPROVAL,
+  SUMMARY_TYPE
 });

package/dist/common/interface.d.js

@@ -0,0 +1,15 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var interface_d_exports = {};
+module.exports = __toCommonJS(interface_d_exports);

package/dist/common/utils.d.ts

@@ -0,0 +1,2 @@
+export declare function isUTCString(str?: string): boolean;
+export declare function isDateType(value: any): boolean;

package/dist/common/utils.js

@@ -0,0 +1,46 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var utils_exports = {};
+__export(utils_exports, {
+  isDateType: () => isDateType,
+  isUTCString: () => isUTCString
+});
+module.exports = __toCommonJS(utils_exports);
+const utcRegex = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/;
+function isUTCString(str = "") {
+  return utcRegex.test(str);
+}
+function isDateType(value) {
+  if (typeof value !== "string") {
+    return false;
+  }
+  if (isUTCString(value)) {
+    return true;
+  }
+  const dateRegex = /^\d{4}-\d{2}-\d{2}/;
+  if (dateRegex.test(value)) {
+    const date = new Date(value);
+    return !isNaN(date.getTime());
+  }
+  return false;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  isDateType,
+  isUTCString
+});

package/dist/externalVersion.js

@@ -1,16 +1,17 @@
 module.exports = {
-  "@tachybase/client": "1.5.0",
-  "@tachybase/module-workflow": "1.5.0",
+  "@tachybase/client": "1.6.0",
   "@tego/server": "1.3.52",
+  "@tachybase/module-workflow": "1.6.0",
   "lodash": "4.17.21",
   "react": "18.3.1",
   "@tachybase/schema": "1.3.52",
   "antd": "5.22.5",
-  "@tachybase/module-ui-schema": "1.5.0",
+  "@tachybase/module-ui-schema": "1.6.0",
   "sequelize": "6.37.5",
   "@tego/client": "1.3.52",
+  "react-i18next": "16.2.1",
+  "react-router-dom": "6.28.1",
   "@ant-design/icons": "5.6.1",
   "dayjs": "1.11.13",
-  "ahooks": "3.9.0",
-  "react-router-dom": "6.28.1"
+  "ahooks": "3.9.0"
 };

package/dist/locale/en-US.json

@@ -183,6 +183,7 @@
   "Negotiation": "Negotiation",
   "Negotiation mode": "Negotiation mode",
   "New Initiate Request": "New Initiate Request",
+  "No data yet": "No data yet",
   "No end": "No end",
   "No limit": "No limit",
   "No repeat": "No repeat",

package/dist/server/actions/approvals.js

@@ -96,7 +96,9 @@ const approvals = {
       data: {
         ...instance,
         ...data
-      }
+      },
+      collection,
+      app: context.app
     });
     Object.keys(model.associations).forEach((key) => {
       delete instance[key];
@@ -126,7 +128,9 @@ const approvals = {
     });
     const summary = (0, import_tools.getSummary)({
       summaryConfig,
-      data
+      data,
+      collection,
+      app: context.app
     });
     context.action.mergeParams({
       values: {
@@ -284,7 +288,7 @@ const approvals = {
     const assignees = approval.records.map((record) => record.userId);
     for (const userId of assignees) {
       const [dataSourceName] = (0, import_server.parseCollectionName)(approval.collectionName);
-      const collection = this.workflow.app.dataSourceManager.dataSources.get(dataSourceName).collectionManager.getCollection(approval.collectionName);
+      const collection = context.app.dataSourceManager.dataSources.get(dataSourceName).collectionManager.getCollection(approval.collectionName);
       const message = {
         userId,
         title: `{{t("Approval", { ns: '${import_constants.NAMESPACE}' })}}`,

package/dist/server/tools.d.ts

@@ -1,11 +1,8 @@
-interface ParamsType {
-    summaryConfig: Array<string>;
-    data: object;
-}
-export declare function getSummary(params: ParamsType): object;
-export declare function parsePerson({ node, processor, keyName }: {
+import { type ParamsType } from '../common/interface';
+declare function parsePerson({ node, processor, keyName }: {
     node: any;
     processor: any;
     keyName: any;
 }): Promise<unknown[]>;
-export {};
+declare function getSummary(params: ParamsType): object;
+export { getSummary, parsePerson };

package/dist/server/tools.js

@@ -32,18 +32,8 @@ __export(tools_exports, {
 });
 module.exports = __toCommonJS(tools_exports);
 var import_lodash = __toESM(require("lodash"));
-function getSummary(params) {
-  const { summaryConfig = [], data } = params;
-  const result = summaryConfig.reduce((summary, key) => {
-    const value = import_lodash.default.get(data, key);
-    const realValue = Object.prototype.toString.call(value) === "[object Object]" ? value == null ? void 0 : value["name"] : value;
-    return {
-      ...summary,
-      [key]: realValue
-    };
-  }, {});
-  return result;
-}
+var import_constants = require("../common/constants");
+var import_utils = require("../common/utils");
 async function parsePerson({ node, processor, keyName }) {
   var _a;
   const configPerson = processor.getParsedValue(((_a = node.config) == null ? void 0 : _a[keyName]) ?? [], node.id).flat().filter(Boolean);
@@ -63,6 +53,257 @@ async function parsePerson({ node, processor, keyName }) {
   }
   return [...targetPerson];
 }
+function getSummary(params) {
+  const { summaryConfig = [], data, collection, app } = params;
+  const summaryDataSource = getSummaryDataSource({ summaryConfig, data, collection, app });
+  return summaryDataSource;
+}
+function getAssociationTitleFieldValue(value, fieldName, collection, app) {
+  if (!collection && !app || typeof value !== "object" || value === null || Array.isArray(value)) {
+    return void 0;
+  }
+  let field;
+  let dataSource;
+  let targetCollection;
+  if (collection) {
+    field = collection.getField(fieldName);
+    if (!field || !field.target) {
+      return void 0;
+    }
+    const db = collection.db;
+    if (db) {
+      targetCollection = db.getCollection(field.target);
+    } else if (app && app.dataSourceManager) {
+      const collectionDataSource = collection.dataSource;
+      if (collectionDataSource) {
+        dataSource = app.dataSourceManager.dataSources.get(collectionDataSource);
+      } else {
+        dataSource = app.dataSourceManager.dataSources.get("main");
+      }
+      if (dataSource) {
+        targetCollection = dataSource.collectionManager.getCollection(field.target);
+      }
+    } else {
+      try {
+        const cm = collection.collectionManager;
+        if (cm) {
+          dataSource = cm.dataSource;
+          targetCollection = dataSource.collectionManager.getCollection(field.target);
+        }
+      } catch (e) {
+      }
+    }
+  } else if (app) {
+    return void 0;
+  }
+  if (!targetCollection) {
+    return void 0;
+  }
+  const titleField = targetCollection.titleField || targetCollection.getPrimaryKey() || "id";
+  const titleValue = value[titleField];
+  return titleValue !== void 0 && titleValue !== null ? String(titleValue) : void 0;
+}
+function getFieldLabel(key, collection) {
+  var _a;
+  if (!collection) {
+    return key;
+  }
+  const field = collection.getField(key);
+  if (field) {
+    const uiSchema = (_a = field.options) == null ? void 0 : _a.uiSchema;
+    if (uiSchema == null ? void 0 : uiSchema.title) {
+      return uiSchema.title;
+    }
+    if (field.title) {
+      return field.title;
+    }
+  }
+  return key;
+}
+function processValue(value, fieldName, collection, app) {
+  if (value === void 0 || value === null) {
+    return "";
+  }
+  if (value instanceof Date || typeof value.toDate === "function" && value.toDate() instanceof Date) {
+    const dateObj = value instanceof Date ? value : value.toDate();
+    return dateObj.toISOString();
+  }
+  if (typeof value === "object" && !Array.isArray(value)) {
+    const titleFieldValue = getAssociationTitleFieldValue(value, fieldName, collection, app);
+    if (titleFieldValue !== void 0) {
+      return titleFieldValue;
+    }
+    if (value.name !== void 0) {
+      return String(value.name);
+    }
+    return JSON.stringify(value);
+  }
+  if (typeof value === "number") {
+    return value;
+  }
+  return String(value);
+}
+function getSummaryItem(key, data, collection, app) {
+  const value = import_lodash.default.get(data, key);
+  const label = getFieldLabel(key, collection);
+  if (value === void 0 || value === null) {
+    return {
+      key,
+      label,
+      type: import_constants.SUMMARY_TYPE.LITERAL,
+      value: ""
+    };
+  }
+  if (Array.isArray(value)) {
+    const processedArray = [];
+    for (const item of value) {
+      const processedValue2 = processValue(item, key, collection, app);
+      processedArray.push(processedValue2);
+    }
+    return {
+      key,
+      label,
+      type: import_constants.SUMMARY_TYPE.ARRAY,
+      value: processedArray
+    };
+  }
+  if (value instanceof Date || typeof value.toDate === "function" && value.toDate() instanceof Date) {
+    const dateObj = value instanceof Date ? value : value.toDate();
+    return {
+      key,
+      label,
+      type: import_constants.SUMMARY_TYPE.DATE,
+      value: dateObj.toISOString()
+    };
+  }
+  const processedValue = processValue(value, key, collection, app);
+  const valueStr = String(processedValue);
+  const finalType = (0, import_utils.isDateType)(valueStr) ? import_constants.SUMMARY_TYPE.DATE : import_constants.SUMMARY_TYPE.LITERAL;
+  return {
+    key,
+    label,
+    type: finalType,
+    value: processedValue
+  };
+}
+function getTargetCollection(mainKey, collection, app) {
+  if (!collection) {
+    return void 0;
+  }
+  const field = collection.getField(mainKey);
+  if (!field || !field.target) {
+    return void 0;
+  }
+  let targetCollection;
+  const db = collection.db;
+  if (db) {
+    targetCollection = db.getCollection(field.target);
+  } else if (app && app.dataSourceManager) {
+    const collectionDataSource = collection.dataSource;
+    let dataSource;
+    if (collectionDataSource) {
+      dataSource = app.dataSourceManager.dataSources.get(collectionDataSource);
+    } else {
+      dataSource = app.dataSourceManager.dataSources.get("main");
+    }
+    if (dataSource) {
+      targetCollection = dataSource.collectionManager.getCollection(field.target);
+    }
+  }
+  return targetCollection;
+}
+function isManyToManyField(mainKey, collection) {
+  if (!collection) {
+    return false;
+  }
+  const field = collection.getField(mainKey);
+  if (!field) {
+    return false;
+  }
+  return field.type === "belongsToMany" || field.type === "hasMany";
+}
+function getSummaryDataSource({ summaryConfig = [], data, collection, app }) {
+  const mainPathKeys = [];
+  const subPathKeys = [];
+  for (const key of summaryConfig) {
+    if (key.includes(".")) {
+      subPathKeys.push(key);
+    } else {
+      mainPathKeys.push(key);
+    }
+  }
+  const summaryDataSource = [];
+  for (const mainKey of mainPathKeys) {
+    const parentValue = import_lodash.default.get(data, mainKey);
+    const label = getFieldLabel(mainKey, collection);
+    const isManyToMany = isManyToManyField(mainKey, collection);
+    if (isManyToMany && Array.isArray(parentValue) && parentValue.length > 0) {
+      const mainKeyPrefix = `${mainKey}.`;
+      const relevantSubKeys = subPathKeys.filter((subKey) => subKey.startsWith(mainKeyPrefix));
+      if (relevantSubKeys.length === 0) {
+        summaryDataSource.push(getSummaryItem(mainKey, data, collection, app));
+      } else {
+        const fieldPathMap = /* @__PURE__ */ new Map();
+        for (const subKey of relevantSubKeys) {
+          const relativePath = subKey.slice(mainKeyPrefix.length);
+          const fieldName = relativePath.split(".")[0];
+          if (!fieldPathMap.has(fieldName)) {
+            fieldPathMap.set(fieldName, relativePath);
+          } else {
+            const existingPath = fieldPathMap.get(fieldName);
+            if (relativePath.length > existingPath.length) {
+              fieldPathMap.set(fieldName, relativePath);
+            }
+          }
+        }
+        const targetFields = Array.from(fieldPathMap.keys());
+        const childValues = [];
+        let isValidTable = true;
+        let rowCount = 0;
+        for (const fieldName of targetFields) {
+          const relativePath = fieldPathMap.get(fieldName);
+          const fullSubKey = `${mainKey}.${fieldName}`;
+          const childArray = [];
+          for (let i = 0; i < parentValue.length; i++) {
+            const item = parentValue[i];
+            const childValue = import_lodash.default.get(item, relativePath);
+            const processedValue = processValue(childValue, fullSubKey, collection, app);
+            childArray.push(processedValue);
+          }
+          childValues.push(childArray);
+          if (rowCount === 0) {
+            rowCount = childArray.length;
+          } else if (rowCount !== childArray.length) {
+            isValidTable = false;
+          }
+        }
+        if (isValidTable && rowCount > 0) {
+          const targetCollection = getTargetCollection(mainKey, collection, app);
+          const tableFields = targetFields.map((fieldName, idx) => {
+            const childLabel = targetCollection ? getFieldLabel(fieldName, targetCollection) : fieldName;
+            return {
+              key: fieldName,
+              label: childLabel,
+              type: import_constants.SUMMARY_TYPE.ARRAY,
+              value: childValues[idx]
+            };
+          });
+          summaryDataSource.push({
+            key: mainKey,
+            label,
+            type: import_constants.SUMMARY_TYPE.TABLE,
+            value: tableFields
+          });
+        } else {
+          summaryDataSource.push(getSummaryItem(mainKey, data, collection, app));
+        }
+      }
+    } else {
+      summaryDataSource.push(getSummaryItem(mainKey, data, collection, app));
+    }
+  }
+  return summaryDataSource;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getSummary,

package/dist/server/triggers/Approval.js

@@ -58,7 +58,9 @@ const _ApprovalTrigger = class _ApprovalTrigger extends import_module_workflow.T
         return;
       }
       const [dataSourceName, collectionName] = (0, import_server.parseCollectionName)(approval.collectionName);
-      const { repository } = this.workflow.app.dataSourceManager.dataSources.get(dataSourceName).collectionManager.getCollection(collectionName);
+      const dataSource = this.workflow.app.dataSourceManager.dataSources.get(dataSourceName);
+      const collection = dataSource.collectionManager.getCollection(collectionName);
+      const { repository } = collection;
       const data = await repository.findOne({
         filterByTk: approval.get("dataKey"),
         appends: workflow.config.appends,
@@ -72,7 +74,10 @@ const _ApprovalTrigger = class _ApprovalTrigger extends import_module_workflow.T
           applicantRoleName: approval.applicantRoleName,
           summary: (0, import_tools.getSummary)({
             summaryConfig: workflow.config.summary,
-            data
+            data,
+            collection,
+            // Fix: type assertion to bypass typing error
+            app: this.workflow.app
           }),
           collectionName: approval.collectionName
         },
@@ -108,6 +113,21 @@ const _ApprovalTrigger = class _ApprovalTrigger extends import_module_workflow.T
       if (!execution.workflow) {
         execution.workflow = await execution.getWorkflow({ transaction });
       }
+      if (execution.workflow.type === _ApprovalTrigger.TYPE && execution.context && execution.context.approvalId && execution.status === import_module_workflow.EXECUTION_STATUS.STARTED) {
+        const approval2 = await this.workflow.db.getRepository("approvals").findOne({
+          filterByTk: execution.context.approvalId,
+          transaction
+        });
+        if (approval2 && approval2.status === import_status.APPROVAL_STATUS.DRAFT) {
+          await execution.update(
+            {
+              status: import_module_workflow.EXECUTION_STATUS.CANCELED
+            },
+            { transaction }
+          );
+          return;
+        }
+      }
       if (!execution.status || execution.workflow.type !== _ApprovalTrigger.TYPE) {
         return;
       }
@@ -224,7 +244,10 @@ const _ApprovalTrigger = class _ApprovalTrigger extends import_module_workflow.T
           workflowKey: workflow.key,
           summary: (0, import_tools.getSummary)({
             summaryConfig: workflow.config.summary,
-            data
+            data,
+            collection: collecton,
+            // Fix: type assertion to bypass typing error
+            app: this.workflow.app
           })
         },
         context
@@ -287,7 +310,9 @@ const _ApprovalTrigger = class _ApprovalTrigger extends import_module_workflow.T
             applicantRoleName: context.state.currentRole,
             summary: (0, import_tools.getSummary)({
               summaryConfig: workflow.config.summary,
-              data: dataCurrent
+              data: dataCurrent,
+              collection,
+              app: context.app
             })
           },
           context

package/package.json

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