@nocobase/flow-engine 2.0.0-alpha.40 → 2.0.0-alpha.41

package/lib/flowContext.js

@@ -57,6 +57,7 @@ __export(flowContext_exports, {
 module.exports = __toCommonJS(flowContext_exports);
 var import_reactive = require("@formily/reactive");
 var antd = __toESM(require("antd"));
+var antdIcons = __toESM(require("@ant-design/icons"));
 var import_lodash = __toESM(require("lodash"));
 var import_qs = __toESM(require("qs"));
 var import_react = __toESM(require("react"));
@@ -1294,6 +1295,14 @@ const _FlowRunJSContext = class _FlowRunJSContext extends FlowContext {
       }, "createRoot")
     };
     this.defineProperty("ReactDOM", { value: ReactDOMShim });
+    const libs = Object.freeze({
+      React: import_react.default,
+      ReactDOM: ReactDOMShim,
+      antd,
+      dayjs: import_dayjs.default,
+      antdIcons
+    });
+    this.defineProperty("libs", { value: libs });
     this.defineMethod(
       "render",
       function(vnode, container) {

package/lib/flowEngine.js

@@ -494,7 +494,7 @@ const _FlowEngine = class _FlowEngine {
    * @returns {boolean} Returns true if successfully destroyed, false otherwise (e.g. instance does not exist)
    */
   removeModel(uid) {
-    var _a;
+    var _a, _b, _c;
     if (!this._modelInstances.has(uid)) {
       console.warn(`FlowEngine: Model with UID '${uid}' does not exist.`);
       return false;
@@ -509,11 +509,21 @@ const _FlowEngine = class _FlowEngine {
           if (index !== -1) {
             subModelValue.splice(index, 1);
             modelInstance.parent.emitter.emit("onSubModelRemoved", modelInstance);
+            (_b = this.emitter) == null ? void 0 : _b.emit("model:subModel:removed", {
+              parentUid: modelInstance.parent.uid,
+              parent: modelInstance.parent,
+              model: modelInstance
+            });
             break;
           }
         } else if (subModelValue && subModelValue === modelInstance) {
           delete modelInstance.parent.subModels[subKey];
           modelInstance.parent.emitter.emit("onSubModelRemoved", modelInstance);
+          (_c = this.emitter) == null ? void 0 : _c.emit("model:subModel:removed", {
+            parentUid: modelInstance.parent.uid,
+            parent: modelInstance.parent,
+            model: modelInstance
+          });
           break;
         }
       }
@@ -688,7 +698,7 @@ const _FlowEngine = class _FlowEngine {
    * @returns {Promise<T | null>} Newly created model instance
    */
   async replaceModel(uid, optionsOrFn) {
-    var _a;
+    var _a, _b;
     const oldModel = this.getModel(uid);
     if (!oldModel) {
       console.warn(`FlowEngine: Cannot replace model. Model with UID '${uid}' not found.`);
@@ -725,6 +735,12 @@ const _FlowEngine = class _FlowEngine {
       currentParent.parent.invalidateFlowCache("beforeRender", true);
       (_a = currentParent.parent) == null ? void 0 : _a.rerender();
       currentParent.emitter.emit("onSubModelReplaced", { oldModel, newModel });
+      (_b = this.emitter) == null ? void 0 : _b.emit("model:subModel:replaced", {
+        parentUid: currentParent.uid,
+        parent: currentParent,
+        oldModel,
+        newModel
+      });
     }
     await newModel.save();
     return newModel;
@@ -736,6 +752,7 @@ const _FlowEngine = class _FlowEngine {
    * @returns {Promise<void>} No return value
    */
   async moveModel(sourceId, targetId, options) {
+    var _a, _b;
     const sourceModel = this.getModel(sourceId);
     const targetModel = this.getModel(targetId);
     if (!sourceModel || !targetModel) {
@@ -778,6 +795,12 @@ const _FlowEngine = class _FlowEngine {
       await this._modelRepository.move(sourceId, targetId, position);
     }
     sourceModel.parent.emitter.emit("onSubModelMoved", { source: sourceModel, target: targetModel });
+    (_b = this.emitter) == null ? void 0 : _b.emit("model:subModel:moved", {
+      parentUid: (_a = sourceModel.parent) == null ? void 0 : _a.uid,
+      parent: sourceModel.parent,
+      source: sourceModel,
+      target: targetModel
+    });
   }
   /**
    * Filter model classes by parent class (supports multi-level inheritance).

package/lib/flowSettings.js

@@ -485,6 +485,10 @@ const _FlowSettings = class _FlowSettings {
         const flowRuntimeContext = new import_flowContext.FlowRuntimeContext(model, fk, "settings");
         (0, import_utils.setupRuntimeContextSteps)(flowRuntimeContext, flow.steps, model, fk);
         flowRuntimeContext.defineProperty("currentStep", { value: step });
+        flowRuntimeContext.defineMethod("getStepFormValues", (flowKey2, stepKey2) => {
+          var _a2;
+          return (_a2 = forms.get(keyOf({ flowKey: flowKey2, stepKey: stepKey2 }))) == null ? void 0 : _a2.values;
+        });
         const modelStepParams = model.getStepParams(fk, sk) || {};
         const resolvedDefaultParams = await (0, import_utils.resolveDefaultParams)(step.defaultParams, flowRuntimeContext);
         const resolvedActionDefaults = await (0, import_utils.resolveDefaultParams)(actionDefaultParams, flowRuntimeContext);

package/lib/models/CollectionFieldModel.js

@@ -51,6 +51,7 @@ var import_hooks = require("../hooks");
 var import_utils = require("../utils");
 var import_flowModel = require("./flowModel");
 function FieldPlaceholder() {
+  const { t } = (0, import_react_i18next.useTranslation)();
   return /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, null, /* @__PURE__ */ import_react.default.createElement(
     import_antd.Card,
     {
@@ -61,7 +62,9 @@ function FieldPlaceholder() {
         }
       }
     },
-    "\u8BE5\u5B57\u6BB5\u5DF2\u88AB\u9690\u85CF\uFF0C\u4F60\u65E0\u6CD5\u67E5\u770B\uFF08\u8BE5\u5185\u5BB9\u4EC5\u5728\u6FC0\u6D3B UI Editor \u65F6\u663E\u793A\uFF09\u3002"
+    t(
+      "This field has been hidden and you cannot view it (this content is only visible when the UI Editor is activated)."
+    )
   ));
 }
 __name(FieldPlaceholder, "FieldPlaceholder");

package/lib/models/flowModel.js

@@ -620,10 +620,14 @@ const _FlowModel = class _FlowModel {
     if (isBeforeRender) {
       this._lastAutoRunParams = [inputArgs, execOptions.useCache];
     }
+    let finalInputArgs = inputArgs;
+    if (this.context.record) {
+      finalInputArgs = { record: this.context.record, ...inputArgs };
+    }
     if (options == null ? void 0 : options.debounce) {
-      return this._dispatchEventWithDebounce(eventName, inputArgs, execOptions);
+      return this._dispatchEventWithDebounce(eventName, finalInputArgs, execOptions);
     }
-    return this._dispatchEvent(eventName, inputArgs, execOptions);
+    return this._dispatchEvent(eventName, finalInputArgs, execOptions);
   }
   /**
    * 按事件名获取对应的流程集合（保持 getFlows 的顺序，即按 sort 排序）。
@@ -828,7 +832,7 @@ const _FlowModel = class _FlowModel {
     this.context.removeDelegate(this.parent.context);
   }
   addSubModel(subKey, options) {
-    var _a;
+    var _a, _b, _c;
     const actualParent = this["master"] || this;
     let model;
     if (options instanceof _FlowModel) {
@@ -855,10 +859,16 @@ const _FlowModel = class _FlowModel {
     model.sortIndex = maxSortIndex + 1;
     subModels[subKey].push(model);
     actualParent.emitter.emit("onSubModelAdded", model);
+    (_c = (_b = actualParent.flowEngine) == null ? void 0 : _b.emitter) == null ? void 0 : _c.emit("model:subModel:added", {
+      parentUid: actualParent.uid,
+      parent: actualParent,
+      subKey,
+      model
+    });
     return model;
   }
   setSubModel(subKey, options) {
-    var _a;
+    var _a, _b, _c;
     const actualParent = this["master"] || this;
     let model;
     if (options instanceof _FlowModel) {
@@ -879,6 +889,12 @@ const _FlowModel = class _FlowModel {
     model.setParent(actualParent);
     actualParent.subModels[subKey] = model;
     actualParent.emitter.emit("onSubModelAdded", model);
+    (_c = (_b = actualParent.flowEngine) == null ? void 0 : _b.emitter) == null ? void 0 : _c.emit("model:subModel:added", {
+      parentUid: actualParent.uid,
+      parent: actualParent,
+      subKey,
+      model
+    });
     return model;
   }
   filterSubModels(subKey, callback) {

package/lib/runjs-context/contexts/base.js

@@ -63,9 +63,20 @@ function defineBaseContextMeta() {
           language: "Current active language code."
         }
       },
-      React: "React namespace providing React library functions and hooks (available in RunJS environment)",
-      ReactDOM: "ReactDOM client API including createRoot for rendering React components",
-      antd: "Ant Design component library"
+      React: "React namespace providing React library functions and hooks (available in RunJS environment). Recommended access path: `ctx.libs.React`.",
+      ReactDOM: "ReactDOM client API including createRoot for rendering React components. Also available via `ctx.libs.ReactDOM`.",
+      antd: "Ant Design component library. Recommended access path: `ctx.libs.antd`.",
+      libs: {
+        description: "Namespace for third-party and shared libraries. Includes React, ReactDOM, Ant Design, and dayjs.",
+        detail: "Libraries namespace",
+        properties: {
+          React: "React namespace (same as ctx.React).",
+          ReactDOM: "ReactDOM client API (same as ctx.ReactDOM).",
+          antd: "Ant Design component library (same as ctx.antd).",
+          dayjs: "dayjs date-time utility library.",
+          antdIcons: "Ant Design icons library. Example: `ctx.libs.antdIcons.PlusOutlined`."
+        }
+      }
     },
     methods: {
       t: 'Internationalization function for translating text. Parameters: (key: string, variables?: object) => string. Example: `ctx.t("Hello {name}", { name: "World" })`',
@@ -141,9 +152,20 @@ function defineBaseContextMeta() {
             language: "\u5F53\u524D\u6FC0\u6D3B\u7684\u8BED\u8A00\u4EE3\u7801"
           }
         },
-        React: "React \u547D\u540D\u7A7A\u95F4\uFF0C\u63D0\u4F9B React \u51FD\u6570\u4E0E hooks\uFF08RunJS \u73AF\u5883\u4E2D\u53EF\u7528\uFF09",
-        ReactDOM: "ReactDOM \u5BA2\u6237\u7AEF API\uFF0C\u542B createRoot \u7B49\u6E32\u67D3\u65B9\u6CD5",
-        antd: "Ant Design \u7EC4\u4EF6\u5E93\uFF08RunJS \u73AF\u5883\u4E2D\u53EF\u7528\uFF09"
+        React: "React \u547D\u540D\u7A7A\u95F4\uFF0C\u63D0\u4F9B React \u51FD\u6570\u4E0E hooks\uFF08RunJS \u73AF\u5883\u4E2D\u53EF\u7528\uFF09\u3002\u63A8\u8350\u4F7F\u7528 `ctx.libs.React` \u8BBF\u95EE\u3002",
+        ReactDOM: "ReactDOM \u5BA2\u6237\u7AEF API\uFF0C\u542B createRoot \u7B49\u6E32\u67D3\u65B9\u6CD5\u3002\u63A8\u8350\u901A\u8FC7 `ctx.libs.ReactDOM` \u8BBF\u95EE\u3002",
+        antd: "Ant Design \u7EC4\u4EF6\u5E93\uFF08RunJS \u73AF\u5883\u4E2D\u53EF\u7528\uFF09\u3002\u63A8\u8350\u4F7F\u7528 `ctx.libs.antd` \u8BBF\u95EE\u3002",
+        libs: {
+          description: "\u7B2C\u4E09\u65B9/\u901A\u7528\u5E93\u7684\u7EDF\u4E00\u547D\u540D\u7A7A\u95F4\uFF0C\u5305\u542B React\u3001ReactDOM\u3001Ant Design\u3001dayjs \u7B49\u3002\u540E\u7EED\u65B0\u589E\u5E93\u4F1A\u4F18\u5148\u6302\u5728\u6B64\u5904\u3002",
+          detail: "\u901A\u7528\u5E93\u547D\u540D\u7A7A\u95F4",
+          properties: {
+            React: "React \u547D\u540D\u7A7A\u95F4\uFF08\u7B49\u4EF7\u4E8E ctx.React\uFF09\u3002",
+            ReactDOM: "ReactDOM \u5BA2\u6237\u7AEF API\uFF08\u7B49\u4EF7\u4E8E ctx.ReactDOM\uFF09\u3002",
+            antd: "Ant Design \u7EC4\u4EF6\u5E93\uFF08\u7B49\u4EF7\u4E8E ctx.antd\uFF09\u3002",
+            dayjs: "dayjs \u65E5\u671F\u65F6\u95F4\u5DE5\u5177\u5E93\u3002",
+            antdIcons: "Ant Design \u56FE\u6807\u5E93\u3002 \u4F8B\u5982\uFF1A`ctx.libs.antdIcons.PlusOutlined`\u3002"
+          }
+        }
       },
       methods: {
         t: '\u56FD\u9645\u5316\u51FD\u6570\uFF0C\u7528\u4E8E\u7FFB\u8BD1\u6587\u6848\u3002\u53C2\u6570\uFF1A(key: string, variables?: object) => string\u3002\u793A\u4F8B\uFF1A`ctx.t("\u4F60\u597D {name}", { name: "\u4E16\u754C" })`',

package/lib/runjs-context/snippets/index.js

@@ -61,6 +61,7 @@ const snippets = {
   // scene/block
   "scene/block/render-react": /* @__PURE__ */ __name(() => import("./scene/block/render-react.snippet"), "scene/block/render-react"),
   "scene/block/render-react-jsx": /* @__PURE__ */ __name(() => import("./scene/block/render-react-jsx.snippet"), "scene/block/render-react-jsx"),
+  "scene/block/render-antd-icons": /* @__PURE__ */ __name(() => import("./scene/block/render-antd-icons.snippet"), "scene/block/render-antd-icons"),
   "scene/block/render-button-handler": /* @__PURE__ */ __name(() => import("./scene/block/render-button-handler.snippet"), "scene/block/render-button-handler"),
   "scene/block/add-event-listener": /* @__PURE__ */ __name(() => import("./scene/block/add-event-listener.snippet"), "scene/block/add-event-listener"),
   "scene/block/chartjs-bar": /* @__PURE__ */ __name(() => import("./scene/block/chartjs-bar.snippet"), "scene/block/chartjs-bar"),

package/lib/runjs-context/snippets/scene/block/render-antd-icons.snippet.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 { SnippetModule } from '../../types';
+declare const snippet: SnippetModule;
+export default snippet;

package/lib/runjs-context/snippets/scene/block/render-antd-icons.snippet.js

@@ -0,0 +1,65 @@
+/**
+ * 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 __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 render_antd_icons_snippet_exports = {};
+__export(render_antd_icons_snippet_exports, {
+  default: () => render_antd_icons_snippet_default
+});
+module.exports = __toCommonJS(render_antd_icons_snippet_exports);
+var import_JSBlockRunJSContext = require("../../../contexts/JSBlockRunJSContext");
+const snippet = {
+  contexts: [import_JSBlockRunJSContext.JSBlockRunJSContext],
+  prefix: "sn-jsb-antd-icons",
+  label: "Render Ant Design icons",
+  description: "Render Ant Design icons with buttons inside the block container",
+  locales: {
+    "zh-CN": {
+      label: "\u6E32\u67D3 Ant Design \u56FE\u6807",
+      description: "\u5728\u533A\u5757\u5BB9\u5668\u4E2D\u4F7F\u7528 Ant Design \u56FE\u6807\u4E0E\u6309\u94AE\u8FDB\u884C\u6E32\u67D3"
+    }
+  },
+  content: `
+// Render Ant Design icons with buttons via ctx.libs
+const { React, antd, antdIcons } = ctx.libs;
+const { Button, Space } = antd;
+const { PlusOutlined, EditOutlined, DeleteOutlined } = antdIcons;
+
+const IconButtons = () => (
+  <Space style={{ padding: 12 }}>
+    <Button type="primary" icon={<PlusOutlined />}>
+      {ctx.t('Add')}
+    </Button>
+    <Button icon={<EditOutlined />}>{ctx.t('Edit')}</Button>
+    <Button danger icon={<DeleteOutlined />}>
+      {ctx.t('Delete')}
+    </Button>
+  </Space>
+);
+
+ctx.render(<IconButtons />);
+`
+};
+var render_antd_icons_snippet_default = snippet;

package/lib/runjs-context/snippets/scene/block/render-button-handler.snippet.js

@@ -42,7 +42,7 @@ const snippet = {
     }
   },
   content: `
-const { Button } = ctx.antd;
+const { Button } = ctx.libs.antd;
 
 ctx.render(
   <Button type="primary" onClick={() => ctx.message.success(ctx.t('Clicked!'))}>

package/lib/runjs-context/snippets/scene/block/render-info-card.snippet.js

@@ -42,7 +42,7 @@ const snippet = {
     }
   },
   content: `
-const { Card, Descriptions, Tag } = ctx.antd;
+const { Card, Descriptions, Tag } = ctx.libs.antd;
 
 if (!ctx.record) {
   ctx.render('<div style="padding:16px;color:#999;">' + ctx.t('No record data') + '</div>');

package/lib/runjs-context/snippets/scene/block/render-react-jsx.snippet.js

@@ -43,7 +43,7 @@ const snippet = {
   },
   content: `
 // Render a React component with JSX
-const { React } = ctx;
+const { React } = ctx.libs;
 
 const App = () => (
   <div style={{ padding: 12 }}>

package/lib/runjs-context/snippets/scene/block/render-react.snippet.js

@@ -43,7 +43,7 @@ const snippet = {
   },
   content: `
 // Render a React element into ctx.element via ReactDOM
-const { Button } = ctx.antd;
+const { Button } = ctx.libs.antd;
 
 ctx.render(
   <div style={{ padding: 12 }}>

package/lib/runjs-context/snippets/scene/block/render-statistics.snippet.js

@@ -42,7 +42,7 @@ const snippet = {
     }
   },
   content: `
-const { Card, Statistic, Row, Col } = ctx.antd;
+const { Card, Statistic, Row, Col } = ctx.libs.antd;
 
 const res = await ctx.api.request({
   url: 'users:list',

package/lib/runjs-context/snippets/scene/block/render-timeline.snippet.js

@@ -42,7 +42,7 @@ const snippet = {
     }
   },
   content: `
-const { Timeline, Card } = ctx.antd;
+const { Timeline, Card } = ctx.libs.antd;
 
 const res = await ctx.api.request({
   url: 'users:list',

package/lib/utils/index.d.ts

@@ -16,7 +16,7 @@ export { compileUiSchema, resolveStepUiSchema, resolveUiMode } from './schema-ut
 export { setupRuntimeContextSteps } from './setupRuntimeContextSteps';
 export { createCollectionContextMeta } from './createCollectionContextMeta';
 export { createAssociationAwareObjectMetaFactory, createAssociationSubpathResolver } from './associationObjectVariable';
-export { buildRecordMeta, collectContextParamsForTemplate, createCurrentRecordMetaFactory, createRecordMetaFactory, extractUsedVariableNames, extractUsedVariablePaths, inferRecordRef, type RecordParamsBuilder, } from './variablesParams';
+export { buildRecordMeta, collectContextParamsForTemplate, createCurrentRecordMetaFactory, createRecordResolveOnServerWithLocal, createRecordMetaFactory, extractUsedVariableNames, extractUsedVariablePaths, inferRecordRef, type RecordParamsBuilder, } from './variablesParams';
 export { extractPropertyPath, formatPathToVariable, isVariableExpression } from './context';
 export { clearAutoFlowError, getAutoFlowError, setAutoFlowError, type AutoFlowError } from './autoFlowError';
 export { parsePathnameToViewParams, type ViewParam } from './parsePathnameToViewParams';

package/lib/utils/index.js

@@ -42,6 +42,7 @@ __export(utils_exports, {
   createCurrentRecordMetaFactory: () => import_variablesParams.createCurrentRecordMetaFactory,
   createEphemeralContext: () => import_createEphemeralContext.createEphemeralContext,
   createRecordMetaFactory: () => import_variablesParams.createRecordMetaFactory,
+  createRecordResolveOnServerWithLocal: () => import_variablesParams.createRecordResolveOnServerWithLocal,
   createSafeDocument: () => import_safeGlobals.createSafeDocument,
   createSafeNavigator: () => import_safeGlobals.createSafeNavigator,
   createSafeWindow: () => import_safeGlobals.createSafeWindow,
@@ -106,6 +107,7 @@ var import_flows = require("./flows");
   createCurrentRecordMetaFactory,
   createEphemeralContext,
   createRecordMetaFactory,
+  createRecordResolveOnServerWithLocal,
   createSafeDocument,
   createSafeNavigator,
   createSafeWindow,

package/lib/utils/variablesParams.d.ts

@@ -13,6 +13,19 @@ import { type RecordRef, type ServerContextParams } from '../utils/serverContext
 import type { JSONValue } from './params-resolvers';
 export declare function inferRecordRef(ctx: FlowContext): RecordRef | undefined;
 export declare function inferViewRecordRef(ctx: FlowContext): RecordRef | undefined;
+export declare function getViewRecordFromParent(flowContext: FlowContext, viewContext: FlowContext): unknown;
+export declare function createViewRecordResolveOnServer(ctx: FlowContext, getLocalRecord: () => unknown): (subPath: string) => boolean;
+/**
+ * 创建一个用于 “ctx.record” 变量的 resolveOnServer 判定函数：
+ * - 若本地 record 不存在：统一走服务端；
+ * - 若本地 record 存在：
+ *   - 访问空子路径（"{{ ctx.record }}"）时使用本地值，不走服务端；
+ *   - 访问非关联字段（如 id/title）：使用本地值；
+ *   - 访问关联字段：
+ *     - 若本地该字段无值（undefined/null），则交给服务端解析（无论是 "author" 还是 "author.name"）；
+ *     - 若本地已有值，则仅在访问子属性且本地缺少该子属性值时交给服务端。
+ */
+export declare function createRecordResolveOnServerWithLocal(collectionAccessor: () => Collection | null, valueAccessor: () => unknown): (subPath: string) => boolean;
 export declare function inferParentRecordRef(ctx: FlowContext): RecordRef | undefined;
 export type RecordParamsBuilder = (ctx: FlowContext) => RecordRef | Promise<RecordRef> | undefined;
 /**

package/lib/utils/variablesParams.js

@@ -7,9 +7,11 @@
  * 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) => {
@@ -24,6 +26,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   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 variablesParams_exports = {};
 __export(variablesParams_exports, {
@@ -31,8 +41,11 @@ __export(variablesParams_exports, {
   collectContextParamsForTemplate: () => collectContextParamsForTemplate,
   createCurrentRecordMetaFactory: () => createCurrentRecordMetaFactory,
   createRecordMetaFactory: () => createRecordMetaFactory,
+  createRecordResolveOnServerWithLocal: () => createRecordResolveOnServerWithLocal,
+  createViewRecordResolveOnServer: () => createViewRecordResolveOnServer,
   extractUsedVariableNames: () => extractUsedVariableNames,
   extractUsedVariablePaths: () => extractUsedVariablePaths,
+  getViewRecordFromParent: () => getViewRecordFromParent,
   inferParentRecordRef: () => inferParentRecordRef,
   inferRecordRef: () => inferRecordRef,
   inferViewRecordRef: () => inferViewRecordRef
@@ -41,6 +54,8 @@ module.exports = __toCommonJS(variablesParams_exports);
 var import_shared = require("@nocobase/shared");
 var import_serverContextParams = require("../utils/serverContextParams");
 var import_createCollectionContextMeta = require("./createCollectionContextMeta");
+var import_associationObjectVariable = require("./associationObjectVariable");
+var import_lodash = __toESM(require("lodash"));
 function isObject(value) {
   return typeof value === "object" && value !== null;
 }
@@ -85,6 +100,73 @@ function inferViewRecordRef(ctx) {
   return { collection, dataSourceKey, filterByTk, sourceId };
 }
 __name(inferViewRecordRef, "inferViewRecordRef");
+function getViewRecordFromParent(flowContext, viewContext) {
+  var _a, _b, _c;
+  const parentRecord = (_a = flowContext.inputArgs) == null ? void 0 : _a.record;
+  const parentTk = (_b = flowContext.collection) == null ? void 0 : _b.filterTargetKey;
+  if (!parentRecord || !parentTk) return void 0;
+  const view = viewContext.view;
+  const viewFilterByTk = (_c = view == null ? void 0 : view.inputArgs) == null ? void 0 : _c.filterByTk;
+  const recordFilterByTk = parentRecord[parentTk];
+  if (viewFilterByTk == null || recordFilterByTk == null) return void 0;
+  if (viewFilterByTk !== recordFilterByTk) return void 0;
+  return import_lodash.default.cloneDeep(parentRecord);
+}
+__name(getViewRecordFromParent, "getViewRecordFromParent");
+function createViewRecordResolveOnServer(ctx, getLocalRecord) {
+  return (p) => {
+    var _a, _b, _c, _d;
+    if (!(p === "record" || p.startsWith("record."))) return false;
+    const local = getLocalRecord();
+    if (!local) return true;
+    if (p === "record") return false;
+    const ref = inferViewRecordRef(ctx);
+    const colName = ref == null ? void 0 : ref.collection;
+    const dsKey = (ref == null ? void 0 : ref.dataSourceKey) || "main";
+    if (!colName) return true;
+    const ds = (_b = (_a = ctx.dataSourceManager) == null ? void 0 : _a.getDataSource) == null ? void 0 : _b.call(_a, dsKey);
+    const collection = (_d = (_c = ds == null ? void 0 : ds.collectionManager) == null ? void 0 : _c.getCollection) == null ? void 0 : _d.call(_c, colName);
+    if (!collection) return true;
+    const resolver = (0, import_associationObjectVariable.createAssociationSubpathResolver)(
+      () => collection,
+      () => local
+    );
+    const subPath = p.startsWith("record.") ? p.slice("record.".length) : "";
+    if (!subPath) return false;
+    return resolver(subPath);
+  };
+}
+__name(createViewRecordResolveOnServer, "createViewRecordResolveOnServer");
+function createRecordResolveOnServerWithLocal(collectionAccessor, valueAccessor) {
+  const assocSubpathResolver = (0, import_associationObjectVariable.createAssociationSubpathResolver)(collectionAccessor, () => valueAccessor());
+  return (p) => {
+    var _a;
+    const local = valueAccessor();
+    if (!local) return true;
+    if (!p) return false;
+    const collection = collectionAccessor();
+    if (!p.includes(".")) {
+      const name = p;
+      let field;
+      if (collection) {
+        if (typeof collection.getField === "function") {
+          field = collection.getField(name);
+        }
+        if (!field && typeof collection.getFields === "function") {
+          const fields = collection.getFields() || [];
+          field = fields.find((f) => (f == null ? void 0 : f.name) === name);
+        }
+      }
+      const isAssoc = !!((_a = field == null ? void 0 : field.isAssociationField) == null ? void 0 : _a.call(field));
+      if (!isAssoc) return false;
+      const value = local == null ? void 0 : local[name];
+      if (value === void 0 || value === null) return true;
+      return false;
+    }
+    return assocSubpathResolver(p);
+  };
+}
+__name(createRecordResolveOnServerWithLocal, "createRecordResolveOnServerWithLocal");
 function inferParentRecordRef(ctx) {
   var _a, _b, _c, _d;
   const resource = getResource(ctx);
@@ -153,8 +235,11 @@ __name(collectContextParamsForTemplate, "collectContextParamsForTemplate");
   collectContextParamsForTemplate,
   createCurrentRecordMetaFactory,
   createRecordMetaFactory,
+  createRecordResolveOnServerWithLocal,
+  createViewRecordResolveOnServer,
   extractUsedVariableNames,
   extractUsedVariablePaths,
+  getViewRecordFromParent,
   inferParentRecordRef,
   inferRecordRef,
   inferViewRecordRef

package/lib/views/useDialog.d.ts

@@ -28,5 +28,6 @@ export declare function useDialog(): (React.JSX.Element | {
             extra?: React.ReactNode;
         }) => void;
         navigation: any;
+        readonly record: unknown;
     };
 })[];

package/lib/views/useDialog.js

@@ -50,6 +50,7 @@ var import_DialogComponent = __toESM(require("./DialogComponent"));
 var import_usePatchElement = __toESM(require("./usePatchElement"));
 var import_provider = require("../provider");
 var import_ViewScopedFlowEngine = require("../ViewScopedFlowEngine");
+var import_variablesParams = require("../utils/variablesParams");
 let uuid = 0;
 function useDialog() {
   const holderRef = React.useRef(null);
@@ -90,6 +91,15 @@ function useDialog() {
       }, [props]);
       return null;
     }, "HeaderComponent");
+    const ctx = new import_flowContext.FlowContext();
+    const scopedEngine = (0, import_ViewScopedFlowEngine.createViewScopedEngine)(flowContext.engine);
+    ctx.defineProperty("engine", { value: scopedEngine });
+    ctx.addDelegate(scopedEngine.context);
+    if (config.inheritContext !== false) {
+      ctx.addDelegate(flowContext);
+    } else {
+      ctx.addDelegate(flowContext.engine.context);
+    }
     const currentDialog = {
       type: "dialog",
       inputArgs: config.inputArgs || {},
@@ -123,21 +133,15 @@ function useDialog() {
         currentHeader = header;
         (_a2 = dialogRef.current) == null ? void 0 : _a2.setHeader(header);
       }, "setHeader"),
-      navigation: (_a = config.inputArgs) == null ? void 0 : _a.navigation
+      navigation: (_a = config.inputArgs) == null ? void 0 : _a.navigation,
+      get record() {
+        return (0, import_variablesParams.getViewRecordFromParent)(flowContext, ctx);
+      }
     };
-    const ctx = new import_flowContext.FlowContext();
-    const scopedEngine = (0, import_ViewScopedFlowEngine.createViewScopedEngine)(flowContext.engine);
-    ctx.defineProperty("engine", { value: scopedEngine });
-    ctx.addDelegate(scopedEngine.context);
-    if (config.inheritContext !== false) {
-      ctx.addDelegate(flowContext);
-    } else {
-      ctx.addDelegate(flowContext.engine.context);
-    }
     ctx.defineProperty("view", {
       get: /* @__PURE__ */ __name(() => currentDialog, "get"),
       // meta: createViewMeta(ctx),
-      resolveOnServer: /* @__PURE__ */ __name((p) => p === "record" || p.startsWith("record."), "resolveOnServer")
+      resolveOnServer: (0, import_variablesParams.createViewRecordResolveOnServer)(ctx, () => (0, import_variablesParams.getViewRecordFromParent)(flowContext, ctx))
     });
     (0, import_createViewMeta.registerPopupVariable)(ctx, currentDialog);
     const DialogWithContext = (0, import__.observer)(

package/lib/views/useDrawer.d.ts

@@ -29,5 +29,6 @@ export declare function useDrawer(): (React.JSX.Element | {
             extra?: React.ReactNode;
         }) => void;
         navigation: any;
+        readonly record: unknown;
     };
 })[];