@nocobase/client 1.6.26 → 1.6.28

package/es/index.mjs

@@ -7365,7 +7365,7 @@ function getSubscriber({
         t.setState((p) => {
           p.display = "visible";
         });
-      })) : (t[l] = u == null ? void 0 : u.value, t.data = t.data || {}, t.data.hidden = !1, l === "display" && (u == null ? void 0 : u.value) === "visible" && t.data.prevRequired && (delete t.data.prevRequired, t.required = !0), requestAnimationFrame(() => {
+      })) : (t[l] = u == null ? void 0 : u.value, l === "display" && (u == null ? void 0 : u.value) === "visible" && (t.data = t.data || {}, t.data.hidden = !1, t.data.prevRequired && (delete t.data.prevRequired, t.required = !0)), requestAnimationFrame(() => {
         t.setState((p) => {
           p[l] = u == null ? void 0 : u.value;
         });
@@ -8577,44 +8577,54 @@ function withInitializer(e) {
         [j]
       );
       return !o && m !== !0 ? null : /* @__PURE__ */ jsx(ErrorBoundary, { FallbackComponent: ErrorFallback.Modal, onError: console.error, children: /* @__PURE__ */ jsx(
-        SchemaInitializerContext.Provider,
+        ConfigProvider,
         {
-          value: {
-            visible: T,
-            setVisible: D,
-            insert: v,
-            options: n
+          theme: {
+            token: {
+              zIndexPopupBase: 9999
+            }
           },
-          children: f === !1 ? React.createElement(e, N) : /* @__PURE__ */ jsx(
-            Popover,
-            P(x({
-              zIndex: 9999,
-              placement: "bottomLeft"
-            }, h), {
-              arrow: !1,
-              overlayClassName: B,
-              open: T,
-              onOpenChange: D,
-              content: F(
-                /* @__PURE__ */ jsx("div", { className: `${w} ${I}`, style: R, children: /* @__PURE__ */ jsx(
-                  ConfigProvider,
-                  {
-                    theme: {
-                      components: {
-                        Menu: {
-                          itemHeight: O.marginXL,
-                          borderRadius: O.borderRadiusSM,
-                          itemBorderRadius: O.borderRadiusSM,
-                          subMenuItemBorderRadius: O.borderRadiusSM
-                        }
+          children: /* @__PURE__ */ jsx(
+            SchemaInitializerContext.Provider,
+            {
+              value: {
+                visible: T,
+                setVisible: D,
+                options: n,
+                insert: v
+              },
+              children: f === !1 ? React.createElement(e, N) : /* @__PURE__ */ jsx(
+                Popover,
+                P(x({
+                  zIndex: 9999,
+                  placement: "bottomLeft"
+                }, h), {
+                  arrow: !1,
+                  overlayClassName: B,
+                  open: T,
+                  onOpenChange: D,
+                  content: F(
+                    /* @__PURE__ */ jsx("div", { className: `${w} ${I}`, style: R, children: /* @__PURE__ */ jsx(
+                      ConfigProvider,
+                      {
+                        theme: {
+                          components: {
+                            Menu: {
+                              itemHeight: O.marginXL,
+                              borderRadius: O.borderRadiusSM,
+                              itemBorderRadius: O.borderRadiusSM,
+                              subMenuItemBorderRadius: O.borderRadiusSM
+                            }
+                          }
+                        },
+                        children: g
                       }
-                    },
-                    children: g
-                  }
-                ) })
-              ),
-              children: React.createElement(e, N)
-            })
+                    ) })
+                  ),
+                  children: React.createElement(e, N)
+                })
+              )
+            }
           )
         }
       ) });
@@ -9208,7 +9218,7 @@ function addAppVersion(e, t) {
       addAppVersion((o = e.properties) == null ? void 0 : o[n], t);
     }), e;
 }
-const name = "@nocobase/client", version = "1.6.26", 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.28", 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",
@@ -9230,9 +9240,9 @@ const name = "@nocobase/client", version = "1.6.26", 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.26",
-  "@nocobase/sdk": "1.6.26",
-  "@nocobase/utils": "1.6.26",
+  "@nocobase/evaluators": "1.6.28",
+  "@nocobase/sdk": "1.6.28",
+  "@nocobase/utils": "1.6.28",
   ahooks: "^3.7.2",
   antd: "5.12.8",
   "antd-style": "3.7.1",
@@ -27454,7 +27464,7 @@ function getFilteredFormValues(e) {
       return i.length <= 1 ? i.join(".") : i.slice(0, -1).join(".");
     })
   ).forEach((r, i) => {
-    (i !== 0 || r.includes(".")) && _.unset(t, r);
+    (i !== 0 || r.includes(".")) && !t[r] && _.unset(t, r);
   }), t;
 }
 function getFormValues({
@@ -28822,16 +28832,17 @@ const SortableProvider = (e) => {
   }), a = useMemo(() => ({ draggable: r, droppable: i }), [r, i]);
   return /* @__PURE__ */ jsx(SortableContext.Provider, { value: a, children: o });
 }, getComputedColor = (e) => new TinyColor(e).setAlpha(0.15).toHex8String(), Sortable = (e) => {
-  var g, f;
-  const h = e, { component: t, overStyle: n, style: o, children: r, openMode: i } = h, a = Y(h, ["component", "overStyle", "style", "children", "openMode"]), { token: l } = useToken$1(), { draggable: c, droppable: u } = useContext(SortableContext), { isOver: d, setNodeRef: p } = u, m = x({}, o);
-  return d && ((g = c == null ? void 0 : c.active) == null ? void 0 : g.id) !== ((f = u == null ? void 0 : u.over) == null ? void 0 : f.id) && (m[t === "a" ? "color" : "background"] = getComputedColor(l.colorSettings), Object.assign(m, n)), React.createElement(
+  var C, b;
+  const f = e, { component: t, overStyle: n, style: o, children: r, openMode: i } = f, a = Y(f, ["component", "overStyle", "style", "children", "openMode"]), { token: l } = useToken$1(), { draggable: c, droppable: u } = useContext(SortableContext), { isOver: d, setNodeRef: p } = u, m = x({}, o), h = useFieldSchema(), g = (h == null ? void 0 : h["x-component"]) === "Action.Link" || t === "a";
+  return d && ((C = c == null ? void 0 : c.active) == null ? void 0 : C.id) !== ((b = u == null ? void 0 : u.over) == null ? void 0 : b.id) && (m[g ? "color" : "background"] = getComputedColor(l.colorSettings), Object.assign(m, n)), React.createElement(
     t || "div",
     P(x({
       role: "none"
     }, a), {
       className: cx("nb-sortable-designer", e.className),
       ref: p,
-      style: m
+      style: m,
+      setNodeRef: p
     }),
     r
   );