@nocobase/client 1.5.8 → 1.5.10

package/es/application/CustomRouterContextProvider.d.ts

@@ -47,5 +47,8 @@ export declare const useRouterBasename: () => string;
  * Used to determine if the user closed the sub-page by clicking on the page menu
  * @returns
  */
-export declare const useIsSubPageClosedByPageMenu: (fieldSchema: Schema) => boolean;
+export declare const useIsSubPageClosedByPageMenu: (fieldSchema: Schema) => {
+    isSubPageClosedByPageMenu: () => boolean;
+    reset: () => void;
+};
 export declare const CustomRouterContextProvider: FC;

package/es/index.mjs

@@ -6020,18 +6020,22 @@ SearchParamsContext.displayName = "SearchParamsContext";
 const RouterBasenameContext = React.createContext("");
 RouterBasenameContext.displayName = "RouterBasenameContext";
 const IsSubPageClosedByPageMenuContext = React.createContext({
-  isSubPageClosedByPageMenu: !1,
+  isSubPageClosedByPageMenu: () => !1,
   setFieldSchema: () => {
+  },
+  reset: () => {
   }
 });
 IsSubPageClosedByPageMenuContext.displayName = "IsSubPageClosedByPageMenuContext";
 const IsSubPageClosedByPageMenuProvider = ({ children: e }) => {
-  const t = useParams(), n = useRef({}), [o, r] = useState(null), i = useMemo(() => {
-    var c, u;
-    const l = _.isEmpty(t["*"]) && ((c = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : c.openMode) === "page" && !!((u = n.current["*"]) != null && u.includes(o["x-uid"]));
-    return n.current = t, l;
-  }, [o, t]), a = useMemo(() => ({ isSubPageClosedByPageMenu: i, setFieldSchema: r }), [i]);
-  return /* @__PURE__ */ jsx(IsSubPageClosedByPageMenuContext.Provider, { value: a, children: e });
+  const t = useParams(), n = useRef({}), [o, r] = useState(null), i = useCallback(() => {
+    var u, d;
+    const c = _.isEmpty(t["*"]) && ((u = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : u.openMode) === "page" && !!((d = n.current["*"]) != null && d.includes(o["x-uid"]));
+    return n.current = t, c;
+  }, [o, t]), a = useCallback(() => {
+    n.current = {};
+  }, []), l = useMemo(() => ({ isSubPageClosedByPageMenu: i, setFieldSchema: r, reset: a }), [i, a]);
+  return /* @__PURE__ */ jsx(IsSubPageClosedByPageMenuContext.Provider, { value: l, children: e });
 }, RouterBasenameProvider = ({ children: e }) => {
   const t = useHref("/");
   return /* @__PURE__ */ jsx(RouterBasenameContext.Provider, { value: t, children: e });
@@ -6072,10 +6076,10 @@ const IsSubPageClosedByPageMenuProvider = ({ 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) => {
-  const { isSubPageClosedByPageMenu: t, setFieldSchema: n } = React.useContext(IsSubPageClosedByPageMenuContext);
+  const { isSubPageClosedByPageMenu: t, setFieldSchema: n, reset: o } = React.useContext(IsSubPageClosedByPageMenuContext);
   return useEffect(() => {
     n(e);
-  }, [e, n]), t;
+  }, [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 = () => {
 }, getHook = (e, t, n) => {
   let o;
@@ -10782,14 +10786,14 @@ const InternalTableBlockProvider = (e) => {
 ActionContext.displayName = "ActionContext";
 const ActionContextProvider = React.memo(
   (e) => {
-    const [t, n] = useState(!1), { visible: o } = x(x({}, e), e.value), { setSubmitted: r } = x(x({}, e), e.value), i = useBlockServiceInActionButton(), a = useIsSubPageClosedByPageMenu(useFieldSchema());
+    const [t, n] = useState(!1), { visible: o } = x(x({}, e), e.value), { setSubmitted: r } = x(x({}, e), e.value), i = useBlockServiceInActionButton(), { isSubPageClosedByPageMenu: a, reset: l } = useIsSubPageClosedByPageMenu(useFieldSchema());
     useEffect(() => {
       q(void 0, null, function* () {
-        o === !1 && i && !i.loading && (t || a) && (i.loading = !0, yield i.refreshAsync(), i.loading = !1, n(!1), r == null || r(!0));
+        o === !1 && i && !i.loading && (t || a()) && (l(), i.loading = !0, yield i.refreshAsync(), i.loading = !1, n(!1), r == null || r(!0));
       });
-    }, [o, i == null ? void 0 : i.refresh, r, a]);
-    const l = useMemo(() => P(x(x({}, e), e == null ? void 0 : e.value), { submitted: t, setSubmitted: n }), [e, t]);
-    return /* @__PURE__ */ jsx(ActionContext.Provider, { value: l, children: e.children });
+    }, [o, i, r, a, t, l]);
+    const c = useMemo(() => P(x(x({}, e), e == null ? void 0 : e.value), { submitted: t, setSubmitted: n }), [e, t]);
+    return /* @__PURE__ */ jsx(ActionContext.Provider, { value: c, children: e.children });
   }
 );
 ActionContextProvider.displayName = "ActionContextProvider";
@@ -13757,6 +13761,7 @@ function getGroupItemForTable({
     };
     return {
       type: "item",
+      key: `${t.target}_${g.name}_${C}`,
       name: C,
       title: ((S = g == null ? void 0 : g.uiSchema) == null ? void 0 : S.title) || g.name,
       Component: "TableCollectionFieldInitializer",
@@ -13776,6 +13781,7 @@ function getGroupItemForTable({
     };
   }), p = [{
     type: "itemGroup",
+    key: `${t.target}_${r}_displayFields`,
     name: `${r}-displayCollectionFields`,
     title: l("Display fields"),
     children: u
@@ -13794,6 +13800,7 @@ function getGroupItemForTable({
     if (g.length) {
       const f = {
         type: "itemGroup",
+        key: `${t.target}_${r}_associationFields`,
         name: `${r}-associationFields`,
         title: l("Display association fields"),
         children: g
@@ -13803,7 +13810,8 @@ function getGroupItemForTable({
   }
   return {
     type: "subMenu",
-    name: `${r}`,
+    key: `${t.target}_${r}_submenu`,
+    name: r,
     title: (h = t.uiSchema) == null ? void 0 : h.title,
     children: p
   };
@@ -35192,7 +35200,7 @@ function addAppVersion(e, t) {
       addAppVersion((o = e.properties) == null ? void 0 : o[n], t);
     }), e;
 }
-const name = "@nocobase/client", version = "1.5.8", license = "AGPL-3.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
+const name = "@nocobase/client", version = "1.5.10", 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",
@@ -35214,9 +35222,9 @@ const name = "@nocobase/client", version = "1.5.8", license = "AGPL-3.0", main =
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "1.5.8",
-  "@nocobase/sdk": "1.5.8",
-  "@nocobase/utils": "1.5.8",
+  "@nocobase/evaluators": "1.5.10",
+  "@nocobase/sdk": "1.5.10",
+  "@nocobase/utils": "1.5.10",
   ahooks: "^3.7.2",
   antd: "5.12.8",
   "antd-style": "3.7.1",
@@ -37431,6 +37439,7 @@ const useStyles$9 = genStyleHook("nb-page", (e) => {
       display: "flex",
       flexDirection: "column",
       overflowY: "auto",
+      overflowX: "hidden",
       "&:hover": { "> .general-schema-designer": { display: "block" } },
       ".ant-page-header": { zIndex: 1, position: "relative" },
       "> .general-schema-designer": {