@nocobase/flow-engine 2.2.0-beta.3 → 2.2.0-beta.6

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/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) {
@@ -2680,7 +2710,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 +2831,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 +2855,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 +2863,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 +2875,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 +2883,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/flowSettings.d.ts

@@ -9,7 +9,7 @@
 import React from 'react';
 import { FlowEngine } from '.';
 import type { FlowModel } from './models';
-import { StepSettingsDialogProps, ToolbarItemConfig } from './types';
+import { DynamicFlowSource, DynamicFlowSourceProvider, StepSettingsDialogProps, ToolbarItemConfig } from './types';
 /**
  * 打开流程设置的参数接口
  */
@@ -93,6 +93,7 @@ export declare class FlowSettings {
     enabled: boolean;
     private engine;
     toolbarItems: ToolbarItemConfig[];
+    private dynamicFlowSourceProviders;
     constructor(engine: FlowEngine);
     on(event: 'beforeOpen', callback: (...args: any[]) => void): void;
     off(event: 'beforeOpen', callback: (...args: any[]) => void): void;
@@ -206,6 +207,9 @@ export declare class FlowSettings {
      * @returns {ToolbarItemConfig[]} 所有项目配置
      */
     getToolbarItems(): ToolbarItemConfig[];
+    registerDynamicFlowSourceProvider(provider: DynamicFlowSourceProvider): () => void;
+    hasDynamicFlowSourceProvider(model: FlowModel): boolean;
+    getDynamicFlowSources(model: FlowModel): Promise<DynamicFlowSource[]>;
     /**
      * 清空所有工具栏项目
      * @example

package/lib/flowSettings.js

@@ -78,6 +78,7 @@ const _FlowSettings = class _FlowSettings {
     __privateAdd(this, _forceEnabled, false);
     // 强制启用状态，主要用于设计模式下的强制启用
     __publicField(this, "toolbarItems", []);
+    __publicField(this, "dynamicFlowSourceProviders", []);
     __privateAdd(this, _emitter, new import_emitter.Emitter());
     this.engine = engine;
     this.enabled = false;
@@ -369,6 +370,75 @@ const _FlowSettings = class _FlowSettings {
   getToolbarItems() {
     return [...this.toolbarItems];
   }
+  registerDynamicFlowSourceProvider(provider) {
+    const existingIndex = this.dynamicFlowSourceProviders.findIndex((item) => item.key === provider.key);
+    if (existingIndex !== -1) {
+      console.warn(
+        `FlowSettings: Dynamic flow source provider with key '${provider.key}' already exists and will be replaced.`
+      );
+      this.dynamicFlowSourceProviders[existingIndex] = provider;
+    } else {
+      this.dynamicFlowSourceProviders.push(provider);
+    }
+    this.dynamicFlowSourceProviders.sort((a, b) => (a.sort || 0) - (b.sort || 0));
+    return () => {
+      const index = this.dynamicFlowSourceProviders.indexOf(provider);
+      if (index !== -1) {
+        this.dynamicFlowSourceProviders.splice(index, 1);
+      }
+    };
+  }
+  hasDynamicFlowSourceProvider(model) {
+    return this.dynamicFlowSourceProviders.some((provider) => {
+      try {
+        return provider.visible ? provider.visible(model) : true;
+      } catch (error) {
+        console.warn(`FlowSettings: Dynamic flow source provider '${provider.key}' visibility check failed.`, error);
+        return false;
+      }
+    });
+  }
+  async getDynamicFlowSources(model) {
+    const t = (0, import_utils.getT)(model);
+    const selfSource = {
+      key: "self",
+      label: t("Current block"),
+      model,
+      sort: -1e3
+    };
+    const sources = [];
+    const seenKeys = /* @__PURE__ */ new Set(["self"]);
+    const seenModelUids = /* @__PURE__ */ new Set([model.uid]);
+    for (const provider of this.dynamicFlowSourceProviders) {
+      try {
+        if (provider.visible && !provider.visible(model)) {
+          continue;
+        }
+        const providerSources = await provider.getSources(model);
+        for (const source of providerSources || []) {
+          if (!(source == null ? void 0 : source.key) || !source.model) {
+            continue;
+          }
+          const key = String(source.key);
+          const uid = source.model.uid;
+          if (seenKeys.has(key) || seenModelUids.has(uid)) {
+            continue;
+          }
+          seenKeys.add(key);
+          seenModelUids.add(uid);
+          sources.push({
+            ...source,
+            key,
+            label: source.label || key,
+            sort: source.sort || 0
+          });
+        }
+      } catch (error) {
+        console.warn(`FlowSettings: Dynamic flow source provider '${provider.key}' failed.`, error);
+      }
+    }
+    return [selfSource, ...sources.sort((a, b) => (a.sort || 0) - (b.sort || 0))];
+  }
   /**
    * 清空所有工具栏项目
    * @example

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/types.d.ts

@@ -500,6 +500,18 @@ export interface ToolbarItemConfig {
     /** 排序权重，数字越小越靠右（先添加的在右边） */
     sort?: number;
 }
+export interface DynamicFlowSource {
+    key: string;
+    label: React.ReactNode;
+    model: FlowModel;
+    sort?: number;
+}
+export interface DynamicFlowSourceProvider {
+    key: string;
+    sort?: number;
+    visible?: (model: FlowModel) => boolean;
+    getSources: (model: FlowModel) => DynamicFlowSource[] | Promise<DynamicFlowSource[]>;
+}
 export interface ApplyFlowCacheEntry {
     status: 'pending' | 'resolved' | 'rejected';
     promise: Promise<any>;

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}"`);
       }

