@nocobase/client 2.0.3 → 2.0.6

package/es/index.mjs

@@ -9957,7 +9957,7 @@ function addAppVersion(e, t) {
       addAppVersion((n = e.properties) == null ? void 0 : n[o], t);
     }), e;
 }
-const name = "@nocobase/client", version = "2.0.3", license = "Apache-2.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
+const name = "@nocobase/client", version = "2.0.6", license = "Apache-2.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",
@@ -9980,10 +9980,10 @@ const name = "@nocobase/client", version = "2.0.3", license = "Apache-2.0", main
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "2.0.3",
-  "@nocobase/flow-engine": "2.0.3",
-  "@nocobase/sdk": "2.0.3",
-  "@nocobase/utils": "2.0.3",
+  "@nocobase/evaluators": "2.0.6",
+  "@nocobase/flow-engine": "2.0.6",
+  "@nocobase/sdk": "2.0.6",
+  "@nocobase/utils": "2.0.6",
   "@tanstack/react-table": "^8.21.3",
   "@types/tabulator-tables": "^6.2.6",
   "acorn-jsx": "^5.3.2",
@@ -26292,6 +26292,17 @@ const components$5 = { TreeSelect: TreeSelect$1 }, toItems$2 = (e, { t, compile:
       children: e.children
     }
   );
+}, MOBILE_MENU_CLOSE_DELAY_MS = 220, runAfterMobileMenuClosed = ({
+  isMobile: e,
+  closeMobileMenu: t,
+  callback: o,
+  delayMs: n = MOBILE_MENU_CLOSE_DELAY_MS
+}) => {
+  if (!e) {
+    o();
+    return;
+  }
+  t(), window.setTimeout(o, n);
 }, UserCenterButton = () => {
   const { token: e } = useToken();
   return /* @__PURE__ */ jsx(
@@ -26467,7 +26478,10 @@ const LayoutContent = () => {
     /* @__PURE__ */ jsx(MenuSchemaToolbar, { container: t }),
     /* @__PURE__ */ jsx("div", { ref: e })
   ] });
