@nocobase/plugin-workflow-manual 2.3.0-alpha.1 → 2.3.0-beta.3

package/dist/server/forms/create.js

@@ -29,7 +29,7 @@ __export(create_exports, {
   default: () => create_default
 });
 module.exports = __toCommonJS(create_exports);
-async function create_default(instance, { dataSource = "main", collection }, processor) {
+async function create_default(instance, { dataSource = "main", collection }, transaction) {
   const repo = this.workflow.app.dataSourceManager.dataSources.get(dataSource).collectionManager.getRepository(collection);
   if (!repo) {
     throw new Error(`collection ${collection} for create data on manual node not found`);
@@ -43,8 +43,8 @@ async function create_default(instance, { dataSource = "main", collection }, pro
       updatedBy: instance.userId
     },
     context: {
-      executionId: processor.execution.id
+      executionId: instance.executionId
     },
-    transaction: processor.transaction
+    transaction
   });
 }

package/dist/server/forms/index.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.
  */
-import { Processor } from '@nocobase/plugin-workflow';
+import type { Transaction } from '@nocobase/database';
 import ManualInstruction from '../ManualInstruction';
-export type FormHandler = (this: ManualInstruction, instance: any, formConfig: any, processor: Processor) => Promise<void>;
+export type FormHandler = (this: ManualInstruction, instance: any, formConfig: any, transaction?: Transaction) => Promise<void>;
 export default function ({ formTypes }: {
     formTypes: any;
 }): void;

package/dist/server/forms/update.d.ts

@@ -6,10 +6,10 @@
  * 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 { Processor } from '@nocobase/plugin-workflow';
+import type { Transaction } from '@nocobase/database';
 import ManualInstruction from '../ManualInstruction';
 export default function (this: ManualInstruction, instance: any, { dataSource, collection, filter }: {
     dataSource?: string;
     collection: any;
     filter?: {};
-}, processor: Processor): Promise<void>;
+}, transaction?: Transaction): Promise<void>;

package/dist/server/forms/update.js

@@ -29,7 +29,7 @@ __export(update_exports, {
   default: () => update_default
 });
 module.exports = __toCommonJS(update_exports);
-async function update_default(instance, { dataSource = "main", collection, filter = {} }, processor) {
+async function update_default(instance, { dataSource = "main", collection, filter = {} }, transaction) {
   const repo = this.workflow.app.dataSourceManager.dataSources.get(dataSource).collectionManager.getRepository(collection);
   if (!repo) {
     throw new Error(`collection ${collection} for update data on manual node not found`);
@@ -37,14 +37,14 @@ async function update_default(instance, { dataSource = "main", collection, filte
   const { _, ...form } = instance.result;
   const [values] = Object.values(form);
   await repo.update({
-    filter: processor.getParsedValue(filter, instance.nodeId),
+    filter,
     values: {
       ...values ?? {},
       updatedBy: instance.userId
     },
     context: {
-      executionId: processor.execution.id
+      executionId: instance.executionId
     },
-    transaction: processor.transaction
+    transaction
   });
 }

package/dist/server/migrations/20260723120000-rebuild-workflow-task-stats.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 { 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_MANUAL], silent: true });
+  }
+}

package/package.json

@@ -6,7 +6,7 @@
   "description": "Could be used for workflows which some of decisions are made by users.",
   "description.ru-RU": "Может использоваться в рабочих процессах, где какие-то решения принимаются пользователями.",
   "description.zh-CN": "用于人工控制部分决策的流程。",
-  "version": "2.3.0-alpha.1",
+  "version": "2.3.0-beta.3",
   "license": "Apache-2.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/workflow-manual",
@@ -37,7 +37,7 @@
     "@nocobase/test": "2.x",
     "@nocobase/utils": "2.x"
   },
-  "gitHead": "2377df8ceb12549149017f7f14a61207bf6e49a2",
+  "gitHead": "f8cb6ec699b9aaffcf500fe68a55f1271b8a331c",
   "keywords": [
     "Workflow"
   ]