@nocobase/plugin-workflow-cc 2.2.0-beta.9 → 3.0.0-alpha.1

package/dist/client-v2/plugin.d.ts

@@ -0,0 +1,16 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+import { Plugin, type Application } from '@nocobase/client-v2';
+export declare class PluginWorkflowCCClientV2 extends Plugin<Record<string, never>, Application> {
+    load(): Promise<void>;
+    private registerCollections;
+    private registerModelLoaders;
+    private registerWorkflowExtensions;
+}
+export default PluginWorkflowCCClientV2;

package/dist/client-v2/tasks.d.ts

@@ -0,0 +1,15 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+import { type TaskTypeOptions, type WorkflowTaskStatus } from '@nocobase/plugin-workflow/client-v2';
+export declare function useCcTaskActionParams(status: WorkflowTaskStatus): {
+    filter: Record<string, unknown>;
+    appends: string[];
+    except: string[];
+};
+export declare const ccTaskType: TaskTypeOptions;

package/dist/client-v2/utils/registerWorkflowCcCollections.d.ts

@@ -0,0 +1,10 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+import { type FlowEngine } from '@nocobase/flow-engine';
+export declare function registerWorkflowCcCollections(flowEngine: FlowEngine): void;

package/dist/client-v2/workflowPluginCompat.d.ts

@@ -0,0 +1,41 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+import { type SubModelItem } from '@nocobase/flow-engine';
+import { type TempAssociationSource } from '@nocobase/plugin-workflow/client-v2';
+export type WorkflowLike = {
+    config?: Record<string, unknown>;
+    id?: number | string;
+    type?: string;
+};
+export type CanvasNodeLike = {
+    config?: Record<string, unknown>;
+    id?: number | string;
+    key?: string;
+    type?: string;
+};
+type WorkflowTriggerLike = {
+    getCreateModelMenuItem?: (args: {
+        config: Record<string, unknown>;
+        nodeType?: string;
+        workflow?: WorkflowLike;
+    }) => SubModelItem | SubModelItem[] | null;
+    useTempAssociationSource?: (config?: Record<string, unknown>, workflow?: WorkflowLike) => TempAssociationSource | null;
+};
+type WorkflowInstructionLike = {
+    getCreateModelMenuItem?: (args: {
+        node: CanvasNodeLike;
+        workflow?: WorkflowLike;
+    }) => SubModelItem | SubModelItem[] | null;
+    useTempAssociationSource?: (node: CanvasNodeLike) => TempAssociationSource | null;
+};
+export declare function useWorkflowPluginCompat(): {
+    getInstruction: (type?: string) => WorkflowInstructionLike;
+    getTrigger: (type?: string) => WorkflowTriggerLike;
+};
+export {};

package/dist/externalVersion.js

@@ -9,22 +9,22 @@
 
 module.exports = {
   "react": "18.2.0",
-  "@nocobase/client": "2.2.0-beta.9",
-  "@nocobase/plugin-workflow": "2.2.0-beta.9",
+  "@nocobase/client": "3.0.0-alpha.1",
+  "@nocobase/plugin-workflow": "3.0.0-alpha.1",
   "react-i18next": "11.18.6",
   "antd-style": "3.7.1",
   "antd": "5.24.2",
   "react-router-dom": "6.30.1",
   "lodash": "4.18.1",
-  "@nocobase/utils": "2.2.0-beta.9",
-  "@nocobase/plugin-ui-schema-storage": "2.2.0-beta.9",
-  "@nocobase/actions": "2.2.0-beta.9",
-  "@nocobase/server": "2.2.0-beta.9",
-  "@nocobase/database": "2.2.0-beta.9",
-  "@nocobase/data-source-manager": "2.2.0-beta.9",
-  "@nocobase/flow-engine": "2.2.0-beta.9",
-  "@formily/shared": "2.3.7",
-  "@formily/react": "2.3.7",
+  "@nocobase/flow-engine": "3.0.0-alpha.1",
+  "@nocobase/client-v2": "3.0.0-alpha.1",
   "@ant-design/icons": "5.6.1",
-  "@formily/antd-v5": "1.2.3"
+  "ahooks": "3.7.8",
+  "@nocobase/utils": "3.0.0-alpha.1",
+  "@nocobase/plugin-ui-schema-storage": "3.0.0-alpha.1",
+  "@nocobase/actions": "3.0.0-alpha.1",
+  "@nocobase/server": "3.0.0-alpha.1",
+  "@nocobase/database": "3.0.0-alpha.1",
+  "@nocobase/data-source-manager": "3.0.0-alpha.1",
+  "@nocobase/plugin-notification-manager": "3.0.0-alpha.1"
 };

