@nocobase/flow-engine 2.0.0-alpha.7 → 2.0.0-alpha.71

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,91 @@
+/**
+ * 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);
+  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",
+    // getModel 需要在本地执行以确保全局查找时正确遍历整个引擎栈
+    "getModel"
+  ]);
+  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

@@ -240,12 +240,8 @@ export declare class FlowStep {
         use?: string;
         sort?: number;
         preset?: boolean;
-        paramsRequired?: boolean;
-        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 +411,15 @@ 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[];
+        paramsRequired?: boolean;
+        hideInSettings?: boolean | ((ctx: import("./flowContext").FlowRuntimeContext<import(".").FlowModel<import("./types").DefaultStructure>, any>) => boolean | Promise<boolean>);
+        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.d.ts

@@ -11,6 +11,12 @@ export interface JSRunnerOptions {
     timeoutMs?: number;
     globals?: Record<string, any>;
     version?: string;
+    /**
+     * Enable RunJS template compatibility preprocessing for `{{ ... }}`.
+     * When enabled via `ctx.runjs(code, vars, { preprocessTemplates: true })` (default),
+     * the code will be rewritten to call `ctx.resolveJsonTemplate(...)` at runtime.
+     */
+    preprocessTemplates?: boolean;
 }
 export declare class JSRunner {
     private globals;

package/lib/JSRunner.js

@@ -35,6 +35,7 @@ const _JSRunner = class _JSRunner {
   globals;
   timeoutMs;
   constructor(options = {}) {
+    var _a, _b;
     const bindWindowFn = /* @__PURE__ */ __name((key) => {
       if (typeof window !== "undefined" && typeof window[key] === "function") {
         return window[key].bind(window);
@@ -42,13 +43,34 @@ const _JSRunner = class _JSRunner {
       const fn = globalThis[key];
       return typeof fn === "function" ? fn.bind(globalThis) : fn;
     }, "bindWindowFn");
+    const providedGlobals = options.globals || {};
+    const liftedGlobals = {};
+    if (!Object.prototype.hasOwnProperty.call(providedGlobals, "Blob")) {
+      try {
+        const blobCtor = (_a = providedGlobals.window) == null ? void 0 : _a.Blob;
+        if (typeof blobCtor !== "undefined") {
+          liftedGlobals.Blob = blobCtor;
+        }
+      } catch {
+      }
+    }
+    if (!Object.prototype.hasOwnProperty.call(providedGlobals, "URL")) {
+      try {
+        const urlCtor = (_b = providedGlobals.window) == null ? void 0 : _b.URL;
+        if (typeof urlCtor !== "undefined") {
+          liftedGlobals.URL = urlCtor;
+        }
+      } catch {
+      }
+    }
     this.globals = {
       console,
       setTimeout: bindWindowFn("setTimeout"),
       clearTimeout: bindWindowFn("clearTimeout"),
       setInterval: bindWindowFn("setInterval"),
       clearInterval: bindWindowFn("clearInterval"),
-      ...options.globals || {}
+      ...liftedGlobals,
+      ...providedGlobals
     };
     this.timeoutMs = options.timeoutMs ?? 5e3;
   }
@@ -62,6 +84,10 @@ const _JSRunner = class _JSRunner {
    * 异步运行代码，带错误处理和超时机制
    */
   async run(code) {
+    const search = typeof location !== "undefined" ? location.search : void 0;
+    if (typeof search === "string" && 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

@@ -31,24 +31,41 @@ __export(ViewScopedFlowEngine_exports, {
 });
 module.exports = __toCommonJS(ViewScopedFlowEngine_exports);
 var import_flowEngine = require("./flowEngine");
+var import_viewEvents = require("./views/viewEvents");
 function createViewScopedEngine(parent) {
   const local = new import_flowEngine.FlowEngine();
+  Object.defineProperty(local, import_viewEvents.ENGINE_SCOPE_KEY, { value: import_viewEvents.VIEW_ENGINE_SCOPE, configurable: true });
   if (parent.modelRepository) {
     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",
     "executor",
     "context",
+    import_viewEvents.ENGINE_SCOPE_KEY,
     "previousEngine",
     "nextEngine",
+    // 调度器与事件总线局部化
+    "emitter",
+    "_modelOperationScheduler",
+    "getScheduler",
+    "scheduleModelOperation",
+    "disposeScheduler",
     // 栈指针维护方法需要在本地执行，而非代理到父引擎
     "unlinkFromStack",
     "linkAfter",
     "_previousEngine",
-    "_nextEngine"
+    "_nextEngine",
+    // getModel 需要在本地执行以确保全局查找时正确遍历整个引擎栈
+    "getModel"
   ]);
   const handler = {
     get(target, prop, receiver) {

package/lib/acl/Acl.d.ts

@@ -1,29 +1,29 @@
-/**
- * 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';
 interface CheckOptions {
     dataSourceKey: string;
     resourceName: string;
     actionName: string;
     fields?: string[];
+    recordPkValue?: string | number;
+    allowedActions: any[];
 }
 export declare class ACL {
     private flowEngine;
-    private dataSources;
+    private data;
+    private meta;
     private loaded;
     private loadingPromise;
+    private lastToken;
     constructor(flowEngine: FlowEngine);
+    setData(data: Record<string, any>): void;
+    setMeta(data: Record<string, any>): void;
     load(): Promise<void>;
     getActionAlias(actionName: string): any;
-    inResources(resourceName: string): any;
-    getResourceActionParams(resourceName: any, actionName: any): any;
-    getStrategyActionParams(actionName: string): {};
+    inResources(resourceName: string, dataSourceName: any): any;
+    getResourceActionParams(resourceName: any, actionName: any, dataSourceName: any): any;
+    getStrategyActionParams(actionName: string, dataSourceName: any): {};
+    getIgnoreScope: (options?: any) => boolean;
+    verifyScope: (actionName: string, recordPkValue: any, allowedActions: any) => boolean;
     parseAction(options: CheckOptions): any;
     parseField(options: CheckOptions): boolean;
     aclCheck(options: CheckOptions): Promise<boolean>;

package/lib/acl/Acl.js

@@ -7,9 +7,11 @@
  * 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) => {
@@ -24,65 +26,123 @@ var __copyProps = (to, from, except, desc) => {
   }
   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 Acl_exports = {};
 __export(Acl_exports, {
   ACL: () => ACL
 });
 module.exports = __toCommonJS(Acl_exports);
+var import_lodash = __toESM(require("lodash"));
 const _ACL = class _ACL {
   constructor(flowEngine) {
     this.flowEngine = flowEngine;
   }
-  dataSources = {};
+  data = {};
+  meta = {};
   loaded = false;
   loadingPromise = null;
+  // 用于识别当前鉴权状态（例如切换登录用户后应重新加载）
+  // 记录上一次用于鉴权的 token，用于识别登录态变更
+  lastToken = null;
+  setData(data) {
+    this.data = import_lodash.default.cloneDeep(data);
+  }
+  setMeta(data) {
+    this.meta = import_lodash.default.cloneDeep(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 = {};
+      this.meta = {};
     }
+    const { data } = await this.flowEngine.context.api.request({
+      url: "roles:check"
+    });
+    this.data = (data == null ? void 0 : data.data) || {};
+    this.meta = (data == null ? void 0 : data.meta) || {};
+    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);
+  inResources(resourceName, dataSourceName) {
+    var _a, _b;
+    const { dataSources: dataSourcesAcl } = (this == null ? void 0 : this.meta) || {};
+    const data = { ...this.data, ...(0, import_lodash.omit)(dataSourcesAcl == null ? void 0 : dataSourcesAcl[dataSourceName], "snippets") };
+    return (_b = (_a = data.resources) == null ? void 0 : _a.includes) == null ? void 0 : _b.call(_a, resourceName);
   }
-  getResourceActionParams(resourceName, actionName) {
-    var _a, _b, _c, _d;
+  getResourceActionParams(resourceName, actionName, dataSourceName) {
+    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]);
+    const { dataSources: dataSourcesAcl } = (this == null ? void 0 : this.meta) || {};
+    const data = { ...this.data, ...(0, import_lodash.omit)(dataSourcesAcl == null ? void 0 : dataSourcesAcl[dataSourceName], "snippets") };
+    return ((_a = data.actions) == null ? void 0 : _a[`${resourceName}:${actionAlias}`]) || ((_b = data.actions) == null ? void 0 : _b[actionName]);
   }
-  getStrategyActionParams(actionName) {
-    var _a, _b, _c;
+  getStrategyActionParams(actionName, dataSourceName) {
+    var _a, _b;
     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 { dataSources: dataSourcesAcl } = (this == null ? void 0 : this.meta) || {};
+    const data = { ...this.data, ...(0, import_lodash.omit)(dataSourcesAcl == null ? void 0 : dataSourcesAcl[dataSourceName], "snippets") };
+    const strategyAction = (_b = (_a = data == null ? void 0 : data.strategy) == null ? void 0 : _a.actions) == null ? void 0 : _b.find((action) => {
       const [value] = action.split(":");
       return value === actionAlias;
     });
     return strategyAction ? {} : null;
   }
+  getIgnoreScope = /* @__PURE__ */ __name((options = {}) => {
+    const { recordPkValue, allowedActions, actionName } = options;
+    let ignoreScope = false;
+    if (options.ignoreScope) {
+      ignoreScope = true;
+    }
+    if (actionName === "create") {
+      ignoreScope = true;
+    }
+    if (!recordPkValue || !allowedActions) {
+      ignoreScope = true;
+    }
+    return ignoreScope;
+  }, "getIgnoreScope");
+  verifyScope = /* @__PURE__ */ __name((actionName, recordPkValue, allowedActions) => {
+    const actionAlias = this.getActionAlias(actionName);
+    const scopeValues = allowedActions == null ? void 0 : allowedActions[actionAlias];
+    if (!Array.isArray(scopeValues)) {
+      return null;
+    }
+    return scopeValues.map((v) => String(v)).includes(String(recordPkValue));
+  }, "verifyScope");
   parseAction(options) {
     var _a;
-    const { resourceName, actionName, dataSourceKey = "main" } = options;
+    const { resourceName, actionName, dataSourceKey = "main", recordPkValue, allowedActions } = options;
     const targetResource = (resourceName == null ? void 0 : resourceName.includes(".")) && ((_a = this.flowEngine.context.dataSourceManager.getDataSource(dataSourceKey).collectionManager.getAssociation(resourceName)) == null ? void 0 : _a.target);
-    if (this.inResources(targetResource)) {
-      return this.getResourceActionParams(targetResource, actionName);
+    if (!this.getIgnoreScope(options)) {
+      const r = this.verifyScope(actionName, recordPkValue, allowedActions);
+      if (!r) {
+        return null;
+      }
+    }
+    if (this.inResources(targetResource, dataSourceKey)) {
+      return this.getResourceActionParams(targetResource, actionName, dataSourceKey);
     }
-    if (this.inResources(resourceName)) {
-      return this.getResourceActionParams(resourceName, actionName);
+    if (this.inResources(resourceName, dataSourceKey)) {
+      return this.getResourceActionParams(resourceName, actionName, dataSourceKey);
     }
-    return this.getStrategyActionParams(actionName);
+    return this.getStrategyActionParams(actionName, dataSourceKey);
   }
   parseField(options) {
     const { fields } = options;
@@ -95,9 +155,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/DynamicFlowsEditor.js

@@ -39,10 +39,8 @@ __export(DynamicFlowsEditor_exports, {
   DynamicFlowsEditor: () => DynamicFlowsEditor
 });
 module.exports = __toCommonJS(DynamicFlowsEditor_exports);
-var import_antd = require("antd");
-var import_react2 = __toESM(require("react"));
-const Panel = import_antd.Collapse.Panel;
-const DynamicFlowsEditor = /* @__PURE__ */ import_react2.default.createElement(import_react2.default.Fragment, null, "Uncomment and fix issues after refactoring flow definitions");
+var import_react = __toESM(require("react"));
+const DynamicFlowsEditor = /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, "Uncomment and fix issues after refactoring flow definitions");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   DynamicFlowsEditor

package/lib/components/FieldModelRenderer.js

@@ -52,7 +52,6 @@ const flowModelRendererPropKeys = [
   "flowSettingsVariant",
   "hideRemoveInSettings",
   "showTitle",
-  "skipApplyAutoFlows",
   "inputArgs",
   "showErrorFallback",
   "settingsMenuLevel",
@@ -63,27 +62,36 @@ 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),
-    onChange: handleChange,
     onCompositionStart: handleCompositionStart,
-    onCompositionEnd: handleCompositionEnd
+    onCompositionEnd: handleCompositionEnd,
+    ...import_lodash.default.omit(rest, flowModelRendererPropKeys),
+    onChange: handleChange
   };
   (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
+});