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

package/lib/views/createViewMeta.js

@@ -27,7 +27,10 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var createViewMeta_exports = {};
 __export(createViewMeta_exports, {
-  createViewMeta: () => createViewMeta
+  buildPopupRuntime: () => buildPopupRuntime,
+  createPopupMeta: () => createPopupMeta,
+  createViewMeta: () => createViewMeta,
+  registerPopupVariable: () => registerPopupVariable
 });
 module.exports = __toCommonJS(createViewMeta_exports);
 var import_variablesParams = require("../utils/variablesParams");
@@ -79,93 +82,356 @@ function makeMetaFromValue(value, title, seen) {
   return { type: "any", title };
 }
 __name(makeMetaFromValue, "makeMetaFromValue");
-function buildNavigationMeta(ctx, getView) {
-  const t = /* @__PURE__ */ __name((key) => {
-    var _a;
-    return ((_a = ctx == null ? void 0 : ctx.t) == null ? void 0 : _a.call(ctx, key)) || key;
-  }, "t");
-  return {
-    type: "object",
-    title: t("\u5BFC\u822A"),
-    properties: /* @__PURE__ */ __name(async () => {
-      const view = getView();
-      const nav = view == null ? void 0 : view.navigation;
-      const props = {};
-      const stack = Array.isArray(nav == null ? void 0 : nav.viewStack) ? nav.viewStack : [];
-      const stackMeta = {
-        type: "array",
-        title: t("\u89C6\u56FE\u5806\u6808"),
-        properties: void 0
-      };
-      if (stack.length) {
-        const children = {};
-        const max = Math.min(stack.length, 20);
-        for (let i = 0; i < max; i++) {
-          const item = stack[i] || {};
-          children[String(i)] = {
-            type: "object",
-            title: `#${i}`,
-            properties: {
-              viewUid: { type: "string", title: "viewUid" },
-              tabUid: { type: "string", title: "tabUid" },
-              filterByTk: { type: "string", title: "filterByTk" },
-              sourceId: { type: "string", title: "sourceId" }
-            }
+function createViewMeta(ctx) {
+  const viewTitle = ctx.t("\u5F53\u524D\u89C6\u56FE");
+  const factory = /* @__PURE__ */ __name(async () => {
+    const view = ctx.view;
+    return {
+      type: "object",
+      title: ctx.t("\u5F53\u524D\u89C6\u56FE"),
+      buildVariablesParams: /* @__PURE__ */ __name((c) => {
+        const params = (0, import_variablesParams.inferViewRecordRef)(c);
+        if (params) {
+          return {
+            record: params
           };
         }
-        stackMeta.properties = children;
-      }
-      props.viewStack = stackMeta;
-      return props;
-    }, "properties")
-  };
+        return void 0;
+      }, "buildVariablesParams"),
+      properties: /* @__PURE__ */ __name(async () => {
+        var _a, _b, _c;
+        const props = {};
+        const refNow = (0, import_variablesParams.inferViewRecordRef)(ctx);
+        if (refNow && refNow.collection) {
+          const recordFactory = /* @__PURE__ */ __name(async () => {
+            var _a2, _b2, _c2, _d;
+            try {
+              const ref = (0, import_variablesParams.inferViewRecordRef)(ctx);
+              if (!(ref == null ? void 0 : ref.collection)) return null;
+              const dsKey = ref.dataSourceKey || "main";
+              const ds = (_b2 = (_a2 = ctx.dataSourceManager) == null ? void 0 : _a2.getDataSource) == null ? void 0 : _b2.call(_a2, dsKey);
+              const col = (_d = (_c2 = ds == null ? void 0 : ds.collectionManager) == null ? void 0 : _c2.getCollection) == null ? void 0 : _d.call(_c2, ref.collection);
+              if (!col) return null;
+              return await (0, import_variablesParams.buildRecordMeta)(
+                () => col,
+                ctx.t("\u5F53\u524D\u89C6\u56FE\u8BB0\u5F55"),
+                (c) => (0, import_variablesParams.inferViewRecordRef)(c)
+              );
+            } catch (e) {
+              return null;
+            }
+          }, "recordFactory");
+          recordFactory.title = ctx.t("\u5F53\u524D\u89C6\u56FE\u8BB0\u5F55");
+          recordFactory.hasChildren = true;
+          props.record = recordFactory;
+        }
+        props.type = { type: "string", title: ((_a = ctx.t) == null ? void 0 : _a.call(ctx, "\u7C7B\u578B")) || "\u7C7B\u578B" };
+        props.preventClose = { type: "boolean", title: ((_b = ctx.t) == null ? void 0 : _b.call(ctx, "\u662F\u5426\u5141\u8BB8\u5173\u95ED")) || "\u662F\u5426\u5141\u8BB8\u5173\u95ED" };
+        props.inputArgs = makeMetaFromValue(view == null ? void 0 : view.inputArgs, ((_c = ctx.t) == null ? void 0 : _c.call(ctx, "\u8F93\u5165\u53C2\u6570")) || "\u8F93\u5165\u53C2\u6570");
+        return props;
+      }, "properties")
+    };
+  }, "factory");
+  factory.title = viewTitle;
+  return factory;
 }
-__name(buildNavigationMeta, "buildNavigationMeta");
-function createViewMeta(ctx, getView) {
-  var _a;
-  const viewTitle = ((_a = ctx == null ? void 0 : ctx.t) == null ? void 0 : _a.call(ctx, "\u5F53\u524D\u89C6\u56FE")) || "\u5F53\u524D\u89C6\u56FE";
-  const factory = /* @__PURE__ */ __name(async () => {
-    var _a2;
-    const recordMeta = await (0, import_variablesParams.buildRecordMeta)(
-      () => {
-        var _a3, _b, _c, _d;
+__name(createViewMeta, "createViewMeta");
+function createPopupMeta(ctx, anchorView) {
+  const t = /* @__PURE__ */ __name((k) => ctx.t(k), "t");
+  const resolveRecordRef = /* @__PURE__ */ __name(async (flowCtx) => {
+    const view = anchorView ?? flowCtx.view;
+    if (view) {
+      const base = await buildPopupRuntime(flowCtx, view);
+      const res = base == null ? void 0 : base.resource;
+      if ((res == null ? void 0 : res.collectionName) && res.filterByTk != null) {
+        return {
+          collection: res.collectionName,
+          dataSourceKey: res.dataSourceKey || "main",
+          filterByTk: res.filterByTk
+        };
+      }
+    }
+    return (0, import_variablesParams.inferViewRecordRef)(flowCtx);
+  }, "resolveRecordRef");
+  const getCurrentCollection = /* @__PURE__ */ __name(async () => {
+    var _a, _b, _c, _d;
+    const ref = await resolveRecordRef(ctx);
+    if (!(ref == null ? void 0 : ref.collection)) return null;
+    const ds = (_b = (_a = ctx.dataSourceManager) == null ? void 0 : _a.getDataSource) == null ? void 0 : _b.call(_a, ref.dataSourceKey || "main");
+    return ((_d = (_c = ds == null ? void 0 : ds.collectionManager) == null ? void 0 : _c.getCollection) == null ? void 0 : _d.call(_c, ref.collection)) || null;
+  }, "getCurrentCollection");
+  const getParentRecordRef = /* @__PURE__ */ __name(async (level, flowCtx) => {
+    var _a, _b, _c, _d, _e, _f, _g, _h;
+    try {
+      const useCtx = flowCtx || ctx;
+      const nav = (_a = useCtx.view) == null ? void 0 : _a.navigation;
+      const stack = Array.isArray(nav == null ? void 0 : nav.viewStack) ? nav.viewStack : [];
+      if (stack.length < 2 || level < 1) return void 0;
+      const idx = stack.length - 1 - level;
+      if (idx < 0) return void 0;
+      const parent = stack[idx];
+      if (!(parent == null ? void 0 : parent.viewUid)) return void 0;
+      let model = (_c = (_b = useCtx.engine) == null ? void 0 : _b.getModel) == null ? void 0 : _c.call(_b, parent.viewUid);
+      if (!model) {
         try {
-          const ref = (0, import_variablesParams.inferRecordRef)(ctx);
-          if (!(ref == null ? void 0 : ref.collection)) return null;
-          const ds = (_b = (_a3 = ctx.dataSourceManager) == null ? void 0 : _a3.getDataSource) == null ? void 0 : _b.call(_a3, ref.dataSourceKey || "main");
-          return ((_d = (_c = ds == null ? void 0 : ds.collectionManager) == null ? void 0 : _c.getCollection) == null ? void 0 : _d.call(_c, ref.collection)) || null;
+          model = await useCtx.engine.loadModel({ uid: parent.viewUid });
         } catch (e) {
-          return null;
+          (_e = (_d = useCtx.logger || ctx.logger) == null ? void 0 : _d.warn) == null ? void 0 : _e.call(_d, { err: e }, "[FlowEngine] popup.getParentRecordRef loadModel failed");
         }
-      },
-      ((_a2 = ctx == null ? void 0 : ctx.t) == null ? void 0 : _a2.call(ctx, "\u5F53\u524D\u89C6\u56FE\u8BB0\u5F55")) || "\u5F53\u524D\u89C6\u56FE\u8BB0\u5F55",
-      (c) => (0, import_variablesParams.inferRecordRef)(c)
-    );
-    const view = getView();
-    return {
+      }
+      const params = ((_f = model == null ? void 0 : model.getStepParams) == null ? void 0 : _f.call(model, "popupSettings", "openView")) || {};
+      const collection = params == null ? void 0 : params.collectionName;
+      const dataSourceKey = (params == null ? void 0 : params.dataSourceKey) || "main";
+      const filterByTk = (parent == null ? void 0 : parent.filterByTk) ?? (parent == null ? void 0 : parent.sourceId);
+      if (!collection || typeof filterByTk === "undefined" || filterByTk === null) return void 0;
+      return { collection, dataSourceKey, filterByTk };
+    } catch (e) {
+      (_h = (_g = (flowCtx == null ? void 0 : flowCtx.logger) || ctx.logger) == null ? void 0 : _g.warn) == null ? void 0 : _h.call(_g, { err: e }, "[FlowEngine] popup.getParentRecordRef failed");
+      return void 0;
+    }
+  }, "getParentRecordRef");
+  const hasParentNow = /* @__PURE__ */ __name((level) => {
+    var _a;
+    try {
+      const nav = (_a = anchorView ?? ctx.view) == null ? void 0 : _a.navigation;
+      const stack = Array.isArray(nav == null ? void 0 : nav.viewStack) ? nav.viewStack : [];
+      return stack.length >= level + 1;
+    } catch (_) {
+      return false;
+    }
+  }, "hasParentNow");
+  const createParentFactory = /* @__PURE__ */ __name((level) => {
+    const factory2 = /* @__PURE__ */ __name(() => {
+      const meta = {
+        type: "object",
+        title: t("Parent popup"),
+        disabled: /* @__PURE__ */ __name(() => !hasParentNow(level), "disabled"),
+        disabledReason: /* @__PURE__ */ __name(() => !hasParentNow(level) ? t("No parent popup") : void 0, "disabledReason"),
+        properties: /* @__PURE__ */ __name(async () => {
+          const parentRef = await getParentRecordRef(level);
+          const props = {};
+          props.uid = { type: "string", title: t("Popup uid") };
+          if (parentRef) {
+            const parentCollection = (() => {
+              var _a, _b, _c, _d;
+              try {
+                const ds = (_b = (_a = ctx.dataSourceManager) == null ? void 0 : _a.getDataSource) == null ? void 0 : _b.call(_a, parentRef.dataSourceKey || "main");
+                return ((_d = (_c = ds == null ? void 0 : ds.collectionManager) == null ? void 0 : _c.getCollection) == null ? void 0 : _d.call(_c, parentRef.collection || "")) || null;
+              } catch (_) {
+                return null;
+              }
+            })();
+            const base = await (0, import_variablesParams.buildRecordMeta)(
+              () => parentCollection,
+              t("Popup record"),
+              () => parentRef
+            );
+            props.record = base || { type: "object", title: t("Popup record") };
+          } else {
+            props.record = { type: "object", title: t("Popup record") };
+          }
+          const resourceMeta = {
+            type: "object",
+            title: t("Data source"),
+            properties: /* @__PURE__ */ __name(async () => ({
+              dataSourceKey: { type: "string", title: t("Data source key") },
+              collectionName: { type: "string", title: t("Collection name") },
+              filterByTk: { type: "string", title: t("filterByTk") },
+              sourceId: { type: "string", title: t("sourceId") }
+            }), "properties")
+          };
+          props.resource = resourceMeta;
+          return props;
+        }, "properties")
+      };
+      return meta;
+    }, "factory");
+    factory2.title = t("Parent popup");
+    return factory2;
+  }, "createParentFactory");
+  const factory = /* @__PURE__ */ __name(() => {
+    const meta = {
       type: "object",
-      title: viewTitle,
-      buildVariablesParams: /* @__PURE__ */ __name((c) => {
-        const ref = (0, import_variablesParams.inferRecordRef)(c);
-        return ref ? { record: ref } : void 0;
+      title: t("Current popup"),
+      buildVariablesParams: /* @__PURE__ */ __name(async (c) => {
+        var _a, _b, _c, _d, _e, _f;
+        const ref = await resolveRecordRef(c);
+        const inputArgs = (_a = c.view) == null ? void 0 : _a.inputArgs;
+        const params = {};
+        if (ref) params.record = ref;
+        try {
+          const nav = (_b = c.view) == null ? void 0 : _b.navigation;
+          const stack = Array.isArray(nav == null ? void 0 : nav.viewStack) ? nav.viewStack : [];
+          if (stack.length >= 2) {
+            let cur = params;
+            let level = 1;
+            let parentRef = await getParentRecordRef(level, c);
+            while (parentRef) {
+              if (!cur.parent) cur.parent = {};
+              cur.parent.record = parentRef;
+              cur = cur.parent;
+              level += 1;
+              parentRef = await getParentRecordRef(level, c);
+            }
+          }
+        } catch (err) {
+          (_d = (_c = c.logger) == null ? void 0 : _c.debug) == null ? void 0 : _d.call(_c, { err }, "[FlowEngine] buildVariablesParams: build parent-chain failed");
+        }
+        try {
+          const srcId = inputArgs == null ? void 0 : inputArgs.sourceId;
+          const assoc = inputArgs == null ? void 0 : inputArgs.associationName;
+          const dsKey = (inputArgs == null ? void 0 : inputArgs.dataSourceKey) || "main";
+          if (srcId != null && srcId !== "" && assoc && typeof assoc === "string") {
+            const parentCollectionName = String(assoc).split(".")[0];
+            if (parentCollectionName) {
+              params.sourceRecord = {
+                collection: parentCollectionName,
+                dataSourceKey: dsKey,
+                filterByTk: srcId
+              };
+            }
+          }
+        } catch (err) {
+          (_f = (_e = c.logger) == null ? void 0 : _e.debug) == null ? void 0 : _f.call(_e, { err }, "[FlowEngine] buildVariablesParams: infer sourceRecord failed");
+        }
+        return params;
       }, "buildVariablesParams"),
       properties: /* @__PURE__ */ __name(async () => {
-        var _a3, _b, _c;
+        var _a, _b, _c, _d, _e, _f, _g;
         const props = {};
-        if (recordMeta) props.record = recordMeta;
-        props.type = { type: "string", title: ((_a3 = ctx == null ? void 0 : ctx.t) == null ? void 0 : _a3.call(ctx, "\u7C7B\u578B")) || "\u7C7B\u578B" };
-        props.preventClose = { type: "boolean", title: ((_b = ctx == null ? void 0 : ctx.t) == null ? void 0 : _b.call(ctx, "\u662F\u5426\u5141\u8BB8\u5173\u95ED")) || "\u662F\u5426\u5141\u8BB8\u5173\u95ED" };
-        props.inputArgs = makeMetaFromValue(view == null ? void 0 : view.inputArgs, ((_c = ctx == null ? void 0 : ctx.t) == null ? void 0 : _c.call(ctx, "\u8F93\u5165\u53C2\u6570")) || "\u8F93\u5165\u53C2\u6570");
-        props.navigation = buildNavigationMeta(ctx, getView);
+        props.uid = { type: "string", title: t("Popup uid") };
+        const recordFactory = /* @__PURE__ */ __name(async () => {
+          const col = await getCurrentCollection();
+          if (!col) return null;
+          return await (0, import_variablesParams.buildRecordMeta)(
+            () => col,
+            t("Current popup record"),
+            (c) => resolveRecordRef(c)
+          );
+        }, "recordFactory");
+        recordFactory.title = t("Current popup record");
+        recordFactory.hasChildren = true;
+        props.record = recordFactory;
+        try {
+          const inputArgs = (_a = ctx.view) == null ? void 0 : _a.inputArgs;
+          const srcId = inputArgs == null ? void 0 : inputArgs.sourceId;
+          let assoc = inputArgs == null ? void 0 : inputArgs.associationName;
+          let dsKey = (inputArgs == null ? void 0 : inputArgs.dataSourceKey) || "main";
+          if (!assoc || typeof assoc !== "string" || !assoc.includes(".")) {
+            const nav = (_b = ctx.view) == null ? void 0 : _b.navigation;
+            const stack = Array.isArray(nav == null ? void 0 : nav.viewStack) ? nav.viewStack : [];
+            const last = stack == null ? void 0 : stack[stack.length - 1];
+            if (last == null ? void 0 : last.viewUid) {
+              let model = (_d = (_c = ctx == null ? void 0 : ctx.engine) == null ? void 0 : _c.getModel) == null ? void 0 : _d.call(_c, last.viewUid);
+              if (!model) {
+                model = await ctx.engine.loadModel({ uid: last.viewUid });
+              }
+              const p = ((_e = model == null ? void 0 : model.getStepParams) == null ? void 0 : _e.call(model, "popupSettings", "openView")) || {};
+              assoc = (p == null ? void 0 : p.associationName) || assoc;
+              dsKey = (p == null ? void 0 : p.dataSourceKey) || dsKey;
+            }
+          }
+          if (srcId != null && srcId !== "" && assoc && typeof assoc === "string") {
+            const parentCollectionName = String(assoc).includes(".") ? String(assoc).split(".")[0] : void 0;
+            if (parentCollectionName) {
+              const parentCollectionAccessor = /* @__PURE__ */ __name(() => {
+                var _a2, _b2, _c2, _d2;
+                try {
+                  const ds = (_b2 = (_a2 = ctx.dataSourceManager) == null ? void 0 : _a2.getDataSource) == null ? void 0 : _b2.call(_a2, dsKey);
+                  return ((_d2 = (_c2 = ds == null ? void 0 : ds.collectionManager) == null ? void 0 : _c2.getCollection) == null ? void 0 : _d2.call(_c2, parentCollectionName)) || null;
+                } catch (_) {
+                  return null;
+                }
+              }, "parentCollectionAccessor");
+              const srcMeta = await (0, import_variablesParams.buildRecordMeta)(parentCollectionAccessor, t("Current popup parent record"), () => ({
+                collection: parentCollectionName,
+                dataSourceKey: dsKey,
+                filterByTk: srcId
+              }));
+              if (srcMeta) {
+                props.sourceRecord = srcMeta;
+              }
+            }
+          }
+        } catch (err) {
+          (_g = (_f = ctx.logger) == null ? void 0 : _f.debug) == null ? void 0 : _g.call(_f, { err }, "[FlowEngine] popup.properties: build sourceRecord failed");
+        }
+        const resourceMeta = {
+          type: "object",
+          title: t("Data source"),
+          properties: /* @__PURE__ */ __name(async () => ({
+            dataSourceKey: { type: "string", title: t("Data source key") },
+            collectionName: { type: "string", title: t("Collection name") },
+            filterByTk: { type: "string", title: t("filterByTk") },
+            sourceId: { type: "string", title: t("sourceId") }
+          }), "properties")
+        };
+        props.resource = resourceMeta;
+        const parentRef1 = await getParentRecordRef(1);
+        if (parentRef1) {
+          props.parent = createParentFactory(1);
+        }
         return props;
       }, "properties")
     };
+    return meta;
   }, "factory");
-  factory.title = viewTitle;
+  factory.title = t("Current popup");
+  factory.sort = 975;
   return factory;
 }
-__name(createViewMeta, "createViewMeta");
+__name(createPopupMeta, "createPopupMeta");
+async function buildPopupRuntime(ctx, view) {
+  var _a, _b;
+  const nav = view == null ? void 0 : view.navigation;
+  const stack = Array.isArray(nav == null ? void 0 : nav.viewStack) ? nav.viewStack : [];
+  const buildNode = /* @__PURE__ */ __name(async (idx) => {
+    var _a2, _b2, _c, _d, _e, _f, _g;
+    if (idx < 0 || !((_a2 = stack[idx]) == null ? void 0 : _a2.viewUid)) return void 0;
+    const viewUid = stack[idx].viewUid;
+    let model = (_c = (_b2 = ctx.engine) == null ? void 0 : _b2.getModel) == null ? void 0 : _c.call(_b2, viewUid);
+    if (!model) {
+      model = await ((_d = ctx.engine) == null ? void 0 : _d.loadModel({ uid: viewUid }));
+    }
+    const p = ((_e = model == null ? void 0 : model.getStepParams) == null ? void 0 : _e.call(model, "popupSettings", "openView")) || {};
+    const collectionName = p == null ? void 0 : p.collectionName;
+    const dataSourceKey = (p == null ? void 0 : p.dataSourceKey) || "main";
+    const node = {
+      uid: viewUid,
+      resource: {
+        dataSourceKey,
+        collectionName,
+        filterByTk: (_f = stack[idx]) == null ? void 0 : _f.filterByTk,
+        sourceId: (_g = stack[idx]) == null ? void 0 : _g.sourceId
+      }
+    };
+    const parentNode = await buildNode(idx - 1);
+    if (parentNode) node.parent = parentNode;
+    return node;
+  }, "buildNode");
+  const currentNode = await buildNode((((_b = (_a = view == null ? void 0 : view.navigation) == null ? void 0 : _a.viewStack) == null ? void 0 : _b.length) || 1) - 1);
+  return currentNode;
+}
+__name(buildPopupRuntime, "buildPopupRuntime");
+function registerPopupVariable(ctx, view) {
+  const POPUP_SERVER_PATH_RE = /^(?:record|sourceRecord)(?:\.|$)|^parent(?:\.parent)*(?:\.(?:record|sourceRecord))(?:\.|$)/;
+  ctx.defineProperty("popup", {
+    get: /* @__PURE__ */ __name(async () => buildPopupRuntime(ctx, view), "get"),
+    meta: createPopupMeta(ctx, view),
+    resolveOnServer: /* @__PURE__ */ __name((p) => {
+      try {
+        return !!p && POPUP_SERVER_PATH_RE.test(p);
+      } catch (_) {
+        return false;
+      }
+    }, "resolveOnServer")
+  });
+}
+__name(registerPopupVariable, "registerPopupVariable");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  createViewMeta
+  buildPopupRuntime,
+  createPopupMeta,
+  createViewMeta,
+  registerPopupVariable
 });

package/lib/views/index.d.ts

@@ -11,3 +11,4 @@ export { useDrawer } from './useDrawer';
 export { usePage } from './usePage';
 export { usePopover } from './usePopover';
 export { ViewNavigation } from './ViewNavigation';
+export { createViewMeta } from './createViewMeta';

package/lib/views/index.js

@@ -27,6 +27,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var views_exports = {};
 __export(views_exports, {
   ViewNavigation: () => import_ViewNavigation.ViewNavigation,
+  createViewMeta: () => import_createViewMeta.createViewMeta,
   useDialog: () => import_useDialog.useDialog,
   useDrawer: () => import_useDrawer.useDrawer,
   usePage: () => import_usePage.usePage,
@@ -38,9 +39,11 @@ var import_useDrawer = require("./useDrawer");
 var import_usePage = require("./usePage");
 var import_usePopover = require("./usePopover");
 var import_ViewNavigation = require("./ViewNavigation");
+var import_createViewMeta = require("./createViewMeta");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ViewNavigation,
+  createViewMeta,
   useDialog,
   useDrawer,
   usePage,

package/lib/views/useDialog.d.ts

@@ -9,24 +9,25 @@
 import * as React from 'react';
 export declare function useDialog(): (React.JSX.Element | {
     open: (config: any, flowContext: any) => Promise<unknown> & {
-        type: string;
+        type: "dialog";
         inputArgs: any;
         preventClose: boolean;
         destroy: () => void;
         update: (newConfig: any) => void;
         close: (result?: any, force?: boolean) => void;
-        Footer: ({ children, ...props }: {
-            [x: string]: any;
-            children: any;
-        }) => any;
-        Header: ({ ...props }: {
-            [x: string]: any;
-        }) => any;
+        Footer: React.FC<{
+            children?: React.ReactNode;
+        }>;
+        Header: React.FC<{
+            title?: React.ReactNode;
+            extra?: React.ReactNode;
+        }>;
         setFooter: (footer: React.ReactNode) => void;
         setHeader: (header: {
             title?: React.ReactNode;
             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);
@@ -64,7 +65,7 @@ function useDialog() {
     });
     let currentFooter = null;
     let currentHeader = null;
-    const FooterComponent = /* @__PURE__ */ __name(({ children, ...props }) => {
+    const FooterComponent = /* @__PURE__ */ __name(({ children }) => {
       React.useEffect(() => {
         var _a2;
         currentFooter = children;
@@ -77,7 +78,7 @@ function useDialog() {
       }, [children]);
       return null;
     }, "FooterComponent");
-    const HeaderComponent = /* @__PURE__ */ __name(({ ...props }) => {
+    const HeaderComponent = /* @__PURE__ */ __name((props) => {
       React.useEffect(() => {
         var _a2;
         currentHeader = props;
@@ -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,22 +133,17 @@ 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();
     ctx.defineProperty("view", {
       get: /* @__PURE__ */ __name(() => currentDialog, "get"),
-      meta: (0, import_createViewMeta.createViewMeta)(ctx, () => currentDialog),
-      resolveOnServer: /* @__PURE__ */ __name((p) => p === "record" || p.startsWith("record."), "resolveOnServer")
+      // meta: createViewMeta(ctx),
+      resolveOnServer: (0, import_variablesParams.createViewRecordResolveOnServer)(ctx, () => (0, import_variablesParams.getViewRecordFromParent)(flowContext, ctx))
     });
-    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);
-    }
+    (0, import_createViewMeta.registerPopupVariable)(ctx, currentDialog);
     const DialogWithContext = (0, import__.observer)(
       () => {
         var _a2, _b2, _c, _d;

package/lib/views/useDrawer.d.ts

@@ -10,24 +10,25 @@ import * as React from 'react';
 import { FlowEngineContext } from '../flowContext';
 export declare function useDrawer(): (React.JSX.Element | {
     open: (config: any, flowContext: FlowEngineContext) => Promise<unknown> & {
-        type: string;
+        type: "drawer";
         inputArgs: any;
         preventClose: boolean;
         destroy: () => void;
         update: (newConfig: any) => void;
         close: (result?: any, force?: boolean) => void;
-        Footer: ({ children, ...props }: {
-            [x: string]: any;
-            children: any;
-        }) => any;
-        Header: ({ ...props }: {
-            [x: string]: any;
-        }) => any;
+        Footer: React.FC<{
+            children?: React.ReactNode;
+        }>;
+        Header: React.FC<{
+            title?: React.ReactNode;
+            extra?: React.ReactNode;
+        }>;
         setFooter: (footer: React.ReactNode) => void;
         setHeader: (header: {
             title?: React.ReactNode;
             extra?: React.ReactNode;
         }) => void;
         navigation: any;
+        readonly record: unknown;
     };
 })[];