@nocobase/plugin-workflow-cc 2.0.0-beta.9 → 2.0.1

package/dist/client/models/CCTaskCardDetailsModel.d.ts

@@ -0,0 +1,22 @@
+/**
+ * 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 { SingleRecordResource } from '@nocobase/flow-engine';
+import { DetailsBlockModel } from '@nocobase/client';
+/**
+ * 抄送任务卡片详情：隐藏顶部按钮，保留详情卡片的字段/标题配置，不支持卡片级操作按钮。
+ */
+export declare class CCTaskCardDetailsModel extends DetailsBlockModel {
+    get hidden(): boolean;
+    set hidden(value: boolean);
+    onInit(options: any): void;
+    createResource(ctx: any, params: any): SingleRecordResource<unknown>;
+    refresh(): Promise<void>;
+    renderComponent(): React.JSX.Element;
+}

package/dist/client/models/CCTaskCardGridModel.d.ts

@@ -0,0 +1,23 @@
+/**
+ * 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 { DetailsGridModel } from '@nocobase/client';
+import React from 'react';
+/**
+ * 抄送任务卡片详情的字段网格
+ */
+export declare class CCTaskCardGridModel extends DetailsGridModel {
+    private lastTempAssociationSnapshot?;
+    private readonly tempAssociationSyncHandler;
+    onMount(): void;
+    onUnmount(): void;
+    private getTempAssociationFieldNames;
+    private syncTempAssociationFields;
+    renderAddSubModelButton(): React.JSX.Element;
+    render(): React.JSX.Element;
+}

package/dist/client/models/CCTriggerBlockGridModel.d.ts

