@nocobase/flow-engine 2.1.0-alpha.3 → 2.1.0-alpha.30

package/lib/runjs-context/snippets/scene/detail/set-field-style.snippet.d.ts

@@ -0,0 +1,11 @@
+/**
+ * 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 { SnippetModule } from '../../types';
+declare const snippet: SnippetModule;
+export default snippet;

package/lib/runjs-context/snippets/scene/detail/set-field-style.snippet.js

@@ -0,0 +1,50 @@
+/**
+ * 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 set_field_style_snippet_exports = {};
+__export(set_field_style_snippet_exports, {
+  default: () => set_field_style_snippet_default
+});
+module.exports = __toCommonJS(set_field_style_snippet_exports);
+const snippet = {
+  contexts: ["*"],
+  scenes: ["detailFieldEvent", "formFieldEvent"],
+  prefix: "sn-item-style",
+  label: "Set form item/details item style",
+  description: "Customize form item and details item container styles",
+  locales: {
+    "zh-CN": {
+      label: "\u8BBE\u7F6E\u8868\u5355\u9879/\u8BE6\u60C5\u9879\u6837\u5F0F",
+      description: "\u81EA\u5B9A\u4E49\u8868\u5355\u9879\u548C\u8BE6\u60C5\u9879\u5BB9\u5668\u6837\u5F0F"
+    }
+  },
+  content: `
+ctx.model.props.style = {
+  background: 'red',
+};
+`
+};
+var set_field_style_snippet_default = snippet;

package/lib/runjs-context/snippets/scene/table/set-cell-style.snippet.d.ts

@@ -0,0 +1,11 @@
+/**
+ * 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 { SnippetModule } from '../../types';
+declare const snippet: SnippetModule;
+export default snippet;

package/lib/runjs-context/snippets/scene/table/set-cell-style.snippet.js

@@ -0,0 +1,54 @@
+/**
+ * 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 set_cell_style_snippet_exports = {};
+__export(set_cell_style_snippet_exports, {
+  default: () => set_cell_style_snippet_default
+});
+module.exports = __toCommonJS(set_cell_style_snippet_exports);
+const snippet = {
+  contexts: ["*"],
+  scenes: ["tableFieldEvent"],
+  prefix: "sn-table-cell-style",
+  label: "Set table cell style",
+  description: "Customize table field cell styles with onCell",
+  locales: {
+    "zh-CN": {
+      label: "\u8868\u683C\u5B57\u6BB5\u6837\u5F0F\u8BBE\u7F6E",
+      description: "\u901A\u8FC7 onCell \u81EA\u5B9A\u4E49\u8868\u683C\u5B57\u6BB5\u5355\u5143\u683C\u6837\u5F0F"
+    }
+  },
+  content: `
+ctx.model.props.onCell = (record, rowIndex) => {
+  return {
+    style: {
+      background: 'red',
+    },
+  };
+};
+`
+};
+var set_cell_style_snippet_default = snippet;

package/lib/scheduler/ModelOperationScheduler.d.ts

@@ -9,7 +9,10 @@
 import type { FlowEngine } from '../flowEngine';
 import type { FlowModel } from '../models/flowModel';
 type LifecycleType = 'created' | 'mounted' | 'unmounted' | 'destroyed' | `event:${string}:start` | `event:${string}:end` | `event:${string}:error`;
-export type ScheduleWhen = LifecycleType | ((e: LifecycleEvent) => boolean);
+type EventPredicateWhen = ((e: LifecycleEvent) => boolean) & {
+    __eventType?: string;
+};
+export type ScheduleWhen = LifecycleType | EventPredicateWhen;
 export interface ScheduleOptions {
     when?: ScheduleWhen;
 }
@@ -22,6 +25,7 @@ export interface LifecycleEvent {
     error?: any;
     inputArgs?: Record<string, any>;
     result?: any;
+    aborted?: boolean;
     flowKey?: string;
     stepKey?: string;
 }

package/lib/scheduler/ModelOperationScheduler.js

@@ -171,8 +171,9 @@ const _ModelOperationScheduler = class _ModelOperationScheduler {
     this.unbindHandlers.push(() => emitter.off("model:destroyed", onDestroyed));
   }
   ensureEventSubscriptionIfNeeded(when) {
-    if (!when || typeof when !== "string") return;
-    const parsed = this.parseEventWhen(when);
+    const eventType = typeof when === "string" ? when : typeof when === "function" ? when.__eventType : void 0;
+    if (!eventType) return;
+    const parsed = this.parseEventWhen(eventType);
     if (!parsed) return;
     const { name } = parsed;
     if (this.subscribedEventNames.has(name)) return;

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）。
  *
@@ -303,6 +303,52 @@ export interface CreateModelOptions {
     delegateToParent?: boolean;
     [key: string]: any;
 }
+/**
+ * FlowModel loader result.
+ * Supports returning the model constructor directly, a default export, or a module object containing the named export.
+ */
+export type FlowModelLoaderResult = ModelConstructor | {
+    default?: ModelConstructor;
+    [key: string]: unknown;
+} | Record<string, unknown>;
+/**
+ * FlowModel loader function.
+ */
+export type FlowModelLoader = () => Promise<FlowModelLoaderResult>;
+/**
+ * FlowModel loader entry (normalized internal form).
+ */
+export interface FlowModelLoaderEntry {
+    loader: FlowModelLoader;
+    extends?: string[];
+}
+/**
+ * FlowModel loader input (user-facing form for registerModelLoaders).
+ * The `extends` field accepts flexible formats that will be normalized to `string[]` at registration time.
+ */
+export interface FlowModelLoaderInput {
+    loader: FlowModelLoader;
+    extends?: string | ModelConstructor | (string | ModelConstructor)[];
+}
+/**
+ * FlowModel loader entry map (normalized internal form).
+ */
+export type FlowModelLoaderMap = Record<string, FlowModelLoaderEntry>;
+/**
+ * FlowModel loader input map (user-facing form for registerModelLoaders).
+ */
+export type FlowModelLoaderInputMap = Record<string, FlowModelLoaderInput>;
+/**
+ * Batch ensure result.
+ */
+export interface EnsureBatchResult {
+    requested: string[];
+    loaded: string[];
+    failed: Array<{
+        name: string;
+        error?: unknown;
+    }>;
+}
 export interface IFlowModelRepository<T extends FlowModel = FlowModel> {
     findOne(query: Record<string, any>): Promise<Record<string, any> | null>;
     save(model: T, options?: {

package/lib/utils/createCollectionContextMeta.js

@@ -32,6 +32,10 @@ __export(createCollectionContextMeta_exports, {
 module.exports = __toCommonJS(createCollectionContextMeta_exports);
 const RELATION_FIELD_TYPES = ["belongsTo", "hasOne", "hasMany", "belongsToMany", "belongsToArray"];
 const NUMERIC_FIELD_TYPES = ["integer", "float", "double", "decimal"];
+function shouldShowFieldInMeta(field, includeNonFilterable) {
+  return Boolean(field.interface && (includeNonFilterable || field.filterable));
+}
+__name(shouldShowFieldInMeta, "shouldShowFieldInMeta");
 function createFieldMetadata(field, includeNonFilterable) {
   const baseProperties = createMetaBaseProperties(field);
   if (field.isAssociationField()) {
@@ -49,7 +53,7 @@ function createFieldMetadata(field, includeNonFilterable) {
       properties: /* @__PURE__ */ __name(async () => {
         const subProperties = {};
         targetCollection.fields.forEach((subField) => {
-          if (includeNonFilterable || subField.filterable) {
+          if (shouldShowFieldInMeta(subField, includeNonFilterable)) {
             subProperties[subField.name] = createFieldMetadata(subField, includeNonFilterable);
           }
         });
@@ -104,7 +108,7 @@ function createCollectionContextMeta(collectionOrFactory, title, includeNonFilte
       properties: /* @__PURE__ */ __name(async () => {
         const properties = {};
         collection.fields.forEach((field) => {
-          if (includeNonFilterable || field.filterable) {
+          if (shouldShowFieldInMeta(field, includeNonFilterable)) {
             properties[field.name] = createFieldMetadata(field, includeNonFilterable);
           }
         });

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/parsePathnameToViewParams.js

@@ -92,7 +92,7 @@ const parsePathnameToViewParams = /* @__PURE__ */ __name((pathname) => {
             } catch (_) {
               parsed = decoded;
             }
-          } else if (decoded && decoded.includes("=") && decoded.includes("&")) {
+          } else if (decoded && /^[^=&]+=[^=&]*(?:&[^=&]+=[^=&]*)*$/.test(decoded)) {
             parsed = parseKeyValuePairs(decoded);
           }
           currentView.filterByTk = parsed;

package/lib/utils/runjsTemplateCompat.js

@@ -527,8 +527,8 @@ function extractUsedCtxLibKeys(code) {
 }
 __name(extractUsedCtxLibKeys, "extractUsedCtxLibKeys");
 function injectEnsureLibsPreamble(code) {
-  if (!CTX_LIBS_MARKER_RE.test(code)) return code;
   if (ENSURE_LIBS_MARKER_RE.test(code)) return code;
+  if (!CTX_LIBS_MARKER_RE.test(code)) return code;
   const keys = extractUsedCtxLibKeys(code);
   if (!keys.length) return code;
   return `/* __runjs_ensure_libs */

package/lib/utils/runjsValue.js

@@ -231,6 +231,34 @@ function normalizeSubPath(raw) {
   return { subPath: s, wildcard: false };
 }
 __name(normalizeSubPath, "normalizeSubPath");
+function extractCtxRootUsage(expr) {
+  const raw = String(expr || "").trim();
+  if (!raw || raw === "ctx") return null;
+  const dotMatch = raw.match(/^ctx\.([a-zA-Z_$][a-zA-Z0-9_$]*)([\s\S]*)$/);
+  if (dotMatch) {
+    const varName = dotMatch[1] || "";
+    const rest = dotMatch[2] || "";
+    const normalized = normalizeSubPath(rest);
+    return {
+      varName,
+      subPath: normalized.subPath,
+      wildcard: normalized.wildcard
+    };
+  }
+  const bracketMatch = raw.match(/^ctx\s*\[\s*(['"])([a-zA-Z_$][a-zA-Z0-9_$]*)\1\s*\]([\s\S]*)$/);
+  if (bracketMatch) {
+    const varName = bracketMatch[2] || "";
+    const rest = bracketMatch[3] || "";
+    const normalized = normalizeSubPath(rest);
+    return {
+      varName,
+      subPath: normalized.subPath,
+      wildcard: normalized.wildcard
+    };
+  }
+  return null;
+}
+__name(extractCtxRootUsage, "extractCtxRootUsage");
 function extractUsedVariablePathsFromRunJS(code) {
   if (typeof code !== "string" || !code.trim()) return {};
   const src = stripStringsAndComments(code);
@@ -242,23 +270,25 @@ function extractUsedVariablePathsFromRunJS(code) {
     set.add(subPath || "");
     usage.set(varName, set);
   }, "add");
+  const addCtxUsage = /* @__PURE__ */ __name((expr) => {
+    const hit = extractCtxRootUsage(expr);
+    if (!(hit == null ? void 0 : hit.varName)) return;
+    add(hit.varName, hit.wildcard ? "" : hit.subPath);
+  }, "addCtxUsage");
   const dotRe = /ctx\.([a-zA-Z_$][a-zA-Z0-9_$]*(?:(?:\.[a-zA-Z_$][a-zA-Z0-9_$]*)|(?:\[[^\]]+\]))*)(?!\s*\()/g;
   let match;
   while (match = dotRe.exec(src)) {
-    const pathAfterCtx = match[1] || "";
-    const firstKeyMatch = pathAfterCtx.match(/^([a-zA-Z_$][a-zA-Z0-9_$]*)/);
-    if (!firstKeyMatch) continue;
-    const firstKey = firstKeyMatch[1];
-    const rest = pathAfterCtx.slice(firstKey.length);
-    const { subPath, wildcard } = normalizeSubPath(rest);
-    add(firstKey, wildcard ? "" : subPath);
+    addCtxUsage(`ctx.${match[1] || ""}`);
   }
   const bracketRootRe = /ctx\s*\[\s*(['"])([a-zA-Z_$][a-zA-Z0-9_$]*)\1\s*\]((?:(?:\.[a-zA-Z_$][a-zA-Z0-9_$]*)|(?:\[[^\]]+\]))*)(?!\s*\()/g;
   while (match = bracketRootRe.exec(srcWithStrings)) {
-    const varName = match[2] || "";
-    const rest = match[3] || "";
-    const { subPath, wildcard } = normalizeSubPath(rest);
-    add(varName, wildcard ? "" : subPath);
+    addCtxUsage(`ctx['${match[2] || ""}']${match[3] || ""}`);
+  }
+  const getVarRe = /ctx\.getVar\s*\(\s*(['"])((?:\\.|(?!\1)[\s\S])*)\1\s*\)/g;
+  while (match = getVarRe.exec(srcWithStrings)) {
+    const expr = String(match[2] || "").replace(/\\'/g, "'").replace(/\\"/g, '"').trim();
+    if (!expr.startsWith("ctx")) continue;
+    addCtxUsage(expr);
   }
   const out = {};
   for (const [k, set] of usage.entries()) {

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);
@@ -103,12 +104,16 @@ function useDialog() {
     } else {
       ctx.addDelegate(flowContext.engine.context);
     }
+    let destroyed = false;
     const currentDialog = {
       type: "dialog",
       inputArgs: config.inputArgs || {},
       preventClose: !!config.preventClose,
+      beforeClose: void 0,
       destroy: /* @__PURE__ */ __name((result) => {
         var _a2, _b2, _c2, _d;
+        if (destroyed) return;
+        destroyed = true;
         (_a2 = config.onClose) == null ? void 0 : _a2.call(config);
         (_b2 = dialogRef.current) == null ? void 0 : _b2.destroy();
         closeFunc == null ? void 0 : closeFunc();
@@ -122,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,
@@ -154,6 +164,13 @@ function useDialog() {
       get: /* @__PURE__ */ __name(() => currentDialog, "get"),
       resolveOnServer: (0, import_variablesParams.createViewRecordResolveOnServer)(ctx, () => (0, import_variablesParams.getViewRecordFromParent)(flowContext, ctx))
     });
+    scopedEngine.setDestroyView(() => {
+      var _a2, _b2;
+      if (config.triggerByRouter && ((_b2 = (_a2 = config.inputArgs) == null ? void 0 : _a2.navigation) == null ? void 0 : _b2.back)) {
+        config.inputArgs.navigation.back();
+      }
+      currentDialog.destroy();
+    });
     (0, import_createViewMeta.registerPopupVariable)(ctx, currentDialog);
     const DialogWithContext = (0, import__.observer)(
       () => {

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;
         }>;