@nocobase/flow-engine 2.0.0-beta.9 → 2.0.1

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);
@@ -724,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/flowI18n.js

@@ -56,11 +56,13 @@ const _FlowI18n = class _FlowI18n {
     if (!keyOrTemplate || typeof keyOrTemplate !== "string") {
       return keyOrTemplate;
     }
-    let result = this.translateKey(keyOrTemplate, options);
-    if (this.isTemplate(result)) {
-      result = this.compileTemplate(result);
+    if ((options == null ? void 0 : options.compareWith) && keyOrTemplate === options.compareWith) {
+      return keyOrTemplate;
+    }
+    if (this.isTemplate(keyOrTemplate)) {
+      return this.compileTemplate(keyOrTemplate);
     }
-    return result;
+    return this.translateKey(keyOrTemplate, options);
   }
   /**
    * 内部翻译方法

package/lib/flowSettings.js

@@ -62,7 +62,9 @@ var import_flowContext = require("./flowContext");
 var import__ = require(".");
 var import_useFlowSettingsContext = require("./hooks/useFlowSettingsContext");
 var import_utils = require("./utils");
+var import_exceptions = require("./utils/exceptions");
 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 +538,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 +550,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();
         }
       };
@@ -711,7 +714,10 @@ const _FlowSettings = class _FlowSettings {
               console.error("FlowSettings.open: onSaved callback error", cbErr);
             }
           } catch (err) {
-            if (err instanceof import_utils.FlowExitException) {
+            if (err instanceof import_utils.FlowCancelSaveException) {
+              return;
+            }
+            if (err instanceof import_utils.FlowExitException || err instanceof import_exceptions.FlowExitAllException) {
               currentView.close();
               return;
             }

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';
@@ -25,8 +27,12 @@ export * from './JSRunner';
 export { getRunJSDocFor, createJSRunnerWithVersion, getRunJSScenesForModel, getRunJSScenesForContext, } from './runjs-context/helpers';
 export { RunJSContextRegistry, getModelClassName } from './runjs-context/registry';
 export { setupRunJSContexts } from './runjs-context/setup';
-export { getSnippetBody, listSnippetsForContext } from './runjs-context/snippets';
+export type { RunJSContextContribution, RunJSContextContributionApi } from './runjs-context/contributions';
+export { registerRunJSContextContribution } from './runjs-context/contributions';
+export type { RunJSSnippetLoader } from './runjs-context/snippets';
+export { getSnippetBody, listSnippetsForContext, registerRunJSSnippet } 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,33 @@ 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,
+  registerRunJSContextContribution: () => import_contributions.registerRunJSContextContribution,
+  registerRunJSLib: () => import_runjsLibs.registerRunJSLib,
+  registerRunJSSnippet: () => import_snippets.registerRunJSSnippet,
   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);
@@ -60,24 +70,35 @@ __reExport(src_exports, require("./JSRunner"), module.exports);
 var import_helpers = require("./runjs-context/helpers");
 var import_registry = require("./runjs-context/registry");
 var import_setup = require("./runjs-context/setup");
+var import_contributions = require("./runjs-context/contributions");
 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,
+  registerRunJSContextContribution,
+  registerRunJSLib,
+  registerRunJSSnippet,
   setupRunJSContexts,
   ...require("./types"),
   ...require("./utils"),

package/lib/locale/en-US.json

@@ -62,6 +62,7 @@
   "This is likely a NocoBase internals bug. Please open an issue at": "This is likely a NocoBase internals bug. Please open an issue at",
   "This step has no configurable parameters": "This step has no configurable parameters",
   "This variable is not available": "This variable is not available",
+  "Use return to output value": "Use return to output value",
   "Try again": "Try again",
   "Template created": "Template created",
   "Template description": "Template description",
@@ -69,5 +70,11 @@
   "Template name is required": "Template name is required",
   "UID copied to clipboard": "UID copied to clipboard",
   "createModelOptions must specify use property": "createModelOptions must specify \"use\" property",
-  "here": "here"
-}
+  "here": "here",
+  "RunJS deprecated warning": "[RunJS][Deprecated] {{api}} is deprecated{{location}}",
+  "RunJS deprecated warning with message": "[RunJS][Deprecated] {{api}} {{message}}{{location}}",
+  "RunJS deprecated separator": "; ",
+  "RunJS deprecated replacedBy": "Use {{replacedBy}} instead",
+  "RunJS deprecated since": "since {{since}}",
+  "RunJS deprecated removedIn": "will be removed in {{removedIn}}"
+}

package/lib/locale/index.d.ts

@@ -71,6 +71,7 @@ export declare const locales: {
         "This is likely a NocoBase internals bug. Please open an issue at": string;
         "This step has no configurable parameters": string;
         "This variable is not available": string;
+        "Use return to output value": string;
         "Try again": string;
         "Template created": string;
         "Template description": string;
@@ -79,6 +80,12 @@ export declare const locales: {
         "UID copied to clipboard": string;
         "createModelOptions must specify use property": string;
         here: string;
+        "RunJS deprecated warning": string;
+        "RunJS deprecated warning with message": string;
+        "RunJS deprecated separator": string;
+        "RunJS deprecated replacedBy": string;
+        "RunJS deprecated since": string;
+        "RunJS deprecated removedIn": string;
     };
     'zh-CN': {
         Add: string;
@@ -148,10 +155,17 @@ export declare const locales: {
         "This is likely a NocoBase internals bug. Please open an issue at": string;
         "This step has no configurable parameters": string;
         "This variable is not available": string;
+        "Use return to output value": string;
         "Try again": string;
         "UID copied to clipboard": string;
         "createModelOptions must specify use property": string;
         here: string;
+        "RunJS deprecated warning": string;
+        "RunJS deprecated warning with message": string;
+        "RunJS deprecated separator": string;
+        "RunJS deprecated replacedBy": string;
+        "RunJS deprecated since": string;
+        "RunJS deprecated removedIn": string;
     };
 };
 /**

package/lib/locale/zh-CN.json

@@ -66,8 +66,15 @@
   "This is likely a NocoBase internals bug. Please open an issue at": "这可能是 NocoBase 内部错误。请在以下地址提交问题",
   "This step has no configurable parameters": "此步骤没有可配置的参数",
   "This variable is not available": "此变量不可用",
+  "Use return to output value": "使用 return 返回最终值",
   "Try again": "重试",
   "UID copied to clipboard": "UID 已复制到剪贴板",
   "createModelOptions must specify use property": "createModelOptions 必须指定 \"use\" 属性",
-  "here": "这里"
+  "here": "这里",
+  "RunJS deprecated warning": "[RunJS][已废弃] {{api}}{{location}}",
+  "RunJS deprecated warning with message": "[RunJS][已废弃] {{api}} {{message}}{{location}}",
+  "RunJS deprecated separator": "；",
+  "RunJS deprecated replacedBy": "建议使用：{{replacedBy}}",
+  "RunJS deprecated since": "自 {{since}} 起",
+  "RunJS deprecated removedIn": "将在 {{removedIn}} 移除"
 }

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

package/lib/models/flowModel.js

@@ -353,7 +353,18 @@ const _FlowModel = class _FlowModel {
       const meta = Cls.meta;
       const metaCreate = meta == null ? void 0 : meta.createModelOptions;
       if (metaCreate && typeof metaCreate === "object" && metaCreate.subModels) {
-        mergedSubModels = import_lodash.default.merge({}, import_lodash.default.cloneDeep(metaCreate.subModels || {}), import_lodash.default.cloneDeep(subModels || {}));
+        const replaceArrays = /* @__PURE__ */ __name((objValue, srcValue) => {
+          if (Array.isArray(objValue) && Array.isArray(srcValue)) {
+            return srcValue;
+          }
+          return void 0;
+        }, "replaceArrays");
+        mergedSubModels = import_lodash.default.mergeWith(
+          {},
+          import_lodash.default.cloneDeep(metaCreate.subModels || {}),
+          import_lodash.default.cloneDeep(subModels || {}),
+          replaceArrays
+        );
       }
     } catch (e) {
     }