package/lib/utils/runjsModuleLoader.js

@@ -34,27 +34,6 @@ __export(runjsModuleLoader_exports, {
 module.exports = __toCommonJS(runjsModuleLoader_exports);
 var import_runjsLibs = require("../runjsLibs");
 var import_resolveModuleUrl = require("./resolveModuleUrl");
-var import_safeGlobals = require("./safeGlobals");
-function snapshotOwnKeys(obj) {
-  try {
-    if (!obj || typeof obj !== "object" && typeof obj !== "function") return [];
-    return Object.getOwnPropertyNames(obj);
-  } catch (_) {
-    return [];
-  }
-}
-__name(snapshotOwnKeys, "snapshotOwnKeys");
-function diffAddedKeys(afterKeys, beforeKeys) {
-  if (!afterKeys.length) return [];
-  if (!beforeKeys.length) return [...afterKeys];
-  const beforeSet = new Set(beforeKeys);
-  const added = [];
-  for (const k of afterKeys) {
-    if (!beforeSet.has(k)) added.push(k);
-  }
-  return added;
-}
-__name(diffAddedKeys, "diffAddedKeys");
 async function withRunjsModuleLoadLock(task) {
   const g = globalThis;
   g.__nocobaseRunjsModuleLoadLock = (g.__nocobaseRunjsModuleLoadLock || Promise.resolve()).catch(() => {
@@ -222,8 +201,6 @@ async function prefetchEsmModule(url, options) {
 __name(prefetchEsmModule, "prefetchEsmModule");
 async function runjsRequireAsync(requirejs, url) {
   return await withRunjsModuleLoadLock(async () => {
-    const beforeWinKeys = typeof window !== "undefined" ? snapshotOwnKeys(window) : [];
-    const beforeDocKeys = typeof document !== "undefined" ? snapshotOwnKeys(document) : [];
     let result;
     let error;
     try {
@@ -242,13 +219,6 @@ async function runjsRequireAsync(requirejs, url) {
       });
     } catch (e) {
       error = e;
-    } finally {
-      const afterWinKeys = typeof window !== "undefined" ? snapshotOwnKeys(window) : [];
-      const afterDocKeys = typeof document !== "undefined" ? snapshotOwnKeys(document) : [];
-      const addedWinKeys = diffAddedKeys(afterWinKeys, beforeWinKeys);
-      const addedDocKeys = diffAddedKeys(afterDocKeys, beforeDocKeys);
-      (0, import_safeGlobals.registerRunJSSafeWindowGlobals)(addedWinKeys);
-      (0, import_safeGlobals.registerRunJSSafeDocumentGlobals)(addedDocKeys);
     }
     if (error) throw error;
     return result;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/flow-engine",
-  "version": "2.2.0-beta.3",
+  "version": "2.2.0-beta.6",
   "private": false,
   "description": "A standalone flow engine for NocoBase, managing workflows, models, and actions.",
   "main": "lib/index.js",
@@ -8,8 +8,8 @@
   "dependencies": {
     "@formily/antd-v5": "1.x",
     "@formily/reactive": "2.x",
-    "@nocobase/sdk": "2.2.0-beta.3",
-    "@nocobase/shared": "2.2.0-beta.3",
+    "@nocobase/sdk": "2.2.0-beta.6",
+    "@nocobase/shared": "2.2.0-beta.6",
     "ahooks": "^3.7.2",
     "axios": "^1.7.0",
     "dayjs": "^1.11.9",
@@ -37,5 +37,5 @@
   ],
   "author": "NocoBase Team",
   "license": "Apache-2.0",
-  "gitHead": "7b16bb2cfd427c110c6671252138cd85155723c5"
+  "gitHead": "dc9246516f8a3efd6056f22fe7b3bc947bd4575b"
 }