@nocobase/flow-engine 2.0.0-beta.2 → 2.0.0-beta.20

package/lib/flowContext.js

@@ -57,7 +57,6 @@ __export(flowContext_exports, {
 module.exports = __toCommonJS(flowContext_exports);
 var import_reactive = require("@formily/reactive");
 var antd = __toESM(require("antd"));
-var antdIcons = __toESM(require("@ant-design/icons"));
 var import_lodash = __toESM(require("lodash"));
 var import_qs = __toESM(require("qs"));
 var import_react = __toESM(require("react"));
@@ -74,9 +73,12 @@ var import_utils = require("./utils");
 var import_exceptions = require("./utils/exceptions");
 var import_params_resolvers = require("./utils/params-resolvers");
 var import_serverContextParams = require("./utils/serverContextParams");
+var import_variablesParams = require("./utils/variablesParams");
 var import_registry = require("./runjs-context/registry");
 var import_createEphemeralContext = require("./utils/createEphemeralContext");
 var import_dayjs = __toESM(require("dayjs"));
+var import_runjsLibs = require("./runjsLibs");
+var import_runjsModuleLoader = require("./utils/runjsModuleLoader");
 var _proxy, _FlowContext_instances, createChildNodes_fn, findMetaByPath_fn, findMetaInDelegatesDeep_fn, findMetaInProperty_fn, resolvePathInMeta_fn, resolvePathInMetaAsync_fn, buildParentTitles_fn, toTreeNode_fn;
 function isRecordRefLike(val) {
   return !!(val && typeof val === "object" && "collection" in val && "filterByTk" in val);
@@ -96,6 +98,50 @@ function filterBuilderOutputByPaths(built, neededPaths) {
   return void 0;
 }
 __name(filterBuilderOutputByPaths, "filterBuilderOutputByPaths");
+function topLevelOf(subPath) {
+  if (!subPath) return void 0;
+  const m = String(subPath).match(/^([^.[]+)/);
+  return m == null ? void 0 : m[1];
+}
+__name(topLevelOf, "topLevelOf");
+function inferSelectsFromUsage(paths = []) {
+  if (!Array.isArray(paths) || paths.length === 0) {
+    return { generatedAppends: void 0, generatedFields: void 0 };
+  }
+  const appendSet = /* @__PURE__ */ new Set();
+  const fieldSet = /* @__PURE__ */ new Set();
+  const normalizePath = /* @__PURE__ */ __name((raw) => {
+    if (!raw) return "";
+    let s = String(raw);
+    s = s.replace(/\[(?:\d+)\]/g, "");
+    s = s.replace(/\[(?:"((?:[^"\\]|\\.)*)"|'((?:[^'\\]|\\.)*)')\]/g, (_m, g1, g2) => `.${g1 || g2}`);
+    s = s.replace(/\.\.+/g, ".");
+    s = s.replace(/^\./, "").replace(/\.$/, "");
+    return s;
+  }, "normalizePath");
+  for (let path of paths) {
+    if (!path) continue;
+    while (/^\[(\d+)\](\.|$)/.test(path)) {
+      path = path.replace(/^\[(\d+)\]\.?/, "");
+    }
+    const norm = normalizePath(path);
+    if (!norm) continue;
+    const segments = norm.split(".").filter(Boolean);
+    if (segments.length === 0) continue;
+    if (segments.length === 1) {
+      fieldSet.add(segments[0]);
+      continue;
+    }
+    for (let i = 0; i < segments.length - 1; i++) {
+      appendSet.add(segments.slice(0, i + 1).join("."));
+    }
+    fieldSet.add(segments.join("."));
+  }
+  const generatedAppends = appendSet.size ? Array.from(appendSet) : void 0;
+  const generatedFields = fieldSet.size ? Array.from(fieldSet) : void 0;
+  return { generatedAppends, generatedFields };
+}
+__name(inferSelectsFromUsage, "inferSelectsFromUsage");
 const _FlowContext = class _FlowContext {
   constructor() {
     __privateAdd(this, _FlowContext_instances);
@@ -607,6 +653,7 @@ toTreeNode_fn = /* @__PURE__ */ __name(function(name, metaOrFactory, paths = [na
       type: "object",
       // 初始类型
       interface: void 0,
+      options: void 0,
       uiSchema: void 0,
       paths,
       parentTitles: parentTitles.length > 0 ? parentTitles : void 0,
@@ -635,6 +682,7 @@ toTreeNode_fn = /* @__PURE__ */ __name(function(name, metaOrFactory, paths = [na
           node.title = finalTitle;
           node.type = meta == null ? void 0 : meta.type;
           node.interface = meta == null ? void 0 : meta.interface;
+          node.options = meta == null ? void 0 : meta.options;
           node.uiSchema = meta == null ? void 0 : meta.uiSchema;
           if (!(meta == null ? void 0 : meta.properties)) return [];
           const childNodes = __privateMethod(this, _FlowContext_instances, createChildNodes_fn).call(this, meta.properties, paths, [...parentTitles, finalTitle], meta);
@@ -655,6 +703,7 @@ toTreeNode_fn = /* @__PURE__ */ __name(function(name, metaOrFactory, paths = [na
       title: nodeTitle,
       type: metaOrFactory.type,
       interface: metaOrFactory.interface,
+      options: metaOrFactory.options,
       uiSchema: metaOrFactory.uiSchema,
       paths,
       parentTitles: parentTitles.length > 0 ? parentTitles : void 0,
@@ -670,6 +719,23 @@ toTreeNode_fn = /* @__PURE__ */ __name(function(name, metaOrFactory, paths = [na
 __name(_FlowContext, "FlowContext");
 let FlowContext = _FlowContext;
 const _BaseFlowEngineContext = class _BaseFlowEngineContext extends FlowContext {
+  constructor() {
+    super();
+    this.defineMethod(
+      "runjs",
+      async function(code, variables, options) {
+        const { preprocessTemplates, ...runnerOptions } = options || {};
+        const mergedGlobals = { ...(runnerOptions == null ? void 0 : runnerOptions.globals) || {}, ...variables || {} };
+        const runner = await this.createJSRunner({
+          ...runnerOptions || {},
+          globals: mergedGlobals
+        });
+        const shouldPreprocessTemplates = preprocessTemplates !== false;
+        const jsCode = await (0, import_utils.prepareRunJsCode)(String(code ?? ""), { preprocessTemplates: shouldPreprocessTemplates });
+        return runner.run(jsCode);
+      }
+    );
+  }
 };
 __name(_BaseFlowEngineContext, "BaseFlowEngineContext");
 let BaseFlowEngineContext = _BaseFlowEngineContext;
@@ -706,14 +772,6 @@ const _FlowEngineContext = class _FlowEngineContext extends BaseFlowEngineContex
     this.defineMethod("t", (keyOrTemplate, options) => {
       return i18n.translate(keyOrTemplate, options);
     });
-    this.defineMethod("runjs", async (code, variables, options) => {
-      const mergedGlobals = { ...(options == null ? void 0 : options.globals) || {}, ...variables || {} };
-      const runner = await this.createJSRunner({
-        ...options || {},
-        globals: mergedGlobals
-      });
-      return runner.run(code);
-    });
     this.defineMethod("renderJson", function(template) {
       return this.resolveJsonTemplate(template);
     });
@@ -745,6 +803,21 @@ const _FlowEngineContext = class _FlowEngineContext extends BaseFlowEngineContex
       const needServer = Object.keys(serverVarPaths).length > 0;
       let serverResolved = template;
       if (needServer) {
+        const inferRecordRefWithMeta = /* @__PURE__ */ __name((ctx) => {
+          var _a2, _b2, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
+          const ref = (0, import_variablesParams.inferRecordRef)(ctx);
+          if (ref) return ref;
+          try {
+            const tk = (_b2 = (_a2 = ctx == null ? void 0 : ctx.resource) == null ? void 0 : _a2.getMeta) == null ? void 0 : _b2.call(_a2, "currentFilterByTk");
+            if (typeof tk === "undefined" || tk === null) return void 0;
+            const collection = ((_c = ctx == null ? void 0 : ctx.collection) == null ? void 0 : _c.name) || ((_j = (_i = (_h = (_g = (_f = (_e = (_d = ctx == null ? void 0 : ctx.resource) == null ? void 0 : _d.getResourceName) == null ? void 0 : _e.call(_d)) == null ? void 0 : _f.split) == null ? void 0 : _g.call(_f, ".")) == null ? void 0 : _h.slice) == null ? void 0 : _i.call(_h, -1)) == null ? void 0 : _j[0]);
+            if (!collection) return void 0;
+            const dataSourceKey = ((_k = ctx == null ? void 0 : ctx.collection) == null ? void 0 : _k.dataSourceKey) || ((_m = (_l = ctx == null ? void 0 : ctx.resource) == null ? void 0 : _l.getDataSourceKey) == null ? void 0 : _m.call(_l));
+            return { collection, dataSourceKey, filterByTk: tk };
+          } catch (_2) {
+            return void 0;
+          }
+        }, "inferRecordRefWithMeta");
         const collectFromMeta = /* @__PURE__ */ __name(async () => {
           var _a2;
           const out = {};
@@ -780,6 +853,43 @@ const _FlowEngineContext = class _FlowEngineContext extends BaseFlowEngineContex
         }, "collectFromMeta");
         const inputFromMeta = await collectFromMeta();
         const autoInput = { ...inputFromMeta };
+        try {
+          const varName = "formValues";
+          const neededPaths = serverVarPaths[varName] || [];
+          if (neededPaths.length) {
+            const requiredTop = /* @__PURE__ */ new Set();
+            for (const p of neededPaths) {
+              const top = topLevelOf(p);
+              if (top) requiredTop.add(top);
+            }
+            const metaOut = inputFromMeta == null ? void 0 : inputFromMeta[varName];
+            const builtTop = /* @__PURE__ */ new Set();
+            if (metaOut && typeof metaOut === "object" && !Array.isArray(metaOut) && !isRecordRefLike(metaOut)) {
+              Object.keys(metaOut).forEach((k) => builtTop.add(k));
+            }
+            const missing = [...requiredTop].filter((k) => !builtTop.has(k));
+            if (missing.length) {
+              const ref = inferRecordRefWithMeta(this);
+              if (ref) {
+                const { generatedFields, generatedAppends } = inferSelectsFromUsage(neededPaths);
+                const recordRef = {
+                  ...ref,
+                  fields: generatedFields,
+                  appends: generatedAppends
+                };
+                const existing = autoInput[varName];
+                if (existing && typeof existing === "object" && !Array.isArray(existing) && !isRecordRefLike(existing)) {
+                  for (const [k, v] of Object.entries(existing)) {
+                    autoInput[`${varName}.${k}`] = v;
+                  }
+                  delete autoInput[varName];
+                }
+                autoInput[varName] = recordRef;
+              }
+            }
+          }
+        } catch (_2) {
+        }
         const autoContextParams = Object.keys(autoInput).length ? (0, import_serverContextParams.buildServerContextParams)(this, autoInput) : void 0;
         if (!autoContextParams) {
           const keys = Object.keys(serverVarPaths);
@@ -894,7 +1004,8 @@ const _FlowEngineContext = class _FlowEngineContext extends BaseFlowEngineContex
         user: this.user
       }), "get")
     });
-    this.defineMethod("loadCSS", async (url) => {
+    this.defineMethod("loadCSS", async (href) => {
+      const url = (0, import_utils.resolveModuleUrl)(href);
       return new Promise((resolve, reject) => {
         const existingLink = document.querySelector(`link[href="${url}"]`);
         if (existingLink) {
@@ -910,51 +1021,14 @@ const _FlowEngineContext = class _FlowEngineContext extends BaseFlowEngineContex
       });
     });
     this.defineMethod("requireAsync", async (url) => {
-      return new Promise((resolve, reject) => {
-        if (!this.requirejs) {
-          reject(new Error("requirejs is not available"));
-          return;
-        }
-        this.requirejs(
-          [url],
-          (...args) => {
-            resolve(args[0]);
-          },
-          reject
-        );
-      });
+      const u = (0, import_utils.resolveModuleUrl)(url, { raw: true });
+      return await (0, import_runjsModuleLoader.runjsRequireAsync)(this.requirejs, u);
     });
-    this.defineMethod("importAsync", async (url) => {
-      if (!url || typeof url !== "string") {
-        throw new Error("invalid url");
+    this.defineMethod("importAsync", async function(url) {
+      if ((0, import_utils.isCssFile)(url)) {
+        return this.loadCSS(url);
       }
-      const u = url.trim();
-      const g = globalThis;
-      g.__nocobaseImportAsyncCache = g.__nocobaseImportAsyncCache || /* @__PURE__ */ new Map();
-      const cache = g.__nocobaseImportAsyncCache;
-      if (cache.has(u)) return cache.get(u);
-      const nativeImport = /* @__PURE__ */ __name(() => import(
-        /* @vite-ignore */
-        /* webpackIgnore: true */
-        u
-      ), "nativeImport");
-      const evalImport = /* @__PURE__ */ __name(() => {
-        const importer = (0, eval)("u => import(u)");
-        return importer(u);
-      }, "evalImport");
-      const p = (async () => {
-        try {
-          return await nativeImport();
-        } catch (err) {
-          try {
-            return await evalImport();
-          } catch (err2) {
-            throw err2 || err;
-          }
-        }
-      })();
-      cache.set(u, p);
-      return p;
+      return await (0, import_runjsModuleLoader.runjsImportModule)(this, url, { importer: import_runjsModuleLoader.runjsImportAsync });
     });
     this.defineMethod("createJSRunner", async function(options) {
       try {
@@ -964,11 +1038,8 @@ const _FlowEngineContext = class _FlowEngineContext extends BaseFlowEngineContex
       }
       const version = (options == null ? void 0 : options.version) || "v1";
       const modelClass = (0, import_registry.getModelClassName)(this);
-      const Ctor = import_registry.RunJSContextRegistry.resolve(version, modelClass) || import_registry.RunJSContextRegistry.resolve(version, "*") || FlowRunJSContext;
-      let runCtx;
-      if (Ctor) {
-        runCtx = new Ctor(this);
-      }
+      const Ctor = import_registry.RunJSContextRegistry.resolve(version, modelClass) || FlowRunJSContext;
+      const runCtx = new Ctor(this);
       const globals = { ctx: runCtx, ...(options == null ? void 0 : options.globals) || {} };
       const { timeoutMs } = options || {};
       return new import_JSRunner.JSRunner({ globals, timeoutMs });
@@ -1045,13 +1116,6 @@ const _FlowModelContext = class _FlowModelContext extends BaseFlowModelContext {
     this.defineMethod("onRefReady", (ref, cb, timeout) => {
       this.engine.reactView.onRefReady(ref, cb, timeout);
     });
-    this.defineMethod("runjs", async (code, variables, options) => {
-      const runner = await this.createJSRunner({
-        globals: variables,
-        version: options == null ? void 0 : options.version
-      });
-      return runner.run(code);
-    });
     this.defineProperty("model", {
       value: model
     });
@@ -1183,13 +1247,6 @@ const _FlowForkModelContext = class _FlowForkModelContext extends BaseFlowModelC
         return stableRef;
       }, "get")
     });
-    this.defineMethod("runjs", async (code, variables, options) => {
-      const runner = await this.createJSRunner({
-        globals: variables,
-        version: options == null ? void 0 : options.version
-      });
-      return runner.run(code);
-    });
   }
 };
 __name(_FlowForkModelContext, "FlowForkModelContext");
@@ -1234,13 +1291,6 @@ const _FlowRuntimeContext = class _FlowRuntimeContext extends BaseFlowModelConte
     this.defineMethod("onRefReady", (ref, cb, timeout) => {
       this.engine.reactView.onRefReady(ref, cb, timeout);
     });
-    this.defineMethod("runjs", async (code, variables, options) => {
-      const runner = await this.createJSRunner({
-        globals: variables,
-        version: options == null ? void 0 : options.version
-      });
-      return runner.run(code);
-    });
   }
   stepResults = {};
   _getOwnProperty(key) {
@@ -1307,15 +1357,9 @@ const _FlowRunJSContext = class _FlowRunJSContext extends FlowContext {
         return this.engine.reactView.createRoot(realContainer, options);
       }, "createRoot")
     };
+    ReactDOMShim.__nbRunjsInternalShim = true;
     this.defineProperty("ReactDOM", { value: ReactDOMShim });
-    const libs = Object.freeze({
-      React: import_react.default,
-      ReactDOM: ReactDOMShim,
-      antd,
-      dayjs: import_dayjs.default,
-      antdIcons
-    });
-    this.defineProperty("libs", { value: libs });
+    (0, import_runjsLibs.setupRunJSLibs)(this);
     this.defineMethod(
       "render",
       function(vnode, container) {
@@ -1325,39 +1369,64 @@ const _FlowRunJSContext = class _FlowRunJSContext extends FlowContext {
         const globalRef = globalThis;
         globalRef.__nbRunjsRoots = globalRef.__nbRunjsRoots || /* @__PURE__ */ new WeakMap();
         const rootMap = globalRef.__nbRunjsRoots;
-        if (typeof vnode === "string") {
-          const existingRoot = rootMap.get(containerEl);
-          if (existingRoot && typeof existingRoot.unmount === "function") {
+        const disposeEntry = /* @__PURE__ */ __name((entry2) => {
+          if (!entry2) return;
+          if (entry2.disposeTheme && typeof entry2.disposeTheme === "function") {
             try {
-              existingRoot.unmount();
-            } finally {
-              rootMap.delete(containerEl);
+              entry2.disposeTheme();
+            } catch (_2) {
+            }
+            entry2.disposeTheme = void 0;
+          }
+          const root = entry2.root || entry2;
+          if (root && typeof root.unmount === "function") {
+            try {
+              root.unmount();
+            } catch (_2) {
             }
           }
+        }, "disposeEntry");
+        const unmountContainerRoot = /* @__PURE__ */ __name(() => {
+          const existing = rootMap.get(containerEl);
+          if (existing) {
+            disposeEntry(existing);
+            rootMap.delete(containerEl);
+          }
+        }, "unmountContainerRoot");
+        if (typeof vnode === "string") {
+          unmountContainerRoot();
           const proxy = new import_ElementProxy.ElementProxy(containerEl);
           proxy.innerHTML = String(vnode ?? "");
           return null;
         }
         if (vnode && vnode.nodeType && (vnode.nodeType === 1 || vnode.nodeType === 3 || vnode.nodeType === 11)) {
-          const existingRoot = rootMap.get(containerEl);
-          if (existingRoot && typeof existingRoot.unmount === "function") {
-            try {
-              existingRoot.unmount();
-            } finally {
-              rootMap.delete(containerEl);
-            }
-          }
+          unmountContainerRoot();
           while (containerEl.firstChild) containerEl.removeChild(containerEl.firstChild);
           containerEl.appendChild(vnode);
           return null;
         }
-        let root = rootMap.get(containerEl);
-        if (!root) {
-          root = this.ReactDOM.createRoot(containerEl);
-          rootMap.set(containerEl, root);
+        const rendererKey = this.ReactDOM;
+        const ownerKey = this;
+        let entry = rootMap.get(containerEl);
+        if (!entry || entry.rendererKey !== rendererKey || entry.ownerKey !== ownerKey) {
+          if (entry) {
+            disposeEntry(entry);
+            rootMap.delete(containerEl);
+          }
+          const root = this.ReactDOM.createRoot(containerEl);
+          entry = { rendererKey, ownerKey, root, disposeTheme: void 0, lastVnode: void 0 };
+          rootMap.set(containerEl, entry);
         }
-        root.render(vnode);
-        return root;
+        return (0, import_runjsLibs.externalReactRender)({
+          ctx: this,
+          entry,
+          vnode,
+          containerEl,
+          rootMap,
+          unmountContainerRoot,
+          internalReact: import_react.default,
+          internalAntd: antd
+        });
       }
     );
   }

package/lib/flowEngine.d.ts

@@ -84,6 +84,17 @@ export declare class FlowEngine {
     private _previousEngine?;
     private _nextEngine?;
     private _resources;
+    /**
+     * Data change registry used to coordinate "refresh on active" across view-scoped engines.
+     *
+     * Keyed by: dataSourceKey -> resourceName -> version.
+     * - mark: increments version
+     * - get: returns current version (default 0)
+     *
+     * NOTE: ViewScopedFlowEngine proxies delegate non-local fields/methods to parents, so this
+     * registry naturally lives on the root engine instance and is shared across the whole view stack.
+     */
+    private _dataSourceDirtyVersions;
     /**
      * 引擎事件总线（目前用于模型生命周期等事件）。
      * ViewScopedFlowEngine 持有自己的实例，实现作用域隔离。
@@ -116,6 +127,16 @@ export declare class FlowEngine {
     getScheduler(): ModelOperationScheduler;
     /** 释放并清理当前引擎本地调度器（若存在） */
     disposeScheduler(): void;
+    /**
+     * Mark a data source resource as "dirty" (changed).
+     * This is used by data blocks to decide whether to refresh when a view becomes active.
+     */
+    markDataSourceDirty(dataSourceKey: string, resourceName: string): number;
+    /**
+     * Get current dirty version for a data source resource.
+     * Returns 0 when no writes have been recorded.
+     */
+    getDataSourceDirtyVersion(dataSourceKey: string, resourceName: string): number;
     /** 在目标模型生命周期达成时执行操作（仅在 View 引擎本地存储计划） */
     scheduleModelOperation(fromModelOrUid: FlowModel | string, toUid: string, fn: (model: FlowModel) => Promise<void> | void, options?: ScheduleOptions): ScheduledCancel;
     /** 上一个引擎（根引擎为 undefined） */

package/lib/flowEngine.js

@@ -120,6 +120,17 @@ const _FlowEngine = class _FlowEngine {
     __publicField(this, "_previousEngine");
     __publicField(this, "_nextEngine");
     __publicField(this, "_resources", /* @__PURE__ */ new Map());
+    /**
+     * Data change registry used to coordinate "refresh on active" across view-scoped engines.
+     *
+     * Keyed by: dataSourceKey -> resourceName -> version.
+     * - mark: increments version
+     * - get: returns current version (default 0)
+     *
+     * NOTE: ViewScopedFlowEngine proxies delegate non-local fields/methods to parents, so this
+     * registry naturally lives on the root engine instance and is shared across the whole view stack.
+     */
+    __publicField(this, "_dataSourceDirtyVersions", /* @__PURE__ */ new Map());
     /**
      * 引擎事件总线（目前用于模型生命周期等事件）。
      * ViewScopedFlowEngine 持有自己的实例，实现作用域隔离。
@@ -187,6 +198,33 @@ const _FlowEngine = class _FlowEngine {
       }
     }
   }
+  /**
+   * Mark a data source resource as "dirty" (changed).
+   * This is used by data blocks to decide whether to refresh when a view becomes active.
+   */
+  markDataSourceDirty(dataSourceKey, resourceName) {
+    const dsKey = String(dataSourceKey || "main");
+    const resName = String(resourceName || "");
+    if (!resName) return this.getDataSourceDirtyVersion(dsKey, resName);
+    const ds = this._dataSourceDirtyVersions.get(dsKey) || /* @__PURE__ */ new Map();
+    if (!this._dataSourceDirtyVersions.has(dsKey)) {
+      this._dataSourceDirtyVersions.set(dsKey, ds);
+    }
+    const next = (ds.get(resName) || 0) + 1;
+    ds.set(resName, next);
+    return next;
+  }
+  /**
+   * Get current dirty version for a data source resource.
+   * Returns 0 when no writes have been recorded.
+   */
+  getDataSourceDirtyVersion(dataSourceKey, resourceName) {
+    var _a;
+    const dsKey = String(dataSourceKey || "main");
+    const resName = String(resourceName || "");
+    if (!resName) return 0;
+    return ((_a = this._dataSourceDirtyVersions.get(dsKey)) == null ? void 0 : _a.get(resName)) || 0;
+  }
   /** 在目标模型生命周期达成时执行操作（仅在 View 引擎本地存储计划） */
   scheduleModelOperation(fromModelOrUid, toUid, fn, options) {
     return this.getScheduler().schedule(fromModelOrUid, toUid, fn, options);

package/lib/flowSettings.js

@@ -63,6 +63,7 @@ var import__ = require(".");
 var import_useFlowSettingsContext = require("./hooks/useFlowSettingsContext");
 var import_utils = require("./utils");
 var import_useFlowStep = require("./hooks/useFlowStep");
+var import_views = require("./views");
 var _forceEnabled, _emitter;
 const Panel = import_antd.Collapse.Panel;
 const _FlowSettings = class _FlowSettings {
@@ -536,12 +537,9 @@ const _FlowSettings = class _FlowSettings {
     };
     let modeProps = typeof resolvedUiMode === "object" && resolvedUiMode ? resolvedUiMode.props || {} : {};
     if (modeType === "embed") {
-      const target = document.querySelector("#nocobase-embed-container");
+      const target = document.querySelector(`#${import_views.GLOBAL_EMBED_CONTAINER_ID}`);
       const onOpen = modeProps.onOpen;
       const onClose = modeProps.onClose;
-      if (target) {
-        target.innerHTML = "";
-      }
       modeProps = {
         target,
         styles: {
@@ -551,15 +549,19 @@ const _FlowSettings = class _FlowSettings {
         },
         ...modeProps,
         onOpen() {
-          target.style.width = modeProps.width || "33.3%";
-          target.style.maxWidth = modeProps.maxWidth || "800px";
-          target.style.minWidth = modeProps.minWidth || "0px";
+          if (target) {
+            target.style.width = modeProps.width || "33.3%";
+            target.style.maxWidth = modeProps.maxWidth || "800px";
+            target.style.minWidth = modeProps.minWidth || "0px";
+          }
           onOpen == null ? void 0 : onOpen();
         },
         onClose() {
-          target.style.width = "auto";
-          target.style.maxWidth = "none";
-          target.style.minWidth = "auto";
+          if (target && target.dataset[import_views.EMBED_REPLACING_DATA_KEY] !== "1") {
+            target.style.width = "auto";
+            target.style.maxWidth = "none";
+            target.style.minWidth = "auto";
+          }
           onClose == null ? void 0 : onClose();
         }
       };

package/lib/index.d.ts

@@ -9,6 +9,8 @@
 export * from './types';
 export * from './utils';
 export { compileRunJs } from './utils/jsxTransform';
+export { registerRunJSLib } from './runjsLibs';
+export type { RunJSLibCache, RunJSLibLoader } from './runjsLibs';
 export * from './resources';
 export * from './flowEngine';
 export * from './hooks';
@@ -27,6 +29,7 @@ export { RunJSContextRegistry, getModelClassName } from './runjs-context/registr
 export { setupRunJSContexts } from './runjs-context/setup';
 export { getSnippetBody, listSnippetsForContext } from './runjs-context/snippets';
 export * from './views';
+export { DATA_SOURCE_DIRTY_EVENT, ENGINE_SCOPE_KEY, getEmitterViewActivatedVersion, VIEW_ACTIVATED_EVENT, VIEW_ACTIVATED_VERSION, VIEW_ENGINE_SCOPE, } from './views/viewEvents';
 export * from './FlowDefinition';
 export { createViewScopedEngine } from './ViewScopedFlowEngine';
 export { createBlockScopedEngine } from './BlockScopedFlowEngine';

package/lib/index.js

@@ -27,23 +27,31 @@ var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "defau
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var src_exports = {};
 __export(src_exports, {
+  DATA_SOURCE_DIRTY_EVENT: () => import_viewEvents.DATA_SOURCE_DIRTY_EVENT,
+  ENGINE_SCOPE_KEY: () => import_viewEvents.ENGINE_SCOPE_KEY,
   RunJSContextRegistry: () => import_registry.RunJSContextRegistry,
+  VIEW_ACTIVATED_EVENT: () => import_viewEvents.VIEW_ACTIVATED_EVENT,
+  VIEW_ACTIVATED_VERSION: () => import_viewEvents.VIEW_ACTIVATED_VERSION,
+  VIEW_ENGINE_SCOPE: () => import_viewEvents.VIEW_ENGINE_SCOPE,
   compileRunJs: () => import_jsxTransform.compileRunJs,
   createBlockScopedEngine: () => import_BlockScopedFlowEngine.createBlockScopedEngine,
   createJSRunnerWithVersion: () => import_helpers.createJSRunnerWithVersion,
   createViewScopedEngine: () => import_ViewScopedFlowEngine.createViewScopedEngine,
+  getEmitterViewActivatedVersion: () => import_viewEvents.getEmitterViewActivatedVersion,
   getModelClassName: () => import_registry.getModelClassName,
   getRunJSDocFor: () => import_helpers.getRunJSDocFor,
   getRunJSScenesForContext: () => import_helpers.getRunJSScenesForContext,
   getRunJSScenesForModel: () => import_helpers.getRunJSScenesForModel,
   getSnippetBody: () => import_snippets.getSnippetBody,
   listSnippetsForContext: () => import_snippets.listSnippetsForContext,
+  registerRunJSLib: () => import_runjsLibs.registerRunJSLib,
   setupRunJSContexts: () => import_setup.setupRunJSContexts
 });
 module.exports = __toCommonJS(src_exports);
 __reExport(src_exports, require("./types"), module.exports);
 __reExport(src_exports, require("./utils"), module.exports);
 var import_jsxTransform = require("./utils/jsxTransform");
+var import_runjsLibs = require("./runjsLibs");
 __reExport(src_exports, require("./resources"), module.exports);
 __reExport(src_exports, require("./flowEngine"), module.exports);
 __reExport(src_exports, require("./hooks"), module.exports);
@@ -62,22 +70,30 @@ var import_registry = require("./runjs-context/registry");
 var import_setup = require("./runjs-context/setup");
 var import_snippets = require("./runjs-context/snippets");
 __reExport(src_exports, require("./views"), module.exports);
+var import_viewEvents = require("./views/viewEvents");
 __reExport(src_exports, require("./FlowDefinition"), module.exports);
 var import_ViewScopedFlowEngine = require("./ViewScopedFlowEngine");
 var import_BlockScopedFlowEngine = require("./BlockScopedFlowEngine");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  DATA_SOURCE_DIRTY_EVENT,
+  ENGINE_SCOPE_KEY,
   RunJSContextRegistry,
+  VIEW_ACTIVATED_EVENT,
+  VIEW_ACTIVATED_VERSION,
+  VIEW_ENGINE_SCOPE,
   compileRunJs,
   createBlockScopedEngine,
   createJSRunnerWithVersion,
   createViewScopedEngine,
+  getEmitterViewActivatedVersion,
   getModelClassName,
   getRunJSDocFor,
   getRunJSScenesForContext,
   getRunJSScenesForModel,
   getSnippetBody,
   listSnippetsForContext,
+  registerRunJSLib,
   setupRunJSContexts,
   ...require("./types"),
   ...require("./utils"),

package/lib/models/CollectionFieldModel.d.ts

@@ -45,6 +45,7 @@ export declare class CollectionFieldModel<T extends DefaultStructure = DefaultSt
     }): BindingOptions | null;
     static bindModelToInterface(modelName: string, interfaceName: string | string[], options?: {
         isDefault?: boolean;
+        order?: number;
         defaultProps?: object | ((ctx: FlowEngineContext, fieldInstance: CollectionField) => object);
         when?: (ctx: FlowEngineContext, fieldInstance: CollectionField) => boolean;
     }): void;

package/lib/models/CollectionFieldModel.js

@@ -182,7 +182,7 @@ const _CollectionFieldModel = class _CollectionFieldModel extends import_flowMod
     if (!this.bindings.has(interfaceName)) {
       return [];
     }
-    const bindings = this.bindings.get(interfaceName);
+    const bindings = this.bindings.get(interfaceName).sort((a, b) => a.order - b.order);
     return bindings.filter(
       (binding) => ctx.engine.getModelClass(binding.modelName) && binding.when(ctx, collectionField)
     );
@@ -245,7 +245,8 @@ const _CollectionFieldModel = class _CollectionFieldModel extends import_flowMod
       modelName,
       isDefault: options.isDefault || false,
       defaultProps: options.defaultProps || null,
-      when: options.when || defaultWhen
+      when: options.when || defaultWhen,
+      order: options.order
     });
     this.currentBindings.set(interfaceName, bindings);
   }