package/lib/provider.js

@@ -79,17 +79,17 @@ const FlowEngineGlobalsContextProvider = /* @__PURE__ */ __name(({ children }) =
       cache: false,
       get: /* @__PURE__ */ __name((ctx) => new import_FlowView.FlowViewer(ctx, { drawer, embed, popover, dialog }), "get")
     });
-    engine.context.defineProperty("themeToken", {
-      get: /* @__PURE__ */ __name(() => token, "get"),
-      observable: true,
-      cache: true
-    });
     for (const item of Object.entries(context)) {
       const [key, value] = item;
       if (value) {
         engine.context.defineProperty(key, { value });
       }
     }
+    engine.context.defineProperty("themeToken", {
+      get: /* @__PURE__ */ __name(() => token, "get"),
+      observable: true,
+      cache: true
+    });
     engine.reactView.refresh();
   }, [engine, drawer, modal, message, notification, config, popover, token, dialog, embed]);
   return /* @__PURE__ */ import_react.default.createElement(import_antd.ConfigProvider, { ...config, locale: (_a = engine.context.locales) == null ? void 0 : _a.antd, popupMatchSelectWidth: false }, children, contextHolder, popoverContextHolder, pageContextHolder, dialogContextHolder);

package/lib/resources/baseRecordResource.d.ts

