@nocobase/client 1.6.8 → 1.6.10

package/es/index.mjs

@@ -9161,7 +9161,7 @@ function addAppVersion(e, t) {
       addAppVersion((o = e.properties) == null ? void 0 : o[n], t);
     }), e;
 }
-const name = "@nocobase/client", version = "1.6.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.6.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.6.1",
@@ -9183,9 +9183,9 @@ const name = "@nocobase/client", version = "1.6.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.6.8",
-  "@nocobase/sdk": "1.6.8",
-  "@nocobase/utils": "1.6.8",
+  "@nocobase/evaluators": "1.6.10",
+  "@nocobase/sdk": "1.6.10",
+  "@nocobase/utils": "1.6.10",
   ahooks: "^3.7.2",
   antd: "5.12.8",
   "antd-style": "3.7.1",
@@ -10636,24 +10636,24 @@ const Table$2 = withDynamicSchemaProps(
         const Q = D ? N : [];
         _.isEqual(Q, R) || M(Q);
       }, [D, N]);
-      const W = useCallback((Q) => {
+      const K = useCallback((Q) => {
         if (m)
-          return K(Q);
+          return W(Q);
         if (Q.key)
           return Q.key;
         if (q.current.has(Q))
           return q.current.get(Q);
         const te = uid();
         return q.current.set(Q, te), te;
-      }, []), K = useCallback(
+      }, []), W = useCallback(
         (Q) => {
           var te;
           return Array.isArray(m) ? m.map((oe) => {
             var ie;
             return ((ie = Q[oe]) == null ? void 0 : ie.toString()) || "";
-          }).join("-") : typeof m == "string" ? Q[m] : (te = (m != null ? m : W)(Q)) == null ? void 0 : te.toString();
+          }).join("-") : typeof m == "string" ? Q[m] : (te = (m != null ? m : K)(Q)) == null ? void 0 : te.toString();
         },
