@nocobase/client 1.6.31 → 1.6.33

package/es/application/CustomRouterContextProvider.d.ts

@@ -18,6 +18,11 @@ export declare const CurrentPageUidContext: React.Context<string>;
  * @internal
  */
 export declare const CurrentTabUidContext: React.Context<string>;
+export declare const IsSubPageClosedByPageMenuContext: React.Context<{
+    isSubPageClosedByPageMenu: () => boolean;
+    setFieldSchema: React.Dispatch<React.SetStateAction<Schema>>;
+    reset: () => void;
+}>;
 export declare const IsSubPageClosedByPageMenuProvider: FC;
 export declare const CurrentPageUidProvider: FC;
 export declare const CurrentTabUidProvider: FC;
@@ -34,8 +39,6 @@ export declare const useLocationNoUpdate: () => Location<any>;
 export declare const useLocationSearch: () => string;
 export declare const useIsAdminPage: () => boolean;
 export declare const useCurrentPageUid: () => string;
-export declare const useMatchAdmin: () => boolean;
-export declare const useMatchAdminName: () => boolean;
 export declare const useIsInSettingsPage: () => boolean;
 /**
  * @internal

package/es/index.mjs

@@ -62,7 +62,7 @@ import _, { filter, capitalize, cloneDeep as cloneDeep$1, isArray, every, some,
 import template from "lodash/template";
 import React, { createContext, useContext, useMemo, Fragment, useCallback, useEffect, memo, useState, useRef, Suspense, useDeferredValue, createElement, isValidElement, lazy as lazy$1, startTransition, useLayoutEffect, forwardRef, useImperativeHandle, createRef } from "react";
 import * as ReactRouterDom from "react-router-dom";
-import { useParams, useHref, useSearchParams, useLocation, useMatch, useNavigate, UNSAFE_LocationContext, UNSAFE_RouteContext, Outlet, createHashRouter, createBrowserRouter, createMemoryRouter, useRouteError, RouterProvider, Link as Link$1, Navigate, NavLink, Router, useOutletContext } from "react-router-dom";
+import { useParams, useHref, useSearchParams, useLocation, useNavigate, UNSAFE_LocationContext, UNSAFE_RouteContext, UNSAFE_DataRouterContext, UNSAFE_DataRouterStateContext, Outlet, createHashRouter, createBrowserRouter, createMemoryRouter, useRouteError, RouterProvider, Link as Link$1, Navigate, NavLink, Router, useOutletContext } from "react-router-dom";
 import * as formilyShared from "@formily/shared";
 import { merge, uid, isArr, isFn, applyMiddleware, isNum as isNum$1, isStr, isBool, toArr as toArr$3, isReactElement, isValid, FormPath, each, isEmpty as isEmpty$2 } from "@formily/shared";
 import * as formilyJsonReactive from "@formily/reactive";
@@ -107,7 +107,7 @@ import { observer } from "@formily/reactive-react";
 import cronstrue from "cronstrue";
 import * as antdStyle from "antd-style";
 import { createGlobalStyle, useAntdToken, createStyles } from "antd-style";
-import { createStyles as yn } from "antd-style";
+import { createStyles as vn } from "antd-style";
 import JSON5 from "json5";
 import { usePrefixCls as usePrefixCls$1, dayjsable, formatDayjsValue } from "@formily/antd-v5/esm/__builtins__";
 import * as dndKitAccessibility from "@dnd-kit/accessibility";
@@ -129,7 +129,8 @@ import { useHotkeys } from "react-hotkeys-hook";
 import { loadableResource } from "react-imported-component";
 import LRUCache from "lru-cache";
 import ignore from "ignore";
-import ProLayout, { PageHeader, RouteContext } from "@ant-design/pro-layout";
+import ProLayout, { RouteContext, PageHeader } from "@ant-design/pro-layout";
+import { Context } from "rc-motion/es/context";
 import { spliceArrayState, exchangeArrayState } from "@formily/core/esm/shared/internals";
 import relativeTime from "dayjs/plugin/relativeTime";
 import { useSchemaInitializer as useSchemaInitializer$1, SchemaInitializerItem as SchemaInitializerItem$1, ActionContextProvider as ActionContextProvider$1, SchemaComponent as SchemaComponent$1, Action as Action$2 } from "@nocobase/client";
@@ -1866,6 +1867,9 @@ const bp = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   get IsInNocoBaseRecursionFieldContext() {
     return IsInNocoBaseRecursionFieldContext;
   },
+  get IsSubPageClosedByPageMenuContext() {
+    return IsSubPageClosedByPageMenuContext;
+  },
   get IsSubPageClosedByPageMenuProvider() {
     return IsSubPageClosedByPageMenuProvider;
   },
@@ -3789,6 +3793,9 @@ const bp = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   get useIsSubPageClosedByPageMenu() {
     return useIsSubPageClosedByPageMenu;
   },
+  get useKeepAlive() {
+    return useKeepAlive;
+  },
   get useLabelUiSchema() {
     return useLabelUiSchema;
   },
@@ -3813,12 +3820,6 @@ const bp = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   get useLocationSearch() {
     return useLocationSearch;
   },
-  get useMatchAdmin() {
-    return useMatchAdmin;
-  },
-  get useMatchAdminName() {
-    return useMatchAdminName;
-  },
   get useMenuDragEnd() {
     return useMenuDragEnd;
   },
@@ -6203,10 +6204,6 @@ const IsAdminPageContext = React.createContext(!1);
 IsAdminPageContext.displayName = "IsAdminPageContext";
 const CurrentPageUidContext = React.createContext("");
 CurrentPageUidContext.displayName = "CurrentPageUidContext";
-const MatchAdminContext = React.createContext(!1);
-MatchAdminContext.displayName = "MatchAdminContext";
-const MatchAdminNameContext = React.createContext(!1);
-MatchAdminNameContext.displayName = "MatchAdminNameContext";
 const IsInSettingsPageContext = React.createContext(!1);
 IsInSettingsPageContext.displayName = "IsInSettingsPageContext";
 const CurrentTabUidContext = React.createContext("");
@@ -6244,12 +6241,6 @@ const IsSubPageClosedByPageMenuProvider = ({ children: e }) => {
 }, IsInSettingsPageProvider = ({ children: e }) => {
   const t = useLocation().pathname.includes("/settings");
   return /* @__PURE__ */ jsx(IsInSettingsPageContext.Provider, { value: t, children: e });