@@ -0,0 +1,13 @@
+/**
+ * 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 { BlockGridModel } from '@nocobase/client';
+import React from 'react';
+export declare class CCTriggerBlockGridModel extends BlockGridModel {
+    renderAddSubModelButton(): React.JSX.Element;
+}

package/dist/client/tasks.d.ts

@@ -24,5 +24,8 @@ export declare const ccTodo: {
     Actions: typeof TodoExtraActions;
     Item: typeof TaskItem;
     Detail: typeof Drawer;
+    getPopupRecord: (apiClient: any, { params }: {
+        params: any;
+    }) => any;
 };
 export {};

package/dist/common/collections/workflowCcTasks.d.ts

@@ -8,6 +8,7 @@
  */
 declare const _default: {
     name: string;
+    filterTargetKey: string;
     dumpRules: {
         group: string;
     };
@@ -69,11 +70,17 @@ declare const _default: {
         type: string;
         name: string;
         target: string;
+        uiSchema: {
+            type: string;
+            title: string;
+            'x-component'?: undefined;
+            'x-component-props'?: undefined;
+            enum?: undefined;
+        };
         primaryKey?: undefined;
         allowNull?: undefined;
         foreignKey?: undefined;
         interface?: undefined;
-        uiSchema?: undefined;
         onDelete?: undefined;
         defaultValue?: undefined;
     } | {

package/dist/common/collections/workflowCcTasks.js

@@ -32,6 +32,7 @@ module.exports = __toCommonJS(workflowCcTasks_exports);
 var import_constants = require("../constants");
 var workflowCcTasks_default = {
   name: "workflowCcTasks",
+  filterTargetKey: "id",
   dumpRules: {
     group: "log"
   },
@@ -78,7 +79,11 @@ var workflowCcTasks_default = {
     {
       type: "belongsTo",
       name: "node",
-      target: "flow_nodes"
+      target: "flow_nodes",
+      uiSchema: {
+        type: "object",
+        title: `{{t("CC node", { ns: "${import_constants.NAMESPACE}" })}}`
+      }
     },
     {
       type: "belongsTo",
@@ -141,7 +146,7 @@ var workflowCcTasks_default = {
       interface: "createdAt",
       uiSchema: {
         type: "datetime",
-        title: '{{t("Created at")}}',
+        title: `{{t("Created at", { ns: "${import_constants.NAMESPACE}" })}}`,
         "x-component": "DatePicker",
         "x-component-props": {
           showTime: true
@@ -154,7 +159,7 @@ var workflowCcTasks_default = {
       interface: "updatedAt",
       uiSchema: {
         type: "datetime",
-        title: '{{t("Updated at")}}',
+        title: `{{t("Updated at", { ns: "${import_constants.NAMESPACE}" })}}`,
         "x-component": "DatePicker",
         "x-component-props": {
           showTime: true

package/dist/common/tempAssociation.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.
+ */
+export declare const TEMP_ASSOCIATION_PREFIX = "ccTempAssoc_";
+export declare const buildTempAssociationFieldName: (nodeType: string, nodeKey: string | number) => string;

package/dist/common/tempAssociation.js

@@ -0,0 +1,40 @@
+/**
+ * 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 __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 tempAssociation_exports = {};
+__export(tempAssociation_exports, {
+  TEMP_ASSOCIATION_PREFIX: () => TEMP_ASSOCIATION_PREFIX,
+  buildTempAssociationFieldName: () => buildTempAssociationFieldName
+});
+module.exports = __toCommonJS(tempAssociation_exports);
+const TEMP_ASSOCIATION_PREFIX = "ccTempAssoc_";
+const sanitizeFieldKey = (value) => String(value ?? "").replace(/[^a-zA-Z0-9_]/g, "_");
+const buildTempAssociationFieldName = (nodeType, nodeKey) => `${TEMP_ASSOCIATION_PREFIX}${nodeType}_${sanitizeFieldKey(nodeKey)}`;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  TEMP_ASSOCIATION_PREFIX,
+  buildTempAssociationFieldName
+});

package/dist/externalVersion.js

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

package/dist/locale/en-US.json

@@ -1,15 +1,30 @@
 {
   "CC": "CC",
   "CC to me": "CC to me",
+  "CC information": "CC information",
   "Configure user interface": "Configure user interface",
+  "Configure v2 UI": "Configure v2 UI",
+  "Before using the v2 UI, you must delete the existing v1 UI. Are you sure you want to delete the v1 UI?": "Before using the v2 UI, you must delete the existing v1 UI. Are you sure you want to delete the v1 UI?",
+  "Delete v1 configuration": "Delete v1 configuration",
+  "Deleted successfully": "Deleted successfully",
+  "Go to configure": "Go to configure",
   "Mark all as read": "Mark all as read",
   "Mark as read": "Mark as read",
   "Mark as unread": "Mark as unread",
+  "Refresh": "Refresh",
+  "Filter": "Filter",
   "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.",
+  "Read at": "Read at",
+  "Created at": "Created at",
+  "Updated at": "Updated at",
   "Unread": "Unread",
   "User interface": "User interface",
-  "View user interface": "View user interface"
-}
+  "View user interface": "View user interface",
+  "v1 (Legacy)": "v1 (Legacy)",
+  "v2": "v2"
+}

package/dist/locale/zh-CN.json

@@ -1,15 +1,33 @@
 {
   "CC": "抄送",
   "CC to me": "抄送我的",
+  "CC information": "抄送信息",
+  "CC node": "抄送节点",
+  "Other information": "其他信息",
   "Configure user interface": "配置用户界面",
+  "Configure v2 UI": "配置 v2 界面",
+  "Before using the v2 UI, you must delete the existing v1 UI. Are you sure you want to delete the v1 UI?": "使用 v2 界面前，必须删除现有的 v1 界面。确定要删除 v1 界面吗？",
+  "Delete v1 configuration": "删除 v1 配置",
+  "Deleted successfully": "删除成功",
+  "Go to configure": "前往配置",
   "Mark all as read": "全部标为已读",
   "Mark as read": "标为已读",
   "Mark as unread": "标为未读",
+  "Refresh": "刷新",
+  "Filter": "筛选",
   "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": "状态",
+  "Read at": "阅读时间",
+  "Created at": "创建时间",
+  "Updated at": "更新时间",
   "Title of each CC item in tasks center. Could use variables in string template. Default to node title.": "待办中心每个抄送项的标题。可以在字符串模板中使用变量。默认为节点标题。",
   "Unread": "未读",
   "User interface": "用户界面",
-  "View user interface": "查看用户界面"
-}
+  "View user interface": "查看用户界面",
+  "v1 (Legacy)": "v1（旧版）",
+  "v2": "v2"
+}

package/dist/server/CCInstruction.js

@@ -82,15 +82,30 @@ class CCInstruction extends import_plugin_workflow.Instruction {
   }
   async duplicateConfig(node, { transaction }) {
     const uiSchemaRepo = this.workflow.app.db.getRepository("uiSchemas");
-    if (!node.config.ccDetail) {
-      return node.config;
+    const flowModelRepo = this.workflow.app.db.getRepository("flowModels");
+    const nextConfig = { ...node.config };
+    if (node.config.ccDetail) {
+      const result = await uiSchemaRepo.duplicate(node.config.ccDetail, {
+        transaction
+      });
+      nextConfig.ccDetail = (result == null ? void 0 : result["x-uid"]) ?? (0, import_utils.uid)();
     }
-    const result = await uiSchemaRepo.duplicate(node.config.ccDetail, {
-      transaction
-    });
-    return {
-      ...node.config,
-      ccDetail: (result == null ? void 0 : result["x-uid"]) ?? (0, import_utils.uid)()
+    const duplicateFlowModelUid = async (modelUid) => {
+      var _a, _b, _c, _d;
+      if (!modelUid) return void 0;
+      try {
+        const duplicated = await ((_a = flowModelRepo == null ? void 0 : flowModelRepo.duplicate) == null ? void 0 : _a.call(flowModelRepo, modelUid, { transaction }));
+        return (duplicated == null ? void 0 : duplicated.uid) || ((_b = duplicated == null ? void 0 : duplicated.data) == null ? void 0 : _b.uid) || ((_d = (_c = duplicated == null ? void 0 : duplicated.data) == null ? void 0 : _c.data) == null ? void 0 : _d.uid) || (0, import_utils.uid)();
+      } catch (error) {
+        return modelUid;
+      }
     };
+    if (node.config.ccUid) {
+      nextConfig.ccUid = await duplicateFlowModelUid(node.config.ccUid);
+    }
+    if (node.config.taskCardUid) {
+      nextConfig.taskCardUid = await duplicateFlowModelUid(node.config.taskCardUid);
+    }
+    return nextConfig;
   }
 }

package/dist/server/actions.js

@@ -40,6 +40,12 @@ __export(actions_exports, {
 });
 module.exports = __toCommonJS(actions_exports);
 var import_actions = __toESM(require("@nocobase/actions"));
+var import_tempAssociationFields = require("./tempAssociationFields");
+const mergeAppends = (appends, required) => {
+  const result = /* @__PURE__ */ new Set([...appends || []]);
+  required.forEach((item) => result.add(item));
+  return Array.from(result);
+};
 const workflowCcTasks = {
   async get(context, next) {
     context.action.mergeParams({
@@ -50,12 +56,15 @@ const workflowCcTasks = {
     return import_actions.default.get(context, next);
   },
   async listMine(context, next) {
+    var _a;
     context.action.mergeParams({
       filter: {
         userId: context.state.currentUser.id
-      }
+      },
+      appends: mergeAppends((_a = context.action.params) == null ? void 0 : _a.appends, ["node", "workflow", "workflow.nodes"])
     });
-    return import_actions.default.list(context, next);
+    await import_actions.default.list(context, next);
+    await (0, import_tempAssociationFields.appendTempAssociationFields)(context);
   },
   async read(context, next) {
     const { filterByTk } = context.action.params;

package/dist/server/tempAssociationFields.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 { Context } from '@nocobase/actions';
+export declare function appendTempAssociationFields(context: Context): Promise<void>;