@nocobase/client 1.2.8-alpha → 1.2.9-alpha

package/es/index.mjs

@@ -21,7 +21,7 @@ var H = (e, t) => {
   return o;
 };
 var P = (e, t, o) => (ke(e, typeof t != "symbol" ? t + "" : t, o), o);
-var O = (e, t, o) => new Promise((n, r) => {
+var V = (e, t, o) => new Promise((n, r) => {
   var i = (c) => {
     try {
       l(o.next(c));
@@ -430,6 +430,15 @@ const bp = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   get FilterActionContext() {
     return FilterActionContext;
   },
+  get FilterContext() {
+    return FilterContext$1;
+  },
+  get FilterDynamicComponent() {
+    return FilterDynamicComponent;
+  },
+  get FilterLogicContext() {
+    return FilterLogicContext;
+  },
   get FixedBlock() {
     return FixedBlock;
   },
@@ -550,6 +559,9 @@ const bp = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   get RemoveButton() {
     return RemoveButton;
   },
+  get RemoveConditionContext() {
+    return RemoveConditionContext;
+  },
   get RequestSettings() {
     return RequestSettings;
   },
@@ -1284,9 +1296,6 @@ const bp = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   get DatetimeFieldInterface() {
     return DatetimeFieldInterface;
   },
-  get DeclareVariable() {
-    return DeclareVariable;
-  },
   get DefaultValueProvider() {
     return DefaultValueProvider;
   },
@@ -1425,9 +1434,18 @@ const bp = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   get FilterBlockType() {
     return FilterBlockType;
   },
+  get FilterContext() {
+    return FilterContext$1;
+  },
+  get FilterDynamicComponent() {
+    return FilterDynamicComponent;
+  },
   get FilterFormBlockProvider() {
     return FilterFormBlockProvider;
   },
+  get FilterLogicContext() {
+    return FilterLogicContext;
+  },
   get FilterParentCollectionFields() {
     return FilterParentCollectionFields;
   },
@@ -1794,6 +1812,9 @@ const bp = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   get RemoveButton() {
     return RemoveButton;
   },
+  get RemoveConditionContext() {
+    return RemoveConditionContext;
+  },
   get RenderChildrenWithAssociationFilter() {
     return RenderChildrenWithAssociationFilter;
   },
@@ -2289,6 +2310,9 @@ const bp = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   get VariableInput() {
     return VariableInput;
   },
+  get VariablePopupRecordProvider() {
+    return VariablePopupRecordProvider;
+  },
   get VariableScopeProvider() {
     return VariableScopeProvider;
   },
@@ -3628,13 +3652,13 @@ function assign(e, t, o = {}) {
 function useRequest(e, t = {}) {
   const [o, n] = useSetState({}), r = useAPIClient();
   let i;
-  typeof e == "function" ? i = e : e ? i = (...u) => O(this, [...u], function* (c = {}) {
+  typeof e == "function" ? i = e : e ? i = (...u) => V(this, [...u], function* (c = {}) {
     const { resource: d, url: p } = e;
     let m = cloneDeep(e);
     d || p ? (m.params = m.params || {}, assign(m.params, c)) : m = merge(m, c);
     const h = yield r.request(m);
     return h == null ? void 0 : h.data;
-  }) : i = () => O(this, null, function* () {
+  }) : i = () => V(this, null, function* () {
   });
   const a = v(g({}, t), {
     onSuccess(...c) {
@@ -3853,15 +3877,15 @@ class Plugin {
     return this.app.dataSourceManager;
   }
   afterAdd() {
-    return O(this, null, function* () {
+    return V(this, null, function* () {
     });
   }
   beforeLoad() {
-    return O(this, null, function* () {
+    return V(this, null, function* () {
     });
   }
   load() {
-    return O(this, null, function* () {
+    return V(this, null, function* () {
     });
   }
   t(t, o = {}) {
@@ -3902,7 +3926,7 @@ function addAppVersion(e, t) {
       addAppVersion((n = e.properties) == null ? void 0 : n[o], t);
     }), e;
 }
-const name = "@nocobase/client", version$1 = "1.2.8-alpha", license = "AGPL-3.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
+const name = "@nocobase/client", version$1 = "1.2.9-alpha", 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",
@@ -3923,9 +3947,9 @@ const name = "@nocobase/client", version$1 = "1.2.8-alpha", license = "AGPL-3.0"
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "1.2.8-alpha",
-  "@nocobase/sdk": "1.2.8-alpha",
-  "@nocobase/utils": "1.2.8-alpha",
+  "@nocobase/evaluators": "1.2.9-alpha",
+  "@nocobase/sdk": "1.2.9-alpha",
+  "@nocobase/utils": "1.2.9-alpha",
   ahooks: "^3.7.2",
   antd: "^5.12.8",
   "antd-style": "3.4.5",
@@ -4048,7 +4072,7 @@ class Designable {
         });
       }), r["x-uid"] && a.length ? a : [];
     };
-    this.on("insertAdjacent", (p) => O(this, [p], function* ({ onSuccess: r, current: i, position: a, schema: l, wrap: c, wrapped: u, removed: d }) {
+    this.on("insertAdjacent", (p) => V(this, [p], function* ({ onSuccess: r, current: i, position: a, schema: l, wrap: c, wrapped: u, removed: d }) {
       var x;
       let m = [];
       if ((u == null ? void 0 : u["x-component"]) === "Grid.Col" && (m = m.concat(n(u.parent))), (d == null ? void 0 : d["x-component"]) === "Grid.Col" && (m = m.concat(n(d.parent))), this.refresh(), !i["x-uid"])
@@ -4069,19 +4093,19 @@ class Designable {
         url: `/uiSchemas:remove/${d["x-uid"]}`,
         method: "post"
       })), r == null || r((x = h == null ? void 0 : h.data) == null ? void 0 : x.data), message.success(o("Saved successfully"), 0.2);
-    })), this.on("patch", (i) => O(this, [i], function* ({ schema: r }) {
+    })), this.on("patch", (i) => V(this, [i], function* ({ schema: r }) {
       this.refresh(), r != null && r["x-uid"] && (yield t.request({
         url: "/uiSchemas:patch",
         method: "post",
         data: g({}, r)
       }), message.success(o("Saved successfully"), 0.2));
-    })), this.on("batchPatch", (i) => O(this, [i], function* ({ schemas: r }) {
+    })), this.on("batchPatch", (i) => V(this, [i], function* ({ schemas: r }) {
       this.refresh(), yield t.request({
         url: "/uiSchemas:batchPatch",
         method: "post",
         data: r
       }), message.success(o("Saved successfully"), 0.2);
-    })), this.on("remove", (i) => O(this, [i], function* ({ removed: r }) {
+    })), this.on("remove", (i) => V(this, [i], function* ({ removed: r }) {
       let a = [];
       (r == null ? void 0 : r["x-component"]) === "Grid.Col" && (a = n(r.parent)), this.refresh(), r != null && r["x-uid"] && (yield t.request({
         url: `/uiSchemas:remove/${r["x-uid"]}`,
@@ -4100,7 +4124,7 @@ class Designable {
     this.events[t] || (this.events[t] = []), this.events[t].push(o);
   }
   emit(t, ...o) {
-    return O(this, null, function* () {
+    return V(this, null, function* () {
       if (!this.events[t])
         return;
       const [n, ...r] = o;
@@ -4595,7 +4619,7 @@ const TreeNode = (e) => {
     getOnCheck: x,
     getScopeDataSource: (S) => {
       const b = t(S), y = (k, A) => {
-        var V, R;
+        var O, R;
         if (!k.interface)
           return;
         const w = r(k.interface);
@@ -4603,7 +4627,7 @@ const TreeNode = (e) => {
           return;
         const { nested: M, children: N, operators: E } = w.filterable, z = {
           name: k.name,
-          title: ((V = k == null ? void 0 : k.uiSchema) == null ? void 0 : V.title) || k.name,
+          title: ((O = k == null ? void 0 : k.uiSchema) == null ? void 0 : O.title) || k.name,
           schema: k == null ? void 0 : k.uiSchema,
           operators: ((R = E == null ? void 0 : E.filter) == null ? void 0 : R.call(E, (j) => !(j != null && j.visible) || j.visible(k))) || [],
           interface: k.interface
@@ -5483,13 +5507,13 @@ function getAllKeys(e) {
   }
   return o(e), t;
 }
-const conditionAnalyses = (n) => O(void 0, [n], function* ({
+const conditionAnalyses = (n) => V(void 0, [n], function* ({
   ruleGroup: e,
   variables: t,
   localVariables: o
 }) {
   const r = Object.keys(e)[0] || "$and";
-  let a = e[r].map((l) => O(void 0, null, function* () {
+  let a = e[r].map((l) => V(void 0, null, function* () {
     if ("$and" in l || "$or" in l)
       return yield conditionAnalyses({ ruleGroup: l, variables: t, localVariables: o });
     const c = getInnermostKeyAndValue(l), u = c == null ? void 0 : c.key;
@@ -5514,7 +5538,7 @@ function targetFieldToVariableString(e) {
   return `{{ $nForm.${e.join(".")} }}`;
 }
 function getTempFieldState(e, t) {
-  return O(this, null, function* () {
+  return V(this, null, function* () {
     return [e, t] = yield Promise.all([e, t]), {
       condition: e,
       value: t
@@ -5566,7 +5590,7 @@ const collectFieldStateOfLinkageRules = ({
       break;
     case ActionType.Value:
       {
-        const y = () => O(void 0, null, function* () {
+        const y = () => V(void 0, null, function* () {
           var F;
           if ((t == null ? void 0 : t.mode) === "express") {
             if ((t.value || t.result) == null)
@@ -5595,7 +5619,7 @@ const collectFieldStateOfLinkageRules = ({
   }
 };
 function replaceVariables(n, r) {
-  return O(this, arguments, function* (e, {
+  return V(this, arguments, function* (e, {
     variables: t,
     localVariables: o
   }) {
@@ -5603,7 +5627,7 @@ function replaceVariables(n, r) {
     const i = {}, a = {};
     if (e == null)
       return;
-    const l = (c = e.match(REGEX_OF_VARIABLE_IN_EXPRESSION)) == null ? void 0 : c.map((u) => O(this, null, function* () {
+    const l = (c = e.match(REGEX_OF_VARIABLE_IN_EXPRESSION)) == null ? void 0 : c.map((u) => V(this, null, function* () {
       const d = yield t.parseVariable(u, o), p = `_${uid$1()}`;
       return a[p] = d, i[u] = p, d;
     }));
@@ -5621,7 +5645,7 @@ const useCloseAction$3 = () => {
   const { setVisible: e } = useActionContext(), t = useForm();
   return {
     run() {
-      return O(this, null, function* () {
+      return V(this, null, function* () {
         e(!1), t.submit((n) => {
           console.log(n);
         });
@@ -5632,7 +5656,7 @@ const useCloseAction$3 = () => {
   const { setVisible: e } = useActionContext(), t = useForm(), o = useAPIClient();
   return {
     run() {
-      return O(this, null, function* () {
+      return V(this, null, function* () {
         yield t.submit(), yield o.resource("auth").changePassword({
           values: t.values
         }), yield t.reset(), e(!1);
@@ -5776,7 +5800,7 @@ const useCurrentUserSettingsMenu = () => {
   const { setVisible: e } = useActionContext(), t = useForm();
   return {
     run() {
-      return O(this, null, function* () {
+      return V(this, null, function* () {
         e(!1), t.submit((n) => {
           console.log(n);
         });
@@ -5790,7 +5814,7 @@ const useCurrentUserSettingsMenu = () => {
   const e = useCurrentUserContext(), { setVisible: t } = useActionContext(), o = useForm(), n = useAPIClient();
   return {
     run() {
-      return O(this, null, function* () {
+      return V(this, null, function* () {
         var a;
         const i = yield o.submit();
         t(!1), yield n.resource("users").updateProfile({
@@ -6036,7 +6060,7 @@ const useCurrentUserSettingsMenu = () => {
           value: l
         })),
         defaultValue: t.language,
-        onChange: (l) => O(void 0, null, function* () {
+        onChange: (l) => V(void 0, null, function* () {
           yield o.resource("users").updateProfile({
             values: {
               appLang: l
@@ -6353,7 +6377,7 @@ function getRemotePlugins(e, t = []) {
   });
 }
 function getPlugins(e) {
-  return O(this, null, function* () {
+  return V(this, null, function* () {
     const { requirejs: t, pluginData: o, devDynamicImport: n } = e;
     if (o.length === 0)
       return [];
@@ -6395,12 +6419,12 @@ let PluginManager$1 = class {
    * @internal
    */
   init(t) {
-    return O(this, null, function* () {
+    return V(this, null, function* () {
       yield this.initStaticPlugins(t), this.loadRemotePlugins && (yield this.initRemotePlugins());
     });
   }
   initStaticPlugins() {
-    return O(this, arguments, function* (t = []) {
+    return V(this, arguments, function* (t = []) {
       try {
         for (var o = Fe(t), n, r, i; n = !(r = yield o.next()).done; n = !1) {
           const a = r.value;
@@ -6420,7 +6444,7 @@ let PluginManager$1 = class {
     });
   }
   initRemotePlugins() {
-    return O(this, null, function* () {
+    return V(this, null, function* () {
       var r;
       const t = yield this.app.apiClient.request({ url: "pm:listEnabled" }), o = ((r = t == null ? void 0 : t.data) == null ? void 0 : r.data) || [], n = yield getPlugins({
         requirejs: this.app.requirejs,
@@ -6446,7 +6470,7 @@ let PluginManager$1 = class {
     });
   }
   add(n) {
-    return O(this, arguments, function* (t, o = {}) {
+    return V(this, arguments, function* (t, o = {}) {
       const r = this.getInstance(t, o);
       this.pluginInstances.set(t, r), o.name && (this.pluginsAliases[o.name] = r), o.packageName && (this.pluginsAliases[o.packageName] = r), yield r.afterAdd();
     });
@@ -6461,7 +6485,7 @@ let PluginManager$1 = class {
    * @internal
    */
   load() {
-    return O(this, null, function* () {
+    return V(this, null, function* () {
       yield this.initPlugins;
       for (const t of this.pluginInstances.values())
         yield t.beforeLoad();
@@ -6774,9 +6798,9 @@ class WebSocketClient {
       for (const { type: n, listener: r, options: i } of this.events)
         this._ws.addEventListener(n, r, i);
       o = setInterval(() => this.send("ping"), this.pingInterval), this.connected = !0;
-    }, t.onerror = () => O(this, null, function* () {
+    }, t.onerror = () => V(this, null, function* () {
       console.log("onerror", this.readyState, this._reconnectTimes);
-    }), t.onclose = (n) => O(this, null, function* () {
+    }), t.onclose = (n) => V(this, null, function* () {
       setTimeout(() => this.connect(), this.reconnectInterval), console.log("onclose", this.readyState, this._reconnectTimes, this.serverDown), this.connected = !1, clearInterval(o);
     });
   }
@@ -6830,7 +6854,7 @@ const useNiceDropdownMaxHeight = (e = []) => {
   var n;
   const { getPrefixCls: o } = useContext(ConfigProvider.ConfigContext) || {};
   return "ConfigContext" in ConfigProvider ? (o == null ? void 0 : o(e, t == null ? void 0 : t.prefixCls)) || "" : `${(n = t == null ? void 0 : t.prefixCls) != null ? n : "ant-"}${e != null ? e : ""}`;
-}, useToken = () => theme.useToken(), loading = (e = "Loading...", t) => O(void 0, null, function* () {
+}, useToken = () => theme.useToken(), loading = (e = "Loading...", t) => V(void 0, null, function* () {
   let o = null;
   const n = setTimeout(() => {
     o = message.loading(e);
@@ -6870,7 +6894,7 @@ function legacyUnmount(e) {
   return unmountComponentAtNode(e);
 }
 function concurrentUnmount(e) {
-  return O(this, null, function* () {
+  return V(this, null, function* () {
     return Promise.resolve().then(() => {
       var t;
       (t = e[MARK]) == null || t.unmount(), delete e[MARK];
@@ -7288,7 +7312,7 @@ const SchemaInitializerDivider = () => {
     const x = useForm(), f = useActionContext();
     return {
       run() {
-        return O(this, null, function* () {
+        return V(this, null, function* () {
           yield l == null ? void 0 : l(), f.setVisible(!1), x.reset();
         });
       }
@@ -7297,7 +7321,7 @@ const SchemaInitializerDivider = () => {
     const x = useForm(), f = useActionContext();
     return {
       run() {
-        return O(this, null, function* () {
+        return V(this, null, function* () {
           yield x.validate(), yield c == null ? void 0 : c(x.values), f.setVisible(!1), x.reset();
         });
       }
@@ -7829,21 +7853,21 @@ https://requirejs.org/docs/errors.html#` + e);
         }
     }
     function S(T, D, $) {
-      var q, L, G, U, K, Y, W, X, Q, J, oe, ne, re = D && D.split("/"), ie = a.map, le = ie && ie["*"];
-      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("/")), $ && ie && (re || le)) {
+      var q, L, G, U, K, Y, W, X, Q, J, te, oe, re = D && D.split("/"), se = a.map, ae = 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 && (oe = re.slice(0, re.length - 1), T = oe.concat(T)), C(T), T = T.join("/")), $ && se && (re || ae)) {
         G = T.split("/");
         e:
           for (U = G.length; U > 0; U -= 1) {
             if (Y = G.slice(0, U).join("/"), re) {
               for (K = re.length; K > 0; K -= 1)
-                if (L = getOwn(ie, re.slice(0, K).join("/")), L && (L = getOwn(L, Y), L)) {
+                if (L = getOwn(se, re.slice(0, K).join("/")), L && (L = getOwn(L, Y), L)) {
                   X = L, Q = U;
                   break e;
                 }
             }
-            !J && le && getOwn(le, Y) && (J = getOwn(le, Y), oe = U);
+            !J && ae && getOwn(ae, Y) && (J = getOwn(ae, Y), te = U);
           }
-        !X && J && (X = J, Q = oe), X && (G.splice(0, Q, X), T = G.join("/"));
+        !X && J && (X = J, Q = te), X && (G.splice(0, Q, X), T = G.join("/"));
       }
       return q = getOwn(a.pkgs, T), q || T;
     }
@@ -7866,8 +7890,8 @@ https://requirejs.org/docs/errors.html#` + e);
     }
     function I(T, D, $, q) {
       var L, G, U, K, Y = null, W = D ? D.name : null, X = T, Q = !0, J = "";
-      return T || (Q = !1, T = "_@r" + (x += 1)), K = F(T), Y = K[0], T = K[1], Y && (Y = S(Y, W, q), G = getOwn(p, Y)), T && (Y ? $ ? J = T : G && G.normalize ? J = G.normalize(T, function(oe) {
-        return S(oe, W, q);
+      return T || (Q = !1, T = "_@r" + (x += 1)), K = F(T), Y = K[0], T = K[1], Y && (Y = S(Y, W, q), G = getOwn(p, Y)), T && (Y ? $ ? J = T : G && G.normalize ? J = G.normalize(T, function(te) {
+        return S(te, W, q);
       }) : J = T.indexOf("!") === -1 ? S(T, W, q) : T : (J = S(T, W, q), K = F(J), Y = K[0], J = K[1], $ = !0, L = n.nameToUrl(J))), U = Y && !G && !$ ? "_unnormalized" + (f += 1) : "", {
         prefix: Y,
         name: J,
@@ -8060,19 +8084,19 @@ https://requirejs.org/docs/errors.html#` + e);
               J.map.id.indexOf(D + "_unnormalized") === 0 && N(J.map.id);
             }), w(Q);
           }), L.fromText = bind(this, function(Q, J) {
-            var oe = T.name, ne = I(oe), re = useInteractive;
-            J && (Q = J), re && (useInteractive = !1), k(ne), hasProp(a.config, D) && (a.config[oe] = a.config[D]);
+            var te = T.name, oe = I(te), re = useInteractive;
+            J && (Q = J), re && (useInteractive = !1), k(oe), hasProp(a.config, D) && (a.config[te] = a.config[D]);
             try {
               req.exec(Q);
-            } catch (ie) {
+            } catch (se) {
               return w(makeError(
                 "fromtexteval",
-                "fromText eval for " + D + " failed: " + ie,
-                ie,
+                "fromText eval for " + D + " failed: " + se,
+                se,
                 [D]
               ));
             }
-            re && (useInteractive = !0), this.depMaps.push(ne), n.completeLoad(oe), X([oe], L);
+            re && (useInteractive = !0), this.depMaps.push(oe), n.completeLoad(te), X([te], L);
           }), q.load(T.name, X, L, a);
         })), n.enable($, this), this.pluginMaps[$.id] = $;
       },
@@ -8111,7 +8135,7 @@ https://requirejs.org/docs/errors.html#` + e);
         }), T === "error" && delete this.events[T];
       }
     };
-    function V(T) {
+    function O(T) {
       hasProp(p, T[0]) || k(I(T[0], null, !0)).init(T[1], T[2]);
     }
     function R(T, D, $, q) {
@@ -8129,7 +8153,7 @@ https://requirejs.org/docs/errors.html#` + e);
       for (M(); d.length; ) {
         if (T = d.shift(), T[0] === null)
           return w(makeError("mismatch", "Mismatched anonymous define() module: " + T[T.length - 1]));
-        V(T);
+        O(T);
       }
       n.defQueueMap = {};
     }
@@ -8250,7 +8274,7 @@ https://requirejs.org/docs/errors.html#` + e);
             D = !0;
           } else
             $[0] === T && (D = !0);
-          V($);
+          O($);
         }
         if (n.defQueueMap = {}, q = getOwn(l, T), !D && !hasProp(p, T) && q && !q.inited) {
           if (a.enforceDefine && (!G || !getGlobal(G)))
@@ -8260,7 +8284,7 @@ https://requirejs.org/docs/errors.html#` + e);
               null,
               [T]
             ));
-          V([T, L.deps || [], L.exportsFn]);
+          O([T, L.deps || [], L.exportsFn]);
         }
         z();
       },
@@ -8487,7 +8511,7 @@ class DataSource {
     this.reloadCallbacks = this.reloadCallbacks.filter((o) => o !== t);
   }
   reload() {
-    return O(this, null, function* () {
+    return V(this, null, function* () {
       const t = yield this.getDataSource();
       return this.setOptions(t), this.collectionManager.setCollections(t.collections || []), this.reloadCallbacks.forEach((o) => o(t.collections)), this.options;
     });
@@ -8661,7 +8685,7 @@ class DataSourceManager {
     return this.dataSourceInstancesMap[n.key] = n, n;
   }
   addDataSources(t, o) {
-    return O(this, null, function* () {
+    return V(this, null, function* () {
       this.multiDataSources.some(([n, r]) => n === t && r === o) || this.multiDataSources.push([t, o]);
     });
   }
@@ -8684,9 +8708,9 @@ class DataSourceManager {
     this.collectionFieldInterfaceManager.addFieldInterfaces(t);
   }
   reload() {
-    return O(this, null, function* () {
+    return V(this, null, function* () {
       return yield Promise.all(
-        this.multiDataSources.map((n) => O(this, [n], function* ([t, o]) {
+        this.multiDataSources.map((n) => V(this, [n], function* ([t, o]) {
           (yield t()).map((i) => this.addDataSource(o, i));
         }))
       ), Promise.all(this.getDataSources().map((t) => t.reload()));
@@ -8814,18 +8838,18 @@ const useCollections = (e) => {
       const W = S(R, Y), X = (Q = W == null ? void 0 : W.filter(
         (J) => J.interface && !G.includes(J.interface) && (L || j.includes(J.type) || (T && J.target && J.target !== R && Array.isArray(T) ? T.includes(J.interface) : !1))
       )) == null ? void 0 : Q.map((J) => {
-        var ne, re;
-        const oe = g({
+        var oe, re;
+        const te = g({
           value: K && U ? `${U}.${J.name}` : J.name,
-          label: f((ne = J == null ? void 0 : J.uiSchema) == null ? void 0 : ne.title) || J.name
+          label: f((oe = J == null ? void 0 : J.uiSchema) == null ? void 0 : oe.title) || J.name
         }, J);
-        return T && J.target && (oe.children = $.includes(J.target) ? [] : k(J.target, j, v(g({}, B), {
+        return T && J.target && (te.children = $.includes(J.target) ? [] : k(J.target, j, v(g({}, B), {
           cached: D,
           dataSource: Y,
           collectionNames: [...$, J.target],
           prefixFieldValue: K ? U ? `${U}.${J.name}` : J.name : "",
           usePrefix: K
-        })), !((re = oe.children) != null && re.length)) ? null : oe;
+        })), !((re = te.children) != null && re.length)) ? null : te;
       }).filter(Boolean);
       return D[R] = X, X;
     },
@@ -8860,7 +8884,7 @@ const useCollections = (e) => {
       return (D = (T = p(B)) == null ? void 0 : T.getCollection(j)) == null ? void 0 : D.getParentCollectionFields(R);
     },
     [t, p]
-  ), V = useCallback(
+  ), O = useCallback(
     (R = "general") => t == null ? void 0 : t.collectionTemplateManager.getCollectionTemplate(R),
     [t]
   );
@@ -8869,7 +8893,7 @@ const useCollections = (e) => {
     interfaces: c,
     collections: m,
     templates: u,
-    getTemplate: V,
+    getTemplate: O,
     getInterface: N,
     getCollections: d,
     getParentCollectionFields: z,
@@ -9072,7 +9096,7 @@ function useCurrentRequest(e) {
   }));
 }
 function requestParentRecordData(a) {
-  return O(this, arguments, function* ({
+  return V(this, arguments, function* ({
     sourceId: e,
     association: t,
     parentRecord: o,
@@ -9283,7 +9307,7 @@ const SchemaComponentProvider = (e) => {
 SchemaComponentProvider.displayName = "SchemaComponentProvider";
 class SchemaComponentPlugin extends Plugin {
   load() {
-    return O(this, null, function* () {
+    return V(this, null, function* () {
       this.addComponents();
     });
   }
@@ -9416,7 +9440,7 @@ class Application {
     });
   }
   load() {
-    return O(this, null, function* () {
+    return V(this, null, function* () {
       var o, n, r, i, a;
       let t = !1;
       this.ws.on("message", (l) => {
@@ -9904,7 +9928,7 @@ const useRoleVariable = ({
     key: t,
     isLeaf: !1,
     disabled: a,
-    loadChildren: (c, u) => O(void 0, null, function* () {
+    loadChildren: (c, u) => V(void 0, null, function* () {
       const d = u ? {
         [u]: void 0
       } : {};
@@ -10007,7 +10031,7 @@ const variablesStore = {}, getFieldPath = (e, t) => {
   const t = useRef({}), o = useAPIClient(), { getCollectionJoinField: n, getCollection: r } = useCollectionManager_deprecated(), i = useCompile(), { builtinVariables: a } = useBuiltInVariables(), l = useCallback((f) => {
     _.isFunction(f) ? t.current = f(t.current) : t.current = f;
   }, []), c = useCallback(
-    (f, C, S) => O(void 0, null, function* () {
+    (f, C, S) => V(void 0, null, function* () {
       var E;
       const b = f.split("."), y = b[0], F = mergeVariableToCollectionNameWithLocalVariables(variablesStore, C);
       let I = mergeCtxWithLocalVariables(t.current, C);
@@ -10018,11 +10042,11 @@ const variablesStore = {}, getFieldPath = (e, t) => {
       for (let z = 0; z < b.length; z++) {
         if (I == null)
           return I === void 0 ? w.defaultValue : I;
-        const V = b[z], { fieldPath: R } = getFieldPath(b.slice(0, z + 1).join("."), F), j = n(R, A), B = (E = r(M)) == null ? void 0 : E.getPrimaryKey();
+        const O = b[z], { fieldPath: R } = getFieldPath(b.slice(0, z + 1).join("."), F), j = n(R, A), B = (E = r(M)) == null ? void 0 : E.getPrimaryKey();
         if (Array.isArray(I)) {
           const T = I.map((D) => {
-            if (shouldToRequest(D == null ? void 0 : D[V]) && (D == null ? void 0 : D[B]) != null && j != null && j.target) {
-              const $ = `/${M}/${D[j.sourceKey || B]}/${V}:${getAction(j.type)}`;
+            if (shouldToRequest(D == null ? void 0 : D[O]) && (D == null ? void 0 : D[B]) != null && j != null && j.target) {
+              const $ = `/${M}/${D[j.sourceKey || B]}/${O}:${getAction(j.type)}`;
               if (hasRequested($))
                 return getRequested($);
               const q = o.request({
@@ -10031,14 +10055,14 @@ const variablesStore = {}, getFieldPath = (e, t) => {
                 params: {
                   appends: S == null ? void 0 : S.appends
                 }
-              }).then((L) => (clearRequested($), D[V] = L.data.data, D[V]));
+              }).then((L) => (clearRequested($), D[O] = L.data.data, D[O]));
               return stashRequested($, q), q;
             }
-            return D == null ? void 0 : D[V];
+            return D == null ? void 0 : D[O];
           });
           I = removeThroughCollectionFields(_.flatten(yield Promise.all(T)), j);
-        } else if (shouldToRequest(I[V]) && I[B] != null && (j != null && j.target)) {
-          const T = `/${M}/${I[j.sourceKey || B]}/${V}:${getAction(j.type)}`;
+        } else if (shouldToRequest(I[O]) && I[B] != null && (j != null && j.target)) {
+          const T = `/${M}/${I[j.sourceKey || B]}/${O}:${getAction(j.type)}`;
           let D = null;
           if (hasRequested(T))
             D = yield getRequested(T);
@@ -10052,9 +10076,9 @@ const variablesStore = {}, getFieldPath = (e, t) => {
             });
             stashRequested(T, $), D = yield $, clearRequested(T);
           }
-          raw(I)[V] || (raw(I)[V] = D.data.data), I = removeThroughCollectionFields(getValuesByPath(I, V), j);
+          raw(I)[O] || (raw(I)[O] = D.data.data), I = removeThroughCollectionFields(getValuesByPath(I, O), j);
         } else
-          I = removeThroughCollectionFields(getValuesByPath(I, V), j);
+          I = removeThroughCollectionFields(getValuesByPath(I, O), j);
         j != null && j.target && (M = j.target);
       }
       const N = i(_.isFunction(I) ? I() : I);
@@ -10087,7 +10111,7 @@ const variablesStore = {}, getFieldPath = (e, t) => {
      * @param localVariables 局部变量，解析完成后会被清除
      * @returns
      */
-    (f, C, S) => O(void 0, null, function* () {
+    (f, C, S) => V(void 0, null, function* () {
       if (!isVariable(f))
         return f;
       C && (C = _.isArray(C) ? C : [C]);
@@ -10096,7 +10120,7 @@ const variablesStore = {}, getFieldPath = (e, t) => {
     }),
     [c]
   ), h = useCallback(
-    (f, C) => O(void 0, null, function* () {
+    (f, C) => V(void 0, null, function* () {
       var k;
       if (!isVariable(f))
         throw new Error(`VariablesProvider: ${f} is not a variable string`);
@@ -10596,8 +10620,8 @@ function useServiceOptions$1(e) {
   var C, S, b, y;
   const { action: t = "list", service: o, useOriginalFilter: n } = e, r = useFieldSchema(), i = useField(), { getField: a } = useCollection_deprecated(), { getCollectionJoinField: l } = useCollectionManager_deprecated(), c = useRecord(), { parseFilter: u, findVariable: d } = useParseDataScopeFilter(), [p, m] = useState(null);
   useEffect(() => {
-    var w, M, N, E, z, V, R, j, B;
-    const F = isString((N = (M = (w = r == null ? void 0 : r["x-component-props"]) == null ? void 0 : w.service) == null ? void 0 : M.params) == null ? void 0 : N.filter) ? (V = (z = (E = i.componentProps) == null ? void 0 : E.service) == null ? void 0 : z.params) == null ? void 0 : V.filter : (B = (j = (R = r == null ? void 0 : r["x-component-props"]) == null ? void 0 : R.service) == null ? void 0 : j.params) == null ? void 0 : B.filter, I = () => O(this, null, function* () {
+    var w, M, N, E, z, O, R, j, B;
+    const F = isString((N = (M = (w = r == null ? void 0 : r["x-component-props"]) == null ? void 0 : w.service) == null ? void 0 : M.params) == null ? void 0 : N.filter) ? (O = (z = (E = i.componentProps) == null ? void 0 : E.service) == null ? void 0 : z.params) == null ? void 0 : O.filter : (B = (j = (R = r == null ? void 0 : r["x-component-props"]) == null ? void 0 : R.service) == null ? void 0 : j.params) == null ? void 0 : B.filter, I = () => V(this, null, function* () {
       var D;
       const T = yield u(mergeFilter([F || ((D = o == null ? void 0 : o.params) == null ? void 0 : D.filter)]));
       m(T);
@@ -10705,6 +10729,54 @@ const SubFormProvider = SubFormContext.Provider, useSubFormValue = () => {
     /** 变量的配置项 */
     currentObjectSettings: d
   };
+}, CurrentPopupRecordContext = React.createContext(null), CurrentParentPopupRecordContext = React.createContext(null), VariablePopupRecordProvider = (e) => {
+  var i, a;
+  const { t } = useTranslation(), o = useCollectionRecordData(), n = useCollection(), r = useCurrentPopupRecord();
+  return /* @__PURE__ */ jsx(
+    CurrentParentPopupRecordContext.Provider,
+    {
+      value: {
+        name: "$nParentPopupRecord",
+        title: t("Parent popup record"),
+        value: ((i = e.parent) == null ? void 0 : i.recordData) || (r == null ? void 0 : r.value),
+        collection: ((a = e.parent) == null ? void 0 : a.collection) || (r == null ? void 0 : r.collection)
+      },
+      children: /* @__PURE__ */ jsx(
+        CurrentPopupRecordContext.Provider,
+        {
+          value: {
+            name: "$nPopupRecord",
+            title: t("Current popup record"),
+            value: e.recordData || o,
+            collection: e.collection || n
+          },
+          children: e.children
+        }
+      )
+    }
+  );
+}, useCurrentPopupRecord = () => React.useContext(CurrentPopupRecordContext), useParentPopupRecord = () => React.useContext(CurrentParentPopupRecordContext), useParentPopupVariable = (e = {}) => {
+  const { value: t, title: o, collection: n } = useParentPopupRecord() || {}, { isVariableParsedInOtherContext: r } = useFlag();
+  return {
+    /** 变量配置 */
+    settings: useBaseVariable({
+      collectionField: e.collectionField,
+      uiSchema: e.schema,
+      name: "$nParentPopupRecord",
+      title: o,
+      collectionName: n == null ? void 0 : n.name,
+      noDisabled: e.noDisabled,
+      targetFieldSchema: e.targetFieldSchema,
+      dataSource: n == null ? void 0 : n.dataSource
+    }),
+    /** 变量值 */
+    parentPopupRecordCtx: t,
+    /** 用于判断是否需要显示配置项 */
+    shouldDisplayParentPopupRecord: !!t && !r,
+    /** 当前记录对应的 collection name */
+    collectionName: n == null ? void 0 : n.name,
+    dataSource: n == null ? void 0 : n.dataSource
+  };
 }, ParentCollectionContext = createContext(null);
 ParentCollectionContext.displayName = "ParentCollectionContext";
 const ParentCollectionProvider = (e) => {
@@ -10738,14 +10810,8 @@ const ParentCollectionProvider = (e) => {
     collectionName: n || (i == null ? void 0 : i.name),
     dataSource: c
   };
-}, DeclareVariableContext = createContext(null), DeclareVariable = (e) => {
-  const { name: t, value: o, title: n, collection: r } = e;
-  return /* @__PURE__ */ jsx(DeclareVariableContext.Provider, { value: { name: t, value: o, title: n, collection: r }, children: e.children });
-}, useVariable = (e) => {
-  const { name: t, value: o, title: n, collection: r } = useContext(DeclareVariableContext) || {};
-  return t === e ? { value: o, title: n, collection: r } : {};
 }, usePopupVariable = (e = {}) => {
-  const { value: t, title: o, collection: n } = useVariable("$nPopupRecord"), { isVariableParsedInOtherContext: r } = useFlag();
+  const { value: t, title: o, collection: n } = useCurrentPopupRecord() || {}, { isVariableParsedInOtherContext: r } = useFlag();
   return {
     /** 变量配置 */
     settings: useBaseVariable({
@@ -10797,9 +10863,13 @@ const ParentCollectionProvider = (e) => {
     popupRecordCtx: c,
     collectionName: u,
     dataSource: d
-  } = usePopupVariable(), { datetimeCtx: p } = useDatetimeVariable(), { currentFormCtx: m } = useCurrentFormVariable({ form: e == null ? void 0 : e.currentForm }), { name: h } = useCollection_deprecated();
-  let { name: x } = useBlockCollection();
-  return e != null && e.collectionName && (x = e.collectionName), useMemo(() => [
+  } = usePopupVariable(), {
+    parentPopupRecordCtx: p,
+    collectionName: m,
+    dataSource: h
+  } = useParentPopupVariable(), { datetimeCtx: x } = useDatetimeVariable(), { currentFormCtx: f } = useCurrentFormVariable({ form: e == null ? void 0 : e.currentForm }), { name: C } = useCollection_deprecated();
+  let { name: S } = useBlockCollection();
+  return e != null && e.collectionName && (S = e.collectionName), useMemo(() => [
     /**
      * @deprecated
      * 兼容老版本
@@ -10814,9 +10884,9 @@ const ParentCollectionProvider = (e) => {
      * 兼容旧版本的以数据表名称命名的变量，新版本已更名为 `$nForm`
      */
     {
-      name: x,
-      ctx: m || n,
-      collectionName: x
+      name: S,
+      ctx: f || n,
+      collectionName: S
     },
     /**
      * @deprecated
@@ -10824,8 +10894,8 @@ const ParentCollectionProvider = (e) => {
      */
     {
       name: "$form",
-      ctx: m,
-      collectionName: x
+      ctx: f,
+      collectionName: S
     },
     {
       name: "$nRecord",
@@ -10844,14 +10914,20 @@ const ParentCollectionProvider = (e) => {
       collectionName: u,
       dataSource: d
     },
+    {
+      name: "$nParentPopupRecord",
+      ctx: p,
+      collectionName: m,
+      dataSource: h
+    },
     {
       name: "$nForm",
-      ctx: m,
-      collectionName: x
+      ctx: f,
+      collectionName: S
     },
     {
       name: "$nDate",
-      ctx: p
+      ctx: x
     },
     /**
      * @deprecated
@@ -10859,28 +10935,28 @@ const ParentCollectionProvider = (e) => {
      */
     {
       name: "$date",
-      ctx: p
+      ctx: x
     },
     o && {
       name: "$iteration",
       ctx: t,
-      collectionName: h
+      collectionName: C
     }
   ].filter(Boolean), [
     n,
     r,
-    x,
-    m,
+    S,
+    f,
     i,
     a,
     l,
     c,
     u,
     d,
-    p,
+    x,
     o,
     t,
-    h
+    C
   ]);
 }, useVariables = () => useContext(VariablesContext), DEBOUNCE_WAIT = 100;
 function useParsedFilter({ filterOption: e }) {
@@ -10888,7 +10964,7 @@ function useParsedFilter({ filterOption: e }) {
   return useEffect(() => {
     if (!e)
       return;
-    const l = () => O(this, null, function* () {
+    const l = () => V(this, null, function* () {
       a(!0);
       const u = yield t(e);
       a(!1), r(u);
@@ -11172,8 +11248,8 @@ const ColDivider = (e) => {
         return;
       const M = l.current, N = M.previousElementSibling, E = M.nextElementSibling;
       h["x-component-props"] = h["x-component-props"] || {}, x["x-component-props"] = x["x-component-props"] || {};
-      const z = M.clientWidth * (e.cols.length + 1) / e.cols.length, V = (100 * (N.getBoundingClientRect().width + z) / M.parentElement.clientWidth).toFixed(2), R = (100 * (E.getBoundingClientRect().width + z) / M.parentElement.clientWidth).toFixed(2);
-      _.set(h, "x-component-props.width", V), _.set(x, "x-component-props.width", R), i.emit("batchPatch", {
+      const z = M.clientWidth * (e.cols.length + 1) / e.cols.length, O = (100 * (N.getBoundingClientRect().width + z) / M.parentElement.clientWidth).toFixed(2), R = (100 * (E.getBoundingClientRect().width + z) / M.parentElement.clientWidth).toFixed(2);
+      _.set(h, "x-component-props.width", O), _.set(x, "x-component-props.width", R), i.emit("batchPatch", {
         schemas: [
           {
             "x-uid": h["x-uid"],
@@ -11266,27 +11342,29 @@ const ColDivider = (e) => {
   return useMemo(() => e.reduceProperties((t, o) => (o["x-component"] === "Grid.Col" && !o["x-hidden"] && t.push(o), t), []), [Object.keys(e.properties || {}).join(",")]);
 }, DndWrapper = (e) => e.dndContext === !1 ? /* @__PURE__ */ jsx(Fragment, { children: e.children }) : /* @__PURE__ */ jsx(DndContext, v(g({}, e.dndContext), { children: e.children })), useGridContext = () => useContext(GridContext), useGridRowContext = () => useContext(GridRowContext), Grid = observer$1(
   (e) => {
-    const { distributed: t, showDivider: o = !0 } = e, n = useRef(null), r = useField(), i = useFieldSchema(), { render: a } = useSchemaInitializerRender(i["x-initializer"], i["x-initializer-props"]), l = useCallback((C) => a(C), []), c = r.address.toString(), u = useRowProperties(), { setPrintContent: d } = useFormBlockContext(), { styles: p } = useStyles$j(), { token: m } = theme.useToken(), { designable: h } = useDesignable(), x = t === void 0 ? (i == null ? void 0 : i.parent["x-component"]) === "Page" || (i == null ? void 0 : i.parent["x-component"]) === "Tabs.TabPane" : t;
+    const { distributed: t, showDivider: o = !0 } = e, n = useRef(null), r = useField(), i = useFieldSchema(), { render: a } = useSchemaInitializerRender(i["x-initializer"], i["x-initializer-props"]), l = useCallback((f) => a(f), []), c = r.address.toString(), u = useRowProperties(), { setPrintContent: d } = useFormBlockContext(), { styles: p } = useStyles$j(), { token: m } = theme.useToken();
+    useDesignable();
+    const h = t === void 0 ? (i == null ? void 0 : i.parent["x-component"]) === "Page" || (i == null ? void 0 : i.parent["x-component"]) === "Tabs.TabPane" : t;
     useEffect(() => {
       n.current && (d == null || d(n.current));
     }, [n.current]);
-    const f = useMemo(() => ({
+    const x = useMemo(() => ({
       ref: n,
       fieldSchema: i,
       renderSchemaInitializer: a,
       InitializerComponent: l,
       showDivider: o
     }), [i, a, l, o]);
-    return /* @__PURE__ */ jsx(FilterBlockProvider, { children: /* @__PURE__ */ jsx(GridContext.Provider, { value: f, children: /* @__PURE__ */ jsx(
+    return /* @__PURE__ */ jsx(FilterBlockProvider, { children: /* @__PURE__ */ jsx(GridContext.Provider, { value: x, children: /* @__PURE__ */ jsx(
       "div",
       {
         className: cls(
-          "nb-grid-container",
-          css`
-                & {
-                  margin-bottom: ${h ? 0 : -m.marginLG}px;
-                }
-              `
+          "nb-grid-container"
+          // css`
+          //   & {
+          //     margin-bottom: ${designable ? 0 : -token.marginLG}px;
+          //   }
+          // `,
         ),
         children: /* @__PURE__ */ jsx("div", { className: cls(`nb-grid ${p.container}`), style: { position: "relative" }, ref: n, children: /* @__PURE__ */ jsxs("div", { className: "nb-grid-warp", children: [
           /* @__PURE__ */ jsxs(DndWrapper, { dndContext: e.dndContext, children: [
@@ -11304,25 +11382,29 @@ const ColDivider = (e) => {
                 }
               }
             ) : null,
-            u.map((C, S) => /* @__PURE__ */ jsxs(React.Fragment, { children: [
-              x ? /* @__PURE__ */ jsx(SchemaComponent, { name: C.name, schema: C, distributed: !0 }) : /* @__PURE__ */ jsx(MemorizedRecursionField, { name: C.name, schema: C }),
+            u.map((f, C) => /* @__PURE__ */ jsxs(React.Fragment, { children: [
+              h ? /* @__PURE__ */ jsx(SchemaComponent, { name: f.name, schema: f, distributed: !0 }) : /* @__PURE__ */ jsx(MemorizedRecursionField, { name: f.name, schema: f }),
               o ? /* @__PURE__ */ jsx(
                 RowDivider,
                 {
                   rows: u,
-                  index: S,
-                  id: `${c}_${S + 1}`,
+                  index: C,
+                  id: `${c}_${C + 1}`,
                   data: {
                     breakRemoveOn: breakRemoveOnGrid,
                     wrapSchema: wrapRowSchema,
                     insertAdjacent: "afterEnd",
-                    schema: C
+                    schema: f
                   }
                 }
               ) : null
-            ] }, S))
+            ] }, C))
           ] }),
-          a()
+          a({
+            style: {
+              marginBottom: m.marginLG
+            }
+          })
         ] }) })
       }
     ) }) });
@@ -11931,7 +12013,7 @@ const DataBlockInitializer = (e) => {
     currentText: S,
     otherText: b
   } = e, { insert: y, setVisible: F } = useSchemaInitializer(), I = useCompile(), { getTemplateSchemaByMode: k } = useSchemaTemplateManager(), A = useCallback(
-    (B) => O(void 0, null, function* () {
+    (B) => V(void 0, null, function* () {
       const { item: T, fromOthersInPopup: D } = B;
       if (f)
         return f(B);
@@ -11956,9 +12038,9 @@ const DataBlockInitializer = (e) => {
     onClick: A,
     currentText: S,
     otherText: b
-  }), M = useGetSchemaInitializerMenuItems(A), N = useMemo(() => M(w, i), [M, w, i]), [E, z] = useState([]), V = useMenuSearch({ data: N, openKeys: E, hideSearch: u }), R = useMemo(() => {
-    let B = V.filter((T) => T.key !== "search" && T.key !== "empty");
-    return p && B.length === 1 ? B = B[0].children : B = V, [
+  }), M = useGetSchemaInitializerMenuItems(A), N = useMemo(() => M(w, i), [M, w, i]), [E, z] = useState([]), O = useMenuSearch({ data: N, openKeys: E, hideSearch: u }), R = useMemo(() => {
+    let B = O.filter((T) => T.key !== "search" && T.key !== "empty");
+    return p && B.length === 1 ? B = B[0].children : B = O, [
       {
         key: i,
         label: I(a),
@@ -11969,7 +12051,7 @@ const DataBlockInitializer = (e) => {
         children: B
       }
     ];
-  }, [V, p, i, I, a, r, A, e]);
+  }, [O, p, i, I, a, r, A, e]);
   return N.length > 1 || N.length === 1 && ((j = N[0].children) == null ? void 0 : j.length) > 0 ? /* @__PURE__ */ jsx(
     SchemaInitializerMenu,
     {
@@ -12069,7 +12151,7 @@ const DataBlockInitializer = (e) => {
     v(g({}, a), {
       icon: /* @__PURE__ */ jsx(TableOutlined, {}),
       componentType: "Table",
-      onCreateBlockSchema: (c) => O(void 0, null, function* () {
+      onCreateBlockSchema: (c) => V(void 0, null, function* () {
         if (n)
           return n(c);
         l(c);
@@ -12331,7 +12413,7 @@ function FormDialog(e, t, o, n) {
             var S;
             ((S = l == null ? void 0 : l.onCancel) == null ? void 0 : S.call(l, C)) !== !1 && (h == null || h());
           },
-          onOk: (C) => O(this, null, function* () {
+          onOk: (C) => V(this, null, function* () {
             var S;
             ((S = l == null ? void 0 : l.onOk) == null ? void 0 : S.call(l, C)) !== !1 && (m == null || m());
           }),
@@ -12345,8 +12427,8 @@ function FormDialog(e, t, o, n) {
     forOpen: (p) => (isFn(p) && r.openMiddlewares.push(p), d),
     forConfirm: (p) => (isFn(p) && r.confirmMiddlewares.push(p), d),
     forCancel: (p) => (isFn(p) && r.cancelMiddlewares.push(p), d),
-    open: (p) => O(this, null, function* () {
-      return r.promise || (r.promise = new Promise((m, h) => O(this, null, function* () {
+    open: (p) => V(this, null, function* () {
+      return r.promise || (r.promise = new Promise((m, h) => V(this, null, function* () {
         try {
           p = yield loading(l.loadingText, () => applyMiddleware(p, r.openMiddlewares)), r.form = r.form || createForm(p);
         } catch (x) {
@@ -12357,7 +12439,7 @@ function FormDialog(e, t, o, n) {
             !0,
             () => {
               var x;
-              (x = r.form) == null || x.submit(() => O(this, null, function* () {
+              (x = r.form) == null || x.submit(() => V(this, null, function* () {
                 yield applyMiddleware(r.form, r.confirmMiddlewares), untracked(() => {
                   var f;
                   m(g({}, (f = r.form) == null ? void 0 : f.values));
@@ -12365,7 +12447,7 @@ function FormDialog(e, t, o, n) {
               })).catch(() => {
               });
             },
-            () => O(this, null, function* () {
+            () => V(this, null, function* () {
               yield loading(l.loadingText, () => applyMiddleware(r.form, r.cancelMiddlewares)), d.close();
             })
           )
@@ -12436,7 +12518,7 @@ const useGetAriaLabelOfBlockItem = (e) => {
   const o = useLocation(), [n, r] = React.useState(!1), i = useAPIClient();
   return {
     loading: n,
-    download: () => O(void 0, null, function* () {
+    download: () => V(void 0, null, function* () {
       r(!0);
       try {
         const a = yield i.request({
@@ -13004,7 +13086,7 @@ const useParseDefaultValue = () => {
   useEffect(() => {
     if (t.default == null || a || l || isSubMode(t) || !(r != null && r.isNew) && !i)
       return;
-    const f = (...b) => O(void 0, [...b], function* ({ forceUpdate: S = !1 } = {}) {
+    const f = (...b) => V(void 0, [...b], function* ({ forceUpdate: S = !1 } = {}) {
       if (o && e && (isVariable(t.default) && e.value == null || e.value === t.default || S)) {
         isVariable(e.value) && (yield e.reset({ forceClear: !0 })), e.loading = !0;
         const y = !t.name.toString().includes(".") && d(t.name), F = transformVariableValue(yield o.parseVariable(t.default, n), {
@@ -13335,7 +13417,7 @@ const SchemaTemplateManagerProvider = (e) => {
     templates: o,
     refresh: t,
     getTemplateSchemaByMode(i) {
-      return O(this, null, function* () {
+      return V(this, null, function* () {
         const { mode: a, template: l } = i;
         if (a === "copy") {
           const { data: c } = yield n.request({
@@ -13353,7 +13435,7 @@ const SchemaTemplateManagerProvider = (e) => {
       });
     },
     copyTemplateSchema(i) {
-      return O(this, null, function* () {
+      return V(this, null, function* () {
         const { data: a } = yield n.request({
           url: `/uiSchemas:getJsonSchema/${i.uid}?includeAsyncNode=true`
         }), l = (a == null ? void 0 : a.data) || {};
@@ -13361,7 +13443,7 @@ const SchemaTemplateManagerProvider = (e) => {
       });
     },
     saveAsTemplate(i) {
-      return O(this, null, function* () {
+      return V(this, null, function* () {
         const { uid: a } = i, l = uid();
         return yield n.resource("uiSchemas").saveAsTemplate({
           filterByTk: a,
@@ -13413,7 +13495,7 @@ const SchemaTemplateManagerProvider = (e) => {
   return r.loading ? o() : /* @__PURE__ */ jsx(
     SchemaTemplateManagerProvider,
     {
-      refresh: () => O(void 0, null, function* () {
+      refresh: () => V(void 0, null, function* () {
         const { data: a } = yield t.request(n);
         r.mutate(a);
       }),
@@ -13424,7 +13506,7 @@ const SchemaTemplateManagerProvider = (e) => {
 };
 class RemoteSchemaTemplateManagerPlugin extends Plugin {
   load() {
-    return O(this, null, function* () {
+    return V(this, null, function* () {
       this.addRoutes(), this.addComponents();
     });
   }
@@ -13458,11 +13540,11 @@ function SchemaSettingsTemplate(e) {
     SchemaSettingsItem,
     {
       title: "Convert reference to duplicate",
-      onClick: () => O(this, null, function* () {
+      onClick: () => V(this, null, function* () {
         const b = yield C(d), y = x.removeWithoutEmit();
         x.insertAfterEnd(b, {
           onSuccess() {
-            return O(this, null, function* () {
+            return V(this, null, function* () {
               yield h.request({
                 url: `/uiSchemas:remove/${y["x-uid"]}`
               });
@@ -13476,7 +13558,7 @@ function SchemaSettingsTemplate(e) {
     SchemaSettingsItem,
     {
       title: "Save as template",
-      onClick: () => O(this, null, function* () {
+      onClick: () => V(this, null, function* () {
         u(!1);
         const b = o && l(o), y = yield FormDialog(
           a("Save as template"),
@@ -13829,8 +13911,8 @@ const findOption$1 = (e = [], t) => {
   targetFieldSchema: i,
   record: a
 }) => {
-  var A;
-  const l = (A = a == null ? void 0 : a.__parent) == null ? void 0 : A.__collectionName, { currentUserSettings: c } = useCurrentUserVariable({
+  var M;
+  const l = (M = a == null ? void 0 : a.__parent) == null ? void 0 : M.__collectionName, { currentUserSettings: c } = useCurrentUserVariable({
     maxDepth: 3,
     uiSchema: o,
     collectionField: e,
@@ -13862,13 +13944,18 @@ const findOption$1 = (e = [], t) => {
     collectionField: e,
     noDisabled: r,
     targetFieldSchema: i
-  }), { currentParentRecordSettings: y, shouldDisplayCurrentParentRecord: F } = useCurrentParentRecordVariable({
+  }), { settings: y, shouldDisplayParentPopupRecord: F } = useParentPopupVariable({
+    schema: o,
+    collectionField: e,
+    noDisabled: r,
+    targetFieldSchema: i
+  }), { currentParentRecordSettings: I, shouldDisplayCurrentParentRecord: k } = useCurrentParentRecordVariable({
     schema: o,
     collectionName: l,
     collectionField: e,
     noDisabled: r,
     targetFieldSchema: i
-  }), { urlSearchParamsSettings: I, shouldDisplay: k } = useURLSearchParamsVariable();
+  }), { urlSearchParamsSettings: A, shouldDisplay: w } = useURLSearchParamsVariable();
   return useMemo(() => [
     c,
     u,
@@ -13876,9 +13963,10 @@ const findOption$1 = (e = [], t) => {
     m && p,
     x && h,
     C && f,
-    F && y,
+    k && I,
     b && S,
-    k && I
+    F && y,
+    w && A
   ].filter(Boolean), [
     c,
     u,
@@ -13889,12 +13977,12 @@ const findOption$1 = (e = [], t) => {
     h,
     C,
     f,
-    F,
-    y,
+    k,
+    I,
     b,
     S,
-    k,
-    I
+    w,
+    A
   ]);
 }, VariableInput = (e) => {
   const {
@@ -13931,7 +14019,7 @@ const findOption$1 = (e = [], t) => {
     (A, w) => {
       if (!u)
         return o(A);
-      setTimeout(() => O(void 0, null, function* () {
+      setTimeout(() => V(void 0, null, function* () {
         (yield u(A, w)) && o(A);
       }));
     },
@@ -13960,7 +14048,7 @@ const findOption$1 = (e = [], t) => {
   getAllCollectionsInheritChain: n
 }) => {
   const r = e ? n(e.target) : [];
-  return (i, a) => O(void 0, null, function* () {
+  return (i, a) => V(void 0, null, function* () {
     if (_.isString(i) && i.includes("$nRole") || !isVariable(i) || !t || !e || e.interface === "json")
       return !0;
     const l = a[a.length - 1];
@@ -14133,12 +14221,12 @@ const useHookDefault = (e) => e, createSelectSchemaSettingsItem = (e) => {
   return {
     name: t,
     type: "select",
+    useVisible: a,
     useComponentProps() {
       const u = useFieldSchema(), { deepMerge: d } = useDesignable$1(), p = r(n), m = c(l), h = useCompile$1(), { t: x } = useTranslation();
       return {
         title: typeof o == "function" ? o(x) : h(o),
         options: p,
-        useVisible: a,
         value: _.get(u, i, m),
         onChange(f) {
           d(getNewSchema({ fieldSchema: u, schemaKey: i, value: f }));
@@ -14186,11 +14274,11 @@ function createModalSettingsItem(e) {
   return {
     name: t,
     type: "actionModal",
+    useVisible: a,
     useComponentProps() {
       const u = useFieldSchema(), { deepMerge: d } = useDesignable$1(), p = c(l), m = _.get(u, o), h = useCompile$1(), { t: x } = useTranslation();
       return {
         title: typeof i == "function" ? i(x) : h(i),
-        useVisible: a,
         schema: r(g(g({}, p), m)),
         onSubmit(f) {
           d(getNewSchema({ fieldSchema: u, schemaKey: o, value: f, valueKeys: n }));
@@ -14254,7 +14342,7 @@ const tableBlockSettings = new SchemaSettings({
         return {
           title: r("Enable drag and drop sorting"),
           checked: t.decoratorProps.dragSort,
-          onChange: (u) => O(void 0, null, function* () {
+          onChange: (u) => V(void 0, null, function* () {
             var d, p, m;
             if (u && l) {
               const { data: h } = yield c.resource("collections.fields", l.collectionName).update({
@@ -14482,7 +14570,7 @@ const SchemaSettingsDefaultValue = function e(t) {
       return !(G != null && G.length) && L && (L.children = formatVariableScop(b())), q;
     },
     [b, I]
-  ), V = useMemo(() => ({
+  ), O = useMemo(() => ({
     ArrayCollapse: ArrayCollapse$2,
     FormLayout,
     VariableInput: (q) => /* @__PURE__ */ jsx(FlagProvider, { isInSubForm: y, isInSubTable: F, isInSetDefaultValueDialog: !0, children: /* @__PURE__ */ jsx(VariableInput, g({}, q)) })
@@ -14566,7 +14654,7 @@ const SchemaSettingsDefaultValue = function e(t) {
     SchemaSettingsModalItem,
     {
       title: a("Set default value"),
-      components: V,
+      components: O,
       width: 800,
       schema: R,
       onSubmit: j
@@ -15036,7 +15124,7 @@ const InternalTableBlockProvider = (e) => {
       o.field.data = ((b = o == null ? void 0 : o.field) == null ? void 0 : b.data) || {}, o.field.data.selectedRowKeys = S, (F = (y = o == null ? void 0 : o.field) == null ? void 0 : y.onRowSelect) == null || F.call(y, S);
     }, []),
     onRowDragEnd: useCallback(
-      (y) => O(void 0, [y], function* ({ from: S, to: b }) {
+      (y) => V(void 0, [y], function* ({ from: S, to: b }) {
         yield o.resource.move({
           sourceId: S[o.rowKey || "id"],
           targetId: b[o.rowKey || "id"],
@@ -15062,11 +15150,11 @@ const InternalTableBlockProvider = (e) => {
         }
         const A = [S[o.rowKey]];
         k.forEach((w) => {
-          var V, R, j;
+          var O, R, j;
           const M = F.find((B) => B.uid === w.uid);
           if (!M)
             return;
-          const N = ((V = w.service.params) == null ? void 0 : V[0]) || {}, E = ((j = (R = w.service.params) == null ? void 0 : R[1]) == null ? void 0 : j.filters) || {};
+          const N = ((O = w.service.params) == null ? void 0 : O[0]) || {}, E = ((j = (R = w.service.params) == null ? void 0 : R[1]) == null ? void 0 : j.filters) || {};
           if (y.includes(S[o.rowKey])) {
             if (w.dataLoadingMode === "manual")
               return w.clearData();
@@ -15199,7 +15287,7 @@ class TableFieldResource {
     this.field = t.field, this.api = t.api, this.sourceId = t.sourceId, this.resource = this.api.resource(t.resource, this.sourceId);
   }
   list(t) {
-    return O(this, null, function* () {
+    return V(this, null, function* () {
       if (this.field.data = this.field.data || {}, this.field.data.changed)
         return console.log("list.dataSource", this.field.data.dataSource), {
           data: {
@@ -15221,7 +15309,7 @@ class TableFieldResource {
     });
   }
   get(t) {
-    return O(this, null, function* () {
+    return V(this, null, function* () {
       console.log("get", t);
       const { filterByTk: o } = t;
       return {
@@ -15232,21 +15320,21 @@ class TableFieldResource {
     });
   }
   create(t) {
-    return O(this, null, function* () {
+    return V(this, null, function* () {
       console.log("create", t);
       const { values: o } = t;
       this.field.data.dataSource.push(o), this.field.data.changed = !0;
     });
   }
   update(t) {
-    return O(this, null, function* () {
+    return V(this, null, function* () {
       console.log("update", t);
       const { filterByTk: o, values: n } = t;
       this.field.data.dataSource[o] = n, this.field.data.changed = !0;
     });
   }
   destroy(t) {
-    return O(this, null, function* () {
+    return V(this, null, function* () {
       console.log("destroy", t);
       let { filterByTk: o } = t;
       Array.isArray(o) || (o = [o]), this.field.data.dataSource = this.field.data.dataSource.filter((n, r) => !o.includes(r)), this.field.data.changed = !0;
@@ -15401,10 +15489,10 @@ const useTableSelectorParams = () => useContext(TableSelectorParamsContext), Tab
   var a, l, c, u, d, p, m, h, x, f, C, S, b, y, F, I;
   const e = useField(), t = useTableSelectorContext(), o = useFieldSchema(), { getCollectionJoinField: n } = useCollectionManager_deprecated(), r = recursiveParent$1(o, "CollectionField"), i = n(r == null ? void 0 : r["x-collection-field"]);
   return useEffect(() => {
-    var A, w, M, N, E, z, V, R, j, B, T, D, $, q, L;
+    var A, w, M, N, E, z, O, R, j, B, T, D, $, q, L;
     if (!((A = t == null ? void 0 : t.service) != null && A.loading)) {
       const G = (M = (w = t == null ? void 0 : t.service) == null ? void 0 : w.data) == null ? void 0 : M.data.map((U) => _.omit(U, i == null ? void 0 : i.foreignKey));
-      e.value = G, (N = e == null ? void 0 : e.setInitialValue) == null || N.call(e, G), e.data = e.data || {}, e.data.selectedRowKeys = (z = (E = t == null ? void 0 : t.field) == null ? void 0 : E.data) == null ? void 0 : z.selectedRowKeys, e.componentProps.pagination = e.componentProps.pagination || {}, e.componentProps.pagination.pageSize = (j = (R = (V = t == null ? void 0 : t.service) == null ? void 0 : V.data) == null ? void 0 : R.meta) == null ? void 0 : j.pageSize, e.componentProps.pagination.total = (D = (T = (B = t == null ? void 0 : t.service) == null ? void 0 : B.data) == null ? void 0 : T.meta) == null ? void 0 : D.count, e.componentProps.pagination.current = (L = (q = ($ = t == null ? void 0 : t.service) == null ? void 0 : $.data) == null ? void 0 : q.meta) == null ? void 0 : L.page;
+      e.value = G, (N = e == null ? void 0 : e.setInitialValue) == null || N.call(e, G), e.data = e.data || {}, e.data.selectedRowKeys = (z = (E = t == null ? void 0 : t.field) == null ? void 0 : E.data) == null ? void 0 : z.selectedRowKeys, e.componentProps.pagination = e.componentProps.pagination || {}, e.componentProps.pagination.pageSize = (j = (R = (O = t == null ? void 0 : t.service) == null ? void 0 : O.data) == null ? void 0 : R.meta) == null ? void 0 : j.pageSize, e.componentProps.pagination.total = (D = (T = (B = t == null ? void 0 : t.service) == null ? void 0 : B.data) == null ? void 0 : T.meta) == null ? void 0 : D.count, e.componentProps.pagination.current = (L = (q = ($ = t == null ? void 0 : t.service) == null ? void 0 : $.data) == null ? void 0 : q.meta) == null ? void 0 : L.page;
     }
   }, [
     i == null ? void 0 : i.foreignKey,
@@ -15426,7 +15514,7 @@ const useTableSelectorParams = () => useContext(TableSelectorParamsContext), Tab
       t.field.data = ((M = t == null ? void 0 : t.field) == null ? void 0 : M.data) || {}, t.field.data.selectedRowKeys = A;
     },
     onRowDragEnd(M) {
-      return O(this, arguments, function* ({ from: A, to: w }) {
+      return V(this, arguments, function* ({ from: A, to: w }) {
         yield t.resource.move({
           sourceId: A[t.rowKey || "id"],
           targetId: w[t.rowKey || "id"]
@@ -15484,7 +15572,7 @@ const useTableSelectorParams = () => useContext(TableSelectorParamsContext), Tab
 );
 class BlockSchemaComponentPlugin extends Plugin {
   load() {
-    return O(this, null, function* () {
+    return V(this, null, function* () {
       this.addComponents(), this.addScopes();
     });
   }
@@ -15540,7 +15628,7 @@ const useUpdateSchemaTemplateActionProps = () => {
   const e = useUpdateActionProps(), { __parent: t } = useBlockRequestContext();
   return {
     onClick() {
-      return O(this, null, function* () {
+      return V(this, null, function* () {
         var n, r;
         yield e.onClick(), (r = (n = t == null ? void 0 : t.service) == null ? void 0 : n.refresh) == null || r.call(n);
       });
@@ -15550,7 +15638,7 @@ const useUpdateSchemaTemplateActionProps = () => {
   const e = useBulkDestroyActionProps(), t = useSchemaTemplateManager(), { service: o } = useBlockRequestContext();
   return {
     onClick() {
-      return O(this, null, function* () {
+      return V(this, null, function* () {
         var r;
         yield e.onClick(), yield t.refresh(), (r = o == null ? void 0 : o.refresh) == null || r.call(o);
       });
@@ -15560,7 +15648,7 @@ const useUpdateSchemaTemplateActionProps = () => {
   const e = useDestroyActionProps(), { service: t } = useBlockRequestContext(), o = useSchemaTemplateManager();
   return {
     onClick() {
-      return O(this, null, function* () {
+      return V(this, null, function* () {
         var r;
         yield e.onClick(), yield o.refresh(), (r = t == null ? void 0 : t.refresh) == null || r.call(t);
       });
@@ -17083,9 +17171,9 @@ const useStyles$h = createStyles(() => ({
     return {
       insertPosition: "afterEnd",
       wrap: ((z = b == null ? void 0 : b.cols) == null ? void 0 : z.length) > 1 ? void 0 : gridRowColWrap,
-      Component: (V) => /* @__PURE__ */ jsx(
+      Component: (O) => /* @__PURE__ */ jsx(
         PlusOutlined,
-        v(g({}, V), {
+        v(g({}, O), {
           role: "button",
           "aria-label": x("schema-initializer"),
           style: { cursor: "pointer", fontSize: 14 }
@@ -17123,7 +17211,7 @@ const useStyles$h = createStyles(() => ({
     ] }) })
   ] }) })) : null;
 }, InternalSchemaToolbar = (e) => {
-  var V;
+  var O;
   const t = useFieldSchema(), {
     title: o,
     initializer: n,
@@ -17158,7 +17246,7 @@ const useStyles$h = createStyles(() => ({
         })
       )
     };
-  }, [m, (V = k == null ? void 0 : k.cols) == null ? void 0 : V.length]), M = useMemo(() => l === !1 ? null : /* @__PURE__ */ jsx(DragHandler, { children: /* @__PURE__ */ jsx(DragOutlined, { role: "button", "aria-label": m("drag-handler") }) }), [l, m]), N = useMemo(() => {
+  }, [m, (O = k == null ? void 0 : k.cols) == null ? void 0 : O.length]), M = useMemo(() => l === !1 ? null : /* @__PURE__ */ jsx(DragHandler, { children: /* @__PURE__ */ jsx(DragOutlined, { role: "button", "aria-label": m("drag-handler") }) }), [l, m]), N = useMemo(() => {
     var R;
     if (n === !1)
       return null;
@@ -17253,7 +17341,7 @@ const useCollectMenuItem = () => useContext(GetMenuItemContext) || {}, useCollec
   return { Component: n, getMenuItems: r, getMenuItem: i, clean: a };
 }, useA = () => ({
   run() {
-    return O(this, null, function* () {
+    return V(this, null, function* () {
     });
   }
 }), useActionContext = () => {
@@ -17270,7 +17358,7 @@ const useCollectMenuItem = () => useContext(GetMenuItemContext) || {}, useCollec
             title: t("Unsaved changes"),
             content: t("Are you sure you don't want to save?"),
             onOk() {
-              return O(this, null, function* () {
+              return V(this, null, function* () {
                 var c;
                 e.setFormValueChanged(!1), (c = e.setVisible) == null || c.call(e, !1);
               });
@@ -17284,7 +17372,7 @@ const useCollectMenuItem = () => useContext(GetMenuItemContext) || {}, useCollec
   const { setVisible: e } = useContext(ActionContext), t = useForm();
   return {
     run() {
-      return O(this, null, function* () {
+      return V(this, null, function* () {
         e(!1), t.submit((n) => {
           console.log(n);
         });
@@ -17841,7 +17929,7 @@ const EnableChildCollections = withDynamicSchemaProps(
           d.dataSource = m, d.loading = !1, d.initialValue && (d.disabled = !0);
         })
       );
-    }, c = (u) => O(void 0, null, function* () {
+    }, c = (u) => V(void 0, null, function* () {
       var p, m;
       const { childrenCollections: d } = ((p = n.values) == null ? void 0 : p.enableChildren) || {};
       return (m = a.filter((h) => !d.find((x) => x.collection === h.name) || u.initialValue || h.name === u.value)) == null ? void 0 : m.map((h) => ({
@@ -18689,7 +18777,7 @@ const SchemaSettingsProvider = (e) => {
     SchemaSettingsItem,
     {
       title: "Convert reference to duplicate",
-      onClick: () => O(this, null, function* () {
+      onClick: () => V(this, null, function* () {
         const S = yield f(p), b = findBlockTemplateSchema(m), y = createDesignable({
           t: a,
           api: h,
@@ -18698,7 +18786,7 @@ const SchemaSettingsProvider = (e) => {
         });
         y.loadAPIClientEvents(), y.removeWithoutEmit(b), y.insertAdjacent(o, S, {
           onSuccess() {
-            return O(this, null, function* () {
+            return V(this, null, function* () {
               yield h.request({
                 url: `/uiSchemas:remove/${b["x-uid"]}`
               });
@@ -18719,7 +18807,7 @@ const SchemaSettingsProvider = (e) => {
     SchemaSettingsItem,
     {
       title: "Save as block template",
-      onClick: () => O(this, null, function* () {
+      onClick: () => V(this, null, function* () {
         d(!1);
         const S = r && c(r), b = findGridSchema(m), y = yield FormDialog(
           a("Save as template"),
@@ -18833,7 +18921,7 @@ const SchemaSettingsProvider = (e) => {
           content: a("Are you sure you want to delete it?")
         }, t), {
           onOk() {
-            return O(this, null, function* () {
+            return V(this, null, function* () {
               var C;
               const f = {
                 removeParentsIfNoChildren: o,
@@ -18920,9 +19008,9 @@ const SchemaSettingsProvider = (e) => {
   }, [JSON.stringify(n || {})]);
   const A = useCallback(() => {
     m(!1), k.reset();
-  }, [k]), w = useCallback(() => O(void 0, null, function* () {
+  }, [k]), w = useCallback(() => V(void 0, null, function* () {
     yield k.submit(), o == null || o(cloneDeep$1(k.values)), m(!1);
-  }), [k, o]), M = useCallback(() => O(void 0, null, function* () {
+  }), [k, o]), M = useCallback(() => V(void 0, null, function* () {
     !h && (i != null && i["x-uid"]) && (C["x-action-settings"].schemaUid = i["x-uid"], b.emit("patch", { schema: C }), yield F.resource("uiSchemas").insert({ values: i }), x(i["x-uid"])), typeof r == "function" && (r == null || r()), S.setVisible(!1), m(!0);
   }), [F, S, b, C, i, h]), N = useCallback((z) => z.stopPropagation(), []);
   return /* @__PURE__ */ jsxs(Fragment, { children: [
@@ -18964,7 +19052,7 @@ const SchemaSettingsProvider = (e) => {
 });
 SchemaSettingsActionModalItem.displayName = "SchemaSettingsActionModalItem";
 const SchemaSettingsModalItem = (e) => {
-  const V = e, {
+  const R = e, {
     hidden: t,
     title: o,
     components: n,
@@ -18975,7 +19063,7 @@ const SchemaSettingsModalItem = (e) => {
     initialValues: c,
     width: u = "fit-content",
     noRecord: d = !1
-  } = V, p = H(V, [
+  } = R, p = H(R, [
     "hidden",
     "title",
     "components",
@@ -18986,23 +19074,25 @@ const SchemaSettingsModalItem = (e) => {
     "initialValues",
     "width",
     "noRecord"
-  ]), m = useContext(SchemaOptionsContext), h = useCollection_deprecated(), x = useAPIClient(), f = useApp(), { theme: C } = useGlobalTheme(), S = useBlockRequestContext(), b = useFormActiveFields(), { locale: y } = useContext(ConfigProvider.ConfigContext), F = useDataSourceManager(), I = useDataSourceKey(), k = useCollectionRecord(), { association: A } = useDataBlockProps() || {}, w = useFormBlockContext(), M = useBlockContext(), { formValue: N, collection: E } = useSubFormValue(), z = useVariable("$nPopupRecord");
+  ]), m = useContext(SchemaOptionsContext), h = useCollection_deprecated(), x = useAPIClient(), f = useApp(), { theme: C } = useGlobalTheme(), S = useBlockRequestContext(), b = useFormActiveFields(), { locale: y } = useContext(ConfigProvider.ConfigContext), F = useDataSourceManager(), I = useDataSourceKey(), k = useCollectionRecord(), { association: A } = useDataBlockProps() || {}, w = useFormBlockContext(), M = useBlockContext(), { formValue: N, collection: E } = useSubFormValue(), z = useCurrentPopupRecord(), O = useParentPopupRecord();
   return t ? null : /* @__PURE__ */ jsx(
     SchemaSettingsItem,
     v(g({
       title: o
     }, p), {
-      onClick: () => O(void 0, null, function* () {
-        const R = l ? yield l() : c, j = _.isFunction(e.schema) ? e.schema() : e.schema;
+      onClick: () => V(void 0, null, function* () {
+        const j = l ? yield l() : c, B = _.isFunction(e.schema) ? e.schema() : e.schema;
         FormDialog(
-          { title: j.title || o, width: u },
+          { title: B.title || o, width: u },
           () => /* @__PURE__ */ jsx(BlockContext.Provider, { value: M, children: /* @__PURE__ */ jsx(
-            DeclareVariable,
+            VariablePopupRecordProvider,
             {
-              name: "$nPopupRecord",
-              title: z.title,
-              value: z.value,
-              collection: z.collection,
+              recordData: z == null ? void 0 : z.value,
+              collection: z == null ? void 0 : z.collection,
+              parent: {
+                recordData: O == null ? void 0 : O.value,
+                collection: O == null ? void 0 : O.collection
+              },
               children: /* @__PURE__ */ jsx(CollectionRecordProvider, { record: d ? null : k, children: /* @__PURE__ */ jsx(FormBlockContext$1.Provider, { value: w, children: /* @__PURE__ */ jsx(SubFormProvider, { value: { value: N, collection: E }, children: /* @__PURE__ */ jsx(
                 FormActiveFieldsProvider,
                 {
@@ -19029,7 +19119,7 @@ const SchemaSettingsModalItem = (e) => {
                                           min-width: 320px;
                                         }
                                       `,
-                          children: /* @__PURE__ */ jsx(ApplicationContext.Provider, { value: f, children: /* @__PURE__ */ jsx(APIClientProvider, { apiClient: x, children: /* @__PURE__ */ jsx(ConfigProvider, { locale: y, children: /* @__PURE__ */ jsx(SchemaComponent, { components: n, scope: r, schema: j }) }) }) })
+                          children: /* @__PURE__ */ jsx(ApplicationContext.Provider, { value: f, children: /* @__PURE__ */ jsx(APIClientProvider, { apiClient: x, children: /* @__PURE__ */ jsx(ConfigProvider, { locale: y, children: /* @__PURE__ */ jsx(SchemaComponent, { components: n, scope: r, schema: B }) }) }) })
                         }
                       ) })
                     }
@@ -19040,10 +19130,10 @@ const SchemaSettingsModalItem = (e) => {
           ) }),
           C
         ).open({
-          initialValues: R,
+          initialValues: j,
           effects: i
-        }).then((B) => (a(B), B)).catch((B) => {
-          console.error(B);
+        }).then((T) => (a(T), T)).catch((T) => {
+          console.error(T);
         });
       }),
       children: e.children || e.title
@@ -19056,7 +19146,7 @@ const SchemaSettingsModalItem = (e) => {
   } : {
     field: h,
     direction: "asc"
-  }), p = useSortFields(t.name || c), m = (x) => O(this, [x], function* ({ sort: h }) {
+  }), p = useSortFields(t.name || c), m = (x) => V(this, [x], function* ({ sort: h }) {
     var C;
     if (t != null && t.onSubmit)
       return t.onSubmit({ sort: h });
@@ -19928,7 +20018,11 @@ const useFilterableFields = (e) => {
       "&.reset": {
         "&.nb-action-popup": {
           ".ant-drawer-header": { display: "none" },
-          ".ant-drawer-body": { paddingTop: e.paddingContentVerticalLG, backgroundColor: e.colorBgLayout }
+          ".ant-drawer-body": {
+            paddingTop: e.paddingContentVerticalLG,
+            backgroundColor: e.colorBgLayout,
+            paddingBottom: 0
+          }
         },
         "&.nb-record-picker-selector": {
           ".ant-drawer-wrapper-body": {
@@ -19960,11 +20054,11 @@ const useFilterableFields = (e) => {
         paddingRight: e.paddingLG - e.paddingPageHorizontal,
         marginLeft: e.paddingPageHorizontal - e.paddingLG,
         marginRight: e.paddingPageHorizontal - e.paddingLG
-      },
-      ".ant-tabs-content-holder": {
-        padding: `${e.paddingPopupVertical}px ${e.paddingPopupHorizontal}px`,
-        margin: `-${e.size}px -${e.paddingLG}px -${e.paddingLG}px`
       }
+      // '.ant-tabs-content-holder': {
+      //   padding: `${token.paddingPopupVertical}px ${token.paddingPopupHorizontal}px 0`,
+      //   margin: `-${token.paddingPopupVertical}px -${token.paddingPopupHorizontal}px`,
+      // },
     }
   };
 }), useGetAriaLabelOfDrawer = () => {
@@ -20064,6 +20158,7 @@ const useGetAriaLabelOfModal = () => {
               .ant-modal-content {
                 background: var(--nb-box-bg);
                 border: 1px solid rgba(255, 255, 255, 0.1);
+                padding-bottom: 0;
               }
 
               // 这里的样式是为了保证页面 tabs 标签下面的分割线和页面内容对齐（页面内边距可以通过主题编辑器调节）
@@ -20074,11 +20169,6 @@ const useGetAriaLabelOfModal = () => {
                 margin-right: ${p.paddingPageHorizontal - p.paddingLG}px;
               }
 
-              .ant-tabs-content-holder {
-                padding: ${p.paddingPopupVertical}px ${p.paddingPopupHorizontal}px;
-                margin: -${p.size}px -${p.paddingLG}px -${p.paddingLG}px;
-              }
-
               .ant-modal-footer {
                 display: ${h ? "block" : "none"};
               }
@@ -20616,7 +20706,7 @@ const createSubmitActionSettings = new SchemaSettings({
       "x-validator": validateJSON$1
     }
   }
-}, linkageAction = (i) => O(void 0, [i], function* ({
+}, linkageAction = (i) => V(void 0, [i], function* ({
   operator: e,
   field: t,
   condition: o,
@@ -21375,8 +21465,8 @@ const ActionLink = withDynamicSchemaProps(
   };
 }, handleError = (e) => console.log(e), Action = withDynamicSchemaProps(
   observer$1((e) => {
-    var ge, xe, fe, Z, te;
-    const he = useProps(e), {
+    var me, he, ge, xe, ee;
+    const pe = useProps(e), {
       popover: t,
       confirm: o,
       openMode: n,
@@ -21395,7 +21485,7 @@ const ActionLink = withDynamicSchemaProps(
       addChild: C,
       onMouseEnter: S,
       refreshDataBlockRequest: b
-    } = he, y = H(he, [
+    } = pe, y = H(pe, [
       "popover",
       "confirm",
       "openMode",
@@ -21415,75 +21505,75 @@ const ActionLink = withDynamicSchemaProps(
       "addChild",
       "onMouseEnter",
       "refreshDataBlockRequest"
-    ]), F = useACLActionParamsContext(), { wrapSSR: I, componentCls: k, hashId: A } = useStyles$d(), { t: w } = useTranslation(), [M, N] = useState(!1), [E, z] = useState(!1), V = useDesigner(), R = useField(), { run: j, element: B, disabled: T } = a(f), D = useFieldSchema(), $ = useCompile(), q = useForm(), L = useCollectionRecordData(), G = useCollectionParentRecordData(), U = useCollection(), K = D["x-toolbar-props"] || D["x-designer-props"], Y = (ge = D == null ? void 0 : D["x-component-props"]) == null ? void 0 : ge.openMode, W = (xe = D == null ? void 0 : D["x-component-props"]) == null ? void 0 : xe.openSize, X = (fe = D == null ? void 0 : D["x-component-props"]) == null ? void 0 : fe.refreshDataBlockRequest, Q = q.disabled || R.disabled || ((Z = R.data) == null ? void 0 : Z.disabled) || x || T, J = useMemo(() => (D == null ? void 0 : D["x-linkage-rules"]) || [], [D == null ? void 0 : D["x-linkage-rules"]]), { designable: oe } = useDesignable(), ne = useComponent(i) || i, { modal: re } = App.useApp(), ie = useVariables(), le = useLocalVariables({ currentForm: { values: L } }), { getAriaLabel: Pe } = useGetAriaLabelOfAction(u), ce = useDataBlockRequest(), de = useMemo(() => {
-      const ee = u || $(D.title);
-      return _.isString(ee) ? w(ee) : ee;
+    ]), F = useACLActionParamsContext(), { wrapSSR: I, componentCls: k, hashId: A } = useStyles$d(), { t: w } = useTranslation(), [M, N] = useState(!1), [E, z] = useState(!1), O = useDesigner(), R = useField(), { run: j, element: B, disabled: T } = a(f), D = useFieldSchema(), $ = useCompile(), q = useForm(), L = useCollectionRecordData(), G = useCollectionParentRecordData(), U = D["x-toolbar-props"] || D["x-designer-props"], K = (me = D == null ? void 0 : D["x-component-props"]) == null ? void 0 : me.openMode, Y = (he = D == null ? void 0 : D["x-component-props"]) == null ? void 0 : he.openSize, W = (ge = D == null ? void 0 : D["x-component-props"]) == null ? void 0 : ge.refreshDataBlockRequest, X = q.disabled || R.disabled || ((xe = R.data) == null ? void 0 : xe.disabled) || x || T, Q = useMemo(() => (D == null ? void 0 : D["x-linkage-rules"]) || [], [D == null ? void 0 : D["x-linkage-rules"]]), { designable: J } = useDesignable(), te = useComponent(i) || i, { modal: oe } = App.useApp(), re = useVariables(), se = useLocalVariables({ currentForm: { values: L } }), { getAriaLabel: ae } = useGetAriaLabelOfAction(u), ce = useDataBlockRequest(), ue = useMemo(() => {
+      const Z = u || $(D.title);
+      return _.isString(Z) ? w(Z) : Z;
     }, [u, D.title, w]);
     useEffect(() => {
-      R.stateOfLinkageRules && setInitialActionState(R), R.stateOfLinkageRules = {}, J.filter((ee) => !ee.disabled).forEach((ee) => {
-        var se;
-        (se = ee.actions) == null || se.forEach((ae) => {
+      R.stateOfLinkageRules && setInitialActionState(R), R.stateOfLinkageRules = {}, Q.filter((Z) => !Z.disabled).forEach((Z) => {
+        var ne;
+        (ne = Z.actions) == null || ne.forEach((ie) => {
           linkageAction({
-            operator: ae.operator,
+            operator: ie.operator,
             field: R,
-            condition: ee.condition,
-            variables: ie,
-            localVariables: le
+            condition: Z.condition,
+            variables: re,
+            localVariables: se
           });
         });
       });
-    }, [R, J, le, ie]);
-    const Ie = useCallback(
-      (ee, se = !0) => {
-        if (!(se && isPortalInBody(ee.target)) && (ee.preventDefault(), ee.stopPropagation(), !Q && F)) {
-          const ae = () => {
-            d ? d(ee, () => {
-              var ue;
-              X !== !1 && ((ue = ce == null ? void 0 : ce.refresh) == null || ue.call(ce));
+    }, [R, Q, se, re]);
+    const Pe = useCallback(
+      (Z, ne = !0) => {
+        if (!(ne && isPortalInBody(Z.target)) && (Z.preventDefault(), Z.stopPropagation(), !X && F)) {
+          const ie = () => {
+            d ? d(Z, () => {
+              var le;
+              W !== !1 && ((le = ce == null ? void 0 : ce.refresh) == null || le.call(ce));
             }) : (N(!0), j());
           };
-          o != null && o.content ? re.confirm({
-            title: w(o.title, { title: de }),
-            content: w(o.content, { title: de }),
-            onOk: ae
-          }) : ae();
+          o != null && o.content ? oe.confirm({
+            title: w(o.title, { title: ue }),
+            content: w(o.content, { title: ue }),
+            onOk: ie
+          }) : ie();
         }
       },
-      [o, Q, re, d, j]
-    ), be = useMemo(() => {
-      var ee;
+      [o, X, oe, d, j]
+    ), Ie = useMemo(() => {
+      var Z;
       return v(g({}, p), {
-        opacity: oe && (((ee = R == null ? void 0 : R.data) == null ? void 0 : ee.hidden) || !F) && 0.1
+        opacity: J && (((Z = R == null ? void 0 : R.data) == null ? void 0 : Z.hidden) || !F) && 0.1
       });
-    }, [oe, (te = R == null ? void 0 : R.data) == null ? void 0 : te.hidden, p]), Ae = useCallback(
-      (ee) => {
-        S == null || S(ee);
+    }, [J, (ee = R == null ? void 0 : R.data) == null ? void 0 : ee.hidden, p]), Se = useCallback(
+      (Z) => {
+        S == null || S(Z);
       },
       [S]
-    ), pe = () => {
-      var ee, se;
-      return !oe && ((ee = R == null ? void 0 : R.data) != null && ee.hidden || !F) ? null : /* @__PURE__ */ jsxs(
+    ), be = () => {
+      var Z, ne;
+      return !J && ((Z = R == null ? void 0 : R.data) != null && Z.hidden || !F) ? null : /* @__PURE__ */ jsxs(
         SortableItem,
         v(g({
           role: "button",
-          "aria-label": Pe()
+          "aria-label": ae()
         }, y), {
-          onMouseEnter: Ae,
-          loading: ((se = R == null ? void 0 : R.data) == null ? void 0 : se.loading) || m,
+          onMouseEnter: Se,
+          loading: ((ne = R == null ? void 0 : R.data) == null ? void 0 : ne.loading) || m,
           icon: typeof c == "string" ? /* @__PURE__ */ jsx(Icon, { type: c }) : c,
-          disabled: Q,
-          style: be,
-          onClick: Ie,
-          component: ne || Button,
+          disabled: X,
+          style: Ie,
+          onClick: Pe,
+          component: te || Button,
           className: cls(k, A, l, "nb-action"),
           type: e.type === "danger" ? void 0 : e.type,
           children: [
-            de,
-            /* @__PURE__ */ jsx(V, g({}, K))
+            ue,
+            /* @__PURE__ */ jsx(O, g({}, U))
           ]
         })
       );
-    }, ye = pe(), me = /* @__PURE__ */ jsxs(
+    }, ye = be(), de = /* @__PURE__ */ jsxs(
       ActionContextProvider,
       {
         button: ye,
@@ -21491,23 +21581,14 @@ const ActionLink = withDynamicSchemaProps(
         setVisible: N,
         formValueChanged: E,
         setFormValueChanged: z,
-        openMode: Y,
-        openSize: W,
+        openMode: K,
+        openSize: Y,
         containerRefKey: r,
         fieldSchema: D,
         children: [
           t && /* @__PURE__ */ jsx(RecursionField, { basePath: R.address, onlyRenderProperties: !0, schema: D }),
-          !t && pe(),
-          /* @__PURE__ */ jsx(
-            DeclareVariable,
-            {
-              name: "$nPopupRecord",
-              title: w("Current popup record"),
-              value: L,
-              collection: U,
-              children: !t && e.children
-            }
-          ),
+          !t && be(),
+          /* @__PURE__ */ jsx(VariablePopupRecordProvider, { children: !t && e.children }),
           B
         ]
       }
@@ -21515,8 +21596,8 @@ const ActionLink = withDynamicSchemaProps(
     return I(
       C ? (
         // fix https://nocobase.height.app/T-3966
-        /* @__PURE__ */ jsx(RecordProvider, { record: null, parent: G, children: /* @__PURE__ */ jsx(TreeRecordProvider, { parent: L, children: me }) })
-      ) : me
+        /* @__PURE__ */ jsx(RecordProvider, { record: null, parent: G, children: /* @__PURE__ */ jsx(TreeRecordProvider, { parent: L, children: de }) })
+      ) : de
     );
   }),
   { displayName: "Action" }
@@ -21569,34 +21650,36 @@ const Action$1 = Action, ActionBarContext = React.createContext({
   return /* @__PURE__ */ jsx(Fragment, { children: o && n.includes(t.parent["x-component"]) ? createPortal(e.children, o) : e.children });
 }, ActionBar = withDynamicSchemaProps(
   observer$1((e) => {
-    var m;
-    const { forceProps: t = {} } = useActionBarContext(), { token: o } = theme.useToken(), p = g(g({}, useProps(e)), t), { layout: n = "two-columns", style: r, spaceProps: i } = p, a = H(p, ["layout", "style", "spaceProps"]), l = useFieldSchema(), { render: c } = useSchemaInitializerRender(l["x-initializer"], l["x-initializer-props"]), { designable: u } = useDesignable();
-    if (n === "one-column")
+    var p;
+    const { forceProps: t = {} } = useActionBarContext();
+    theme.useToken();
+    const d = g(g({}, useProps(e)), t), { layout: o = "two-columns", style: n, spaceProps: r } = d, i = H(d, ["layout", "style", "spaceProps"]), a = useFieldSchema(), { render: l } = useSchemaInitializerRender(a["x-initializer"], a["x-initializer-props"]), { designable: c } = useDesignable();
+    if (o === "one-column")
       return /* @__PURE__ */ jsx(Portal, { children: /* @__PURE__ */ jsx(DndContext, { children: /* @__PURE__ */ jsxs(
         "div",
         v(g({
-          style: v(g({ display: "flex", alignItems: "center", gap: 8 }, r), { marginTop: o.marginLG })
-        }, a), {
-          className: cx(a.className, "nb-action-bar"),
+          style: v(g({ display: "flex", alignItems: "center", gap: 8 }, n), { marginTop: 0 })
+        }, i), {
+          className: cx(i.className, "nb-action-bar"),
           children: [
-            e.children && /* @__PURE__ */ jsx("div", { children: /* @__PURE__ */ jsx(Space$1, v(g({}, i), { style: { flexWrap: "wrap" }, children: l.mapProperties((h, x) => /* @__PURE__ */ jsx(RecursionField, { name: x, schema: h }, x)) })) }),
-            c({ style: { margin: "0 !important" } })
+            e.children && /* @__PURE__ */ jsx("div", { children: /* @__PURE__ */ jsx(Space$1, v(g({}, r), { style: { flexWrap: "wrap" }, children: a.mapProperties((m, h) => /* @__PURE__ */ jsx(RecursionField, { name: h, schema: m }, h)) })) }),
+            l({ style: { margin: "0 !important" } })
           ]
         })
       ) }) });
-    const d = Object.keys((m = l.properties) != null ? m : {}).length > 0;
+    const u = Object.keys((p = a.properties) != null ? p : {}).length > 0;
     return /* @__PURE__ */ jsxs(
       "div",
       v(g({
-        style: !u && !d ? void 0 : g({
+        style: !c && !u ? void 0 : g({
           display: "flex",
           justifyContent: "space-between",
           alignItems: "center",
           overflowX: "auto",
           flexShrink: 0
-        }, r)
-      }, a), {
-        className: cx(a.className, "nb-action-bar"),
+        }, n)
+      }, i), {
+        className: cx(i.className, "nb-action-bar"),
         children: [
           /* @__PURE__ */ jsx(
             "div",
@@ -21610,12 +21693,12 @@ const Action$1 = Action, ActionBarContext = React.createContext({
                 flexWrap: "wrap"
               },
               children: /* @__PURE__ */ jsxs(DndContext, { children: [
-                /* @__PURE__ */ jsx(Space$1, v(g({}, i), { children: l.mapProperties((h, x) => h["x-align"] !== "left" ? null : /* @__PURE__ */ jsx(RecursionField, { name: x, schema: h }, x)) })),
-                /* @__PURE__ */ jsx(Space$1, v(g({}, i), { style: { flexWrap: "wrap" }, children: l.mapProperties((h, x) => h["x-align"] === "left" ? null : /* @__PURE__ */ jsx(RecursionField, { name: x, schema: h }, x)) }))
+                /* @__PURE__ */ jsx(Space$1, v(g({}, r), { children: a.mapProperties((m, h) => m["x-align"] !== "left" ? null : /* @__PURE__ */ jsx(RecursionField, { name: h, schema: m }, h)) })),
+                /* @__PURE__ */ jsx(Space$1, v(g({}, r), { style: { flexWrap: "wrap" }, children: a.mapProperties((m, h) => m["x-align"] === "left" ? null : /* @__PURE__ */ jsx(RecursionField, { name: h, schema: m }, h)) }))
               ] })
             }
           ),
-          c()
+          l()
         ]
       })
     );
@@ -21703,7 +21786,7 @@ const FilterAction = withDynamicSchemaProps(
                 /* @__PURE__ */ jsx(
                   Button,
                   {
-                    onClick: () => O(void 0, null, function* () {
+                    onClick: () => V(void 0, null, function* () {
                       yield c.reset(), p == null || p(c.values), o.title = t("Filter"), r(!1);
                     }),
                     children: t("Reset")
@@ -21772,17 +21855,18 @@ const DynamicComponent = (e) => {
       });
     }
   }), [JSON.stringify(e.value), e.schema]), i = useCallback(() => {
-    var a;
+    var l;
+    const a = merge(((l = e == null ? void 0 : e.schema) == null ? void 0 : l["x-component-props"]) || {}, e.componentProps || {});
     return /* @__PURE__ */ jsx(FieldContext.Provider, { value: null, children: /* @__PURE__ */ jsx(
       SchemaComponent,
       {
         schema: v(g({
           "x-component": "Input"
         }, e.schema), {
-          "x-component-props": merge(((a = e == null ? void 0 : e.schema) == null ? void 0 : a["x-component-props"]) || {}, {
-            style: {
+          "x-component-props": merge(a, {
+            style: g({
               minWidth: 150
-            }
+            }, e.style)
           }),
           name: "value",
           "x-read-pretty": !1,
@@ -21799,7 +21883,7 @@ const DynamicComponent = (e) => {
     onChange: e == null ? void 0 : e.onChange,
     renderSchemaComponent: i
   }) : i() });
-}, FilterItem = observer$1(
+}, FilterDynamicComponent = DynamicComponent, FilterItem = observer$1(
   (e) => {
     const { t } = useTranslation(), o = useCompile(), n = useContext(RemoveConditionContext), {
       schema: r,
@@ -22167,8 +22251,8 @@ const useGetFilterOptions = () => {
     };
   });
 }, TableColumnDesigner$1 = (e) => {
-  var N, E, z, V, R, j, B, T, D, $, q, L;
-  const { uiSchema: t, fieldSchema: o, collectionField: n } = e, { form: r } = useFormBlockContext(), { getInterface: i, getCollection: a } = useCollectionManager_deprecated(), l = useField(), { t: c } = useTranslation(), u = useFieldSchema(), { dn: d } = useDesignable(), p = ((N = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : N.fieldNames) || ((E = t == null ? void 0 : t["x-component-props"]) == null ? void 0 : E.fieldNames), m = useLabelFields$1((z = n == null ? void 0 : n.target) != null ? z : n == null ? void 0 : n.targetCollection), h = useColorFields((V = n == null ? void 0 : n.target) != null ? V : n == null ? void 0 : n.targetCollection), x = i(n == null ? void 0 : n.interface), f = a(n == null ? void 0 : n.target), C = isFileCollection$1(f), S = ["QuickEdit", "FormItem"].includes(o["x-decorator"]), { currentMode: b } = useAssociationFieldContext(), { isAllowToSetDefaultValue: y } = useIsAllowToSetDefaultValue({ collectionField: n, fieldSchema: o }), F = ["datetime", "createdAt", "updatedAt"].includes(n == null ? void 0 : n.interface), I = ["obo", "oho", "o2o", "o2m", "m2m", "m2o", "snapshot"].includes(
+  var N, E, z, O, R, j, B, T, D, $, q, L;
+  const { uiSchema: t, fieldSchema: o, collectionField: n } = e, { form: r } = useFormBlockContext(), { getInterface: i, getCollection: a } = useCollectionManager_deprecated(), l = useField(), { t: c } = useTranslation(), u = useFieldSchema(), { dn: d } = useDesignable(), p = ((N = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : N.fieldNames) || ((E = t == null ? void 0 : t["x-component-props"]) == null ? void 0 : E.fieldNames), m = useLabelFields$1((z = n == null ? void 0 : n.target) != null ? z : n == null ? void 0 : n.targetCollection), h = useColorFields((O = n == null ? void 0 : n.target) != null ? O : n == null ? void 0 : n.targetCollection), x = i(n == null ? void 0 : n.interface), f = a(n == null ? void 0 : n.target), C = isFileCollection$1(f), S = ["QuickEdit", "FormItem"].includes(o["x-decorator"]), { currentMode: b } = useAssociationFieldContext(), { isAllowToSetDefaultValue: y } = useIsAllowToSetDefaultValue({ collectionField: n, fieldSchema: o }), F = ["datetime", "createdAt", "updatedAt"].includes(n == null ? void 0 : n.interface), I = ["obo", "oho", "o2o", "o2m", "m2m", "m2o", "snapshot"].includes(
     n == null ? void 0 : n.interface
   ), k = useFieldModeOptions({ fieldSchema: o }), A = ((R = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : R.mode) || "Select";
   let w = "editable";
@@ -22303,8 +22387,8 @@ const useGetFilterOptions = () => {
           });
           _.set(o, "x-component-props.fieldNames", U);
           const K = (J = l.path) == null ? void 0 : J.splice(((Q = l.path) == null ? void 0 : Q.length) - 1, 1);
-          l.form.query(`${K.concat("*." + o.name)}`).forEach((oe) => {
-            oe.componentProps.fieldNames = U;
+          l.form.query(`${K.concat("*." + o.name)}`).forEach((te) => {
+            te.componentProps.fieldNames = U;
           }), d.emit("patch", {
             schema: {
               "x-uid": o["x-uid"],
@@ -23191,7 +23275,7 @@ const useCurrentUserContext = () => useContext(CurrentUserContext), useCurrentRo
         },
         options: t,
         defaultValue: e.auth.role,
-        onChange: (r) => O(void 0, null, function* () {
+        onChange: (r) => V(void 0, null, function* () {
           e.auth.setRole(r), yield e.resource("users").setDefaultRole({ values: { roleName: r } }), location.reload(), window.location.reload();
         })
       }
@@ -23210,7 +23294,7 @@ const useCurrentUserContext = () => useContext(CurrentUserContext), useCurrentRo
     };
   }, [(o = e == null ? void 0 : e.data) == null ? void 0 : o.email, (n = e == null ? void 0 : e.data) == null ? void 0 : n.nickname, (r = e == null ? void 0 : e.data) == null ? void 0 : r.username, e == null ? void 0 : e.data.version, t.colorTextDescription]);
 }, SettingsMenu$1 = (e) => {
-  const { addMenuItem: t, getMenuItems: o } = useCurrentUserSettingsMenu(), { redirectUrl: n = "" } = e, { allowAll: r, snippets: i } = useACLRoleContext(), a = r || (i == null ? void 0 : i.includes("app")), l = useNavigate(), c = useAPIClient(), { t: u } = useTranslation(), d = useAPIClient(), p = useCallback(() => O(void 0, null, function* () {
+  const { addMenuItem: t, getMenuItems: o } = useCurrentUserSettingsMenu(), { redirectUrl: n = "" } = e, { allowAll: r, snippets: i } = useACLRoleContext(), a = r || (i == null ? void 0 : i.includes("app")), l = useNavigate(), c = useAPIClient(), { t: u } = useTranslation(), d = useAPIClient(), p = useCallback(() => V(void 0, null, function* () {
     return yield new Promise((y) => {
       const F = setInterval(() => {
         d.silent().resource("app").getInfo().then((I) => ((I == null ? void 0 : I.status) === 200 && (y("ok"), clearInterval(F)), I)).catch((I) => {
@@ -23222,14 +23306,14 @@ const useCurrentUserContext = () => useContext(CurrentUserContext), useCurrentRo
     {
       key: "cache",
       label: u("Clear cache"),
-      onClick: () => O(void 0, null, function* () {
+      onClick: () => V(void 0, null, function* () {
         yield c.resource("app").clearCache(), window.location.reload();
       })
     },
     {
       key: "reboot",
       label: u("Restart application"),
-      onClick: () => O(void 0, null, function* () {
+      onClick: () => V(void 0, null, function* () {
         S.confirm({
           title: u("Restart application"),
           // content: t('The will interrupt service, it may take a few seconds to restart. Are you sure to continue?'),
@@ -23237,7 +23321,7 @@ const useCurrentUserContext = () => useContext(CurrentUserContext), useCurrentRo
           okButtonProps: {
             danger: !0
           },
-          onOk: () => O(void 0, null, function* () {
+          onOk: () => V(void 0, null, function* () {
             yield c.resource("app").restart();
           })
         });
@@ -23270,7 +23354,7 @@ const useCurrentUserContext = () => useContext(CurrentUserContext), useCurrentRo
       {
         key: "signout",
         label: u("Sign out"),
-        onClick: () => O(void 0, null, function* () {
+        onClick: () => V(void 0, null, function* () {
           yield c.auth.signOut(), l(`/signin?redirect=${encodeURIComponent(n)}`);
         })
       }
@@ -23385,7 +23469,7 @@ function getFormValues({
 }
 function useCollectValuesToSubmit() {
   const e = useForm(), t = useFilterByTk(), { field: o, resource: n } = useBlockRequestContext(), { fields: r, getField: i, getTreeParentField: a, name: l } = useCollection_deprecated(), c = r.map((f) => f.name), { fieldSchema: u } = useActionContext(), { getActiveFieldsName: d } = useFormActiveFields() || {}, p = useVariables(), m = useLocalVariables({ currentForm: e }), h = useFieldSchema(), x = useTreeParentRecord();
-  return useCallback(() => O(this, null, function* () {
+  return useCallback(() => V(this, null, function* () {
     var I, k, A, w;
     const { assignedValues: f = {}, overwriteValues: C } = (I = h == null ? void 0 : h["x-action-settings"]) != null ? I : {}, S = getFormValues({
       filterByTk: t,
@@ -23395,7 +23479,7 @@ function useCollectValuesToSubmit() {
       getField: i,
       resource: n,
       actionFields: (d == null ? void 0 : d("form")) || []
-    }), b = {}, y = Object.keys(f).map((M) => O(this, null, function* () {
+    }), b = {}, y = Object.keys(f).map((M) => V(this, null, function* () {
       const N = f[M], E = i(M);
       if (isVariable(N)) {
         const z = yield p == null ? void 0 : p.parseVariable(N, m);
@@ -23430,7 +23514,7 @@ const useCreateActionProps = () => {
   const e = useFilterByTk(), t = useCollectionRecord(), o = useForm(), { field: n, resource: r } = useBlockRequestContext(), { setVisible: i, setSubmitted: a, setFormValueChanged: l } = useActionContext(), c = useNavigate(), u = useFieldSchema(), d = useField(), p = useCompile(), { modal: m } = App.useApp(), { t: h } = useTranslation(), { updateAssociationValues: x } = useFormBlockContext(), f = useCollectValuesToSubmit(), C = t.isNew ? d.componentProps.saveMode || "create" : "update", S = ((b = d.componentProps.filterKeys) == null ? void 0 : b.checked) || [];
   return {
     onClick() {
-      return O(this, null, function* () {
+      return V(this, null, function* () {
         var w;
         const { onSuccess: F, skipValidator: I, triggerWorkflows: k } = (w = u == null ? void 0 : u["x-action-settings"]) != null ? w : {};
         I || (yield o.submit());
@@ -23451,7 +23535,7 @@ const useCreateActionProps = () => {
           }
           F != null && F.manualClose ? m.success({
             title: p(F == null ? void 0 : F.successMessage),
-            onOk: () => O(this, null, function* () {
+            onOk: () => V(this, null, function* () {
               yield resetFormCorrectly(o), F != null && F.redirecting && (F != null && F.redirectTo) && (isURL(F.redirectTo) ? window.location.href = F.redirectTo : c(F.redirectTo));
             })
           }) : (message.success(p(F == null ? void 0 : F.successMessage)), yield resetFormCorrectly(o), F != null && F.redirecting && (F != null && F.redirectTo) && (isURL(F.redirectTo) ? window.location.href = F.redirectTo : c(F.redirectTo)));
@@ -23466,7 +23550,7 @@ const useCreateActionProps = () => {
   const e = useForm(), { field: t, resource: o, __parent: n } = useBlockRequestContext(), { setVisible: r, fieldSchema: i, setSubmitted: a } = useActionContext(), l = useFieldSchema(), c = useField(), { fields: u, getField: d, getTreeParentField: p, name: m } = useCollection_deprecated(), h = useCompile(), x = useFilterByTk(), f = useRecord(), C = useVariables(), S = useLocalVariables({ currentForm: e }), { getActiveFieldsName: b } = useFormActiveFields() || {}, y = c.componentProps.saveMode || "create", F = ((I = c.componentProps.filterKeys) == null ? void 0 : I.checked) || [];
   return {
     onClick() {
-      return O(this, null, function* () {
+      return V(this, null, function* () {
         var T, D, $, q, L, G;
         const A = u.map((U) => U.name), {
           assignedValues: w = {},
@@ -23474,7 +23558,7 @@ const useCreateActionProps = () => {
           overwriteValues: N,
           skipValidator: E,
           triggerWorkflows: z
-        } = (T = l == null ? void 0 : l["x-action-settings"]) != null ? T : {}, V = (D = i == null ? void 0 : i["x-component-props"]) == null ? void 0 : D.addChild, R = {}, j = Object.keys(w).map((U) => O(this, null, function* () {
+        } = (T = l == null ? void 0 : l["x-action-settings"]) != null ? T : {}, O = (D = i == null ? void 0 : i["x-component-props"]) == null ? void 0 : D.addChild, R = {}, j = Object.keys(w).map((U) => V(this, null, function* () {
           const K = w[U], Y = d(U);
           if (isVariable(K)) {
             const W = yield C == null ? void 0 : C.parseVariable(K, S);
@@ -23492,7 +23576,7 @@ const useCreateActionProps = () => {
           resource: o,
           actionFields: (b == null ? void 0 : b("form")) || []
         });
-        if (V) {
+        if (O) {
           const U = p();
           B[($ = U == null ? void 0 : U.name) != null ? $ : "parent"] = f, B[(q = U == null ? void 0 : U.foreignKey) != null ? q : "parentId"] = f.id;
         }
@@ -23533,10 +23617,10 @@ const useCreateActionProps = () => {
   }
 }, useDoFilter = () => {
   const e = useForm(), { getDataBlocks: t } = useFilterBlock(), { getCollectionJoinField: o } = useCollectionManager_deprecated(), { getOperators: n } = useOperators(), r = useFieldSchema(), { name: i } = useCollection(), { targets: a = [], uid: l } = useMemo(() => findFilterTargets(r), [r]), c = useCallback(() => removeNullCondition(transformToFilter(e.values, n(), o, i)), [e.values, o, n, i]), u = useCallback(
-    (...p) => O(void 0, [...p], function* ({ doNothingWhenFilterIsEmpty: d = !1 } = {}) {
+    (...p) => V(void 0, [...p], function* ({ doNothingWhenFilterIsEmpty: d = !1 } = {}) {
       try {
         yield Promise.all(
-          t().map((m) => O(void 0, null, function* () {
+          t().map((m) => V(void 0, null, function* () {
             var S, b, y;
             if (!a.find((F) => F.uid === m.uid))
               return;
@@ -23578,7 +23662,7 @@ const useCreateActionProps = () => {
   const { doFilter: e } = useDoFilter(), t = useField();
   return t.data = t.data || {}, {
     onClick() {
-      return O(this, null, function* () {
+      return V(this, null, function* () {
         t.data.loading = !0, yield e(), t.data.loading = !1;
       });
     }
@@ -23586,7 +23670,7 @@ const useCreateActionProps = () => {
 }, useDoReset = () => {
   const e = useForm(), t = useFieldSchema(), { getDataBlocks: o } = useFilterBlock(), { targets: n, uid: r } = findFilterTargets(t), { doFilter: i, getFilterFromCurrentForm: a } = useDoFilter();
   return {
-    doReset: () => O(void 0, null, function* () {
+    doReset: () => V(void 0, null, function* () {
       if (yield e.reset(), _.isEmpty(a()))
         return doReset({ getDataBlocks: o, targets: n, uid: r });
       yield i();
@@ -23596,7 +23680,7 @@ const useCreateActionProps = () => {
   const e = useField(), { doReset: t } = useDoReset();
   return e.data = e.data || {}, {
     onClick() {
-      return O(this, null, function* () {
+      return V(this, null, function* () {
         e.data.loading = !0, yield t(), e.data.loading = !1;
       });
     }
@@ -23605,14 +23689,14 @@ const useCreateActionProps = () => {
   const { resource: e, __parent: t, service: o } = useBlockRequestContext(), n = useFilterByTk(), r = useFieldSchema(), i = useNavigate(), a = useCompile(), l = useForm(), { modal: c } = App.useApp(), u = useVariables(), d = useLocalVariables({ currentForm: l }), { name: p, getField: m } = useCollection_deprecated();
   return {
     onClick(x, f) {
-      return O(this, null, function* () {
+      return V(this, null, function* () {
         var k, A, w;
         const {
           assignedValues: C = {},
           onSuccess: S,
           skipValidator: b,
           triggerWorkflows: y
-        } = (k = r == null ? void 0 : r["x-action-settings"]) != null ? k : {}, F = {}, I = Object.keys(C).map((M) => O(this, null, function* () {
+        } = (k = r == null ? void 0 : r["x-action-settings"]) != null ? k : {}, F = {}, I = Object.keys(C).map((M) => V(this, null, function* () {
           const N = C[M], E = m(M);
           if (isVariable(N)) {
             const z = yield u == null ? void 0 : u.parseVariable(N, d);
@@ -23627,7 +23711,7 @@ const useCreateActionProps = () => {
           triggerWorkflows: y != null && y.length ? y.map((M) => [M.workflowKey, M.context].filter(Boolean).join("!")).join(",") : void 0
         }), f && (f == null || f()), e instanceof TableFieldResource || (w = (A = t == null ? void 0 : t.service) == null ? void 0 : A.refresh) == null || w.call(A), S != null && S.successMessage && (S != null && S.manualClose ? c.success({
           title: a(S == null ? void 0 : S.successMessage),
-          onOk: () => O(this, null, function* () {
+          onOk: () => V(this, null, function* () {
             S != null && S.redirecting && (S != null && S.redirectTo) && (isURL(S.redirectTo) ? window.location.href = S.redirectTo : i(S.redirectTo));
           })
         }) : (message.success(a(S == null ? void 0 : S.successMessage)), S != null && S.redirecting && (S != null && S.redirectTo) && (isURL(S.redirectTo) ? window.location.href = S.redirectTo : i(S.redirectTo))));
@@ -23641,7 +23725,7 @@ const useCreateActionProps = () => {
   const { name: f, getField: C } = useCollection_deprecated(), S = useLocalVariables();
   return {
     onClick() {
-      return O(this, null, function* () {
+      return V(this, null, function* () {
         var z;
         const {
           assignedValues: A = {},
@@ -23649,7 +23733,7 @@ const useCreateActionProps = () => {
           updateMode: M
         } = (z = i == null ? void 0 : i["x-action-settings"]) != null ? z : {};
         m.data = e.data || {}, m.data.loading = !0;
-        const N = {}, E = Object.keys(A).map((R) => O(this, null, function* () {
+        const N = {}, E = Object.keys(A).map((R) => V(this, null, function* () {
           const j = A[R], B = C(R);
           if (isVariable(j)) {
             const T = yield x == null ? void 0 : x.parseVariable(j, S);
@@ -23661,7 +23745,7 @@ const useCreateActionProps = () => {
           title: p("Bulk update"),
           content: p(M === "selected" ? "Update selected data?" : "Update all data?"),
           onOk() {
-            return O(this, null, function* () {
+            return V(this, null, function* () {
               var B, T, D, $;
               const { filter: R } = (T = (B = n.params) == null ? void 0 : B[0]) != null ? T : {}, j = {
                 values: g({}, N),
@@ -23684,14 +23768,14 @@ const useCreateActionProps = () => {
               }
               t instanceof TableFieldResource || ($ = (D = o == null ? void 0 : o.service) == null ? void 0 : D.refresh) == null || $.call(D), w != null && w.successMessage && (w != null && w.manualClose ? h.success({
                 title: d(w == null ? void 0 : w.successMessage),
-                onOk: () => O(this, null, function* () {
+                onOk: () => V(this, null, function* () {
                   w != null && w.redirecting && (w != null && w.redirectTo) && (isURL(w.redirectTo) ? window.location.href = w.redirectTo : u(w.redirectTo));
                 })
               }) : (message.success(d(w == null ? void 0 : w.successMessage)), w != null && w.redirecting && (w != null && w.redirectTo) && (isURL(w.redirectTo) ? window.location.href = w.redirectTo : u(w.redirectTo))));
             });
           },
           onCancel() {
-            return O(this, null, function* () {
+            return V(this, null, function* () {
               m.data.loading = !1;
             });
           }
@@ -23704,7 +23788,7 @@ const useCreateActionProps = () => {
   const e = useAPIClient(), t = useNavigate(), o = useFilterByTk(), n = useFieldSchema(), r = useCompile(), i = useForm(), { fields: a, getField: l } = useCollection_deprecated(), { field: c, resource: u, __parent: d, service: p } = useBlockRequestContext(), m = useRecord(), h = useCurrentUserContext(), x = (y = h == null ? void 0 : h.data) == null ? void 0 : y.data, f = useField(), { setVisible: C } = useActionContext(), { modal: S } = App.useApp(), { getActiveFieldsName: b } = useFormActiveFields() || {};
   return {
     onClick() {
-      return O(this, null, function* () {
+      return V(this, null, function* () {
         var R, j, B, T;
         const { skipValidator: I, onSuccess: k, requestSettings: A } = (R = n == null ? void 0 : n["x-action-settings"]) != null ? R : {}, w = n == null ? void 0 : n["x-action"];
         if (!A.url)
@@ -23723,7 +23807,7 @@ const useCreateActionProps = () => {
           });
           Object.assign(E, $);
         }
-        const V = {
+        const O = {
           url: renderTemplate(A.url, { currentRecord: m, currentUser: x }),
           method: A.method,
           headers: parse(M)({ currentRecord: m, currentUser: x }),
@@ -23732,11 +23816,11 @@ const useCreateActionProps = () => {
         };
         f.data = c.data || {}, f.data.loading = !0;
         try {
-          if (yield e.request(g({}, V)), f.data.loading = !1, u instanceof TableFieldResource || (B = (j = d == null ? void 0 : d.service) == null ? void 0 : j.refresh) == null || B.call(j), (T = p == null ? void 0 : p.refresh) == null || T.call(p), w === "customize:form:request" && (C == null || C(!1)), !(k != null && k.successMessage))
+          if (yield e.request(g({}, O)), f.data.loading = !1, u instanceof TableFieldResource || (B = (j = d == null ? void 0 : d.service) == null ? void 0 : j.refresh) == null || B.call(j), (T = p == null ? void 0 : p.refresh) == null || T.call(p), w === "customize:form:request" && (C == null || C(!1)), !(k != null && k.successMessage))
             return;
           k != null && k.manualClose ? S.success({
             title: r(k == null ? void 0 : k.successMessage),
-            onOk: () => O(this, null, function* () {
+            onOk: () => V(this, null, function* () {
               k != null && k.redirecting && (k != null && k.redirectTo) && (isURL(k.redirectTo) ? window.location.href = k.redirectTo : t(k.redirectTo));
             })
           }) : message.success(r(k == null ? void 0 : k.successMessage));
@@ -23750,7 +23834,7 @@ const useCreateActionProps = () => {
   const e = useForm(), t = useFilterByTk(), { field: o, resource: n, __parent: r } = useBlockRequestContext(), { setVisible: i, setSubmitted: a, setFormValueChanged: l } = useActionContext(), c = useFieldSchema(), u = useNavigate(), { fields: d, getField: p, name: m } = useCollection_deprecated(), h = useCompile(), x = useField(), { updateAssociationValues: f } = useFormBlockContext(), { modal: C } = App.useApp(), S = useParamsFromRecord(), b = useVariables(), y = useLocalVariables({ currentForm: e }), { getActiveFieldsName: F } = useFormActiveFields() || {};
   return {
     onClick() {
-      return O(this, null, function* () {
+      return V(this, null, function* () {
         var j;
         const {
           assignedValues: k = {},
@@ -23758,7 +23842,7 @@ const useCreateActionProps = () => {
           overwriteValues: w,
           skipValidator: M,
           triggerWorkflows: N
-        } = (j = c == null ? void 0 : c["x-action-settings"]) != null ? j : {}, E = {}, z = Object.keys(k).map((B) => O(this, null, function* () {
+        } = (j = c == null ? void 0 : c["x-action-settings"]) != null ? j : {}, E = {}, z = Object.keys(k).map((B) => V(this, null, function* () {
           const T = k[B], D = p(B);
           if (isVariable(T)) {
             const $ = yield b == null ? void 0 : b.parseVariable(T, y);
@@ -23767,11 +23851,11 @@ const useCreateActionProps = () => {
             T != null && T !== "" && (E[B] = T);
         }));
         yield Promise.all(z), M || (yield e.submit());
-        const V = d.map((B) => B.name), R = getFormValues({
+        const O = d.map((B) => B.name), R = getFormValues({
           filterByTk: t,
           field: o,
           form: e,
-          fieldNames: V,
+          fieldNames: O,
           getField: p,
           resource: n,
           actionFields: (F == null ? void 0 : F("form")) || []
@@ -23789,7 +23873,7 @@ const useCreateActionProps = () => {
             return;
           A != null && A.manualClose ? C.success({
             title: h(A == null ? void 0 : A.successMessage),
-            onOk: () => O(this, null, function* () {
+            onOk: () => V(this, null, function* () {
               yield e.reset(), A != null && A.redirecting && (A != null && A.redirectTo) && (isURL(A.redirectTo) ? window.location.href = A.redirectTo : u(A.redirectTo));
             })
           }) : (message.success(h(A == null ? void 0 : A.successMessage)), A != null && A.redirecting && (A != null && A.redirectTo) && (isURL(A.redirectTo) ? window.location.href = A.redirectTo : u(A.redirectTo)));
@@ -23803,7 +23887,7 @@ const useCreateActionProps = () => {
   const e = useFilterByTk(), { resource: t, service: o, block: n, __parent: r } = useBlockRequestContext(), { setVisible: i, setSubmitted: a } = useActionContext(), l = useParamsFromRecord(), c = useFieldSchema();
   return {
     onClick(d, p) {
-      return O(this, null, function* () {
+      return V(this, null, function* () {
         var C, S, b, y, F;
         const { triggerWorkflows: m } = (C = c == null ? void 0 : c["x-action-settings"]) != null ? C : {};
         yield t.destroy(g({
@@ -23822,7 +23906,7 @@ const useCreateActionProps = () => {
   const t = useFilterByTk(), n = useAPIClient().resource(e, t);
   return {
     onClick(i) {
-      return O(this, null, function* () {
+      return V(this, null, function* () {
         yield n.remove({
           values: [i.id]
         });
@@ -23833,7 +23917,7 @@ const useCreateActionProps = () => {
   const e = useFilterByTk(), { resource: t, service: o, block: n, __parent: r } = useBlockRequestContext(), { setVisible: i, setSubmitted: a, setFormValueChanged: l } = useActionContext();
   return {
     onClick(u, d) {
-      return O(this, null, function* () {
+      return V(this, null, function* () {
         var x, f, C, S;
         yield t.remove({
           values: [e]
@@ -23859,7 +23943,7 @@ const useCreateActionProps = () => {
   });
   return {
     onClick() {
-      return O(this, null, function* () {
+      return V(this, null, function* () {
         t();
       });
     }
@@ -23868,7 +23952,7 @@ const useCreateActionProps = () => {
   const { field: e } = useBlockRequestContext(), { resource: t, service: o } = useBlockRequestContext(), { setSubmitted: n } = useActionContext();
   return {
     onClick(i, a) {
-      return O(this, null, function* () {
+      return V(this, null, function* () {
         var u, d, p, m, h, x;
         if (!((d = (u = e == null ? void 0 : e.data) == null ? void 0 : u.selectedRowKeys) != null && d.length))
           return;
@@ -23884,7 +23968,7 @@ const useCreateActionProps = () => {
   const { service: e } = useBlockRequestContext();
   return {
     onClick() {
-      return O(this, null, function* () {
+      return V(this, null, function* () {
         var o;
         (o = e == null ? void 0 : e.refresh) == null || o.call(e);
       });
@@ -23901,7 +23985,7 @@ const useCreateActionProps = () => {
     pageSize: 1,
     showSizeChanger: !1,
     onChange(u) {
-      return O(this, null, function* () {
+      return V(this, null, function* () {
         var p, m;
         const d = (m = (p = e.service) == null ? void 0 : p.params) == null ? void 0 : m[0];
         e.service.run(v(g({}, d), { page: u }));
@@ -24017,7 +24101,7 @@ const useCreateActionProps = () => {
         var B, T, D;
         if (!w.find(($) => $.uid === N.uid))
           return;
-        const z = `${M}${t.name}`, V = ((B = N.service.params) == null ? void 0 : B[0]) || {}, R = ((D = (T = N.service.params) == null ? void 0 : T[1]) == null ? void 0 : D.filters) || {};
+        const z = `${M}${t.name}`, O = ((B = N.service.params) == null ? void 0 : B[0]) || {}, R = ((D = (T = N.service.params) == null ? void 0 : T[1]) == null ? void 0 : D.filters) || {};
         if (A.length)
           R[z] = {
             [C]: A
@@ -24029,7 +24113,7 @@ const useCreateActionProps = () => {
         }
         const j = mergeFilter([...Object.values(R), N.defaultFilter]);
         return N.doFilter(
-          v(g({}, V), {
+          v(g({}, O), {
             page: 1,
             filter: j
           }),
@@ -24045,14 +24129,14 @@ const useCreateActionProps = () => {
   };
 };
 function doReset(n) {
-  return O(this, arguments, function* ({
+  return V(this, arguments, function* ({
     getDataBlocks: e,
     targets: t,
     uid: o
   }) {
     try {
       yield Promise.all(
-        e().map((r) => O(this, null, function* () {
+        e().map((r) => V(this, null, function* () {
           var u, d, p;
           if (!t.find((m) => m.uid === r.uid))
             return;
@@ -24148,7 +24232,7 @@ function getTargetField(e) {
   return o.slice(0, n);
 }
 function resetFormCorrectly(e) {
-  return O(this, null, function* () {
+  return V(this, null, function* () {
     untracked(() => {
       Object.keys(e.fields).forEach((t) => {
         isSubMode(e.fields[t]) && (e.fields[t].initialValue = null);
@@ -24165,7 +24249,7 @@ function useLinkActionProps() {
   return {
     type: "default",
     onClick() {
-      return O(this, null, function* () {
+      return V(this, null, function* () {
         if (!n) {
           message.warning(o("Please configure the URL"));
           return;
@@ -24182,7 +24266,7 @@ function useLinkActionProps() {
   };
 }
 function replaceVariableValue(e, t, o) {
-  return O(this, null, function* () {
+  return V(this, null, function* () {
     if (!e)
       return;
     const { evaluate: n } = evaluators.get("string"), { exp: r, scope: i } = yield replaceVariables(e, {
@@ -24197,14 +24281,14 @@ function replaceVariableValue(e, t, o) {
   });
 }
 function parseVariablesAndChangeParamsToQueryString(r) {
-  return O(this, arguments, function* ({
+  return V(this, arguments, function* ({
     searchParams: e,
     variables: t,
     localVariables: o,
     replaceVariableValue: n
   }) {
     const i = yield Promise.all(
-      e.map((u) => O(this, [u], function* ({ name: l, value: c }) {
+      e.map((u) => V(this, [u], function* ({ name: l, value: c }) {
         if (typeof c == "string") {
           if (isVariable(c)) {
             const p = yield t.parseVariable(c, o);
@@ -24250,17 +24334,17 @@ const useSyncFromForm = (e, t, o) => {
         isLeaf: !0,
         field: N,
         disabled: I
-      }), V = k.find((j) => j.name === z.key);
-      if (["belongsTo", "belongsToMany"].includes(N.type) && (!V || ["Select", "Picker"].includes(V == null ? void 0 : V.fieldMode)))
+      }), O = k.find((j) => j.name === z.key);
+      if (["belongsTo", "belongsToMany"].includes(N.type) && (!O || ["Select", "Picker"].includes(O == null ? void 0 : O.fieldMode)))
         E.type = "reference", z.type = "reference", z.title = React.createElement(TreeNode, v(g({}, E), { type: "reference" })), z.isLeaf = !1, z.children = m(N.target, {
           depth: b + 1,
           maxDepth: y,
           prefix: z.key,
           exclude: systemKeys
         });
-      else if (["hasOne", "hasMany"].includes(N.type) || ["Nester", "SubTable"].includes(V == null ? void 0 : V.fieldMode)) {
+      else if (["hasOne", "hasMany"].includes(N.type) || ["Nester", "SubTable"].includes(O == null ? void 0 : O.fieldMode)) {
         let j = !1;
-        ["hasOne", "hasMany"].includes(N.type) && ["Select", "Picker"].includes(V == null ? void 0 : V.fieldMode) && (j = !0), z.disabled = !0, z.isLeaf = !1, z.children = p(
+        ["hasOne", "hasMany"].includes(N.type) && ["Select", "Picker"].includes(O == null ? void 0 : O.fieldMode) && (j = !0), z.disabled = !0, z.isLeaf = !1, z.children = p(
           N.target,
           {
             depth: b + 1,
@@ -24316,13 +24400,13 @@ const useSyncFromForm = (e, t, o) => {
   }, []);
   return {
     run() {
-      return O(this, null, function* () {
+      return V(this, null, function* () {
         var y;
         const f = /* @__PURE__ */ new Set([]), C = /* @__PURE__ */ new Set([]), S = (F, I) => {
           var k;
           (k = F == null ? void 0 : F.reduceProperties) == null || k.call(F, (A, w) => {
             var j, B, T;
-            const M = A || I, N = w["x-collection-field"] && n(w["x-collection-field"]), E = w.name.includes("."), z = N && ["hasOne", "hasMany", "belongsTo", "belongsToMany"].includes(N.type), V = !z && E ? getAssociationPath(w.name) : w.name, R = M === "" || !M ? V : M + "." + V;
+            const M = A || I, N = w["x-collection-field"] && n(w["x-collection-field"]), E = w.name.includes("."), z = N && ["hasOne", "hasMany", "belongsTo", "belongsToMany"].includes(N.type), O = !z && E ? getAssociationPath(w.name) : w.name, R = M === "" || !M ? O : M + "." + O;
             if (N && !(["hasOne", "hasMany"].includes(N.type) || ["SubForm", "Nester"].includes((j = w["x-component-props"]) == null ? void 0 : j.mode)) && C.add(R), N && (z || E) && w["x-component"] !== "TableField") {
               if (f.add({ name: R, fieldMode: ((B = w["x-component-props"]) == null ? void 0 : B.mode) || "Select" }), ["Nester", "SubTable"].includes((T = w["x-component-props"]) == null ? void 0 : T.mode)) {
                 const D = M && M !== "" ? M + "." + w.name : w.name;
@@ -24488,7 +24572,7 @@ const useSyncFromForm = (e, t, o) => {
     [t, o]
   );
   return { parseFilter: useCallback(
-    (i) => O(void 0, null, function* () {
+    (i) => V(void 0, null, function* () {
       const a = flatten(i, {
         breakOn({ key: c }) {
           return c.startsWith("$") && c !== "$and" && c !== "$or";
@@ -24498,7 +24582,7 @@ const useSyncFromForm = (e, t, o) => {
         }
       });
       return yield Promise.all(
-        Object.keys(a).map((c) => O(void 0, null, function* () {
+        Object.keys(a).map((c) => V(void 0, null, function* () {
           return a[c] = yield a[c], a[c] === void 0 && delete a[c], a[c];
         }))
       ), unflatten$1(a);
@@ -27777,7 +27861,7 @@ const gridCardBlockSettings = new SchemaSettings({
     v(g({}, allowMultiple$3), {
       useVisible() {
         const e = useIsAssociationField(), t = useIsShowMultipleSwitch();
-        return console.log(e, t()), e && t();
+        return e && t();
       }
     }),
     v(g({}, titleField$2), {
@@ -28688,7 +28772,7 @@ const gridCardBlockSettings = new SchemaSettings({
 });
 class SchemaSettingsPlugin extends Plugin {
   load() {
-    return O(this, null, function* () {
+    return V(this, null, function* () {
       this.schemaSettingsManager.add(tableBlockSettings), this.schemaSettingsManager.add(createFormBlockSettings), this.schemaSettingsManager.add(editFormBlockSettings), this.schemaSettingsManager.add(filterFormBlockSettings), this.schemaSettingsManager.add(filterFormItemFieldSettings), this.schemaSettingsManager.add(multiDataDetailsBlockSettings), this.schemaSettingsManager.add(detailsWithPaginationSettings), this.schemaSettingsManager.add(singleDataDetailsBlockSettings), this.schemaSettingsManager.add(detailsBlockSettings), this.schemaSettingsManager.add(tableSelectorBlockSettings), this.schemaSettingsManager.add(listBlockSettings), this.schemaSettingsManager.add(gridCardBlockSettings), this.schemaSettingsManager.add(filterCollapseBlockSettings), this.schemaSettingsManager.add(markdownBlockSettings), this.schemaSettingsManager.add(addNewActionSettings), this.schemaSettingsManager.add(filterActionSettings), this.schemaSettingsManager.add(refreshActionSettings), this.schemaSettingsManager.add(viewActionSettings), this.schemaSettingsManager.add(editActionSettings), this.schemaSettingsManager.add(deleteActionSettings), this.schemaSettingsManager.add(disassociateActionSettings), this.schemaSettingsManager.add(bulkDeleteActionSettings), this.schemaSettingsManager.add(customizeAddRecordActionSettings), this.schemaSettingsManager.add(customizePopupActionSettings), this.schemaSettingsManager.add(customizeLinkActionSettings), this.schemaSettingsManager.add(customizeUpdateRecordActionSettings), this.schemaSettingsManager.add(createSubmitActionSettings), this.schemaSettingsManager.add(updateSubmitActionSettings), this.schemaSettingsManager.add(submitActionSettings), this.schemaSettingsManager.add(customizeSaveRecordActionSettings), this.schemaSettingsManager.add(addChildActionSettings), this.schemaSettingsManager.add(expendableActionSettings), this.schemaSettingsManager.add(fieldSettingsFormItem), this.schemaSettingsManager.add(tableColumnSettings), this.schemaSettingsManager.add(filterCollapseItemFieldSettings), this.schemaSettingsManager.add(selectComponentFieldSettings), this.schemaSettingsManager.add(recordPickerComponentFieldSettings), this.schemaSettingsManager.add(subformComponentFieldSettings), this.schemaSettingsManager.add(subformPopoverComponentFieldSettings), this.schemaSettingsManager.add(subTablePopoverComponentFieldSettings), this.schemaSettingsManager.add(datePickerComponentFieldSettings), this.schemaSettingsManager.add(unixTimestampComponentFieldSettings), this.schemaSettingsManager.add(inputNumberComponentFieldSettings), this.schemaSettingsManager.add(fileManagerComponentFieldSettings), this.schemaSettingsManager.add(tagComponentFieldSettings), this.schemaSettingsManager.add(cascadeSelectComponentFieldSettings), this.schemaSettingsManager.add(inputPreviewComponentFieldSettings), this.schemaSettingsManager.add(inputURLComponentFieldSettings), this.schemaSettingsManager.add(uploadAttachmentComponentFieldSettings), this.schemaSettingsManager.add(previewComponentFieldSettings);
     });
   }
@@ -28883,8 +28967,8 @@ const useFieldComponentOptions = () => {
   const { refresh: t } = useDesignable(), o = useAPIClient(), { t: n } = useTranslation();
   return useCallback(
     (r) => {
-      var f, C, S, b, y, F, I, k, A, w, M, N, E, z, V;
-      const { active: i, over: a } = r, l = (C = (f = i == null ? void 0 : i.data) == null ? void 0 : f.current) == null ? void 0 : C.schema, c = (b = (S = a == null ? void 0 : a.data) == null ? void 0 : S.current) == null ? void 0 : b.schema, u = (F = (y = a == null ? void 0 : a.data) == null ? void 0 : y.current) == null ? void 0 : F.insertAdjacent, d = (k = (I = a == null ? void 0 : a.data) == null ? void 0 : I.current) == null ? void 0 : k.breakRemoveOn, p = (w = (A = a == null ? void 0 : a.data) == null ? void 0 : A.current) == null ? void 0 : w.wrapSchema, m = (N = (M = a == null ? void 0 : a.data) == null ? void 0 : M.current) == null ? void 0 : N.onSuccess, h = (V = (z = (E = a == null ? void 0 : a.data) == null ? void 0 : E.current) == null ? void 0 : z.removeParentsIfNoChildren) != null ? V : !0;
+      var f, C, S, b, y, F, I, k, A, w, M, N, E, z, O;
+      const { active: i, over: a } = r, l = (C = (f = i == null ? void 0 : i.data) == null ? void 0 : f.current) == null ? void 0 : C.schema, c = (b = (S = a == null ? void 0 : a.data) == null ? void 0 : S.current) == null ? void 0 : b.schema, u = (F = (y = a == null ? void 0 : a.data) == null ? void 0 : y.current) == null ? void 0 : F.insertAdjacent, d = (k = (I = a == null ? void 0 : a.data) == null ? void 0 : I.current) == null ? void 0 : k.breakRemoveOn, p = (w = (A = a == null ? void 0 : a.data) == null ? void 0 : A.current) == null ? void 0 : w.wrapSchema, m = (N = (M = a == null ? void 0 : a.data) == null ? void 0 : M.current) == null ? void 0 : N.onSuccess, h = (O = (z = (E = a == null ? void 0 : a.data) == null ? void 0 : E.current) == null ? void 0 : z.removeParentsIfNoChildren) != null ? O : !0;
       if (!l || !c) {
         e == null || e(r);
         return;
@@ -29036,7 +29120,7 @@ const SortableProvider = (e) => {
   SortableItem,
   SortableProvider
 }, Symbol.toStringTag, { value: "Module" })), requestChartData = (e) => function() {
-  return O(this, null, function* () {
+  return V(this, null, function* () {
     var t;
     try {
       const o = yield this.api.request(e);
@@ -29066,7 +29150,7 @@ const Form$1 = observer$1(
       {
         uid: a["x-uid"],
         onSuccess(h) {
-          return O(this, null, function* () {
+          return V(this, null, function* () {
             yield c.reset(), c.setValues(h == null ? void 0 : h.data), c.setInitialValues(h == null ? void 0 : h.data);
           });
         }
@@ -29337,7 +29421,7 @@ Select.ReadPretty = ReadPretty$c;
 const getValues = (e, t) => castArray(e).filter((o) => o != null).map((o) => typeof o == "object" ? o[t.value] : o), ReadPretty$b = observer$1(
   (e) => {
     const t = g(g({}, defaultFieldNames$1), e.fieldNames), o = useField(), n = useFieldSchema(), r = useRecord(), { snapshot: i } = useActionContext(), { data: a } = useRequest(
-      i ? () => O(void 0, null, function* () {
+      i ? () => V(void 0, null, function* () {
         return {
           data: r[n.name]
         };
@@ -29392,21 +29476,21 @@ const getValues = (e, t) => castArray(e).filter((o) => o != null).map((o) => typ
     ]), x = useDataSourceKey(), f = useDataSourceHeaders(m || x), [C, S] = useState(!1), b = useRef(!1), y = useFieldSchema(), F = ((K = y["x-component-props"]) == null ? void 0 : K.addMode) === "quickAdd", { getField: I } = useCollection_deprecated(), k = useRef(null), { getCollectionJoinField: A, getInterface: w } = useCollectionManager_deprecated(), M = y["x-collection-field"] || y.name, N = I(M) || A(M), E = u || (N == null ? void 0 : N.target) && (t == null ? void 0 : t.label) && A(`${N.target}.${t.label}`), z = useMemo(() => {
       var W, X;
       return E != null && E.interface && ((X = (W = w(E.interface)) == null ? void 0 : W.filterable) == null ? void 0 : X.operators[0].value) || "$includes";
-    }, [E]), V = useCompile(), R = useCallback(
+    }, [E]), O = useCompile(), R = useCallback(
       (W) => {
         try {
           return W.filter((X) => ["number", "string"].includes(typeof X[t.value])).map((X) => {
             var J;
-            let Q = V(X[t.label]);
+            let Q = O(X[t.label]);
             if ((J = E == null ? void 0 : E.uiSchema) != null && J.enum)
               if (Array.isArray(Q))
-                Q = Q.map((oe, ne) => {
-                  const re = E.uiSchema.enum.find((ie) => ie.value === oe);
-                  return re ? /* @__PURE__ */ jsx(Tag, { role: "button", color: re.color, style: { marginRight: 3 }, children: (re == null ? void 0 : re.label) || oe }, ne) : /* @__PURE__ */ jsx(Tag, { role: "button", children: oe }, oe);
+                Q = Q.map((te, oe) => {
+                  const re = E.uiSchema.enum.find((se) => se.value === te);
+                  return re ? /* @__PURE__ */ jsx(Tag, { role: "button", color: re.color, style: { marginRight: 3 }, children: (re == null ? void 0 : re.label) || te }, oe) : /* @__PURE__ */ jsx(Tag, { role: "button", children: te }, te);
                 }).reverse();
               else {
-                const oe = E.uiSchema.enum.find((ne) => ne.value === Q);
-                oe && (Q = /* @__PURE__ */ jsx(Tag, { role: "button", color: oe.color, children: oe.label }));
+                const te = E.uiSchema.enum.find((oe) => oe.value === Q);
+                te && (Q = /* @__PURE__ */ jsx(Tag, { role: "button", color: te.color, children: te.label }));
               }
             return (E == null ? void 0 : E.type) === "date" && (Q = dayjs(Q).format("YYYY-MM-DD")), c ? c({
               [t.label]: Q || EMPTY$1,
@@ -29454,7 +29538,7 @@ const getValues = (e, t) => castArray(e).filter((o) => o != null).map((o) => typ
     useEffect(() => {
       b.current && B();
     }, [D]);
-    const q = (W) => O(void 0, null, function* () {
+    const q = (W) => V(void 0, null, function* () {
       var X;
       B({
         filter: mergeFilter([
@@ -29565,9 +29649,9 @@ const useFormDataTemplates = () => {
     alignItems: "center",
     backgroundColor: o.colorFillAlter,
     padding: o.padding
-  }, e), [e, o.colorFillAlter]), C = useMemo(() => ({ fontSize: o.fontSize, fontWeight: "bold", whiteSpace: "nowrap", marginRight: o.marginXS }), [o.fontSize, o.marginXS]), S = useCallback((F) => O(void 0, null, function* () {
+  }, e), [e, o.colorFillAlter]), C = useMemo(() => ({ fontSize: o.fontSize, fontWeight: "bold", whiteSpace: "nowrap", marginRight: o.marginXS }), [o.fontSize, o.marginXS]), S = useCallback((F) => V(void 0, null, function* () {
     d(F), m(null), t == null || t.reset();
-  }), []), b = useCallback((F, I) => O(void 0, null, function* () {
+  }), []), b = useCallback((F, I) => V(void 0, null, function* () {
     const k = v(g({}, I), { dataId: F });
     m(I), fetchTemplateData(h, k).then((A) => (t && A && (t.reset(), t.__template = !0, forEach(A, (w, M) => {
       var N;
@@ -29621,7 +29705,7 @@ function findDataTemplates(e) {
   return t ? _.cloneDeep(t["x-data-templates"]) || {} : {};
 }
 function fetchTemplateData(e, t, o) {
-  return O(this, null, function* () {
+  return V(this, null, function* () {
     if (!(t.fields.length === 0 || !t.dataId))
       return e.resource(t.collection).get({
         filterByTk: t.dataId,
@@ -29634,20 +29718,22 @@ function fetchTemplateData(e, t, o) {
   });
 }
 const useFormBlockHeight = () => {
-  var I, k, A;
-  const e = useDataBlockHeight(), t = useFieldSchema(), { token: o } = theme.useToken(), { designable: n } = useDesignable(), { heightProps: r } = useBlockHeightProps() || {}, { title: i } = r || {}, { display: a, enabled: l } = useFormDataTemplates(), c = t.reduceProperties((w, M) => M["x-component"] === "ActionBar" ? M : w), u = Object.keys((c == null ? void 0 : c.properties) || {}).length > 0, d = (A = (k = (I = t == null ? void 0 : t.parent) == null ? void 0 : I["x-decorator"]) == null ? void 0 : k.includes) == null ? void 0 : A.call(k, "FormBlockProvider"), p = () => d ? n ? 2 : 1 : 2, m = u || n ? o.controlHeight + p() * o.marginLG : 1 * o.marginLG, h = i ? o.fontSizeLG * o.lineHeightLG + o.padding * 2 - 1 : 0, { data: x } = useDataBlockRequest() || {}, { count: f, pageSize: C } = (x == null ? void 0 : x.meta) || {}, S = f > C, b = S ? o.controlHeightSM + (n ? 1 : 0) * o.paddingLG : 0, y = a && l ? o.controlHeight + 2 * o.padding + o.margin : 0, F = () => !d && !S ? n ? 1 : 0 : 1;
-  return e - m - F() * o.paddingLG - h - b - y;
+  var y, F, I;
+  const e = useDataBlockHeight(), t = useFieldSchema(), { token: o } = theme.useToken(), { designable: n } = useDesignable(), { heightProps: r } = useBlockHeightProps() || {}, { title: i } = r || {}, { display: a, enabled: l } = useFormDataTemplates(), c = t.reduceProperties((k, A) => A["x-component"] === "ActionBar" ? A : k), u = Object.keys((c == null ? void 0 : c.properties) || {}).length > 0, d = (I = (F = (y = t == null ? void 0 : t.parent) == null ? void 0 : y["x-decorator"]) == null ? void 0 : F.includes) == null ? void 0 : I.call(F, "FormBlockProvider"), p = u || n ? o.controlHeight + (d ? 1 : 2) * o.marginLG : o.marginLG, m = i ? o.fontSizeLG * o.lineHeightLG + o.padding * 2 - 1 : 0, { data: h } = useDataBlockRequest() || {}, { count: x, pageSize: f } = (h == null ? void 0 : h.meta) || {}, S = x > f ? o.controlHeightSM + 1 * o.paddingLG : 0, b = a && l ? o.controlHeight + 2 * o.padding + o.margin : 0;
+  return e - p - o.paddingLG - m - S - b;
 }, FormComponent = (e) => {
-  const d = e, { form: t, children: o } = d, n = H(d, ["form", "children"]), r = useField(), i = useFieldSchema(), a = useAttach(t.createVoidField(v(g({}, r.props), { basePath: "" }))), l = useFormBlockHeight(), { token: c } = theme.useToken(), { designable: u } = useDesignable();
-  return /* @__PURE__ */ jsx(FieldContext.Provider, { value: void 0, children: /* @__PURE__ */ jsx(FormContext.Provider, { value: t, children: /* @__PURE__ */ jsx(FormLayout, v(g({ layout: "vertical" }, n), { children: /* @__PURE__ */ jsx(
+  const u = e, { form: t, children: o } = u, n = H(u, ["form", "children"]), r = useField(), i = useFieldSchema(), a = useAttach(t.createVoidField(v(g({}, r.props), { basePath: "" }))), l = useFormBlockHeight(), { token: c } = theme.useToken();
+  return useDesignable(), /* @__PURE__ */ jsx(FieldContext.Provider, { value: void 0, children: /* @__PURE__ */ jsx(FormContext.Provider, { value: t, children: /* @__PURE__ */ jsx(FormLayout, v(g({ layout: "vertical" }, n), { children: /* @__PURE__ */ jsx(
     "div",
     {
       className: css`
               .nb-grid-container {
                 height: ${l ? l + "px" : "100%"};
                 overflow-y: auto;
-                margin: 0px -${c.marginLG}px ${u ? 0 : -c.marginLG}px;
-                padding: 0px ${c.paddingLG}px;
+                margin-left: -${c.marginLG}px;
+                margin-right: -${c.marginLG}px;
+                padding-left: ${c.marginLG}px;
+                padding-right: ${c.marginLG}px;
               }
             `,
       children: /* @__PURE__ */ jsx(RecursionField, { basePath: a.address, schema: i, onlyRenderProperties: !0 })
@@ -29752,7 +29838,7 @@ function getSubscriber(e, t, o, n, r) {
       condition: o.condition,
       variables: n,
       localVariables: r
-    }), setTimeout(() => O(this, null, function* () {
+    }), setTimeout(() => V(this, null, function* () {
       var c;
       const i = getFieldNameByOperator(e.operator);
       if (!((c = t.stateOfLinkageRules) != null && c[i]))
@@ -30160,7 +30246,7 @@ const useSystemSettings = () => useContext(SystemSettingsContext), SystemSetting
   const { setVisible: e } = useActionContext();
   return {
     run() {
-      return O(this, null, function* () {
+      return V(this, null, function* () {
         e(!1);
       });
     }
@@ -30174,7 +30260,7 @@ const useSystemSettings = () => useContext(SystemSettingsContext), SystemSetting
   const { setVisible: e } = useActionContext(), t = useForm(), { mutate: o, data: n } = useSystemSettings(), r = useAPIClient(), { t: i } = useTranslation();
   return {
     run() {
-      return O(this, null, function* () {
+      return V(this, null, function* () {
         var u;
         yield t.submit();
         const l = cloneDeep(t.values);
@@ -30292,7 +30378,7 @@ const useSystemSettings = () => useContext(SystemSettingsContext), SystemSetting
 ) });
 class SystemSettingsPlugin extends Plugin {
   load() {
-    return O(this, null, function* () {
+    return V(this, null, function* () {
       this.app.use(SystemSettingsProvider, this.options);
     });
   }
@@ -30330,7 +30416,7 @@ const DocumentTitleProvider = (e) => {
 };
 class RemoteDocumentTitlePlugin extends Plugin {
   load() {
-    return O(this, null, function* () {
+    return V(this, null, function* () {
       this.app.use(RemoteDocumentTitleProvider, this.options);
     });
   }
@@ -30495,6 +30581,7 @@ const FixedBlockContext = React.createContext({
       },
       ".nb-page-wrapper": {
         padding: `${e.paddingPageVertical}px`,
+        paddingBottom: 0,
         flex: 1
       }
     }
@@ -30512,13 +30599,13 @@ const FixedBlockContext = React.createContext({
   const h = (B = l["x-component-props"]) == null ? void 0 : B.disablePageHeader, x = (T = l["x-component-props"]) == null ? void 0 : T.enablePageTabs, f = (D = l["x-component-props"]) == null ? void 0 : D.hidePageTitle, C = useContext(SchemaOptionsContext), [S, b] = useSearchParams(), [y, F] = useState(!1), I = useMemo(
     () => S.get("tab") || Object.keys(l.properties || {}).shift(),
     [l.properties, S]
-  ), [k, A] = useState(0), { wrapSSR: w, hashId: M, componentCls: N } = useStyles$b(), E = useStyles$c(), { token: z } = useToken(), V = f ? void 0 : l.title || r(i);
+  ), [k, A] = useState(0), { wrapSSR: w, hashId: M, componentCls: N } = useStyles$b(), E = useStyles$c(), { token: z } = useToken(), O = f ? void 0 : l.title || r(i);
   useRequest(
     {
       url: `/uiSchemas:getParentJsonSchema/${l["x-uid"]}`
     },
     {
-      ready: !f && !V,
+      ready: !f && !O,
       onSuccess($) {
         a($.data.title);
       }
@@ -30539,9 +30626,9 @@ const FixedBlockContext = React.createContext({
           children: !h && /* @__PURE__ */ jsx(
             PageHeader,
             v(g({
-              className: cls("pageHeaderCss", V || x ? "" : "height0"),
+              className: cls("pageHeaderCss", O || x ? "" : "height0"),
               ghost: !1,
-              title: V || " "
+              title: O || " "
             }, o), {
               footer: x && /* @__PURE__ */ jsx(DndContext, { children: /* @__PURE__ */ jsx(
                 Tabs$1,
@@ -30567,7 +30654,7 @@ const FixedBlockContext = React.createContext({
                       icon: /* @__PURE__ */ jsx(PlusOutlined, {}),
                       className: "addTabBtn",
                       type: "dashed",
-                      onClick: () => O(void 0, null, function* () {
+                      onClick: () => V(void 0, null, function* () {
                         const $ = yield FormDialog(
                           n("Add tab"),
                           () => /* @__PURE__ */ jsx(SchemaComponentOptions, { scope: C.scope, components: g({}, C.components), children: /* @__PURE__ */ jsx(FormLayout, { layout: "vertical", children: /* @__PURE__ */ jsx(
@@ -30841,7 +30928,7 @@ const pageSettings = new SchemaSettings({
     {
       title: t("Fix block"),
       checked: (l = o["x-decorator-props"]) == null ? void 0 : l.fixedBlock,
-      onChange: (c) => O(void 0, null, function* () {
+      onChange: (c) => V(void 0, null, function* () {
         var d;
         const u = v(g({}, o["x-decorator-props"]), {
           fixedBlock: c
@@ -30868,7 +30955,7 @@ const pageSettings = new SchemaSettings({
 };
 class AntdSchemaComponentPlugin extends Plugin {
   load() {
-    return O(this, null, function* () {
+    return V(this, null, function* () {
       this.addComponents(), this.addScopes(), this.addSchemaSettings();
     });
   }
@@ -30936,12 +31023,12 @@ const AppendsTreeSelect = (e) => {
     "rootOption",
     "loadData"
   ]), d = useCompile(), { t: p } = useTranslation(), [m, h] = useState({}), x = i({ collection: r }), [f, C] = parseCollectionName(x), S = useApp(), { collectionManager: b } = S.dataSourceManager.getDataSource(f), y = b.getCollectionFields.bind(b), F = Object.values(m), I = useMemo(() => e.multiple ? (o || []).map((z) => m[z]).filter(Boolean) : o, [o, e.multiple, m]), k = useCallback(
-    (z) => O(void 0, null, function* () {
+    (z) => V(void 0, null, function* () {
       if (c != null)
         return c(z);
       if (!z.isLeaf && z.loadChildren) {
-        const V = z.loadChildren(z);
-        h((R) => V.reduce((j, B) => Object.assign(j, { [B.value]: B }), g({}, R)));
+        const O = z.loadChildren(z);
+        h((R) => O.reduce((j, B) => Object.assign(j, { [B.value]: B }), g({}, R)));
       }
     }),
     [c]
@@ -30959,7 +31046,7 @@ const AppendsTreeSelect = (e) => {
     const z = e.multiple ? o : o ? [o] : [];
     if (!(z != null && z.length) || z.every((R) => !!m[R]))
       return;
-    const V = [];
+    const O = [];
     z.forEach((R) => {
       const j = R.split(".");
       let B = m[j[0]];
@@ -30971,10 +31058,10 @@ const AppendsTreeSelect = (e) => {
         }
         if (!B.isLeaf && B.loadChildren) {
           const $ = B.loadChildren(B);
-          $ != null && $.length && (V.push(...$), B = $.find((q) => q.value === j.slice(0, T + 1).join(".")));
+          $ != null && $.length && (O.push(...$), B = $.find((q) => q.value === j.slice(0, T + 1).join(".")));
         }
       }
-    }), h((R) => V.reduce((j, B) => Object.assign(j, { [B.value]: B }), g({}, R)));
+    }), h((R) => O.reduce((j, B) => Object.assign(j, { [B.value]: B }), g({}, R)));
   }, [o, F.length, e.multiple]);
   const A = useCallback(
     (z) => {
@@ -30982,14 +31069,14 @@ const AppendsTreeSelect = (e) => {
         n(z);
         return;
       }
-      const V = z.map((B) => B.value).filter(Boolean), R = new Set(V), j = I.find((B) => !R.has(B.value));
+      const O = z.map((B) => B.value).filter(Boolean), R = new Set(O), j = I.find((B) => !R.has(B.value));
       if (j) {
         const B = `${j.value}.`;
         Object.keys(m).forEach((T) => {
           T.startsWith(B) && R.delete(T);
         });
       } else
-        V.forEach((B) => {
+        O.forEach((B) => {
           const T = B.split(".");
           if (T.length)
             for (let D = 1; D <= T.length; D++)
@@ -31001,10 +31088,10 @@ const AppendsTreeSelect = (e) => {
   ), w = useCallback(
     (z) => {
       var D;
-      const { value: V, onClose: R, disabled: j, closable: B } = z;
-      if (!V)
+      const { value: O, onClose: R, disabled: j, closable: B } = z;
+      if (!O)
         return null;
-      const { fullTitle: T } = (D = m[V]) != null ? D : {};
+      const { fullTitle: T } = (D = m[O]) != null ? D : {};
       return /* @__PURE__ */ jsx(Tag, { closable: B && !j, onClose: R, children: T == null ? void 0 : T.join(" / ") });
     },
     [m]
@@ -31100,14 +31187,14 @@ const AppendsTreeSelect = (e) => {
       const A = uid();
       return f.addEffects(A, () => {
         onFieldInputValueChange("*", (w) => {
-          var N, E, z, V;
-          (filterAnalyses((z = (E = (N = r.componentProps) == null ? void 0 : N.service) == null ? void 0 : E.params) == null ? void 0 : z.filter) || []).includes((V = w == null ? void 0 : w.props) == null ? void 0 : V.name) && r.value && (r.setValue(r.initialValue), p(r.initialValue));
+          var N, E, z, O;
+          (filterAnalyses((z = (E = (N = r.componentProps) == null ? void 0 : N.service) == null ? void 0 : E.params) == null ? void 0 : z.filter) || []).includes((O = w == null ? void 0 : w.props) == null ? void 0 : O.name) && r.value && (r.setValue(r.initialValue), p(r.initialValue));
         });
       }), () => {
         f.removeEffects(A);
       };
     }, []);
-    const y = (A) => O(void 0, null, function* () {
+    const y = (A) => V(void 0, null, function* () {
       var E, z;
       const { search: w, callBack: M } = A, {
         data: { data: N }
@@ -31118,8 +31205,8 @@ const AppendsTreeSelect = (e) => {
       });
       if (N) {
         if (["m2m", "o2m"].includes(l == null ? void 0 : l.interface) && x !== !1) {
-          const V = f.getValuesIn(r.path) || [];
-          V.push(N), f.setValuesIn(r.path, V), r.onInput(V);
+          const O = f.getValuesIn(r.path) || [];
+          O.push(N), f.setValuesIn(r.path, O), r.onInput(O);
         } else
           f.setValuesIn(r.path, N), r.onInput(N);
         isFunction(M) && (M == null || M()), message.success(h("Saved successfully"));
@@ -32038,10 +32125,10 @@ const InternalFileManager = (e) => {
     setSelectedRows: u,
     collectionField: C
   }, k = () => {
-    const { setVisible: N } = useActionContext(), { multiple: E, selectedRows: z, onChange: V, options: R, collectionField: j } = useContext(RecordPickerContext);
+    const { setVisible: N } = useActionContext(), { multiple: E, selectedRows: z, onChange: O, options: R, collectionField: j } = useContext(RecordPickerContext);
     return {
       onClick() {
-        V(E ? unionBy(z, R, (j == null ? void 0 : j.targetKey) || "id") : (z == null ? void 0 : z[0]) || null), N(!1);
+        O(E ? unionBy(z, R, (j == null ? void 0 : j.targetKey) || "id") : (z == null ? void 0 : z[0]) || null), N(!1);
       }
     };
   };
@@ -32097,13 +32184,13 @@ const InternalFileManager = (e) => {
   const { data: t, mapOptions: o, onChange: n, value: r } = e, [i, a] = useState([
     { key: void 0, children: [], value: null }
   ]), [l, c] = useState(t), [u, d] = useState(!1), p = useCompile(), m = useAPIClient(), h = useServiceOptions$1(e), { options: x, field: f } = useAssociationFieldContext(), C = m.resource(x.target), { getCollectionJoinField: S, getInterface: b } = useCollectionManager_deprecated(), y = (z = f == null ? void 0 : f.componentProps) == null ? void 0 : z.fieldNames, F = (x == null ? void 0 : x.target) && (y == null ? void 0 : y.label) && S(`${x.target}.${y.label}`), I = useMemo(() => {
-    var V, R;
-    return F != null && F.interface && ((R = (V = b(F.interface)) == null ? void 0 : V.filterable) == null ? void 0 : R.operators[0].value) || "$includes";
+    var O, R;
+    return F != null && F.interface && ((R = (O = b(F.interface)) == null ? void 0 : O.filterable) == null ? void 0 : R.operators[0].value) || "$includes";
   }, [F]), k = useField();
   useEffect(() => {
-    var V;
+    var O;
     if (r) {
-      const R = Array.isArray(r) ? extractLastNonNullValueObjects(r == null ? void 0 : r.filter((B) => B.value), !0) : transformNestedData(r), j = (V = R == null ? void 0 : R.map) == null ? void 0 : V.call(R, (B) => ({
+      const R = Array.isArray(r) ? extractLastNonNullValueObjects(r == null ? void 0 : r.filter((B) => B.value), !0) : transformNestedData(r), j = (O = R == null ? void 0 : R.map) == null ? void 0 : O.call(R, (B) => ({
         key: B.parentId,
         children: [],
         value: B
@@ -32112,9 +32199,9 @@ const InternalFileManager = (e) => {
     }
   }, []);
   const A = useCallback(
-    (V) => {
+    (O) => {
       try {
-        return V == null ? void 0 : V.filter((R) => ["number", "string"].includes(typeof R[y.value])).map((R) => {
+        return O == null ? void 0 : O.filter((R) => ["number", "string"].includes(typeof R[y.value])).map((R) => {
           var B, T, D;
           let j = p(R[y.label]);
           if ((B = F == null ? void 0 : F.uiSchema) != null && B.enum)
@@ -32137,20 +32224,20 @@ const InternalFileManager = (e) => {
           });
         }).filter(Boolean);
       } catch (R) {
-        return console.error(R), V;
+        return console.error(R), O;
       }
     },
     [F == null ? void 0 : F.uiSchema, y]
-  ), w = (V) => O(void 0, null, function* () {
+  ), w = (O) => V(void 0, null, function* () {
     var j, B;
     const R = yield C.list({
       pageSize: 200,
       params: h == null ? void 0 : h.params,
-      filter: mergeFilter([(j = h == null ? void 0 : h.params) == null ? void 0 : j.filter, V]),
-      tree: V.parentId ? void 0 : !0
+      filter: mergeFilter([(j = h == null ? void 0 : h.params) == null ? void 0 : j.filter, O]),
+      tree: O.parentId ? void 0 : !0
     });
     return (B = R == null ? void 0 : R.data) == null ? void 0 : B.data;
-  }), M = (V, R, j) => O(void 0, null, function* () {
+  }), M = (O, R, j) => V(void 0, null, function* () {
     const B = yield w({ parentId: R == null ? void 0 : R.id }), T = [...i];
     if (T.splice(j + 1), T[j] = v(g({}, T[j]), { value: R }), R != null && R.id && (T[j + 1] = { key: R == null ? void 0 : R.id, children: (B == null ? void 0 : B.length) > 0 ? B : null }), a(T), ["o2m", "m2m"].includes(x.interface)) {
       const D = Array.isArray(f.fieldValue) ? f.fieldValue : [];
@@ -32158,9 +32245,9 @@ const InternalFileManager = (e) => {
     } else
       f.value = R;
     n == null || n(T);
-  }), N = (V, R, j) => O(void 0, null, function* () {
+  }), N = (O, R, j) => V(void 0, null, function* () {
     var B, T, D;
-    if (V) {
+    if (O) {
       d(!0);
       const $ = yield w({ parentId: R == null ? void 0 : R.key });
       if (d(!1), c($), j === (i == null ? void 0 : i.length) - 1 && ((B = R == null ? void 0 : R.value) != null && B.id)) {
@@ -32168,10 +32255,10 @@ const InternalFileManager = (e) => {
         L.splice(j + 1), L[j] = v(g({}, L[j]), { value: R == null ? void 0 : R.value }), L[j + 1] = { key: (D = R == null ? void 0 : R.value) == null ? void 0 : D.id, children: (q == null ? void 0 : q.length) > 0 ? q : null }, a(L), n == null || n(L);
       }
     }
-  }), E = (V, R) => O(void 0, null, function* () {
-    const j = V ? {
+  }), E = (O, R) => V(void 0, null, function* () {
+    const j = O ? {
       [y.label]: {
-        [I]: V
+        [I]: O
       }
     } : {};
     d(!0);
@@ -32180,9 +32267,9 @@ const InternalFileManager = (e) => {
     }));
     d(!1), c(B);
   });
-  return /* @__PURE__ */ jsx(Space$1, { wrap: !0, children: i.map((V, R) => {
+  return /* @__PURE__ */ jsx(Space$1, { wrap: !0, children: i.map((O, R) => {
     var j, B, T;
-    return V.children && /* @__PURE__ */ jsx(
+    return O.children && /* @__PURE__ */ jsx(
       Select$1,
       {
         disabled: f.disabled,
@@ -32192,55 +32279,56 @@ const InternalFileManager = (e) => {
         filterOption: !1,
         filterSort: null,
         defaultValue: {
-          label: (j = V == null ? void 0 : V.value) == null ? void 0 : j[y.label],
-          value: (B = V == null ? void 0 : V.value) == null ? void 0 : B[y.value]
+          label: (j = O == null ? void 0 : O.value) == null ? void 0 : j[y.label],
+          value: (B = O == null ? void 0 : O.value) == null ? void 0 : B[y.value]
         },
         labelInValue: !0,
-        onSearch: (D) => E(D, V),
+        onSearch: (D) => E(D, O),
         fieldNames: y,
         style: { minWidth: 150 },
         onChange: (D, $) => M(D, $, R),
         options: u ? [] : A(l),
-        onDropdownVisibleChange: (D) => N(D, V, R),
+        onDropdownVisibleChange: (D) => N(D, O, R),
         notFoundContent: u ? /* @__PURE__ */ jsx(Spin, { size: "small" }) : null
       },
-      `${(T = V.value) == null ? void 0 : T.id}+ ${V.key} + ${y.label}`
+      `${(T = O.value) == null ? void 0 : T.id}+ ${O.key} + ${y.label}`
     );
   }) });
 }), AssociationCascadeSelect = connect((e) => /* @__PURE__ */ jsx("div", { children: /* @__PURE__ */ jsx(CascadeSelect, g({}, e)) })), InternalCascadeSelect = observer$1(
   (e) => {
-    const { options: t } = useAssociationFieldContext(), o = useMemo(() => createForm(), []), { t: n } = useTranslation(), r = useField(), i = useFieldSchema();
+    var m;
+    const { options: t } = useAssociationFieldContext(), o = useMemo(() => createForm(), []), { t: n } = useTranslation(), r = useField(), i = useFieldSchema(), { loading: a, data: l } = useDataBlockRequest() || {}, c = (m = l == null ? void 0 : l.data) == null ? void 0 : m[i.name];
     useEffect(() => {
-      const u = uid();
-      return o.addEffects(u, () => {
-        onFormValuesChange((d) => {
-          var p, m;
+      const h = uid();
+      return o.addEffects(h, () => {
+        onFormValuesChange((x) => {
+          var f, C;
           if (t.interface === "m2o") {
-            const h = extractLastNonNullValueObjects((p = d.values) == null ? void 0 : p[i.name]);
+            const S = extractLastNonNullValueObjects((f = x.values) == null ? void 0 : f[i.name]);
             setTimeout(() => {
-              d.setValuesIn(i.name, h), e.onChange(h), r.value = h;
+              x.setValuesIn(i.name, S), r.value = S;
             });
           } else {
-            const h = extractLastNonNullValueObjects((m = d.values) == null ? void 0 : m.select_array).filter(
-              (x) => x && Object.keys(x).length > 0
+            const S = extractLastNonNullValueObjects((C = x.values) == null ? void 0 : C.select_array).filter(
+              (b) => b && Object.keys(b).length > 0
             );
             setTimeout(() => {
-              r.value = h, e.onChange(h);
+              r.value = S;
             });
           }
         });
       }), () => {
-        o.removeEffects(u);
+        o.removeEffects(h);
       };
     }, []);
-    const c = {
+    const p = {
       type: "object",
       properties: {
         select_array: {
           type: "array",
           "x-component": "ArrayItems",
           "x-decorator": "FormItem",
-          default: Array.isArray(r.value) && r.value.length > 0 ? r.value : [{}],
+          default: Array.isArray(c) && c.length > 0 ? c : [{}],
           items: {
             type: "void",
             "x-component": "Space",
@@ -32273,18 +32361,18 @@ const InternalFileManager = (e) => {
         }
       }
     };
-    return /* @__PURE__ */ jsx(FormProvider$1, { form: o, children: t.interface === "m2o" ? /* @__PURE__ */ jsx(
+    return !a && /* @__PURE__ */ jsx(FormProvider$1, { form: o, children: t.interface === "m2o" ? /* @__PURE__ */ jsx(
       SchemaComponent,
       {
         components: { FormItem: FormItem$1 },
         schema: v(g({}, i), {
-          default: r.value,
+          default: c,
           title: "",
           "x-component": AssociationCascadeSelect,
           "x-component-props": g({}, e)
         })
       }
-    ) : /* @__PURE__ */ jsx(SchemaField, { schema: c }) });
+    ) : /* @__PURE__ */ jsx(SchemaField, { schema: p }) });
   },
   { displayName: "InternalCascadeSelect" }
 );
@@ -32353,7 +32441,6 @@ const InternalNesterCss = css`
           css`
                   .nb-grid-container {
                     height: 100% !important;
-                    margin-bottom: 0px;
                   }
                 `
         ),
@@ -32394,7 +32481,7 @@ const InternalNesterCss = css`
   });
 }, InternalPicker = observer$1(
   (e) => {
-    var V;
+    var O;
     const z = e, { value: t, multiple: o, openSize: n, onChange: r, quickUpload: i, selectFile: a, shouldMountElement: l } = z, c = H(z, ["value", "multiple", "openSize", "onChange", "quickUpload", "selectFile", "shouldMountElement"]), u = useField(), d = useFieldNames$1(e), [p, m] = useState(!1), h = useFieldSchema(), x = useInsertSchema("Selector"), { options: f } = useAssociationFieldContext(), { collectionName: C } = useFormBlockContext(), S = useCompile(), b = useLabelUiSchema$1(f, (d == null ? void 0 : d.label) || "label"), y = h["x-add-new"], [F, I] = useState([]), k = useCollectionRecordData(), A = useMemo(() => t && Object.keys(t).length > 0 ? (Array.isArray(t) ? t : t ? [t] : []).filter(Boolean).map((j) => {
       const B = j == null ? void 0 : j[d.label];
       return v(g({}, j), {
@@ -32480,7 +32567,7 @@ const InternalNesterCss = css`
         ActionContextProvider,
         {
           value: {
-            openSize: ((V = h["x-component-props"]) == null ? void 0 : V.openSize) || n,
+            openSize: ((O = h["x-component-props"]) == null ? void 0 : O.openSize) || n,
             openMode: "drawer",
             visible: p,
             setVisible: m
@@ -32514,55 +32601,48 @@ function isObject(e) {
 }
 const ReadPrettyInternalViewer = observer$1(
   (e) => {
-    var E;
-    const t = useFieldSchema(), o = useRecord(), { getCollection: n } = useCollectionManager_deprecated(), { enableLink: r } = t["x-component-props"] || {}, i = useField(), a = useFieldNames$1(e), [l, c] = useState(!1), u = useInsertSchema("Viewer"), { options: d } = useAssociationFieldContext(), [p, m] = useState({}), h = useCompile(), { designable: x } = useDesignable(), { snapshot: f } = useActionContext(), C = n(d == null ? void 0 : d.target), S = (C == null ? void 0 : C.template) === "tree", b = useRef(), y = useLabelUiSchemaV2(), [F, I] = useState(!1), { t: k } = useTranslation(), w = /* @__PURE__ */ jsx(EllipsisWithTooltip, { ellipsis: !0, ref: b, children: toArr$3(e.value).map((z, V, R) => {
-      const j = z == null ? void 0 : z[(a == null ? void 0 : a.label) || "label"], B = S ? transformNestedData(z).map((q) => q == null ? void 0 : q[(a == null ? void 0 : a.label) || "label"]).join(" / ") : isObject(j) ? JSON.stringify(j) : j, T = toValue$4(h(B), "N/A"), D = y(
-        (z == null ? void 0 : z.__collection) || (d == null ? void 0 : d.target),
+    var N;
+    const t = useFieldSchema(), o = useRecord(), { getCollection: n } = useCollectionManager_deprecated(), { enableLink: r } = t["x-component-props"] || {}, i = useField(), a = useFieldNames$1(e), [l, c] = useState(!1), u = useInsertSchema("Viewer"), { options: d } = useAssociationFieldContext(), [p, m] = useState({}), h = useCompile(), { designable: x } = useDesignable(), { snapshot: f } = useActionContext(), C = n(d == null ? void 0 : d.target), S = (C == null ? void 0 : C.template) === "tree", b = useRef(), y = useLabelUiSchemaV2(), [F, I] = useState(!1);
+    useTranslation();
+    const A = /* @__PURE__ */ jsx(EllipsisWithTooltip, { ellipsis: !0, ref: b, children: toArr$3(e.value).map((E, z, O) => {
+      const R = E == null ? void 0 : E[(a == null ? void 0 : a.label) || "label"], j = S ? transformNestedData(E).map(($) => $ == null ? void 0 : $[(a == null ? void 0 : a.label) || "label"]).join(" / ") : isObject(R) ? JSON.stringify(R) : R, B = toValue$4(h(j), "N/A"), T = y(
+        (E == null ? void 0 : E.__collection) || (d == null ? void 0 : d.target),
         (a == null ? void 0 : a.label) || "label"
-      ), $ = getLabelFormatValue$1(h(D), T, !0);
+      ), D = getLabelFormatValue$1(h(T), B, !0);
       return /* @__PURE__ */ jsxs(Fragment$1, { children: [
-        /* @__PURE__ */ jsx("span", { children: f ? $ : r !== !1 ? /* @__PURE__ */ jsx(
+        /* @__PURE__ */ jsx("span", { children: f ? D : r !== !1 ? /* @__PURE__ */ jsx(
           "a",
           {
             onMouseEnter: () => {
               I(!0);
             },
-            onClick: (q) => {
-              var L;
-              I(!0), q.stopPropagation(), q.preventDefault(), x && u(schema$1.Viewer), c(!0), m(z), (L = b == null ? void 0 : b.current) == null || L.setPopoverVisible(!1);
+            onClick: ($) => {
+              var q;
+              I(!0), $.stopPropagation(), $.preventDefault(), x && u(schema$1.Viewer), c(!0), m(E), (q = b == null ? void 0 : b.current) == null || q.setPopoverVisible(!1);
             },
-            children: $
+            children: D
           }
-        ) : $ }),
-        V < R.length - 1 ? /* @__PURE__ */ jsx("span", { style: { marginRight: 4, color: "#aaa" }, children: "," }) : null
-      ] }, `${z == null ? void 0 : z.id}_${V}`);
+        ) : D }),
+        z < O.length - 1 ? /* @__PURE__ */ jsx("span", { style: { marginRight: 4, color: "#aaa" }, children: "," }) : null
+      ] }, `${E == null ? void 0 : E.id}_${z}`);
     }) });
     if (r === !1 || !F)
-      return w;
-    const M = () => /* @__PURE__ */ jsx(
-      DeclareVariable,
+      return A;
+    const w = () => /* @__PURE__ */ jsx(VariablePopupRecordProvider, { recordData: p, collection: C, children: /* @__PURE__ */ jsx(WithoutTableFieldResource.Provider, { value: !0, children: /* @__PURE__ */ jsx(FormProvider, { children: /* @__PURE__ */ jsx(
+      RecursionField,
       {
-        name: "$nPopupRecord",
-        title: k("Current popup record"),
-        value: p,
-        collection: C,
-        children: /* @__PURE__ */ jsx(WithoutTableFieldResource.Provider, { value: !0, children: /* @__PURE__ */ jsx(FormProvider, { children: /* @__PURE__ */ jsx(
-          RecursionField,
-          {
-            schema: t,
-            onlyRenderProperties: !0,
-            basePath: i.address,
-            filterProperties: (z) => z["x-component"] === "AssociationField.Viewer"
-          }
-        ) }) })
+        schema: t,
+        onlyRenderProperties: !0,
+        basePath: i.address,
+        filterProperties: (E) => E["x-component"] === "AssociationField.Viewer"
       }
-    ), N = () => {
-      var V;
-      const z = (V = t == null ? void 0 : t["x-collection-field"]) == null ? void 0 : V.split(".");
-      return z && z.length > 2 ? /* @__PURE__ */ jsx(RecordProvider, { record: p, parent: o[z[1]], children: M() }) : /* @__PURE__ */ jsx(RecordProvider, { record: p, parent: o, children: M() });
+    ) }) }) }), M = () => {
+      var z;
+      const E = (z = t == null ? void 0 : t["x-collection-field"]) == null ? void 0 : z.split(".");
+      return E && E.length > 2 ? /* @__PURE__ */ jsx(RecordProvider, { record: p, parent: o[E[1]], children: w() }) : /* @__PURE__ */ jsx(RecordProvider, { record: p, parent: o, children: w() });
     };
-    return /* @__PURE__ */ jsx("div", { children: /* @__PURE__ */ jsx(BlockAssociationContext.Provider, { value: `${d == null ? void 0 : d.collectionName}.${d == null ? void 0 : d.name}`, children: /* @__PURE__ */ jsxs(CollectionProvider_deprecated, { name: (E = d == null ? void 0 : d.target) != null ? E : d == null ? void 0 : d.targetCollection, children: [
-      w,
+    return /* @__PURE__ */ jsx("div", { children: /* @__PURE__ */ jsx(BlockAssociationContext.Provider, { value: `${d == null ? void 0 : d.collectionName}.${d == null ? void 0 : d.name}`, children: /* @__PURE__ */ jsxs(CollectionProvider_deprecated, { name: (N = d == null ? void 0 : d.target) != null ? N : d == null ? void 0 : d.targetCollection, children: [
+      A,
       /* @__PURE__ */ jsx(
         ActionContextProvider,
         {
@@ -32573,7 +32653,7 @@ const ReadPrettyInternalViewer = observer$1(
             snapshot: (d == null ? void 0 : d.interface) === "snapshot",
             fieldSchema: t
           },
-          children: N()
+          children: M()
         }
       )
     ] }) }) });
@@ -32994,7 +33074,7 @@ const CreateRecordAction$1 = forwardRef(InternalCreateRecordAction), initializer
       const { onClick: l } = useAssociationCreateActionProps(), c = useField(), { getPrimaryKey: u } = useCollection_deprecated(), d = u();
       return {
         onClick() {
-          return O(this, null, function* () {
+          return V(this, null, function* () {
             var h, x;
             yield l();
             const { data: m } = ((x = (h = c.data) == null ? void 0 : h.data) == null ? void 0 : x.data) || {};
@@ -33109,7 +33189,7 @@ const CreateRecordAction$1 = forwardRef(InternalCreateRecordAction), initializer
 ), toValue$3 = (e, t) => e == null ? t : e, ReadPrettyInternalTag = observer$1(
   (e) => {
     var E;
-    const t = useFieldSchema(), o = useRecord(), { enableLink: n, tagColorField: r } = t["x-component-props"], i = useField(), a = useFieldNames$1(e), [l, c] = useState(!1), u = useInsertSchema("Viewer"), { options: d } = useAssociationFieldContext(), [p, m] = useState({}), h = useCompile(), { designable: x } = useDesignable(), f = useLabelUiSchema$1(d, (a == null ? void 0 : a.label) || "label"), { snapshot: C } = useActionContext(), S = useRef(), { getCollection: b } = useCollectionManager_deprecated(), y = b(d == null ? void 0 : d.target), F = (y == null ? void 0 : y.template) === "tree", [I, k] = useState(!1), w = /* @__PURE__ */ jsx(EllipsisWithTooltip, { ellipsis: !0, ref: S, children: toArr$3(e.value).map((z, V, R) => {
+    const t = useFieldSchema(), o = useRecord(), { enableLink: n, tagColorField: r } = t["x-component-props"], i = useField(), a = useFieldNames$1(e), [l, c] = useState(!1), u = useInsertSchema("Viewer"), { options: d } = useAssociationFieldContext(), [p, m] = useState({}), h = useCompile(), { designable: x } = useDesignable(), f = useLabelUiSchema$1(d, (a == null ? void 0 : a.label) || "label"), { snapshot: C } = useActionContext(), S = useRef(), { getCollection: b } = useCollectionManager_deprecated(), y = b(d == null ? void 0 : d.target), F = (y == null ? void 0 : y.template) === "tree", [I, k] = useState(!1), w = /* @__PURE__ */ jsx(EllipsisWithTooltip, { ellipsis: !0, ref: S, children: toArr$3(e.value).map((z, O, R) => {
       const j = z == null ? void 0 : z[(a == null ? void 0 : a.label) || "label"], B = F ? transformNestedData(z).map(($) => $ == null ? void 0 : $[(a == null ? void 0 : a.label) || "label"]).join(" / ") : isObject(j) ? JSON.stringify(j) : j, T = toValue$3(h(B), "N/A"), D = getTabFormatValue(h(f), T, z[r]);
       return /* @__PURE__ */ jsxs(Fragment$1, { children: [
         /* @__PURE__ */ jsx("span", { children: C ? D : n !== !1 ? /* @__PURE__ */ jsx(
@@ -33125,8 +33205,8 @@ const CreateRecordAction$1 = forwardRef(InternalCreateRecordAction), initializer
             children: D
           }
         ) : D }),
-        V < R.length - 1 ? /* @__PURE__ */ jsx("span", { style: { marginRight: 4, color: "#aaa" }, children: "," }) : null
-      ] }, `${z == null ? void 0 : z[a.value]}_${V}`);
+        O < R.length - 1 ? /* @__PURE__ */ jsx("span", { style: { marginRight: 4, color: "#aaa" }, children: "," }) : null
+      ] }, `${z == null ? void 0 : z[a.value]}_${O}`);
     }) });
     if (n === !1 || !I)
       return w;
@@ -33139,8 +33219,8 @@ const CreateRecordAction$1 = forwardRef(InternalCreateRecordAction), initializer
         filterProperties: (z) => z["x-component"] === "AssociationField.Viewer"
       }
     ) }) }), N = () => {
-      var V;
-      const z = (V = t == null ? void 0 : t["x-collection-field"]) == null ? void 0 : V.split(".");
+      var O;
+      const z = (O = t == null ? void 0 : t["x-collection-field"]) == null ? void 0 : O.split(".");
       return z && z.length > 2 ? /* @__PURE__ */ jsx(RecordProvider, { record: p, parent: o[z[1]], children: M() }) : /* @__PURE__ */ jsx(RecordProvider, { record: p, parent: o, children: M() });
     };
     return /* @__PURE__ */ jsx("div", { children: /* @__PURE__ */ jsx(BlockAssociationContext.Provider, { value: `${d == null ? void 0 : d.collectionName}.${d == null ? void 0 : d.name}`, children: /* @__PURE__ */ jsxs(CollectionProvider_deprecated, { name: (E = d == null ? void 0 : d.target) != null ? E : d == null ? void 0 : d.targetCollection, children: [
@@ -33325,10 +33405,11 @@ const useTableColumns$1 = (e) => {
     top: 50%;
     transform: translateY(-50%);
   }
+`, floatLeftClass = css`
+  float: left;
 `, rowSelectCheckboxWrapperClass = css`
   position: relative;
   display: flex;
-  float: left;
   align-items: center;
   justify-content: space-evenly;
   padding-right: 8px;
@@ -33363,8 +33444,8 @@ const useTableColumns$1 = (e) => {
   }
 `, HeaderWrapperComponent = (e) => /* @__PURE__ */ jsx(DndContext, { children: /* @__PURE__ */ jsx("thead", g({}, e)) }), HeaderCellComponent = (e) => /* @__PURE__ */ jsx("th", v(g({}, e), { className: cls(e.className, headerClass) })), BodyRowComponent = (e) => /* @__PURE__ */ jsx(SortableRow, g({}, e)), Table$1 = withDynamicSchemaProps(
   observer$1((e) => {
-    var he, ge, xe, fe;
-    const { token: t } = useToken(), pe = omit$1(e, ["onBlur", "onFocus", "value"]), { pagination: o, useProps: n } = pe, r = H(pe, ["pagination", "useProps"]), ye = (n == null ? void 0 : n()) || {}, { pagination: i } = ye, a = H(ye, ["pagination"]), me = g(g({}, r), a), {
+    var me, he, ge, xe;
+    const { token: t } = useToken(), ye = omit$1(e, ["onBlur", "onFocus", "value"]), { pagination: o, useProps: n } = ye, r = H(ye, ["pagination", "useProps"]), de = (n == null ? void 0 : n()) || {}, { pagination: i } = de, a = H(de, ["pagination"]), pe = g(g({}, r), a), {
       dragSort: l = !1,
       showIndex: c = !0,
       onRowSelectionChange: u,
@@ -33375,7 +33456,7 @@ const useTableColumns$1 = (e) => {
       onExpand: x,
       loading: f,
       onClickRow: C
-    } = me, S = H(me, [
+    } = pe, S = H(pe, [
       "dragSort",
       "showIndex",
       "onRowSelectionChange",
@@ -33386,8 +33467,8 @@ const useTableColumns$1 = (e) => {
       "onExpand",
       "loading",
       "onClickRow"
-    ]), b = useArrayField(S), y = useTableColumns$1(S), F = useFieldSchema(), I = useCollection(), A = ((he = F == null ? void 0 : F.parent) == null ? void 0 : he["x-decorator"]) === "TableSelectorProvider" ? useTableSelectorContext() : useTableBlockContext(), { expandFlag: w, allIncludesChildren: M } = A, N = useMemoizedFn(S.onRowDragEnd || (() => {
-    })), E = usePaginationProps$1(o, i), [z, V] = useState(() => w ? M : []), [R, j] = useState(((ge = b == null ? void 0 : b.data) == null ? void 0 : ge.selectedRowKeys) || []), [B, T] = useState([]), D = (p == null ? void 0 : p.type) !== "none", $ = useRef(/* @__PURE__ */ new Map()), q = useMemo(() => css`
+    ]), b = useArrayField(S), y = useTableColumns$1(S), F = useFieldSchema(), I = useCollection(), A = ((me = F == null ? void 0 : F.parent) == null ? void 0 : me["x-decorator"]) === "TableSelectorProvider" ? useTableSelectorContext() : useTableBlockContext(), { expandFlag: w, allIncludesChildren: M } = A, N = useMemoizedFn(S.onRowDragEnd || (() => {
+    })), E = usePaginationProps$1(o, i), [z, O] = useState(() => w ? M : []), [R, j] = useState(((he = b == null ? void 0 : b.data) == null ? void 0 : he.selectedRowKeys) || []), [B, T] = useState([]), D = (p == null ? void 0 : p.type) !== "none", $ = useRef(/* @__PURE__ */ new Map()), q = useMemo(() => css`
         & > td {
           background-color: ${t.controlItemBgActiveHover} !important;
         }
@@ -33397,58 +33478,58 @@ const useTableColumns$1 = (e) => {
       `, [t.controlItemBgActiveHover]), L = useMemo(
       () => C ? q : "",
       [C, t.controlItemBgActiveHover]
-    ), G = useMemo(() => C ? (Z) => ({
-      onClick: (te) => {
-        isPortalInBody(te.target) || C(Z, T, B);
+    ), G = useMemo(() => C ? (ee) => ({
+      onClick: (Z) => {
+        isPortalInBody(Z.target) || C(ee, T, B);
       }
     }) : null, [C, B]);
     useDeepCompareEffect(() => {
-      const Z = w ? M : [];
-      _.isEqual(Z, z) || V(Z);
+      const ee = w ? M : [];
+      _.isEqual(ee, z) || O(ee);
     }, [w, M]);
-    const U = useCallback((Z) => {
-      if (Z.key)
-        return Z.key;
-      if ($.current.has(Z))
-        return $.current.get(Z);
-      const te = uid();
-      return $.current.set(Z, te), te;
+    const U = useCallback((ee) => {
+      if (ee.key)
+        return ee.key;
+      if ($.current.has(ee))
+        return $.current.get(ee);
+      const Z = uid();
+      return $.current.set(ee, Z), Z;
     }, []), K = useCallback(
-      (Z) => {
-        var te, ee;
-        return typeof m == "string" ? (te = Z[m]) == null ? void 0 : te.toString() : (ee = (m != null ? m : U)(Z)) == null ? void 0 : ee.toString();
+      (ee) => {
+        var Z, ne;
+        return typeof m == "string" ? (Z = ee[m]) == null ? void 0 : Z.toString() : (ne = (m != null ? m : U)(ee)) == null ? void 0 : ne.toString();
       },
       [m, U]
-    ), Y = (xe = b == null ? void 0 : b.value) == null ? void 0 : xe.map(K), W = useMemo(() => Y, [JSON.stringify(Y)]), X = useMemo(
+    ), Y = (ge = b == null ? void 0 : b.value) == null ? void 0 : ge.map(K), W = useMemo(() => Y, [JSON.stringify(Y)]), X = useMemo(
       () => [...(b == null ? void 0 : b.value) || []].filter(Boolean),
-      [b == null ? void 0 : b.value, (fe = b == null ? void 0 : b.value) == null ? void 0 : fe.length, W]
-    ), Q = useMemo(() => (Z) => /* @__PURE__ */ jsx(
+      [b == null ? void 0 : b.value, (xe = b == null ? void 0 : b.value) == null ? void 0 : xe.length, W]
+    ), Q = useMemo(() => (ee) => /* @__PURE__ */ jsx(
       DndContext,
       {
-        onDragEnd: (te) => {
-          var Ce, Se, Te, we, Re, De;
-          if (!te.active || !te.over) {
+        onDragEnd: (Z) => {
+          var fe, Ce, Te, we, Re, De;
+          if (!Z.active || !Z.over) {
             console.warn("move cancel");
             return;
           }
-          const ee = (Te = (Se = (Ce = te.active) == null ? void 0 : Ce.data.current) == null ? void 0 : Se.sortable) == null ? void 0 : Te.index, se = (De = (Re = (we = te.over) == null ? void 0 : we.data.current) == null ? void 0 : Re.sortable) == null ? void 0 : De.index, ae = b.value[ee] || te.active, ue = b.value[se] || te.over;
-          b.move(ee, se), N({ from: ae, to: ue });
+          const ne = (Te = (Ce = (fe = Z.active) == null ? void 0 : fe.data.current) == null ? void 0 : Ce.sortable) == null ? void 0 : Te.index, ie = (De = (Re = (we = Z.over) == null ? void 0 : we.data.current) == null ? void 0 : Re.sortable) == null ? void 0 : De.index, le = b.value[ne] || Z.active, Ae = b.value[ie] || Z.over;
+          b.move(ne, ie), N({ from: le, to: Ae });
         },
-        children: /* @__PURE__ */ jsx("tbody", g({}, Z))
+        children: /* @__PURE__ */ jsx("tbody", g({}, ee))
       }
     ), [N, b]), J = useCallback(
-      (Z) => {
-        var ae;
-        const te = (ae = Z.className) == null ? void 0 : ae.includes("selection-column"), { ref: ee, inView: se } = useInView({
+      (ee) => {
+        var le;
+        const Z = (le = ee.className) == null ? void 0 : le.includes("selection-column"), { ref: ne, inView: ie } = useInView({
           threshold: 0,
           triggerOnce: !0,
-          initialInView: te || !1 || X.length <= 10,
-          skip: te || !1
+          initialInView: Z || !1 || X.length <= 10,
+          skip: Z || !1
         });
-        return /* @__PURE__ */ jsx("td", v(g({}, Z), { ref: ee, className: cls(Z.className, cellClass), children: se || te ? Z.children : /* @__PURE__ */ jsx(Skeleton.Button, { style: { height: "100%" } }) }));
+        return /* @__PURE__ */ jsx("td", v(g({}, ee), { ref: ne, className: cls(ee.className, cellClass), children: ie || Z ? ee.children : /* @__PURE__ */ jsx(Skeleton.Button, { style: { height: "100%" } }) }));
       },
       [X.length]
-    ), oe = useMemo(() => ({
+    ), te = useMemo(() => ({
       header: {
         wrapper: HeaderWrapperComponent,
         cell: HeaderCellComponent
@@ -33458,56 +33539,56 @@ const useTableColumns$1 = (e) => {
         row: BodyRowComponent,
         cell: J
       }
-    }), [J, Q]), ne = useMemo(() => p, [JSON.stringify(p)]), re = useMemo(
+    }), [J, Q]), oe = useMemo(() => p, [JSON.stringify(p)]), re = useMemo(
       () => ({
-        rowSelection: ne ? g({
+        rowSelection: oe ? g({
           type: "checkbox",
           selectedRowKeys: R,
-          onChange(Z, te) {
-            b.data = b.data || {}, b.data.selectedRowKeys = Z, j(Z), u == null || u(Z, te);
+          onChange(ee, Z) {
+            b.data = b.data || {}, b.data.selectedRowKeys = ee, j(ee), u == null || u(ee, Z);
           },
-          getCheckboxProps(Z) {
+          getCheckboxProps(ee) {
             return {
               "aria-label": "checkbox"
             };
           },
-          renderCell: (Z, te, ee, se) => {
-            var Ce, Se;
+          renderCell: (ee, Z, ne, ie) => {
+            var fe, Ce;
             if (!l && !c)
-              return se;
-            const ae = (Ce = e == null ? void 0 : e.pagination) == null ? void 0 : Ce.current, ue = ((Se = e == null ? void 0 : e.pagination) == null ? void 0 : Se.pageSize) || 20;
-            return ae ? ee = ee + (ae - 1) * ue + 1 : ee = ee + 1, te.__index && (ee = extractIndex(te.__index)), /* @__PURE__ */ jsxs(
+              return ie;
+            const le = (fe = e == null ? void 0 : e.pagination) == null ? void 0 : fe.current, Ae = ((Ce = e == null ? void 0 : e.pagination) == null ? void 0 : Ce.pageSize) || 20;
+            return le ? ne = ne + (le - 1) * Ae + 1 : ne = ne + 1, Z.__index && (ne = extractIndex(Z.__index)), /* @__PURE__ */ jsxs(
               "div",
               {
                 role: "button",
-                "aria-label": `table-index-${ee}`,
-                className: cls(Z ? "checked" : null, rowSelectCheckboxWrapperClass, {
+                "aria-label": `table-index-${ne}`,
+                className: cls(ee ? "checked" : floatLeftClass, rowSelectCheckboxWrapperClass, {
                   [rowSelectCheckboxWrapperClassHover]: D
                 }),
                 children: [
-                  /* @__PURE__ */ jsxs("div", { className: cls(Z ? "checked" : null, rowSelectCheckboxContentClass), children: [
-                    l && /* @__PURE__ */ jsx(SortHandle$1, { id: K(te) }),
-                    c && /* @__PURE__ */ jsx(TableIndex$2, { index: ee })
+                  /* @__PURE__ */ jsxs("div", { className: cls(ee ? "checked" : null, rowSelectCheckboxContentClass), children: [
+                    l && /* @__PURE__ */ jsx(SortHandle$1, { id: K(Z) }),
+                    c && /* @__PURE__ */ jsx(TableIndex$2, { index: ne })
                   ] }),
                   D && /* @__PURE__ */ jsx(
                     "div",
                     {
                       className: cls(
                         "nb-origin-node",
-                        Z ? "checked" : null,
+                        ee ? "checked" : null,
                         rowSelectCheckboxCheckedClassHover
                       ),
-                      children: se
+                      children: ie
                     }
                   )
                 ]
               }
             );
           }
-        }, ne) : void 0
+        }, oe) : void 0
       }),
       [
-        ne,
+        oe,
         R,
         u,
         c,
@@ -33515,38 +33596,38 @@ const useTableColumns$1 = (e) => {
         b,
         K,
         D,
-        ne
+        oe
       ]
-    ), ie = useCallback(
-      ({ children: Z }) => {
-        var te, ee;
+    ), se = useCallback(
+      ({ children: ee }) => {
+        var Z, ne;
         return l ? React.createElement(
           SortableContext$1,
           {
-            items: ((ee = (te = b.value) == null ? void 0 : te.map) == null ? void 0 : ee.call(te, K)) || []
+            items: ((ne = (Z = b.value) == null ? void 0 : Z.map) == null ? void 0 : ne.call(Z, K)) || []
           },
-          Z
-        ) : React.createElement(React.Fragment, {}, Z);
+          ee
+        ) : React.createElement(React.Fragment, {}, ee);
       },
       [b, l, K]
-    ), { height: le, tableSizeRefCallback: Pe } = useTableSize(), ce = useMemo(() => ({
+    ), { height: ae, tableSizeRefCallback: ce } = useTableSize(), ue = useMemo(() => ({
       x: "max-content"
-    }), []), de = useMemo(() => ({
+    }), []), Pe = useMemo(() => ({
       x: "max-content",
-      y: le
-    }), [le, ce]), Ie = useCallback(
-      (Z) => B.includes(Z[m]) ? L : "",
+      y: ae
+    }), [ae, ue]), Ie = useCallback(
+      (ee) => B.includes(ee[m]) ? L : "",
       [B, L, m]
-    ), be = useCallback(
-      (Z, te) => {
-        const ee = Z ? [...z, te[I.getPrimaryKey()]] : z.filter((se) => te[I.getPrimaryKey()] !== se);
-        V(ee), x == null || x(Z, te);
+    ), Se = useCallback(
+      (ee, Z) => {
+        const ne = ee ? [...z, Z[I.getPrimaryKey()]] : z.filter((ie) => Z[I.getPrimaryKey()] !== ie);
+        O(ne), x == null || x(ee, Z);
       },
       [z, x, I]
-    ), Ae = useMemo(() => ({
-      onExpand: be,
+    ), be = useMemo(() => ({
+      onExpand: Se,
       expandedRowKeys: z
-    }), [z, be]);
+    }), [z, Se]);
     return /* @__PURE__ */ jsxs(
       "div",
       {
@@ -33562,7 +33643,7 @@ const useTableColumns$1 = (e) => {
                 display: flex;
                 flex-direction: column;
                 .ant-table-body {
-                  min-height: ${le}px;
+                  min-height: ${ae}px;
                 }
               }
             }
@@ -33573,26 +33654,26 @@ const useTableColumns$1 = (e) => {
           }
         `,
         children: [
-          /* @__PURE__ */ jsx(ie, { children: /* @__PURE__ */ jsx(
+          /* @__PURE__ */ jsx(se, { children: /* @__PURE__ */ jsx(
             MemoizedAntdTable,
             v(g(g({
-              ref: Pe,
+              ref: ce,
               rowKey: m != null ? m : U,
               dataSource: X,
               tableLayout: "auto"
             }, S), re), {
               loading: f,
               pagination: E,
-              components: oe,
+              components: te,
               onChange: d,
               onRow: G,
               rowClassName: Ie,
-              scroll: de,
+              scroll: Pe,
               columns: y,
-              expandable: Ae
+              expandable: be
             })
           ) }),
-          b.errors.length > 0 && /* @__PURE__ */ jsx("div", { className: "ant-formily-item-error-help ant-formily-item-help ant-formily-item-help-enter ant-formily-item-help-enter-active", children: b.errors.map((Z) => Z.messages.map((te) => /* @__PURE__ */ jsx("div", { children: te }, te))) })
+          b.errors.length > 0 && /* @__PURE__ */ jsx("div", { className: "ant-formily-item-error-help ant-formily-item-help ant-formily-item-help-enter ant-formily-item-help-enter-active", children: b.errors.map((ee) => ee.messages.map((Z) => /* @__PURE__ */ jsx("div", { children: Z }, Z))) })
         ]
       }
     );
@@ -33874,8 +33955,8 @@ AssociationSelect.Designer = function e() {
       label: f((X = W == null ? void 0 : W.uiSchema) == null ? void 0 : X.title) || (W == null ? void 0 : W.name)
     };
   });
-  let V = "editable";
-  u["x-disabled"] === !0 && (V = "readonly"), u["x-read-pretty"] === !0 && (V = "read-pretty");
+  let O = "editable";
+  u["x-disabled"] === !0 && (O = "readonly"), u["x-read-pretty"] === !0 && (O = "read-pretty");
   const R = _.omit(u, "required");
   return /* @__PURE__ */ jsxs(GeneralSchemaDesigner, { children: [
     /* @__PURE__ */ jsx(GeneralSchemaItems, {}),
@@ -33966,17 +34047,17 @@ AssociationSelect.Designer = function e() {
           }
         },
         onSubmit: (W) => {
-          var oe;
+          var te;
           const X = [];
-          for (const ne of W.rules)
-            X.push(_.pickBy(ne, _.identity));
+          for (const oe of W.rules)
+            X.push(_.pickBy(oe, _.identity));
           const Q = {
             "x-uid": u["x-uid"]
           };
           if (["percent"].includes(b == null ? void 0 : b.interface))
-            for (const ne of X)
-              (ne.maxValue || ne.minValue) && (ne.percentMode = !0), ne.percentFormat && (ne.percentFormats = !0);
-          const J = _.concat([], ((oe = b == null ? void 0 : b.uiSchema) == null ? void 0 : oe["x-validator"]) || [], X);
+            for (const oe of X)
+              (oe.maxValue || oe.minValue) && (oe.percentMode = !0), oe.percentFormat && (oe.percentFormats = !0);
+          const J = _.concat([], ((te = b == null ? void 0 : b.uiSchema) == null ? void 0 : te["x-validator"]) || [], X);
           c.validator = J, u["x-validator"] = X, Q["x-validator"] = X, m.emit("patch", {
             schema: Q
           }), h();
@@ -34188,7 +34269,7 @@ AssociationSelect.Designer = function e() {
           { label: d("Readonly"), value: "readonly" },
           { label: d("Easy-reading"), value: "read-pretty" }
         ],
-        value: V,
+        value: O,
         onChange: (W) => {
           const X = {
             "x-uid": u["x-uid"]
@@ -34221,10 +34302,10 @@ AssociationSelect.Designer = function e() {
         options: z,
         value: (Y = (K = c == null ? void 0 : c.componentProps) == null ? void 0 : K.fieldNames) == null ? void 0 : Y.label,
         onChange: (W) => {
-          var J, oe;
+          var J, te;
           const X = {
             "x-uid": u["x-uid"]
-          }, Q = v(g(g({}, (oe = (J = b == null ? void 0 : b.uiSchema) == null ? void 0 : J["x-component-props"]) == null ? void 0 : oe.fieldNames), c.componentProps.fieldNames), {
+          }, Q = v(g(g({}, (te = (J = b == null ? void 0 : b.uiSchema) == null ? void 0 : J["x-component-props"]) == null ? void 0 : te.fieldNames), c.componentProps.fieldNames), {
             label: W
           });
           c.componentProps.fieldNames = Q, u["x-component-props"] = u["x-component-props"] || {}, u["x-component-props"].fieldNames = Q, X["x-component-props"] = u["x-component-props"], m.emit("patch", {
@@ -34251,7 +34332,7 @@ AssociationSelect.Designer = function e() {
   ] });
 };
 AssociationSelect.FilterDesigner = function e() {
-  var I, k, A, w, M, N, E, z, V, R, j;
+  var I, k, A, w, M, N, E, z, O, R, j;
   const { getCollectionFields: t, getInterface: o, getCollectionJoinField: n } = useCollectionManager_deprecated(), { getField: r } = useCollection_deprecated(), { form: i } = useFormBlockContext(), a = useField(), l = useFieldSchema(), { t: c } = useTranslation(), { dn: u, refresh: d } = useDesignable(), p = useCompile(), m = r(l.name) || n(l["x-collection-field"]), h = o(m == null ? void 0 : m.interface), x = (I = h == null ? void 0 : h.validateSchema) == null ? void 0 : I.call(h, l), f = (k = m == null ? void 0 : m.uiSchema) == null ? void 0 : k.title, C = m != null && m.target ? t(m == null ? void 0 : m.target) : [];
   a.title === f || a.title;
   const S = useSortFields(m == null ? void 0 : m.target), b = ((M = (w = (A = a.componentProps) == null ? void 0 : A.service) == null ? void 0 : w.params) == null ? void 0 : M.sort) || [], y = b == null ? void 0 : b.map((B) => B.startsWith("-") ? {
@@ -34406,7 +34487,7 @@ AssociationSelect.FilterDesigner = function e() {
       SchemaSettingsDataScope,
       {
         collectionName: m == null ? void 0 : m.target,
-        defaultFilter: ((V = (z = (E = a.componentProps) == null ? void 0 : E.service) == null ? void 0 : z.params) == null ? void 0 : V.filter) || {},
+        defaultFilter: ((O = (z = (E = a.componentProps) == null ? void 0 : E.service) == null ? void 0 : z.params) == null ? void 0 : O.filter) || {},
         form: i,
         onSubmit: ({ filter: B }) => {
           B = removeNullCondition(B), _.set(a.componentProps, "service.params.filter", B), l["x-component-props"] = a.componentProps, u.emit("patch", {
@@ -35271,7 +35352,7 @@ const validateJSON = {
             }
           }
         },
-        onSubmit: (m) => O(void 0, [m], function* ({ plot: u, title: d, config: p }) {
+        onSubmit: (m) => V(void 0, [m], function* ({ plot: u, title: d, config: p }) {
           n.title = r(d), n.componentProps.plot = u;
           const h = r(JSON.parse(p)), x = h == null ? void 0 : h.data;
           if (typeof x == "function") {
@@ -36242,7 +36323,7 @@ const MarkdownVoidDesigner = () => {
   };
 });
 function parseMarkdown(e) {
-  return O(this, null, function* () {
+  return V(this, null, function* () {
     return e && (yield import("./md-1OKMvqVH.mjs")).default.render(e);
   });
 }
@@ -36308,7 +36389,7 @@ function VariableSelect({
 }) {
   const { t: a } = useTranslation(), [l, c] = useState([]), { wrapSSR: u, componentCls: d, hashId: p } = useStyles$5(), { token: m } = useToken();
   function h(x) {
-    return O(this, null, function* () {
+    return V(this, null, function* () {
       var C;
       const f = x[x.length - 1];
       !((C = f.children) != null && C.length) && !f.isLeaf && f.loadChildren && (yield f.loadChildren(f), t((S) => [...S]));
@@ -36452,7 +36533,7 @@ const MarkdownEditor = (e) => {
   observer$1((e) => {
     const { isDarkTheme: t } = useGlobalTheme(), { componentCls: o, hashId: n } = useStyles$6({ isDarkTheme: t }), { content: r, className: i } = e, a = useField(), l = useFieldSchema(), { dn: c } = useDesignable(), { onSave: u, onCancel: d, form: p } = e, m = useCollectionRecord(), [h, x] = useState(""), f = useVariables(), C = useLocalVariables(), [S, b] = useState(!1);
     useEffect(() => {
-      b(!0), O(void 0, null, function* () {
+      b(!0), V(void 0, null, function* () {
         const k = yield replaceVariableValue(r, f, C), A = yield parseMarkdown(k);
         x(A), b(!1);
       });
@@ -36476,7 +36557,7 @@ const MarkdownEditor = (e) => {
         onCancel: () => {
           a.editable = !1, d == null || d();
         },
-        onSubmit: (I) => O(void 0, null, function* () {
+        onSubmit: (I) => V(void 0, null, function* () {
           var k;
           a.editable = !1, (k = l["x-component-props"]) != null || (l["x-component-props"] = {}), l["x-component-props"].content = I, a.componentProps.content = I, u == null || u(l), c.emit("patch", {
             schema: {
@@ -37154,7 +37235,7 @@ const Menu = observer$1(
       "defaultOpenKeys",
       "children"
     ]), { t: d } = useTranslation(), p = useDesigner(), m = useFieldSchema(), { refresh: h } = useDesignable(), x = useAPIClient(), { render: f } = useSchemaInitializerRender(m["x-initializer"], m["x-initializer-props"]), C = useSideMenuRef(), [S, b] = useState(), [y, F] = useState(() => a || (r ? findKeysByUid(m, r) : [])), [I, k] = useState(!1), [A, w] = useState(() => ["inline", "mix"].includes(o) ? l || y : l), M = useMemo(() => {
-      var V;
+      var O;
       let z;
       if (n) {
         const R = findKeysByUid(m, n);
@@ -37162,7 +37243,7 @@ const Menu = observer$1(
       } else
         z = (y == null ? void 0 : y[0]) || null;
       if (o === "mix" && z) {
-        const R = (V = m.properties) == null ? void 0 : V[z];
+        const R = (O = m.properties) == null ? void 0 : O[z];
         if ((R == null ? void 0 : R["x-component"]) === "Menu.SubMenu")
           return R;
       }
@@ -37710,8 +37791,8 @@ const toValue$1 = (e, t) => e == null ? t : e, ReadPrettyRecordPicker = observer
           "a",
           {
             onClick: (z) => {
-              var V;
-              z.stopPropagation(), z.preventDefault(), l(!0), p(A), (V = S == null ? void 0 : S.current) == null || V.setPopoverVisible(!1);
+              var O;
+              z.stopPropagation(), z.preventDefault(), l(!0), p(A), (O = S == null ? void 0 : S.current) == null || O.setPopoverVisible(!1);
             },
             children: E
           }
@@ -38493,7 +38574,7 @@ const useStyles$3 = genStyleHook("nb-rich-text", (e) => {
   return /* @__PURE__ */ jsx("div", v(g({ className: cls("nb-table-index"), style: { padding: "0 8px 0 16px" } }, o), { children: t + 1 }));
 }, useDefAction = () => ({
   move() {
-    return O(this, null, function* () {
+    return V(this, null, function* () {
     });
   }
 }), TableArray = observer$1(
@@ -38620,7 +38701,7 @@ const useStyles$3 = genStyleHook("nb-rich-text", (e) => {
           ReactDragListView,
           {
             handleSelector: ".drag-handle",
-            onDragEnd: (y, F) => O(void 0, null, function* () {
+            onDragEnd: (y, F) => V(void 0, null, function* () {
               const I = o.value[y], k = o.value[F];
               o.move(y, F), yield h(I, k);
             }),
@@ -38709,7 +38790,7 @@ const useStyles$3 = genStyleHook("nb-rich-text", (e) => {
                       const m = useActionContext();
                       return {
                         run() {
-                          return O(this, null, function* () {
+                          return V(this, null, function* () {
                             m.setVisible(!1);
                           });
                         }
@@ -38727,7 +38808,7 @@ const useStyles$3 = genStyleHook("nb-rich-text", (e) => {
                       const m = useForm(), h = useActionContext();
                       return {
                         run() {
-                          return O(this, null, function* () {
+                          return V(this, null, function* () {
                             const { title: f } = m.values;
                             f && (r.title = f, i.title = f, a.emit("patch", {
                               schema: {
@@ -39114,7 +39195,7 @@ const TableActionColumnDesigner = (e) => {
     "sort-field"
   );
 }, TableBlockDesigner = () => {
-  var A, w, M, N, E, z, V, R, j, B;
+  var A, w, M, N, E, z, O, R, j, B;
   const { name: e, title: t } = useCollection_deprecated(), { getCollectionField: o, getCollection: n } = useCollectionManager_deprecated(), r = useField(), i = useFieldSchema(), { form: a } = useFormBlockContext(), l = useSortFields(e), { service: c } = useTableBlockContext(), { t: u } = useTranslation(), { dn: d } = useDesignable(), p = ((w = (A = i == null ? void 0 : i["x-decorator-props"]) == null ? void 0 : A.params) == null ? void 0 : w.sort) || [], m = ((M = i == null ? void 0 : i["x-decorator-props"]) == null ? void 0 : M.resource) || ((N = i == null ? void 0 : i["x-decorator-props"]) == null ? void 0 : N.association), h = !((E = i == null ? void 0 : i["x-decorator-props"]) != null && E.disableTemplate), x = p == null ? void 0 : p.map((T) => T != null && T.startsWith("-") ? {
     field: T.substring(1),
     direction: "desc"
@@ -39160,7 +39241,7 @@ const TableActionColumnDesigner = (e) => {
       {
         title: u("Enable drag and drop sorting"),
         checked: r.decoratorProps.dragSort,
-        onChange: (T) => O(void 0, null, function* () {
+        onChange: (T) => V(void 0, null, function* () {
           T && y && (yield k.resource("collections.fields", y.collectionName).update({
             filterByTk: y.name,
             values: {
@@ -39180,7 +39261,7 @@ const TableActionColumnDesigner = (e) => {
       SchemaSettingsDataScope,
       {
         collectionName: e,
-        defaultFilter: ((R = (V = i == null ? void 0 : i["x-decorator-props"]) == null ? void 0 : V.params) == null ? void 0 : R.filter) || {},
+        defaultFilter: ((R = (O = i == null ? void 0 : i["x-decorator-props"]) == null ? void 0 : O.params) == null ? void 0 : R.filter) || {},
         form: a,
         onSubmit: I
       }
@@ -39329,11 +39410,11 @@ TableField.ActionBar = observer$1(
 );
 const TableSelectorDesigner = () => {
   var A, w, M, N, E, z;
-  const { name: e, title: t } = useCollection_deprecated(), { getCollectionJoinField: o, getAllCollectionsInheritChain: n } = useCollectionManager_deprecated(), r = useField(), i = useFieldSchema(), { form: a } = useFormBlockContext(), l = useSortFields(e), { service: c, extraFilter: u } = useTableSelectorContext(), { t: d } = useTranslation(), { dn: p } = useDesignable(), m = ((w = (A = i == null ? void 0 : i["x-decorator-props"]) == null ? void 0 : A.params) == null ? void 0 : w.sort) || [], h = recursiveParent$1(i, "CollectionField"), x = o(h == null ? void 0 : h["x-collection-field"]), f = m == null ? void 0 : m.map((V) => V.startsWith("-") ? {
-    field: V.substring(1),
+  const { name: e, title: t } = useCollection_deprecated(), { getCollectionJoinField: o, getAllCollectionsInheritChain: n } = useCollectionManager_deprecated(), r = useField(), i = useFieldSchema(), { form: a } = useFormBlockContext(), l = useSortFields(e), { service: c, extraFilter: u } = useTableSelectorContext(), { t: d } = useTranslation(), { dn: p } = useDesignable(), m = ((w = (A = i == null ? void 0 : i["x-decorator-props"]) == null ? void 0 : A.params) == null ? void 0 : w.sort) || [], h = recursiveParent$1(i, "CollectionField"), x = o(h == null ? void 0 : h["x-collection-field"]), f = m == null ? void 0 : m.map((O) => O.startsWith("-") ? {
+    field: O.substring(1),
     direction: "desc"
   } : {
-    field: V,
+    field: O,
     direction: "asc"
   }), C = useSchemaTemplate(), S = useCollection_deprecated(), { dragSort: b } = r.decoratorProps, y = useRecord(), F = useVariables(), { currentFormCollection: I } = useContext(RecordPickerContext), k = useLocalVariables({ collectionName: I });
   return /* @__PURE__ */ jsxs(GeneralSchemaDesigner, { template: C, title: t || e, disableInitializer: !0, children: [
@@ -39342,12 +39423,12 @@ const TableSelectorDesigner = () => {
       {
         defaultFilter: ((N = (M = i == null ? void 0 : i["x-decorator-props"]) == null ? void 0 : M.params) == null ? void 0 : N.filter) || {},
         form: a,
-        onSubmit: ({ filter: V }) => {
+        onSubmit: ({ filter: O }) => {
           var B;
-          V = removeNullCondition(V);
+          O = removeNullCondition(O);
           const R = r.decoratorProps.params || {};
-          R.filter = V, r.decoratorProps.params = R, i["x-decorator-props"].params = R;
-          let j = _.cloneDeep(V);
+          R.filter = O, r.decoratorProps.params = R, i["x-decorator-props"].params = R;
+          let j = _.cloneDeep(O);
           u && (j ? j = {
             $and: [u, j]
           } : j = u), c.run(v(g({}, (B = c.params) == null ? void 0 : B[0]), { filter: j, page: 1 })), p.emit("patch", {
@@ -39358,14 +39439,14 @@ const TableSelectorDesigner = () => {
           });
         },
         collectionName: e,
-        dynamicComponent: (V) => /* @__PURE__ */ jsx(
+        dynamicComponent: (O) => /* @__PURE__ */ jsx(
           VariableInput,
-          v(g({}, V), {
+          v(g({}, O), {
             form: a,
-            collectionField: V.collectionField,
+            collectionField: O.collectionField,
             record: y,
             shouldChange: getShouldChange({
-              collectionField: V.collectionField,
+              collectionField: O.collectionField,
               variables: F,
               localVariables: k,
               getAllCollectionsInheritChain: n
@@ -39382,11 +39463,11 @@ const TableSelectorDesigner = () => {
         title: d("Tree table"),
         defaultChecked: !0,
         checked: r.decoratorProps.treeTable,
-        onChange: (V) => {
+        onChange: (O) => {
           var j;
-          r.form.clearFormGraph(`${r.address}.*`), r.decoratorProps.treeTable = V, i["x-decorator-props"].treeTable = V;
+          r.form.clearFormGraph(`${r.address}.*`), r.decoratorProps.treeTable = O, i["x-decorator-props"].treeTable = O;
           const R = v(g({}, (j = c.params) == null ? void 0 : j[0]), {
-            tree: V ? !0 : null
+            tree: O ? !0 : null
           });
           p.emit("patch", {
             schema: i
@@ -39470,9 +39551,9 @@ const TableSelectorDesigner = () => {
             }
           }
         },
-        onSubmit: ({ sort: V }) => {
+        onSubmit: ({ sort: O }) => {
           var B;
-          const R = V.map((T) => T.direction === "desc" ? `-${T.field}` : T.field), j = r.decoratorProps.params || {};
+          const R = O.map((T) => T.direction === "desc" ? `-${T.field}` : T.field), j = r.decoratorProps.params || {};
           j.sort = R, r.decoratorProps.params = j, i["x-decorator-props"].params = j, p.emit("patch", {
             schema: {
               "x-uid": i["x-uid"],
@@ -39494,10 +39575,10 @@ const TableSelectorDesigner = () => {
           { label: "100", value: 100 },
           { label: "200", value: 200 }
         ],
-        onChange: (V) => {
+        onChange: (O) => {
           var j;
           const R = r.decoratorProps.params || {};
-          R.pageSize = V, r.decoratorProps.params = R, i["x-decorator-props"].params = R, c.run(v(g({}, (j = c.params) == null ? void 0 : j[0]), { pageSize: V, page: 1 })), p.emit("patch", {
+          R.pageSize = O, r.decoratorProps.params = R, i["x-decorator-props"].params = R, c.run(v(g({}, (j = c.params) == null ? void 0 : j[0]), { pageSize: O, page: 1 })), p.emit("patch", {
             schema: {
               "x-uid": i["x-uid"],
               "x-decorator-props": i["x-decorator-props"]
@@ -39921,7 +40002,7 @@ function Input(e) {
     const D = [f(z), ...d ? [...d] : []].filter(($) => !$.deprecated || (M == null ? void 0 : M[0]) === $[N.value]);
     y(D);
   }, [d, M]);
-  const V = (D) => O(this, null, function* () {
+  const O = (D) => V(this, null, function* () {
     var q;
     const $ = D[D.length - 1];
     if (!((q = $.children) != null && q.length) && !$.isLeaf && $.loadChildren) {
@@ -39947,7 +40028,7 @@ function Input(e) {
     [w, M, o]
   );
   useEffect(() => {
-    O(this, null, function* () {
+    V(this, null, function* () {
       var L;
       if (!M || b.length <= 1)
         return;
@@ -40043,7 +40124,7 @@ function Input(e) {
           options: b,
           value: M != null ? M : ["", ...n || !((T = z.children) != null && T.length) ? [] : [w]],
           onChange: R,
-          loadData: V,
+          loadData: O,
           changeOnSelect: c,
           fieldNames: u,
           disabled: j,
@@ -40278,7 +40359,7 @@ function TextArea(e) {
       C(!1), b(!0), k(getCurrentRange(j)), a(getValue(j));
     },
     [a]
-  ), V = useCallback(
+  ), O = useCallback(
     function(j) {
       j.preventDefault();
       const B = j.clipboardData.getData("text/html") || j.clipboardData.getData("text"), T = sanitizeHTML(B, {
@@ -40337,7 +40418,7 @@ function TextArea(e) {
               onInput: w,
               onBlur: M,
               onKeyDown: N,
-              onPaste: V,
+              onPaste: O,
               onCompositionStart: E,
               onCompositionEnd: z,
               placeholder: e.placeholder,
@@ -40376,7 +40457,7 @@ function TextArea(e) {
   );
 }
 function preloadOptions(e, t) {
-  return O(this, null, function* () {
+  return V(this, null, function* () {
     var n;
     let o = [...e != null ? e : []];
     o = o.filter((r) => !r.deprecated || (t == null ? void 0 : t.includes(r.value))), VARIABLE_RE.lastIndex = 0;
@@ -40763,7 +40844,7 @@ const CollectionResourceActionProvider = (e) => {
   const e = useForm(), t = useActionContext();
   return {
     run() {
-      return O(this, null, function* () {
+      return V(this, null, function* () {
         t.setVisible(!1), e.reset();
       });
     }
@@ -40782,7 +40863,7 @@ const CollectionResourceActionProvider = (e) => {
   const { run: e } = useResourceActionContext(), t = useForm(), o = useActionContext();
   return {
     run() {
-      return O(this, null, function* () {
+      return V(this, null, function* () {
         t.reset(), e(), o.setVisible(!1);
       });
     }
@@ -40791,7 +40872,7 @@ const CollectionResourceActionProvider = (e) => {
   const { resource: e } = useCollection_deprecated();
   return {
     onCardDragEnd(c, u, d) {
-      return O(this, arguments, function* ({ columns: o, groupField: n }, { fromColumnId: r, fromPosition: i }, { toColumnId: a, toPosition: l }) {
+      return V(this, arguments, function* ({ columns: o, groupField: n }, { fromColumnId: r, fromPosition: i }, { toColumnId: a, toPosition: l }) {
         var C, S;
         const p = o.find((b) => b.id === r), m = o.find((b) => b.id === a), h = (C = p == null ? void 0 : p.cards) == null ? void 0 : C[i], x = (S = m == null ? void 0 : m.cards) == null ? void 0 : S[l], f = {
           sourceId: h.id,
@@ -40982,7 +41063,7 @@ const CollectionResourceActionProvider = (e) => {
   const { run: e, params: t, defaultRequest: o } = useResourceActionContext(), n = useForm(), r = useActionContext(), [i, ...a] = t;
   return {
     run() {
-      return O(this, null, function* () {
+      return V(this, null, function* () {
         var d;
         const c = (d = o == null ? void 0 : o.params) == null ? void 0 : d.filter, u = c ? { $and: [c, n.values.filter] } : n.values.filter;
         e(v(g({}, i), { filter: u }), ...a), r.setVisible(!1);
@@ -40993,7 +41074,7 @@ const CollectionResourceActionProvider = (e) => {
   const t = useForm(), o = useField(), n = useActionContext(), { refresh: r } = useResourceActionContext(), { resource: i } = useResourceContext();
   return {
     run() {
-      return O(this, null, function* () {
+      return V(this, null, function* () {
         var l;
         try {
           yield t.submit(), o.data = o.data || {}, o.data.loading = !0;
@@ -41009,7 +41090,7 @@ const CollectionResourceActionProvider = (e) => {
   const t = useForm(), { resource: o } = useResourceContext();
   return {
     run() {
-      return O(this, null, function* () {
+      return V(this, null, function* () {
         var i;
         yield t.submit();
         const r = yield o.create({ values: t.values });
@@ -41023,7 +41104,7 @@ const CollectionResourceActionProvider = (e) => {
   const { resource: o, targetKey: n } = useResourceContext(), { [n]: r } = useRecord();
   return {
     run() {
-      return O(this, null, function* () {
+      return V(this, null, function* () {
         var l;
         yield t.submit();
         const a = yield o.update({ filterByTk: r, values: t.values });
@@ -41035,7 +41116,7 @@ const CollectionResourceActionProvider = (e) => {
   const { resource: e } = useResourceContext(), { refresh: t } = useResourceActionContext();
   return {
     move(n, r) {
-      return O(this, null, function* () {
+      return V(this, null, function* () {
         yield e.move({
           sourceId: n.id,
           targetId: r.id
@@ -41047,7 +41128,7 @@ const CollectionResourceActionProvider = (e) => {
   const t = useField(), o = useForm(), n = useActionContext(), { refresh: r } = useResourceActionContext(), { resource: i, targetKey: a } = useResourceContext(), { [a]: l } = useRecord();
   return {
     run() {
-      return O(this, null, function* () {
+      return V(this, null, function* () {
         var u;
         yield o.submit(), t.data = t.data || {}, t.data.loading = !0;
         try {
@@ -41065,7 +41146,7 @@ const CollectionResourceActionProvider = (e) => {
   const { refresh: t } = useResourceActionContext(), { resource: o, targetKey: n } = useResourceContext(), { [n]: r } = useRecord();
   return {
     run() {
-      return O(this, null, function* () {
+      return V(this, null, function* () {
         yield o.destroy({ filterByTk: r }), e == null || e(r), t();
       });
     }
@@ -41074,7 +41155,7 @@ const CollectionResourceActionProvider = (e) => {
   const { state: t, setState: o, refresh: n } = useResourceActionContext(), { resource: r } = useResourceContext(), { t: i } = useTranslation();
   return {
     run() {
-      return O(this, null, function* () {
+      return V(this, null, function* () {
         var l;
         if (!((l = t == null ? void 0 : t.selectedRowKeys) != null && l.length))
           return message.error(i("Please select the records you want to delete"));
@@ -41093,7 +41174,7 @@ const CollectionResourceActionProvider = (e) => {
   const { run: e } = useCreateAction$1(), { refreshCM: t } = useCollectionManager_deprecated();
   return {
     run() {
-      return O(this, null, function* () {
+      return V(this, null, function* () {
         yield e(), yield t();
       });
     }
@@ -41102,7 +41183,7 @@ const CollectionResourceActionProvider = (e) => {
   const { run: e } = useUpdateAction$1(), { refreshCM: t } = useCollectionManager_deprecated();
   return {
     run() {
-      return O(this, null, function* () {
+      return V(this, null, function* () {
         yield e(), yield t();
       });
     }
@@ -41111,7 +41192,7 @@ const CollectionResourceActionProvider = (e) => {
   const { run: e } = useDestroyAction$2(), { refreshCM: t } = useCollectionManager_deprecated();
   return {
     run() {
-      return O(this, null, function* () {
+      return V(this, null, function* () {
         yield e(), yield t();
       });
     }
@@ -41126,7 +41207,7 @@ const CollectionResourceActionProvider = (e) => {
   const { run: e } = useBulkDestroyAction$2(), { refreshCM: t } = useCollectionManager_deprecated();
   return {
     run() {
-      return O(this, null, function* () {
+      return V(this, null, function* () {
         yield e(), yield t();
       });
     }
@@ -41243,7 +41324,7 @@ const useSelectedRowKeys = () => {
   const e = useContext(DataSourceContext_deprecated), t = useForm(), { setVisible: o } = useActionContext();
   return {
     run() {
-      return O(this, null, function* () {
+      return V(this, null, function* () {
         console.log("form.values", t.values);
         const r = e.dataSource || [];
         r.push(cloneDeep$1(t.values)), e.setDataSource([...r]), o(!1), yield t.reset();
@@ -41254,7 +41335,7 @@ const useSelectedRowKeys = () => {
   const e = useContext(DataSourceContext_deprecated), { selectedRowKeys: t, setSelectedRowKeys: o } = e;
   return {
     run() {
-      return O(this, null, function* () {
+      return V(this, null, function* () {
         const r = e.dataSource || [];
         e.setDataSource(
           r.filter((i, a) => !t.includes(a))
@@ -41266,7 +41347,7 @@ const useSelectedRowKeys = () => {
   const e = useRecordIndex(), t = useForm(), { setVisible: o } = useActionContext(), n = useContext(DataSourceContext_deprecated);
   return {
     run() {
-      return O(this, null, function* () {
+      return V(this, null, function* () {
         const a = ((n == null ? void 0 : n.dataSource) || []).map((l, c) => c === e ? g({}, t.values) : l);
         n.setDataSource([...a]), o(!1);
       });
@@ -41276,7 +41357,7 @@ const useSelectedRowKeys = () => {
   const e = useRecordIndex(), t = useContext(DataSourceContext_deprecated);
   return {
     run() {
-      return O(this, null, function* () {
+      return V(this, null, function* () {
         const n = t.dataSource || [];
         t.setDataSource(
           n.filter((r, i) => e !== i)
@@ -41406,7 +41487,7 @@ const CollectionHistoryProvider = (e) => {
   }, r = useLocation().pathname.startsWith("/admin"), i = t.auth.getToken() || "", { render: a } = useAppSpin(), l = useRequest(o, {
     refreshDeps: [r, i],
     ready: !!(r && i)
-  }), c = () => O(void 0, null, function* () {
+  }), c = () => V(void 0, null, function* () {
     const { data: d } = yield t.request(o);
     return l.mutate(d), (d == null ? void 0 : d.data) || [];
   });
@@ -41433,7 +41514,7 @@ const CollectionHistoryProvider = (e) => {
   }, i = useRequest(() => o.reload().then(n)), a = useRequest(r), { render: l } = useAppSpin();
   if (i.loading)
     return l();
-  const c = () => O(void 0, null, function* () {
+  const c = () => V(void 0, null, function* () {
     const { data: u } = yield t.request(r);
     return a.mutate(u), (u == null ? void 0 : u.data) || [];
   });
@@ -41591,7 +41672,7 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
       {
         showSearch: !0,
         options: l,
-        onDropdownVisibleChange: (x) => O(void 0, null, function* () {
+        onDropdownVisibleChange: (x) => V(void 0, null, function* () {
           var S;
           const { target: f, type: C } = p.values;
           f && x && c(
@@ -41640,7 +41721,7 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
         value: C,
         options: o,
         showSearch: !0,
-        onDropdownVisibleChange: (y) => O(void 0, null, function* () {
+        onDropdownVisibleChange: (y) => V(void 0, null, function* () {
           var w;
           const { target: F, type: I, through: k } = f.values, A = ["belongsTo"].includes(I) ? l || p : ["belongsToMany"].includes(I) ? k : F;
           if (A && y) {
@@ -41853,7 +41934,7 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
   const e = useForm(), { refreshCM: t } = useCollectionManager_deprecated(), o = useActionContext(), { refresh: n } = useResourceActionContext(), { resource: r } = useResourceContext(), i = useField();
   return {
     run() {
-      return O(this, null, function* () {
+      return V(this, null, function* () {
         yield e.submit(), i.data = i.data || {}, i.data.loading = !0;
         const l = cloneDeep$1(e.values);
         l.autoCreateReverseField || delete l.reverseField, delete l.autoCreateReverseField;
@@ -41869,8 +41950,8 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
   const t = useRecord();
   return /* @__PURE__ */ jsx(AddFieldAction, g({ item: t }, e));
 }, AddFieldAction = (e) => {
-  var z, V;
-  const { scope: t, getContainer: o, item: n, children: r, trigger: i, align: a, database: l } = e, { getInterface: c, getTemplate: u, collections: d, getCollection: p } = useCollectionManager_deprecated(), [m, h] = useState(!1), [x, f] = useState(), [C, S] = useState({}), b = useCompile(), { t: y } = useTranslation(), { isDialect: F } = useDialect(), I = useFieldInterfaceOptions(), k = ((V = (z = p(n.name)) == null ? void 0 : z.options) == null ? void 0 : V.fields) || n.fields || [], A = useMemo(() => d.map((R) => ({
+  var z, O;
+  const { scope: t, getContainer: o, item: n, children: r, trigger: i, align: a, database: l } = e, { getInterface: c, getTemplate: u, collections: d, getCollection: p } = useCollectionManager_deprecated(), [m, h] = useState(!1), [x, f] = useState(), [C, S] = useState({}), b = useCompile(), { t: y } = useTranslation(), { isDialect: F } = useDialect(), I = useFieldInterfaceOptions(), k = ((O = (z = p(n.name)) == null ? void 0 : z.options) == null ? void 0 : O.fields) || n.fields || [], A = useMemo(() => d.map((R) => ({
     label: b(R.title),
     value: R.name
   })), []), w = useCallback(() => {
@@ -42073,7 +42154,7 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
   const e = useForm(), { refreshCM: t } = useCollectionManager_deprecated(), o = useActionContext(), { refresh: n } = useResourceActionContext(), { resource: r, targetKey: i } = useResourceContext(), { [i]: a } = useRecord();
   return {
     run() {
-      return O(this, null, function* () {
+      return V(this, null, function* () {
         yield e.submit();
         const c = cloneDeep(e.values);
         c.autoCreateReverseField || delete c.reverseField, delete c.autoCreateReverseField, yield r.update({ filterByTk: a, values: c }), o.setVisible(!1), yield e.reset(), n(), yield t();
@@ -42101,7 +42182,7 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
     /* @__PURE__ */ jsx(
       "a",
       v(g({}, a), {
-        onClick: () => O(void 0, null, function* () {
+        onClick: () => V(void 0, null, function* () {
           var E, z;
           const { data: A } = yield x.resource("collections.fields", n.collectionName).get({
             filterByTk: n.name,
@@ -42209,19 +42290,19 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
   const t = useRecord(), o = useCollectionParentRecordData();
   return /* @__PURE__ */ jsx(OverridingFieldAction, g({ item: t, parentItem: o }, e));
 }, getIsOverriding = (e, t) => e.find((n) => n.name === t.name), OverridingFieldAction = (e) => {
-  const { scope: t, getContainer: o, item: n, parentItem: r, children: i, currentCollection: a } = e, { target: l, through: c } = n, { getInterface: u, getCurrentCollectionFields: d, getChildrenCollections: p, collections: m } = useCollectionManager_deprecated(), [h, x] = useState(!1), [f, C] = useState({}), S = useAPIClient(), { t: b } = useTranslation(), y = useCompile(), F = (E) => {
-    var V;
-    return E && ((V = p(E)) == null ? void 0 : V.map((R) => R.name).concat([E]));
-  }, [I, k] = useState({}), A = d(a), w = getIsOverriding(A, n), M = useMemo(() => m.map((E) => ({
-    label: y(E.title),
-    value: E.name
-  })), []), N = () => {
-    const E = useForm(), { refresh: z } = useResourceActionContext(), { refreshCM: V } = useCollectionManager_deprecated(), R = useActionContext(), { resource: j } = useResourceContext();
+  const { scope: t, getContainer: o, item: n, parentItem: r, children: i, currentCollection: a } = e, { target: l, through: c } = n, { getInterface: u, getCollection: d, getCurrentCollectionFields: p, getChildrenCollections: m, collections: h } = useCollectionManager_deprecated(), [x, f] = useState(!1), [C, S] = useState({}), b = useAPIClient(), { t: y } = useTranslation(), F = useCompile(), I = (O) => {
+    var j;
+    return O && ((j = m(O)) == null ? void 0 : j.map((B) => B.name).concat([O]));
+  }, [k, A] = useState({}), w = p(a), M = getIsOverriding(w, n), N = useMemo(() => h.map((O) => ({
+    label: F(O.title),
+    value: O.name
+  })), []), E = () => {
+    const O = useForm(), { refresh: R } = useResourceActionContext(), { refreshCM: j } = useCollectionManager_deprecated(), B = useActionContext(), { resource: T } = useResourceContext();
     return {
       run() {
-        return O(this, null, function* () {
-          yield E.submit();
-          const T = cloneDeep(E.values), D = omit$1(T, [
+        return V(this, null, function* () {
+          yield O.submit();
+          const $ = cloneDeep(O.values), q = omit$1($, [
             "key",
             "uiSchemaUid",
             "collectionName",
@@ -42233,56 +42314,66 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
             // 'reverseField.key',
             // 'reverseField.uiSchemaUid',
           ]);
-          yield j.create({
-            values: D
-          }), yield E.reset(), yield V(), yield z(), R.setVisible(!1);
+          yield T.create({
+            values: q
+          }), yield O.reset(), yield j(), yield R(), B.setVisible(!1);
         });
       }
     };
-  };
-  return /* @__PURE__ */ jsx(RecordProvider, { record: v(g({}, n), { collectionName: r.name }), parent: r, children: /* @__PURE__ */ jsxs(ActionContextProvider, { value: { visible: h, setVisible: x }, children: [
+  }, z = useMemo(() => {
+    var O;
+    return (n == null ? void 0 : n.fields) || ((O = d(n.collectionName)) == null ? void 0 : O.options.fields.filter((R) => ["string", "bigInt", "integer"].includes(R.type)).map((R) => {
+      var j;
+      return {
+        value: R.name,
+        label: F((j = R.uiSchema) == null ? void 0 : j.title)
+      };
+    }));
+  }, [n.name]);
+  return /* @__PURE__ */ jsx(RecordProvider, { record: v(g({}, n), { collectionName: r.name }), parent: r, children: /* @__PURE__ */ jsxs(ActionContextProvider, { value: { visible: x, setVisible: f }, children: [
     /* @__PURE__ */ jsx(
       "a",
       {
-        disabled: w,
-        onClick: () => O(void 0, null, function* () {
-          var E;
-          if (!w) {
-            const { data: z } = yield S.resource("collections.fields", n.collectionName).get({
+        disabled: M,
+        onClick: () => V(void 0, null, function* () {
+          var O;
+          if (!M) {
+            const { data: R } = yield b.resource("collections.fields", n.collectionName).get({
               filterByTk: n.name,
               appends: ["reverseField"]
             });
-            k(z == null ? void 0 : z.data);
-            const V = u(n.interface), R = cloneDeep(z == null ? void 0 : z.data) || {};
-            R != null && R.reverseField || (R.autoCreateReverseField = !1, R.reverseField = (E = V.default) == null ? void 0 : E.reverseField, set$1(R.reverseField, "name", `f_${uid()}`), set$1(R.reverseField, "uiSchema.title", n.__parent.title));
-            const j = getSchema$6(
-              v(g({}, V), {
-                default: R
+            A(R == null ? void 0 : R.data);
+            const j = u(n.interface), B = cloneDeep(R == null ? void 0 : R.data) || {};
+            B != null && B.reverseField || (B.autoCreateReverseField = !1, B.reverseField = (O = j.default) == null ? void 0 : O.reverseField, set$1(B.reverseField, "name", `f_${uid()}`), set$1(B.reverseField, "uiSchema.title", n.__parent.title));
+            const T = getSchema$6(
+              v(g({}, j), {
+                default: B
               }),
               n,
-              y
+              F
             );
-            C(j), x(!0);
+            S(T), f(!0);
           }
         }),
-        children: i || b("Override")
+        children: i || y("Override")
       }
     ),
     /* @__PURE__ */ jsx(
       SchemaComponent,
       {
-        schema: f,
+        schema: C,
         components: v(g({}, components$1), { ArrayTable }),
         scope: g({
           getContainer: o,
-          useOverridingCollectionField: N,
+          useOverridingCollectionField: E,
           useCancelAction,
-          showReverseFieldConfig: !(I != null && I.reverseField),
+          showReverseFieldConfig: !(k != null && k.reverseField),
           createOnly: !0,
           override: !0,
           isOverride: !0,
-          targetScope: { target: F(l), through: F(c) },
-          collections: M
+          targetScope: { target: I(l), through: I(c) },
+          collections: N,
+          scopeKeyOptions: z
         }, t)
       }
     )
@@ -42344,7 +42435,7 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
     /* @__PURE__ */ jsx(
       "a",
       {
-        onClick: () => O(void 0, null, function* () {
+        onClick: () => V(void 0, null, function* () {
           var k;
           const { data: b } = yield m.resource("collections.fields", n.collectionName).get({
             filterByTk: n.name,
@@ -42491,7 +42582,7 @@ const getSchema$4 = (e, t, o) => {
   const t = useForm(), { refreshCM: o } = useCollectionManager_deprecated(), n = useActionContext(), { refresh: r } = useResourceActionContext(), { resource: i } = useResourceContext(), a = useField();
   return {
     run() {
-      return O(this, null, function* () {
+      return V(this, null, function* () {
         var c;
         a.data = a.data || {}, a.data.loading = !0;
         try {
@@ -42628,7 +42719,7 @@ const getSchema$4 = (e, t, o) => {
   const { refreshCM: t } = useCollectionManager_deprecated(), o = useForm(), n = useActionContext(), { refresh: r } = useResourceActionContext(), { resource: i, targetKey: a } = useResourceContext(), { [a]: l, template: c } = useRecord(), u = useAPIClient(), d = c === "sql" ? u.resource("sqlCollection") : i;
   return {
     run() {
-      return O(this, null, function* () {
+      return V(this, null, function* () {
         yield o.submit(), yield d.update({
           filterByTk: l,
           values: c === "sql" ? o.values : omit(o.values, ["fields"])
@@ -42645,7 +42736,7 @@ const getSchema$4 = (e, t, o) => {
     /* @__PURE__ */ jsx(
       "a",
       v(g({}, i), {
-        onClick: () => O(void 0, null, function* () {
+        onClick: () => V(void 0, null, function* () {
           const x = a(n.template), f = getSchema$3(
             g({}, x),
             n,
@@ -42766,7 +42857,7 @@ const getSchema$4 = (e, t, o) => {
         source: T
       });
     });
-  }, V = [
+  }, O = [
     {
       title: l("Field name"),
       dataIndex: "name",
@@ -42868,7 +42959,7 @@ const getSchema$4 = (e, t, o) => {
         {
           bordered: !0,
           size: "middle",
-          columns: V,
+          columns: O,
           dataSource: d,
           scroll: { y: 300 },
           pagination: !1,
@@ -42903,8 +42994,8 @@ const mapFields = ["lineString", "point", "circle", "polygon"], PreviewTable$1 =
   }, b = (y) => {
     var F;
     return (F = y.filter((I) => I.source || I.interface)) == null ? void 0 : F.map((I) => {
-      var N, E, z, V, R, j;
-      const k = typeof (I == null ? void 0 : I.source) == "string" ? (N = I == null ? void 0 : I.source) == null ? void 0 : N.split(".") : I == null ? void 0 : I.source, A = (z = (E = h(k == null ? void 0 : k[0])) == null ? void 0 : E.find((B) => B.name === (k == null ? void 0 : k[1]))) == null ? void 0 : z.uiSchema, w = ((V = I == null ? void 0 : I.uiSchema) == null ? void 0 : V.title) || (A == null ? void 0 : A.title) || I.name, M = I.source ? A : (j = (R = m(I.interface)) == null ? void 0 : R.default) == null ? void 0 : j.uiSchema;
+      var N, E, z, O, R, j;
+      const k = typeof (I == null ? void 0 : I.source) == "string" ? (N = I == null ? void 0 : I.source) == null ? void 0 : N.split(".") : I == null ? void 0 : I.source, A = (z = (E = h(k == null ? void 0 : k[0])) == null ? void 0 : E.find((B) => B.name === (k == null ? void 0 : k[1]))) == null ? void 0 : z.uiSchema, w = ((O = I == null ? void 0 : I.uiSchema) == null ? void 0 : O.title) || (A == null ? void 0 : A.title) || I.name, M = I.source ? A : (j = (R = m(I.interface)) == null ? void 0 : R.default) == null ? void 0 : j.uiSchema;
       return {
         title: u(w),
         dataIndex: I.name,
@@ -43054,7 +43145,7 @@ const mapFields = ["lineString", "point", "circle", "polygon"], PreviewTable$1 =
   const e = useForm(), { refreshCM: t } = useCollectionManager_deprecated(), o = useActionContext(), { refresh: n } = useResourceActionContext(), { targetKey: r } = useResourceContext(), { [r]: i } = useRecord(), a = useAPIClient(), l = useField();
   return {
     run() {
-      return O(this, null, function* () {
+      return V(this, null, function* () {
         yield e.submit(), l.data = l.data || {}, l.data.loading = !0;
         try {
           yield a.resource("collections").setFields({
@@ -43156,12 +43247,12 @@ const AsyncDataProvider = (e) => {
       const w = /* @__PURE__ */ new Map();
       i || (a && a.length ? Object.entries((a == null ? void 0 : a[0]) || {}).forEach(([E, z]) => {
         var T;
-        const V = l[E], R = inferInterface(E, z), j = (T = C.current(R)) == null ? void 0 : T.default, B = (V == null ? void 0 : V.uiSchema) || (j == null ? void 0 : j.uiSchema) || {};
+        const O = l[E], R = inferInterface(E, z), j = (T = C.current(R)) == null ? void 0 : T.default, B = (O == null ? void 0 : O.uiSchema) || (j == null ? void 0 : j.uiSchema) || {};
         w.set(E, {
           name: E,
-          interface: (V == null ? void 0 : V.interface) || R,
-          type: (V == null ? void 0 : V.type) || (j == null ? void 0 : j.type),
-          source: V == null ? void 0 : V.source,
+          interface: (O == null ? void 0 : O.interface) || R,
+          type: (O == null ? void 0 : O.type) || (j == null ? void 0 : j.type),
+          source: O == null ? void 0 : O.source,
           uiSchema: g({
             title: E
           }, B)
@@ -43194,9 +43285,9 @@ const AsyncDataProvider = (e) => {
       const N = [...t];
       N.splice(M, 1, w), o(N), c.setValue(
         N.map((E) => {
-          var z, V, R;
+          var z, O, R;
           return v(g({}, E), {
-            source: typeof E.source == "string" ? E.source : ((R = (V = (z = E.source) == null ? void 0 : z.filter) == null ? void 0 : V.call(z, Boolean)) == null ? void 0 : R.join(".")) || null
+            source: typeof E.source == "string" ? E.source : ((R = (O = (z = E.source) == null ? void 0 : z.filter) == null ? void 0 : O.call(z, Boolean)) == null ? void 0 : R.join(".")) || null
           });
         })
       );
@@ -43222,13 +43313,13 @@ const AsyncDataProvider = (e) => {
               options: d(f),
               placeholder: e("Select field source"),
               onChange: (z) => {
-                let V = l[z == null ? void 0 : z[1]];
-                V != null && V.interface || (V = m((z == null ? void 0 : z.join(".")) || "")), b(
+                let O = l[z == null ? void 0 : z[1]];
+                O != null && O.interface || (O = m((z == null ? void 0 : z.join(".")) || "")), b(
                   v(g({}, E), {
                     source: z,
-                    interface: V == null ? void 0 : V.interface,
-                    type: V == null ? void 0 : V.type,
-                    uiSchema: V == null ? void 0 : V.uiSchema
+                    interface: O == null ? void 0 : O.interface,
+                    type: O == null ? void 0 : O.type,
+                    uiSchema: O == null ? void 0 : O.uiSchema
                   }),
                   N
                 );
@@ -43251,12 +43342,12 @@ const AsyncDataProvider = (e) => {
               defaultValue: E.interface || "input",
               style: { width: "100%" },
               popupMatchSelectWidth: !1,
-              onChange: (V) => {
+              onChange: (O) => {
                 var j, B, T, D, $;
-                const R = p(V);
+                const R = p(O);
                 b(
                   v(g({}, E), {
-                    interface: V || null,
+                    interface: O || null,
                     uiSchema: v(g({}, (j = R == null ? void 0 : R.default) == null ? void 0 : j.uiSchema), {
                       title: ((T = (B = R == null ? void 0 : R.default) == null ? void 0 : B.uiSchema) == null ? void 0 : T.title) || ((D = E.uiSchema) == null ? void 0 : D.title)
                     }),
@@ -43277,13 +43368,13 @@ const AsyncDataProvider = (e) => {
         key: "title",
         width: 180,
         render: (w, M, N) => {
-          var z, V;
+          var z, O;
           const E = t[N];
           return /* @__PURE__ */ jsx(
             Input$3,
             {
               value: ((z = E.uiSchema) == null ? void 0 : z.title) || w,
-              defaultValue: ((V = E.uiSchema) == null ? void 0 : V.title) !== void 0 ? E.uiSchema.title : E == null ? void 0 : E.name,
+              defaultValue: ((O = E.uiSchema) == null ? void 0 : O.title) !== void 0 ? E.uiSchema.title : E == null ? void 0 : E.name,
               onChange: (R) => b(v(g({}, E), { uiSchema: v(g({}, E == null ? void 0 : E.uiSchema), { title: R.target.value }) }), N)
             }
           );
@@ -43482,7 +43573,7 @@ const AsyncDataProvider = (e) => {
   const t = useForm(), o = useActionContext(), { refreshCM: n } = useCollectionManager_deprecated(), { refresh: r } = useResourceActionContext(), { targetKey: i } = useResourceContext(), { [i]: a } = useRecord(), l = useAPIClient(), c = useField();
   return {
     run() {
-      return O(this, null, function* () {
+      return V(this, null, function* () {
         yield t.submit(), c.data = c.data || {}, c.data.loading = !0;
         try {
           yield l.resource("sqlCollection").setFields({
@@ -43526,7 +43617,7 @@ const AsyncDataProvider = (e) => {
   const { run: e } = useDestroyAction(), { refreshCM: t } = useCollectionManager_deprecated();
   return {
     run() {
-      return O(this, null, function* () {
+      return V(this, null, function* () {
         yield e(), yield t();
       });
     }
@@ -43535,7 +43626,7 @@ const AsyncDataProvider = (e) => {
   const { run: t } = useBulkDestroyAction(), { refreshCM: o } = useCollectionManager_deprecated();
   return {
     run() {
-      return O(this, null, function* () {
+      return V(this, null, function* () {
         yield t(e), yield o();
       });
     }
@@ -43544,7 +43635,7 @@ const AsyncDataProvider = (e) => {
   const { refresh: e } = useResourceActionContext(), { resource: t, targetKey: o } = useResourceContext(), { [o]: n } = useRecord(), r = useForm(), { cascade: i } = (r == null ? void 0 : r.values) || {};
   return {
     run() {
-      return O(this, null, function* () {
+      return V(this, null, function* () {
         yield t.destroy({ filterByTk: n, cascade: i }), e();
       });
     }
@@ -43553,7 +43644,7 @@ const AsyncDataProvider = (e) => {
   const { state: e, setState: t, refresh: o } = useResourceActionContext(), { resource: n } = useResourceContext(), r = useActionContext(), { t: i } = useTranslation(), a = useForm(), { cascade: l } = (a == null ? void 0 : a.values) || {};
   return {
     run(u) {
-      return O(this, null, function* () {
+      return V(this, null, function* () {
         var d, p;
         if (!((d = e == null ? void 0 : e.selectedRowKeys) != null && d.length))
           return message.error(i("Please select the records you want to delete"));
@@ -43703,7 +43794,7 @@ const getSchema$1 = (e) => {
   };
 }, useCreateSubField = () => (useActionContext(), {
   run() {
-    return O(this, null, function* () {
+    return V(this, null, function* () {
     });
   }
 }), AddSubFieldAction = () => {
@@ -43788,7 +43879,7 @@ const getSchema$1 = (e) => {
   const e = useForm(), { run: t } = useUpdateAction$1(), { refreshCM: o } = useCollectionManager_deprecated();
   return {
     run() {
-      return O(this, null, function* () {
+      return V(this, null, function* () {
         var i, a, l;
         yield e.submit();
         const r = ((l = (a = (i = e == null ? void 0 : e.values) == null ? void 0 : i.uiSchema) == null ? void 0 : a.enum) == null ? void 0 : l.slice()) || [];
@@ -43809,7 +43900,7 @@ const getSchema$1 = (e) => {
     /* @__PURE__ */ jsx(
       "a",
       {
-        onClick: () => O(void 0, null, function* () {
+        onClick: () => V(void 0, null, function* () {
           const c = getSchema(v(g({}, o(t.interface)), {
             default: t
           }));
@@ -48407,7 +48498,7 @@ class SqlCollectionTemplate extends CollectionTemplate {
 }
 class MainDataSource extends DataSource {
   getDataSource() {
-    return O(this, null, function* () {
+    return V(this, null, function* () {
       var n;
       const t = yield this.app.apiClient.request({
         resource: "collections",
@@ -48429,7 +48520,7 @@ class MainDataSource extends DataSource {
 }
 class CollectionPlugin extends Plugin {
   load() {
-    return O(this, null, function* () {
+    return V(this, null, function* () {
       this.dataSourceManager.addCollectionMixins([InheritanceCollectionMixin]), this.addFieldInterfaces(), this.addCollectionTemplates(), this.addFieldInterfaces(), this.addFieldInterfaceGroups(), this.addMainDataSource();
     });
   }
@@ -48890,7 +48981,7 @@ const toItems = (e = {}) => {
         l(((f = x == null ? void 0 : x.data) == null ? void 0 : f.map((C) => C["x-uid"])) || []);
       }
     }
-  ), d = o.resource("roles.menuUiSchemas", t.name), p = i.length === a.length, m = (x, f) => O(void 0, null, function* () {
+  ), d = o.resource("roles.menuUiSchemas", t.name), p = i.length === a.length, m = (x, f) => V(void 0, null, function* () {
     const C = getParentUids(n, (b) => b.uid === f.uid), S = getChildrenUids(f == null ? void 0 : f.children, []);
     if (x) {
       const b = S.concat(f.uid), y = a.filter((F) => !b.includes(F));
@@ -48935,7 +49026,7 @@ const toItems = (e = {}) => {
               Checkbox$1,
               {
                 checked: p,
-                onChange: (x) => O(void 0, null, function* () {
+                onChange: (x) => V(void 0, null, function* () {
                   p ? yield d.set({
                     values: []
                   }) : yield d.set({
@@ -48973,7 +49064,7 @@ const PermissionProvider = (e) => {
     {
       value: {
         currentRecord: i,
-        update: (l, c) => O(void 0, null, function* () {
+        update: (l, c) => V(void 0, null, function* () {
           const { path: u, value: d } = l.getState();
           if (["ui.*", "pm", "pm.*"].includes(u)) {
             const p = t.resource("roles.snippets", o.name);
@@ -49044,7 +49135,7 @@ const PermissionProvider = (e) => {
             );
           },
           effects() {
-            onFieldChange("*", (n, r) => O(this, null, function* () {
+            onFieldChange("*", (n, r) => V(this, null, function* () {
               r.modified && (yield e(n, r));
             }));
           }
@@ -49967,8 +50058,8 @@ const RolesResourcesActions = connect((e) => {
                       name: A.name
                     }, z = E.fields || [];
                     if (M) {
-                      const V = z.indexOf(N.name);
-                      z.splice(V, 1);
+                      const O = z.indexOf(N.name);
+                      z.splice(O, 1);
                     } else
                       z.push(N.name);
                     E.fields = z, m[A.name] = E, o(Object.values(m));
@@ -50336,7 +50427,7 @@ const PluginDetail = ({ plugin: e, onCancel: t }) => {
     const u = useForm();
     return {
       run() {
-        return O(this, null, function* () {
+        return V(this, null, function* () {
           yield u.submit(), c.request({
             url: t ? "pm:update" : "pm:add",
             method: "post",
@@ -50444,7 +50535,7 @@ const PluginUploadForm = ({ onClose: e, pluginData: t, isUpgrade: o }) => {
     const c = useForm();
     return {
       run() {
-        return O(this, null, function* () {
+        return V(this, null, function* () {
           var p, m;
           yield c.submit();
           const d = new FormData();
@@ -50523,7 +50614,7 @@ const PluginUploadForm = ({ onClose: e, pluginData: t, isUpgrade: o }) => {
     const c = useForm();
     return {
       run() {
-        return O(this, null, function* () {
+        return V(this, null, function* () {
           const d = c.values.compressedFileUrl;
           if (!d)
             return;
@@ -50710,7 +50801,7 @@ function PluginInfo(e) {
               {
                 disabled: u,
                 title: S("Are you sure to delete this plugin?"),
-                onConfirm: (A) => O(this, null, function* () {
+                onConfirm: (A) => V(this, null, function* () {
                   A.stopPropagation(), b.request({
                     url: "pm:remove",
                     params: {
@@ -50745,7 +50836,7 @@ function PluginInfo(e) {
               "aria-label": "enable",
               size: "small",
               disabled: u || m,
-              onChange: (A, w) => O(this, null, function* () {
+              onChange: (A, w) => V(this, null, function* () {
                 if (w.stopPropagation(), !a && A) {
                   message.error(S("Dependencies check failed, can't enable."));
                   return;
@@ -50757,7 +50848,7 @@ function PluginInfo(e) {
                   }
                 }) : y.confirm({
                   title: S("Are you sure to disable this plugin?"),
-                  onOk: () => O(this, null, function* () {
+                  onOk: () => V(this, null, function* () {
                     yield b.request({
                       url: "pm:disable",
                       params: {
@@ -50816,7 +50907,11 @@ const PluginCard = (e) => {
     r === "upload" && /* @__PURE__ */ jsx(PluginUploadForm, { onClose: e, isUpgrade: !1 }),
     r === "url" && /* @__PURE__ */ jsx(PluginUrlForm, { onClose: e })
   ] });
-}, LocalPlugins = () => {
+};
+function hasIntersection(e, t) {
+  return !Array.isArray(e) || !Array.isArray(t) ? !1 : e.some((o) => t.includes(o));
+}
+const LocalPlugins = () => {
   const { t: e } = useTranslation(), { theme: t } = useStyles$1(), { data: o, loading: n, refresh: r } = useRequest({
     url: "pm:list"
   }), i = useMemo(() => {
@@ -50858,7 +50953,7 @@ const PluginCard = (e) => {
     "Others"
   ], C = useMemo(() => f.map((F) => {
     if (F === "Others") {
-      const k = o == null ? void 0 : o.data.filter((A) => !A.keywords || !A.keywords.every((w) => f.includes(w)));
+      const k = o == null ? void 0 : o.data.filter((A) => !hasIntersection(A.keywords, f));
       return {
         key: F,
         list: k
@@ -51135,7 +51230,7 @@ const AdminSettingsLayout = () => {
 };
 class PMPlugin extends Plugin {
   load() {
-    return O(this, null, function* () {
+    return V(this, null, function* () {
       this.addComponents(), this.addRoutes(), this.addSettings();
     });
   }
@@ -51203,7 +51298,7 @@ const SettingCenterProvider = (e) => {
         c((f == null ? void 0 : f.data) || []);
       }
     }
-  ), h = n.resource("roles.snippets", o.name), x = (f, C) => O(void 0, null, function* () {
+  ), h = n.resource("roles.snippets", o.name), x = (f, C) => V(void 0, null, function* () {
     const b = getChildrenKeys(C == null ? void 0 : C.children, []).concat(C.aclSnippet);
     f ? (yield h.add({
       values: b.map((y) => "!" + y)
@@ -51234,7 +51329,7 @@ const SettingCenterProvider = (e) => {
               Checkbox$1,
               {
                 checked: u,
-                onChange: () => O(void 0, null, function* () {
+                onChange: () => V(void 0, null, function* () {
                   const f = a.map((C) => "!" + C);
                   u ? yield h.add({
                     values: f
@@ -51281,7 +51376,7 @@ const SettingCenterProvider = (e) => {
 }, ACLPane = () => /* @__PURE__ */ jsx(Card, { "data-testid": "acl-pane-card", bordered: !1, children: /* @__PURE__ */ jsx(SchemaComponent, { components, schema: schema2 }) });
 class ACLPlugin extends Plugin {
   load() {
-    return O(this, null, function* () {
+    return V(this, null, function* () {
       this.app.addComponents({
         ACLCollectionFieldProvider,
         ACLActionProvider,
@@ -51489,7 +51584,7 @@ function AntdConfigProvider(e) {
 }
 class AntdConfigPlugin extends Plugin {
   load() {
-    return O(this, null, function* () {
+    return V(this, null, function* () {
       var t;
       this.app.use(AntdConfigProvider, ((t = this.options) == null ? void 0 : t.config) || {});
     });
@@ -51573,7 +51668,7 @@ const PinnedPluginListProvider = (e) => {
 };
 class PinnedListPlugin extends Plugin {
   load() {
-    return O(this, null, function* () {
+    return V(this, null, function* () {
       this.app.use(PinnedPluginListProvider, this.options.config);
     });
   }
@@ -51742,8 +51837,8 @@ const useMenuProps = () => {
     var M, N, E;
     const w = ((N = Object.values(((M = C == null ? void 0 : C.root) == null ? void 0 : M.properties) || {}).shift()) == null ? void 0 : N.properties) || ((E = I == null ? void 0 : I.data) == null ? void 0 : E.properties);
     if (x.current) {
-      const z = w && Object.values(w).find((R) => R["x-uid"] === c.name && R["x-component"] === "Menu.Item"), V = u == null ? void 0 : u.pathname.includes("/settings");
-      z || V ? x.current.style.display = "none" : x.current.style.display = "block";
+      const z = w && Object.values(w).find((R) => R["x-uid"] === c.name && R["x-component"] === "Menu.Item"), O = u == null ? void 0 : u.pathname.includes("/settings");
+      z || O ? x.current.style.display = "none" : x.current.style.display = "block";
     }
   }, [I == null ? void 0 : I.data, c.name, x]);
   const A = useMemo(() => {
@@ -52023,12 +52118,12 @@ const useMenuProps = () => {
 }, AdminProvider = (e) => /* @__PURE__ */ jsx(CurrentAppInfoProvider, { children: /* @__PURE__ */ jsx(NavigateIfNotSignIn, { children: /* @__PURE__ */ jsx(RemoteSchemaTemplateManagerProvider, { children: /* @__PURE__ */ jsx(RemoteCollectionManagerProvider, { children: /* @__PURE__ */ jsx(VariablesProvider, { children: /* @__PURE__ */ jsx(ACLRolesCheckProvider, { children: e.children }) }) }) }) }) }), AdminLayout = (e) => /* @__PURE__ */ jsx(AdminProvider, { children: /* @__PURE__ */ jsx(InternalAdminLayout, g({}, e)) });
 class AdminLayoutPlugin extends Plugin {
   afterAdd() {
-    return O(this, null, function* () {
+    return V(this, null, function* () {
       yield this.app.pm.add(RemoteSchemaTemplateManagerPlugin);
     });
   }
   load() {
-    return O(this, null, function* () {
+    return V(this, null, function* () {
       this.app.addComponents({ AdminLayout, AdminDynamicPage });
     });
   }
@@ -52581,7 +52676,7 @@ const ActionInitializerItem = (e) => {
     ), F = x || (i == null ? void 0 : i.targetKey) || "id", I = f || ((L = (q = a["x-component-props"]) == null ? void 0 : q.fieldNames) == null ? void 0 : L.label) || F, k = {
       title: I || F,
       key: F
-    }, [A, w] = useState([]), [M, N] = useState([]), [E, z] = useState(!0), V = useLabelUiSchema(i, (k == null ? void 0 : k.title) || "label");
+    }, [A, w] = useState([]), [M, N] = useState([]), [E, z] = useState(!0), O = useLabelUiSchema(i, (k == null ? void 0 : k.title) || "label");
     if (!i)
       return null;
     const R = (K) => {
@@ -52648,7 +52743,7 @@ const ActionInitializerItem = (e) => {
                 treeData: u,
                 onSelect: j,
                 fieldNames: k,
-                titleRender: (K) => /* @__PURE__ */ jsx(EllipsisWithTooltip, { ellipsis: !0, children: getLabelFormatValue(V, c(K[I])) }),
+                titleRender: (K) => /* @__PURE__ */ jsx(EllipsisWithTooltip, { ellipsis: !0, children: getLabelFormatValue(O, c(K[I])) }),
                 selectedKeys: M,
                 blockNode: !0
               }
@@ -52965,7 +53060,7 @@ AssociationFilter.useAssociationField = () => {
 };
 class AssociationFilterPlugin extends Plugin {
   load() {
-    return O(this, null, function* () {
+    return V(this, null, function* () {
       this.app.schemaInitializerManager.add(associationFilterFilterBlockInitializer), this.app.schemaInitializerManager.add(filterCollapseItemInitializer_deprecated), this.app.schemaInitializerManager.add(filterCollapseItemInitializer), this.app.schemaInitializerManager.add(associationFilterInitializer);
     });
   }
@@ -53063,7 +53158,7 @@ const AssociationFilterDesignerDelete = () => {
     v(g({
       icon: /* @__PURE__ */ jsx(TableOutlined, {})
     }, r), {
-      onClick: (h) => O(void 0, [h], function* ({ item: m }) {
+      onClick: (h) => V(void 0, [h], function* ({ item: m }) {
         if (m.template) {
           const x = yield a(m);
           i(x);
@@ -53159,7 +53254,7 @@ const RecordAssociationDetailsBlockInitializer = () => {
     v(g({
       icon: /* @__PURE__ */ jsx(FormOutlined, {})
     }, r), {
-      onClick: (h) => O(void 0, [h], function* ({ item: m }) {
+      onClick: (h) => V(void 0, [h], function* ({ item: m }) {
         if (m.template) {
           const x = yield a(m);
           i(x);
@@ -53230,10 +53325,7 @@ function createCreateFormBlockUISchema(e) {
             "x-initializer": "createForm:configureActions",
             "x-component": "ActionBar",
             "x-component-props": {
-              layout: "one-column",
-              style: {
-                marginTop: "var(--nb-spacing)"
-              }
+              layout: "one-column"
             }
           }
         }
@@ -53248,7 +53340,7 @@ const RecordAssociationFormBlockInitializer = () => {
     v(g({
       icon: /* @__PURE__ */ jsx(FormOutlined, {})
     }, r), {
-      onClick: (h) => O(void 0, [h], function* ({ item: m }) {
+      onClick: (h) => V(void 0, [h], function* ({ item: m }) {
         if (m.template) {
           const x = yield l(m);
           if (m.template.componentName === "FormItem") {
@@ -53380,7 +53472,7 @@ const createGridCardBlockUISchema = (e) => {
     v(g({
       icon: /* @__PURE__ */ jsx(TableOutlined, {})
     }, r), {
-      onClick: (h) => O(void 0, [h], function* ({ item: m }) {
+      onClick: (h) => V(void 0, [h], function* ({ item: m }) {
         if (m.template) {
           const x = yield a(m);
           i(x);
@@ -53469,10 +53561,7 @@ const createListBlockUISchema = (e) => {
                 "x-component": "ActionBar",
                 "x-use-component-props": "useListActionBarProps",
                 "x-component-props": {
-                  layout: "one-column",
-                  style: {
-                    marginTop: "var(--nb-spacing)"
-                  }
+                  layout: "one-column"
                 }
               }
             }
@@ -53488,7 +53577,7 @@ const createListBlockUISchema = (e) => {
     v(g({
       icon: /* @__PURE__ */ jsx(TableOutlined, {})
     }, r), {
-      onClick: (h) => O(void 0, [h], function* ({ item: m }) {
+      onClick: (h) => V(void 0, [h], function* ({ item: m }) {
         if (m.template) {
           const x = yield a(m);
           i(x);
@@ -53577,7 +53666,7 @@ const RecordReadPrettyAssociationFormBlockInitializer = () => {
     v(g({
       icon: /* @__PURE__ */ jsx(FormOutlined, {})
     }, r), {
-      onClick: (x) => O(void 0, [x], function* ({ item: h }) {
+      onClick: (x) => V(void 0, [x], function* ({ item: h }) {
         if (h.template) {
           const f = yield l(h);
           if (h.template.componentName === "ReadPrettyFormItem") {
@@ -54030,7 +54119,7 @@ const SelectActionInitializer = (e) => {
     v(g({}, c), {
       icon: /* @__PURE__ */ jsx(TableOutlined, {}),
       componentType: n,
-      onCreateBlockSchema: (d) => O(void 0, null, function* () {
+      onCreateBlockSchema: (d) => V(void 0, null, function* () {
         if (r)
           return r(d);
         u(d);
@@ -54247,7 +54336,7 @@ function useCreateSingleDetailsSchema() {
     [o]
   );
   return { createSingleDetailsSchema: useCallback(
-    (a) => O(this, [a], function* ({ item: i }) {
+    (a) => V(this, [a], function* ({ item: i }) {
       if (i.template) {
         const l = yield t(i);
         e(n(l, { item: i }));
@@ -54398,10 +54487,7 @@ function createEditFormBlockUISchema(e) {
             "x-initializer": "editForm:configureActions",
             "x-component": "ActionBar",
             "x-component-props": {
-              layout: "one-column",
-              style: {
-                marginTop: "var(--nb-spacing)"
-              }
+              layout: "one-column"
             }
           }
         }
@@ -54416,7 +54502,7 @@ const RecordFormBlockInitializer = () => {
     v(g({
       icon: /* @__PURE__ */ jsx(FormOutlined, {})
     }, o), {
-      onClick: (p) => O(void 0, [p], function* ({ item: d }) {
+      onClick: (p) => V(void 0, [p], function* ({ item: d }) {
         if (d.template) {
           const m = yield r(d);
           n(c(m, { item: d }));
@@ -54721,7 +54807,7 @@ const commonOptions$e = {
     v(g({}, l), {
       icon: /* @__PURE__ */ jsx(OrderedListOutlined, {}),
       componentType: "GridCard",
-      onCreateBlockSchema: (u) => O(void 0, null, function* () {
+      onCreateBlockSchema: (u) => V(void 0, null, function* () {
         if (n)
           return n(u);
         c(u);
@@ -54926,7 +55012,7 @@ const commonOptions$e = {
     v(g({}, l), {
       icon: /* @__PURE__ */ jsx(OrderedListOutlined, {}),
       componentType: "List",
-      onCreateBlockSchema: (u) => O(void 0, null, function* () {
+      onCreateBlockSchema: (u) => V(void 0, null, function* () {
         if (n)
           return n(u);
         c(u);
@@ -55092,7 +55178,7 @@ const commonOptions$e = {
     v(g({
       icon: /* @__PURE__ */ jsx(FormOutlined, {})
     }, r), {
-      onClick: () => O(void 0, null, function* () {
+      onClick: () => V(void 0, null, function* () {
         i(
           createTableSelectorUISchema({
             rowKey: a.filterTargetKey,
@@ -55143,7 +55229,7 @@ const commonOptions$e = {
       onlyCurrentDataSource: t,
       icon: /* @__PURE__ */ jsx(TableOutlined, {}),
       componentType: "FilterCollapse",
-      onCreateBlockSchema: (a) => O(void 0, [a], function* ({ item: i }) {
+      onCreateBlockSchema: (a) => V(void 0, [a], function* ({ item: i }) {
         const l = createCollapseBlockSchema({
           dataSource: i.dataSource,
           collectionName: i.collectionName || i.name,
@@ -55219,8 +55305,7 @@ const commonOptions$e = {
             "x-component-props": {
               layout: "one-column",
               style: {
-                float: "right",
-                marginTop: "var(--nb-spacing)"
+                float: "right"
               }
             }
           }
@@ -55431,7 +55516,7 @@ const commonOptions$e = {
   const e = {}, t = useSchemaInitializerItem();
   return /* @__PURE__ */ jsx(InitializerWithSwitch, v(g({}, t), { schema: e, item: t, type: "x-collection-field" }));
 }, LinkMenuItem = () => {
-  const { insert: e } = useSchemaInitializer(), { t } = useTranslation(), o = useContext(SchemaOptionsContext), { theme: n } = useGlobalTheme(), { styles: r } = useStyles$4(), i = useCallback(() => O(void 0, null, function* () {
+  const { insert: e } = useSchemaInitializer(), { t } = useTranslation(), o = useContext(SchemaOptionsContext), { theme: n } = useGlobalTheme(), { styles: r } = useStyles$4(), i = useCallback(() => V(void 0, null, function* () {
     const a = yield FormDialog(
       t("Add link"),
       () => /* @__PURE__ */ jsx(SchemaComponentOptions, { scope: o.scope, components: g({}, o.components), children: /* @__PURE__ */ jsx(FormLayout, { layout: "vertical", children: /* @__PURE__ */ jsx(
@@ -55486,7 +55571,7 @@ const commonOptions$e = {
   }), [e, o.components, o.scope, t, n]);
   return /* @__PURE__ */ jsx(SchemaInitializerItem, { title: t("Link"), onClick: i, className: r.menuItem });
 }, PageMenuItem = () => {
-  const { insert: e } = useSchemaInitializer(), { t } = useTranslation(), o = useContext(SchemaOptionsContext), { theme: n } = useGlobalTheme(), { styles: r } = useStyles$4(), i = useCallback(() => O(void 0, null, function* () {
+  const { insert: e } = useSchemaInitializer(), { t } = useTranslation(), o = useContext(SchemaOptionsContext), { theme: n } = useGlobalTheme(), { styles: r } = useStyles$4(), i = useCallback(() => V(void 0, null, function* () {
     const a = yield FormDialog(
       t("Add page"),
       () => /* @__PURE__ */ jsx(SchemaComponentOptions, { scope: o.scope, components: g({}, o.components), children: /* @__PURE__ */ jsx(FormLayout, { layout: "vertical", children: /* @__PURE__ */ jsx(
@@ -55550,7 +55635,7 @@ const commonOptions$e = {
   }), [e, o.components, o.scope, t, n]);
   return /* @__PURE__ */ jsx(SchemaInitializerItem, { title: t("Page"), onClick: i, className: r.menuItem });
 }, GroupItem = () => {
-  const { insert: e } = useSchemaInitializer(), { t } = useTranslation(), o = useContext(SchemaOptionsContext), { theme: n } = useGlobalTheme(), { styles: r } = useStyles$4(), i = useCallback(() => O(void 0, null, function* () {
+  const { insert: e } = useSchemaInitializer(), { t } = useTranslation(), o = useContext(SchemaOptionsContext), { theme: n } = useGlobalTheme(), { styles: r } = useStyles$4(), i = useCallback(() => V(void 0, null, function* () {
     const a = yield FormDialog(
       t("Add group"),
       () => /* @__PURE__ */ jsx(SchemaComponentOptions, { scope: o.scope, components: g({}, o.components), children: /* @__PURE__ */ jsx(FormLayout, { layout: "vertical", children: /* @__PURE__ */ jsx(
@@ -56020,7 +56105,7 @@ const commonOptions$2 = {
     let h = a;
     return h || (h = "popup:common:addBlock", n || !c ? h = "popup:addNew:addBlock" : r && (h = "popup:bulkEdit:addBlock")), {
       run() {
-        return O(this, null, function* () {
+        return V(this, null, function* () {
           yield p.submit();
           const { title: f, icon: C } = p.values;
           o({
@@ -56092,7 +56177,7 @@ const commonOptions$2 = {
                         const p = useActionContext();
                         return {
                           run() {
-                            return O(this, null, function* () {
+                            return V(this, null, function* () {
                               p.setVisible(!1);
                             });
                           }
@@ -56135,7 +56220,7 @@ const commonOptions$2 = {
 });
 class SchemaInitializerPlugin extends Plugin {
   load() {
-    return O(this, null, function* () {
+    return V(this, null, function* () {
       this.app.addComponents(v(g(g({}, initializerComponents), items), {
         DestroyActionInitializer,
         FormBlockInitializer,
@@ -56176,7 +56261,7 @@ class LocalePlugin extends Plugin {
     P(this, "locales", {});
   }
   afterAdd() {
-    return O(this, null, function* () {
+    return V(this, null, function* () {
       var r, i, a, l, c, u, d;
       const o = this.app.apiClient, n = o.auth.locale;
       try {
@@ -56378,7 +56463,7 @@ const AppSpin = () => /* @__PURE__ */ jsx(Spin, { style: { position: "fixed", to
 };
 class NocoBaseBuildInPlugin extends Plugin {
   afterAdd() {
-    return O(this, null, function* () {
+    return V(this, null, function* () {
       this.app.addComponents({
         AppSpin,
         AppError,
@@ -56389,7 +56474,7 @@ class NocoBaseBuildInPlugin extends Plugin {
     });
   }
   load() {
-    return O(this, null, function* () {
+    return V(this, null, function* () {
       this.addComponents(), this.addRoutes(), this.app.use(CurrentUserProvider), this.app.use(CurrentUserSettingsMenuProvider);
     });
   }
@@ -56417,7 +56502,7 @@ class NocoBaseBuildInPlugin extends Plugin {
     });
   }
   addPlugins() {
-    return O(this, null, function* () {
+    return V(this, null, function* () {
       yield this.app.pm.add(AssociationFilterPlugin), yield this.app.pm.add(LocalePlugin, { name: "builtin-locale" }), yield this.app.pm.add(AdminLayoutPlugin, { name: "admin-layout" }), yield this.app.pm.add(SystemSettingsPlugin, { name: "system-setting" }), yield this.app.pm.add(PinnedListPlugin, {
         name: "pinned-list",
         config: {
@@ -56629,7 +56714,6 @@ export {
   DatePicker,
   DatePickerProvider,
   DatetimeFieldInterface,
-  DeclareVariable,
   DefaultValueProvider,
   DeleteCollection,
   DeleteCollectionAction,
@@ -56676,7 +56760,10 @@ export {
   FilterAssociatedFields,
   FilterBlockProvider,
   FilterBlockType,
+  FilterContext$1 as FilterContext,
+  FilterDynamicComponent,
   FilterFormBlockProvider,
+  FilterLogicContext,
   FilterParentCollectionFields,
   FixedBlock,
   FixedBlockDesignerItem,
@@ -56799,6 +56886,7 @@ export {
   RemoteSchemaTemplateManagerProvider,
   RemoteSelect,
   RemoveButton,
+  RemoveConditionContext,
   RenderChildrenWithAssociationFilter,
   RequestSettings,
   Resizable,
@@ -56964,6 +57052,7 @@ export {
   UrlFieldInterface,
   Variable,
   VariableInput,
+  VariablePopupRecordProvider,
   VariableScopeProvider,
   VariablesContext,
   VariablesProvider,