@@ -30,6 +30,11 @@ export declare abstract class BaseRecordResource<TData = any> extends APIResourc
     runAction<TData = any, TMeta = any>(action: string, options: any): Promise<any>;
     setResourceName(resourceName: string): this;
     getResourceName(): string;
+    /**
+     * Mark current resource as dirty on the root FlowEngine.
+     * Used to coordinate "refresh on active" across view stacks.
+     */
+    protected markDataSourceDirty(resourceName?: string): void;
     setSourceId(sourceId: string | number): this;
     getSourceId(): string | number;
     setDataSourceKey(dataSourceKey: string): this;

package/lib/resources/baseRecordResource.js

@@ -44,6 +44,7 @@ var import_lodash = __toESM(require("lodash"));
 var import_apiResource = require("./apiResource");
 var import_filterItem = require("./filterItem");
 var import_flowResource = require("./flowResource");
+var import_viewEvents = require("../views/viewEvents");
 const _BaseRecordResource = class _BaseRecordResource extends import_apiResource.APIResource {
   resourceName;
   sourceId = null;
@@ -145,6 +146,29 @@ const _BaseRecordResource = class _BaseRecordResource extends import_apiResource
   getResourceName() {
     return this.resourceName;
   }
+  /**
+   * Mark current resource as dirty on the root FlowEngine.
+   * Used to coordinate "refresh on active" across view stacks.
+   */
+  markDataSourceDirty(resourceName) {
+    var _a, _b;
+    const engine = this.context.engine;
+    if (!engine) return;
+    const dataSourceKey = this.getDataSourceKey() || "main";
+    const resName = resourceName || this.getResourceName();
+    if (!resName) return;
+    const affectedResourceNames = /* @__PURE__ */ new Set([String(resName)]);
+    if (typeof resName === "string" && resName.includes(".")) {
+      affectedResourceNames.add(resName.split(".")[0]);
+    }
+    for (const name of affectedResourceNames) {
+      engine.markDataSourceDirty(dataSourceKey, name);
+    }
+    (_b = (_a = engine.emitter) == null ? void 0 : _a.emit) == null ? void 0 : _b.call(_a, import_viewEvents.DATA_SOURCE_DIRTY_EVENT, {
+      dataSourceKey,
+      resourceNames: Array.from(affectedResourceNames)
+    });
+  }
   setSourceId(sourceId) {
     this.sourceId = sourceId;
     return this;

package/lib/resources/multiRecordResource.d.ts

@@ -16,6 +16,7 @@ export declare class MultiRecordResource<TDataItem = any> extends BaseRecordReso
         value: Record<string, any>;
     };
     private refreshTimer;
+    private refreshWaiters;
     protected createActionOptions: {};
     protected updateActionOptions: {};
     protected _refreshActionName: string;

package/lib/resources/multiRecordResource.js

@@ -47,6 +47,7 @@ const _MultiRecordResource = class _MultiRecordResource extends import_baseRecor
   _data = import_reactive.observable.ref([]);
   _meta = import_reactive.observable.ref({});
   refreshTimer = null;
+  refreshWaiters = [];
   createActionOptions = {};
   updateActionOptions = {};
   _refreshActionName = "list";
@@ -130,6 +131,7 @@ const _MultiRecordResource = class _MultiRecordResource extends import_baseRecor
   async create(data, options) {
     const config = this.mergeRequestConfig({ data }, this.createActionOptions, options);
     const res = await this.runAction("create", config);
+    this.markDataSourceDirty();
     this.emit("saved", data);
     if ((options == null ? void 0 : options.refresh) !== false) {
       await this.refresh();
@@ -160,6 +162,7 @@ const _MultiRecordResource = class _MultiRecordResource extends import_baseRecor
       options
     );
     await this.runAction("update", config);
+    this.markDataSourceDirty();
     this.emit("saved", data);
     await this.refresh();
   }
@@ -180,6 +183,7 @@ const _MultiRecordResource = class _MultiRecordResource extends import_baseRecor
       options
     );
     await this.runAction("destroy", config);
