@nocobase/client 1.3.24-beta → 1.3.26-beta

package/es/index.mjs

@@ -54,7 +54,7 @@ export * from "@emotion/css";
 import jsxRuntime, { jsx, Fragment, jsxs } from "react/jsx-runtime";
 import * as formilyReact from "@formily/react";
 import { SchemaOptionsContext, SchemaExpressionScopeContext, Schema, useField, useFieldSchema, useExpressionScope, useForm, Observer, observer as observer$1, connect, SchemaComponentsContext, ExpressionScope, FormProvider as FormProvider$1, RecursionField, mapProps, mapReadPretty, FormContext, useFormEffects, FieldContext, ObjectField, ArrayField, createSchemaField, SchemaContext } from "@formily/react";
-import _, { filter, get, uniqBy, every, some, findIndex, set as set$1, concat, isObject as isObject$1, cloneDeep as cloneDeep$1, isEmpty as isEmpty$1, isString, isEqual, last, clone, debounce, castArray, differenceBy, unionBy, omit as omit$1, isBoolean, uniq as uniq$2, pick as pick$1 } from "lodash";
+import _, { filter, get, uniqBy, every, some, findIndex, set as set$1, concat, last, isObject as isObject$1, cloneDeep as cloneDeep$1, isEmpty as isEmpty$1, isString, isEqual, clone, debounce, castArray, differenceBy, unionBy, omit as omit$1, isBoolean, uniq as uniq$2, pick as pick$1 } from "lodash";
 import React, { createContext, useContext, useCallback, useRef, useEffect, isValidElement, useMemo, useState, memo, createElement, Fragment as Fragment$1, useLayoutEffect, forwardRef, useImperativeHandle, useTransition, createRef } from "react";
 import * as ReactRouterDom from "react-router-dom";
 import { useNavigate, useLocation, Outlet, useHref, UNSAFE_RouteContext, UNSAFE_LocationContext, useRoutes, HashRouter, BrowserRouter, MemoryRouter, useParams, Link as Link$1, Navigate, NavLink, useSearchParams, useOutletContext, useMatch, Router } from "react-router-dom";
@@ -841,6 +841,9 @@ const bp = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   get useLinkageAction() {
     return useLinkageAction;
   },
+  get usePopupSettings() {
+    return usePopupSettings;
+  },
   get useStyles() {
     return useStyles$3;
   },
@@ -3456,6 +3459,9 @@ const bp = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   get usePlugin() {
     return usePlugin;
   },
+  get usePopupSettings() {
+    return usePopupSettings;
+  },
   get usePopupUtils() {
     return usePopupUtils;
   },
@@ -4101,7 +4107,7 @@ function addAppVersion(e, t) {
       addAppVersion((n = e.properties) == null ? void 0 : n[o], t);
     }), e;
 }
-const name = "@nocobase/client", version$1 = "1.3.24-beta", license = "AGPL-3.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
+const name = "@nocobase/client", version$1 = "1.3.26-beta", license = "AGPL-3.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
   "@ahooksjs/use-url-state": "3.5.1",
   "@ant-design/cssinjs": "^1.11.1",
   "@ant-design/icons": "^5.1.4",
@@ -4122,9 +4128,9 @@ const name = "@nocobase/client", version$1 = "1.3.24-beta", license = "AGPL-3.0"
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "1.3.24-beta",
-  "@nocobase/sdk": "1.3.24-beta",
-  "@nocobase/utils": "1.3.24-beta",
+  "@nocobase/evaluators": "1.3.26-beta",
+  "@nocobase/sdk": "1.3.26-beta",
+  "@nocobase/utils": "1.3.26-beta",
   ahooks: "^3.7.2",
   antd: "5.12.8",
   "antd-style": "3.4.5",
@@ -9877,11 +9883,18 @@ const TabsContext = React.createContext({}), TabsContextProvider = (o) => {
   };
 }, randomNestedSchemaKeyStorage = {}, getRandomNestedSchemaKey = (e) => randomNestedSchemaKeyStorage[e] || (randomNestedSchemaKeyStorage[e] = uid()), deleteRandomNestedSchemaKey = (e) => delete randomNestedSchemaKeyStorage[e], ActionContext = createContext({});
 ActionContext.displayName = "ActionContext";
