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

package/lib/components/MobilePopup.style.js

@@ -96,9 +96,17 @@ const genStyleHook = /* @__PURE__ */ __name((component, styleFn) => {
         return [genCommonStyle(token, prefixCls), styleInterpolation];
       }
     );
-    const memoizedWrapSSR = (0, import_react.useMemo)(() => {
-      return wrapSSR;
-    }, [theme2, token, hashId, prefixCls, iconPrefixCls, rootPrefixCls, props]);
+    const wrapSSRDeps = [theme2, token, hashId, prefixCls, iconPrefixCls, rootPrefixCls, props];
+    const wrapSSRCacheRef = (0, import_react.useRef)();
+    const currentCache = wrapSSRCacheRef.current;
+    let memoizedWrapSSR = (currentCache == null ? void 0 : currentCache.wrapSSR) || wrapSSR;
+    if (!currentCache || wrapSSRDeps.some((dep, index) => dep !== currentCache.deps[index])) {
+      wrapSSRCacheRef.current = {
+        deps: wrapSSRDeps,
+        wrapSSR
+      };
+      memoizedWrapSSR = wrapSSR;
+    }
     return {
       wrapSSR: memoizedWrapSSR,
       hashId,
@@ -112,7 +120,7 @@ const useMobileActionDrawerStyle = genStyleHook("nb-mobile-action-drawer", (toke
   return {
     [componentCls]: {
       ".nb-mobile-action-drawer-header": {
-        height: "var(--nb-mobile-page-header-height)",
+        height: "var(--nb-mobile-page-header-height, 46px)",
         display: "flex",
         alignItems: "center",
         justifyContent: "space-between",
@@ -139,7 +147,10 @@ const useMobileActionDrawerStyle = genStyleHook("nb-mobile-action-drawer", (toke
       ".nb-mobile-action-drawer-body": {
         borderTopLeftRadius: 8,
         borderTopRightRadius: 8,
-        maxHeight: "calc(100% - var(--nb-mobile-page-header-height))",
+        maxHeight: "calc(100vh - var(--nb-mobile-page-header-height, 46px))",
+        "@supports (height: 100dvh)": {
+          maxHeight: "calc(100dvh - var(--nb-mobile-page-header-height, 46px))"
+        },
         overflowY: "auto",
         overflowX: "hidden",
         backgroundColor: token.colorBgLayout,

package/lib/flowContext.d.ts

@@ -7,7 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { ISchema } from '@formily/json-schema';
-import { APIClient, RequestOptions } from '@nocobase/sdk';
+import type { APIClient, RequestOptions } from '@nocobase/sdk';
 import type { Router } from '@remix-run/router';
 import { MessageInstance } from 'antd/es/message/interface';
 import type { HookAPI } from 'antd/es/modal/useModal';

package/lib/flowContext.js

@@ -75,6 +75,7 @@ var import_utils = require("./utils");
 var import_exceptions = require("./utils/exceptions");
 var import_params_resolvers = require("./utils/params-resolvers");
 var import_serverContextParams = require("./utils/serverContextParams");
+var import_dirtyAwareApiClient = require("./utils/dirtyAwareApiClient");
 var import_variablesParams = require("./utils/variablesParams");
 var import_registry = require("./runjs-context/registry");
 var import_createEphemeralContext = require("./utils/createEphemeralContext");
@@ -1899,15 +1900,16 @@ const _FlowContext = class _FlowContext {
     const options = this._props[key];
     if (!options) return void 0;
     if ("value" in options) {
-      return options.value;
+      return key === "api" ? (0, import_dirtyAwareApiClient.getDirtyAwareApiClient)(options.value, currentContext) : options.value;
     }
     if (options.get) {
       if (options.cache === false) {
-        return options.get(currentContext);
+        const value = options.get(currentContext);
+        return key === "api" ? (0, import_dirtyAwareApiClient.getDirtyAwareApiClient)(value, currentContext) : value;
       }
       const cacheKey = options.observable ? "_observableCache" : "_cache";
       if (key in this[cacheKey]) {
-        return this[cacheKey][key];
+        return key === "api" ? (0, import_dirtyAwareApiClient.getDirtyAwareApiClient)(this[cacheKey][key], currentContext) : this[cacheKey][key];
       }
       if (this._pending[key]) return this._pending[key];
       const result = options.get(this.createProxy());
@@ -1917,7 +1919,7 @@ const _FlowContext = class _FlowContext {
           (v) => {
             this[cacheKey][key] = v;
             delete this._pending[key];
-            return v;
+            return key === "api" ? (0, import_dirtyAwareApiClient.getDirtyAwareApiClient)(v, currentContext) : v;
           },
           (err) => {
             delete this._pending[key];
@@ -1927,7 +1929,7 @@ const _FlowContext = class _FlowContext {
         return this._pending[key];
       }
       this[cacheKey][key] = result;
-      return result;
+      return key === "api" ? (0, import_dirtyAwareApiClient.getDirtyAwareApiClient)(result, currentContext) : result;
     }
     return void 0;
   }
@@ -2251,7 +2253,7 @@ const _BaseFlowEngineContext = class _BaseFlowEngineContext extends FlowContext
     this.defineMethod("getModel", (modelName, searchInPreviousEngines) => {
       return this.engine.getModel(modelName, searchInPreviousEngines);
     });
-    this.defineMethod("request", (options) => {
+    this.defineMethod("request", function(options) {
       const app = this.app;
       if (typeof (options == null ? void 0 : options.url) === "string" && shouldBypassApiClient(options.url, app)) {
         return import_axios.default.request(options);
@@ -3510,6 +3512,20 @@ const _FlowRunJSContext = class _FlowRunJSContext extends FlowContext {
     ReactDOMShim.__nbRunjsInternalShim = true;
     this.defineProperty("ReactDOM", { value: ReactDOMShim });
     (0, import_runjsLibs.setupRunJSLibs)(this);
+    this.defineMethod("openView", async function(uid, options) {
+      const delegateOpenView = delegate.openView;
+      if (typeof delegateOpenView !== "function") {
+        throw new Error("ctx.openView is not available in current context.");
+      }
+      const routeState = (0, import_utils.createOpenViewRouteState)(options);
+      if (!routeState) {
+        return delegateOpenView(uid, options);
+      }
+      return delegateOpenView(uid, {
+        ...options || {},
+        [import_utils.RUNJS_OPEN_VIEW_ROUTE_STATE]: routeState
+      });
+    });
     this.defineMethod(
       "render",
       function(vnode, container) {

package/lib/locale/en-US.json

@@ -56,6 +56,7 @@
   "Replace current block with template?": "Replace current block with template?",
   "Replaced with template block": "Replaced with template block",
   "Render failed": "Render failed",
+  "Response record": "Response record",
   "Step configuration": "Step configuration",
   "Step parameter configuration": "Step parameter configuration",
   "Step with key {{stepKey}} not found": "Step with key {{stepKey}} not found",

package/lib/locale/index.d.ts

@@ -65,6 +65,7 @@ export declare const locales: {
         "Replace current block with template?": string;
         "Replaced with template block": string;
         "Render failed": string;
+        "Response record": string;
         "Step configuration": string;
         "Step parameter configuration": string;
         "Step with key {{stepKey}} not found": string;
@@ -150,6 +151,7 @@ export declare const locales: {
         "Other blocks": string;
         "Previous step": string;
         "Render failed": string;
+        "Response record": string;
         "Step configuration": string;
         "Step parameter configuration": string;
         "Step with key {{stepKey}} not found": string;

package/lib/locale/zh-CN.json

@@ -60,6 +60,7 @@
   "Other blocks": "其他区块",
   "Previous step": "上一步",
   "Render failed": "渲染失败",
+  "Response record": "响应结果记录",
   "Step configuration": "步骤配置",
   "Step parameter configuration": "步骤参数配置",
   "Step with key {{stepKey}} not found": "未找到key为 {{stepKey}} 的步骤",

package/lib/resources/apiResource.js

@@ -30,6 +30,7 @@ __export(apiResource_exports, {
   APIResource: () => APIResource
 });
 module.exports = __toCommonJS(apiResource_exports);
+var import_dirtyAwareApiClient = require("../utils/dirtyAwareApiClient");
 var import_flowResource = require("./flowResource");
 const _APIResource = class _APIResource extends import_flowResource.FlowResource {
   // 请求配置
@@ -49,7 +50,7 @@ const _APIResource = class _APIResource extends import_flowResource.FlowResource
     }
   }
   setAPIClient(api) {
-    this.api = api;
+    this.api = (0, import_dirtyAwareApiClient.getDirtyAwareApiClient)(api, this.context);
     return this;
   }
   getURL() {

package/lib/resources/baseRecordResource.js

@@ -44,7 +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");
+var import_dataSourceDirty = require("../utils/dataSourceDirty");
 const _BaseRecordResource = class _BaseRecordResource extends import_apiResource.APIResource {
   resourceName;
   sourceId = null;
@@ -151,22 +151,11 @@ const _BaseRecordResource = class _BaseRecordResource extends import_apiResource
    * 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)
+    (0, import_dataSourceDirty.markDataSourceDirty)({
+      engine: this.context.engine,
+      dataSourceKey: this.getDataSourceKey(),
+      resourceName: resourceName || this.getResourceName(),
+      includePreviousEngines: true
     });
   }
   setSourceId(sourceId) {

package/lib/resources/multiRecordResource.js

@@ -42,6 +42,7 @@ __export(multiRecordResource_exports, {
 module.exports = __toCommonJS(multiRecordResource_exports);
 var import_reactive = require("@formily/reactive");
 var import_lodash = __toESM(require("lodash"));
+var import_dirtyAwareApiClient = require("../utils/dirtyAwareApiClient");
 var import_baseRecordResource = require("./baseRecordResource");
 const _MultiRecordResource = class _MultiRecordResource extends import_baseRecordResource.BaseRecordResource {
   _data = import_reactive.observable.ref([]);
@@ -130,7 +131,10 @@ 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);
+    const res = await this.runAction("create", {
+      ...config,
+      [import_dirtyAwareApiClient.SKIP_DATA_SOURCE_DIRTY]: true
+    });
     this.markDataSourceDirty();
     this.emit("saved", data);
     if ((options == null ? void 0 : options.refresh) !== false) {
@@ -161,7 +165,10 @@ const _MultiRecordResource = class _MultiRecordResource extends import_baseRecor
       this.updateActionOptions,
       options
     );
-    await this.runAction("update", config);
+    await this.runAction("update", {
+      ...config,
+      [import_dirtyAwareApiClient.SKIP_DATA_SOURCE_DIRTY]: true
+    });
     this.markDataSourceDirty();
     this.emit("saved", data);
     await this.refresh();
@@ -182,7 +189,10 @@ const _MultiRecordResource = class _MultiRecordResource extends import_baseRecor
       },
       options
     );
-    await this.runAction("destroy", config);
+    await this.runAction("destroy", {
+      ...config,
+      [import_dirtyAwareApiClient.SKIP_DATA_SOURCE_DIRTY]: true
+    });
     this.markDataSourceDirty();
     const currentPage = this.getPage();
     const lastPage = Math.ceil((this.getCount() - import_lodash.default.castArray(filterByTk).length) / this.getPageSize());

package/lib/resources/singleRecordResource.js

@@ -41,6 +41,7 @@ __export(singleRecordResource_exports, {
 });
 module.exports = __toCommonJS(singleRecordResource_exports);
 var import_lodash = __toESM(require("lodash"));
+var import_dirtyAwareApiClient = require("../utils/dirtyAwareApiClient");
 var import_baseRecordResource = require("./baseRecordResource");
 const _SingleRecordResource = class _SingleRecordResource extends import_baseRecordResource.BaseRecordResource {
   isNewRecord = false;
@@ -68,7 +69,8 @@ const _SingleRecordResource = class _SingleRecordResource extends import_baseRec
     }
     const res = await this.runAction(actionName, {
       ...config,
-      data: result
+      data: result,
+      [import_dirtyAwareApiClient.SKIP_DATA_SOURCE_DIRTY]: true
     });
     this.markDataSourceDirty();
     this.emit("saved", data);
@@ -86,7 +88,10 @@ const _SingleRecordResource = class _SingleRecordResource extends import_baseRec
       },
       options
     );
-    await this.runAction("destroy", config);
+    await this.runAction("destroy", {
+      ...config,
+      [import_dirtyAwareApiClient.SKIP_DATA_SOURCE_DIRTY]: true
+    });
     this.markDataSourceDirty();
     this.setData(null);
   }

package/lib/utils/dataSourceDirty.d.ts

@@ -0,0 +1,20 @@
+/**
+ * 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 type { FlowEngine } from '../flowEngine';
+type MarkDataSourceDirtyOptions = {
+    engine?: FlowEngine;
+    dataSourceKey?: unknown;
+    resourceName?: unknown;
+    includePreviousEngines?: boolean;
+};
+export declare function getHeaderValue(headers: unknown, name: string): unknown;
+export declare function getDataSourceKeyFromHeaders(headers: unknown): string;
+export declare function getAffectedResourceNames(resourceName: unknown): string[];
+export declare function markDataSourceDirty(options: MarkDataSourceDirtyOptions): string[];
+export {};

package/lib/utils/dataSourceDirty.js

@@ -0,0 +1,139 @@
+/**
+ * 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 __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var dataSourceDirty_exports = {};
+__export(dataSourceDirty_exports, {
+  getAffectedResourceNames: () => getAffectedResourceNames,
+  getDataSourceKeyFromHeaders: () => getDataSourceKeyFromHeaders,
+  getHeaderValue: () => getHeaderValue,
+  markDataSourceDirty: () => markDataSourceDirty
+});
+module.exports = __toCommonJS(dataSourceDirty_exports);
+var import_viewEvents = require("../views/viewEvents");
+function getHeaderValue(headers, name) {
+  if (!headers || typeof headers !== "object") {
+    return void 0;
+  }
+  const maybeHeaders = headers;
+  if (typeof maybeHeaders.get === "function") {
+    const value = maybeHeaders.get(name);
+    if (value != null && value !== "") {
+      return value;
+    }
+  }
+  const lowerName = name.toLowerCase();
+  for (const [key, value] of Object.entries(headers)) {
+    if (key.toLowerCase() === lowerName) {
+      return value;
+    }
+  }
+  return void 0;
+}
+__name(getHeaderValue, "getHeaderValue");
+function getDataSourceKeyFromHeaders(headers) {
+  const value = getHeaderValue(headers, "x-data-source");
+  if (Array.isArray(value)) {
+    return String(value[0] || "main");
+  }
+  return value == null || value === "" ? "main" : String(value);
+}
+__name(getDataSourceKeyFromHeaders, "getDataSourceKeyFromHeaders");
+function getAffectedResourceNames(resourceName) {
+  const name = String(resourceName || "").trim();
+  if (!name) {
+    return [];
+  }
+  const names = /* @__PURE__ */ new Set([name]);
+  if (name.includes(".")) {
+    names.add(name.split(".")[0]);
+  }
+  return Array.from(names);
+}
+__name(getAffectedResourceNames, "getAffectedResourceNames");
+function getDirtyTargetEngines(engine, includePreviousEngines) {
+  if (!includePreviousEngines) {
+    return [engine];
+  }
+  const engines = [];
+  const seen = /* @__PURE__ */ new Set();
+  let current = engine;
+  let guard = 0;
+  while (current && guard++ < 50) {
+    if (!seen.has(current)) {
+      engines.push(current);
+      seen.add(current);
+    }
+    current = current.previousEngine;
+  }
+  return engines;
+}
+__name(getDirtyTargetEngines, "getDirtyTargetEngines");
+function markDataSourceDirty(options) {
+  var _a, _b, _c, _d;
+  const { engine, resourceName, includePreviousEngines } = options;
+  if (!(engine == null ? void 0 : engine.markDataSourceDirty)) {
+    return [];
+  }
+  const resourceNames = getAffectedResourceNames(resourceName);
+  if (!resourceNames.length) {
+    return [];
+  }
+  const dataSourceKey = String(options.dataSourceKey || "main");
+  const targetEngines = getDirtyTargetEngines(engine, includePreviousEngines);
+  const beforeVersions = /* @__PURE__ */ new Map();
+  for (const targetEngine of targetEngines) {
+    const versions = /* @__PURE__ */ new Map();
+    beforeVersions.set(targetEngine, versions);
+    for (const name of resourceNames) {
+      versions.set(name, ((_a = targetEngine.getDataSourceDirtyVersion) == null ? void 0 : _a.call(targetEngine, dataSourceKey, name)) || 0);
+    }
+  }
+  for (const targetEngine of targetEngines) {
+    const versions = beforeVersions.get(targetEngine);
+    for (const name of resourceNames) {
+      const before = (versions == null ? void 0 : versions.get(name)) || 0;
+      const current = ((_b = targetEngine.getDataSourceDirtyVersion) == null ? void 0 : _b.call(targetEngine, dataSourceKey, name)) || 0;
+      if (current !== before) {
+        continue;
+      }
+      targetEngine.markDataSourceDirty(dataSourceKey, name);
+    }
+  }
+  (_d = (_c = engine.emitter) == null ? void 0 : _c.emit) == null ? void 0 : _d.call(_c, import_viewEvents.DATA_SOURCE_DIRTY_EVENT, {
+    dataSourceKey,
+    resourceNames
+  });
+  return resourceNames;
+}
+__name(markDataSourceDirty, "markDataSourceDirty");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getAffectedResourceNames,
+  getDataSourceKeyFromHeaders,
+  getHeaderValue,
+  markDataSourceDirty
+});

package/lib/utils/dirtyAwareApiClient.d.ts

@@ -0,0 +1,11 @@
+/**
+ * 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 type { FlowContext } from '../flowContext';
+export declare const SKIP_DATA_SOURCE_DIRTY = "__nocobaseSkipDataSourceDirty";
+export declare function getDirtyAwareApiClient(value: unknown, context: FlowContext): unknown;