+    this.markDataSourceDirty();
     const currentPage = this.getPage();
     const lastPage = Math.ceil((this.getCount() - import_lodash.default.castArray(filterByTk).length) / this.getPageSize());
     if (currentPage > lastPage) {
@@ -202,7 +206,11 @@ const _MultiRecordResource = class _MultiRecordResource extends import_baseRecor
       clearTimeout(this.refreshTimer);
     }
     return new Promise((resolve, reject) => {
+      this.refreshWaiters.push({ resolve, reject });
       this.refreshTimer = setTimeout(async () => {
+        const waiters = this.refreshWaiters;
+        this.refreshWaiters = [];
+        this.refreshTimer = null;
         try {
           this.clearError();
           this.loading = true;
@@ -218,13 +226,12 @@ const _MultiRecordResource = class _MultiRecordResource extends import_baseRecor
             this.setPageSize(meta.pageSize);
           }
           this.emit("refresh");
-          this.loading = false;
-          resolve();
+          waiters.forEach((w) => w.resolve());
         } catch (error) {
           this.setError(error);
-          reject(error instanceof Error ? error : new Error(String(error)));
+          const err = error instanceof Error ? error : new Error(String(error));
+          waiters.forEach((w) => w.reject(err));
         } finally {
-          this.refreshTimer = null;
           this.loading = false;
         }
       });

package/lib/resources/singleRecordResource.js

@@ -70,6 +70,7 @@ const _SingleRecordResource = class _SingleRecordResource extends import_baseRec
       ...config,
       data: result
     });
+    this.markDataSourceDirty();
     this.emit("saved", data);
     if ((options == null ? void 0 : options.refresh) !== false) {
       await this.refresh();
@@ -86,6 +87,7 @@ const _SingleRecordResource = class _SingleRecordResource extends import_baseRec
       options
     );
     await this.runAction("destroy", config);
+    this.markDataSourceDirty();
     this.setData(null);
   }
   async refresh() {

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>;
@@ -35,6 +35,7 @@ export declare class SQLResource<TData = any> extends BaseRecordResource<TData>
         value: Record<string, any>;
     };
     private refreshTimer;
+    private refreshWaiters;
     private _debugEnabled;
     private _sql;
     protected request: {

package/lib/resources/sqlResource.js

@@ -126,6 +126,7 @@ const _SQLResource = class _SQLResource extends import_baseRecordResource.BaseRe
   _data = import_reactive.observable.ref(null);
   _meta = import_reactive.observable.ref({});
   refreshTimer = null;
+  refreshWaiters = [];
   _debugEnabled = false;
   _sql;
   // 请求配置 - 与 APIClient 接口保持一致
@@ -261,7 +262,11 @@ const _SQLResource = class _SQLResource extends import_baseRecordResource.BaseRe
       clearTimeout(this.refreshTimer);
     }
     return new Promise((resolve, reject) => {
+      this.refreshWaiters.push({ resolve, reject });
       this.refreshTimer = setTimeout(async () => {
+        const waiters = this.refreshWaiters;
+        this.refreshWaiters = [];
+        this.refreshTimer = null;
         try {
           this.clearError();
           this.loading = true;
@@ -270,12 +275,12 @@ const _SQLResource = class _SQLResource extends import_baseRecordResource.BaseRe
           this.setData(data).setMeta(meta);
           this.loading = false;
           this.emit("refresh");
-          resolve();
+          waiters.forEach((w) => w.resolve());
         } catch (error) {
           this.setError(error);
-          reject(error instanceof Error ? error : new Error(String(error)));
+          const err = error instanceof Error ? error : new Error(String(error));
+          waiters.forEach((w) => w.reject(err));
         } finally {
-          this.refreshTimer = null;
           this.loading = false;
         }
       });