package/dist/locale/en-US.json

@@ -1,5 +1,6 @@
 {
   "CC": "CC",
+  "CC node": "CC node",
   "CC to me": "CC to me",
   "CC information": "CC information",
   "Configure user interface": "Configure user interface",
@@ -11,14 +12,19 @@
   "Mark all as read": "Mark all as read",
   "Mark as read": "Mark as read",
   "Mark as unread": "Mark as unread",
+  "Please wait for the workflow model configuration to finish opening.": "Please wait for the workflow model configuration to finish opening.",
   "Refresh": "Refresh",
   "Filter": "Filter",
+  "Execution": "Execution",
+  "Load failed": "Load failed",
+  "Workflow": "Workflow",
   "Provide a CC (carbon copy) feature in workflows to send approvals, or any other type of information to specified users.": "Provide a CC (carbon copy) feature in workflows to send approvals, or any other type of information to specified users.",
   "Read": "Read",
   "Recipients": "Recipients",
   "Task card": "Task card",
   "Task title": "Task title",
   "Title of each CC item in tasks center. Could use variables in string template. Default to node title.": "Title of each CC item in tasks center. Could use variables in string template. Default to node title.",
+  "Status": "Status",
   "Read at": "Read at",
   "Created at": "Created at",
   "Updated at": "Updated at",

package/dist/locale/zh-CN.json

@@ -13,14 +13,18 @@
   "Mark all as read": "全部标为已读",
   "Mark as read": "标为已读",
   "Mark as unread": "标为未读",
+  "Please wait for the workflow model configuration to finish opening.": "请等待工作流模型配置打开完成。",
   "Refresh": "刷新",
   "Filter": "筛选",
+  "Execution": "执行",
+  "Load failed": "加载失败",
   "Provide a CC (carbon copy) feature in workflows to send approvals, or any other type of information to specified users.": "在工作流中提供抄送功能，将审批或其他任意信息抄送给特定的用户。",
   "Read": "已读",
   "Recipients": "接收人",
   "Task card": "任务卡片",
   "Task title": "任务标题",
   "Status": "状态",
+  "Workflow": "工作流",
   "Read at": "阅读时间",
   "Created at": "创建时间",
   "Updated at": "更新时间",

package/dist/{client/models/CCChildPageModel.d.ts → server/migrations/20260723120000-rebuild-workflow-task-stats.d.ts}

@@ -6,7 +6,8 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
-import { ChildPageModel } from '@nocobase/client';
-export declare class CCChildPageModel extends ChildPageModel {
-    onInit(options: any): void;
+import { Migration } from '@nocobase/server';
+export default class extends Migration {
+    on: string;
+    up(): Promise<void>;
 }

package/dist/server/migrations/20260723120000-rebuild-workflow-task-stats.js

@@ -0,0 +1,51 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var rebuild_workflow_task_stats_exports = {};
+__export(rebuild_workflow_task_stats_exports, {
+  default: () => rebuild_workflow_task_stats_default
+});
+module.exports = __toCommonJS(rebuild_workflow_task_stats_exports);
+var import_plugin_workflow = __toESM(require("@nocobase/plugin-workflow"));
+var import_server = require("@nocobase/server");
+var import_constants = require("../../common/constants");
+class rebuild_workflow_task_stats_default extends import_server.Migration {
+  on = "afterLoad";
+  async up() {
+    const workflowPlugin = this.pm.get(import_plugin_workflow.default);
+    await workflowPlugin.repairTaskStats({ types: [import_constants.TASK_TYPE_CC], silent: true });
+  }
+}

package/dist/server/plugin.d.ts

@@ -9,6 +9,8 @@
 import { Plugin } from '@nocobase/server';
 import { Model } from '@nocobase/database';
 export declare class PluginWorkflowCCServer extends Plugin {
+    private getWorkflowKeyById;
+    private collectCcTaskStats;
     onRecordSave: (record: Model, { transaction }: {
         transaction: any;
     }) => Promise<void>;

package/dist/server/plugin.js

@@ -46,28 +46,132 @@ var import_CCInstruction = __toESM(require("./CCInstruction"));
 var import_constants = require("../common/constants");
 var import_actions = require("./actions");
 class PluginWorkflowCCServer extends import_server.Plugin {
-  onRecordSave = async (record, { transaction }) => {
-    if (!record.userId) {
-      return;
+  async getWorkflowKeyById(workflowId, transaction) {
+    const WorkflowRepo = this.db.getRepository("workflows");
+    const workflow = await WorkflowRepo.findOne({
+      filterByTk: workflowId,
+      fields: ["key"],
+      transaction
+    });
+    return workflow == null ? void 0 : workflow.key;
+  }
+  async collectCcTaskStats(options) {
+    var _a, _b;
+    const workflowPlugin = this.app.pm.get(import_plugin_workflow.default);
+    const CCModel = this.db.getModel("workflowCcTasks");
+    const qualifiedColumn = (name) => {
+      const fieldName = CCModel.getAttributes()[name].field ?? name;
+      return this.db.sequelize.col(`${CCModel.name}.${fieldName}`);
+    };
+    const group = ["userId", "workflowId"].map((name) => qualifiedColumn(name));
+    const countColumn = qualifiedColumn("id");
+    const where = {};
+    if ((_a = options.userIds) == null ? void 0 : _a.length) {
+      where.userId = options.userIds;
     }
-    const CCModel = record.constructor;
-    const pending = await CCModel.count({
+    if ((_b = options.workflowKeys) == null ? void 0 : _b.length) {
+      const workflowIds2 = (await Promise.all(
+        options.workflowKeys.map(
+          (workflowKey) => workflowPlugin.getWorkflowIdsByKey(workflowKey, options.transaction)
+        )
+      )).flat();
+      if (!workflowIds2.length) {
+        return [];
+      }
+      where.workflowId = workflowIds2;
+    }
+    const allCounts = await CCModel.findAll({
+      attributes: ["userId", "workflowId", [this.db.sequelize.fn("COUNT", countColumn), "count"]],
+      where,
+      group,
+      raw: true,
+      transaction: options.transaction
+    });
+    const pendingCounts = await CCModel.findAll({
+      attributes: ["userId", "workflowId", [this.db.sequelize.fn("COUNT", countColumn), "count"]],
       where: {
-        userId: record.userId,
+        ...where,
         status: import_constants.TASK_STATUS.UNREAD
       },
-      transaction
+      group,
+      raw: true,
+      transaction: options.transaction
     });
-    const all = await CCModel.count({
-      where: {
-        userId: record.userId
-      },
+    const workflowIds = Array.from(new Set([...allCounts, ...pendingCounts].map((row) => row.workflowId)));
+    const workflows = workflowIds.length ? await this.db.getRepository("workflows").find({
+      filter: { id: workflowIds },
+      fields: ["id", "key"],
+      transaction: options.transaction
+    }) : [];
+    const workflowKeyMap = new Map(
+      workflows.map((workflow) => [workflow.id, workflow.key])
+    );
+    const statsMap = /* @__PURE__ */ new Map();
+    for (const row of allCounts) {
+      const userId = row.userId;
+      const workflowKey = workflowKeyMap.get(row.workflowId);
+      if (!userId || !workflowKey) {
+        continue;
+      }
+      const key = `${userId}\0${workflowKey}`;
+      const stats = statsMap.get(key) ?? {
+        userId,
+        workflowKey,
+        type: import_constants.TASK_TYPE_CC,
+        pending: 0,
+        all: 0
+      };
+      stats.all += Number(row.count) || 0;
+      statsMap.set(key, stats);
+    }
+    for (const row of pendingCounts) {
+      const userId = row.userId;
+      const workflowKey = workflowKeyMap.get(row.workflowId);
+      if (!userId || !workflowKey) {
+        continue;
+      }
+      const key = `${userId}\0${workflowKey}`;
+      const stats = statsMap.get(key) ?? {
+        userId,
+        workflowKey,
+        type: import_constants.TASK_TYPE_CC,
+        pending: 0,
+        all: 0
+      };
+      stats.pending += Number(row.count) || 0;
+      statsMap.set(key, stats);
+    }
+    return Array.from(statsMap.values());
+  }
+  onRecordSave = async (record, { transaction }) => {
+    const userId = record.get("userId");
+    const workflowId = record.get("workflowId");
+    if (!userId || !workflowId) {
+      return;
+    }
+    const workflowKey = await this.getWorkflowKeyById(workflowId, transaction);
+    if (!workflowKey) {
+      return;
+    }
+    const [row] = await this.collectCcTaskStats({
+      userIds: [userId],
+      workflowKeys: [workflowKey],
       transaction
     });
-    await this.app.pm.get(import_plugin_workflow.default).updateTasksStats(
-      record.userId,
-      import_constants.TASK_TYPE_CC,
-      { pending, all },
+    const stats = row ?? {
+      userId,
+      workflowKey,
+      type: import_constants.TASK_TYPE_CC,
+      pending: 0,
+      all: 0
+    };
+    await this.app.pm.get(import_plugin_workflow.default).updateTaskStatsByWorkflow(
+      {
+        userId,
+        workflowKey,
+        type: import_constants.TASK_TYPE_CC,
+        stats
+      },
       { transaction }
     );
   };
@@ -76,7 +180,12 @@ class PluginWorkflowCCServer extends import_server.Plugin {
     this.app.acl.allow("workflowCcTasks", ["list", "listMine", "get", "read", "unread", "readAll"], "loggedIn");
     const workflowPlugin = this.app.pm.get(import_plugin_workflow.default);
     workflowPlugin.registerInstruction("cc", import_CCInstruction.default);
-    this.app.db.on("workflowCcTasks.afterSave", this.onRecordSave);
+    workflowPlugin.registerTaskStatsProvider(import_constants.TASK_TYPE_CC, {
+      collectTaskStats: (options) => this.collectCcTaskStats(options)
+    });
+    this.app.db.on("workflowCcTasks.afterCreateWithAssociations", this.onRecordSave);
+    this.app.db.on("workflowCcTasks.afterUpdate", this.onRecordSave);
+    this.app.db.on("workflowCcTasks.afterDestroy", this.onRecordSave);
   }
 }
 var plugin_default = PluginWorkflowCCServer;

package/package.json

@@ -10,20 +10,25 @@
   "homepage.ru-RU": "https://docs-ru.nocobase.com/handbook/workflow-cc",
   "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/workflow-cc",
   "license": "Apache-2.0",
-  "version": "2.2.0-beta.9",
+  "version": "3.0.0-alpha.1",
   "main": "dist/server/index.js",
   "peerDependencies": {
     "@nocobase/actions": "2.x",
     "@nocobase/client": "2.x",
+    "@nocobase/client-v2": "2.x",
+    "@nocobase/flow-engine": "2.x",
+    "@nocobase/plugin-flow-engine": "2.x",
+    "@nocobase/plugin-notification-manager": "2.x",
     "@nocobase/plugin-ui-schema-storage": "2.x",
     "@nocobase/plugin-users": "2.x",
     "@nocobase/plugin-workflow": "2.x",
     "@nocobase/server": "2.x",
     "@nocobase/test": "2.x",
-    "@nocobase/utils": "2.x"
+    "@nocobase/utils": "2.x",
+    "ahooks": "^3.7.2"
   },
   "keywords": [
     "Workflow"
   ],
-  "gitHead": "60e3d7abbaa0c7cead76f71a4f3d5eedb6b8acdb"
+  "gitHead": "22d8be8ece179cfa5c8a4ebb2c896c92bd418e03"
 }

package/dist/client/instruction/SchemaConfig.d.ts

@@ -1,17 +0,0 @@
-/**
- * This file is part of the NocoBase (R) project.
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
- * Authors: NocoBase Team.
- *
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
- * For more information, please refer to: https://www.nocobase.com/agreement.
- */
-import React from 'react';
-import { SchemaInitializer } from '@nocobase/client';
-export declare const addBlockButton: SchemaInitializer<import("antd").ButtonProps, {}>;
-export declare function SchemaConfig(): React.JSX.Element;
-export declare function SchemaConfigButton(props: any): React.JSX.Element;
-export declare function CCInterfaceConfig({ children }: {
-    children: any;
-}): React.JSX.Element;
-export declare function CCTaskCardConfigButton(): React.JSX.Element;