@nocobase/flow-engine 2.0.0-alpha.5 → 2.0.0-alpha.50

package/lib/BlockScopedFlowEngine.d.ts

@@ -0,0 +1,23 @@
+/**
+ * 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 { FlowEngine } from './flowEngine';
+/**
+ * BlockScopedFlowEngine（区块作用域引擎）
+ *
+ * 设计目标：
+ * - 仅在“区块”作用域内隔离“模型实例表”和“事件缓存”；
+ * - 其余能力（动作/事件/模型类/资源/仓库/设置/日志/翻译等）全部直接代理到父引擎；
+ * - 使用 Proxy 实现“最小代理”，保持与父引擎的全局一致性。
+ *
+ * 注意：
+ * - 本地化的字段仅有：`_modelInstances`、`_applyFlowCache`、`executor`、`context`、栈指针；
+ * - 其它字段/方法均通过 Proxy 转发到父引擎；
+ * - 这样可满足“同一 uid 的模型可在不同区块隔离出现（实例/缓存隔离）”与“共享全局注册/仓库”的诉求。
+ */
+export declare function createBlockScopedEngine(parent: FlowEngine): FlowEngine;

package/lib/BlockScopedFlowEngine.js

@@ -0,0 +1,90 @@
+/**
+ * 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 BlockScopedFlowEngine_exports = {};
+__export(BlockScopedFlowEngine_exports, {
+  createBlockScopedEngine: () => createBlockScopedEngine
+});
+module.exports = __toCommonJS(BlockScopedFlowEngine_exports);
+var import_flowEngine = require("./flowEngine");
+function createBlockScopedEngine(parent) {
+  const local = new import_flowEngine.FlowEngine();
+  if (parent.modelRepository) {
+    local.setModelRepository(parent.modelRepository);
+  }
+  local.context.addDelegate(parent.context);
+  const originalUnlink = local.unlinkFromStack.bind(local);
+  local.unlinkFromStack = function() {
+    const prev = local._previousEngine;
+    const next = local._nextEngine;
+    if (prev) prev._nextEngine = next;
+    if (next) next._previousEngine = prev;
+    local._previousEngine = void 0;
+    local._nextEngine = void 0;
+  };
+  const localOnly = /* @__PURE__ */ new Set([
+    "_modelInstances",
+    "_applyFlowCache",
+    "executor",
+    "context",
+    "previousEngine",
+    "nextEngine",
+    // 栈指针维护方法需要在本地执行，而非代理到父引擎
+    "unlinkFromStack",
+    "linkAfter",
+    "_previousEngine",
+    "_nextEngine"
+  ]);
+  const handler = {
+    get(target, prop, receiver) {
+      if (localOnly.has(prop)) {
+        return Reflect.get(target, prop, receiver);
+      }
+      const value = Reflect.get(parent, prop, receiver);
+      if (prop === "registerModels" && typeof value === "function") {
+        return value.bind(parent);
+      }
+      return value;
+    },
+    set(target, prop, value) {
+      if (localOnly.has(prop)) {
+        return Reflect.set(target, prop, value);
+      }
+      return Reflect.set(parent, prop, value);
+    },
+    has(target, prop) {
+      return prop in target || prop in parent;
+    }
+  };
+  local.linkAfter(parent);
+  return new Proxy(local, handler);
+}
+__name(createBlockScopedEngine, "createBlockScopedEngine");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  createBlockScopedEngine
+});

package/lib/FlowContextProvider.d.ts

@@ -15,10 +15,10 @@ export declare function FlowContextProvider(props: {
     children: React.ReactNode;
     context: FlowContext;
 }): React.JSX.Element;
-export declare function FlowViewContextProvider(props: {
+export declare const FlowViewContextProvider: React.MemoExoticComponent<(props: {
     children: React.ReactNode;
     context: FlowContext;
-}): React.JSX.Element;
+}) => React.JSX.Element>;
 export declare function useFlowContext<T = FlowEngineContext>(): T;
 export declare function useFlowViewContext<T = FlowEngineContext>(): T;
 export declare function useFlowView(): FlowView;

package/lib/FlowContextProvider.js