-}, MatchAdminProvider = ({ children: e }) => {
-  const t = !!useMatch("/admin");
-  return /* @__PURE__ */ jsx(MatchAdminContext.Provider, { value: t, children: e });
-}, MatchAdminNameProvider = ({ children: e }) => {
-  const t = !!useMatch("/admin/:name");
-  return /* @__PURE__ */ jsx(MatchAdminNameContext.Provider, { value: t, children: e });
 }, IsAdminPageProvider = ({ children: e }) => {
   const n = useLocation().pathname.startsWith("/admin");
   return /* @__PURE__ */ jsx(IsAdminPageContext.Provider, { value: n, children: e });
@@ -6274,12 +6265,12 @@ const IsSubPageClosedByPageMenuProvider = ({ children: e }) => {
 }, LocationSearchProvider = ({ children: e }) => {
   const t = useLocation();
   return /* @__PURE__ */ jsx(LocationSearchContext.Provider, { value: t.search, children: e });
-}, useNavigateNoUpdate = () => React.useContext(NavigateNoUpdateContext), useLocationNoUpdate = () => React.useContext(LocationNoUpdateContext), useLocationSearch = () => React.useContext(LocationSearchContext), useIsAdminPage = () => React.useContext(IsAdminPageContext), useCurrentPageUid = () => React.useContext(CurrentPageUidContext), useMatchAdmin = () => React.useContext(MatchAdminContext), useMatchAdminName = () => React.useContext(MatchAdminNameContext), useIsInSettingsPage = () => React.useContext(IsInSettingsPageContext), useCurrentTabUid = () => React.useContext(CurrentTabUidContext), useCurrentSearchParams = () => React.useContext(SearchParamsContext), useRouterBasename = () => React.useContext(RouterBasenameContext), useIsSubPageClosedByPageMenu = (e) => {
+}, useNavigateNoUpdate = () => React.useContext(NavigateNoUpdateContext), useLocationNoUpdate = () => React.useContext(LocationNoUpdateContext), useLocationSearch = () => React.useContext(LocationSearchContext), useIsAdminPage = () => React.useContext(IsAdminPageContext), useCurrentPageUid = () => React.useContext(CurrentPageUidContext), useIsInSettingsPage = () => React.useContext(IsInSettingsPageContext), useCurrentTabUid = () => React.useContext(CurrentTabUidContext), useCurrentSearchParams = () => React.useContext(SearchParamsContext), useRouterBasename = () => React.useContext(RouterBasenameContext), useIsSubPageClosedByPageMenu = (e) => {
   const { isSubPageClosedByPageMenu: t, setFieldSchema: n, reset: o } = React.useContext(IsSubPageClosedByPageMenuContext);
   return useEffect(() => {
     n(e);
   }, [e, n]), { isSubPageClosedByPageMenu: t, reset: o };
-}, CustomRouterContextProvider = ({ children: e }) => /* @__PURE__ */ jsx(NavigateNoUpdateProvider, { children: /* @__PURE__ */ jsx(LocationNoUpdateProvider, { children: /* @__PURE__ */ jsx(IsAdminPageProvider, { children: /* @__PURE__ */ jsx(LocationSearchProvider, { children: /* @__PURE__ */ jsx(MatchAdminProvider, { children: /* @__PURE__ */ jsx(MatchAdminNameProvider, { children: /* @__PURE__ */ jsx(SearchParamsProvider, { children: /* @__PURE__ */ jsx(RouterBasenameProvider, { children: /* @__PURE__ */ jsx(IsInSettingsPageProvider, { children: e }) }) }) }) }) }) }) }) }), useDefaultDynamicComponentProps = () => {
+}, CustomRouterContextProvider = ({ children: e }) => /* @__PURE__ */ jsx(NavigateNoUpdateProvider, { children: /* @__PURE__ */ jsx(LocationNoUpdateProvider, { children: /* @__PURE__ */ jsx(IsAdminPageProvider, { children: /* @__PURE__ */ jsx(LocationSearchProvider, { children: /* @__PURE__ */ jsx(SearchParamsProvider, { children: /* @__PURE__ */ jsx(RouterBasenameProvider, { children: /* @__PURE__ */ jsx(IsInSettingsPageProvider, { children: e }) }) }) }) }) }) }), useDefaultDynamicComponentProps = () => {
 }, getHook = (e, t, n) => {
   let o;
   return _.isFunction(e) ? o = e : (o = t[e], o || console.error(`${n} is not registered`)), o || useDefaultDynamicComponentProps;
@@ -6471,11 +6462,15 @@ function SetDataLoadingMode() {
 const useSourceKey = (e) => useCollectionManager().getSourceKeyByAssociation(e), KeepAliveContext = createContext(!0), DesignableInterceptor = ({ children: e, active: t }) => {
   const n = useContext(SchemaComponentContext), o = useContext(SchemaOptionsContext), r = useContext(SchemaComponentsContext), i = useContext(SchemaExpressionScopeContext), a = useContext(ACLContext), l = useRef(n), c = useRef(o), u = useRef(r), d = useRef(i), p = useRef(a);
   return t && (l.current = n, c.current = o, u.current = r, d.current = i, p.current = a), /* @__PURE__ */ jsx(SchemaComponentContext.Provider, { value: l.current, children: /* @__PURE__ */ jsx(SchemaOptionsContext.Provider, { value: c.current, children: /* @__PURE__ */ jsx(SchemaComponentsContext.Provider, { value: u.current, children: /* @__PURE__ */ jsx(SchemaExpressionScopeContext.Provider, { value: d.current, children: /* @__PURE__ */ jsx(ACLContext.Provider, { value: p.current, children: e }) }) }) }) });
-}, KeepAliveProvider = ({ children: e, active: t }) => {
-  const n = useContext(UNSAFE_LocationContext), o = useContext(UNSAFE_RouteContext), r = useRef(n), i = useRef(o);
-  return t && // Skip comparing location key to improve LocationContext rendering performance
-  !_.isEqual(_.omit(r.current.location, "key"), _.omit(n.location, "key")) && (r.current = n), t && !_.isEqual(i.current, o) && (i.current = o), /* @__PURE__ */ jsx(KeepAliveContext.Provider, { value: t, children: /* @__PURE__ */ jsx(DesignableInterceptor, { active: t, children: /* @__PURE__ */ jsx(UNSAFE_LocationContext.Provider, { value: r.current, children: /* @__PURE__ */ jsx(UNSAFE_RouteContext.Provider, { value: i.current, children: e }) }) }) });
-}, useKeepAlive = () => ({ active: useContext(KeepAliveContext) }), getMaxPageCount = () => {
+}, hidden = { display: "none" }, KeepAliveProvider = memo(
+  ({ children: e, active: t, parentActive: n }) => {
+    const o = useContext(UNSAFE_LocationContext), r = useContext(UNSAFE_RouteContext), i = useContext(UNSAFE_DataRouterContext), a = useContext(UNSAFE_DataRouterStateContext), l = useContext(IsSubPageClosedByPageMenuContext), c = useContext(Context), u = useContext(RouteContext), d = useRef(o), p = useRef(r), m = useRef(i), h = useRef(a), g = useRef(l), f = useRef(c), C = useRef(u);
+    t && (m.current = i, h.current = a, g.current = l, f.current = c, C.current = u), t && // Skip comparing location key to improve LocationContext rendering performance
+    !_.isEqual(_.omit(d.current.location, "key"), _.omit(o.location, "key")) && (d.current = o), t && !_.isEqual(p.current, r) && (p.current = r);
+    const b = /* @__PURE__ */ jsx(RouteContext.Provider, { value: C.current, children: /* @__PURE__ */ jsx(Context.Provider, { value: f.current, children: /* @__PURE__ */ jsx(UNSAFE_DataRouterContext.Provider, { value: m.current, children: /* @__PURE__ */ jsx(UNSAFE_DataRouterStateContext.Provider, { value: h.current, children: /* @__PURE__ */ jsx(UNSAFE_LocationContext.Provider, { value: d.current, children: /* @__PURE__ */ jsx(UNSAFE_RouteContext.Provider, { value: p.current, children: /* @__PURE__ */ jsx(KeepAliveContext.Provider, { value: n === !1 ? !1 : t, children: /* @__PURE__ */ jsx(DesignableInterceptor, { active: t, children: /* @__PURE__ */ jsx(IsSubPageClosedByPageMenuContext.Provider, { value: g.current, children: e }) }) }) }) }) }) }) }) });
+    return /* @__PURE__ */ jsx("div", { style: t ? null : hidden, children: b });
+  }
+), useKeepAlive = () => ({ active: useContext(KeepAliveContext) }), getMaxPageCount = () => {
   let t = 5;
   try {
     const n = navigator.deviceMemory;
@@ -6495,8 +6490,8 @@ const useSourceKey = (e) => useCollectionManager().getSourceKeyByAssociation(e),
     return 5;
   }
 }, MAX_RENDERED_PAGE_COUNT = getMaxPageCount(), KeepAlive = React.memo(({ children: e, uid: t }) => {
-  const n = useRef([]);
-  return n.current.includes(t) || (n.current.push(t), n.current.length > MAX_RENDERED_PAGE_COUNT && (n.current = n.current.slice(-MAX_RENDERED_PAGE_COUNT))), /* @__PURE__ */ jsx(Fragment$1, { children: n.current.map((o) => /* @__PURE__ */ jsx(CurrentPageUidContext.Provider, { value: o, children: /* @__PURE__ */ jsx(KeepAliveProvider, { active: o === t, children: e(o) }) }, o)) });
+  const { active: n } = useKeepAlive(), o = useRef([]);
+  return o.current.includes(t) || (o.current.push(t), o.current.length > MAX_RENDERED_PAGE_COUNT && (o.current = o.current.slice(-MAX_RENDERED_PAGE_COUNT))), /* @__PURE__ */ jsx(Fragment$1, { children: o.current.map((r) => /* @__PURE__ */ jsx(KeepAliveProvider, { active: r === t, parentActive: n, children: e(r) }, r)) });
 });
 KeepAlive.displayName = "KeepAlive";
 const DEBOUNCE_WAIT = 100, LOADING_DELAY = void 0, EMPTY_OBJECT = Object.freeze({});
@@ -9218,7 +9213,7 @@ function addAppVersion(e, t) {
       addAppVersion((o = e.properties) == null ? void 0 : o[n], t);
     }), e;
 }
-const name = "@nocobase/client", version = "1.6.31", license = "AGPL-3.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
+const name = "@nocobase/client", version = "1.6.33", 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.6.1",
@@ -9240,9 +9235,9 @@ const name = "@nocobase/client", version = "1.6.31", license = "AGPL-3.0", main
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "1.6.31",
-  "@nocobase/sdk": "1.6.31",
-  "@nocobase/utils": "1.6.31",
+  "@nocobase/evaluators": "1.6.33",
+  "@nocobase/sdk": "1.6.33",
+  "@nocobase/utils": "1.6.33",
   ahooks: "^3.7.2",
   antd: "5.12.8",
   "antd-style": "3.7.1",
@@ -10035,10 +10030,10 @@ const opacityStyle = {
   height: "100%",
   maxHeight: 400,
   zIndex: 1e3
-}, displayNone$4 = {
+}, displayNone$3 = {
   display: "none"
 }, HighPerformanceSpin = React.memo((e) => /* @__PURE__ */ jsxs("div", { style: containerStyle, children: [
-  /* @__PURE__ */ jsx(Spin, P(x({}, _.omit(e, "children")), { style: e.spinning ? spinStyle : displayNone$4 })),
+  /* @__PURE__ */ jsx(Spin, P(x({}, _.omit(e, "children")), { style: e.spinning ? spinStyle : displayNone$3 })),
   /* @__PURE__ */ jsx("div", { style: e.spinning ? opacityStyle : null, children: e.children })
 ] })), AssociationFieldContext = createContext({});
 AssociationFieldContext.displayName = "AssociationFieldContext";
@@ -10526,9 +10521,9 @@ const InternalBodyCellComponent$1 = React.memo((e) => {
   ] });
 });
 InternalBodyCellComponent$1.displayName = "InternalBodyCellComponent";