-}, menuItemStyle = { display: "flex", alignItems: "center", justifyContent: "space-between" }, GroupItem = (e) => {
+}, menuItemStyle = { display: "flex", alignItems: "center", justifyContent: "space-between" }, MobileMenuControlContext = React.createContext({
+  closeMobileMenu: () => {
+  }
+}), GroupItem = (e) => {
   var i, a, l, c;
   const { item: t } = e, { designable: o } = useDesignable(), n = useEvaluatedExpression((a = (i = t._route.options) == null ? void 0 : i.badge) == null ? void 0 : a.count), r = { __route__: t._route };
   return /* @__PURE__ */ jsx(ParentRouteContext.Provider, { value: t._parentRoute, children: /* @__PURE__ */ jsx(NocoBaseRouteContext.Provider, { value: t._route, children: /* @__PURE__ */ jsxs(SortableItem$1, { id: t._route.id, schema: r, "aria-label": t.name, style: menuItemStyle, children: [
@@ -26486,59 +26500,76 @@ const LayoutContent = () => {
   const { inHeader: t } = useContext(HeaderContext);
   return /* @__PURE__ */ jsx(RouteContext.Consumer, { children: (o) => o.collapsed && !e.hidden && !t ? /* @__PURE__ */ jsx(Tooltip, { title: e.title, placement: "right", children: /* @__PURE__ */ jsx(Badge, A(x({}, e.badgeProps), { style: { transform: "none", maxWidth: "10em" }, dot: !1, children: e.children })) }) : e.children });
 }, MenuItem = (e) => {
-  var m, h, g, f, y, b, S, C, F;
-  const { item: t } = e, { parseURLAndParams: o } = useParseURLAndParams(), n = useRef(null), r = useLocation(), i = useEvaluatedExpression((h = (m = t._route.options) == null ? void 0 : m.badge) == null ? void 0 : h.count), a = useNavigateNoUpdate(), l = useRouterBasename();
+  var g, f, y, b, S, C, F, P, v, k, I;
+  const { item: t } = e, { parseURLAndParams: o } = useParseURLAndParams(), n = useRef(null), r = useLocation(), i = useEvaluatedExpression((f = (g = t._route.options) == null ? void 0 : g.badge) == null ? void 0 : f.count), a = useNavigateNoUpdate(), l = useRouterBasename(), { closeMobileMenu: c } = useContext(MobileMenuControlContext), u = t.redirect || t.path, d = A(x({}, (y = t._route.options) == null ? void 0 : y.badge), { count: i });
   useEffect(() => {
     n.current && (n.current.parentElement.parentElement.style.order = 999, n.current.parentElement.parentElement.style.paddingLeft = 0, n.current.parentElement.parentElement.style.padding = 0);
   }, []);
-  const c = useCallback(
-    (P) => V(void 0, null, function* () {
-      var D, E, $;
-      const v = (D = t._route.options) == null ? void 0 : D.href, k = (E = t._route.options) == null ? void 0 : E.params, I = ($ = t._route.options) == null ? void 0 : $.openInNewWindow;
-      P.preventDefault(), P.stopPropagation();
+  const p = useCallback(
+    (D) => V(void 0, null, function* () {
+      var T, w, B, N, j, O;
+      const E = (T = t._route.options) == null ? void 0 : T.href, $ = (w = t._route.options) == null ? void 0 : w.params, M = (B = t._route.options) == null ? void 0 : B.openInNewWindow;
+      D.preventDefault(), D.stopPropagation();
       try {
-        const M = yield o(v, k || []);
-        I !== !1 ? window.open(M, "_blank") : navigateWithinSelf(v, a, window.location.origin + l);
-      } catch (M) {
-        console.error(M), window.open(v, "_blank");
+        const q = yield o(E, $ || []);
+        M !== !1 ? ((N = e.options) != null && N.isMobile && c(), window.open(q, "_blank")) : runAfterMobileMenuClosed({
+          isMobile: !!((j = e.options) != null && j.isMobile),
+          closeMobileMenu: c,
+          callback: () => {
+            navigateWithinSelf(E, a, window.location.origin + l);
+          }
+        });
+      } catch (q) {
+        console.error(q), (O = e.options) != null && O.isMobile && c(), window.open(E, "_blank");
       }
     }),
-    [o, t]
+    [o, t, (b = e.options) == null ? void 0 : b.isMobile, c, a, l]
+  ), m = useCallback(
+    (D) => {
+      var E, $;
+      if (D.preventDefault(), D.stopPropagation(), !((E = e.options) != null && E.isMobile)) {
+        a(u);
+        return;
+      }
+      runAfterMobileMenuClosed({
+        isMobile: !!(($ = e.options) != null && $.isMobile),
+        closeMobileMenu: c,
+        callback: () => {
+          a(u);
+        }
+      });
+    },
+    [(S = e.options) == null ? void 0 : S.isMobile, c, a, u]
   );
   if (t._hidden)
     return null;
-  const u = { __route__: t._route };
-  if (t.key === "x-designer-button")
-    return /* @__PURE__ */ jsx("div", { ref: n, children: /* @__PURE__ */ jsx(ResetThemeTokenAndKeepAlgorithm, { children: /* @__PURE__ */ jsx(ParentRouteContext.Provider, { value: t._parentRoute, children: /* @__PURE__ */ jsx(NocoBaseRouteContext.Provider, { value: t._route, children: e.children }) }) }) });
-  if (((g = t._route) == null ? void 0 : g.type) === NocoBaseDesktopRouteType.link)
-    return /* @__PURE__ */ jsx(ParentRouteContext.Provider, { value: t._parentRoute, children: /* @__PURE__ */ jsx(NocoBaseRouteContext.Provider, { value: t._route, children: /* @__PURE__ */ jsxs(SortableItem$1, { id: t._route.id, schema: u, style: menuItemStyle, children: [
-      /* @__PURE__ */ jsx("div", { onClick: c, children: /* @__PURE__ */ jsx(Link$1, { to: r.pathname, "aria-label": t.name, children: e.children }) }),
-      /* @__PURE__ */ jsx(MenuSchemaToolbar, {}),
-      i != null && /* @__PURE__ */ jsx(
-        Badge,
-        A(x({}, (f = t._route.options) == null ? void 0 : f.badge), {
-          count: i,
-          style: { marginLeft: 4, color: (b = (y = t._route.options) == null ? void 0 : y.badge) == null ? void 0 : b.textColor, maxWidth: "10em" },
-          dot: !1
-        })
-      )
-    ] }) }) });
-  const d = t.redirect || t.path, p = A(x({}, (S = t._route.options) == null ? void 0 : S.badge), { count: i });
-  return /* @__PURE__ */ jsx(ParentRouteContext.Provider, { value: t._parentRoute, children: /* @__PURE__ */ jsx(NocoBaseRouteContext.Provider, { value: t._route, children: /* @__PURE__ */ jsxs(SortableItem$1, { id: t._route.id, schema: u, style: menuItemStyle, children: [
+  const h = { __route__: t._route };
+  return t.key === "x-designer-button" ? /* @__PURE__ */ jsx("div", { ref: n, children: /* @__PURE__ */ jsx(ResetThemeTokenAndKeepAlgorithm, { children: /* @__PURE__ */ jsx(ParentRouteContext.Provider, { value: t._parentRoute, children: /* @__PURE__ */ jsx(NocoBaseRouteContext.Provider, { value: t._route, children: e.children }) }) }) }) : ((C = t._route) == null ? void 0 : C.type) === NocoBaseDesktopRouteType.link ? /* @__PURE__ */ jsx(ParentRouteContext.Provider, { value: t._parentRoute, children: /* @__PURE__ */ jsx(NocoBaseRouteContext.Provider, { value: t._route, children: /* @__PURE__ */ jsxs(SortableItem$1, { id: t._route.id, schema: h, style: menuItemStyle, children: [
+    /* @__PURE__ */ jsx("div", { onClick: p, children: /* @__PURE__ */ jsx(Link$1, { to: r.pathname, "aria-label": t.name, children: e.children }) }),
+    /* @__PURE__ */ jsx(MenuSchemaToolbar, {}),
+    i != null && /* @__PURE__ */ jsx(
+      Badge,
+      A(x({}, (F = t._route.options) == null ? void 0 : F.badge), {
+        count: i,
+        style: { marginLeft: 4, color: (v = (P = t._route.options) == null ? void 0 : P.badge) == null ? void 0 : v.textColor, maxWidth: "10em" },
+        dot: !1
+      })
+    )
+  ] }) }) }) : /* @__PURE__ */ jsx(ParentRouteContext.Provider, { value: t._parentRoute, children: /* @__PURE__ */ jsx(NocoBaseRouteContext.Provider, { value: t._route, children: /* @__PURE__ */ jsxs(SortableItem$1, { id: t._route.id, schema: h, style: menuItemStyle, children: [
     /* @__PURE__ */ jsx(
       WithTooltip,
       {
         title: t.name,
         hidden: t._route.type === NocoBaseDesktopRouteType.group || t._depth > 0,
-        badgeProps: p,
-        children: /* @__PURE__ */ jsx(Link$1, { to: d, "aria-label": t.name, children: e.children })
+        badgeProps: d,
+        children: /* @__PURE__ */ jsx(Link$1, { to: u, "aria-label": t.name, onClick: m, children: e.children })
       }
     ),
     /* @__PURE__ */ jsx(MenuSchemaToolbar, {}),
     i != null && /* @__PURE__ */ jsx(
       Badge,
-      A(x({}, p), {
-        style: { marginLeft: 4, color: (F = (C = t._route.options) == null ? void 0 : C.badge) == null ? void 0 : F.textColor, maxWidth: "10em" },
+      A(x({}, d), {
+        style: { marginLeft: 4, color: (I = (k = t._route.options) == null ? void 0 : k.badge) == null ? void 0 : I.textColor, maxWidth: "10em" },
         dot: !1
       })
     )
@@ -26657,10 +26688,10 @@ const LayoutContent = () => {
   return /* @__PURE__ */ jsx(t, {});
 }, InternalAdminLayout = (e) => {
   const { allAccessRoutes: t } = useAllAccessDesktopRoutes(), { designable: o } = useDesignable(), n = useLocation(), { onDragEnd: r } = useMenuDragEnd(), { token: i } = useToken(), { isMobileLayout: a } = useMobileLayout(), [l, c] = useState(a), u = useRef(!1), { t: d } = useMenuTranslation(), p = a ? !1 : o, { styles: m } = useHeaderStyle(), { Component: h } = useApplications(), g = useMemo(() => {
-    const v = convertRoutesToLayout(t, { designable: p, isMobile: a, t: d });
+    const k = convertRoutesToLayout(t, { designable: p, isMobile: a, t: d });
     return {
       path: "/",
-      children: Array.isArray(v) ? v : []
+      children: Array.isArray(k) ? k : []
     };
   }, [t, p, a, d]), f = useMemo(() => ({
     header: {
@@ -26697,17 +26728,19 @@ const LayoutContent = () => {
     }),
     algorithm: b ? [theme.compactAlgorithm, theme.darkAlgorithm] : theme.compactAlgorithm
     // Set mobile mode to always use compact algorithm
-  }), [y, b]), C = useCallback((v) => {
-    u.current || c(v);
+  }), [y, b]), C = useCallback((k) => {
+    u.current || c(k);
   }, []), F = useCallback(() => {
     u.current = !0, setTimeout(() => {
       u.current = !1;
     });
   }, []), P = useMemo(() => ({
     overflowedIndicatorPopupClassName: m.headerPopup
-  }), [m.headerPopup]);
+  }), [m.headerPopup]), v = useCallback(() => {
+    a && c(!0);
+  }, [a]);
   return /* @__PURE__ */ jsxs("div", { style: rootStyle, children: [
-    /* @__PURE__ */ jsx("div", { id: "nocobase-app-container", style: appContainerStyle, children: /* @__PURE__ */ jsx(DndContext, { onDragEnd: r, children: /* @__PURE__ */ jsx(
+    /* @__PURE__ */ jsx("div", { id: "nocobase-app-container", style: appContainerStyle, children: /* @__PURE__ */ jsx(MobileMenuControlContext.Provider, { value: { closeMobileMenu: v }, children: /* @__PURE__ */ jsx(DndContext, { onDragEnd: r, children: /* @__PURE__ */ jsx(
       ProLayout,
       A(x({}, e), {
         contentStyle: contentStyle$1,
@@ -26736,15 +26769,15 @@ const LayoutContent = () => {
           autoClose: !1
         },
         menuProps: P,
-        children: /* @__PURE__ */ jsx(RouteContext.Consumer, { children: (v) => {
-          const { isMobile: k } = v;
-          return /* @__PURE__ */ jsx(SetIsMobileLayout, { isMobile: k, children: /* @__PURE__ */ jsxs(ConfigProvider, { theme: k ? S : y, children: [
+        children: /* @__PURE__ */ jsx(RouteContext.Consumer, { children: (k) => {
+          const { isMobile: I } = k;
+          return /* @__PURE__ */ jsx(SetIsMobileLayout, { isMobile: I, children: /* @__PURE__ */ jsxs(ConfigProvider, { theme: I ? S : y, children: [
             /* @__PURE__ */ jsx(GlobalStyle, {}),
             /* @__PURE__ */ jsx(LayoutContent, {})
           ] }) });
         } })
       })
-    ) }) }),
+    ) }) }) }),
     /* @__PURE__ */ jsx("div", { id: "nocobase-embed-container", style: embedContainerStyle })
   ] });
 };
@@ -30527,7 +30560,7 @@ const useStyles$a = genStyleHook("nb-markdown", (e, { isDarkTheme: t }) => {
     }, t ? i : r)
   };
 }), parseMarkdown$1 = _.memoize((e) => V(void 0, null, function* () {
-  return e && (yield import("./md-BbvRKckr.mjs")).default.render(e);
+  return e && (yield import("./md-oH2RssNY.mjs")).default.render(e);
 }));
 function useParseMarkdown$1(e) {
   const [t, o] = useState(""), [n, r] = useState(!0);
@@ -71748,7 +71781,7 @@ BlockGridModel.registerFlow({
   }
 });
 const parseMarkdown = _.memoize((e) => V(void 0, null, function* () {
-  return e && (yield import("./md-oH2RssNY.mjs")).default.render(e);
+  return e && (yield import("./md-BbvRKckr.mjs")).default.render(e);
 }));
 function useParseMarkdown(e) {
   const [t, o] = useState(""), [n, r] = useState(!0);
@@ -78047,7 +78080,26 @@ function clearLegacyDefaultValuesFromFormModel(e) {
 const GRID_DELEGATED_STEP_KEYS = {
   formModelSettings: /* @__PURE__ */ new Set(["layout", "assignRules"]),
   eventSettings: /* @__PURE__ */ new Set(["linkageRules"])
-};
+}, FLOW_KEEP_MOBILE_HORIZONTAL_CLASS = "nb-flow-keep-mobile-horizontal", flowKeepMobileHorizontalClassName = css`
+  &.${FLOW_KEEP_MOBILE_HORIZONTAL_CLASS} {
+    @media (max-width: 575px) {
+      .ant-form-item {
+        flex-wrap: nowrap !important;
+      }
+
+      .ant-form-item .ant-form-item-label {
+        flex: 0 0 auto !important;
+        max-width: none !important;
+      }
+
+      .ant-form-item .ant-form-item-control {
+        flex: 1 1 0 !important;
+        max-width: none !important;
+        min-width: 0;
+      }
+    }
+  }
+`;
 function isGridDelegatedStep(e, t) {
   var o;
   return !!((o = GRID_DELEGATED_STEP_KEYS[e]) != null && o.has(t));
@@ -78296,29 +78348,35 @@ function FormComponent(i) {
     "layoutProps",
     "initialValues"
   ]);
-  var l, c, u;
+  var u, d, p, m;
+  const l = !!((u = e == null ? void 0 : e.context) != null && u.isMobileLayout && (o == null ? void 0 : o.layout) === "horizontal"), c = [
+    r.className,
+    l ? FLOW_KEEP_MOBILE_HORIZONTAL_CLASS : "",
+    l ? flowKeepMobileHorizontalClassName : ""
+  ].filter(Boolean).join(" ");
   return /* @__PURE__ */ jsx(
     Form$2,
     A(x(A(x({
       form: e.form,
-      initialValues: ((u = (c = (l = e.context) == null ? void 0 : l.view) == null ? void 0 : c.inputArgs) == null ? void 0 : u.formData) || e.context.record || n
+      initialValues: ((m = (p = (d = e.context) == null ? void 0 : d.view) == null ? void 0 : p.inputArgs) == null ? void 0 : m.formData) || e.context.record || n
     }, omit(o, "labelWidth")), {
       labelCol: { style: { width: o == null ? void 0 : o.labelWidth } },
-      onFieldsChange: (d) => {
-        const p = e.formValueRuntime;
-        p && p.handleFormFieldsChange(d);
+      onFieldsChange: (h) => {
+        const g = e.formValueRuntime;
+        g && g.handleFormFieldsChange(h);
       },
-      onValuesChange: (d, p) => {
-        var h;
-        (h = e.markUserModifiedFields) == null || h.call(e, d);
-        const m = e.formValueRuntime;
-        if (m) {
-          m.handleFormValuesChange(d, p);
+      onValuesChange: (h, g) => {
+        var y;
+        (y = e.markUserModifiedFields) == null || y.call(e, h);
+        const f = e.formValueRuntime;
+        if (f) {
+          f.handleFormValuesChange(h, g);
           return;
         }
-        e.dispatchEvent("formValuesChange", { changedValues: d, allValues: p }, { debounce: !0 }), e.emitter.emit("formValuesChange", { changedValues: d, allValues: p });
+        e.dispatchEvent("formValuesChange", { changedValues: h, allValues: g }, { debounce: !0 }), e.emitter.emit("formValuesChange", { changedValues: h, allValues: g });
       }
     }), r), {
+      className: c || void 0,
       children: t
     })
   );

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

@@ -0,0 +1,15 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+export declare const MOBILE_MENU_CLOSE_DELAY_MS = 220;
+export declare const runAfterMobileMenuClosed: ({ isMobile, closeMobileMenu, callback, delayMs, }: {
+    isMobile: boolean;
+    closeMobileMenu: () => void;
+    callback: () => void;
+    delayMs?: number;
+}) => void;