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

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;
   }

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

@@ -521,7 +521,7 @@ const DefaultSettingsIcon = /* @__PURE__ */ __name(({
             };
             items.push({
               key: uniqueKey,
-              label: /* @__PURE__ */ import_react.default.createElement(MenuLabelItem, { title: t(stepInfo.title), uiMode, itemProps })
+              label: /* @__PURE__ */ import_react.default.createElement(MenuLabelItem, { title: stepInfo.title, uiMode, itemProps })
             });
           });
           if (flow.options.divider === "bottom") {
@@ -555,7 +555,7 @@ const DefaultSettingsIcon = /* @__PURE__ */ __name(({
                 const uniqueKey = generateUniqueKey(`${flow.key}:${stepInfo.stepKey}`);
                 items.push({
                   key: uniqueKey,
-                  label: t(stepInfo.title)
+                  label: stepInfo.title
                 });
               });
             });
@@ -567,7 +567,7 @@ const DefaultSettingsIcon = /* @__PURE__ */ __name(({
                 const uniqueKey = generateUniqueKey(`${modelKey}:${flow.key}:${stepInfo.stepKey}`);
                 subMenuChildren.push({
                   key: uniqueKey,
-                  label: t(stepInfo.title)
+                  label: stepInfo.title
                 });
               });
             });

package/lib/data-source/index.d.ts

@@ -66,6 +66,11 @@ export interface CollectionOptions {
 export declare class CollectionManager {
     dataSource: DataSource;
     collections: Map<string, Collection>;
+    allCollectionsInheritChain: string[];
+    protected childrenCollectionsName: {
+        supportView?: string[];
+        notSupportView?: string[];
+    };
     constructor(dataSource: DataSource);
     get flowEngine(): FlowEngine;
     addCollection(collection: Collection | CollectionOptions): void;
@@ -83,6 +88,8 @@ export declare class CollectionManager {
     clearCollections(): void;
     getAssociation(associationName: string): CollectionField | undefined;
     getChildrenCollections(name: any): any[];
+    getChildrenCollectionsName(name: any, isSupportView?: boolean): string[];
+    getAllCollectionsInheritChain(name: any): string[];
 }
 export declare class Collection {
     fields: Map<string, CollectionField>;

package/lib/data-source/index.js

@@ -188,6 +188,8 @@ const _CollectionManager = class _CollectionManager {
     this.collections = import_reactive.observable.shallow(/* @__PURE__ */ new Map());
   }
   collections;
+  allCollectionsInheritChain;
+  childrenCollectionsName = {};
   get flowEngine() {
     return this.dataSource.flowEngine;
   }
@@ -317,6 +319,76 @@ const _CollectionManager = class _CollectionManager {
     }, "getChildrens");
     return getChildrens(name);
   }
+  getChildrenCollectionsName(name, isSupportView = false) {
+    const cacheKey = isSupportView ? "supportView" : "notSupportView";
+    if (this.childrenCollectionsName[cacheKey]) {
+      return this.childrenCollectionsName[cacheKey].slice();
+    }
+    const children = [];
+    const collections = [...this.getCollections()];
+    const getChildrenCollectionsInner = /* @__PURE__ */ __name((collectionName) => {
+      const inheritCollections = collections.filter((v) => {
+        var _a;
+        return (_a = [...v.inherits]) == null ? void 0 : _a.includes(collectionName);
+      });
+      inheritCollections.forEach((v) => {
+        const collectionKey = v.name;
+        children.push(collectionKey);
+        return getChildrenCollectionsInner(collectionKey);
+      });
+      if (isSupportView) {
+        const sourceCollections = collections.filter((v) => {
+          var _a;
+          return ((_a = [...v.sources]) == null ? void 0 : _a.length) === 1 && (v == null ? void 0 : v.sources[0]) === collectionName;
+        });
+        sourceCollections.forEach((v) => {
+          const collectionKey = v.name;
+          children.push(v.name);
+          return getChildrenCollectionsInner(collectionKey);
+        });
+      }
+      return import_lodash.default.uniq(children);
+    }, "getChildrenCollectionsInner");
+    this.childrenCollectionsName[cacheKey] = getChildrenCollectionsInner(name);
+    return this.childrenCollectionsName[cacheKey];
+  }
+  getAllCollectionsInheritChain(name) {
+    if (this.allCollectionsInheritChain) {
+      return this.allCollectionsInheritChain.slice();
+    }
+    const collectionsInheritChain = [name];
+    const getInheritChain = /* @__PURE__ */ __name((name2) => {
+      const collection = this.getCollection(name2);
+      if (collection) {
+        const { inherits } = collection;
+        const children = this.getChildrenCollectionsName(name2);
+        if (inherits) {
+          for (let index = 0; index < inherits.length; index++) {
+            const collectionKey = inherits[index];
+            if (collectionsInheritChain.includes(collectionKey)) {
+              continue;
+            }
+            collectionsInheritChain.push(collectionKey);
+            getInheritChain(collectionKey);
+          }
+        }
+        if (children) {
+          for (let index = 0; index < children.length; index++) {
+            const collection2 = this.getCollection(children[index]);
+            const collectionKey = collection2.name;
+            if (collectionsInheritChain.includes(collectionKey)) {
+              continue;
+            }
+            collectionsInheritChain.push(collectionKey);
+            getInheritChain(collectionKey);
+          }
+        }
+      }
+      return collectionsInheritChain;
+    }, "getInheritChain");
+    this.allCollectionsInheritChain = getInheritChain(name);
+    return this.allCollectionsInheritChain || [];
+  }
 };
 __name(_CollectionManager, "CollectionManager");
 let CollectionManager = _CollectionManager;