-const ActionContextProvider = (e) => {
-  const [t, o] = useState(!1), { visible: n } = g(g({}, e), e.value), { setSubmitted: r } = g(g({}, e), e.value), i = useBlockServiceInActionButton();
-  return useEffect(() => (n === !1 && t && i && (i.refresh(), r == null || r(!0)), () => {
+const useIsSubPageClosedByPageMenu = () => {
+  const e = useParams(), t = useRef({}), o = useFieldSchema();
+  return useMemo(() => {
+    var i, a;
+    const r = _.isEmpty(e["*"]) && ((i = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : i.openMode) === "page" && !!((a = t.current["*"]) != null && a.includes(o["x-uid"]));
+    return t.current = e, r;
+  }, [o, e]);
+}, ActionContextProvider = (e) => {
+  const [t, o] = useState(!1), { visible: n } = g(g({}, e), e.value), { setSubmitted: r } = g(g({}, e), e.value), i = useBlockServiceInActionButton(), a = useIsSubPageClosedByPageMenu();
+  return useEffect(() => (n === !1 && i && !i.loading && (t || a) && (i.refresh(), i.loading = !0, r == null || r(!0)), () => {
     o(!1);
-  }), [n, i == null ? void 0 : i.refresh, r]), /* @__PURE__ */ jsx(ActionContext.Provider, { value: F(g(g({}, e), e == null ? void 0 : e.value), { submitted: t, setSubmitted: o }), children: e.children });
+  }), [n, i == null ? void 0 : i.refresh, r, a]), /* @__PURE__ */ jsx(ActionContext.Provider, { value: F(g(g({}, e), e == null ? void 0 : e.value), { submitted: t, setSubmitted: o }), children: e.children });
 }, useBlockServiceInActionButton = () => {
   var i, a;
   const { params: e } = useCurrentPopupContext(), t = useFieldSchema(), o = (i = useFieldSchema()) == null ? void 0 : i["x-uid"], n = useDataBlockRequest(), r = e == null ? void 0 : e.popupuid;
@@ -10429,7 +10442,103 @@ const useStyles$j = genStyleHook("nb-action-drawer", (e) => {
     (l) => (l = l ? `-${l}` : "", `drawer-${o}${r}${i}${l}`),
     [r, o, i]
   ) };
-}, DrawerErrorFallback = (e) => {
+}, validateJSON$1 = {
+  validator: `{{(value, rule)=> {
+    if (!value) {
+      return '';
+    }
+    try {
+      const val = JSON.parse(value);
+      if(!isNaN(val)) {
+        return false;
+      }
+      return true;
+    } catch(error) {
+      console.error(error);
+      return false;
+    }
+  }}}`,
+  message: '{{t("Invalid JSON format")}}'
+}, requestSettingsSchema = {
+  type: "object",
+  properties: {
+    url: {
+      type: "string",
+      title: '{{t("Request URL")}}',
+      required: !0,
+      "x-decorator": "FormItem",
+      "x-component": "Input"
+    },
+    method: {
+      type: "string",
+      title: '{{t("Request method")}}',
+      "x-decorator": "FormItem",
+      "x-component": "Select",
+      default: "POST",
+      enum: [
+        { label: "POST", value: "POST" },
+        { label: "GET", value: "GET" },
+        { label: "PUT", value: "PUT" },
+        { label: "PATCH", value: "PATCH" },
+        { label: "DELETE", value: "DELETE" }
+      ]
+    },
+    headers: {
+      type: "string",
+      title: '{{t("Request headers")}}',
+      "x-decorator": "FormItem",
+      "x-component": "Input.TextArea",
+      "x-validator": validateJSON$1
+    },
+    params: {
+      type: "string",
+      title: '{{t("Request query parameters")}}',
+      "x-decorator": "FormItem",
+      "x-component": "Input.TextArea",
+      "x-validator": validateJSON$1
+    },
+    data: {
+      type: "string",
+      title: '{{t("Request body")}}',
+      "x-decorator": "FormItem",
+      "x-component": "Input.TextArea",
+      "x-validator": validateJSON$1
+    }
+  }
+}, linkageAction = (i) => z(void 0, [i], function* ({
+  operator: e,
+  field: t,
+  condition: o,
+  variables: n,
+  localVariables: r
+}) {
+  var c, u;
+  const a = ((c = t == null ? void 0 : t.stateOfLinkageRules) == null ? void 0 : c.disabled) || [!1], l = ((u = t == null ? void 0 : t.stateOfLinkageRules) == null ? void 0 : u.display) || ["visible"];
+  switch (e) {
+    case ActionType.Visible:
+      (yield conditionAnalyses({ ruleGroup: o, variables: n, localVariables: r })) && (l.push(e), t.data = t.data || {}, t.data.hidden = !1), t.stateOfLinkageRules = F(g({}, t.stateOfLinkageRules), {
+        display: l
+      }), t.display = last(l);
+      break;
+    case ActionType.Hidden:
+      (yield conditionAnalyses({ ruleGroup: o, variables: n, localVariables: r })) ? (t.data = t.data || {}, t.data.hidden = !0) : (t.data = t.data || {}, t.data.hidden = !1);
+      break;
+    case ActionType.Disabled:
+      (yield conditionAnalyses({ ruleGroup: o, variables: n, localVariables: r })) && a.push(!0), t.stateOfLinkageRules = F(g({}, t.stateOfLinkageRules), {
+        disabled: a
+      }), t.disabled = last(a), t.componentProps.disabled = last(a);
+      break;
+    case ActionType.Active:
+      (yield conditionAnalyses({ ruleGroup: o, variables: n, localVariables: r })) ? a.push(!1) : a.push(t.disabled), t.stateOfLinkageRules = F(g({}, t.stateOfLinkageRules), {
+        disabled: a
+      }), t.disabled = last(a), t.componentProps.disabled = last(a);
+      break;
+    default:
+      return null;
+  }
+}), setInitialActionState = (e) => {
+  e.data = e.data || {}, e.display = "visible", e.disabled = !1, e.data.hidden = !1, e.componentProps.disabled = !1;
+}, antdDrawerZIndex = 100, DrawerErrorFallback = (e) => {
   const { visible: t, setVisible: o } = useActionContext();
   return /* @__PURE__ */ jsx(Drawer$1, { open: t, onClose: () => o(!1, !0), width: "50%", children: /* @__PURE__ */ jsx(ErrorFallback, g({}, e)) });
 }, openSizeWidthMap$1 = /* @__PURE__ */ new Map([
@@ -10438,27 +10547,28 @@ const useStyles$j = genStyleHook("nb-action-drawer", (e) => {
   ["large", "70%"]
 ]), InternalActionDrawer = observer$1(
   (e) => {
-    const x = e, { footerNodeName: t = "Action.Drawer.Footer" } = x, o = W(x, ["footerNodeName"]), { visible: n, setVisible: r, openSize: i = "middle", drawerProps: a, modalProps: l } = useActionContext(), c = useFieldSchema(), u = useField(), { componentCls: d, hashId: p } = useStyles$j(), m = c.reduceProperties((C, S) => S["x-component"] === t ? S : C), { hidden: h } = useCurrentPopupContext(), f = useMemo(() => F(g(g({}, a == null ? void 0 : a.style), o == null ? void 0 : o.style), {
-      display: h ? "none" : "block"
-    }), [h, a == null ? void 0 : a.style, o == null ? void 0 : o.style]);
-    return /* @__PURE__ */ jsx(
+    const C = e, { footerNodeName: t = "Action.Drawer.Footer" } = C, o = W(C, ["footerNodeName"]), { visible: n, setVisible: r, openSize: i = "middle", drawerProps: a, modalProps: l } = useActionContext(), c = useFieldSchema(), u = useField(), { componentCls: d, hashId: p } = useStyles$j(), m = useTabsContext(), h = c.reduceProperties((S, b) => b["x-component"] === t ? b : S), { hidden: f } = useCurrentPopupContext(), x = useMemo(() => F(g(g({}, a == null ? void 0 : a.style), o == null ? void 0 : o.style), {
+      display: f ? "none" : "block"
+    }), [f, a == null ? void 0 : a.style, o == null ? void 0 : o.style]);
+    return /* @__PURE__ */ jsx(TabsContextProvider, F(g({}, m), { tabBarExtraContent: null, children: /* @__PURE__ */ jsx(
       Drawer$1,
       F(g(g({
+        zIndex: antdDrawerZIndex + e.level,
         width: openSizeWidthMap$1.get(i),
         title: u.title
       }, o), a), {
-        rootStyle: f,
+        rootStyle: x,
         destroyOnClose: !0,
         open: n,
         onClose: () => r(!1, !0),
         rootClassName: cls(d, p, a == null ? void 0 : a.className, o.className, "reset"),
-        footer: m && /* @__PURE__ */ jsx("div", { className: "footer", children: /* @__PURE__ */ jsx(
+        footer: h && /* @__PURE__ */ jsx("div", { className: "footer", children: /* @__PURE__ */ jsx(
           RecursionField,
           {
             basePath: u.address,
             schema: c,
             onlyRenderProperties: !0,
-            filterProperties: (C) => C["x-component"] === t
+            filterProperties: (S) => S["x-component"] === t
           }
         ) }),
         children: /* @__PURE__ */ jsx(
@@ -10467,11 +10577,11 @@ const useStyles$j = genStyleHook("nb-action-drawer", (e) => {
             basePath: u.address,
             schema: c,
             onlyRenderProperties: !0,
-            filterProperties: (C) => C["x-component"] !== t
+            filterProperties: (S) => S["x-component"] !== t
           }
         )
       })
-    );
+    ) }));
   },
   { displayName: "ActionDrawer" }
 ), ActionDrawer = (e) => /* @__PURE__ */ jsx(ErrorBoundary, { FallbackComponent: DrawerErrorFallback, onError: (t) => console.log(t), children: /* @__PURE__ */ jsx(InternalActionDrawer, g({}, e)) });
@@ -10498,21 +10608,22 @@ const useGetAriaLabelOfModal = () => {
   ["large", "80%"]
 ]), InternalActionModal = observer$1(
   (e) => {
-    const S = e, { footerNodeName: t = "Action.Modal.Footer", width: o } = S, n = W(S, ["footerNodeName", "width"]), { visible: r, setVisible: i, openSize: a = "middle", modalProps: l } = useActionContext(), c = o != null ? o : openSizeWidthMap.get(a), u = useFieldSchema(), d = useForm(), p = useField(), { token: m } = useToken$1(), h = u.reduceProperties((b, y) => y["x-component"] === t ? y : b), { hidden: f } = useCurrentPopupContext(), x = useMemo(() => ({
+    const b = e, { footerNodeName: t = "Action.Modal.Footer", width: o } = b, n = W(b, ["footerNodeName", "width"]), { visible: r, setVisible: i, openSize: a = "middle", modalProps: l } = useActionContext(), c = o != null ? o : openSizeWidthMap.get(a), u = useFieldSchema(), d = useForm(), p = useField(), { token: m } = useToken$1(), h = useTabsContext(), f = u.reduceProperties((y, v) => v["x-component"] === t ? v : y), { hidden: x } = useCurrentPopupContext(), C = useMemo(() => ({
       mask: {
-        display: f ? "none" : "block"
+        display: x ? "none" : "block"
       },
       content: {
-        display: f ? "none" : "block"
+        display: x ? "none" : "block"
       }
-    }), [f]), C = !!h;
-    return /* @__PURE__ */ jsx(
+    }), [x]), S = !!f;
+    return /* @__PURE__ */ jsx(TabsContextProvider, F(g({}, h), { tabBarExtraContent: null, children: /* @__PURE__ */ jsx(
       Modal,
       F(g(g({
+        zIndex: antdDrawerZIndex + e.level,
         width: c,
         title: p.title
       }, n), l), {
-        styles: x,
+        styles: C,
         style: g(g({}, l == null ? void 0 : l.style), n == null ? void 0 : n.style),
         destroyOnClose: !0,
         open: r,
@@ -10523,38 +10634,38 @@ const useGetAriaLabelOfModal = () => {
           n.className,
           l == null ? void 0 : l.className,
           css`
-            &.nb-action-popup {
-              .ant-modal-header {
-                display: none;
-              }
+              &.nb-action-popup {
+                .ant-modal-header {
+                  display: none;
+                }
 
-              .ant-modal-content {
-                background: var(--nb-box-bg);
-                border: 1px solid rgba(255, 255, 255, 0.1);
-                padding-bottom: 0;
-              }
+                .ant-modal-content {
+                  background: var(--nb-box-bg);
+                  border: 1px solid rgba(255, 255, 255, 0.1);
+                  padding-bottom: 0;
+                }
 
-              // 这里的样式是为了保证页面 tabs 标签下面的分割线和页面内容对齐（页面内边距可以通过主题编辑器调节）
-              .ant-tabs-nav {
-                padding-left: ${m.paddingLG - m.paddingPageHorizontal}px;
-                padding-right: ${m.paddingLG - m.paddingPageHorizontal}px;
-                margin-left: ${m.paddingPageHorizontal - m.paddingLG}px;
-                margin-right: ${m.paddingPageHorizontal - m.paddingLG}px;
-              }
+                // 这里的样式是为了保证页面 tabs 标签下面的分割线和页面内容对齐（页面内边距可以通过主题编辑器调节）
+                .ant-tabs-nav {
+                  padding-left: ${m.paddingLG - m.paddingPageHorizontal}px;
+                  padding-right: ${m.paddingLG - m.paddingPageHorizontal}px;
+                  margin-left: ${m.paddingPageHorizontal - m.paddingLG}px;
+                  margin-right: ${m.paddingPageHorizontal - m.paddingLG}px;
+                }
 
-              .ant-modal-footer {
-                display: ${C ? "block" : "none"};
+                .ant-modal-footer {
+                  display: ${S ? "block" : "none"};
+                }
               }
-            }
-          `
+            `
         ),
-        footer: C ? /* @__PURE__ */ jsx(
+        footer: S ? /* @__PURE__ */ jsx(
           RecursionField,
           {
             basePath: p.address,
             schema: u,
             onlyRenderProperties: !0,
-            filterProperties: (b) => b["x-component"] === t
+            filterProperties: (y) => y["x-component"] === t
           }
         ) : !1,
         children: /* @__PURE__ */ jsx(
@@ -10563,11 +10674,11 @@ const useGetAriaLabelOfModal = () => {
             basePath: p.address,
             schema: u,
             onlyRenderProperties: !0,
-            filterProperties: (b) => b["x-component"] !== t
+            filterProperties: (y) => y["x-component"] !== t
           }
         )
       })
-    );
+    ) }));
   },
   { displayName: "ActionModal" }
 ), ActionModal = (e) => /* @__PURE__ */ jsx(ErrorBoundary, { FallbackComponent: ModalErrorFallback, onError: (t) => console.log(t), children: /* @__PURE__ */ jsx(InternalActionModal, g({}, e)) });
@@ -10727,7 +10838,7 @@ const BaseVariableContext = React.createContext(null), BaseVariableProvider = (e
     const v = y.field.target;
     return new Promise((A) => {
       setTimeout(() => {
-        const T = (getChildren$2(d(f(v, u), y), {
+        const k = (getChildren$2(d(f(v, u, !0), y), {
           collectionField: e,
           uiSchema: t,
           targetFieldSchema: o,
@@ -10739,12 +10850,12 @@ const BaseVariableContext = React.createContext(null), BaseVariableProvider = (e
           isDisabled: x || isDisabledDefault,
           getCollectionField: C.getCollectionField,
           deprecated: p
-        }) || []).sort((k, D) => k.isLeaf && !D.isLeaf ? -1 : !k.isLeaf && D.isLeaf ? 1 : 0).sort((k, D) => k.disabled && !D.disabled ? 1 : !k.disabled && D.disabled ? -1 : 0);
-        if (T.length === 0) {
+        }) || []).sort((D, $) => D.isLeaf && !$.isLeaf ? -1 : !D.isLeaf && $.isLeaf ? 1 : 0).sort((D, $) => D.disabled && !$.disabled ? 1 : !D.disabled && $.disabled ? -1 : 0);
+        if (k.length === 0) {
           y.disabled = !0, y.isLeaf = !0, A();
           return;
         }
-        y.children = T, A();
+        y.children = k, A();
       }, 5);
     });
   };
@@ -18637,10 +18748,10 @@ const useContextVariable = () => {
   typeof t != "function" && (n = useDef$3);
   const r = n();
   return g(g({}, o), r);
-}, ActionContainer = observer$1(
+}, PopupLevelContext = React.createContext(0), ActionContainer = observer$1(
   (e) => {
-    const { getComponentByOpenMode: t, defaultOpenMode: o } = useOpenModeContext(), { openMode: n = o } = useActionContext(), { currentLevel: r } = useCurrentPopupContext(), i = t(n);
-    return /* @__PURE__ */ jsx(i, g({ footerNodeName: "Action.Container.Footer", level: r }, e));
+    const { getComponentByOpenMode: t, defaultOpenMode: o } = useOpenModeContext(), { openMode: n = o } = useActionContext(), i = React.useContext(PopupLevelContext) + 1, a = t(n);
+    return console.log("currentLevel", i), /* @__PURE__ */ jsx(PopupLevelContext.Provider, { value: i, children: /* @__PURE__ */ jsx(a, g({ footerNodeName: "Action.Container.Footer", level: i || 1 }, e)) });
   },
   { displayName: "ActionContainer" }
 );
@@ -18885,34 +18996,31 @@ const createSubmitActionSettings = new SchemaSettings({
     ] }) }) : null
   ] });
 }, SchemaSettingOpenModeSchemaItems = (e) => {
-  var p, m, h, f;
-  const { openMode: t = !0, openSize: o = !0, modeOptions: n } = e, r = useFieldSchema(), i = useField(), { t: a } = useTranslation(), { dn: l } = useDesignable(), { isPopupVisibleControlledByURL: c } = usePopupSettings(), u = ((p = r == null ? void 0 : r["x-component-props"]) == null ? void 0 : p.openMode) || "drawer", d = useMemo(() => n || (c() ? [
+  var d, p, m, h;
+  const { openMode: t = !0, openSize: o = !0, modeOptions: n } = e, r = useFieldSchema(), i = useField(), { t: a } = useTranslation(), { dn: l } = useDesignable(), c = ((d = r == null ? void 0 : r["x-component-props"]) == null ? void 0 : d.openMode) || "drawer", u = useMemo(() => n || [
     { label: a("Drawer"), value: "drawer" },
     { label: a("Dialog"), value: "modal" },
     { label: a("Page"), value: "page" }
-  ] : [
-    { label: a("Drawer"), value: "drawer" },
-    { label: a("Dialog"), value: "modal" }
-  ]), [n, a]);
+  ], [n, a]);
   return /* @__PURE__ */ jsxs(Fragment, { children: [
     t ? /* @__PURE__ */ jsx(
       SchemaSettingsSelectItem,
       {
         title: a("Open mode"),
-        options: d,
-        value: u,
-        onChange: (x) => {
-          i.componentProps.openMode = x;
-          const C = {
+        options: u,
+        value: c,
+        onChange: (f) => {
+          i.componentProps.openMode = f;
+          const x = {
             "x-uid": r["x-uid"]
           };
-          C["x-component-props"] = r["x-component-props"] || {}, C["x-component-props"].openMode = x, r["x-component-props"].openMode = x, Reflect.deleteProperty(r["x-component-props"], "openSize"), l.emit("patch", {
-            schema: C
+          x["x-component-props"] = r["x-component-props"] || {}, x["x-component-props"].openMode = f, r["x-component-props"].openMode = f, Reflect.deleteProperty(r["x-component-props"], "openSize"), l.emit("patch", {
+            schema: x
           }), l.refresh();
         }
       }
     ) : null,
-    o && ["modal", "drawer"].includes(u) ? /* @__PURE__ */ jsx(
+    o && ["modal", "drawer"].includes(c) ? /* @__PURE__ */ jsx(
       SchemaSettingsSelectItem,
       {
         title: a("Popup size"),
@@ -18921,14 +19029,14 @@ const createSubmitActionSettings = new SchemaSettings({
           { label: a("Middle"), value: "middle" },
           { label: a("Large"), value: "large" }
         ],
-        value: (f = (m = r == null ? void 0 : r["x-component-props"]) == null ? void 0 : m.openSize) != null ? f : ((h = r == null ? void 0 : r["x-component-props"]) == null ? void 0 : h.openMode) == "modal" ? "large" : "middle",
-        onChange: (x) => {
-          i.componentProps.openSize = x;
-          const C = {
+        value: (h = (p = r == null ? void 0 : r["x-component-props"]) == null ? void 0 : p.openSize) != null ? h : ((m = r == null ? void 0 : r["x-component-props"]) == null ? void 0 : m.openMode) == "modal" ? "large" : "middle",
+        onChange: (f) => {
+          i.componentProps.openSize = f;
+          const x = {
             "x-uid": r["x-uid"]
           };
-          C["x-component-props"] = r["x-component-props"] || {}, C["x-component-props"].openSize = x, r["x-component-props"].openSize = x, l.emit("patch", {
-            schema: C
+          x["x-component-props"] = r["x-component-props"] || {}, x["x-component-props"].openSize = f, r["x-component-props"].openSize = f, l.emit("patch", {
+            schema: x
           }), l.refresh();
         }
       }
@@ -19059,103 +19167,7 @@ const createSubmitActionSettings = new SchemaSettings({
     ] });
   },
   { displayName: "GeneralSchemaItems" }
-), validateJSON$1 = {
-  validator: `{{(value, rule)=> {
-    if (!value) {
-      return '';
-    }
-    try {
-      const val = JSON.parse(value);
-      if(!isNaN(val)) {
-        return false;
-      }
-      return true;
-    } catch(error) {
-      console.error(error);
-      return false;
-    }
-  }}}`,
-  message: '{{t("Invalid JSON format")}}'
-}, requestSettingsSchema = {
-  type: "object",
-  properties: {
-    url: {
-      type: "string",
-      title: '{{t("Request URL")}}',
-      required: !0,
-      "x-decorator": "FormItem",
-      "x-component": "Input"
-    },
-    method: {
-      type: "string",
-      title: '{{t("Request method")}}',
-      "x-decorator": "FormItem",
-      "x-component": "Select",
-      default: "POST",
-      enum: [
-        { label: "POST", value: "POST" },
-        { label: "GET", value: "GET" },
-        { label: "PUT", value: "PUT" },
-        { label: "PATCH", value: "PATCH" },
-        { label: "DELETE", value: "DELETE" }
-      ]
-    },
-    headers: {
-      type: "string",
-      title: '{{t("Request headers")}}',
-      "x-decorator": "FormItem",
-      "x-component": "Input.TextArea",
-      "x-validator": validateJSON$1
-    },
-    params: {
-      type: "string",
-      title: '{{t("Request query parameters")}}',
-      "x-decorator": "FormItem",
-      "x-component": "Input.TextArea",
-      "x-validator": validateJSON$1
-    },
-    data: {
-      type: "string",
-      title: '{{t("Request body")}}',
-      "x-decorator": "FormItem",
-      "x-component": "Input.TextArea",
-      "x-validator": validateJSON$1
-    }
-  }
-}, linkageAction = (i) => z(void 0, [i], function* ({
-  operator: e,
-  field: t,
-  condition: o,
-  variables: n,
-  localVariables: r
-}) {
-  var c, u;
-  const a = ((c = t == null ? void 0 : t.stateOfLinkageRules) == null ? void 0 : c.disabled) || [!1], l = ((u = t == null ? void 0 : t.stateOfLinkageRules) == null ? void 0 : u.display) || ["visible"];
-  switch (e) {
-    case ActionType.Visible:
-      (yield conditionAnalyses({ ruleGroup: o, variables: n, localVariables: r })) && (l.push(e), t.data = t.data || {}, t.data.hidden = !1), t.stateOfLinkageRules = F(g({}, t.stateOfLinkageRules), {
-        display: l
-      }), t.display = last(l);
-      break;
-    case ActionType.Hidden:
-      (yield conditionAnalyses({ ruleGroup: o, variables: n, localVariables: r })) ? (t.data = t.data || {}, t.data.hidden = !0) : (t.data = t.data || {}, t.data.hidden = !1);
-      break;
-    case ActionType.Disabled:
-      (yield conditionAnalyses({ ruleGroup: o, variables: n, localVariables: r })) && a.push(!0), t.stateOfLinkageRules = F(g({}, t.stateOfLinkageRules), {
-        disabled: a
-      }), t.disabled = last(a), t.componentProps.disabled = last(a);
-      break;
-    case ActionType.Active:
-      (yield conditionAnalyses({ ruleGroup: o, variables: n, localVariables: r })) ? a.push(!1) : a.push(t.disabled), t.stateOfLinkageRules = F(g({}, t.stateOfLinkageRules), {
-        disabled: a
-      }), t.disabled = last(a), t.componentProps.disabled = last(a);
-      break;
-    default:
-      return null;
-  }
-}), setInitialActionState = (e) => {
-  e.data = e.data || {}, e.display = "visible", e.disabled = !1, e.data.hidden = !1, e.componentProps.disabled = !1;
-}, MenuGroup = (e) => e.children;
+), MenuGroup = (e) => e.children;
 function ButtonEditor$1(e) {
   var a, l, c, u;
   const t = useField(), o = useFieldSchema(), { dn: n } = useDesignable(), { t: r } = useTranslation(), i = (e == null ? void 0 : e.isLink) || o["x-component"] === "Action.Link";
@@ -20282,13 +20294,12 @@ const ActionBarContext = React.createContext({
 };
 function ActionPage({ level: e }) {
   const t = useFieldSchema(), o = useActionContext(), { getContainerDOM: n } = usePopupOrSubpagesContainerDOM(), { styles: r } = useActionPageStyle(), i = useTabsContext(), a = useMemo(() => ({
-    // 20 is the z-index value of the main page
-    zIndex: 20 + e
+    zIndex: antdDrawerZIndex + e
   }), [e]);
   if (!o.visible)
     return null;
   const l = /* @__PURE__ */ jsx("div", { className: r.container, style: a, children: /* @__PURE__ */ jsx(TabsContextProvider, F(g({}, i), { tabBarExtraContent: /* @__PURE__ */ jsx(BackButtonUsedInSubPage, {}), children: /* @__PURE__ */ jsx(RecursionField, { schema: t, onlyRenderProperties: !0 }) })) }), c = n();
-  return c ? createPortal(l, c) : l;
+  return createPortal(l, c || document.body);
 }
 ActionPage.Footer = observer$1(
   () => null,
@@ -23772,48 +23783,48 @@ Filter.Action = FilterAction;
 Filter.Action.Designer = FilterActionDesigner;
 const useGetFilterOptions = () => {
   const { getCollectionFields: e } = useCollectionManager_deprecated(), t = useGetFilterFieldOptions();
-  return (o, n) => {
-    const r = e(o, n);
-    return t(r);
+  return (o, n, r) => {
+    const i = e(o, n);
+    return t(i, r);
   };
 }, useFilterOptions = (e) => {
   const { getCollectionFields: t } = useCollectionManager_deprecated(), o = t(e);
   return useFilterFieldOptions(o);
 }, useGetFilterFieldOptions = () => {
   var a;
-  const e = useFieldSchema(), t = ((a = e == null ? void 0 : e["x-component-props"]) == null ? void 0 : a.nonfilterable) || [], { getCollectionFields: o, getInterface: n } = useCollectionManager_deprecated(), r = (l, c) => {
-    var f, x;
+  const e = useFieldSchema(), t = ((a = e == null ? void 0 : e["x-component-props"]) == null ? void 0 : a.nonfilterable) || [], { getCollectionFields: o, getInterface: n } = useCollectionManager_deprecated(), r = (l, c, u) => {
+    var x, C;
     if (t.length && c === 1 && t.includes(l.name) || !l.interface)
       return;
-    const u = n(l.interface);
-    if (!(u != null && u.filterable))
+    const d = n(l.interface);
+    if (!(d != null && d.filterable) && !u)
       return;
-    const { nested: d, children: p, operators: m } = u.filterable, h = {
+    const { nested: p, children: m, operators: h } = (d == null ? void 0 : d.filterable) || {}, f = {
       name: l.name,
       type: l.type,
       target: l.target,
-      title: ((f = l == null ? void 0 : l.uiSchema) == null ? void 0 : f.title) || l.name,
+      title: ((x = l == null ? void 0 : l.uiSchema) == null ? void 0 : x.title) || l.name,
       schema: l == null ? void 0 : l.uiSchema,
       interface: l.interface,
-      operators: ((x = m == null ? void 0 : m.filter) == null ? void 0 : x.call(m, (C) => !(C != null && C.visible) || C.visible(l))) || []
+      operators: ((C = h == null ? void 0 : h.filter) == null ? void 0 : C.call(h, (S) => !(S != null && S.visible) || S.visible(l))) || []
     };
     if (!(l.target && c > 2)) {
       if (c > 2)
-        return h;
-      if (p != null && p.length && (h.children = p), d) {
-        const C = o(l.target), S = i(C, c + 1).filter(Boolean);
-        h.children = h.children || [], h.children.push(...S);
+        return f;
+      if (m != null && m.length && (f.children = m), p) {
+        const S = o(l.target), b = i(S, c + 1).filter(Boolean);
+        f.children = f.children || [], f.children.push(...b);
       }
-      return h;
+      return f;
     }
-  }, i = (l, c) => {
-    const u = [];
-    return l.forEach((d) => {
-      const p = r(d, c);
-      p && u.push(p);
-    }), u;
+  }, i = (l, c, u) => {
+    const d = [];
+    return l.forEach((p) => {
+      const m = r(p, c, u);
+      m && d.push(m);
+    }), d;
   };
-  return (l) => i(l, 1);
+  return (l, c) => i(l, 1, c);
 }, useFilterFieldOptions = (e) => {
   var l;
   const t = useFieldSchema(), o = ((l = t == null ? void 0 : t["x-component-props"]) == null ? void 0 : l.nonfilterable) || [], { getCollectionFields: n, getInterface: r } = useCollectionManager_deprecated(), i = (c, u) => {
@@ -55773,32 +55784,32 @@ const RecordAssociationFormBlockInitializer = () => {
   );
 };
 function useCreateAssociationFormBlock() {
-  const { insert: e } = useSchemaInitializer(), { getCollection: t } = useCollectionManager_deprecated(), o = useCallback(
-    ({ item: r }) => {
-      const i = r.associationField, a = t(i.target);
+  const { insert: e } = useSchemaInitializer(), { getCollection: t } = useCollectionManager_deprecated(), { componentNamePrefix: o } = useBlockTemplateContext(), n = useCallback(
+    ({ item: i }) => {
+      const a = i.associationField, l = t(a.target);
       e(
         createCreateFormBlockUISchema({
-          dataSource: a.dataSource,
-          association: `${i.collectionName}.${i.name}`
+          dataSource: l.dataSource,
+          association: `${a.collectionName}.${a.name}`
         })
       );
     },
     [t, e]
-  ), n = useCallback(
-    (r, { item: i }) => {
-      if (i.template.componentName === "FormItem" && i.associationField) {
-        const a = i.associationField, l = t(a.target), c = createCreateFormBlockUISchema({
-          dataSource: l.dataSource,
-          association: `${a.collectionName}.${a.name}`,
-          templateSchema: r
+  ), r = useCallback(
+    (i, { item: a }) => {
+      if (a.template.componentName === `${o}FormItem` && a.associationField) {
+        const l = a.associationField, c = t(l.target), u = createCreateFormBlockUISchema({
+          dataSource: c.dataSource,
+          association: `${l.collectionName}.${l.name}`,
+          templateSchema: i
         });
-        return i.mode === "reference" && (c["x-template-key"] = i.template.key), c;
+        return a.mode === "reference" && (u["x-template-key"] = a.template.key), u;
       } else
-        return r;
+        return i;
     },
-    [t]
+    [t, o]
   );
-  return { createAssociationFormBlock: o, templateWrap: n };
+  return { createAssociationFormBlock: n, templateWrap: r };
 }
 const createGridCardBlockUISchema = (e) => {
   const { collectionName: t, association: o, templateSchema: n, dataSource: r, rowKey: i } = e, a = o || t;
@@ -56094,33 +56105,33 @@ const RecordReadPrettyAssociationFormBlockInitializer = () => {
   );
 };
 function useCreateAssociationDetailsWithoutPagination() {
-  const { insert: e } = useSchemaInitializer(), { getCollection: t } = useCollectionManager_deprecated(), o = useCallback(
-    ({ item: r }) => {
-      const i = r.associationField, a = t(i.target);
+  const { insert: e } = useSchemaInitializer(), { getCollection: t } = useCollectionManager_deprecated(), { componentNamePrefix: o } = useBlockTemplateContext(), n = useCallback(
+    ({ item: i }) => {
+      const a = i.associationField, l = t(a.target);
       e(
         createDetailsUISchema({
-          dataSource: a.dataSource,
-          association: `${i.collectionName}.${i.name}`
+          dataSource: l.dataSource,
+          association: `${a.collectionName}.${a.name}`
         })
       );
     },
     [t, e]
-  ), n = useCallback(
-    (r, { item: i }) => {
-      const a = i.associationField, l = t(a.target);
-      if (i.template.componentName === "ReadPrettyFormItem") {
-        const c = createDetailsUISchema({
-          dataSource: l.dataSource,
-          association: `${a.collectionName}.${a.name}`,
-          templateSchema: r
+  ), r = useCallback(
+    (i, { item: a }) => {
+      const l = a.associationField, c = t(l.target);
+      if (a.template.componentName === `${o}ReadPrettyFormItem`) {
+        const u = createDetailsUISchema({
+          dataSource: c.dataSource,
+          association: `${l.collectionName}.${l.name}`,
+          templateSchema: i
         });
-        return i.mode === "reference" && (c["x-template-key"] = i.template.key), c;
+        return a.mode === "reference" && (u["x-template-key"] = a.template.key), u;
       } else
-        return r;
+        return i;
     },
-    [t]
+    [t, o]
   );
-  return { createAssociationDetailsWithoutPagination: o, templateWrap: n };
+  return { createAssociationDetailsWithoutPagination: n, templateWrap: r };
 }
 const SelectActionInitializer = (e) => {
   const t = {
@@ -56719,55 +56730,55 @@ const SelectActionInitializer = (e) => {
   );
 };
 function useCreateSingleDetailsSchema() {
-  const { insert: e } = useSchemaInitializer(), { getTemplateSchemaByMode: t } = useSchemaTemplateManager(), o = useAssociationName(), n = useCollectionManager(), r = useCallback(
-    (a, l) => {
-      const { item: c } = l;
-      if (c.template.componentName === "ReadPrettyFormItem") {
-        const u = c.collectionName || c.name, d = n.getCollection(u), p = createDetailsUISchema(
+  const { insert: e } = useSchemaInitializer(), { getTemplateSchemaByMode: t } = useSchemaTemplateManager(), o = useAssociationName(), n = useCollectionManager(), { componentNamePrefix: r } = useBlockTemplateContext(), i = useCallback(
+    (l, c) => {
+      const { item: u } = c;
+      if (u.template.componentName === `${r}ReadPrettyFormItem`) {
+        const d = u.collectionName || u.name, p = n.getCollection(d), m = createDetailsUISchema(
           o ? {
             association: o,
             // see: https://applink.feishu.cn/client/message/link/open?token=AmP9n9dkwcABZrr3nBdAwAI%3D
-            collectionName: d.isInherited() ? u : void 0,
-            dataSource: c.dataSource,
-            templateSchema: a,
+            collectionName: p.isInherited() ? d : void 0,
+            dataSource: u.dataSource,
+            templateSchema: l,
             isCurrent: !0
           } : {
-            collectionName: u,
-            dataSource: c.dataSource,
-            templateSchema: a
+            collectionName: d,
+            dataSource: u.dataSource,
+            templateSchema: l
           }
         );
-        return c.mode === "reference" && (p["x-template-key"] = c.template.key), p;
+        return u.mode === "reference" && (m["x-template-key"] = u.template.key), m;
       } else
-        return a;
+        return l;
     },
-    [o, n]
+    [o, n, r]
   );
   return { createSingleDetailsSchema: useCallback(
-    (l) => z(this, [l], function* ({ item: a }) {
-      if (a.template) {
-        const c = yield t(a);
-        e(r(c, { item: a }));
+    (c) => z(this, [c], function* ({ item: l }) {
+      if (l.template) {
+        const u = yield t(l);
+        e(i(u, { item: l }));
       } else {
-        const c = a.collectionName || a.name, u = n.getCollection(c);
+        const u = l.collectionName || l.name, d = n.getCollection(u);
         e(
           createDetailsUISchema(
             o ? {
               association: o,
               // see: https://applink.feishu.cn/client/message/link/open?token=AmP9n9dkwcABZrr3nBdAwAI%3D
-              collectionName: u.isInherited() ? c : void 0,
-              dataSource: a.dataSource,
+              collectionName: d.isInherited() ? u : void 0,
+              dataSource: l.dataSource,
               isCurrent: !0
             } : {
-              collectionName: c,
-              dataSource: a.dataSource
+              collectionName: u,
+              dataSource: l.dataSource
             }
           )
         );
       }
     }),
-    [o, n, t, e, r]
-  ), templateWrap: r };
+    [o, n, t, e, i]
+  ), templateWrap: i };
 }
 const FormBlockInitializer = ({
   filterCollections: e,
@@ -56926,47 +56937,47 @@ const RecordFormBlockInitializer = () => {
   );
 };
 function useCreateEditFormBlock() {
-  const { insert: e } = useSchemaInitializer(), t = useAssociationName(), o = useCollectionManager(), n = useCallback(
-    ({ item: i }) => {
-      const a = i.collectionName || i.name, l = o.getCollection(a);
+  const { insert: e } = useSchemaInitializer(), t = useAssociationName(), o = useCollectionManager(), { componentNamePrefix: n } = useBlockTemplateContext(), r = useCallback(
+    ({ item: a }) => {
+      const l = a.collectionName || a.name, c = o.getCollection(l);
       e(
         createEditFormBlockUISchema(
           t ? {
             association: t,
-            collectionName: l.isInherited() ? a : void 0,
-            dataSource: i.dataSource,
+            collectionName: c.isInherited() ? l : void 0,
+            dataSource: a.dataSource,
             isCurrent: !0
           } : {
-            collectionName: a,
-            dataSource: i.dataSource
+            collectionName: l,
+            dataSource: a.dataSource
           }
         )
       );
     },
     [t, o, e]
-  ), r = useCallback(
-    (i, { item: a }) => {
-      if (a.template.componentName === "FormItem") {
-        const l = a.collectionName || a.name, c = o.getCollection(l), u = createEditFormBlockUISchema(
+  ), i = useCallback(
+    (a, { item: l }) => {
+      if (l.template.componentName === `${n}FormItem`) {
+        const c = l.collectionName || l.name, u = o.getCollection(c), d = createEditFormBlockUISchema(
           t ? {
             association: t,
-            collectionName: c.isInherited() ? l : void 0,
-            dataSource: a.dataSource,
-            templateSchema: i,
+            collectionName: u.isInherited() ? c : void 0,
+            dataSource: l.dataSource,
+            templateSchema: a,
             isCurrent: !0
           } : {
-            collectionName: l,
-            dataSource: a.dataSource,
-            templateSchema: i
+            collectionName: c,
+            dataSource: l.dataSource,
+            templateSchema: a
           }
         );
-        return a.mode === "reference" && (u["x-template-key"] = a.template.key), u;
+        return l.mode === "reference" && (d["x-template-key"] = l.template.key), d;
       } else
-        return i;
+        return a;
     },
-    [t, o]
+    [t, o, n]
   );
-  return { createEditFormBlock: n, templateWrap: r };
+  return { createEditFormBlock: r, templateWrap: i };
 }
 const commonOptions$e = {
   title: '{{t("Configure actions")}}',
@@ -59834,6 +59845,7 @@ export {
   useParsedFilter,
   usePickActionProps$1 as usePickActionProps,
   usePlugin,
+  usePopupSettings,
   usePopupUtils,
   useProps,
   useRecord,