-        [JSON.stringify(m), W]
+        [JSON.stringify(m), K]
       ), X = useMemo(() => (Array.isArray(b) ? b : []).filter(Boolean), [b, b == null ? void 0 : b.length]), ee = useMemo(() => (Q) => {
         const te = useCallback((oe) => {
           var Se, ye, ve, Pe, Fe, Ie;
@@ -10708,7 +10708,7 @@ const Table$2 = withDynamicSchemaProps(
                   }),
                   children: [
                     /* @__PURE__ */ jsxs("div", { className: cls(Q ? "checked" : null, rowSelectCheckboxContentClass$1), children: [
-                      l && /* @__PURE__ */ jsx(SortHandle$2, { id: K(te) }),
+                      l && /* @__PURE__ */ jsx(SortHandle$2, { id: W(te) }),
                       c && /* @__PURE__ */ jsx(TableIndex$3, { index: oe })
                     ] }),
                     E && /* @__PURE__ */ jsx(
@@ -10735,7 +10735,7 @@ const Table$2 = withDynamicSchemaProps(
           c,
           l,
           v,
-          K,
+          W,
           E,
           ne,
           O,
@@ -10747,12 +10747,12 @@ const Table$2 = withDynamicSchemaProps(
           return l ? React.createElement(
             SortableContext$1,
             {
-              items: ((te = b == null ? void 0 : b.map) == null ? void 0 : te.call(b, K)) || []
+              items: ((te = b == null ? void 0 : b.map) == null ? void 0 : te.call(b, W)) || []
             },
             Q
           ) : React.createElement(React.Fragment, {}, Q);
         },
-        [l, K]
+        [l, W]
         // Don't put 'value' in dependencies, otherwise it will cause the dropdown component to disappear immediately when adding association fields to the table
       ), { height: le, tableSizeRefCallback: ue } = useTableSize(), fe = useMemo(() => ({
         x: "max-content",
@@ -10779,7 +10779,7 @@ const Table$2 = withDynamicSchemaProps(
             tableHeight: le,
             SortableWrapper: se,
             tableSizeRefCallback: ue,
-            defaultRowKey: W,
+            defaultRowKey: K,
             dataSource: X
           }, S), re), {
             paginationProps: O,
@@ -12957,21 +12957,21 @@ https://requirejs.org/docs/errors.html#` + e);
         }
     }
     function b(T, z, L) {
-      var E, q, G, U, H, J, W, K, X, ee, Z, ne, re = z && z.split("/"), se = a.map, le = se && se["*"];
-      if (T && (T = T.split("/"), W = T.length - 1, a.nodeIdCompat && jsSuffixRegExp.test(T[W]) && (T[W] = T[W].replace(jsSuffixRegExp, "")), T[0].charAt(0) === "." && re && (ne = re.slice(0, re.length - 1), T = ne.concat(T)), C(T), T = T.join("/")), L && se && (re || le)) {
+      var E, q, G, U, H, J, K, W, X, ee, Z, ne, re = z && z.split("/"), se = a.map, le = se && se["*"];
+      if (T && (T = T.split("/"), K = T.length - 1, a.nodeIdCompat && jsSuffixRegExp.test(T[K]) && (T[K] = T[K].replace(jsSuffixRegExp, "")), T[0].charAt(0) === "." && re && (ne = re.slice(0, re.length - 1), T = ne.concat(T)), C(T), T = T.join("/")), L && se && (re || le)) {
         G = T.split("/");
         e:
           for (U = G.length; U > 0; U -= 1) {
             if (J = G.slice(0, U).join("/"), re) {
               for (H = re.length; H > 0; H -= 1)
                 if (q = getOwn(se, re.slice(0, H).join("/")), q && (q = getOwn(q, J), q)) {
-                  K = q, X = U;
+                  W = q, X = U;
                   break e;
                 }
             }
             !ee && le && getOwn(le, J) && (ee = getOwn(le, J), Z = U);
           }
-        !K && ee && (K = ee, X = Z), K && (G.splice(0, X, K), T = G.join("/"));
+        !W && ee && (W = ee, X = Z), W && (G.splice(0, X, W), T = G.join("/"));
       }
       return E = getOwn(a.pkgs, T), E || T;
     }
@@ -12993,16 +12993,16 @@ https://requirejs.org/docs/errors.html#` + e);
       return L > -1 && (z = T.substring(0, L), T = T.substring(L + 1, T.length)), [z, T];
     }
     function F(T, z, L, E) {
-      var q, G, U, H, J = null, W = z ? z.name : null, K = T, X = !0, ee = "";
-      return T || (X = !1, T = "_@r" + (g += 1)), H = y(T), J = H[0], T = H[1], J && (J = b(J, W, E), G = getOwn(p, J)), T && (J ? L ? ee = T : G && G.normalize ? ee = G.normalize(T, function(Z) {
-        return b(Z, W, E);
-      }) : ee = T.indexOf("!") === -1 ? b(T, W, E) : T : (ee = b(T, W, E), H = y(ee), J = H[0], ee = H[1], L = !0, q = o.nameToUrl(ee))), U = J && !G && !L ? "_unnormalized" + (f += 1) : "", {
+      var q, G, U, H, J = null, K = z ? z.name : null, W = T, X = !0, ee = "";
+      return T || (X = !1, T = "_@r" + (g += 1)), H = y(T), J = H[0], T = H[1], J && (J = b(J, K, E), G = getOwn(p, J)), T && (J ? L ? ee = T : G && G.normalize ? ee = G.normalize(T, function(Z) {
+        return b(Z, K, E);
+      }) : ee = T.indexOf("!") === -1 ? b(T, K, E) : T : (ee = b(T, K, E), H = y(ee), J = H[0], ee = H[1], L = !0, q = o.nameToUrl(ee))), U = J && !G && !L ? "_unnormalized" + (f += 1) : "", {
         prefix: J,
         name: ee,
         parentMap: z,
         unnormalized: !!U,
         url: q,
-        originalName: K,
+        originalName: W,
         isDefine: X,
         id: (J ? J + "!" + ee : ee) + U
       };
@@ -13061,11 +13061,11 @@ https://requirejs.org/docs/errors.html#` + e);
       var T, z, L = a.waitSeconds * 1e3, E = L && o.startTime + L < (/* @__PURE__ */ new Date()).getTime(), q = [], G = [], U = !1, H = !0;
       if (!t) {
         if (t = !0, eachProp(c, function(J) {
-          var W = J.map, K = W.id;
-          if (J.enabled && (W.isDefine || G.push(J), !J.error)) {
+          var K = J.map, W = K.id;
+          if (J.enabled && (K.isDefine || G.push(J), !J.error)) {
             if (!J.inited && E)
-              v(K) ? (z = !0, U = !0) : (q.push(K), S(K));
-            else if (!J.inited && J.fetched && W.isDefine && (U = !0, !W.prefix))
+              v(W) ? (z = !0, U = !0) : (q.push(W), S(W));
+            else if (!J.inited && J.fetched && K.isDefine && (U = !0, !K.prefix))
               return H = !1;
           }
         }), E && q.length)
@@ -13147,12 +13147,12 @@ https://requirejs.org/docs/errors.html#` + e);
       callPlugin: function() {
         var T = this.map, z = T.id, L = F(T.prefix);
         this.depMaps.push(L), w(L, "defined", bind(this, function(E) {
-          var q, G, U, H = getOwn(h, this.map.id), J = this.map.name, W = this.map.parentMap ? this.map.parentMap.name : null, K = o.makeRequire(T.parentMap, {
+          var q, G, U, H = getOwn(h, this.map.id), J = this.map.name, K = this.map.parentMap ? this.map.parentMap.name : null, W = o.makeRequire(T.parentMap, {
             enableBuildCallback: !0
           });
           if (this.map.unnormalized) {
             E.normalize && (J = E.normalize(J, function(X) {
-              return b(X, W, !0);
+              return b(X, K, !0);
             }) || ""), G = F(
               T.prefix + "!" + J,
               this.map.parentMap,
@@ -13200,8 +13200,8 @@ https://requirejs.org/docs/errors.html#` + e);
                 [z]
               ));
             }
-            re && (useInteractive = !0), this.depMaps.push(ne), o.completeLoad(Z), K([Z], q);
-          }), E.load(T.name, K, q, a);
+            re && (useInteractive = !0), this.depMaps.push(ne), o.completeLoad(Z), W([Z], q);
+          }), E.load(T.name, W, q, a);
         })), o.enable(L, this), this.pluginMaps[L.id] = L;
       },
       enable: function() {
@@ -13400,9 +13400,9 @@ https://requirejs.org/docs/errors.html#` + e);
        * internal API, not a public one. Use toUrl for the public API.
        */
       nameToUrl: function(T, z, L) {
-        var E, q, G, U, H, J, W, K = getOwn(a.pkgs, T);
-        if (K && (T = K), W = getOwn(h, T), W)
-          return o.nameToUrl(W, z, L);
+        var E, q, G, U, H, J, K, W = getOwn(a.pkgs, T);
+        if (W && (T = W), K = getOwn(h, T), K)
+          return o.nameToUrl(K, z, L);
         if (req.jsExtRegExp.test(T))
           H = T + (z || "");
         else {
@@ -17978,13 +17978,13 @@ const useGetAriaLabelOfDesigner = () => {
     o || (t == null ? void 0 : t["x-initializer"]),
     t == null ? void 0 : t["x-initializer-props"]
   ), $ = useGridRowContext(), T = useGridContext(), z = useMemo(() => {
-    var W;
+    var K;
     return {
       insertPosition: "afterEnd",
-      wrap: ((W = $ == null ? void 0 : $.cols) == null ? void 0 : W.length) === 1 ? gridRowColWrap : void 0,
-      Component: (K) => /* @__PURE__ */ jsx(
+      wrap: ((K = $ == null ? void 0 : $.cols) == null ? void 0 : K.length) === 1 ? gridRowColWrap : void 0,
+      Component: (W) => /* @__PURE__ */ jsx(
         PlusOutlined,
-        P(x({}, K), {
+        P(x({}, W), {
           role: "button",
           "aria-label": y("schema-initializer"),
           style: { cursor: "pointer", fontSize: 14 }
@@ -17992,29 +17992,29 @@ const useGetAriaLabelOfDesigner = () => {
       )
     };
   }, [y, (J = $ == null ? void 0 : $.cols) == null ? void 0 : J.length]), L = useMemo(() => u === !1 || C === !1 ? null : /* @__PURE__ */ jsx(DragHandler, { children: /* @__PURE__ */ jsx(DragOutlined, { role: "button", "aria-label": y("drag-handler") }) }), [u, y, C]), E = useMemo(() => {
-    var W;
+    var K;
     if (o === !1)
       return null;
     if (M)
       return R(z);
     if (T != null && T.InitializerComponent || T != null && T.renderSchemaInitializer)
-      return T != null && T.InitializerComponent ? /* @__PURE__ */ jsx(T.InitializerComponent, x({}, z)) : (W = T.renderSchemaInitializer) == null ? void 0 : W.call(T, z);
+      return T != null && T.InitializerComponent ? /* @__PURE__ */ jsx(T.InitializerComponent, x({}, z)) : (K = T.renderSchemaInitializer) == null ? void 0 : K.call(T, z);
   }, [T, o, z, M, R]), q = useMemo(() => r !== !1 && B ? O() : null, [B, O, r]), G = useRef(null), U = "hidden";
   useEffect(() => {
-    const W = G.current;
-    let K = W == null ? void 0 : W.parentElement;
-    for (; K && K.clientHeight === 0; )
-      K = K.parentElement;
-    const X = g || K;
+    const K = G.current;
+    let W = K == null ? void 0 : K.parentElement;
+    for (; W && W.clientHeight === 0; )
+      W = W.parentElement;
+    const X = g || W;
     if (!X)
       return;
     function ee() {
       var ne;
-      W && (W.classList.remove(U), (ne = e.onVisibleChange) == null || ne.call(e, !0));
+      K && (K.classList.remove(U), (ne = e.onVisibleChange) == null || ne.call(e, !0));
     }
     function Z() {
       var ne;
-      W && (W.classList.add(U), (ne = e.onVisibleChange) == null || ne.call(e, !1));
+      K && (K.classList.add(U), (ne = e.onVisibleChange) == null || ne.call(e, !1));
     }
     return X.addEventListener("mouseenter", ee), X.addEventListener("mouseleave", Z), () => {
       X.removeEventListener("mouseenter", ee), X.removeEventListener("mouseleave", Z);
@@ -18160,14 +18160,14 @@ const SchemaToolbarErrorFallback = (e) => {
         exceptInterfaces: U = [],
         prefixFieldValue: H = "",
         usePrefix: J = !1,
-        dataSource: W
+        dataSource: K
       } = T || {};
       if (E.length - 1 > q)
         return;
       if (L[R])
         return _.cloneDeep(L[R]);
       M && typeof M == "string" && (M = [M]), $ && typeof $ == "string" && ($ = [$]);
-      const K = b(R, W), X = (ee = K == null ? void 0 : K.filter(
+      const W = b(R, K), X = (ee = W == null ? void 0 : W.filter(
         (Z) => Z.interface && !U.includes(Z.interface) && (G || M && M.includes(Z.type) || $ && $.includes(Z.interface) || (z && Z.target && Z.target !== R && Array.isArray(z) ? z.includes(Z.interface) : !1))
       )) == null ? void 0 : ee.map((Z) => {
         var re, se;
@@ -18177,7 +18177,7 @@ const SchemaToolbarErrorFallback = (e) => {
         }, Z);
         return z && Z.target && (ne.children = E.includes(Z.target) ? [] : I(Z.target, M, $, P(x({}, T), {
           cached: L,
-          dataSource: W,
+          dataSource: K,
           collectionNames: [...E, Z.target],
           prefixFieldValue: J ? H ? `${H}.${Z.name}` : Z.name : "",
           usePrefix: J
@@ -23270,7 +23270,7 @@ const useGetFilterOptions = () => {
     }
   }, i = (l, c, u) => {
     const d = [];
-    return l.forEach((p) => {
+    return l == null || l.forEach((p) => {
       const m = r(p, c, u);
       m && d.push(m);
     }), d;
@@ -23431,11 +23431,11 @@ const useGetFilterOptions = () => {
         defaultFilter: ((L = (z = (T = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : T.service) == null ? void 0 : z.params) == null ? void 0 : L.filter) || {},
         form: r,
         onSubmit: ({ filter: U }) => {
-          var J, W;
+          var J, K;
           U = removeNullCondition(U), set(l.componentProps, "service.params.filter", U), n["x-component-props"] = l.componentProps;
-          const H = (W = l.path) == null ? void 0 : W.splice(((J = l.path) == null ? void 0 : J.length) - 1, 1);
-          l.form.query(`${H.concat("*." + n.name)}`).forEach((K) => {
-            K.componentProps.service = K.componentProps.service || { params: {} }, K.componentProps.service.params.filter = U;
+          const H = (K = l.path) == null ? void 0 : K.splice(((J = l.path) == null ? void 0 : J.length) - 1, 1);
+          l.form.query(`${H.concat("*." + n.name)}`).forEach((W) => {
+            W.componentProps.service = W.componentProps.service || { params: {} }, W.componentProps.service.params.filter = U;
           }), d.emit("patch", {
             schema: {
               "x-uid": n["x-uid"],
@@ -23519,8 +23519,8 @@ const useGetFilterOptions = () => {
         options: m,
         value: p == null ? void 0 : p.label,
         onChange: (U) => {
-          var W, K, X, ee, Z;
-          const H = P(x(x({}, (K = (W = o == null ? void 0 : o.uiSchema) == null ? void 0 : W["x-component-props"]) == null ? void 0 : K.fieldNames), (X = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : X.fieldNames), {
+          var K, W, X, ee, Z;
+          const H = P(x(x({}, (W = (K = o == null ? void 0 : o.uiSchema) == null ? void 0 : K["x-component-props"]) == null ? void 0 : W.fieldNames), (X = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : X.fieldNames), {
             label: U
           });
           _.set(n, "x-component-props.fieldNames", H);
@@ -23580,12 +23580,12 @@ const useGetFilterOptions = () => {
         title: c("Required"),
         checked: n.required,
         onChange: (U) => {
-          var W, K;
+          var K, W;
           const H = {
             "x-uid": n["x-uid"]
           };
           n.required = U, H.required = U;
-          const J = (K = l.path) == null ? void 0 : K.splice(((W = l.path) == null ? void 0 : W.length) - 1, 1);
+          const J = (W = l.path) == null ? void 0 : W.splice(((K = l.path) == null ? void 0 : K.length) - 1, 1);
           l.form.query(`${J.concat("*." + n.name)}`).forEach((X) => {
             X.required = U;
           }), d.emit("patch", {
@@ -23606,10 +23606,10 @@ const useGetFilterOptions = () => {
         ],
         value: k,
         onChange: (U) => {
-          var W, K;
+          var K, W;
           const H = {
             "x-uid": n["x-uid"]
-          }, J = (K = l.path) == null ? void 0 : K.splice(((W = l.path) == null ? void 0 : W.length) - 1, 1);
+          }, J = (W = l.path) == null ? void 0 : W.splice(((K = l.path) == null ? void 0 : K.length) - 1, 1);
           switch (U) {
             case "readonly": {
               n["x-read-pretty"] = !1, n["x-disabled"] = !0, H["x-read-pretty"] = !1, H["x-disabled"] = !0, l.form.query(`${J.concat("*." + n.name)}`).forEach((X) => {
@@ -23643,10 +23643,10 @@ const useGetFilterOptions = () => {
       {
         fieldSchema: n,
         onSubmitCallBack: (U) => {
-          var J, W;
-          const H = (W = l.path) == null ? void 0 : W.splice(((J = l.path) == null ? void 0 : J.length) - 1, 1);
-          l.form.query(`${H.concat("*." + n.name)}`).forEach((K) => {
-            K.componentProps.service = K.componentProps.service || { params: {} }, K.componentProps.service.params.sort = U;
+          var J, K;
+          const H = (K = l.path) == null ? void 0 : K.splice(((J = l.path) == null ? void 0 : J.length) - 1, 1);
+          l.form.query(`${H.concat("*." + n.name)}`).forEach((W) => {
+            W.componentProps.service = W.componentProps.service || { params: {} }, W.componentProps.service.params.sort = U;
           });
         }
       }
@@ -25427,7 +25427,7 @@ function getTypedConstantOption(e, t, n) {
   };
 }
 function Input$1(e) {
-  var H, J, W;
+  var H, J, K;
   const {
     value: t = "",
     onChange: n,
@@ -25457,10 +25457,10 @@ function Input$1(e) {
     label: v("Constant"),
     [M.value]: "$",
     [M.label]: v("Constant")
-  } : i ? getTypedConstantOption(B, i, M) : null, [B, i]), T = (H = $ == null ? void 0 : $.component) != null ? H : NullComponent, z = Array.isArray(i) ? (W = (J = i.find((K) => Array.isArray(K) && K[0] === B)) == null ? void 0 : J[1]) != null ? W : {} : {};
+  } : i ? getTypedConstantOption(B, i, M) : null, [B, i]), T = (H = $ == null ? void 0 : $.component) != null ? H : NullComponent, z = Array.isArray(i) ? (K = (J = i.find((W) => Array.isArray(W) && W[0] === B)) == null ? void 0 : J[1]) != null ? K : {} : {};
   let L;
   t == null ? a ? o && D ? L = ["$"] : L = [""] : o ? L = ["$"] : L = [" ", B] : L = o ? ["$"] : [" ", B], m && (L = ["$"]), useEffect(() => {
-    const Z = $ != null ? $ : {}, { component: K } = Z, X = Y(Z, ["component"]), ee = [
+    const Z = $ != null ? $ : {}, { component: W } = Z, X = Y(Z, ["component"]), ee = [
       ...a ? [
         {
           value: "",
@@ -25474,9 +25474,9 @@ function Input$1(e) {
     ].filter((ne) => !ne.deprecated || (R == null ? void 0 : R[0]) === ne[M.value]);
     I(ee);
   }, [h, R, $, a]);
-  const E = (K) => V(this, null, function* () {
+  const E = (W) => V(this, null, function* () {
     var ee;
-    const X = K[K.length - 1];
+    const X = W[W.length - 1];
     if (!((ee = X.children) != null && ee.length) && !X.isLeaf && X.loadChildren) {
       let Z;
       if (R && R.length >= 2) {
@@ -25489,27 +25489,27 @@ function Input$1(e) {
       yield X.loadChildren(X, Z, R), I((ne) => [...ne]);
     }
   }), q = useCallback(
-    (K, X) => {
+    (W, X) => {
       var ee, Z, ne;
-      if (K[0] === "$") {
+      if (W[0] === "$") {
         N(!0), R && n(null, X);
         return;
       } else
         N(!1);
-      if (K[0] === "") {
+      if (W[0] === "") {
         n(null);
         return;
       }
-      if (K[0] === " ") {
-        K[1] ? K[1] !== B && n((ne = (Z = (ee = ConstantTypes[K[1]]) == null ? void 0 : ee.default) == null ? void 0 : Z.call(ee)) != null ? ne : null, X) : R && n(null, X);
+      if (W[0] === " ") {
+        W[1] ? W[1] !== B && n((ne = (Z = (ee = ConstantTypes[W[1]]) == null ? void 0 : ee.default) == null ? void 0 : Z.call(ee)) != null ? ne : null, X) : R && n(null, X);
         return;
       }
-      n(`{{${K.join(".")}}}`, X);
+      n(`{{${W.join(".")}}}`, X);
     },
     [B, R, n]
   ), G = useCallback(() => {
-    var K;
-    if (N(!!o), (K = $ == null ? void 0 : $.children) != null && K.length) {
+    var W;
+    if (N(!!o), (W = $ == null ? void 0 : $.children) != null && W.length) {
       const X = $.children[0].default();
       return n(X);
     }
@@ -25576,10 +25576,10 @@ function Input$1(e) {
                 "aria-label": "variable-tag",
                 style: { overflow: "hidden" },
                 className: cx("ant-input", { "ant-input-disabled": U }, f),
-                children: /* @__PURE__ */ jsx(Tag, { color: "blue", children: w.map((K, X) => /* @__PURE__ */ jsxs(React.Fragment, { children: [
+                children: /* @__PURE__ */ jsx(Tag, { color: "blue", children: w.map((W, X) => /* @__PURE__ */ jsxs(React.Fragment, { children: [
                   X ? " / " : "",
-                  K
-                ] }, K)) })
+                  W
+                ] }, W)) })
               }
             ),
             U ? null : /* @__PURE__ */ jsx(
@@ -25829,8 +25829,8 @@ function TextArea(e) {
       const { lastChild: U } = E;
       if (U) {
         q.setStartAfter(U), q.setEndAfter(U);
-        const H = Array.from(E.childNodes), J = q.startContainer === E ? -1 : H.indexOf(U), W = q.startContainer === E ? -1 : H.indexOf(U);
-        D([J, q.startOffset, W, q.endOffset]);
+        const H = Array.from(E.childNodes), J = q.startContainer === E ? -1 : H.indexOf(U), K = q.startContainer === E ? -1 : H.indexOf(U);
+        D([J, q.startOffset, K, q.endOffset]);
       }
     }
   }, [I]);
@@ -26181,12 +26181,13 @@ const getVariableComponentWithScope = (e) => (t) => {
   }), [e]);
   return { urlSchema: n, paramsSchema: i, openInNewWindowSchema: a, modeSchema: o, htmlSchema: r };
 }, LinkMenuItem = () => {
-  const { t: e } = useTranslation(), t = useContext(SchemaOptionsContext), { theme: n } = useGlobalTheme(), { componentCls: o, hashId: r } = useStyles$b(), { urlSchema: i, paramsSchema: a } = useURLAndHTMLSchema(), l = useParentRoute(), { createRoute: c } = useNocoBaseRoutes(), u = useCallback(() => V(void 0, null, function* () {
-    const d = yield FormDialog(
+  const { t: e } = useTranslation(), t = useContext(SchemaOptionsContext), { theme: n } = useGlobalTheme(), { componentCls: o, hashId: r } = useStyles$b(), { urlSchema: i, paramsSchema: a } = useURLAndHTMLSchema(), l = useParentRoute(), { createRoute: c } = useNocoBaseRoutes(), u = useDataSourceManager(), d = useCollectionManager(), p = useCallback(() => V(void 0, null, function* () {
+    const m = yield FormDialog(
       e("Add link"),
       () => {
-        const f = createMemoryHistory();
-        return /* @__PURE__ */ jsx(Router, { location: f.location, navigator: f, children: /* @__PURE__ */ jsx(SchemaComponentOptions, { scope: t.scope, components: x({}, t.components), children: /* @__PURE__ */ jsx(FormLayout, { layout: "vertical", children: /* @__PURE__ */ jsx(
+        var S;
+        const b = createMemoryHistory();
+        return /* @__PURE__ */ jsx(DataSourceManagerProvider, { dataSourceManager: u, children: /* @__PURE__ */ jsx(CollectionManagerProvider, { instance: d, dataSource: (S = d == null ? void 0 : d.dataSource) == null ? void 0 : S.key, children: /* @__PURE__ */ jsx(Router, { location: b.location, navigator: b, children: /* @__PURE__ */ jsx(SchemaComponentOptions, { scope: t.scope, components: x({}, t.components), children: /* @__PURE__ */ jsx(FormLayout, { layout: "vertical", children: /* @__PURE__ */ jsx(
           SchemaComponent,
           {
             schema: {
@@ -26207,24 +26208,24 @@ const getVariableComponentWithScope = (e) => (t) => {
               }
             }
           }
-        ) }) }) });
+        ) }) }) }) }) });
       },
       n
     ).open({
       initialValues: {}
-    }), { title: p, href: m, params: h, icon: g } = d;
+    }), { title: h, href: g, params: f, icon: C } = m;
     yield c({
       type: NocoBaseDesktopRouteType.link,
-      title: p,
-      icon: g,
+      title: h,
+      icon: C,
       parentId: l == null ? void 0 : l.id,
       options: {
-        href: m,
-        params: h
+        href: g,
+        params: f
       }
     });
   }), [t.components, t.scope, e, n]);
-  return /* @__PURE__ */ jsx(SchemaInitializerItem, { title: e("Link"), onClick: u, className: `${o} ${r}` });
+  return /* @__PURE__ */ jsx(SchemaInitializerItem, { title: e("Link"), onClick: p, className: `${o} ${r}` });
 }, useInsertPageSchema = () => {
   const e = useAPIClient();
   return useCallback(
@@ -27371,7 +27372,7 @@ function useCollectValuesToSubmit() {
         const { value: O } = (yield p == null ? void 0 : p.parseVariable(N, m)) || {};
         O != null && (S[D] = transformVariableValue(O, { targetCollectionField: j }));
       } else
-        N != null && N !== "" && (S[D] = N);
+        N !== "" && (S[D] = N);
     }));
     if (yield Promise.all(v), (I = u == null ? void 0 : u["x-component-props"]) == null ? void 0 : I.addChild) {
       const D = a();
@@ -27445,12 +27446,12 @@ const useCreateActionProps = () => {
           skipValidator: j,
           triggerWorkflows: O
         } = (z = l == null ? void 0 : l["x-action-settings"]) != null ? z : {}, B = (L = i == null ? void 0 : i["x-component-props"]) == null ? void 0 : L.addChild, { successMessage: R } = D || {}, M = {}, $ = Object.keys(k).map((H) => V(this, null, function* () {
-          const J = k[H], W = d(H);
+          const J = k[H], K = d(H);
           if (isVariable$1(J)) {
-            const { value: K } = (yield C == null ? void 0 : C.parseVariable(J, b)) || {};
-            K && (M[H] = transformVariableValue(K, { targetCollectionField: W }));
+            const { value: W } = (yield C == null ? void 0 : C.parseVariable(J, b)) || {};
+            W && (M[H] = transformVariableValue(W, { targetCollectionField: K }));
           } else
-            J != null && J !== "" && (M[H] = J);
+            J !== "" && (M[H] = J);
         }));
         yield Promise.all($), j || (yield e.submit());
         const T = getFormValues({
@@ -27593,7 +27594,7 @@ const useCreateActionProps = () => {
             const { value: z } = (yield u == null ? void 0 : u.parseVariable($, d)) || {};
             z && (N[M] = transformVariableValue(z, { targetCollectionField: T }));
           } else
-            $ != null && $ !== "" && (N[M] = $);
+            $ !== "" && (N[M] = $);
         }));
         yield Promise.all(j), v === !1 && (yield l.submit()), yield e.update({
           filterByTk: o,
@@ -27630,7 +27631,7 @@ const useCreateActionProps = () => {
             const { value: U } = (yield g == null ? void 0 : g.parseVariable(q, b)) || {};
             U && ($[E] = transformVariableValue(U, { targetCollectionField: G }));
           } else
-            q != null && q !== "" && ($[E] = q);
+            q !== "" && ($[E] = q);
         }));
         yield Promise.all(T), (M === "previous" || !M && O !== !0) && (S == null || S(!1)), h.confirm({
           title: p("Bulk update"),
@@ -27653,7 +27654,7 @@ const useCreateActionProps = () => {
               q.filter || (q.forceUpdate = !0);
               try {
                 yield t.update(q);
-              } catch (W) {
+              } catch (K) {
               } finally {
                 m.data.loading = !1;
               }
@@ -27687,7 +27688,7 @@ const useCreateActionProps = () => {
         I !== !0 && R === "customize:form:request" && (yield i.submit());
         const M = k.headers ? JSON.parse(k.headers) : {}, $ = k.params ? JSON.parse(k.params) : {}, T = k.data ? JSON.parse(k.data) : {};
         if (R === "customize:form:request" && ["POST", "PUT", "PATCH"].includes(k.method)) {
-          const H = a.map((W) => W.name), J = getFormValues({
+          const H = a.map((K) => K.name), J = getFormValues({
             filterByTk: n,
             field: c,
             form: i,
@@ -27737,7 +27738,7 @@ const useCreateActionProps = () => {
             const { value: J } = (yield b == null ? void 0 : b.parseVariable(U, S)) || {};
             J && (T[G] = transformVariableValue(J, { targetCollectionField: H }));
           } else
-            U != null && U !== "" && (T[G] = U);
+            U !== "" && (T[G] = U);
         }));
         yield Promise.all(z), N || (yield e.submit());
         const L = u.map((G) => G.name), E = getFormValues({
@@ -27988,8 +27989,8 @@ const useCreateActionProps = () => {
     (R) => {
       const { targets: M, uid: $ } = findFilterTargets(t);
       o().forEach((T) => {
-        var U, H, J, W;
-        if (!M.find((K) => K.uid === T.uid))
+        var U, H, J, K;
+        if (!M.find((W) => W.uid === T.uid))
           return;
         const L = `${$}${t.name}`, E = ((U = T.service.params) == null ? void 0 : U[0]) || {};
         (J = (H = T.service.params) == null ? void 0 : H[1]) != null && J.filters || _.set(T.service.params, "[1].filters", {});
@@ -27999,7 +28000,7 @@ const useCreateActionProps = () => {
             [S]: R
           };
         else {
-          if ((W = T.clearSelection) == null || W.call(T), T.dataLoadingMode === "manual")
+          if ((K = T.clearSelection) == null || K.call(T), T.dataLoadingMode === "manual")
             return T.clearData();
           delete q[L];
         }
@@ -34868,6 +34869,9 @@ const tableBlockSettings = new SchemaSettings({
   return {
     name: "allowMultiple",
     type: "switch",
+    useVisible() {
+      return useIsAssociationField();
+    },
     useComponentProps() {
       var u;
       const { t: n } = useTranslation(), o = useField(), { fieldSchema: r } = useColumnSchema$1(), i = useFieldSchema(), a = r || i, { dn: l, refresh: c } = useDesignable();
@@ -35215,9 +35219,9 @@ const tableBlockSettings = new SchemaSettings({
         }), H["x-component-props"] = n["x-component-props"], o.componentProps = n["x-component-props"];
         const J = o.path.entire.split(".");
         J.pop();
-        const W = J.join(".");
-        o.query(`${W}.*[0:].${n.name}`).forEach((K) => {
-          K.props.name === n.name && K.setComponentProps({
+        const K = J.join(".");
+        o.query(`${K}.*[0:].${n.name}`).forEach((W) => {
+          W.props.name === n.name && W.setComponentProps({
             _maxDate: I(U == null ? void 0 : U._maxDate),
             _minDate: I(U == null ? void 0 : U._minDate)
           });
@@ -36557,12 +36561,6 @@ const useBuiltInVariables = () => {
       defaultValue: a
     }
   ], [t, e, o, a, r, i]) };
-}, cache = /* @__PURE__ */ new Map(), cacheLazyLoadedValues = (e, t, n) => {
-  const o = cache.get(e);
-  o ? o[t] = n : cache.set(e, { [t]: n });
-}, getCachedLazyLoadedValues = (e, t) => {
-  const n = cache.get(e);
-  return n == null ? void 0 : n[t];
 }, filterEmptyValues = (e) => Array.isArray(e) ? e.filter((t) => t === 0 || t === !1 || t) : e, TYPE_TO_ACTION = {
   hasMany: "list?pageSize=9999",
   belongsTo: "get",
@@ -36605,7 +36603,7 @@ const variablesStore = {}, getFieldPath = (e, t) => {
         const T = v[$], z = v.slice(0, $ + 1).join("."), { fieldPath: L } = getFieldPath(z, F), E = r(L, k), q = (M = i(N, k)) == null ? void 0 : M.getPrimaryKey();
         if (Array.isArray(I)) {
           const G = I.map((U) => {
-            if (!(S != null && S.doNotRequest) && shouldToRequest(U == null ? void 0 : U[T], U, z) && (U == null ? void 0 : U[q]) != null && E != null && E.target) {
+            if (!(S != null && S.doNotRequest) && shouldToRequest(U == null ? void 0 : U[T]) && (U == null ? void 0 : U[q]) != null && E != null && E.target) {
               const H = `/${N}/${U[E.sourceKey || q]}/${T}:${getAction(E.type)}`;
               if (hasRequested(H))
                 return getRequested(H);
@@ -36615,17 +36613,13 @@ const variablesStore = {}, getFieldPath = (e, t) => {
                 params: {
                   appends: S == null ? void 0 : S.appends
                 }
-              }).then((W) => {
-                clearRequested(H);
-                const K = W.data.data;
-                return cacheLazyLoadedValues(U, z, K), K;
-              });
+              }).then((K) => (clearRequested(H), K.data.data));
               return stashRequested(H, J), J;
             }
-            return getCachedLazyLoadedValues(U, z) || (U == null ? void 0 : U[T]);
+            return U == null ? void 0 : U[T];
           });
           I = removeThroughCollectionFields(_.flatten(yield Promise.all(G)), E);
-        } else if (!(S != null && S.doNotRequest) && shouldToRequest(I[T], I, z) && I[q] != null && (E != null && E.target)) {
+        } else if (!(S != null && S.doNotRequest) && shouldToRequest(I[T]) && I[q] != null && (E != null && E.target)) {
           const G = `/${N}/${I[E.sourceKey || q]}/${T}:${getAction(E.type)}`;
           let U = null;
           if (hasRequested(G))
@@ -36641,12 +36635,9 @@ const variablesStore = {}, getFieldPath = (e, t) => {
             stashRequested(G, J), U = yield J, clearRequested(G);
           }
           const H = U.data.data;
-          getCachedLazyLoadedValues(I, z) || cacheLazyLoadedValues(I, z, H), I = removeThroughCollectionFields(H, E);
+          I = removeThroughCollectionFields(H, E);
         } else
-          I = removeThroughCollectionFields(
-            getCachedLazyLoadedValues(I, z) || getValuesByPath(I, T),
-            E
-          );
+          I = removeThroughCollectionFields(getValuesByPath(I, T), E);
         E != null && E.target && (N = E.target);
       }
       const B = a(
@@ -36738,13 +36729,13 @@ VariablesProvider.displayName = "VariablesProvider";
 const VariablesProvider$1 = VariablesProvider;
 function shouldToRequest(e, t, n) {
   let o = !1;
-  return getCachedLazyLoadedValues(t, n) ? !1 : (untracked(() => {
+  return untracked(() => {
     if (JSON.stringify(e) === "[{}]" || JSON.stringify(e) === "{}") {
       o = !0;
       return;
     }
     o = _.isEmpty(e);
-  }), o);
+  }), o;
 }
 function mergeCtxWithLocalVariables(e, t) {
   return e = x({}, e), t == null || t.forEach((n) => {
@@ -37093,10 +37084,10 @@ const ActionLink = withDynamicSchemaProps(
     useEffect(() => {
       F.stateOfLinkageRules && setInitialActionState(F), F.stateOfLinkageRules = {}, N.filter((H) => !H.disabled).forEach((H) => {
         var J;
-        (J = H.actions) == null || J.forEach((W) => {
+        (J = H.actions) == null || J.forEach((K) => {
           linkageAction(
             {
-              operator: W.operator,
+              operator: K.operator,
               field: F,
               condition: H.condition,
               variables: B,
@@ -37205,16 +37196,16 @@ const ActionLink = withDynamicSchemaProps(
     "setSubmitted",
     "getAriaLabel",
     "parentRecordData"
-  ]), [R, M] = useState(!1), { wrapSSR: $, componentCls: T, hashId: z } = useStyles$8(), [L, E] = useState(!1), q = o["x-toolbar-props"] || o["x-designer-props"], G = (me = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : me.openMode, U = (he = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : he.openSize, H = (ge = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : ge.refreshDataBlockRequest, { modal: J } = App.useApp(), W = useForm(), K = useACLActionParamsContext(), { run: X, element: ee, disabled: Z } = (I == null ? void 0 : I(w)) || {}, ne = W.disabled || i.disabled || ((de = i.data) == null ? void 0 : de.disabled) || F || Z, re = useMemo(() => {
+  ]), [R, M] = useState(!1), { wrapSSR: $, componentCls: T, hashId: z } = useStyles$8(), [L, E] = useState(!1), q = o["x-toolbar-props"] || o["x-designer-props"], G = (me = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : me.openMode, U = (he = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : he.openSize, H = (ge = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : ge.refreshDataBlockRequest, { modal: J } = App.useApp(), K = useForm(), W = useACLActionParamsContext(), { run: X, element: ee, disabled: Z } = (I == null ? void 0 : I(w)) || {}, ne = K.disabled || i.disabled || ((de = i.data) == null ? void 0 : de.disabled) || F || Z, re = useMemo(() => {
     var ce;
     return P(x({}, y), {
-      opacity: r && (((ce = i == null ? void 0 : i.data) == null ? void 0 : ce.hidden) || !K) && 0.1,
+      opacity: r && (((ce = i == null ? void 0 : i.data) == null ? void 0 : ce.hidden) || !W) && 0.1,
       color: ne ? "rgba(0, 0, 0, 0.25)" : y == null ? void 0 : y.color
     });
-  }, [K, r, (pe = i == null ? void 0 : i.data) == null ? void 0 : pe.hidden, y, ne]), se = {
+  }, [W, r, (pe = i == null ? void 0 : i.data) == null ? void 0 : pe.hidden, y, ne]), se = {
     designable: r,
     field: i,
-    aclCtx: K,
+    aclCtx: W,
     icon: a,
     loading: l,
     disabled: ne,
@@ -37404,8 +37395,8 @@ const RenderButton = ({
 RenderButton.displayName = "RenderButton";
 const RenderButtonInner = observer$1(
   (e) => {
-    var w, k;
-    const I = e, {
+    var D, j;
+    const k = e, {
       designable: t,
       field: n,
       aclCtx: o,
@@ -37424,7 +37415,7 @@ const RenderButtonInner = observer$1(
       Designer: C,
       designerProps: b,
       title: S
-    } = I, v = Y(I, [
+    } = k, v = Y(k, [
       "designable",
       "field",
       "aclCtx",
@@ -37445,8 +37436,8 @@ const RenderButtonInner = observer$1(
       "title"
     ]), y = useCallback(
       debounce$1(
-        (D, N = !0) => {
-          d(D, N);
+        (O, B = !0) => {
+          d(O, B);
         },
         300,
         { leading: !0, trailing: !1 }
@@ -37455,9 +37446,9 @@ const RenderButtonInner = observer$1(
     );
     if (useEffect(() => () => {
       y.cancel();
-    }, []), !t && ((w = n == null ? void 0 : n.data) != null && w.hidden || !o))
+    }, []), !t && ((D = n == null ? void 0 : n.data) != null && D.hidden || !o))
       return null;
-    const F = S || (n == null ? void 0 : n.title);
+    const F = S || (n == null ? void 0 : n.title), N = l, { opacity: I } = N, w = Y(N, ["opacity"]);
     return /* @__PURE__ */ jsxs(
       SortableItem,
       P(x({
@@ -37465,16 +37456,16 @@ const RenderButtonInner = observer$1(
         "aria-label": u()
       }, v), {
         onMouseEnter: c,
-        loading: ((k = n == null ? void 0 : n.data) == null ? void 0 : k.loading) || i,
-        icon: typeof r == "string" ? /* @__PURE__ */ jsx(Icon, { type: r }) : r,
+        loading: ((j = n == null ? void 0 : n.data) == null ? void 0 : j.loading) || i,
+        icon: typeof r == "string" ? /* @__PURE__ */ jsx(Icon, { style: { opacity: I }, type: r }) : r,
         disabled: a,
-        style: l,
+        style: w,
         onClick: y,
         component: p || Button,
         className: cls(m, h, g, "nb-action"),
         type: f === "danger" ? void 0 : f,
         children: [
-          F && /* @__PURE__ */ jsx("span", { className: r ? "nb-action-title" : null, children: F }),
+          F && /* @__PURE__ */ jsx("span", { className: r ? "nb-action-title" : null, style: { opacity: I }, children: F }),
           /* @__PURE__ */ jsx(C, x({}, b))
         ]
       })
@@ -37906,7 +37897,7 @@ const getValues = (e, t) => castArray(e).filter((n) => n != null).map((n) => typ
         CustomDropdownRender: d,
         optionFilter: p,
         dataSource: m,
-        toOptionsItem: h = (W) => W,
+        toOptionsItem: h = (K) => K,
         popupMatchSelectWidth: g = !1
       } = U, f = Y(U, [
         "fieldNames",
@@ -37924,18 +37915,18 @@ const getValues = (e, t) => castArray(e).filter((n) => n != null).map((n) => typ
         "toOptionsItem",
         "popupMatchSelectWidth"
       ]), C = useDataSourceKey(), b = useDataSourceHeaders(m || C), S = useRef(!1), v = useFieldSchema(), y = ((H = v["x-component-props"]) == null ? void 0 : H.addMode) === "quickAdd", { getField: F } = useCollection_deprecated(), I = useRef(null), { getCollectionJoinField: w, getInterface: k } = useCollectionManager_deprecated(), D = v["x-collection-field"] || v.name, N = F(D) || w(D), j = u || (N == null ? void 0 : N.target) && (t == null ? void 0 : t.label) && w(`${N.target}.${t.label}`), O = useMemo(() => {
-        var W;
+        var K;
         if (j != null && j.interface) {
-          const K = k(j.interface), X = ((W = K == null ? void 0 : K.filterable) == null ? void 0 : W.operators[0].value) || "$includes";
+          const W = k(j.interface), X = ((K = W == null ? void 0 : W.filterable) == null ? void 0 : K.operators[0].value) || "$includes";
           return j.type === "string" ? "$includes" : X;
         }
         return "$includes";
       }, [j]), B = useCompile(), R = useCallback(
-        (W) => {
+        (K) => {
           try {
-            return W.filter((K) => ["number", "string"].includes(typeof K[t.value]) || !K[t.value]).map((K) => {
+            return K.filter((W) => ["number", "string"].includes(typeof W[t.value]) || !W[t.value]).map((W) => {
               var ee;
-              let X = B(K[t.label]);
+              let X = B(W[t.label]);
               if ((ee = j == null ? void 0 : j.uiSchema) != null && ee.enum)
                 if (Array.isArray(X))
                   X = X.map((Z, ne) => {
@@ -37948,14 +37939,14 @@ 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]: K[t.value]
-              }) : P(x({}, K), {
+                [t.value]: W[t.value]
+              }) : P(x({}, W), {
                 [t.label]: X || EMPTY$1,
-                [t.value]: K[t.value]
+                [t.value]: W[t.value]
               });
             }).filter(Boolean);
-          } catch (K) {
-            return console.error(K), W;
+          } catch (W) {
+            return console.error(W), K;
           }
         },
         [j == null ? void 0 : j.uiSchema, t]
@@ -37992,25 +37983,25 @@ const getValues = (e, t) => castArray(e).filter((n) => n != null).map((n) => typ
       useEffect(() => {
         S.current && $();
       }, [z]);
-      const E = (W) => V(void 0, null, function* () {
-        var K;
+      const E = (K) => V(void 0, null, function* () {
+        var W;
         $({
           filter: mergeFilter([
-            W ? {
+            K ? {
               [t.label]: {
-                [O]: W
+                [O]: K
               }
             } : {},
-            (K = n == null ? void 0 : n.params) == null ? void 0 : K.filter
+            (W = n == null ? void 0 : n.params) == null ? void 0 : W.filter
           ])
-        }), I.current = W;
+        }), I.current = K;
       }), q = useMemo(() => {
         var ee;
-        const W = r || i;
+        const K = r || i;
         if (!((ee = M == null ? void 0 : M.data) != null && ee.length))
-          return W != null ? Array.isArray(W) ? W : [W] : [];
-        const K = W != null && (Array.isArray(W) ? W.map((Z) => P(x({}, Z), { [t.value]: Z[t.value] || Z })) : [P(x({}, W), { [t.value]: W[t.value] || W })]) || [], X = typeof p == "function" ? M.data.filter(p) : M.data;
-        return uniqBy(X.concat(K != null ? K : []), t.value);
+          return K != null ? Array.isArray(K) ? K : [K] : [];
+        const W = K != null && (Array.isArray(K) ? K.map((Z) => P(x({}, Z), { [t.value]: Z[t.value] || Z })) : [P(x({}, K), { [t.value]: K[t.value] || K })]) || [], X = typeof p == "function" ? M.data.filter(p) : M.data;
+        return uniqBy(X.concat(W != null ? W : []), t.value);
       }, [r, i, M == null ? void 0 : M.data, t.value, p]);
       return /* @__PURE__ */ jsx(
         Select,
@@ -38021,8 +38012,8 @@ const getValues = (e, t) => castArray(e).filter((n) => n != null).map((n) => typ
           filterSort: null,
           fieldNames: t,
           onSearch: E,
-          onDropdownVisibleChange: (W) => {
-            I.current = null, W && $(), S.current = !0;
+          onDropdownVisibleChange: (K) => {
+            I.current = null, K && $(), S.current = !0;
           },
           objectValue: a,
           value: r,
@@ -38031,13 +38022,13 @@ const getValues = (e, t) => castArray(e).filter((n) => n != null).map((n) => typ
           loading: M ? T : !0,
           options: h(R(q)),
           rawOptions: q,
-          dropdownRender: (W) => {
-            const K = q.some((X) => X[t.label] === I.current);
+          dropdownRender: (K) => {
+            const W = q.some((X) => X[t.label] === I.current);
             return /* @__PURE__ */ jsx(Fragment$1, { children: y ? /* @__PURE__ */ jsxs(Fragment$1, { children: [
-              !((M == null ? void 0 : M.data.length) === 0 && (I != null && I.current)) && W,
-              (M == null ? void 0 : M.data.length) > 0 && (I == null ? void 0 : I.current) && !K && /* @__PURE__ */ jsx(Divider$1, { style: { margin: 0 } }),
-              !K && /* @__PURE__ */ jsx(L, {})
-            ] }) : W });
+              !((M == null ? void 0 : M.data.length) === 0 && (I != null && I.current)) && K,
+              (M == null ? void 0 : M.data.length) > 0 && (I == null ? void 0 : I.current) && !W && /* @__PURE__ */ jsx(Divider$1, { style: { margin: 0 } }),
+              !W && /* @__PURE__ */ jsx(L, {})
+            ] }) : K });
           }
         })
       );
@@ -41862,9 +41853,9 @@ const useStyles$5 = genStyleHook("nb-association-filter-item", (e) => {
     }, $ = (J) => {
       j(J), d(J), p == null || p(J);
     }, T = (J) => {
-      var K;
-      const W = (K = h == null ? void 0 : h[0]) == null ? void 0 : K.filter;
-      (S || W) && g(P(x({}, h == null ? void 0 : h[0]), {
+      var W;
+      const K = (W = h == null ? void 0 : h[0]) == null ? void 0 : W.filter;
+      (S || K) && g(P(x({}, h == null ? void 0 : h[0]), {
         filter: void 0
       })), v(!S), J.stopPropagation();
     }, z = (J) => {
@@ -46153,14 +46144,9 @@ function FinallyButton({
   form: d,
   designable: p
 }) {
-  var f, C, b, S, v;
-  const { getCollection: m } = useCollectionManager_deprecated(), h = useACLActionParamsContext(), g = useMemo(() => {
-    var y;
-    return {
-      opacity: p && (((y = u == null ? void 0 : u.data) == null ? void 0 : y.hidden) || !h) && 0.1
-    };
-  }, [p, (f = u == null ? void 0 : u.data) == null ? void 0 : f.hidden]);
-  return (e == null ? void 0 : e.length) > 0 ? t ? /* @__PURE__ */ jsx(
+  var h, g, f, C;
+  const { getCollection: m } = useCollectionManager_deprecated();
+  return useACLActionParamsContext(), (e == null ? void 0 : e.length) > 0 ? t ? /* @__PURE__ */ jsx(
     Button,
     {
       "aria-label": o["aria-label"],
@@ -46168,14 +46154,14 @@ function FinallyButton({
       disabled: u.disabled,
       danger: o.danger,
       icon: c,
-      onClick: (y) => {
-        const F = getLinkageCollection(t, d, u), I = e.find((k) => k.name === F) ? F : l.name, w = m(I);
-        a == null || a(w);
+      onClick: (b) => {
+        const S = getLinkageCollection(t, d, u), v = e.find((F) => F.name === S) ? S : l.name, y = m(v);
+        a == null || a(y);
+      },
+      style: {
+        display: !p && ((h = u == null ? void 0 : u.data) == null ? void 0 : h.hidden) && "none",
+        opacity: p && ((g = u == null ? void 0 : u.data) == null ? void 0 : g.hidden) && 0.1
       },
-      style: x({
-        display: !p && ((C = u == null ? void 0 : u.data) == null ? void 0 : C.hidden) && "none",
-        opacity: p && ((b = u == null ? void 0 : u.data) == null ? void 0 : b.hidden) && 0.1
-      }, g),
       children: o.children
     }
   ) : n === void 0 || n ? /* @__PURE__ */ jsxs(
@@ -46185,18 +46171,17 @@ function FinallyButton({
       danger: o.danger,
       type: r,
       icon: /* @__PURE__ */ jsx(DownOutlined, {}),
-      style: x(x({}, o == null ? void 0 : o.style), g),
-      buttonsRender: ([y, F]) => [
-        React.cloneElement(y, {
+      buttonsRender: ([b, S]) => [
+        React.cloneElement(b, {
           style: o == null ? void 0 : o.style
         }),
-        React.cloneElement(F, {
+        React.cloneElement(S, {
           loading: !1,
           style: P(x({}, o == null ? void 0 : o.style), { justifyContent: "center" })
         })
       ],
       menu: i,
-      onClick: (y) => {
+      onClick: (b) => {
         a == null || a(l);
       },
       children: [
@@ -46204,21 +46189,11 @@ function FinallyButton({
         o.children
       ]
     }
-  ) : /* @__PURE__ */ jsx(Dropdown, { menu: i, children: /* @__PURE__ */ jsxs(
-    Button,
-    {
-      "aria-label": o["aria-label"],
-      icon: c,
-      type: r,
-      danger: o.danger,
-      style: x(x({}, o == null ? void 0 : o.style), g),
-      children: [
-        o.children,
-        " ",
-        /* @__PURE__ */ jsx(DownOutlined, {})
-      ]
-    }
-  ) }) : /* @__PURE__ */ jsx(
+  ) : /* @__PURE__ */ jsx(Dropdown, { menu: i, children: /* @__PURE__ */ jsxs(Button, { "aria-label": o["aria-label"], icon: c, type: r, danger: o.danger, children: [
+    o.children,
+    " ",
+    /* @__PURE__ */ jsx(DownOutlined, {})
+  ] }) }) : /* @__PURE__ */ jsx(
     Button,
     P(x({}, o), {
       "aria-label": o["aria-label"],
@@ -46226,13 +46201,14 @@ function FinallyButton({
       disabled: u.disabled,
       danger: o.danger,
       icon: c,
-      onClick: (y) => {
+      onClick: (b) => {
         a == null || a(l);
       },
-      style: x(P(x({}, o == null ? void 0 : o.style), {
-        display: !p && ((S = u == null ? void 0 : u.data) == null ? void 0 : S.hidden) && "none",
-        opacity: p && ((v = u == null ? void 0 : u.data) == null ? void 0 : v.hidden) && 0.1
-      }), g),
+      style: P(x({}, o == null ? void 0 : o.style), {
+        display: !p && ((f = u == null ? void 0 : u.data) == null ? void 0 : f.hidden) && "none",
+        opacity: p && ((C = u == null ? void 0 : u.data) == null ? void 0 : C.hidden) && 0.1,
+        height: "100%"
+      }),
       children: o.children
     })
   );
@@ -48542,7 +48518,7 @@ const AppendsTreeSelect = (e) => {
         ]
       }
     );
-    return console.log(i), /* @__PURE__ */ jsx("div", { children: /* @__PURE__ */ jsxs(Space$1.Compact, { style: { display: "flex" }, children: [
+    return /* @__PURE__ */ jsx("div", { children: /* @__PURE__ */ jsxs(Space$1.Compact, { style: { display: "flex" }, children: [
       /* @__PURE__ */ jsx(
         RemoteSelect,
         P(x({
@@ -50400,7 +50376,7 @@ const Table$1 = withDynamicSchemaProps(
         }).join("-") : typeof m == "string" ? Q[m] : (te = (m != null ? m : H)(Q)) == null ? void 0 : te.toString();
       },
       [JSON.stringify(m), H]
-    ), W = useMemo(() => (Array.isArray(S == null ? void 0 : S.value) ? S.value : []).filter(Boolean), [S == null ? void 0 : S.value, (be = S == null ? void 0 : S.value) == null ? void 0 : be.length]), K = useMemo(() => (Q) => {
+    ), K = useMemo(() => (Array.isArray(S == null ? void 0 : S.value) ? S.value : []).filter(Boolean), [S == null ? void 0 : S.value, (be = S == null ? void 0 : S.value) == null ? void 0 : be.length]), W = useMemo(() => (Q) => {
       const te = useCallback((oe) => {
         var Se, ye, ve, Pe, Fe, Ie;
         if (!oe.active || !oe.over) {
@@ -50412,18 +50388,18 @@ const Table$1 = withDynamicSchemaProps(
       }, []);
       return /* @__PURE__ */ jsx(DndContext, { onDragEnd: te, children: /* @__PURE__ */ jsx("tbody", x({}, Q)) });
     }, [S, N]);
-    K.displayName = "BodyWrapperComponent";
+    W.displayName = "BodyWrapperComponent";
     const X = useMemo(() => ({
       header: {
         wrapper: HeaderWrapperComponent,
         cell: HeaderCellComponent
       },
       body: {
-        wrapper: K,
+        wrapper: W,
         row: BodyRowComponent,
         cell: BodyCellComponent
       }
-    }), [K]), ee = useMemo(() => p, [JSON.stringify(p)]), Z = useMemo(
+    }), [W]), ee = useMemo(() => p, [JSON.stringify(p)]), Z = useMemo(
       () => ({
         rowSelection: ee ? x({
           type: "checkbox",
@@ -50498,8 +50474,8 @@ const Table$1 = withDynamicSchemaProps(
       x: "max-content"
     }), []), ue = useMemo(() => ({
       x: "max-content",
-      y: W.length > 0 ? re : void 0
-    }), [re, le, W]), fe = useCallback(
+      y: K.length > 0 ? re : void 0
+    }), [re, le, K]), fe = useCallback(
       (Q) => T.includes(Q[m]) ? G : "",
       [T, G, JSON.stringify(m)]
     ), me = useCallback(
@@ -50521,7 +50497,7 @@ const Table$1 = withDynamicSchemaProps(
           SortableWrapper: ne,
           tableSizeRefCallback: se,
           defaultRowKey: H,
-          dataSource: W
+          dataSource: K
         }, b), Z), {
           paginationProps: j,
           components: X,
@@ -50844,19 +50820,19 @@ AssociationSelect.Designer = function e() {
   useEffect(() => {
     c.readPretty !== u["x-read-pretty"] && (c.readPretty = !!u["x-read-pretty"]);
   }, [u["x-read-pretty"]]);
-  const j = N == null ? void 0 : N.map((W) => W.startsWith("-") ? {
-    field: W.substring(1),
+  const j = N == null ? void 0 : N.map((K) => K.startsWith("-") ? {
+    field: K.substring(1),
     direction: "desc"
   } : {
-    field: W,
+    field: K,
     direction: "asc"
   });
   c.readPretty || c.required;
-  const O = k.filter((W) => i(W)).map((W) => {
-    var K;
+  const O = k.filter((K) => i(K)).map((K) => {
+    var W;
     return {
-      value: W == null ? void 0 : W.name,
-      label: f((K = W == null ? void 0 : W.uiSchema) == null ? void 0 : K.title) || (W == null ? void 0 : W.name)
+      value: K == null ? void 0 : K.name,
+      label: f((W = K == null ? void 0 : K.uiSchema) == null ? void 0 : W.title) || (K == null ? void 0 : K.name)
     };
   });
   let B = "editable";
@@ -50950,19 +50926,19 @@ AssociationSelect.Designer = function e() {
             }
           }
         },
-        onSubmit: (W) => {
+        onSubmit: (K) => {
           var ne;
-          const K = [], X = (re) => re != null && !Number.isNaN(re);
-          for (const re of W.rules)
-            K.push(_.pickBy(re, X));
+          const W = [], X = (re) => re != null && !Number.isNaN(re);
+          for (const re of K.rules)
+            W.push(_.pickBy(re, X));
           const ee = {
             "x-uid": u["x-uid"]
           };
           if (["percent"].includes(S == null ? void 0 : S.interface))
-            for (const re of K)
+            for (const re of W)
               (re.maxValue || re.minValue) && (re.percentMode = !0), re.percentFormat && (re.percentFormats = !0);
-          const Z = _.concat([], ((ne = S == null ? void 0 : S.uiSchema) == null ? void 0 : ne["x-validator"]) || [], K);
-          c.validator = Z, u["x-validator"] = K, ee["x-validator"] = K, m.emit("patch", {
+          const Z = _.concat([], ((ne = S == null ? void 0 : S.uiSchema) == null ? void 0 : ne["x-validator"]) || [], W);
+          c.validator = Z, u["x-validator"] = W, ee["x-validator"] = W, m.emit("patch", {
             schema: ee
           }), h();
         }
@@ -50994,12 +50970,12 @@ AssociationSelect.Designer = function e() {
             })
           }
         },
-        onSubmit: (W) => {
-          const K = {
+        onSubmit: (K) => {
+          const W = {
             "x-uid": u["x-uid"]
           };
-          c.value !== W.default && (c.value = W.default), u.default = W.default, K.default = W.default, m.emit("patch", {
-            schema: K
+          c.value !== K.default && (c.value = K.default), u.default = K.default, W.default = K.default, m.emit("patch", {
+            schema: W
           }), h();
         }
       }
@@ -51010,9 +50986,9 @@ AssociationSelect.Designer = function e() {
         title: d("Field component"),
         options: v,
         value: u["x-component"],
-        onChange: (W) => {
+        onChange: (K) => {
           var X, ee;
-          const K = {
+          const W = {
             name: S == null ? void 0 : S.name,
             type: "void",
             required: u.required,
@@ -51022,19 +50998,19 @@ AssociationSelect.Designer = function e() {
             // 'x-designer': 'FormItem.Designer',
             "x-toolbar": "FormItemSchemaToolbar",
             "x-settings": "fieldSettings:FormItem",
-            "x-component": W,
+            "x-component": K,
             "x-validator": u["x-validator"],
             "x-collection-field": u["x-collection-field"],
             "x-decorator-props": u["x-decorator-props"],
             "x-component-props": x(x({}, (X = S == null ? void 0 : S.uiSchema) == null ? void 0 : X["x-component-props"]), u["x-component-props"])
           };
-          (ee = F == null ? void 0 : F.schemaInitialize) == null || ee.call(F, K, {
+          (ee = F == null ? void 0 : F.schemaInitialize) == null || ee.call(F, W, {
             field: S,
             block: "Form",
             readPretty: c.readPretty,
             action: p ? "get" : null,
             targetCollection: r(S == null ? void 0 : S.target)
-          }), W === "CollectionField" && (K.type = "string"), g("beforeBegin", divWrap(K), {
+          }), K === "CollectionField" && (W.type = "string"), g("beforeBegin", divWrap(W), {
             onSuccess: () => {
               m.remove(null, {
                 removeParentsIfNoChildren: !0,
@@ -51052,12 +51028,12 @@ AssociationSelect.Designer = function e() {
       {
         title: d("Allow multiple"),
         checked: ((E = u["x-component-props"]) == null ? void 0 : E.multiple) === void 0 ? !0 : u["x-component-props"].multiple,
-        onChange: (W) => {
-          const K = {
+        onChange: (K) => {
+          const W = {
             "x-uid": u["x-uid"]
           };
-          u["x-component-props"] = u["x-component-props"] || {}, c.componentProps = c.componentProps || {}, u["x-component-props"].multiple = W, c.componentProps.multiple = W, K["x-component-props"] = u["x-component-props"], m.emit("patch", {
-            schema: K
+          u["x-component-props"] = u["x-component-props"] || {}, c.componentProps = c.componentProps || {}, u["x-component-props"].multiple = K, c.componentProps.multiple = K, W["x-component-props"] = u["x-component-props"], m.emit("patch", {
+            schema: W
           }), h();
         }
       },
@@ -51069,8 +51045,8 @@ AssociationSelect.Designer = function e() {
         collectionName: S == null ? void 0 : S.target,
         defaultFilter: ((U = (G = (q = c.componentProps) == null ? void 0 : q.service) == null ? void 0 : G.params) == null ? void 0 : U.filter) || {},
         form: l,
-        onSubmit: ({ filter: W }) => {
-          W = removeNullCondition(W), _.set(c.componentProps, "service.params.filter", W), u["x-component-props"] = c.componentProps, m.emit("patch", {
+        onSubmit: ({ filter: K }) => {
+          K = removeNullCondition(K), _.set(c.componentProps, "service.params.filter", K), u["x-component-props"] = c.componentProps, m.emit("patch", {
             schema: {
               "x-uid": u["x-uid"],
               "x-component-props": c.componentProps
@@ -51153,9 +51129,9 @@ AssociationSelect.Designer = function e() {
             }
           }
         },
-        onSubmit: ({ sort: W }) => {
-          const K = W.map((X) => X.direction === "desc" ? `-${X.field}` : X.field);
-          _.set(c.componentProps, "service.params.sort", K), u["x-component-props"] = c.componentProps, m.emit("patch", {
+        onSubmit: ({ sort: K }) => {
+          const W = K.map((X) => X.direction === "desc" ? `-${X.field}` : X.field);
+          _.set(c.componentProps, "service.params.sort", W), u["x-component-props"] = c.componentProps, m.emit("patch", {
             schema: {
               "x-uid": u["x-uid"],
               "x-component-props": c.componentProps
@@ -51174,26 +51150,26 @@ AssociationSelect.Designer = function e() {
           { label: d("Easy-reading"), value: "read-pretty" }
         ],
         value: B,
-        onChange: (W) => {
-          const K = {
+        onChange: (K) => {
+          const W = {
             "x-uid": u["x-uid"]
           };
-          switch (W) {
+          switch (K) {
             case "readonly": {
-              u["x-read-pretty"] = !1, u["x-disabled"] = !0, K["x-read-pretty"] = !1, K["x-disabled"] = !0, c.readPretty = !1, c.disabled = !0;
+              u["x-read-pretty"] = !1, u["x-disabled"] = !0, W["x-read-pretty"] = !1, W["x-disabled"] = !0, c.readPretty = !1, c.disabled = !0;
               break;
             }
             case "read-pretty": {
-              u["x-read-pretty"] = !0, u["x-disabled"] = !1, K["x-read-pretty"] = !0, K["x-disabled"] = !1, c.readPretty = !0;
+              u["x-read-pretty"] = !0, u["x-disabled"] = !1, W["x-read-pretty"] = !0, W["x-disabled"] = !1, c.readPretty = !0;
               break;
             }
             default: {
-              u["x-read-pretty"] = !1, u["x-disabled"] = !1, K["x-read-pretty"] = !1, K["x-disabled"] = !1, c.readPretty = !1, c.disabled = !1;
+              u["x-read-pretty"] = !1, u["x-disabled"] = !1, W["x-read-pretty"] = !1, W["x-disabled"] = !1, c.readPretty = !1, c.disabled = !1;
               break;
             }
           }
           m.emit("patch", {
-            schema: K
+            schema: W
           }), m.refresh();
         }
       },
@@ -51205,15 +51181,15 @@ AssociationSelect.Designer = function e() {
         title: d("Title field"),
         options: O,
         value: (J = (H = c == null ? void 0 : c.componentProps) == null ? void 0 : H.fieldNames) == null ? void 0 : J.label,
-        onChange: (W) => {
+        onChange: (K) => {
           var ee, Z;
-          const K = {
+          const W = {
             "x-uid": u["x-uid"]
           }, X = P(x(x({}, (Z = (ee = S == null ? void 0 : S.uiSchema) == null ? void 0 : ee["x-component-props"]) == null ? void 0 : Z.fieldNames), c.componentProps.fieldNames), {
-            label: W
+            label: K
           });
-          c.componentProps.fieldNames = X, u["x-component-props"] = u["x-component-props"] || {}, u["x-component-props"].fieldNames = X, K["x-component-props"] = u["x-component-props"], m.emit("patch", {
-            schema: K
+          c.componentProps.fieldNames = X, u["x-component-props"] = u["x-component-props"] || {}, u["x-component-props"].fieldNames = X, W["x-component-props"] = u["x-component-props"], m.emit("patch", {
+            schema: W
           }), m.refresh();
         }
       },