@nocobase/flow-engine 2.2.0-beta.5 → 2.2.0-beta.7

package/lib/JSRunner.d.ts

@@ -27,6 +27,7 @@ export interface JSRunnerOptions {
  * 3. Fallback keeps v1-compatible behavior (enabled).
  */
 export declare function shouldPreprocessRunJSTemplates(options?: Pick<JSRunnerOptions, 'preprocessTemplates' | 'version'>): boolean;
+export declare const RUNJS_ALLOWED_BARE_GLOBAL_NAMES: readonly ["ctx", "console", "window", "document", "navigator", "setTimeout", "clearTimeout", "setInterval", "clearInterval", "Array", "ArrayBuffer", "BigInt", "BigInt64Array", "BigUint64Array", "Boolean", "DataView", "Date", "Error", "EvalError", "FinalizationRegistry", "Float32Array", "Float64Array", "Int8Array", "Int16Array", "Int32Array", "Map", "Math", "Number", "Object", "Promise", "Proxy", "RangeError", "ReferenceError", "Reflect", "RegExp", "Set", "String", "Symbol", "SyntaxError", "TypeError", "URIError", "Uint8Array", "Uint8ClampedArray", "Uint16Array", "Uint32Array", "WeakMap", "WeakRef", "WeakSet", "JSON", "decodeURI", "decodeURIComponent", "encodeURI", "encodeURIComponent", "isFinite", "isNaN", "parseFloat", "parseInt", "undefined", "NaN", "Infinity", "fetch", "localStorage", "sessionStorage", "XMLHttpRequest", "WebSocket", "Worker", "SharedWorker", "ServiceWorker", "BroadcastChannel", "EventSource", "indexedDB", "caches", "Function", "eval", "globalThis", "Intl", "Blob", "URL", "location"];
 export declare class JSRunner {
     private globals;
     private timeoutMs;

package/lib/JSRunner.js

@@ -28,6 +28,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var JSRunner_exports = {};
 __export(JSRunner_exports, {
   JSRunner: () => JSRunner,
+  RUNJS_ALLOWED_BARE_GLOBAL_NAMES: () => RUNJS_ALLOWED_BARE_GLOBAL_NAMES,
   shouldPreprocessRunJSTemplates: () => shouldPreprocessRunJSTemplates
 });
 module.exports = __toCommonJS(JSRunner_exports);
@@ -40,6 +41,113 @@ function shouldPreprocessRunJSTemplates(options) {
   return (options == null ? void 0 : options.version) !== "v2";
 }
 __name(shouldPreprocessRunJSTemplates, "shouldPreprocessRunJSTemplates");
+const RUNJS_BROWSER_GLOBAL_NAMES = [
+  "fetch",
+  "localStorage",
+  "sessionStorage",
+  "XMLHttpRequest",
+  "WebSocket",
+  "Worker",
+  "SharedWorker",
+  "ServiceWorker",
+  "BroadcastChannel",
+  "EventSource",
+  "indexedDB",
+  "caches",
+  "Function",
+  "eval",
+  "globalThis",
+  "Intl",
+  "Blob",
+  "URL",
+  "location"
+];
+const RUNJS_ALLOWED_BARE_GLOBAL_NAMES = [
+  "ctx",
+  "console",
+  "window",
+  "document",
+  "navigator",
+  "setTimeout",
+  "clearTimeout",
+  "setInterval",
+  "clearInterval",
+  "Array",
+  "ArrayBuffer",
+  "BigInt",
+  "BigInt64Array",
+  "BigUint64Array",
+  "Boolean",
+  "DataView",
+  "Date",
+  "Error",
+  "EvalError",
+  "FinalizationRegistry",
+  "Float32Array",
+  "Float64Array",
+  "Int8Array",
+  "Int16Array",
+  "Int32Array",
+  "Map",
+  "Math",
+  "Number",
+  "Object",
+  "Promise",
+  "Proxy",
+  "RangeError",
+  "ReferenceError",
+  "Reflect",
+  "RegExp",
+  "Set",
+  "String",
+  "Symbol",
+  "SyntaxError",
+  "TypeError",
+  "URIError",
+  "Uint8Array",
+  "Uint8ClampedArray",
+  "Uint16Array",
+  "Uint32Array",
+  "WeakMap",
+  "WeakRef",
+  "WeakSet",
+  "JSON",
+  "decodeURI",
+  "decodeURIComponent",
+  "encodeURI",
+  "encodeURIComponent",
+  "isFinite",
+  "isNaN",
+  "parseFloat",
+  "parseInt",
+  "undefined",
+  "NaN",
+  "Infinity",
+  ...RUNJS_BROWSER_GLOBAL_NAMES
+];
+function collectRunJSBrowserGlobals(providedGlobals = {}) {
+  const windowGlobal = providedGlobals.window;
+  if (!windowGlobal || typeof windowGlobal !== "object") {
+    return {};
+  }
+  const windowRecord = windowGlobal;
+  const globals = {};
+  RUNJS_BROWSER_GLOBAL_NAMES.forEach((name) => {
+    if (Object.prototype.hasOwnProperty.call(providedGlobals, name)) {
+      return;
+    }
+    try {
+      const value = windowRecord[name];
+      if (typeof value === "undefined") {
+        return;
+      }
+      globals[name] = name === "fetch" && typeof value === "function" ? value.bind(windowGlobal) : value;
+    } catch {
+    }
+  });
+  return globals;
+}
+__name(collectRunJSBrowserGlobals, "collectRunJSBrowserGlobals");
 const BARE_CTX_TEMPLATE_RE = /(^|[=(:,[\s)])(\{\{\s*(ctx(?:\.|\[|\?\.)[^}]*)\s*\}\})/m;
 function extractDeprecatedCtxTemplateUsage(code) {
   const src = String(code || "");
@@ -78,7 +186,6 @@ 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);
@@ -87,25 +194,7 @@ const _JSRunner = class _JSRunner {
       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 {
-      }
-    }
+    const liftedGlobals = collectRunJSBrowserGlobals(providedGlobals);
     this.globals = {
       console,
       setTimeout: bindWindowFn("setTimeout"),
@@ -169,5 +258,6 @@ let JSRunner = _JSRunner;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   JSRunner,
+  RUNJS_ALLOWED_BARE_GLOBAL_NAMES,
   shouldPreprocessRunJSTemplates
 });

package/lib/components/dnd/index.js

@@ -57,6 +57,10 @@ const EMPTY_COLUMN_UID = "EMPTY_COLUMN";
 const TOOLBAR_DRAG_ACTIVITY_EVENT = "nb-toolbar-drag-activity";
 const TOOLBAR_DRAG_ANCHOR_EVENT = "nb-toolbar-drag-anchor";
 const MENU_SUBMENU_POPUP_SELECTOR = ".ant-menu-submenu-popup";
+const getToolbarModelUidFromNode = /* @__PURE__ */ __name((node) => {
+  var _a;
+  return ((_a = node == null ? void 0 : node.closest(".nb-toolbar-container[data-model-uid]")) == null ? void 0 : _a.getAttribute("data-model-uid")) || null;
+}, "getToolbarModelUidFromNode");
 const resolveOverlayAnchorTransform = /* @__PURE__ */ __name(({
   activeId,
   active,
@@ -76,7 +80,7 @@ const resolveOverlayAnchorTransform = /* @__PURE__ */ __name(({
 const resolveDraggableHostNode = /* @__PURE__ */ __name((activatorNode) => {
   const ownerDocument = activatorNode == null ? void 0 : activatorNode.ownerDocument;
   const floatToolbarContainer = activatorNode == null ? void 0 : activatorNode.closest(".nb-toolbar-container[data-model-uid]");
-  const toolbarModelUid = floatToolbarContainer == null ? void 0 : floatToolbarContainer.getAttribute("data-model-uid");
+  const toolbarModelUid = getToolbarModelUidFromNode(activatorNode);
   if (!ownerDocument || !toolbarModelUid) {
     return activatorNode;
   }
@@ -99,6 +103,7 @@ const DragHandler = /* @__PURE__ */ __name(({
   const dragHandlerRef = (0, import_react.useRef)(null);
   const draggableNodeRef = (0, import_react.useRef)(null);
   const pointerPressCleanupRef = (0, import_react.useRef)(null);
+  const toolbarDragModelUidRef = (0, import_react.useRef)(null);
   const isDraggingRef = (0, import_react.useRef)(isDragging);
   const isPointerPressActiveRef = (0, import_react.useRef)(false);
   const isToolbarDragActiveRef = (0, import_react.useRef)(false);
@@ -128,9 +133,11 @@ const DragHandler = /* @__PURE__ */ __name(({
       if (!ownerDocument) {
         return;
       }
+      const toolbarModelUid = getToolbarModelUidFromNode(dragHandlerRef.current) || toolbarDragModelUidRef.current || model.uid;
+      toolbarDragModelUidRef.current = active ? toolbarModelUid : null;
       ownerDocument.dispatchEvent(
         new CustomEvent(TOOLBAR_DRAG_ACTIVITY_EVENT, {
-          detail: { active, modelUid: model.uid }
+          detail: { active, modelUid: toolbarModelUid }
         })
       );
     },

package/lib/components/settings/wrappers/contextual/FlowsFloatContextMenu.js

@@ -44,6 +44,7 @@ var import_react = __toESM(require("react"));
 var import_react_dom = require("react-dom");
 var import_antd = require("antd");
 var import_css = require("@emotion/css");
+var import_ahooks = require("ahooks");
 var import_hooks = require("../../../../hooks");
 var import_provider = require("../../../../provider");
 var import_utils = require("../../../../utils");
@@ -312,6 +313,38 @@ const buildToolbarContainerStyle = /* @__PURE__ */ __name((portalRect, toolbarSt
 const isModelByIdProps = /* @__PURE__ */ __name((props) => {
   return "uid" in props && "modelClassName" in props && Boolean(props.uid) && Boolean(props.modelClassName);
 }, "isModelByIdProps");
+const stopResizeInteractionEvent = /* @__PURE__ */ __name((event) => {
+  var _a;
+  if (!event) {
+    return;
+  }
+  event.preventDefault();
+  event.stopPropagation();
+  const nativeEvent = "nativeEvent" in event ? event.nativeEvent : event;
+  (_a = nativeEvent.stopImmediatePropagation) == null ? void 0 : _a.call(nativeEvent);
+}, "stopResizeInteractionEvent");
+const pendingResizeClickSuppressions = /* @__PURE__ */ new WeakMap();
+const clearPendingResizeClickSuppression = /* @__PURE__ */ __name((ownerDocument) => {
+  const pending = pendingResizeClickSuppressions.get(ownerDocument);
+  if (!pending) {
+    return;
+  }
+  ownerDocument.removeEventListener("click", pending.listener, true);
+  (ownerDocument.defaultView || window).clearTimeout(pending.timer);
+  pendingResizeClickSuppressions.delete(ownerDocument);
+}, "clearPendingResizeClickSuppression");
+const suppressNextResizeClick = /* @__PURE__ */ __name((ownerDocument) => {
+  clearPendingResizeClickSuppression(ownerDocument);
+  const listener = /* @__PURE__ */ __name((event) => {
+    stopResizeInteractionEvent(event);
+    clearPendingResizeClickSuppression(ownerDocument);
+  }, "listener");
+  const timer = (ownerDocument.defaultView || window).setTimeout(() => {
+    clearPendingResizeClickSuppression(ownerDocument);
+  }, 0);
+  pendingResizeClickSuppressions.set(ownerDocument, { listener, timer });
+  ownerDocument.addEventListener("click", listener, true);
+}, "suppressNextResizeClick");
 const FlowsFloatContextMenu = (0, import_reactive.observer)((props) => {
   const ctx = (0, import__.useFlowContext)();
   if (!ctx.flowSettingsEnabled) {
@@ -326,44 +359,64 @@ const ResizeHandles = /* @__PURE__ */ __name((props) => {
   const isDraggingRef = (0, import_react.useRef)(false);
   const dragTypeRef = (0, import_react.useRef)(null);
   const dragStartPosRef = (0, import_react.useRef)({ x: 0, y: 0 });
+  const dragOwnerDocumentRef = (0, import_react.useRef)(null);
   const { onDragStart, onDragEnd } = props;
-  const handleDragMove = (0, import_react.useCallback)(
-    (e) => {
-      if (!isDraggingRef.current || !dragTypeRef.current) return;
-      const deltaX = e.clientX - dragStartPosRef.current.x;
-      switch (dragTypeRef.current) {
-        case "left":
-          props.model.parent.emitter.emit("onResizeLeft", { resizeDistance: -deltaX, model: props.model });
-          break;
-        case "right":
-          props.model.parent.emitter.emit("onResizeRight", { resizeDistance: deltaX, model: props.model });
-          break;
-      }
-    },
-    [props.model]
-  );
-  const handleDragEnd = (0, import_react.useCallback)(() => {
+  const handleDragMove = (0, import_ahooks.useMemoizedFn)((e) => {
+    if (!isDraggingRef.current || !dragTypeRef.current) return;
+    stopResizeInteractionEvent(e);
+    const deltaX = e.clientX - dragStartPosRef.current.x;
+    switch (dragTypeRef.current) {
+      case "left":
+        props.model.parent.emitter.emit("onResizeLeft", { resizeDistance: -deltaX, model: props.model });
+        break;
+      case "right":
+        props.model.parent.emitter.emit("onResizeRight", { resizeDistance: deltaX, model: props.model });
+        break;
+    }
+  });
+  const handleDragEnd = (0, import_ahooks.useMemoizedFn)((e) => {
+    if (!isDraggingRef.current) {
+      return;
+    }
+    stopResizeInteractionEvent(e);
+    const ownerDocument = dragOwnerDocumentRef.current || document;
+    ownerDocument.removeEventListener("mousemove", handleDragMove, true);
+    ownerDocument.removeEventListener("mouseup", handleDragEnd, true);
+    suppressNextResizeClick(ownerDocument);
     isDraggingRef.current = false;
     dragTypeRef.current = null;
     dragStartPosRef.current = { x: 0, y: 0 };
-    document.removeEventListener("mousemove", handleDragMove);
-    document.removeEventListener("mouseup", handleDragEnd);
+    dragOwnerDocumentRef.current = null;
     props.model.parent.emitter.emit("onResizeEnd");
     onDragEnd == null ? void 0 : onDragEnd();
-  }, [handleDragMove, onDragEnd, props.model]);
-  const handleDragStart = (0, import_react.useCallback)(
-    (e, type) => {
-      e.preventDefault();
-      e.stopPropagation();
-      isDraggingRef.current = true;
-      dragTypeRef.current = type;
-      dragStartPosRef.current = { x: e.clientX, y: e.clientY };
-      document.addEventListener("mousemove", handleDragMove);
-      document.addEventListener("mouseup", handleDragEnd);
-      onDragStart == null ? void 0 : onDragStart();
-    },
-    [handleDragMove, handleDragEnd, onDragStart]
-  );
+  });
+  (0, import_react.useEffect)(() => {
+    return () => {
+      const dragOwnerDocument = dragOwnerDocumentRef.current;
+      dragOwnerDocument == null ? void 0 : dragOwnerDocument.removeEventListener("mousemove", handleDragMove, true);
+      dragOwnerDocument == null ? void 0 : dragOwnerDocument.removeEventListener("mouseup", handleDragEnd, true);
+      if (isDraggingRef.current) {
+        suppressNextResizeClick(dragOwnerDocument || document);
+        props.model.parent.emitter.emit("onResizeEnd");
+        onDragEnd == null ? void 0 : onDragEnd();
+      }
+      isDraggingRef.current = false;
+      dragTypeRef.current = null;
+      dragStartPosRef.current = { x: 0, y: 0 };
+      dragOwnerDocumentRef.current = null;
+    };
+  }, [handleDragMove, handleDragEnd, onDragEnd, props.model]);
+  const handleDragStart = (0, import_ahooks.useMemoizedFn)((e, type) => {
+    stopResizeInteractionEvent(e);
+    const ownerDocument = e.currentTarget.ownerDocument;
+    isDraggingRef.current = true;
+    dragTypeRef.current = type;
+    dragStartPosRef.current = { x: e.clientX, y: e.clientY };
+    dragOwnerDocumentRef.current = ownerDocument;
+    ownerDocument.addEventListener("mousemove", handleDragMove, true);
+    ownerDocument.addEventListener("mouseup", handleDragEnd, true);
+    onDragStart == null ? void 0 : onDragStart();
+  });
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
@@ -466,6 +519,7 @@ const FlowsFloatContextMenuWithModel = (0, import_reactive.observer)(
         getPopupContainer,
         handleSettingsMenuOpenChange,
         model,
+        modelUid,
         settingsMenuLevel,
         showCopyUidButton,
         showDeleteButton,

package/lib/components/settings/wrappers/contextual/useFloatToolbarVisibility.js

@@ -44,6 +44,17 @@ const getToolbarModelUidFromTarget = /* @__PURE__ */ __name((target) => {
   }
   return ((_a = target.closest(".nb-toolbar-container[data-model-uid]")) == null ? void 0 : _a.getAttribute("data-model-uid")) || null;
 }, "getToolbarModelUidFromTarget");
+const escapeCssAttributeValue = /* @__PURE__ */ __name((value) => {
+  return value.replace(/\\/g, "\\\\").replace(/"/g, '\\"').replace(/\n/g, "\\a ").replace(/\r/g, "\\d ").replace(/\f/g, "\\c ");
+}, "escapeCssAttributeValue");
+const isToolbarModelUidRendered = /* @__PURE__ */ __name((ownerDocument, modelUid) => {
+  if (!ownerDocument) {
+    return false;
+  }
+  return !!ownerDocument.querySelector(
+    `.nb-toolbar-container[data-model-uid="${escapeCssAttributeValue(modelUid)}"]`
+  );
+}, "isToolbarModelUidRendered");
 const isNodeWithinDescendantFloatToolbar = /* @__PURE__ */ __name((target, container, currentModelUid) => {
   const targetModelUid = getToolbarModelUidFromTarget(target);
   if (!container || !targetModelUid || targetModelUid === currentModelUid) {
@@ -222,6 +233,15 @@ const useFloatToolbarVisibility = /* @__PURE__ */ __name(({
       const isCurrentHostTarget = !childWithMenu || childWithMenu === containerRef.current;
       if (isCurrentHostTarget) {
         clearHideToolbarTimer();
+        setActiveChildToolbarIds((prevIds) => {
+          var _a;
+          if (!prevIds.length) {
+            return prevIds;
+          }
+          const ownerDocument = ((_a = containerRef.current) == null ? void 0 : _a.ownerDocument) ?? null;
+          const nextIds = prevIds.filter((id) => isToolbarModelUidRendered(ownerDocument, id));
+          return nextIds.length === prevIds.length ? prevIds : nextIds;
+        });
         setHostHovered(true);
       }
       setHideMenu(!!childWithMenu && childWithMenu !== containerRef.current);

package/lib/flowContext.js

@@ -2294,6 +2294,36 @@ const _BaseFlowModelContext = class _BaseFlowModelContext extends BaseFlowEngine
 };
 __name(_BaseFlowModelContext, "BaseFlowModelContext");
 let BaseFlowModelContext = _BaseFlowModelContext;
+const OPEN_VIEW_INHERITED_INPUT_ARG_KEYS = [
+  "dataSourceKey",
+  "collectionName",
+  "associationName",
+  "filterByTk",
+  "sourceId",
+  "tabUid"
+];
+function pickDefinedKeys(source, keys) {
+  const res = {};
+  for (const key of keys) {
+    if (typeof (source == null ? void 0 : source[key]) !== "undefined") {
+      res[key] = source[key];
+    }
+  }
+  return res;
+}
+__name(pickDefinedKeys, "pickDefinedKeys");
+function pickDefinedOpenViewInputArgs(source) {
+  return pickDefinedKeys(source, OPEN_VIEW_INHERITED_INPUT_ARG_KEYS);
+}
+__name(pickDefinedOpenViewInputArgs, "pickDefinedOpenViewInputArgs");
+function applyDefinedDefaults(target, defaults) {
+  for (const [key, value] of Object.entries(defaults)) {
+    if (typeof target[key] === "undefined") {
+      target[key] = value;
+    }
+  }
+}
+__name(applyDefinedDefaults, "applyDefinedDefaults");
 const _FlowEngineContext = class _FlowEngineContext extends BaseFlowEngineContext {
   // public dataSourceManager: DataSourceManager;
   constructor(engine) {
@@ -2525,8 +2555,16 @@ const _FlowEngineContext = class _FlowEngineContext extends BaseFlowEngineContex
     });
     this.defineProperty("role", {
       get: /* @__PURE__ */ __name(() => {
-        var _a, _b;
-        return (_b = (_a = this.api) == null ? void 0 : _a.auth) == null ? void 0 : _b.role;
+        var _a, _b, _c;
+        const currentRole = (_b = (_a = this.api) == null ? void 0 : _a.auth) == null ? void 0 : _b.role;
+        if (currentRole !== "__union__") {
+          return currentRole;
+        }
+        const roles = (_c = this.user) == null ? void 0 : _c.roles;
+        if (!Array.isArray(roles)) {
+          return [];
+        }
+        return roles.map((role) => role == null ? void 0 : role.name).filter((name) => !!name);
       }, "get"),
       cache: false,
       // 注意：使用惰性 meta 工厂，避免在 i18n 尚未注入时提前求值导致无法翻译
@@ -2680,7 +2718,17 @@ const _FlowEngineContext = class _FlowEngineContext extends BaseFlowEngineContex
         doc = {};
       }
       const deprecatedCtx = createRunJSDeprecationProxy(runCtx, { doc });
-      const globals = { ctx: deprecatedCtx, ...(options == null ? void 0 : options.globals) || {} };
+      const browserGlobals = {};
+      if (typeof window !== "undefined") {
+        browserGlobals.window = window;
+        if (typeof navigator !== "undefined") {
+          browserGlobals.navigator = navigator;
+        }
+      }
+      if (typeof document !== "undefined") {
+        browserGlobals.document = document;
+      }
+      const globals = { ctx: deprecatedCtx, ...browserGlobals, ...(options == null ? void 0 : options.globals) || {} };
       const { timeoutMs } = options || {};
       return new import_JSRunner.JSRunner({ globals, timeoutMs });
     });
@@ -2791,23 +2839,19 @@ const _FlowModelContext = class _FlowModelContext extends BaseFlowModelContext {
       }
     });
     this.defineMethod("openView", async function(uid, options) {
-      var _a, _b, _c, _d, _e;
-      const opts = { ...options };
+      var _a, _b, _c, _d;
+      const inheritedInputArgs = {
+        ...typeof ((_a = this.model) == null ? void 0 : _a["getInputArgs"]) === "function" ? pickDefinedOpenViewInputArgs(this.model["getInputArgs"]()) : {},
+        ...pickDefinedOpenViewInputArgs(this.inputArgs)
+      };
+      const opts = { ...options || {} };
+      applyDefinedDefaults(opts, inheritedInputArgs);
       if (opts.defineProperties || opts.defineMethods) {
         opts.navigation = false;
       }
       let model2 = null;
       model2 = await this.engine.loadModel({ uid });
       if (!model2) {
-        const pickDefined = /* @__PURE__ */ __name((src, keys) => {
-          const res = {};
-          for (const k of keys) {
-            if (typeof (src == null ? void 0 : src[k]) !== "undefined") {
-              res[k] = src[k];
-            }
-          }
-          return res;
-        }, "pickDefined");
         model2 = this.engine.createModel({
           uid,
           // 注意： 新建的 model 应该使用 ${parentModel.uid}-xxx 形式的 uid
@@ -2819,7 +2863,7 @@ const _FlowModelContext = class _FlowModelContext extends BaseFlowModelContext {
             popupSettings: {
               openView: {
                 // 仅在创建时持久化一份默认配置；运行时以本次 opts 为准，避免多个 opener 互相覆盖。
-                ...pickDefined(opts, ["dataSourceKey", "collectionName", "associationName", "mode", "size"])
+                ...pickDefinedKeys(opts, ["dataSourceKey", "collectionName", "associationName", "mode", "size"])
               }
             }
           }
@@ -2827,12 +2871,10 @@ const _FlowModelContext = class _FlowModelContext extends BaseFlowModelContext {
         await model2.save();
       }
       model2.setParent(this.model);
-      const viewUid = (opts == null ? void 0 : opts.routeViewUid) ?? (opts == null ? void 0 : opts.viewUid) ?? (((_b = (_a = model2.stepParams) == null ? void 0 : _a.popupSettings) == null ? void 0 : _b.openView) ? model2.uid : this.model.uid);
+      const viewUid = (opts == null ? void 0 : opts.routeViewUid) ?? (opts == null ? void 0 : opts.viewUid) ?? (((_c = (_b = model2.stepParams) == null ? void 0 : _b.popupSettings) == null ? void 0 : _c.openView) ? model2.uid : this.model.uid);
       const parentView = this.view;
       const pendingType = (opts == null ? void 0 : opts.isMobileLayout) ? "embed" : (opts == null ? void 0 : opts.mode) || "drawer";
       const pendingInputArgs = { ...opts, viewUid, navigation: opts.navigation };
-      pendingInputArgs.filterByTk = pendingInputArgs.filterByTk || ((_c = this.inputArgs) == null ? void 0 : _c.filterByTk);
-      pendingInputArgs.sourceId = pendingInputArgs.sourceId || ((_d = this.inputArgs) == null ? void 0 : _d.sourceId);
       const pendingView = {
         type: pendingType,
         inputArgs: pendingInputArgs,
@@ -2841,7 +2883,7 @@ const _FlowModelContext = class _FlowModelContext extends BaseFlowModelContext {
         engineCtx: this.engine.context
       };
       model2.context.defineProperty("view", { value: pendingView });
-      const popupFlow = (_e = model2.getFlow) == null ? void 0 : _e.call(model2, "popupSettings");
+      const popupFlow = (_d = model2.getFlow) == null ? void 0 : _d.call(model2, "popupSettings");
       const on = popupFlow == null ? void 0 : popupFlow.on;
       let openEventName = "click";
       if (typeof on === "string" && on) {
@@ -2849,17 +2891,10 @@ const _FlowModelContext = class _FlowModelContext extends BaseFlowModelContext {
       } else if (on && typeof on === "object" && typeof on.eventName === "string" && on.eventName) {
         openEventName = on.eventName;
       }
-      await model2.dispatchEvent(
-        openEventName,
-        {
-          // navigation: false, // TODO: 路由模式有bug，不支持多层同样viewId的弹窗，因此这里默认先用false
-          // ...this.model?.['getInputArgs']?.(), // 避免部分关系字段信息丢失, 仿照 ClickableCollectionField 做法
-          ...opts
-        },
-        {
-          debounce: true
-        }
-      );
+      await model2.dispatchEvent(openEventName, {
+        // navigation: false, // TODO: 路由模式有bug，不支持多层同样viewId的弹窗，因此这里默认先用false
+        ...opts
+      });
     });
     this.defineMethod("getEvents", function() {
       return this.model.getEvents();

package/lib/runjs-context/helpers.js

@@ -71,18 +71,25 @@ function createJSRunnerWithVersion(options) {
     doc = {};
   }
   const deprecatedCtx = (0, import_flowContext.createRunJSDeprecationProxy)(runCtx, { doc });
-  const globals = { ctx: deprecatedCtx, ...(options == null ? void 0 : options.globals) || {} };
-  if (modelClass === "JSFieldModel" || modelClass === "JSBlockModel") {
-    if (typeof window !== "undefined") globals.window = window;
-    if (typeof document !== "undefined") globals.document = document;
+  const browserGlobals = {};
+  if (typeof window !== "undefined") {
+    browserGlobals.window = window;
+    if (typeof navigator !== "undefined") {
+      browserGlobals.navigator = navigator;
+    }
   }
+  if (typeof document !== "undefined") {
+    browserGlobals.document = document;
+  }
+  const globals = { ctx: deprecatedCtx, ...browserGlobals, ...(options == null ? void 0 : options.globals) || {} };
   const { timeoutMs } = options || {};
   return new import_JSRunner.JSRunner({ globals, timeoutMs });
 }
 __name(createJSRunnerWithVersion, "createJSRunnerWithVersion");
 function getRunJSScenesForModel(modelClass, version = "v1") {
   const meta = import_registry.RunJSContextRegistry.getMeta(version, modelClass);
-  return Array.isArray(meta == null ? void 0 : meta.scenes) ? [...meta.scenes] : [];
+  const scenes = meta == null ? void 0 : meta.scenes;
+  return Array.isArray(scenes) ? [...scenes] : [];
 }
 __name(getRunJSScenesForModel, "getRunJSScenesForModel");
 function getRunJSScenesForContext(ctx, { version = "v1" } = {}) {

package/lib/utils/index.d.ts

@@ -21,7 +21,6 @@ export { extractPropertyPath, formatPathToVariable, isVariableExpression } from
 export { clearAutoFlowError, getAutoFlowError, setAutoFlowError, type AutoFlowError } from './autoFlowError';
 export { parsePathnameToViewParams, type ViewParam } from './parsePathnameToViewParams';
 export { decodeBase64Url, encodeBase64Url, isCompleteCtxDatePath, isCtxDatePathPrefix, isCtxDateExpression, parseCtxDateExpression, resolveCtxDatePath, serializeCtxDateValue, } from './dateVariable';
-export { createSafeDocument, createSafeWindow, createSafeNavigator, createSafeRunJSGlobals, runjsWithSafeGlobals, } from './safeGlobals';
 export { isRunJSValue, normalizeRunJSValue, extractUsedVariablePathsFromRunJS, type RunJSValue } from './runjsValue';
 export { resolveRunJSObjectValues } from './resolveRunJSObjectValues';
 export { prepareRunJsCode, preprocessRunJsTemplates } from './runjsTemplateCompat';

package/lib/utils/index.js

@@ -44,10 +44,6 @@ __export(utils_exports, {
   createEphemeralContext: () => import_createEphemeralContext.createEphemeralContext,
   createRecordMetaFactory: () => import_variablesParams.createRecordMetaFactory,
   createRecordResolveOnServerWithLocal: () => import_variablesParams.createRecordResolveOnServerWithLocal,
-  createSafeDocument: () => import_safeGlobals.createSafeDocument,
-  createSafeNavigator: () => import_safeGlobals.createSafeNavigator,
-  createSafeRunJSGlobals: () => import_safeGlobals.createSafeRunJSGlobals,
-  createSafeWindow: () => import_safeGlobals.createSafeWindow,
   decodeBase64Url: () => import_dateVariable.decodeBase64Url,
   defineAction: () => import_flow_definitions.defineAction,
   encodeBase64Url: () => import_dateVariable.encodeBase64Url,
@@ -84,7 +80,6 @@ __export(utils_exports, {
   resolveStepDisabledInSettings: () => import_schema_utils.resolveStepDisabledInSettings,
   resolveStepUiSchema: () => import_schema_utils.resolveStepUiSchema,
   resolveUiMode: () => import_schema_utils.resolveUiMode,
-  runjsWithSafeGlobals: () => import_safeGlobals.runjsWithSafeGlobals,
   serializeCtxDateValue: () => import_dateVariable.serializeCtxDateValue,
   setAutoFlowError: () => import_autoFlowError.setAutoFlowError,
   setupRuntimeContextSteps: () => import_setupRuntimeContextSteps.setupRuntimeContextSteps,
@@ -108,7 +103,6 @@ var import_context = require("./context");
 var import_autoFlowError = require("./autoFlowError");
 var import_parsePathnameToViewParams = require("./parsePathnameToViewParams");
 var import_dateVariable = require("./dateVariable");
-var import_safeGlobals = require("./safeGlobals");
 var import_runjsValue = require("./runjsValue");
 var import_resolveRunJSObjectValues = require("./resolveRunJSObjectValues");
 var import_runjsTemplateCompat = require("./runjsTemplateCompat");
@@ -137,10 +131,6 @@ var import_randomId = require("./randomId");
   createEphemeralContext,
   createRecordMetaFactory,
   createRecordResolveOnServerWithLocal,
-  createSafeDocument,
-  createSafeNavigator,
-  createSafeRunJSGlobals,
-  createSafeWindow,
   decodeBase64Url,
   defineAction,
   encodeBase64Url,
@@ -177,7 +167,6 @@ var import_randomId = require("./randomId");
   resolveStepDisabledInSettings,
   resolveStepUiSchema,
   resolveUiMode,
-  runjsWithSafeGlobals,
   serializeCtxDateValue,
   setAutoFlowError,
   setupRuntimeContextSteps,

package/lib/utils/resolveRunJSObjectValues.js

@@ -31,8 +31,8 @@ __export(resolveRunJSObjectValues_exports, {
 });
 module.exports = __toCommonJS(resolveRunJSObjectValues_exports);
 var import_runjsValue = require("./runjsValue");
-var import_safeGlobals = require("./safeGlobals");
 async function resolveRunJSObjectValues(ctx, raw) {
+  var _a;
   const out = {};
   if (!raw || typeof raw !== "object") return out;
   if (Array.isArray(raw)) return out;
@@ -41,7 +41,8 @@ async function resolveRunJSObjectValues(ctx, raw) {
     if ((0, import_runjsValue.isRunJSValue)(value)) {
       const { code, version } = (0, import_runjsValue.normalizeRunJSValue)(value);
       if (!code.trim()) continue;
-      const ret = await (0, import_safeGlobals.runjsWithSafeGlobals)(ctx, code, { version });
+      const runjsCtx = ctx;
+      const ret = await ((_a = runjsCtx == null ? void 0 : runjsCtx.runjs) == null ? void 0 : _a.call(runjsCtx, code, void 0, { version }));
       if (!(ret == null ? void 0 : ret.success)) {
         throw new Error(`RunJS execution failed for "${key}"`);
       }