@nocobase/flow-engine 2.0.16 → 2.0.18

package/lib/executor/FlowExecutor.js

@@ -459,6 +459,12 @@ const _FlowExecutor = class _FlowExecutor {
         result,
         ...abortedByExitAll ? { aborted: true } : {}
       });
+      if (result && typeof result === "object") {
+        Object.defineProperty(result, "__abortedByExitAll", {
+          value: abortedByExitAll,
+          configurable: true
+        });
+      }
       return result;
     } catch (error) {
       try {

package/lib/types.d.ts

@@ -177,7 +177,7 @@ export interface ActionDefinition<TModel extends FlowModel = FlowModel, TCtx ext
  * - 收录内置常用事件，便于智能提示；
  * - 允许扩展字符串以保持向后兼容。
  */
-export type FlowEventName = 'click' | 'submit' | 'reset' | 'remove' | 'openView' | 'dropdownOpen' | 'popupScroll' | 'search' | 'customRequest' | 'collapseToggle' | (string & {});
+export type FlowEventName = 'click' | 'close' | 'submit' | 'reset' | 'remove' | 'openView' | 'dropdownOpen' | 'popupScroll' | 'search' | 'customRequest' | 'collapseToggle' | (string & {});
 /**
  * 事件流的执行时机（phase）。
  *

package/lib/utils/index.d.ts

@@ -8,11 +8,11 @@
  */
 export { BLOCK_GROUP_CONFIGS, BLOCK_TYPES, FLOW_ENGINE_NAMESPACE, MENU_KEYS, type BlockBuilderConfig, } from './constants';
 export { escapeT, getT, tExpr } from './translation';
-export { FlowCancelSaveException, FlowExitException } from './exceptions';
+export { FlowCancelSaveException, FlowExitAllException, FlowExitException } from './exceptions';
 export { defineAction } from './flow-definitions';
 export { isInheritedFrom } from './inheritance';
 export { resolveCreateModelOptions, resolveDefaultParams, resolveExpressions } from './params-resolvers';
-export { compileUiSchema, resolveStepUiSchema, resolveStepDisabledInSettings, resolveUiMode, shouldHideStepInSettings, } from './schema-utils';
+export { compileUiSchema, resolveStepUiSchema, resolveStepDisabledInSettings, resolveUiMode, shouldHideEventInSettings, shouldHideStepInSettings, } from './schema-utils';
 export { setupRuntimeContextSteps } from './setupRuntimeContextSteps';
 export { createCollectionContextMeta } from './createCollectionContextMeta';
 export { createAssociationAwareObjectMetaFactory, createAssociationSubpathResolver } from './associationObjectVariable';

package/lib/utils/index.js

@@ -30,6 +30,7 @@ __export(utils_exports, {
   BLOCK_TYPES: () => import_constants.BLOCK_TYPES,
   FLOW_ENGINE_NAMESPACE: () => import_constants.FLOW_ENGINE_NAMESPACE,
   FlowCancelSaveException: () => import_exceptions.FlowCancelSaveException,
+  FlowExitAllException: () => import_exceptions.FlowExitAllException,
   FlowExitException: () => import_exceptions.FlowExitException,
   MENU_KEYS: () => import_constants.MENU_KEYS,
   buildRecordMeta: () => import_variablesParams.buildRecordMeta,
@@ -86,6 +87,7 @@ __export(utils_exports, {
   serializeCtxDateValue: () => import_dateVariable.serializeCtxDateValue,
   setAutoFlowError: () => import_autoFlowError.setAutoFlowError,
   setupRuntimeContextSteps: () => import_setupRuntimeContextSteps.setupRuntimeContextSteps,
+  shouldHideEventInSettings: () => import_schema_utils.shouldHideEventInSettings,
   shouldHideStepInSettings: () => import_schema_utils.shouldHideStepInSettings,
   tExpr: () => import_translation.tExpr
 });
@@ -119,6 +121,7 @@ var import_resolveModuleUrl = require("./resolveModuleUrl");
   BLOCK_TYPES,
   FLOW_ENGINE_NAMESPACE,
   FlowCancelSaveException,
+  FlowExitAllException,
   FlowExitException,
   MENU_KEYS,
   buildRecordMeta,
@@ -175,6 +178,7 @@ var import_resolveModuleUrl = require("./resolveModuleUrl");
   serializeCtxDateValue,
   setAutoFlowError,
   setupRuntimeContextSteps,
+  shouldHideEventInSettings,
   shouldHideStepInSettings,
   tExpr
 });

package/lib/utils/schema-utils.d.ts

@@ -9,7 +9,7 @@
 import type { ISchema } from '@formily/json-schema';
 import type { FlowModel } from '../models';
 import { FlowRuntimeContext } from '../flowContext';
-import type { StepDefinition, StepUIMode } from '../types';
+import type { EventDefinition, StepDefinition, StepUIMode } from '../types';
 /**
  * 解析 uiMode，支持静态值和函数形式
  * 函数可以接收 FlowRuntimeContext
@@ -38,6 +38,12 @@ export declare function compileUiSchema(scope: Record<string, any>, uiSchema: an
  * @returns 合并后的uiSchema对象，如果为空则返回null
  */
 export declare function resolveStepUiSchema<TModel extends FlowModel = FlowModel>(model: TModel, flow: any, step: StepDefinition): Promise<Record<string, ISchema> | null>;
+/**
+ * 判断事件在设置菜单中是否应被隐藏。
+ * - 支持 EventDefinition.hideInSettings。
+ * - hideInSettings 可为布尔值或函数（接收 FlowRuntimeContext）。
+ */
+export declare function shouldHideEventInSettings<TModel extends FlowModel = FlowModel>(model: TModel, flow: any, event: EventDefinition<TModel> | undefined): Promise<boolean>;
 /**
  * 判断步骤在设置菜单中是否应被隐藏。
  * - 支持 StepDefinition.hideInSettings 与 ActionDefinition.hideInSettings（step 优先）。

package/lib/utils/schema-utils.js

@@ -31,6 +31,7 @@ __export(schema_utils_exports, {
   resolveStepDisabledInSettings: () => resolveStepDisabledInSettings,
   resolveStepUiSchema: () => resolveStepUiSchema,
   resolveUiMode: () => resolveUiMode,
+  shouldHideEventInSettings: () => shouldHideEventInSettings,
   shouldHideStepInSettings: () => shouldHideStepInSettings
 });
 module.exports = __toCommonJS(schema_utils_exports);
@@ -195,6 +196,23 @@ async function resolveStepUiSchema(model, flow, step) {
   return resolvedStepUiSchema;
 }
 __name(resolveStepUiSchema, "resolveStepUiSchema");
+async function shouldHideEventInSettings(model, flow, event) {
+  if (!event) return true;
+  const { hideInSettings } = event;
+  if (typeof hideInSettings === "function") {
+    try {
+      const ctx = new import_flowContext.FlowRuntimeContext(model, flow.key, "settings");
+      (0, import_setupRuntimeContextSteps.setupRuntimeContextSteps)(ctx, flow.steps || {}, model, flow.key);
+      const result = await hideInSettings(ctx);
+      return !!result;
+    } catch (error) {
+      console.warn(`Error evaluating hideInSettings for event '${event.name || ""}' in flow '${flow.key}':`, error);
+      return false;
+    }
+  }
+  return !!hideInSettings;
+}
+__name(shouldHideEventInSettings, "shouldHideEventInSettings");
 async function shouldHideStepInSettings(model, flow, step) {
   var _a;
   if (!step) return true;
@@ -283,5 +301,6 @@ __name(resolveStepDisabledInSettings, "resolveStepDisabledInSettings");
   resolveStepDisabledInSettings,
   resolveStepUiSchema,
   resolveUiMode,
+  shouldHideEventInSettings,
   shouldHideStepInSettings
 });

package/lib/views/FlowView.d.ts

@@ -10,6 +10,11 @@
 import { PopoverProps as AntdPopoverProps } from 'antd';
 import { FlowContext } from '../flowContext';
 import { ViewNavigation } from './ViewNavigation';
+export type FlowViewBeforeClosePayload = {
+    result?: any;
+    force?: boolean;
+};
+export type FlowViewBeforeCloseHandler = (payload: FlowViewBeforeClosePayload) => Promise<boolean | void> | boolean | void;
 export type FlowView = {
     type: 'drawer' | 'popover' | 'dialog' | 'embed';
     inputArgs: any;
@@ -20,8 +25,9 @@ export type FlowView = {
     Footer: React.FC<{
         children?: React.ReactNode;
     }> | null;
-    close: (result?: any, force?: boolean) => void;
+    close: (result?: any, force?: boolean) => Promise<boolean | void> | boolean | void;
     update: (newConfig: any) => void;
+    beforeClose?: FlowViewBeforeCloseHandler;
     navigation?: ViewNavigation;
     /** 页面的销毁方法 */
     destroy?: () => void;

package/lib/views/runViewBeforeClose.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 { FlowView, FlowViewBeforeClosePayload } from './FlowView';
+export declare function runViewBeforeClose(view: FlowView, payload: FlowViewBeforeClosePayload): Promise<boolean>;

package/lib/views/runViewBeforeClose.js

@@ -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.
+ */
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+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 runViewBeforeClose_exports = {};
+__export(runViewBeforeClose_exports, {
+  runViewBeforeClose: () => runViewBeforeClose
+});
+module.exports = __toCommonJS(runViewBeforeClose_exports);
+async function runViewBeforeClose(view, payload) {
+  var _a;
+  if (payload.force) {
+    return true;
+  }
+  const result = await ((_a = view.beforeClose) == null ? void 0 : _a.call(view, payload));
+  return result !== false;
+}
+__name(runViewBeforeClose, "runViewBeforeClose");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  runViewBeforeClose
+});

