@nocobase/client 1.6.34 → 1.6.36

package/es/index.mjs

@@ -8767,7 +8767,7 @@ const SchemaInitializerSubMenuContext = React.createContext({}), SchemaInitializ
         /* @__PURE__ */ jsx(Button, { type: "primary", href: "https://github.com/nocobase/nocobase/issues", target: "_blank", children: n("Feedback") }, "feedback"),
         /* @__PURE__ */ jsx(Button, { loading: o, onClick: r, children: n("Download logs") }, "log")
       ],
-      children: /* @__PURE__ */ jsx(Paragraph, { copyable: !0, children: /* @__PURE__ */ jsx(Text$1, { type: "danger", style: { whiteSpace: "pre-line", textAlign: "center" }, children: e.stack }) })
+      children: /* @__PURE__ */ jsx(Paragraph, { copyable: { text: e.stack }, children: /* @__PURE__ */ jsx(Text$1, { type: "danger", style: { whiteSpace: "pre-line", textAlign: "center" }, children: e.stack }) })
     }
   ) });
 };
@@ -9210,7 +9210,7 @@ function addAppVersion(e, t) {
       addAppVersion((o = e.properties) == null ? void 0 : o[n], t);
     }), e;
 }
-const name = "@nocobase/client", version = "1.6.34", license = "AGPL-3.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
+const name = "@nocobase/client", version = "1.6.36", license = "AGPL-3.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
   "@ahooksjs/use-url-state": "3.5.1",
   "@ant-design/cssinjs": "^1.11.1",
   "@ant-design/icons": "^5.6.1",
@@ -9231,9 +9231,9 @@ const name = "@nocobase/client", version = "1.6.34", license = "AGPL-3.0", main
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "1.6.34",
-  "@nocobase/sdk": "1.6.34",
-  "@nocobase/utils": "1.6.34",
+  "@nocobase/evaluators": "1.6.36",
+  "@nocobase/sdk": "1.6.36",
+  "@nocobase/utils": "1.6.36",
   ahooks: "^3.7.2",
   antd: "5.12.8",
   "antd-style": "3.7.1",
