@nocobase/client 1.7.2 → 1.7.3

package/es/index.mjs

@@ -21,7 +21,7 @@ var W = (e, t) => {
   return o;
 };
 var A = (e, t, o) => (we(e, typeof t != "symbol" ? t + "" : t, o), o);
-var q = (e, t, o) => new Promise((n, r) => {
+var z = (e, t, o) => new Promise((n, r) => {
   var a = (c) => {
     try {
       l(o.next(c));
@@ -4294,7 +4294,7 @@ class APIClient extends APIClient$1 {
     return (i = (a = o == null ? void 0 : o.response) == null ? void 0 : a.data) != null && i.error ? [(c = (l = o == null ? void 0 : o.response) == null ? void 0 : l.data) == null ? void 0 : c.error] : ((d = (u = o == null ? void 0 : o.response) == null ? void 0 : u.data) == null ? void 0 : d.errors) || ((m = (p = o == null ? void 0 : o.response) == null ? void 0 : p.data) == null ? void 0 : m.messages) || ((h = o == null ? void 0 : o.response) == null ? void 0 : h.error) || [{ message: o.message || "Server error" }];
   }
   handleNotificationError(o) {
-    return q(this, null, function* () {
+    return z(this, null, function* () {
       var a, i, l, c, u, d, p, m, h, g;
       if (this.silence)
         throw o;
@@ -4383,13 +4383,13 @@ function assign(e, t, o = {}) {
 function useRequest(e, t = {}) {
   const [o, n] = useSetState({}), r = useAPIClient();
   let a;
-  typeof e == "function" ? a = e : e ? a = (...u) => q(this, [...u], function* (c = {}) {
+  typeof e == "function" ? a = e : e ? a = (...u) => z(this, [...u], function* (c = {}) {
     const { resource: d, url: p } = e;
     let m = cloneDeep(e);
     d || p ? (m.params = m.params || {}, assign(m.params, c)) : m = merge(m, c);
     const h = yield r.request(m);
     return h == null ? void 0 : h.data;
-  }) : a = () => q(this, null, function* () {
+  }) : a = () => z(this, null, function* () {
   });
   const i = P(x({}, t), {
     onSuccess(...c) {
@@ -4591,7 +4591,7 @@ class Collection {
 const { ConfigContext } = ConfigProvider, useConfig = () => useContext(ConfigContext), usePrefixCls = (e, t) => {
   const { getPrefixCls: o } = useContext(ConfigProvider.ConfigContext) || {};
   return "ConfigContext" in ConfigProvider ? (o == null ? void 0 : o(e, t == null ? void 0 : t.prefixCls)) || "" : `ant-${e != null ? e : ""}`;
-}, useToken$1 = () => theme.useToken(), loading = (e = "Loading...", t) => q(void 0, null, function* () {
+}, useToken$1 = () => theme.useToken(), loading = (e = "Loading...", t) => z(void 0, null, function* () {
   let o = null;
   const n = setTimeout(() => {
     o = message.loading(e);
@@ -4631,7 +4631,7 @@ function legacyUnmount(e) {
   return unmountComponentAtNode(e);
 }
 function concurrentUnmount(e) {
-  return q(this, null, function* () {
+  return z(this, null, function* () {
     return Promise.resolve().then(() => {
       var t;
       (t = e[MARK]) == null || t.unmount(), delete e[MARK];
@@ -4890,7 +4890,7 @@ class DataSource {
     this.reloadCallbacks = this.reloadCallbacks.filter((o) => o !== t);
   }
   reload() {
-    return q(this, null, function* () {
+    return z(this, null, function* () {
       const t = yield this.getDataSource();
       return this.setOptions(t), this.collectionManager.setCollections(t.collections || []), this.reloadCallbacks.forEach((o) => o(t.collections)), this.options;
     });
@@ -6128,7 +6128,7 @@ class DataSourceManager {
     return this.dataSourceInstancesMap[n.key] = n, n;
   }
   addDataSources(t, o) {
-    return q(this, null, function* () {
+    return z(this, null, function* () {
       this.multiDataSources.some(([n, r]) => n === t && r === o) || this.multiDataSources.push([t, o]);
     });
   }
@@ -6151,9 +6151,9 @@ class DataSourceManager {
     this.collectionFieldInterfaceManager.addFieldInterfaces(t);
   }
   reload() {
-    return q(this, null, function* () {
+    return z(this, null, function* () {
       return yield Promise.all(
-        this.multiDataSources.map((n) => q(this, [n], function* ([t, o]) {
+        this.multiDataSources.map((n) => z(this, [n], function* ([t, o]) {
           (yield t()).map((a) => this.addDataSource(o, a));
         }))
       ), Promise.all(this.getDataSources().map((t) => t.reload()));
@@ -6914,7 +6914,7 @@ function getAllKeys(e) {
   }
   return o(e), t;
 }
-const parseVariableValue = (e, t, o) => q(void 0, null, function* () {
+const parseVariableValue = (e, t, o) => z(void 0, null, function* () {
   const n = isVariable$1(e) ? [t.parseVariable(e, o).then(({ value: r }) => r)] : [e];
   try {
     const [r] = yield Promise.all(n);
@@ -6922,7 +6922,7 @@ const parseVariableValue = (e, t, o) => q(void 0, null, function* () {
   } catch (r) {
     throw console.error("Error in parseVariableValue:", r), r;
   }
-}), conditionAnalyses = (i, l) => q(void 0, [i, l], function* ({
+}), conditionAnalyses = (i, l) => z(void 0, [i, l], function* ({
   ruleGroup: e,
   variables: t,
   localVariables: o,
@@ -6935,12 +6935,12 @@ const parseVariableValue = (e, t, o) => q(void 0, null, function* () {
     )
   );
   return c === "$and" ? every(d, (p) => p) : d.length ? some(d, (p) => p) : !0;
-}), processCondition = (e, t, o, n, r, a) => q(void 0, null, function* () {
+}), processCondition = (e, t, o, n, r, a) => z(void 0, null, function* () {
   return "$and" in e || "$or" in e ? yield conditionAnalyses({ ruleGroup: e, variables: t, localVariables: o, conditionType: r }, a) : r === "advanced" ? processAdvancedCondition(e, t, o, a) : processBasicCondition(e, t, o, n, a);
-}), processAdvancedCondition = (e, t, o, n) => q(void 0, null, function* () {
+}), processAdvancedCondition = (e, t, o, n) => z(void 0, null, function* () {
   const r = e.op, a = yield parseVariableValue(e.rightVar, t, o), i = yield parseVariableValue(e.leftVar, t, o);
   return r ? n.apply({ [r]: [i, a] }) : !0;
-}), processBasicCondition = (e, t, o, n, r) => q(void 0, null, function* () {
+}), processBasicCondition = (e, t, o, n, r) => z(void 0, null, function* () {
   const a = getInnermostKeyAndValue(e), i = a == null ? void 0 : a.key;
   if (!i)
     return !0;
@@ -6968,7 +6968,7 @@ const getVariablesData = (e) => {
   }), t;
 };
 function getRenderContent(e, t, o, n, r) {
-  return q(this, null, function* () {
+  return z(this, null, function* () {
     var a, i;
     if (t && e === "handlebars")
       try {
@@ -7312,7 +7312,7 @@ function getRemotePlugins(e, t = []) {
   });
 }
 function getPlugins(e) {
-  return q(this, null, function* () {
+  return z(this, null, function* () {
     const { requirejs: t, pluginData: o, devDynamicImport: n } = e;
     if (o.length === 0)
       return [];
@@ -7357,12 +7357,12 @@ let PluginManager$1 = class {
    * @internal
    */
   init(t) {
-    return q(this, null, function* () {
+    return z(this, null, function* () {
       yield this.initStaticPlugins(t), this.loadRemotePlugins && (yield this.initRemotePlugins());
     });
   }
   initStaticPlugins() {
-    return q(this, arguments, function* (t = []) {
+    return z(this, arguments, function* (t = []) {
       try {
         for (var o = Te(t), n, r, a; n = !(r = yield o.next()).done; n = !1) {
           const i = r.value;
@@ -7382,7 +7382,7 @@ let PluginManager$1 = class {
     });
   }
   initRemotePlugins() {
-    return q(this, null, function* () {
+    return z(this, null, function* () {
       var r;
       const t = yield this.app.apiClient.request({ url: "pm:listEnabled" }), o = ((r = t == null ? void 0 : t.data) == null ? void 0 : r.data) || [], n = yield getPlugins({
         requirejs: this.app.requirejs,
@@ -7408,7 +7408,7 @@ let PluginManager$1 = class {
     });
   }
   add(n) {
-    return q(this, arguments, function* (t, o = {}) {
+    return z(this, arguments, function* (t, o = {}) {
       const r = this.getInstance(t, o);
       this.pluginInstances.set(t, r), o.name && (this.pluginsAliases[o.name] = r), o.packageName && (this.pluginsAliases[o.packageName] = r), yield r.afterAdd();
     });
@@ -7423,7 +7423,7 @@ let PluginManager$1 = class {
    * @internal
    */
   load() {
-    return q(this, null, function* () {
+    return z(this, null, function* () {
       yield this.initPlugins;
       for (const t of this.pluginInstances.values())
         yield t.beforeLoad();
@@ -7822,9 +7822,9 @@ class WebSocketClient {
       for (const { type: n, listener: r, options: a } of this.events)
         this._ws.addEventListener(n, r, a);
       o = setInterval(() => this.send("ping"), this.pingInterval), this.connected = !0, this.emit("open", {});
-    }, t.onerror = () => q(this, null, function* () {
+    }, t.onerror = () => z(this, null, function* () {
       console.log("onerror", this.readyState, this._reconnectTimes);
-    }), t.onclose = (n) => q(this, null, function* () {
+    }), t.onclose = (n) => z(this, null, function* () {
       setTimeout(() => this.connect(), this.reconnectInterval), console.log("onclose", this.readyState, this._reconnectTimes, this.serverDown), this.connected = !1, clearInterval(o);
     });
   }
@@ -8129,7 +8129,7 @@ const SchemaInitializerSubMenuContext = React.createContext({}), SchemaInitializ
   const o = useLocationNoUpdate(), [n, r] = React.useState(!1), a = useAPIClient();
   return {
     loading: n,
-    download: () => q(void 0, null, function* () {
+    download: () => z(void 0, null, function* () {
       r(!0);
       try {
         const i = yield a.request({
@@ -8210,15 +8210,15 @@ class Plugin {
     return this.app.dataSourceManager;
   }
   afterAdd() {
-    return q(this, null, function* () {
+    return z(this, null, function* () {
     });
   }
   beforeLoad() {
-    return q(this, null, function* () {
+    return z(this, null, function* () {
     });
   }
   load() {
-    return q(this, null, function* () {
+    return z(this, null, function* () {
     });
   }
   t(t, o = {}) {
@@ -8385,7 +8385,7 @@ function addAppVersion(e, t) {
       addAppVersion((n = e.properties) == null ? void 0 : n[o], t);
     }), e;
 }
-const name = "@nocobase/client", version = "1.7.2", license = "AGPL-3.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
+const name = "@nocobase/client", version = "1.7.3", 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",
@@ -8406,9 +8406,9 @@ const name = "@nocobase/client", version = "1.7.2", license = "AGPL-3.0", main =
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "1.7.2",
-  "@nocobase/sdk": "1.7.2",
-  "@nocobase/utils": "1.7.2",
+  "@nocobase/evaluators": "1.7.3",
+  "@nocobase/sdk": "1.7.3",
+  "@nocobase/utils": "1.7.3",
   ahooks: "^3.7.2",
   antd: "5.24.2",
   "antd-style": "3.7.1",
@@ -8532,7 +8532,7 @@ class Designable {
         });
       }), r["x-uid"] && i.length ? i : [];
     };
-    this.on("insertAdjacent", (p) => q(this, [p], function* ({ onSuccess: r, current: a, position: i, schema: l, wrap: c, wrapped: u, removed: d }) {
+    this.on("insertAdjacent", (p) => z(this, [p], function* ({ onSuccess: r, current: a, position: i, schema: l, wrap: c, wrapped: u, removed: d }) {
       var g;
       let m = [];
       if ((u == null ? void 0 : u["x-component"]) === "Grid.Col" && (m = m.concat(n(u.parent))), (d == null ? void 0 : d["x-component"]) === "Grid.Col" && (m = m.concat(n(d.parent))), this.refresh(), !a["x-uid"])
@@ -8553,25 +8553,25 @@ class Designable {
         url: `/uiSchemas:remove/${d["x-uid"]}`,
         method: "post"
       })), r == null || r((g = h == null ? void 0 : h.data) == null ? void 0 : g.data), message.success(o("Saved successfully"), 0.2);
-    })), this.on("patch", (a) => q(this, [a], function* ({ schema: r }) {
+    })), this.on("patch", (a) => z(this, [a], function* ({ schema: r }) {
       this.refresh(), r != null && r["x-uid"] && (yield t.request({
         url: "/uiSchemas:patch",
         method: "post",
         data: x({}, r)
       }), message.success(o("Saved successfully"), 0.2));
-    })), this.on("initializeActionContext", (a) => q(this, [a], function* ({ schema: r }) {
+    })), this.on("initializeActionContext", (a) => z(this, [a], function* ({ schema: r }) {
       r != null && r["x-uid"] && (yield t.request({
         url: "/uiSchemas:initializeActionContext",
         method: "post",
         data: x({}, r)
       }));
-    })), this.on("batchPatch", (a) => q(this, [a], function* ({ schemas: r }) {
+    })), this.on("batchPatch", (a) => z(this, [a], function* ({ schemas: r }) {
       this.refresh(), yield t.request({
         url: "/uiSchemas:batchPatch",
         method: "post",
         data: r
       }), message.success(o("Saved successfully"), 0.2);
-    })), this.on("remove", (a) => q(this, [a], function* ({ removed: r }) {
+    })), this.on("remove", (a) => z(this, [a], function* ({ removed: r }) {
       let i = [];
       (r == null ? void 0 : r["x-component"]) === "Grid.Col" && (i = n(r.parent)), this.refresh(), r != null && r["x-uid"] && (yield t.request({
         url: `/uiSchemas:remove/${r["x-uid"]}`,
@@ -8590,7 +8590,7 @@ class Designable {
     this.events[t] || (this.events[t] = []), this.events[t].push(o);
   }
   emit(t, ...o) {
-    return q(this, null, function* () {
+    return z(this, null, function* () {
       if (!this.events[t])
         return;
       const [n, ...r] = o;
@@ -9056,7 +9056,7 @@ function useParsedFilter({ filterOption: e }) {
   return useEffect(() => {
     if (!e)
       return;
-    const l = () => q(this, null, function* () {
+    const l = () => z(this, null, function* () {
       i(!0);
       const u = yield t(e);
       i(!1), r(u);
@@ -9158,20 +9158,20 @@ const LinkageRuleDataKeyMap = {
     default:
       return null;
   }
-}, getSatisfiedActions = (r, a) => q(void 0, [r, a], function* ({ rules: e, variables: t, localVariables: o }, n) {
+}, getSatisfiedActions = (r, a) => z(void 0, [r, a], function* ({ rules: e, variables: t, localVariables: o }, n) {
   return (yield Promise.all(
-    e.filter((l) => !l.disabled).map((l) => q(void 0, null, function* () {
+    e.filter((l) => !l.disabled).map((l) => z(void 0, null, function* () {
       return (yield conditionAnalyses(
         { ruleGroup: l.condition, variables: t, localVariables: o, conditionType: l.conditionType },
         n
       )) ? l : null;
     }))
   )).filter(Boolean).map((l) => l.actions).flat();
-}), getSatisfiedValues = (r, a) => q(void 0, [r, a], function* ({ rules: e, variables: t, localVariables: o }, n) {
+}), getSatisfiedValues = (r, a) => z(void 0, [r, a], function* ({ rules: e, variables: t, localVariables: o }, n) {
   return (yield getSatisfiedActions({ rules: e, variables: t, localVariables: o }, n)).map((i) => P(x({}, i), {
     value: getActionValue(i.operator, i.value)
   }));
-}), getSatisfiedValueMap = (r, a) => q(void 0, [r, a], function* ({ rules: e, variables: t, localVariables: o }, n) {
+}), getSatisfiedValueMap = (r, a) => z(void 0, [r, a], function* ({ rules: e, variables: t, localVariables: o }, n) {
   return (yield getSatisfiedValues({ rules: e, variables: t, localVariables: o }, n)).reduce((c, u) => P(x({}, c), { [u.operator]: u.value }), {});
 });
 function useSatisfiedActionValues({
@@ -9972,7 +9972,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(), R = ((be = v == null ? void 0 : v.parent) == null ? void 0 : be["x-decorator"]) === "TableSelectorProvider" ? useTableSelectorContext() : useTableBlockContext(), { expandFlag: D, allIncludesChildren: B, enableIndexÏColumn: N } = R, $ = useMemoizedFn(S.onRowDragEnd || (() => {
-      })), L = usePaginationProps$3(o, a, e), w = useTableColumns$2(S, L), [O, j] = useState(() => D ? B : []), [k, M] = useState(((Se = y == null ? void 0 : y.data) == null ? void 0 : Se.selectedRowKeys) || []), [E, V] = useState([]), z = (p == null ? void 0 : p.type) !== "none", G = useRef(/* @__PURE__ */ new Map()), U = useMemo(() => css`
+      })), L = usePaginationProps$3(o, a, e), w = useTableColumns$2(S, L), [O, j] = useState(() => D ? B : []), [k, M] = useState(((Se = y == null ? void 0 : y.data) == null ? void 0 : Se.selectedRowKeys) || []), [q, E] = useState([]), V = (p == null ? void 0 : p.type) !== "none", G = useRef(/* @__PURE__ */ new Map()), U = useMemo(() => css`
           & > td {
             background-color: ${t.controlItemBgActive} !important;
           }
@@ -9988,14 +9988,14 @@ const Table$2 = withDynamicSchemaProps(
       }, [H == null ? void 0 : H.field]);
       const Y = useMemo(() => C ? U : "", [U, C]), J = useMemo(() => C ? (Z, ne) => ({
         onClick: (re) => {
-          isPortalInBody(re.target) || C(Z, V, E);
+          isPortalInBody(re.target) || C(Z, E, q);
         },
         rowIndex: ne,
         record: Z
       }) : (Z, ne) => ({
         rowIndex: ne,
         record: Z
-      }), [C, E]);
+      }), [C, q]);
       useDeepCompareEffect(() => {
         const Z = D ? B : [];
         _.isEqual(Z, O) || j(Z);
@@ -10068,14 +10068,14 @@ const Table$2 = withDynamicSchemaProps(
                   role: "button",
                   "aria-label": `table-index-${re}`,
                   className: cls(Z ? "checked" : null, rowSelectCheckboxWrapperClass$1, {
-                    [rowSelectCheckboxWrapperClassHover$1]: z
+                    [rowSelectCheckboxWrapperClassHover$1]: V
                   }),
                   children: [
                     /* @__PURE__ */ jsxs("div", { className: cls(Z ? "checked" : null, rowSelectCheckboxContentClass$1), children: [
                       l && /* @__PURE__ */ jsx(SortHandle$2, { id: X(ne) }),
                       c && /* @__PURE__ */ jsx(TableIndex$3, { index: re })
                     ] }),
-                    z && /* @__PURE__ */ jsx(
+                    V && /* @__PURE__ */ jsx(
                       "div",
                       {
                         className: cls(
@@ -10100,7 +10100,7 @@ const Table$2 = withDynamicSchemaProps(
           l,
           y,
           X,
-          z,
+          V,
           te,
           L,
           H,
@@ -10123,8 +10123,8 @@ const Table$2 = withDynamicSchemaProps(
         x: "max-content",
         y: ue
       }), [ue, Q]), pe = useCallback(
-        (Z) => E.includes(Z[m]) ? Y : "",
-        [E, Y, JSON.stringify(m)]
+        (Z) => q.includes(Z[m]) ? Y : "",
+        [q, Y, JSON.stringify(m)]
       ), me = useCallback(
         (Z, ne) => {
           const re = Z ? [...O, ne[I.getPrimaryKey()]] : O.filter((ae) => ne[I.getPrimaryKey()] !== ae);
@@ -10373,10 +10373,10 @@ const InternalTableBlockProvider = (e) => {
     [t, p]
   ), v = useCallback(
     (w, O = !1, j) => {
-      var E;
+      var q;
       if (!w)
         return [];
-      const k = (E = p(j)) == null ? void 0 : E.getCollection(w);
+      const k = (q = p(j)) == null ? void 0 : q.getCollection(w);
       return (k == null ? void 0 : k.getChildrenCollections(O)) || [];
     },
     [t, p]
@@ -10391,19 +10391,19 @@ const InternalTableBlockProvider = (e) => {
       var Q;
       const {
         association: M = !1,
-        cached: E = {},
-        collectionNames: V = [w],
-        maxDepth: z = 1,
+        cached: q = {},
+        collectionNames: E = [w],
+        maxDepth: V = 1,
         allowAllTypes: G = !1,
         exceptInterfaces: U = [],
         prefixFieldValue: H = "",
         usePrefix: Y = !1,
         dataSource: J
       } = k || {};
-      if (V.length - 1 > z)
+      if (E.length - 1 > V)
         return;
-      if (E[w])
-        return _.cloneDeep(E[w]);
+      if (q[w])
+        return _.cloneDeep(q[w]);
       O && typeof O == "string" && (O = [O]), j && typeof j == "string" && (j = [j]);
       const K = b(w, J), X = (Q = K == null ? void 0 : K.filter(
         (ee) => ee.interface && !U.includes(ee.interface) && (G || O && O.includes(ee.type) || j && j.includes(ee.interface) || (M && ee.target && ee.target !== w && Array.isArray(M) ? M.includes(ee.interface) : !1))
@@ -10413,15 +10413,15 @@ const InternalTableBlockProvider = (e) => {
           value: Y && H ? `${H}.${ee.name}` : ee.name,
           label: f((te = ee == null ? void 0 : ee.uiSchema) == null ? void 0 : te.title) || ee.name
         }, ee);
-        return M && ee.target && (oe.children = V.includes(ee.target) ? [] : I(ee.target, O, j, P(x({}, k), {
-          cached: E,
+        return M && ee.target && (oe.children = E.includes(ee.target) ? [] : I(ee.target, O, j, P(x({}, k), {
+          cached: q,
           dataSource: J,
-          collectionNames: [...V, ee.target],
+          collectionNames: [...E, ee.target],
           prefixFieldValue: Y ? H ? `${H}.${ee.name}` : ee.name : "",
           usePrefix: Y
         })), !((se = oe.children) != null && se.length)) ? null : oe;
       }).filter(Boolean);
-      return E[w] = X, X;
+      return q[w] = X, X;
     },
     [b]
   ), T = useCallback(
@@ -10691,14 +10691,14 @@ const popupsContextStorage = {}, getStoredPopupContext = (e) => popupsContextSto
       recordData: j,
       sourceId: k,
       collection: M,
-      puid: E
+      puid: q
     }) => {
-      const V = c.getFilterByTK(u || l, j);
+      const E = c.getFilterByTK(u || l, j);
       return getPopupPathFromParams({
         popupuid: O,
-        puid: E,
+        puid: q,
         collection: M,
-        filterbytk: V,
+        filterbytk: E,
         sourceid: k,
         tab: w
       });
@@ -10721,27 +10721,27 @@ const popupsContextStorage = {}, getStoredPopupContext = (e) => popupsContextSto
     } = {}) => {
       if (!f())
         return I == null ? void 0 : I(!0);
-      const E = M || n, V = E == null ? void 0 : E["x-uid"], z = y(O);
+      const q = M || n, E = q == null ? void 0 : q["x-uid"], V = y(O);
       w = w || (a == null ? void 0 : a.data);
       const G = T({
-        popupUid: V,
+        popupUid: E,
         recordData: w,
-        sourceId: z,
+        sourceId: V,
         collection: j,
         puid: k
       });
       let U = o.pathname;
-      if (_.last(U) === "/" && (U = U.slice(0, -1)), storePopupContext(V, {
-        schema: E,
+      if (_.last(U) === "/" && (U = U.slice(0, -1)), storePopupContext(E, {
+        schema: q,
         record: new CollectionRecord({ isNew: !1, data: w }),
         parentRecord: O ? new CollectionRecord({ isNew: !1, data: O }) : i,
         service: g(),
         dataSource: r,
         collection: l == null ? void 0 : l.name,
         association: u,
-        sourceId: z,
+        sourceId: V,
         tableBlockContext: P(x({}, F), { collection: l == null ? void 0 : l.name, blockData: v })
-      }), b(R(), M), E.properties) {
+      }), b(R(), M), q.properties) {
         const H = h + 1;
         if (getPopupLayerState(H))
           return;
@@ -10749,7 +10749,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(q, null, 2)}`
         );
     },
     [
@@ -10860,7 +10860,7 @@ const ActionContextProvider = React.memo(
   (e) => {
     const [t, o] = useState(!1), { visible: n } = x(x({}, e), e.value), { setSubmitted: r } = x(x({}, e), e.value), a = useBlockServiceInActionButton(), { isSubPageClosedByPageMenu: i, reset: l } = useIsSubPageClosedByPageMenu(useFieldSchema());
     useEffect(() => {
-      q(void 0, null, function* () {
+      z(void 0, null, function* () {
         n === !1 && a && !a.loading && (t || i()) && (l(), a.loading = !0, yield a.refreshAsync(), a.loading = !1, o(!1), r == null || r(!0));
       });
     }, [n, a, r, i, t, l]);
@@ -10915,7 +10915,7 @@ function FormDialog(e, t, o, n) {
             var b;
             ((b = l == null ? void 0 : l.onCancel) == null ? void 0 : b.call(l, C)) !== !1 && (h == null || h());
           },
-          onOk: (C) => q(this, null, function* () {
+          onOk: (C) => z(this, null, function* () {
             var b;
             ((b = l == null ? void 0 : l.onOk) == null ? void 0 : b.call(l, C)) !== !1 && (m == null || m());
           }),
@@ -10929,8 +10929,8 @@ function FormDialog(e, t, o, n) {
     forOpen: (p) => (isFn(p) && r.openMiddlewares.push(p), d),
     forConfirm: (p) => (isFn(p) && r.confirmMiddlewares.push(p), d),
     forCancel: (p) => (isFn(p) && r.cancelMiddlewares.push(p), d),
-    open: (p) => q(this, null, function* () {
-      return r.promise || (r.promise = new Promise((m, h) => q(this, null, function* () {
+    open: (p) => z(this, null, function* () {
+      return r.promise || (r.promise = new Promise((m, h) => z(this, null, function* () {
         try {
           p = yield loading(l.loadingText, () => applyMiddleware(p, r.openMiddlewares)), r.form = r.form || createForm(p);
         } catch (g) {
@@ -10941,7 +10941,7 @@ function FormDialog(e, t, o, n) {
             !0,
             () => {
               var g;
-              (g = r.form) == null || g.submit(() => q(this, null, function* () {
+              (g = r.form) == null || g.submit(() => z(this, null, function* () {
                 yield applyMiddleware(r.form, r.confirmMiddlewares), untracked(() => {
                   var f;
                   m(x({}, (f = r.form) == null ? void 0 : f.values));
@@ -10949,7 +10949,7 @@ function FormDialog(e, t, o, n) {
               })).catch(() => {
               });
             },
-            () => q(this, null, function* () {
+            () => z(this, null, function* () {
               yield loading(l.loadingText, () => applyMiddleware(r.form, r.cancelMiddlewares)), d.close();
             })
           )
@@ -11041,7 +11041,7 @@ const options$2 = {
   const t = useAPIClient(), o = useIsAdminPage(), n = t.auth.getToken() || "", r = useRequest(options$2, {
     refreshDeps: [o, n],
     ready: !!(o && n)
-  }), a = useCallback(() => q(void 0, null, function* () {
+  }), a = useCallback(() => z(void 0, null, function* () {
     const { data: c } = yield t.request(options$2);
     return r.mutate(c), (c == null ? void 0 : c.data) || [];
   }), [r]), i = useMemo(() => {
@@ -11193,7 +11193,7 @@ const useSelectedRowKeys = () => {
   const e = useContext(DataSourceContext_deprecated), t = useForm(), { setVisible: o } = useActionContext();
   return {
     run() {
-      return q(this, null, function* () {
+      return z(this, null, function* () {
         console.log("form.values", t.values);
         const r = e.dataSource || [];
         r.push(cloneDeep$1(t.values)), e.setDataSource([...r]), o(!1), yield t.reset();
@@ -11204,7 +11204,7 @@ const useSelectedRowKeys = () => {
   const e = useContext(DataSourceContext_deprecated), { selectedRowKeys: t, setSelectedRowKeys: o } = e;
   return {
     run() {
-      return q(this, null, function* () {
+      return z(this, null, function* () {
         const r = e.dataSource || [];
         e.setDataSource(
           r.filter((a, i) => !t.includes(i))
@@ -11216,7 +11216,7 @@ const useSelectedRowKeys = () => {
   const e = useRecordIndex(), t = useForm(), { setVisible: o } = useActionContext(), n = useContext(DataSourceContext_deprecated);
   return {
     run() {
-      return q(this, null, function* () {
+      return z(this, null, function* () {
         const i = ((n == null ? void 0 : n.dataSource) || []).map((l, c) => c === e ? x({}, t.values) : l);
         n.setDataSource([...i]), o(!1);
       });
@@ -11226,7 +11226,7 @@ const useSelectedRowKeys = () => {
   const e = useRecordIndex(), t = useContext(DataSourceContext_deprecated);
   return {
     run() {
-      return q(this, null, function* () {
+      return z(this, null, function* () {
         const n = t.dataSource || [];
         t.setDataSource(
           n.filter((r, a) => e !== a)
@@ -11970,7 +11970,7 @@ function getSubscriber({
         conditionType: o.conditionType
       },
       i
-    ), setTimeout(() => q(this, null, function* () {
+    ), setTimeout(() => z(this, null, function* () {
       var d, p, m, h, g, f, C, b;
       const l = getFieldNameByOperator(e.operator);
       if (!((d = t.stateOfLinkageRules) != null && d[l]))
@@ -12084,19 +12084,19 @@ const collectFieldStateOfLinkageRules = ({
       break;
     case ActionType.Value:
       {
-        const j = () => q(void 0, null, function* () {
+        const j = () => z(void 0, null, function* () {
           var k;
           if ((t == null ? void 0 : t.mode) === "express") {
             if ((t.value || t.result) == null)
               return;
-            const { exp: M, scope: E } = yield replaceVariables(t.value || t.result, {
+            const { exp: M, scope: q } = yield replaceVariables(t.value || t.result, {
               variables: r,
               localVariables: a
             });
             try {
-              return f(M, x({ now: () => (/* @__PURE__ */ new Date()).toString() }, E));
-            } catch (V) {
-              console.error(V);
+              return f(M, x({ now: () => (/* @__PURE__ */ new Date()).toString() }, q));
+            } catch (E) {
+              console.error(E);
             }
           } else
             return (t == null ? void 0 : t.mode) === "constant" ? (k = t == null ? void 0 : t.value) != null ? k : t : null;
@@ -12130,7 +12130,7 @@ const collectFieldStateOfLinkageRules = ({
   }
 };
 function getTempFieldState(e, t) {
-  return q(this, null, function* () {
+  return z(this, null, function* () {
     return [e, t] = yield Promise.all([e, t]), {
       condition: e,
       value: t
@@ -12142,7 +12142,7 @@ function isConditionEmpty(e) {
   return _.isEmpty(o);
 }
 function replaceVariables(n, r) {
-  return q(this, arguments, function* (e, {
+  return z(this, arguments, function* (e, {
     variables: t,
     localVariables: o
   }) {
@@ -12150,7 +12150,7 @@ function replaceVariables(n, r) {
     const a = {}, i = {};
     if (e == null)
       return;
-    const l = (c = e.match(REGEX_OF_VARIABLE_IN_EXPRESSION)) == null ? void 0 : c.map((u) => q(this, null, function* () {
+    const l = (c = e.match(REGEX_OF_VARIABLE_IN_EXPRESSION)) == null ? void 0 : c.map((u) => z(this, null, function* () {
       const { value: d } = yield t.parseVariable(u, o, {
         doNotRequest: u.includes("$nForm") || u.includes("$iteration")
       }), p = `_${uid$1()}`;
@@ -12639,7 +12639,7 @@ const CurrentRecordContext = createContext(null), CurrentRecordContextProvider =
     /** 当前记录对应的 collection name */
     collectionName: r
   };
-}, getVariableValue = (e, t) => q(void 0, null, function* () {
+}, getVariableValue = (e, t) => z(void 0, null, function* () {
   if (!e)
     return e;
   const { evaluate: o } = evaluators.get("string"), { exp: n, scope: r } = yield replaceVariables(e, t);
@@ -12903,7 +12903,7 @@ const DatePickerContext = React.createContext({ utc: !0 }), useDatePickerContext
   }), () => {
     u.current();
   }), [e._maxDate, e._minDate, r, n]);
-  const d = () => q(void 0, null, function* () {
+  const d = () => z(void 0, null, function* () {
     let m = e._minDate ? Promise.resolve(dayjs(e._minDate)) : Promise.resolve(null), h = e._maxDate ? Promise.resolve(dayjs(e._maxDate)) : Promise.resolve(null);
     isVariable$1(e._maxDate) && (h = n(e._maxDate, r).then((y) => dayjs(Array.isArray(y.value) ? last(y.value) : y.value))), isVariable$1(e._minDate) && (m = n(e._minDate, r).then((y) => dayjs(Array.isArray(y.value) ? first(y.value) : y.value)));
     const [g, f] = yield Promise.all([m, h]), C = Array.from({ length: 60 }, (y, v) => v), b = (y) => {
@@ -13751,7 +13751,7 @@ const ParentCollectionProvider = (e) => {
     key: t,
     isLeaf: !1,
     disabled: i,
-    loadChildren: (c, u) => q(void 0, null, function* () {
+    loadChildren: (c, u) => z(void 0, null, function* () {
       const d = u ? {
         [u]: void 0
       } : {};
@@ -13909,7 +13909,7 @@ const ParentCollectionProvider = (e) => {
     (L, w) => {
       if (!u)
         return o(L, w);
-      setTimeout(() => q(void 0, null, function* () {
+      setTimeout(() => z(void 0, null, function* () {
         (yield u(L, w)) && o(L, w);
       }));
     },
@@ -13941,7 +13941,7 @@ const ParentCollectionProvider = (e) => {
   variables: t,
   localVariables: o,
   getAllCollectionsInheritChain: n
-}) => (e && n(e.target), (r, a) => q(void 0, null, function* () {
+}) => (e && n(e.target), (r, a) => z(void 0, null, function* () {
   return !0;
 }));
 function useCompatOldVariables(e) {
@@ -14252,7 +14252,7 @@ const getActionContext = (e) => {
   var o;
   return ((o = e.fieldSchema) == null ? void 0 : o["x-action-context"]) || {};
 }, SchemaSettingsDefaultValue = function(t) {
-  var k, M, E;
+  var k, M, q;
   const o = useFieldSchema(), n = (k = t == null ? void 0 : t.fieldSchema) != null ? k : o, r = useField(), { dn: a } = useDesignable(), { t: i } = 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, T = useMemo(
@@ -14260,21 +14260,21 @@ const getActionContext = (e) => {
     [n, p, d]
   ), R = _.omit(n, "required");
   T != null && T.target && (u = p(
-    `${T.target}.${((E = (M = n["x-component-props"]) == null ? void 0 : M.fieldNames) == null ? void 0 : E.label) || "id"}`
+    `${T.target}.${((q = (M = n["x-component-props"]) == null ? void 0 : M.fieldNames) == null ? void 0 : q.label) || "id"}`
   ));
   const D = (T == null ? void 0 : T.interface) === "m2o" && findParentFieldSchema(n), B = D && p(D == null ? void 0 : D["x-collection-field"]), N = useTableBlockContext(), $ = (T == null ? void 0 : T.interface) === "m2m" || (T == null ? void 0 : T.interface) === "mbm" || (B == null ? void 0 : B.type) === "hasMany" && (T == null ? void 0 : T.interface) === "m2o", L = useCallback(
-    (V) => {
-      const z = V.find((U) => U.value === "$nForm"), G = m(I);
-      return !(G != null && G.length) && z && (z.children = formatVariableScop(y())), V;
+    (E) => {
+      const V = E.find((U) => U.value === "$nForm"), G = m(I);
+      return !(G != null && G.length) && V && (V.children = formatVariableScop(y())), E;
     },
     [y, I]
   ), w = useMemo(() => ({
     ArrayCollapse: ArrayCollapse$2,
     FormLayout,
-    VariableInput: (V) => /* @__PURE__ */ jsx(
+    VariableInput: (E) => /* @__PURE__ */ jsx(
       VariableInput,
-      P(x({}, V), {
-        value: V.value || void 0,
+      P(x({}, E), {
+        value: E.value || void 0,
         hideVariableButton: t == null ? void 0 : t.hideVariableButton
       })
     )
@@ -14300,7 +14300,7 @@ const getActionContext = (e) => {
             localVariables: f,
             getAllCollectionsInheritChain: h
           }),
-          renderSchemaComponent: function(z) {
+          renderSchemaComponent: function(V) {
             const G = useMemo(() => _.cloneDeep(R) || {}, []);
             G["x-read-pretty"] = !1, G["x-disabled"] = !1, _.set(G, "x-decorator-props.showTitle", !1);
             const U = getFieldDefaultValue(G, T);
@@ -14322,7 +14322,7 @@ const getActionContext = (e) => {
               }),
               [G, U]
             );
-            return _.set(H, "x-component-props.onChange", z.onChange), /* @__PURE__ */ jsx(FormProvider, { children: /* @__PURE__ */ jsx(SchemaComponent, { schema: H }) });
+            return _.set(H, "x-component-props.onChange", V.onChange), /* @__PURE__ */ jsx(FormProvider, { children: /* @__PURE__ */ jsx(SchemaComponent, { schema: H }) });
           }
         }),
         title: i("Default value"),
@@ -14344,13 +14344,13 @@ const getActionContext = (e) => {
     u,
     g
   ]), j = useCallback(
-    (V) => {
+    (E) => {
       var G, U, H;
-      const z = {
+      const V = {
         "x-uid": n["x-uid"]
       };
-      n.default = (G = V.default) != null ? G : null, isVariable$1(V.default) || (U = r.setInitialValue) == null || U.call(r, V.default), z.default = (H = V.default) != null ? H : null, a.emit("patch", {
-        schema: z,
+      n.default = (G = E.default) != null ? G : null, isVariable$1(E.default) || (U = r.setInitialValue) == null || U.call(r, E.default), V.default = (H = E.default) != null ? H : null, a.emit("patch", {
+        schema: V,
         currentSchema: o
       });
     },
@@ -14364,14 +14364,14 @@ const getActionContext = (e) => {
       width: 800,
       schema: O,
       onSubmit: j,
-      ModalContextProvider: (V) => /* @__PURE__ */ jsx(
+      ModalContextProvider: (E) => /* @__PURE__ */ jsx(
         FlagProvider,
         {
           isInSubForm: v,
           isInSubTable: F,
           isInSetDefaultValueDialog: !0,
           collectionField: T,
-          children: V.children
+          children: E.children
         }
       )
     }
@@ -14755,7 +14755,7 @@ const SaveConditions = () => {
         /* @__PURE__ */ jsx(
           Button,
           {
-            onClick: () => q(void 0, null, function* () {
+            onClick: () => z(void 0, null, function* () {
               yield e.reset(), r == null || r(e.values), o.title = l(n.title) || c("Filter"), a(!1);
             }),
             children: c("Reset")
@@ -14866,7 +14866,7 @@ const DynamicComponent$2 = (e) => {
         d(R);
       },
       [d]
-    ), F = useMemo(() => ({ color: "#bfbfbf" }), []), I = (R) => q(void 0, null, function* () {
+    ), F = useMemo(() => ({ color: "#bfbfbf" }), []), I = (R) => z(void 0, null, function* () {
       if (R) {
         const D = o(g).filter((B) => B[S.label].toLowerCase().includes(R.toLowerCase()));
         C(D);
@@ -15230,7 +15230,7 @@ const useGetFilterOptions = () => {
     };
   });
 }, TableColumnDesigner$1 = (e) => {
-  var N, $, L, w, O, j, k, M, E, V, z, G;
+  var N, $, L, w, O, j, k, M, q, E, V, G;
   const { uiSchema: t, fieldSchema: o, collectionField: n } = e, { form: r } = useFormBlockContext(), { getInterface: a, getCollection: i } = useCollectionManager_deprecated(), l = useField(), { t: c } = useTranslation(), u = useFieldSchema(), { dn: d } = useDesignable(), p = ((N = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : N.fieldNames) || (($ = t == null ? void 0 : t["x-component-props"]) == null ? void 0 : $.fieldNames), m = useLabelFields$1((L = n == null ? void 0 : n.target) != null ? L : n == null ? void 0 : n.targetCollection), h = useColorFields((w = n == null ? void 0 : n.target) != null ? w : n == null ? void 0 : n.targetCollection), g = a(n == null ? void 0 : n.interface), f = i(n == null ? void 0 : n.target), C = isFileCollection$2(f), b = ["QuickEdit", "FormItem"].includes(o["x-decorator"]), { currentMode: S } = useAssociationFieldContext(), { isAllowToSetDefaultValue: y } = useIsAllowToSetDefaultValue({ collectionField: n, fieldSchema: o }), v = ["datetime", "createdAt", "updatedAt"].includes(n == null ? void 0 : n.interface), F = ["obo", "oho", "o2o", "o2m", "m2m", "m2o", "snapshot"].includes(
     n == null ? void 0 : n.interface
   ), I = useFieldModeOptions({ fieldSchema: o }), T = ((O = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : O.mode) || "Select";
@@ -15273,7 +15273,7 @@ const useGetFilterOptions = () => {
       SchemaSettingsDataScope,
       {
         collectionName: n == null ? void 0 : n.target,
-        defaultFilter: ((E = (M = (k = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : k.service) == null ? void 0 : M.params) == null ? void 0 : E.filter) || {},
+        defaultFilter: ((q = (M = (k = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : k.service) == null ? void 0 : M.params) == null ? void 0 : q.filter) || {},
         form: r,
         onSubmit: ({ filter: U }) => {
           var Y, J;
@@ -15299,7 +15299,7 @@ const useGetFilterOptions = () => {
           title: c("Column width"),
           properties: {
             width: {
-              default: ((V = u == null ? void 0 : u["x-component-props"]) == null ? void 0 : V.width) || 100,
+              default: ((E = u == null ? void 0 : u["x-component-props"]) == null ? void 0 : E.width) || 100,
               "x-decorator": "FormItem",
               "x-component": "InputNumber",
               "x-component-props": {}
@@ -15342,7 +15342,7 @@ const useGetFilterOptions = () => {
       SchemaSettingsSwitchItem,
       {
         title: c("Enable link"),
-        checked: ((z = o["x-component-props"]) == null ? void 0 : z.enableLink) !== !1,
+        checked: ((V = o["x-component-props"]) == null ? void 0 : V.enableLink) !== !1,
         onChange: (U) => {
           o["x-component-props"] = P(x({}, o == null ? void 0 : o["x-component-props"]), {
             enableLink: U
@@ -17894,7 +17894,7 @@ const useStyles$g = genStyleHook("nb-schema-toolbar", (e) => {
   ), { render: O, exists: j } = useSchemaInitializerRender(
     n || (t == null ? void 0 : t["x-initializer"]),
     t == null ? void 0 : t["x-initializer-props"]
-  ), k = useGridRowContext(), M = useGridContext(), E = useMemo(() => {
+  ), k = useGridRowContext(), M = useGridContext(), q = useMemo(() => {
     var K;
     return {
       insertPosition: "afterEnd",
@@ -17908,15 +17908,15 @@ const useStyles$g = genStyleHook("nb-schema-toolbar", (e) => {
         })
       )
     };
-  }, [v, (J = k == null ? void 0 : k.cols) == null ? void 0 : J.length]), V = useMemo(() => u === !1 || C === !1 ? null : /* @__PURE__ */ jsx(DragHandler, { children: /* @__PURE__ */ jsx(DragOutlined, { role: "button", "aria-label": v("drag-handler") }) }), [u, v, C]), z = useMemo(() => {
+  }, [v, (J = k == null ? void 0 : k.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]), V = useMemo(() => {
     var K;
     if (n === !1)
       return null;
     if (j)
-      return O(E);
+      return O(q);
     if (M != null && M.InitializerComponent || M != null && M.renderSchemaInitializer)
-      return M != null && M.InitializerComponent ? /* @__PURE__ */ jsx(M.InitializerComponent, x({}, E)) : (K = M.renderSchemaInitializer) == null ? void 0 : K.call(M, E);
-  }, [M, n, E, j, O]), G = useMemo(() => r !== !1 && w ? L() : null, [w, L, r]), U = useRef(null), H = "hidden";
+      return M != null && M.InitializerComponent ? /* @__PURE__ */ jsx(M.InitializerComponent, x({}, q)) : (K = M.renderSchemaInitializer) == null ? void 0 : K.call(M, q);
+  }, [M, n, q, j, O]), G = useMemo(() => r !== !1 && w ? L() : null, [w, L, r]), U = useRef(null), H = "hidden";
   useEffect(() => {
     const K = U.current;
     let X = K == null ? void 0 : K.parentElement;
@@ -17956,8 +17956,8 @@ const useStyles$g = genStyleHook("nb-schema-toolbar", (e) => {
           $[1] && /* @__PURE__ */ jsx("span", { className: "toolbar-title-tag", children: `${B.current}: ${`${$[1]}` || y("Untitled")}` })
         ] }) }),
         /* @__PURE__ */ jsx("div", { className: cls("toolbar-icons", i), style: l, children: /* @__PURE__ */ jsxs(Space$1, { size: 3, align: "center", className: d, style: p, children: [
-          V,
-          /* @__PURE__ */ jsx(RefreshComponentProvider, { refresh: N, children: z }),
+          E,
+          /* @__PURE__ */ jsx(RefreshComponentProvider, { refresh: N, children: V }),
           G
         ] }) })
       ]
@@ -18648,7 +18648,7 @@ const useTableBlockProps = () => {
       a && (a.field.data = ((v = a.field) == null ? void 0 : v.data) || {}, a.field.data.selectedRowKeys = S, a.field.data.selectedRowData = y, (I = (F = a.field) == null ? void 0 : F.onRowSelect) == null || I.call(F, S));
     }, []),
     onRowDragEnd: useCallback(
-      (v) => q(void 0, [v], function* ({ from: S, to: y }) {
+      (v) => z(void 0, [v], function* ({ from: S, to: y }) {
         yield i.current.resource.move({
           sourceId: S[a.rowKey || "id"],
           targetId: y[a.rowKey || "id"],
@@ -18663,9 +18663,9 @@ const useTableBlockProps = () => {
     ),
     onChange: useCallback(
       ({ current: S, pageSize: y }, v, F) => {
-        var B, N, $, L, w, O, j, k, M, E;
+        var B, N, $, L, w, O, j, k, M, q;
         const I = ($ = (N = (B = t.parent) == null ? void 0 : B["x-decorator-props"]) == null ? void 0 : N.params) == null ? void 0 : $.sort, T = F.order ? F.order === "ascend" ? [F.field] : [`-${F.field}`] : I || a.dragSortBy, R = y || ((O = (w = (L = t.parent) == null ? void 0 : L["x-decorator-props"]) == null ? void 0 : w.params) == null ? void 0 : O.pageSize), D = P(x({}, (M = (k = (j = i.current) == null ? void 0 : j.service) == null ? void 0 : k.params) == null ? void 0 : M[0]), { page: S || 1, pageSize: R });
-        T && (D.sort = T), (E = i.current) == null || E.service.run(D);
+        T && (D.sort = T), (q = i.current) == null || q.service.run(D);
       },
       [t.parent]
     ),
@@ -18678,13 +18678,13 @@ const useTableBlockProps = () => {
         }
         const R = T.find((D) => D.uid === t.parent["x-uid"]);
         T.forEach((D) => {
-          var j, k, M, E;
-          const B = F.find((V) => V.uid === D.uid);
+          var j, k, M, q;
+          const B = F.find((E) => E.uid === D.uid);
           if (!B)
             return;
           const N = getSourceKey(R, B.field) || a.rowKey || "id", $ = [S[N]], L = ((j = D.service.params) == null ? void 0 : j[0]) || {}, w = ((M = (k = D.service.params) == null ? void 0 : k[1]) == null ? void 0 : M.filters) || {};
           if (v.includes(S[a.rowKey])) {
-            if ((E = D.clearSelection) == null || E.call(D), D.dataLoadingMode === "manual")
+            if ((q = D.clearSelection) == null || q.call(D), D.dataLoadingMode === "manual")
               return D.clearData();
             delete w[I];
           } else
@@ -18698,7 +18698,7 @@ const useTableBlockProps = () => {
               ]
             };
           const O = mergeFilter([
-            ...Object.values(w).map((V) => removeNullCondition(V)),
+            ...Object.values(w).map((E) => removeNullCondition(E)),
             D.defaultFilter
           ]);
           return D.doFilter(
@@ -18856,7 +18856,7 @@ class TableFieldResource {
     this.field = t.field, this.api = t.api, this.sourceId = t.sourceId, this.resource = this.api.resource(t.resource, this.sourceId);
   }
   list(t) {
-    return q(this, null, function* () {
+    return z(this, null, function* () {
       if (this.field.data = this.field.data || {}, this.field.data.changed)
         return console.log("list.dataSource", this.field.data.dataSource), {
           data: {
@@ -18878,7 +18878,7 @@ class TableFieldResource {
     });
   }
   get(t) {
-    return q(this, null, function* () {
+    return z(this, null, function* () {
       console.log("get", t);
       const { filterByTk: o } = t;
       return {
@@ -18889,21 +18889,21 @@ class TableFieldResource {
     });
   }
   create(t) {
-    return q(this, null, function* () {
+    return z(this, null, function* () {
       console.log("create", t);
       const { values: o } = t;
       this.field.data.dataSource.push(o), this.field.data.changed = !0;
     });
   }
   update(t) {
-    return q(this, null, function* () {
+    return z(this, null, function* () {
       console.log("update", t);
       const { filterByTk: o, values: n } = t;
       this.field.data.dataSource[o] = n, this.field.data.changed = !0;
     });
   }
   destroy(t) {
-    return q(this, null, function* () {
+    return z(this, null, function* () {
       console.log("destroy", t);
       let { filterByTk: o } = t;
       Array.isArray(o) || (o = [o]), this.field.data.dataSource = this.field.data.dataSource.filter((n, r) => !o.includes(r)), this.field.data.changed = !0;
@@ -19058,10 +19058,10 @@ const useTableSelectorParams = () => useContext(TableSelectorParamsContext), Tab
   var i, l, c, u, d, p, m, h, g, f, C, b, S, y, v, F;
   const e = useField(), t = useTableSelectorContext(), o = useFieldSchema(), { getCollectionJoinField: n } = useCollectionManager_deprecated(), r = recursiveParent(o, "CollectionField"), a = n(r == null ? void 0 : r["x-collection-field"]);
   return useEffect(() => {
-    var T, R, D, B, N, $, L, w, O, j, k, M, E;
+    var T, R, D, B, N, $, L, w, O, j, k, M, q;
     if (!((T = t == null ? void 0 : t.service) != null && T.loading)) {
-      const V = (D = (R = t == null ? void 0 : t.service) == null ? void 0 : R.data) == null ? void 0 : D.data.map((z) => z);
-      e.value = V, (B = e == null ? void 0 : e.setInitialValue) == null || B.call(e, V), e.data = e.data || {}, e.data.selectedRowKeys = [], e.componentProps.pagination = e.componentProps.pagination || {}, e.componentProps.pagination.pageSize = (L = ($ = (N = t == null ? void 0 : t.service) == null ? void 0 : N.data) == null ? void 0 : $.meta) == null ? void 0 : L.pageSize, e.componentProps.pagination.total = (j = (O = (w = t == null ? void 0 : t.service) == null ? void 0 : w.data) == null ? void 0 : O.meta) == null ? void 0 : j.count, e.componentProps.pagination.current = (E = (M = (k = t == null ? void 0 : t.service) == null ? void 0 : k.data) == null ? void 0 : M.meta) == null ? void 0 : E.page;
+      const E = (D = (R = t == null ? void 0 : t.service) == null ? void 0 : R.data) == null ? void 0 : D.data.map((V) => V);
+      e.value = E, (B = e == null ? void 0 : e.setInitialValue) == null || B.call(e, E), e.data = e.data || {}, e.data.selectedRowKeys = [], e.componentProps.pagination = e.componentProps.pagination || {}, e.componentProps.pagination.pageSize = (L = ($ = (N = t == null ? void 0 : t.service) == null ? void 0 : N.data) == null ? void 0 : $.meta) == null ? void 0 : L.pageSize, e.componentProps.pagination.total = (j = (O = (w = t == null ? void 0 : t.service) == null ? void 0 : w.data) == null ? void 0 : O.meta) == null ? void 0 : j.count, e.componentProps.pagination.current = (q = (M = (k = t == null ? void 0 : t.service) == null ? void 0 : k.data) == null ? void 0 : M.meta) == null ? void 0 : q.page;
     }
   }, [
     a == null ? void 0 : a.foreignKey,
@@ -19083,7 +19083,7 @@ const useTableSelectorParams = () => useContext(TableSelectorParamsContext), Tab
       t.field.data = ((D = t == null ? void 0 : t.field) == null ? void 0 : D.data) || {}, t.field.data.selectedRowKeys = T, t.field.data.selectedRowData = R;
     },
     onRowDragEnd(D) {
-      return q(this, arguments, function* ({ from: T, to: R }) {
+      return z(this, arguments, function* ({ from: T, to: R }) {
         yield t.resource.move({
           sourceId: T[t.rowKey || "id"],
           targetId: R[t.rowKey || "id"]
@@ -19145,7 +19145,7 @@ const useTableSelectorParams = () => useContext(TableSelectorParamsContext), Tab
 );
 class BlockSchemaComponentPlugin extends Plugin {
   load() {
-    return q(this, null, function* () {
+    return z(this, null, function* () {
       this.addComponents(), this.addScopes();
     });
   }
@@ -19250,7 +19250,7 @@ const regenerateUid = (e) => {
     templates: o,
     refresh: t,
     getTemplateSchemaByMode: useCallback(
-      (r) => q(void 0, null, function* () {
+      (r) => z(void 0, null, function* () {
         const { mode: a, template: i } = r;
         if (a === "copy") {
           const { data: l } = yield n.request({
@@ -19269,7 +19269,7 @@ const regenerateUid = (e) => {
       [n]
     ),
     copyTemplateSchema: useCallback(
-      (r) => q(void 0, null, function* () {
+      (r) => z(void 0, null, function* () {
         const { data: a } = yield n.request({
           url: `/uiSchemas:getJsonSchema/${r.uid}?includeAsyncNode=true`
         }), i = (a == null ? void 0 : a.data) || {};
@@ -19278,7 +19278,7 @@ const regenerateUid = (e) => {
       [n]
     ),
     saveAsTemplate: useCallback(
-      (r) => q(void 0, null, function* () {
+      (r) => z(void 0, null, function* () {
         const { uid: a } = r, i = uid();
         return yield n.resource("uiSchemas").saveAsTemplate({
           filterByTk: a,
@@ -19339,7 +19339,7 @@ const regenerateUid = (e) => {
   refreshDeps: []
 }, RemoteSchemaTemplateManagerProvider = (e) => {
   var a;
-  const t = useAPIClient(), o = useRequest(options$1), n = useCallback(() => q(void 0, null, function* () {
+  const t = useAPIClient(), o = useRequest(options$1), n = useCallback(() => z(void 0, null, function* () {
     const { data: i } = yield t.request(options$1);
     o.mutate(i);
   }), [t, o]), r = useMemo(() => {
@@ -19350,7 +19350,7 @@ const regenerateUid = (e) => {
 };
 class RemoteSchemaTemplateManagerPlugin extends Plugin {
   load() {
-    return q(this, null, function* () {
+    return z(this, null, function* () {
       this.addRoutes(), this.addComponents();
     });
   }
@@ -19386,7 +19386,7 @@ const CollectionTitle = (e) => {
   const e = useUpdateActionProps(), { __parent: t } = useBlockRequestContext();
   return {
     onClick() {
-      return q(this, null, function* () {
+      return z(this, null, function* () {
         var n, r;
         yield e.onClick(), (r = (n = t == null ? void 0 : t.service) == null ? void 0 : n.refresh) == null || r.call(n);
       });
@@ -19396,7 +19396,7 @@ const CollectionTitle = (e) => {
   const e = useBulkDestroyActionProps(), t = useSchemaTemplateManager(), { service: o } = useBlockRequestContext();
   return {
     onClick() {
-      return q(this, null, function* () {
+      return z(this, null, function* () {
         var r;
         yield e.onClick(), yield t.refresh(), (r = o == null ? void 0 : o.refresh) == null || r.call(o);
       });
@@ -19406,7 +19406,7 @@ const CollectionTitle = (e) => {
   const e = useDestroyActionProps(), { service: t } = useBlockRequestContext(), o = useSchemaTemplateManager();
   return {
     onClick() {
-      return q(this, null, function* () {
+      return z(this, null, function* () {
         var r;
         yield e.onClick(), yield o.refresh(), (r = t == null ? void 0 : t.refresh) == null || r.call(t);
       });
@@ -20154,7 +20154,7 @@ const EnableChildCollections = withDynamicSchemaProps(
           d.dataSource = m, d.loading = !1, d.initialValue && (d.disabled = !0);
         })
       );
-    }, c = (u) => q(void 0, null, function* () {
+    }, c = (u) => z(void 0, null, function* () {
       var p, m;
       const { childrenCollections: d } = ((p = n.values) == null ? void 0 : p.enableChildren) || {};
       return (m = i.filter((h) => !d.find((g) => g.collection === h.name) || u.initialValue || h.name === u.value)) == null ? void 0 : m.map((h) => ({
@@ -21479,7 +21479,7 @@ const findGridSchema = (e) => e.reduceProperties((t, o) => {
     SchemaSettingsItem,
     {
       title: "Convert reference to duplicate",
-      onClick: () => q(this, null, function* () {
+      onClick: () => z(this, null, function* () {
         const b = yield f(p), S = findBlockTemplateSchema(m), y = createDesignable({
           t: i,
           api: h,
@@ -21487,7 +21487,7 @@ const findGridSchema = (e) => e.reduceProperties((t, o) => {
         });
         y.loadAPIClientEvents(), y.removeWithoutEmit(S), y.insertAdjacent(o, b, {
           onSuccess() {
-            return q(this, null, function* () {
+            return z(this, null, function* () {
               yield h.request({
                 url: `/uiSchemas:remove/${S["x-uid"]}`
               });
@@ -21508,7 +21508,7 @@ const findGridSchema = (e) => e.reduceProperties((t, o) => {
     SchemaSettingsItem,
     {
       title: i("Save as reference template"),
-      onClick: () => q(this, null, function* () {
+      onClick: () => z(this, null, function* () {
         d(!1);
         const b = r && (c == null ? void 0 : c.getCollection(r)), S = findGridSchema(m), y = yield FormDialog(
           i("Save as reference template"),
@@ -21622,7 +21622,7 @@ const findGridSchema = (e) => e.reduceProperties((t, o) => {
           content: c("Are you sure you want to delete it?")
         }, o), {
           onOk() {
-            return q(this, null, function* () {
+            return z(this, null, function* () {
               var y;
               const S = {
                 removeParentsIfNoChildren: r,
@@ -21735,7 +21735,7 @@ const SchemaSettingsSwitchItem = (e) => {
   }, [JSON.stringify(r || {})]);
   const B = useCallback(() => {
     h(!1), D.reset();
-  }, [D]), N = useCallback(() => q(void 0, null, function* () {
+  }, [D]), N = useCallback(() => z(void 0, null, function* () {
     yield D.submit();
     try {
       const O = D.values, j = Object.keys(O).reduce((k, M) => (D.query(M).take() && (k[M] = O[M]), k), {});
@@ -21743,7 +21743,7 @@ const SchemaSettingsSwitchItem = (e) => {
     } catch (O) {
       console.error(O);
     }
-  }), [D, o]), $ = useCallback(() => q(void 0, null, function* () {
+  }), [D, o]), $ = useCallback(() => z(void 0, null, function* () {
     !g && (i != null && i["x-uid"]) && (b["x-action-settings"].schemaUid = i["x-uid"], y.emit("patch", { schema: b }), yield F.resource("uiSchemas").insert({ values: i }), f(i["x-uid"])), typeof a == "function" && (a == null || a()), S.setVisible(!1), h(!0);
   }), [F, S, y, b, i, g]), L = useCallback((O) => O.stopPropagation(), []);
   return /* @__PURE__ */ jsxs(zIndexContext.Provider, { value: R, children: [
@@ -21812,26 +21812,26 @@ const SchemaSettingsModalItem = (e) => {
     "noRecord",
     "ModalContextProvider",
     "dialogRootClassName"
-  ]), g = useContext(SchemaOptionsContext), f = useCollection(), C = useAPIClient(), b = useApp(), { theme: S } = useGlobalTheme(), y = useBlockRequestContext(), v = useFormActiveFields(), { locale: F } = useContext(ConfigProvider.ConfigContext), I = useDataSourceManager(), T = useDataSourceKey(), R = useCollectionRecord(), { association: D } = useDataBlockProps() || {}, B = useCurrentRecord(), N = useFormBlockContext(), $ = useBlockContext(), { getOperators: L } = useOperators(), w = useLocationSearch(), O = useVariables$1(), j = useContext(AllDataBlocksContext), { formValue: k, collection: M, parent: E } = useSubFormValue(), V = useCurrentPopupRecord(), z = useParentPopupRecord();
+  ]), g = useContext(SchemaOptionsContext), f = useCollection(), C = useAPIClient(), b = useApp(), { theme: S } = useGlobalTheme(), y = useBlockRequestContext(), v = useFormActiveFields(), { locale: F } = useContext(ConfigProvider.ConfigContext), I = useDataSourceManager(), T = useDataSourceKey(), R = useCollectionRecord(), { association: D } = useDataBlockProps() || {}, B = useCurrentRecord(), N = useFormBlockContext(), $ = useBlockContext(), { getOperators: L } = useOperators(), w = useLocationSearch(), O = useVariables$1(), j = useContext(AllDataBlocksContext), { formValue: k, collection: M, parent: q } = useSubFormValue(), E = useCurrentPopupRecord(), V = useParentPopupRecord();
   return t ? null : /* @__PURE__ */ jsx(
     SchemaSettingsItem,
     P(x({
       title: o
     }, h), {
-      onClick: () => q(void 0, null, function* () {
+      onClick: () => z(void 0, null, function* () {
         const U = l ? yield l() : c, H = _.isFunction(e.schema) ? e.schema() : e.schema;
         FormDialog(
           { title: H.title || o, width: u, rootClassName: m },
           () => /* @__PURE__ */ jsx(AllDataBlocksContext.Provider, { value: j, children: /* @__PURE__ */ jsx(p, { children: /* @__PURE__ */ jsx(CollectOperators, { defaultOperators: L(), children: /* @__PURE__ */ jsx(VariablesContext.Provider, { value: O, children: /* @__PURE__ */ jsx(BlockContext.Provider, { value: $, children: /* @__PURE__ */ jsx(
             VariablePopupRecordProvider,
             {
-              recordData: V == null ? void 0 : V.value,
-              collection: V == null ? void 0 : V.collection,
+              recordData: E == null ? void 0 : E.value,
+              collection: E == null ? void 0 : E.collection,
               parent: {
-                recordData: z == null ? void 0 : z.value,
-                collection: z == null ? void 0 : z.collection
+                recordData: V == null ? void 0 : V.value,
+                collection: V == null ? void 0 : V.collection
               },
-              children: /* @__PURE__ */ jsx(CollectionRecordProvider, { record: d ? null : R, children: /* @__PURE__ */ jsx(CurrentRecordContextProvider, P(x({}, B), { children: /* @__PURE__ */ jsx(FormBlockContext$1.Provider, { value: N, children: /* @__PURE__ */ jsx(SubFormProvider, { value: { value: k, collection: M, parent: E }, children: /* @__PURE__ */ jsx(
+              children: /* @__PURE__ */ jsx(CollectionRecordProvider, { record: d ? null : R, children: /* @__PURE__ */ jsx(CurrentRecordContextProvider, P(x({}, B), { children: /* @__PURE__ */ jsx(FormBlockContext$1.Provider, { value: N, children: /* @__PURE__ */ jsx(SubFormProvider, { value: { value: k, collection: M, parent: q }, children: /* @__PURE__ */ jsx(
                 FormActiveFieldsProvider,
                 {
                   name: "form",
@@ -21905,7 +21905,7 @@ const SchemaSettingsModalItem = (e) => {
   } : {
     field: h,
     direction: "asc"
-  }), p = useSortFields(t.name || (c == null ? void 0 : c.name)), m = (g) => q(this, [g], function* ({ sort: h }) {
+  }), p = useSortFields(t.name || (c == null ? void 0 : c.name)), m = (g) => z(this, [g], function* ({ sort: h }) {
     var C;
     if (t != null && t.onSubmit)
       return t.onSubmit({ sort: h });
@@ -22028,15 +22028,15 @@ const SchemaSettingsModalItem = (e) => {
     [o, c, u, y, g, f, p, h, R, r]
   ), $ = useMemo(() => ({ ArrayCollapse: ArrayCollapse$2, FormLayout }), []), L = useCallback(
     (O) => {
-      var V;
+      var E;
       const j = [];
-      for (const z of O.fieldReaction.rules)
-        j.push(_.omit(_.pickBy(z, _.identity), ["conditionBasic", "conditionAdvanced"]));
-      const k = y["x-component"] === "BlockTemplate" && ((V = y["x-component-props"]) == null ? void 0 : V.templateId), E = {
+      for (const V of O.fieldReaction.rules)
+        j.push(_.omit(_.pickBy(V, _.identity), ["conditionBasic", "conditionAdvanced"]));
+      const k = y["x-component"] === "BlockTemplate" && ((E = y["x-component-props"]) == null ? void 0 : E.templateId), q = {
         "x-uid": b !== LinkageRuleCategory.block ? k && m(k).uid || y["x-uid"] : c["x-uid"]
       };
-      y[T] = j, E[T] = j, c[T] = j, d.emit("patch", {
-        schema: E
+      y[T] = j, q[T] = j, c[T] = j, d.emit("patch", {
+        schema: q
       }), d.refresh(), a == null || a();
     },
     [d, m, y, T, a, b]
@@ -22930,9 +22930,9 @@ function Input$1(e) {
     label: v("Constant"),
     [j.value]: "$",
     [j.label]: v("Constant")
-  } : a ? getTypedConstantOption(w, a, j) : null : null, [w, a]), M = (Y = k == null ? void 0 : k.component) != null ? Y : NullComponent, E = Array.isArray(a) ? (K = (J = a.find((X) => Array.isArray(X) && X[0] === w)) == null ? void 0 : J[1]) != null ? K : {} : {};
-  let V;
-  t == null ? i ? n && B ? V = ["$"] : V = [""] : n ? V = ["$"] : V = [" ", w] : V = n ? ["$"] : [" ", w], m && (V = ["$"]), useEffect(() => {
+  } : a ? getTypedConstantOption(w, a, j) : null : null, [w, a]), M = (Y = k == null ? void 0 : k.component) != null ? Y : NullComponent, q = Array.isArray(a) ? (K = (J = a.find((X) => Array.isArray(X) && X[0] === w)) == null ? void 0 : J[1]) != null ? K : {} : {};
+  let E;
+  t == null ? i ? n && B ? E = ["$"] : E = [""] : n ? E = ["$"] : E = [" ", w] : E = n ? ["$"] : [" ", w], m && (E = ["$"]), useEffect(() => {
     const oe = k != null ? k : {}, { component: X } = oe, Q = W(oe, ["component"]), ee = [
       ...i ? [
         {
@@ -22947,7 +22947,7 @@ function Input$1(e) {
     ].filter((te) => !te.deprecated || (O == null ? void 0 : O[0]) === te[j.value]);
     T(ee);
   }, [g, O, k, i]);
-  const z = (X) => q(this, null, function* () {
+  const V = (X) => z(this, null, function* () {
     var ee;
     const Q = X[X.length - 1];
     if (!((ee = Q.children) != null && ee.length) && !Q.isLeaf && Q.loadChildren) {
@@ -22989,7 +22989,7 @@ function Input$1(e) {
     o(null);
   }, [k]);
   useEffect(() => {
-    q(this, null, function* () {
+    z(this, null, function* () {
       var oe;
       if (!O || I.length <= 1)
         return;
@@ -23074,7 +23074,7 @@ function Input$1(e) {
           P(x({
             role: "button",
             "aria-label": "variable-constant"
-          }, E), {
+          }, q), {
             value: t,
             onChange: o
           })
@@ -23083,9 +23083,9 @@ function Input$1(e) {
           Cascader$1,
           {
             options: I,
-            value: O != null ? O : V,
+            value: O != null ? O : E,
             onChange: G,
-            loadData: z,
+            loadData: V,
             changeOnSelect: u != null ? u : !0,
             fieldNames: d,
             disabled: H,
@@ -23144,7 +23144,7 @@ function VariableSelect({
 }) {
   const { t: l } = useTranslation(), [c, u] = useState([]), { wrapSSR: d, componentCls: p, hashId: m } = useStyles$c(), { token: h } = useToken$1();
   function g(f) {
-    return q(this, null, function* () {
+    return z(this, null, function* () {
       var b;
       const C = f[f.length - 1];
       !((b = C.children) != null && b.length) && !C.isLeaf && C.loadChildren && (yield C.loadChildren(C), t((S) => [...S]));
@@ -23367,23 +23367,23 @@ function TextArea(e) {
   ), [S, y] = useState(!1), [v, F] = useState(!1), [I, T] = useState(() => renderHTML(p != null ? p : "", b, c)), [R, D] = useState([-1, 0, -1, 0]);
   useAntdInputStyle("ant-input");
   const { token: B } = theme.useToken(), N = c.join(" "), $ = useCallback(
-    (z) => {
+    (V) => {
       var U;
-      const G = getValue(z, c);
+      const G = getValue(V, c);
       (U = e.onChange) == null || U.call(e, d ? G.trim() : G);
     },
     [N, e.onChange, d]
   );
   useEffect(() => {
-    preloadOptions(r, m).then((z) => {
-      f(z);
+    preloadOptions(r, m).then((V) => {
+      f(V);
     }).catch(console.error);
   }, [r, JSON.stringify(m)]), useEffect(() => {
     T(renderHTML(p != null ? p : "", b, c)), v || D([-1, 0, -1, 0]);
   }, [p, b, N]), useEffect(() => {
     var U;
-    const { current: z } = h;
-    if (!z)
+    const { current: V } = h;
+    if (!V)
       return;
     const G = new Range();
     if (v) {
@@ -23392,22 +23392,22 @@ function TextArea(e) {
       const H = (U = window.getSelection) == null ? void 0 : U.call(window);
       if (H)
         try {
-          const Y = Array.from(z.childNodes);
+          const Y = Array.from(V.childNodes);
           Y.length && (R[0] === -1 ? R[1] && G.setStartAfter(Y[R[1] - 1]) : G.setStart(Y[R[0]], R[1]), R[2] === -1 ? R[3] && G.setEndAfter(Y[R[3] - 1]) : G.setEnd(Y[R[2]], R[3])), G.collapse(!0), H.removeAllRanges(), H.addRange(G);
         } catch (Y) {
         }
     } else {
-      const { lastChild: H } = z;
+      const { lastChild: H } = V;
       if (H) {
         G.setStartAfter(H), G.setEndAfter(H);
-        const Y = Array.from(z.childNodes), J = G.startContainer === z ? -1 : Y.indexOf(H), K = G.startContainer === z ? -1 : Y.indexOf(H);
+        const Y = Array.from(V.childNodes), J = G.startContainer === V ? -1 : Y.indexOf(H), K = G.startContainer === V ? -1 : Y.indexOf(H);
         D([J, G.startOffset, K, G.endOffset]);
       }
     }
   }, [I]);
   const L = useCallback(
-    function(z) {
-      const G = z.filter((Y) => !!Y.trim()), { current: U } = h;
+    function(V) {
+      const G = V.filter((Y) => !!Y.trim()), { current: U } = h;
       if (!U || !G)
         return;
       U.focus();
@@ -23418,25 +23418,25 @@ function TextArea(e) {
     },
     [b, $, R]
   ), w = useCallback(
-    function({ currentTarget: z }) {
-      S || (F(!0), D(getCurrentRange(z)), $(z));
+    function({ currentTarget: V }) {
+      S || (F(!0), D(getCurrentRange(V)), $(V));
     },
     [S, $]
-  ), O = useCallback(function({ currentTarget: z }) {
-    D(getCurrentRange(z));
-  }, []), j = useCallback(function(z) {
-    z.key === "Enter" && z.preventDefault();
+  ), O = useCallback(function({ currentTarget: V }) {
+    D(getCurrentRange(V));
+  }, []), j = useCallback(function(V) {
+    V.key === "Enter" && V.preventDefault();
   }, []), k = useCallback(function() {
     y(!0);
   }, []), M = useCallback(
-    ({ currentTarget: z }) => {
-      y(!1), F(!0), D(getCurrentRange(z)), $(z);
+    ({ currentTarget: V }) => {
+      y(!1), F(!0), D(getCurrentRange(V)), $(V);
     },
     [$]
-  ), E = useCallback(
-    function(z) {
-      z.preventDefault();
-      const G = z.clipboardData.getData("text/html") || z.clipboardData.getData("text"), U = sanitizeHTML(G, {
+  ), q = useCallback(
+    function(V) {
+      V.preventDefault();
+      const G = V.clipboardData.getData("text/html") || V.clipboardData.getData("text"), U = sanitizeHTML(G, {
         allowedTags: ["span"],
         allowedAttributes: {
           span: ["data-variable", "contenteditable"]
@@ -23453,10 +23453,10 @@ function TextArea(e) {
           }
         }
       }).replace(/\n/g, " ");
-      F(!0), pasteHTML(z.currentTarget, U), D(getCurrentRange(z.currentTarget)), $(z.currentTarget);
+      F(!0), pasteHTML(V.currentTarget, U), D(getCurrentRange(V.currentTarget)), $(V.currentTarget);
     },
     [$]
-  ), V = e.disabled || C.disabled;
+  ), E = e.disabled || C.disabled;
   return t(
     /* @__PURE__ */ jsxs(Fragment$1, { children: [
       /* @__PURE__ */ jsxs(
@@ -23508,7 +23508,7 @@ function TextArea(e) {
                 onInput: w,
                 onBlur: O,
                 onKeyDown: j,
-                onPaste: E,
+                onPaste: q,
                 onCompositionStart: k,
                 onCompositionEnd: M,
                 placeholder: e.placeholder,
@@ -23516,7 +23516,7 @@ function TextArea(e) {
                 className: cx(
                   o,
                   "ant-input ant-input-outlined",
-                  { "ant-input-disabled": V },
+                  { "ant-input-disabled": E },
                   // NOTE: `pre-wrap` here for avoid the `&nbsp;` (\x160) issue when paste content, we need normal space (\x32).
                   css`
               min-height: ${B.controlHeight}px;
@@ -23538,7 +23538,7 @@ function TextArea(e) {
             `
                 ),
                 ref: h,
-                contentEditable: !V,
+                contentEditable: !E,
                 dangerouslySetInnerHTML: { __html: I }
               }
             ),
@@ -23550,7 +23550,7 @@ function TextArea(e) {
                 onInsert: L,
                 changeOnSelect: a,
                 fieldNames: l || defaultFieldNames$2,
-                disabled: V
+                disabled: E
               }
             )
           ]
@@ -23561,7 +23561,7 @@ function TextArea(e) {
   );
 }
 function preloadOptions(e, t) {
-  return q(this, null, function* () {
+  return z(this, null, function* () {
     var r;
     let o = [...e != null ? e : []];
     const n = t.map((a) => a.split("."));
@@ -23764,7 +23764,7 @@ const getVariableComponentWithScope = (e, t = []) => (o) => {
   }), [e]);
   return { urlSchema: n, paramsSchema: i, openInNewWindowSchema: l, modeSchema: r, htmlSchema: a };
 }, LinkMenuItem = () => {
-  const { t: e } = useTranslation(), t = useContext(SchemaOptionsContext), { theme: o } = useGlobalTheme(), { componentCls: n, hashId: r } = useStyles$h(), { urlSchema: a, paramsSchema: i, openInNewWindowSchema: l } = useURLAndHTMLSchema(), c = useParentRoute(), { createRoute: u } = useNocoBaseRoutes(), d = useDataSourceManager(), p = useCollectionManager(), m = useCallback(() => q(void 0, null, function* () {
+  const { t: e } = useTranslation(), t = useContext(SchemaOptionsContext), { theme: o } = useGlobalTheme(), { componentCls: n, hashId: r } = useStyles$h(), { urlSchema: a, paramsSchema: i, openInNewWindowSchema: l } = useURLAndHTMLSchema(), c = useParentRoute(), { createRoute: u } = useNocoBaseRoutes(), d = useDataSourceManager(), p = useCollectionManager(), m = useCallback(() => z(void 0, null, function* () {
     const h = yield FormDialog(
       e("Add link"),
       () => {
@@ -23814,7 +23814,7 @@ const getVariableComponentWithScope = (e, t = []) => (o) => {
 }, useInsertPageSchema = () => {
   const e = useAPIClient();
   return useCallback(
-    (t) => q(void 0, null, function* () {
+    (t) => z(void 0, null, function* () {
       yield e.request({
         method: "POST",
         url: "/uiSchemas:insert",
@@ -23824,7 +23824,7 @@ const getVariableComponentWithScope = (e, t = []) => (o) => {
     [e]
   );
 }, PageMenuItem = () => {
-  const { t: e } = useTranslation(), t = useContext(SchemaOptionsContext), { theme: o } = useGlobalTheme(), { componentCls: n, hashId: r } = useStyles$h(), a = useParentRoute(), { createRoute: i } = useNocoBaseRoutes(), l = useInsertPageSchema(), c = useCallback(() => q(void 0, null, function* () {
+  const { t: e } = useTranslation(), t = useContext(SchemaOptionsContext), { theme: o } = useGlobalTheme(), { componentCls: n, hashId: r } = useStyles$h(), a = useParentRoute(), { createRoute: i } = useNocoBaseRoutes(), l = useInsertPageSchema(), c = useCallback(() => z(void 0, null, function* () {
     const u = yield FormDialog(
       e("Add page"),
       () => /* @__PURE__ */ jsx(SchemaComponentOptions, { scope: t.scope, components: x({}, t.components), children: /* @__PURE__ */ jsx(FormLayout, { layout: "vertical", children: /* @__PURE__ */ jsx(
@@ -23889,7 +23889,7 @@ function getPageMenuSchema({ pageSchemaUid: e, tabSchemaUid: t, tabSchemaName: o
   };
 }
 const GroupItem$1 = () => {
-  const { t: e } = useTranslation(), t = useContext(SchemaOptionsContext), { theme: o } = useGlobalTheme(), { componentCls: n, hashId: r } = useStyles$h(), a = useParentRoute(), { createRoute: i } = useNocoBaseRoutes(), l = useCallback(() => q(void 0, null, function* () {
+  const { t: e } = useTranslation(), t = useContext(SchemaOptionsContext), { theme: o } = useGlobalTheme(), { componentCls: n, hashId: r } = useStyles$h(), a = useParentRoute(), { createRoute: i } = useNocoBaseRoutes(), l = useCallback(() => z(void 0, null, function* () {
     const c = yield FormDialog(
       e("Add group"),
       () => /* @__PURE__ */ jsx(SchemaComponentOptions, { scope: t.scope, components: x({}, t.components), children: /* @__PURE__ */ jsx(FormLayout, { layout: "vertical", children: /* @__PURE__ */ jsx(
@@ -24017,7 +24017,7 @@ const GroupItem$1 = () => {
         t.confirm({
           title: e("Delete menu item"),
           content: e("Are you sure you want to delete it?"),
-          onOk: () => q(void 0, null, function* () {
+          onOk: () => z(void 0, null, function* () {
             if ((n == null ? void 0 : n.id) != null && (yield o(n.id)), i !== (n == null ? void 0 : n.schemaUid) && !findRouteBySchemaUid(i, n == null ? void 0 : n.children))
               return;
             const l = findPrevSibling(r, n), c = findNextSibling(r, n);
@@ -24054,7 +24054,7 @@ const GroupItem$1 = () => {
             }
           }
         },
-        onSubmit: (f) => q(void 0, [f], function* ({ title: h, icon: g }) {
+        onSubmit: (f) => z(void 0, [f], function* ({ title: h, icon: g }) {
           var y;
           const C = uid(), b = n === "beforeEnd" ? c == null ? void 0 : c.id : c == null ? void 0 : c.parentId, { data: S } = yield d({
             type: NocoBaseDesktopRouteType.group,
@@ -24096,7 +24096,7 @@ const GroupItem$1 = () => {
             }
           }
         },
-        onSubmit: (f) => q(void 0, [f], function* ({ title: h, icon: g }) {
+        onSubmit: (f) => z(void 0, [f], function* ({ title: h, icon: g }) {
           var I;
           const C = uid(), b = uid(), S = uid(), y = uid(), v = n === "beforeEnd" ? c == null ? void 0 : c.id : c == null ? void 0 : c.parentId, { data: F } = yield d({
             type: NocoBaseDesktopRouteType.page,
@@ -24150,7 +24150,7 @@ const GroupItem$1 = () => {
             openInNewWindow: l
           }
         },
-        onSubmit: (S) => q(void 0, [S], function* ({ title: h, icon: g, href: f, params: C, openInNewWindow: b }) {
+        onSubmit: (S) => z(void 0, [S], function* ({ title: h, icon: g, href: f, params: C, openInNewWindow: b }) {
           var I;
           const y = uid(), v = n === "beforeEnd" ? c == null ? void 0 : c.id : c == null ? void 0 : c.parentId, { data: F } = yield d({
             type: NocoBaseDesktopRouteType.link,
@@ -24234,7 +24234,7 @@ const GroupItem$1 = () => {
             "After hiding, this menu will no longer appear in the menu bar. To show it again, you need to go to the route management page to configure it."
           ),
           onOk() {
-            return q(this, null, function* () {
+            return z(this, null, function* () {
               t.id !== void 0 && (yield o(t.id, {
                 hideInMenu: !!r
               }));
@@ -24288,7 +24288,7 @@ const GroupItem$1 = () => {
       }
     }
   }), [r, e]), { moveRoute: i } = useNocoBaseRoutes(), l = useCurrentRoute(), c = useCallback(
-    (p) => q(void 0, [p], function* ({ target: u, position: d }) {
+    (p) => z(void 0, [p], function* ({ target: u, position: d }) {
       var f;
       const [m] = ((f = u == null ? void 0 : u.split) == null ? void 0 : f.call(u, "||")) || [];
       if (!m || m === void 0 || !l)
@@ -24475,7 +24475,7 @@ const LanguageSettings = () => {
         value: i
       })),
       value: t.language,
-      onChange: (i) => q(void 0, null, function* () {
+      onChange: (i) => z(void 0, null, function* () {
         yield o.resource("users").updateLang({
           values: {
             appLang: i
@@ -24608,7 +24608,7 @@ const LayoutContent = () => {
     n.current && (n.current.parentElement.parentElement.style.order = 999, n.current.parentElement.parentElement.style.paddingLeft = 0, n.current.parentElement.parentElement.style.padding = 0);
   }, []);
   const l = useCallback(
-    (p) => q(void 0, null, function* () {
+    (p) => z(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();
@@ -24835,12 +24835,12 @@ const LayoutContent = () => {
 }, AdminProvider = (e) => /* @__PURE__ */ jsx(CurrentPageUidProvider, { children: /* @__PURE__ */ jsx(CurrentTabUidProvider, { children: /* @__PURE__ */ jsx(IsSubPageClosedByPageMenuProvider, { children: /* @__PURE__ */ jsx(ACLRolesCheckProvider, { children: /* @__PURE__ */ jsx(RoutesRequestProvider, { children: /* @__PURE__ */ jsx(NavigateToDefaultPage, { children: /* @__PURE__ */ jsx(LegacyRouteCompat, { children: /* @__PURE__ */ jsx(RemoteCollectionManagerProvider, { children: /* @__PURE__ */ jsx(CurrentAppInfoProvider, { children: /* @__PURE__ */ jsx(RemoteSchemaTemplateManagerProvider, { children: e.children }) }) }) }) }) }) }) }) }) }), AdminLayout = (e) => /* @__PURE__ */ jsx(AdminProvider, { children: /* @__PURE__ */ jsx(InternalAdminLayout, x({}, e)) });
 class AdminLayoutPlugin extends Plugin {
   afterAdd() {
-    return q(this, null, function* () {
+    return z(this, null, function* () {
       yield this.app.pm.add(RemoteSchemaTemplateManagerPlugin);
     });
   }
   load() {
-    return q(this, null, function* () {
+    return z(this, null, function* () {
       this.app.schemaSettingsManager.add(userCenterSettings), this.app.addComponents({ AdminLayout, AdminDynamicPage }), this.app.use(MobileLayoutProvider);
     });
   }
@@ -25007,7 +25007,7 @@ const SchemaComponentProvider = (e) => {
 SchemaComponentProvider.displayName = "SchemaComponentProvider";
 class SchemaComponentPlugin extends Plugin {
   load() {
-    return q(this, null, function* () {
+    return z(this, null, function* () {
       this.addComponents();
     });
   }
@@ -25104,12 +25104,12 @@ const VisibleProvider = React.memo(({ children: e, popupuid: t }) => {
 }, InternalPagePopups = (e) => {
   const t = useFieldSchema(), o = useLocation(), n = e.paramsList || getPopupParamsFromPath(getPopupPath(o)), { requestSchema: r } = useRequestSchema(), [a, i] = useState(null), l = useRef([]), { savePopupSchemaToSchema: c, getPopupSchemaFromSchema: u } = usePopupUtils();
   useEffect(() => {
-    q(void 0, null, function* () {
+    z(void 0, null, function* () {
       const m = n.map((C) => {
         var b;
         return ((b = getStoredPopupContext(C.popupuid)) == null ? void 0 : b.schema) || findSchemaByUid(C.popupuid, t == null ? void 0 : t.root) || r(C.popupuid);
       }), h = yield Promise.all(m), g = yield Promise.all(
-        h.map((C, b) => q(void 0, null, function* () {
+        h.map((C, b) => z(void 0, null, function* () {
           if (_.isEmpty(C))
             return get404Schema();
           const S = n[b];
@@ -25174,7 +25174,7 @@ const VisibleProvider = React.memo(({ children: e, popupuid: t }) => {
   return t ? /* @__PURE__ */ jsx(InternalPagePopups, x({}, e)) : null;
 }, useRequestSchema = () => {
   const e = useAPIClient();
-  return { requestSchema: useCallback((o) => q(void 0, null, function* () {
+  return { requestSchema: useCallback((o) => z(void 0, null, function* () {
     var n;
     try {
       return (n = (yield e.request({
@@ -25357,7 +25357,7 @@ const useStyles$b = genStyleHook("nb-action-drawer", (e) => {
             title: t("Unsaved changes"),
             content: t("Are you sure you don't want to save?"),
             onOk() {
-              return q(this, null, function* () {
+              return z(this, null, function* () {
                 var c;
                 e.setFormValueChanged(!1), (c = e.setVisible) == null || c.call(e, !1);
               });
@@ -25374,7 +25374,7 @@ const useStyles$b = genStyleHook("nb-action-drawer", (e) => {
   const { setVisible: e } = useContext(ActionContext), t = useForm();
   return {
     run() {
-      return q(this, null, function* () {
+      return z(this, null, function* () {
         e(!1), t.submit((n) => {
           console.log(n);
         });
@@ -25931,7 +25931,7 @@ const useMenuSearch$1 = (e) => {
     const b = useForm(), S = useActionContext();
     return {
       run() {
-        return q(this, null, function* () {
+        return z(this, null, function* () {
           yield u == null ? void 0 : u(), S.setVisible(!1), b.reset();
         });
       }
@@ -25940,7 +25940,7 @@ const useMenuSearch$1 = (e) => {
     const b = useForm(), S = useActionContext();
     return {
       run() {
-        return q(this, null, function* () {
+        return z(this, null, function* () {
           yield b.validate();
           try {
             yield d == null ? void 0 : d(b.values), S.setVisible(!1), b.reset();
@@ -26422,26 +26422,26 @@ https://requirejs.org/docs/errors.html#` + e);
       config: {}
     }, l = {}, c = {}, u = {}, d = [], p = {}, m = {}, h = {}, g = 1, f = 1;
     function C(k) {
-      var M, E;
+      var M, q;
       for (M = 0; M < k.length; M++)
-        if (E = k[M], E === ".")
+        if (q = k[M], q === ".")
           k.splice(M, 1), M -= 1;
-        else if (E === "..") {
+        else if (q === "..") {
           if (M === 0 || M === 1 && k[2] === ".." || k[M - 1] === "..")
             continue;
           M > 0 && (k.splice(M - 1, 2), M -= 2);
         }
     }
-    function b(k, M, E) {
-      var V, z, G, U, H, Y, J, K, X, Q, ee, oe, te = M && M.split("/"), se = i.map, ie = se && se["*"];
-      if (k && (k = k.split("/"), J = k.length - 1, i.nodeIdCompat && jsSuffixRegExp.test(k[J]) && (k[J] = k[J].replace(jsSuffixRegExp, "")), k[0].charAt(0) === "." && te && (oe = te.slice(0, te.length - 1), k = oe.concat(k)), C(k), k = k.join("/")), E && se && (te || ie)) {
+    function b(k, M, q) {
+      var E, V, G, U, H, Y, J, K, X, Q, ee, oe, te = M && M.split("/"), se = i.map, ie = se && se["*"];
+      if (k && (k = k.split("/"), J = k.length - 1, i.nodeIdCompat && jsSuffixRegExp.test(k[J]) && (k[J] = k[J].replace(jsSuffixRegExp, "")), k[0].charAt(0) === "." && te && (oe = te.slice(0, te.length - 1), k = oe.concat(k)), C(k), k = k.join("/")), q && se && (te || ie)) {
         G = k.split("/");
         e:
           for (U = G.length; U > 0; U -= 1) {
             if (Y = G.slice(0, U).join("/"), te) {
               for (H = te.length; H > 0; H -= 1)
-                if (z = getOwn(se, te.slice(0, H).join("/")), z && (z = getOwn(z, Y), z)) {
-                  K = z, X = U;
+                if (V = getOwn(se, te.slice(0, H).join("/")), V && (V = getOwn(V, Y), V)) {
+                  K = V, X = U;
                   break e;
                 }
             }
@@ -26449,7 +26449,7 @@ https://requirejs.org/docs/errors.html#` + e);
           }
         !K && Q && (K = Q, X = ee), K && (G.splice(0, X, K), k = G.join("/"));
       }
-      return V = getOwn(i.pkgs, k), V || k;
+      return E = getOwn(i.pkgs, k), E || k;
     }
     function S(k) {
       isBrowser && each(scripts(), function(M) {
@@ -26465,38 +26465,38 @@ https://requirejs.org/docs/errors.html#` + e);
         })([k]), !0;
     }
     function v(k) {
-      var M, E = k ? k.indexOf("!") : -1;
-      return E > -1 && (M = k.substring(0, E), k = k.substring(E + 1, k.length)), [M, k];
-    }
-    function F(k, M, E, V) {
-      var z, G, U, H, Y = null, J = M ? M.name : null, K = k, X = !0, Q = "";
-      return k || (X = !1, k = "_@r" + (g += 1)), H = v(k), Y = H[0], k = H[1], Y && (Y = b(Y, J, V), G = getOwn(p, Y)), k && (Y ? E ? Q = k : G && G.normalize ? Q = G.normalize(k, function(ee) {
-        return b(ee, J, V);
-      }) : Q = k.indexOf("!") === -1 ? b(k, J, V) : k : (Q = b(k, J, V), H = v(Q), Y = H[0], Q = H[1], E = !0, z = n.nameToUrl(Q))), U = Y && !G && !E ? "_unnormalized" + (f += 1) : "", {
+      var M, q = k ? k.indexOf("!") : -1;
+      return q > -1 && (M = k.substring(0, q), k = k.substring(q + 1, k.length)), [M, k];
+    }
+    function F(k, M, q, E) {
+      var V, G, U, H, Y = null, J = M ? M.name : null, K = k, X = !0, Q = "";
+      return k || (X = !1, k = "_@r" + (g += 1)), H = v(k), Y = H[0], k = H[1], Y && (Y = b(Y, J, E), G = getOwn(p, Y)), k && (Y ? q ? Q = k : G && G.normalize ? Q = G.normalize(k, function(ee) {
+        return b(ee, J, E);
+      }) : Q = k.indexOf("!") === -1 ? b(k, J, E) : k : (Q = b(k, J, E), H = v(Q), Y = H[0], Q = H[1], q = !0, V = n.nameToUrl(Q))), U = Y && !G && !q ? "_unnormalized" + (f += 1) : "", {
         prefix: Y,
         name: Q,
         parentMap: M,
         unnormalized: !!U,
-        url: z,
+        url: V,
         originalName: K,
         isDefine: X,
         id: (Y ? Y + "!" + Q : Q) + U
       };
     }
     function I(k) {
-      var M = k.id, E = getOwn(l, M);
-      return E || (E = l[M] = new n.Module(k)), E;
+      var M = k.id, q = getOwn(l, M);
+      return q || (q = l[M] = new n.Module(k)), q;
     }
-    function T(k, M, E) {
-      var V = k.id, z = getOwn(l, V);
-      hasProp(p, V) && (!z || z.defineEmitComplete) ? M === "defined" && E(p[V]) : (z = I(k), z.error && M === "error" ? E(z.error) : z.on(M, E));
+    function T(k, M, q) {
+      var E = k.id, V = getOwn(l, E);
+      hasProp(p, E) && (!V || V.defineEmitComplete) ? M === "defined" && q(p[E]) : (V = I(k), V.error && M === "error" ? q(V.error) : V.on(M, q));
     }
     function R(k, M) {
-      var E = k.requireModules, V = !1;
-      M ? M(k) : (each(E, function(z) {
-        var G = getOwn(l, z);
-        G && (G.error = k, G.events.error && (V = !0, G.emit("error", k)));
-      }), V || req.onError(k));
+      var q = k.requireModules, E = !1;
+      M ? M(k) : (each(q, function(V) {
+        var G = getOwn(l, V);
+        G && (G.error = k, G.events.error && (E = !0, G.emit("error", k)));
+      }), E || req.onError(k));
     }
     function D() {
       globalDefQueue.length && (each(globalDefQueue, function(k) {
@@ -26526,29 +26526,29 @@ https://requirejs.org/docs/errors.html#` + e);
     function B(k) {
       delete l[k], delete c[k];
     }
-    function N(k, M, E) {
-      var V = k.map.id;
-      k.error ? k.emit("error", k.error) : (M[V] = !0, each(k.depMaps, function(z, G) {
-        var U = z.id, H = getOwn(l, U);
-        H && !k.depMatched[G] && !E[U] && (getOwn(M, U) ? (k.defineDep(G, p[U]), k.check()) : N(H, M, E));
-      }), E[V] = !0);
+    function N(k, M, q) {
+      var E = k.map.id;
+      k.error ? k.emit("error", k.error) : (M[E] = !0, each(k.depMaps, function(V, G) {
+        var U = V.id, H = getOwn(l, U);
+        H && !k.depMatched[G] && !q[U] && (getOwn(M, U) ? (k.defineDep(G, p[U]), k.check()) : N(H, M, q));
+      }), q[E] = !0);
     }
     function $() {
-      var k, M, E = i.waitSeconds * 1e3, V = E && n.startTime + E < (/* @__PURE__ */ new Date()).getTime(), z = [], G = [], U = !1, H = !0;
+      var k, M, q = i.waitSeconds * 1e3, E = q && n.startTime + q < (/* @__PURE__ */ new Date()).getTime(), V = [], G = [], U = !1, H = !0;
       if (!t) {
         if (t = !0, eachProp(c, function(Y) {
           var J = Y.map, K = J.id;
           if (Y.enabled && (J.isDefine || G.push(Y), !Y.error)) {
-            if (!Y.inited && V)
-              y(K) ? (M = !0, U = !0) : (z.push(K), S(K));
+            if (!Y.inited && E)
+              y(K) ? (M = !0, U = !0) : (V.push(K), S(K));
             else if (!Y.inited && Y.fetched && J.isDefine && (U = !0, !J.prefix))
               return H = !1;
           }
-        }), V && z.length)
-          return k = makeError("timeout", "Load timeout for modules: " + z, null, z), k.contextName = n.contextName, R(k);
+        }), E && V.length)
+          return k = makeError("timeout", "Load timeout for modules: " + V, null, V), k.contextName = n.contextName, R(k);
         H && each(G, function(Y) {
           N(Y, {}, {});
-        }), (!V || M) && U && (isBrowser || isWebWorker) && !a && (a = setTimeout(function() {
+        }), (!E || M) && U && (isBrowser || isWebWorker) && !a && (a = setTimeout(function() {
           a = 0, $();
         }, 50)), t = !1;
       }
@@ -26556,10 +26556,10 @@ https://requirejs.org/docs/errors.html#` + e);
     o = function(k) {
       this.events = getOwn(u, k.id) || {}, this.map = k, this.shim = getOwn(i.shim, k.id), this.depExports = [], this.depMaps = [], this.depMatched = [], this.pluginMaps = {}, this.depCount = 0;
     }, o.prototype = {
-      init: function(k, M, E, V) {
-        V = V || {}, !this.inited && (this.factory = M, E ? this.on("error", E) : this.events.error && (E = bind(this, function(z) {
-          this.emit("error", z);
-        })), this.depMaps = k && k.slice(0), this.errback = E, this.inited = !0, this.ignore = V.ignore, V.enabled || this.enabled ? this.enable() : this.check());
+      init: function(k, M, q, E) {
+        E = E || {}, !this.inited && (this.factory = M, q ? this.on("error", q) : this.events.error && (q = bind(this, function(V) {
+          this.emit("error", V);
+        })), this.depMaps = k && k.slice(0), this.errback = q, this.inited = !0, this.ignore = E.ignore, E.enabled || this.enabled ? this.enable() : this.check());
       },
       defineDep: function(k, M) {
         this.depMatched[k] || (this.depMatched[k] = !0, this.depCount -= 1, this.depExports[k] = M);
@@ -26588,9 +26588,9 @@ https://requirejs.org/docs/errors.html#` + e);
        */
       check: function() {
         if (!(!this.enabled || this.enabling)) {
-          var k, M, E = this.map.id, V = this.depExports, z = this.exports, G = this.factory;
+          var k, M, q = this.map.id, E = this.depExports, V = this.exports, G = this.factory;
           if (!this.inited)
-            hasProp(n.defQueueMap, E) || this.fetch();
+            hasProp(n.defQueueMap, q) || this.fetch();
           else if (this.error)
             this.emit("error", this.error);
           else if (!this.defining) {
@@ -26598,36 +26598,36 @@ https://requirejs.org/docs/errors.html#` + e);
               if (isFunction(G)) {
                 if (this.events.error && this.map.isDefine || req.onError !== defaultOnError)
                   try {
-                    z = n.execCb(E, G, V, z);
+                    V = n.execCb(q, G, E, V);
                   } catch (H) {
                     k = H;
                   }
                 else
-                  z = n.execCb(E, G, V, z);
-                if (this.map.isDefine && z === void 0 && (M = this.module, M ? z = M.exports : this.usingExports && (z = this.exports)), k)
+                  V = n.execCb(q, G, E, V);
+                if (this.map.isDefine && V === void 0 && (M = this.module, M ? V = M.exports : this.usingExports && (V = this.exports)), k)
                   return k.requireMap = this.map, k.requireModules = this.map.isDefine ? [this.map.id] : null, k.requireType = this.map.isDefine ? "define" : "require", R(this.error = k);
               } else
-                z = G;
-              if (this.exports = z, this.map.isDefine && !this.ignore && (p[E] = z, req.onResourceLoad)) {
+                V = G;
+              if (this.exports = V, this.map.isDefine && !this.ignore && (p[q] = V, req.onResourceLoad)) {
                 var U = [];
                 each(this.depMaps, function(H) {
                   U.push(H.normalizedMap || H);
                 }), req.onResourceLoad(n, this.map, U);
               }
-              B(E), this.defined = !0;
+              B(q), 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, M = k.id, E = F(k.prefix);
-        this.depMaps.push(E), T(E, "defined", bind(this, function(V) {
-          var z, G, U, H = getOwn(h, this.map.id), Y = this.map.name, J = this.map.parentMap ? this.map.parentMap.name : null, K = n.makeRequire(k.parentMap, {
+        var k = this.map, M = k.id, q = F(k.prefix);
+        this.depMaps.push(q), T(q, "defined", bind(this, function(E) {
+          var V, G, U, H = getOwn(h, this.map.id), Y = this.map.name, J = this.map.parentMap ? this.map.parentMap.name : null, K = n.makeRequire(k.parentMap, {
             enableBuildCallback: !0
           });
           if (this.map.unnormalized) {
-            V.normalize && (Y = V.normalize(Y, function(X) {
+            E.normalize && (Y = E.normalize(Y, function(X) {
               return b(X, J, !0);
             }) || ""), G = F(
               k.prefix + "!" + Y,
@@ -26653,17 +26653,17 @@ https://requirejs.org/docs/errors.html#` + e);
             this.map.url = n.nameToUrl(H), this.load();
             return;
           }
-          z = bind(this, function(X) {
+          V = bind(this, function(X) {
             this.init([], function() {
               return X;
             }, null, {
               enabled: !0
             });
-          }), z.error = bind(this, function(X) {
+          }), V.error = bind(this, function(X) {
             this.inited = !0, this.error = X, X.requireModules = [M], eachProp(l, function(Q) {
               Q.map.id.indexOf(M + "_unnormalized") === 0 && B(Q.map.id);
             }), R(X);
-          }), z.fromText = bind(this, function(X, Q) {
+          }), V.fromText = bind(this, function(X, Q) {
             var ee = k.name, oe = F(ee), te = useInteractive;
             Q && (X = Q), te && (useInteractive = !1), I(oe), hasProp(i.config, M) && (i.config[ee] = i.config[M]);
             try {
@@ -26676,21 +26676,21 @@ https://requirejs.org/docs/errors.html#` + e);
                 [M]
               ));
             }
-            te && (useInteractive = !0), this.depMaps.push(oe), n.completeLoad(ee), K([ee], z);
-          }), V.load(k.name, K, z, i);
-        })), n.enable(E, this), this.pluginMaps[E.id] = E;
+            te && (useInteractive = !0), this.depMaps.push(oe), n.completeLoad(ee), K([ee], V);
+          }), E.load(k.name, K, V, i);
+        })), n.enable(q, this), this.pluginMaps[q.id] = q;
       },
       enable: function() {
         c[this.map.id] = this, this.enabled = !0, this.enabling = !0, each(this.depMaps, bind(this, function(k, M) {
-          var E, V, z;
+          var q, E, V;
           if (typeof k == "string") {
             if (k = F(
               k,
               this.map.isDefine ? this.map : this.map.parentMap,
               !1,
               !this.skipMap
-            ), this.depMaps[M] = k, z = getOwn(r, k.id), z) {
-              this.depExports[M] = z(this);
+            ), this.depMaps[M] = k, V = getOwn(r, k.id), V) {
+              this.depExports[M] = V(this);
               return;
             }
             this.depCount += 1, T(k, "defined", bind(this, function(G) {
@@ -26699,27 +26699,27 @@ https://requirejs.org/docs/errors.html#` + e);
               this.emit("error", G);
             }));
           }
-          E = k.id, V = l[E], !hasProp(r, E) && V && !V.enabled && n.enable(k, this);
+          q = k.id, E = l[q], !hasProp(r, q) && E && !E.enabled && n.enable(k, this);
         })), eachProp(this.pluginMaps, bind(this, function(k) {
           var M = getOwn(l, k.id);
           M && !M.enabled && n.enable(k, this);
         })), this.enabling = !1, this.check();
       },
       on: function(k, M) {
-        var E = this.events[k];
-        E || (E = this.events[k] = []), E.push(M);
+        var q = this.events[k];
+        q || (q = this.events[k] = []), q.push(M);
       },
       emit: function(k, M) {
-        each(this.events[k], function(E) {
-          E(M);
+        each(this.events[k], function(q) {
+          q(M);
         }), k === "error" && delete this.events[k];
       }
     };
     function L(k) {
       hasProp(p, k[0]) || I(F(k[0], null, !0)).init(k[1], k[2]);
     }
-    function w(k, M, E, V) {
-      k.detachEvent && !isOpera ? V && k.detachEvent(V, M) : k.removeEventListener(E, M, !1);
+    function w(k, M, q, E) {
+      k.detachEvent && !isOpera ? E && k.detachEvent(E, M) : k.removeEventListener(q, M, !1);
     }
     function O(k) {
       var M = k.currentTarget || k.srcElement;
@@ -26756,78 +26756,78 @@ 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 M = k.urlArgs;
-          k.urlArgs = function(z, G) {
+          k.urlArgs = function(V, G) {
             return (G.indexOf("?") === -1 ? "?" : "&") + M;
           };
         }
-        var E = i.shim, V = {
+        var q = i.shim, E = {
           paths: !0,
           bundles: !0,
           config: !0,
           map: !0
         };
-        eachProp(k, function(z, G) {
-          V[G] ? (i[G] || (i[G] = {}), mixin(i[G], z, !0, !0)) : i[G] = z;
-        }), k.bundles && eachProp(k.bundles, function(z, G) {
-          each(z, function(U) {
+        eachProp(k, function(V, G) {
+          E[G] ? (i[G] || (i[G] = {}), mixin(i[G], V, !0, !0)) : i[G] = V;
+        }), k.bundles && eachProp(k.bundles, function(V, G) {
+          each(V, function(U) {
             U !== G && (h[U] = G);
           });
-        }), k.shim && (eachProp(k.shim, function(z, G) {
-          isArray(z) && (z = {
-            deps: z
-          }), (z.exports || z.init) && !z.exportsFn && (z.exportsFn = n.makeShimExports(z)), E[G] = z;
-        }), i.shim = E), k.packages && each(k.packages, function(z) {
+        }), k.shim && (eachProp(k.shim, function(V, G) {
+          isArray(V) && (V = {
+            deps: V
+          }), (V.exports || V.init) && !V.exportsFn && (V.exportsFn = n.makeShimExports(V)), q[G] = V;
+        }), i.shim = q), k.packages && each(k.packages, function(V) {
           var G, U;
-          z = typeof z == "string" ? { name: z } : z, U = z.name, G = z.location, G && (i.paths[U] = z.location), i.pkgs[U] = z.name + "/" + (z.main || "main").replace(currDirRegExp, "").replace(jsSuffixRegExp, "");
-        }), eachProp(l, function(z, G) {
-          !z.inited && !z.map.unnormalized && (z.map = F(G, null, !0));
+          V = typeof V == "string" ? { name: V } : V, U = V.name, G = V.location, G && (i.paths[U] = V.location), i.pkgs[U] = V.name + "/" + (V.main || "main").replace(currDirRegExp, "").replace(jsSuffixRegExp, "");
+        }), eachProp(l, function(V, G) {
+          !V.inited && !V.map.unnormalized && (V.map = F(G, null, !0));
         }), (k.deps || k.callback) && n.require(k.deps || [], k.callback);
       },
       makeShimExports: function(k) {
         function M() {
-          var E;
-          return k.init && (E = k.init.apply(global, arguments)), E || k.exports && getGlobal(k.exports);
+          var q;
+          return k.init && (q = k.init.apply(global, arguments)), q || k.exports && getGlobal(k.exports);
         }
         return M;
       },
       makeRequire: function(k, M) {
         M = M || {};
-        function E(V, z, G) {
+        function q(E, V, G) {
           var U, H, Y;
-          return M.enableBuildCallback && z && isFunction(z) && (z.__requireJsBuild = !0), typeof V == "string" ? isFunction(z) ? R(makeError("requireargs", "Invalid require call"), G) : k && hasProp(r, V) ? r[V](l[k.id]) : req.get ? req.get(n, V, k, E) : (H = F(V, k, !1, !0), U = H.id, hasProp(p, U) ? p[U] : R(makeError("notloaded", 'Module name "' + U + '" has not been loaded yet for context: ' + e + (k ? "" : ". Use require([])")))) : (j(), n.nextTick(function() {
-            j(), Y = I(F(null, k)), Y.skipMap = M.skipMap, Y.init(V, z, G, {
+          return M.enableBuildCallback && V && isFunction(V) && (V.__requireJsBuild = !0), typeof E == "string" ? isFunction(V) ? R(makeError("requireargs", "Invalid require call"), G) : k && hasProp(r, E) ? r[E](l[k.id]) : req.get ? req.get(n, E, k, q) : (H = F(E, k, !1, !0), U = H.id, hasProp(p, U) ? p[U] : R(makeError("notloaded", 'Module name "' + U + '" has not been loaded yet for context: ' + e + (k ? "" : ". Use require([])")))) : (j(), n.nextTick(function() {
+            j(), Y = I(F(null, k)), Y.skipMap = M.skipMap, Y.init(E, V, G, {
               enabled: !0
             }), $();
-          }), E);
+          }), q);
         }
-        return mixin(E, {
+        return mixin(q, {
           isBrowser,
           /**
            * Converts a module name + .extension into an URL path.
            * *Requires* the use of a module name. It does not support using
            * plain URLs like nameToUrl.
            */
-          toUrl: function(V) {
-            var z, G = V.lastIndexOf("."), U = V.split("/")[0], H = U === "." || U === "..";
-            return G !== -1 && (!H || G > 1) && (z = V.substring(G, V.length), V = V.substring(0, G)), n.nameToUrl(b(
-              V,
+          toUrl: function(E) {
+            var V, G = E.lastIndexOf("."), U = E.split("/")[0], H = U === "." || U === "..";
+            return G !== -1 && (!H || G > 1) && (V = E.substring(G, E.length), E = E.substring(0, G)), n.nameToUrl(b(
+              E,
               k && k.id,
               !0
-            ), z, !0);
+            ), V, !0);
           },
-          defined: function(V) {
-            return hasProp(p, F(V, k, !1, !0).id);
+          defined: function(E) {
+            return hasProp(p, F(E, k, !1, !0).id);
           },
-          specified: function(V) {
-            return V = F(V, k, !1, !0).id, hasProp(p, V) || hasProp(l, V);
+          specified: function(E) {
+            return E = F(E, k, !1, !0).id, hasProp(p, E) || hasProp(l, E);
           }
-        }), k || (E.undef = function(V) {
+        }), k || (q.undef = function(E) {
           D();
-          var z = F(V, k, !0), G = getOwn(l, V);
-          G.undefed = !0, S(V), delete p[V], delete m[z.url], delete u[V], eachReverse(d, function(U, H) {
-            U[0] === V && d.splice(H, 1);
-          }), delete n.defQueueMap[V], G && (G.events.defined && (u[V] = G.events), B(V));
-        }), E;
+          var V = F(E, k, !0), G = getOwn(l, E);
+          G.undefed = !0, S(E), delete p[E], delete m[V.url], delete u[E], eachReverse(d, function(U, H) {
+            U[0] === E && d.splice(H, 1);
+          }), delete n.defQueueMap[E], G && (G.events.defined && (u[E] = G.events), B(E));
+        }), q;
       },
       /**
        * Called to enable a module if it is still in the registry
@@ -26846,17 +26846,17 @@ https://requirejs.org/docs/errors.html#` + e);
        * @param {String} moduleName the name of the module to potentially complete.
        */
       completeLoad: function(k) {
-        var M, E, V, z = getOwn(i.shim, k) || {}, G = z.exports;
+        var M, q, E, V = getOwn(i.shim, k) || {}, G = V.exports;
         for (D(); d.length; ) {
-          if (E = d.shift(), E[0] === null) {
-            if (E[0] = k, M)
+          if (q = d.shift(), q[0] === null) {
+            if (q[0] = k, M)
               break;
             M = !0;
           } else
-            E[0] === k && (M = !0);
-          L(E);
+            q[0] === k && (M = !0);
+          L(q);
         }
-        if (n.defQueueMap = {}, V = getOwn(l, k), !M && !hasProp(p, k) && V && !V.inited) {
+        if (n.defQueueMap = {}, E = getOwn(l, k), !M && !hasProp(p, k) && E && !E.inited) {
           if (i.enforceDefine && (!G || !getGlobal(G)))
             return y(k) ? void 0 : R(makeError(
               "nodefine",
@@ -26864,7 +26864,7 @@ https://requirejs.org/docs/errors.html#` + e);
               null,
               [k]
             ));
-          L([k, z.deps || [], z.exportsFn]);
+          L([k, V.deps || [], V.exportsFn]);
         }
         $();
       },
@@ -26875,19 +26875,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, M, E) {
-        var V, z, G, U, H, Y, J, K = getOwn(i.pkgs, k);
+      nameToUrl: function(k, M, q) {
+        var E, V, G, U, H, Y, J, K = getOwn(i.pkgs, k);
         if (K && (k = K), J = getOwn(h, k), J)
-          return n.nameToUrl(J, M, E);
+          return n.nameToUrl(J, M, q);
         if (req.jsExtRegExp.test(k))
           H = k + (M || "");
         else {
-          for (V = i.paths, z = k.split("/"), G = z.length; G > 0; G -= 1)
-            if (U = z.slice(0, G).join("/"), Y = getOwn(V, U), Y) {
-              isArray(Y) && (Y = Y[0]), z.splice(0, G, Y);
+          for (E = i.paths, V = k.split("/"), G = V.length; G > 0; G -= 1)
+            if (U = V.slice(0, G).join("/"), Y = getOwn(E, U), Y) {
+              isArray(Y) && (Y = Y[0]), V.splice(0, G, Y);
               break;
             }
-          H = z.join("/"), H += M || (/^data\:|^blob\:|\?/.test(H) || E ? "" : ".js"), H = (H.charAt(0) === "/" || H.match(/^[\w\+\.\-]+:/) ? "" : i.baseUrl) + H;
+          H = V.join("/"), H += M || (/^data\:|^blob\:|\?/.test(H) || q ? "" : ".js"), H = (H.charAt(0) === "/" || H.match(/^[\w\+\.\-]+:/) ? "" : i.baseUrl) + H;
         }
         return i.urlArgs && !/^blob\:/.test(H) ? H + i.urlArgs(k, H) : H;
       },
@@ -26903,8 +26903,8 @@ https://requirejs.org/docs/errors.html#` + e);
        *
        * @private
        */
-      execCb: function(k, M, E, V) {
-        return M.apply(V, E);
+      execCb: function(k, M, q, E) {
+        return M.apply(E, q);
       },
       /**
        * callback for script loads, used to check status of loading.
@@ -26925,13 +26925,13 @@ https://requirejs.org/docs/errors.html#` + e);
       onScriptError: function(k) {
         var M = O(k);
         if (!y(M.id)) {
-          var E = [];
-          return eachProp(l, function(V, z) {
-            z.indexOf("_@r") !== 0 && each(V.depMaps, function(G) {
+          var q = [];
+          return eachProp(l, function(E, V) {
+            V.indexOf("_@r") !== 0 && each(E.depMaps, function(G) {
               if (G.id === M.id)
-                return E.push(z), !0;
+                return q.push(V), !0;
             });
-          }), R(makeError("scripterror", 'Script error for "' + M.id + (E.length ? '", needed by: ' + E.join(", ") : '"'), k, [M.id]));
+          }), R(makeError("scripterror", 'Script error for "' + M.id + (q.length ? '", needed by: ' + q.join(", ") : '"'), k, [M.id]));
         }
       }
     }, n.require = n.makeRequire(), n;
@@ -27410,7 +27410,7 @@ function getOperators() {
   }, o;
 }
 function parseFullDate(e) {
-  return /* @__PURE__ */ new Date(`${e}T00:00:00`);
+  return e.includes("T") && e.endsWith("Z") ? new Date(e) : e.includes(" ") ? new Date(e.replace(" ", "T")) : /* @__PURE__ */ new Date(`${e}T00:00:00`);
 }
 function parseMonth(e) {
   const [t, o] = e.split("-").map(Number);
@@ -27584,7 +27584,7 @@ class Application {
     });
   }
   load() {
-    return q(this, null, function* () {
+    return z(this, null, function* () {
       var t, o, n, r, a;
       try {
         this.loading = !0, yield this.loadWebSocket(), yield this.pm.load();
@@ -27599,7 +27599,7 @@ class Application {
     });
   }
   loadWebSocket() {
-    return q(this, null, function* () {
+    return z(this, null, function* () {
       this.eventBus.addEventListener("ws:message:authorized", () => {
         this.setWsAuthorized(!0);
       }), this.ws.on("message", (t) => {
@@ -27855,7 +27855,7 @@ function createTextSettingsItem(e) {
     }
   };
 }
-const linkageAction$1 = (l, c) => q(void 0, [l, c], function* ({
+const linkageAction$1 = (l, c) => z(void 0, [l, c], function* ({
   operator: e,
   condition: t,
   variables: o,
@@ -27880,7 +27880,7 @@ const linkageAction$1 = (l, c) => q(void 0, [l, c], function* ({
 }), useReactiveLinkageEffect = (e, t, o, n) => {
   const a = useApp().jsonLogic, [i, l] = useState(null), c = useCollectionRecord();
   return useEffect(() => {
-    q(void 0, null, function* () {
+    z(void 0, null, function* () {
       const d = [];
       for (const p of e.filter((m) => !m.disabled))
         for (const m of p.actions || [])
@@ -28002,7 +28002,7 @@ function useRecordRequest(e) {
     const F = r.filterByTk === void 0 ? _.omit(r, "filterByTk") : r, I = x(x({}, F), v);
     return (T = o[n]) == null ? void 0 : T.call(o, I).then((R) => R.data);
   };
-  return useRequest((...v) => q(this, null, function* () {
+  return useRequest((...v) => z(this, null, function* () {
     const [F, I] = yield Promise.all([
       (i || b)(...v),
       requestParentRecordData({ sourceId: c, association: u, parentRecord: d, api: p, headers: h, sourceKey: g })
@@ -28015,7 +28015,7 @@ function useRecordRequest(e) {
   }));
 }
 function requestParentRecordData(i) {
-  return q(this, arguments, function* ({
+  return z(this, arguments, function* ({
     sourceId: e,
     association: t,
     parentRecord: o,
@@ -28391,7 +28391,7 @@ const useStyles$a = genStyleHook("nb-markdown", (e, { isDarkTheme: t }) => {
       ".field-interface-datetime": { minWidth: "100px" }
     }, t ? a : r)
   };
-}), parseMarkdown = _.memoize((e) => q(void 0, null, function* () {
+}), parseMarkdown = _.memoize((e) => z(void 0, null, function* () {
   return e && (yield import("./md-oH2RssNY.mjs")).default.render(e);
 }));
 function useParseMarkdown(e) {
@@ -28492,8 +28492,8 @@ const MarkdownEditor = (e) => {
   observer$1((e) => {
     const { isDarkTheme: t } = useGlobalTheme(), { componentCls: o, hashId: n } = useStyles$a({ isDarkTheme: t }), { content: r, className: a } = e, i = useField(), l = useFieldSchema(), { dn: c } = useDesignable(), { onSave: u, onCancel: d, form: p } = e, m = useCollectionRecord(), [h, g] = useState(""), f = useVariables$1(), C = useLocalVariables$1(), { engine: b } = (l == null ? void 0 : l["x-decorator-props"]) || {}, [S, y] = useState(!1);
     useCompile(), useEffect(() => {
-      y(!0), q(void 0, null, function* () {
-        setTimeout(() => q(void 0, null, function* () {
+      y(!0), z(void 0, null, function* () {
+        setTimeout(() => z(void 0, null, function* () {
           const T = yield getRenderContent(b, r, f, C, parseMarkdown);
           g(T);
         })), y(!1);
@@ -28518,7 +28518,7 @@ const MarkdownEditor = (e) => {
         onCancel: () => {
           i.editable = !1, d == null || d();
         },
-        onSubmit: (I) => q(void 0, null, function* () {
+        onSubmit: (I) => z(void 0, null, function* () {
           var T;
           i.editable = !1, (T = l["x-component-props"]) != null || (l["x-component-props"] = {}), l["x-component-props"].content = I, i.componentProps.content = I, u == null || u(l), c.emit("patch", {
             schema: {
@@ -28676,7 +28676,7 @@ function getFormValues({
 }
 function useCollectValuesToSubmit() {
   const e = useForm(), t = useFilterByTk(), { field: o, resource: n } = useBlockRequestContext(), { fields: r, getField: a, getTreeParentField: i, name: l } = useCollection_deprecated(), c = r.map((f) => f.name), { fieldSchema: u } = useActionContext(), { getActiveFieldsName: d } = useFormActiveFields() || {}, p = useVariables$1(), m = useLocalVariables$1({ currentForm: e }), h = useFieldSchema(), g = useTreeParentRecord();
-  return useCallback(() => q(this, null, function* () {
+  return useCallback(() => z(this, null, function* () {
     var F, I, T, R;
     const { assignedValues: f = {}, overwriteValues: C } = (F = h == null ? void 0 : h["x-action-settings"]) != null ? F : {}, b = getFormValues({
       filterByTk: t,
@@ -28686,7 +28686,7 @@ function useCollectValuesToSubmit() {
       getField: a,
       resource: n,
       actionFields: (d == null ? void 0 : d("form")) || []
-    }), S = {}, y = Object.keys(f).map((D) => q(this, null, function* () {
+    }), S = {}, y = Object.keys(f).map((D) => z(this, null, function* () {
       const B = f[D], N = a(D);
       if (isVariable$1(B)) {
         const { value: $ } = (yield p == null ? void 0 : p.parseVariable(B, m)) || {};
@@ -28721,7 +28721,7 @@ const useCreateActionProps = () => {
   const e = useFilterByTk(), t = useCollectionRecord(), o = useForm(), { field: n, resource: r } = useBlockRequestContext(), { setVisible: a, setSubmitted: i, setFormValueChanged: l } = useActionContext(), c = useNavigateNoUpdate(), u = useFieldSchema(), d = useField(), p = useCompile(), { modal: m } = App.useApp(), { t: h } = useTranslation(), { updateAssociationValues: g } = useFormBlockContext(), f = useCollectValuesToSubmit(), C = t.isNew ? d.componentProps.saveMode || "create" : "update", b = ((v = d.componentProps.filterKeys) == null ? void 0 : v.checked) || [], S = useLocalVariables$1(), y = useVariables$1();
   return {
     onClick() {
-      return q(this, null, function* () {
+      return z(this, null, function* () {
         var O, j;
         const { onSuccess: I, skipValidator: T, triggerWorkflows: R } = (O = u == null ? void 0 : u["x-action-settings"]) != null ? O : {}, {
           manualClose: D,
@@ -28739,7 +28739,7 @@ const useCreateActionProps = () => {
             filterKeys: b,
             filterByTk: e,
             // TODO(refactor): should change to inject by plugin
-            triggerWorkflows: R != null && R.length ? R.map((E) => [E.workflowKey, E.context].filter(Boolean).join("!")).join(",") : void 0,
+            triggerWorkflows: R != null && R.length ? R.map((q) => [q.workflowKey, q.context].filter(Boolean).join("!")).join(",") : void 0,
             updateAssociationValues: g
           });
           let M = N;
@@ -28752,7 +28752,7 @@ const useCreateActionProps = () => {
           }
           D ? m.success({
             title: p($),
-            onOk: () => q(this, null, function* () {
+            onOk: () => z(this, null, function* () {
               yield resetFormCorrectly(o), (B && !L || L === "redirect") && M && (isURL(M) ? window.location.href = M : c(M));
             })
           }) : (message.success(p($)), yield resetFormCorrectly(o), (B && !L || L === "redirect") && M && (isURL(M) ? window.location.href = M : c(M)));
@@ -28767,15 +28767,15 @@ const useCreateActionProps = () => {
   const e = useForm(), { field: t, resource: o, __parent: n } = useBlockRequestContext(), { setVisible: r, fieldSchema: a, setSubmitted: i } = useActionContext(), l = useFieldSchema(), c = useField(), { fields: u, getField: d, getTreeParentField: p, name: m } = useCollection_deprecated(), h = useCompile(), g = useFilterByTk(), f = useRecord(), C = useVariables$1(), b = useLocalVariables$1({ currentForm: e }), { getActiveFieldsName: S } = useFormActiveFields() || {}, y = c.componentProps.saveMode || "create", v = ((F = c.componentProps.filterKeys) == null ? void 0 : F.checked) || [];
   return {
     onClick() {
-      return q(this, null, function* () {
-        var M, E, V, z, G, U;
+      return z(this, null, function* () {
+        var M, q, E, V, G, U;
         const T = u.map((H) => H.name), {
           assignedValues: R = {},
           onSuccess: D,
           overwriteValues: B,
           skipValidator: N,
           triggerWorkflows: $
-        } = (M = l == null ? void 0 : l["x-action-settings"]) != null ? M : {}, L = (E = a == null ? void 0 : a["x-component-props"]) == null ? void 0 : E.addChild, { successMessage: w } = D || {}, O = {}, j = Object.keys(R).map((H) => q(this, null, function* () {
+        } = (M = l == null ? void 0 : l["x-action-settings"]) != null ? M : {}, L = (q = a == null ? void 0 : a["x-component-props"]) == null ? void 0 : q.addChild, { successMessage: w } = D || {}, O = {}, j = Object.keys(R).map((H) => z(this, null, function* () {
           const Y = R[H], J = d(H);
           if (isVariable$1(Y)) {
             const { value: K } = (yield C == null ? void 0 : C.parseVariable(Y, b)) || {};
@@ -28795,7 +28795,7 @@ const useCreateActionProps = () => {
         });
         if (L) {
           const H = p();
-          k[(V = H == null ? void 0 : H.name) != null ? V : "parent"] = f, k[(z = H == null ? void 0 : H.foreignKey) != null ? z : "parentId"] = f.id;
+          k[(E = H == null ? void 0 : H.name) != null ? E : "parent"] = f, k[(V = H == null ? void 0 : H.foreignKey) != null ? V : "parentId"] = f.id;
         }
         c.data = t.data || {}, c.data.loading = !0;
         try {
@@ -28834,10 +28834,10 @@ const useCreateActionProps = () => {
   }
 }, useDoFilter = () => {
   const e = useForm(), { getDataBlocks: t } = useFilterBlock(), o = useCollectionManager(), { getOperators: n } = useOperators(), r = useFieldSchema(), { name: a } = useCollection(), { targets: i = [], uid: l } = useMemo(() => findFilterTargets(r), [r]), c = useCallback(() => removeNullCondition(transformToFilter(e.values, n(), o.getCollectionField.bind(o), a)), [e.values, o, n, a]), u = useCallback(
-    (...p) => q(void 0, [...p], function* ({ doNothingWhenFilterIsEmpty: d = !1 } = {}) {
+    (...p) => z(void 0, [...p], function* ({ doNothingWhenFilterIsEmpty: d = !1 } = {}) {
       try {
         yield Promise.all(
-          t().map((m) => q(void 0, null, function* () {
+          t().map((m) => z(void 0, null, function* () {
             var b, S, y, v;
             if (!i.find((F) => F.uid === m.uid))
               return;
@@ -28883,7 +28883,7 @@ const useCreateActionProps = () => {
   const o = useForm();
   return {
     onClick() {
-      return q(this, null, function* () {
+      return z(this, null, function* () {
         yield o.submit(), t.data.loading = !0, yield e(), t.data.loading = !1;
       });
     }
@@ -28891,7 +28891,7 @@ const useCreateActionProps = () => {
 }, useDoReset = () => {
   const e = useForm(), t = useFieldSchema(), { getDataBlocks: o } = useFilterBlock(), { targets: n, uid: r } = findFilterTargets(t), { doFilter: a, getFilterFromCurrentForm: i } = useDoFilter();
   return {
-    doReset: () => q(void 0, null, function* () {
+    doReset: () => z(void 0, null, function* () {
       var l;
       if (yield e.reset(void 0, {
         forceClear: !!((l = t == null ? void 0 : t["x-component-props"]) != null && l.clearDefaultValue)
@@ -28904,7 +28904,7 @@ const useCreateActionProps = () => {
   const e = useField(), { doReset: t } = useDoReset();
   return e.data = e.data || {}, {
     onClick() {
-      return q(this, null, function* () {
+      return z(this, null, function* () {
         e.data.loading = !0, yield t(), e.data.loading = !1;
       });
     }
@@ -28913,7 +28913,7 @@ const useCreateActionProps = () => {
   const { resource: e, __parent: t, service: o } = useBlockRequestContext(), n = useFilterByTk(), r = useFieldSchema(), a = useNavigateNoUpdate(), i = useCompile(), l = useForm(), { modal: c } = App.useApp(), u = useVariables$1(), d = useLocalVariables$1({ currentForm: l }), { name: p, getField: m } = useCollection_deprecated(), { setVisible: h } = useActionContext();
   return {
     onClick(f, C) {
-      return q(this, null, function* () {
+      return z(this, null, function* () {
         var w, O, j, k;
         const {
           assignedValues: b = {},
@@ -28926,13 +28926,13 @@ const useCreateActionProps = () => {
           redirectTo: T,
           successMessage: R,
           actionAfterSuccess: D
-        } = S || {}, B = {}, N = Object.keys(b).map((M) => q(this, null, function* () {
-          const E = b[M], V = m(M);
-          if (isVariable$1(E)) {
-            const { value: z } = (yield u == null ? void 0 : u.parseVariable(E, d)) || {};
-            z && (B[M] = transformVariableValue(z, { targetCollectionField: V }));
+        } = S || {}, B = {}, N = Object.keys(b).map((M) => z(this, null, function* () {
+          const q = b[M], E = m(M);
+          if (isVariable$1(q)) {
+            const { value: V } = (yield u == null ? void 0 : u.parseVariable(q, d)) || {};
+            V && (B[M] = transformVariableValue(V, { targetCollectionField: E }));
           } else
-            E !== "" && (B[M] = E);
+            q !== "" && (B[M] = q);
         }));
         yield Promise.all(N), y === !1 && (yield l.submit());
         const $ = yield e.update({
@@ -28947,7 +28947,7 @@ const useCreateActionProps = () => {
           localVariables: [...d, { name: "$record", ctx: new Proxy((O = $ == null ? void 0 : $.data) == null ? void 0 : O.data, {}) }]
         })), (D === "previous" || !D && I !== !0) && (h == null || h(!1)), C && (C == null || C()), e instanceof TableFieldResource || (k = (j = t == null ? void 0 : t.service) == null ? void 0 : j.refresh) == null || k.call(j), R && (F ? c.success({
           title: i(R),
-          onOk: () => q(this, null, function* () {
+          onOk: () => z(this, null, function* () {
             (I && !D || D === "redirect") && L && (isURL(L) ? window.location.href = L : a(L));
           })
         }) : (message.success(i(R)), (I && !D || D === "redirect") && L && (isURL(L) ? window.location.href = L : a(L))));
@@ -28961,7 +28961,7 @@ const useCreateActionProps = () => {
   const { name: f, getField: C } = useCollection_deprecated(), b = useLocalVariables$1(), { setVisible: S } = useActionContext();
   return {
     onClick() {
-      return q(this, null, function* () {
+      return z(this, null, function* () {
         var M;
         const {
           assignedValues: R = {},
@@ -28969,23 +28969,23 @@ const useCreateActionProps = () => {
           updateMode: B
         } = (M = a == null ? void 0 : a["x-action-settings"]) != null ? M : {}, { manualClose: N, redirecting: $, redirectTo: L, successMessage: w, actionAfterSuccess: O } = D || {};
         m.data = e.data || {}, m.data.loading = !0;
-        const j = {}, k = Object.keys(R).map((V) => q(this, null, function* () {
-          const z = R[V], G = C(V);
-          if (isVariable$1(z)) {
-            const { value: U } = (yield g == null ? void 0 : g.parseVariable(z, b)) || {};
-            U && (j[V] = transformVariableValue(U, { targetCollectionField: G }));
+        const j = {}, k = Object.keys(R).map((E) => z(this, null, function* () {
+          const V = R[E], G = C(E);
+          if (isVariable$1(V)) {
+            const { value: U } = (yield g == null ? void 0 : g.parseVariable(V, b)) || {};
+            U && (j[E] = transformVariableValue(U, { targetCollectionField: G }));
           } else
-            z !== "" && (j[V] = z);
+            V !== "" && (j[E] = V);
         }));
         yield Promise.all(k), (O === "previous" || !O && $ !== !0) && (S == null || S(!1)), h.confirm({
           title: p("Bulk update"),
           content: p(B === "selected" ? "Update selected data?" : "Update all data?"),
           onOk() {
-            return q(this, null, function* () {
+            return z(this, null, function* () {
               var G, U, H, Y;
-              const { filter: V } = (U = (G = n.params) == null ? void 0 : G[0]) != null ? U : {}, z = {
+              const { filter: E } = (U = (G = n.params) == null ? void 0 : G[0]) != null ? U : {}, V = {
                 values: x({}, j),
-                filter: V,
+                filter: E,
                 forceUpdate: !1
               };
               if (B === "selected") {
@@ -28993,25 +28993,25 @@ const useCreateActionProps = () => {
                   message.error(p("Please select the records to be updated")), m.data.loading = !1;
                   return;
                 }
-                z.filter = { $and: [{ [l || "id"]: { $in: c } }] };
+                V.filter = { $and: [{ [l || "id"]: { $in: c } }] };
               }
-              z.filter || (z.forceUpdate = !0);
+              V.filter || (V.forceUpdate = !0);
               try {
-                yield t.update(z);
+                yield t.update(V);
               } catch (J) {
               } finally {
                 m.data.loading = !1;
               }
               t instanceof TableFieldResource || (Y = (H = o == null ? void 0 : o.service) == null ? void 0 : H.refresh) == null || Y.call(H), w && (N ? h.success({
                 title: d(w),
-                onOk: () => q(this, null, function* () {
+                onOk: () => z(this, null, function* () {
                   ($ && !O || O === "redirect") && L && (isURL(L) ? window.location.href = L : u(L));
                 })
               }) : (message.success(d(w)), ($ && !O || O === "redirect") && L && (isURL(L) ? window.location.href = L : u(L))));
             });
           },
           onCancel() {
-            return q(this, null, function* () {
+            return z(this, null, function* () {
               m.data.loading = !1;
             });
           }
@@ -29024,9 +29024,9 @@ const useCreateActionProps = () => {
   const e = useAPIClient(), t = useNavigateNoUpdate(), o = useFilterByTk(), n = useFieldSchema(), r = useCompile(), a = useForm(), { fields: i, getField: l } = useCollection_deprecated(), { field: c, resource: u, __parent: d, service: p } = useBlockRequestContext(), m = useRecord(), h = useCurrentUserContext(), g = (v = h == null ? void 0 : h.data) == null ? void 0 : v.data, f = useField(), { t: C } = useTranslation(), { setVisible: b } = useActionContext(), { modal: S } = App.useApp(), { getActiveFieldsName: y } = useFormActiveFields() || {};
   return {
     onClick() {
-      return q(this, null, function* () {
-        var V, z, G, U;
-        const { skipValidator: I, onSuccess: T, requestSettings: R } = (V = n == null ? void 0 : n["x-action-settings"]) != null ? V : {}, { manualClose: D, redirecting: B, redirectTo: N, successMessage: $, actionAfterSuccess: L } = T || {}, w = n == null ? void 0 : n["x-action"];
+      return z(this, null, function* () {
+        var E, V, G, U;
+        const { skipValidator: I, onSuccess: T, requestSettings: R } = (E = n == null ? void 0 : n["x-action-settings"]) != null ? E : {}, { manualClose: D, redirecting: B, redirectTo: N, successMessage: $, actionAfterSuccess: L } = T || {}, w = n == null ? void 0 : n["x-action"];
         if (!R.url)
           return;
         I !== !0 && w === "customize:form:request" && (yield a.submit());
@@ -29043,7 +29043,7 @@ const useCreateActionProps = () => {
           });
           Object.assign(k, Y);
         }
-        const E = {
+        const q = {
           url: renderTemplate(R.url, { currentRecord: m, currentUser: g }),
           method: R.method,
           headers: parse(O)({ currentRecord: m, currentUser: g }),
@@ -29052,9 +29052,9 @@ const useCreateActionProps = () => {
         };
         f.data = c.data || {}, f.data.loading = !0;
         try {
-          yield e.request(x({}, E)), f.data.loading = !1, u instanceof TableFieldResource || (G = (z = d == null ? void 0 : d.service) == null ? void 0 : z.refresh) == null || G.call(z), (U = p == null ? void 0 : p.refresh) == null || U.call(p), w === "customize:form:request" && (L === "previous" || !L && B !== !0) && (b == null || b(!1)), $ || (message.success(C("Saved successfully")), yield resetFormCorrectly(a), (B && !L || L === "redirect") && N && (isURL(N) ? window.location.href = N : t(N))), D ? S.success({
+          yield e.request(x({}, q)), f.data.loading = !1, u instanceof TableFieldResource || (G = (V = d == null ? void 0 : d.service) == null ? void 0 : V.refresh) == null || G.call(V), (U = p == null ? void 0 : p.refresh) == null || U.call(p), w === "customize:form:request" && (L === "previous" || !L && B !== !0) && (b == null || b(!1)), $ || (message.success(C("Saved successfully")), yield resetFormCorrectly(a), (B && !L || L === "redirect") && N && (isURL(N) ? window.location.href = N : t(N))), D ? S.success({
             title: r($),
-            onOk: () => q(this, null, function* () {
+            onOk: () => z(this, null, function* () {
               (B && !L || L === "redirect") && N && (isURL(N) ? window.location.href = N : t(N));
             })
           }) : message.success(r($));
@@ -29068,21 +29068,21 @@ const useCreateActionProps = () => {
   const e = useForm(), t = useFilterByTk(), { field: o, resource: n, __parent: r } = useBlockRequestContext(), { setVisible: a, setFormValueChanged: i } = useActionContext(), l = useFieldSchema(), c = useNavigateNoUpdate(), { fields: u, getField: d, name: p } = useCollection_deprecated(), m = useCompile(), h = useField(), { updateAssociationValues: g } = useFormBlockContext(), { modal: f } = App.useApp(), C = useParamsFromRecord(), b = useVariables$1(), S = useLocalVariables$1({ currentForm: e }), { getActiveFieldsName: y } = useFormActiveFields() || {};
   return {
     onClick(F, I) {
-      return q(this, null, function* () {
-        var z, G;
+      return z(this, null, function* () {
+        var V, G;
         const {
           assignedValues: T = {},
           onSuccess: R,
           overwriteValues: D,
           skipValidator: B,
           triggerWorkflows: N
-        } = (z = l == null ? void 0 : l["x-action-settings"]) != null ? z : {}, {
+        } = (V = l == null ? void 0 : l["x-action-settings"]) != null ? V : {}, {
           manualClose: $,
           redirecting: L,
           redirectTo: w,
           successMessage: O,
           actionAfterSuccess: j
-        } = R || {}, k = {}, M = Object.keys(T).map((U) => q(this, null, function* () {
+        } = R || {}, k = {}, M = Object.keys(T).map((U) => z(this, null, function* () {
           const H = T[U], Y = d(U);
           if (isVariable$1(H)) {
             const { value: J } = (yield b == null ? void 0 : b.parseVariable(H, S)) || {};
@@ -29091,11 +29091,11 @@ const useCreateActionProps = () => {
             H !== "" && (k[U] = H);
         }));
         yield Promise.all(M), B || (yield e.submit());
-        const E = u.map((U) => U.name), V = getFormValues({
+        const q = u.map((U) => U.name), E = getFormValues({
           filterByTk: t,
           field: o,
           form: e,
-          fieldNames: E,
+          fieldNames: q,
           getField: d,
           resource: n,
           actionFields: (y == null ? void 0 : y("form")) || []
@@ -29104,7 +29104,7 @@ const useCreateActionProps = () => {
         try {
           const U = yield n.update(P(x({
             filterByTk: t,
-            values: x(x(x({}, V), D), k)
+            values: x(x(x({}, E), D), k)
           }, C), {
             updateAssociationValues: g,
             // TODO(refactor): should change to inject by plugin
@@ -29119,7 +29119,7 @@ const useCreateActionProps = () => {
             return;
           $ ? f.success({
             title: m(O),
-            onOk: () => q(this, null, function* () {
+            onOk: () => z(this, null, function* () {
               yield e.reset(), (L && !j || j === "redirect") && H && (isURL(H) ? window.location.href = H : c(H));
             })
           }) : (message.success(m(O)), (L && !j || j === "redirect" || j === "redirect") && H && (isURL(H) ? window.location.href = H : c(H)));
@@ -29133,7 +29133,7 @@ const useCreateActionProps = () => {
   const e = useFilterByTk(), { resource: t, service: o, block: n, __parent: r } = useBlockRequestContext(), { setVisible: a, setSubmitted: i } = useActionContext(), l = useParamsFromRecord(), c = useFieldSchema();
   return {
     onClick(d, p) {
-      return q(this, null, function* () {
+      return z(this, null, function* () {
         var C, b, S, y, v, F, I;
         const { triggerWorkflows: m } = (C = c == null ? void 0 : c["x-action-settings"]) != null ? C : {};
         yield t.destroy(x({
@@ -29154,7 +29154,7 @@ const useCreateActionProps = () => {
   const t = useFilterByTk(), n = useAPIClient().resource(e, t);
   return {
     onClick(a) {
-      return q(this, null, function* () {
+      return z(this, null, function* () {
         yield n.remove({
           values: [a.id]
         });
@@ -29165,7 +29165,7 @@ const useCreateActionProps = () => {
   const e = useFilterByTk(), { resource: t, service: o, block: n, __parent: r } = useBlockRequestContext(), { setVisible: a, setSubmitted: i, setFormValueChanged: l } = useActionContext();
   return {
     onClick(u, d) {
-      return q(this, null, function* () {
+      return z(this, null, function* () {
         var g, f, C, b;
         yield t.remove({
           values: [e]
@@ -29181,7 +29181,7 @@ const useCreateActionProps = () => {
   const { field: e } = useBlockRequestContext(), { resource: t, service: o } = useBlockRequestContext(), { setSubmitted: n } = useActionContext(), r = useCollection_deprecated(), { filterTargetKey: a } = r;
   return {
     onClick(l, c) {
-      return q(this, null, function* () {
+      return z(this, null, function* () {
         var m, h, g, f, C, b, S;
         let u = (m = e.data) == null ? void 0 : m.selectedRowKeys;
         if (Array.isArray(a) && (u = e.data.selectedRowData.map((y) => {
@@ -29203,7 +29203,7 @@ const useCreateActionProps = () => {
   const { service: e } = useBlockRequestContext();
   return {
     onClick() {
-      return q(this, null, function* () {
+      return z(this, null, function* () {
         var o;
         (o = e == null ? void 0 : e.refresh) == null || o.call(e);
       });
@@ -29221,7 +29221,7 @@ const useCreateActionProps = () => {
       showSizeChanger: !1,
       align: "center",
       onChange(v) {
-        return q(this, null, function* () {
+        return z(this, null, function* () {
           var I, T;
           const F = (T = (I = e.service) == null ? void 0 : I.params) == null ? void 0 : T[0];
           e.service.run(P(x({}, F), { page: v }));
@@ -29250,7 +29250,7 @@ const useCreateActionProps = () => {
     showSizeChanger: !1,
     align: "center",
     onChange(y) {
-      return q(this, null, function* () {
+      return z(this, null, function* () {
         var F, I;
         const v = (I = (F = e.service) == null ? void 0 : F.params) == null ? void 0 : I[0];
         e.service.run(P(x({}, v), { page: y }));
@@ -29352,25 +29352,25 @@ const useCreateActionProps = () => {
         var U, H, Y, J;
         if (!O.find((K) => K.uid === k.uid))
           return;
-        const E = `${j}${t.name}`, V = ((U = k.service.params) == null ? void 0 : U[0]) || {};
+        const q = `${j}${t.name}`, E = ((U = k.service.params) == null ? void 0 : U[0]) || {};
         (Y = (H = k.service.params) == null ? void 0 : H[1]) != null && Y.filters || _.set(k.service.params, "[1].filters", {});
-        const z = k.service.params[1].filters;
+        const V = k.service.params[1].filters;
         if (w.length)
-          z[E] = {
+          V[q] = {
             [S]: w
           };
         else {
           if ((J = k.clearSelection) == null || J.call(k), k.dataLoadingMode === "manual")
             return k.clearData();
-          delete z[E];
+          delete V[q];
         }
-        const G = mergeFilter([...Object.values(z), k.defaultFilter]);
+        const G = mergeFilter([...Object.values(V), k.defaultFilter]);
         return k.doFilter(
-          P(x({}, V), {
+          P(x({}, E), {
             page: 1,
             filter: G
           }),
-          { filters: z }
+          { filters: V }
         );
       });
     },
@@ -29392,7 +29392,7 @@ const useCreateActionProps = () => {
         p = j;
         return;
       }
-      p = j.filter((E) => E.label.includes(M));
+      p = j.filter((q) => q.label.includes(M));
     };
   } else
     S = `${r}.${C}.$in`, p = (f == null ? void 0 : f.data) || [], m = (w) => {
@@ -29415,14 +29415,14 @@ const useCreateActionProps = () => {
   };
 };
 function doReset(n) {
-  return q(this, arguments, function* ({
+  return z(this, arguments, function* ({
     getDataBlocks: e,
     targets: t,
     uid: o
   }) {
     try {
       yield Promise.all(
-        e().map((r) => q(this, null, function* () {
+        e().map((r) => z(this, null, function* () {
           var u, d, p, m;
           if (!t.find((h) => h.uid === r.uid))
             return;
@@ -29561,7 +29561,7 @@ function getTargetField(e) {
   return o.slice(0, n);
 }
 function resetFormCorrectly(e) {
-  return q(this, null, function* () {
+  return z(this, null, function* () {
     untracked(() => {
       Object.keys(e.fields).forEach((t) => {
         isSubMode(e.fields[t]) && (e.fields[t].initialValue = null);
@@ -29575,7 +29575,7 @@ function appendQueryStringToUrl(e, t) {
 const useParseURLAndParams = () => {
   const e = useVariables$1(), t = useLocalVariables$1();
   return { parseURLAndParams: useCallback(
-    (n, r) => q(void 0, null, function* () {
+    (n, r) => z(void 0, null, function* () {
       const a = yield parseVariablesAndChangeParamsToQueryString({
         searchParams: r,
         variables: e,
@@ -29593,7 +29593,7 @@ function useLinkActionProps(e) {
   return {
     type: l,
     onClick() {
-      return q(this, null, function* () {
+      return z(this, null, function* () {
         if (!a) {
           message.warning(r("Please configure the URL"));
           return;
@@ -29605,7 +29605,7 @@ function useLinkActionProps(e) {
   };
 }
 function replaceVariableValue(e, t, o) {
-  return q(this, null, function* () {
+  return z(this, null, function* () {
     if (!e)
       return;
     const { evaluate: n } = evaluators.get("string"), { exp: r, scope: a } = yield replaceVariables(e, {
@@ -29620,14 +29620,14 @@ function replaceVariableValue(e, t, o) {
   });
 }
 function parseVariablesAndChangeParamsToQueryString(r) {
-  return q(this, arguments, function* ({
+  return z(this, arguments, function* ({
     searchParams: e,
     variables: t,
     localVariables: o,
     replaceVariableValue: n
   }) {
     const a = yield Promise.all(
-      e.map((u) => q(this, [u], function* ({ name: l, value: c }) {
+      e.map((u) => z(this, [u], function* ({ name: l, value: c }) {
         if (typeof c == "string") {
           if (isVariable$1(c)) {
             const { value: p } = (yield t.parseVariable(c, o)) || {};
@@ -29755,7 +29755,7 @@ const useSyncFromForm = (e, t, o) => {
   }, []);
   return {
     run() {
-      return q(this, null, function* () {
+      return z(this, null, function* () {
         var y;
         const f = /* @__PURE__ */ new Set([]), C = /* @__PURE__ */ new Set([]), b = (v, F) => {
           var I;
@@ -30982,7 +30982,7 @@ const useParseDefaultValue = () => {
     var F, I;
     if (g === "update" && t.default && e.form === f && ((I = e.setValue) == null || I.call(e, (F = r == null ? void 0 : r.data) == null ? void 0 : F[t.name])), t.default == null || i || l || isSubMode(t) || !(r != null && r.isNew) && !a)
       return;
-    const y = (...R) => q(void 0, [...R], function* ({ forceUpdate: T = !1 } = {}) {
+    const y = (...R) => z(void 0, [...R], function* ({ forceUpdate: T = !1 } = {}) {
       if (o && e && (isVariable$1(t.default) && e.value == null || e.value === t.default || T)) {
         e.loading = !0;
         const D = !t.name.toString().includes(".") && (d == null ? void 0 : d.getField(t.name)), {
@@ -31118,11 +31118,11 @@ function SchemaSettingsTemplate(e) {
     SchemaSettingsItem,
     {
       title: i("Convert reference to duplicate"),
-      onClick: () => q(this, null, function* () {
+      onClick: () => z(this, null, function* () {
         const S = yield C(d), y = g.removeWithoutEmit();
         g.insertAfterEnd(S, {
           onSuccess() {
-            return q(this, null, function* () {
+            return z(this, null, function* () {
               yield h.request({
                 url: `/uiSchemas:remove/${y["x-uid"]}`
               });
@@ -31136,7 +31136,7 @@ function SchemaSettingsTemplate(e) {
     SchemaSettingsItem,
     {
       title: i("Save as reference template"),
-      onClick: () => q(this, null, function* () {
+      onClick: () => z(this, null, function* () {
         u(!1);
         const S = o && l(o), y = yield FormDialog(
           i("Save as reference template"),
@@ -31505,7 +31505,7 @@ function AccessControl() {
         roles: l == null ? void 0 : l.data
       },
       beforeOpen: () => !l && i(),
-      onSubmit: (p) => q(this, [p], function* ({ roles: d }) {
+      onSubmit: (p) => z(this, [p], function* ({ roles: d }) {
         return yield n.set({ values: d.map((m) => m.name) }), yield c(), r.success(e("Saved successfully"));
       })
     }
@@ -31523,7 +31523,7 @@ const SchemaSettingAccessControl = {
     [t, o]
   );
   return { parseFilter: useCallback(
-    (a) => q(void 0, null, function* () {
+    (a) => z(void 0, null, function* () {
       const i = flatten(a, {
         breakOn({ key: c }) {
           return c.startsWith("$") && c !== "$and" && c !== "$or";
@@ -31533,7 +31533,7 @@ const SchemaSettingAccessControl = {
         }
       });
       return yield Promise.all(
-        Object.keys(i).map((c) => q(void 0, null, function* () {
+        Object.keys(i).map((c) => z(void 0, null, function* () {
           return i[c] = yield i[c], i[c] === void 0 && delete i[c], i[c];
         }))
       ), unflatten$1(i);
@@ -32034,7 +32034,7 @@ const createSubmitActionSettings = new SchemaSettings({
       "x-validator": validateJSON$1
     }
   }
-}, linkageAction = (c, u) => q(void 0, [c, u], function* ({
+}, linkageAction = (c, u) => z(void 0, [c, u], function* ({
   operator: e,
   field: t,
   condition: o,
@@ -35328,7 +35328,7 @@ const enabledIndexColumn$1 = {
     return {
       title: o("Enable index column"),
       checked: e.decoratorProps.enableIndexÏColumn !== !1,
-      onChange: (r) => q(void 0, null, function* () {
+      onChange: (r) => z(void 0, null, function* () {
         e.decoratorProps = e.decoratorProps || {}, e.decoratorProps.enableIndexÏColumn = r, t["x-decorator-props"].enableIndexÏColumn = r, n.emit("patch", {
           schema: {
             "x-uid": t["x-uid"],
@@ -35405,7 +35405,7 @@ const enabledIndexColumn$1 = {
         return {
           title: r("Enable drag and drop sorting"),
           checked: t.decoratorProps.dragSort,
-          onChange: (u) => q(void 0, null, function* () {
+          onChange: (u) => z(void 0, null, function* () {
             var d, p, m;
             if (u && l) {
               const { data: h } = yield c.resource("collections.fields", l.collectionName).update({
@@ -36588,7 +36588,7 @@ const enabledIndexColumn$1 = {
       title: a("Ellipsis overflow content"),
       checked: !!((c = i["x-component-props"]) != null && c.ellipsis),
       hidden: l,
-      onChange: (u) => q(this, null, function* () {
+      onChange: (u) => z(this, null, function* () {
         e && t ? t.forEach((d) => {
           d.componentProps.ellipsis = u;
         }) : n.componentProps.ellipsis = u, _.set(i, "x-component-props.ellipsis", u), yield r.emit("patch", {
@@ -36962,10 +36962,10 @@ const enabledIndexColumn$1 = {
   name: "fieldSettings:component:CascadeSelect",
   items: [fieldComponent$6, titleField$1, ellipsisSettingsItem, setTheDataScope]
 }), SchemaSettingsDateRange = function e(t) {
-  var T, R, D, B, N, $, L, w, O, j, k, M, E, V, z, G;
+  var T, R, D, B, N, $, L, w, O, j, k, M, q, E, V, G;
   const { fieldSchema: o } = t, n = useField(), { dn: r } = useDesignable(), { t: a } = useTranslation(), { getCollectionJoinField: i } = useCollectionManager_deprecated(), { isInSubForm: l, isInSubTable: c } = useFlag() || {}, u = i(o == null ? void 0 : o["x-collection-field"]) || {}, d = ((T = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : T.showTime) || ((D = (R = u == null ? void 0 : u.uiSchema) == null ? void 0 : R["x-component-props"]) == null ? void 0 : D.showTime) || !1, p = ((B = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : B.dateFormat) || (($ = (N = u == null ? void 0 : u.uiSchema) == null ? void 0 : N["x-component-props"]) == null ? void 0 : $.dateFormat) || "YYYY-MM-DD", m = ((L = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : L.timeFormat) || ((O = (w = u == null ? void 0 : u.uiSchema) == null ? void 0 : w["x-component-props"]) == null ? void 0 : O.timeFormat) || "HH:mm:ss", h = ((j = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : j.picker) || ((M = (k = u == null ? void 0 : u.uiSchema) == null ? void 0 : k["x-component-props"]) == null ? void 0 : M.picker) || "date";
   o["x-read-pretty"] || n.readOnly || n.readPretty;
-  const g = (E = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : E._minDate, f = (V = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : V._maxDate, C = ((z = u == null ? void 0 : u.uiSchema) == null ? void 0 : z["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 = (q = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : q._minDate, f = (E = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : E._maxDate, C = ((V = u == null ? void 0 : u.uiSchema) == null ? void 0 : V["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,
       {
@@ -37651,7 +37651,7 @@ const dividerSettings = new SchemaSettings({
     return {
       title: o("Enable index column"),
       checked: e.componentProps.enableIndexÏColumn !== !1,
-      onChange: (r) => q(void 0, null, function* () {
+      onChange: (r) => z(void 0, null, function* () {
         e.componentProps = e.componentProps || {}, e.componentProps.enableIndexÏColumn = r, t["x-component-props"].enableIndexÏColumn = r, n.emit("patch", {
           schema: {
             "x-uid": t["x-uid"],
@@ -38337,7 +38337,7 @@ const dividerSettings = new SchemaSettings({
 });
 class SchemaSettingsPlugin extends Plugin {
   load() {
-    return q(this, null, function* () {
+    return z(this, null, function* () {
       this.schemaSettingsManager.add(tableBlockSettings), this.schemaSettingsManager.add(createFormBlockSettings), this.schemaSettingsManager.add(editFormBlockSettings), this.schemaSettingsManager.add(filterFormBlockSettings), this.schemaSettingsManager.add(filterFormItemFieldSettings), this.schemaSettingsManager.add(multiDataDetailsBlockSettings), this.schemaSettingsManager.add(detailsWithPaginationSettings), this.schemaSettingsManager.add(singleDataDetailsBlockSettings), this.schemaSettingsManager.add(detailsBlockSettings), this.schemaSettingsManager.add(tableSelectorBlockSettings), this.schemaSettingsManager.add(listBlockSettings), this.schemaSettingsManager.add(gridCardBlockSettings), this.schemaSettingsManager.add(filterCollapseBlockSettings), this.schemaSettingsManager.add(markdownBlockSettings), this.schemaSettingsManager.add(addNewActionSettings), this.schemaSettingsManager.add(filterActionSettings), this.schemaSettingsManager.add(refreshActionSettings), this.schemaSettingsManager.add(viewActionSettings), this.schemaSettingsManager.add(editActionSettings), this.schemaSettingsManager.add(deleteActionSettings), this.schemaSettingsManager.add(disassociateActionSettings), this.schemaSettingsManager.add(associateActionSettings), this.schemaSettingsManager.add(bulkDeleteActionSettings), this.schemaSettingsManager.add(customizeAddRecordActionSettings), this.schemaSettingsManager.add(customizePopupActionSettings), this.schemaSettingsManager.add(customizeLinkActionSettings), this.schemaSettingsManager.add(customizeUpdateRecordActionSettings), this.schemaSettingsManager.add(createSubmitActionSettings), this.schemaSettingsManager.add(updateSubmitActionSettings), this.schemaSettingsManager.add(submitActionSettings), this.schemaSettingsManager.add(customizeSaveRecordActionSettings), this.schemaSettingsManager.add(addChildActionSettings), this.schemaSettingsManager.add(expendableActionSettings), this.schemaSettingsManager.add(fieldSettingsFormItem), this.schemaSettingsManager.add(tableColumnSettings), this.schemaSettingsManager.add(filterCollapseItemFieldSettings), this.schemaSettingsManager.add(selectComponentFieldSettings), this.schemaSettingsManager.add(filterSelectComponentFieldSettings), this.schemaSettingsManager.add(recordPickerComponentFieldSettings), this.schemaSettingsManager.add(filterRecordPickerComponentFieldSettings), this.schemaSettingsManager.add(subformComponentFieldSettings), this.schemaSettingsManager.add(subformPopoverComponentFieldSettings), this.schemaSettingsManager.add(subTablePopoverComponentFieldSettings), this.schemaSettingsManager.add(datePickerComponentFieldSettings), this.schemaSettingsManager.add(rangePickerPickerComponentFieldSettings), this.schemaSettingsManager.add(unixTimestampComponentFieldSettings), this.schemaSettingsManager.add(inputNumberComponentFieldSettings), this.schemaSettingsManager.add(inputComponentSettings), this.schemaSettingsManager.add(inputURLSettings), this.schemaSettingsManager.add(inputTextAreaSettings), this.schemaSettingsManager.add(inputJSONSettings), this.schemaSettingsManager.add(markdownSettings), this.schemaSettingsManager.add(markdownVditorSettings), this.schemaSettingsManager.add(richTextSettings), this.schemaSettingsManager.add(fileManagerComponentFieldSettings), this.schemaSettingsManager.add(tagComponentFieldSettings), this.schemaSettingsManager.add(cascadeSelectComponentFieldSettings), this.schemaSettingsManager.add(inputPreviewComponentFieldSettings), this.schemaSettingsManager.add(uploadAttachmentComponentFieldSettings), this.schemaSettingsManager.add(previewComponentFieldSettings), this.schemaSettingsManager.add(dividerSettings), this.schemaSettingsManager.add(timePickerComponentFieldSettings);
     });
   }
@@ -38443,7 +38443,7 @@ const variablesStore = {}, getFieldPath$1 = (e, t) => {
   const o = useRef({}), n = useAPIClient(), { getCollectionJoinField: r, getCollection: a } = useCollectionManager_deprecated(), i = useCompile(), { builtinVariables: l } = useBuiltInVariables(), c = useCallback((C) => {
     _.isFunction(C) ? o.current = C(o.current) : o.current = C;
   }, []), u = useCallback(
-    (C, b, S) => q(void 0, null, function* () {
+    (C, b, S) => z(void 0, null, function* () {
       var w, O;
       const y = C.split("."), v = y[0], F = mergeVariableToCollectionNameWithLocalVariables(variablesStore, b);
       let I = mergeCtxWithLocalVariables(o.current, b);
@@ -38459,11 +38459,11 @@ const variablesStore = {}, getFieldPath$1 = (e, t) => {
             dataSource: R,
             collectionName: $
           };
-        const k = y[j], M = y.slice(0, j + 1).join("."), { fieldPath: E } = getFieldPath$1(M, F), V = r(E, R), z = (O = a(B, R)) == null ? void 0 : O.getPrimaryKey();
+        const k = y[j], M = y.slice(0, j + 1).join("."), { fieldPath: q } = getFieldPath$1(M, F), E = r(q, R), V = (O = a(B, R)) == null ? void 0 : O.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[z]) != null && V != null && V.target) {
-              const H = `/${B}/${U[V.sourceKey || z]}/${k}:${getAction(V.type)}`;
+            if (!(S != null && S.doNotRequest) && shouldToRequest(U == null ? void 0 : U[k]) && (U == null ? void 0 : U[V]) != null && E != null && E.target) {
+              const H = `/${B}/${U[E.sourceKey || V]}/${k}:${getAction(E.type)}`;
               if (hasRequested(H))
                 return getRequested(H);
               const Y = n.request({
@@ -38477,9 +38477,9 @@ const variablesStore = {}, getFieldPath$1 = (e, t) => {
             }
             return U == null ? void 0 : U[k];
           });
-          I = removeThroughCollectionFields(_.flatten(yield Promise.all(G)), V);
-        } else if (!(S != null && S.doNotRequest) && shouldToRequest(I[k]) && I[z] != null && (V != null && V.target)) {
-          const G = `/${B}/${I[V.sourceKey || z]}/${k}:${getAction(V.type)}`;
+          I = removeThroughCollectionFields(_.flatten(yield Promise.all(G)), E);
+        } else if (!(S != null && S.doNotRequest) && shouldToRequest(I[k]) && I[V] != null && (E != null && E.target)) {
+          const G = `/${B}/${I[E.sourceKey || V]}/${k}:${getAction(E.type)}`;
           let U = null;
           if (hasRequested(G))
             U = yield getRequested(G);
@@ -38494,10 +38494,10 @@ const variablesStore = {}, getFieldPath$1 = (e, t) => {
             stashRequested(G, Y), U = yield Y, clearRequested(G);
           }
           const H = U.data.data;
-          I = removeThroughCollectionFields(H, V);
+          I = removeThroughCollectionFields(H, E);
         } else
-          I = removeThroughCollectionFields(getValuesByPath(I, k), V);
-        V != null && V.target && (B = V.target);
+          I = removeThroughCollectionFields(getValuesByPath(I, k), E);
+        E != null && E.target && (B = E.target);
       }
       const L = i(
         _.isFunction(I) ? I({ fieldOperator: S == null ? void 0 : S.fieldOperator, isParsingVariable: !0 }) : I
@@ -38535,7 +38535,7 @@ const variablesStore = {}, getFieldPath$1 = (e, t) => {
      * @param localVariables Local variables, will be cleared after parsing
      * @returns
      */
-    (C, b, S) => q(void 0, null, function* () {
+    (C, b, S) => z(void 0, null, function* () {
       if (!isVariable$1(C))
         return C;
       b && (b = _.isArray(b) ? b : [b]);
@@ -38546,7 +38546,7 @@ const variablesStore = {}, getFieldPath$1 = (e, t) => {
     }),
     [u]
   ), g = useCallback(
-    (C, b) => q(void 0, null, function* () {
+    (C, b) => z(void 0, null, function* () {
       var T;
       if (!isVariable$1(C))
         throw new Error(`VariablesProvider: ${C} is not a variable string`);
@@ -38908,7 +38908,7 @@ const ActionLink = withDynamicSchemaProps(
   };
 }, useA = () => ({
   run() {
-    return q(this, null, function* () {
+    return z(this, null, function* () {
     });
   }
 }), handleError = console.log, Action = withDynamicSchemaProps(
@@ -38959,7 +38959,7 @@ const ActionLink = withDynamicSchemaProps(
         return ((K = I == null ? void 0 : I["x-linkage-rules"]) == null ? void 0 : K.filter((X) => !X.disabled)) || [];
       },
       [I == null ? void 0 : I["x-linkage-rules"]]
-    ), { designable: N } = useDesignable(), $ = useComponent(n) || n, L = useVariables$1(), w = useLocalVariables$1(), { visibleWithURL: O, setVisibleWithURL: j } = usePopupUtils(), { setSubmitted: k } = useActionContext(), { getAriaLabel: M } = useGetAriaLabelOfAction(l), E = useCollectionParentRecordData(), V = useApp(), { getAllDataBlocks: z } = useAllDataBlocks(), G = useForm();
+    ), { designable: N } = useDesignable(), $ = useComponent(n) || n, L = useVariables$1(), w = useLocalVariables$1(), { visibleWithURL: O, setVisibleWithURL: j } = usePopupUtils(), { setSubmitted: k } = useActionContext(), { getAriaLabel: M } = useGetAriaLabelOfAction(l), q = useCollectionParentRecordData(), E = useApp(), { getAllDataBlocks: V } = useAllDataBlocks(), G = useForm();
     useEffect(() => {
       F.stateOfLinkageRules && setInitialActionState(F);
       const K = uid(), X = [];
@@ -38980,7 +38980,7 @@ const ActionLink = withDynamicSchemaProps(
                       conditionType: ee.conditionType,
                       variableNameOfLeftCondition: "$nRecord"
                     },
-                    V.jsonLogic
+                    E.jsonLogic
                   );
                 },
                 { fireImmediately: !0, equals: isEqual }
@@ -38999,11 +38999,11 @@ const ActionLink = withDynamicSchemaProps(
         C == null || C(K);
       },
       [C]
-    ), H = useMemo(() => c && ((K, X) => q(void 0, null, function* () {
+    ), H = useMemo(() => c && ((K, X) => z(void 0, null, function* () {
       var ee, oe;
       yield c == null ? void 0 : c(K, X);
       const Q = ((oe = (ee = I["x-action-settings"]) == null ? void 0 : ee.onSuccess) == null ? void 0 : oe.blocksToRefresh) || [];
-      Q.length > 0 && z().forEach((te) => {
+      Q.length > 0 && V().forEach((te) => {
         var se;
         if (Q.includes(te.uid))
           try {
@@ -39012,7 +39012,7 @@ const ActionLink = withDynamicSchemaProps(
             console.error("Failed to refresh block:", te.uid, ie);
           }
       });
-    })), [c, I, z]);
+    })), [c, I, V]);
     return /* @__PURE__ */ jsx(
       InternalAction,
       x({
@@ -39041,7 +39041,7 @@ const ActionLink = withDynamicSchemaProps(
         setVisibleWithURL: j,
         setSubmitted: k,
         getAriaLabel: M,
-        parentRecordData: E,
+        parentRecordData: q,
         actionCallback: h
       }, y)
     );
@@ -39105,7 +39105,7 @@ const ActionLink = withDynamicSchemaProps(
     "setSubmitted",
     "getAriaLabel",
     "parentRecordData"
-  ]), [w, O] = useState(!1), { wrapSSR: j, componentCls: k, hashId: M } = useStyles$8(), [E, V] = useState(!1), z = n["x-toolbar-props"] || n["x-designer-props"], G = (fe = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : fe.openMode, U = (pe = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : pe.openSize, H = (me = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : me.refreshDataBlockRequest, { modal: Y } = App.useApp(), J = useForm(), K = useACLActionParamsContext(), { run: X, element: Q, disabled: ee } = (I == null ? void 0 : I(T)) || {}, oe = J.disabled || a.disabled || ((he = a.data) == null ? void 0 : he.disabled) || F || ee, te = useMemo(() => {
+  ]), [w, O] = useState(!1), { wrapSSR: j, componentCls: k, hashId: M } = useStyles$8(), [q, E] = useState(!1), V = n["x-toolbar-props"] || n["x-designer-props"], G = (fe = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : fe.openMode, U = (pe = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : pe.openSize, H = (me = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : me.refreshDataBlockRequest, { modal: Y } = App.useApp(), J = useForm(), K = useACLActionParamsContext(), { run: X, element: Q, disabled: ee } = (I == null ? void 0 : I(T)) || {}, oe = J.disabled || a.disabled || ((he = a.data) == null ? void 0 : he.disabled) || F || ee, te = useMemo(() => {
     var ce;
     return P(x({}, v), {
       opacity: r && (((ce = a == null ? void 0 : a.data) == null ? void 0 : ce.hidden) || !K) && 0.1,
@@ -39121,7 +39121,7 @@ const ActionLink = withDynamicSchemaProps(
     buttonStyle: te,
     handleMouseEnter: c,
     tarComponent: u,
-    designerProps: z,
+    designerProps: V,
     componentCls: k,
     hashId: M,
     className: d,
@@ -39151,8 +39151,8 @@ const ActionLink = withDynamicSchemaProps(
       button: RenderButton(se),
       visible: w || R,
       setVisible: ie,
-      formValueChanged: E,
-      setFormValueChanged: V,
+      formValueChanged: q,
+      setFormValueChanged: E,
       openMode: G,
       openSize: U,
       containerRefKey: o,
@@ -39236,18 +39236,18 @@ const RenderButton = ({
   confirmTitle: D,
   title: B
 }) => {
-  const { getDataBlockRequest: N } = useDataBlockRequestGetter(), { t: $ } = useTranslation(), { isPopupVisibleControlledByURL: L } = usePopupSettings(), { openPopup: w } = usePopupUtils(), O = useVariables$1(), j = useLocalVariables$1(), k = useRef(null), M = useCompile(), E = useForm();
+  const { getDataBlockRequest: N } = useDataBlockRequestGetter(), { t: $ } = useTranslation(), { isPopupVisibleControlledByURL: L } = usePopupSettings(), { openPopup: w } = usePopupUtils(), O = useVariables$1(), j = useLocalVariables$1(), k = useRef(null), M = useCompile(), q = useForm();
   k.current = w;
-  const V = {
+  const E = {
     variables: O,
     localVariables: j
-  }, z = useCallback(
-    (G, U = !0) => q(void 0, null, function* () {
+  }, V = useCallback(
+    (G, U = !0) => z(void 0, null, function* () {
       var J;
       if (U && isPortalInBody(G.target))
         return;
       G.preventDefault(), G.stopPropagation();
-      const H = yield getVariableValue($(I == null ? void 0 : I.title, { title: M(y.title) }), V), Y = yield getVariableValue($(I == null ? void 0 : I.content, { title: M(y.title) }), V);
+      const H = yield getVariableValue($(I == null ? void 0 : I.title, { title: M(y.title) }), E), Y = yield getVariableValue($(I == null ? void 0 : I.content, { title: M(y.title) }), E);
       if (!a && o) {
         const K = () => {
           b ? b(G, () => {
@@ -39255,7 +39255,7 @@ const RenderButton = ({
             S !== !1 && (R == null || R(!0), (Q = (X = N()) == null ? void 0 : X.refresh) == null || Q.call(X));
           }) : isBulkEditAction(y) || !L() ? (v(!0), F == null || F()) : ["view", "update", "create", "customize:popup"].includes(y["x-action"]) && y["x-uid"] ? k.current() : (v(!0), F == null || F());
         };
-        (I == null ? void 0 : I.enable) !== !1 && (I != null && I.content) ? (yield (J = E == null ? void 0 : E.submit) == null ? void 0 : J.call(E), T.confirm({
+        (I == null ? void 0 : I.enable) !== !1 && (I != null && I.content) ? (yield (J = q == null ? void 0 : q.submit) == null ? void 0 : J.call(q), T.confirm({
           title: $(H, { title: D || B || (t == null ? void 0 : t.title) }),
           content: $(Y, { title: D || B || (t == null ? void 0 : t.title) }),
           onOk: K
@@ -39295,7 +39295,7 @@ const RenderButton = ({
       buttonStyle: i,
       handleMouseEnter: l,
       getAriaLabel: g,
-      handleButtonClick: z,
+      handleButtonClick: V,
       tarComponent: c,
       componentCls: d,
       hashId: p,
@@ -39355,8 +39355,8 @@ const RenderButtonInner = observer$1(
       "onlyIcon"
     ]), { t: I } = useTranslation(), T = useCallback(
       debounce$1(
-        (M, E = !0) => {
-          d(M, E);
+        (M, q = !0) => {
+          d(M, q);
         },
         300,
         { leading: !0, trailing: !1 }
@@ -39369,10 +39369,10 @@ const RenderButtonInner = observer$1(
       return null;
     const R = S != null ? S : o == null ? void 0 : o.title, D = typeof R == "string" ? I(R, { ns: NAMESPACE_UI_SCHEMA }) : R, j = l, { opacity: B } = j, N = W(j, ["opacity"]), $ = y && B ? { opacity: B } : void 0, L = React.forwardRef(
       (H, U) => {
-        var Y = H, { component: M = p || Button, icon: E, onlyIcon: V, children: z } = Y, G = W(Y, ["component", "icon", "onlyIcon", "children"]);
+        var Y = H, { component: M = p || Button, icon: q, onlyIcon: E, children: V } = Y, G = W(Y, ["component", "icon", "onlyIcon", "children"]);
         return /* @__PURE__ */ jsxs(M, P(x({ ref: U }, G), { children: [
-          V ? /* @__PURE__ */ jsx(Tooltip, { title: G.title, children: /* @__PURE__ */ jsx("span", { children: E && typeof E == "string" ? /* @__PURE__ */ jsx(Icon, { type: E }) : E }) }) : /* @__PURE__ */ jsx("span", { children: E && typeof E == "string" ? /* @__PURE__ */ jsx(Icon, { type: E }) : E }),
-          V ? z[1] : z
+          E ? /* @__PURE__ */ jsx(Tooltip, { title: G.title, children: /* @__PURE__ */ jsx("span", { children: q && typeof q == "string" ? /* @__PURE__ */ jsx(Icon, { type: q }) : q }) }) : /* @__PURE__ */ jsx("span", { children: q && typeof q == "string" ? /* @__PURE__ */ jsx(Icon, { type: q }) : q }),
+          E ? V[1] : V
         ] }));
       }
     );
@@ -39474,7 +39474,7 @@ const ActionBarContext = React.createContext({
     [r, o, a]
   ) };
 }, requestChartData = (e) => function() {
-  return q(this, null, function* () {
+  return z(this, null, function* () {
     var t;
     try {
       const o = yield this.api.request(e);
@@ -39504,7 +39504,7 @@ const Form$1 = observer$1(
       {
         uid: i["x-uid"],
         onSuccess(h) {
-          return q(this, null, function* () {
+          return z(this, null, function* () {
             yield c.reset(), c.setValues(h == null ? void 0 : h.data), c.setInitialValues(h == null ? void 0 : h.data);
           });
         }
@@ -39791,7 +39791,7 @@ Select.ReadPretty = ReadPretty$b;
 const getValues = (e, t) => castArray(e).filter((o) => o != null).map((o) => typeof o == "object" ? o[t.value] : o), ReadPretty$a = observer$1(
   (e) => {
     const t = x(x({}, defaultFieldNames$1), e.fieldNames), o = useField(), n = useFieldSchema(), r = useRecord(), { snapshot: a } = useActionContext(), { data: i } = useRequest(
-      a ? () => q(void 0, null, function* () {
+      a ? () => z(void 0, null, function* () {
         return {
           data: r[n.name]
         };
@@ -39902,13 +39902,13 @@ const getValues = (e, t) => castArray(e).filter((o) => o != null).map((o) => typ
           debounceWait: n,
           onSuccess: f
         }, o.defaultParams ? { defaultParams: [o.defaultParams] } : {})
-      ), E = useMemo(
+      ), q = useMemo(
         () => JSON.stringify({
           service: o,
           fieldNames: t
         }),
         [o, t]
-      ), V = useCallback(() => T.current && d ? /* @__PURE__ */ jsx(
+      ), E = useCallback(() => T.current && d ? /* @__PURE__ */ jsx(
         d,
         {
           search: T.current,
@@ -39919,8 +39919,8 @@ const getValues = (e, t) => castArray(e).filter((o) => o != null).map((o) => typ
       ) : null, [T.current]);
       useEffect(() => {
         y.current && k();
-      }, [E]);
-      const z = (K) => q(void 0, null, function* () {
+      }, [q]);
+      const V = (K) => z(void 0, null, function* () {
         var X;
         k({
           filter: mergeFilter([
@@ -39948,7 +39948,7 @@ const getValues = (e, t) => castArray(e).filter((o) => o != null).map((o) => typ
           filterOption: !1,
           filterSort: null,
           fieldNames: t,
-          onSearch: z,
+          onSearch: V,
           onDropdownVisibleChange: (K) => {
             T.current = null, K && k(), y.current = !0;
           },
@@ -39964,7 +39964,7 @@ const getValues = (e, t) => castArray(e).filter((o) => o != null).map((o) => typ
             return /* @__PURE__ */ jsx(Fragment$1, { children: F ? /* @__PURE__ */ jsxs(Fragment$1, { children: [
               !((j == null ? void 0 : j.data.length) === 0 && (T != null && T.current)) && K,
               (j == null ? void 0 : j.data.length) > 0 && (T == null ? void 0 : T.current) && !X && /* @__PURE__ */ jsx(Divider$1, { style: { margin: 0 } }),
-              !X && /* @__PURE__ */ jsx(V, {})
+              !X && /* @__PURE__ */ jsx(E, {})
             ] }) : K });
           }
         })
@@ -40031,9 +40031,9 @@ const useFormDataTemplates = () => {
     alignItems: "center",
     backgroundColor: o.colorFillAlter,
     padding: o.padding
-  }, e), [e, o.colorFillAlter]), S = useMemo(() => ({ fontSize: o.fontSize, fontWeight: "bold", whiteSpace: "nowrap", marginRight: o.marginXS }), [o.fontSize, o.marginXS]), y = useCallback((I) => q(void 0, null, function* () {
+  }, e), [e, o.colorFillAlter]), S = useMemo(() => ({ fontSize: o.fontSize, fontWeight: "bold", whiteSpace: "nowrap", marginRight: o.marginXS }), [o.fontSize, o.marginXS]), y = useCallback((I) => z(void 0, null, function* () {
     d(I), m(null), t == null || t.reset();
-  }), []), v = useCallback((I, T, R) => q(void 0, null, function* () {
+  }), []), v = useCallback((I, T, R) => z(void 0, null, function* () {
     const D = P(x({}, T), { dataId: I });
     m(T), fetchTemplateData(h, D, R).then((B) => (t && B && (t.reset(), t.__template = !0, forEach(B, (N, $) => {
       var L;
@@ -40088,7 +40088,7 @@ function findDataTemplates(e) {
   return t ? _.cloneDeep(t["x-data-templates"]) || {} : {};
 }
 function fetchTemplateData(e, t, o) {
-  return q(this, null, function* () {
+  return z(this, null, function* () {
     if (!(t.fields.length === 0 || !t.dataId))
       return e.resource(t.collection, void 0, o).get({
         filterByTk: t.dataId,
@@ -40572,7 +40572,7 @@ const useSystemSettings = () => useContext(SystemSettingsContext), SystemSetting
   const { setVisible: e } = useActionContext();
   return {
     run() {
-      return q(this, null, function* () {
+      return z(this, null, function* () {
         e(!1);
       });
     }
@@ -40586,7 +40586,7 @@ const useSystemSettings = () => useContext(SystemSettingsContext), SystemSetting
   const { setVisible: e } = useActionContext(), t = useForm(), { mutate: o, data: n } = useSystemSettings() || {}, r = useAPIClient(), { t: a } = useTranslation();
   return {
     run() {
-      return q(this, null, function* () {
+      return z(this, null, function* () {
         var u;
         yield t.submit();
         const l = cloneDeep(t.values);
@@ -40707,7 +40707,7 @@ const useSystemSettings = () => useContext(SystemSettingsContext), SystemSetting
 ) });
 class SystemSettingsPlugin extends Plugin {
   load() {
-    return q(this, null, function* () {
+    return z(this, null, function* () {
       this.app.use(SystemSettingsProvider, this.options);
     });
   }
@@ -40743,7 +40743,7 @@ const RemoteDocumentTitleProvider = (e) => {
 };
 class RemoteDocumentTitlePlugin extends Plugin {
   load() {
-    return q(this, null, function* () {
+    return z(this, null, function* () {
       this.app.use(RemoteDocumentTitleProvider, this.options);
     });
   }
@@ -40830,7 +40830,7 @@ const insertPositionToMethod = {
             }
           }
         },
-        onSubmit: (g) => q(void 0, [g], function* ({ title: m, icon: h }) {
+        onSubmit: (g) => z(void 0, [g], function* ({ title: m, icon: h }) {
           var y, v;
           const f = a.__route__, C = (y = a.parent) == null ? void 0 : y.__route__, b = uid(), { data: S } = yield u({
             type: NocoBaseDesktopRouteType.group,
@@ -40872,7 +40872,7 @@ const insertPositionToMethod = {
             }
           }
         },
-        onSubmit: (g) => q(void 0, [g], function* ({ title: m, icon: h }) {
+        onSubmit: (g) => z(void 0, [g], function* ({ title: m, icon: h }) {
           var I, T;
           const f = a.__route__, C = (I = a.parent) == null ? void 0 : I.__route__, b = uid(), S = uid(), y = uid(), v = uid(), { data: F } = yield u({
             type: NocoBaseDesktopRouteType.page,
@@ -40925,7 +40925,7 @@ const insertPositionToMethod = {
             params: l
           }
         },
-        onSubmit: (C) => q(void 0, [C], function* ({ title: m, icon: h, href: g, params: f }) {
+        onSubmit: (C) => z(void 0, [C], function* ({ title: m, icon: h, href: g, params: f }) {
           var F, I;
           const b = a.__route__, S = (F = a.parent) == null ? void 0 : F.__route__, y = uid(), { data: v } = yield u(
             {
@@ -41069,9 +41069,9 @@ const insertPositionToMethod = {
       }
     }
   }), [h, l]), { moveRoute: I } = useNocoBaseRoutes(), T = useCallback(
-    (L) => q(void 0, [L], function* ({ target: N, position: $ }) {
-      var E;
-      const [w] = ((E = N == null ? void 0 : N.split) == null ? void 0 : E.call(N, "||")) || [];
+    (L) => z(void 0, [L], function* ({ target: N, position: $ }) {
+      var q;
+      const [w] = ((q = N == null ? void 0 : N.split) == null ? void 0 : q.call(N, "||")) || [];
       if (!w)
         return;
       const O = findByUid(c, w), j = createDesignable({
@@ -41137,7 +41137,7 @@ const insertPositionToMethod = {
               "After hiding, this menu will no longer appear in the menu bar. To show it again, you need to go to the route management page to configure it."
             ),
             onOk() {
-              return q(this, null, function* () {
+              return z(this, null, function* () {
                 var L;
                 n["x-component-props"].hidden = !!N, o.componentProps.hidden = !!N, (L = n.__route__) != null && L.id && (yield e(n.__route__.id, {
                   hideInMenu: !!N
@@ -41323,7 +41323,7 @@ const insertPositionToMethod = {
 ParentRouteContext.displayName = "ParentRouteContext";
 const useParentRoute = () => useContext(ParentRouteContext), useNocoBaseRoutes = (e = "desktopRoutes") => {
   const t = useAPIClient(), o = useMemo(() => t.resource(e), [t, e]), { refresh: n } = useAllAccessDesktopRoutes(), r = useCallback(
-    (c, u = !0) => q(void 0, null, function* () {
+    (c, u = !0) => z(void 0, null, function* () {
       const d = yield o.create({
         values: c
       });
@@ -41331,7 +41331,7 @@ const useParentRoute = () => useContext(ParentRouteContext), useNocoBaseRoutes =
     }),
     [o, n]
   ), a = useCallback(
-    (c, u, d = !0) => q(void 0, null, function* () {
+    (c, u, d = !0) => z(void 0, null, function* () {
       const p = yield o.update({
         filterByTk: c,
         values: u
@@ -41340,7 +41340,7 @@ const useParentRoute = () => useContext(ParentRouteContext), useNocoBaseRoutes =
     }),
     [o, n]
   ), i = useCallback(
-    (c, u = !0) => q(void 0, null, function* () {
+    (c, u = !0) => z(void 0, null, function* () {
       const d = yield o.destroy({
         filterByTk: c
       });
@@ -41348,7 +41348,7 @@ const useParentRoute = () => useContext(ParentRouteContext), useNocoBaseRoutes =
     }),
     [n, o]
   ), l = useCallback(
-    (f) => q(void 0, [f], function* ({
+    (f) => z(void 0, [f], function* ({
       sourceId: c,
       targetId: u,
       targetScope: d,
@@ -41660,7 +41660,7 @@ const MenuURLButton = ({ href: e, params: t, icon: o }) => {
   var u;
   const n = useField(), r = useFieldSchema(), { t: a } = useMenuTranslation(), i = useContext(MenuItemDesignerContext), { parseURLAndParams: l } = useParseURLAndParams(), c = useRef(e);
   return useEffect(() => {
-    q(void 0, null, function* () {
+    z(void 0, null, function* () {
       try {
         c.current = yield l(e, t || []);
       } catch (p) {
@@ -41966,7 +41966,7 @@ const className1 = css`
       icon: /* @__PURE__ */ jsx(PlusOutlined, {}),
       className: "addTabBtn",
       type: "dashed",
-      onClick: () => q(void 0, null, function* () {
+      onClick: () => z(void 0, null, function* () {
         const F = yield FormDialog(
           n("Add tab"),
           () => /* @__PURE__ */ jsx(SchemaComponentOptions, { scope: p.scope, components: x({}, p.components), children: /* @__PURE__ */ jsx(FormLayout, { layout: "vertical", children: /* @__PURE__ */ jsx(
@@ -42212,7 +42212,7 @@ const pageSettings = new SchemaSettings({
           title: t("Enable page tabs"),
           checked: n.enableTabs,
           onChange(i) {
-            return q(this, null, function* () {
+            return z(this, null, function* () {
               yield r(n.id, {
                 enableTabs: i
               }), o["x-component-props"] = o["x-component-props"] || {}, o["x-component-props"].enablePageTabs = i, e.emit("patch", {
@@ -42282,7 +42282,7 @@ const pageSettings = new SchemaSettings({
                 "After hiding, this tab will no longer appear in the tab bar. To show it again, you need to go to the route management page to set it."
               ),
               onOk() {
-                return q(this, null, function* () {
+                return z(this, null, function* () {
                   yield t(o.id, {
                     hideInMenu: !!n
                   });
@@ -42311,7 +42311,7 @@ const pageSettings = new SchemaSettings({
               content: o("Are you sure you want to delete it?")
             }, confirm), {
               onOk() {
-                return q(this, null, function* () {
+                return z(this, null, function* () {
                   yield n(r.id), t.emit("remove", {
                     removed: {
                       "x-uid": r.schemaUid
@@ -42339,7 +42339,7 @@ const pageSettings = new SchemaSettings({
 };
 class AntdSchemaComponentPlugin extends Plugin {
   load() {
-    return q(this, null, function* () {
+    return z(this, null, function* () {
       this.addComponents(), this.addScopes(), this.addSchemaSettings();
     });
   }
@@ -42410,7 +42410,7 @@ const AppendsTreeSelect = (e) => {
     const w = S.getCollection($);
     return w ? w.getAllFields(L) : [];
   }, v = Object.values(m), F = useMemo(() => e.multiple ? (o || []).map(($) => m[$]).filter(Boolean) : o, [o, e.multiple, m]), I = useCallback(
-    ($) => q(void 0, null, function* () {
+    ($) => z(void 0, null, function* () {
       if (c != null)
         return c($);
       if (!$.isLeaf && $.loadChildren) {
@@ -42444,8 +42444,8 @@ const AppendsTreeSelect = (e) => {
           break;
         }
         if (!j.isLeaf && j.loadChildren) {
-          const E = j.loadChildren(j);
-          E != null && E.length && (L.push(...E), j = E.find((V) => V.value === O.slice(0, k + 1).join(".")));
+          const q = j.loadChildren(j);
+          q != null && q.length && (L.push(...q), j = q.find((E) => E.value === O.slice(0, k + 1).join(".")));
         }
       }
     }), h((w) => L.reduce((O, j) => Object.assign(O, { [j.value]: j }), x({}, w)));
@@ -42537,15 +42537,15 @@ const InternalAssociationSelect$1 = observer$1(
       const N = uid();
       return f.addEffects(N, () => {
         onFieldInputValueChange("*", ($) => {
-          var j, k, M, E, V, z;
+          var j, k, M, q, E, V;
           const L = filterAnalyses((M = (k = (j = r.componentProps) == null ? void 0 : j.service) == null ? void 0 : k.params) == null ? void 0 : M.filter) || [], w = getFieldPath($.address.entire), O = getFieldPath(r.address.entire);
-          L.includes((E = $ == null ? void 0 : $.props) == null ? void 0 : E.name) && r.value && isEqual($ == null ? void 0 : $.indexes, r == null ? void 0 : r.indexes) && ((V = $ == null ? void 0 : $.props) == null ? void 0 : V.name) !== r.props.name && (!((z = r == null ? void 0 : r.indexes) != null && z.length) || isEqual(w, O)) && (r.setValue(null), p(null));
+          L.includes((q = $ == null ? void 0 : $.props) == null ? void 0 : q.name) && r.value && isEqual($ == null ? void 0 : $.indexes, r == null ? void 0 : r.indexes) && ((E = $ == null ? void 0 : $.props) == null ? void 0 : E.name) !== r.props.name && (!((V = r == null ? void 0 : r.indexes) != null && V.length) || isEqual(w, O)) && (r.setValue(null), p(null));
         });
       }), () => {
         f.removeEffects(N);
       };
     }, []);
-    const T = (N) => q(void 0, null, function* () {
+    const T = (N) => z(void 0, null, function* () {
       var O, j;
       const { search: $, callBack: L } = N, {
         data: { data: w }
@@ -43633,14 +43633,14 @@ const InternalFileManager = (e) => {
           let O = p(w[y.label]);
           if ((j = v == null ? void 0 : v.uiSchema) != null && j.enum)
             if (Array.isArray(O))
-              O = O.map((E, V) => {
+              O = O.map((q, E) => {
                 var G, U;
-                const z = (U = (G = v.uiSchema.enum).find) == null ? void 0 : U.call(G, (H) => H.value === E);
-                return z ? /* @__PURE__ */ jsx(Tag, { color: z.color, style: { marginRight: 3 }, children: (z == null ? void 0 : z.label) || E }, V) : /* @__PURE__ */ jsx(Tag, { children: E }, E);
+                const V = (U = (G = v.uiSchema.enum).find) == null ? void 0 : U.call(G, (H) => H.value === q);
+                return V ? /* @__PURE__ */ jsx(Tag, { color: V.color, style: { marginRight: 3 }, children: (V == null ? void 0 : V.label) || q }, E) : /* @__PURE__ */ jsx(Tag, { children: q }, q);
               }).reverse();
             else {
-              const E = (M = (k = v.uiSchema.enum).find) == null ? void 0 : M.call(k, (V) => V.value === O);
-              E && (O = /* @__PURE__ */ jsx(Tag, { color: E.color, children: E.label }));
+              const q = (M = (k = v.uiSchema.enum).find) == null ? void 0 : M.call(k, (E) => E.value === O);
+              q && (O = /* @__PURE__ */ jsx(Tag, { color: q.color, children: q.label }));
             }
           return (v == null ? void 0 : v.type) === "date" && (O = dayjs(O).format("YYYY-MM-DD")), o ? o({
             [y.label]: O || EMPTY,
@@ -43655,7 +43655,7 @@ const InternalFileManager = (e) => {
       }
     },
     [v == null ? void 0 : v.uiSchema, y]
-  ), R = (L) => q(void 0, null, function* () {
+  ), R = (L) => z(void 0, null, function* () {
     var O, j;
     const w = yield C.list({
       pageSize: 200,
@@ -43664,7 +43664,7 @@ const InternalFileManager = (e) => {
       tree: L.parentId ? void 0 : !0
     });
     return (j = w == null ? void 0 : w.data) == null ? void 0 : j.data;
-  }), D = (L, w, O) => q(void 0, null, function* () {
+  }), D = (L, w, O) => z(void 0, null, function* () {
     const j = yield R({ parentId: w == null ? void 0 : w.id }), k = [...a];
     if (k.splice(O + 1), k[O] = P(x({}, k[O]), { value: w }), w != null && w.id && (k[O + 1] = { key: w == null ? void 0 : w.id, children: (j == null ? void 0 : j.length) > 0 ? j : null }), i(k), ["o2m", "m2m"].includes(g.interface)) {
       const M = Array.isArray(f.fieldValue) ? f.fieldValue : [];
@@ -43672,17 +43672,17 @@ const InternalFileManager = (e) => {
     } else
       f.value = w;
     k.length === 1 && !k[0].value ? n == null || n(null) : n == null || n(k);
-  }), B = (L, w, O) => q(void 0, null, function* () {
+  }), B = (L, w, O) => z(void 0, null, function* () {
     var j, k, M;
     if (L) {
       d(!0);
-      const E = yield R({ parentId: w == null ? void 0 : w.key });
-      if (d(!1), c(E), O === (a == null ? void 0 : a.length) - 1 && ((j = w == null ? void 0 : w.value) != null && j.id)) {
-        const V = yield R({ parentId: (k = w == null ? void 0 : w.value) == null ? void 0 : k.id }), z = [...a];
-        z.splice(O + 1), z[O] = P(x({}, z[O]), { value: w == null ? void 0 : w.value }), z[O + 1] = { key: (M = w == null ? void 0 : w.value) == null ? void 0 : M.id, children: (V == null ? void 0 : V.length) > 0 ? V : null }, i(z), n == null || n(z);
+      const q = yield R({ parentId: w == null ? void 0 : w.key });
+      if (d(!1), c(q), O === (a == null ? void 0 : a.length) - 1 && ((j = w == null ? void 0 : w.value) != null && j.id)) {
+        const E = yield R({ parentId: (k = w == null ? void 0 : w.value) == null ? void 0 : k.id }), V = [...a];
+        V.splice(O + 1), V[O] = P(x({}, V[O]), { value: w == null ? void 0 : w.value }), V[O + 1] = { key: (M = w == null ? void 0 : w.value) == null ? void 0 : M.id, children: (E == null ? void 0 : E.length) > 0 ? E : null }, i(V), n == null || n(V);
       }
     }
-  }), N = (L, w) => q(void 0, null, function* () {
+  }), N = (L, w) => z(void 0, null, function* () {
     const O = L ? {
       [y.label]: {
         [F]: L
@@ -43713,7 +43713,7 @@ const InternalFileManager = (e) => {
         onSearch: (M) => N(M, L),
         fieldNames: y,
         style: { minWidth: 150 },
-        onChange: (M, E) => D(M, E, w),
+        onChange: (M, q) => D(M, q, w),
         options: u ? [] : T(l),
         onDropdownVisibleChange: (M) => B(M, L, w),
         notFoundContent: u ? /* @__PURE__ */ jsx(Spin, { size: "small" }) : null
@@ -43957,9 +43957,9 @@ const InternalNesterCardCss = css`
   (e) => {
     var j;
     const O = e, { value: t, multiple: o, openSize: n, onChange: r, quickUpload: a, selectFile: i, shouldMountElement: l } = O, c = W(O, ["value", "multiple", "openSize", "onChange", "quickUpload", "selectFile", "shouldMountElement"]), u = useField(), d = useFieldNames$1(e), [p, m] = useState(!1), h = useFieldSchema(), g = useInsertSchema$1("Selector"), { options: f } = useAssociationFieldContext(), { collectionName: C } = useFormBlockContext(), b = useCompile(), S = useLabelUiSchema$1(f, (d == null ? void 0 : d.label) || "label"), y = h["x-add-new"], [v, F] = useState([]), I = useCollectionRecordData(), T = useMemo(() => t && Object.keys(t).length > 0 ? (Array.isArray(t) ? t : t ? [t] : []).filter(Boolean).map((M) => {
-      const E = M == null ? void 0 : M[d.label];
+      const q = M == null ? void 0 : M[d.label];
       return P(x({}, M), {
-        [d.label]: getLabelFormatValue$1(b(S), b(E))
+        [d.label]: getLabelFormatValue$1(b(S), b(q))
       });
     }) : [], [t, d == null ? void 0 : d.label]), R = {
       size: "small",
@@ -43978,13 +43978,13 @@ const InternalNesterCardCss = css`
       var k;
       return o == null ? null : Array.isArray(t) ? (k = t.filter(Boolean)) == null ? void 0 : k.map((M) => M == null ? void 0 : M[d.value]) : t == null ? void 0 : t[d.value];
     }, N = () => {
-      const k = (f == null ? void 0 : f.targetKey) || "id", M = T.map((V) => V[k]).filter(Boolean);
+      const k = (f == null ? void 0 : f.targetKey) || "id", M = T.map((E) => E[k]).filter(Boolean);
       return M.length ? { $and: [{ [`${k}.$ne`]: M }] } : {};
     }, $ = () => {
-      const { setVisible: k } = useActionContext(), { multiple: M, selectedRows: E, onChange: V, options: z, collectionField: G } = useContext(RecordPickerContext);
+      const { setVisible: k } = useActionContext(), { multiple: M, selectedRows: q, onChange: E, options: V, collectionField: G } = useContext(RecordPickerContext);
       return {
         onClick() {
-          V(M ? unionBy(E, z, (G == null ? void 0 : G.targetKey) || "id") : (E == null ? void 0 : E[0]) || null), k(!1);
+          E(M ? unionBy(q, V, (G == null ? void 0 : G.targetKey) || "id") : (q == null ? void 0 : q[0]) || null), k(!1);
         },
         style: {
           display: M === !1 ? "none" : "block"
@@ -44023,7 +44023,7 @@ const InternalNesterCardCss = css`
                     r([]), F([]);
                     return;
                   }
-                  const M = T == null ? void 0 : T.filter((E) => k.includes(E[d.value]));
+                  const M = T == null ? void 0 : T.filter((q) => k.includes(q[d.value]));
                   r(M), F(M);
                 }
               } else {
@@ -44489,30 +44489,32 @@ const defaultModeToComponent = {
 };
 var AssignedFieldValueType = /* @__PURE__ */ ((e) => (e.ConstantValue = "constantValue", e.DynamicValue = "dynamicValue", e))(AssignedFieldValueType || {});
 const AssignedFieldInner = (e) => {
-  const { value: t, onChange: o } = e, { getCollectionFields: n, getAllCollectionsInheritChain: r } = useCollectionManager_deprecated(), a = useCollection_deprecated(), { form: i } = useFormBlockContext(), l = useFieldSchema(), c = useRecord(), u = useVariables$1(), d = useLocalVariables$1(), p = useCollectionFilterOptions(a), { name: m, getField: h } = a, g = h(l.name), f = useMemo(
-    () => getShouldChange({ collectionField: g, variables: u, localVariables: d, getAllCollectionsInheritChain: r }),
-    [g, r, d, u]
-  ), C = useCallback(
-    (S) => {
-      const y = S.find((F) => F.value === "$nForm"), v = n(m);
-      return !(v != null && v.length) && y && (y.children = formatVariableScop(p)), S;
+  const { value: t, onChange: o } = e, { getCollectionFields: n, getAllCollectionsInheritChain: r } = useCollectionManager_deprecated(), a = useCollection_deprecated(), { form: i } = useFormBlockContext(), l = useFieldSchema(), c = useField(), u = useRecord(), d = useVariables$1(), p = useLocalVariables$1(), m = useCollectionFilterOptions(a), { name: h, getField: g } = a, f = g(l.name), { uiSchema: C } = useCollectionField_deprecated(), b = useMemo(
+    () => getShouldChange({ collectionField: f, variables: d, localVariables: p, getAllCollectionsInheritChain: r }),
+    [f, r, p, d]
+  ), S = useCallback(
+    (v) => {
+      const F = v.find((T) => T.value === "$nForm"), I = n(h);
+      return !(I != null && I.length) && F && (F.children = formatVariableScop(m)), v;
     },
-    [p, m]
-  ), b = useCallback(
-    ({ value: S, onChange: y }) => /* @__PURE__ */ jsx(CollectionField, P(x({}, e), { value: S, onChange: y })),
+    [m, h]
+  ), y = useCallback(
+    ({ value: v, onChange: F }) => /* @__PURE__ */ jsx(CollectionField, P(x({}, e), { value: v, onChange: F })),
     [JSON.stringify(_.omit(e, "value"))]
   );
-  return /* @__PURE__ */ jsx(FlagProvider, { collectionField: g, children: /* @__PURE__ */ jsx(
+  return useEffect(() => {
+    C && (c.title = typeof c.title == "undefined" ? (C == null ? void 0 : C.title) || c.name : c.title);
+  }, [JSON.stringify(C)]), /* @__PURE__ */ jsx(FlagProvider, { collectionField: f, children: /* @__PURE__ */ jsx(
     VariableInput,
     {
       form: i,
-      record: c,
+      record: u,
       value: t,
       onChange: o,
-      renderSchemaComponent: b,
-      collectionField: g,
-      shouldChange: f,
-      returnScope: C,
+      renderSchemaComponent: y,
+      collectionField: f,
+      shouldChange: b,
+      returnScope: S,
       targetFieldSchema: l
     }
   ) });
@@ -44774,7 +44776,7 @@ const CreateRecordAction$1 = forwardRef(InternalCreateRecordAction), initializer
     const { onClick: u } = useAssociationCreateActionProps(), d = useField(), { getPrimaryKey: p } = useCollection_deprecated(), m = p();
     return {
       onClick() {
-        return q(this, null, function* () {
+        return z(this, null, function* () {
           var f, C;
           yield u();
           const { data: g } = ((C = (f = d.data) == null ? void 0 : f.data) == null ? void 0 : C.data) || {};
@@ -45424,7 +45426,7 @@ const Table$1 = withDynamicSchemaProps(
       "onClickRow",
       "enableIndexÏColumn"
     ]), y = useArrayField(S), v = useFieldSchema(), { size: F = "small" } = (v == null ? void 0 : v["x-component-props"]) || {}, I = useCollection(), R = ((Ce = v == null ? void 0 : v.parent) == null ? void 0 : Ce["x-decorator"]) === "TableSelectorProvider" ? useTableSelectorContext() : useTableBlockContext(), { expandFlag: D, allIncludesChildren: B } = R, N = useMemoizedFn(S.onRowDragEnd || (() => {
-    })), $ = usePaginationProps$2(o, a), L = useTableColumns$1(S, $), [w, O] = useState(() => D ? B : []), [j, k] = useState(((be = y == null ? void 0 : y.data) == null ? void 0 : be.selectedRowKeys) || []), [M, E] = useState([]), V = (p == null ? void 0 : p.type) !== "none", z = useRef(/* @__PURE__ */ new Map()), G = useMemo(() => css`
+    })), $ = usePaginationProps$2(o, a), L = useTableColumns$1(S, $), [w, O] = useState(() => D ? B : []), [j, k] = useState(((be = y == null ? void 0 : y.data) == null ? void 0 : be.selectedRowKeys) || []), [M, q] = useState([]), E = (p == null ? void 0 : p.type) !== "none", V = useRef(/* @__PURE__ */ new Map()), G = useMemo(() => css`
         & > td {
           background-color: ${t.controlItemBgActive} !important;
         }
@@ -45433,7 +45435,7 @@ const Table$1 = withDynamicSchemaProps(
         }
       `, [t.controlItemBgActive, t.controlItemBgActiveHover]), U = useMemo(() => C ? G : "", [G, C]), H = useMemo(() => C ? (Z, ne) => ({
       onClick: (re) => {
-        isPortalInBody(re.target) || C(Z, E, M);
+        isPortalInBody(re.target) || C(Z, q, M);
       },
       rowIndex: ne
     }) : null, [C, M]);
@@ -45446,10 +45448,10 @@ const Table$1 = withDynamicSchemaProps(
         return J(Z);
       if (Z.key)
         return Z.key;
-      if (z.current.has(Z))
-        return z.current.get(Z);
+      if (V.current.has(Z))
+        return V.current.get(Z);
       const ne = uid();
-      return z.current.set(Z, ne), ne;
+      return V.current.set(Z, ne), ne;
     }, []), J = useCallback(
       (Z) => {
         var ne;
@@ -45505,14 +45507,14 @@ const Table$1 = withDynamicSchemaProps(
                 role: "button",
                 "aria-label": `table-index-${re}`,
                 className: cls(Z ? "checked" : null, rowSelectCheckboxWrapperClass, {
-                  [rowSelectCheckboxWrapperClassHover]: V
+                  [rowSelectCheckboxWrapperClassHover]: E
                 }),
                 children: [
                   /* @__PURE__ */ jsxs("div", { className: cls(Z ? "checked" : null, rowSelectCheckboxContentClass), children: [
                     l && /* @__PURE__ */ jsx(SortHandle$1, { id: J(ne) }),
                     c && /* @__PURE__ */ jsx(TableIndex$2, { index: re })
                   ] }),
-                  V && /* @__PURE__ */ jsx(
+                  E && /* @__PURE__ */ jsx(
                     "div",
                     {
                       className: cls(
@@ -45537,7 +45539,7 @@ const Table$1 = withDynamicSchemaProps(
         l,
         y,
         J,
-        V,
+        E,
         ee,
         $,
         b
@@ -45649,14 +45651,14 @@ const Table$1 = withDynamicSchemaProps(
   }
 `, SubTable = observer$1(
   (e) => {
-    var j, k, M;
+    var k, M, q;
     const { openSize: t } = e, { field: o, options: n, fieldSchema: r } = useAssociationFieldContext(), { t: a } = useTranslation(), [i, l] = useState(!1), [c, u] = useState([]), d = useFieldNames$1(e), p = useFieldSchema(), m = useCompile(), h = useLabelUiSchema$1(n, (d == null ? void 0 : d.label) || "label"), g = useCollectionRecord(), f = useCollection(), { allowSelectExistingRecord: C, allowAddnew: b, allowDisassociation: S, enableIndexÏColumn: y } = o.componentProps;
     useSubTableSpecialCase({ rootField: o, rootSchema: r });
     const v = (E, V) => {
       if (V !== void 0 && isArr(o.value) && E !== V)
         return action(() => {
-          const z = o.value[E];
-          return o.value.splice(E, 1), o.value.splice(V, 0, z), exchangeArrayState(o, {
+          const G = o.value[E];
+          return o.value.splice(E, 1), o.value.splice(V, 0, G), exchangeArrayState(o, {
             fromIndex: E,
             toIndex: V
           }), o.onInput(o.value);
@@ -45664,9 +45666,9 @@ const Table$1 = withDynamicSchemaProps(
     };
     o.move = v;
     const F = useMemo(() => o.value && Object.keys(o.value).length > 0 ? (Array.isArray(o.value) ? o.value : o.value ? [o.value] : []).filter(Boolean).map((V) => {
-      const z = V == null ? void 0 : V[d.label];
+      const G = V == null ? void 0 : V[d.label];
       return P(x({}, V), {
-        [d.label]: getLabelFormatValue$1(m(h), m(z))
+        [d.label]: getLabelFormatValue$1(m(h), m(G))
       });
     }) : [], [o.value, d == null ? void 0 : d.label]), I = {
       size: "small",
@@ -45681,48 +45683,48 @@ const Table$1 = withDynamicSchemaProps(
       setSelectedRows: u,
       collectionField: n
     }, T = () => {
-      const { setVisible: E } = useActionContext(), { selectedRows: V, setSelectedRows: z } = useContext(RecordPickerContext);
+      const { setVisible: E } = useActionContext(), { selectedRows: V, setSelectedRows: G } = useContext(RecordPickerContext);
       return {
         onClick() {
-          var U;
-          Array.isArray(o.value) || (o.value = []), V.forEach((H) => o.value.push(markRecordAsNew(H))), o.onInput(o.value), o.initialValue = o.value, z([]), E(!1);
-          const G = Math.ceil(o.value.length / (((U = o.componentProps) == null ? void 0 : U.pageSize) || 10));
-          B(G);
+          var H;
+          Array.isArray(o.value) || (o.value = []), V.forEach((Y) => o.value.push(markRecordAsNew(Y))), o.onInput(o.value), o.initialValue = o.value, G([]), E(!1);
+          const U = Math.ceil(o.value.length / (((H = o.componentProps) == null ? void 0 : H.pageSize) || 10));
+          B(U);
         }
       };
     }, R = () => {
-      const E = (n == null ? void 0 : n.targetKey) || "id", V = (o.value || []).map((G) => G == null ? void 0 : G[E]).filter(Boolean);
+      const E = (n == null ? void 0 : n.targetKey) || "id", V = (o.value || []).map((U) => U == null ? void 0 : U[E]).filter(Boolean);
       return V.length ? { $and: [{ [`${E}.$ne`]: V }] } : {};
-    }, [D, B] = useState(1), [N, $] = useState(((j = o.componentProps) == null ? void 0 : j.pageSize) || 10);
+    }, [D, B] = useState(1), [N, $] = useState(((k = o.componentProps) == null ? void 0 : k.pageSize) || 10), { setFormValueChanged: L } = useActionContext();
     useEffect(() => {
       var E;
       $((E = o.componentProps) == null ? void 0 : E.pageSize);
-    }, [(k = o.componentProps) == null ? void 0 : k.pageSize]);
-    const L = useMemo(() => {
+    }, [(M = o.componentProps) == null ? void 0 : M.pageSize]);
+    const w = useMemo(() => {
       var V;
       const E = Math.ceil(((V = o.value) == null ? void 0 : V.length) / 10);
       return {
         current: D > E ? E : D,
         pageSize: N || 10,
         total: o == null ? void 0 : o.value,
-        onChange: (z, G) => {
-          B(z), $(G), o.componentProps.pageSize = G, o.onInput(o.value);
+        onChange: (G, U) => {
+          B(G), $(U), o.componentProps.pageSize = U, o.onInput(o.value), L(!1);
         },
         showSizeChanger: !0,
         pageSizeOptions: ["10", "20", "50", "100"],
         hideOnSinglePage: !1
       };
-    }, [(M = o.value) == null ? void 0 : M.length, N, D]), w = () => {
+    }, [(q = o.value) == null ? void 0 : q.length, N, D]), O = () => {
       const { field: E } = useAssociationFieldContext();
       return {
         run() {
-          var z;
+          var G;
           E.value = E.value || [], E.value.push(markRecordAsNew({}));
-          const V = Math.ceil(E.value.length / (((z = E.componentProps) == null ? void 0 : z.pageSize) || 10));
+          const V = Math.ceil(E.value.length / (((G = E.componentProps) == null ? void 0 : G.pageSize) || 10));
           return B(V), E.onInput(E.value);
         }
       };
-    }, O = () => ({
+    }, j = () => ({
       run() {
         l(!0);
       }
@@ -45737,7 +45739,7 @@ const Table$1 = withDynamicSchemaProps(
           showIndex: !0,
           dragSort: !1,
           showDel: o.editable && (b !== !1 || C !== !1 || S !== !1) ? (E) => o.editable ? S !== !1 ? !0 : E == null ? void 0 : E.__isNewRecord__ : !1 : !1,
-          pagination: L,
+          pagination: w,
           rowSelection: { type: "none", hideSelectAll: !0 },
           isSubTable: !0,
           locale: {
@@ -45757,7 +45759,7 @@ const Table$1 = withDynamicSchemaProps(
                 b !== !1 && /* @__PURE__ */ jsx(
                   Action.Link,
                   {
-                    useAction: w,
+                    useAction: O,
                     title: /* @__PURE__ */ jsxs(Space$1, { style: { gap: 2 }, className: "nb-sub-table-addNew", children: [
                       /* @__PURE__ */ jsx(PlusOutlined, {}),
                       " ",
@@ -45768,7 +45770,7 @@ const Table$1 = withDynamicSchemaProps(
                 C && /* @__PURE__ */ jsx(
                   Action.Link,
                   {
-                    useAction: O,
+                    useAction: j,
                     title: /* @__PURE__ */ jsxs(Space$1, { style: { gap: 2 }, children: [
                       /* @__PURE__ */ jsx(ZoomInOutlined, {}),
                       " ",
@@ -45903,10 +45905,10 @@ const ReadPretty$7 = observer$1(
 InternalAssociationSelect.displayName = "InternalAssociationSelect";
 const AssociationSelect = InternalAssociationSelect;
 AssociationSelect.Designer = function e() {
-  var O, j, k, M, E, V, z, G, U, H, Y;
+  var O, j, k, M, q, E, V, G, U, H, Y;
   const { getCollectionFields: t, getInterface: o, getCollectionJoinField: n, getCollection: r, isTitleField: a } = useCollectionManager_deprecated(), { getField: i } = 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 = i(u.name) || n(u["x-collection-field"]), y = useFieldComponentOptions(), v = c.address.segments.includes("__form_grid"), F = o(S == null ? void 0 : S.interface), I = (O = F == null ? void 0 : F.validateSchema) == null ? void 0 : O.call(F, u), T = (j = S == null ? void 0 : S.uiSchema) == null ? void 0 : j.title, R = S != null && S.target ? t(S == null ? void 0 : S.target) : [];
   c.title === T || c.title;
-  const D = useSortFields(S == null ? void 0 : S.target), B = ((E = (M = (k = c.componentProps) == null ? void 0 : k.service) == null ? void 0 : M.params) == null ? void 0 : E.sort) || [];
+  const D = useSortFields(S == null ? void 0 : S.target), B = ((q = (M = (k = c.componentProps) == null ? void 0 : k.service) == null ? void 0 : M.params) == null ? void 0 : q.sort) || [];
   useEffect(() => {
     c.readPretty !== u["x-read-pretty"] && (c.readPretty = !!u["x-read-pretty"]);
   }, [u["x-read-pretty"]]);
@@ -46117,7 +46119,7 @@ AssociationSelect.Designer = function e() {
       SchemaSettingsSwitchItem,
       {
         title: d("Allow multiple"),
-        checked: ((V = u["x-component-props"]) == null ? void 0 : V.multiple) === void 0 ? !0 : u["x-component-props"].multiple,
+        checked: ((E = u["x-component-props"]) == null ? void 0 : E.multiple) === void 0 ? !0 : u["x-component-props"].multiple,
         onChange: (J) => {
           const K = {
             "x-uid": u["x-uid"]
@@ -46133,7 +46135,7 @@ AssociationSelect.Designer = function e() {
       SchemaSettingsDataScope,
       {
         collectionName: S == null ? void 0 : S.target,
-        defaultFilter: ((U = (G = (z = c.componentProps) == null ? void 0 : z.service) == null ? void 0 : G.params) == null ? void 0 : U.filter) || {},
+        defaultFilter: ((U = (G = (V = c.componentProps) == null ? void 0 : V.service) == null ? void 0 : G.params) == null ? void 0 : U.filter) || {},
         form: l,
         onSubmit: ({ filter: J }) => {
           J = removeNullCondition(J), _.set(c.componentProps, "service.params.filter", J), u["x-component-props"] = c.componentProps, m.emit("patch", {
@@ -46409,18 +46411,18 @@ AssociationSelect.FilterDesigner = function e() {
           }
         },
         onSubmit: (j) => {
-          var V;
+          var E;
           const k = [];
-          for (const z of j.rules)
-            k.push(_.pickBy(z, _.identity));
+          for (const V of j.rules)
+            k.push(_.pickBy(V, _.identity));
           const M = {
             "x-uid": l["x-uid"]
           };
           if (["percent"].includes(m == null ? void 0 : m.interface))
-            for (const z of k)
-              (z.maxValue || z.minValue) && (z.percentMode = !0), z.percentFormat && (z.percentFormats = !0);
-          const E = _.concat([], ((V = m == null ? void 0 : m.uiSchema) == null ? void 0 : V["x-validator"]) || [], k);
-          i.validator = E, l["x-validator"] = k, M["x-validator"] = k, u.emit("patch", {
+            for (const V of k)
+              (V.maxValue || V.minValue) && (V.percentMode = !0), V.percentFormat && (V.percentFormats = !0);
+          const q = _.concat([], ((E = m == null ? void 0 : m.uiSchema) == null ? void 0 : E["x-validator"]) || [], k);
+          i.validator = q, l["x-validator"] = k, M["x-validator"] = k, u.emit("patch", {
             schema: M
           }), d();
         }
@@ -46561,10 +46563,10 @@ AssociationSelect.FilterDesigner = function e() {
         options: v,
         value: (O = (w = i == null ? void 0 : i.componentProps) == null ? void 0 : w.fieldNames) == null ? void 0 : O.label,
         onChange: (j) => {
-          var E, V;
+          var q, E;
           const k = {
             "x-uid": l["x-uid"]
-          }, M = P(x(x({}, (V = (E = m == null ? void 0 : m.uiSchema) == null ? void 0 : E["x-component-props"]) == null ? void 0 : V.fieldNames), i.componentProps.fieldNames), {
+          }, M = P(x(x({}, (E = (q = m == null ? void 0 : m.uiSchema) == null ? void 0 : q["x-component-props"]) == null ? void 0 : E.fieldNames), i.componentProps.fieldNames), {
             label: j
           });
           i.componentProps.fieldNames = M, l["x-component-props"] = l["x-component-props"] || {}, l["x-component-props"].fieldNames = M, k["x-component-props"] = l["x-component-props"], u.emit("patch", {
@@ -47295,7 +47297,7 @@ const validateJSON = {
             }
           }
         },
-        onSubmit: (m) => q(void 0, [m], function* ({ plot: u, title: d, config: p }) {
+        onSubmit: (m) => z(void 0, [m], function* ({ plot: u, title: d, config: p }) {
           n.title = r(d), n.componentProps.plot = u;
           const h = r(JSON.parse(p)), g = h == null ? void 0 : h.data;
           if (typeof g == "function") {
@@ -48186,7 +48188,7 @@ const InternalListBlockProvider = (e) => {
               display: none !important;
             }
           `,
-        itemRender: (M, E, V) => E === "prev" ? /* @__PURE__ */ jsxs(
+        itemRender: (M, q, E) => q === "prev" ? /* @__PURE__ */ jsxs(
           "div",
           {
             style: { display: "flex" },
@@ -48196,12 +48198,12 @@ const InternalListBlockProvider = (e) => {
                     }
                   `,
             children: [
-              V,
+              E,
               " ",
               /* @__PURE__ */ jsx("div", { style: { marginLeft: "7px" }, children: d })
             ]
           }
-        ) : V
+        ) : E
       };
     })(), { isMobileLayout: $ } = useMobileLayout();
     return h(
@@ -49484,7 +49486,7 @@ const useStyles$2 = genStyleHook("nb-rich-text", (e) => {
   return /* @__PURE__ */ jsx("div", P(x({ className: cls("nb-table-index"), style: { padding: "0 8px 0 16px" } }, o), { children: t + 1 }));
 }, useDefAction = () => ({
   move() {
-    return q(this, null, function* () {
+    return z(this, null, function* () {
     });
   }
 }), TableArray = observer$1(
@@ -49611,7 +49613,7 @@ const useStyles$2 = genStyleHook("nb-rich-text", (e) => {
           ReactDragListView,
           {
             handleSelector: ".drag-handle",
-            onDragEnd: (y, v) => q(void 0, null, function* () {
+            onDragEnd: (y, v) => z(void 0, null, function* () {
               const F = o.value[y], I = o.value[v];
               o.move(y, v), yield h(F, I);
             }),
@@ -49700,7 +49702,7 @@ const useStyles$2 = genStyleHook("nb-rich-text", (e) => {
                       const m = useActionContext();
                       return {
                         run() {
-                          return q(this, null, function* () {
+                          return z(this, null, function* () {
                             m.setVisible(!1);
                           });
                         }
@@ -49718,7 +49720,7 @@ const useStyles$2 = genStyleHook("nb-rich-text", (e) => {
                       const m = useForm(), h = useActionContext();
                       return {
                         run() {
-                          return q(this, null, function* () {
+                          return z(this, null, function* () {
                             const { title: f } = m.values;
                             f && (r.title = f, a.title = f, i.emit("patch", {
                               schema: {
@@ -50142,9 +50144,9 @@ const TableActionColumnDesigner = (e) => {
         defaultChecked: !0,
         checked: S ? r.decoratorProps.treeTable : !1,
         onChange: (k) => {
-          var E;
+          var q;
           r.decoratorProps.treeTable = k, a["x-decorator-props"].treeTable = k;
-          const M = P(x({}, (E = c.params) == null ? void 0 : E[0]), {
+          const M = P(x({}, (q = c.params) == null ? void 0 : q[0]), {
             tree: k ? !0 : null
           });
           d.emit("patch", {
@@ -50158,7 +50160,7 @@ const TableActionColumnDesigner = (e) => {
       {
         title: u("Enable drag and drop sorting"),
         checked: r.decoratorProps.dragSort,
-        onChange: (k) => q(void 0, null, function* () {
+        onChange: (k) => z(void 0, null, function* () {
           k && b && (yield v.resource("collections.fields", b.collectionName).update({
             filterByTk: b.name,
             values: {
@@ -50178,7 +50180,7 @@ const TableActionColumnDesigner = (e) => {
       {
         title: u("Enable index column"),
         checked: ((N = r.decoratorProps) == null ? void 0 : N.enableSelectColumn) !== !1,
-        onChange: (k) => q(void 0, null, function* () {
+        onChange: (k) => z(void 0, null, function* () {
           r.decoratorProps = r.decoratorProps || {}, r.decoratorProps.enableIndexÏColumn = k, a["x-decorator-props"].enableIndexÏColumn = k, d.emit("patch", {
             schema: {
               "x-uid": a["x-uid"],
@@ -50274,14 +50276,14 @@ const TableActionColumnDesigner = (e) => {
           }
         },
         onSubmit: ({ sort: k }) => {
-          var V;
-          const M = k.map((z) => z.direction === "desc" ? `-${z.field}` : z.field), E = r.decoratorProps.params || {};
-          E.sort = M, r.decoratorProps.params = E, a["x-decorator-props"].params = E, d.emit("patch", {
+          var E;
+          const M = k.map((V) => V.direction === "desc" ? `-${V.field}` : V.field), q = r.decoratorProps.params || {};
+          q.sort = M, r.decoratorProps.params = q, a["x-decorator-props"].params = q, d.emit("patch", {
             schema: {
               "x-uid": a["x-uid"],
               "x-decorator-props": a["x-decorator-props"]
             }
-          }), c.run(P(x({}, (V = c.params) == null ? void 0 : V[0]), { sort: M }));
+          }), c.run(P(x({}, (E = c.params) == null ? void 0 : E[0]), { sort: M }));
         }
       }
     ),
@@ -50300,9 +50302,9 @@ const TableActionColumnDesigner = (e) => {
           { label: "200", value: 200 }
         ],
         onChange: (k) => {
-          var E;
+          var q;
           const M = r.decoratorProps.params || {};
-          M.pageSize = k, r.decoratorProps.params = M, a["x-decorator-props"].params = M, c.run(P(x({}, (E = c.params) == null ? void 0 : E[0]), { pageSize: k, page: 1 })), d.emit("patch", {
+          M.pageSize = k, r.decoratorProps.params = M, a["x-decorator-props"].params = M, c.run(P(x({}, (q = c.params) == null ? void 0 : q[0]), { pageSize: k, page: 1 })), d.emit("patch", {
             schema: {
               "x-uid": a["x-uid"],
               "x-decorator-props": a["x-decorator-props"]
@@ -50322,9 +50324,9 @@ const TableActionColumnDesigner = (e) => {
           { label: u("Small"), value: "small" }
         ],
         onChange: (k) => {
-          const M = a.reduceProperties((E, V) => {
-            if (V["x-component"] === "TableV2")
-              return V;
+          const M = a.reduceProperties((q, E) => {
+            if (E["x-component"] === "TableV2")
+              return E;
           }, null);
           M["x-component-props"] = M["x-component-props"] || {}, M["x-component-props"].size = k, d.emit("patch", {
             schema: {
@@ -50821,7 +50823,7 @@ function FormDrawer(e, t, o, n) {
   document.body.appendChild(r.host);
   const d = {
     forOpen: (p) => (isFn(p) && r.openMiddlewares.push(p), d),
-    open: (p) => (r.promise || (r.promise = new Promise((m, h) => q(this, null, function* () {
+    open: (p) => (r.promise || (r.promise = new Promise((m, h) => z(this, null, function* () {
       try {
         p = yield loading(l.loadingText, () => applyMiddleware(p, r.openMiddlewares)), r.form = r.form || createForm(P(x({}, p), {
           effects(g) {
@@ -51753,7 +51755,7 @@ const useRecordIsOwn = () => {
   const e = useForm(), t = useActionContext();
   return {
     run() {
-      return q(this, null, function* () {
+      return z(this, null, function* () {
         t.setVisible(!1), e.reset();
       });
     }
@@ -51772,7 +51774,7 @@ const useRecordIsOwn = () => {
   const { run: e } = useResourceActionContext(), t = useForm(), o = useActionContext();
   return {
     run() {
-      return q(this, null, function* () {
+      return z(this, null, function* () {
         t.reset(), e(), o.setVisible(!1);
       });
     }
@@ -51781,7 +51783,7 @@ const useRecordIsOwn = () => {
   const { resource: e } = useCollection_deprecated();
   return {
     onCardDragEnd(c, u, d) {
-      return q(this, arguments, function* ({ columns: o, groupField: n }, { fromColumnId: r, fromPosition: a }, { toColumnId: i, toPosition: l }) {
+      return z(this, arguments, function* ({ columns: o, groupField: n }, { fromColumnId: r, fromPosition: a }, { toColumnId: i, toPosition: l }) {
         var C, b;
         const p = o.find((S) => S.id === r), m = o.find((S) => S.id === i), h = (C = p == null ? void 0 : p.cards) == null ? void 0 : C[a], g = (b = m == null ? void 0 : m.cards) == null ? void 0 : b[l], f = {
           sourceId: h.id,
@@ -51974,7 +51976,7 @@ const useRecordIsOwn = () => {
   const { run: e, params: t, defaultRequest: o } = useResourceActionContext(), n = useForm(), r = useActionContext(), [a, ...i] = t;
   return {
     run() {
-      return q(this, null, function* () {
+      return z(this, null, function* () {
         var d;
         const c = (d = o == null ? void 0 : o.params) == null ? void 0 : d.filter, u = c ? { $and: [c, n.values.filter] } : n.values.filter;
         e(P(x({}, a), { filter: u }), ...i), r.setVisible(!1);
@@ -51985,7 +51987,7 @@ const useRecordIsOwn = () => {
   const t = useForm(), o = useField(), n = useActionContext(), { refresh: r } = useResourceActionContext(), { resource: a } = useResourceContext();
   return {
     run() {
-      return q(this, null, function* () {
+      return z(this, null, function* () {
         var l;
         try {
           yield t.submit(), o.data = o.data || {}, o.data.loading = !0;
@@ -52001,7 +52003,7 @@ const useRecordIsOwn = () => {
   const t = useForm(), { resource: o } = useResourceContext();
   return {
     run() {
-      return q(this, null, function* () {
+      return z(this, null, function* () {
         var a;
         yield t.submit();
         const r = yield o.create({ values: t.values });
@@ -52015,7 +52017,7 @@ const useRecordIsOwn = () => {
   const { resource: o, targetKey: n } = useResourceContext(), { [n]: r } = useRecord();
   return {
     run() {
-      return q(this, null, function* () {
+      return z(this, null, function* () {
         var l;
         yield t.submit();
         const i = yield o.update({ filterByTk: r, values: t.values });
@@ -52027,7 +52029,7 @@ const useRecordIsOwn = () => {
   const { resource: e } = useResourceContext(), { refresh: t } = useResourceActionContext();
   return {
     move(n, r) {
-      return q(this, null, function* () {
+      return z(this, null, function* () {
         yield e.move({
           sourceId: n.id,
           targetId: r.id
@@ -52039,7 +52041,7 @@ const useRecordIsOwn = () => {
   const t = useField(), o = useForm(), n = useActionContext(), { refresh: r } = useResourceActionContext(), { resource: a, targetKey: i } = useResourceContext(), { [i]: l } = useRecord();
   return {
     run() {
-      return q(this, null, function* () {
+      return z(this, null, function* () {
         var u;
         yield o.submit(), t.data = t.data || {}, t.data.loading = !0;
         try {
@@ -52057,7 +52059,7 @@ const useRecordIsOwn = () => {
   const { refresh: t } = useResourceActionContext(), { resource: o, targetKey: n } = useResourceContext(), { [n]: r } = useRecord();
   return {
     run() {
-      return q(this, null, function* () {
+      return z(this, null, function* () {
         yield o.destroy({ filterByTk: r }), e == null || e(r), t();
       });
     }
@@ -52066,7 +52068,7 @@ const useRecordIsOwn = () => {
   const { state: t, setState: o, refresh: n } = useResourceActionContext(), { resource: r } = useResourceContext(), { t: a } = useTranslation();
   return {
     run() {
-      return q(this, null, function* () {
+      return z(this, null, function* () {
         var l;
         if (!((l = t == null ? void 0 : t.selectedRowKeys) != null && l.length))
           return message.error(a("Please select the records you want to delete"));
@@ -52085,7 +52087,7 @@ const useRecordIsOwn = () => {
   const { run: e } = useCreateAction(), { refreshCM: t } = useCollectionManager_deprecated();
   return {
     run() {
-      return q(this, null, function* () {
+      return z(this, null, function* () {
         yield e(), yield t();
       });
     }
@@ -52094,7 +52096,7 @@ const useRecordIsOwn = () => {
   const { run: e } = useUpdateAction(), { refreshCM: t } = useCollectionManager_deprecated();
   return {
     run() {
-      return q(this, null, function* () {
+      return z(this, null, function* () {
         yield e(), yield t();
       });
     }
@@ -52103,7 +52105,7 @@ const useRecordIsOwn = () => {
   const { run: e } = useDestroyAction$1(), { refreshCM: t } = useCollectionManager_deprecated();
   return {
     run() {
-      return q(this, null, function* () {
+      return z(this, null, function* () {
         yield e(), yield t();
       });
     }
@@ -52118,7 +52120,7 @@ const useRecordIsOwn = () => {
   const { run: e } = useBulkDestroyAction$1(), { refreshCM: t } = useCollectionManager_deprecated();
   return {
     run() {
-      return q(this, null, function* () {
+      return z(this, null, function* () {
         yield e(), yield t();
       });
     }
@@ -52277,7 +52279,7 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
       {
         showSearch: !0,
         options: l,
-        onDropdownVisibleChange: (g) => q(void 0, null, function* () {
+        onDropdownVisibleChange: (g) => z(void 0, null, function* () {
           var b;
           const { target: f, type: C } = p.values;
           f && g && c(
@@ -52327,7 +52329,7 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
         value: C,
         options: o,
         showSearch: !0,
-        onDropdownVisibleChange: (F) => q(void 0, null, function* () {
+        onDropdownVisibleChange: (F) => z(void 0, null, function* () {
           var B;
           const { target: I, type: T, through: R } = f.values, D = ["belongsTo"].includes(T) ? l || p : ["belongsToMany"].includes(T) ? R : I;
           if (D && F) {
@@ -52510,7 +52512,7 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
   const e = useForm(), { refreshCM: t } = useCollectionManager_deprecated(), o = useActionContext(), { refresh: n } = useResourceActionContext(), { resource: r } = useResourceContext(), a = useField();
   return {
     run() {
-      return q(this, null, function* () {
+      return z(this, null, function* () {
         yield e.submit(), a.data = a.data || {}, a.data.loading = !0;
         const l = cloneDeep$1(e.values);
         l.autoCreateReverseField || delete l.reverseField, delete l.autoCreateReverseField;
@@ -52533,21 +52535,21 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
   })), []), R = useCallback(() => {
     const { availableFieldInterfaces: w } = u(n.template) || {}, { exclude: O, include: j } = w || {}, k = [];
     return F.forEach((M) => {
-      var E;
+      var q;
       if (M.key === "systemInfo")
         k.push(P(x({}, M), {
-          children: M.children.filter((V) => V.hidden ? !1 : V.value === "tableoid" ? j != null && j.length ? j.includes(V.value) : (l == null ? void 0 : l.dialect) === "postgres" : typeof n[V.value] == "boolean" ? n[V.value] : !0)
+          children: M.children.filter((E) => E.hidden ? !1 : E.value === "tableoid" ? j != null && j.length ? j.includes(E.value) : (l == null ? void 0 : l.dialect) === "postgres" : typeof n[E.value] == "boolean" ? n[E.value] : !0)
         }));
       else {
-        let V = [];
-        j != null && j.length ? j.forEach((z) => {
+        let E = [];
+        j != null && j.length ? j.forEach((V) => {
           var U;
-          const G = (U = M == null ? void 0 : M.children) == null ? void 0 : U.find((H) => [z, z.interface].includes(H.name));
-          G && V.push(P(x({}, G), {
-            targetScope: z == null ? void 0 : z.targetScope
+          const G = (U = M == null ? void 0 : M.children) == null ? void 0 : U.find((H) => [V, V.interface].includes(H.name));
+          G && E.push(P(x({}, G), {
+            targetScope: V == null ? void 0 : V.targetScope
           }));
-        }) : O != null && O.length ? V = (E = M == null ? void 0 : M.children) == null ? void 0 : E.filter((z) => !O.includes(z.name)) : V = M == null ? void 0 : M.children, V != null && V.length && k.push(P(x({}, M), {
-          children: V
+        }) : O != null && O.length ? E = (q = M == null ? void 0 : M.children) == null ? void 0 : q.filter((V) => !O.includes(V.name)) : E = M == null ? void 0 : M.children, E != null && E.length && k.push(P(x({}, M), {
+          children: E
         }));
       }
     }), k;
@@ -52696,7 +52698,7 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
   const e = useForm(), { refreshCM: t } = useCollectionManager_deprecated(), o = useActionContext(), { refresh: n } = useResourceActionContext(), { resource: r, targetKey: a } = useResourceContext(), { [a]: i } = useRecord();
   return {
     run() {
-      return q(this, null, function* () {
+      return z(this, null, function* () {
         yield e.submit();
         const c = cloneDeep(e.values);
         c.autoCreateReverseField || delete c.reverseField, delete c.autoCreateReverseField, yield r.update({ filterByTk: i, values: c }), o.setVisible(!1), yield e.reset(), n(), yield t();
@@ -52724,7 +52726,7 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
     /* @__PURE__ */ jsx(
       "a",
       P(x({}, i), {
-        onClick: () => q(void 0, null, function* () {
+        onClick: () => z(void 0, null, function* () {
           var N, $;
           const { data: T } = yield g.resource("collections.fields", n.collectionName).get({
             filterByTk: n.name,
@@ -52836,9 +52838,9 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
     const L = useForm(), { refresh: w } = useResourceActionContext(), { refreshCM: O } = useCollectionManager_deprecated(), j = useActionContext(), { resource: k } = useResourceContext();
     return {
       run() {
-        return q(this, null, function* () {
+        return z(this, null, function* () {
           yield L.submit();
-          const E = cloneDeep(L.values), V = omit(E, [
+          const q = cloneDeep(L.values), E = omit(q, [
             "key",
             "uiSchemaUid",
             "collectionName",
@@ -52851,7 +52853,7 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
             // 'reverseField.uiSchemaUid',
           ]);
           yield k.create({
-            values: V
+            values: E
           }), yield L.reset(), yield O(), yield w(), j.setVisible(!1);
         });
       }
@@ -52871,7 +52873,7 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
       "a",
       {
         disabled: D,
-        onClick: () => q(void 0, null, function* () {
+        onClick: () => z(void 0, null, function* () {
           var L;
           if (!D) {
             const { data: w } = yield S.resource("collections.fields", n.collectionName).get({
@@ -52971,7 +52973,7 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
     /* @__PURE__ */ jsx(
       "a",
       {
-        onClick: () => q(void 0, null, function* () {
+        onClick: () => z(void 0, null, function* () {
           var I;
           const { data: S } = yield m.resource("collections.fields", n.collectionName).get({
             filterByTk: n.name,
@@ -53118,7 +53120,7 @@ const getSchema$4 = (e, t, o) => {
   const t = useForm(), { refreshCM: o } = useCollectionManager_deprecated(), n = useActionContext(), { refresh: r } = useResourceActionContext(), { resource: a } = useResourceContext(), i = useField();
   return {
     run() {
-      return q(this, null, function* () {
+      return z(this, null, function* () {
         var c;
         i.data = i.data || {}, i.data.loading = !0;
         try {
@@ -53266,7 +53268,7 @@ const getSchema$4 = (e, t, o) => {
   const { refreshCM: t } = useCollectionManager_deprecated(), o = useForm(), n = useActionContext(), { refresh: r } = useResourceActionContext(), { resource: a, targetKey: i } = useResourceContext(), { [i]: l, template: c } = useRecord(), u = useAPIClient(), d = c === "sql" ? u.resource("sqlCollection") : a;
   return {
     run() {
-      return q(this, null, function* () {
+      return z(this, null, function* () {
         yield o.submit(), yield d.update({
           filterByTk: l,
           values: c === "sql" ? o.values : omit$1(o.values, ["fields"])
@@ -53283,7 +53285,7 @@ const getSchema$4 = (e, t, o) => {
     /* @__PURE__ */ jsx(
       "a",
       P(x({}, a), {
-        onClick: () => q(void 0, null, function* () {
+        onClick: () => z(void 0, null, function* () {
           const g = i(n.template), f = getSchema$3(
             x({}, g),
             n,
@@ -53345,13 +53347,13 @@ const getSchema$4 = (e, t, o) => {
   useEffect(() => {
     const w = [];
     g.forEach((O) => {
-      var V;
-      const j = v(O), M = T(O).map((z) => {
-        const G = R(z, O);
+      var E;
+      const j = v(O), M = T(O).map((V) => {
+        const G = R(V, O);
         return {
           type: "group",
-          key: z,
-          label: l("Parent collection fields") + l(`(${v(z).title})`),
+          key: V,
+          label: l("Parent collection fields") + l(`(${v(V).title})`),
           children: G.filter((U) => !["hasOne", "hasMany", "belongsToMany"].includes(U == null ? void 0 : U.type)).map((U) => {
             var H;
             return {
@@ -53360,14 +53362,14 @@ const getSchema$4 = (e, t, o) => {
             };
           })
         };
-      }), E = (V = j.fields.filter((z) => !["obo", "oho", "m2m", "o2m"].includes(z == null ? void 0 : z.interface))) == null ? void 0 : V.map((z) => {
+      }), q = (E = j.fields.filter((V) => !["obo", "oho", "m2m", "o2m"].includes(V == null ? void 0 : V.interface))) == null ? void 0 : E.map((V) => {
         var G;
-        return { value: z.name, key: z.name, label: l(((G = z.uiSchema) == null ? void 0 : G.title) || z.name) };
+        return { value: V.name, key: V.name, label: l(((G = V.uiSchema) == null ? void 0 : G.title) || V.name) };
       }).concat(M);
       w.push({
         value: O,
         label: l(j.title || j.name),
-        children: E
+        children: q
       });
     }), h(w);
   }, [g, t]), useEffect(() => {
@@ -53376,30 +53378,30 @@ const getSchema$4 = (e, t, o) => {
       if (w) {
         u(!1), p([]);
         const k = (j = Object.values((O = w == null ? void 0 : w.data) == null ? void 0 : O.fields)) == null ? void 0 : j.map((M) => {
-          var E, V;
+          var q, E;
           if (M.source) {
-            const z = (a == null ? void 0 : a.data.find((G) => G.name === M.name)) || M;
+            const V = (a == null ? void 0 : a.data.find((G) => G.name === M.name)) || M;
             return P(x({}, M), {
-              uiSchema: P(x({}, omit(z.uiSchema, "rawTitle")), { title: ((E = z.uiSchema) == null ? void 0 : E.title) || z.name })
+              uiSchema: P(x({}, omit(V.uiSchema, "rawTitle")), { title: ((q = V.uiSchema) == null ? void 0 : q.title) || V.name })
             });
           } else {
-            const z = (a == null ? void 0 : a.data.find((G) => G.name === M.name)) || M;
-            return P(x({}, z), {
-              uiSchema: P(x({}, omit(z.uiSchema, "rawTitle")), { title: ((V = z.uiSchema) == null ? void 0 : V.title) || z.name })
+            const V = (a == null ? void 0 : a.data.find((G) => G.name === M.name)) || M;
+            return P(x({}, V), {
+              uiSchema: P(x({}, omit(V.uiSchema, "rawTitle")), { title: ((E = V.uiSchema) == null ? void 0 : E.title) || V.name })
             });
           }
         });
         S.value = k, setTimeout(() => {
-          var M, E, V;
-          p(k), y.setValuesIn("sources", (M = w.data) == null ? void 0 : M.sources), f((E = w.data) == null ? void 0 : E.sources), b((V = w == null ? void 0 : w.data) == null ? void 0 : V.unsupportedFields);
+          var M, q, E;
+          p(k), y.setValuesIn("sources", (M = w.data) == null ? void 0 : M.sources), f((q = w.data) == null ? void 0 : q.sources), b((E = w == null ? void 0 : w.data) == null ? void 0 : E.unsupportedFields);
         });
       }
     }).catch);
   }, [t]);
   const $ = (w, O) => {
     d.splice(O, 1, w), p(d), S.value = d.map((j) => {
-      var M, E, V;
-      const k = typeof j.source == "string" ? j.source : (V = (E = (M = j.source) == null ? void 0 : M.filter) == null ? void 0 : E.call(M, Boolean)) == null ? void 0 : V.join(".");
+      var M, q, E;
+      const k = typeof j.source == "string" ? j.source : (E = (q = (M = j.source) == null ? void 0 : M.filter) == null ? void 0 : q.call(M, Boolean)) == null ? void 0 : E.join(".");
       return P(x({}, j), {
         source: k
       });
@@ -53424,9 +53426,9 @@ const getSchema$4 = (e, t, o) => {
           style: { width: "100%" },
           options: D(m),
           onChange: (k, M) => {
-            var V;
-            const E = (V = I(k == null ? void 0 : k[0])) == null ? void 0 : V.find((z) => z.name === last(k));
-            $(P(x({}, O), { source: k, uiSchema: E == null ? void 0 : E.uiSchema }), j);
+            var E;
+            const q = (E = I(k == null ? void 0 : k[0])) == null ? void 0 : E.find((V) => V.name === last(k));
+            $(P(x({}, O), { source: k, uiSchema: q == null ? void 0 : q.uiSchema }), j);
           },
           placeholder: l("Select field source")
         }
@@ -53464,12 +53466,12 @@ const getSchema$4 = (e, t, o) => {
             defaultValue: w,
             style: { width: "100%" },
             popupMatchSelectWidth: !1,
-            onChange: (E) => {
-              var z;
-              const V = F(E);
-              $(P(x({}, k), { interface: E, uiSchema: (z = V == null ? void 0 : V.default) == null ? void 0 : z.uiSchema }), j);
+            onChange: (q) => {
+              var V;
+              const E = F(q);
+              $(P(x({}, k), { interface: q, uiSchema: (V = E == null ? void 0 : E.default) == null ? void 0 : V.uiSchema }), j);
             },
-            children: M.map((E) => /* @__PURE__ */ jsx(Select$1.OptGroup, { label: D(E.label), children: E.children.map((V) => /* @__PURE__ */ jsx(Select$1.Option, { value: V.name, children: D(V.label) }, V.value)) }, E.key))
+            children: M.map((q) => /* @__PURE__ */ jsx(Select$1.OptGroup, { label: D(q.label), children: q.children.map((E) => /* @__PURE__ */ jsx(Select$1.Option, { value: E.name, children: D(E.label) }, E.value)) }, q.key))
           }
         );
       }
@@ -53486,8 +53488,8 @@ const getSchema$4 = (e, t, o) => {
           Input$3,
           {
             defaultValue: ((M = k == null ? void 0 : k.uiSchema) == null ? void 0 : M.title) || w,
-            onChange: (E) => $(
-              P(x({}, k), { uiSchema: P(x({}, omit(k == null ? void 0 : k.uiSchema, "rawTitle")), { title: E.target.value }) }),
+            onChange: (q) => $(
+              P(x({}, k), { uiSchema: P(x({}, omit(k == null ? void 0 : k.uiSchema, "rawTitle")), { title: q.target.value }) }),
               j
             )
           }
@@ -53549,7 +53551,7 @@ const mapFields = ["lineString", "point", "circle", "polygon"], PreviewTable$1 =
         key: F.name,
         width: 200,
         render: (j, k, M) => {
-          const E = k[F.name], V = {
+          const q = k[F.name], E = {
             type: "object",
             properties: {
               [F.name]: {
@@ -53557,11 +53559,11 @@ 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(q) : q
               }
             }
           };
-          return /* @__PURE__ */ jsx(EllipsisWithTooltip, { ellipsis: !0, children: /* @__PURE__ */ jsx(RecursionField, { schema: V, name: M, onlyRenderProperties: !0 }) });
+          return /* @__PURE__ */ jsx(EllipsisWithTooltip, { ellipsis: !0, children: /* @__PURE__ */ jsx(RecursionField, { schema: E, name: M, onlyRenderProperties: !0 }) });
         }
       };
     });
@@ -53692,7 +53694,7 @@ const mapFields = ["lineString", "point", "circle", "polygon"], PreviewTable$1 =
   const e = useForm(), { refreshCM: t } = useCollectionManager_deprecated(), o = useActionContext(), { refresh: n } = useResourceActionContext(), { targetKey: r } = useResourceContext(), { [r]: a } = useRecord(), i = useAPIClient(), l = useField();
   return {
     run() {
-      return q(this, null, function* () {
+      return z(this, null, function* () {
         yield e.submit(), l.data = l.data || {}, l.data.loading = !0;
         try {
           yield i.resource("collections").setFields({
@@ -53890,7 +53892,7 @@ const AsyncDataProvider = (e) => {
               style: { width: "100%" },
               popupMatchSelectWidth: !1,
               onChange: (L) => {
-                var O, j, k, M, E;
+                var O, j, k, M, q;
                 const w = p(L);
                 S(
                   P(x({}, N), {
@@ -53898,7 +53900,7 @@ const AsyncDataProvider = (e) => {
                     uiSchema: P(x({}, (O = w == null ? void 0 : w.default) == null ? void 0 : O.uiSchema), {
                       title: ((k = (j = w == null ? void 0 : w.default) == null ? void 0 : j.uiSchema) == null ? void 0 : k.title) || ((M = N.uiSchema) == null ? void 0 : M.title)
                     }),
-                    type: (E = w == null ? void 0 : w.default) == null ? void 0 : E.type
+                    type: (q = w == null ? void 0 : w.default) == null ? void 0 : q.type
                   }),
                   B
                 );
@@ -54120,7 +54122,7 @@ const AsyncDataProvider = (e) => {
   const t = useForm(), o = useActionContext(), { refreshCM: n } = useCollectionManager_deprecated(), { refresh: r } = useResourceActionContext(), { targetKey: a } = useResourceContext(), { [a]: i } = useRecord(), l = useAPIClient(), c = useField();
   return {
     run() {
-      return q(this, null, function* () {
+      return z(this, null, function* () {
         yield t.submit(), c.data = c.data || {}, c.data.loading = !0;
         try {
           yield l.resource("sqlCollection").setFields({
@@ -54164,7 +54166,7 @@ const AsyncDataProvider = (e) => {
   const { run: e } = useDestroyAction(), { refreshCM: t } = useCollectionManager_deprecated();
   return {
     run() {
-      return q(this, null, function* () {
+      return z(this, null, function* () {
         yield e(), yield t();
       });
     }
@@ -54173,7 +54175,7 @@ const AsyncDataProvider = (e) => {
   const { run: t } = useBulkDestroyAction(), { refreshCM: o } = useCollectionManager_deprecated();
   return {
     run() {
-      return q(this, null, function* () {
+      return z(this, null, function* () {
         yield t(e), yield o();
       });
     }
@@ -54182,7 +54184,7 @@ const AsyncDataProvider = (e) => {
   const { refresh: e } = useResourceActionContext(), { resource: t, targetKey: o } = useResourceContext(), { [o]: n } = useRecord(), r = useForm(), { cascade: a } = (r == null ? void 0 : r.values) || {};
   return {
     run() {
-      return q(this, null, function* () {
+      return z(this, null, function* () {
         yield t.destroy({ filterByTk: n, cascade: a }), e();
       });
     }
@@ -54191,7 +54193,7 @@ const AsyncDataProvider = (e) => {
   const { state: e, setState: t, refresh: o } = useResourceActionContext(), { resource: n } = useResourceContext(), r = useActionContext(), { t: a } = useTranslation(), i = useForm(), { cascade: l } = (i == null ? void 0 : i.values) || {}, c = Object.values(e).flat();
   return {
     run(d) {
-      return q(this, null, function* () {
+      return z(this, null, function* () {
         var p;
         if (!(c != null && c.length))
           return message.error(a("Please select the records you want to delete"));
@@ -54341,7 +54343,7 @@ const getSchema$1 = (e) => {
   };
 }, useCreateSubField = () => (useActionContext(), {
   run() {
-    return q(this, null, function* () {
+    return z(this, null, function* () {
     });
   }
 }), AddSubFieldAction = () => {
@@ -54426,7 +54428,7 @@ const getSchema$1 = (e) => {
   const e = useForm(), { run: t } = useUpdateAction(), { refreshCM: o } = useCollectionManager_deprecated();
   return {
     run() {
-      return q(this, null, function* () {
+      return z(this, null, function* () {
         var a, i, l;
         yield e.submit();
         const r = ((l = (i = (a = e == null ? void 0 : e.values) == null ? void 0 : a.uiSchema) == null ? void 0 : i.enum) == null ? void 0 : l.slice()) || [];
@@ -54447,7 +54449,7 @@ const getSchema$1 = (e) => {
     /* @__PURE__ */ jsx(
       "a",
       {
-        onClick: () => q(void 0, null, function* () {
+        onClick: () => z(void 0, null, function* () {
           const c = getSchema(P(x({}, o(t.interface)), {
             default: t
           }));
@@ -58358,7 +58360,7 @@ class SqlCollectionTemplate extends CollectionTemplate {
 }
 class MainDataSource extends DataSource {
   getDataSource() {
-    return q(this, null, function* () {
+    return z(this, null, function* () {
       var n;
       const t = yield this.app.apiClient.request({
         resource: "collections",
@@ -58372,7 +58374,7 @@ class MainDataSource extends DataSource {
 }
 class CollectionPlugin extends Plugin {
   load() {
-    return q(this, null, function* () {
+    return z(this, null, function* () {
       this.dataSourceManager.addCollectionMixins([InheritanceCollectionMixin]), this.addFieldInterfaces(), this.addCollectionTemplates(), this.addFieldInterfaces(), this.addFieldInterfaceGroups(), this.addMainDataSource();
     });
   }
@@ -58858,7 +58860,7 @@ const toItems = (e = {}) => {
         i(((g = h == null ? void 0 : h.data) == null ? void 0 : g.map((f) => f["x-uid"])) || []);
       }
     }
-  ), u = t.resource("roles.menuUiSchemas", e.name), d = r.length === a.length, p = (h, g) => q(void 0, null, function* () {
+  ), u = t.resource("roles.menuUiSchemas", e.name), d = r.length === a.length, p = (h, g) => z(void 0, null, function* () {
     const f = getParentUids(o, (b) => b.uid === g.uid), C = getChildrenUids(g == null ? void 0 : g.children, []);
     if (h) {
       const b = C.concat(g.uid), S = a.filter((y) => !b.includes(y));
@@ -58903,7 +58905,7 @@ const toItems = (e = {}) => {
               Checkbox$1,
               {
                 checked: d,
-                onChange: (h) => q(void 0, null, function* () {
+                onChange: (h) => z(void 0, null, function* () {
                   d ? yield u.set({
                     values: []
                   }) : yield u.set({
@@ -58941,7 +58943,7 @@ const PermissionProvider = (e) => {
     {
       value: {
         currentRecord: a,
-        update: (l, c) => q(void 0, null, function* () {
+        update: (l, c) => z(void 0, null, function* () {
           const { path: u, value: d } = l.getState();
           if (["ui.*", "pm", "pm.*"].includes(u)) {
             const p = t.resource("roles.snippets", o.name);
@@ -59012,7 +59014,7 @@ const PermissionProvider = (e) => {
             );
           },
           effects() {
-            onFieldChange("*", (n, r) => q(this, null, function* () {
+            onFieldChange("*", (n, r) => z(this, null, function* () {
               r.modified && (yield e(n, r));
             }));
           }
@@ -60265,7 +60267,7 @@ const PluginDetail = ({ plugin: e, onCancel: t }) => {
     const u = useForm();
     return {
       run() {
-        return q(this, null, function* () {
+        return z(this, null, function* () {
           yield u.submit(), c.request({
             url: t ? "pm:update" : "pm:add",
             method: "post",
@@ -60371,7 +60373,7 @@ const PluginUploadForm = ({ onClose: e, pluginData: t, isUpgrade: o }) => {
     const l = useAPIClient(), { t: c } = useTranslation(), u = useForm();
     return {
       run() {
-        return q(this, null, function* () {
+        return z(this, null, function* () {
           var h, g;
           yield u.submit();
           const p = new FormData();
@@ -60472,7 +60474,7 @@ const PluginUploadForm = ({ onClose: e, pluginData: t, isUpgrade: o }) => {
     const c = useForm();
     return {
       run() {
-        return q(this, null, function* () {
+        return z(this, null, function* () {
           const d = c.values.compressedFileUrl;
           if (!d)
             return;
@@ -60672,7 +60674,7 @@ function PluginInfo(e) {
               {
                 disabled: u,
                 title: S("Are you sure to delete this plugin?"),
-                onConfirm: (R) => q(this, null, function* () {
+                onConfirm: (R) => z(this, null, function* () {
                   R.stopPropagation(), yield y.request({
                     url: "pm:remove",
                     params: {
@@ -60729,14 +60731,14 @@ function PluginInfo(e) {
               "aria-label": "enable",
               size: "small",
               disabled: u || h,
-              onChange: (R, D) => q(this, null, function* () {
+              onChange: (R, D) => z(this, null, function* () {
                 if (D.stopPropagation(), !i && R) {
                   v.confirm({
                     title: S("Plugin dependency version mismatch"),
                     content: S(
                       "The current dependency version of the plugin does not match the version of the application and may not work properly. Are you sure you want to continue enabling the plugin?"
                     ),
-                    onOk: () => q(this, null, function* () {
+                    onOk: () => z(this, null, function* () {
                       yield y.request({
                         url: "pm:enable",
                         params: {
@@ -60754,7 +60756,7 @@ function PluginInfo(e) {
                   }
                 }) : v.confirm({
                   title: S("Are you sure to disable this plugin?"),
-                  onOk: () => q(this, null, function* () {
+                  onOk: () => z(this, null, function* () {
                     yield y.request({
                       url: "pm:disable",
                       params: {
@@ -60827,7 +60829,7 @@ function BulkEnableButton({ plugins: e = [] }) {
         width: 1e3,
         title: t("Bulk enable"),
         open: a,
-        onOk: () => q(this, null, function* () {
+        onOk: () => z(this, null, function* () {
           yield o.request({
             url: "pm:enable",
             params: {
@@ -61242,7 +61244,7 @@ const AdminSettingsLayout = () => {
 };
 class PMPlugin extends Plugin {
   load() {
-    return q(this, null, function* () {
+    return z(this, null, function* () {
       this.addComponents(), this.addRoutes(), this.addSettings();
     });
   }
@@ -61303,7 +61305,7 @@ const SettingCenterProvider = (e) => {
         l((g == null ? void 0 : g.data) || []);
       }
     }
-  ), m = o.resource("roles.snippets", t.name), h = (g, f) => q(void 0, null, function* () {
+  ), m = o.resource("roles.snippets", t.name), h = (g, f) => z(void 0, null, function* () {
     const b = getChildrenKeys(f == null ? void 0 : f.children, []).concat(f.aclSnippet);
     g ? (yield m.add({
       values: b.map((S) => "!" + S)
@@ -61334,7 +61336,7 @@ const SettingCenterProvider = (e) => {
               Checkbox$1,
               {
                 checked: c,
-                onChange: () => q(void 0, null, function* () {
+                onChange: () => z(void 0, null, function* () {
                   const g = a.map((f) => "!" + f);
                   c ? yield m.add({
                     values: g
@@ -61381,7 +61383,7 @@ const SettingCenterProvider = (e) => {
 }, ACLPane = () => /* @__PURE__ */ jsx(Card, { "data-testid": "acl-pane-card", bordered: !1, children: /* @__PURE__ */ jsx(SchemaComponent, { components, schema: schema2 }) });
 class ACLPlugin extends Plugin {
   load() {
-    return q(this, null, function* () {
+    return z(this, null, function* () {
       this.app.addComponents({
         ACLCollectionFieldProvider,
         ACLActionProvider,
@@ -61589,7 +61591,7 @@ function AntdConfigProvider(e) {
 }
 class AntdConfigPlugin extends Plugin {
   load() {
-    return q(this, null, function* () {
+    return z(this, null, function* () {
       var t;
       this.app.use(AntdConfigProvider, ((t = this.options) == null ? void 0 : t.config) || {});
     });
@@ -61781,7 +61783,7 @@ const SettingsMenu = () => {
 PinnedPluginList.displayName = "PinnedPluginList";
 class PinnedListPlugin extends Plugin {
   load() {
-    return q(this, null, function* () {
+    return z(this, null, function* () {
       this.app.use(PinnedPluginListProvider, this.options.config);
     });
   }
@@ -62442,11 +62444,11 @@ const ActionInitializerItem = (e) => {
       (y || K) && g(P(x({}, h == null ? void 0 : h[0]), {
         filter: f
       })), v(!y), J.stopPropagation();
-    }, E = (J) => {
+    }, q = (J) => {
       J.stopPropagation();
-    }, V = (J) => {
+    }, E = (J) => {
       m(J);
-    }, z = (Y = i.title) != null ? Y : (H = a == null ? void 0 : a.uiSchema) == null ? void 0 : H.title;
+    }, V = (Y = i.title) != null ? Y : (H = a == null ? void 0 : a.uiSchema) == null ? void 0 : H.title;
     return t(
       /* @__PURE__ */ jsxs(SortableItem, { className: cls(o, n, "nb-block-item", e.className, "SortableItem"), children: [
         /* @__PURE__ */ jsx(l, {}),
@@ -62463,17 +62465,17 @@ const ActionInitializerItem = (e) => {
                 },
                 gutter: 5,
                 children: [
-                  /* @__PURE__ */ jsx(Col, { title: c(z), className: "headerCol", children: y ? /* @__PURE__ */ jsx(
+                  /* @__PURE__ */ jsx(Col, { title: c(V), className: "headerCol", children: y ? /* @__PURE__ */ jsx(
                     Input$3,
                     {
                       bordered: !1,
                       autoFocus: !0,
                       placeholder: "Search...",
                       className: "search",
-                      onClick: E,
-                      onChange: V
+                      onClick: q,
+                      onChange: E
                     }
-                  ) : c(z) }),
+                  ) : c(V) }),
                   /* @__PURE__ */ jsx(
                     Col,
                     {
@@ -62686,7 +62688,7 @@ AssociationFilter.useAssociationField = () => {
 };
 class AssociationFilterPlugin extends Plugin {
   load() {
-    return q(this, null, function* () {
+    return z(this, null, function* () {
       this.app.schemaInitializerManager.add(associationFilterFilterBlockInitializer), this.app.schemaInitializerManager.add(filterCollapseItemInitializer_deprecated), this.app.schemaInitializerManager.add(filterCollapseItemInitializer), this.app.schemaInitializerManager.add(associationFilterInitializer);
     });
   }
@@ -62913,21 +62915,21 @@ const DataBlockInitializer = (e) => {
     otherText: S,
     alwaysRenderMenu: y
   } = e, { insert: v, setVisible: F } = useSchemaInitializer(), I = useCompile(), { getTemplateSchemaByMode: T } = useSchemaTemplateManager(), R = useTemplateBlockNotifier(), D = useCallback(
-    (E) => q(void 0, null, function* () {
+    (q) => z(void 0, null, function* () {
       R({
-        collection: E.item.name,
-        dataSource: E.item.dataSource,
+        collection: q.item.name,
+        dataSource: q.item.dataSource,
         componentType: n,
         menuName: a
       });
-      const { item: V, fromOthersInPopup: z } = E;
+      const { item: E, fromOthersInPopup: V } = q;
       if (f)
-        return f(E);
-      if (V.template) {
-        const G = yield T(V);
-        v(t ? t(G, { item: V, fromOthersInPopup: z }) : G);
+        return f(q);
+      if (E.template) {
+        const G = yield T(E);
+        v(t ? t(G, { item: E, fromOthersInPopup: V }) : G);
       } else
-        V.schemaInsertor ? yield V.schemaInsertor(v, { item: V, name: a, fromOthersInPopup: z }) : o && o({ item: V, fromOthersInPopup: z });
+        E.schemaInsertor ? yield E.schemaInsertor(v, { item: E, name: a, fromOthersInPopup: V }) : o && o({ item: E, fromOthersInPopup: V });
       F(!1);
     }),
     [
@@ -62956,24 +62958,24 @@ const DataBlockInitializer = (e) => {
     currentText: b,
     otherText: S
   }), N = useGetSchemaInitializerMenuItems(D), $ = useMemo(() => N(B, a), [N, B, a]), [L, w] = useState([]), O = useMenuSearch({ data: $, openKeys: L, hideSearch: u }), j = useMemo(() => {
-    let E = O.filter((V) => V.key !== "search" && V.key !== "empty");
-    return p && E.length === 1 ? E = E[0].children : E = O, [
+    let q = O.filter((E) => E.key !== "search" && E.key !== "empty");
+    return p && q.length === 1 ? q = q[0].children : q = O, [
       {
         key: a,
         label: I(i),
         icon: typeof r == "string" ? /* @__PURE__ */ jsx(antIcons__default, { type: r }) : r,
-        onClick: (V) => {
-          V.key === a && D(P(x({}, V), { item: e }));
+        onClick: (E) => {
+          E.key === a && D(P(x({}, E), { item: e }));
         },
-        children: E
+        children: q
       }
     ];
   }, [O, p, a, I, i, r, D, e]);
   return $.length > 1 || $.length === 1 && ((M = (k = $[0]) == null ? void 0 : k.children) == null ? void 0 : M.length) > 0 || y ? /* @__PURE__ */ jsx(
     SchemaInitializerMenu,
     {
-      onOpenChange: (E) => {
-        w(E);
+      onOpenChange: (q) => {
+        w(q);
       },
       items: j
     }
@@ -63070,7 +63072,7 @@ const DataBlockInitializer = (e) => {
     P(x({
       icon: /* @__PURE__ */ jsx(TableOutlined, {})
     }, r), {
-      onClick: (h) => q(void 0, [h], function* ({ item: m }) {
+      onClick: (h) => z(void 0, [h], function* ({ item: m }) {
         if (m.template) {
           const g = yield i(m);
           a(g);
@@ -63164,7 +63166,7 @@ const RecordAssociationDetailsBlockInitializer = () => {
     P(x({
       icon: /* @__PURE__ */ jsx(FormOutlined, {})
     }, r), {
-      onClick: (h) => q(void 0, [h], function* ({ item: m }) {
+      onClick: (h) => z(void 0, [h], function* ({ item: m }) {
         if (m.template) {
           const g = yield i(m);
           a(g);
@@ -63250,7 +63252,7 @@ const RecordAssociationFormBlockInitializer = () => {
     P(x({
       icon: /* @__PURE__ */ jsx(FormOutlined, {})
     }, r), {
-      onClick: (h) => q(void 0, [h], function* ({ item: m }) {
+      onClick: (h) => z(void 0, [h], function* ({ item: m }) {
         if (m.template) {
           const g = yield l(m);
           if (m.template.componentName === "FormItem") {
@@ -63382,7 +63384,7 @@ const createGridCardBlockUISchema = (e) => {
     P(x({
       icon: /* @__PURE__ */ jsx(TableOutlined, {})
     }, r), {
-      onClick: (h) => q(void 0, [h], function* ({ item: m }) {
+      onClick: (h) => z(void 0, [h], function* ({ item: m }) {
         if (m.template) {
           const g = yield i(m);
           a(g);
@@ -63487,7 +63489,7 @@ const createListBlockUISchema = (e) => {
     P(x({
       icon: /* @__PURE__ */ jsx(TableOutlined, {})
     }, r), {
-      onClick: (h) => q(void 0, [h], function* ({ item: m }) {
+      onClick: (h) => z(void 0, [h], function* ({ item: m }) {
         if (m.template) {
           const g = yield i(m);
           a(g);
@@ -63576,7 +63578,7 @@ const RecordReadPrettyAssociationFormBlockInitializer = () => {
     P(x({
       icon: /* @__PURE__ */ jsx(FormOutlined, {})
     }, r), {
-      onClick: (g) => q(void 0, [g], function* ({ item: h }) {
+      onClick: (g) => z(void 0, [g], function* ({ item: h }) {
         if (h.template) {
           const f = yield l(h);
           if (h.template.componentName === "ReadPrettyFormItem") {
@@ -63765,7 +63767,7 @@ function ModalActionSchemaInitializerItem(e) {
               const m = useForm();
               return {
                 onClick() {
-                  return q(this, null, function* () {
+                  return z(this, null, function* () {
                     var g;
                     yield m.submit(), l(!1), (g = e == null ? void 0 : e.onSubmit) == null || g.call(e, m.values);
                   });
@@ -64042,7 +64044,7 @@ const items = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.definePropert
     const { selectedRows: C } = useContext(RecordPickerContext), { setVisible: b, setSubmitted: S, setFormValueChanged: y } = useActionContext();
     return {
       onClick(F, I) {
-        return q(this, null, function* () {
+        return z(this, null, function* () {
           var T, R;
           yield r.add({
             values: C
@@ -64263,7 +64265,7 @@ const items = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.definePropert
     P(x({}, c), {
       icon: /* @__PURE__ */ jsx(ProfileOutlined, {}),
       componentType: n,
-      onCreateBlockSchema: (d) => q(void 0, null, function* () {
+      onCreateBlockSchema: (d) => z(void 0, null, function* () {
         if (r)
           return r(d);
         u(d);
@@ -64513,7 +64515,7 @@ function useCreateSingleDetailsSchema() {
     [o, n, r]
   );
   return { createSingleDetailsSchema: useCallback(
-    (c) => q(this, [c], function* ({ item: l }) {
+    (c) => z(this, [c], function* ({ item: l }) {
       if (l.template) {
         const u = yield t(l);
         e(a(u, { item: l }));
@@ -64683,7 +64685,7 @@ const RecordFormBlockInitializer = () => {
     P(x({
       icon: /* @__PURE__ */ jsx(FormOutlined, {})
     }, o), {
-      onClick: (p) => q(void 0, [p], function* ({ item: d }) {
+      onClick: (p) => z(void 0, [p], function* ({ item: d }) {
         if (d.template) {
           const m = yield r(d);
           n(c(m, { item: d }));
@@ -65003,7 +65005,7 @@ const commonOptions$h = {
     P(x({}, l), {
       icon: /* @__PURE__ */ jsx(AppstoreOutlined, {}),
       componentType: "GridCard",
-      onCreateBlockSchema: (u) => q(void 0, null, function* () {
+      onCreateBlockSchema: (u) => z(void 0, null, function* () {
         if (n)
           return n(u);
         c(u);
@@ -65200,7 +65202,7 @@ const commonOptions$h = {
     P(x({}, l), {
       icon: /* @__PURE__ */ jsx(OrderedListOutlined, {}),
       componentType: "List",
-      onCreateBlockSchema: (u) => q(void 0, null, function* () {
+      onCreateBlockSchema: (u) => z(void 0, null, function* () {
         if (n)
           return n(u);
         c(u);
@@ -65355,7 +65357,7 @@ const commonOptions$h = {
     P(x({
       icon: /* @__PURE__ */ jsx(FormOutlined, {})
     }, r), {
-      onClick: () => q(void 0, null, function* () {
+      onClick: () => z(void 0, null, function* () {
         a(
           createTableSelectorUISchema({
             rowKey: i.filterTargetKey,
@@ -65704,7 +65706,7 @@ const commonOptions$h = {
     P(x({}, i), {
       icon: /* @__PURE__ */ jsx(TableOutlined, {}),
       componentType: "Table",
-      onCreateBlockSchema: (c) => q(void 0, null, function* () {
+      onCreateBlockSchema: (c) => z(void 0, null, function* () {
         if (n)
           return n(c);
         l(c);
@@ -65844,7 +65846,7 @@ const commonOptions$h = {
       onlyCurrentDataSource: t,
       icon: /* @__PURE__ */ jsx(RightSquareOutlined, {}),
       componentType: "FilterCollapse",
-      onCreateBlockSchema: (i) => q(void 0, [i], function* ({ item: a }) {
+      onCreateBlockSchema: (i) => z(void 0, [i], function* ({ item: a }) {
         const l = createCollapseBlockSchema({
           dataSource: a.dataSource,
           collectionName: a.collectionName || a.name,
@@ -66518,7 +66520,7 @@ const commonOptions$2 = {
     let f = i;
     return d || (f = "page:addBlock", c && (f = "mobile:addBlock")), f || (f = "popup:common:addBlock", n || !u ? f = "popup:addNew:addBlock" : r && (f = "popup:bulkEdit:addBlock")), {
       run() {
-        return q(this, null, function* () {
+        return z(this, null, function* () {
           yield h.submit();
           const { title: b, icon: S } = h.values;
           o({
@@ -66591,7 +66593,7 @@ const commonOptions$2 = {
                         const h = useActionContext();
                         return {
                           run() {
-                            return q(this, null, function* () {
+                            return z(this, null, function* () {
                               h.setVisible(!1);
                             });
                           }
@@ -66634,7 +66636,7 @@ const commonOptions$2 = {
 });
 class SchemaInitializerPlugin extends Plugin {
   load() {
-    return q(this, null, function* () {
+    return z(this, null, function* () {
       this.app.addComponents(P(x(x({}, initializerComponents), items), {
         DestroyActionInitializer,
         FormBlockInitializer,
@@ -66679,7 +66681,7 @@ class LocalePlugin extends Plugin {
     A(this, "locales", {});
   }
   afterAdd() {
-    return q(this, null, function* () {
+    return z(this, null, function* () {
       var r, a, i, l, c, u, d;
       const o = this.app.apiClient, n = o.auth.locale;
       try {
@@ -66852,7 +66854,7 @@ const AppSpin = () => /* @__PURE__ */ jsx(Spin, { style: { position: "fixed", to
 );
 class NocoBaseBuildInPlugin extends Plugin {
   afterAdd() {
-    return q(this, null, function* () {
+    return z(this, null, function* () {
       this.app.addComponents({
         AppSpin,
         AppError,
@@ -66863,7 +66865,7 @@ class NocoBaseBuildInPlugin extends Plugin {
     });
   }
   load() {
-    return q(this, null, function* () {
+    return z(this, null, function* () {
       this.addComponents(), this.addRoutes(), this.app.use(CurrentUserProvider), this.app.use(CurrentUserSettingsMenuProvider), this.app.pluginSettingsManager.add("security", {
         title: tval$1("Security"),
         icon: "SafetyOutlined"
@@ -66903,7 +66905,7 @@ class NocoBaseBuildInPlugin extends Plugin {
     });
   }
   addPlugins() {
-    return q(this, null, function* () {
+    return z(this, null, function* () {
       yield this.app.pm.add(AssociationFilterPlugin), yield this.app.pm.add(LocalePlugin, { name: "builtin-locale" }), yield this.app.pm.add(AdminLayoutPlugin, { name: "admin-layout" }), yield this.app.pm.add(SystemSettingsPlugin, { name: "system-setting" }), yield this.app.pm.add(PinnedListPlugin, {
         name: "pinned-list",
         config: {