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

package/lib/models/forkFlowModel.d.ts

@@ -31,7 +31,7 @@ export declare class ForkFlowModel<TMaster extends FlowModel = FlowModel> {
     /** 是否已被释放 */
     private disposed;
     /** fork 在 master.forks 中的索引 */
-    readonly forkId: number;
+    readonly forkId: string;
     /** 需要与 master 共享的属性列表 */
     private static readonly SHARED_PROPERTIES;
     /**
@@ -48,7 +48,7 @@ export declare class ForkFlowModel<TMaster extends FlowModel = FlowModel> {
      * 注意：此属性通过 Proxy 在 get/set 陷阱中被动态访问，IDE 可能无法检测到使用, 切勿删除！
      */
     private localProperties;
-    constructor(master: TMaster, initialProps?: IModelComponentProps, forkId?: number);
+    constructor(master: TMaster, initialProps?: IModelComponentProps, forkId?: string);
     get context(): FlowModelContext;
     /**
      * 获取对象及其原型链上的属性描述符
@@ -58,14 +58,18 @@ export declare class ForkFlowModel<TMaster extends FlowModel = FlowModel> {
      * 修改局部 props，仅影响当前 fork
      */
     setProps(key: string | IModelComponentProps, value?: any): void;
+    /**
+     * 清理局部 props，仅影响当前 fork
+     */
+    clearProps(): {};
     /**
      * render 依旧使用 master 的方法，但合并后的 props 需要透传
      */
     render(): any;
     /**
-     * 自动流程缓存的作用域标识（fork 专用）。
+     * 事件缓存的作用域标识（fork 专用）。
      */
-    getAutoFlowCacheScope(): string;
+    getFlowCacheScope(eventName: string): string;
     /**
      * 释放 fork：从 master.forks 中移除自身并断开引用
      */

package/lib/models/forkFlowModel.js

@@ -38,10 +38,10 @@ __export(forkFlowModel_exports, {
 module.exports = __toCommonJS(forkFlowModel_exports);
 var import_reactive = require("@formily/reactive");
 var import_flowContext = require("../flowContext");
-var import_flowEngine = require("../flowEngine");
+var import_secure = require("uid/secure");
 var _flowContext;
 const _ForkFlowModel = class _ForkFlowModel {
-  constructor(master, initialProps = {}, forkId = 0) {
+  constructor(master, initialProps = {}, forkId) {
     /** 与 master 相同的 UID，用于日志调试 */
     __publicField(this, "uid");
     /** 调试标识，便于在日志或断言中快速识别 */
@@ -65,7 +65,7 @@ const _ForkFlowModel = class _ForkFlowModel {
     this.master = master;
     this.uid = master.uid;
     this.localProps = { ...initialProps };
-    this.forkId = forkId;
+    this.forkId = forkId || (0, import_secure.uid)();
     this.hidden = this.master.hidden;
     (0, import_reactive.define)(this, {
       localProps: import_reactive.observable,
@@ -179,6 +179,12 @@ const _ForkFlowModel = class _ForkFlowModel {
       this.localProps = { ...this.localProps, ...key };
     }
   }
+  /**
+   * 清理局部 props，仅影响当前 fork
+   */
+  clearProps() {
+    return this.localProps = {};
+  }
   /**
    * render 依旧使用 master 的方法，但合并后的 props 需要透传
    */
@@ -194,10 +200,10 @@ const _ForkFlowModel = class _ForkFlowModel {
     }
   }
   /**
-   * 自动流程缓存的作用域标识（fork 专用）。
+   * 事件缓存的作用域标识（fork 专用）。
    */
-  getAutoFlowCacheScope() {
-    return String(this.forkId);
+  getFlowCacheScope(eventName) {
+    return `${String(eventName)}:${String(this.forkId)}`;
   }
   // onUnmount() {
   //   // 不在此处自动 dispose（避免破坏外部 fork 管理），但应透传到 master 的 onUnmount 钩子，
@@ -216,11 +222,35 @@ const _ForkFlowModel = class _ForkFlowModel {
    * 释放 fork：从 master.forks 中移除自身并断开引用
    */
   dispose() {
+    var _a;
     if (this.disposed) return;
     this.disposed = true;
+    try {
+      const cache = (_a = this.flowEngine) == null ? void 0 : _a.applyFlowCache;
+      if (cache && cache.size > 0) {
+        const uidSuffixes = [`:${this.uid}`, `-${this.uid}`];
+        const forkIdColon = `:${this.forkId}:`;
+        const forkIdHyphen = `-${this.forkId}-`;
+        for (const key of cache.keys()) {
+          const isEventCache = key.startsWith("event:") || key.startsWith("event-");
+          if (!isEventCache) continue;
+          const endMatches = uidSuffixes.some((s) => key.endsWith(s));
+          if (!endMatches) continue;
+          let trimmed = key;
+          for (const suf of uidSuffixes) {
+            if (trimmed.endsWith(suf)) {
+              trimmed = trimmed.slice(0, -suf.length);
+              break;
+            }
+          }
+          if (trimmed.includes(forkIdColon) || trimmed.includes(forkIdHyphen)) {
+            cache.delete(key);
+          }
+        }
+      }
+    } catch {
+    }
     if (this.master && this.master.forks) {
-      const forkCacheKey = import_flowEngine.FlowEngine.generateApplyFlowCacheKey(`${this.forkId}`, "all", this.uid);
-      this.flowEngine.applyFlowCache.delete(forkCacheKey);
       this.master.forks.delete(this);
     }
     if (this.master && this.master.forkCache) {

package/lib/provider.d.ts

@@ -17,6 +17,8 @@ export declare const FlowEngineProvider: React.FC<FlowEngineProviderProps>;
 export declare const FlowEngineGlobalsContextProvider: React.FC<{
     children: React.ReactNode;
 }>;
-export declare const useFlowEngine: () => FlowEngine;
+export declare const useFlowEngine: ({ throwError }?: {
+    throwError?: boolean;
+}) => FlowEngine;
 export declare const useFlowEngineContext: () => FlowEngineContext;
 export {};

package/lib/provider.js

@@ -49,14 +49,16 @@ var import_FlowContextProvider = require("./FlowContextProvider");
 var import_views = require("./views");
 var import_FlowView = require("./views/FlowView");
 const FlowEngineReactContext = (0, import_react.createContext)(null);
-const FlowEngineProvider = /* @__PURE__ */ __name((props) => {
+const FlowEngineProvider = import_react.default.memo((props) => {
   const { engine, children } = props;
   if (!engine) {
     throw new Error("FlowEngineProvider must be supplied with an engine.");
   }
   return /* @__PURE__ */ import_react.default.createElement(FlowEngineReactContext.Provider, { value: engine }, /* @__PURE__ */ import_react.default.createElement(import_FlowContextProvider.FlowContextProvider, { context: engine.context }, children));
-}, "FlowEngineProvider");
+});
+FlowEngineProvider.displayName = "FlowEngineProvider";
 const FlowEngineGlobalsContextProvider = /* @__PURE__ */ __name(({ children }) => {
+  var _a;
   const { modal, message, notification } = import_antd.App.useApp();
   const [drawer, contextHolder] = (0, import_views.useDrawer)();
   const [embed, pageContextHolder] = (0, import_views.usePage)();
@@ -77,27 +79,28 @@ 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_react.default.Fragment, null, children, contextHolder, popoverContextHolder, pageContextHolder, dialogContextHolder);
+  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);
 }, "FlowEngineGlobalsContextProvider");
-const useFlowEngine = /* @__PURE__ */ __name(() => {
+const useFlowEngine = /* @__PURE__ */ __name(({ throwError = true } = {}) => {
   const context = (0, import_react.useContext)(FlowEngineReactContext);
-  if (!context) {
-    throw new Error(
+  if (!context && throwError) {
+    console.warn(
       "useFlowEngine must be used within a FlowEngineProvider, and FlowEngineProvider must be supplied with an engine."
     );
+    return;
   }
   return context;
 }, "useFlowEngine");

package/lib/reactive/index.d.ts

@@ -0,0 +1,10 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+export * from '@formily/reactive';
+export { observer, getPageActive } from './observer';

package/lib/{runjs-context/snippets/global/api-request-post.snippet.js → reactive/index.js}

@@ -23,20 +23,19 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var api_request_post_snippet_exports = {};
-__export(api_request_post_snippet_exports, {
-  default: () => api_request_post_snippet_default
+var reactive_exports = {};
+__export(reactive_exports, {
+  getPageActive: () => import_observer.getPageActive,
+  observer: () => import_observer.observer
+});
+module.exports = __toCommonJS(reactive_exports);
+__reExport(reactive_exports, require("@formily/reactive"), module.exports);
+var import_observer = require("./observer");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getPageActive,
+  observer,
+  ...require("@formily/reactive")
 });
-module.exports = __toCommonJS(api_request_post_snippet_exports);
-var api_request_post_snippet_default = {
-  contexts: ["*"],
-  prefix: "sn-api-post",
-  label: "POST request template",
-  description: "Basic template to send a POST request via ctx.api",
-  content: `
-const res = await ctx.api.request({ url: '/your/api', method: 'post', data: { name: 'NocoBase' } });
-ctx.message.success(ctx.t('POST request completed'));
-console.log(ctx.t('POST result:'), res);
-`
-};

package/lib/reactive/observer.d.ts

@@ -0,0 +1,19 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * 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 { IObserverOptions, ReactFC } from '@formily/reactive-react';
+import React from 'react';
+import { FlowEngineContext } from '..';
+type ObserverComponentProps<P, Options extends IObserverOptions> = Options extends {
+    forwardRef: true;
+} ? P & {
+    ref?: 'ref' extends keyof P ? P['ref'] : React.RefAttributes<any>;
+} : React.PropsWithoutRef<P>;
+export declare const observer: <P, Options extends IObserverOptions = IObserverOptions>(Component: ReactFC<P>, options?: Options) => React.MemoExoticComponent<ReactFC<ObserverComponentProps<P, Options>>>;
+export declare function getPageActive(context: FlowEngineContext): boolean | undefined;
+export {};

package/lib/reactive/observer.js

@@ -0,0 +1,109 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var observer_exports = {};
+__export(observer_exports, {
+  getPageActive: () => getPageActive,
+  observer: () => observer
+});
+module.exports = __toCommonJS(observer_exports);
+var import_reactive_react = require("@formily/reactive-react");
+var import_react = __toESM(require("react"));
+var import_FlowContextProvider = require("../FlowContextProvider");
+var import_reactive = require("@formily/reactive");
+const observer = /* @__PURE__ */ __name((Component, options) => {
+  const ComponentWithDefaultScheduler = import_react.default.memo((props) => {
+    const ctx = (0, import_FlowContextProvider.useFlowContext)();
+    const ctxRef = (0, import_react.useRef)(ctx);
+    ctxRef.current = ctx;
+    const pendingDisposerRef = (0, import_react.useRef)(null);
+    (0, import_react.useEffect)(() => {
+      return () => {
+        if (pendingDisposerRef.current) {
+          pendingDisposerRef.current();
+          pendingDisposerRef.current = null;
+        }
+      };
+    }, []);
+    const ObservedComponent = (0, import_react.useMemo)(
+      () => (0, import_reactive_react.observer)(Component, {
+        scheduler(updater) {
+          var _a, _b;
+          const pageActive = getPageActive(ctxRef.current);
+          const tabActive = (_b = (_a = ctxRef.current) == null ? void 0 : _a.tabActive) == null ? void 0 : _b.value;
+          if (pageActive === false || tabActive === false) {
+            setTimeout(() => {
+              if (pendingDisposerRef.current) {
+                return;
+              }
+              const disposer = (0, import_reactive.autorun)(() => {
+                var _a2, _b2, _c, _d, _e, _f;
+                if (((_b2 = (_a2 = ctxRef.current) == null ? void 0 : _a2.pageActive) == null ? void 0 : _b2.value) && (((_d = (_c = ctxRef.current) == null ? void 0 : _c.tabActive) == null ? void 0 : _d.value) === true || ((_f = (_e = ctxRef.current) == null ? void 0 : _e.tabActive) == null ? void 0 : _f.value) === void 0)) {
+                  updater();
+                  disposer == null ? void 0 : disposer();
+                  pendingDisposerRef.current = null;
+                }
+              });
+              pendingDisposerRef.current = disposer;
+            });
+            return;
+          }
+          if (pendingDisposerRef.current) {
+            pendingDisposerRef.current();
+            pendingDisposerRef.current = null;
+          }
+          updater();
+        },
+        ...options
+      }),
+      []
+    );
+    return /* @__PURE__ */ import_react.default.createElement(ObservedComponent, { ...props });
+  });
+  ComponentWithDefaultScheduler.displayName = `ComponentWithDefaultScheduler`;
+  return ComponentWithDefaultScheduler;
+}, "observer");
+function getPageActive(context) {
+  var _a, _b, _c;
+  return typeof ((_a = context == null ? void 0 : context.pageActive) == null ? void 0 : _a.value) === "boolean" ? (_b = context == null ? void 0 : context.pageActive) == null ? void 0 : _b.value : (_c = context == null ? void 0 : context.view) == null ? void 0 : _c.inputArgs.pageActive;
+}
+__name(getPageActive, "getPageActive");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getPageActive,
+  observer
+});

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;
@@ -45,6 +50,7 @@ export declare abstract class BaseRecordResource<TData = any> extends APIResourc
     removeAppends(appends: string | string[]): this;
     getUpdateAssociationValues(): string[];
     addUpdateAssociationValues(updateAssociationValues: string | string[]): this;
+    jsonStringify(value: any): string;
     setFilterByTk(filterByTk: any): this;
     getFilterByTk(): any;
     setFields(fields: string[] | 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;
@@ -110,6 +111,7 @@ const _BaseRecordResource = class _BaseRecordResource extends import_apiResource
   }
   async runAction(action, options) {
     var _a;
+    const { rawResponse, ...rest } = options;
     const config = this.mergeRequestConfig(
       import_lodash.default.omit(this.request, ["params", "data", "method"]),
       {
@@ -117,14 +119,18 @@ const _BaseRecordResource = class _BaseRecordResource extends import_apiResource
         url: this.buildURL(action)
       },
       (_a = this.runActionOptions) == null ? void 0 : _a[action],
-      options
+      rest
     );
     if (["create", "update", "firstOrCreate", "updateOrCreate"].includes(action)) {
       config.params = config.params || {};
       config.params.updateAssociationValues = this.getUpdateAssociationValues();
     }
     try {
-      const { data } = await this.api.request(config);
+      const response = await this.api.request(config);
+      if (rawResponse) {
+        return response;
+      }
+      const { data } = response;
       if (!(data == null ? void 0 : data.data)) {
         return data;
       }
@@ -140,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;
@@ -219,8 +248,14 @@ const _BaseRecordResource = class _BaseRecordResource extends import_apiResource
     this.updateAssociationValues = currentUpdateAssociationValues;
     return this;
   }
+  jsonStringify(value) {
+    if (value !== null && typeof value === "object") {
+      return JSON.stringify(value);
+    }
+    return value;
+  }
   setFilterByTk(filterByTk) {
-    return this.addRequestParameter("filterByTk", filterByTk);
+    return this.addRequestParameter("filterByTk", this.jsonStringify(filterByTk));
   }
   getFilterByTk() {
     return this.request.params.filterByTk;

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;
@@ -39,11 +40,13 @@ export declare class MultiRecordResource<TDataItem = any> extends BaseRecordReso
     next(): Promise<void>;
     previous(): Promise<void>;
     goto(page: number): Promise<void>;
-    create(data: TDataItem, options?: AxiosRequestConfig): Promise<void>;
+    create(data: TDataItem, options?: AxiosRequestConfig & {
+        refresh?: boolean;
+    }): Promise<void>;
     get(filterByTk: any): Promise<TDataItem | undefined>;
     update(filterByTk: string | number, data: Partial<TDataItem>, options?: AxiosRequestConfig): Promise<void>;
     destroySelectedRows(): Promise<void>;
-    destroy(filterByTk: string | number | string[] | number[] | TDataItem | TDataItem[], options?: AxiosRequestConfig): Promise<void>;
+    destroy(filterByTk: string | number | string[] | number[] | TDataItem | TDataItem[] | object, options?: AxiosRequestConfig): Promise<void>;
     setItem(index: number, newDataItem: TDataItem): void;
     /**
      * 在同一个事件循环内多次调用 refresh 方法时，只有最后一次调用会生效。避免触发多次相同的接口请求。

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";
@@ -129,8 +130,13 @@ const _MultiRecordResource = class _MultiRecordResource extends import_baseRecor
   }
   async create(data, options) {
     const config = this.mergeRequestConfig({ data }, this.createActionOptions, options);
-    await this.runAction("create", config);
-    await this.refresh();
+    const res = await this.runAction("create", config);
+    this.markDataSourceDirty();
+    this.emit("saved", data);
+    if ((options == null ? void 0 : options.refresh) !== false) {
+      await this.refresh();
+    }
+    return res;
   }
   async get(filterByTk) {
     const options = {
@@ -144,17 +150,20 @@ const _MultiRecordResource = class _MultiRecordResource extends import_baseRecor
     return data;
   }
   async update(filterByTk, data, options) {
+    const result = data;
     const config = this.mergeRequestConfig(
       {
         params: {
           filterByTk
         },
-        data
+        data: result
       },
       this.updateActionOptions,
       options
     );
     await this.runAction("update", config);
+    this.markDataSourceDirty();
+    this.emit("saved", data);
     await this.refresh();
   }
   async destroySelectedRows() {
@@ -168,14 +177,18 @@ const _MultiRecordResource = class _MultiRecordResource extends import_baseRecor
     const config = this.mergeRequestConfig(
       {
         params: {
-          filterByTk: import_lodash.default.castArray(filterByTk).map((item) => {
-            return typeof item === "object" ? item["id"] : item;
-          })
+          filterByTk: this.jsonStringify(filterByTk)
         }
       },
       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) {
+      this.setPage(lastPage || 1);
+    }
     await this.refresh();
   }
   setItem(index, newDataItem) {
@@ -193,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;
@@ -209,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

@@ -60,29 +60,34 @@ const _SingleRecordResource = class _SingleRecordResource extends import_baseRec
   async save(data, options) {
     const config = this.mergeRequestConfig(this.saveActionOptions, import_lodash.default.omit(options, ["refresh"]));
     let actionName = "create";
+    const result = data;
     if (!this.isNewRecord) {
       config.params = config.params || {};
       config.params.filterByTk = this.getFilterByTk();
       actionName = "update";
     }
-    await this.runAction(actionName, {
+    const res = await this.runAction(actionName, {
       ...config,
-      data
+      data: result
     });
+    this.markDataSourceDirty();
+    this.emit("saved", data);
     if ((options == null ? void 0 : options.refresh) !== false) {
       await this.refresh();
     }
+    return res;
   }
   async destroy(options) {
     const config = this.mergeRequestConfig(
       {
         params: {
-          filterByTk: this.request.params.filterByTk
+          filterByTk: this.jsonStringify(this.request.params.filterByTk)
         }
       },
       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: {
@@ -61,6 +62,7 @@ export declare class SQLResource<TData = any> extends BaseRecordResource<TData>
     setFilterByTk(filterByTk: any): this;
     setFilter(filter: Record<string, any>): this;
     setBind(bind: Record<string, any> | Array<any>): this;
+    setLiquidContext(liquidContext: Record<string, any>): this;
     run(): Promise<any>;
     runBySQL(): Promise<any>;
     runById(): Promise<any>;