@@ -10351,9 +10351,9 @@ const TableCellRender = ({ record: e, columnSchema: t, uiSchema: n, filterProper
   }, [S, l, o, c, e.showDel, a]);
 }, SortableRow$1 = (e) => {
   var m, g, f, C, b, S;
-  const { token: t } = useToken$1(), n = (m = e["data-row-key"]) == null ? void 0 : m.toString(), { setNodeRef: o, isOver: r, active: i, over: a } = useSortable({
+  const { token: t } = useToken$1(), n = (m = e["data-row-key"]) == null ? void 0 : m.toString(), { setNodeRef: o, active: r, over: i } = useSortable({
     id: n
-  }), h = e, { rowIndex: l } = h, c = Y(h, ["rowIndex"]), u = useMemo(() => {
+  }), a = (i == null ? void 0 : i.id) == n, h = e, { rowIndex: l } = h, c = Y(h, ["rowIndex"]), u = useMemo(() => {
     const y = new TinyColor(t.colorSettings).setAlpha(0.6).toHex8String();
     return {
       topActiveClass: css`
@@ -10367,15 +10367,15 @@ const TableCellRender = ({ record: e, columnSchema: t, uiSchema: n, filterProper
         }
       `
     };
-  }, [t.colorSettings]), d = ((f = (g = i == null ? void 0 : i.data.current) == null ? void 0 : g.sortable.index) != null ? f : -1) > ((S = (b = (C = a == null ? void 0 : a.data.current) == null ? void 0 : C.sortable) == null ? void 0 : b.index) != null ? S : -1) ? u.topActiveClass : u.bottomActiveClass;
+  }, [t.colorSettings]), d = ((f = (g = r == null ? void 0 : r.data.current) == null ? void 0 : g.sortable.index) != null ? f : -1) > ((S = (b = (C = i == null ? void 0 : i.data.current) == null ? void 0 : C.sortable) == null ? void 0 : b.index) != null ? S : -1) ? u.topActiveClass : u.bottomActiveClass;
   return /* @__PURE__ */ jsx(
     "tr",
     P(x({
       ref: (y) => {
-        (i == null ? void 0 : i.id) !== n && o(y);
+        (r == null ? void 0 : r.id) !== n && o(y);
       }
     }, c), {
-      className: cls(e.className, { [d]: i && r })
+      className: cls(e.className, { [d]: r && a })
     })
   );
 }, SortHandle$2 = (e) => {
@@ -10658,7 +10658,7 @@ const Table$2 = withDynamicSchemaProps(
         "onClickRow",
         "value"
       ]), y = useArrayField$1(S), v = useFieldSchema(), { size: F = "small" } = (v == null ? void 0 : v["x-component-props"]) || {}, I = useCollection(), T = ((Ce = v == null ? void 0 : v.parent) == null ? void 0 : Ce["x-decorator"]) === "TableSelectorProvider" ? useTableSelectorContext() : useTableBlockContext(), { expandFlag: D, allIncludesChildren: O } = T, j = useMemoizedFn(S.onRowDragEnd || (() => {
-      })), N = usePaginationProps$3(n, i, e), B = useTableColumns$2(S, N), [w, M] = useState(() => D ? O : []), [$, k] = useState(((be = y == null ? void 0 : y.data) == null ? void 0 : be.selectedRowKeys) || []), [z, E] = useState([]), q = (p == null ? void 0 : p.type) !== "none", L = useRef(/* @__PURE__ */ new Map()), G = useMemo(() => css`
+      })), N = usePaginationProps$3(n, i, e), B = useTableColumns$2(S, N), [w, M] = useState(() => D ? O : []), [$, k] = useState(((be = y == null ? void 0 : y.data) == null ? void 0 : be.selectedRowKeys) || []), [z, L] = useState([]), q = (p == null ? void 0 : p.type) !== "none", E = useRef(/* @__PURE__ */ new Map()), G = useMemo(() => css`
           & > td {
             background-color: ${t.controlItemBgActive} !important;
           }
@@ -10674,7 +10674,7 @@ const Table$2 = withDynamicSchemaProps(
       }, [U == null ? void 0 : U.field]);
       const H = useMemo(() => C ? G : "", [G, C]), J = useMemo(() => C ? (Q, te) => ({
         onClick: (oe) => {
-          isPortalInBody(oe.target) || C(Q, E, z);
+          isPortalInBody(oe.target) || C(Q, L, z);
         },
         rowIndex: te,
         record: Q
@@ -10691,10 +10691,10 @@ const Table$2 = withDynamicSchemaProps(
           return W(Q);
         if (Q.key)
           return Q.key;
-        if (L.current.has(Q))
-          return L.current.get(Q);
+        if (E.current.has(Q))
+          return E.current.get(Q);
         const te = uid();
-        return L.current.set(Q, te), te;
+        return E.current.set(Q, te), te;
       }, []), W = useCallback(
         (Q) => {
           var te;
@@ -11425,12 +11425,12 @@ const popupsContextStorage = {}, getStoredPopupContext = (e) => popupsContextSto
       recordData: $,
       sourceId: k,
       collection: z,
-      puid: E
+      puid: L
     }) => {
       const q = c.getFilterByTK(u || l, $);
       return getPopupPathFromParams({
         popupuid: M,
-        puid: E,
+        puid: L,
         collection: z,
         filterbytk: q,
         sourceid: k,
@@ -11455,27 +11455,27 @@ const popupsContextStorage = {}, getStoredPopupContext = (e) => popupsContextSto
     } = {}) => {
       if (!f())
         return I == null ? void 0 : I(!0);
-      const E = z || o, q = E == null ? void 0 : E["x-uid"], L = y(M);
+      const L = z || o, q = L == null ? void 0 : L["x-uid"], E = y(M);
       w = w || (i == null ? void 0 : i.data);
       const G = R({
         popupUid: q,
         recordData: w,
-        sourceId: L,
+        sourceId: E,
         collection: $,
         puid: k
       });
       let U = n.pathname;
       if (_.last(U) === "/" && (U = U.slice(0, -1)), storePopupContext(q, {
-        schema: E,
+        schema: L,
         record: new CollectionRecord({ isNew: !1, data: w }),
         parentRecord: M ? new CollectionRecord({ isNew: !1, data: M }) : a,
         service: g(),
         dataSource: r,
         collection: l == null ? void 0 : l.name,
         association: u,
-        sourceId: L,
+        sourceId: E,
         tableBlockContext: P(x({}, F), { collection: l == null ? void 0 : l.name, blockData: v })
-      }), b(T(), z), E.properties) {
+      }), b(T(), z), L.properties) {
         const H = h + 1;
         if (getPopupLayerState(H))
           return;
@@ -11483,7 +11483,7 @@ const popupsContextStorage = {}, getStoredPopupContext = (e) => popupsContextSto
       } else
         console.error(
           `[NocoBase] The popup schema is invalid, please check the schema: 
-${JSON.stringify(E, null, 2)}`
+${JSON.stringify(L, null, 2)}`
         );
     },
     [
@@ -13034,26 +13034,26 @@ https://requirejs.org/docs/errors.html#` + e);
       config: {}
     }, l = {}, c = {}, u = {}, d = [], p = {}, m = {}, h = {}, g = 1, f = 1;
     function C(k) {
-      var z, E;
+      var z, L;
       for (z = 0; z < k.length; z++)
-        if (E = k[z], E === ".")
+        if (L = k[z], L === ".")
           k.splice(z, 1), z -= 1;
-        else if (E === "..") {
+        else if (L === "..") {
           if (z === 0 || z === 1 && k[2] === ".." || k[z - 1] === "..")
             continue;
           z > 0 && (k.splice(z - 1, 2), z -= 2);
         }
     }
-    function b(k, z, E) {
-      var q, L, G, U, H, J, K, W, X, ee, Z, ne, re = z && z.split("/"), se = a.map, le = se && se["*"];
-      if (k && (k = k.split("/"), K = k.length - 1, a.nodeIdCompat && jsSuffixRegExp.test(k[K]) && (k[K] = k[K].replace(jsSuffixRegExp, "")), k[0].charAt(0) === "." && re && (ne = re.slice(0, re.length - 1), k = ne.concat(k)), C(k), k = k.join("/")), E && se && (re || le)) {
+    function b(k, z, L) {
+      var q, E, G, U, H, J, K, W, X, ee, Z, ne, re = z && z.split("/"), se = a.map, le = se && se["*"];
+      if (k && (k = k.split("/"), K = k.length - 1, a.nodeIdCompat && jsSuffixRegExp.test(k[K]) && (k[K] = k[K].replace(jsSuffixRegExp, "")), k[0].charAt(0) === "." && re && (ne = re.slice(0, re.length - 1), k = ne.concat(k)), C(k), k = k.join("/")), L && se && (re || le)) {
         G = k.split("/");
         e:
           for (U = G.length; U > 0; U -= 1) {
             if (J = G.slice(0, U).join("/"), re) {
               for (H = re.length; H > 0; H -= 1)
-                if (L = getOwn(se, re.slice(0, H).join("/")), L && (L = getOwn(L, J), L)) {
-                  W = L, X = U;
+                if (E = getOwn(se, re.slice(0, H).join("/")), E && (E = getOwn(E, J), E)) {
+                  W = E, X = U;
                   break e;
                 }
             }
@@ -13077,36 +13077,36 @@ https://requirejs.org/docs/errors.html#` + e);
         })([k]), !0;
     }
     function v(k) {
-      var z, E = k ? k.indexOf("!") : -1;
-      return E > -1 && (z = k.substring(0, E), k = k.substring(E + 1, k.length)), [z, k];
+      var z, L = k ? k.indexOf("!") : -1;
+      return L > -1 && (z = k.substring(0, L), k = k.substring(L + 1, k.length)), [z, k];
     }
-    function F(k, z, E, q) {
-      var L, G, U, H, J = null, K = z ? z.name : null, W = k, X = !0, ee = "";
-      return k || (X = !1, k = "_@r" + (g += 1)), H = v(k), J = H[0], k = H[1], J && (J = b(J, K, q), G = getOwn(p, J)), k && (J ? E ? ee = k : G && G.normalize ? ee = G.normalize(k, function(Z) {
+    function F(k, z, L, q) {
+      var E, G, U, H, J = null, K = z ? z.name : null, W = k, X = !0, ee = "";
+      return k || (X = !1, k = "_@r" + (g += 1)), H = v(k), J = H[0], k = H[1], J && (J = b(J, K, q), G = getOwn(p, J)), k && (J ? L ? ee = k : G && G.normalize ? ee = G.normalize(k, function(Z) {
         return b(Z, K, q);
-      }) : ee = k.indexOf("!") === -1 ? b(k, K, q) : k : (ee = b(k, K, q), H = v(ee), J = H[0], ee = H[1], E = !0, L = o.nameToUrl(ee))), U = J && !G && !E ? "_unnormalized" + (f += 1) : "", {
+      }) : ee = k.indexOf("!") === -1 ? b(k, K, q) : k : (ee = b(k, K, q), H = v(ee), J = H[0], ee = H[1], L = !0, E = o.nameToUrl(ee))), U = J && !G && !L ? "_unnormalized" + (f += 1) : "", {
         prefix: J,
         name: ee,
         parentMap: z,
         unnormalized: !!U,
-        url: L,
+        url: E,
         originalName: W,
         isDefine: X,
         id: (J ? J + "!" + ee : ee) + U
       };
     }
     function I(k) {
-      var z = k.id, E = getOwn(l, z);
-      return E || (E = l[z] = new o.Module(k)), E;
+      var z = k.id, L = getOwn(l, z);
+      return L || (L = l[z] = new o.Module(k)), L;
     }
-    function R(k, z, E) {
-      var q = k.id, L = getOwn(l, q);
-      hasProp(p, q) && (!L || L.defineEmitComplete) ? z === "defined" && E(p[q]) : (L = I(k), L.error && z === "error" ? E(L.error) : L.on(z, E));
+    function R(k, z, L) {
+      var q = k.id, E = getOwn(l, q);
+      hasProp(p, q) && (!E || E.defineEmitComplete) ? z === "defined" && L(p[q]) : (E = I(k), E.error && z === "error" ? L(E.error) : E.on(z, L));
     }
     function T(k, z) {
-      var E = k.requireModules, q = !1;
-      z ? z(k) : (each(E, function(L) {
-        var G = getOwn(l, L);
+      var L = k.requireModules, q = !1;
+      z ? z(k) : (each(L, function(E) {
+        var G = getOwn(l, E);
         G && (G.error = k, G.events.error && (q = !0, G.emit("error", k)));
       }), q || req.onError(k));
     }
@@ -13138,26 +13138,26 @@ https://requirejs.org/docs/errors.html#` + e);
     function O(k) {
       delete l[k], delete c[k];
     }
-    function j(k, z, E) {
+    function j(k, z, L) {
       var q = k.map.id;
-      k.error ? k.emit("error", k.error) : (z[q] = !0, each(k.depMaps, function(L, G) {
-        var U = L.id, H = getOwn(l, U);
-        H && !k.depMatched[G] && !E[U] && (getOwn(z, U) ? (k.defineDep(G, p[U]), k.check()) : j(H, z, E));
-      }), E[q] = !0);
+      k.error ? k.emit("error", k.error) : (z[q] = !0, each(k.depMaps, function(E, G) {
+        var U = E.id, H = getOwn(l, U);
+        H && !k.depMatched[G] && !L[U] && (getOwn(z, U) ? (k.defineDep(G, p[U]), k.check()) : j(H, z, L));
+      }), L[q] = !0);
     }
     function N() {
-      var k, z, E = a.waitSeconds * 1e3, q = E && o.startTime + E < (/* @__PURE__ */ new Date()).getTime(), L = [], G = [], U = !1, H = !0;
+      var k, z, L = a.waitSeconds * 1e3, q = L && o.startTime + L < (/* @__PURE__ */ new Date()).getTime(), E = [], G = [], U = !1, H = !0;
       if (!t) {
         if (t = !0, eachProp(c, function(J) {
           var K = J.map, W = K.id;
           if (J.enabled && (K.isDefine || G.push(J), !J.error)) {
             if (!J.inited && q)
-              y(W) ? (z = !0, U = !0) : (L.push(W), S(W));
+              y(W) ? (z = !0, U = !0) : (E.push(W), S(W));
             else if (!J.inited && J.fetched && K.isDefine && (U = !0, !K.prefix))
               return H = !1;
           }
-        }), q && L.length)
-          return k = makeError("timeout", "Load timeout for modules: " + L, null, L), k.contextName = o.contextName, T(k);
+        }), q && E.length)
+          return k = makeError("timeout", "Load timeout for modules: " + E, null, E), k.contextName = o.contextName, T(k);
         H && each(G, function(J) {
           j(J, {}, {});
         }), (!q || z) && U && (isBrowser || isWebWorker) && !i && (i = setTimeout(function() {
@@ -13168,10 +13168,10 @@ https://requirejs.org/docs/errors.html#` + e);
     n = function(k) {
       this.events = getOwn(u, k.id) || {}, this.map = k, this.shim = getOwn(a.shim, k.id), this.depExports = [], this.depMaps = [], this.depMatched = [], this.pluginMaps = {}, this.depCount = 0;
     }, n.prototype = {
-      init: function(k, z, E, q) {
-        q = q || {}, !this.inited && (this.factory = z, E ? this.on("error", E) : this.events.error && (E = bind(this, function(L) {
-          this.emit("error", L);
-        })), this.depMaps = k && k.slice(0), this.errback = E, this.inited = !0, this.ignore = q.ignore, q.enabled || this.enabled ? this.enable() : this.check());
+      init: function(k, z, L, q) {
+        q = q || {}, !this.inited && (this.factory = z, L ? this.on("error", L) : this.events.error && (L = bind(this, function(E) {
+          this.emit("error", E);
+        })), this.depMaps = k && k.slice(0), this.errback = L, this.inited = !0, this.ignore = q.ignore, q.enabled || this.enabled ? this.enable() : this.check());
       },
       defineDep: function(k, z) {
         this.depMatched[k] || (this.depMatched[k] = !0, this.depCount -= 1, this.depExports[k] = z);
@@ -13200,9 +13200,9 @@ https://requirejs.org/docs/errors.html#` + e);
        */
       check: function() {
         if (!(!this.enabled || this.enabling)) {
-          var k, z, E = this.map.id, q = this.depExports, L = this.exports, G = this.factory;
+          var k, z, L = this.map.id, q = this.depExports, E = this.exports, G = this.factory;
           if (!this.inited)
-            hasProp(o.defQueueMap, E) || this.fetch();
+            hasProp(o.defQueueMap, L) || this.fetch();
           else if (this.error)
             this.emit("error", this.error);
           else if (!this.defining) {
@@ -13210,32 +13210,32 @@ https://requirejs.org/docs/errors.html#` + e);
               if (isFunction(G)) {
                 if (this.events.error && this.map.isDefine || req.onError !== defaultOnError)
                   try {
-                    L = o.execCb(E, G, q, L);
+                    E = o.execCb(L, G, q, E);
                   } catch (H) {
                     k = H;
                   }
                 else
-                  L = o.execCb(E, G, q, L);
-                if (this.map.isDefine && L === void 0 && (z = this.module, z ? L = z.exports : this.usingExports && (L = this.exports)), k)
+                  E = o.execCb(L, G, q, E);
+                if (this.map.isDefine && E === void 0 && (z = this.module, z ? E = z.exports : this.usingExports && (E = this.exports)), k)
                   return k.requireMap = this.map, k.requireModules = this.map.isDefine ? [this.map.id] : null, k.requireType = this.map.isDefine ? "define" : "require", T(this.error = k);
               } else
-                L = G;
-              if (this.exports = L, this.map.isDefine && !this.ignore && (p[E] = L, req.onResourceLoad)) {
+                E = G;
+              if (this.exports = E, this.map.isDefine && !this.ignore && (p[L] = E, req.onResourceLoad)) {
                 var U = [];
                 each(this.depMaps, function(H) {
                   U.push(H.normalizedMap || H);
                 }), req.onResourceLoad(o, this.map, U);
               }
-              O(E), this.defined = !0;
+              O(L), this.defined = !0;
             }
             this.defining = !1, this.defined && !this.defineEmitted && (this.defineEmitted = !0, this.emit("defined", this.exports), this.defineEmitComplete = !0);
           }
         }
       },
       callPlugin: function() {
-        var k = this.map, z = k.id, E = F(k.prefix);
-        this.depMaps.push(E), R(E, "defined", bind(this, function(q) {
-          var L, G, U, H = getOwn(h, this.map.id), J = this.map.name, K = this.map.parentMap ? this.map.parentMap.name : null, W = o.makeRequire(k.parentMap, {
+        var k = this.map, z = k.id, L = F(k.prefix);
+        this.depMaps.push(L), R(L, "defined", bind(this, function(q) {
+          var E, G, U, H = getOwn(h, this.map.id), J = this.map.name, K = this.map.parentMap ? this.map.parentMap.name : null, W = o.makeRequire(k.parentMap, {
             enableBuildCallback: !0
           });
           if (this.map.unnormalized) {
@@ -13265,17 +13265,17 @@ https://requirejs.org/docs/errors.html#` + e);
             this.map.url = o.nameToUrl(H), this.load();
             return;
           }
-          L = bind(this, function(X) {
+          E = bind(this, function(X) {
             this.init([], function() {
               return X;
             }, null, {
               enabled: !0
             });
-          }), L.error = bind(this, function(X) {
+          }), E.error = bind(this, function(X) {
             this.inited = !0, this.error = X, X.requireModules = [z], eachProp(l, function(ee) {
               ee.map.id.indexOf(z + "_unnormalized") === 0 && O(ee.map.id);
             }), T(X);
-          }), L.fromText = bind(this, function(X, ee) {
+          }), E.fromText = bind(this, function(X, ee) {
             var Z = k.name, ne = F(Z), re = useInteractive;
             ee && (X = ee), re && (useInteractive = !1), I(ne), hasProp(a.config, z) && (a.config[Z] = a.config[z]);
             try {
@@ -13288,21 +13288,21 @@ https://requirejs.org/docs/errors.html#` + e);
                 [z]
               ));
             }
-            re && (useInteractive = !0), this.depMaps.push(ne), o.completeLoad(Z), W([Z], L);
-          }), q.load(k.name, W, L, a);
-        })), o.enable(E, this), this.pluginMaps[E.id] = E;
+            re && (useInteractive = !0), this.depMaps.push(ne), o.completeLoad(Z), W([Z], E);
+          }), q.load(k.name, W, E, a);
+        })), o.enable(L, this), this.pluginMaps[L.id] = L;
       },
       enable: function() {
         c[this.map.id] = this, this.enabled = !0, this.enabling = !0, each(this.depMaps, bind(this, function(k, z) {
-          var E, q, L;
+          var L, q, E;
           if (typeof k == "string") {
             if (k = F(
               k,
               this.map.isDefine ? this.map : this.map.parentMap,
               !1,
               !this.skipMap
-            ), this.depMaps[z] = k, L = getOwn(r, k.id), L) {
-              this.depExports[z] = L(this);
+            ), this.depMaps[z] = k, E = getOwn(r, k.id), E) {
+              this.depExports[z] = E(this);
               return;
             }
             this.depCount += 1, R(k, "defined", bind(this, function(G) {
@@ -13311,27 +13311,27 @@ https://requirejs.org/docs/errors.html#` + e);
               this.emit("error", G);
             }));
           }
-          E = k.id, q = l[E], !hasProp(r, E) && q && !q.enabled && o.enable(k, this);
+          L = k.id, q = l[L], !hasProp(r, L) && q && !q.enabled && o.enable(k, this);
         })), eachProp(this.pluginMaps, bind(this, function(k) {
           var z = getOwn(l, k.id);
           z && !z.enabled && o.enable(k, this);
         })), this.enabling = !1, this.check();
       },
       on: function(k, z) {
-        var E = this.events[k];
-        E || (E = this.events[k] = []), E.push(z);
+        var L = this.events[k];
+        L || (L = this.events[k] = []), L.push(z);
       },
       emit: function(k, z) {
-        each(this.events[k], function(E) {
-          E(z);
+        each(this.events[k], function(L) {
+          L(z);
         }), k === "error" && delete this.events[k];
       }
     };
     function B(k) {
       hasProp(p, k[0]) || I(F(k[0], null, !0)).init(k[1], k[2]);
     }
-    function w(k, z, E, q) {
-      k.detachEvent && !isOpera ? q && k.detachEvent(q, z) : k.removeEventListener(E, z, !1);
+    function w(k, z, L, q) {
+      k.detachEvent && !isOpera ? q && k.detachEvent(q, z) : k.removeEventListener(L, z, !1);
     }
     function M(k) {
       var z = k.currentTarget || k.srcElement;
@@ -13368,51 +13368,51 @@ https://requirejs.org/docs/errors.html#` + e);
       configure: function(k) {
         if (k.baseUrl && k.baseUrl.charAt(k.baseUrl.length - 1) !== "/" && (k.baseUrl += "/"), typeof k.urlArgs == "string") {
           var z = k.urlArgs;
-          k.urlArgs = function(L, G) {
+          k.urlArgs = function(E, G) {
             return (G.indexOf("?") === -1 ? "?" : "&") + z;
           };
         }
-        var E = a.shim, q = {
+        var L = a.shim, q = {
           paths: !0,
           bundles: !0,
           config: !0,
           map: !0
         };
-        eachProp(k, function(L, G) {
-          q[G] ? (a[G] || (a[G] = {}), mixin(a[G], L, !0, !0)) : a[G] = L;
-        }), k.bundles && eachProp(k.bundles, function(L, G) {
-          each(L, function(U) {
+        eachProp(k, function(E, G) {
+          q[G] ? (a[G] || (a[G] = {}), mixin(a[G], E, !0, !0)) : a[G] = E;
+        }), k.bundles && eachProp(k.bundles, function(E, G) {
+          each(E, function(U) {
             U !== G && (h[U] = G);
           });
-        }), k.shim && (eachProp(k.shim, function(L, G) {
-          isArray(L) && (L = {
-            deps: L
-          }), (L.exports || L.init) && !L.exportsFn && (L.exportsFn = o.makeShimExports(L)), E[G] = L;
-        }), a.shim = E), k.packages && each(k.packages, function(L) {
+        }), k.shim && (eachProp(k.shim, function(E, G) {
+          isArray(E) && (E = {
+            deps: E
+          }), (E.exports || E.init) && !E.exportsFn && (E.exportsFn = o.makeShimExports(E)), L[G] = E;
+        }), a.shim = L), k.packages && each(k.packages, function(E) {
           var G, U;
-          L = typeof L == "string" ? { name: L } : L, U = L.name, G = L.location, G && (a.paths[U] = L.location), a.pkgs[U] = L.name + "/" + (L.main || "main").replace(currDirRegExp, "").replace(jsSuffixRegExp, "");
-        }), eachProp(l, function(L, G) {
-          !L.inited && !L.map.unnormalized && (L.map = F(G, null, !0));
+          E = typeof E == "string" ? { name: E } : E, U = E.name, G = E.location, G && (a.paths[U] = E.location), a.pkgs[U] = E.name + "/" + (E.main || "main").replace(currDirRegExp, "").replace(jsSuffixRegExp, "");
+        }), eachProp(l, function(E, G) {
+          !E.inited && !E.map.unnormalized && (E.map = F(G, null, !0));
         }), (k.deps || k.callback) && o.require(k.deps || [], k.callback);
       },
       makeShimExports: function(k) {
         function z() {
-          var E;
-          return k.init && (E = k.init.apply(global, arguments)), E || k.exports && getGlobal(k.exports);
+          var L;
+          return k.init && (L = k.init.apply(global, arguments)), L || k.exports && getGlobal(k.exports);
         }
         return z;
       },
       makeRequire: function(k, z) {
         z = z || {};
-        function E(q, L, G) {
+        function L(q, E, G) {
           var U, H, J;
-          return z.enableBuildCallback && L && isFunction(L) && (L.__requireJsBuild = !0), typeof q == "string" ? isFunction(L) ? T(makeError("requireargs", "Invalid require call"), G) : k && hasProp(r, q) ? r[q](l[k.id]) : req.get ? req.get(o, q, k, E) : (H = F(q, k, !1, !0), U = H.id, hasProp(p, U) ? p[U] : T(makeError("notloaded", 'Module name "' + U + '" has not been loaded yet for context: ' + e + (k ? "" : ". Use require([])")))) : ($(), o.nextTick(function() {
-            $(), J = I(F(null, k)), J.skipMap = z.skipMap, J.init(q, L, G, {
+          return z.enableBuildCallback && E && isFunction(E) && (E.__requireJsBuild = !0), typeof q == "string" ? isFunction(E) ? T(makeError("requireargs", "Invalid require call"), G) : k && hasProp(r, q) ? r[q](l[k.id]) : req.get ? req.get(o, q, k, L) : (H = F(q, k, !1, !0), U = H.id, hasProp(p, U) ? p[U] : T(makeError("notloaded", 'Module name "' + U + '" has not been loaded yet for context: ' + e + (k ? "" : ". Use require([])")))) : ($(), o.nextTick(function() {
+            $(), J = I(F(null, k)), J.skipMap = z.skipMap, J.init(q, E, G, {
               enabled: !0
             }), N();
-          }), E);
+          }), L);
         }
-        return mixin(E, {
+        return mixin(L, {
           isBrowser,
           /**
            * Converts a module name + .extension into an URL path.
@@ -13420,12 +13420,12 @@ https://requirejs.org/docs/errors.html#` + e);
            * plain URLs like nameToUrl.
            */
           toUrl: function(q) {
-            var L, G = q.lastIndexOf("."), U = q.split("/")[0], H = U === "." || U === "..";
-            return G !== -1 && (!H || G > 1) && (L = q.substring(G, q.length), q = q.substring(0, G)), o.nameToUrl(b(
+            var E, G = q.lastIndexOf("."), U = q.split("/")[0], H = U === "." || U === "..";
+            return G !== -1 && (!H || G > 1) && (E = q.substring(G, q.length), q = q.substring(0, G)), o.nameToUrl(b(
               q,
               k && k.id,
               !0
-            ), L, !0);
+            ), E, !0);
           },
           defined: function(q) {
             return hasProp(p, F(q, k, !1, !0).id);
@@ -13433,13 +13433,13 @@ https://requirejs.org/docs/errors.html#` + e);
           specified: function(q) {
             return q = F(q, k, !1, !0).id, hasProp(p, q) || hasProp(l, q);
           }
-        }), k || (E.undef = function(q) {
+        }), k || (L.undef = function(q) {
           D();
-          var L = F(q, k, !0), G = getOwn(l, q);
-          G.undefed = !0, S(q), delete p[q], delete m[L.url], delete u[q], eachReverse(d, function(U, H) {
+          var E = F(q, k, !0), G = getOwn(l, q);
+          G.undefed = !0, S(q), delete p[q], delete m[E.url], delete u[q], eachReverse(d, function(U, H) {
             U[0] === q && d.splice(H, 1);
           }), delete o.defQueueMap[q], G && (G.events.defined && (u[q] = G.events), O(q));
-        }), E;
+        }), L;
       },
       /**
        * Called to enable a module if it is still in the registry
@@ -13458,15 +13458,15 @@ https://requirejs.org/docs/errors.html#` + e);
        * @param {String} moduleName the name of the module to potentially complete.
        */
       completeLoad: function(k) {
-        var z, E, q, L = getOwn(a.shim, k) || {}, G = L.exports;
+        var z, L, q, E = getOwn(a.shim, k) || {}, G = E.exports;
         for (D(); d.length; ) {
-          if (E = d.shift(), E[0] === null) {
-            if (E[0] = k, z)
+          if (L = d.shift(), L[0] === null) {
+            if (L[0] = k, z)
               break;
             z = !0;
           } else
-            E[0] === k && (z = !0);
-          B(E);
+            L[0] === k && (z = !0);
+          B(L);
         }
         if (o.defQueueMap = {}, q = getOwn(l, k), !z && !hasProp(p, k) && q && !q.inited) {
           if (a.enforceDefine && (!G || !getGlobal(G)))
@@ -13476,7 +13476,7 @@ https://requirejs.org/docs/errors.html#` + e);
               null,
               [k]
             ));
-          B([k, L.deps || [], L.exportsFn]);
+          B([k, E.deps || [], E.exportsFn]);
         }
         N();
       },
@@ -13487,19 +13487,19 @@ https://requirejs.org/docs/errors.html#` + e);
        * it is assumed to have already been normalized. This is an
        * internal API, not a public one. Use toUrl for the public API.
        */
-      nameToUrl: function(k, z, E) {
-        var q, L, G, U, H, J, K, W = getOwn(a.pkgs, k);
+      nameToUrl: function(k, z, L) {
+        var q, E, G, U, H, J, K, W = getOwn(a.pkgs, k);
         if (W && (k = W), K = getOwn(h, k), K)
-          return o.nameToUrl(K, z, E);
+          return o.nameToUrl(K, z, L);
         if (req.jsExtRegExp.test(k))
           H = k + (z || "");
         else {
-          for (q = a.paths, L = k.split("/"), G = L.length; G > 0; G -= 1)
-            if (U = L.slice(0, G).join("/"), J = getOwn(q, U), J) {
-              isArray(J) && (J = J[0]), L.splice(0, G, J);
+          for (q = a.paths, E = k.split("/"), G = E.length; G > 0; G -= 1)
+            if (U = E.slice(0, G).join("/"), J = getOwn(q, U), J) {
+              isArray(J) && (J = J[0]), E.splice(0, G, J);
               break;
             }
-          H = L.join("/"), H += z || (/^data\:|^blob\:|\?/.test(H) || E ? "" : ".js"), H = (H.charAt(0) === "/" || H.match(/^[\w\+\.\-]+:/) ? "" : a.baseUrl) + H;
+          H = E.join("/"), H += z || (/^data\:|^blob\:|\?/.test(H) || L ? "" : ".js"), H = (H.charAt(0) === "/" || H.match(/^[\w\+\.\-]+:/) ? "" : a.baseUrl) + H;
         }
         return a.urlArgs && !/^blob\:/.test(H) ? H + a.urlArgs(k, H) : H;
       },
@@ -13515,8 +13515,8 @@ https://requirejs.org/docs/errors.html#` + e);
        *
        * @private
        */
-      execCb: function(k, z, E, q) {
-        return z.apply(q, E);
+      execCb: function(k, z, L, q) {
+        return z.apply(q, L);
       },
       /**
        * callback for script loads, used to check status of loading.
@@ -13537,13 +13537,13 @@ https://requirejs.org/docs/errors.html#` + e);
       onScriptError: function(k) {
         var z = M(k);
         if (!y(z.id)) {
-          var E = [];
-          return eachProp(l, function(q, L) {
-            L.indexOf("_@r") !== 0 && each(q.depMaps, function(G) {
+          var L = [];
+          return eachProp(l, function(q, E) {
+            E.indexOf("_@r") !== 0 && each(q.depMaps, function(G) {
               if (G.id === z.id)
-                return E.push(L), !0;
+                return L.push(E), !0;
             });
-          }), T(makeError("scripterror", 'Script error for "' + z.id + (E.length ? '", needed by: ' + E.join(", ") : '"'), k, [z.id]));
+          }), T(makeError("scripterror", 'Script error for "' + z.id + (L.length ? '", needed by: ' + L.join(", ") : '"'), k, [z.id]));
         }
       }
     }, o.require = o.makeRequire(), o;
@@ -15169,14 +15169,14 @@ GridColContext.displayName = "GridColContext";
 const GridContext = createContext({});
 GridContext.displayName = "GridContext";
 const breakRemoveOnGrid = (e) => e["x-component"] === "Grid", breakRemoveOnRow = (e) => e["x-component"] === "Grid.Row", ColDivider = (e) => {
-  var F, I, R;
+  var I, R, T;
   const { token: t } = useToken$1(), n = useRef(null), { dn: o, designable: r } = useDesignable(), { isOver: i, setNodeRef: a } = useDroppable({
     id: e.id,
     data: e.data,
     disabled: !r
   }), l = useRef(), c = useMemo(() => i ? {
     backgroundColor: new TinyColor(t.colorSettings).setAlpha(0.1).toHex8String()
-  } : {}, [i]), d = (R = (I = (F = useDndContext().active) == null ? void 0 : F.data.current) == null ? void 0 : I.schema) == null ? void 0 : R.parent, p = useMemo(
+  } : {}, [i]), d = (T = (R = (I = useDndContext().active) == null ? void 0 : I.data.current) == null ? void 0 : R.schema) == null ? void 0 : T.parent, p = useMemo(
     () => d ? Object.keys(d.properties).length : 0,
     [d]
   );
@@ -15185,46 +15185,51 @@ const breakRemoveOnGrid = (e) => e["x-component"] === "Grid", breakRemoveOnRow =
     if (e.first)
       m = d !== e.cols[0];
     else {
-      const T = e.cols[e.index], D = e.cols[e.index + 1];
-      m = d !== T && D !== d;
-    }
-  const h = e.cols[e.index], g = e.cols[e.index + 1], {
-    attributes: f,
-    listeners: C,
-    setNodeRef: b,
-    isDragging: S
+      const D = e.cols[e.index], O = e.cols[e.index + 1];
+      m = d !== D && O !== d;
+    }
+  const h = e.cols[e.index], g = e.cols[e.index + 1], f = e.first || e.last || !r, {
+    attributes: C,
+    listeners: b,
+    setNodeRef: S,
+    isDragging: y
   } = useDraggable({
-    disabled: e.first || e.last || !r,
+    disabled: f,
     id: e.id,
     data: {
       dividerRef: l,
       prevSchema: h,
       nextSchema: g
+    },
+    attributes: {
+      tabIndex: f ? -1 : 0
     }
-  }), [y, v] = useState([0, 0]);
+  }), [v, F] = useState([0, 0]);
   return useDndMonitor({
-    onDragStart(T) {
-      if (!r || !S)
+    onDragStart(D) {
+      var w, M, $;
+      const O = ($ = (M = (w = D.active) == null ? void 0 : w.data) == null ? void 0 : M.current) == null ? void 0 : $.dividerRef;
+      if (!O || !r)
         return;
-      n.current = T.active.id;
-      const D = l.current, O = D.previousElementSibling, j = D.nextElementSibling;
-      v([O.clientWidth, j.clientWidth]);
+      n.current = D.active.id;
+      const j = O.current, N = j.previousElementSibling, B = j.nextElementSibling;
+      F([N.clientWidth, B.clientWidth]);
     },
-    onDragMove(T) {
-      if (!r || !S)
+    onDragMove(D) {
+      if (!r || !y)
         return;
-      n.current === T.active.id && (n.current = n.current + "_move");
-      const D = l.current, O = D.previousElementSibling, j = D.nextElementSibling;
-      O.style.width = `${y[0] + T.delta.x}px`, j.style.width = `${y[1] - T.delta.x}px`;
+      n.current === D.active.id && (n.current = n.current + "_move");
+      const O = l.current, j = O.previousElementSibling, N = O.nextElementSibling;
+      j.style.width = `${v[0] + D.delta.x}px`, N.style.width = `${v[1] - D.delta.x}px`;
     },
-    onDragEnd(T) {
-      var M;
-      if (!r || !n.current || (M = n.current) != null && M.startsWith(T.active.id) && !n.current.endsWith("_move") || y[0] <= 0 || y[1] <= 0 || (v([0, 0]), !h || !g))
+    onDragEnd(D) {
+      var $;
+      if (!r || !n.current || ($ = n.current) != null && $.startsWith(D.active.id) && !n.current.endsWith("_move") || v[0] <= 0 || v[1] <= 0 || (F([0, 0]), !h || !g))
         return;
-      const D = l.current, O = D.previousElementSibling, j = D.nextElementSibling;
+      const O = l.current, j = O.previousElementSibling, N = O.nextElementSibling;
       h["x-component-props"] = h["x-component-props"] || {}, g["x-component-props"] = g["x-component-props"] || {};
-      const N = D.clientWidth * (e.cols.length + 1) / e.cols.length, B = (100 * (O.getBoundingClientRect().width + N) / D.parentElement.clientWidth).toFixed(2), w = (100 * (j.getBoundingClientRect().width + N) / D.parentElement.clientWidth).toFixed(2);
-      _.set(h, "x-component-props.width", B), _.set(g, "x-component-props.width", w), o.emit("batchPatch", {
+      const B = O.clientWidth * (e.cols.length + 1) / e.cols.length, w = (100 * (j.getBoundingClientRect().width + B) / O.parentElement.clientWidth).toFixed(2), M = (100 * (N.getBoundingClientRect().width + B) / O.parentElement.clientWidth).toFixed(2);
+      _.set(h, "x-component-props.width", w), _.set(g, "x-component-props.width", M), o.emit("batchPatch", {
         schemas: [
           {
             "x-uid": h["x-uid"],
@@ -15240,16 +15245,16 @@ const breakRemoveOnGrid = (e) => e["x-component"] === "Grid", breakRemoveOnRow =
   }), /* @__PURE__ */ jsx(
     "div",
     {
-      ref: (T) => {
-        m && (a(T), l.current = T);
+      ref: (D) => {
+        m && (a(D), l.current = D);
       },
       className: cls("nb-col-divider", "ColDivider"),
       style: c,
       children: /* @__PURE__ */ jsx(
         "div",
         P(x(x({
-          ref: b
-        }, C), f), {
+          ref: S
+        }, b), C), {
           className: e.first || e.last || !r ? null : "DraggableNode"
         })
       )
@@ -15538,9 +15543,9 @@ const useTableBlockProps = () => {
     ),
     onChange: useCallback(
       ({ current: S, pageSize: y }, v, F) => {
-        var O, j, N, B, w, M, $, k, z, E;
+        var O, j, N, B, w, M, $, k, z, L;
         const I = (N = (j = (O = t.parent) == null ? void 0 : O["x-decorator-props"]) == null ? void 0 : j.params) == null ? void 0 : N.sort, R = F.order ? F.order === "ascend" ? [F.field] : [`-${F.field}`] : I || i.dragSortBy, T = y || ((M = (w = (B = t.parent) == null ? void 0 : B["x-decorator-props"]) == null ? void 0 : w.params) == null ? void 0 : M.pageSize), D = P(x({}, (z = (k = ($ = a.current) == null ? void 0 : $.service) == null ? void 0 : k.params) == null ? void 0 : z[0]), { page: S || 1, pageSize: T });
-        R && (D.sort = R), (E = a.current) == null || E.service.run(D);
+        R && (D.sort = R), (L = a.current) == null || L.service.run(D);
       },
       [t.parent]
     ),
@@ -15553,13 +15558,13 @@ const useTableBlockProps = () => {
         }
         const T = R.find((D) => D.uid === t.parent["x-uid"]);
         R.forEach((D) => {
-          var $, k, z, E;
+          var $, k, z, L;
           const O = F.find((q) => q.uid === D.uid);
           if (!O)
             return;
           const j = getSourceKey(T, O.field) || i.rowKey || "id", N = [S[j]], B = (($ = D.service.params) == null ? void 0 : $[0]) || {}, w = ((z = (k = D.service.params) == null ? void 0 : k[1]) == null ? void 0 : z.filters) || {};
           if (v.includes(S[i.rowKey])) {
-            if ((E = D.clearSelection) == null || E.call(D), D.dataLoadingMode === "manual")
+            if ((L = D.clearSelection) == null || L.call(D), D.dataLoadingMode === "manual")
               return D.clearData();
             delete w[I];
           } else
@@ -15965,10 +15970,10 @@ const useTableSelectorParams = () => useContext(TableSelectorParamsContext), Tab
   var a, l, c, u, d, p, m, h, g, f, C, b, S, y, v, F;
   const e = useField(), t = useTableSelectorContext(), n = useFieldSchema(), { getCollectionJoinField: o } = useCollectionManager_deprecated(), r = recursiveParent$1(n, "CollectionField"), i = o(r == null ? void 0 : r["x-collection-field"]);
   return useEffect(() => {
-    var R, T, D, O, j, N, B, w, M, $, k, z, E;
+    var R, T, D, O, j, N, B, w, M, $, k, z, L;
     if (!((R = t == null ? void 0 : t.service) != null && R.loading)) {
-      const q = (D = (T = t == null ? void 0 : t.service) == null ? void 0 : T.data) == null ? void 0 : D.data.map((L) => L);
-      e.value = q, (O = e == null ? void 0 : e.setInitialValue) == null || O.call(e, q), e.data = e.data || {}, e.data.selectedRowKeys = [], e.componentProps.pagination = e.componentProps.pagination || {}, e.componentProps.pagination.pageSize = (B = (N = (j = t == null ? void 0 : t.service) == null ? void 0 : j.data) == null ? void 0 : N.meta) == null ? void 0 : B.pageSize, e.componentProps.pagination.total = ($ = (M = (w = t == null ? void 0 : t.service) == null ? void 0 : w.data) == null ? void 0 : M.meta) == null ? void 0 : $.count, e.componentProps.pagination.current = (E = (z = (k = t == null ? void 0 : t.service) == null ? void 0 : k.data) == null ? void 0 : z.meta) == null ? void 0 : E.page;
+      const q = (D = (T = t == null ? void 0 : t.service) == null ? void 0 : T.data) == null ? void 0 : D.data.map((E) => E);
+      e.value = q, (O = e == null ? void 0 : e.setInitialValue) == null || O.call(e, q), e.data = e.data || {}, e.data.selectedRowKeys = [], e.componentProps.pagination = e.componentProps.pagination || {}, e.componentProps.pagination.pageSize = (B = (N = (j = t == null ? void 0 : t.service) == null ? void 0 : j.data) == null ? void 0 : N.meta) == null ? void 0 : B.pageSize, e.componentProps.pagination.total = ($ = (M = (w = t == null ? void 0 : t.service) == null ? void 0 : w.data) == null ? void 0 : M.meta) == null ? void 0 : $.count, e.componentProps.pagination.current = (L = (z = (k = t == null ? void 0 : t.service) == null ? void 0 : k.data) == null ? void 0 : z.meta) == null ? void 0 : L.page;
     }
   }, [
     i == null ? void 0 : i.foreignKey,
@@ -17002,11 +17007,10 @@ const useFormItemInitializerFields = (e) => {
   var u;
   const { name: t, currentFields: n } = useCollection_deprecated(), { getInterface: o, getCollection: r } = useCollectionManager_deprecated(), i = useForm(), { readPretty: a = i.readPretty, block: l = "Form" } = e || {}, c = useRemoveGridFormItem();
   return (u = n == null ? void 0 : n.filter((d) => !d.inherit && (d == null ? void 0 : d.interface) && d.interface !== "snapshot" && d.type !== "sequence")) == null ? void 0 : u.map((d) => {
-    var h, g, f;
+    var h, g;
     const p = o(d.interface), m = {
       type: "string",
       name: d.name,
-      title: ((h = d == null ? void 0 : d.uiSchema) == null ? void 0 : h.title) || d.name,
       // 'x-designer': 'FormItem.Designer',
       "x-toolbar": "FormItemSchemaToolbar",
       "x-settings": "fieldSettings:FormItem",
@@ -17015,14 +17019,14 @@ const useFormItemInitializerFields = (e) => {
       "x-collection-field": `${t}.${d.name}`
     };
     return {
-      name: ((g = d == null ? void 0 : d.uiSchema) == null ? void 0 : g.title) || d.name,
+      name: ((h = d == null ? void 0 : d.uiSchema) == null ? void 0 : h.title) || d.name,
       type: "item",
-      title: ((f = d == null ? void 0 : d.uiSchema) == null ? void 0 : f.title) || d.name,
+      title: ((g = d == null ? void 0 : d.uiSchema) == null ? void 0 : g.title) || d.name,
       Component: "CollectionFieldInitializer",
       remove: c,
-      schemaInitialize: (C) => {
-        var b;
-        (b = p == null ? void 0 : p.schemaInitialize) == null || b.call(p, C, {
+      schemaInitialize: (f) => {
+        var C;
+        (C = p == null ? void 0 : p.schemaInitialize) == null || C.call(p, f, {
           field: d,
           block: l,
           readPretty: a,
@@ -18060,7 +18064,7 @@ const useGetAriaLabelOfDesigner = () => {
         })
       )
     };
-  }, [v, (J = $ == null ? void 0 : $.cols) == null ? void 0 : J.length]), E = useMemo(() => u === !1 || C === !1 ? null : /* @__PURE__ */ jsx(DragHandler, { children: /* @__PURE__ */ jsx(DragOutlined, { role: "button", "aria-label": v("drag-handler") }) }), [u, v, C]), q = useMemo(() => {
+  }, [v, (J = $ == null ? void 0 : $.cols) == null ? void 0 : J.length]), L = useMemo(() => u === !1 || C === !1 ? null : /* @__PURE__ */ jsx(DragHandler, { children: /* @__PURE__ */ jsx(DragOutlined, { role: "button", "aria-label": v("drag-handler") }) }), [u, v, C]), q = useMemo(() => {
     var K;
     if (o === !1)
       return null;
@@ -18068,7 +18072,7 @@ const useGetAriaLabelOfDesigner = () => {
       return w(z);
     if (k != null && k.InitializerComponent || k != null && k.renderSchemaInitializer)
       return k != null && k.InitializerComponent ? /* @__PURE__ */ jsx(k.InitializerComponent, x({}, z)) : (K = k.renderSchemaInitializer) == null ? void 0 : K.call(k, z);
-  }, [k, o, z, M, w]), L = useMemo(() => r !== !1 && B ? N() : null, [B, N, r]), G = useRef(null), U = "hidden";
+  }, [k, o, z, M, w]), E = useMemo(() => r !== !1 && B ? N() : null, [B, N, r]), G = useRef(null), U = "hidden";
   useEffect(() => {
     const K = G.current;
     let W = K == null ? void 0 : K.parentElement;
@@ -18108,9 +18112,9 @@ const useGetAriaLabelOfDesigner = () => {
           j[1] && /* @__PURE__ */ jsx("span", { className: "toolbar-title-tag", children: `${y("Reference template")}: ${`${j[1]}` || y("Untitled")}` })
         ] }) }),
         /* @__PURE__ */ jsx("div", { className: cls("toolbar-icons", a), style: l, children: /* @__PURE__ */ jsxs(Space$1, { size: 3, align: "center", className: d, style: p, children: [
-          E,
+          L,
           /* @__PURE__ */ jsx(RefreshComponentProvider, { refresh: O, children: q }),
-          L
+          E
         ] }) })
       ]
     }
@@ -18204,10 +18208,10 @@ const SchemaToolbarErrorFallback = (e) => {
     [t, p]
   ), v = useCallback(
     (w, M = !1, $) => {
-      var E;
+      var L;
       if (!w)
         return [];
-      const k = (E = p($)) == null ? void 0 : E.getCollection(w);
+      const k = (L = p($)) == null ? void 0 : L.getCollection(w);
       return (k == null ? void 0 : k.getChildrenCollections(M)) || [];
     },
     [t, p]
@@ -18222,19 +18226,19 @@ const SchemaToolbarErrorFallback = (e) => {
       var ee;
       const {
         association: z = !1,
-        cached: E = {},
+        cached: L = {},
         collectionNames: q = [w],
-        maxDepth: L = 1,
+        maxDepth: E = 1,
         allowAllTypes: G = !1,
         exceptInterfaces: U = [],
         prefixFieldValue: H = "",
         usePrefix: J = !1,
         dataSource: K
       } = k || {};
-      if (q.length - 1 > L)
+      if (q.length - 1 > E)
         return;
-      if (E[w])
-        return _.cloneDeep(E[w]);
+      if (L[w])
+        return _.cloneDeep(L[w]);
       M && typeof M == "string" && (M = [M]), $ && typeof $ == "string" && ($ = [$]);
       const W = b(w, K), X = (ee = W == null ? void 0 : W.filter(
         (Z) => Z.interface && !U.includes(Z.interface) && (G || M && M.includes(Z.type) || $ && $.includes(Z.interface) || (z && Z.target && Z.target !== w && Array.isArray(z) ? z.includes(Z.interface) : !1))
@@ -18245,14 +18249,14 @@ const SchemaToolbarErrorFallback = (e) => {
           label: f((re = Z == null ? void 0 : Z.uiSchema) == null ? void 0 : re.title) || Z.name
         }, Z);
         return z && Z.target && (ne.children = q.includes(Z.target) ? [] : I(Z.target, M, $, P(x({}, k), {
-          cached: E,
+          cached: L,
           dataSource: K,
           collectionNames: [...q, Z.target],
           prefixFieldValue: J ? H ? `${H}.${Z.name}` : Z.name : "",
           usePrefix: J
         })), !((se = ne.children) != null && se.length)) ? null : ne;
       }).filter(Boolean);
-      return E[w] = X, X;
+      return L[w] = X, X;
     },
     [b]
   ), R = useCallback(
@@ -21668,7 +21672,7 @@ const SchemaSettingsModalItem = (e) => {
     initialValues: c,
     width: u = "fit-content",
     noRecord: d = !1,
-    ModalContextProvider: p = (L) => /* @__PURE__ */ jsx(Fragment$1, { children: L.children })
+    ModalContextProvider: p = (E) => /* @__PURE__ */ jsx(Fragment$1, { children: E.children })
   } = q, m = Y(q, [
     "hidden",
     "title",
@@ -21681,14 +21685,14 @@ const SchemaSettingsModalItem = (e) => {
     "width",
     "noRecord",
     "ModalContextProvider"
-  ]), h = useContext(SchemaOptionsContext), g = useCollection(), f = useAPIClient(), C = useApp(), { theme: b } = useGlobalTheme(), S = useBlockRequestContext(), y = useFormActiveFields(), { locale: v } = useContext(ConfigProvider.ConfigContext), F = useDataSourceManager(), I = useDataSourceKey(), R = useCollectionRecord(), { association: T } = useDataBlockProps() || {}, D = useCurrentRecord(), O = useFormBlockContext(), j = useBlockContext(), { getOperators: N } = useOperators(), B = useLocationSearch(), w = useVariables$1(), { formValue: M, collection: $, parent: k } = useSubFormValue(), z = useCurrentPopupRecord(), E = useParentPopupRecord();
+  ]), h = useContext(SchemaOptionsContext), g = useCollection(), f = useAPIClient(), C = useApp(), { theme: b } = useGlobalTheme(), S = useBlockRequestContext(), y = useFormActiveFields(), { locale: v } = useContext(ConfigProvider.ConfigContext), F = useDataSourceManager(), I = useDataSourceKey(), R = useCollectionRecord(), { association: T } = useDataBlockProps() || {}, D = useCurrentRecord(), O = useFormBlockContext(), j = useBlockContext(), { getOperators: N } = useOperators(), B = useLocationSearch(), w = useVariables$1(), { formValue: M, collection: $, parent: k } = useSubFormValue(), z = useCurrentPopupRecord(), L = useParentPopupRecord();
   return t ? null : /* @__PURE__ */ jsx(
     SchemaSettingsItem,
     P(x({
       title: n
     }, m), {
       onClick: () => V(void 0, null, function* () {
-        const L = l ? yield l() : c, G = _.isFunction(e.schema) ? e.schema() : e.schema;
+        const E = l ? yield l() : c, G = _.isFunction(e.schema) ? e.schema() : e.schema;
         FormDialog(
           { title: G.title || n, width: u },
           () => /* @__PURE__ */ jsx(p, { children: /* @__PURE__ */ jsx(CollectOperators, { defaultOperators: N(), children: /* @__PURE__ */ jsx(VariablesContext.Provider, { value: w, children: /* @__PURE__ */ jsx(BlockContext.Provider, { value: j, children: /* @__PURE__ */ jsx(
@@ -21697,8 +21701,8 @@ const SchemaSettingsModalItem = (e) => {
               recordData: z == null ? void 0 : z.value,
               collection: z == null ? void 0 : z.collection,
               parent: {
-                recordData: E == null ? void 0 : E.value,
-                collection: E == null ? void 0 : E.collection
+                recordData: L == null ? void 0 : L.value,
+                collection: L == null ? void 0 : L.collection
               },
               children: /* @__PURE__ */ jsx(CollectionRecordProvider, { record: d ? null : R, children: /* @__PURE__ */ jsx(CurrentRecordContextProvider, P(x({}, D), { children: /* @__PURE__ */ jsx(FormBlockContext$1.Provider, { value: O, children: /* @__PURE__ */ jsx(SubFormProvider, { value: { value: M, collection: $, parent: k }, children: /* @__PURE__ */ jsx(
                 FormActiveFieldsProvider,
@@ -21744,7 +21748,7 @@ const SchemaSettingsModalItem = (e) => {
           ) }) }) }) }),
           b
         ).open({
-          initialValues: L,
+          initialValues: E,
           effects: i
         }).then((U) => (a(U), U)).catch((U) => {
           console.error(U);
@@ -22582,7 +22586,7 @@ const getActionContext = (e) => {
   var n;
   return ((n = e.fieldSchema) == null ? void 0 : n["x-action-context"]) || {};
 }, SchemaSettingsDefaultValue = function e(t) {
-  var k, z, E;
+  var k, z, L;
   const n = useFieldSchema(), o = (k = t == null ? void 0 : t.fieldSchema) != null ? k : n, r = useField(), { dn: i } = useDesignable(), { t: a } = useTranslation(), l = useActionContext(), c = getActionContext(l).collection;
   let u;
   const { getField: d } = useCollection_deprecated(), { getCollectionJoinField: p, getCollectionFields: m, getAllCollectionsInheritChain: h } = useCollectionManager_deprecated(), g = useVariables$1(), f = useLocalVariables$1(), C = useCollection_deprecated(), b = useRecord(), { form: S } = useFormBlockContext(), { getFields: y } = useCollectionFilterOptionsV2(C), { isInSubForm: v, isInSubTable: F } = useFlag() || {}, { name: I } = C, R = useMemo(
@@ -22590,12 +22594,12 @@ const getActionContext = (e) => {
     [o, p, d]
   ), T = _.omit(o, "required");
   R != null && R.target && (u = p(
-    `${R.target}.${((E = (z = o["x-component-props"]) == null ? void 0 : z.fieldNames) == null ? void 0 : E.label) || "id"}`
+    `${R.target}.${((L = (z = o["x-component-props"]) == null ? void 0 : z.fieldNames) == null ? void 0 : L.label) || "id"}`
   ));
   const D = (R == null ? void 0 : R.interface) === "m2o" && findParentFieldSchema(o), O = D && p(D == null ? void 0 : D["x-collection-field"]), j = useTableBlockContext(), N = (R == null ? void 0 : R.interface) === "m2m" || (R == null ? void 0 : R.interface) === "mbm" || (O == null ? void 0 : O.type) === "hasMany" && (R == null ? void 0 : R.interface) === "m2o", B = useCallback(
     (q) => {
-      const L = q.find((U) => U.value === "$nForm"), G = m(I);
-      return !(G != null && G.length) && L && (L.children = formatVariableScop(y())), q;
+      const E = q.find((U) => U.value === "$nForm"), G = m(I);
+      return !(G != null && G.length) && E && (E.children = formatVariableScop(y())), q;
     },
     [y, I]
   ), w = useMemo(() => ({
@@ -22630,7 +22634,7 @@ const getActionContext = (e) => {
             localVariables: f,
             getAllCollectionsInheritChain: h
           }),
-          renderSchemaComponent: function(L) {
+          renderSchemaComponent: function(E) {
             const G = useMemo(() => _.cloneDeep(T) || {}, []);
             G["x-read-pretty"] = !1, G["x-disabled"] = !1, _.set(G, "x-decorator-props.showTitle", !1);
             const U = getFieldDefaultValue(G, R);
@@ -22652,7 +22656,7 @@ const getActionContext = (e) => {
               }),
               [G, U]
             );
-            return _.set(H, "x-component-props.onChange", L.onChange), /* @__PURE__ */ jsx(FormProvider, { children: /* @__PURE__ */ jsx(SchemaComponent, { schema: H }) });
+            return _.set(H, "x-component-props.onChange", E.onChange), /* @__PURE__ */ jsx(FormProvider, { children: /* @__PURE__ */ jsx(SchemaComponent, { schema: H }) });
           }
         }),
         title: a("Default value"),
@@ -22676,11 +22680,11 @@ const getActionContext = (e) => {
   ]), $ = useCallback(
     (q) => {
       var G, U, H;
-      const L = {
+      const E = {
         "x-uid": o["x-uid"]
       };
-      o.default = (G = q.default) != null ? G : null, isVariable$1(q.default) || (U = r.setInitialValue) == null || U.call(r, q.default), L.default = (H = q.default) != null ? H : null, i.emit("patch", {
-        schema: L,
+      o.default = (G = q.default) != null ? G : null, isVariable$1(q.default) || (U = r.setInitialValue) == null || U.call(r, q.default), E.default = (H = q.default) != null ? H : null, i.emit("patch", {
+        schema: E,
         currentSchema: n
       });
     },
@@ -23468,7 +23472,7 @@ const useGetFilterOptions = () => {
     };
   });
 }, TableColumnDesigner$1 = (e) => {
-  var j, N, B, w, M, $, k, z, E, q, L, G;
+  var j, N, B, w, M, $, k, z, L, q, E, G;
   const { uiSchema: t, fieldSchema: n, collectionField: o } = e, { form: r } = useFormBlockContext(), { getInterface: i, getCollection: a } = useCollectionManager_deprecated(), l = useField(), { t: c } = useTranslation(), u = useFieldSchema(), { dn: d } = useDesignable(), p = ((j = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : j.fieldNames) || ((N = t == null ? void 0 : t["x-component-props"]) == null ? void 0 : N.fieldNames), m = useLabelFields$1((B = o == null ? void 0 : o.target) != null ? B : o == null ? void 0 : o.targetCollection), h = useColorFields((w = o == null ? void 0 : o.target) != null ? w : o == null ? void 0 : o.targetCollection), g = i(o == null ? void 0 : o.interface), f = a(o == null ? void 0 : o.target), C = isFileCollection$2(f), b = ["QuickEdit", "FormItem"].includes(n["x-decorator"]), { currentMode: S } = useAssociationFieldContext(), { isAllowToSetDefaultValue: y } = useIsAllowToSetDefaultValue({ collectionField: o, fieldSchema: n }), v = ["datetime", "createdAt", "updatedAt"].includes(o == null ? void 0 : o.interface), F = ["obo", "oho", "o2o", "o2m", "m2m", "m2o", "snapshot"].includes(
     o == null ? void 0 : o.interface
   ), I = useFieldModeOptions({ fieldSchema: n }), R = ((M = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : M.mode) || "Select";
@@ -23511,7 +23515,7 @@ const useGetFilterOptions = () => {
       SchemaSettingsDataScope,
       {
         collectionName: o == null ? void 0 : o.target,
-        defaultFilter: ((E = (z = (k = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : k.service) == null ? void 0 : z.params) == null ? void 0 : E.filter) || {},
+        defaultFilter: ((L = (z = (k = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : k.service) == null ? void 0 : z.params) == null ? void 0 : L.filter) || {},
         form: r,
         onSubmit: ({ filter: U }) => {
           var J, K;
@@ -23580,7 +23584,7 @@ const useGetFilterOptions = () => {
       SchemaSettingsSwitchItem,
       {
         title: c("Enable link"),
-        checked: ((L = n["x-component-props"]) == null ? void 0 : L.enableLink) !== !1,
+        checked: ((E = n["x-component-props"]) == null ? void 0 : E.enableLink) !== !1,
         onChange: (U) => {
           n["x-component-props"] = P(x({}, n == null ? void 0 : n["x-component-props"]), {
             enableLink: U
@@ -25552,8 +25556,8 @@ function Input$1(e) {
     [M.value]: "$",
     [M.label]: y("Constant")
   } : i ? getTypedConstantOption(B, i, M) : null, [B, i]), k = (H = $ == null ? void 0 : $.component) != null ? H : NullComponent, z = Array.isArray(i) ? (K = (J = i.find((W) => Array.isArray(W) && W[0] === B)) == null ? void 0 : J[1]) != null ? K : {} : {};
-  let E;
-  t == null ? a ? o && D ? E = ["$"] : E = [""] : o ? E = ["$"] : E = [" ", B] : E = o ? ["$"] : [" ", B], m && (E = ["$"]), useEffect(() => {
+  let L;
+  t == null ? a ? o && D ? L = ["$"] : L = [""] : o ? L = ["$"] : L = [" ", B] : L = o ? ["$"] : [" ", B], m && (L = ["$"]), useEffect(() => {
     const Z = $ != null ? $ : {}, { component: W } = Z, X = Y(Z, ["component"]), ee = [
       ...a ? [
         {
@@ -25582,7 +25586,7 @@ function Input$1(e) {
       }
       yield X.loadChildren(X, Z, w), I((ne) => [...ne]);
     }
-  }), L = useCallback(
+  }), E = useCallback(
     (W, X) => {
       var ee, Z, ne;
       if (W[0] === "$") {
@@ -25703,8 +25707,8 @@ function Input$1(e) {
         Cascader$1,
         {
           options: F,
-          value: w != null ? w : E,
-          onChange: L,
+          value: w != null ? w : L,
+          onChange: E,
           loadData: q,
           changeOnSelect: u,
           fieldNames: d,
@@ -25898,23 +25902,23 @@ function TextArea(e) {
   ), [S, y] = useState(!1), [v, F] = useState(!1), [I, R] = useState(() => renderHTML(p != null ? p : "", b, c)), [T, D] = useState([-1, 0, -1, 0]);
   useAntdInputStyle("ant-input");
   const { token: O } = theme.useToken(), j = c.join(" "), N = useCallback(
-    (L) => {
+    (E) => {
       var U;
-      const G = getValue(L, c);
+      const G = getValue(E, c);
       (U = e.onChange) == null || U.call(e, d ? G.trim() : G);
     },
     [j, e.onChange, d]
   );
   useEffect(() => {
-    preloadOptions(r, m).then((L) => {
-      f(L);
+    preloadOptions(r, m).then((E) => {
+      f(E);
     }).catch(console.error);
   }, [r, JSON.stringify(m)]), useEffect(() => {
     R(renderHTML(p != null ? p : "", b, c)), v || D([-1, 0, -1, 0]);
   }, [p, b, j]), useEffect(() => {
     var U;
-    const { current: L } = h;
-    if (!L)
+    const { current: E } = h;
+    if (!E)
       return;
     const G = new Range();
     if (v) {
@@ -25923,22 +25927,22 @@ function TextArea(e) {
       const H = (U = window.getSelection) == null ? void 0 : U.call(window);
       if (H)
         try {
-          const J = Array.from(L.childNodes);
+          const J = Array.from(E.childNodes);
           J.length && (T[0] === -1 ? T[1] && G.setStartAfter(J[T[1] - 1]) : G.setStart(J[T[0]], T[1]), T[2] === -1 ? T[3] && G.setEndAfter(J[T[3] - 1]) : G.setEnd(J[T[2]], T[3])), G.collapse(!0), H.removeAllRanges(), H.addRange(G);
         } catch (J) {
         }
     } else {
-      const { lastChild: H } = L;
+      const { lastChild: H } = E;
       if (H) {
         G.setStartAfter(H), G.setEndAfter(H);
-        const J = Array.from(L.childNodes), K = G.startContainer === L ? -1 : J.indexOf(H), W = G.startContainer === L ? -1 : J.indexOf(H);
+        const J = Array.from(E.childNodes), K = G.startContainer === E ? -1 : J.indexOf(H), W = G.startContainer === E ? -1 : J.indexOf(H);
         D([K, G.startOffset, W, G.endOffset]);
       }
     }
   }, [I]);
   const B = useCallback(
-    function(L) {
-      const G = L.filter((J) => !!J.trim()), { current: U } = h;
+    function(E) {
+      const G = E.filter((J) => !!J.trim()), { current: U } = h;
       if (!U || !G)
         return;
       U.focus();
@@ -25949,25 +25953,25 @@ function TextArea(e) {
     },
     [b, N, T]
   ), w = useCallback(
-    function({ currentTarget: L }) {
-      S || (F(!0), D(getCurrentRange(L)), N(L));
+    function({ currentTarget: E }) {
+      S || (F(!0), D(getCurrentRange(E)), N(E));
     },
     [S, N]
-  ), M = useCallback(function({ currentTarget: L }) {
-    D(getCurrentRange(L));
-  }, []), $ = useCallback(function(L) {
-    L.key === "Enter" && L.preventDefault();
+  ), M = useCallback(function({ currentTarget: E }) {
+    D(getCurrentRange(E));
+  }, []), $ = useCallback(function(E) {
+    E.key === "Enter" && E.preventDefault();
   }, []), k = useCallback(function() {
     y(!0);
   }, []), z = useCallback(
-    ({ currentTarget: L }) => {
-      y(!1), F(!0), D(getCurrentRange(L)), N(L);
+    ({ currentTarget: E }) => {
+      y(!1), F(!0), D(getCurrentRange(E)), N(E);
     },
     [N]
-  ), E = useCallback(
-    function(L) {
-      L.preventDefault();
-      const G = L.clipboardData.getData("text/html") || L.clipboardData.getData("text"), U = sanitizeHTML(G, {
+  ), L = useCallback(
+    function(E) {
+      E.preventDefault();
+      const G = E.clipboardData.getData("text/html") || E.clipboardData.getData("text"), U = sanitizeHTML(G, {
         allowedTags: ["span"],
         allowedAttributes: {
           span: ["data-variable", "contenteditable"]
@@ -25984,7 +25988,7 @@ function TextArea(e) {
           }
         }
       }).replace(/\n/g, " ");
-      F(!0), pasteHTML(L.currentTarget, U), D(getCurrentRange(L.currentTarget)), N(L.currentTarget);
+      F(!0), pasteHTML(E.currentTarget, U), D(getCurrentRange(E.currentTarget)), N(E.currentTarget);
     },
     [N]
   ), q = e.disabled || C.disabled;
@@ -26038,7 +26042,7 @@ function TextArea(e) {
               onInput: w,
               onBlur: M,
               onKeyDown: $,
-              onPaste: E,
+              onPaste: L,
               onCompositionStart: k,
               onCompositionEnd: z,
               placeholder: e.placeholder,
@@ -26283,13 +26287,13 @@ const getVariableComponentWithScope = (e) => (t) => {
   }), [e]);
   return { urlSchema: n, paramsSchema: i, openInNewWindowSchema: a, modeSchema: o, htmlSchema: r };
 }, LinkMenuItem = () => {
-  const { t: e } = useTranslation(), t = useContext(SchemaOptionsContext), { theme: n } = useGlobalTheme(), { componentCls: o, hashId: r } = useStyles$b(), { urlSchema: i, paramsSchema: a } = useURLAndHTMLSchema(), l = useParentRoute(), { createRoute: c } = useNocoBaseRoutes(), u = useDataSourceManager(), d = useCollectionManager(), p = useCallback(() => V(void 0, null, function* () {
-    const m = yield FormDialog(
+  const { t: e } = useTranslation(), t = useContext(SchemaOptionsContext), { theme: n } = useGlobalTheme(), { componentCls: o, hashId: r } = useStyles$b(), { urlSchema: i, paramsSchema: a, openInNewWindowSchema: l } = useURLAndHTMLSchema(), c = useParentRoute(), { createRoute: u } = useNocoBaseRoutes(), d = useDataSourceManager(), p = useCollectionManager(), m = useCallback(() => V(void 0, null, function* () {
+    const h = yield FormDialog(
       e("Add link"),
       () => {
-        var S;
-        const b = createMemoryHistory();
-        return /* @__PURE__ */ jsx(DataSourceManagerProvider, { dataSourceManager: u, children: /* @__PURE__ */ jsx(CollectionManagerProvider, { instance: d, dataSource: (S = d == null ? void 0 : d.dataSource) == null ? void 0 : S.key, children: /* @__PURE__ */ jsx(Router, { location: b.location, navigator: b, children: /* @__PURE__ */ jsx(SchemaComponentOptions, { scope: t.scope, components: x({}, t.components), children: /* @__PURE__ */ jsx(FormLayout, { layout: "vertical", children: /* @__PURE__ */ jsx(
+        var v;
+        const y = createMemoryHistory();
+        return /* @__PURE__ */ jsx(DataSourceManagerProvider, { dataSourceManager: d, children: /* @__PURE__ */ jsx(CollectionManagerProvider, { instance: p, dataSource: (v = p == null ? void 0 : p.dataSource) == null ? void 0 : v.key, children: /* @__PURE__ */ jsx(Router, { location: y.location, navigator: y, children: /* @__PURE__ */ jsx(SchemaComponentOptions, { scope: t.scope, components: x({}, t.components), children: /* @__PURE__ */ jsx(FormLayout, { layout: "vertical", children: /* @__PURE__ */ jsx(
           SchemaComponent,
           {
             schema: {
@@ -26306,7 +26310,8 @@ const getVariableComponentWithScope = (e) => (t) => {
                   "x-decorator": "FormItem"
                 },
                 href: i,
-                params: a
+                params: a,
+                openInNewWindow: l
               }
             }
           }
@@ -26314,20 +26319,21 @@ const getVariableComponentWithScope = (e) => (t) => {
       },
       n
     ).open({
-      initialValues: {}
-    }), { title: h, href: g, params: f, icon: C } = m;
-    yield c({
+      initialValues: { openInNewWindow: !0 }
+    }), { title: g, href: f, params: C, icon: b, openInNewWindow: S } = h;
+    yield u({
       type: NocoBaseDesktopRouteType.link,
-      title: h,
-      icon: C,
-      parentId: l == null ? void 0 : l.id,
+      title: g,
+      icon: b,
+      parentId: c == null ? void 0 : c.id,
       options: {
-        href: g,
-        params: f
+        href: f,
+        params: C,
+        openInNewWindow: S
       }
     });
   }), [t.components, t.scope, e, n]);
-  return /* @__PURE__ */ jsx(SchemaInitializerItem, { title: e("Link"), onClick: p, className: `${o} ${r}` });
+  return /* @__PURE__ */ jsx(SchemaInitializerItem, { title: e("Link"), onClick: m, className: `${o} ${r}` });
 }, useInsertPageSchema = () => {
   const e = useAPIClient();
   return useCallback(
@@ -26546,8 +26552,8 @@ const GroupItem$1 = () => {
     }
   );
 }, InsertMenuItems$1 = (e) => {
-  const { eventKey: t, title: n, insertPosition: o } = e, { t: r } = useTranslation(), { urlSchema: i, paramsSchema: a } = useURLAndHTMLSchema(), l = useCurrentRoute(), c = (l == null ? void 0 : l.type) === NocoBaseDesktopRouteType.group, { createRoute: u, moveRoute: d } = useNocoBaseRoutes(), p = useInsertPageSchema();
-  return !c && o === "beforeEnd" ? null : /* @__PURE__ */ jsxs(SchemaSettingsSubMenu, { eventKey: t, title: n, children: [
+  const { eventKey: t, title: n, insertPosition: o } = e, { t: r } = useTranslation(), { urlSchema: i, paramsSchema: a, openInNewWindowSchema: l } = useURLAndHTMLSchema(), c = useCurrentRoute(), u = (c == null ? void 0 : c.type) === NocoBaseDesktopRouteType.group, { createRoute: d, moveRoute: p } = useNocoBaseRoutes(), m = useInsertPageSchema();
+  return !u && o === "beforeEnd" ? null : /* @__PURE__ */ jsxs(SchemaSettingsSubMenu, { eventKey: t, title: n, children: [
     /* @__PURE__ */ jsx(
       SchemaSettingsModalItem,
       {
@@ -26571,19 +26577,19 @@ const GroupItem$1 = () => {
             }
           }
         },
-        onSubmit: (g) => V(void 0, [g], function* ({ title: m, icon: h }) {
-          var S;
-          const f = uid(), C = o === "beforeEnd" ? l == null ? void 0 : l.id : l == null ? void 0 : l.parentId, { data: b } = yield u({
+        onSubmit: (f) => V(void 0, [f], function* ({ title: h, icon: g }) {
+          var y;
+          const C = uid(), b = o === "beforeEnd" ? c == null ? void 0 : c.id : c == null ? void 0 : c.parentId, { data: S } = yield d({
             type: NocoBaseDesktopRouteType.group,
-            title: m,
-            icon: h,
+            title: h,
+            icon: g,
             // 'beforeEnd' 表示的是 Insert inner，此时需要把路由插入到当前路由的内部
-            parentId: C || void 0,
-            schemaUid: f
+            parentId: b || void 0,
+            schemaUid: C
           });
-          insertPositionToMethod$1[o] && (yield d({
-            sourceId: (S = b == null ? void 0 : b.data) == null ? void 0 : S.id,
-            targetId: l == null ? void 0 : l.id,
+          insertPositionToMethod$1[o] && (yield p({
+            sourceId: (y = S == null ? void 0 : S.data) == null ? void 0 : y.id,
+            targetId: c == null ? void 0 : c.id,
             sortField: "sort",
             method: insertPositionToMethod$1[o]
           }));
@@ -26613,32 +26619,32 @@ const GroupItem$1 = () => {
             }
           }
         },
-        onSubmit: (g) => V(void 0, [g], function* ({ title: m, icon: h }) {
-          var F;
-          const f = uid(), C = uid(), b = uid(), S = uid(), y = o === "beforeEnd" ? l == null ? void 0 : l.id : l == null ? void 0 : l.parentId, { data: v } = yield u({
+        onSubmit: (f) => V(void 0, [f], function* ({ title: h, icon: g }) {
+          var I;
+          const C = uid(), b = uid(), S = uid(), y = uid(), v = o === "beforeEnd" ? c == null ? void 0 : c.id : c == null ? void 0 : c.parentId, { data: F } = yield d({
             type: NocoBaseDesktopRouteType.page,
-            title: m,
-            icon: h,
+            title: h,
+            icon: g,
             // 'beforeEnd' 表示的是 Insert inner，此时需要把路由插入到当前路由的内部
-            parentId: y || void 0,
-            schemaUid: C,
-            menuSchemaUid: f,
+            parentId: v || void 0,
+            schemaUid: b,
+            menuSchemaUid: C,
             enableTabs: !1,
             children: [
               {
                 type: NocoBaseDesktopRouteType.tabs,
-                schemaUid: b,
-                tabSchemaName: S,
+                schemaUid: S,
+                tabSchemaName: y,
                 hidden: !0
               }
             ]
           });
-          insertPositionToMethod$1[o] && (yield d({
-            sourceId: (F = v == null ? void 0 : v.data) == null ? void 0 : F.id,
-            targetId: l == null ? void 0 : l.id,
+          insertPositionToMethod$1[o] && (yield p({
+            sourceId: (I = F == null ? void 0 : F.data) == null ? void 0 : I.id,
+            targetId: c == null ? void 0 : c.id,
             sortField: "sort",
             method: insertPositionToMethod$1[o]
-          })), p(getPageMenuSchema({ pageSchemaUid: C, tabSchemaUid: b, tabSchemaName: S }));
+          })), m(getPageMenuSchema({ pageSchemaUid: b, tabSchemaUid: S, tabSchemaName: y }));
         })
       }
     ),
@@ -26663,26 +26669,28 @@ const GroupItem$1 = () => {
               "x-decorator": "FormItem"
             },
             href: i,
-            params: a
+            params: a,
+            openInNewWindow: l
           }
         },
-        onSubmit: (C) => V(void 0, [C], function* ({ title: m, icon: h, href: g, params: f }) {
-          var v;
-          const b = uid(), S = o === "beforeEnd" ? l == null ? void 0 : l.id : l == null ? void 0 : l.parentId, { data: y } = yield u({
+        onSubmit: (S) => V(void 0, [S], function* ({ title: h, icon: g, href: f, params: C, openInNewWindow: b }) {
+          var I;
+          const y = uid(), v = o === "beforeEnd" ? c == null ? void 0 : c.id : c == null ? void 0 : c.parentId, { data: F } = yield d({
             type: NocoBaseDesktopRouteType.link,
-            title: m,
-            icon: h,
+            title: h,
+            icon: g,
             // 'beforeEnd' 表示的是 Insert inner，此时需要把路由插入到当前路由的内部
-            parentId: S || void 0,
-            schemaUid: b,
+            parentId: v || void 0,
+            schemaUid: y,
             options: {
-              href: g,
-              params: f
+              href: f,
+              params: C,
+              openInNewWindow: b
             }
           });
-          insertPositionToMethod$1[o] && (yield d({
-            sourceId: (v = y == null ? void 0 : y.data) == null ? void 0 : v.id,
-            targetId: l == null ? void 0 : l.id,
+          insertPositionToMethod$1[o] && (yield p({
+            sourceId: (I = F == null ? void 0 : F.data) == null ? void 0 : I.id,
+            targetId: c == null ? void 0 : c.id,
             sortField: "sort",
             method: insertPositionToMethod$1[o]
           }));
@@ -26708,18 +26716,19 @@ const GroupItem$1 = () => {
         "x-decorator": "FormItem"
       }
     }
-  }), [e]), n = useCurrentRoute(), { urlSchema: o, paramsSchema: r } = useURLAndHTMLSchema(), i = useMemo(() => ({
+  }), [e]), n = useCurrentRoute(), { urlSchema: o, paramsSchema: r, openInNewWindowSchema: i } = useURLAndHTMLSchema(), a = useMemo(() => ({
     title: n.title,
     icon: n.icon
   }), [n.title, n.icon]);
-  n.type === NocoBaseDesktopRouteType.link && (t.properties.href = o, t.properties.params = r, i.href = n.options.href, i.params = n.options.params);
-  const { updateRoute: a } = useNocoBaseRoutes(), l = useCallback(({ title: c, icon: u, href: d, params: p }) => {
-    n.id !== void 0 && a(n.id, {
-      title: c,
-      icon: u,
-      options: d || p ? {
-        href: d,
-        params: p
+  n.type === NocoBaseDesktopRouteType.link && (t.properties.href = o, t.properties.params = r, t.properties.openInNewWindow = i, a.href = n.options.href, a.params = n.options.params, a.openInNewWindow = n.options.openInNewWindow !== !1);
+  const { updateRoute: l } = useNocoBaseRoutes(), c = useCallback(({ title: u, icon: d, href: p, params: m, openInNewWindow: h }) => {
+    n.id !== void 0 && l(n.id, {
+      title: u,
+      icon: d,
+      options: p || m ? {
+        href: p,
+        params: m,
+        openInNewWindow: h
       } : void 0
     });
   }, []);
@@ -26729,8 +26738,8 @@ const GroupItem$1 = () => {
       title: e("Edit"),
       eventKey: "edit",
       schema: t,
-      initialValues: i,
-      onSubmit: l
+      initialValues: a,
+      onSubmit: c
     }
   );
 }, HiddenMenuItem = () => {
@@ -27106,43 +27115,43 @@ const useAllAccessDesktopRoutes = () => useContext(AllAccessDesktopRoutesContext
   const { inHeader: t } = useContext(headerContext);
   return /* @__PURE__ */ jsx(RouteContext.Consumer, { children: (n) => n.collapsed && !e.hidden && !t ? /* @__PURE__ */ jsx(Tooltip, { title: e.title, placement: "right", children: e.children }) : e.children });
 }, MenuItem = (e) => {
-  var c;
-  const { item: t } = e, { parseURLAndParams: n } = useParseURLAndParams(), o = useRef(null), r = useLocation();
+  var d;
+  const { item: t } = e, { parseURLAndParams: n } = useParseURLAndParams(), o = useRef(null), r = useLocation(), i = useNavigateNoUpdate(), a = useRouterBasename();
   useEffect(() => {
     o.current && (o.current.parentElement.parentElement.style.order = 999, o.current.parentElement.parentElement.style.paddingLeft = 0, o.current.parentElement.parentElement.style.padding = 0);
   }, []);
-  const i = useCallback(
-    (u) => V(void 0, null, function* () {
-      var m, h;
-      const d = (m = t._route.options) == null ? void 0 : m.href, p = (h = t._route.options) == null ? void 0 : h.params;
-      u.preventDefault(), u.stopPropagation();
+  const l = useCallback(
+    (p) => V(void 0, null, function* () {
+      var f, C, b;
+      const m = (f = t._route.options) == null ? void 0 : f.href, h = (C = t._route.options) == null ? void 0 : C.params, g = (b = t._route.options) == null ? void 0 : b.openInNewWindow;
+      p.preventDefault(), p.stopPropagation();
       try {
-        const g = yield n(d, p || []);
-        window.open(g, "_blank");
-      } catch (g) {
-        console.error(g), window.open(d, "_blank");
+        const S = yield n(m, h || []);
+        g !== !1 ? window.open(S, "_blank") : navigateWithinSelf(m, i, window.location.origin + a);
+      } catch (S) {
+        console.error(S), window.open(m, "_blank");
       }
     }),
     [n, t]
   );
   if (t._hidden)
     return null;
-  const a = { __route__: t._route };
+  const c = { __route__: t._route };
   if (t.key === "x-designer-button")
     return /* @__PURE__ */ jsx("div", { ref: o, children: /* @__PURE__ */ jsx(ResetThemeTokenAndKeepAlgorithm, { children: /* @__PURE__ */ jsx(ParentRouteContext.Provider, { value: t._parentRoute, children: /* @__PURE__ */ jsx(NocoBaseRouteContext.Provider, { value: t._route, children: e.children }) }) }) });
-  if (((c = t._route) == null ? void 0 : c.type) === NocoBaseDesktopRouteType.link)
-    return /* @__PURE__ */ jsx(ParentRouteContext.Provider, { value: t._parentRoute, children: /* @__PURE__ */ jsx(NocoBaseRouteContext.Provider, { value: t._route, children: /* @__PURE__ */ jsxs(SortableItem, { id: t._route.id, schema: a, children: [
-      /* @__PURE__ */ jsx("div", { onClick: i, children: /* @__PURE__ */ jsx(Link$1, { to: r.pathname, "aria-label": t.name, children: e.children }) }),
+  if (((d = t._route) == null ? void 0 : d.type) === NocoBaseDesktopRouteType.link)
+    return /* @__PURE__ */ jsx(ParentRouteContext.Provider, { value: t._parentRoute, children: /* @__PURE__ */ jsx(NocoBaseRouteContext.Provider, { value: t._route, children: /* @__PURE__ */ jsxs(SortableItem, { id: t._route.id, schema: c, children: [
+      /* @__PURE__ */ jsx("div", { onClick: l, children: /* @__PURE__ */ jsx(Link$1, { to: r.pathname, "aria-label": t.name, children: e.children }) }),
       /* @__PURE__ */ jsx(MenuSchemaToolbar, {})
     ] }) }) });
-  const l = t.redirect || t.path;
-  return /* @__PURE__ */ jsx(ParentRouteContext.Provider, { value: t._parentRoute, children: /* @__PURE__ */ jsx(NocoBaseRouteContext.Provider, { value: t._route, children: /* @__PURE__ */ jsxs(SortableItem, { id: t._route.id, schema: a, children: [
+  const u = t.redirect || t.path;
+  return /* @__PURE__ */ jsx(ParentRouteContext.Provider, { value: t._parentRoute, children: /* @__PURE__ */ jsx(NocoBaseRouteContext.Provider, { value: t._route, children: /* @__PURE__ */ jsxs(SortableItem, { id: t._route.id, schema: c, children: [
     /* @__PURE__ */ jsx(
       WithTooltip,
       {
         title: t.name,
         hidden: t._route.type === NocoBaseDesktopRouteType.group || t._depth > 0,
-        children: /* @__PURE__ */ jsx(Link$1, { to: l, "aria-label": t.name, children: e.children })
+        children: /* @__PURE__ */ jsx(Link$1, { to: u, "aria-label": t.name, children: e.children })
       }
     ),
     /* @__PURE__ */ jsx(MenuSchemaToolbar, {})
@@ -27564,14 +27573,14 @@ const useCreateActionProps = () => {
   return {
     onClick() {
       return V(this, null, function* () {
-        var z, E, q, L, G, U;
+        var z, L, q, E, G, U;
         const R = u.map((H) => H.name), {
           assignedValues: T = {},
           onSuccess: D,
           overwriteValues: O,
           skipValidator: j,
           triggerWorkflows: N
-        } = (z = l == null ? void 0 : l["x-action-settings"]) != null ? z : {}, B = (E = i == null ? void 0 : i["x-component-props"]) == null ? void 0 : E.addChild, { successMessage: w } = D || {}, M = {}, $ = Object.keys(T).map((H) => V(this, null, function* () {
+        } = (z = l == null ? void 0 : l["x-action-settings"]) != null ? z : {}, B = (L = i == null ? void 0 : i["x-component-props"]) == null ? void 0 : L.addChild, { successMessage: w } = D || {}, M = {}, $ = Object.keys(T).map((H) => V(this, null, function* () {
           const J = T[H], K = d(H);
           if (isVariable$1(J)) {
             const { value: W } = (yield C == null ? void 0 : C.parseVariable(J, b)) || {};
@@ -27591,7 +27600,7 @@ const useCreateActionProps = () => {
         });
         if (B) {
           const H = p();
-          k[(q = H == null ? void 0 : H.name) != null ? q : "parent"] = f, k[(L = H == null ? void 0 : H.foreignKey) != null ? L : "parentId"] = f.id;
+          k[(q = H == null ? void 0 : H.name) != null ? q : "parent"] = f, k[(E = H == null ? void 0 : H.foreignKey) != null ? E : "parentId"] = f.id;
         }
         c.data = t.data || {}, c.data.loading = !0;
         try {
@@ -27754,12 +27763,12 @@ const useCreateActionProps = () => {
         } = (z = i == null ? void 0 : i["x-action-settings"]) != null ? z : {}, { manualClose: j, redirecting: N, redirectTo: B, successMessage: w, actionAfterSuccess: M } = D || {};
         m.data = e.data || {}, m.data.loading = !0;
         const $ = {}, k = Object.keys(T).map((q) => V(this, null, function* () {
-          const L = T[q], G = C(q);
-          if (isVariable$1(L)) {
-            const { value: U } = (yield g == null ? void 0 : g.parseVariable(L, b)) || {};
+          const E = T[q], G = C(q);
+          if (isVariable$1(E)) {
+            const { value: U } = (yield g == null ? void 0 : g.parseVariable(E, b)) || {};
             U && ($[q] = transformVariableValue(U, { targetCollectionField: G }));
           } else
-            L !== "" && ($[q] = L);
+            E !== "" && ($[q] = E);
         }));
         yield Promise.all(k), (M === "previous" || !M && N !== !0) && (S == null || S(!1)), h.confirm({
           title: p("Bulk update"),
@@ -27767,7 +27776,7 @@ const useCreateActionProps = () => {
           onOk() {
             return V(this, null, function* () {
               var G, U, H, J;
-              const { filter: q } = (U = (G = o.params) == null ? void 0 : G[0]) != null ? U : {}, L = {
+              const { filter: q } = (U = (G = o.params) == null ? void 0 : G[0]) != null ? U : {}, E = {
                 values: x({}, $),
                 filter: q,
                 forceUpdate: !1
@@ -27777,11 +27786,11 @@ const useCreateActionProps = () => {
                   message.error(p("Please select the records to be updated")), m.data.loading = !1;
                   return;
                 }
-                L.filter = { $and: [{ [l || "id"]: { $in: c } }] };
+                E.filter = { $and: [{ [l || "id"]: { $in: c } }] };
               }
-              L.filter || (L.forceUpdate = !0);
+              E.filter || (E.forceUpdate = !0);
               try {
-                yield t.update(L);
+                yield t.update(E);
               } catch (K) {
               } finally {
                 m.data.loading = !1;
@@ -27809,7 +27818,7 @@ const useCreateActionProps = () => {
   return {
     onClick() {
       return V(this, null, function* () {
-        var q, L, G, U;
+        var q, E, G, U;
         const { skipValidator: I, onSuccess: R, requestSettings: T } = (q = o == null ? void 0 : o["x-action-settings"]) != null ? q : {}, { manualClose: D, redirecting: O, redirectTo: j, successMessage: N, actionAfterSuccess: B } = R || {}, w = o == null ? void 0 : o["x-action"];
         if (!T.url)
           return;
@@ -27827,7 +27836,7 @@ const useCreateActionProps = () => {
           });
           Object.assign(k, J);
         }
-        const E = {
+        const L = {
           url: renderTemplate(T.url, { currentRecord: m, currentUser: g }),
           method: T.method,
           headers: parse(M)({ currentRecord: m, currentUser: g }),
@@ -27836,7 +27845,7 @@ const useCreateActionProps = () => {
         };
         f.data = c.data || {}, f.data.loading = !0;
         try {
-          yield e.request(x({}, E)), f.data.loading = !1, u instanceof TableFieldResource || (G = (L = d == null ? void 0 : d.service) == null ? void 0 : L.refresh) == null || G.call(L), (U = p == null ? void 0 : p.refresh) == null || U.call(p), w === "customize:form:request" && (B === "previous" || !B && O !== !0) && (b == null || b(!1)), N || (message.success(C("Saved successfully")), yield resetFormCorrectly(i), (O && !B || B === "redirect") && j && (isURL(j) ? window.location.href = j : t(j))), D ? S.success({
+          yield e.request(x({}, L)), f.data.loading = !1, u instanceof TableFieldResource || (G = (E = d == null ? void 0 : d.service) == null ? void 0 : E.refresh) == null || G.call(E), (U = p == null ? void 0 : p.refresh) == null || U.call(p), w === "customize:form:request" && (B === "previous" || !B && O !== !0) && (b == null || b(!1)), N || (message.success(C("Saved successfully")), yield resetFormCorrectly(i), (O && !B || B === "redirect") && j && (isURL(j) ? window.location.href = j : t(j))), D ? S.success({
             title: r(N),
             onOk: () => V(this, null, function* () {
               (O && !B || B === "redirect") && j && (isURL(j) ? window.location.href = j : t(j));
@@ -27853,14 +27862,14 @@ const useCreateActionProps = () => {
   return {
     onClick(F, I) {
       return V(this, null, function* () {
-        var L;
+        var E;
         const {
           assignedValues: R = {},
           onSuccess: T,
           overwriteValues: D,
           skipValidator: O,
           triggerWorkflows: j
-        } = (L = l == null ? void 0 : l["x-action-settings"]) != null ? L : {}, { manualClose: N, redirecting: B, redirectTo: w, successMessage: M, actionAfterSuccess: $ } = T || {}, k = {}, z = Object.keys(R).map((G) => V(this, null, function* () {
+        } = (E = l == null ? void 0 : l["x-action-settings"]) != null ? E : {}, { manualClose: N, redirecting: B, redirectTo: w, successMessage: M, actionAfterSuccess: $ } = T || {}, k = {}, z = Object.keys(R).map((G) => V(this, null, function* () {
           const U = R[G], H = d(G);
           if (isVariable$1(U)) {
             const { value: J } = (yield b == null ? void 0 : b.parseVariable(U, S)) || {};
@@ -27869,11 +27878,11 @@ const useCreateActionProps = () => {
             U !== "" && (k[G] = U);
         }));
         yield Promise.all(z), O || (yield e.submit());
-        const E = u.map((G) => G.name), q = getFormValues({
+        const L = u.map((G) => G.name), q = getFormValues({
           filterByTk: t,
           field: n,
           form: e,
-          fieldNames: E,
+          fieldNames: L,
           getField: d,
           resource: o,
           actionFields: (y == null ? void 0 : y("form")) || []
@@ -28122,25 +28131,25 @@ const useCreateActionProps = () => {
         var U, H, J, K;
         if (!M.find((W) => W.uid === k.uid))
           return;
-        const E = `${$}${t.name}`, q = ((U = k.service.params) == null ? void 0 : U[0]) || {};
+        const L = `${$}${t.name}`, q = ((U = k.service.params) == null ? void 0 : U[0]) || {};
         (J = (H = k.service.params) == null ? void 0 : H[1]) != null && J.filters || _.set(k.service.params, "[1].filters", {});
-        const L = k.service.params[1].filters;
+        const E = k.service.params[1].filters;
         if (w.length)
-          L[E] = {
+          E[L] = {
             [S]: w
           };
         else {
           if ((K = k.clearSelection) == null || K.call(k), k.dataLoadingMode === "manual")
             return k.clearData();
-          delete L[E];
+          delete E[L];
         }
-        const G = mergeFilter([...Object.values(L), k.defaultFilter]);
+        const G = mergeFilter([...Object.values(E), k.defaultFilter]);
         return k.doFilter(
           P(x({}, q), {
             page: 1,
             filter: G
           }),
-          { filters: L }
+          { filters: E }
         );
       });
     },
@@ -28162,7 +28171,7 @@ const useCreateActionProps = () => {
         p = $;
         return;
       }
-      p = $.filter((E) => E.label.includes(z));
+      p = $.filter((L) => L.label.includes(z));
     };
   } else
     S = `${r}.${C}.$in`, p = (f == null ? void 0 : f.data) || [], m = (w) => {
@@ -35281,10 +35290,10 @@ const tableBlockSettings = new SchemaSettings({
   name: "fieldSettings:component:CascadeSelect",
   items: [fieldComponent$6, titleField$1, ellipsisSettingsItem, setTheDataScope]
 }), SchemaSettingsDateRange = function e(t) {
-  var R, T, D, O, j, N, B, w, M, $, k, z, E, q, L, G;
+  var R, T, D, O, j, N, B, w, M, $, k, z, L, q, E, G;
   const { fieldSchema: n } = t, o = useField(), { dn: r } = useDesignable(), { t: i } = useTranslation(), { getCollectionJoinField: a } = useCollectionManager_deprecated(), { isInSubForm: l, isInSubTable: c } = useFlag() || {}, u = a(n == null ? void 0 : n["x-collection-field"]) || {}, d = ((R = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : R.showTime) || ((D = (T = u == null ? void 0 : u.uiSchema) == null ? void 0 : T["x-component-props"]) == null ? void 0 : D.showTime) || !1, p = ((O = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : O.dateFormat) || ((N = (j = u == null ? void 0 : u.uiSchema) == null ? void 0 : j["x-component-props"]) == null ? void 0 : N.dateFormat) || "YYYY-MM-DD", m = ((B = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : B.timeFormat) || ((M = (w = u == null ? void 0 : u.uiSchema) == null ? void 0 : w["x-component-props"]) == null ? void 0 : M.timeFormat) || "HH:mm:ss", h = (($ = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : $.picker) || ((z = (k = u == null ? void 0 : u.uiSchema) == null ? void 0 : k["x-component-props"]) == null ? void 0 : z.picker) || "date";
   n["x-read-pretty"] || o.readOnly || o.readPretty;
-  const g = (E = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : E._minDate, f = (q = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : q._maxDate, C = ((L = u == null ? void 0 : u.uiSchema) == null ? void 0 : L["x-component-props"].gmt) || !1, b = ((G = u == null ? void 0 : u.uiSchema) == null ? void 0 : G["x-component-props"].utc) || !1, S = useRecord(), { form: y } = useFormBlockContext(), v = useCallback(
+  const g = (L = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : L._minDate, f = (q = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : q._maxDate, C = ((E = u == null ? void 0 : u.uiSchema) == null ? void 0 : E["x-component-props"].gmt) || !1, b = ((G = u == null ? void 0 : u.uiSchema) == null ? void 0 : G["x-component-props"].utc) || !1, S = useRecord(), { form: y } = useFormBlockContext(), v = useCallback(
     (U) => /* @__PURE__ */ jsx(
       SchemaComponent,
       {
@@ -36745,11 +36754,11 @@ const variablesStore = {}, getFieldPath$1 = (e, t) => {
             dataSource: T,
             collectionName: N
           };
-        const k = y[$], z = y.slice(0, $ + 1).join("."), { fieldPath: E } = getFieldPath$1(z, F), q = r(E, T), L = (M = i(O, T)) == null ? void 0 : M.getPrimaryKey();
+        const k = y[$], z = y.slice(0, $ + 1).join("."), { fieldPath: L } = getFieldPath$1(z, F), q = r(L, T), E = (M = i(O, T)) == null ? void 0 : M.getPrimaryKey();
         if (Array.isArray(I)) {
           const G = I.map((U) => {
-            if (!(S != null && S.doNotRequest) && shouldToRequest(U == null ? void 0 : U[k]) && (U == null ? void 0 : U[L]) != null && q != null && q.target) {
-              const H = `/${O}/${U[q.sourceKey || L]}/${k}:${getAction(q.type)}`;
+            if (!(S != null && S.doNotRequest) && shouldToRequest(U == null ? void 0 : U[k]) && (U == null ? void 0 : U[E]) != null && q != null && q.target) {
+              const H = `/${O}/${U[q.sourceKey || E]}/${k}:${getAction(q.type)}`;
               if (hasRequested(H))
                 return getRequested(H);
               const J = o.request({
@@ -36764,8 +36773,8 @@ const variablesStore = {}, getFieldPath$1 = (e, t) => {
             return U == null ? void 0 : U[k];
           });
           I = removeThroughCollectionFields(_.flatten(yield Promise.all(G)), q);
-        } else if (!(S != null && S.doNotRequest) && shouldToRequest(I[k]) && I[L] != null && (q != null && q.target)) {
-          const G = `/${O}/${I[q.sourceKey || L]}/${k}:${getAction(q.type)}`;
+        } else if (!(S != null && S.doNotRequest) && shouldToRequest(I[k]) && I[E] != null && (q != null && q.target)) {
+          const G = `/${O}/${I[q.sourceKey || E]}/${k}:${getAction(q.type)}`;
           let U = null;
           if (hasRequested(G))
             U = yield getRequested(G);
@@ -37236,7 +37245,7 @@ const ActionLink = withDynamicSchemaProps(
       "onMouseEnter",
       "refreshDataBlockRequest",
       "confirmTitle"
-    ]), v = useDesigner(), F = useField(), I = useFieldSchema(), R = useCompile(), T = useCollectionRecordData(), D = R((U = I["x-component-props"]) == null ? void 0 : U.confirm) || g, O = useMemo(() => (I == null ? void 0 : I["x-linkage-rules"]) || [], [I == null ? void 0 : I["x-linkage-rules"]]), { designable: j } = useDesignable(), N = useComponent(o) || o, B = useVariables$1(), w = useLocalVariables$1({ currentForm: { values: T, readPretty: !1 } }), { visibleWithURL: M, setVisibleWithURL: $ } = usePopupUtils(), { setSubmitted: k } = useActionContext(), { getAriaLabel: z } = useGetAriaLabelOfAction(l), E = useCollectionParentRecordData(), q = useApp();
+    ]), v = useDesigner(), F = useField(), I = useFieldSchema(), R = useCompile(), T = useCollectionRecordData(), D = R((U = I["x-component-props"]) == null ? void 0 : U.confirm) || g, O = useMemo(() => (I == null ? void 0 : I["x-linkage-rules"]) || [], [I == null ? void 0 : I["x-linkage-rules"]]), { designable: j } = useDesignable(), N = useComponent(o) || o, B = useVariables$1(), w = useLocalVariables$1({ currentForm: { values: T, readPretty: !1 } }), { visibleWithURL: M, setVisibleWithURL: $ } = usePopupUtils(), { setSubmitted: k } = useActionContext(), { getAriaLabel: z } = useGetAriaLabelOfAction(l), L = useCollectionParentRecordData(), q = useApp();
     useEffect(() => {
       F.stateOfLinkageRules && setInitialActionState(F), F.stateOfLinkageRules = {}, O.filter((H) => !H.disabled).forEach((H) => {
         var J;
@@ -37254,7 +37263,7 @@ const ActionLink = withDynamicSchemaProps(
         });
       });
     }, [F, O, w, B]);
-    const L = useCallback(
+    const E = useCallback(
       (H) => {
         C == null || C(H);
       },
@@ -37269,7 +37278,7 @@ const ActionLink = withDynamicSchemaProps(
         field: F,
         icon: a,
         loading: d,
-        handleMouseEnter: L,
+        handleMouseEnter: E,
         tarComponent: N,
         className: i,
         type: e.type,
@@ -37288,7 +37297,7 @@ const ActionLink = withDynamicSchemaProps(
         setVisibleWithURL: $,
         setSubmitted: k,
         getAriaLabel: z,
-        parentRecordData: E,
+        parentRecordData: L,
         actionCallback: h
       }, y)
     );
@@ -37352,7 +37361,7 @@ const ActionLink = withDynamicSchemaProps(
     "setSubmitted",
     "getAriaLabel",
     "parentRecordData"
-  ]), [w, M] = useState(!1), { wrapSSR: $, componentCls: k, hashId: z } = useStyles$8(), [E, q] = useState(!1), L = o["x-toolbar-props"] || o["x-designer-props"], G = (me = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : me.openMode, U = (he = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : he.openSize, H = (ge = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : ge.refreshDataBlockRequest, { modal: J } = App.useApp(), K = useForm(), W = useACLActionParamsContext(), { run: X, element: ee, disabled: Z } = (I == null ? void 0 : I(R)) || {}, ne = K.disabled || i.disabled || ((de = i.data) == null ? void 0 : de.disabled) || F || Z, re = useMemo(() => {
+  ]), [w, M] = useState(!1), { wrapSSR: $, componentCls: k, hashId: z } = useStyles$8(), [L, q] = useState(!1), E = o["x-toolbar-props"] || o["x-designer-props"], G = (me = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : me.openMode, U = (he = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : he.openSize, H = (ge = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : ge.refreshDataBlockRequest, { modal: J } = App.useApp(), K = useForm(), W = useACLActionParamsContext(), { run: X, element: ee, disabled: Z } = (I == null ? void 0 : I(R)) || {}, ne = K.disabled || i.disabled || ((de = i.data) == null ? void 0 : de.disabled) || F || Z, re = useMemo(() => {
     var ce;
     return P(x({}, v), {
       opacity: r && (((ce = i == null ? void 0 : i.data) == null ? void 0 : ce.hidden) || !W) && 0.1,
@@ -37368,7 +37377,7 @@ const ActionLink = withDynamicSchemaProps(
     buttonStyle: re,
     handleMouseEnter: c,
     tarComponent: u,
-    designerProps: L,
+    designerProps: E,
     componentCls: k,
     hashId: z,
     className: d,
@@ -37398,7 +37407,7 @@ const ActionLink = withDynamicSchemaProps(
       button: RenderButton(se),
       visible: w || T,
       setVisible: le,
-      formValueChanged: E,
+      formValueChanged: L,
       setFormValueChanged: q,
       openMode: G,
       openSize: U,
@@ -37483,24 +37492,25 @@ const RenderButton = ({
   confirmTitle: D,
   title: O
 }) => {
-  const { getDataBlockRequest: j } = useDataBlockRequestGetter(), { t: N } = useTranslation(), { isPopupVisibleControlledByURL: B } = usePopupSettings(), { openPopup: w } = usePopupUtils(), M = useRef(null);
-  M.current = w;
-  const $ = useCallback(
-    (k, z = !0) => {
-      if (!(z && isPortalInBody(k.target)) && (k.preventDefault(), k.stopPropagation(), !i && n)) {
+  const { getDataBlockRequest: j } = useDataBlockRequestGetter(), { t: N } = useTranslation(), { isPopupVisibleControlledByURL: B } = usePopupSettings(), { openPopup: w } = usePopupUtils(), M = useForm(), $ = useRef(null);
+  $.current = w;
+  const k = useCallback(
+    (z, L = !0) => V(void 0, null, function* () {
+      var q;
+      if (!(L && isPortalInBody(z.target)) && (z.preventDefault(), z.stopPropagation(), !i && n)) {
         const E = () => {
-          b ? b(k, () => {
-            var q, L;
-            S !== !1 && (T == null || T(!0), (L = (q = j()) == null ? void 0 : q.refresh) == null || L.call(q));
-          }) : isBulkEditAction(y) || !B() ? (v(!0), F == null || F()) : ["view", "update", "create", "customize:popup"].includes(y["x-action"]) && y["x-uid"] ? M.current() : (v(!0), F == null || F());
+          b ? b(z, () => {
+            var G, U;
+            S !== !1 && (T == null || T(!0), (U = (G = j()) == null ? void 0 : G.refresh) == null || U.call(G));
+          }) : isBulkEditAction(y) || !B() ? (v(!0), F == null || F()) : ["view", "update", "create", "customize:popup"].includes(y["x-action"]) && y["x-uid"] ? $.current() : (v(!0), F == null || F());
         };
-        (I == null ? void 0 : I.enable) !== !1 && (I != null && I.content) ? R.confirm({
+        (I == null ? void 0 : I.enable) !== !1 && (I != null && I.content) ? (yield (q = M == null ? void 0 : M.submit) == null ? void 0 : q.call(M), R.confirm({
           title: N(I.title, { title: D || O || (t == null ? void 0 : t.title) }),
           content: N(I.content, { title: D || O || (t == null ? void 0 : t.title) }),
           onOk: E
-        }) : E();
+        })) : E();
       }
-    },
+    }),
     [
       n,
       I == null ? void 0 : I.content,
@@ -37534,7 +37544,7 @@ const RenderButton = ({
       buttonStyle: a,
       handleMouseEnter: l,
       getAriaLabel: g,
-      handleButtonClick: $,
+      handleButtonClick: k,
       tarComponent: c,
       componentCls: d,
       hashId: p,
@@ -38112,7 +38122,7 @@ const getValues = (e, t) => castArray(e).filter((n) => n != null).map((n) => typ
         }, n), {
           headers: b,
           params: P(x({
-            paginate: !1
+            pageSize: 200
           }, n == null ? void 0 : n.params), {
             filter: (J = n == null ? void 0 : n.params) == null ? void 0 : J.filter
           })
@@ -38127,7 +38137,7 @@ const getValues = (e, t) => castArray(e).filter((n) => n != null).map((n) => typ
           fieldNames: t
         }),
         [n, t]
-      ), E = useCallback(() => I.current && d ? /* @__PURE__ */ jsx(
+      ), L = useCallback(() => I.current && d ? /* @__PURE__ */ jsx(
         d,
         {
           search: I.current,
@@ -38151,7 +38161,7 @@ const getValues = (e, t) => castArray(e).filter((n) => n != null).map((n) => typ
             (W = n == null ? void 0 : n.params) == null ? void 0 : W.filter
           ])
         }), I.current = K;
-      }), L = useMemo(() => {
+      }), E = useMemo(() => {
         var ee;
         const K = r || i;
         if (!((ee = M == null ? void 0 : M.data) != null && ee.length))
@@ -38176,14 +38186,14 @@ const getValues = (e, t) => castArray(e).filter((n) => n != null).map((n) => typ
           defaultValue: i
         }, f), {
           loading: M ? k : !0,
-          options: h(w(L)),
-          rawOptions: L,
+          options: h(w(E)),
+          rawOptions: E,
           dropdownRender: (K) => {
-            const W = L.some((X) => X[t.label] === I.current);
+            const W = E.some((X) => X[t.label] === I.current);
             return /* @__PURE__ */ jsx(Fragment$1, { children: v ? /* @__PURE__ */ jsxs(Fragment$1, { children: [
               !((M == null ? void 0 : M.data.length) === 0 && (I != null && I.current)) && K,
               (M == null ? void 0 : M.data.length) > 0 && (I == null ? void 0 : I.current) && !W && /* @__PURE__ */ jsx(Divider$1, { style: { margin: 0 } }),
-              !W && /* @__PURE__ */ jsx(E, {})
+              !W && /* @__PURE__ */ jsx(L, {})
             ] }) : K });
           }
         })
@@ -39286,8 +39296,8 @@ const insertPositionToMethod = {
     }
   }), [h, l]), { moveRoute: I } = useNocoBaseRoutes(), R = useCallback(
     (B) => V(void 0, [B], function* ({ target: j, position: N }) {
-      var E;
-      const [w] = ((E = j == null ? void 0 : j.split) == null ? void 0 : E.call(j, "||")) || [];
+      var L;
+      const [w] = ((L = j == null ? void 0 : j.split) == null ? void 0 : L.call(j, "||")) || [];
       if (!w)
         return;
       const M = findByUid(c, w), $ = createDesignable({
@@ -40648,8 +40658,8 @@ const AppendsTreeSelect = (e) => {
           break;
         }
         if (!$.isLeaf && $.loadChildren) {
-          const E = $.loadChildren($);
-          E != null && E.length && (B.push(...E), $ = E.find((q) => q.value === M.slice(0, k + 1).join(".")));
+          const L = $.loadChildren($);
+          L != null && L.length && (B.push(...L), $ = L.find((q) => q.value === M.slice(0, k + 1).join(".")));
         }
       }
     }), h((w) => B.reduce((M, $) => Object.assign(M, { [$.value]: $ }), x({}, w)));
@@ -40739,9 +40749,9 @@ const InternalAssociationSelect$1 = observer$1(
       const j = uid();
       return f.addEffects(j, () => {
         onFieldInputValueChange("*", (N) => {
-          var $, k, z, E, q, L;
+          var $, k, z, L, q, E;
           const B = filterAnalyses((z = (k = ($ = r.componentProps) == null ? void 0 : $.service) == null ? void 0 : k.params) == null ? void 0 : z.filter) || [], w = getFieldPath(N.address.entire), M = getFieldPath(r.address.entire);
-          B.includes((E = N == null ? void 0 : N.props) == null ? void 0 : E.name) && r.value && isEqual(N == null ? void 0 : N.indexes, r == null ? void 0 : r.indexes) && ((q = N == null ? void 0 : N.props) == null ? void 0 : q.name) !== r.props.name && (!((L = r == null ? void 0 : r.indexes) != null && L.length) || isEqual(w, M)) && (r.setValue(null), p(null));
+          B.includes((L = N == null ? void 0 : N.props) == null ? void 0 : L.name) && r.value && isEqual(N == null ? void 0 : N.indexes, r == null ? void 0 : r.indexes) && ((q = N == null ? void 0 : N.props) == null ? void 0 : q.name) !== r.props.name && (!((E = r == null ? void 0 : r.indexes) != null && E.length) || isEqual(w, M)) && (r.setValue(null), p(null));
         });
       }), () => {
         f.removeEffects(j);
@@ -41835,14 +41845,14 @@ const InternalFileManager = (e) => {
           let M = p(w[y.label]);
           if (($ = v == null ? void 0 : v.uiSchema) != null && $.enum)
             if (Array.isArray(M))
-              M = M.map((E, q) => {
+              M = M.map((L, q) => {
                 var G, U;
-                const L = (U = (G = v.uiSchema.enum).find) == null ? void 0 : U.call(G, (H) => H.value === E);
-                return L ? /* @__PURE__ */ jsx(Tag, { color: L.color, style: { marginRight: 3 }, children: (L == null ? void 0 : L.label) || E }, q) : /* @__PURE__ */ jsx(Tag, { children: E }, E);
+                const E = (U = (G = v.uiSchema.enum).find) == null ? void 0 : U.call(G, (H) => H.value === L);
+                return E ? /* @__PURE__ */ jsx(Tag, { color: E.color, style: { marginRight: 3 }, children: (E == null ? void 0 : E.label) || L }, q) : /* @__PURE__ */ jsx(Tag, { children: L }, L);
               }).reverse();
             else {
-              const E = (z = (k = v.uiSchema.enum).find) == null ? void 0 : z.call(k, (q) => q.value === M);
-              E && (M = /* @__PURE__ */ jsx(Tag, { color: E.color, children: E.label }));
+              const L = (z = (k = v.uiSchema.enum).find) == null ? void 0 : z.call(k, (q) => q.value === M);
+              L && (M = /* @__PURE__ */ jsx(Tag, { color: L.color, children: L.label }));
             }
           return (v == null ? void 0 : v.type) === "date" && (M = dayjs(M).format("YYYY-MM-DD")), n ? n({
             [y.label]: M || EMPTY,
@@ -41878,10 +41888,10 @@ const InternalFileManager = (e) => {
     var $, k, z;
     if (B) {
       d(!0);
-      const E = yield T({ parentId: w == null ? void 0 : w.key });
-      if (d(!1), c(E), M === (i == null ? void 0 : i.length) - 1 && (($ = w == null ? void 0 : w.value) != null && $.id)) {
-        const q = yield T({ parentId: (k = w == null ? void 0 : w.value) == null ? void 0 : k.id }), L = [...i];
-        L.splice(M + 1), L[M] = P(x({}, L[M]), { value: w == null ? void 0 : w.value }), L[M + 1] = { key: (z = w == null ? void 0 : w.value) == null ? void 0 : z.id, children: (q == null ? void 0 : q.length) > 0 ? q : null }, a(L), o == null || o(L);
+      const L = yield T({ parentId: w == null ? void 0 : w.key });
+      if (d(!1), c(L), M === (i == null ? void 0 : i.length) - 1 && (($ = w == null ? void 0 : w.value) != null && $.id)) {
+        const q = yield T({ parentId: (k = w == null ? void 0 : w.value) == null ? void 0 : k.id }), E = [...i];
+        E.splice(M + 1), E[M] = P(x({}, E[M]), { value: w == null ? void 0 : w.value }), E[M + 1] = { key: (z = w == null ? void 0 : w.value) == null ? void 0 : z.id, children: (q == null ? void 0 : q.length) > 0 ? q : null }, a(E), o == null || o(E);
       }
     }
   }), j = (B, w) => V(void 0, null, function* () {
@@ -41915,7 +41925,7 @@ const InternalFileManager = (e) => {
         onSearch: (z) => j(z, B),
         fieldNames: y,
         style: { minWidth: 150 },
-        onChange: (z, E) => D(z, E, w),
+        onChange: (z, L) => D(z, L, w),
         options: u ? [] : R(l),
         onDropdownVisibleChange: (z) => O(z, B, w),
         notFoundContent: u ? /* @__PURE__ */ jsx(Spin, { size: "small" }) : null
@@ -42183,10 +42193,10 @@ const InternalNesterCardCss = css`
       const w = (f == null ? void 0 : f.targetKey) || "id", M = R.map((k) => k[w]).filter(Boolean);
       return M.length ? { $and: [{ [`${w}.$ne`]: M }] } : {};
     }, j = () => {
-      const { setVisible: w } = useActionContext(), { multiple: M, selectedRows: $, onChange: k, options: z, collectionField: E } = useContext(RecordPickerContext);
+      const { setVisible: w } = useActionContext(), { multiple: M, selectedRows: $, onChange: k, options: z, collectionField: L } = useContext(RecordPickerContext);
       return {
         onClick() {
-          k(M ? unionBy($, z, (E == null ? void 0 : E.targetKey) || "id") : ($ == null ? void 0 : $[0]) || null), w(!1);
+          k(M ? unionBy($, z, (L == null ? void 0 : L.targetKey) || "id") : ($ == null ? void 0 : $[0]) || null), w(!1);
         },
         style: {
           display: M === !1 ? "none" : "block"
@@ -43579,14 +43589,14 @@ const Table$1 = withDynamicSchemaProps(
       "loading",
       "onClickRow"
     ]), S = useArrayField(b), y = useFieldSchema(), { size: v = "small" } = (y == null ? void 0 : y["x-component-props"]) || {}, F = useCollection(), R = ((ce = y == null ? void 0 : y.parent) == null ? void 0 : ce["x-decorator"]) === "TableSelectorProvider" ? useTableSelectorContext() : useTableBlockContext(), { expandFlag: T, allIncludesChildren: D } = R, O = useMemoizedFn(b.onRowDragEnd || (() => {
-    })), j = usePaginationProps$2(n, i), N = useTableColumns$1(b, j), [B, w] = useState(() => T ? D : []), [M, $] = useState(((Ce = S == null ? void 0 : S.data) == null ? void 0 : Ce.selectedRowKeys) || []), [k, z] = useState([]), E = (p == null ? void 0 : p.type) !== "none", q = useRef(/* @__PURE__ */ new Map()), L = useMemo(() => css`
+    })), j = usePaginationProps$2(n, i), N = useTableColumns$1(b, j), [B, w] = useState(() => T ? D : []), [M, $] = useState(((Ce = S == null ? void 0 : S.data) == null ? void 0 : Ce.selectedRowKeys) || []), [k, z] = useState([]), L = (p == null ? void 0 : p.type) !== "none", q = useRef(/* @__PURE__ */ new Map()), E = useMemo(() => css`
         & > td {
           background-color: ${t.controlItemBgActive} !important;
         }
         &:hover > td {
           background-color: ${t.controlItemBgActiveHover} !important;
         }
-      `, [t.controlItemBgActive, t.controlItemBgActiveHover]), G = useMemo(() => C ? L : "", [L, C]), U = useMemo(() => C ? (Q, te) => ({
+      `, [t.controlItemBgActive, t.controlItemBgActiveHover]), G = useMemo(() => C ? E : "", [E, C]), U = useMemo(() => C ? (Q, te) => ({
       onClick: (oe) => {
         isPortalInBody(oe.target) || C(Q, z, k);
       },
@@ -43660,14 +43670,14 @@ const Table$1 = withDynamicSchemaProps(
                 role: "button",
                 "aria-label": `table-index-${oe}`,
                 className: cls(Q ? "checked" : null, rowSelectCheckboxWrapperClass, {
-                  [rowSelectCheckboxWrapperClassHover]: E
+                  [rowSelectCheckboxWrapperClassHover]: L
                 }),
                 children: [
                   /* @__PURE__ */ jsxs("div", { className: cls(Q ? "checked" : null, rowSelectCheckboxContentClass), children: [
                     l && /* @__PURE__ */ jsx(SortHandle$1, { id: J(te) }),
                     c && /* @__PURE__ */ jsx(TableIndex$2, { index: oe })
                   ] }),
-                  E && /* @__PURE__ */ jsx(
+                  L && /* @__PURE__ */ jsx(
                     "div",
                     {
                       className: cls(
@@ -43692,7 +43702,7 @@ const Table$1 = withDynamicSchemaProps(
         l,
         S,
         J,
-        E,
+        L,
         ee,
         j
       ]
@@ -43806,20 +43816,20 @@ const Table$1 = withDynamicSchemaProps(
     var M, $, k;
     const { openSize: t } = e, { field: n, options: o, fieldSchema: r } = useAssociationFieldContext(), { t: i } = useTranslation(), [a, l] = useState(!1), [c, u] = useState([]), d = useFieldNames$1(e), p = useFieldSchema(), m = useCompile(), h = useLabelUiSchema$1(o, (d == null ? void 0 : d.label) || "label"), g = useCollectionRecord(), f = useCollection(), { allowSelectExistingRecord: C, allowAddnew: b, allowDisassociation: S } = n.componentProps;
     useSubTableSpecialCase({ rootField: n, rootSchema: r });
-    const y = (z, E) => {
-      if (E !== void 0 && isArr(n.value) && z !== E)
+    const y = (z, L) => {
+      if (L !== void 0 && isArr(n.value) && z !== L)
         return action(() => {
           const q = n.value[z];
-          return n.value.splice(z, 1), n.value.splice(E, 0, q), exchangeArrayState(n, {
+          return n.value.splice(z, 1), n.value.splice(L, 0, q), exchangeArrayState(n, {
             fromIndex: z,
-            toIndex: E
+            toIndex: L
           }), n.onInput(n.value);
         });
     };
     n.move = y;
-    const v = useMemo(() => n.value && Object.keys(n.value).length > 0 ? (Array.isArray(n.value) ? n.value : n.value ? [n.value] : []).filter(Boolean).map((E) => {
-      const q = E == null ? void 0 : E[d.label];
-      return P(x({}, E), {
+    const v = useMemo(() => n.value && Object.keys(n.value).length > 0 ? (Array.isArray(n.value) ? n.value : n.value ? [n.value] : []).filter(Boolean).map((L) => {
+      const q = L == null ? void 0 : L[d.label];
+      return P(x({}, L), {
         [d.label]: getLabelFormatValue$1(m(h), m(q))
       });
     }) : [], [n.value, d == null ? void 0 : d.label]), F = {
@@ -43835,32 +43845,32 @@ const Table$1 = withDynamicSchemaProps(
       setSelectedRows: u,
       collectionField: o
     }, I = () => {
-      const { setVisible: z } = useActionContext(), { selectedRows: E, setSelectedRows: q } = useContext(RecordPickerContext);
+      const { setVisible: z } = useActionContext(), { selectedRows: L, setSelectedRows: q } = useContext(RecordPickerContext);
       return {
         onClick() {
           var G;
-          Array.isArray(n.value) || (n.value = []), E.forEach((U) => n.value.push(markRecordAsNew(U))), n.onInput(n.value), n.initialValue = n.value, q([]), z(!1);
-          const L = Math.ceil(n.value.length / (((G = n.componentProps) == null ? void 0 : G.pageSize) || 10));
-          D(L);
+          Array.isArray(n.value) || (n.value = []), L.forEach((U) => n.value.push(markRecordAsNew(U))), n.onInput(n.value), n.initialValue = n.value, q([]), z(!1);
+          const E = Math.ceil(n.value.length / (((G = n.componentProps) == null ? void 0 : G.pageSize) || 10));
+          D(E);
         }
       };
     }, R = () => {
-      const z = (o == null ? void 0 : o.targetKey) || "id", E = (n.value || []).map((L) => L == null ? void 0 : L[z]).filter(Boolean);
-      return E.length ? { $and: [{ [`${z}.$ne`]: E }] } : {};
+      const z = (o == null ? void 0 : o.targetKey) || "id", L = (n.value || []).map((E) => E == null ? void 0 : E[z]).filter(Boolean);
+      return L.length ? { $and: [{ [`${z}.$ne`]: L }] } : {};
     }, [T, D] = useState(1), [O, j] = useState(((M = n.componentProps) == null ? void 0 : M.pageSize) || 10);
     useEffect(() => {
       var z;
       j((z = n.componentProps) == null ? void 0 : z.pageSize);
     }, [($ = n.componentProps) == null ? void 0 : $.pageSize]);
     const N = useMemo(() => {
-      var E;
-      const z = Math.ceil(((E = n.value) == null ? void 0 : E.length) / 10);
+      var L;
+      const z = Math.ceil(((L = n.value) == null ? void 0 : L.length) / 10);
       return {
         current: T > z ? z : T,
         pageSize: O || 10,
         total: n == null ? void 0 : n.value,
-        onChange: (q, L) => {
-          D(q), j(L), n.componentProps.pageSize = L, n.onInput(n.value);
+        onChange: (q, E) => {
+          D(q), j(E), n.componentProps.pageSize = E, n.onInput(n.value);
         },
         showSizeChanger: !0,
         pageSizeOptions: ["10", "20", "50", "100"],
@@ -43872,8 +43882,8 @@ const Table$1 = withDynamicSchemaProps(
         run() {
           var q;
           z.value = z.value || [], z.value.push(markRecordAsNew({}));
-          const E = Math.ceil(z.value.length / (((q = z.componentProps) == null ? void 0 : q.pageSize) || 10));
-          return D(E), z.onInput(z.value);
+          const L = Math.ceil(z.value.length / (((q = z.componentProps) == null ? void 0 : q.pageSize) || 10));
+          return D(L), z.onInput(z.value);
         }
       };
     }, w = () => ({
@@ -44056,10 +44066,10 @@ const ReadPretty$7 = observer$1(
 InternalAssociationSelect.displayName = "InternalAssociationSelect";
 const AssociationSelect = InternalAssociationSelect;
 AssociationSelect.Designer = function e() {
-  var M, $, k, z, E, q, L, G, U, H, J;
+  var M, $, k, z, L, q, E, G, U, H, J;
   const { getCollectionFields: t, getInterface: n, getCollectionJoinField: o, getCollection: r, isTitleField: i } = useCollectionManager_deprecated(), { getField: a } = useCollection_deprecated(), { form: l } = useFormBlockContext(), c = useField(), u = useFieldSchema(), { t: d } = useTranslation(), p = useFilterByTk(), { dn: m, refresh: h, insertAdjacent: g } = useDesignable(), f = useCompile(), C = useIsShowMultipleSwitch(), { isAllowToSetDefaultValue: b } = useIsAllowToSetDefaultValue(), S = a(u.name) || o(u["x-collection-field"]), y = useFieldComponentOptions(), v = c.address.segments.includes("__form_grid"), F = n(S == null ? void 0 : S.interface), I = (M = F == null ? void 0 : F.validateSchema) == null ? void 0 : M.call(F, u), R = ($ = S == null ? void 0 : S.uiSchema) == null ? void 0 : $.title, T = S != null && S.target ? t(S == null ? void 0 : S.target) : [];
   c.title === R || c.title;
-  const D = useSortFields(S == null ? void 0 : S.target), O = ((E = (z = (k = c.componentProps) == null ? void 0 : k.service) == null ? void 0 : z.params) == null ? void 0 : E.sort) || [];
+  const D = useSortFields(S == null ? void 0 : S.target), O = ((L = (z = (k = c.componentProps) == null ? void 0 : k.service) == null ? void 0 : z.params) == null ? void 0 : L.sort) || [];
   useEffect(() => {
     c.readPretty !== u["x-read-pretty"] && (c.readPretty = !!u["x-read-pretty"]);
   }, [u["x-read-pretty"]]);
@@ -44286,7 +44296,7 @@ AssociationSelect.Designer = function e() {
       SchemaSettingsDataScope,
       {
         collectionName: S == null ? void 0 : S.target,
-        defaultFilter: ((U = (G = (L = c.componentProps) == null ? void 0 : L.service) == null ? void 0 : G.params) == null ? void 0 : U.filter) || {},
+        defaultFilter: ((U = (G = (E = c.componentProps) == null ? void 0 : E.service) == null ? void 0 : G.params) == null ? void 0 : U.filter) || {},
         form: l,
         onSubmit: ({ filter: K }) => {
           K = removeNullCondition(K), _.set(c.componentProps, "service.params.filter", K), u["x-component-props"] = c.componentProps, m.emit("patch", {
@@ -44564,16 +44574,16 @@ AssociationSelect.FilterDesigner = function e() {
         onSubmit: ($) => {
           var q;
           const k = [];
-          for (const L of $.rules)
-            k.push(_.pickBy(L, _.identity));
+          for (const E of $.rules)
+            k.push(_.pickBy(E, _.identity));
           const z = {
             "x-uid": l["x-uid"]
           };
           if (["percent"].includes(m == null ? void 0 : m.interface))
-            for (const L of k)
-              (L.maxValue || L.minValue) && (L.percentMode = !0), L.percentFormat && (L.percentFormats = !0);
-          const E = _.concat([], ((q = m == null ? void 0 : m.uiSchema) == null ? void 0 : q["x-validator"]) || [], k);
-          a.validator = E, l["x-validator"] = k, z["x-validator"] = k, u.emit("patch", {
+            for (const E of k)
+              (E.maxValue || E.minValue) && (E.percentMode = !0), E.percentFormat && (E.percentFormats = !0);
+          const L = _.concat([], ((q = m == null ? void 0 : m.uiSchema) == null ? void 0 : q["x-validator"]) || [], k);
+          a.validator = L, l["x-validator"] = k, z["x-validator"] = k, u.emit("patch", {
             schema: z
           }), d();
         }
@@ -44714,10 +44724,10 @@ AssociationSelect.FilterDesigner = function e() {
         options: v,
         value: (M = (w = a == null ? void 0 : a.componentProps) == null ? void 0 : w.fieldNames) == null ? void 0 : M.label,
         onChange: ($) => {
-          var E, q;
+          var L, q;
           const k = {
             "x-uid": l["x-uid"]
-          }, z = P(x(x({}, (q = (E = m == null ? void 0 : m.uiSchema) == null ? void 0 : E["x-component-props"]) == null ? void 0 : q.fieldNames), a.componentProps.fieldNames), {
+          }, z = P(x(x({}, (q = (L = m == null ? void 0 : m.uiSchema) == null ? void 0 : L["x-component-props"]) == null ? void 0 : q.fieldNames), a.componentProps.fieldNames), {
             label: $
           });
           a.componentProps.fieldNames = z, l["x-component-props"] = l["x-component-props"] || {}, l["x-component-props"].fieldNames = z, k["x-component-props"] = l["x-component-props"], u.emit("patch", {
@@ -48253,17 +48263,17 @@ const TableActionColumnDesigner = (e) => {
   );
 }, TableBlockDesigner = () => {
   var T, D, O, j, N, B, w, M, $, k, z;
-  const { name: e, title: t } = useCollection_deprecated(), { getCollectionField: n, getCollection: o } = useCollectionManager_deprecated(), r = useField(), i = useFieldSchema(), { form: a } = useFormBlockContext(), l = useSortFields(e), { service: c } = useTableBlockContext(), { t: u } = useTranslation(), { dn: d } = useDesignable(), { componentNamePrefix: p } = useBlockTemplateContext(), m = ((D = (T = i == null ? void 0 : i["x-decorator-props"]) == null ? void 0 : T.params) == null ? void 0 : D.sort) || [], h = ((O = i == null ? void 0 : i["x-decorator-props"]) == null ? void 0 : O.resource) || ((j = i == null ? void 0 : i["x-decorator-props"]) == null ? void 0 : j.association), g = !((N = i == null ? void 0 : i["x-decorator-props"]) != null && N.disableTemplate), f = m == null ? void 0 : m.map((E) => E != null && E.startsWith("-") ? {
-    field: E.substring(1),
+  const { name: e, title: t } = useCollection_deprecated(), { getCollectionField: n, getCollection: o } = useCollectionManager_deprecated(), r = useField(), i = useFieldSchema(), { form: a } = useFormBlockContext(), l = useSortFields(e), { service: c } = useTableBlockContext(), { t: u } = useTranslation(), { dn: d } = useDesignable(), { componentNamePrefix: p } = useBlockTemplateContext(), m = ((D = (T = i == null ? void 0 : i["x-decorator-props"]) == null ? void 0 : T.params) == null ? void 0 : D.sort) || [], h = ((O = i == null ? void 0 : i["x-decorator-props"]) == null ? void 0 : O.resource) || ((j = i == null ? void 0 : i["x-decorator-props"]) == null ? void 0 : j.association), g = !((N = i == null ? void 0 : i["x-decorator-props"]) != null && N.disableTemplate), f = m == null ? void 0 : m.map((L) => L != null && L.startsWith("-") ? {
+    field: L.substring(1),
     direction: "desc"
   } : {
-    field: E,
+    field: L,
     direction: "asc"
   }), C = useSchemaTemplate(), b = useCollection_deprecated(), { dragSort: S, resource: y } = r.decoratorProps, v = y && n(y), F = y != null && y.includes(".") ? (B = o(v == null ? void 0 : v.target)) == null ? void 0 : B.tree : !!(b != null && b.tree), I = useCallback(
-    ({ filter: E }) => {
-      E = removeNullCondition(E);
+    ({ filter: L }) => {
+      L = removeNullCondition(L);
       const q = r.decoratorProps.params || {};
-      q.filter = E, r.decoratorProps.params = q, i["x-decorator-props"].params = q, d.emit("patch", {
+      q.filter = L, r.decoratorProps.params = q, i["x-decorator-props"].params = q, d.emit("patch", {
         schema: {
           "x-uid": i["x-uid"],
           "x-decorator-props": i["x-decorator-props"]
@@ -48281,11 +48291,11 @@ const TableActionColumnDesigner = (e) => {
         title: u("Tree table"),
         defaultChecked: !0,
         checked: F ? r.decoratorProps.treeTable : !1,
-        onChange: (E) => {
-          var L;
-          r.decoratorProps.treeTable = E, i["x-decorator-props"].treeTable = E;
-          const q = P(x({}, (L = c.params) == null ? void 0 : L[0]), {
-            tree: E ? !0 : null
+        onChange: (L) => {
+          var E;
+          r.decoratorProps.treeTable = L, i["x-decorator-props"].treeTable = L;
+          const q = P(x({}, (E = c.params) == null ? void 0 : E[0]), {
+            tree: L ? !0 : null
           });
           d.emit("patch", {
             schema: i
@@ -48298,13 +48308,13 @@ const TableActionColumnDesigner = (e) => {
       {
         title: u("Enable drag and drop sorting"),
         checked: r.decoratorProps.dragSort,
-        onChange: (E) => V(void 0, null, function* () {
-          E && v && (yield R.resource("collections.fields", v.collectionName).update({
+        onChange: (L) => V(void 0, null, function* () {
+          L && v && (yield R.resource("collections.fields", v.collectionName).update({
             filterByTk: v.name,
             values: {
               sortable: !0
             }
-          })), r.decoratorProps.dragSort = E, i["x-decorator-props"].dragSort = E, d.emit("patch", {
+          })), r.decoratorProps.dragSort = L, i["x-decorator-props"].dragSort = L, d.emit("patch", {
             schema: {
               "x-uid": i["x-uid"],
               "x-decorator-props": i["x-decorator-props"]
@@ -48398,10 +48408,10 @@ const TableActionColumnDesigner = (e) => {
             }
           }
         },
-        onSubmit: ({ sort: E }) => {
+        onSubmit: ({ sort: L }) => {
           var G;
-          const q = E.map((U) => U.direction === "desc" ? `-${U.field}` : U.field), L = r.decoratorProps.params || {};
-          L.sort = q, r.decoratorProps.params = L, i["x-decorator-props"].params = L, d.emit("patch", {
+          const q = L.map((U) => U.direction === "desc" ? `-${U.field}` : U.field), E = r.decoratorProps.params || {};
+          E.sort = q, r.decoratorProps.params = E, i["x-decorator-props"].params = E, d.emit("patch", {
             schema: {
               "x-uid": i["x-uid"],
               "x-decorator-props": i["x-decorator-props"]
@@ -48424,10 +48434,10 @@ const TableActionColumnDesigner = (e) => {
           { label: "100", value: 100 },
           { label: "200", value: 200 }
         ],
-        onChange: (E) => {
-          var L;
+        onChange: (L) => {
+          var E;
           const q = r.decoratorProps.params || {};
-          q.pageSize = E, r.decoratorProps.params = q, i["x-decorator-props"].params = q, c.run(P(x({}, (L = c.params) == null ? void 0 : L[0]), { pageSize: E, page: 1 })), d.emit("patch", {
+          q.pageSize = L, r.decoratorProps.params = q, i["x-decorator-props"].params = q, c.run(P(x({}, (E = c.params) == null ? void 0 : E[0]), { pageSize: L, page: 1 })), d.emit("patch", {
             schema: {
               "x-uid": i["x-uid"],
               "x-decorator-props": i["x-decorator-props"]
@@ -48446,12 +48456,12 @@ const TableActionColumnDesigner = (e) => {
           { label: u("Middle"), value: "middle" },
           { label: u("Small"), value: "small" }
         ],
-        onChange: (E) => {
-          const q = i.reduceProperties((L, G) => {
+        onChange: (L) => {
+          const q = i.reduceProperties((E, G) => {
             if (G["x-component"] === "TableV2")
               return G;
           }, null);
-          q["x-component-props"] = q["x-component-props"] || {}, q["x-component-props"].size = E, d.emit("patch", {
+          q["x-component-props"] = q["x-component-props"] || {}, q["x-component-props"].size = L, d.emit("patch", {
             schema: {
               "x-uid": q["x-uid"],
               "x-decorator-props": q["x-component-props"]
@@ -50344,20 +50354,20 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
   })), []), T = useCallback(() => {
     const { availableFieldInterfaces: w } = u(o.template) || {}, { exclude: M, include: $ } = w || {}, k = [];
     return F.forEach((z) => {
-      var E;
+      var L;
       if (z.key === "systemInfo")
         k.push(P(x({}, z), {
           children: z.children.filter((q) => q.hidden ? !1 : q.value === "tableoid" ? $ != null && $.length ? $.includes(q.value) : (l == null ? void 0 : l.dialect) === "postgres" : typeof o[q.value] == "boolean" ? o[q.value] : !0)
         }));
       else {
         let q = [];
-        $ != null && $.length ? $.forEach((L) => {
+        $ != null && $.length ? $.forEach((E) => {
           var U;
-          const G = (U = z == null ? void 0 : z.children) == null ? void 0 : U.find((H) => [L, L.interface].includes(H.name));
+          const G = (U = z == null ? void 0 : z.children) == null ? void 0 : U.find((H) => [E, E.interface].includes(H.name));
           G && q.push(P(x({}, G), {
-            targetScope: L == null ? void 0 : L.targetScope
+            targetScope: E == null ? void 0 : E.targetScope
           }));
-        }) : M != null && M.length ? q = (E = z == null ? void 0 : z.children) == null ? void 0 : E.filter((L) => !M.includes(L.name)) : q = z == null ? void 0 : z.children, q != null && q.length && k.push(P(x({}, z), {
+        }) : M != null && M.length ? q = (L = z == null ? void 0 : z.children) == null ? void 0 : L.filter((E) => !M.includes(E.name)) : q = z == null ? void 0 : z.children, q != null && q.length && k.push(P(x({}, z), {
           children: q
         }));
       }
@@ -50649,7 +50659,7 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
       run() {
         return V(this, null, function* () {
           yield B.submit();
-          const E = cloneDeep(B.values), q = omit(E, [
+          const L = cloneDeep(B.values), q = omit(L, [
             "key",
             "uiSchemaUid",
             "collectionName",
@@ -51157,12 +51167,12 @@ const getSchema$4 = (e, t, n) => {
     const w = [];
     g.forEach((M) => {
       var q;
-      const $ = v(M), z = R(M).map((L) => {
-        const G = T(L, M);
+      const $ = v(M), z = R(M).map((E) => {
+        const G = T(E, M);
         return {
           type: "group",
-          key: L,
-          label: l("Parent collection fields") + l(`(${v(L).title})`),
+          key: E,
+          label: l("Parent collection fields") + l(`(${v(E).title})`),
           children: G.filter((U) => !["hasOne", "hasMany", "belongsToMany"].includes(U == null ? void 0 : U.type)).map((U) => {
             var H;
             return {
@@ -51171,14 +51181,14 @@ const getSchema$4 = (e, t, n) => {
             };
           })
         };
-      }), E = (q = $.fields.filter((L) => !["obo", "oho", "m2m", "o2m"].includes(L == null ? void 0 : L.interface))) == null ? void 0 : q.map((L) => {
+      }), L = (q = $.fields.filter((E) => !["obo", "oho", "m2m", "o2m"].includes(E == null ? void 0 : E.interface))) == null ? void 0 : q.map((E) => {
         var G;
-        return { value: L.name, key: L.name, label: l(((G = L.uiSchema) == null ? void 0 : G.title) || L.name) };
+        return { value: E.name, key: E.name, label: l(((G = E.uiSchema) == null ? void 0 : G.title) || E.name) };
       }).concat(z);
       w.push({
         value: M,
         label: l($.title || $.name),
-        children: E
+        children: L
       });
     }), h(w);
   }, [g, t]), useEffect(() => {
@@ -51187,30 +51197,30 @@ const getSchema$4 = (e, t, n) => {
       if (w) {
         u(!1), p([]);
         const k = ($ = Object.values((M = w == null ? void 0 : w.data) == null ? void 0 : M.fields)) == null ? void 0 : $.map((z) => {
-          var E, q;
+          var L, q;
           if (z.source) {
-            const L = (i == null ? void 0 : i.data.find((G) => G.name === z.name)) || z;
+            const E = (i == null ? void 0 : i.data.find((G) => G.name === z.name)) || z;
             return P(x({}, z), {
-              uiSchema: P(x({}, omit(L.uiSchema, "rawTitle")), { title: ((E = L.uiSchema) == null ? void 0 : E.title) || L.name })
+              uiSchema: P(x({}, omit(E.uiSchema, "rawTitle")), { title: ((L = E.uiSchema) == null ? void 0 : L.title) || E.name })
             });
           } else {
-            const L = (i == null ? void 0 : i.data.find((G) => G.name === z.name)) || z;
-            return P(x({}, L), {
-              uiSchema: P(x({}, omit(L.uiSchema, "rawTitle")), { title: ((q = L.uiSchema) == null ? void 0 : q.title) || L.name })
+            const E = (i == null ? void 0 : i.data.find((G) => G.name === z.name)) || z;
+            return P(x({}, E), {
+              uiSchema: P(x({}, omit(E.uiSchema, "rawTitle")), { title: ((q = E.uiSchema) == null ? void 0 : q.title) || E.name })
             });
           }
         });
         S.value = k, setTimeout(() => {
-          var z, E, q;
-          p(k), y.setValuesIn("sources", (z = w.data) == null ? void 0 : z.sources), f((E = w.data) == null ? void 0 : E.sources), b((q = w == null ? void 0 : w.data) == null ? void 0 : q.unsupportedFields);
+          var z, L, q;
+          p(k), y.setValuesIn("sources", (z = w.data) == null ? void 0 : z.sources), f((L = w.data) == null ? void 0 : L.sources), b((q = w == null ? void 0 : w.data) == null ? void 0 : q.unsupportedFields);
         });
       }
     }).catch);
   }, [t]);
   const N = (w, M) => {
     d.splice(M, 1, w), p(d), S.value = d.map(($) => {
-      var z, E, q;
-      const k = typeof $.source == "string" ? $.source : (q = (E = (z = $.source) == null ? void 0 : z.filter) == null ? void 0 : E.call(z, Boolean)) == null ? void 0 : q.join(".");
+      var z, L, q;
+      const k = typeof $.source == "string" ? $.source : (q = (L = (z = $.source) == null ? void 0 : z.filter) == null ? void 0 : L.call(z, Boolean)) == null ? void 0 : q.join(".");
       return P(x({}, $), {
         source: k
       });
@@ -51236,8 +51246,8 @@ const getSchema$4 = (e, t, n) => {
           options: D(m),
           onChange: (k, z) => {
             var q;
-            const E = (q = I(k == null ? void 0 : k[0])) == null ? void 0 : q.find((L) => L.name === last(k));
-            N(P(x({}, M), { source: k, uiSchema: E == null ? void 0 : E.uiSchema }), $);
+            const L = (q = I(k == null ? void 0 : k[0])) == null ? void 0 : q.find((E) => E.name === last(k));
+            N(P(x({}, M), { source: k, uiSchema: L == null ? void 0 : L.uiSchema }), $);
           },
           placeholder: l("Select field source")
         }
@@ -51275,12 +51285,12 @@ const getSchema$4 = (e, t, n) => {
             defaultValue: w,
             style: { width: "100%" },
             popupMatchSelectWidth: !1,
-            onChange: (E) => {
-              var L;
-              const q = F(E);
-              N(P(x({}, k), { interface: E, uiSchema: (L = q == null ? void 0 : q.default) == null ? void 0 : L.uiSchema }), $);
+            onChange: (L) => {
+              var E;
+              const q = F(L);
+              N(P(x({}, k), { interface: L, uiSchema: (E = q == null ? void 0 : q.default) == null ? void 0 : E.uiSchema }), $);
             },
-            children: z.map((E) => /* @__PURE__ */ jsx(Select$1.OptGroup, { label: D(E.label), children: E.children.map((q) => /* @__PURE__ */ jsx(Select$1.Option, { value: q.name, children: D(q.label) }, q.value)) }, E.key))
+            children: z.map((L) => /* @__PURE__ */ jsx(Select$1.OptGroup, { label: D(L.label), children: L.children.map((q) => /* @__PURE__ */ jsx(Select$1.Option, { value: q.name, children: D(q.label) }, q.value)) }, L.key))
           }
         );
       }
@@ -51297,8 +51307,8 @@ const getSchema$4 = (e, t, n) => {
           Input$3,
           {
             defaultValue: ((z = k == null ? void 0 : k.uiSchema) == null ? void 0 : z.title) || w,
-            onChange: (E) => N(
-              P(x({}, k), { uiSchema: P(x({}, omit(k == null ? void 0 : k.uiSchema, "rawTitle")), { title: E.target.value }) }),
+            onChange: (L) => N(
+              P(x({}, k), { uiSchema: P(x({}, omit(k == null ? void 0 : k.uiSchema, "rawTitle")), { title: L.target.value }) }),
               $
             )
           }
@@ -51360,7 +51370,7 @@ const mapFields = ["lineString", "point", "circle", "polygon"], PreviewTable$1 =
         key: F.name,
         width: 200,
         render: ($, k, z) => {
-          const E = k[F.name], q = {
+          const L = k[F.name], q = {
             type: "object",
             properties: {
               [F.name]: {
@@ -51368,7 +51378,7 @@ const mapFields = ["lineString", "point", "circle", "polygon"], PreviewTable$1 =
                 "x-component": D && I ? "CollectionField" : "Input",
                 "x-read-pretty": !0,
                 "x-collection-field": I == null ? void 0 : I.join("."),
-                default: F.interface === "json" ? JSON.stringify(E) : E
+                default: F.interface === "json" ? JSON.stringify(L) : L
               }
             }
           };
@@ -51701,7 +51711,7 @@ const AsyncDataProvider = (e) => {
               style: { width: "100%" },
               popupMatchSelectWidth: !1,
               onChange: (B) => {
-                var M, $, k, z, E;
+                var M, $, k, z, L;
                 const w = p(B);
                 S(
                   P(x({}, j), {
@@ -51709,7 +51719,7 @@ const AsyncDataProvider = (e) => {
                     uiSchema: P(x({}, (M = w == null ? void 0 : w.default) == null ? void 0 : M.uiSchema), {
                       title: ((k = ($ = w == null ? void 0 : w.default) == null ? void 0 : $.uiSchema) == null ? void 0 : k.title) || ((z = j.uiSchema) == null ? void 0 : z.title)
                     }),
-                    type: (E = w == null ? void 0 : w.default) == null ? void 0 : E.type
+                    type: (L = w == null ? void 0 : w.default) == null ? void 0 : L.type
                   }),
                   O
                 );
@@ -60288,11 +60298,11 @@ const ActionInitializerItem = (e) => {
       (y || W) && g(P(x({}, h == null ? void 0 : h[0]), {
         filter: f
       })), v(!y), K.stopPropagation();
-    }, E = (K) => {
+    }, L = (K) => {
       K.stopPropagation();
     }, q = (K) => {
       m(K);
-    }, L = (J = a.title) != null ? J : (H = i == null ? void 0 : i.uiSchema) == null ? void 0 : H.title;
+    }, E = (J = a.title) != null ? J : (H = i == null ? void 0 : i.uiSchema) == null ? void 0 : H.title;
     return t(
       /* @__PURE__ */ jsxs(SortableItem, { className: cls(n, o, "nb-block-item", e.className, "SortableItem"), children: [
         /* @__PURE__ */ jsx(l, {}),
@@ -60309,17 +60319,17 @@ const ActionInitializerItem = (e) => {
                 },
                 gutter: 5,
                 children: [
-                  /* @__PURE__ */ jsx(Col, { title: c(L), className: "headerCol", children: y ? /* @__PURE__ */ jsx(
+                  /* @__PURE__ */ jsx(Col, { title: c(E), className: "headerCol", children: y ? /* @__PURE__ */ jsx(
                     Input$3,
                     {
                       bordered: !1,
                       autoFocus: !0,
                       placeholder: "Search...",
                       className: "search",
-                      onClick: E,
+                      onClick: L,
                       onChange: q
                     }
-                  ) : c(L) }),
+                  ) : c(E) }),
                   /* @__PURE__ */ jsx(
                     Col,
                     {
@@ -60747,14 +60757,14 @@ const DataBlockInitializer = (e) => {
     alwaysRenderMenu: y
   } = e, { insert: v, setVisible: F } = useSchemaInitializer(), I = useCompile(), { getTemplateSchemaByMode: R } = useSchemaTemplateManager(), T = useCallback(
     (z) => V(void 0, null, function* () {
-      const { item: E, fromOthersInPopup: q } = z;
+      const { item: L, fromOthersInPopup: q } = z;
       if (f)
         return f(z);
-      if (E.template) {
-        const L = yield R(E);
-        v(t ? t(L, { item: E, fromOthersInPopup: q }) : L);
+      if (L.template) {
+        const E = yield R(L);
+        v(t ? t(E, { item: L, fromOthersInPopup: q }) : E);
       } else
-        n && n({ item: E, fromOthersInPopup: q });
+        n && n({ item: L, fromOthersInPopup: q });
       F(!1);
     }),
     [R, v, F, n, f, t]
@@ -60773,14 +60783,14 @@ const DataBlockInitializer = (e) => {
     currentText: b,
     otherText: S
   }), O = useGetSchemaInitializerMenuItems(T), j = useMemo(() => O(D, i), [O, D, i]), [N, B] = useState([]), w = useMenuSearch({ data: j, openKeys: N, hideSearch: u }), M = useMemo(() => {
-    let z = w.filter((E) => E.key !== "search" && E.key !== "empty");
+    let z = w.filter((L) => L.key !== "search" && L.key !== "empty");
     return p && z.length === 1 ? z = z[0].children : z = w, [
       {
         key: i,
         label: I(a),
         icon: typeof r == "string" ? /* @__PURE__ */ jsx(antIcons__default, { type: r }) : r,
-        onClick: (E) => {
-          E.key === i && T(P(x({}, E), { item: e }));
+        onClick: (L) => {
+          L.key === i && T(P(x({}, L), { item: e }));
         },
         children: z
       }