@@ -53,10 +53,10 @@ function FlowContextProvider(props) {
   return /* @__PURE__ */ import_react.default.createElement(FlowReactContext.Provider, { value: props.context }, props.children);
 }
 __name(FlowContextProvider, "FlowContextProvider");
-function FlowViewContextProvider(props) {
+const FlowViewContextProvider = import_react.default.memo((props) => {
   return /* @__PURE__ */ import_react.default.createElement(FlowViewContext.Provider, { value: props.context }, /* @__PURE__ */ import_react.default.createElement(FlowReactContext.Provider, { value: props.context }, props.children));
-}
-__name(FlowViewContextProvider, "FlowViewContextProvider");
+});
+FlowViewContextProvider.displayName = "FlowViewContextProvider";
 function useFlowContext() {
   return (0, import_react.useContext)(FlowReactContext);
 }

package/lib/FlowDefinition.d.ts

@@ -244,8 +244,6 @@ export declare class FlowStep {
         hideInSettings?: boolean;
         uiMode?: import("./types").StepUIMode | ((ctx: import("./flowContext").FlowRuntimeContext<import(".").FlowModel<import("./types").DefaultStructure>, any>) => import("./types").StepUIMode | Promise<import("./types").StepUIMode>);
         title?: string;
-        defaultParams?: Record<string, any> | ((ctx: import("./flowContext").FlowRuntimeContext<import(".").FlowModel<import("./types").DefaultStructure>, any>) => Record<string, any> | Promise<Record<string, any>>);
-        handler?: (ctx: import("./flowContext").FlowRuntimeContext<import(".").FlowModel<import("./types").DefaultStructure>, any>, params: any) => any;
         uiSchema?: Record<string, import("@formily/json-schema").Stringify<{
             [key: symbol]: any;
             [key: `x-${string}`]: any;
@@ -415,9 +413,13 @@ export declare class FlowStep {
             "x-read-pretty"?: boolean;
             "x-compile-omitted"?: string[];
         }>>>);
+        defaultParams?: Record<string, any> | ((ctx: import("./flowContext").FlowRuntimeContext<import(".").FlowModel<import("./types").DefaultStructure>, any>) => Record<string, any> | Promise<Record<string, any>>);
+        handler?: (ctx: import("./flowContext").FlowRuntimeContext<import(".").FlowModel<import("./types").DefaultStructure>, any>, params: any) => any;
         beforeParamsSave?: (ctx: import("./flowContext").FlowSettingsContext<import(".").FlowModel<import("./types").DefaultStructure>>, params: any, previousParams: any) => void | Promise<void>;
         afterParamsSave?: (ctx: import("./flowContext").FlowSettingsContext<import(".").FlowModel<import("./types").DefaultStructure>>, params: any, previousParams: any) => void | Promise<void>;
         useRawParams?: boolean | ((ctx: import("./flowContext").FlowRuntimeContext<import(".").FlowModel<import("./types").DefaultStructure>, any>) => boolean | Promise<boolean>);
         scene?: import("./types").ActionScene | import("./types").ActionScene[];
+        defineProperties?: Record<string, import("./flowContext").PropertyOptions> | ((ctx: import("./flowContext").FlowRuntimeContext<import(".").FlowModel<import("./types").DefaultStructure>, any>) => Record<string, import("./flowContext").PropertyOptions> | Promise<Record<string, import("./flowContext").PropertyOptions>>);
+        defineMethods?: Record<string, (this: import("./flowContext").FlowRuntimeContext<import(".").FlowModel<import("./types").DefaultStructure>, any>, ...args: any[]) => any> | ((ctx: import("./flowContext").FlowRuntimeContext<import(".").FlowModel<import("./types").DefaultStructure>, any>) => Record<string, (this: import("./flowContext").FlowRuntimeContext<import(".").FlowModel<import("./types").DefaultStructure>, any>, ...args: any[]) => any> | Promise<Record<string, (this: import("./flowContext").FlowRuntimeContext<import(".").FlowModel<import("./types").DefaultStructure>, any>, ...args: any[]) => any>>);
     };
 }

package/lib/JSRunner.js

