@nocobase/flow-engine 2.1.38 → 2.1.39

package/lib/flowContext.js

@@ -3501,8 +3501,13 @@ function __mergeRunJSDocMeta(base, patch) {
 __name(__mergeRunJSDocMeta, "__mergeRunJSDocMeta");
 const _FlowRunJSContext = class _FlowRunJSContext extends FlowContext {
   constructor(delegate) {
+    var _a, _b;
     super();
     this.addDelegate(delegate);
+    const submit = (_b = (_a = delegate.blockModel) == null ? void 0 : _a.submitFromRunJs) == null ? void 0 : _b.bind(delegate.blockModel);
+    if (delegate.form && submit) {
+      this.defineProperty("form", { value: { ...delegate.form, submit } });
+    }
     this.defineProperty("React", { value: import_react.default });
     this.defineProperty("antd", { value: antd });
     this.defineProperty("dayjs", {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/flow-engine",
-  "version": "2.1.38",
+  "version": "2.1.39",
   "private": false,
   "description": "A standalone flow engine for NocoBase, managing workflows, models, and actions.",
   "main": "lib/index.js",
@@ -8,8 +8,8 @@
   "dependencies": {
     "@formily/antd-v5": "1.x",
     "@formily/reactive": "2.x",
-    "@nocobase/sdk": "2.1.38",
-    "@nocobase/shared": "2.1.38",
+    "@nocobase/sdk": "2.1.39",
+    "@nocobase/shared": "2.1.39",
     "ahooks": "^3.7.2",
     "axios": "^1.7.0",
     "dayjs": "^1.11.9",
@@ -37,5 +37,5 @@
   ],
   "author": "NocoBase Team",
   "license": "Apache-2.0",
-  "gitHead": "cf73a1ede7f46029428d3ed143af2e5dc4f035e6"
+  "gitHead": "ddbf88ac2a5de1ad94ff4779618cdf1b81aae037"
 }

package/src/__tests__/runjsFormSubmit.test.ts

@@ -0,0 +1,45 @@
+/**
+ * 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 { describe, expect, it, vi } from 'vitest';
+import { FlowContext, FlowRunJSContext } from '../flowContext';
+import { JSItemRunJSContext } from '../runjs-context/contexts/JSItemRunJSContext';
+
+describe('FlowRunJSContext form submission', () => {
+  it('uses the form block RunJS submit capability without changing the native form', () => {
+    const nativeSubmit = vi.fn();
+    const getFieldsValue = vi.fn(() => ({ name: 'Alice' }));
+    const form = { submit: nativeSubmit, getFieldsValue };
+    const submitFromRunJs = vi.fn();
+    const delegate = new FlowContext();
+    delegate.defineProperty('form', { value: form });
+    delegate.defineProperty('blockModel', { value: { submitFromRunJs } });
+
+    const ctx = new JSItemRunJSContext(delegate);
+
+    expect(ctx.form.getFieldsValue()).toEqual({ name: 'Alice' });
+    ctx.form.submit();
+    expect(submitFromRunJs).toHaveBeenCalledOnce();
+    expect(nativeSubmit).not.toHaveBeenCalled();
+    expect(form.submit).toBe(nativeSubmit);
+  });
+
+  it('keeps the native submit method when the block has no RunJS submit capability', () => {
+    const nativeSubmit = vi.fn();
+    const form = { submit: nativeSubmit };
+    const delegate = new FlowContext();
+    delegate.defineProperty('form', { value: form });
+    delegate.defineProperty('blockModel', { value: {} });
+
+    const ctx = new FlowRunJSContext(delegate);
+
+    ctx.form.submit();
+    expect(nativeSubmit).toHaveBeenCalledOnce();
+  });
+});

package/src/flowContext.ts

@@ -4601,6 +4601,10 @@ export class FlowRunJSContext extends FlowContext {
   constructor(delegate: FlowContext) {
     super();
     this.addDelegate(delegate);
+    const submit = delegate.blockModel?.submitFromRunJs?.bind(delegate.blockModel);
+    if (delegate.form && submit) {
+      this.defineProperty('form', { value: { ...delegate.form, submit } });
+    }
     this.defineProperty('React', { value: React });
     this.defineProperty('antd', { value: antd });
     this.defineProperty('dayjs', {