@nocobase/plugin-workflow-manual 1.6.0-beta.9 → 1.6.1

package/dist/common/constants.js

@@ -0,0 +1,71 @@
+/**
+ * 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 constants_exports = {};
+__export(constants_exports, {
+  MANUAL_TASK_TYPE: () => MANUAL_TASK_TYPE,
+  NAMESPACE: () => NAMESPACE,
+  TASK_STATUS: () => TASK_STATUS,
+  TaskStatusOptions: () => TaskStatusOptions,
+  TaskStatusOptionsMap: () => TaskStatusOptionsMap
+});
+module.exports = __toCommonJS(constants_exports);
+const NAMESPACE = "workflow-manual";
+const MANUAL_TASK_TYPE = "manual";
+const TASK_STATUS = {
+  PENDING: 0,
+  RESOLVED: 1,
+  REJECTED: -1
+};
+const TaskStatusOptions = [
+  {
+    value: TASK_STATUS.PENDING,
+    label: `{{t("Pending", { ns: "workflow" })}}`,
+    color: "gold"
+  },
+  {
+    value: TASK_STATUS.RESOLVED,
+    label: `{{t("Resolved", { ns: "workflow" })}}`,
+    color: "green"
+  },
+  {
+    value: TASK_STATUS.REJECTED,
+    label: `{{t("Rejected", { ns: "workflow" })}}`,
+    color: "red"
+  }
+];
+const TaskStatusOptionsMap = TaskStatusOptions.reduce(
+  (map, item) => Object.assign(map, { [item.value]: item }),
+  {}
+);
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  MANUAL_TASK_TYPE,
+  NAMESPACE,
+  TASK_STATUS,
+  TaskStatusOptions,
+  TaskStatusOptionsMap
+});

package/dist/externalVersion.js

@@ -8,22 +8,23 @@
  */
 
 module.exports = {
-  "@nocobase/client": "1.6.0-beta.9",
+  "@nocobase/client": "1.6.1",
   "react": "18.2.0",
-  "@nocobase/plugin-workflow": "1.6.0-beta.9",
   "@formily/react": "2.3.0",
+  "@formily/antd-v5": "1.1.9",
   "antd": "5.12.8",
+  "@ant-design/icons": "5.6.1",
+  "antd-style": "3.7.1",
   "dayjs": "1.11.10",
-  "@ant-design/icons": "5.2.6",
   "react-i18next": "11.18.6",
-  "@nocobase/utils": "1.6.0-beta.9",
-  "@nocobase/server": "1.6.0-beta.9",
-  "@nocobase/actions": "1.6.0-beta.9",
-  "@nocobase/resourcer": "1.6.0-beta.9",
-  "@nocobase/test": "1.6.0-beta.9",
-  "@nocobase/plugin-workflow-test": "1.6.0-beta.9",
+  "lodash": "4.17.21",
+  "@nocobase/plugin-workflow": "1.6.1",
+  "@nocobase/utils": "1.6.1",
+  "@nocobase/server": "1.6.1",
+  "@nocobase/actions": "1.6.1",
+  "@nocobase/resourcer": "1.6.1",
+  "@nocobase/test": "1.6.1",
+  "@nocobase/plugin-workflow-test": "1.6.1",
   "@formily/core": "2.3.0",
-  "@formily/antd-v5": "1.1.9",
-  "@nocobase/database": "1.6.0-beta.9",
-  "lodash": "4.17.21"
+  "@nocobase/database": "1.6.1"
 };

package/dist/locale/index.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.
  */
-export declare const NAMESPACE = "workflow-manual";
+import { NAMESPACE } from '../common/constants';
+export { NAMESPACE };
 export declare function useLang(key: string, options?: {}): string;
 export declare const lang: typeof useLang;
 export declare function usePluginTranslation(options?: any): import("react-i18next").UseTranslationResponse<"workflow-manual", undefined>;