-const displayNone$3 = { display: "none" }, BodyCellComponent$1 = React.memo((e) => {
+const displayNone$2 = { display: "none" }, BodyCellComponent$1 = React.memo((e) => {
   const { designable: t } = useDesignable();
-  return e.columnHidden ? /* @__PURE__ */ jsx("td", { style: t ? columnOpacityStyle$1 : columnHiddenStyle$1, children: t ? e.children : /* @__PURE__ */ jsx("span", { style: displayNone$3, children: e.children }) }) : /* @__PURE__ */ jsx(InternalBodyCellComponent$1, x({}, _.omit(e, "columnHidden")));
+  return e.columnHidden ? /* @__PURE__ */ jsx("td", { style: t ? columnOpacityStyle$1 : columnHiddenStyle$1, children: t ? e.children : /* @__PURE__ */ jsx("span", { style: displayNone$2, children: e.children }) }) : /* @__PURE__ */ jsx(InternalBodyCellComponent$1, x({}, _.omit(e, "columnHidden")));
 });
 BodyCellComponent$1.displayName = "BodyCellComponent";
 const TableElementRefContext = createContext(null), useTableElementRef = () => useContext(TableElementRefContext), InternalNocoBaseTable$1 = React.memo(
@@ -11631,7 +11626,7 @@ const VisibleProvider = React.memo(({ children: e, popupuid: t }) => {
     [n]
   ), { isPopupVisibleControlledByURL: r } = usePopupSettings();
   return r() ? /* @__PURE__ */ jsx(TabsContextProvider, { activeKey: t == null ? void 0 : t.tab, onChange: o, children: e }) : /* @__PURE__ */ jsx(Fragment$1, { children: e });
-}, displayNone$2 = { display: "none" }, PagePopupsItemProvider = ({ params: e, context: t, currentLevel: n, children: o }) => {
+}, displayNone$1 = { display: "none" }, PagePopupsItemProvider = ({ params: e, context: t, currentLevel: n, children: o }) => {
   const r = x({}, getStoredPopupContext(e.popupuid));
   return useEffect(() => (setPopupLayerState(n, !0), () => {
     removePopupLayerState(n);
@@ -11642,7 +11637,7 @@ const VisibleProvider = React.memo(({ children: e, popupuid: t }) => {
       association: r.association
     },
     _.isNil
-  )), _.isEmpty(t) ? /* @__PURE__ */ jsx(PopupParamsProvider, { params: e, context: t, currentLevel: n, children: /* @__PURE__ */ jsx(VisibleProvider, { popupuid: e.popupuid, children: /* @__PURE__ */ jsx("div", { style: displayNone$2, children: o }) }) }) : /* @__PURE__ */ jsx(PopupParamsProvider, { params: e, context: t, currentLevel: n, children: /* @__PURE__ */ jsx(
+  )), _.isEmpty(t) ? /* @__PURE__ */ jsx(PopupParamsProvider, { params: e, context: t, currentLevel: n, children: /* @__PURE__ */ jsx(VisibleProvider, { popupuid: e.popupuid, children: /* @__PURE__ */ jsx("div", { style: displayNone$1, children: o }) }) }) : /* @__PURE__ */ jsx(PopupParamsProvider, { params: e, context: t, currentLevel: n, children: /* @__PURE__ */ jsx(
     DataBlockProvider,
     {
       dataSource: t.dataSource,
@@ -11653,7 +11648,7 @@ const VisibleProvider = React.memo(({ children: e, popupuid: t }) => {
       record: r.record,
       parentRecord: r.parentRecord,
       action: "get",
-      children: /* @__PURE__ */ jsx(BlockRequestContextProvider, { recordRequest: r.service, children: /* @__PURE__ */ jsx(PopupTabsPropsProvider, { children: /* @__PURE__ */ jsx(VisibleProvider, { popupuid: e.popupuid, children: /* @__PURE__ */ jsx("div", { style: displayNone$2, children: o }) }) }) })
+      children: /* @__PURE__ */ jsx(BlockRequestContextProvider, { recordRequest: r.service, children: /* @__PURE__ */ jsx(PopupTabsPropsProvider, { children: /* @__PURE__ */ jsx(VisibleProvider, { popupuid: e.popupuid, children: /* @__PURE__ */ jsx("div", { style: displayNone$1, children: o }) }) }) })
     }
   ) });
 }, insertChildToParentSchema = ({
@@ -13807,7 +13802,7 @@ function getOperators() {
       return n.truthy(r);
     },
     $empty: function(r) {
-      return Array.isArray(r) ? r.some((i) => !n.truthy(i)) : !n.truthy(r);
+      return Array.isArray(r) ? r.length === 0 : !n.truthy(r);
     },
     $notExists: function(r) {
       return !n.truthy(r);
@@ -27019,10 +27014,10 @@ const LanguageSettings = () => {
   ]
 }), NocoBaseRouteContext = createContext(null);
 NocoBaseRouteContext.displayName = "NocoBaseRouteContext";
-const CurrentRouteProvider = ({ children: e, uid: t }) => {
+const CurrentRouteProvider = memo(({ children: e, uid: t }) => {
   const { allAccessRoutes: n } = useAllAccessDesktopRoutes(), o = useMemo(() => findRouteBySchemaUid(t, n), [t, n]);
   return /* @__PURE__ */ jsx(NocoBaseRouteContext.Provider, { value: o, children: e });
-}, useCurrentRoute = () => useContext(NocoBaseRouteContext) || {}, emptyArray = [], AllAccessDesktopRoutesContext = createContext({
+}), useCurrentRoute = () => useContext(NocoBaseRouteContext) || {}, emptyArray = [], AllAccessDesktopRoutesContext = createContext({
   allAccessRoutes: emptyArray,
   refresh: () => {
   }
@@ -27039,7 +27034,7 @@ const useAllAccessDesktopRoutes = () => useContext(AllAccessDesktopRoutesContext
   return r && !t.current ? null : (t.current = !0, /* @__PURE__ */ jsx(AllAccessDesktopRoutesContext.Provider, { value: i, children: e }));
 }, noAccessPermission = (e, t) => e ? !findRouteBySchemaUid(e, t) : !1, AdminDynamicPage = () => {
   const e = useCurrentPageUid(), { allAccessRoutes: t } = useAllAccessDesktopRoutes();
-  return isGroup(e, t) ? null : noAccessPermission(e, t) ? /* @__PURE__ */ jsx(AppNotFound$1, {}) : /* @__PURE__ */ jsx(KeepAlive, { uid: e, children: (n) => /* @__PURE__ */ jsx(CurrentRouteProvider, { uid: n, children: /* @__PURE__ */ jsx(RemoteSchemaComponent, { uid: n }) }) });
+  return isGroup(e, t) ? null : noAccessPermission(e, t) ? /* @__PURE__ */ jsx(AppNotFound$1, {}) : /* @__PURE__ */ jsx(KeepAlive, { uid: e, children: (n) => /* @__PURE__ */ jsx(CurrentPageUidContext.Provider, { value: n, children: /* @__PURE__ */ jsx(CurrentRouteProvider, { uid: n, children: /* @__PURE__ */ jsx(RemoteSchemaComponent, { uid: n }) }) }) });
 }, layoutContentClass = css`
   display: flex;
   flex-direction: column;
@@ -27915,17 +27910,19 @@ const useCreateActionProps = () => {
   return {
     onClick(d, p) {
       return V(this, null, function* () {
-        var C, b, S, y, v;
+        var C, b, S, y, v, F, I;
         const { triggerWorkflows: m } = (C = c == null ? void 0 : c["x-action-settings"]) != null ? C : {};
         yield t.destroy(x({
           filterByTk: e,
           // TODO(refactor): should change to inject by plugin
-          triggerWorkflows: m != null && m.length ? m.map((F) => [F.workflowKey, F.context].filter(Boolean).join("!")).join(",") : void 0
+          triggerWorkflows: m != null && m.length ? m.map((R) => [R.workflowKey, R.context].filter(Boolean).join("!")).join(",") : void 0
         }, l));
         const { count: h = 0, page: g = 0, pageSize: f = 0 } = ((b = n == null ? void 0 : n.data) == null ? void 0 : b.meta) || {};
-        h % f === 1 && g !== 1 && n.run(P(x({}, (S = n == null ? void 0 : n.params) == null ? void 0 : S[0]), {
-          page: g - 1
-        })), p && (p == null || p()), a == null || a(!0), o && o !== "TableField" && ((v = (y = r == null ? void 0 : r.service) == null ? void 0 : y.refresh) == null || v.call(y), i == null || i(!1), a == null || a(!0));
+        if (h % f === 1 && g !== 1) {
+          const R = (S = n.params[0]) == null ? void 0 : S.page, T = (v = (y = n.data) == null ? void 0 : y.meta) == null ? void 0 : v.totalPage;
+          R === T && n.params[0] && R !== 1 && (n.params[0].page = R - 1);
+        }
+        p && (p == null || p()), a == null || a(!0), o && o !== "TableField" && ((I = (F = r == null ? void 0 : r.service) == null ? void 0 : F.refresh) == null || I.call(F), i == null || i(!1), a == null || a(!0));
       });
     }
   };
@@ -38103,7 +38100,7 @@ const getValues = (e, t) => castArray(e).filter((n) => n != null).map((n) => typ
               return (j == null ? void 0 : j.type) === "date" && (X = dayjs(X).format("YYYY-MM-DD")), c ? c({
                 [t.label]: X || EMPTY$1,
                 [t.value]: W[t.value]
-              }) : P(x({}, W), {
+              }) : P(x({}, omit(W, "style")), {
                 [t.label]: X || EMPTY$1,
                 [t.value]: W[t.value]
               });
@@ -38119,7 +38116,7 @@ const getValues = (e, t) => castArray(e).filter((n) => n != null).map((n) => typ
         }, n), {
           headers: b,
           params: P(x({
-            pageSize: 200
+            paginate: !1
           }, n == null ? void 0 : n.params), {
             filter: (J = n == null ? void 0 : n.params) == null ? void 0 : J.filter
           })
@@ -40121,14 +40118,9 @@ const useRouteTranslation = () => useTranslation("lm-desktop-routes"), InternalP
       /* @__PURE__ */ jsx(Outlet, {})
     ] }) }) })
   ] });
-}), hiddenStyle = {
-  // Visually hide the element while keeping it in document flow to prevent reflow/repaint
-  transform: "scale(0)",
-  // Prevent element from receiving any pointer events (clicks, hovers etc) to avoid interfering with other elements
-  pointerEvents: "none"
-}, Page = React.memo((e) => {
+}), Page = React.memo((e) => {
   const { hashId: t, componentCls: n } = useStyles$7(), { active: o } = useKeepAlive(), r = useCurrentTabUid(), i = useRef(r);
-  return o && (i.current = r), /* @__PURE__ */ jsx("div", { className: `${n} ${t} ${antTableCell}`, style: o ? null : hiddenStyle, children: /* @__PURE__ */ jsx(CurrentTabUidContext.Provider, { value: "", children: /* @__PURE__ */ jsx(InternalPage, { currentTabUid: i.current, className: e.className }) }) });
+  return o && (i.current = r), /* @__PURE__ */ jsx("div", { className: `${n} ${t} ${antTableCell}`, children: /* @__PURE__ */ jsx(CurrentTabUidContext.Provider, { value: "", children: /* @__PURE__ */ jsx(InternalPage, { currentTabUid: i.current, className: e.className }) }) });
 });
 Page.displayName = "NocoBasePage";
 const PageTabs = () => {
@@ -40153,26 +40145,22 @@ const className1 = css`
       display: none;
     }
   }
-`, displayBlock = {
-  display: "block"
-}, displayNone$1 = {
-  display: "none"
-}, TabPane = React.memo(({ active: e, uid: t }) => {
-  const n = useRef(!1), { active: o } = useKeepAlive();
-  return e && !n.current && (n.current = !0), n.current ? /* @__PURE__ */ jsx("div", { style: e ? displayBlock : displayNone$1, children: /* @__PURE__ */ jsx(KeepAliveProvider, { active: o && e, children: /* @__PURE__ */ jsx(RemoteSchemaComponent, { uid: t }) }) }) : null;
-}), InternalPageContent = (e) => {
-  var p, m, h, g;
-  const { loading: t, disablePageHeader: n, enablePageTabs: o, activeKey: r } = e, i = useCurrentRoute(), a = useNavigateNoUpdate(), l = useLocationNoUpdate(), u = ((i == null ? void 0 : i.children) || []).every((f) => f.schemaUid !== r && f.tabSchemaName !== r);
+`, InternalPageContent = (e) => {
+  var p, m, h;
+  const { loading: t, disablePageHeader: n, enablePageTabs: o, activeKey: r } = e, i = useCurrentRoute(), a = useNavigateNoUpdate(), l = useLocationNoUpdate(), u = ((i == null ? void 0 : i.children) || []).every((g) => g.schemaUid !== r && g.tabSchemaName !== r);
   if (r && u)
     return /* @__PURE__ */ jsx(AppNotFound$1, {});
-  const d = (p = i == null ? void 0 : i.children) == null ? void 0 : p.find((f) => f.tabSchemaName === r);
+  const d = (p = i == null ? void 0 : i.children) == null ? void 0 : p.find((g) => g.tabSchemaName === r);
   if (d) {
-    const f = new URLSearchParams(l.search);
-    f.has("tab") && f.get("tab") === r && f.delete("tab");
-    const C = f.toString() ? `?${f.toString()}` : "", b = l.pathname + (l.pathname.endsWith("/") ? `tabs/${d.schemaUid}` : `/tabs/${d.schemaUid}`);
-    return a(b + C), null;
+    const g = new URLSearchParams(l.search);
+    g.has("tab") && g.get("tab") === r && g.delete("tab");
+    const f = g.toString() ? `?${g.toString()}` : "", C = l.pathname + (l.pathname.endsWith("/") ? `tabs/${d.schemaUid}` : `/tabs/${d.schemaUid}`);
+    return a(C + f), null;
   }
-  return !n && o ? /* @__PURE__ */ jsx(Fragment$1, { children: (m = i.children) == null ? void 0 : m.map((f) => /* @__PURE__ */ jsx(NocoBaseRouteContext.Provider, { value: f, children: /* @__PURE__ */ jsx(TabPane, { active: f.schemaUid === r, uid: f.schemaUid }) }, f.schemaUid)) }) : /* @__PURE__ */ jsx("div", { className: className1, children: /* @__PURE__ */ jsx(NocoBaseRouteContext.Provider, { value: (h = i == null ? void 0 : i.children) == null ? void 0 : h[0], children: /* @__PURE__ */ jsx(RemoteSchemaComponent, { uid: (g = i == null ? void 0 : i.children) == null ? void 0 : g[0].schemaUid }) }) });
+  return !n && o ? /* @__PURE__ */ jsx(KeepAlive, { uid: r, children: (g) => {
+    var f;
+    return /* @__PURE__ */ jsx(NocoBaseRouteContext.Provider, { value: (f = i.children) == null ? void 0 : f.find((C) => C.schemaUid === g), children: /* @__PURE__ */ jsx(RemoteSchemaComponent, { uid: g }) });
+  } }) : /* @__PURE__ */ jsx("div", { className: className1, children: /* @__PURE__ */ jsx(NocoBaseRouteContext.Provider, { value: (m = i == null ? void 0 : i.children) == null ? void 0 : m[0], children: /* @__PURE__ */ jsx(RemoteSchemaComponent, { uid: (h = i == null ? void 0 : i.children) == null ? void 0 : h[0].schemaUid }) }) });
 }, PageContent = memo((e) => /* @__PURE__ */ jsx(PopupRouteContextResetter, { children: /* @__PURE__ */ jsx(InternalPageContent, x({}, e)) })), NocoBasePageHeaderTabs = ({ className: e, activeKey: t }) => {
   const n = useFieldSchema(), { t: o } = useTranslation(), { t: r } = useRouteTranslation(), { token: i } = useToken$1(), a = useRouterBasename(), l = useNavigateNoUpdate(), c = useCallback(
     (F) => {
@@ -40803,7 +40791,7 @@ const InternalAssociationSelect$1 = observer$1(
           service: a,
           onChange: (j) => {
             var B;
-            const N = (j == null ? void 0 : j.length) !== 0 ? j : null;
+            const N = Array.isArray(j) && j.length === 0 ? null : j;
             (B = e.onChange) == null || B.call(e, N);
           },
           CustomDropdownRender: m === "quickAdd" && T
@@ -41941,8 +41929,10 @@ const InternalFileManager = (e) => {
   }) });
 }), AssociationCascadeSelect = connect((e) => /* @__PURE__ */ jsx("div", { children: /* @__PURE__ */ jsx(CascadeSelect, x({}, e)) })), InternalCascadeSelect = observer$1(
   (e) => {
-    var h;
-    const { options: t } = useAssociationFieldContext(), n = useMemo(() => createForm(), []), { t: o } = useTranslation(), r = useField(), i = useFieldSchema(), { loading: a, data: l } = useDataBlockRequest() || {}, c = (h = l == null ? void 0 : l.data) == null ? void 0 : h[i.name], u = debounce((g) => {
+    const { options: t } = useAssociationFieldContext(), n = useMemo(() => createForm(), []), { t: o } = useTranslation(), r = useField(), i = useFieldSchema(), { loading: a, data: l } = useDataBlockRequest() || {}, c = useMemo(() => {
+      var g;
+      return (g = l == null ? void 0 : l.data) == null ? void 0 : g[i.name];
+    }, [a]), u = !l || i.name in ((l == null ? void 0 : l.data) || {}), d = debounce((g) => {
       var f, C;
       if (t.interface === "m2o") {
         const b = extractLastNonNullValueObjects((f = g.values) == null ? void 0 : f[i.name]);
@@ -41962,13 +41952,13 @@ const InternalFileManager = (e) => {
       const g = uid();
       return n.addEffects(g, () => {
         onFormValuesChange((f) => {
-          u(f);
+          d(f);
         });
       }), () => {
-        n.removeEffects(g), u.cancel();
+        n.removeEffects(g), d.cancel();
       };
     }, []);
-    const m = {
+    const h = {
       type: "object",
       properties: {
         select_array: {
@@ -42026,7 +42016,7 @@ const InternalFileManager = (e) => {
         }
       }
     };
-    return !a && /* @__PURE__ */ jsx(FormProvider$1, { form: n, children: t.interface === "m2o" ? /* @__PURE__ */ jsx(
+    return !a && u && /* @__PURE__ */ jsx(FormProvider$1, { form: n, children: t.interface === "m2o" ? /* @__PURE__ */ jsx(
       SchemaComponent,
       {
         components: { FormItem: FormItem$1 },
@@ -42037,7 +42027,7 @@ const InternalFileManager = (e) => {
           "x-component-props": x({}, e)
         })
       }
-    ) : /* @__PURE__ */ jsx(SchemaField, { schema: m }) });
+    ) : /* @__PURE__ */ jsx(SchemaField, { schema: h }) });
   },
   { displayName: "InternalCascadeSelect" }
 );
@@ -65068,6 +65058,7 @@ export {
   IntegerFieldInterface,
   InternalAdminLayout,
   IsInNocoBaseRecursionFieldContext,
+  IsSubPageClosedByPageMenuContext,
   IsSubPageClosedByPageMenuProvider,
   Json,
   JsonFieldInterface,
@@ -65368,7 +65359,7 @@ export {
   createReadPrettyFormBlockSchema,
   createRouterManager,
   createSelectSchemaSettingsItem,
-  yn as createStyles,
+  vn as createStyles,
   createSwitchSettingsItem,
   createTableBlockSchema,
   createTableBlockUISchema,
@@ -65709,6 +65700,7 @@ export {
   useIsLoggedIn,
   useIsSelectFieldMode,
   useIsSubPageClosedByPageMenu,
+  useKeepAlive,
   useLabelUiSchema,
   useLazy,
   useLinkActionProps,
@@ -65717,8 +65709,6 @@ export {
   useLocalVariables$1 as useLocalVariables,
   useLocationNoUpdate,
   useLocationSearch,
-  useMatchAdmin,
-  useMatchAdminName,
   useMenuDragEnd,
   useMenuSearch,
   useMenuTranslation,

package/es/route-switch/antd/admin-layout/KeepAlive.d.ts

@@ -9,6 +9,7 @@
 import React, { FC } from 'react';
 export declare const KeepAliveProvider: FC<{
     active: boolean;
+    parentActive: boolean;
 }>;
 /**
  * Used on components that don't need KeepAlive context, to improve performance when Context values change

package/es/route-switch/antd/admin-layout/index.d.ts

@@ -8,9 +8,9 @@
  */
 import React, { FC } from 'react';
 import { Plugin } from '../../../application/Plugin';
-import { KeepAlive } from './KeepAlive';
+import { KeepAlive, useKeepAlive } from './KeepAlive';
 import { NocoBaseDesktopRoute, NocoBaseDesktopRouteType } from './convertRoutesToSchema';
-export { KeepAlive, NocoBaseDesktopRouteType };
+export { KeepAlive, NocoBaseDesktopRouteType, useKeepAlive };
 export declare const NocoBaseRouteContext: React.Context<NocoBaseDesktopRoute>;
 export declare const CurrentRouteProvider: FC<{
     uid: string;