package/lib/views/useDialog.d.ts

@@ -12,9 +12,10 @@ export declare function useDialog(): (React.JSX.Element | {
         type: "dialog";
         inputArgs: any;
         preventClose: boolean;
+        beforeClose: any;
         destroy: (result?: any) => void;
         update: (newConfig: any) => void;
-        close: (result?: any, force?: boolean) => void;
+        close: (result?: any, force?: boolean) => Promise<boolean>;
         Footer: React.FC<{
             children?: React.ReactNode;
         }>;

package/lib/views/useDialog.js

@@ -52,6 +52,7 @@ var import_viewEvents = require("./viewEvents");
 var import_provider = require("../provider");
 var import_ViewScopedFlowEngine = require("../ViewScopedFlowEngine");
 var import_variablesParams = require("../utils/variablesParams");
+var import_runViewBeforeClose = require("./runViewBeforeClose");
 let uuid = 0;
 function useDialog() {
   const holderRef = React.useRef(null);
@@ -108,6 +109,7 @@ function useDialog() {
       type: "dialog",
       inputArgs: config.inputArgs || {},
       preventClose: !!config.preventClose,
+      beforeClose: void 0,
       destroy: /* @__PURE__ */ __name((result) => {
         var _a2, _b2, _c2, _d;
         if (destroyed) return;
@@ -125,16 +127,21 @@ function useDialog() {
         var _a2;
         return (_a2 = dialogRef.current) == null ? void 0 : _a2.update(newConfig);
       }, "update"),
-      close: /* @__PURE__ */ __name((result, force) => {
+      close: /* @__PURE__ */ __name(async (result, force) => {
         var _a2, _b2;
         if (config.preventClose && !force) {
-          return;
+          return false;
+        }
+        const shouldClose = await (0, import_runViewBeforeClose.runViewBeforeClose)(currentDialog, { result, force });
+        if (!shouldClose) {
+          return false;
         }
         if (config.triggerByRouter && ((_b2 = (_a2 = config.inputArgs) == null ? void 0 : _a2.navigation) == null ? void 0 : _b2.back)) {
           config.inputArgs.navigation.back();
-          return;
+          return true;
         }
         currentDialog.destroy(result);
+        return true;
       }, "close"),
       Footer: FooterComponent,
       Header: HeaderComponent,

package/lib/views/useDrawer.d.ts

@@ -13,9 +13,10 @@ export declare function useDrawer(): (React.JSX.Element | {
         type: "drawer";
         inputArgs: any;
         preventClose: boolean;
+        beforeClose: any;
         destroy: (result?: any) => void;
         update: (newConfig: any) => void;
-        close: (result?: any, force?: boolean) => void;
+        close: (result?: any, force?: boolean) => Promise<boolean>;
         Footer: React.FC<{
             children?: React.ReactNode;
         }>;

package/lib/views/useDrawer.js

@@ -52,6 +52,7 @@ var import_viewEvents = require("./viewEvents");
 var import_provider = require("../provider");
 var import_ViewScopedFlowEngine = require("../ViewScopedFlowEngine");
 var import_variablesParams = require("../utils/variablesParams");
+var import_runViewBeforeClose = require("./runViewBeforeClose");
 function useDrawer() {
   const holderRef = React.useRef(null);
   const drawerList = React.useMemo(() => import__.observable.shallow({ value: [] }), []);
@@ -127,6 +128,7 @@ function useDrawer() {
       type: "drawer",
       inputArgs: config.inputArgs || {},
       preventClose: !!config.preventClose,
+      beforeClose: void 0,
       destroy: /* @__PURE__ */ __name((result) => {
         var _a2, _b2, _c, _d;
         if (destroyed) return;
@@ -144,16 +146,21 @@ function useDrawer() {
         var _a2;
         return (_a2 = drawerRef.current) == null ? void 0 : _a2.update(newConfig);
       }, "update"),
-      close: /* @__PURE__ */ __name((result, force) => {
+      close: /* @__PURE__ */ __name(async (result, force) => {
         var _a2, _b2;
         if (config.preventClose && !force) {
-          return;
+          return false;
+        }
+        const shouldClose = await (0, import_runViewBeforeClose.runViewBeforeClose)(currentDrawer, { result, force });
+        if (!shouldClose) {
+          return false;
         }
         if (config.triggerByRouter && ((_b2 = (_a2 = config.inputArgs) == null ? void 0 : _a2.navigation) == null ? void 0 : _b2.back)) {
           config.inputArgs.navigation.back();
-          return;
+          return true;
         }
         currentDrawer.destroy(result);
+        return true;
       }, "close"),
       Footer: FooterComponent,
       Header: HeaderComponent,

package/lib/views/usePage.d.ts

@@ -16,9 +16,10 @@ export declare function usePage(): (React.JSX.Element | {
         type: "embed";
         inputArgs: any;
         preventClose: boolean;
+        beforeClose: any;
         destroy: (result?: any) => void;
         update: (newConfig: any) => void;
-        close: (result?: any, force?: boolean) => void;
+        close: (result?: any, force?: boolean) => Promise<boolean>;
         Header: React.FC<{
             title?: React.ReactNode;
             extra?: React.ReactNode;

package/lib/views/usePage.js

@@ -54,6 +54,7 @@ var import_viewEvents = require("./viewEvents");
 var import_provider = require("../provider");
 var import_ViewScopedFlowEngine = require("../ViewScopedFlowEngine");
 var import_variablesParams = require("../utils/variablesParams");
+var import_runViewBeforeClose = require("./runViewBeforeClose");
 let uuid = 0;
 const GLOBAL_EMBED_CONTAINER_ID = "nocobase-embed-container";
 const EMBED_REPLACING_DATA_KEY = "nocobaseEmbedReplacing";
@@ -131,6 +132,7 @@ function usePage() {
       type: "embed",
       inputArgs: viewInputArgs,
       preventClose: !!config.preventClose,
+      beforeClose: void 0,
       destroy: /* @__PURE__ */ __name((result) => {
         var _a2, _b2, _c2, _d, _e;
         (_a2 = config.onClose) == null ? void 0 : _a2.call(config);
@@ -152,16 +154,21 @@ function usePage() {
         var _a2;
         return (_a2 = pageRef.current) == null ? void 0 : _a2.update(newConfig);
       }, "update"),
-      close: /* @__PURE__ */ __name((result, force) => {
+      close: /* @__PURE__ */ __name(async (result, force) => {
         var _a2, _b2;
         if (preventClose && !force) {
-          return;
+          return false;
+        }
+        const shouldClose = await (0, import_runViewBeforeClose.runViewBeforeClose)(currentPage, { result, force });
+        if (!shouldClose) {
+          return false;
         }
         if (config.triggerByRouter && ((_b2 = (_a2 = config.inputArgs) == null ? void 0 : _a2.navigation) == null ? void 0 : _b2.back)) {
           config.inputArgs.navigation.back();
-          return;
+          return true;
         }
         currentPage.destroy(result);
+        return true;
       }, "close"),
       Header: HeaderComponent,
       Footer: FooterComponent,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/flow-engine",
-  "version": "2.0.16",
+  "version": "2.0.18",
   "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.0.16",
-    "@nocobase/shared": "2.0.16",
+    "@nocobase/sdk": "2.0.18",
+    "@nocobase/shared": "2.0.18",
     "ahooks": "^3.7.2",
     "dayjs": "^1.11.9",
     "dompurify": "^3.0.2",
@@ -36,5 +36,5 @@
   ],
   "author": "NocoBase Team",
   "license": "Apache-2.0",
-  "gitHead": "cd1b339b28eadbefde73535f945ef7cc3655d727"
+  "gitHead": "f93082fd2c15618fe85e697a9cdd90614371732e"
 }

package/src/executor/FlowExecutor.ts

@@ -519,6 +519,12 @@ export class FlowExecutor {
         result,
         ...(abortedByExitAll ? { aborted: true } : {}),
       });
+      if (result && typeof result === 'object') {
+        Object.defineProperty(result, '__abortedByExitAll', {
+          value: abortedByExitAll,
+          configurable: true,
+        });
+      }
       return result;
     } catch (error) {
       // 进入错误钩子并记录

package/src/executor/__tests__/flowExecutor.test.ts

@@ -232,6 +232,37 @@ describe('FlowExecutor', () => {
     expect(calls.sort()).toEqual(['a', 'b']);
   });
 
+  it('dispatchEvent sequential exposes abortedByExitAll metadata on result array', async () => {
+    const flows = {
+      stopClose: {
+        on: { eventName: 'close' },
+        steps: {
+          only: {
+            handler: vi.fn().mockImplementation((ctx) => {
+              ctx.exit();
+            }),
+          },
+        },
+      },
+      afterClose: {
+        on: { eventName: 'close', phase: 'afterAllFlows' },
+        steps: {
+          only: {
+            handler: vi.fn(),
+          },
+        },
+      },
+    } satisfies Record<string, Omit<FlowDefinitionOptions, 'key'>>;
+
+    const model = createModelWithFlows('m-close-meta', flows);
+
+    const result = await engine.executor.dispatchEvent(model, 'close', {}, { sequential: true });
+
+    expect(Array.isArray(result)).toBe(true);
+    expect((result as any).__abortedByExitAll).toBe(true);
+    expect(flows.afterClose.steps.only.handler).not.toHaveBeenCalled();
+  });
+
   it('dispatchEvent sequential respects sort order and stops on errors', async () => {
     const calls: string[] = [];
     const mkFlow = (key: string, sort: number, opts?: { throw?: boolean }) => ({

package/src/types.ts

@@ -213,6 +213,7 @@ export interface ActionDefinition<TModel extends FlowModel = FlowModel, TCtx ext
  */
 export type FlowEventName =
   | 'click'
+  | 'close'
   | 'submit'
   | 'reset'
   | 'remove'

package/src/utils/__tests__/utils.test.ts

@@ -12,6 +12,7 @@ import {
   getT,
   isInheritedFrom,
   resolveDefaultParams,
+  shouldHideEventInSettings,
   resolveStepUiSchema,
   resolveStepDisabledInSettings,
   shouldHideStepInSettings,
@@ -27,6 +28,7 @@ import type {
   FlowDefinitionOptions,
   ActionDefinition,
   DeepPartial,
+  EventDefinition,
   ModelConstructor,
   StepParams,
   StepDefinition,
@@ -1002,6 +1004,66 @@ describe('Utils', () => {
     });
   });
 
+  // ==================== shouldHideEventInSettings() FUNCTION ====================
+  describe('shouldHideEventInSettings()', () => {
+    let mockFlow: any;
+    let mockEvent: EventDefinition;
+
+    beforeEach(() => {
+      mockFlow = {
+        key: 'testFlow',
+        title: 'Test Flow',
+        steps: {},
+      };
+
+      mockEvent = {
+        name: 'close',
+        title: 'Close',
+        handler: vi.fn(),
+      };
+    });
+
+    test('returns true for static hideInSettings=true', async () => {
+      mockEvent.hideInSettings = true;
+
+      const result = await shouldHideEventInSettings(mockModel, mockFlow, mockEvent);
+
+      expect(result).toBe(true);
+    });
+
+    test('returns false for static hideInSettings=false', async () => {
+      mockEvent.hideInSettings = false;
+
+      const result = await shouldHideEventInSettings(mockModel, mockFlow, mockEvent);
+
+      expect(result).toBe(false);
+    });
+
+    test('evaluates function hideInSettings with FlowRuntimeContext and can read ctx.view.preventClose', async () => {
+      mockModel.context.defineProperty('view', { value: { preventClose: true } });
+      const hideFn = vi.fn().mockImplementation((ctx) => !!ctx.view?.preventClose);
+      mockEvent.hideInSettings = hideFn as any;
+
+      const result = await shouldHideEventInSettings(mockModel, mockFlow, mockEvent);
+
+      expect(hideFn).toHaveBeenCalledTimes(1);
+      const ctx = hideFn.mock.calls[0][0] as FlowRuntimeContext;
+      expect(ctx).toBeInstanceOf(FlowRuntimeContext);
+      expect(result).toBe(true);
+    });
+
+    test('returns false and logs warning when event hideInSettings throws', async () => {
+      const consoleSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});
+      mockEvent.hideInSettings = vi.fn().mockRejectedValue(new Error('boom')) as any;
+
+      const result = await shouldHideEventInSettings(mockModel, mockFlow, mockEvent);
+
+      expect(consoleSpy).toHaveBeenCalled();
+      expect(result).toBe(false);
+      consoleSpy.mockRestore();
+    });
+  });
+
   // ==================== shouldHideStepInSettings() FUNCTION ====================
   describe('shouldHideStepInSettings()', () => {
     let mockFlow: any;

package/src/utils/index.ts

@@ -22,7 +22,7 @@ export {
 export { escapeT, getT, tExpr } from './translation';
 
 // 异常类
-export { FlowCancelSaveException, FlowExitException } from './exceptions';
+export { FlowCancelSaveException, FlowExitAllException, FlowExitException } from './exceptions';
 
 // 流程定义相关
 export { defineAction } from './flow-definitions';
@@ -39,6 +39,7 @@ export {
   resolveStepUiSchema,
   resolveStepDisabledInSettings,
   resolveUiMode,
+  shouldHideEventInSettings,
   shouldHideStepInSettings,
 } from './schema-utils';
 

package/src/utils/schema-utils.ts

@@ -11,7 +11,7 @@ import type { ISchema } from '@formily/json-schema';
 import { Schema } from '@formily/json-schema';
 import type { FlowModel } from '../models';
 import { FlowRuntimeContext } from '../flowContext';
-import type { StepDefinition, StepUIMode } from '../types';
+import type { EventDefinition, StepDefinition, StepUIMode } from '../types';
 import { setupRuntimeContextSteps } from './setupRuntimeContextSteps';
 
 /**
@@ -242,6 +242,35 @@ export async function resolveStepUiSchema<TModel extends FlowModel = FlowModel>(
   return resolvedStepUiSchema;
 }
 
+/**
+ * 判断事件在设置菜单中是否应被隐藏。
+ * - 支持 EventDefinition.hideInSettings。
+ * - hideInSettings 可为布尔值或函数（接收 FlowRuntimeContext）。
+ */
+export async function shouldHideEventInSettings<TModel extends FlowModel = FlowModel>(
+  model: TModel,
+  flow: any,
+  event: EventDefinition<TModel> | undefined,
+): Promise<boolean> {
+  if (!event) return true;
+
+  const { hideInSettings } = event;
+
+  if (typeof hideInSettings === 'function') {
+    try {
+      const ctx = new FlowRuntimeContext(model, flow.key, 'settings');
+      setupRuntimeContextSteps(ctx, flow.steps || {}, model, flow.key);
+      const result = await hideInSettings(ctx as any);
+      return !!result;
+    } catch (error) {
+      console.warn(`Error evaluating hideInSettings for event '${event.name || ''}' in flow '${flow.key}':`, error);
+      return false;
+    }
+  }
+
+  return !!hideInSettings;
+}
+
 /**
  * 判断步骤在设置菜单中是否应被隐藏。
  * - 支持 StepDefinition.hideInSettings 与 ActionDefinition.hideInSettings（step 优先）。

package/src/views/FlowView.tsx

@@ -11,13 +11,23 @@ import { PopoverProps as AntdPopoverProps } from 'antd';
 import { FlowContext } from '../flowContext';
 import { ViewNavigation } from './ViewNavigation';
 
+export type FlowViewBeforeClosePayload = {
+  result?: any;
+  force?: boolean;
+};
+
+export type FlowViewBeforeCloseHandler = (
+  payload: FlowViewBeforeClosePayload,
+) => Promise<boolean | void> | boolean | void;
+
 export type FlowView = {
   type: 'drawer' | 'popover' | 'dialog' | 'embed';
   inputArgs: any;
   Header: React.FC<{ title?: React.ReactNode; extra?: React.ReactNode }> | null;
   Footer: React.FC<{ children?: React.ReactNode }> | null;
-  close: (result?: any, force?: boolean) => void;
+  close: (result?: any, force?: boolean) => Promise<boolean | void> | boolean | void;
   update: (newConfig: any) => void;
+  beforeClose?: FlowViewBeforeCloseHandler;
   navigation?: ViewNavigation;
   /** 页面的销毁方法 */
   destroy?: () => void;

package/src/views/__tests__/runViewBeforeClose.test.ts

@@ -0,0 +1,30 @@
+/**
+ * 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 { runViewBeforeClose } from '../runViewBeforeClose';
+
+describe('runViewBeforeClose', () => {
+  it('returns true when no beforeClose handler is configured', async () => {
+    await expect(runViewBeforeClose({} as any, { force: false })).resolves.toBe(true);
+  });
+
+  it('skips beforeClose handler for force close', async () => {
+    const beforeClose = vi.fn();
+
+    await expect(runViewBeforeClose({ beforeClose } as any, { force: true })).resolves.toBe(true);
+    expect(beforeClose).not.toHaveBeenCalled();
+  });
+
+  it('returns false when beforeClose handler blocks the close', async () => {
+    const beforeClose = vi.fn().mockResolvedValue(false);
+
+    await expect(runViewBeforeClose({ beforeClose } as any, { force: false })).resolves.toBe(false);
+  });
+});

package/src/views/__tests__/useDialog.closeDestroy.test.tsx

@@ -76,40 +76,40 @@ describe('useDialog - close/destroy logic', () => {
     return api;
   };
 
-  it('should call destroy (and thus closeFunc) when close is called without preventClose', () => {
+  it('should call destroy (and thus closeFunc) when close is called without preventClose', async () => {
     const api = renderUseDialog();
     const flowContext = createMockFlowContext();
 
     const dialog = api.open({}, flowContext);
 
-    dialog.close();
+    await dialog.close();
 
     expect(mockCloseFunc).toHaveBeenCalled();
   });
 
-  it('should not call destroy (and thus closeFunc) when close is called with preventClose=true', () => {
+  it('should not call destroy (and thus closeFunc) when close is called with preventClose=true', async () => {
     const api = renderUseDialog();
     const flowContext = createMockFlowContext();
 
     const dialog = api.open({ preventClose: true }, flowContext);
 
-    dialog.close();
+    await dialog.close();
 
     expect(mockCloseFunc).not.toHaveBeenCalled();
   });
 
-  it('should call destroy (and thus closeFunc) when close is called with preventClose=true but force=true', () => {
+  it('should call destroy (and thus closeFunc) when close is called with preventClose=true but force=true', async () => {
     const api = renderUseDialog();
     const flowContext = createMockFlowContext();
 
     const dialog = api.open({ preventClose: true }, flowContext);
 
-    dialog.close(undefined, true);
+    await dialog.close(undefined, true);
 
     expect(mockCloseFunc).toHaveBeenCalled();
   });
 
-  it('should delegate to navigation.back when triggerByRouter is true', () => {
+  it('should delegate to navigation.back when triggerByRouter is true', async () => {
     const api = renderUseDialog();
     const flowContext = createMockFlowContext();
     const backMock = vi.fn();
@@ -126,25 +126,25 @@ describe('useDialog - close/destroy logic', () => {
       flowContext,
     );
 
-    dialog.close();
+    await dialog.close();
 
     expect(backMock).toHaveBeenCalled();
     // Should not call destroy directly, let router handle it
     expect(mockCloseFunc).not.toHaveBeenCalled();
   });
 
-  it('should emit view activated event on opener engine', () => {
+  it('should emit view activated event on opener engine', async () => {
     const api = renderUseDialog();
     const flowContext = createMockFlowContext();
     const emitSpy = flowContext.engine.emitter.emit;
 
     const dialog = api.open({ inputArgs: { viewUid: 'child-view' } }, flowContext);
 
-    dialog.close();
+    await dialog.close();
     expect(emitSpy).toHaveBeenCalledWith('view:activated', expect.anything());
   });
 
-  it('should emit view events on immediate opener engine (previousEngine) when present', () => {
+  it('should emit view events on immediate opener engine (previousEngine) when present', async () => {
     const api = renderUseDialog();
     const flowContext = createMockFlowContext();
     const rootEmitSpy = flowContext.engine.emitter.emit;
@@ -153,7 +153,7 @@ describe('useDialog - close/destroy logic', () => {
 
     const dialog = api.open({ inputArgs: { viewUid: 'child-view' } }, flowContext);
 
-    dialog.close();
+    await dialog.close();
     expect(openerEmitSpy).toHaveBeenCalledWith('view:activated', expect.anything());
     expect(rootEmitSpy).not.toHaveBeenCalledWith('view:activated', expect.anything());
   });

package/src/views/runViewBeforeClose.ts

@@ -0,0 +1,19 @@
+/**
+ * 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 { FlowView, FlowViewBeforeClosePayload } from './FlowView';
+
+export async function runViewBeforeClose(view: FlowView, payload: FlowViewBeforeClosePayload): Promise<boolean> {
+  if (payload.force) {
+    return true;
+  }
+
+  const result = await view.beforeClose?.(payload);
+  return result !== false;
+}

package/src/views/useDialog.tsx

@@ -19,6 +19,7 @@ import { VIEW_ACTIVATED_EVENT, bumpViewActivatedVersion, resolveOpenerEngine } f
 import { FlowEngineProvider } from '../provider';
 import { createViewScopedEngine } from '../ViewScopedFlowEngine';
 import { createViewRecordResolveOnServer, getViewRecordFromParent } from '../utils/variablesParams';
+import { runViewBeforeClose } from './runViewBeforeClose';
 
 let uuid = 0;
 
@@ -97,6 +98,7 @@ export function useDialog() {
       type: 'dialog' as const,
       inputArgs: config.inputArgs || {},
       preventClose: !!config.preventClose,
+      beforeClose: undefined,
       destroy: (result?: any) => {
         if (destroyed) return;
         destroyed = true;
@@ -112,18 +114,24 @@ export function useDialog() {
         scopedEngine.unlinkFromStack();
       },
       update: (newConfig) => dialogRef.current?.update(newConfig),
-      close: (result?: any, force?: boolean) => {
+      close: async (result?: any, force?: boolean) => {
         if (config.preventClose && !force) {
-          return;
+          return false;
+        }
+
+        const shouldClose = await runViewBeforeClose(currentDialog, { result, force });
+        if (!shouldClose) {
+          return false;
         }
 
         if (config.triggerByRouter && config.inputArgs?.navigation?.back) {
           // 交由路由系统来销毁当前视图
           config.inputArgs.navigation.back();
-          return;
+          return true;
         }
 
         currentDialog.destroy(result);
+        return true;
       },
       Footer: FooterComponent,
       Header: HeaderComponent,

package/src/views/useDrawer.tsx

@@ -19,6 +19,7 @@ import { VIEW_ACTIVATED_EVENT, bumpViewActivatedVersion, resolveOpenerEngine } f
 import { FlowEngineProvider } from '../provider';
 import { createViewScopedEngine } from '../ViewScopedFlowEngine';
 import { createViewRecordResolveOnServer, getViewRecordFromParent } from '../utils/variablesParams';
+import { runViewBeforeClose } from './runViewBeforeClose';
 
 export function useDrawer() {
   const holderRef = React.useRef(null);
@@ -126,6 +127,7 @@ export function useDrawer() {
       type: 'drawer' as const,
       inputArgs: config.inputArgs || {},
       preventClose: !!config.preventClose,
+      beforeClose: undefined,
       destroy: (result?: any) => {
         if (destroyed) return;
         destroyed = true;
@@ -141,18 +143,24 @@ export function useDrawer() {
         scopedEngine.unlinkFromStack();
       },
       update: (newConfig) => drawerRef.current?.update(newConfig),
-      close: (result?: any, force?: boolean) => {
+      close: async (result?: any, force?: boolean) => {
         if (config.preventClose && !force) {
-          return;
+          return false;
+        }
+
+        const shouldClose = await runViewBeforeClose(currentDrawer, { result, force });
+        if (!shouldClose) {
+          return false;
         }
 
         if (config.triggerByRouter && config.inputArgs?.navigation?.back) {
           // 交由路由系统来销毁当前视图
           config.inputArgs.navigation.back();
-          return;
+          return true;
         }
 
         currentDrawer.destroy(result);
+        return true;
       },
       Footer: FooterComponent,
       Header: HeaderComponent,

package/src/views/usePage.tsx

@@ -19,6 +19,7 @@ import { VIEW_ACTIVATED_EVENT, bumpViewActivatedVersion, resolveOpenerEngine } f
 import { FlowEngineProvider } from '../provider';
 import { createViewScopedEngine } from '../ViewScopedFlowEngine';
 import { createViewRecordResolveOnServer, getViewRecordFromParent } from '../utils/variablesParams';
+import { runViewBeforeClose } from './runViewBeforeClose';
 
 let uuid = 0;
 
@@ -122,6 +123,7 @@ export function usePage() {
       type: 'embed' as const,
       inputArgs: viewInputArgs,
       preventClose: !!config.preventClose,
+      beforeClose: undefined,
       destroy: (result?: any) => {
         config.onClose?.();
         resolvePromise?.(result);
@@ -145,18 +147,24 @@ export function usePage() {
         scopedEngine.unlinkFromStack();
       },
       update: (newConfig) => pageRef.current?.update(newConfig),
-      close: (result?: any, force?: boolean) => {
+      close: async (result?: any, force?: boolean) => {
         if (preventClose && !force) {
-          return;
+          return false;
+        }
+
+        const shouldClose = await runViewBeforeClose(currentPage, { result, force });
+        if (!shouldClose) {
+          return false;
         }
 
         if (config.triggerByRouter && config.inputArgs?.navigation?.back) {
           // 交由路由系统来销毁当前视图
           config.inputArgs.navigation.back();
-          return;
+          return true;
         }
 
         currentPage.destroy(result);
+        return true;
       },
       Header: HeaderComponent,
       Footer: FooterComponent,