@@ -62,6 +62,9 @@ const _JSRunner = class _JSRunner {
    * 异步运行代码，带错误处理和超时机制
    */
   async run(code) {
+    if (location == null ? void 0 : location.search.includes("skipRunJs=true")) {
+      return { success: true, value: null };
+    }
     const wrapped = `(async () => {
       try {
         ${code};

package/lib/ViewScopedFlowEngine.d.ts

@@ -11,7 +11,7 @@ import { FlowEngine } from './flowEngine';
  * ViewScopedFlowEngine（视图作用域引擎）
  *
  * 设计目标：
- * - 仅在视图（dialog/drawer/embed）作用域内隔离“模型实例表”和“自动流缓存”；
+ * - 仅在视图（dialog/drawer/embed）作用域内隔离“模型实例表”和“事件缓存”；
  * - 其余能力（动作/事件/模型类/资源/仓库/设置/日志/翻译等）全部直接代理到父引擎；
  * - 使用 Proxy 实现“最小代理”，保持与父引擎的全局一致性。
  *

package/lib/ViewScopedFlowEngine.js

@@ -37,6 +37,12 @@ function createViewScopedEngine(parent) {
     local.setModelRepository(parent.modelRepository);
   }
   local.context.addDelegate(parent.context);
+  const originalUnlink = local.unlinkFromStack.bind(local);
+  local.unlinkFromStack = function() {
+    var _a;
+    (_a = local.disposeScheduler) == null ? void 0 : _a.call(local);
+    return originalUnlink();
+  };
   const localOnly = /* @__PURE__ */ new Set([
     "_modelInstances",
     "_applyFlowCache",
@@ -44,6 +50,12 @@ function createViewScopedEngine(parent) {
     "context",
     "previousEngine",
     "nextEngine",
+    // 调度器与事件总线局部化
+    "emitter",
+    "_modelOperationScheduler",
+    "getScheduler",
+    "scheduleModelOperation",
+    "disposeScheduler",
     // 栈指针维护方法需要在本地执行，而非代理到父引擎
     "unlinkFromStack",
     "linkAfter",

package/lib/acl/Acl.d.ts

@@ -15,10 +15,12 @@ interface CheckOptions {
 }
 export declare class ACL {
     private flowEngine;
-    private dataSources;
+    private data;
     private loaded;
     private loadingPromise;
+    private lastToken;
     constructor(flowEngine: FlowEngine);
+    setData(data: Record<string, any>): void;
     load(): Promise<void>;
     getActionAlias(actionName: string): any;
     inResources(resourceName: string): any;

package/lib/acl/Acl.js

@@ -34,39 +34,48 @@ const _ACL = class _ACL {
   constructor(flowEngine) {
     this.flowEngine = flowEngine;
   }
-  dataSources = {};
+  data = {};
   loaded = false;
   loadingPromise = null;
+  // 用于识别当前鉴权状态（例如切换登录用户后应重新加载）
+  // 记录上一次用于鉴权的 token，用于识别登录态变更
+  lastToken = null;
+  setData(data) {
+    this.data = data;
+  }
   async load() {
-    if (this.loaded) return;
-    if (!this.loadingPromise) {
-      this.loadingPromise = (async () => {
-        const { data } = await this.flowEngine.context.api.request({
-          url: "roles:check"
-        });
-        this.dataSources = data || {};
-        this.loaded = true;
-      })();
+    var _a, _b, _c, _d;
+    const currentToken = ((_d = (_c = (_b = (_a = this.flowEngine) == null ? void 0 : _a.context) == null ? void 0 : _b.api) == null ? void 0 : _c.auth) == null ? void 0 : _d.token) || "";
+    if (this.loaded && this.lastToken !== currentToken) {
+      this.loaded = false;
+      this.loadingPromise = null;
+      this.data = {};
     }
+    const { data } = await this.flowEngine.context.api.request({
+      url: "roles:check"
+    });
+    this.data = (data == null ? void 0 : data.data) || {};
+    this.loaded = true;
+    this.lastToken = currentToken;
     await this.loadingPromise;
   }
   getActionAlias(actionName) {
-    var _a, _b;
-    return ((_b = (_a = this.dataSources.data) == null ? void 0 : _a.actionAlias) == null ? void 0 : _b[actionName]) || actionName;
+    var _a;
+    return ((_a = this.data.actionAlias) == null ? void 0 : _a[actionName]) || actionName;
   }
   inResources(resourceName) {
-    var _a, _b, _c;
-    return (_c = (_b = (_a = this.dataSources.data) == null ? void 0 : _a.resources) == null ? void 0 : _b.includes) == null ? void 0 : _c.call(_b, resourceName);
+    var _a, _b;
+    return (_b = (_a = this.data.resources) == null ? void 0 : _a.includes) == null ? void 0 : _b.call(_a, resourceName);
   }
   getResourceActionParams(resourceName, actionName) {
-    var _a, _b, _c, _d;
+    var _a, _b;
     const actionAlias = this.getActionAlias(actionName);
-    return ((_b = (_a = this.dataSources.data) == null ? void 0 : _a.actions) == null ? void 0 : _b[`${resourceName}:${actionAlias}`]) || ((_d = (_c = this.dataSources.data) == null ? void 0 : _c.actions) == null ? void 0 : _d[actionName]);
+    return ((_a = this.data.actions) == null ? void 0 : _a[`${resourceName}:${actionAlias}`]) || ((_b = this.data.actions) == null ? void 0 : _b[actionName]);
   }
   getStrategyActionParams(actionName) {
     var _a, _b, _c;
     const actionAlias = this.getActionAlias(actionName);
-    const strategyAction = (_c = (_b = (_a = this.dataSources.data) == null ? void 0 : _a.strategy) == null ? void 0 : _b.actions) == null ? void 0 : _c.find((action) => {
+    const strategyAction = (_c = (_b = (_a = this.data) == null ? void 0 : _a.strategy) == null ? void 0 : _b.actions) == null ? void 0 : _c.find((action) => {
       const [value] = action.split(":");
       return value === actionAlias;
     });
@@ -95,9 +104,7 @@ const _ACL = class _ACL {
     return allowed;
   }
   async aclCheck(options) {
-    await this.load();
-    const { data } = this.dataSources;
-    const { allowAll } = data;
+    const { allowAll } = this.data;
     if (allowAll) {
       return true;
     }

package/lib/components/FieldModelRenderer.js

@@ -52,7 +52,6 @@ const flowModelRendererPropKeys = [
   "flowSettingsVariant",
   "hideRemoveInSettings",
   "showTitle",
-  "skipApplyAutoFlows",
   "inputArgs",
   "showErrorFallback",
   "settingsMenuLevel",
@@ -63,18 +62,27 @@ function FieldModelRenderer(props) {
   const composingRef = (0, import_react.useRef)(false);
   const handleChange = /* @__PURE__ */ __name((e) => {
     var _a;
-    const val = ((_a = e == null ? void 0 : e.target) == null ? void 0 : _a.value) || e;
+    let val;
+    if (e && e.target && typeof e.target.value !== "undefined") {
+      val = e.target.value;
+    } else if (typeof e === "string" || typeof e === "number" || typeof e === "boolean" || typeof e === "object" && !(e instanceof Event)) {
+      val = e;
+    } else {
+      val = null;
+    }
     model.setProps({ value: val });
     if (!composingRef.current) {
-      props.onChange(e);
+      (_a = props.onChange) == null ? void 0 : _a.call(props, val);
     }
   }, "handleChange");
   const handleCompositionStart = /* @__PURE__ */ __name(() => {
     composingRef.current = true;
   }, "handleCompositionStart");
-  const handleCompositionEnd = /* @__PURE__ */ __name((e) => {
+  const handleCompositionEnd = /* @__PURE__ */ __name((e, flag = true) => {
     composingRef.current = false;
-    props.onChange(e);
+    if (flag) {
+      props.onChange(e);
+    }
   }, "handleCompositionEnd");
   const modelProps = {
     ...import_lodash.default.omit(rest, flowModelRendererPropKeys),
@@ -83,7 +91,7 @@ function FieldModelRenderer(props) {
     onCompositionEnd: handleCompositionEnd
   };
   (0, import_react.useEffect)(() => {
-    model.setProps(modelProps);
+    model && model.setProps(modelProps);
   }, [modelProps]);
   return /* @__PURE__ */ import_react.default.createElement(import_flow_engine.FlowModelRenderer, { model, ...rest });
 }

package/lib/components/FieldSkeleton.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 React from 'react';
+export declare const FieldSkeleton: React.FC;

package/lib/components/FieldSkeleton.js

@@ -0,0 +1,64 @@
+/**
+ * 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 __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 __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 FieldSkeleton_exports = {};
+__export(FieldSkeleton_exports, {
+  FieldSkeleton: () => FieldSkeleton
+});
+module.exports = __toCommonJS(FieldSkeleton_exports);
+var import_react = __toESM(require("react"));
+var import_provider = require("../provider");
+const FieldSkeleton = /* @__PURE__ */ __name(() => {
+  const flowEngine = (0, import_provider.useFlowEngine)();
+  const token = flowEngine.context.themeToken;
+  return /* @__PURE__ */ import_react.default.createElement(
+    "span",
+    {
+      style: {
+        display: "inline-block",
+        width: "100%",
+        height: 16,
+        backgroundColor: token.colorFillSecondary,
+        borderRadius: token.borderRadiusSM
+      }
+    }
+  );
+}, "FieldSkeleton");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  FieldSkeleton
+});

package/lib/components/FlowContextSelector.js

@@ -60,6 +60,7 @@ const FlowContextSelectorComponent = /* @__PURE__ */ __name(({
   formatPathToValue: customFormatPathToValue,
   open,
   onlyLeafSelectable = false,
+  ignoreFieldNames,
   ...cascaderProps
 }) => {
   const lastSelectedRef = (0, import_react.useRef)(null);
@@ -98,8 +99,12 @@ const FlowContextSelectorComponent = /* @__PURE__ */ __name(({
   const options = (0, import_react.useMemo)(() => {
     if (!resolvedMetaTree) return [];
     const base = (0, import_utils.buildContextSelectorItems)(resolvedMetaTree);
-    return translateOptions(base);
-  }, [resolvedMetaTree, updateFlag, translateOptions]);
+    return translateOptions(base).filter((item) => {
+      var _a;
+      if (!ignoreFieldNames || ignoreFieldNames.length === 0) return true;
+      return !ignoreFieldNames.includes(((_a = item.meta) == null ? void 0 : _a.name) || "");
+    });
+  }, [resolvedMetaTree, updateFlag, translateOptions, ignoreFieldNames]);
   const [tempSelectedPath, setTempSelectedPath] = (0, import_react.useState)([]);
   const handleLoadData = (0, import_react.useCallback)(
     async (selectedOptions) => {

package/lib/components/FlowModelRenderer.d.ts

@@ -24,7 +24,7 @@ export interface FlowModelRendererProps {
         /**
          * @default 'inside'
          */
-        toolbarPosition?: 'inside' | 'above';
+        toolbarPosition?: 'inside' | 'above' | 'below';
     };
     /** 流程设置的交互风格 */
     flowSettingsVariant?: 'dropdown' | 'contextMenu' | 'modal' | 'drawer';
@@ -32,9 +32,7 @@ export interface FlowModelRendererProps {
     hideRemoveInSettings?: boolean;
     /** 是否在边框左上角显示模型title，默认 false */
     showTitle?: boolean;
-    /** 是否跳过自动应用流程，默认 false */
-    skipApplyAutoFlows?: boolean;
-    /** 当 skipApplyAutoFlows !== false 时，传递给 useApplyAutoFlows 的额外上下文 */
+    /** 传递给 beforeRender 事件的运行时参数 */
     inputArgs?: Record<string, any>;
     /** 是否在最外层包装 FlowErrorFallback 组件，默认 false */
     showErrorFallback?: boolean;
@@ -54,8 +52,7 @@ export interface FlowModelRendererProps {
  * @param {string} props.flowSettingsVariant - The interaction style for flow settings.
  * @param {boolean} props.hideRemoveInSettings - Whether to hide remove button in settings.
  * @param {boolean} props.showTitle - Whether to show model title in the top-left corner of the border.
- * @param {boolean} props.skipApplyAutoFlows - Whether to skip applying auto flows.
- * @param {any} props.inputArgs - Runtime arguments to pass to useApplyAutoFlows when skipApplyAutoFlows is false.
+ * @param {any} props.inputArgs - Runtime arguments to pass to beforeRender event flows.
  * @param {number} props.settingsMenuLevel - Settings menu levels: 1=current model only (default), 2=include sub-models.
  * @param {ToolbarItemConfig[]} props.extraToolbarItems - Extra toolbar items to add to this renderer instance.
  * @returns {React.ReactNode | null} The rendered output of the model, or null if the model or its render method is invalid.

package/lib/components/FlowModelRenderer.js

@@ -42,7 +42,6 @@ __export(FlowModelRenderer_exports, {
 });
 module.exports = __toCommonJS(FlowModelRenderer_exports);
 var import_reactive_react = require("@formily/reactive-react");
-var import_antd = require("antd");
 var import_lodash = __toESM(require("lodash"));
 var import_react = __toESM(require("react"));
 var import_react_error_boundary = require("react-error-boundary");
@@ -84,33 +83,6 @@ const FlowModelRendererWithAutoFlows = (0, import_reactive_react.observer)(
     ));
   }
 );
-const FlowModelRendererWithoutAutoFlows = (0, import_reactive_react.observer)(
-  ({
-    model,
-    showFlowSettings,
-    flowSettingsVariant,
-    hideRemoveInSettings,
-    showTitle,
-    showErrorFallback,
-    settingsMenuLevel,
-    extraToolbarItems
-  }) => {
-    (0, import_utils.setAutoFlowError)(model, null);
-    return /* @__PURE__ */ import_react.default.createElement(import_hooks.FlowModelProvider, { model }, /* @__PURE__ */ import_react.default.createElement(
-      FlowModelRendererCore,
-      {
-        model,
-        showFlowSettings,
-        flowSettingsVariant,
-        hideRemoveInSettings,
-        showTitle,
-        showErrorFallback,
-        settingsMenuLevel,
-        extraToolbarItems
-      }
-    ));
-  }
-);
 const FlowModelRendererCore = (0, import_reactive_react.observer)(
   ({
     model,
@@ -122,6 +94,7 @@ const FlowModelRendererCore = (0, import_reactive_react.observer)(
     settingsMenuLevel,
     extraToolbarItems
   }) => {
+    var _a;
     const wrapWithErrorBoundary = /* @__PURE__ */ __name((children) => {
       if (showErrorFallback) {
         return /* @__PURE__ */ import_react.default.createElement(import_react_error_boundary.ErrorBoundary, { FallbackComponent: import_FlowErrorFallback.FlowErrorFallback }, children);
@@ -139,8 +112,13 @@ const FlowModelRendererCore = (0, import_reactive_react.observer)(
       }
       return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, rendered);
     }, "ContentOrError");
+    const rawUse = model == null ? void 0 : model.use;
+    const resolvedName = ((_a = model == null ? void 0 : model.constructor) == null ? void 0 : _a.name) || model.uid;
+    const contentKey = typeof rawUse === "string" ? `${rawUse}:${model.uid}` : `${resolvedName}:${model.uid}`;
     if (!showFlowSettings) {
-      return wrapWithErrorBoundary(/* @__PURE__ */ import_react.default.createElement(ContentOrError, null));
+      return wrapWithErrorBoundary(
+        /* @__PURE__ */ import_react.default.createElement("div", { key: contentKey }, /* @__PURE__ */ import_react.default.createElement(ContentOrError, null))
+      );
     }
     switch (flowSettingsVariant) {
       case "dropdown":
@@ -158,10 +136,14 @@ const FlowModelRendererCore = (0, import_reactive_react.observer)(
             toolbarStyle: import_lodash.default.isObject(showFlowSettings) ? showFlowSettings.style : void 0,
             toolbarPosition: import_lodash.default.isObject(showFlowSettings) ? showFlowSettings.toolbarPosition : void 0
           },
-          wrapWithErrorBoundary(/* @__PURE__ */ import_react.default.createElement(ContentOrError, null))
+          wrapWithErrorBoundary(
+            /* @__PURE__ */ import_react.default.createElement("div", { key: contentKey }, /* @__PURE__ */ import_react.default.createElement(ContentOrError, null))
+          )
         );
       case "contextMenu":
-        return /* @__PURE__ */ import_react.default.createElement(import_FlowsContextMenu.FlowsContextMenu, { model, showDeleteButton: !hideRemoveInSettings }, wrapWithErrorBoundary(/* @__PURE__ */ import_react.default.createElement(ContentOrError, null)));
+        return /* @__PURE__ */ import_react.default.createElement(import_FlowsContextMenu.FlowsContextMenu, { model, showDeleteButton: !hideRemoveInSettings }, wrapWithErrorBoundary(
+          /* @__PURE__ */ import_react.default.createElement("div", { key: contentKey }, /* @__PURE__ */ import_react.default.createElement(ContentOrError, null))
+        ));
       case "modal":
         console.warn("FlowModelRenderer: modal variant is not implemented yet");
         return wrapWithErrorBoundary(/* @__PURE__ */ import_react.default.createElement(ContentOrError, null));
@@ -186,7 +168,9 @@ const FlowModelRendererCore = (0, import_reactive_react.observer)(
             toolbarStyle: import_lodash.default.isObject(showFlowSettings) ? showFlowSettings.style : void 0,
             toolbarPosition: import_lodash.default.isObject(showFlowSettings) ? showFlowSettings.toolbarPosition : void 0
           },
-          wrapWithErrorBoundary(/* @__PURE__ */ import_react.default.createElement(ContentOrError, null))
+          wrapWithErrorBoundary(
+            /* @__PURE__ */ import_react.default.createElement("div", { key: contentKey }, /* @__PURE__ */ import_react.default.createElement(ContentOrError, null))
+          )
         );
     }
   },
@@ -197,12 +181,11 @@ const FlowModelRendererCore = (0, import_reactive_react.observer)(
 const FlowModelRenderer = (0, import_reactive_react.observer)(
   ({
     model,
-    fallback = /* @__PURE__ */ import_react.default.createElement(import_antd.Skeleton.Button, { size: "small" }),
+    fallback = null,
     showFlowSettings = false,
     flowSettingsVariant = "dropdown",
     hideRemoveInSettings = false,
     showTitle = false,
-    skipApplyAutoFlows = false,
     inputArgs,
     showErrorFallback = true,
     settingsMenuLevel,
@@ -212,19 +195,7 @@ const FlowModelRenderer = (0, import_reactive_react.observer)(
       console.warn("FlowModelRenderer: Invalid model or render method not found.", model);
       return null;
     }
-    const content = skipApplyAutoFlows ? /* @__PURE__ */ import_react.default.createElement(
-      FlowModelRendererWithoutAutoFlows,
-      {
-        model,
-        showFlowSettings,
-        flowSettingsVariant,
-        hideRemoveInSettings,
-        showTitle,
-        showErrorFallback,
-        settingsMenuLevel,
-        extraToolbarItems
-      }
-    ) : /* @__PURE__ */ import_react.default.createElement(
+    const content = /* @__PURE__ */ import_react.default.createElement(
       FlowModelRendererWithAutoFlows,
       {
         model,

package/lib/components/FormItem.js

@@ -136,7 +136,11 @@ const FormItem = /* @__PURE__ */ __name(({
       layout,
       label: renderLabel(),
       colon: false,
-      extra: rest.extra && /* @__PURE__ */ import_react.default.createElement("span", { style: { whiteSpace: "pre-wrap" } }, rest.extra)
+      extra: rest.extra && /* @__PURE__ */ import_react.default.createElement("span", { style: { whiteSpace: "pre-wrap" } }, rest.extra),
+      tooltip: rest.tooltip && {
+        title: rest.tooltip,
+        overlayInnerStyle: { whiteSpace: "pre-line" }
+      }
     },
     processedChildren
   );

package/lib/components/MobilePopup.d.ts

@@ -0,0 +1,20 @@
+/**
+ * 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 { FC, ReactNode } from 'react';
+interface MobilePopupProps {
+    title?: string;
+    visible: boolean;
+    minHeight?: number | string;
+    onClose: () => void;
+    children: ReactNode;
+    className?: string;
+    footer?: ReactNode;
+}
+export declare const MobilePopup: FC<MobilePopupProps>;
+export {};