package/dist/locale/index.js

@@ -26,21 +26,21 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var locale_exports = {};
 __export(locale_exports, {
-  NAMESPACE: () => NAMESPACE,
+  NAMESPACE: () => import_constants.NAMESPACE,
   lang: () => lang,
   useLang: () => useLang,
   usePluginTranslation: () => usePluginTranslation
 });
 module.exports = __toCommonJS(locale_exports);
 var import_react_i18next = require("react-i18next");
-const NAMESPACE = "workflow-manual";
+var import_constants = require("../common/constants");
 function useLang(key, options = {}) {
   const { t } = usePluginTranslation(options);
   return t(key);
 }
 const lang = useLang;
 function usePluginTranslation(options) {
-  return (0, import_react_i18next.useTranslation)(NAMESPACE, options);
+  return (0, import_react_i18next.useTranslation)(import_constants.NAMESPACE, options);
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/locale/it-IT.json

@@ -0,0 +1,30 @@
+{
+  "Manual": "Manuale",
+  "Could be used for manually submitting data, and determine whether to continue or exit. Workflow will generate a todo item for assigned user when it reaches a manual node, and continue processing after user submits the form.": "Può essere utilizzato per l'invio manuale di dati e per determinare se continuare o uscire. Il workflow genererà un elemento 'da fare' per l'utente assegnato quando raggiunge un nodo manuale e continuerà l'elaborazione dopo che l'utente avrà inviato il modulo.",
+  "Values preset in this form will override user submitted ones when continue or reject.": "I valori preimpostati in questo modulo sovrascriveranno quelli inviati dall'utente quando si continua o si rifiuta.",
+  "Assignee": "Assegnatario",
+  "Assignees": "Assegnatari",
+  "User interface": "Interfaccia utente",
+  "Configure user interface": "Configura interfaccia utente",
+  "View user interface": "Visualizza interfaccia utente",
+  "Separately": "Separato",
+  "Each user has own task": "Ogni utente ha il proprio compito",
+  "Collaboratively": "Collaborativo",
+  "Everyone shares one task": "Tutti condividono un compito",
+  "Negotiation": "Negoziazione",
+  "All pass": "Tutti passano",
+  "Everyone should pass": "Tutti dovrebbero passare",
+  "Any pass": "Qualcuno passa",
+  "Anyone pass": "Chiunque passa",
+  "Field name existed in form": "Nome campo esistente nel modulo",
+  "Continue the process": "Continua il processo",
+  "Terminate the process": "Termina il processo",
+  "Save temporarily": "Salva temporaneamente",
+  "Custom form": "Modulo personalizzato",
+  "Data record": "Record dati",
+  "Create record form": "Modulo creazione record",
+  "Update record form": "Modulo aggiornamento record",
+  "Filter settings": "Impostazioni filtro",
+  "Workflow todos": "'Da fare' del workflow",
+  "Task": "Compito"
+}

package/dist/server/ManualInstruction.js

@@ -121,9 +121,9 @@ class ManualInstruction_default extends import_plugin_workflow.Instruction {
       return job;
     }
     const title = config.title ? processor.getParsedValue(config.title, node.id) : node.title;
-    const UserJobModel = this.workflow.app.db.getModel("users_jobs");
-    await UserJobModel.bulkCreate(
-      assignees.map((userId) => ({
+    const TaskRepo = this.workflow.app.db.getRepository("workflowManualTasks");
+    await TaskRepo.createMany({
+      records: assignees.map((userId) => ({
         userId,
         jobId: job.id,
         nodeId: node.id,
@@ -132,24 +132,22 @@ class ManualInstruction_default extends import_plugin_workflow.Instruction {
         status: import_plugin_workflow.JOB_STATUS.PENDING,
         title
       })),
-      {
-        transaction: processor.mainTransaction
-      }
-    );
+      transaction: processor.mainTransaction
+    });
     return job;
   }
   async resume(node, job, processor) {
     var _a;
     const { mode } = node.config;
-    const UserJobRepo = this.workflow.app.db.getRepository("users_jobs");
-    const jobs = await UserJobRepo.find({
+    const TaskRepo = this.workflow.app.db.getRepository("workflowManualTasks");
+    const tasks = await TaskRepo.find({
       where: {
         jobId: job.id
       },
       transaction: processor.mainTransaction
     });
     const assignees = [];
-    const distributionMap = jobs.reduce((result2, item) => {
+    const distributionMap = tasks.reduce((result2, item) => {
       if (result2[item.status] == null) {
         result2[item.status] = 0;
       }
@@ -161,9 +159,9 @@ class ManualInstruction_default extends import_plugin_workflow.Instruction {
       status: Number.parseInt(status2, 10),
       count: distributionMap[status2]
     }));
-    const submitted = jobs.reduce((count, item) => item.status !== import_plugin_workflow.JOB_STATUS.PENDING ? count + 1 : count, 0);
+    const submitted = tasks.reduce((count, item) => item.status !== import_plugin_workflow.JOB_STATUS.PENDING ? count + 1 : count, 0);
     const status = job.status || (getMode(mode).getStatus(distribution, assignees) ?? import_plugin_workflow.JOB_STATUS.PENDING);
-    const result = mode ? (submitted || 0) / assignees.length : ((_a = job.latestUserJob) == null ? void 0 : _a.result) ?? job.result;
+    const result = mode ? (submitted || 0) / assignees.length : ((_a = job.latestTask) == null ? void 0 : _a.result) ?? job.result;
     processor.logger.debug(`manual resume job and next status: ${status}`);
     job.set({
       status,

package/dist/server/Plugin.js

@@ -44,10 +44,11 @@ var import_actions = __toESM(require("@nocobase/actions"));
 var import_plugin_workflow = __toESM(require("@nocobase/plugin-workflow"));
 var jobActions = __toESM(require("./actions"));
 var import_ManualInstruction = __toESM(require("./ManualInstruction"));
+var import_constants = require("../common/constants");
 class Plugin_default extends import_server.Plugin {
   async load() {
     this.app.resourceManager.define({
-      name: "users_jobs",
+      name: "workflowManualTasks",
       actions: {
         list: {
           filter: {
@@ -68,8 +69,20 @@ class Plugin_default extends import_server.Plugin {
         ...jobActions
       }
     });
-    this.app.acl.allow("users_jobs", ["list", "get", "submit", "countMine"], "loggedIn");
+    this.app.acl.allow("workflowManualTasks", ["list", "get", "submit"], "loggedIn");
     const workflowPlugin = this.app.pm.get(import_plugin_workflow.default);
     workflowPlugin.registerInstruction("manual", import_ManualInstruction.default);
+    this.db.on("workflowManualTasks.afterSave", async (task, options) => {
+      await workflowPlugin.toggleTaskStatus(
+        {
+          type: import_constants.MANUAL_TASK_TYPE,
+          key: `${task.id}`,
+          userId: task.userId,
+          workflowId: task.workflowId
+        },
+        Boolean(task.status),
+        options
+      );
+    });
   }
 }

package/dist/server/actions.d.ts

@@ -8,4 +8,3 @@
  */
 import { Context } from '@nocobase/actions';
 export declare function submit(context: Context, next: any): Promise<never>;
-export declare function countMine(context: Context, next: any): Promise<void>;

package/dist/server/actions.js

@@ -36,7 +36,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var actions_exports = {};
 __export(actions_exports, {
-  countMine: () => countMine,
   submit: () => submit
 });
 module.exports = __toCommonJS(actions_exports);
@@ -52,7 +51,7 @@ async function submit(context, next) {
   }
   const plugin = context.app.getPlugin(import_plugin_workflow.default);
   const instruction = plugin.instructions.get("manual");
-  const userJob = await repository.findOne({
+  const task = await repository.findOne({
     filterByTk,
     // filter: {
     //   userId: currentUser?.id
@@ -60,24 +59,24 @@ async function submit(context, next) {
     appends: ["job", "node", "execution", "workflow"],
     context
   });
-  if (!userJob) {
+  if (!task) {
     return context.throw(404);
   }
-  const { forms = {} } = userJob.node.config;
+  const { forms = {} } = task.node.config;
   const [formKey] = Object.keys(values.result ?? {}).filter((key) => key !== "_");
   const actionKey = (_a = values.result) == null ? void 0 : _a._;
   const actionItem = (_c = (_b = forms[formKey]) == null ? void 0 : _b.actions) == null ? void 0 : _c.find((item) => item.key === actionKey);
-  if (userJob.status !== import_plugin_workflow.JOB_STATUS.PENDING || userJob.job.status !== import_plugin_workflow.JOB_STATUS.PENDING || userJob.execution.status !== import_plugin_workflow.EXECUTION_STATUS.STARTED || !userJob.workflow.enabled || !actionKey || (actionItem == null ? void 0 : actionItem.status) == null) {
+  if (task.status !== import_plugin_workflow.JOB_STATUS.PENDING || task.job.status !== import_plugin_workflow.JOB_STATUS.PENDING || task.execution.status !== import_plugin_workflow.EXECUTION_STATUS.STARTED || !task.workflow.enabled || !actionKey || (actionItem == null ? void 0 : actionItem.status) == null) {
     return context.throw(400);
   }
-  userJob.execution.workflow = userJob.workflow;
-  const processor = plugin.createProcessor(userJob.execution);
+  task.execution.workflow = task.workflow;
+  const processor = plugin.createProcessor(task.execution);
   await processor.prepare();
-  const assignees = processor.getParsedValue(userJob.node.config.assignees ?? [], userJob.nodeId).flat().filter(Boolean);
-  if (!assignees.includes(currentUser.id) || userJob.userId !== currentUser.id) {
+  const assignees = processor.getParsedValue(task.node.config.assignees ?? [], task.nodeId).flat().filter(Boolean);
+  if (!assignees.includes(currentUser.id) || task.userId !== currentUser.id) {
     return context.throw(403);
   }
-  const presetValues = processor.getParsedValue(actionItem.values ?? {}, userJob.nodeId, {
+  const presetValues = processor.getParsedValue(actionItem.values ?? {}, task.nodeId, {
     additionalScope: {
       // @deprecated
       currentUser,
@@ -92,46 +91,25 @@ async function submit(context, next) {
       }
     }
   });
-  userJob.set({
+  task.set({
     status: actionItem.status,
-    result: actionItem.status ? { [formKey]: Object.assign(values.result[formKey], presetValues), _: actionKey } : Object.assign(userJob.result ?? {}, values.result)
+    result: actionItem.status ? { [formKey]: Object.assign(values.result[formKey], presetValues), _: actionKey } : Object.assign(task.result ?? {}, values.result)
   });
   const handler = instruction.formTypes.get(forms[formKey].type);
-  if (handler && userJob.status) {
-    await handler.call(instruction, userJob, forms[formKey], processor);
+  if (handler && task.status) {
+    await handler.call(instruction, task, forms[formKey], processor);
   }
-  await userJob.save();
+  await task.save();
   await processor.exit();
-  context.body = userJob;
+  context.body = task;
   context.status = 202;
   await next();
-  userJob.job.execution = userJob.execution;
-  userJob.job.latestUserJob = userJob;
-  processor.logger.info(`manual node (${userJob.nodeId}) action trigger execution (${userJob.execution.id}) to resume`);
-  plugin.resume(userJob.job);
-}
-async function countMine(context, next) {
-  const repository = import_actions.utils.getRepositoryFromParams(context);
-  const { currentUser } = context.state;
-  const count = await repository.count({
-    filter: {
-      $and: [
-        {
-          "workflow.enabled": true
-        },
-        context.action.params.filter ?? {},
-        {
-          userId: currentUser.id
-        }
-      ]
-    },
-    context
-  });
-  context.body = count;
-  await next();
+  task.job.execution = task.execution;
+  task.job.latestTask = task;
+  processor.logger.info(`manual node (${task.nodeId}) action trigger execution (${task.execution.id}) to resume`);
+  plugin.resume(task.job);
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  countMine,
   submit
 });

package/dist/server/collections/{1-users_jobs.js → workflowManualTasks.js}

@@ -24,14 +24,15 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var users_jobs_exports = {};
-__export(users_jobs_exports, {
-  default: () => users_jobs_default
+var workflowManualTasks_exports = {};
+__export(workflowManualTasks_exports, {
+  default: () => workflowManualTasks_default
 });
-module.exports = __toCommonJS(users_jobs_exports);
+module.exports = __toCommonJS(workflowManualTasks_exports);
 var import_database = require("@nocobase/database");
-var users_jobs_default = (0, import_database.defineCollection)({
-  name: "users_jobs",
+var import_constants = require("../../common/constants");
+var workflowManualTasks_default = (0, import_database.defineCollection)({
+  name: "workflowManualTasks",
   dumpRules: {
     group: "log"
   },
@@ -60,7 +61,13 @@ var users_jobs_default = (0, import_database.defineCollection)({
     },
     {
       type: "string",
-      name: "title"
+      name: "title",
+      interface: "input",
+      uiSchema: {
+        type: "string",
+        title: `{{t("Task title", { ns: "${import_constants.NAMESPACE}" })}}`,
+        "x-component": "Input"
+      }
     },
     {
       type: "belongsTo",
@@ -73,7 +80,21 @@ var users_jobs_default = (0, import_database.defineCollection)({
     },
     {
       type: "belongsTo",
-      name: "workflow"
+      name: "workflow",
+      target: "workflows",
+      foreignKey: "workflowId",
+      interface: "m2o",
+      uiSchema: {
+        type: "object",
+        title: `{{t("Workflow", { ns: "workflow" })}}`,
+        "x-component": "AssociationField",
+        "x-component-props": {
+          fieldNames: {
+            label: "title",
+            value: "id"
+          }
+        }
+      }
     },
     {
       type: "integer",

package/dist/server/migrations/20250113163732-add-task-title.js

@@ -35,7 +35,7 @@ class add_task_title_default extends import_server.Migration {
   async up() {
     const { db } = this.context;
     const NodeRepo = db.getRepository("flow_nodes");
-    const TaskRepo = db.getRepository("users_jobs");
+    const TaskRepo = db.getRepository("workflowManualTasks");
     await db.sequelize.transaction(async (transaction) => {
       const nodes = await NodeRepo.find({
         filter: {

package/dist/server/{collections/3-users.d.ts → migrations/20250225175712-change-table-name.d.ts}

@@ -6,9 +6,9 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
-declare const _default: {
-    collectionOptions: import("@nocobase/database").CollectionOptions;
-    mergeOptions: import("deepmerge").Options;
-    extend: boolean;
-};
-export default _default;
+import { Migration } from '@nocobase/server';
+export default class extends Migration {
+    appVersion: string;
+    on: string;
+    up(): Promise<void>;
+}

package/dist/server/migrations/20250225175712-change-table-name.js

@@ -0,0 +1,66 @@
+/**
+ * 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 change_table_name_exports = {};
+__export(change_table_name_exports, {
+  default: () => change_table_name_default
+});
+module.exports = __toCommonJS(change_table_name_exports);
+var import_server = require("@nocobase/server");
+class change_table_name_default extends import_server.Migration {
+  appVersion = "<1.6.0";
+  on = "beforeLoad";
+  async up() {
+    const { db } = this.context;
+    const queryInterface = db.sequelize.getQueryInterface();
+    await db.sequelize.transaction(async (transaction) => {
+      const exists = await queryInterface.tableExists("users_jobs", { transaction });
+      if (exists) {
+        const newTableName = db.options.underscored ? "workflow_manual_tasks" : "workflowManualTasks";
+        await queryInterface.renameTable("users_jobs", newTableName, { transaction });
+        const indexes = await queryInterface.showIndex(newTableName, { transaction });
+        for (const item of indexes) {
+          if (item.name.startsWith("users_jobs")) {
+            if (this.db.isPostgresCompatibleDialect()) {
+              await db.sequelize.query(
+                `ALTER INDEX "${item.name}" RENAME TO "${item.name.replace("users_jobs", "workflow_manual_tasks")}";`,
+                { transaction }
+              );
+            } else if (this.db.isMySQLCompatibleDialect()) {
+              await db.sequelize.query(
+                `ALTER TABLE ${newTableName} RENAME INDEX ${item.name} TO ${item.name.replace(
+                  "users_jobs",
+                  "workflow_manual_tasks"
+                )};`,
+                { transaction }
+              );
+            }
+          }
+        }
+      }
+    });
+  }
+}

package/dist/server/{collections/2-jobs.d.ts → migrations/20250227220712-add-pending-tasks.d.ts}

@@ -6,9 +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.
  */
-declare const _default: {
-    collectionOptions: import("@nocobase/database").CollectionOptions;
-    mergeOptions: import("deepmerge").Options;
-    extend: boolean;
-};
-export default _default;
+import { Migration } from '@nocobase/server';
+export default class extends Migration {
+    appVersion: string;
+    up(): Promise<void>;
+}

package/dist/server/migrations/20250227220712-add-pending-tasks.js

@@ -0,0 +1,63 @@
+/**
+ * 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 add_pending_tasks_exports = {};
+__export(add_pending_tasks_exports, {
+  default: () => add_pending_tasks_default
+});
+module.exports = __toCommonJS(add_pending_tasks_exports);
+var import_plugin_workflow = require("@nocobase/plugin-workflow");
+var import_server = require("@nocobase/server");
+var import_constants = require("../../common/constants");
+class add_pending_tasks_default extends import_server.Migration {
+  appVersion = "<1.6.0";
+  async up() {
+    const { db } = this.context;
+    const WorkflowTaskModel = db.getModel("workflowTasks");
+    const WorkflowManualTaskRepo = db.getRepository("workflowManualTasks");
+    await db.sequelize.transaction(async (transaction) => {
+      const tasks = await WorkflowManualTaskRepo.find({
+        filter: {
+          status: import_plugin_workflow.JOB_STATUS.PENDING,
+          "execution.status": import_plugin_workflow.EXECUTION_STATUS.STARTED,
+          "workflow.enabled": true
+        },
+        transaction
+      });
+      const records = tasks.map((item) => ({
+        type: import_constants.MANUAL_TASK_TYPE,
+        key: `${item.id}`,
+        userId: item.userId,
+        workflowId: item.workflowId
+      }));
+      for (const record of records) {
+        await WorkflowTaskModel.upsert(record, {
+          transaction
+        });
+      }
+    });
+  }
+}

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：人工处理节点",
   "description": "Could be used for workflows which some of decisions are made by users.",
   "description.zh-CN": "用于人工控制部分决策的流程。",
-  "version": "1.6.0-beta.9",
+  "version": "1.6.1",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/workflow-manual",
@@ -30,7 +30,7 @@
     "@nocobase/test": "1.x",
     "@nocobase/utils": "1.x"
   },
-  "gitHead": "eb1ff948fcf7a51175626a1a56a8b8d9b90be006",
+  "gitHead": "a784836ebbe1ddd514bf09c477ca0cff176dcbfd",
   "keywords": [
     "Workflow"
   ]