package/lib/flowContext.js

@@ -830,7 +830,8 @@ const _FlowEngineContext = class _FlowEngineContext extends BaseFlowEngineContex
       value: this.engine
     });
     this.defineProperty("sql", {
-      get: /* @__PURE__ */ __name(() => new import_resources.FlowSQLRepository(this), "get")
+      get: /* @__PURE__ */ __name((ctx) => new import_resources.FlowSQLRepository(ctx), "get"),
+      cache: false
     });
     this.defineProperty("dataSourceManager", {
       value: dataSourceManager
@@ -1207,7 +1208,7 @@ const _FlowModelContext = class _FlowModelContext extends BaseFlowModelContext {
       }, "get")
     });
     this.defineMethod("openView", async function(uid, options) {
-      var _a, _b, _c, _d;
+      var _a, _b, _c, _d, _e;
       const opts = { ...options };
       if (opts.defineProperties || opts.defineMethods) {
         opts.navigation = false;
@@ -1257,8 +1258,16 @@ 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 on = popupFlow == null ? void 0 : popupFlow.on;
+      let openEventName = "click";
+      if (typeof on === "string" && on) {
+        openEventName = on;
+      } else if (on && typeof on === "object" && typeof on.eventName === "string" && on.eventName) {
+        openEventName = on.eventName;
+      }
       await model2.dispatchEvent(
-        "click",
+        openEventName,
         {
           // navigation: false, // TODO: 路由模式有bug，不支持多层同样viewId的弹窗，因此这里默认先用false
           // ...this.model?.['getInputArgs']?.(), // 避免部分关系字段信息丢失, 仿照 ClickableCollectionField 做法

package/lib/flowEngine.js

@@ -762,16 +762,26 @@ const _FlowEngine = class _FlowEngine {
    */
   async loadModel(options) {
     if (!this.ensureModelRepository()) return;
-    const model = this.findModelByParentId(options.parentId, options.subKey);
-    if (model) {
-      return model;
-    }
-    const hydrated = this.hydrateModelFromPreviousEngines(options);
-    if (hydrated) {
-      return hydrated;
+    const refresh = !!(options == null ? void 0 : options.refresh);
+    if (!refresh) {
+      const model = this.findModelByParentId(options.parentId, options.subKey);
+      if (model) {
+        return model;
+      }
+      const hydrated = this.hydrateModelFromPreviousEngines(options);
+      if (hydrated) {
+        return hydrated;
+      }
     }
     const data = await this._modelRepository.findOne(options);
-    return (data == null ? void 0 : data.uid) ? this.createModel(data) : null;
+    if (!(data == null ? void 0 : data.uid)) return null;
+    if (refresh) {
+      const existing = this.getModel(data.uid);
+      if (existing) {
+        this.removeModelWithSubModels(existing.uid);
+      }
+    }
+    return this.createModel(data);
   }
   /**
    * Find a sub-model by parent model ID and subKey.

package/lib/resources/sqlResource.d.ts

@@ -6,7 +6,7 @@
  * 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 { FlowEngineContext } from '../flowContext';
+import { FlowContext, FlowEngineContext } from '../flowContext';
 import { BaseRecordResource } from './baseRecordResource';
 type SQLRunOptions = {
     bind?: Record<string, any>;
@@ -20,8 +20,8 @@ type SQLSaveOptions = {
     dataSourceKey?: string;
 };
 export declare class FlowSQLRepository {
-    protected ctx: FlowEngineContext;
-    constructor(ctx: FlowEngineContext);
+    protected ctx: FlowContext;
+    constructor(ctx: FlowContext);
     run(sql: string, options?: SQLRunOptions): Promise<any>;
     save(data: SQLSaveOptions): Promise<void>;
     runById(uid: string, options?: SQLRunOptions): Promise<any>;

package/lib/utils/safeGlobals.js

@@ -196,6 +196,8 @@ function createSafeWindow(extra) {
     Math,
     Date,
     FormData,
+    ...typeof Blob !== "undefined" ? { Blob } : {},
+    ...typeof URL !== "undefined" ? { URL } : {},
     // 事件侦听仅绑定到真实 window，便于少量需要的全局监听
     addEventListener: addEventListener.bind(window),
     // 安全的 window.open 代理

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/flow-engine",
-  "version": "2.0.0-alpha.70",
+  "version": "2.0.0-alpha.71",
   "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.0.0-alpha.70",
-    "@nocobase/shared": "2.0.0-alpha.70",
+    "@nocobase/sdk": "2.0.0-alpha.71",
+    "@nocobase/shared": "2.0.0-alpha.71",
     "ahooks": "^3.7.2",
     "dayjs": "^1.11.9",
     "dompurify": "^3.0.2",
@@ -36,5 +36,5 @@
   ],
   "author": "NocoBase Team",
   "license": "AGPL-3.0",
-  "gitHead": "42556ed4b29d8410e104ffd8af4fa72c9b1bae7f"
+  "gitHead": "b6fc484eb698fa12fba02dd468a04e39079b1e79"
 }

package/src/JSRunner.ts

@@ -34,13 +34,41 @@ export class JSRunner {
       return typeof fn === 'function' ? fn.bind(globalThis) : fn;
     };
 
+    const providedGlobals = options.globals || {};
+    const liftedGlobals: Record<string, any> = {};
+
+    // Auto-lift selected globals from safe window into top-level sandbox globals
+    // so user code can access them directly (e.g. `new Blob(...)`).
+    if (!Object.prototype.hasOwnProperty.call(providedGlobals, 'Blob')) {
+      try {
+        const blobCtor = (providedGlobals as any).window?.Blob;
+        if (typeof blobCtor !== 'undefined') {
+          liftedGlobals.Blob = blobCtor;
+        }
+      } catch {
+        // ignore when window proxy blocks property access
+      }
+    }
+
+    if (!Object.prototype.hasOwnProperty.call(providedGlobals, 'URL')) {
+      try {
+        const urlCtor = (providedGlobals as any).window?.URL;
+        if (typeof urlCtor !== 'undefined') {
+          liftedGlobals.URL = urlCtor;
+        }
+      } catch {
+        // ignore when window proxy blocks property access
+      }
+    }
+
     this.globals = {
       console,
       setTimeout: bindWindowFn('setTimeout'),
       clearTimeout: bindWindowFn('clearTimeout'),
       setInterval: bindWindowFn('setInterval'),
       clearInterval: bindWindowFn('clearInterval'),
-      ...(options.globals || {}),
+      ...liftedGlobals,
+      ...providedGlobals,
     };
     this.timeoutMs = options.timeoutMs ?? 5000; // 默认 5 秒超时
   }

package/src/__tests__/JSRunner.test.ts

@@ -9,6 +9,7 @@
 
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import { JSRunner } from '../JSRunner';
+import { createSafeWindow } from '../utils';
 
 describe('JSRunner', () => {
   let originalSearch: string;
@@ -48,6 +49,69 @@ describe('JSRunner', () => {
     expect(res2.value).toBe('baz');
   });
 
+  it('auto-lifts Blob from injected window to top-level globals', async () => {
+    if (typeof Blob === 'undefined') {
+      return;
+    }
+
+    const runner = new JSRunner({
+      globals: {
+        window: createSafeWindow(),
+      },
+    });
+
+    const result = await runner.run('return new Blob(["x"]).size');
+    expect(result.success).toBe(true);
+    expect(result.value).toBe(1);
+  });
+
+  it('keeps explicit globals.Blob higher priority than auto-lifted Blob', async () => {
+    const explicitBlob = function ExplicitBlob(this: any, chunks: any[]) {
+      this.size = Array.isArray(chunks) ? chunks.length : 0;
+    } as any;
+
+    const runner = new JSRunner({
+      globals: {
+        window: createSafeWindow(),
+        Blob: explicitBlob,
+      },
+    });
+
+    const result = await runner.run('const b = new Blob([1,2,3]); return b.size;');
+    expect(result.success).toBe(true);
+    expect(result.value).toBe(3);
+  });
+
+  it('auto-lifts URL from injected window to top-level globals', async () => {
+    const runner = new JSRunner({
+      globals: {
+        window: createSafeWindow(),
+      },
+    });
+
+    const result = await runner.run('return typeof URL.createObjectURL === "function"');
+    expect(result.success).toBe(true);
+    expect(result.value).toBe(true);
+  });
+
+  it('keeps explicit globals.URL higher priority than auto-lifted URL', async () => {
+    const explicitURL = {
+      createObjectURL: () => 'explicit://url',
+      revokeObjectURL: (_url: string) => undefined,
+    };
+
+    const runner = new JSRunner({
+      globals: {
+        window: createSafeWindow(),
+        URL: explicitURL,
+      },
+    });
+
+    const result = await runner.run('return URL.createObjectURL(new Blob(["x"]))');
+    expect(result.success).toBe(true);
+    expect(result.value).toBe('explicit://url');
+  });
+
   it('exposes console in sandbox by default', async () => {
     const runner = new JSRunner();
     const result = await runner.run('return typeof console !== "undefined"');

package/src/__tests__/flowContext.test.ts

@@ -759,6 +759,84 @@ describe('FlowEngine context', () => {
     expect(engine.context.appName).toBe('NocoBase');
   });
 
+  it('ctx.sql should resolve template variables from caller context in delegate chain', async () => {
+    const engine = new FlowEngine();
+    const request = vi.fn(async () => ({ data: { data: [] } }));
+    engine.context.defineProperty('api', {
+      value: { request },
+    });
+    engine.context.defineProperty('minId', {
+      get: () => 999,
+      cache: false,
+    });
+
+    const callerCtx = new FlowContext();
+    callerCtx.addDelegate(engine.context);
+    callerCtx.defineProperty('minId', {
+      get: () => 1,
+      cache: false,
+    });
+
+    await callerCtx.sql.run('SELECT * FROM users WHERE id > {{ctx.minId}}', { type: 'selectRows' });
+
+    expect(request).toHaveBeenCalledTimes(1);
+    const config = request.mock.calls[0]?.[0];
+    expect(config?.url).toBe('flowSql:run');
+    expect(config?.data.bind.__var1).toBe(1);
+  });
+
+  it('ctx.sql should not share repository instance between different caller contexts', async () => {
+    const engine = new FlowEngine();
+    const request = vi.fn(async () => ({ data: { data: [] } }));
+    engine.context.defineProperty('api', {
+      value: { request },
+    });
+
+    const caller1 = new FlowContext();
+    caller1.addDelegate(engine.context);
+    caller1.defineProperty('minId', {
+      get: () => 1,
+      cache: false,
+    });
+
+    const caller2 = new FlowContext();
+    caller2.addDelegate(engine.context);
+    caller2.defineProperty('minId', {
+      get: () => 2,
+      cache: false,
+    });
+
+    expect(caller1.sql).not.toBe(caller2.sql);
+
+    await caller1.sql.run('SELECT * FROM users WHERE id > {{ctx.minId}}', { type: 'selectRows' });
+    await caller2.sql.run('SELECT * FROM users WHERE id > {{ctx.minId}}', { type: 'selectRows' });
+
+    expect(request).toHaveBeenCalledTimes(2);
+    const config1 = request.mock.calls[0]?.[0];
+    const config2 = request.mock.calls[1]?.[0];
+    expect(config1?.data.bind.__var1).toBe(1);
+    expect(config2?.data.bind.__var1).toBe(2);
+  });
+
+  it('engine.context.sql should keep working when accessed directly', async () => {
+    const engine = new FlowEngine();
+    const request = vi.fn(async () => ({ data: { data: [] } }));
+    engine.context.defineProperty('api', {
+      value: { request },
+    });
+    engine.context.defineProperty('minId', {
+      get: () => 3,
+      cache: false,
+    });
+
+    await engine.context.sql.run('SELECT * FROM users WHERE id > {{ctx.minId}}', { type: 'selectRows' });
+
+    expect(request).toHaveBeenCalledTimes(1);
+    const config = request.mock.calls[0]?.[0];
+    expect(config?.url).toBe('flowSql:run');
+    expect(config?.data.bind.__var1).toBe(3);
+  });
+
   it('engine.context.getVar should resolve variable by path', async () => {
     const engine = new FlowEngine();
     engine.context.defineProperty('foo', { value: { bar: 1 } });

package/src/__tests__/flowModel.openView.navigation.test.ts

@@ -76,4 +76,32 @@ describe('FlowModelContext.openView - navigation enforcement', () => {
     const dispatchedParams = child.dispatchEvent.mock.calls[0][1];
     expect(dispatchedParams.navigation).toBe(false);
   });
+
+  it('dispatches the popupSettings bound event (object form) when opening external popup', async () => {
+    const { parent, child } = setup();
+
+    child.getFlow = vi.fn((key: string) => {
+      if (key !== 'popupSettings') return undefined;
+      return { on: { eventName: 'openDuplicatePopup' } };
+    });
+
+    await (parent.context as any).openView('child-uid', { mode: 'drawer' });
+
+    expect(child.dispatchEvent).toHaveBeenCalledTimes(1);
+    expect(child.dispatchEvent.mock.calls[0][0]).toBe('openDuplicatePopup');
+  });
+
+  it('falls back to click when popupSettings has no explicit on event', async () => {
+    const { parent, child } = setup();
+
+    child.getFlow = vi.fn((key: string) => {
+      if (key !== 'popupSettings') return undefined;
+      return { on: undefined };
+    });
+
+    await (parent.context as any).openView('child-uid', { mode: 'drawer' });
+
+    expect(child.dispatchEvent).toHaveBeenCalledTimes(1);
+    expect(child.dispatchEvent.mock.calls[0][0]).toBe('click');
+  });
 });

package/src/components/settings/wrappers/contextual/DefaultSettingsIcon.tsx

@@ -614,7 +614,7 @@ export const DefaultSettingsIcon: React.FC<DefaultSettingsIconProps> = ({
             };
             items.push({
               key: uniqueKey,
-              label: <MenuLabelItem title={t(stepInfo.title)} uiMode={uiMode} itemProps={itemProps} />,
+              label: <MenuLabelItem title={stepInfo.title} uiMode={uiMode} itemProps={itemProps} />,
             });
           });
           if (flow.options.divider === 'bottom') {
@@ -656,7 +656,7 @@ export const DefaultSettingsIcon: React.FC<DefaultSettingsIconProps> = ({
 
                 items.push({
                   key: uniqueKey,
-                  label: t(stepInfo.title),
+                  label: stepInfo.title,
                 });
               });
             });
@@ -671,7 +671,7 @@ export const DefaultSettingsIcon: React.FC<DefaultSettingsIconProps> = ({
 
                 subMenuChildren.push({
                   key: uniqueKey,
-                  label: t(stepInfo.title),
+                  label: stepInfo.title,
                 });
               });
             });

package/src/data-source/index.ts

@@ -187,6 +187,9 @@ export interface CollectionOptions {
 export class CollectionManager {
   collections: Map<string, Collection>;
 
+  allCollectionsInheritChain: string[];
+  protected childrenCollectionsName: { supportView?: string[]; notSupportView?: string[] } = {};
+
   constructor(public dataSource: DataSource) {
     this.collections = observable.shallow<Map<string, Collection>>(new Map());
   }
@@ -339,6 +342,81 @@ export class CollectionManager {
     };
     return getChildrens(name);
   }
+  getChildrenCollectionsName(name, isSupportView = false) {
+    const cacheKey = isSupportView ? 'supportView' : 'notSupportView';
+    if (this.childrenCollectionsName[cacheKey]) {
+      return this.childrenCollectionsName[cacheKey].slice();
+    }
+
+    const children: string[] = [];
+    const collections = [...this.getCollections()];
+    const getChildrenCollectionsInner = (collectionName: string) => {
+      const inheritCollections = collections.filter((v: any) => {
+        return [...v.inherits]?.includes(collectionName);
+      });
+      inheritCollections.forEach((v) => {
+        const collectionKey = v.name;
+        children.push(collectionKey);
+        return getChildrenCollectionsInner(collectionKey);
+      });
+      if (isSupportView) {
+        const sourceCollections = collections.filter((v: any) => {
+          return [...v.sources]?.length === 1 && v?.sources[0] === collectionName;
+        });
+        sourceCollections.forEach((v) => {
+          const collectionKey = v.name;
+          children.push(v.name);
+          return getChildrenCollectionsInner(collectionKey);
+        });
+      }
+      return _.uniq(children);
+    };
+
+    this.childrenCollectionsName[cacheKey] = getChildrenCollectionsInner(name);
+    return this.childrenCollectionsName[cacheKey];
+  }
+
+  getAllCollectionsInheritChain(name) {
+    if (this.allCollectionsInheritChain) {
+      return this.allCollectionsInheritChain.slice();
+    }
+
+    const collectionsInheritChain = [name];
+    const getInheritChain = (name: string) => {
+      const collection = this.getCollection(name);
+      if (collection) {
+        const { inherits } = collection as any;
+        const children = this.getChildrenCollectionsName(name);
+        // 搜寻祖先表
+        if (inherits) {
+          for (let index = 0; index < inherits.length; index++) {
+            const collectionKey = inherits[index];
+            if (collectionsInheritChain.includes(collectionKey)) {
+              continue;
+            }
+            collectionsInheritChain.push(collectionKey);
+            getInheritChain(collectionKey);
+          }
+        }
+        // 搜寻后代表
+        if (children) {
+          for (let index = 0; index < children.length; index++) {
+            const collection = this.getCollection(children[index]);
+            const collectionKey = collection.name;
+            if (collectionsInheritChain.includes(collectionKey)) {
+              continue;
+            }
+            collectionsInheritChain.push(collectionKey);
+            getInheritChain(collectionKey);
+          }
+        }
+      }
+      return collectionsInheritChain;
+    };
+
+    this.allCollectionsInheritChain = getInheritChain(name);
+    return this.allCollectionsInheritChain || [];
+  }
 }
 
 // Collection 负责管理自己的 Field

package/src/flowContext.ts

@@ -1144,7 +1144,8 @@ export class FlowEngineContext extends BaseFlowEngineContext {
       value: this.engine,
     });
     this.defineProperty('sql', {
-      get: () => new FlowSQLRepository(this),
+      get: (ctx) => new FlowSQLRepository(ctx),
+      cache: false,
     });
     this.defineProperty('dataSourceManager', {
       value: dataSourceManager,
@@ -1678,8 +1679,17 @@ export class FlowModelContext extends BaseFlowModelContext {
         engineCtx: this.engine.context,
       };
       model.context.defineProperty('view', { value: pendingView });
+      // 默认按 click 打开，但兼容 popupSettings 绑定到其他事件（例如 DuplicateActionModel 监听 openDuplicatePopup）。
+      const popupFlow = model.getFlow?.('popupSettings');
+      const on = (popupFlow as any)?.on;
+      let openEventName = 'click';
+      if (typeof on === 'string' && on) {
+        openEventName = on;
+      } else if (on && typeof on === 'object' && typeof (on as any).eventName === 'string' && (on as any).eventName) {
+        openEventName = (on as any).eventName;
+      }
       await model.dispatchEvent(
-        'click',
+        openEventName,
         {
           // navigation: false, // TODO: 路由模式有bug，不支持多层同样viewId的弹窗，因此这里默认先用false
           // ...this.model?.['getInputArgs']?.(), // 避免部分关系字段信息丢失, 仿照 ClickableCollectionField 做法

package/src/flowEngine.ts

@@ -907,16 +907,26 @@ export class FlowEngine {
    */
   async loadModel<T extends FlowModel = FlowModel>(options): Promise<T | null> {
     if (!this.ensureModelRepository()) return;
-    const model = this.findModelByParentId(options.parentId, options.subKey);
-    if (model) {
-      return model as T;
-    }
-    const hydrated = this.hydrateModelFromPreviousEngines<T>(options);
-    if (hydrated) {
-      return hydrated as T;
+    const refresh = !!options?.refresh;
+    if (!refresh) {
+      const model = this.findModelByParentId(options.parentId, options.subKey);
+      if (model) {
+        return model as T;
+      }
+      const hydrated = this.hydrateModelFromPreviousEngines<T>(options);
+      if (hydrated) {
+        return hydrated as T;
+      }
     }
     const data = await this._modelRepository.findOne(options);
-    return data?.uid ? this.createModel<T>(data as any) : null;
+    if (!data?.uid) return null;
+    if (refresh) {
+      const existing = this.getModel(data.uid);
+      if (existing) {
+        this.removeModelWithSubModels(existing.uid);
+      }
+    }
+    return this.createModel<T>(data as any);
   }
 
   /**

package/src/resources/sqlResource.ts

@@ -27,10 +27,10 @@ type SQLSaveOptions = {
 };
 
 export class FlowSQLRepository {
-  protected ctx: FlowEngineContext;
+  protected ctx: FlowContext;
 
-  constructor(ctx: FlowEngineContext) {
-    this.ctx = new FlowContext() as FlowEngineContext;
+  constructor(ctx: FlowContext) {
+    this.ctx = new FlowContext();
     this.ctx.addDelegate(ctx);
     this.ctx.defineProperty('offset', {
       get: () => 0,

package/src/utils/__tests__/safeGlobals.test.ts

@@ -28,6 +28,14 @@ describe('safeGlobals', () => {
     expect(win.console).toBeDefined();
     expect(win.foo).toBe(123);
     expect(new win.FormData()).toBeInstanceOf(window.FormData);
+    if (typeof window.Blob !== 'undefined') {
+      expect(typeof win.Blob).toBe('function');
+      expect(new win.Blob(['x'])).toBeInstanceOf(window.Blob);
+    }
+    if (typeof window.URL !== 'undefined') {
+      expect(win.URL).toBe(window.URL);
+      expect(typeof win.URL.createObjectURL).toBe('function');
+    }
     // access to location proxy is allowed, but sensitive props throw
     expect(() => win.location.href).toThrow(/not allowed/);
   });

package/src/utils/safeGlobals.ts

@@ -9,7 +9,7 @@
 
 /**
  * 统一的安全全局对象代理：window/document/navigator
- * - window：仅允许常用的定时器、console、Math、Date、FormData、addEventListener、open（安全包装）、location（安全代理）
+ * - window：仅允许常用的定时器、console、Math、Date、FormData、Blob、URL、addEventListener、open（安全包装）、location（安全代理）
  * - document：仅允许 createElement/querySelector/querySelectorAll
  * - navigator：仅提供极少量低风险能力（clipboard.writeText、onLine、language、languages）
  * - 不允许随意访问未声明的属性，最小权限原则
@@ -211,6 +211,8 @@ export function createSafeWindow(extra?: Record<string, any>) {
     Math,
     Date,
     FormData,
+    ...(typeof Blob !== 'undefined' ? { Blob } : {}),
+    ...(typeof URL !== 'undefined' ? { URL } : {}),
     // 事件侦听仅绑定到真实 window，便于少量需要的全局监听
     addEventListener: addEventListener.bind(window),
     // 安全的 window.open 代理