@nocobase/client 1.6.17 → 1.6.18

package/es/index.mjs

@@ -21,7 +21,7 @@ var Y = (e, t) => {
   return n;
 };
 var A = (e, t, n) => (Re(e, typeof t != "symbol" ? t + "" : t, n), n);
-var q = (e, t, n) => new Promise((o, r) => {
+var V = (e, t, n) => new Promise((o, r) => {
   var i = (c) => {
     try {
       l(n.next(c));
@@ -4193,7 +4193,7 @@ class APIClient extends APIClient$1 {
     return (a = (i = n == null ? void 0 : n.response) == null ? void 0 : i.data) != null && a.error ? [(c = (l = n == null ? void 0 : n.response) == null ? void 0 : l.data) == null ? void 0 : c.error] : ((d = (u = n == null ? void 0 : n.response) == null ? void 0 : u.data) == null ? void 0 : d.errors) || ((m = (p = n == null ? void 0 : n.response) == null ? void 0 : p.data) == null ? void 0 : m.messages) || ((h = n == null ? void 0 : n.response) == null ? void 0 : h.error) || [{ message: n.message || "Server error" }];
   }
   handleNotificationError(n) {
-    return q(this, null, function* () {
+    return V(this, null, function* () {
       var i, a, l, c, u, d, p, m, h, g;
       if (this.silence)
         throw n;
@@ -4282,13 +4282,13 @@ function assign(e, t, n = {}) {
 function useRequest(e, t = {}) {
   const [n, o] = useSetState({}), r = useAPIClient();
   let i;
-  typeof e == "function" ? i = e : e ? i = (...u) => q(this, [...u], function* (c = {}) {
+  typeof e == "function" ? i = e : e ? i = (...u) => V(this, [...u], function* (c = {}) {
     const { resource: d, url: p } = e;
     let m = cloneDeep(e);
     d || p ? (m.params = m.params || {}, assign(m.params, c)) : m = merge(m, c);
     const h = yield r.request(m);
     return h == null ? void 0 : h.data;
-  }) : i = () => q(this, null, function* () {
+  }) : i = () => V(this, null, function* () {
   });
   const a = P(x({}, t), {
     onSuccess(...c) {
@@ -4490,7 +4490,7 @@ class Collection {
 const { ConfigContext } = ConfigProvider, useConfig = () => useContext(ConfigContext), usePrefixCls = (e, t) => {
   const { getPrefixCls: n } = useContext(ConfigProvider.ConfigContext) || {};
   return "ConfigContext" in ConfigProvider ? (n == null ? void 0 : n(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) => V(void 0, null, function* () {
   let n = null;
   const o = setTimeout(() => {
     n = message.loading(e);
@@ -4530,7 +4530,7 @@ function legacyUnmount(e) {
   return unmountComponentAtNode(e);
 }
 function concurrentUnmount(e) {
-  return q(this, null, function* () {
+  return V(this, null, function* () {
     return Promise.resolve().then(() => {
       var t;
       (t = e[MARK]) == null || t.unmount(), delete e[MARK];
@@ -4789,7 +4789,7 @@ class DataSource {
     this.reloadCallbacks = this.reloadCallbacks.filter((n) => n !== t);
   }
   reload() {
-    return q(this, null, function* () {
+    return V(this, null, function* () {
       const t = yield this.getDataSource();
       return this.setOptions(t), this.collectionManager.setCollections(t.collections || []), this.reloadCallbacks.forEach((n) => n(t.collections)), this.options;
     });
@@ -5972,7 +5972,7 @@ class DataSourceManager {
     return this.dataSourceInstancesMap[o.key] = o, o;
   }
   addDataSources(t, n) {
-    return q(this, null, function* () {
+    return V(this, null, function* () {
       this.multiDataSources.some(([o, r]) => o === t && r === n) || this.multiDataSources.push([t, n]);
     });
   }
@@ -5995,9 +5995,9 @@ class DataSourceManager {
     this.collectionFieldInterfaceManager.addFieldInterfaces(t);
   }
   reload() {
-    return q(this, null, function* () {
+    return V(this, null, function* () {
       return yield Promise.all(
-        this.multiDataSources.map((o) => q(this, [o], function* ([t, n]) {
+        this.multiDataSources.map((o) => V(this, [o], function* ([t, n]) {
           (yield t()).map((i) => this.addDataSource(n, i));
         }))
       ), Promise.all(this.getDataSources().map((t) => t.reload()));
@@ -6634,7 +6634,7 @@ function useRecordRequest(e) {
     const F = r.filterByTk === void 0 ? _.omit(r, "filterByTk") : r;
     return (I = n[o]) == null ? void 0 : I.call(n, x(x({}, F), v)).then((w) => w.data);
   };
-  return useRequest((...v) => q(this, null, function* () {
+  return useRequest((...v) => V(this, null, function* () {
     const [F, I] = yield Promise.all([
       (a || b)(...v),
       requestParentRecordData({ sourceId: c, association: u, parentRecord: d, api: p, headers: h, sourceKey: g })
@@ -6647,7 +6647,7 @@ function useRecordRequest(e) {
   }));
 }
 function requestParentRecordData(a) {
-  return q(this, arguments, function* ({
+  return V(this, arguments, function* ({
     sourceId: e,
     association: t,
     parentRecord: n,
@@ -7181,14 +7181,14 @@ function getAllKeys(e) {
   }
   return n(e), t;
 }
-const conditionAnalyses = (i, a) => q(void 0, [i, a], function* ({
+const conditionAnalyses = (i, a) => V(void 0, [i, a], function* ({
   ruleGroup: e,
   variables: t,
   localVariables: n,
   variableNameOfLeftCondition: o
 }, r) {
   const l = Object.keys(e)[0] || "$and";
-  let u = e[l].map((d) => q(void 0, null, function* () {
+  let u = e[l].map((d) => V(void 0, null, function* () {
     if ("$and" in d || "$or" in d)
       return yield conditionAnalyses({ ruleGroup: d, variables: t, localVariables: n }, r);
     const p = getInnermostKeyAndValue(d), m = p == null ? void 0 : p.key;
@@ -7224,7 +7224,7 @@ const getVariablesData = (e) => {
   }), t;
 };
 function getRenderContent(e, t, n, o, r) {
-  return q(this, null, function* () {
+  return V(this, null, function* () {
     var i, a;
     if (t && e === "handlebars")
       try {
@@ -7342,7 +7342,7 @@ function getSubscriber({
         variableNameOfLeftCondition: i
       },
       a
-    ), setTimeout(() => q(this, null, function* () {
+    ), setTimeout(() => V(this, null, function* () {
       var d;
       const l = getFieldNameByOperator(e.operator);
       if (!((d = t.stateOfLinkageRules) != null && d[l]))
@@ -7411,7 +7411,7 @@ const collectFieldStateOfLinkageRules = ({ operator: e, value: t, field: n, cond
       break;
     case ActionType.Value:
       {
-        const I = () => q(void 0, null, function* () {
+        const I = () => V(void 0, null, function* () {
           var w;
           if ((t == null ? void 0 : t.mode) === "express") {
             if ((t.value || t.result) == null)
@@ -7438,7 +7438,7 @@ const collectFieldStateOfLinkageRules = ({ operator: e, value: t, field: n, cond
   }
 };
 function getTempFieldState(e, t) {
-  return q(this, null, function* () {
+  return V(this, null, function* () {
     return [e, t] = yield Promise.all([e, t]), {
       condition: e,
       value: t
@@ -7450,7 +7450,7 @@ function isConditionEmpty(e) {
   return _.isEmpty(n);
 }
 function replaceVariables(o, r) {
-  return q(this, arguments, function* (e, {
+  return V(this, arguments, function* (e, {
     variables: t,
     localVariables: n
   }) {
@@ -7458,7 +7458,7 @@ function replaceVariables(o, r) {
     const i = {}, a = {};
     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) => V(this, null, function* () {
       const { value: d } = yield t.parseVariable(u, n, {
         doNotRequest: u.includes("$nForm")
       }), p = `_${uid$1()}`;
@@ -7931,7 +7931,7 @@ function getRemotePlugins(e, t = []) {
   });
 }
 function getPlugins(e) {
-  return q(this, null, function* () {
+  return V(this, null, function* () {
     const { requirejs: t, pluginData: n, devDynamicImport: o } = e;
     if (n.length === 0)
       return [];
@@ -7976,12 +7976,12 @@ let PluginManager$1 = class {
    * @internal
    */
   init(t) {
-    return q(this, null, function* () {
+    return V(this, null, function* () {
       yield this.initStaticPlugins(t), this.loadRemotePlugins && (yield this.initRemotePlugins());
     });
   }
   initStaticPlugins() {
-    return q(this, arguments, function* (t = []) {
+    return V(this, arguments, function* (t = []) {
       try {
         for (var n = ke(t), o, r, i; o = !(r = yield n.next()).done; o = !1) {
           const a = r.value;
@@ -8001,7 +8001,7 @@ let PluginManager$1 = class {
     });
   }
   initRemotePlugins() {
-    return q(this, null, function* () {
+    return V(this, null, function* () {
       var r;
       const t = yield this.app.apiClient.request({ url: "pm:listEnabled" }), n = ((r = t == null ? void 0 : t.data) == null ? void 0 : r.data) || [], o = yield getPlugins({
         requirejs: this.app.requirejs,
@@ -8027,7 +8027,7 @@ let PluginManager$1 = class {
     });
   }
   add(o) {
-    return q(this, arguments, function* (t, n = {}) {
+    return V(this, arguments, function* (t, n = {}) {
       const r = this.getInstance(t, n);
       this.pluginInstances.set(t, r), n.name && (this.pluginsAliases[n.name] = r), n.packageName && (this.pluginsAliases[n.packageName] = r), yield r.afterAdd();
     });
@@ -8042,7 +8042,7 @@ let PluginManager$1 = class {
    * @internal
    */
   load() {
-    return q(this, null, function* () {
+    return V(this, null, function* () {
       yield this.initPlugins;
       for (const t of this.pluginInstances.values())
         yield t.beforeLoad();
@@ -8407,9 +8407,9 @@ class WebSocketClient {
       for (const { type: o, listener: r, options: i } of this.events)
         this._ws.addEventListener(o, r, i);
       n = setInterval(() => this.send("ping"), this.pingInterval), this.connected = !0, this.emit("open", {});
-    }, t.onerror = () => q(this, null, function* () {
+    }, t.onerror = () => V(this, null, function* () {
       console.log("onerror", this.readyState, this._reconnectTimes);
-    }), t.onclose = (o) => q(this, null, function* () {
+    }), t.onclose = (o) => V(this, null, function* () {
       setTimeout(() => this.connect(), this.reconnectInterval), console.log("onclose", this.readyState, this._reconnectTimes, this.serverDown), this.connected = !1, clearInterval(n);
     });
   }
@@ -8703,7 +8703,7 @@ const SchemaInitializerSubMenuContext = React.createContext({}), SchemaInitializ
   const n = useLocationNoUpdate(), [o, r] = React.useState(!1), i = useAPIClient();
   return {
     loading: o,
-    download: () => q(void 0, null, function* () {
+    download: () => V(void 0, null, function* () {
       r(!0);
       try {
         const a = yield i.request({
@@ -8792,7 +8792,7 @@ const options$1 = {
   const t = useAPIClient(), n = useIsAdminPage(), o = t.auth.getToken() || "", r = useRequest(options$1, {
     refreshDeps: [n, o],
     ready: !!(n && o)
-  }), i = useCallback(() => q(void 0, null, function* () {
+  }), i = useCallback(() => V(void 0, null, function* () {
     const { data: c } = yield t.request(options$1);
     return r.mutate(c), (c == null ? void 0 : c.data) || [];
   }), [r]), a = useMemo(() => {
@@ -8944,7 +8944,7 @@ const useSelectedRowKeys = () => {
   const e = useContext(DataSourceContext_deprecated), t = useForm(), { setVisible: n } = useActionContext();
   return {
     run() {
-      return q(this, null, function* () {
+      return V(this, null, function* () {
         console.log("form.values", t.values);
         const r = e.dataSource || [];
         r.push(cloneDeep$1(t.values)), e.setDataSource([...r]), n(!1), yield t.reset();
@@ -8955,7 +8955,7 @@ const useSelectedRowKeys = () => {
   const e = useContext(DataSourceContext_deprecated), { selectedRowKeys: t, setSelectedRowKeys: n } = e;
   return {
     run() {
-      return q(this, null, function* () {
+      return V(this, null, function* () {
         const r = e.dataSource || [];
         e.setDataSource(
           r.filter((i, a) => !t.includes(a))
@@ -8967,7 +8967,7 @@ const useSelectedRowKeys = () => {
   const e = useRecordIndex(), t = useForm(), { setVisible: n } = useActionContext(), o = useContext(DataSourceContext_deprecated);
   return {
     run() {
-      return q(this, null, function* () {
+      return V(this, null, function* () {
         const a = ((o == null ? void 0 : o.dataSource) || []).map((l, c) => c === e ? x({}, t.values) : l);
         o.setDataSource([...a]), n(!1);
       });
@@ -8977,7 +8977,7 @@ const useSelectedRowKeys = () => {
   const e = useRecordIndex(), t = useContext(DataSourceContext_deprecated);
   return {
     run() {
-      return q(this, null, function* () {
+      return V(this, null, function* () {
         const o = t.dataSource || [];
         t.setDataSource(
           o.filter((r, i) => e !== i)
@@ -9184,7 +9184,7 @@ function addAppVersion(e, t) {
       addAppVersion((o = e.properties) == null ? void 0 : o[n], t);
     }), e;
 }
-const name = "@nocobase/client", version = "1.6.17", license = "AGPL-3.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
+const name = "@nocobase/client", version = "1.6.18", 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",
@@ -9206,9 +9206,9 @@ const name = "@nocobase/client", version = "1.6.17", license = "AGPL-3.0", main
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "1.6.17",
-  "@nocobase/sdk": "1.6.17",
-  "@nocobase/utils": "1.6.17",
+  "@nocobase/evaluators": "1.6.18",
+  "@nocobase/sdk": "1.6.18",
+  "@nocobase/utils": "1.6.18",
   ahooks: "^3.7.2",
   antd: "5.12.8",
   "antd-style": "3.7.1",
@@ -9332,7 +9332,7 @@ class Designable {
         });
       }), r["x-uid"] && a.length ? a : [];
     };
-    this.on("insertAdjacent", (p) => q(this, [p], function* ({ onSuccess: r, current: i, position: a, schema: l, wrap: c, wrapped: u, removed: d }) {
+    this.on("insertAdjacent", (p) => V(this, [p], function* ({ onSuccess: r, current: i, position: a, schema: l, wrap: c, wrapped: u, removed: d }) {
       var g;
       let m = [];
       if ((u == null ? void 0 : u["x-component"]) === "Grid.Col" && (m = m.concat(o(u.parent))), (d == null ? void 0 : d["x-component"]) === "Grid.Col" && (m = m.concat(o(d.parent))), this.refresh(), !i["x-uid"])
@@ -9353,25 +9353,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(n("Saved successfully"), 0.2);
-    })), this.on("patch", (i) => q(this, [i], function* ({ schema: r }) {
+    })), this.on("patch", (i) => V(this, [i], function* ({ schema: r }) {
       this.refresh(), r != null && r["x-uid"] && (yield t.request({
         url: "/uiSchemas:patch",
         method: "post",
         data: x({}, r)
       }), message.success(n("Saved successfully"), 0.2));
-    })), this.on("initializeActionContext", (i) => q(this, [i], function* ({ schema: r }) {
+    })), this.on("initializeActionContext", (i) => V(this, [i], function* ({ schema: r }) {
       r != null && r["x-uid"] && (yield t.request({
         url: "/uiSchemas:initializeActionContext",
         method: "post",
         data: x({}, r)
       }));
-    })), this.on("batchPatch", (i) => q(this, [i], function* ({ schemas: r }) {
+    })), this.on("batchPatch", (i) => V(this, [i], function* ({ schemas: r }) {
       this.refresh(), yield t.request({
         url: "/uiSchemas:batchPatch",
         method: "post",
         data: r
       }), message.success(n("Saved successfully"), 0.2);
-    })), this.on("remove", (i) => q(this, [i], function* ({ removed: r }) {
+    })), this.on("remove", (i) => V(this, [i], function* ({ removed: r }) {
       let a = [];
       (r == null ? void 0 : r["x-component"]) === "Grid.Col" && (a = o(r.parent)), this.refresh(), r != null && r["x-uid"] && (yield t.request({
         url: `/uiSchemas:remove/${r["x-uid"]}`,
@@ -9390,7 +9390,7 @@ class Designable {
     this.events[t] || (this.events[t] = []), this.events[t].push(n);
   }
   emit(t, ...n) {
-    return q(this, null, function* () {
+    return V(this, null, function* () {
       if (!this.events[t])
         return;
       const [o, ...r] = n;
@@ -9854,7 +9854,7 @@ function useParsedFilter({ filterOption: e }) {
   return useEffect(() => {
     if (!e)
       return;
-    const l = () => q(this, null, function* () {
+    const l = () => V(this, null, function* () {
       a(!0);
       const u = yield t(e);
       a(!1), r(u);
@@ -9940,17 +9940,17 @@ const key = "__isNewRecord__", isNewRecord = (e) => untracked(() => !!(e != null
     default:
       return null;
   }
-}, getSatisfiedActions = (r, i) => q(void 0, [r, i], function* ({ rules: e, variables: t, localVariables: n }, o) {
+}, getSatisfiedActions = (r, i) => V(void 0, [r, i], function* ({ rules: e, variables: t, localVariables: n }, o) {
   return (yield Promise.all(
-    e.filter((l) => !l.disabled).map((l) => q(void 0, null, function* () {
+    e.filter((l) => !l.disabled).map((l) => V(void 0, null, function* () {
       return (yield conditionAnalyses({ ruleGroup: l.condition, variables: t, localVariables: n }, o)) ? l : null;
     }))
   )).filter(Boolean).map((l) => l.actions).flat();
-}), getSatisfiedValues = (r, i) => q(void 0, [r, i], function* ({ rules: e, variables: t, localVariables: n }, o) {
+}), getSatisfiedValues = (r, i) => V(void 0, [r, i], function* ({ rules: e, variables: t, localVariables: n }, o) {
   return (yield getSatisfiedActions({ rules: e, variables: t, localVariables: n }, o)).map((a) => P(x({}, a), {
     value: getActionValue(a.operator, a.value)
   }));
-}), getSatisfiedValueMap = (r, i) => q(void 0, [r, i], function* ({ rules: e, variables: t, localVariables: n }, o) {
+}), getSatisfiedValueMap = (r, i) => V(void 0, [r, i], function* ({ rules: e, variables: t, localVariables: n }, o) {
   return (yield getSatisfiedValues({ rules: e, variables: t, localVariables: n }, o)).reduce((c, u) => P(x({}, c), { [u.operator]: u.value }), {});
 });
 function useSatisfiedActionValues({
@@ -10631,7 +10631,7 @@ const Table$2 = withDynamicSchemaProps(
         "onClickRow",
         "value"
       ]), y = useArrayField$1(S), v = useFieldSchema(), { size: F = "small" } = (v == null ? void 0 : v["x-component-props"]) || {}, I = useCollection(), T = ((Ce = v == null ? void 0 : v.parent) == null ? void 0 : Ce["x-decorator"]) === "TableSelectorProvider" ? useTableSelectorContext() : useTableBlockContext(), { expandFlag: D, allIncludesChildren: O } = T, j = useMemoizedFn(S.onRowDragEnd || (() => {
-      })), N = usePaginationProps$3(n, i, e), B = useTableColumns$2(S, N), [R, M] = useState(() => D ? O : []), [$, k] = useState(((be = y == null ? void 0 : y.data) == null ? void 0 : be.selectedRowKeys) || []), [z, E] = useState([]), V = (p == null ? void 0 : p.type) !== "none", L = useRef(/* @__PURE__ */ new Map()), G = useMemo(() => css`
+      })), N = usePaginationProps$3(n, i, e), B = useTableColumns$2(S, N), [R, M] = useState(() => D ? O : []), [$, k] = useState(((be = y == null ? void 0 : y.data) == null ? void 0 : be.selectedRowKeys) || []), [z, E] = useState([]), q = (p == null ? void 0 : p.type) !== "none", L = useRef(/* @__PURE__ */ new Map()), G = useMemo(() => css`
           & > td {
             background-color: ${t.controlItemBgActive} !important;
           }
@@ -10727,14 +10727,14 @@ const Table$2 = withDynamicSchemaProps(
                   role: "button",
                   "aria-label": `table-index-${oe}`,
                   className: cls(Q ? "checked" : null, rowSelectCheckboxWrapperClass$1, {
-                    [rowSelectCheckboxWrapperClassHover$1]: V
+                    [rowSelectCheckboxWrapperClassHover$1]: q
                   }),
                   children: [
                     /* @__PURE__ */ jsxs("div", { className: cls(Q ? "checked" : null, rowSelectCheckboxContentClass$1), children: [
                       l && /* @__PURE__ */ jsx(SortHandle$2, { id: K(te) }),
                       c && /* @__PURE__ */ jsx(TableIndex$3, { index: oe })
                     ] }),
-                    V && /* @__PURE__ */ jsx(
+                    q && /* @__PURE__ */ jsx(
                       "div",
                       {
                         className: cls(
@@ -10759,7 +10759,7 @@ const Table$2 = withDynamicSchemaProps(
           l,
           y,
           K,
-          V,
+          q,
           ne,
           N,
           U
@@ -11253,15 +11253,15 @@ class Plugin {
     return this.app.dataSourceManager;
   }
   afterAdd() {
-    return q(this, null, function* () {
+    return V(this, null, function* () {
     });
   }
   beforeLoad() {
-    return q(this, null, function* () {
+    return V(this, null, function* () {
     });
   }
   load() {
-    return q(this, null, function* () {
+    return V(this, null, function* () {
     });
   }
   t(t, n = {}) {
@@ -11271,7 +11271,7 @@ class Plugin {
 }
 class SchemaComponentPlugin extends Plugin {
   load() {
-    return q(this, null, function* () {
+    return V(this, null, function* () {
       this.addComponents();
     });
   }
@@ -11304,7 +11304,7 @@ const ActionContextProvider = React.memo(
   (e) => {
     const [t, n] = useState(!1), { visible: o } = x(x({}, e), e.value), { setSubmitted: r } = x(x({}, e), e.value), i = useBlockServiceInActionButton(), { isSubPageClosedByPageMenu: a, reset: l } = useIsSubPageClosedByPageMenu(useFieldSchema());
     useEffect(() => {
-      q(void 0, null, function* () {
+      V(void 0, null, function* () {
         o === !1 && i && !i.loading && (t || a()) && (l(), i.loading = !0, yield i.refreshAsync(), i.loading = !1, n(!1), r == null || r(!0));
       });
     }, [o, i, r, a, t, l]);
@@ -11399,12 +11399,12 @@ const popupsContextStorage = {}, getStoredPopupContext = (e) => popupsContextSto
       collection: z,
       puid: E
     }) => {
-      const V = c.getFilterByTK(u || l, $);
+      const q = c.getFilterByTK(u || l, $);
       return getPopupPathFromParams({
         popupuid: M,
         puid: E,
         collection: z,
-        filterbytk: V,
+        filterbytk: q,
         sourceid: k,
         tab: R
       });
@@ -11427,17 +11427,17 @@ const popupsContextStorage = {}, getStoredPopupContext = (e) => popupsContextSto
     } = {}) => {
       if (!f())
         return I == null ? void 0 : I(!0);
-      const E = z || o, V = E == null ? void 0 : E["x-uid"], L = y(M);
+      const E = z || o, q = E == null ? void 0 : E["x-uid"], L = y(M);
       R = R || (i == null ? void 0 : i.data);
       const G = w({
-        popupUid: V,
+        popupUid: q,
         recordData: R,
         sourceId: L,
         collection: $,
         puid: k
       });
       let U = n.pathname;
-      if (_.last(U) === "/" && (U = U.slice(0, -1)), storePopupContext(V, {
+      if (_.last(U) === "/" && (U = U.slice(0, -1)), storePopupContext(q, {
         schema: E,
         record: new CollectionRecord({ isNew: !1, data: R }),
         parentRecord: M ? new CollectionRecord({ isNew: !1, data: M }) : a,
@@ -11644,12 +11644,12 @@ const VisibleProvider = React.memo(({ children: e, popupuid: t }) => {
 }, InternalPagePopups = (e) => {
   const t = useFieldSchema(), n = useLocation(), o = e.paramsList || getPopupParamsFromPath(getPopupPath(n)), { requestSchema: r } = useRequestSchema(), [i, a] = useState(null), l = useRef([]), { savePopupSchemaToSchema: c, getPopupSchemaFromSchema: u } = usePopupUtils();
   useEffect(() => {
-    q(void 0, null, function* () {
+    V(void 0, null, function* () {
       const m = o.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) => V(void 0, null, function* () {
           if (_.isEmpty(C))
             return get404Schema();
           const S = o[b];
@@ -11714,7 +11714,7 @@ const VisibleProvider = React.memo(({ children: e, popupuid: t }) => {
   return t ? /* @__PURE__ */ jsx(InternalPagePopups, x({}, e)) : null;
 }, useRequestSchema = () => {
   const e = useAPIClient();
-  return { requestSchema: useCallback((n) => q(void 0, null, function* () {
+  return { requestSchema: useCallback((n) => V(void 0, null, function* () {
     var o;
     try {
       return (o = (yield e.request({
@@ -11898,7 +11898,7 @@ const useStyles$h = 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 V(this, null, function* () {
                 var c;
                 e.setFormValueChanged(!1), (c = e.setVisible) == null || c.call(e, !1);
               });
@@ -11915,7 +11915,7 @@ const useStyles$h = genStyleHook("nb-action-drawer", (e) => {
   const { setVisible: e } = useContext(ActionContext), t = useForm();
   return {
     run() {
-      return q(this, null, function* () {
+      return V(this, null, function* () {
         e(!1), t.submit((o) => {
           console.log(o);
         });
@@ -12064,9 +12064,20 @@ const useGetAriaLabelOfModal = () => {
       }
     ) : null;
   }
-), InternalActionModal = observer$1(
+);
+function useDelayedVisible(e, t = 200) {
+  const [n, o] = useState(!1);
+  return useEffect(() => {
+    if (e) {
+      const r = setTimeout(() => o(!0), t);
+      return () => clearTimeout(r);
+    } else
+      o(!1);
+  }, [e]), n;
+}
+const InternalActionModal = observer$1(
   (e) => {
-    const y = e, { footerNodeName: t = "Action.Modal.Footer", width: n, zIndex: o } = y, r = Y(y, ["footerNodeName", "width", "zIndex"]), { visible: i, setVisible: a, openSize: l = "middle", modalProps: c } = useActionContext(), u = n != null ? n : openSizeWidthMap.get(l), d = useFieldSchema(), p = useField(), { token: m } = useToken(), h = useTabsContext(), g = useZIndexContext(), f = d.reduceProperties((v, F) => F["x-component"] === t ? F : v), { hidden: C } = useCurrentPopupContext(), b = !!f, S = getZIndex("modal", o || g, e.level || 0);
+    const v = e, { footerNodeName: t = "Action.Modal.Footer", width: n, zIndex: o } = v, r = Y(v, ["footerNodeName", "width", "zIndex"]), { visible: i, setVisible: a, openSize: l = "middle", modalProps: c } = useActionContext(), u = n != null ? n : openSizeWidthMap.get(l), d = useFieldSchema(), p = useField(), { token: m } = useToken(), h = useTabsContext(), g = useZIndexContext(), f = d.reduceProperties((F, I) => I["x-component"] === t ? I : F), { hidden: C } = useCurrentPopupContext(), b = !!f, S = getZIndex("modal", o || g, e.level || 0), y = useDelayedVisible(i, 200);
     return /* @__PURE__ */ jsx(ActionContextNoRerender, { children: /* @__PURE__ */ jsx(zIndexContext.Provider, { value: S, children: /* @__PURE__ */ jsx(TabsContextProvider, P(x({}, h), { tabBarExtraContent: null, children: /* @__PURE__ */ jsx(
       Modal,
       P(x(x({
@@ -12115,10 +12126,10 @@ const useGetAriaLabelOfModal = () => {
             basePath: p.address,
             schema: d,
             onlyRenderProperties: !0,
-            filterProperties: (v) => v["x-component"] === t
+            filterProperties: (F) => F["x-component"] === t
           }
         ) : !1,
-        children: /* @__PURE__ */ jsx(ActionModalContent, { footerNodeName: t, field: p, schema: d })
+        children: y ? /* @__PURE__ */ jsx(ActionModalContent, { footerNodeName: t, field: p, schema: d }) : /* @__PURE__ */ jsx(Skeleton, { active: !0, paragraph: { rows: 6 } })
       })
     ) })) }) });
   },
@@ -12452,7 +12463,7 @@ const useMenuSearch$1 = (e) => {
     const b = useForm(), S = useActionContext();
     return {
       run() {
-        return q(this, null, function* () {
+        return V(this, null, function* () {
           yield u == null ? void 0 : u(), S.setVisible(!1), b.reset();
         });
       }
@@ -12461,7 +12472,7 @@ const useMenuSearch$1 = (e) => {
     const b = useForm(), S = useActionContext();
     return {
       run() {
-        return q(this, null, function* () {
+        return V(this, null, function* () {
           yield b.validate();
           try {
             yield d == null ? void 0 : d(b.values), S.setVisible(!1), b.reset();
@@ -13006,7 +13017,7 @@ https://requirejs.org/docs/errors.html#` + e);
         }
     }
     function b(k, z, E) {
-      var V, L, G, U, H, J, W, K, X, ee, Z, ne, re = z && z.split("/"), se = a.map, le = se && se["*"];
+      var q, L, G, U, H, J, W, K, X, ee, Z, ne, re = z && z.split("/"), se = a.map, le = se && se["*"];
       if (k && (k = k.split("/"), W = k.length - 1, a.nodeIdCompat && jsSuffixRegExp.test(k[W]) && (k[W] = k[W].replace(jsSuffixRegExp, "")), k[0].charAt(0) === "." && re && (ne = re.slice(0, re.length - 1), k = ne.concat(k)), C(k), k = k.join("/")), E && se && (re || le)) {
         G = k.split("/");
         e:
@@ -13022,7 +13033,7 @@ https://requirejs.org/docs/errors.html#` + e);
           }
         !K && ee && (K = ee, X = Z), K && (G.splice(0, X, K), k = G.join("/"));
       }
-      return V = getOwn(a.pkgs, k), V || k;
+      return q = getOwn(a.pkgs, k), q || k;
     }
     function S(k) {
       isBrowser && each(scripts(), function(z) {
@@ -13041,11 +13052,11 @@ https://requirejs.org/docs/errors.html#` + e);
       var z, E = k ? k.indexOf("!") : -1;
       return E > -1 && (z = k.substring(0, E), k = k.substring(E + 1, k.length)), [z, k];
     }
-    function F(k, z, E, V) {
+    function F(k, z, E, q) {
       var L, G, U, H, J = null, W = z ? z.name : null, K = k, X = !0, ee = "";
-      return k || (X = !1, k = "_@r" + (g += 1)), H = v(k), J = H[0], k = H[1], J && (J = b(J, W, V), G = getOwn(p, J)), k && (J ? E ? ee = k : G && G.normalize ? ee = G.normalize(k, function(Z) {
-        return b(Z, W, V);
-      }) : ee = k.indexOf("!") === -1 ? b(k, W, V) : k : (ee = b(k, W, V), H = v(ee), J = H[0], ee = H[1], E = !0, L = o.nameToUrl(ee))), U = J && !G && !E ? "_unnormalized" + (f += 1) : "", {
+      return k || (X = !1, k = "_@r" + (g += 1)), H = v(k), J = H[0], k = H[1], J && (J = b(J, W, q), G = getOwn(p, J)), k && (J ? E ? ee = k : G && G.normalize ? ee = G.normalize(k, function(Z) {
+        return b(Z, W, q);
+      }) : ee = k.indexOf("!") === -1 ? b(k, W, q) : k : (ee = b(k, W, q), H = v(ee), J = H[0], ee = H[1], E = !0, L = o.nameToUrl(ee))), U = J && !G && !E ? "_unnormalized" + (f += 1) : "", {
         prefix: J,
         name: ee,
         parentMap: z,
@@ -13061,15 +13072,15 @@ https://requirejs.org/docs/errors.html#` + e);
       return E || (E = l[z] = new o.Module(k)), E;
     }
     function w(k, z, E) {
-      var V = k.id, L = getOwn(l, V);
-      hasProp(p, V) && (!L || L.defineEmitComplete) ? z === "defined" && E(p[V]) : (L = I(k), L.error && z === "error" ? E(L.error) : L.on(z, E));
+      var q = k.id, L = getOwn(l, q);
+      hasProp(p, q) && (!L || L.defineEmitComplete) ? z === "defined" && E(p[q]) : (L = I(k), L.error && z === "error" ? E(L.error) : L.on(z, E));
     }
     function T(k, z) {
-      var E = k.requireModules, V = !1;
+      var E = k.requireModules, q = !1;
       z ? z(k) : (each(E, function(L) {
         var G = getOwn(l, L);
-        G && (G.error = k, G.events.error && (V = !0, G.emit("error", k)));
-      }), V || req.onError(k));
+        G && (G.error = k, G.events.error && (q = !0, G.emit("error", k)));
+      }), q || req.onError(k));
     }
     function D() {
       globalDefQueue.length && (each(globalDefQueue, function(k) {
@@ -13100,28 +13111,28 @@ https://requirejs.org/docs/errors.html#` + e);
       delete l[k], delete c[k];
     }
     function j(k, z, E) {
-      var V = k.map.id;
-      k.error ? k.emit("error", k.error) : (z[V] = !0, each(k.depMaps, function(L, G) {
+      var q = k.map.id;
+      k.error ? k.emit("error", k.error) : (z[q] = !0, each(k.depMaps, function(L, G) {
         var U = L.id, H = getOwn(l, U);
         H && !k.depMatched[G] && !E[U] && (getOwn(z, U) ? (k.defineDep(G, p[U]), k.check()) : j(H, z, E));
-      }), E[V] = !0);
+      }), E[q] = !0);
     }
     function N() {
-      var k, z, E = a.waitSeconds * 1e3, V = E && o.startTime + E < (/* @__PURE__ */ new Date()).getTime(), L = [], G = [], U = !1, H = !0;
+      var k, z, E = a.waitSeconds * 1e3, q = E && o.startTime + E < (/* @__PURE__ */ new Date()).getTime(), L = [], G = [], U = !1, H = !0;
       if (!t) {
         if (t = !0, eachProp(c, function(J) {
           var W = J.map, K = W.id;
           if (J.enabled && (W.isDefine || G.push(J), !J.error)) {
-            if (!J.inited && V)
+            if (!J.inited && q)
               y(K) ? (z = !0, U = !0) : (L.push(K), S(K));
             else if (!J.inited && J.fetched && W.isDefine && (U = !0, !W.prefix))
               return H = !1;
           }
-        }), V && L.length)
+        }), q && L.length)
           return k = makeError("timeout", "Load timeout for modules: " + L, null, L), k.contextName = o.contextName, T(k);
         H && each(G, function(J) {
           j(J, {}, {});
-        }), (!V || z) && U && (isBrowser || isWebWorker) && !i && (i = setTimeout(function() {
+        }), (!q || z) && U && (isBrowser || isWebWorker) && !i && (i = setTimeout(function() {
           i = 0, N();
         }, 50)), t = !1;
       }
@@ -13129,10 +13140,10 @@ https://requirejs.org/docs/errors.html#` + e);
     n = function(k) {
       this.events = getOwn(u, k.id) || {}, this.map = k, this.shim = getOwn(a.shim, k.id), this.depExports = [], this.depMaps = [], this.depMatched = [], this.pluginMaps = {}, this.depCount = 0;
     }, n.prototype = {
-      init: function(k, z, E, V) {
-        V = V || {}, !this.inited && (this.factory = z, E ? this.on("error", E) : this.events.error && (E = bind(this, function(L) {
+      init: function(k, z, E, q) {
+        q = q || {}, !this.inited && (this.factory = z, E ? this.on("error", E) : this.events.error && (E = bind(this, function(L) {
           this.emit("error", L);
-        })), this.depMaps = k && k.slice(0), this.errback = E, this.inited = !0, this.ignore = V.ignore, V.enabled || this.enabled ? this.enable() : this.check());
+        })), this.depMaps = k && k.slice(0), this.errback = E, this.inited = !0, this.ignore = q.ignore, q.enabled || this.enabled ? this.enable() : this.check());
       },
       defineDep: function(k, z) {
         this.depMatched[k] || (this.depMatched[k] = !0, this.depCount -= 1, this.depExports[k] = z);
@@ -13161,7 +13172,7 @@ https://requirejs.org/docs/errors.html#` + e);
        */
       check: function() {
         if (!(!this.enabled || this.enabling)) {
-          var k, z, E = this.map.id, V = this.depExports, L = this.exports, G = this.factory;
+          var k, z, E = this.map.id, q = this.depExports, L = this.exports, G = this.factory;
           if (!this.inited)
             hasProp(o.defQueueMap, E) || this.fetch();
           else if (this.error)
@@ -13171,12 +13182,12 @@ https://requirejs.org/docs/errors.html#` + e);
               if (isFunction(G)) {
                 if (this.events.error && this.map.isDefine || req.onError !== defaultOnError)
                   try {
-                    L = o.execCb(E, G, V, L);
+                    L = o.execCb(E, G, q, L);
                   } catch (H) {
                     k = H;
                   }
                 else
-                  L = o.execCb(E, G, V, L);
+                  L = o.execCb(E, G, q, L);
                 if (this.map.isDefine && L === void 0 && (z = this.module, z ? L = z.exports : this.usingExports && (L = this.exports)), k)
                   return k.requireMap = this.map, k.requireModules = this.map.isDefine ? [this.map.id] : null, k.requireType = this.map.isDefine ? "define" : "require", T(this.error = k);
               } else
@@ -13195,12 +13206,12 @@ https://requirejs.org/docs/errors.html#` + e);
       },
       callPlugin: function() {
         var k = this.map, z = k.id, E = F(k.prefix);
-        this.depMaps.push(E), w(E, "defined", bind(this, function(V) {
+        this.depMaps.push(E), w(E, "defined", bind(this, function(q) {
           var L, G, U, H = getOwn(h, this.map.id), J = this.map.name, W = this.map.parentMap ? this.map.parentMap.name : null, K = o.makeRequire(k.parentMap, {
             enableBuildCallback: !0
           });
           if (this.map.unnormalized) {
-            V.normalize && (J = V.normalize(J, function(X) {
+            q.normalize && (J = q.normalize(J, function(X) {
               return b(X, W, !0);
             }) || ""), G = F(
               k.prefix + "!" + J,
@@ -13250,12 +13261,12 @@ https://requirejs.org/docs/errors.html#` + e);
               ));
             }
             re && (useInteractive = !0), this.depMaps.push(ne), o.completeLoad(Z), K([Z], L);
-          }), V.load(k.name, K, L, a);
+          }), q.load(k.name, K, L, a);
         })), o.enable(E, this), this.pluginMaps[E.id] = E;
       },
       enable: function() {
         c[this.map.id] = this, this.enabled = !0, this.enabling = !0, each(this.depMaps, bind(this, function(k, z) {
-          var E, V, L;
+          var E, q, L;
           if (typeof k == "string") {
             if (k = F(
               k,
@@ -13272,7 +13283,7 @@ https://requirejs.org/docs/errors.html#` + e);
               this.emit("error", G);
             }));
           }
-          E = k.id, V = l[E], !hasProp(r, E) && V && !V.enabled && o.enable(k, this);
+          E = k.id, q = l[E], !hasProp(r, E) && q && !q.enabled && o.enable(k, this);
         })), eachProp(this.pluginMaps, bind(this, function(k) {
           var z = getOwn(l, k.id);
           z && !z.enabled && o.enable(k, this);
@@ -13291,8 +13302,8 @@ https://requirejs.org/docs/errors.html#` + e);
     function B(k) {
       hasProp(p, k[0]) || I(F(k[0], null, !0)).init(k[1], k[2]);
     }
-    function R(k, z, E, V) {
-      k.detachEvent && !isOpera ? V && k.detachEvent(V, z) : k.removeEventListener(E, z, !1);
+    function R(k, z, E, q) {
+      k.detachEvent && !isOpera ? q && k.detachEvent(q, z) : k.removeEventListener(E, z, !1);
     }
     function M(k) {
       var z = k.currentTarget || k.srcElement;
@@ -13333,14 +13344,14 @@ https://requirejs.org/docs/errors.html#` + e);
             return (G.indexOf("?") === -1 ? "?" : "&") + z;
           };
         }
-        var E = a.shim, V = {
+        var E = a.shim, q = {
           paths: !0,
           bundles: !0,
           config: !0,
           map: !0
         };
         eachProp(k, function(L, G) {
-          V[G] ? (a[G] || (a[G] = {}), mixin(a[G], L, !0, !0)) : a[G] = L;
+          q[G] ? (a[G] || (a[G] = {}), mixin(a[G], L, !0, !0)) : a[G] = L;
         }), k.bundles && eachProp(k.bundles, function(L, G) {
           each(L, function(U) {
             U !== G && (h[U] = G);
@@ -13365,10 +13376,10 @@ https://requirejs.org/docs/errors.html#` + e);
       },
       makeRequire: function(k, z) {
         z = z || {};
-        function E(V, L, G) {
+        function E(q, L, G) {
           var U, H, J;
-          return z.enableBuildCallback && L && isFunction(L) && (L.__requireJsBuild = !0), typeof V == "string" ? isFunction(L) ? T(makeError("requireargs", "Invalid require call"), G) : k && hasProp(r, V) ? r[V](l[k.id]) : req.get ? req.get(o, V, k, E) : (H = F(V, k, !1, !0), U = H.id, hasProp(p, U) ? p[U] : T(makeError("notloaded", 'Module name "' + U + '" has not been loaded yet for context: ' + e + (k ? "" : ". Use require([])")))) : ($(), o.nextTick(function() {
-            $(), J = I(F(null, k)), J.skipMap = z.skipMap, J.init(V, L, G, {
+          return z.enableBuildCallback && L && isFunction(L) && (L.__requireJsBuild = !0), typeof q == "string" ? isFunction(L) ? T(makeError("requireargs", "Invalid require call"), G) : k && hasProp(r, q) ? r[q](l[k.id]) : req.get ? req.get(o, q, k, E) : (H = F(q, k, !1, !0), U = H.id, hasProp(p, U) ? p[U] : T(makeError("notloaded", 'Module name "' + U + '" has not been loaded yet for context: ' + e + (k ? "" : ". Use require([])")))) : ($(), o.nextTick(function() {
+            $(), J = I(F(null, k)), J.skipMap = z.skipMap, J.init(q, L, G, {
               enabled: !0
             }), N();
           }), E);
@@ -13380,26 +13391,26 @@ https://requirejs.org/docs/errors.html#` + e);
            * *Requires* the use of a module name. It does not support using
            * plain URLs like nameToUrl.
            */
-          toUrl: function(V) {
-            var L, G = V.lastIndexOf("."), U = V.split("/")[0], H = U === "." || U === "..";
-            return G !== -1 && (!H || G > 1) && (L = V.substring(G, V.length), V = V.substring(0, G)), o.nameToUrl(b(
-              V,
+          toUrl: function(q) {
+            var L, G = q.lastIndexOf("."), U = q.split("/")[0], H = U === "." || U === "..";
+            return G !== -1 && (!H || G > 1) && (L = q.substring(G, q.length), q = q.substring(0, G)), o.nameToUrl(b(
+              q,
               k && k.id,
               !0
             ), L, !0);
           },
-          defined: function(V) {
-            return hasProp(p, F(V, k, !1, !0).id);
+          defined: function(q) {
+            return hasProp(p, F(q, k, !1, !0).id);
           },
-          specified: function(V) {
-            return V = F(V, k, !1, !0).id, hasProp(p, V) || hasProp(l, V);
+          specified: function(q) {
+            return q = F(q, k, !1, !0).id, hasProp(p, q) || hasProp(l, q);
           }
-        }), k || (E.undef = function(V) {
+        }), k || (E.undef = function(q) {
           D();
-          var L = F(V, k, !0), G = getOwn(l, V);
-          G.undefed = !0, S(V), delete p[V], delete m[L.url], delete u[V], eachReverse(d, function(U, H) {
-            U[0] === V && d.splice(H, 1);
-          }), delete o.defQueueMap[V], G && (G.events.defined && (u[V] = G.events), O(V));
+          var L = F(q, k, !0), G = getOwn(l, q);
+          G.undefed = !0, S(q), delete p[q], delete m[L.url], delete u[q], eachReverse(d, function(U, H) {
+            U[0] === q && d.splice(H, 1);
+          }), delete o.defQueueMap[q], G && (G.events.defined && (u[q] = G.events), O(q));
         }), E;
       },
       /**
@@ -13419,7 +13430,7 @@ https://requirejs.org/docs/errors.html#` + e);
        * @param {String} moduleName the name of the module to potentially complete.
        */
       completeLoad: function(k) {
-        var z, E, V, L = getOwn(a.shim, k) || {}, G = L.exports;
+        var z, E, q, L = getOwn(a.shim, k) || {}, G = L.exports;
         for (D(); d.length; ) {
           if (E = d.shift(), E[0] === null) {
             if (E[0] = k, z)
@@ -13429,7 +13440,7 @@ https://requirejs.org/docs/errors.html#` + e);
             E[0] === k && (z = !0);
           B(E);
         }
-        if (o.defQueueMap = {}, V = getOwn(l, k), !z && !hasProp(p, k) && V && !V.inited) {
+        if (o.defQueueMap = {}, q = getOwn(l, k), !z && !hasProp(p, k) && q && !q.inited) {
           if (a.enforceDefine && (!G || !getGlobal(G)))
             return y(k) ? void 0 : T(makeError(
               "nodefine",
@@ -13449,14 +13460,14 @@ https://requirejs.org/docs/errors.html#` + e);
        * internal API, not a public one. Use toUrl for the public API.
        */
       nameToUrl: function(k, z, E) {
-        var V, L, G, U, H, J, W, K = getOwn(a.pkgs, k);
+        var q, L, G, U, H, J, W, K = getOwn(a.pkgs, k);
         if (K && (k = K), W = getOwn(h, k), W)
           return o.nameToUrl(W, z, E);
         if (req.jsExtRegExp.test(k))
           H = k + (z || "");
         else {
-          for (V = a.paths, L = k.split("/"), G = L.length; G > 0; G -= 1)
-            if (U = L.slice(0, G).join("/"), J = getOwn(V, U), J) {
+          for (q = a.paths, L = k.split("/"), G = L.length; G > 0; G -= 1)
+            if (U = L.slice(0, G).join("/"), J = getOwn(q, U), J) {
               isArray(J) && (J = J[0]), L.splice(0, G, J);
               break;
             }
@@ -13476,8 +13487,8 @@ https://requirejs.org/docs/errors.html#` + e);
        *
        * @private
        */
-      execCb: function(k, z, E, V) {
-        return z.apply(V, E);
+      execCb: function(k, z, E, q) {
+        return z.apply(q, E);
       },
       /**
        * callback for script loads, used to check status of loading.
@@ -13499,8 +13510,8 @@ https://requirejs.org/docs/errors.html#` + e);
         var z = M(k);
         if (!y(z.id)) {
           var E = [];
-          return eachProp(l, function(V, L) {
-            L.indexOf("_@r") !== 0 && each(V.depMaps, function(G) {
+          return eachProp(l, function(q, L) {
+            L.indexOf("_@r") !== 0 && each(q.depMaps, function(G) {
               if (G.id === z.id)
                 return E.push(L), !0;
             });
@@ -14221,7 +14232,7 @@ class Application {
     });
   }
   load() {
-    return q(this, null, function* () {
+    return V(this, null, function* () {
       var t, n, o, r, i;
       try {
         this.loading = !0, yield this.loadWebSocket(), yield this.pm.load();
@@ -14236,7 +14247,7 @@ class Application {
     });
   }
   loadWebSocket() {
-    return q(this, null, function* () {
+    return V(this, null, function* () {
       this.eventBus.addEventListener("ws:message:authorized", () => {
         this.setWsAuthorized(!0);
       }), this.ws.on("message", (t) => {
@@ -15481,7 +15492,7 @@ const useTableBlockProps = () => {
       i && (i.field.data = ((v = i.field) == null ? void 0 : v.data) || {}, i.field.data.selectedRowKeys = S, i.field.data.selectedRowData = y, (I = (F = i.field) == null ? void 0 : F.onRowSelect) == null || I.call(F, S));
     }, []),
     onRowDragEnd: useCallback(
-      (v) => q(void 0, [v], function* ({ from: S, to: y }) {
+      (v) => V(void 0, [v], function* ({ from: S, to: y }) {
         yield a.current.resource.move({
           sourceId: S[i.rowKey || "id"],
           targetId: y[i.rowKey || "id"],
@@ -15512,7 +15523,7 @@ const useTableBlockProps = () => {
         const T = w.find((D) => D.uid === t.parent["x-uid"]);
         w.forEach((D) => {
           var $, k, z, E;
-          const O = F.find((V) => V.uid === D.uid);
+          const O = F.find((q) => q.uid === D.uid);
           if (!O)
             return;
           const j = getSourceKey(T, O.field) || i.rowKey || "id", N = [S[j]], B = (($ = D.service.params) == null ? void 0 : $[0]) || {}, R = ((z = (k = D.service.params) == null ? void 0 : k[1]) == null ? void 0 : z.filters) || {};
@@ -15531,7 +15542,7 @@ const useTableBlockProps = () => {
               ]
             };
           const M = mergeFilter([
-            ...Object.values(R).map((V) => removeNullCondition(V)),
+            ...Object.values(R).map((q) => removeNullCondition(q)),
             D.defaultFilter
           ]);
           return D.doFilter(
@@ -15733,7 +15744,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 V(this, null, function* () {
       if (this.field.data = this.field.data || {}, this.field.data.changed)
         return console.log("list.dataSource", this.field.data.dataSource), {
           data: {
@@ -15755,7 +15766,7 @@ class TableFieldResource {
     });
   }
   get(t) {
-    return q(this, null, function* () {
+    return V(this, null, function* () {
       console.log("get", t);
       const { filterByTk: n } = t;
       return {
@@ -15766,21 +15777,21 @@ class TableFieldResource {
     });
   }
   create(t) {
-    return q(this, null, function* () {
+    return V(this, null, function* () {
       console.log("create", t);
       const { values: n } = t;
       this.field.data.dataSource.push(n), this.field.data.changed = !0;
     });
   }
   update(t) {
-    return q(this, null, function* () {
+    return V(this, null, function* () {
       console.log("update", t);
       const { filterByTk: n, values: o } = t;
       this.field.data.dataSource[n] = o, this.field.data.changed = !0;
     });
   }
   destroy(t) {
-    return q(this, null, function* () {
+    return V(this, null, function* () {
       console.log("destroy", t);
       let { filterByTk: n } = t;
       Array.isArray(n) || (n = [n]), this.field.data.dataSource = this.field.data.dataSource.filter((o, r) => !n.includes(r)), this.field.data.changed = !0;
@@ -15937,8 +15948,8 @@ const useTableSelectorParams = () => useContext(TableSelectorParamsContext), Tab
   return useEffect(() => {
     var w, T, D, O, j, N, B, R, M, $, k, z, E;
     if (!((w = t == null ? void 0 : t.service) != null && w.loading)) {
-      const V = (D = (T = t == null ? void 0 : t.service) == null ? void 0 : T.data) == null ? void 0 : D.data.map((L) => L);
-      e.value = V, (O = e == null ? void 0 : e.setInitialValue) == null || O.call(e, V), e.data = e.data || {}, e.data.selectedRowKeys = [], e.componentProps.pagination = e.componentProps.pagination || {}, e.componentProps.pagination.pageSize = (B = (N = (j = t == null ? void 0 : t.service) == null ? void 0 : j.data) == null ? void 0 : N.meta) == null ? void 0 : B.pageSize, e.componentProps.pagination.total = ($ = (M = (R = t == null ? void 0 : t.service) == null ? void 0 : R.data) == null ? void 0 : M.meta) == null ? void 0 : $.count, e.componentProps.pagination.current = (E = (z = (k = t == null ? void 0 : t.service) == null ? void 0 : k.data) == null ? void 0 : z.meta) == null ? void 0 : E.page;
+      const q = (D = (T = t == null ? void 0 : t.service) == null ? void 0 : T.data) == null ? void 0 : D.data.map((L) => L);
+      e.value = q, (O = e == null ? void 0 : e.setInitialValue) == null || O.call(e, q), e.data = e.data || {}, e.data.selectedRowKeys = [], e.componentProps.pagination = e.componentProps.pagination || {}, e.componentProps.pagination.pageSize = (B = (N = (j = t == null ? void 0 : t.service) == null ? void 0 : j.data) == null ? void 0 : N.meta) == null ? void 0 : B.pageSize, e.componentProps.pagination.total = ($ = (M = (R = t == null ? void 0 : t.service) == null ? void 0 : R.data) == null ? void 0 : M.meta) == null ? void 0 : $.count, e.componentProps.pagination.current = (E = (z = (k = t == null ? void 0 : t.service) == null ? void 0 : k.data) == null ? void 0 : z.meta) == null ? void 0 : E.page;
     }
   }, [
     i == null ? void 0 : i.foreignKey,
@@ -15960,7 +15971,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 = w, t.field.data.selectedRowData = T;
     },
     onRowDragEnd(D) {
-      return q(this, arguments, function* ({ from: w, to: T }) {
+      return V(this, arguments, function* ({ from: w, to: T }) {
         yield t.resource.move({
           sourceId: w[t.rowKey || "id"],
           targetId: T[t.rowKey || "id"]
@@ -16019,7 +16030,7 @@ const useTableSelectorParams = () => useContext(TableSelectorParamsContext), Tab
 );
 class BlockSchemaComponentPlugin extends Plugin {
   load() {
-    return q(this, null, function* () {
+    return V(this, null, function* () {
       this.addComponents(), this.addScopes();
     });
   }
@@ -16113,7 +16124,7 @@ const regenerateUid = (e) => {
     templates: n,
     refresh: t,
     getTemplateSchemaByMode: useCallback(
-      (r) => q(void 0, null, function* () {
+      (r) => V(void 0, null, function* () {
         const { mode: i, template: a } = r;
         if (i === "copy") {
           const { data: l } = yield o.request({
@@ -16132,7 +16143,7 @@ const regenerateUid = (e) => {
       [o]
     ),
     copyTemplateSchema: useCallback(
-      (r) => q(void 0, null, function* () {
+      (r) => V(void 0, null, function* () {
         const { data: i } = yield o.request({
           url: `/uiSchemas:getJsonSchema/${r.uid}?includeAsyncNode=true`
         }), a = (i == null ? void 0 : i.data) || {};
@@ -16141,7 +16152,7 @@ const regenerateUid = (e) => {
       [o]
     ),
     saveAsTemplate: useCallback(
-      (r) => q(void 0, null, function* () {
+      (r) => V(void 0, null, function* () {
         const { uid: i } = r, a = uid();
         return yield o.resource("uiSchemas").saveAsTemplate({
           filterByTk: i,
@@ -16202,7 +16213,7 @@ const regenerateUid = (e) => {
   refreshDeps: []
 }, RemoteSchemaTemplateManagerProvider = (e) => {
   var i;
-  const t = useAPIClient(), n = useRequest(options), o = useCallback(() => q(void 0, null, function* () {
+  const t = useAPIClient(), n = useRequest(options), o = useCallback(() => V(void 0, null, function* () {
     const { data: a } = yield t.request(options);
     n.mutate(a);
   }), [t, n]), r = useMemo(() => {
@@ -16213,7 +16224,7 @@ const regenerateUid = (e) => {
 };
 class RemoteSchemaTemplateManagerPlugin extends Plugin {
   load() {
-    return q(this, null, function* () {
+    return V(this, null, function* () {
       this.addRoutes(), this.addComponents();
     });
   }
@@ -16249,7 +16260,7 @@ const CollectionTitle = (e) => {
   const e = useUpdateActionProps(), { __parent: t } = useBlockRequestContext();
   return {
     onClick() {
-      return q(this, null, function* () {
+      return V(this, null, function* () {
         var o, r;
         yield e.onClick(), (r = (o = t == null ? void 0 : t.service) == null ? void 0 : o.refresh) == null || r.call(o);
       });
@@ -16259,7 +16270,7 @@ const CollectionTitle = (e) => {
   const e = useBulkDestroyActionProps(), t = useSchemaTemplateManager(), { service: n } = useBlockRequestContext();
   return {
     onClick() {
-      return q(this, null, function* () {
+      return V(this, null, function* () {
         var r;
         yield e.onClick(), yield t.refresh(), (r = n == null ? void 0 : n.refresh) == null || r.call(n);
       });
@@ -16269,7 +16280,7 @@ const CollectionTitle = (e) => {
   const e = useDestroyActionProps(), { service: t } = useBlockRequestContext(), n = useSchemaTemplateManager();
   return {
     onClick() {
-      return q(this, null, function* () {
+      return V(this, null, function* () {
         var r;
         yield e.onClick(), yield n.refresh(), (r = t == null ? void 0 : t.refresh) == null || r.call(t);
       });
@@ -18030,7 +18041,7 @@ const useGetAriaLabelOfDesigner = () => {
         })
       )
     };
-  }, [v, (J = $ == null ? void 0 : $.cols) == null ? void 0 : J.length]), E = useMemo(() => u === !1 || C === !1 ? null : /* @__PURE__ */ jsx(DragHandler, { children: /* @__PURE__ */ jsx(DragOutlined, { role: "button", "aria-label": v("drag-handler") }) }), [u, v, C]), V = useMemo(() => {
+  }, [v, (J = $ == null ? void 0 : $.cols) == null ? void 0 : J.length]), E = useMemo(() => u === !1 || C === !1 ? null : /* @__PURE__ */ jsx(DragHandler, { children: /* @__PURE__ */ jsx(DragOutlined, { role: "button", "aria-label": v("drag-handler") }) }), [u, v, C]), q = useMemo(() => {
     var W;
     if (o === !1)
       return null;
@@ -18079,7 +18090,7 @@ const useGetAriaLabelOfDesigner = () => {
         ] }) }),
         /* @__PURE__ */ jsx("div", { className: cls("toolbar-icons", a), style: l, children: /* @__PURE__ */ jsxs(Space$1, { size: 3, align: "center", className: d, style: p, children: [
           E,
-          /* @__PURE__ */ jsx(RefreshComponentProvider, { refresh: O, children: V }),
+          /* @__PURE__ */ jsx(RefreshComponentProvider, { refresh: O, children: q }),
           L
         ] }) })
       ]
@@ -18193,7 +18204,7 @@ const SchemaToolbarErrorFallback = (e) => {
       const {
         association: z = !1,
         cached: E = {},
-        collectionNames: V = [R],
+        collectionNames: q = [R],
         maxDepth: L = 1,
         allowAllTypes: G = !1,
         exceptInterfaces: U = [],
@@ -18201,7 +18212,7 @@ const SchemaToolbarErrorFallback = (e) => {
         usePrefix: J = !1,
         dataSource: W
       } = k || {};
-      if (V.length - 1 > L)
+      if (q.length - 1 > L)
         return;
       if (E[R])
         return _.cloneDeep(E[R]);
@@ -18214,10 +18225,10 @@ const SchemaToolbarErrorFallback = (e) => {
           value: J && H ? `${H}.${Z.name}` : Z.name,
           label: f((re = Z == null ? void 0 : Z.uiSchema) == null ? void 0 : re.title) || Z.name
         }, Z);
-        return z && Z.target && (ne.children = V.includes(Z.target) ? [] : I(Z.target, M, $, P(x({}, k), {
+        return z && Z.target && (ne.children = q.includes(Z.target) ? [] : I(Z.target, M, $, P(x({}, k), {
           cached: E,
           dataSource: W,
-          collectionNames: [...V, Z.target],
+          collectionNames: [...q, Z.target],
           prefixFieldValue: J ? H ? `${H}.${Z.name}` : Z.name : "",
           usePrefix: J
         })), !((se = ne.children) != null && se.length)) ? null : ne;
@@ -18379,7 +18390,7 @@ function FormDialog(e, t, n, o) {
             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) => V(this, null, function* () {
             var b;
             ((b = l == null ? void 0 : l.onOk) == null ? void 0 : b.call(l, C)) !== !1 && (m == null || m());
           }),
@@ -18393,8 +18404,8 @@ function FormDialog(e, t, n, o) {
     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) => V(this, null, function* () {
+      return r.promise || (r.promise = new Promise((m, h) => V(this, null, function* () {
         try {
           p = yield loading(l.loadingText, () => applyMiddleware(p, r.openMiddlewares)), r.form = r.form || createForm(p);
         } catch (g) {
@@ -18405,7 +18416,7 @@ function FormDialog(e, t, n, o) {
             !0,
             () => {
               var g;
-              (g = r.form) == null || g.submit(() => q(this, null, function* () {
+              (g = r.form) == null || g.submit(() => V(this, null, function* () {
                 yield applyMiddleware(r.form, r.confirmMiddlewares), untracked(() => {
                   var f;
                   m(x({}, (f = r.form) == null ? void 0 : f.values));
@@ -18413,7 +18424,7 @@ function FormDialog(e, t, n, o) {
               })).catch(() => {
               });
             },
-            () => q(this, null, function* () {
+            () => V(this, null, function* () {
               yield loading(l.loadingText, () => applyMiddleware(r.form, r.cancelMiddlewares)), d.close();
             })
           )
@@ -18579,7 +18590,7 @@ const DatePickerContext = React.createContext({ utc: !0 }), useDatePickerContext
   }), () => {
     u.current();
   }), [e._maxDate, e._minDate, r, o]);
-  const d = () => q(void 0, null, function* () {
+  const d = () => V(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 = o(e._maxDate, r).then((y) => dayjs(y.value))), isVariable$1(e._minDate) && (m = o(e._minDate, r).then((y) => dayjs(y.value)));
     const [g, f] = yield Promise.all([m, h]), C = Array.from({ length: 60 }, (y, v) => v), b = (y) => {
@@ -19109,7 +19120,7 @@ const useDateVariable = ({ operator: e, schema: t, noDisabled: n }) => {
     key: t,
     isLeaf: !1,
     disabled: a,
-    loadChildren: (c, u) => q(void 0, null, function* () {
+    loadChildren: (c, u) => V(void 0, null, function* () {
       const d = u ? {
         [u]: void 0
       } : {};
@@ -19672,7 +19683,7 @@ const findOption$1 = (e = [], t) => {
     (T, D) => {
       if (!u)
         return n(T);
-      setTimeout(() => q(void 0, null, function* () {
+      setTimeout(() => V(void 0, null, function* () {
         (yield u(T, D)) && n(T);
       }));
     },
@@ -19702,7 +19713,7 @@ const findOption$1 = (e = [], t) => {
   getAllCollectionsInheritChain: o
 }) => {
   const r = e ? o(e.target) : [];
-  return (i, a) => q(void 0, null, function* () {
+  return (i, a) => V(void 0, null, function* () {
     if (_.isString(i) && i.includes("$nRole") || !isVariable$1(i) || !t || !e || e.interface === "json")
       return !0;
     const l = a[a.length - 1];
@@ -20369,7 +20380,7 @@ const EnableChildCollections = withDynamicSchemaProps(
           d.dataSource = m, d.loading = !1, d.initialValue && (d.disabled = !0);
         })
       );
-    }, c = (u) => q(void 0, null, function* () {
+    }, c = (u) => V(void 0, null, function* () {
       var p, m;
       const { childrenCollections: d } = ((p = o.values) == null ? void 0 : p.enableChildren) || {};
       return (m = a.filter((h) => !d.find((g) => g.collection === h.name) || u.initialValue || h.name === u.value)) == null ? void 0 : m.map((h) => ({
@@ -21314,7 +21325,7 @@ const findGridSchema = (e) => e.reduceProperties((t, n) => {
     SchemaSettingsItem,
     {
       title: "Convert reference to duplicate",
-      onClick: () => q(this, null, function* () {
+      onClick: () => V(this, null, function* () {
         const b = yield f(p), S = findBlockTemplateSchema(m), y = createDesignable({
           t: a,
           api: h,
@@ -21322,7 +21333,7 @@ const findGridSchema = (e) => e.reduceProperties((t, n) => {
         });
         y.loadAPIClientEvents(), y.removeWithoutEmit(S), y.insertAdjacent(n, b, {
           onSuccess() {
-            return q(this, null, function* () {
+            return V(this, null, function* () {
               yield h.request({
                 url: `/uiSchemas:remove/${S["x-uid"]}`
               });
@@ -21343,7 +21354,7 @@ const findGridSchema = (e) => e.reduceProperties((t, n) => {
     SchemaSettingsItem,
     {
       title: "Save as block template",
-      onClick: () => q(this, null, function* () {
+      onClick: () => V(this, null, function* () {
         d(!1);
         const b = r && (c == null ? void 0 : c.getCollection(r)), S = findGridSchema(m), y = yield FormDialog(
           a("Save as template"),
@@ -21457,7 +21468,7 @@ const findGridSchema = (e) => e.reduceProperties((t, n) => {
           content: c("Are you sure you want to delete it?")
         }, n), {
           onOk() {
-            return q(this, null, function* () {
+            return V(this, null, function* () {
               var y;
               const S = {
                 removeParentsIfNoChildren: r,
@@ -21568,7 +21579,7 @@ const SchemaSettingsSwitchItem = (e) => {
   }, [JSON.stringify(r || {})]);
   const O = useCallback(() => {
     h(!1), D.reset();
-  }, [D]), j = useCallback(() => q(void 0, null, function* () {
+  }, [D]), j = useCallback(() => V(void 0, null, function* () {
     yield D.submit();
     try {
       const M = D.values, $ = Object.keys(M).reduce((k, z) => (D.query(z).take() && (k[z] = M[z]), k), {});
@@ -21576,7 +21587,7 @@ const SchemaSettingsSwitchItem = (e) => {
     } catch (M) {
       console.error(M);
     }
-  }), [D, n]), N = useCallback(() => q(void 0, null, function* () {
+  }), [D, n]), N = useCallback(() => V(void 0, null, function* () {
     !g && (a != null && a["x-uid"]) && (b["x-action-settings"].schemaUid = a["x-uid"], y.emit("patch", { schema: b }), yield F.resource("uiSchemas").insert({ values: a }), f(a["x-uid"])), typeof i == "function" && (i == null || i()), S.setVisible(!1), h(!0);
   }), [F, S, y, b, a, g]), B = useCallback((M) => M.stopPropagation(), []);
   return /* @__PURE__ */ jsxs(zIndexContext.Provider, { value: T, children: [
@@ -21619,7 +21630,7 @@ const SchemaSettingsSwitchItem = (e) => {
 });
 SchemaSettingsActionModalItem.displayName = "SchemaSettingsActionModalItem";
 const SchemaSettingsModalItem = (e) => {
-  const V = e, {
+  const q = e, {
     hidden: t,
     title: n,
     components: o,
@@ -21631,7 +21642,7 @@ const SchemaSettingsModalItem = (e) => {
     width: u = "fit-content",
     noRecord: d = !1,
     ModalContextProvider: p = (L) => /* @__PURE__ */ jsx(Fragment$1, { children: L.children })
-  } = V, m = Y(V, [
+  } = q, m = Y(q, [
     "hidden",
     "title",
     "components",
@@ -21649,7 +21660,7 @@ const SchemaSettingsModalItem = (e) => {
     P(x({
       title: n
     }, m), {
-      onClick: () => q(void 0, null, function* () {
+      onClick: () => V(void 0, null, function* () {
         const L = l ? yield l() : c, G = _.isFunction(e.schema) ? e.schema() : e.schema;
         FormDialog(
           { title: G.title || n, width: u },
@@ -21722,7 +21733,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) => V(this, [g], function* ({ sort: h }) {
     var C;
     if (t != null && t.onSubmit)
       return t.onSubmit({ sort: h });
@@ -22555,18 +22566,18 @@ const getActionContext = (e) => {
     `${w.target}.${((E = (z = o["x-component-props"]) == null ? void 0 : z.fieldNames) == null ? void 0 : E.label) || "id"}`
   ));
   const D = (w == null ? void 0 : w.interface) === "m2o" && findParentFieldSchema(o), O = D && p(D == null ? void 0 : D["x-collection-field"]), j = useTableBlockContext(), N = (w == null ? void 0 : w.interface) === "m2m" || (w == null ? void 0 : w.interface) === "mbm" || (O == null ? void 0 : O.type) === "hasMany" && (w == null ? void 0 : w.interface) === "m2o", B = useCallback(
-    (V) => {
-      const L = V.find((U) => U.value === "$nForm"), G = m(I);
-      return !(G != null && G.length) && L && (L.children = formatVariableScop(y())), V;
+    (q) => {
+      const L = q.find((U) => U.value === "$nForm"), G = m(I);
+      return !(G != null && G.length) && L && (L.children = formatVariableScop(y())), q;
     },
     [y, I]
   ), R = useMemo(() => ({
     ArrayCollapse: ArrayCollapse$2,
     FormLayout,
-    VariableInput: (V) => /* @__PURE__ */ jsx(
+    VariableInput: (q) => /* @__PURE__ */ jsx(
       VariableInput,
-      P(x({}, V), {
-        value: V.value || void 0,
+      P(x({}, q), {
+        value: q.value || void 0,
         hideVariableButton: t == null ? void 0 : t.hideVariableButton
       })
     )
@@ -22636,12 +22647,12 @@ const getActionContext = (e) => {
     u,
     g
   ]), $ = useCallback(
-    (V) => {
+    (q) => {
       var G, U, H;
       const L = {
         "x-uid": o["x-uid"]
       };
-      o.default = (G = V.default) != null ? G : null, isVariable$1(V.default) || (U = r.setInitialValue) == null || U.call(r, V.default), L.default = (H = V.default) != null ? H : null, i.emit("patch", {
+      o.default = (G = q.default) != null ? G : null, isVariable$1(q.default) || (U = r.setInitialValue) == null || U.call(r, q.default), L.default = (H = q.default) != null ? H : null, i.emit("patch", {
         schema: L,
         currentSchema: n
       });
@@ -22656,7 +22667,7 @@ const getActionContext = (e) => {
       width: 800,
       schema: M,
       onSubmit: $,
-      ModalContextProvider: (V) => /* @__PURE__ */ jsx(FlagProvider, { isInSubForm: v, isInSubTable: F, isInSetDefaultValueDialog: !0, children: V.children })
+      ModalContextProvider: (q) => /* @__PURE__ */ jsx(FlagProvider, { isInSubForm: v, isInSubTable: F, isInSetDefaultValueDialog: !0, children: q.children })
     }
   );
 }, SchemaSettingsSortingRule = function e(t) {
@@ -22977,7 +22988,7 @@ const SaveConditions = () => {
         /* @__PURE__ */ jsx(
           Button,
           {
-            onClick: () => q(void 0, null, function* () {
+            onClick: () => V(void 0, null, function* () {
               yield e.reset(), r == null || r(e.values), n.title = l(o.title) || c("Filter"), i(!1);
             }),
             children: c("Reset")
@@ -23424,7 +23435,7 @@ const useGetFilterOptions = () => {
     };
   });
 }, TableColumnDesigner$1 = (e) => {
-  var j, N, B, R, M, $, k, z, E, V, L, G;
+  var j, N, B, R, M, $, k, z, E, q, L, G;
   const { uiSchema: t, fieldSchema: n, collectionField: o } = e, { form: r } = useFormBlockContext(), { getInterface: i, getCollection: a } = useCollectionManager_deprecated(), l = useField(), { t: c } = useTranslation(), u = useFieldSchema(), { dn: d } = useDesignable(), p = ((j = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : j.fieldNames) || ((N = t == null ? void 0 : t["x-component-props"]) == null ? void 0 : N.fieldNames), m = useLabelFields$1((B = o == null ? void 0 : o.target) != null ? B : o == null ? void 0 : o.targetCollection), h = useColorFields((R = o == null ? void 0 : o.target) != null ? R : o == null ? void 0 : o.targetCollection), g = i(o == null ? void 0 : o.interface), f = a(o == null ? void 0 : o.target), C = isFileCollection$2(f), b = ["QuickEdit", "FormItem"].includes(n["x-decorator"]), { currentMode: S } = useAssociationFieldContext(), { isAllowToSetDefaultValue: y } = useIsAllowToSetDefaultValue({ collectionField: o, fieldSchema: n }), v = ["datetime", "createdAt", "updatedAt"].includes(o == null ? void 0 : o.interface), F = ["obo", "oho", "o2o", "o2m", "m2m", "m2o", "snapshot"].includes(
     o == null ? void 0 : o.interface
   ), I = useFieldModeOptions({ fieldSchema: n }), w = ((M = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : M.mode) || "Select";
@@ -23493,7 +23504,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: ((q = u == null ? void 0 : u["x-component-props"]) == null ? void 0 : q.width) || 100,
               "x-decorator": "FormItem",
               "x-component": "InputNumber",
               "x-component-props": {}
@@ -24816,7 +24827,7 @@ function VariableSelect({
 }) {
   const { t: l } = useTranslation(), [c, u] = useState([]), { wrapSSR: d, componentCls: p, hashId: m } = useStyles$d(), { token: h } = useToken$1();
   function g(f) {
-    return q(this, null, function* () {
+    return V(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]));
@@ -25053,7 +25064,7 @@ const useStyles$c = genStyleHook("nb-markdown", (e, { isDarkTheme: t }) => {
       ".field-interface-datetime": { minWidth: "100px" }
     }, t ? i : r)
   };
-}), parseMarkdown = _.memoize((e) => q(void 0, null, function* () {
+}), parseMarkdown = _.memoize((e) => V(void 0, null, function* () {
   return e && (yield import("./md-oH2RssNY.mjs")).default.render(e);
 }));
 function useParseMarkdown(e) {
@@ -25154,8 +25165,8 @@ const MarkdownEditor = (e) => {
   observer$1((e) => {
     const { isDarkTheme: t } = useGlobalTheme(), { componentCls: n, hashId: o } = useStyles$c({ isDarkTheme: t }), { content: r, className: i } = e, a = 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), V(void 0, null, function* () {
+        setTimeout(() => V(void 0, null, function* () {
           const w = yield getRenderContent(b, r, f, C, parseMarkdown);
           g(w);
         })), y(!1);
@@ -25180,7 +25191,7 @@ const MarkdownEditor = (e) => {
         onCancel: () => {
           a.editable = !1, d == null || d();
         },
-        onSubmit: (I) => q(void 0, null, function* () {
+        onSubmit: (I) => V(void 0, null, function* () {
           var w;
           a.editable = !1, (w = l["x-component-props"]) != null || (l["x-component-props"] = {}), l["x-component-props"].content = I, a.componentProps.content = I, u == null || u(l), c.emit("patch", {
             schema: {
@@ -25350,13 +25361,14 @@ const useStyles$b = genStyleHook("nb-menu-item", (e) => {
   };
 }), JT_VALUE_RE = /^\s*{{\s*([^{}]+)\s*}}\s*$/;
 function parseValue(e, t = {}) {
+  var o;
   if (e == null)
-    return "null";
+    return (o = t.defaultTypeOnNull) != null ? o : "null";
   const n = typeof e;
   if (n === "string") {
-    const o = e.match(JT_VALUE_RE);
-    if (o)
-      return o[1].split(".");
+    const r = e.match(JT_VALUE_RE);
+    if (r)
+      return r[1].split(".");
     if (t.stringToDate && !Number.isNaN(Date.parse(e)))
       return "date";
   }
@@ -25522,7 +25534,7 @@ function Input$1(e) {
     ].filter((ne) => !ne.deprecated || (R == null ? void 0 : R[0]) === ne[M.value]);
     I(ee);
   }, [h, R, $, a]);
-  const V = (K) => q(this, null, function* () {
+  const q = (K) => V(this, null, function* () {
     var ee;
     const X = K[K.length - 1];
     if (!((ee = X.children) != null && ee.length) && !X.isLeaf && X.loadChildren) {
@@ -25564,7 +25576,7 @@ function Input$1(e) {
     n(null);
   }, [$]);
   useEffect(() => {
-    q(this, null, function* () {
+    V(this, null, function* () {
       var Z;
       if (!R || F.length <= 1)
         return;
@@ -25659,7 +25671,7 @@ function Input$1(e) {
           options: F,
           value: R != null ? R : E,
           onChange: L,
-          loadData: V,
+          loadData: q,
           changeOnSelect: u,
           fieldNames: d,
           disabled: U,
@@ -25940,7 +25952,7 @@ function TextArea(e) {
       F(!0), pasteHTML(L.currentTarget, U), D(getCurrentRange(L.currentTarget)), N(L.currentTarget);
     },
     [N]
-  ), V = e.disabled || C.disabled;
+  ), q = e.disabled || C.disabled;
   return t(
     /* @__PURE__ */ jsxs(
       Space$1.Compact,
@@ -25999,7 +26011,7 @@ function TextArea(e) {
               className: cx(
                 n,
                 "ant-input",
-                { "ant-input-disabled": V },
+                { "ant-input-disabled": q },
                 // NOTE: `pre-wrap` here for avoid the `&nbsp;` (\x160) issue when paste content, we need normal space (\x32).
                 css`
             min-height: ${O.controlHeight}px;
@@ -26021,7 +26033,7 @@ function TextArea(e) {
           `
               ),
               ref: h,
-              contentEditable: !V,
+              contentEditable: !q,
               dangerouslySetInnerHTML: { __html: I }
             }
           ),
@@ -26033,7 +26045,7 @@ function TextArea(e) {
               onInsert: B,
               changeOnSelect: i,
               fieldNames: l || defaultFieldNames$2,
-              disabled: V
+              disabled: q
             }
           )
         ]
@@ -26042,7 +26054,7 @@ function TextArea(e) {
   );
 }
 function preloadOptions(e, t) {
-  return q(this, null, function* () {
+  return V(this, null, function* () {
     var r;
     let n = [...e != null ? e : []];
     const o = t.map((i) => i.split("."));
@@ -26236,7 +26248,7 @@ const getVariableComponentWithScope = (e) => (t) => {
   }), [e]);
   return { urlSchema: n, paramsSchema: i, openInNewWindowSchema: a, modeSchema: o, htmlSchema: r };
 }, LinkMenuItem = () => {
-  const { t: e } = useTranslation(), t = useContext(SchemaOptionsContext), { theme: n } = useGlobalTheme(), { componentCls: o, hashId: r } = useStyles$b(), { urlSchema: i, paramsSchema: a } = useURLAndHTMLSchema(), l = useParentRoute(), { createRoute: c } = useNocoBaseRoutes(), u = useDataSourceManager(), d = useCollectionManager(), p = useCallback(() => q(void 0, null, function* () {
+  const { t: e } = useTranslation(), t = useContext(SchemaOptionsContext), { theme: n } = useGlobalTheme(), { componentCls: o, hashId: r } = useStyles$b(), { urlSchema: i, paramsSchema: a } = useURLAndHTMLSchema(), l = useParentRoute(), { createRoute: c } = useNocoBaseRoutes(), u = useDataSourceManager(), d = useCollectionManager(), p = useCallback(() => V(void 0, null, function* () {
     const m = yield FormDialog(
       e("Add link"),
       () => {
@@ -26284,7 +26296,7 @@ const getVariableComponentWithScope = (e) => (t) => {
 }, useInsertPageSchema = () => {
   const e = useAPIClient();
   return useCallback(
-    (t) => q(void 0, null, function* () {
+    (t) => V(void 0, null, function* () {
       yield e.request({
         method: "POST",
         url: "/uiSchemas:insert",
@@ -26294,7 +26306,7 @@ const getVariableComponentWithScope = (e) => (t) => {
     [e]
   );
 }, PageMenuItem = () => {
-  const { t: e } = useTranslation(), t = useContext(SchemaOptionsContext), { theme: n } = useGlobalTheme(), { componentCls: o, hashId: r } = useStyles$b(), i = useParentRoute(), { createRoute: a } = useNocoBaseRoutes(), l = useInsertPageSchema(), c = useCallback(() => q(void 0, null, function* () {
+  const { t: e } = useTranslation(), t = useContext(SchemaOptionsContext), { theme: n } = useGlobalTheme(), { componentCls: o, hashId: r } = useStyles$b(), i = useParentRoute(), { createRoute: a } = useNocoBaseRoutes(), l = useInsertPageSchema(), c = useCallback(() => V(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(
@@ -26359,7 +26371,7 @@ function getPageMenuSchema({ pageSchemaUid: e, tabSchemaUid: t, tabSchemaName: n
   };
 }
 const GroupItem$1 = () => {
-  const { t: e } = useTranslation(), t = useContext(SchemaOptionsContext), { theme: n } = useGlobalTheme(), { componentCls: o, hashId: r } = useStyles$b(), i = useParentRoute(), { createRoute: a } = useNocoBaseRoutes(), l = useCallback(() => q(void 0, null, function* () {
+  const { t: e } = useTranslation(), t = useContext(SchemaOptionsContext), { theme: n } = useGlobalTheme(), { componentCls: o, hashId: r } = useStyles$b(), i = useParentRoute(), { createRoute: a } = useNocoBaseRoutes(), l = useCallback(() => V(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(
@@ -26485,7 +26497,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: () => V(void 0, null, function* () {
             if ((o == null ? void 0 : o.id) != null && (yield n(o.id)), a !== (o == null ? void 0 : o.schemaUid) && !findRouteBySchemaUid(a, o == null ? void 0 : o.children))
               return;
             const l = findPrevSibling(r, o), c = findNextSibling(r, o);
@@ -26522,7 +26534,7 @@ const GroupItem$1 = () => {
             }
           }
         },
-        onSubmit: (g) => q(void 0, [g], function* ({ title: m, icon: h }) {
+        onSubmit: (g) => V(void 0, [g], function* ({ title: m, icon: h }) {
           var S;
           const f = uid(), C = o === "beforeEnd" ? l == null ? void 0 : l.id : l == null ? void 0 : l.parentId, { data: b } = yield u({
             type: NocoBaseDesktopRouteType.group,
@@ -26564,7 +26576,7 @@ const GroupItem$1 = () => {
             }
           }
         },
-        onSubmit: (g) => q(void 0, [g], function* ({ title: m, icon: h }) {
+        onSubmit: (g) => V(void 0, [g], function* ({ title: m, icon: h }) {
           var F;
           const f = uid(), C = uid(), b = uid(), S = uid(), y = o === "beforeEnd" ? l == null ? void 0 : l.id : l == null ? void 0 : l.parentId, { data: v } = yield u({
             type: NocoBaseDesktopRouteType.page,
@@ -26617,7 +26629,7 @@ const GroupItem$1 = () => {
             params: a
           }
         },
-        onSubmit: (C) => q(void 0, [C], function* ({ title: m, icon: h, href: g, params: f }) {
+        onSubmit: (C) => V(void 0, [C], function* ({ title: m, icon: h, href: g, params: f }) {
           var v;
           const b = uid(), S = o === "beforeEnd" ? l == null ? void 0 : l.id : l == null ? void 0 : l.parentId, { data: y } = yield u({
             type: NocoBaseDesktopRouteType.link,
@@ -26699,7 +26711,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 V(this, null, function* () {
               t.id !== void 0 && (yield n(t.id, {
                 hideInMenu: !!r
               }));
@@ -26753,7 +26765,7 @@ const GroupItem$1 = () => {
       }
     }
   }), [r, e]), { moveRoute: a } = useNocoBaseRoutes(), l = useCurrentRoute(), c = useCallback(
-    (p) => q(void 0, [p], function* ({ target: u, position: d }) {
+    (p) => V(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)
@@ -26940,7 +26952,7 @@ const LanguageSettings = () => {
         value: a
       })),
       value: t.language,
-      onChange: (a) => q(void 0, null, function* () {
+      onChange: (a) => V(void 0, null, function* () {
         yield n.resource("users").updateLang({
           values: {
             appLang: a
@@ -27022,7 +27034,20 @@ const useAllAccessDesktopRoutes = () => useContext(AllAccessDesktopRoutesContext
 `, pageContentStyle = {
   flex: 1,
   overflowY: "auto"
-}, LayoutContent = () => /* @__PURE__ */ jsx("div", { className: `${layoutContentClass} nb-subpages-slot-without-header-and-side`, children: /* @__PURE__ */ jsx("div", { style: pageContentStyle, children: /* @__PURE__ */ jsx(Outlet, {}) }) }), NocoBaseLogo = () => {
+}, ShowTipWhenNoPages = () => {
+  const { allAccessRoutes: e } = useAllAccessDesktopRoutes(), { designable: t } = useDesignable(), { token: n } = useToken(), { t: o } = useTranslation(), r = useLocation();
+  return e.length === 0 && !t && ["/admin", "/admin/"].includes(r.pathname) ? /* @__PURE__ */ jsx(
+    Result,
+    {
+      icon: /* @__PURE__ */ jsx(HighlightOutlined, { style: { fontSize: "8em", color: n.colorText } }),
+      title: o("No pages yet, please configure first"),
+      subTitle: o('Click the "UI Editor" icon in the upper right corner to enter the UI Editor mode')
+    }
+  ) : null;
+}, LayoutContent = () => /* @__PURE__ */ jsx("div", { className: `${layoutContentClass} nb-subpages-slot-without-header-and-side`, children: /* @__PURE__ */ jsxs("div", { style: pageContentStyle, children: [
+  /* @__PURE__ */ jsx(Outlet, {}),
+  /* @__PURE__ */ jsx(ShowTipWhenNoPages, {})
+] }) }), NocoBaseLogo = () => {
   var r, i, a, l, c, u, d, p;
   const e = useSystemSettings(), { token: t } = useToken(), n = useMemo(() => ({ fontSize: t.fontSizeHeading3 }), [t.fontSizeHeading3]), o = (a = (i = (r = e == null ? void 0 : e.data) == null ? void 0 : r.data) == null ? void 0 : i.logo) != null && a.url ? /* @__PURE__ */ jsx("img", { className: className2, src: (u = (c = (l = e == null ? void 0 : e.data) == null ? void 0 : l.data) == null ? void 0 : c.logo) == null ? void 0 : u.url }) : /* @__PURE__ */ jsx("span", { style: n, className: className3, children: (p = (d = e == null ? void 0 : e.data) == null ? void 0 : d.data) == null ? void 0 : p.title });
   return /* @__PURE__ */ jsx("div", { className: className1$1, children: e != null && e.loading ? null : o });
@@ -27050,7 +27075,7 @@ const useAllAccessDesktopRoutes = () => useContext(AllAccessDesktopRoutesContext
     o.current && (o.current.parentElement.parentElement.style.order = 999, o.current.parentElement.parentElement.style.paddingLeft = 0, o.current.parentElement.parentElement.style.padding = 0);
   }, []);
   const i = useCallback(
-    (u) => q(void 0, null, function* () {
+    (u) => V(void 0, null, function* () {
       var m, h;
       const d = (m = t._route.options) == null ? void 0 : m.href, p = (h = t._route.options) == null ? void 0 : h.params;
       u.preventDefault(), u.stopPropagation();
@@ -27244,12 +27269,12 @@ const NavigateToDefaultPage = (e) => {
 }, 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 V(this, null, function* () {
       yield this.app.pm.add(RemoteSchemaTemplateManagerPlugin);
     });
   }
   load() {
-    return q(this, null, function* () {
+    return V(this, null, function* () {
       this.app.schemaSettingsManager.add(userCenterSettings), this.app.addComponents({ AdminLayout, AdminDynamicPage });
     });
   }
@@ -27411,7 +27436,7 @@ function getFormValues({
 }
 function useCollectValuesToSubmit() {
   const e = useForm(), t = useFilterByTk(), { field: n, resource: o } = useBlockRequestContext(), { fields: r, getField: i, getTreeParentField: a, name: l } = useCollection_deprecated(), c = r.map((f) => f.name), { fieldSchema: u } = useActionContext(), { getActiveFieldsName: d } = useFormActiveFields() || {}, p = useVariables$1(), m = useLocalVariables$1({ currentForm: e }), h = useFieldSchema(), g = useTreeParentRecord();
-  return useCallback(() => q(this, null, function* () {
+  return useCallback(() => V(this, null, function* () {
     var F, I, w, T;
     const { assignedValues: f = {}, overwriteValues: C } = (F = h == null ? void 0 : h["x-action-settings"]) != null ? F : {}, b = getFormValues({
       filterByTk: t,
@@ -27421,7 +27446,7 @@ function useCollectValuesToSubmit() {
       getField: i,
       resource: o,
       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) => V(this, null, function* () {
       const O = f[D], j = i(D);
       if (isVariable$1(O)) {
         const { value: N } = (yield p == null ? void 0 : p.parseVariable(O, m)) || {};
@@ -27456,7 +27481,7 @@ const useCreateActionProps = () => {
   const e = useFilterByTk(), t = useCollectionRecord(), n = useForm(), { field: o, resource: r } = useBlockRequestContext(), { setVisible: i, setSubmitted: a, 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 = ((S = d.componentProps.filterKeys) == null ? void 0 : S.checked) || [];
   return {
     onClick() {
-      return q(this, null, function* () {
+      return V(this, null, function* () {
         var B;
         const { onSuccess: v, skipValidator: F, triggerWorkflows: I } = (B = u == null ? void 0 : u["x-action-settings"]) != null ? B : {}, { manualClose: w, redirecting: T, redirectTo: D, successMessage: O, actionAfterSuccess: j } = v || {};
         F || (yield n.submit());
@@ -27477,7 +27502,7 @@ const useCreateActionProps = () => {
           }
           w ? m.success({
             title: p(O),
-            onOk: () => q(this, null, function* () {
+            onOk: () => V(this, null, function* () {
               yield resetFormCorrectly(n), (T && !j || j === "redirect") && D && (isURL(D) ? window.location.href = D : c(D));
             })
           }) : (message.success(p(O)), yield resetFormCorrectly(n), (T && !j || j === "redirect") && D && (isURL(D) ? window.location.href = D : c(D)));
@@ -27492,15 +27517,15 @@ const useCreateActionProps = () => {
   const e = useForm(), { field: t, resource: n, __parent: o } = useBlockRequestContext(), { setVisible: r, fieldSchema: i, setSubmitted: a } = 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 z, E, V, L, G, U;
+      return V(this, null, function* () {
+        var z, E, q, L, G, U;
         const w = u.map((H) => H.name), {
           assignedValues: T = {},
           onSuccess: D,
           overwriteValues: O,
           skipValidator: j,
           triggerWorkflows: N
-        } = (z = l == null ? void 0 : l["x-action-settings"]) != null ? z : {}, B = (E = i == null ? void 0 : i["x-component-props"]) == null ? void 0 : E.addChild, { successMessage: R } = D || {}, M = {}, $ = Object.keys(T).map((H) => q(this, null, function* () {
+        } = (z = l == null ? void 0 : l["x-action-settings"]) != null ? z : {}, B = (E = i == null ? void 0 : i["x-component-props"]) == null ? void 0 : E.addChild, { successMessage: R } = D || {}, M = {}, $ = Object.keys(T).map((H) => V(this, null, function* () {
           const J = T[H], W = d(H);
           if (isVariable$1(J)) {
             const { value: K } = (yield C == null ? void 0 : C.parseVariable(J, b)) || {};
@@ -27520,7 +27545,7 @@ const useCreateActionProps = () => {
         });
         if (B) {
           const H = p();
-          k[(V = H == null ? void 0 : H.name) != null ? V : "parent"] = f, k[(L = H == null ? void 0 : H.foreignKey) != null ? L : "parentId"] = f.id;
+          k[(q = H == null ? void 0 : H.name) != null ? q : "parent"] = f, k[(L = H == null ? void 0 : H.foreignKey) != null ? L : "parentId"] = f.id;
         }
         c.data = t.data || {}, c.data.loading = !0;
         try {
@@ -27559,10 +27584,10 @@ const useCreateActionProps = () => {
   }
 }, useDoFilter = () => {
   const e = useForm(), { getDataBlocks: t } = useFilterBlock(), n = useCollectionManager(), { getOperators: o } = useOperators(), r = useFieldSchema(), { name: i } = useCollection(), { targets: a = [], uid: l } = useMemo(() => findFilterTargets(r), [r]), c = useCallback(() => removeNullCondition(transformToFilter(e.values, o(), n.getCollectionField.bind(n), i)), [e.values, n, o, i]), u = useCallback(
-    (...p) => q(void 0, [...p], function* ({ doNothingWhenFilterIsEmpty: d = !1 } = {}) {
+    (...p) => V(void 0, [...p], function* ({ doNothingWhenFilterIsEmpty: d = !1 } = {}) {
       try {
         yield Promise.all(
-          t().map((m) => q(void 0, null, function* () {
+          t().map((m) => V(void 0, null, function* () {
             var b, S, y, v;
             if (!a.find((F) => F.uid === m.uid))
               return;
@@ -27606,7 +27631,7 @@ const useCreateActionProps = () => {
   const { doFilter: e } = useDoFilter(), t = useField();
   return t.data = t.data || {}, {
     onClick() {
-      return q(this, null, function* () {
+      return V(this, null, function* () {
         t.data.loading = !0, yield e(), t.data.loading = !1;
       });
     }
@@ -27614,7 +27639,7 @@ const useCreateActionProps = () => {
 }, useDoReset = () => {
   const e = useForm(), t = useFieldSchema(), { getDataBlocks: n } = useFilterBlock(), { targets: o, uid: r } = findFilterTargets(t), { doFilter: i, getFilterFromCurrentForm: a } = useDoFilter();
   return {
-    doReset: () => q(void 0, null, function* () {
+    doReset: () => V(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)
@@ -27627,7 +27652,7 @@ const useCreateActionProps = () => {
   const e = useField(), { doReset: t } = useDoReset();
   return e.data = e.data || {}, {
     onClick() {
-      return q(this, null, function* () {
+      return V(this, null, function* () {
         e.data.loading = !0, yield t(), e.data.loading = !1;
       });
     }
@@ -27636,14 +27661,14 @@ const useCreateActionProps = () => {
   const { resource: e, __parent: t, service: n } = useBlockRequestContext(), o = useFilterByTk(), r = useFieldSchema(), i = useNavigateNoUpdate(), a = 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 V(this, null, function* () {
         var N, B, R;
         const {
           assignedValues: b = {},
           onSuccess: S,
           skipValidator: y,
           triggerWorkflows: v
-        } = (N = r == null ? void 0 : r["x-action-settings"]) != null ? N : {}, { manualClose: F, redirecting: I, redirectTo: w, successMessage: T, actionAfterSuccess: D } = S || {}, O = {}, j = Object.keys(b).map((M) => q(this, null, function* () {
+        } = (N = r == null ? void 0 : r["x-action-settings"]) != null ? N : {}, { manualClose: F, redirecting: I, redirectTo: w, successMessage: T, actionAfterSuccess: D } = S || {}, O = {}, j = Object.keys(b).map((M) => V(this, null, function* () {
           const $ = b[M], k = m(M);
           if (isVariable$1($)) {
             const { value: z } = (yield u == null ? void 0 : u.parseVariable($, d)) || {};
@@ -27658,7 +27683,7 @@ const useCreateActionProps = () => {
           triggerWorkflows: v != null && v.length ? v.map((M) => [M.workflowKey, M.context].filter(Boolean).join("!")).join(",") : void 0
         }), (D === "previous" || !D && I !== !0) && (h == null || h(!1)), C && (C == null || C()), e instanceof TableFieldResource || (R = (B = t == null ? void 0 : t.service) == null ? void 0 : B.refresh) == null || R.call(B), T && (F ? c.success({
           title: a(T),
-          onOk: () => q(this, null, function* () {
+          onOk: () => V(this, null, function* () {
             (I && !D || D === "redirect") && w && (isURL(w) ? window.location.href = w : i(w));
           })
         }) : (message.success(a(T)), (I && !D || D === "redirect") && w && (isURL(w) ? window.location.href = w : i(w))));
@@ -27672,7 +27697,7 @@ const useCreateActionProps = () => {
   const { name: f, getField: C } = useCollection_deprecated(), b = useLocalVariables$1(), { setVisible: S } = useActionContext();
   return {
     onClick() {
-      return q(this, null, function* () {
+      return V(this, null, function* () {
         var z;
         const {
           assignedValues: T = {},
@@ -27680,23 +27705,23 @@ const useCreateActionProps = () => {
           updateMode: O
         } = (z = i == null ? void 0 : i["x-action-settings"]) != null ? z : {}, { manualClose: j, redirecting: N, redirectTo: B, successMessage: R, actionAfterSuccess: M } = D || {};
         m.data = e.data || {}, m.data.loading = !0;
-        const $ = {}, k = Object.keys(T).map((V) => q(this, null, function* () {
-          const L = T[V], G = C(V);
+        const $ = {}, k = Object.keys(T).map((q) => V(this, null, function* () {
+          const L = T[q], G = C(q);
           if (isVariable$1(L)) {
             const { value: U } = (yield g == null ? void 0 : g.parseVariable(L, b)) || {};
-            U && ($[V] = transformVariableValue(U, { targetCollectionField: G }));
+            U && ($[q] = transformVariableValue(U, { targetCollectionField: G }));
           } else
-            L !== "" && ($[V] = L);
+            L !== "" && ($[q] = L);
         }));
         yield Promise.all(k), (M === "previous" || !M && N !== !0) && (S == null || S(!1)), h.confirm({
           title: p("Bulk update"),
           content: p(O === "selected" ? "Update selected data?" : "Update all data?"),
           onOk() {
-            return q(this, null, function* () {
+            return V(this, null, function* () {
               var G, U, H, J;
-              const { filter: V } = (U = (G = o.params) == null ? void 0 : G[0]) != null ? U : {}, L = {
+              const { filter: q } = (U = (G = o.params) == null ? void 0 : G[0]) != null ? U : {}, L = {
                 values: x({}, $),
-                filter: V,
+                filter: q,
                 forceUpdate: !1
               };
               if (O === "selected") {
@@ -27715,14 +27740,14 @@ const useCreateActionProps = () => {
               }
               t instanceof TableFieldResource || (J = (H = n == null ? void 0 : n.service) == null ? void 0 : H.refresh) == null || J.call(H), R && (j ? h.success({
                 title: d(R),
-                onOk: () => q(this, null, function* () {
+                onOk: () => V(this, null, function* () {
                   (N && !M || M === "redirect") && B && (isURL(B) ? window.location.href = B : u(B));
                 })
               }) : (message.success(d(R)), (N && !M || M === "redirect") && B && (isURL(B) ? window.location.href = B : u(B))));
             });
           },
           onCancel() {
-            return q(this, null, function* () {
+            return V(this, null, function* () {
               m.data.loading = !1;
             });
           }
@@ -27735,9 +27760,9 @@ const useCreateActionProps = () => {
   const e = useAPIClient(), t = useNavigateNoUpdate(), n = useFilterByTk(), o = useFieldSchema(), r = useCompile(), i = useForm(), { fields: a, 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, L, G, U;
-        const { skipValidator: I, onSuccess: w, requestSettings: T } = (V = o == null ? void 0 : o["x-action-settings"]) != null ? V : {}, { manualClose: D, redirecting: O, redirectTo: j, successMessage: N, actionAfterSuccess: B } = w || {}, R = o == null ? void 0 : o["x-action"];
+      return V(this, null, function* () {
+        var q, L, G, U;
+        const { skipValidator: I, onSuccess: w, requestSettings: T } = (q = o == null ? void 0 : o["x-action-settings"]) != null ? q : {}, { manualClose: D, redirecting: O, redirectTo: j, successMessage: N, actionAfterSuccess: B } = w || {}, R = o == null ? void 0 : o["x-action"];
         if (!T.url)
           return;
         I !== !0 && R === "customize:form:request" && (yield i.submit());
@@ -27765,7 +27790,7 @@ const useCreateActionProps = () => {
         try {
           yield e.request(x({}, E)), f.data.loading = !1, u instanceof TableFieldResource || (G = (L = d == null ? void 0 : d.service) == null ? void 0 : L.refresh) == null || G.call(L), (U = p == null ? void 0 : p.refresh) == null || U.call(p), R === "customize:form:request" && (B === "previous" || !B && O !== !0) && (b == null || b(!1)), N || (message.success(C("Saved successfully")), yield resetFormCorrectly(i), (O && !B || B === "redirect") && j && (isURL(j) ? window.location.href = j : t(j))), D ? S.success({
             title: r(N),
-            onOk: () => q(this, null, function* () {
+            onOk: () => V(this, null, function* () {
               (O && !B || B === "redirect") && j && (isURL(j) ? window.location.href = j : t(j));
             })
           }) : message.success(r(N));
@@ -27779,7 +27804,7 @@ const useCreateActionProps = () => {
   const e = useForm(), t = useFilterByTk(), { field: n, resource: o, __parent: r } = useBlockRequestContext(), { setVisible: i, setFormValueChanged: a } = 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* () {
+      return V(this, null, function* () {
         var L;
         const {
           assignedValues: w = {},
@@ -27787,7 +27812,7 @@ const useCreateActionProps = () => {
           overwriteValues: D,
           skipValidator: O,
           triggerWorkflows: j
-        } = (L = l == null ? void 0 : l["x-action-settings"]) != null ? L : {}, { manualClose: N, redirecting: B, redirectTo: R, successMessage: M, actionAfterSuccess: $ } = T || {}, k = {}, z = Object.keys(w).map((G) => q(this, null, function* () {
+        } = (L = l == null ? void 0 : l["x-action-settings"]) != null ? L : {}, { manualClose: N, redirecting: B, redirectTo: R, successMessage: M, actionAfterSuccess: $ } = T || {}, k = {}, z = Object.keys(w).map((G) => V(this, null, function* () {
           const U = w[G], H = d(G);
           if (isVariable$1(U)) {
             const { value: J } = (yield b == null ? void 0 : b.parseVariable(U, S)) || {};
@@ -27796,7 +27821,7 @@ const useCreateActionProps = () => {
             U !== "" && (k[G] = U);
         }));
         yield Promise.all(z), O || (yield e.submit());
-        const E = u.map((G) => G.name), V = getFormValues({
+        const E = u.map((G) => G.name), q = getFormValues({
           filterByTk: t,
           field: n,
           form: e,
@@ -27809,7 +27834,7 @@ const useCreateActionProps = () => {
         try {
           if (yield o.update(P(x({
             filterByTk: t,
-            values: x(x(x({}, V), D), k)
+            values: x(x(x({}, q), D), k)
           }, C), {
             updateAssociationValues: g,
             // TODO(refactor): should change to inject by plugin
@@ -27818,7 +27843,7 @@ const useCreateActionProps = () => {
             return;
           N ? f.success({
             title: m(M),
-            onOk: () => q(this, null, function* () {
+            onOk: () => V(this, null, function* () {
               yield e.reset(), (B && !$ || $ === "redirect") && R && (isURL(R) ? window.location.href = R : c(R));
             })
           }) : (message.success(m(M)), (B && !$ || $ === "redirect" || $ === "redirect") && R && (isURL(R) ? window.location.href = R : c(R)));
@@ -27832,7 +27857,7 @@ const useCreateActionProps = () => {
   const e = useFilterByTk(), { resource: t, service: n, block: o, __parent: r } = useBlockRequestContext(), { setVisible: i, setSubmitted: a } = useActionContext(), l = useParamsFromRecord(), c = useFieldSchema();
   return {
     onClick(d, p) {
-      return q(this, null, function* () {
+      return V(this, null, function* () {
         var C, b, S, y, v;
         const { triggerWorkflows: m } = (C = c == null ? void 0 : c["x-action-settings"]) != null ? C : {};
         yield t.destroy(x({
@@ -27851,7 +27876,7 @@ const useCreateActionProps = () => {
   const t = useFilterByTk(), o = useAPIClient().resource(e, t);
   return {
     onClick(i) {
-      return q(this, null, function* () {
+      return V(this, null, function* () {
         yield o.remove({
           values: [i.id]
         });
@@ -27862,7 +27887,7 @@ const useCreateActionProps = () => {
   const e = useFilterByTk(), { resource: t, service: n, block: o, __parent: r } = useBlockRequestContext(), { setVisible: i, setSubmitted: a, setFormValueChanged: l } = useActionContext();
   return {
     onClick(u, d) {
-      return q(this, null, function* () {
+      return V(this, null, function* () {
         var g, f, C, b;
         yield t.remove({
           values: [e]
@@ -27878,7 +27903,7 @@ const useCreateActionProps = () => {
   const { field: e } = useBlockRequestContext(), { resource: t, service: n } = useBlockRequestContext(), { setSubmitted: o } = useActionContext(), r = useCollection_deprecated(), { filterTargetKey: i } = r;
   return {
     onClick(l, c) {
-      return q(this, null, function* () {
+      return V(this, null, function* () {
         var m, h, g, f, C, b, S;
         let u = (m = e.data) == null ? void 0 : m.selectedRowKeys;
         if (Array.isArray(i) && (u = e.data.selectedRowData.map((y) => {
@@ -27900,7 +27925,7 @@ const useCreateActionProps = () => {
   const { service: e } = useBlockRequestContext();
   return {
     onClick() {
-      return q(this, null, function* () {
+      return V(this, null, function* () {
         var n;
         (n = e == null ? void 0 : e.refresh) == null || n.call(e);
       });
@@ -27917,7 +27942,7 @@ const useCreateActionProps = () => {
       pageSize: 1,
       showSizeChanger: !1,
       onChange(v) {
-        return q(this, null, function* () {
+        return V(this, null, function* () {
           var I, w;
           const F = (w = (I = e.service) == null ? void 0 : I.params) == null ? void 0 : w[0];
           e.service.run(P(x({}, F), { page: v }));
@@ -27945,7 +27970,7 @@ const useCreateActionProps = () => {
     pageSize: 1,
     showSizeChanger: !1,
     onChange(y) {
-      return q(this, null, function* () {
+      return V(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 }));
@@ -28047,7 +28072,7 @@ const useCreateActionProps = () => {
         var U, H, J, W;
         if (!M.find((K) => K.uid === k.uid))
           return;
-        const E = `${$}${t.name}`, V = ((U = k.service.params) == null ? void 0 : U[0]) || {};
+        const E = `${$}${t.name}`, q = ((U = k.service.params) == null ? void 0 : U[0]) || {};
         (J = (H = k.service.params) == null ? void 0 : H[1]) != null && J.filters || _.set(k.service.params, "[1].filters", {});
         const L = k.service.params[1].filters;
         if (R.length)
@@ -28061,7 +28086,7 @@ const useCreateActionProps = () => {
         }
         const G = mergeFilter([...Object.values(L), k.defaultFilter]);
         return k.doFilter(
-          P(x({}, V), {
+          P(x({}, q), {
             page: 1,
             filter: G
           }),
@@ -28109,14 +28134,14 @@ const useCreateActionProps = () => {
   };
 };
 function doReset(o) {
-  return q(this, arguments, function* ({
+  return V(this, arguments, function* ({
     getDataBlocks: e,
     targets: t,
     uid: n
   }) {
     try {
       yield Promise.all(
-        e().map((r) => q(this, null, function* () {
+        e().map((r) => V(this, null, function* () {
           var u, d, p, m;
           if (!t.find((h) => h.uid === r.uid))
             return;
@@ -28255,7 +28280,7 @@ function getTargetField(e) {
   return n.slice(0, o);
 }
 function resetFormCorrectly(e) {
-  return q(this, null, function* () {
+  return V(this, null, function* () {
     untracked(() => {
       Object.keys(e.fields).forEach((t) => {
         isSubMode(e.fields[t]) && (e.fields[t].initialValue = null);
@@ -28269,7 +28294,7 @@ function appendQueryStringToUrl(e, t) {
 const useParseURLAndParams = () => {
   const e = useVariables$1(), t = useLocalVariables$1();
   return { parseURLAndParams: useCallback(
-    (o, r) => q(void 0, null, function* () {
+    (o, r) => V(void 0, null, function* () {
       const i = yield parseVariablesAndChangeParamsToQueryString({
         searchParams: r,
         variables: e,
@@ -28287,7 +28312,7 @@ function useLinkActionProps(e) {
   return {
     type: l,
     onClick() {
-      return q(this, null, function* () {
+      return V(this, null, function* () {
         if (!i) {
           message.warning(r("Please configure the URL"));
           return;
@@ -28299,7 +28324,7 @@ function useLinkActionProps(e) {
   };
 }
 function replaceVariableValue(e, t, n) {
-  return q(this, null, function* () {
+  return V(this, null, function* () {
     if (!e)
       return;
     const { evaluate: o } = evaluators.get("string"), { exp: r, scope: i } = yield replaceVariables(e, {
@@ -28314,14 +28339,14 @@ function replaceVariableValue(e, t, n) {
   });
 }
 function parseVariablesAndChangeParamsToQueryString(r) {
-  return q(this, arguments, function* ({
+  return V(this, arguments, function* ({
     searchParams: e,
     variables: t,
     localVariables: n,
     replaceVariableValue: o
   }) {
     const i = yield Promise.all(
-      e.map((u) => q(this, [u], function* ({ name: l, value: c }) {
+      e.map((u) => V(this, [u], function* ({ name: l, value: c }) {
         if (typeof c == "string") {
           if (isVariable$1(c)) {
             const { value: p } = (yield t.parseVariable(c, n)) || {};
@@ -28449,7 +28474,7 @@ const useSyncFromForm = (e, t, n) => {
   }, []);
   return {
     run() {
-      return q(this, null, function* () {
+      return V(this, null, function* () {
         var y;
         const f = /* @__PURE__ */ new Set([]), C = /* @__PURE__ */ new Set([]), b = (v, F) => {
           var I;
@@ -29563,7 +29588,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 || a || l || isSubMode(t) || !(r != null && r.isNew) && !i)
       return;
-    const y = (...T) => q(void 0, [...T], function* ({ forceUpdate: w = !1 } = {}) {
+    const y = (...T) => V(void 0, [...T], function* ({ forceUpdate: w = !1 } = {}) {
       if (n && e && (isVariable$1(t.default) && e.value == null || e.value === t.default || w)) {
         isVariable$1(e.value) && (yield e.reset({ forceClear: !0 })), e.loading = !0;
         const D = !t.name.toString().includes(".") && (d == null ? void 0 : d.getField(t.name)), {
@@ -29699,11 +29724,11 @@ function SchemaSettingsTemplate(e) {
     SchemaSettingsItem,
     {
       title: "Convert reference to duplicate",
-      onClick: () => q(this, null, function* () {
+      onClick: () => V(this, null, function* () {
         const S = yield C(d), y = g.removeWithoutEmit();
         g.insertAfterEnd(S, {
           onSuccess() {
-            return q(this, null, function* () {
+            return V(this, null, function* () {
               yield h.request({
                 url: `/uiSchemas:remove/${y["x-uid"]}`
               });
@@ -29717,7 +29742,7 @@ function SchemaSettingsTemplate(e) {
     SchemaSettingsItem,
     {
       title: "Save as template",
-      onClick: () => q(this, null, function* () {
+      onClick: () => V(this, null, function* () {
         u(!1);
         const S = n && l(n), y = yield FormDialog(
           a("Save as template"),
@@ -30078,7 +30103,7 @@ function AccessControl() {
         roles: l == null ? void 0 : l.data
       },
       beforeOpen: () => !l && a(),
-      onSubmit: (p) => q(this, [p], function* ({ roles: d }) {
+      onSubmit: (p) => V(this, [p], function* ({ roles: d }) {
         return yield o.set({ values: d.map((m) => m.name) }), yield c(), r.success(e("Saved successfully"));
       })
     }
@@ -30096,7 +30121,7 @@ const SchemaSettingAccessControl = {
     [t, n]
   );
   return { parseFilter: useCallback(
-    (i) => q(void 0, null, function* () {
+    (i) => V(void 0, null, function* () {
       const a = flatten(i, {
         breakOn({ key: c }) {
           return c.startsWith("$") && c !== "$and" && c !== "$or";
@@ -30106,7 +30131,7 @@ const SchemaSettingAccessControl = {
         }
       });
       return yield Promise.all(
-        Object.keys(a).map((c) => q(void 0, null, function* () {
+        Object.keys(a).map((c) => V(void 0, null, function* () {
           return a[c] = yield a[c], a[c] === void 0 && delete a[c], a[c];
         }))
       ), unflatten$1(a);
@@ -30555,7 +30580,7 @@ const createSubmitActionSettings = new SchemaSettings({
       "x-validator": validateJSON$1
     }
   }
-}, linkageAction = (a, l) => q(void 0, [a, l], function* ({
+}, linkageAction = (a, l) => V(void 0, [a, l], function* ({
   operator: e,
   field: t,
   condition: n,
@@ -33674,7 +33699,7 @@ const tableBlockSettings = new SchemaSettings({
         return {
           title: r("Enable drag and drop sorting"),
           checked: t.decoratorProps.dragSort,
-          onChange: (u) => q(void 0, null, function* () {
+          onChange: (u) => V(void 0, null, function* () {
             var d, p, m;
             if (u && l) {
               const { data: h } = yield c.resource("collections.fields", l.collectionName).update({
@@ -34819,7 +34844,7 @@ const tableBlockSettings = new SchemaSettings({
       title: i("Ellipsis overflow content"),
       checked: !!((c = a["x-component-props"]) != null && c.ellipsis),
       hidden: l,
-      onChange: (u) => q(this, null, function* () {
+      onChange: (u) => V(this, null, function* () {
         e && t ? t.forEach((d) => {
           d.componentProps.ellipsis = u;
         }) : o.componentProps.ellipsis = u, _.set(a, "x-component-props.ellipsis", u), yield r.emit("patch", {
@@ -35193,10 +35218,10 @@ const tableBlockSettings = new SchemaSettings({
   name: "fieldSettings:component:CascadeSelect",
   items: [fieldComponent$6, titleField$1, ellipsisSettingsItem, setTheDataScope]
 }), SchemaSettingsDateRange = function e(t) {
-  var w, T, D, O, j, N, B, R, M, $, k, z, E, V, L, G;
+  var w, T, D, O, j, N, B, R, M, $, k, z, E, q, L, G;
   const { fieldSchema: n } = t, o = useField(), { dn: r } = useDesignable(), { t: i } = useTranslation(), { getCollectionJoinField: a } = useCollectionManager_deprecated(), { isInSubForm: l, isInSubTable: c } = useFlag() || {}, u = a(n == null ? void 0 : n["x-collection-field"]) || {}, d = ((w = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : w.showTime) || ((D = (T = u == null ? void 0 : u.uiSchema) == null ? void 0 : T["x-component-props"]) == null ? void 0 : D.showTime) || !1, p = ((O = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : O.dateFormat) || ((N = (j = u == null ? void 0 : u.uiSchema) == null ? void 0 : j["x-component-props"]) == null ? void 0 : N.dateFormat) || "YYYY-MM-DD", m = ((B = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : B.timeFormat) || ((M = (R = u == null ? void 0 : u.uiSchema) == null ? void 0 : R["x-component-props"]) == null ? void 0 : M.timeFormat) || "HH:mm:ss", h = (($ = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : $.picker) || ((z = (k = u == null ? void 0 : u.uiSchema) == null ? void 0 : k["x-component-props"]) == null ? void 0 : z.picker) || "date";
   n["x-read-pretty"] || o.readOnly || o.readPretty;
-  const g = (E = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : E._minDate, f = (V = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : V._maxDate, C = ((L = u == null ? void 0 : u.uiSchema) == null ? void 0 : L["x-component-props"].gmt) || !1, b = ((G = u == null ? void 0 : u.uiSchema) == null ? void 0 : G["x-component-props"].utc) || !1, S = useRecord(), { form: y } = useFormBlockContext(), v = useCallback(
+  const g = (E = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : E._minDate, f = (q = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : q._maxDate, C = ((L = u == null ? void 0 : u.uiSchema) == null ? void 0 : L["x-component-props"].gmt) || !1, b = ((G = u == null ? void 0 : u.uiSchema) == null ? void 0 : G["x-component-props"].utc) || !1, S = useRecord(), { form: y } = useFormBlockContext(), v = useCallback(
     (U) => /* @__PURE__ */ jsx(
       SchemaComponent,
       {
@@ -36556,7 +36581,7 @@ const dividerSettings = new SchemaSettings({
 });
 class SchemaSettingsPlugin extends Plugin {
   load() {
-    return q(this, null, function* () {
+    return V(this, null, function* () {
       this.schemaSettingsManager.add(tableBlockSettings), this.schemaSettingsManager.add(createFormBlockSettings), this.schemaSettingsManager.add(editFormBlockSettings), this.schemaSettingsManager.add(filterFormBlockSettings), this.schemaSettingsManager.add(filterFormItemFieldSettings), this.schemaSettingsManager.add(multiDataDetailsBlockSettings), this.schemaSettingsManager.add(detailsWithPaginationSettings), this.schemaSettingsManager.add(singleDataDetailsBlockSettings), this.schemaSettingsManager.add(detailsBlockSettings), this.schemaSettingsManager.add(tableSelectorBlockSettings), this.schemaSettingsManager.add(listBlockSettings), this.schemaSettingsManager.add(gridCardBlockSettings), this.schemaSettingsManager.add(filterCollapseBlockSettings), this.schemaSettingsManager.add(markdownBlockSettings), this.schemaSettingsManager.add(addNewActionSettings), this.schemaSettingsManager.add(filterActionSettings), this.schemaSettingsManager.add(refreshActionSettings), this.schemaSettingsManager.add(viewActionSettings), this.schemaSettingsManager.add(editActionSettings), this.schemaSettingsManager.add(deleteActionSettings), this.schemaSettingsManager.add(disassociateActionSettings), this.schemaSettingsManager.add(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(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);
     });
   }
@@ -36648,7 +36673,7 @@ const variablesStore = {}, getFieldPath$1 = (e, t) => {
   const n = useRef({}), o = useAPIClient(), { getCollectionJoinField: r, getCollection: i } = useCollectionManager_deprecated(), a = useCompile(), { builtinVariables: l } = useBuiltInVariables(), c = useCallback((C) => {
     _.isFunction(C) ? n.current = C(n.current) : n.current = C;
   }, []), u = useCallback(
-    (C, b, S) => q(void 0, null, function* () {
+    (C, b, S) => V(void 0, null, function* () {
       var R, M;
       const y = C.split("."), v = y[0], F = mergeVariableToCollectionNameWithLocalVariables(variablesStore, b);
       let I = mergeCtxWithLocalVariables(n.current, b);
@@ -36664,11 +36689,11 @@ const variablesStore = {}, getFieldPath$1 = (e, t) => {
             dataSource: T,
             collectionName: N
           };
-        const k = y[$], z = y.slice(0, $ + 1).join("."), { fieldPath: E } = getFieldPath$1(z, F), V = r(E, T), L = (M = i(O, T)) == null ? void 0 : M.getPrimaryKey();
+        const k = y[$], z = y.slice(0, $ + 1).join("."), { fieldPath: E } = getFieldPath$1(z, F), q = r(E, T), L = (M = i(O, T)) == null ? void 0 : M.getPrimaryKey();
         if (Array.isArray(I)) {
           const G = I.map((U) => {
-            if (!(S != null && S.doNotRequest) && shouldToRequest(U == null ? void 0 : U[k]) && (U == null ? void 0 : U[L]) != null && V != null && V.target) {
-              const H = `/${O}/${U[V.sourceKey || L]}/${k}:${getAction(V.type)}`;
+            if (!(S != null && S.doNotRequest) && shouldToRequest(U == null ? void 0 : U[k]) && (U == null ? void 0 : U[L]) != null && q != null && q.target) {
+              const H = `/${O}/${U[q.sourceKey || L]}/${k}:${getAction(q.type)}`;
               if (hasRequested(H))
                 return getRequested(H);
               const J = o.request({
@@ -36682,9 +36707,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[L] != null && (V != null && V.target)) {
-          const G = `/${O}/${I[V.sourceKey || L]}/${k}:${getAction(V.type)}`;
+          I = removeThroughCollectionFields(_.flatten(yield Promise.all(G)), q);
+        } else if (!(S != null && S.doNotRequest) && shouldToRequest(I[k]) && I[L] != null && (q != null && q.target)) {
+          const G = `/${O}/${I[q.sourceKey || L]}/${k}:${getAction(q.type)}`;
           let U = null;
           if (hasRequested(G))
             U = yield getRequested(G);
@@ -36699,10 +36724,10 @@ const variablesStore = {}, getFieldPath$1 = (e, t) => {
             stashRequested(G, J), U = yield J, clearRequested(G);
           }
           const H = U.data.data;
-          I = removeThroughCollectionFields(H, V);
+          I = removeThroughCollectionFields(H, q);
         } else
-          I = removeThroughCollectionFields(getValuesByPath(I, k), V);
-        V != null && V.target && (O = V.target);
+          I = removeThroughCollectionFields(getValuesByPath(I, k), q);
+        q != null && q.target && (O = q.target);
       }
       const B = a(
         _.isFunction(I) ? I({ fieldOperator: S == null ? void 0 : S.fieldOperator, isParsingVariable: !0 }) : I
@@ -36740,7 +36765,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) => V(void 0, null, function* () {
       if (!isVariable$1(C))
         return C;
       b && (b = _.isArray(b) ? b : [b]);
@@ -36751,7 +36776,7 @@ const variablesStore = {}, getFieldPath$1 = (e, t) => {
     }),
     [u]
   ), g = useCallback(
-    (C, b) => q(void 0, null, function* () {
+    (C, b) => V(void 0, null, function* () {
       var w;
       if (!isVariable$1(C))
         throw new Error(`VariablesProvider: ${C} is not a variable string`);
@@ -37110,7 +37135,7 @@ const ActionLink = withDynamicSchemaProps(
   };
 }, useA = () => ({
   run() {
-    return q(this, null, function* () {
+    return V(this, null, function* () {
     });
   }
 }), handleError = console.log, Action = withDynamicSchemaProps(
@@ -37155,7 +37180,7 @@ const ActionLink = withDynamicSchemaProps(
       "onMouseEnter",
       "refreshDataBlockRequest",
       "confirmTitle"
-    ]), v = useDesigner(), F = useField(), I = useFieldSchema(), w = useCompile(), T = useCollectionRecordData(), D = w((U = I["x-component-props"]) == null ? void 0 : U.confirm) || g, O = useMemo(() => (I == null ? void 0 : I["x-linkage-rules"]) || [], [I == null ? void 0 : I["x-linkage-rules"]]), { designable: j } = useDesignable(), N = useComponent(o) || o, B = useVariables$1(), R = useLocalVariables$1({ currentForm: { values: T, readPretty: !1 } }), { visibleWithURL: M, setVisibleWithURL: $ } = usePopupUtils(), { setSubmitted: k } = useActionContext(), { getAriaLabel: z } = useGetAriaLabelOfAction(l), E = useCollectionParentRecordData(), V = useApp();
+    ]), v = useDesigner(), F = useField(), I = useFieldSchema(), w = useCompile(), T = useCollectionRecordData(), D = w((U = I["x-component-props"]) == null ? void 0 : U.confirm) || g, O = useMemo(() => (I == null ? void 0 : I["x-linkage-rules"]) || [], [I == null ? void 0 : I["x-linkage-rules"]]), { designable: j } = useDesignable(), N = useComponent(o) || o, B = useVariables$1(), R = useLocalVariables$1({ currentForm: { values: T, readPretty: !1 } }), { visibleWithURL: M, setVisibleWithURL: $ } = usePopupUtils(), { setSubmitted: k } = useActionContext(), { getAriaLabel: z } = useGetAriaLabelOfAction(l), E = useCollectionParentRecordData(), q = useApp();
     useEffect(() => {
       F.stateOfLinkageRules && setInitialActionState(F), F.stateOfLinkageRules = {}, O.filter((H) => !H.disabled).forEach((H) => {
         var J;
@@ -37168,7 +37193,7 @@ const ActionLink = withDynamicSchemaProps(
               variables: B,
               localVariables: R
             },
-            V.jsonLogic
+            q.jsonLogic
           );
         });
       });
@@ -37271,7 +37296,7 @@ const ActionLink = withDynamicSchemaProps(
     "setSubmitted",
     "getAriaLabel",
     "parentRecordData"
-  ]), [R, M] = useState(!1), { wrapSSR: $, componentCls: k, hashId: z } = useStyles$8(), [E, V] = useState(!1), L = o["x-toolbar-props"] || o["x-designer-props"], G = (me = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : me.openMode, U = (he = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : he.openSize, H = (ge = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : ge.refreshDataBlockRequest, { modal: J } = App.useApp(), W = useForm(), K = useACLActionParamsContext(), { run: X, element: ee, disabled: Z } = (I == null ? void 0 : I(w)) || {}, ne = W.disabled || i.disabled || ((de = i.data) == null ? void 0 : de.disabled) || F || Z, re = useMemo(() => {
+  ]), [R, M] = useState(!1), { wrapSSR: $, componentCls: k, hashId: z } = useStyles$8(), [E, q] = useState(!1), L = o["x-toolbar-props"] || o["x-designer-props"], G = (me = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : me.openMode, U = (he = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : he.openSize, H = (ge = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : ge.refreshDataBlockRequest, { modal: J } = App.useApp(), W = useForm(), K = useACLActionParamsContext(), { run: X, element: ee, disabled: Z } = (I == null ? void 0 : I(w)) || {}, ne = W.disabled || i.disabled || ((de = i.data) == null ? void 0 : de.disabled) || F || Z, re = useMemo(() => {
     var ce;
     return P(x({}, v), {
       opacity: r && (((ce = i == null ? void 0 : i.data) == null ? void 0 : ce.hidden) || !K) && 0.1,
@@ -37318,7 +37343,7 @@ const ActionLink = withDynamicSchemaProps(
       visible: R || T,
       setVisible: le,
       formValueChanged: E,
-      setFormValueChanged: V,
+      setFormValueChanged: q,
       openMode: G,
       openSize: U,
       containerRefKey: n,
@@ -37411,8 +37436,8 @@ const RenderButton = ({
       if (!(z && isPortalInBody(k.target)) && (k.preventDefault(), k.stopPropagation(), !i && n)) {
         const E = () => {
           b ? b(k, () => {
-            var V, L;
-            S !== !1 && (T == null || T(!0), (L = (V = j()) == null ? void 0 : V.refresh) == null || L.call(V));
+            var q, L;
+            S !== !1 && (T == null || T(!0), (L = (q = j()) == null ? void 0 : q.refresh) == null || L.call(q));
           }) : isBulkEditAction(y) || !B() ? (v(!0), F == null || F()) : ["view", "update", "create", "customize:popup"].includes(y["x-action"]) && y["x-uid"] ? M.current() : (v(!0), F == null || F());
         };
         (I == null ? void 0 : I.enable) !== !1 && (I != null && I.content) ? w.confirm({
@@ -37622,7 +37647,7 @@ const ActionBarContext = React.createContext({
     [r, n, i]
   ) };
 }, requestChartData = (e) => function() {
-  return q(this, null, function* () {
+  return V(this, null, function* () {
     var t;
     try {
       const n = yield this.api.request(e);
@@ -37652,7 +37677,7 @@ const Form$1 = observer$1(
       {
         uid: a["x-uid"],
         onSuccess(h) {
-          return q(this, null, function* () {
+          return V(this, null, function* () {
             yield c.reset(), c.setValues(h == null ? void 0 : h.data), c.setInitialValues(h == null ? void 0 : h.data);
           });
         }
@@ -37934,7 +37959,7 @@ Select.ReadPretty = ReadPretty$b;
 const getValues = (e, t) => castArray(e).filter((n) => n != null).map((n) => typeof n == "object" ? n[t.value] : n), ReadPretty$a = observer$1(
   (e) => {
     const t = x(x({}, defaultFieldNames$1), e.fieldNames), n = useField(), o = useFieldSchema(), r = useRecord(), { snapshot: i } = useActionContext(), { data: a } = useRequest(
-      i ? () => q(void 0, null, function* () {
+      i ? () => V(void 0, null, function* () {
         return {
           data: r[o.name]
         };
@@ -38060,7 +38085,7 @@ const getValues = (e, t) => castArray(e).filter((n) => n != null).map((n) => typ
       useEffect(() => {
         S.current && $();
       }, [z]);
-      const V = (W) => q(void 0, null, function* () {
+      const q = (W) => V(void 0, null, function* () {
         var K;
         $({
           filter: mergeFilter([
@@ -38088,7 +38113,7 @@ const getValues = (e, t) => castArray(e).filter((n) => n != null).map((n) => typ
           filterOption: !1,
           filterSort: null,
           fieldNames: t,
-          onSearch: V,
+          onSearch: q,
           onDropdownVisibleChange: (W) => {
             I.current = null, W && $(), S.current = !0;
           },
@@ -38171,9 +38196,9 @@ const useFormDataTemplates = () => {
     alignItems: "center",
     backgroundColor: n.colorFillAlter,
     padding: n.padding
-  }, e), [e, n.colorFillAlter]), S = useMemo(() => ({ fontSize: n.fontSize, fontWeight: "bold", whiteSpace: "nowrap", marginRight: n.marginXS }), [n.fontSize, n.marginXS]), y = useCallback((I) => q(void 0, null, function* () {
+  }, e), [e, n.colorFillAlter]), S = useMemo(() => ({ fontSize: n.fontSize, fontWeight: "bold", whiteSpace: "nowrap", marginRight: n.marginXS }), [n.fontSize, n.marginXS]), y = useCallback((I) => V(void 0, null, function* () {
     d(I), m(null), t == null || t.reset();
-  }), []), v = useCallback((I, w, T) => q(void 0, null, function* () {
+  }), []), v = useCallback((I, w, T) => V(void 0, null, function* () {
     const D = P(x({}, w), { dataId: I });
     m(w), fetchTemplateData(h, D, T).then((O) => (t && O && (t.reset(), t.__template = !0, forEach(O, (j, N) => {
       var B;
@@ -38228,7 +38253,7 @@ function findDataTemplates(e) {
   return t ? _.cloneDeep(t["x-data-templates"]) || {} : {};
 }
 function fetchTemplateData(e, t, n) {
-  return q(this, null, function* () {
+  return V(this, null, function* () {
     if (!(t.fields.length === 0 || !t.dataId))
       return e.resource(t.collection, void 0, n).get({
         filterByTk: t.dataId,
@@ -38709,7 +38734,7 @@ const useSystemSettings = () => useContext(SystemSettingsContext), SystemSetting
   const { setVisible: e } = useActionContext();
   return {
     run() {
-      return q(this, null, function* () {
+      return V(this, null, function* () {
         e(!1);
       });
     }
@@ -38723,7 +38748,7 @@ const useSystemSettings = () => useContext(SystemSettingsContext), SystemSetting
   const { setVisible: e } = useActionContext(), t = useForm(), { mutate: n, data: o } = useSystemSettings() || {}, r = useAPIClient(), { t: i } = useTranslation();
   return {
     run() {
-      return q(this, null, function* () {
+      return V(this, null, function* () {
         var u;
         yield t.submit();
         const l = cloneDeep(t.values);
@@ -38844,7 +38869,7 @@ const useSystemSettings = () => useContext(SystemSettingsContext), SystemSetting
 ) });
 class SystemSettingsPlugin extends Plugin {
   load() {
-    return q(this, null, function* () {
+    return V(this, null, function* () {
       this.app.use(SystemSettingsProvider, this.options);
     });
   }
@@ -38880,7 +38905,7 @@ const RemoteDocumentTitleProvider = (e) => {
 };
 class RemoteDocumentTitlePlugin extends Plugin {
   load() {
-    return q(this, null, function* () {
+    return V(this, null, function* () {
       this.app.use(RemoteDocumentTitleProvider, this.options);
     });
   }
@@ -39078,7 +39103,7 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
 PinnedPluginList.displayName = "PinnedPluginList";
 class PinnedListPlugin extends Plugin {
   load() {
-    return q(this, null, function* () {
+    return V(this, null, function* () {
       this.app.use(PinnedPluginListProvider, this.options.config);
     });
   }
@@ -39318,7 +39343,7 @@ const PluginDetail = ({ plugin: e, onCancel: t }) => {
     const u = useForm();
     return {
       run() {
-        return q(this, null, function* () {
+        return V(this, null, function* () {
           yield u.submit(), c.request({
             url: t ? "pm:update" : "pm:add",
             method: "post",
@@ -39424,7 +39449,7 @@ const PluginUploadForm = ({ onClose: e, pluginData: t, isUpgrade: n }) => {
     const l = useAPIClient(), { t: c } = useTranslation(), u = useForm();
     return {
       run() {
-        return q(this, null, function* () {
+        return V(this, null, function* () {
           var h, g;
           yield u.submit();
           const p = new FormData();
@@ -39525,7 +39550,7 @@ const PluginUploadForm = ({ onClose: e, pluginData: t, isUpgrade: n }) => {
     const c = useForm();
     return {
       run() {
-        return q(this, null, function* () {
+        return V(this, null, function* () {
           const d = c.values.compressedFileUrl;
           if (!d)
             return;
@@ -39725,7 +39750,7 @@ function PluginInfo(e) {
               {
                 disabled: u,
                 title: S("Are you sure to delete this plugin?"),
-                onConfirm: (T) => q(this, null, function* () {
+                onConfirm: (T) => V(this, null, function* () {
                   T.stopPropagation(), yield y.request({
                     url: "pm:remove",
                     params: {
@@ -39782,14 +39807,14 @@ function PluginInfo(e) {
               "aria-label": "enable",
               size: "small",
               disabled: u || h,
-              onChange: (T, D) => q(this, null, function* () {
+              onChange: (T, D) => V(this, null, function* () {
                 if (D.stopPropagation(), !a && T) {
                   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: () => V(this, null, function* () {
                       yield y.request({
                         url: "pm:enable",
                         params: {
@@ -39807,7 +39832,7 @@ function PluginInfo(e) {
                   }
                 }) : v.confirm({
                   title: S("Are you sure to disable this plugin?"),
-                  onOk: () => q(this, null, function* () {
+                  onOk: () => V(this, null, function* () {
                     yield y.request({
                       url: "pm:disable",
                       params: {
@@ -39880,7 +39905,7 @@ function BulkEnableButton({ plugins: e = [] }) {
         width: 1e3,
         title: t("Bulk enable"),
         open: i,
-        onOk: () => q(this, null, function* () {
+        onOk: () => V(this, null, function* () {
           yield n.request({
             url: "pm:enable",
             params: {
@@ -40295,7 +40320,7 @@ const AdminSettingsLayout = () => {
 };
 class PMPlugin extends Plugin {
   load() {
-    return q(this, null, function* () {
+    return V(this, null, function* () {
       this.addComponents(), this.addRoutes(), this.addSettings();
     });
   }
@@ -41939,7 +41964,7 @@ const useStyles$5 = genStyleHook("nb-association-filter-item", (e) => {
       J.stopPropagation();
     }, E = (J) => {
       m(J);
-    }, V = (H = a.title) != null ? H : (U = i == null ? void 0 : i.uiSchema) == null ? void 0 : U.title;
+    }, q = (H = a.title) != null ? H : (U = i == null ? void 0 : i.uiSchema) == null ? void 0 : U.title;
     return t(
       /* @__PURE__ */ jsxs(SortableItem, { className: cls(n, o, "nb-block-item", e.className, "SortableItem"), children: [
         /* @__PURE__ */ jsx(l, {}),
@@ -41956,7 +41981,7 @@ const useStyles$5 = genStyleHook("nb-association-filter-item", (e) => {
                 },
                 gutter: 5,
                 children: [
-                  /* @__PURE__ */ jsx(Col, { title: c(V), className: "headerCol", children: S ? /* @__PURE__ */ jsx(
+                  /* @__PURE__ */ jsx(Col, { title: c(q), className: "headerCol", children: S ? /* @__PURE__ */ jsx(
                     Input$3,
                     {
                       bordered: !1,
@@ -41966,7 +41991,7 @@ const useStyles$5 = genStyleHook("nb-association-filter-item", (e) => {
                       onClick: z,
                       onChange: E
                     }
-                  ) : c(V) }),
+                  ) : c(q) }),
                   /* @__PURE__ */ jsx(
                     Col,
                     {
@@ -42179,7 +42204,7 @@ AssociationFilter.useAssociationField = () => {
 };
 class AssociationFilterPlugin extends Plugin {
   load() {
-    return q(this, null, function* () {
+    return V(this, null, function* () {
       this.app.schemaInitializerManager.add(associationFilterFilterBlockInitializer), this.app.schemaInitializerManager.add(filterCollapseItemInitializer_deprecated), this.app.schemaInitializerManager.add(filterCollapseItemInitializer), this.app.schemaInitializerManager.add(associationFilterInitializer);
     });
   }
@@ -42393,15 +42418,15 @@ const DataBlockInitializer = (e) => {
     otherText: S,
     alwaysRenderMenu: y
   } = e, { insert: v, setVisible: F } = useSchemaInitializer(), I = useCompile(), { getTemplateSchemaByMode: w } = useSchemaTemplateManager(), T = useCallback(
-    (z) => q(void 0, null, function* () {
-      const { item: E, fromOthersInPopup: V } = z;
+    (z) => V(void 0, null, function* () {
+      const { item: E, fromOthersInPopup: q } = z;
       if (f)
         return f(z);
       if (E.template) {
         const L = yield w(E);
-        v(t ? t(L, { item: E, fromOthersInPopup: V }) : L);
+        v(t ? t(L, { item: E, fromOthersInPopup: q }) : L);
       } else
-        n && n({ item: E, fromOthersInPopup: V });
+        n && n({ item: E, fromOthersInPopup: q });
       F(!1);
     }),
     [w, v, F, n, f, t]
@@ -42535,7 +42560,7 @@ const DataBlockInitializer = (e) => {
     P(x({
       icon: /* @__PURE__ */ jsx(TableOutlined, {})
     }, r), {
-      onClick: (h) => q(void 0, [h], function* ({ item: m }) {
+      onClick: (h) => V(void 0, [h], function* ({ item: m }) {
         if (m.template) {
           const g = yield a(m);
           i(g);
@@ -42631,7 +42656,7 @@ const RecordAssociationDetailsBlockInitializer = () => {
     P(x({
       icon: /* @__PURE__ */ jsx(FormOutlined, {})
     }, r), {
-      onClick: (h) => q(void 0, [h], function* ({ item: m }) {
+      onClick: (h) => V(void 0, [h], function* ({ item: m }) {
         if (m.template) {
           const g = yield a(m);
           i(g);
@@ -42717,7 +42742,7 @@ const RecordAssociationFormBlockInitializer = () => {
     P(x({
       icon: /* @__PURE__ */ jsx(FormOutlined, {})
     }, r), {
-      onClick: (h) => q(void 0, [h], function* ({ item: m }) {
+      onClick: (h) => V(void 0, [h], function* ({ item: m }) {
         if (m.template) {
           const g = yield l(m);
           if (m.template.componentName === "FormItem") {
@@ -42849,7 +42874,7 @@ const createGridCardBlockUISchema = (e) => {
     P(x({
       icon: /* @__PURE__ */ jsx(TableOutlined, {})
     }, r), {
-      onClick: (h) => q(void 0, [h], function* ({ item: m }) {
+      onClick: (h) => V(void 0, [h], function* ({ item: m }) {
         if (m.template) {
           const g = yield a(m);
           i(g);
@@ -42954,7 +42979,7 @@ const createListBlockUISchema = (e) => {
     P(x({
       icon: /* @__PURE__ */ jsx(TableOutlined, {})
     }, r), {
-      onClick: (h) => q(void 0, [h], function* ({ item: m }) {
+      onClick: (h) => V(void 0, [h], function* ({ item: m }) {
         if (m.template) {
           const g = yield a(m);
           i(g);
@@ -43043,7 +43068,7 @@ const RecordReadPrettyAssociationFormBlockInitializer = () => {
     P(x({
       icon: /* @__PURE__ */ jsx(FormOutlined, {})
     }, r), {
-      onClick: (g) => q(void 0, [g], function* ({ item: h }) {
+      onClick: (g) => V(void 0, [g], function* ({ item: h }) {
         if (h.template) {
           const f = yield l(h);
           if (h.template.componentName === "ReadPrettyFormItem") {
@@ -43232,7 +43257,7 @@ function ModalActionSchemaInitializerItem(e) {
               const m = useForm();
               return {
                 onClick() {
-                  return q(this, null, function* () {
+                  return V(this, null, function* () {
                     var g;
                     yield m.submit(), l(!1), (g = e == null ? void 0 : e.onSubmit) == null || g.call(e, m.values);
                   });
@@ -43573,7 +43598,7 @@ const items = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.definePropert
     P(x({}, c), {
       icon: /* @__PURE__ */ jsx(ProfileOutlined, {}),
       componentType: o,
-      onCreateBlockSchema: (d) => q(void 0, null, function* () {
+      onCreateBlockSchema: (d) => V(void 0, null, function* () {
         if (r)
           return r(d);
         u(d);
@@ -43823,7 +43848,7 @@ function useCreateSingleDetailsSchema() {
     [n, o, r]
   );
   return { createSingleDetailsSchema: useCallback(
-    (c) => q(this, [c], function* ({ item: l }) {
+    (c) => V(this, [c], function* ({ item: l }) {
       if (l.template) {
         const u = yield t(l);
         e(i(u, { item: l }));
@@ -43993,7 +44018,7 @@ const RecordFormBlockInitializer = () => {
     P(x({
       icon: /* @__PURE__ */ jsx(FormOutlined, {})
     }, n), {
-      onClick: (p) => q(void 0, [p], function* ({ item: d }) {
+      onClick: (p) => V(void 0, [p], function* ({ item: d }) {
         if (d.template) {
           const m = yield r(d);
           o(c(m, { item: d }));
@@ -44313,7 +44338,7 @@ const commonOptions$h = {
     P(x({}, l), {
       icon: /* @__PURE__ */ jsx(AppstoreOutlined, {}),
       componentType: "GridCard",
-      onCreateBlockSchema: (u) => q(void 0, null, function* () {
+      onCreateBlockSchema: (u) => V(void 0, null, function* () {
         if (o)
           return o(u);
         c(u);
@@ -44510,7 +44535,7 @@ const commonOptions$h = {
     P(x({}, l), {
       icon: /* @__PURE__ */ jsx(OrderedListOutlined, {}),
       componentType: "List",
-      onCreateBlockSchema: (u) => q(void 0, null, function* () {
+      onCreateBlockSchema: (u) => V(void 0, null, function* () {
         if (o)
           return o(u);
         c(u);
@@ -44665,7 +44690,7 @@ const commonOptions$h = {
     P(x({
       icon: /* @__PURE__ */ jsx(FormOutlined, {})
     }, r), {
-      onClick: () => q(void 0, null, function* () {
+      onClick: () => V(void 0, null, function* () {
         i(
           createTableSelectorUISchema({
             rowKey: a.filterTargetKey,
@@ -45014,7 +45039,7 @@ const commonOptions$h = {
     P(x({}, a), {
       icon: /* @__PURE__ */ jsx(TableOutlined, {}),
       componentType: "Table",
-      onCreateBlockSchema: (c) => q(void 0, null, function* () {
+      onCreateBlockSchema: (c) => V(void 0, null, function* () {
         if (o)
           return o(c);
         l(c);
@@ -45155,7 +45180,7 @@ const commonOptions$h = {
       onlyCurrentDataSource: t,
       icon: /* @__PURE__ */ jsx(RightSquareOutlined, {}),
       componentType: "FilterCollapse",
-      onCreateBlockSchema: (a) => q(void 0, [a], function* ({ item: i }) {
+      onCreateBlockSchema: (a) => V(void 0, [a], function* ({ item: i }) {
         const l = createCollapseBlockSchema({
           dataSource: i.dataSource,
           collectionName: i.collectionName || i.name,
@@ -45612,7 +45637,7 @@ const commonOptions$h = {
     const { selectedRows: h } = useContext(RecordPickerContext), { setVisible: g, setSubmitted: f, setFormValueChanged: C } = useActionContext();
     return {
       onClick(S, y) {
-        return q(this, null, function* () {
+        return V(this, null, function* () {
           var v, F;
           yield r.add({
             values: h
@@ -45934,7 +45959,7 @@ const commonOptions$2 = {
     let f = a;
     return d || (f = "page:addBlock", c && (f = "mobile:addBlock")), f || (f = "popup:common:addBlock", o || !u ? f = "popup:addNew:addBlock" : r && (f = "popup:bulkEdit:addBlock")), {
       run() {
-        return q(this, null, function* () {
+        return V(this, null, function* () {
           yield h.submit();
           const { title: b, icon: S } = h.values;
           n({
@@ -46007,7 +46032,7 @@ const commonOptions$2 = {
                         const h = useActionContext();
                         return {
                           run() {
-                            return q(this, null, function* () {
+                            return V(this, null, function* () {
                               h.setVisible(!1);
                             });
                           }
@@ -46316,7 +46341,7 @@ const CreateRecordAction$1 = forwardRef(InternalCreateRecordAction), initializer
 }, Symbol.toStringTag, { value: "Module" }));
 class SchemaInitializerPlugin extends Plugin {
   load() {
-    return q(this, null, function* () {
+    return V(this, null, function* () {
       this.app.addComponents(P(x(x({}, initializerComponents), items), {
         DestroyActionInitializer,
         FormBlockInitializer,
@@ -46531,7 +46556,7 @@ class LocalePlugin extends Plugin {
     A(this, "locales", {});
   }
   afterAdd() {
-    return q(this, null, function* () {
+    return V(this, null, function* () {
       var r, i, a, l, c, u, d;
       const n = this.app.apiClient, o = n.auth.locale;
       try {
@@ -46715,7 +46740,7 @@ const AppSpin = () => /* @__PURE__ */ jsx(Spin, { style: { position: "fixed", to
 };
 class NocoBaseBuildInPlugin extends Plugin {
   afterAdd() {
-    return q(this, null, function* () {
+    return V(this, null, function* () {
       this.app.addComponents({
         AppSpin,
         AppError,
@@ -46726,7 +46751,7 @@ class NocoBaseBuildInPlugin extends Plugin {
     });
   }
   load() {
-    return q(this, null, function* () {
+    return V(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"
@@ -46766,7 +46791,7 @@ class NocoBaseBuildInPlugin extends Plugin {
     });
   }
   addPlugins() {
-    return q(this, null, function* () {
+    return V(this, null, function* () {
       yield this.app.pm.add(AssociationFilterPlugin), yield this.app.pm.add(LocalePlugin, { name: "builtin-locale" }), yield this.app.pm.add(AdminLayoutPlugin, { name: "admin-layout" }), yield this.app.pm.add(SystemSettingsPlugin, { name: "system-setting" }), yield this.app.pm.add(PinnedListPlugin, {
         name: "pinned-list",
         config: {
@@ -46862,7 +46887,7 @@ const insertPositionToMethod = {
             }
           }
         },
-        onSubmit: (g) => q(void 0, [g], function* ({ title: m, icon: h }) {
+        onSubmit: (g) => V(void 0, [g], function* ({ title: m, icon: h }) {
           var y, v;
           const f = i.__route__, C = (y = i.parent) == null ? void 0 : y.__route__, b = uid(), { data: S } = yield u({
             type: NocoBaseDesktopRouteType.group,
@@ -46904,7 +46929,7 @@ const insertPositionToMethod = {
             }
           }
         },
-        onSubmit: (g) => q(void 0, [g], function* ({ title: m, icon: h }) {
+        onSubmit: (g) => V(void 0, [g], function* ({ title: m, icon: h }) {
           var I, w;
           const f = i.__route__, C = (I = i.parent) == null ? void 0 : I.__route__, b = uid(), S = uid(), y = uid(), v = uid(), { data: F } = yield u({
             type: NocoBaseDesktopRouteType.page,
@@ -46957,7 +46982,7 @@ const insertPositionToMethod = {
             params: l
           }
         },
-        onSubmit: (C) => q(void 0, [C], function* ({ title: m, icon: h, href: g, params: f }) {
+        onSubmit: (C) => V(void 0, [C], function* ({ title: m, icon: h, href: g, params: f }) {
           var F, I;
           const b = i.__route__, S = (F = i.parent) == null ? void 0 : F.__route__, y = uid(), { data: v } = yield u(
             {
@@ -47101,7 +47126,7 @@ const insertPositionToMethod = {
       }
     }
   }), [h, l]), { moveRoute: I } = useNocoBaseRoutes(), w = useCallback(
-    (B) => q(void 0, [B], function* ({ target: j, position: N }) {
+    (B) => V(void 0, [B], function* ({ target: j, position: N }) {
       var E;
       const [R] = ((E = j == null ? void 0 : j.split) == null ? void 0 : E.call(j, "||")) || [];
       if (!R)
@@ -47169,7 +47194,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 V(this, null, function* () {
                 var B;
                 o["x-component-props"].hidden = !!j, n.componentProps.hidden = !!j, (B = o.__route__) != null && B.id && (yield e(o.__route__.id, {
                   hideInMenu: !!j
@@ -47355,7 +47380,7 @@ const insertPositionToMethod = {
 ParentRouteContext.displayName = "ParentRouteContext";
 const useParentRoute = () => useContext(ParentRouteContext), useNocoBaseRoutes = (e = "desktopRoutes") => {
   const t = useAPIClient(), n = useMemo(() => t.resource(e), [t, e]), { refresh: o } = useAllAccessDesktopRoutes(), r = useCallback(
-    (c, u = !0) => q(void 0, null, function* () {
+    (c, u = !0) => V(void 0, null, function* () {
       const d = yield n.create({
         values: c
       });
@@ -47363,7 +47388,7 @@ const useParentRoute = () => useContext(ParentRouteContext), useNocoBaseRoutes =
     }),
     [n, o]
   ), i = useCallback(
-    (c, u, d = !0) => q(void 0, null, function* () {
+    (c, u, d = !0) => V(void 0, null, function* () {
       const p = yield n.update({
         filterByTk: c,
         values: u
@@ -47372,7 +47397,7 @@ const useParentRoute = () => useContext(ParentRouteContext), useNocoBaseRoutes =
     }),
     [n, o]
   ), a = useCallback(
-    (c, u = !0) => q(void 0, null, function* () {
+    (c, u = !0) => V(void 0, null, function* () {
       const d = yield n.destroy({
         filterByTk: c
       });
@@ -47380,7 +47405,7 @@ const useParentRoute = () => useContext(ParentRouteContext), useNocoBaseRoutes =
     }),
     [o, n]
   ), l = useCallback(
-    (f) => q(void 0, [f], function* ({
+    (f) => V(void 0, [f], function* ({
       sourceId: c,
       targetId: u,
       targetScope: d,
@@ -47692,7 +47717,7 @@ const MenuURLButton = ({ href: e, params: t, icon: n }) => {
   var u;
   const o = useField(), r = useFieldSchema(), { t: i } = useMenuTranslation(), a = useContext(MenuItemDesignerContext), { parseURLAndParams: l } = useParseURLAndParams(), c = useRef(e);
   return useEffect(() => {
-    q(void 0, null, function* () {
+    V(void 0, null, function* () {
       try {
         c.current = yield l(e, t || []);
       } catch (p) {
@@ -47995,7 +48020,7 @@ const className1 = css`
       icon: /* @__PURE__ */ jsx(PlusOutlined, {}),
       className: "addTabBtn",
       type: "dashed",
-      onClick: () => q(void 0, null, function* () {
+      onClick: () => V(void 0, null, function* () {
         const F = yield FormDialog(
           o("Add tab"),
           () => /* @__PURE__ */ jsx(SchemaComponentOptions, { scope: p.scope, components: x({}, p.components), children: /* @__PURE__ */ jsx(FormLayout, { layout: "vertical", children: /* @__PURE__ */ jsx(
@@ -48237,7 +48262,7 @@ const pageSettings = new SchemaSettings({
           title: t("Enable page tabs"),
           checked: o.enableTabs,
           onChange(a) {
-            return q(this, null, function* () {
+            return V(this, null, function* () {
               yield r(o.id, {
                 enableTabs: a
               }), n["x-component-props"] = n["x-component-props"] || {}, n["x-component-props"].enablePageTabs = a, e.emit("patch", {
@@ -48307,7 +48332,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 V(this, null, function* () {
                   yield t(n.id, {
                     hideInMenu: !!o
                   });
@@ -48336,7 +48361,7 @@ const pageSettings = new SchemaSettings({
               content: n("Are you sure you want to delete it?")
             }, confirm), {
               onOk() {
-                return q(this, null, function* () {
+                return V(this, null, function* () {
                   yield o(r.id), t.emit("remove", {
                     removed: {
                       "x-uid": r.schemaUid
@@ -48364,7 +48389,7 @@ const pageSettings = new SchemaSettings({
 };
 class AntdSchemaComponentPlugin extends Plugin {
   load() {
-    return q(this, null, function* () {
+    return V(this, null, function* () {
       this.addComponents(), this.addScopes(), this.addSchemaSettings();
     });
   }
@@ -48435,7 +48460,7 @@ const AppendsTreeSelect = (e) => {
     const R = S.getCollection(N);
     return R ? R.getAllFields(B) : [];
   }, v = Object.values(m), F = useMemo(() => e.multiple ? (n || []).map((N) => m[N]).filter(Boolean) : n, [n, e.multiple, m]), I = useCallback(
-    (N) => q(void 0, null, function* () {
+    (N) => V(void 0, null, function* () {
       if (c != null)
         return c(N);
       if (!N.isLeaf && N.loadChildren) {
@@ -48470,7 +48495,7 @@ const AppendsTreeSelect = (e) => {
         }
         if (!$.isLeaf && $.loadChildren) {
           const E = $.loadChildren($);
-          E != null && E.length && (B.push(...E), $ = E.find((V) => V.value === M.slice(0, k + 1).join(".")));
+          E != null && E.length && (B.push(...E), $ = E.find((q) => q.value === M.slice(0, k + 1).join(".")));
         }
       }
     }), h((R) => B.reduce((M, $) => Object.assign(M, { [$.value]: $ }), x({}, R)));
@@ -48560,15 +48585,15 @@ const InternalAssociationSelect$1 = observer$1(
       const j = uid();
       return f.addEffects(j, () => {
         onFieldInputValueChange("*", (N) => {
-          var $, k, z, E, V, L;
+          var $, k, z, E, q, L;
           const B = filterAnalyses((z = (k = ($ = r.componentProps) == null ? void 0 : $.service) == null ? void 0 : k.params) == null ? void 0 : z.filter) || [], R = getFieldPath(N.address.entire), M = getFieldPath(r.address.entire);
-          B.includes((E = N == null ? void 0 : N.props) == null ? void 0 : E.name) && r.value && isEqual(N == null ? void 0 : N.indexes, r == null ? void 0 : r.indexes) && ((V = N == null ? void 0 : N.props) == null ? void 0 : V.name) !== r.props.name && (!((L = r == null ? void 0 : r.indexes) != null && L.length) || isEqual(R, M)) && (r.setValue(null), p(null));
+          B.includes((E = N == null ? void 0 : N.props) == null ? void 0 : E.name) && r.value && isEqual(N == null ? void 0 : N.indexes, r == null ? void 0 : r.indexes) && ((q = N == null ? void 0 : N.props) == null ? void 0 : q.name) !== r.props.name && (!((L = r == null ? void 0 : r.indexes) != null && L.length) || isEqual(R, M)) && (r.setValue(null), p(null));
         });
       }), () => {
         f.removeEffects(j);
       };
     }, []);
-    const w = (j) => q(void 0, null, function* () {
+    const w = (j) => V(void 0, null, function* () {
       var M, $;
       const { search: N, callBack: B } = j, {
         data: { data: R }
@@ -48965,13 +48990,13 @@ const InternalFileManager = (e) => {
           let M = p(R[y.label]);
           if (($ = v == null ? void 0 : v.uiSchema) != null && $.enum)
             if (Array.isArray(M))
-              M = M.map((E, V) => {
+              M = M.map((E, q) => {
                 var G, U;
                 const L = (U = (G = v.uiSchema.enum).find) == null ? void 0 : U.call(G, (H) => H.value === E);
-                return L ? /* @__PURE__ */ jsx(Tag, { color: L.color, style: { marginRight: 3 }, children: (L == null ? void 0 : L.label) || E }, V) : /* @__PURE__ */ jsx(Tag, { children: E }, E);
+                return L ? /* @__PURE__ */ jsx(Tag, { color: L.color, style: { marginRight: 3 }, children: (L == null ? void 0 : L.label) || E }, q) : /* @__PURE__ */ jsx(Tag, { children: E }, E);
               }).reverse();
             else {
-              const E = (z = (k = v.uiSchema.enum).find) == null ? void 0 : z.call(k, (V) => V.value === M);
+              const E = (z = (k = v.uiSchema.enum).find) == null ? void 0 : z.call(k, (q) => q.value === M);
               E && (M = /* @__PURE__ */ jsx(Tag, { color: E.color, children: E.label }));
             }
           return (v == null ? void 0 : v.type) === "date" && (M = dayjs(M).format("YYYY-MM-DD")), n ? n({
@@ -48987,7 +49012,7 @@ const InternalFileManager = (e) => {
       }
     },
     [v == null ? void 0 : v.uiSchema, y]
-  ), T = (B) => q(void 0, null, function* () {
+  ), T = (B) => V(void 0, null, function* () {
     var M, $;
     const R = yield C.list({
       pageSize: 200,
@@ -48996,7 +49021,7 @@ const InternalFileManager = (e) => {
       tree: B.parentId ? void 0 : !0
     });
     return ($ = R == null ? void 0 : R.data) == null ? void 0 : $.data;
-  }), D = (B, R, M) => q(void 0, null, function* () {
+  }), D = (B, R, M) => V(void 0, null, function* () {
     const $ = yield T({ parentId: R == null ? void 0 : R.id }), k = [...i];
     if (k.splice(M + 1), k[M] = P(x({}, k[M]), { value: R }), R != null && R.id && (k[M + 1] = { key: R == null ? void 0 : R.id, children: ($ == null ? void 0 : $.length) > 0 ? $ : null }), a(k), ["o2m", "m2m"].includes(g.interface)) {
       const z = Array.isArray(f.fieldValue) ? f.fieldValue : [];
@@ -49004,17 +49029,17 @@ const InternalFileManager = (e) => {
     } else
       f.value = R;
     k.length === 1 && !k[0].value ? o == null || o(null) : o == null || o(k);
-  }), O = (B, R, M) => q(void 0, null, function* () {
+  }), O = (B, R, M) => V(void 0, null, function* () {
     var $, k, z;
     if (B) {
       d(!0);
       const E = yield T({ parentId: R == null ? void 0 : R.key });
       if (d(!1), c(E), M === (i == null ? void 0 : i.length) - 1 && (($ = R == null ? void 0 : R.value) != null && $.id)) {
-        const V = yield T({ parentId: (k = R == null ? void 0 : R.value) == null ? void 0 : k.id }), L = [...i];
-        L.splice(M + 1), L[M] = P(x({}, L[M]), { value: R == null ? void 0 : R.value }), L[M + 1] = { key: (z = R == null ? void 0 : R.value) == null ? void 0 : z.id, children: (V == null ? void 0 : V.length) > 0 ? V : null }, a(L), o == null || o(L);
+        const q = yield T({ parentId: (k = R == null ? void 0 : R.value) == null ? void 0 : k.id }), L = [...i];
+        L.splice(M + 1), L[M] = P(x({}, L[M]), { value: R == null ? void 0 : R.value }), L[M + 1] = { key: (z = R == null ? void 0 : R.value) == null ? void 0 : z.id, children: (q == null ? void 0 : q.length) > 0 ? q : null }, a(L), o == null || o(L);
       }
     }
-  }), j = (B, R) => q(void 0, null, function* () {
+  }), j = (B, R) => V(void 0, null, function* () {
     const M = B ? {
       [y.label]: {
         [F]: B
@@ -49799,7 +49824,7 @@ const defaultModeToComponent = {
     const { onClick: u } = useAssociationCreateActionProps(), d = useField(), { getPrimaryKey: p } = useCollection_deprecated(), m = p();
     return {
       onClick() {
-        return q(this, null, function* () {
+        return V(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) || {};
@@ -50441,7 +50466,7 @@ const Table$1 = withDynamicSchemaProps(
       "loading",
       "onClickRow"
     ]), S = useArrayField(b), y = useFieldSchema(), { size: v = "small" } = (y == null ? void 0 : y["x-component-props"]) || {}, F = useCollection(), w = ((ce = y == null ? void 0 : y.parent) == null ? void 0 : ce["x-decorator"]) === "TableSelectorProvider" ? useTableSelectorContext() : useTableBlockContext(), { expandFlag: T, allIncludesChildren: D } = w, O = useMemoizedFn(b.onRowDragEnd || (() => {
-    })), j = usePaginationProps$2(n, i), N = useTableColumns$1(b, j), [B, R] = useState(() => T ? D : []), [M, $] = useState(((Ce = S == null ? void 0 : S.data) == null ? void 0 : Ce.selectedRowKeys) || []), [k, z] = useState([]), E = (p == null ? void 0 : p.type) !== "none", V = useRef(/* @__PURE__ */ new Map()), L = useMemo(() => css`
+    })), j = usePaginationProps$2(n, i), N = useTableColumns$1(b, j), [B, R] = useState(() => T ? D : []), [M, $] = useState(((Ce = S == null ? void 0 : S.data) == null ? void 0 : Ce.selectedRowKeys) || []), [k, z] = useState([]), E = (p == null ? void 0 : p.type) !== "none", q = useRef(/* @__PURE__ */ new Map()), L = useMemo(() => css`
         & > td {
           background-color: ${t.controlItemBgActive} !important;
         }
@@ -50463,10 +50488,10 @@ const Table$1 = withDynamicSchemaProps(
         return J(Q);
       if (Q.key)
         return Q.key;
-      if (V.current.has(Q))
-        return V.current.get(Q);
+      if (q.current.has(Q))
+        return q.current.get(Q);
       const te = uid();
-      return V.current.set(Q, te), te;
+      return q.current.set(Q, te), te;
     }, []), J = useCallback(
       (Q) => {
         var te;
@@ -50655,24 +50680,24 @@ const Table$1 = withDynamicSchemaProps(
   }
 `, SubTable = observer$1(
   (e) => {
-    var M, $, k, z;
+    var M, $, k;
     const { openSize: t } = e, { field: n, options: o, fieldSchema: r } = useAssociationFieldContext(), { t: i } = useTranslation(), [a, l] = useState(!1), [c, u] = useState([]), d = useFieldNames$1(e), p = useFieldSchema(), m = useCompile(), h = useLabelUiSchema$1(o, (d == null ? void 0 : d.label) || "label"), g = useCollectionRecord(), f = useCollection(), { allowSelectExistingRecord: C, allowAddnew: b, allowDisassociation: S } = n.componentProps;
     useSubTableSpecialCase({ rootField: n, rootSchema: r });
-    const y = (E, V) => {
-      if (V !== void 0 && isArr(n.value) && E !== V)
+    const y = (z, E) => {
+      if (E !== void 0 && isArr(n.value) && z !== E)
         return action(() => {
-          const L = n.value[E];
-          return n.value.splice(E, 1), n.value.splice(V, 0, L), exchangeArrayState(n, {
-            fromIndex: E,
-            toIndex: V
+          const q = n.value[z];
+          return n.value.splice(z, 1), n.value.splice(E, 0, q), exchangeArrayState(n, {
+            fromIndex: z,
+            toIndex: E
           }), n.onInput(n.value);
         });
     };
     n.move = y;
-    const v = useMemo(() => n.value && Object.keys(n.value).length > 0 ? (Array.isArray(n.value) ? n.value : n.value ? [n.value] : []).filter(Boolean).map((V) => {
-      const L = V == null ? void 0 : V[d.label];
-      return P(x({}, V), {
-        [d.label]: getLabelFormatValue$1(m(h), m(L))
+    const v = useMemo(() => n.value && Object.keys(n.value).length > 0 ? (Array.isArray(n.value) ? n.value : n.value ? [n.value] : []).filter(Boolean).map((E) => {
+      const q = E == null ? void 0 : E[d.label];
+      return P(x({}, E), {
+        [d.label]: getLabelFormatValue$1(m(h), m(q))
       });
     }) : [], [n.value, d == null ? void 0 : d.label]), F = {
       size: "small",
@@ -50687,45 +50712,45 @@ const Table$1 = withDynamicSchemaProps(
       setSelectedRows: u,
       collectionField: o
     }, I = () => {
-      const { setVisible: E } = useActionContext(), { selectedRows: V, setSelectedRows: L } = useContext(RecordPickerContext);
+      const { setVisible: z } = useActionContext(), { selectedRows: E, setSelectedRows: q } = useContext(RecordPickerContext);
       return {
         onClick() {
-          var U;
-          Array.isArray(n.value) || (n.value = []), V.forEach((H) => n.value.push(markRecordAsNew(H))), n.onInput(n.value), n.initialValue = n.value, L([]), E(!1);
-          const G = Math.ceil(n.value.length / (((U = n.componentProps) == null ? void 0 : U.pageSize) || 10));
-          D(G);
+          var G;
+          Array.isArray(n.value) || (n.value = []), E.forEach((U) => n.value.push(markRecordAsNew(U))), n.onInput(n.value), n.initialValue = n.value, q([]), z(!1);
+          const L = Math.ceil(n.value.length / (((G = n.componentProps) == null ? void 0 : G.pageSize) || 10));
+          D(L);
         }
       };
     }, w = () => {
-      const E = (o == null ? void 0 : o.targetKey) || "id", V = (n.value || []).map((G) => G == null ? void 0 : G[E]).filter(Boolean);
-      return V.length ? { $and: [{ [`${E}.$ne`]: V }] } : {};
+      const z = (o == null ? void 0 : o.targetKey) || "id", E = (n.value || []).map((L) => L == null ? void 0 : L[z]).filter(Boolean);
+      return E.length ? { $and: [{ [`${z}.$ne`]: E }] } : {};
     }, [T, D] = useState(1), [O, j] = useState(((M = n.componentProps) == null ? void 0 : M.pageSize) || 10);
     useEffect(() => {
-      var E;
-      j((E = n.componentProps) == null ? void 0 : E.pageSize);
+      var z;
+      j((z = n.componentProps) == null ? void 0 : z.pageSize);
     }, [($ = n.componentProps) == null ? void 0 : $.pageSize]);
     const N = useMemo(() => {
-      var V;
-      const E = Math.ceil(((V = n.value) == null ? void 0 : V.length) / 10);
+      var E;
+      const z = Math.ceil(((E = n.value) == null ? void 0 : E.length) / 10);
       return {
-        current: T > E ? E : T,
+        current: T > z ? z : T,
         pageSize: O || 10,
         total: n == null ? void 0 : n.value,
-        onChange: (L, G) => {
-          D(L), j(G), n.componentProps.pageSize = G, n.onInput(n.value);
+        onChange: (q, L) => {
+          D(q), j(L), n.componentProps.pageSize = L, n.onInput(n.value);
         },
         showSizeChanger: !0,
         pageSizeOptions: ["10", "20", "50", "100"],
         hideOnSinglePage: !1
       };
     }, [(k = n.value) == null ? void 0 : k.length, O, T]), B = () => {
-      const { field: E } = useAssociationFieldContext();
+      const { field: z } = useAssociationFieldContext();
       return {
         run() {
-          var L;
-          E.value = E.value || [], E.value.push(markRecordAsNew({}));
-          const V = Math.ceil(E.value.length / (((L = E.componentProps) == null ? void 0 : L.pageSize) || 10));
-          return D(V), E.onInput(E.value);
+          var q;
+          z.value = z.value || [], z.value.push(markRecordAsNew({}));
+          const E = Math.ceil(z.value.length / (((q = z.componentProps) == null ? void 0 : q.pageSize) || 10));
+          return D(E), z.onInput(z.value);
         }
       };
     }, R = () => ({
@@ -50743,7 +50768,7 @@ const Table$1 = withDynamicSchemaProps(
             field: n,
             showIndex: !0,
             dragSort: !1,
-            showDel: n.editable && (b !== !1 || C !== !1 || S !== !1) ? (E) => n.editable ? S !== !1 ? !0 : E == null ? void 0 : E.__isNewRecord__ : !1 : !1,
+            showDel: n.editable && (b !== !1 || C !== !1 || S !== !1) ? (z) => n.editable ? S !== !1 ? !0 : z == null ? void 0 : z.__isNewRecord__ : !1 : !1,
             pagination: N,
             rowSelection: { type: "none", hideSelectAll: !0 },
             isSubTable: !0,
@@ -50759,8 +50784,7 @@ const Table$1 = withDynamicSchemaProps(
           Space$1,
           {
             style: {
-              marginTop: "10px",
-              position: (z = n.value) != null && z.length ? "absolute" : "relative",
+              position: "relative",
               bottom: "0",
               gap: 15
             },
@@ -50814,7 +50838,7 @@ const Table$1 = withDynamicSchemaProps(
                   onlyRenderProperties: !0,
                   basePath: n.address,
                   schema: p.parent,
-                  filterProperties: (E) => E["x-component"] === "AssociationField.Selector"
+                  filterProperties: (z) => z["x-component"] === "AssociationField.Selector"
                 }
               )
             }
@@ -50913,7 +50937,7 @@ const ReadPretty$7 = observer$1(
 InternalAssociationSelect.displayName = "InternalAssociationSelect";
 const AssociationSelect = InternalAssociationSelect;
 AssociationSelect.Designer = function e() {
-  var M, $, k, z, E, V, L, G, U, H, J;
+  var M, $, k, z, E, q, L, G, U, H, J;
   const { getCollectionFields: t, getInterface: n, getCollectionJoinField: o, getCollection: r, isTitleField: i } = useCollectionManager_deprecated(), { getField: a } = useCollection_deprecated(), { form: l } = useFormBlockContext(), c = useField(), u = useFieldSchema(), { t: d } = useTranslation(), p = useFilterByTk(), { dn: m, refresh: h, insertAdjacent: g } = useDesignable(), f = useCompile(), C = useIsShowMultipleSwitch(), { isAllowToSetDefaultValue: b } = useIsAllowToSetDefaultValue(), S = a(u.name) || o(u["x-collection-field"]), y = useFieldComponentOptions(), v = c.address.segments.includes("__form_grid"), F = n(S == null ? void 0 : S.interface), I = (M = F == null ? void 0 : F.validateSchema) == null ? void 0 : M.call(F, u), w = ($ = S == null ? void 0 : S.uiSchema) == null ? void 0 : $.title, T = S != null && S.target ? t(S == null ? void 0 : S.target) : [];
   c.title === w || c.title;
   const D = useSortFields(S == null ? void 0 : S.target), O = ((E = (z = (k = c.componentProps) == null ? void 0 : k.service) == null ? void 0 : z.params) == null ? void 0 : E.sort) || [];
@@ -51127,7 +51151,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: ((q = u["x-component-props"]) == null ? void 0 : q.multiple) === void 0 ? !0 : u["x-component-props"].multiple,
         onChange: (W) => {
           const K = {
             "x-uid": u["x-uid"]
@@ -51419,7 +51443,7 @@ AssociationSelect.FilterDesigner = function e() {
           }
         },
         onSubmit: ($) => {
-          var V;
+          var q;
           const k = [];
           for (const L of $.rules)
             k.push(_.pickBy(L, _.identity));
@@ -51429,7 +51453,7 @@ AssociationSelect.FilterDesigner = function e() {
           if (["percent"].includes(m == null ? void 0 : m.interface))
             for (const L of k)
               (L.maxValue || L.minValue) && (L.percentMode = !0), L.percentFormat && (L.percentFormats = !0);
-          const E = _.concat([], ((V = m == null ? void 0 : m.uiSchema) == null ? void 0 : V["x-validator"]) || [], k);
+          const E = _.concat([], ((q = m == null ? void 0 : m.uiSchema) == null ? void 0 : q["x-validator"]) || [], k);
           a.validator = E, l["x-validator"] = k, z["x-validator"] = k, u.emit("patch", {
             schema: z
           }), d();
@@ -51571,10 +51595,10 @@ AssociationSelect.FilterDesigner = function e() {
         options: v,
         value: (M = (R = a == null ? void 0 : a.componentProps) == null ? void 0 : R.fieldNames) == null ? void 0 : M.label,
         onChange: ($) => {
-          var E, V;
+          var E, q;
           const k = {
             "x-uid": l["x-uid"]
-          }, z = P(x(x({}, (V = (E = m == null ? void 0 : m.uiSchema) == null ? void 0 : E["x-component-props"]) == null ? void 0 : V.fieldNames), a.componentProps.fieldNames), {
+          }, z = P(x(x({}, (q = (E = m == null ? void 0 : m.uiSchema) == null ? void 0 : E["x-component-props"]) == null ? void 0 : q.fieldNames), a.componentProps.fieldNames), {
             label: $
           });
           a.componentProps.fieldNames = z, l["x-component-props"] = l["x-component-props"] || {}, l["x-component-props"].fieldNames = z, k["x-component-props"] = l["x-component-props"], u.emit("patch", {
@@ -52300,7 +52324,7 @@ const validateJSON = {
             }
           }
         },
-        onSubmit: (m) => q(void 0, [m], function* ({ plot: u, title: d, config: p }) {
+        onSubmit: (m) => V(void 0, [m], function* ({ plot: u, title: d, config: p }) {
           o.title = r(d), o.componentProps.plot = u;
           const h = r(JSON.parse(p)), g = h == null ? void 0 : h.data;
           if (typeof g == "function") {
@@ -54256,7 +54280,7 @@ const useStyles = genStyleHook("nb-rich-text", (e) => {
   return /* @__PURE__ */ jsx("div", P(x({ className: cls("nb-table-index"), style: { padding: "0 8px 0 16px" } }, n), { children: t + 1 }));
 }, useDefAction = () => ({
   move() {
-    return q(this, null, function* () {
+    return V(this, null, function* () {
     });
   }
 }), TableArray = observer$1(
@@ -54383,7 +54407,7 @@ const useStyles = genStyleHook("nb-rich-text", (e) => {
           ReactDragListView,
           {
             handleSelector: ".drag-handle",
-            onDragEnd: (y, v) => q(void 0, null, function* () {
+            onDragEnd: (y, v) => V(void 0, null, function* () {
               const F = n.value[y], I = n.value[v];
               n.move(y, v), yield h(F, I);
             }),
@@ -54472,7 +54496,7 @@ const useStyles = genStyleHook("nb-rich-text", (e) => {
                       const m = useActionContext();
                       return {
                         run() {
-                          return q(this, null, function* () {
+                          return V(this, null, function* () {
                             m.setVisible(!1);
                           });
                         }
@@ -54490,7 +54514,7 @@ const useStyles = genStyleHook("nb-rich-text", (e) => {
                       const m = useForm(), h = useActionContext();
                       return {
                         run() {
-                          return q(this, null, function* () {
+                          return V(this, null, function* () {
                             const { title: f } = m.values;
                             f && (r.title = f, i.title = f, a.emit("patch", {
                               schema: {
@@ -54889,8 +54913,8 @@ const TableActionColumnDesigner = (e) => {
   }), C = useSchemaTemplate(), b = useCollection_deprecated(), { dragSort: S, resource: y } = r.decoratorProps, v = y && n(y), F = y != null && y.includes(".") ? (B = o(v == null ? void 0 : v.target)) == null ? void 0 : B.tree : !!(b != null && b.tree), I = useCallback(
     ({ filter: E }) => {
       E = removeNullCondition(E);
-      const V = r.decoratorProps.params || {};
-      V.filter = E, r.decoratorProps.params = V, i["x-decorator-props"].params = V, d.emit("patch", {
+      const q = r.decoratorProps.params || {};
+      q.filter = E, r.decoratorProps.params = q, i["x-decorator-props"].params = q, d.emit("patch", {
         schema: {
           "x-uid": i["x-uid"],
           "x-decorator-props": i["x-decorator-props"]
@@ -54911,12 +54935,12 @@ const TableActionColumnDesigner = (e) => {
         onChange: (E) => {
           var L;
           r.decoratorProps.treeTable = E, i["x-decorator-props"].treeTable = E;
-          const V = P(x({}, (L = c.params) == null ? void 0 : L[0]), {
+          const q = P(x({}, (L = c.params) == null ? void 0 : L[0]), {
             tree: E ? !0 : null
           });
           d.emit("patch", {
             schema: i
-          }), d.refresh(), c.run(V);
+          }), d.refresh(), c.run(q);
         }
       }
     ),
@@ -54925,7 +54949,7 @@ const TableActionColumnDesigner = (e) => {
       {
         title: u("Enable drag and drop sorting"),
         checked: r.decoratorProps.dragSort,
-        onChange: (E) => q(void 0, null, function* () {
+        onChange: (E) => V(void 0, null, function* () {
           E && v && (yield w.resource("collections.fields", v.collectionName).update({
             filterByTk: v.name,
             values: {
@@ -55027,13 +55051,13 @@ const TableActionColumnDesigner = (e) => {
         },
         onSubmit: ({ sort: E }) => {
           var G;
-          const V = E.map((U) => U.direction === "desc" ? `-${U.field}` : U.field), L = r.decoratorProps.params || {};
-          L.sort = V, r.decoratorProps.params = L, i["x-decorator-props"].params = L, d.emit("patch", {
+          const q = E.map((U) => U.direction === "desc" ? `-${U.field}` : U.field), L = r.decoratorProps.params || {};
+          L.sort = q, r.decoratorProps.params = L, i["x-decorator-props"].params = L, d.emit("patch", {
             schema: {
               "x-uid": i["x-uid"],
               "x-decorator-props": i["x-decorator-props"]
             }
-          }), c.run(P(x({}, (G = c.params) == null ? void 0 : G[0]), { sort: V }));
+          }), c.run(P(x({}, (G = c.params) == null ? void 0 : G[0]), { sort: q }));
         }
       }
     ),
@@ -55053,8 +55077,8 @@ const TableActionColumnDesigner = (e) => {
         ],
         onChange: (E) => {
           var L;
-          const V = r.decoratorProps.params || {};
-          V.pageSize = E, r.decoratorProps.params = V, i["x-decorator-props"].params = V, c.run(P(x({}, (L = c.params) == null ? void 0 : L[0]), { pageSize: E, page: 1 })), d.emit("patch", {
+          const q = r.decoratorProps.params || {};
+          q.pageSize = E, r.decoratorProps.params = q, i["x-decorator-props"].params = q, c.run(P(x({}, (L = c.params) == null ? void 0 : L[0]), { pageSize: E, page: 1 })), d.emit("patch", {
             schema: {
               "x-uid": i["x-uid"],
               "x-decorator-props": i["x-decorator-props"]
@@ -55074,14 +55098,14 @@ const TableActionColumnDesigner = (e) => {
           { label: u("Small"), value: "small" }
         ],
         onChange: (E) => {
-          const V = i.reduceProperties((L, G) => {
+          const q = i.reduceProperties((L, G) => {
             if (G["x-component"] === "TableV2")
               return G;
           }, null);
-          V["x-component-props"] = V["x-component-props"] || {}, V["x-component-props"].size = E, d.emit("patch", {
+          q["x-component-props"] = q["x-component-props"] || {}, q["x-component-props"].size = E, d.emit("patch", {
             schema: {
-              "x-uid": V["x-uid"],
-              "x-decorator-props": V["x-component-props"]
+              "x-uid": q["x-uid"],
+              "x-decorator-props": q["x-component-props"]
             }
           });
         }
@@ -55569,7 +55593,7 @@ function FormDrawer(e, t, n, o) {
   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) => V(this, null, function* () {
       try {
         p = yield loading(l.loadingText, () => applyMiddleware(p, r.openMiddlewares)), r.form = r.form || createForm(P(x({}, p), {
           effects(g) {
@@ -56193,7 +56217,7 @@ const useRecordIsOwn = () => {
   const e = useForm(), t = useActionContext();
   return {
     run() {
-      return q(this, null, function* () {
+      return V(this, null, function* () {
         t.setVisible(!1), e.reset();
       });
     }
@@ -56212,7 +56236,7 @@ const useRecordIsOwn = () => {
   const { run: e } = useResourceActionContext(), t = useForm(), n = useActionContext();
   return {
     run() {
-      return q(this, null, function* () {
+      return V(this, null, function* () {
         t.reset(), e(), n.setVisible(!1);
       });
     }
@@ -56221,7 +56245,7 @@ const useRecordIsOwn = () => {
   const { resource: e } = useCollection_deprecated();
   return {
     onCardDragEnd(c, u, d) {
-      return q(this, arguments, function* ({ columns: n, groupField: o }, { fromColumnId: r, fromPosition: i }, { toColumnId: a, toPosition: l }) {
+      return V(this, arguments, function* ({ columns: n, groupField: o }, { fromColumnId: r, fromPosition: i }, { toColumnId: a, toPosition: l }) {
         var C, b;
         const p = n.find((S) => S.id === r), m = n.find((S) => S.id === a), h = (C = p == null ? void 0 : p.cards) == null ? void 0 : C[i], g = (b = m == null ? void 0 : m.cards) == null ? void 0 : b[l], f = {
           sourceId: h.id,
@@ -56412,7 +56436,7 @@ const useRecordIsOwn = () => {
   const { run: e, params: t, defaultRequest: n } = useResourceActionContext(), o = useForm(), r = useActionContext(), [i, ...a] = t;
   return {
     run() {
-      return q(this, null, function* () {
+      return V(this, null, function* () {
         var d;
         const c = (d = n == null ? void 0 : n.params) == null ? void 0 : d.filter, u = c ? { $and: [c, o.values.filter] } : o.values.filter;
         e(P(x({}, i), { filter: u }), ...a), r.setVisible(!1);
@@ -56423,7 +56447,7 @@ const useRecordIsOwn = () => {
   const t = useForm(), n = useField(), o = useActionContext(), { refresh: r } = useResourceActionContext(), { resource: i } = useResourceContext();
   return {
     run() {
-      return q(this, null, function* () {
+      return V(this, null, function* () {
         var l;
         try {
           yield t.submit(), n.data = n.data || {}, n.data.loading = !0;
@@ -56439,7 +56463,7 @@ const useRecordIsOwn = () => {
   const t = useForm(), { resource: n } = useResourceContext();
   return {
     run() {
-      return q(this, null, function* () {
+      return V(this, null, function* () {
         var i;
         yield t.submit();
         const r = yield n.create({ values: t.values });
@@ -56453,7 +56477,7 @@ const useRecordIsOwn = () => {
   const { resource: n, targetKey: o } = useResourceContext(), { [o]: r } = useRecord();
   return {
     run() {
-      return q(this, null, function* () {
+      return V(this, null, function* () {
         var l;
         yield t.submit();
         const a = yield n.update({ filterByTk: r, values: t.values });
@@ -56465,7 +56489,7 @@ const useRecordIsOwn = () => {
   const { resource: e } = useResourceContext(), { refresh: t } = useResourceActionContext();
   return {
     move(o, r) {
-      return q(this, null, function* () {
+      return V(this, null, function* () {
         yield e.move({
           sourceId: o.id,
           targetId: r.id
@@ -56477,7 +56501,7 @@ const useRecordIsOwn = () => {
   const t = useField(), n = useForm(), o = useActionContext(), { refresh: r } = useResourceActionContext(), { resource: i, targetKey: a } = useResourceContext(), { [a]: l } = useRecord();
   return {
     run() {
-      return q(this, null, function* () {
+      return V(this, null, function* () {
         var u;
         yield n.submit(), t.data = t.data || {}, t.data.loading = !0;
         try {
@@ -56495,7 +56519,7 @@ const useRecordIsOwn = () => {
   const { refresh: t } = useResourceActionContext(), { resource: n, targetKey: o } = useResourceContext(), { [o]: r } = useRecord();
   return {
     run() {
-      return q(this, null, function* () {
+      return V(this, null, function* () {
         yield n.destroy({ filterByTk: r }), e == null || e(r), t();
       });
     }
@@ -56504,7 +56528,7 @@ const useRecordIsOwn = () => {
   const { state: t, setState: n, refresh: o } = useResourceActionContext(), { resource: r } = useResourceContext(), { t: i } = useTranslation();
   return {
     run() {
-      return q(this, null, function* () {
+      return V(this, null, function* () {
         var l;
         if (!((l = t == null ? void 0 : t.selectedRowKeys) != null && l.length))
           return message.error(i("Please select the records you want to delete"));
@@ -56523,7 +56547,7 @@ const useRecordIsOwn = () => {
   const { run: e } = useCreateAction(), { refreshCM: t } = useCollectionManager_deprecated();
   return {
     run() {
-      return q(this, null, function* () {
+      return V(this, null, function* () {
         yield e(), yield t();
       });
     }
@@ -56532,7 +56556,7 @@ const useRecordIsOwn = () => {
   const { run: e } = useUpdateAction(), { refreshCM: t } = useCollectionManager_deprecated();
   return {
     run() {
-      return q(this, null, function* () {
+      return V(this, null, function* () {
         yield e(), yield t();
       });
     }
@@ -56541,7 +56565,7 @@ const useRecordIsOwn = () => {
   const { run: e } = useDestroyAction$1(), { refreshCM: t } = useCollectionManager_deprecated();
   return {
     run() {
-      return q(this, null, function* () {
+      return V(this, null, function* () {
         yield e(), yield t();
       });
     }
@@ -56556,7 +56580,7 @@ const useRecordIsOwn = () => {
   const { run: e } = useBulkDestroyAction$1(), { refreshCM: t } = useCollectionManager_deprecated();
   return {
     run() {
-      return q(this, null, function* () {
+      return V(this, null, function* () {
         yield e(), yield t();
       });
     }
@@ -56708,7 +56732,7 @@ const useRecordIsOwn = () => {
       {
         showSearch: !0,
         options: l,
-        onDropdownVisibleChange: (g) => q(void 0, null, function* () {
+        onDropdownVisibleChange: (g) => V(void 0, null, function* () {
           var b;
           const { target: f, type: C } = p.values;
           f && g && c(
@@ -56758,7 +56782,7 @@ const useRecordIsOwn = () => {
         value: C,
         options: n,
         showSearch: !0,
-        onDropdownVisibleChange: (F) => q(void 0, null, function* () {
+        onDropdownVisibleChange: (F) => V(void 0, null, function* () {
           var O;
           const { target: I, type: w, through: T } = f.values, D = ["belongsTo"].includes(w) ? l || p : ["belongsToMany"].includes(w) ? T : I;
           if (D && F) {
@@ -56941,7 +56965,7 @@ const useRecordIsOwn = () => {
   const e = useForm(), { refreshCM: t } = useCollectionManager_deprecated(), n = useActionContext(), { refresh: o } = useResourceActionContext(), { resource: r } = useResourceContext(), i = useField();
   return {
     run() {
-      return q(this, null, function* () {
+      return V(this, null, function* () {
         yield e.submit(), i.data = i.data || {}, i.data.loading = !0;
         const l = cloneDeep$1(e.values);
         l.autoCreateReverseField || delete l.reverseField, delete l.autoCreateReverseField;
@@ -56967,18 +56991,18 @@ const useRecordIsOwn = () => {
       var E;
       if (z.key === "systemInfo")
         k.push(P(x({}, z), {
-          children: z.children.filter((V) => V.hidden ? !1 : V.value === "tableoid" ? $ != null && $.length ? $.includes(V.value) : (l == null ? void 0 : l.dialect) === "postgres" : typeof o[V.value] == "boolean" ? o[V.value] : !0)
+          children: z.children.filter((q) => q.hidden ? !1 : q.value === "tableoid" ? $ != null && $.length ? $.includes(q.value) : (l == null ? void 0 : l.dialect) === "postgres" : typeof o[q.value] == "boolean" ? o[q.value] : !0)
         }));
       else {
-        let V = [];
+        let q = [];
         $ != null && $.length ? $.forEach((L) => {
           var U;
           const G = (U = z == null ? void 0 : z.children) == null ? void 0 : U.find((H) => [L, L.interface].includes(H.name));
-          G && V.push(P(x({}, G), {
+          G && q.push(P(x({}, G), {
             targetScope: L == null ? void 0 : L.targetScope
           }));
-        }) : M != null && M.length ? V = (E = z == null ? void 0 : z.children) == null ? void 0 : E.filter((L) => !M.includes(L.name)) : V = z == null ? void 0 : z.children, V != null && V.length && k.push(P(x({}, z), {
-          children: V
+        }) : M != null && M.length ? q = (E = z == null ? void 0 : z.children) == null ? void 0 : E.filter((L) => !M.includes(L.name)) : q = z == null ? void 0 : z.children, q != null && q.length && k.push(P(x({}, z), {
+          children: q
         }));
       }
     }), k;
@@ -57127,7 +57151,7 @@ const useRecordIsOwn = () => {
   const e = useForm(), { refreshCM: t } = useCollectionManager_deprecated(), n = useActionContext(), { refresh: o } = useResourceActionContext(), { resource: r, targetKey: i } = useResourceContext(), { [i]: a } = useRecord();
   return {
     run() {
-      return q(this, null, function* () {
+      return V(this, null, function* () {
         yield e.submit();
         const c = cloneDeep(e.values);
         c.autoCreateReverseField || delete c.reverseField, delete c.autoCreateReverseField, yield r.update({ filterByTk: a, values: c }), n.setVisible(!1), yield e.reset(), o(), yield t();
@@ -57155,7 +57179,7 @@ const useRecordIsOwn = () => {
     /* @__PURE__ */ jsx(
       "a",
       P(x({}, a), {
-        onClick: () => q(void 0, null, function* () {
+        onClick: () => V(void 0, null, function* () {
           var j, N;
           const { data: w } = yield g.resource("collections.fields", o.collectionName).get({
             filterByTk: o.name,
@@ -57267,9 +57291,9 @@ const useRecordIsOwn = () => {
     const B = useForm(), { refresh: R } = useResourceActionContext(), { refreshCM: M } = useCollectionManager_deprecated(), $ = useActionContext(), { resource: k } = useResourceContext();
     return {
       run() {
-        return q(this, null, function* () {
+        return V(this, null, function* () {
           yield B.submit();
-          const E = cloneDeep(B.values), V = omit(E, [
+          const E = cloneDeep(B.values), q = omit(E, [
             "key",
             "uiSchemaUid",
             "collectionName",
@@ -57282,7 +57306,7 @@ const useRecordIsOwn = () => {
             // 'reverseField.uiSchemaUid',
           ]);
           yield k.create({
-            values: V
+            values: q
           }), yield B.reset(), yield M(), yield R(), $.setVisible(!1);
         });
       }
@@ -57302,7 +57326,7 @@ const useRecordIsOwn = () => {
       "a",
       {
         disabled: D,
-        onClick: () => q(void 0, null, function* () {
+        onClick: () => V(void 0, null, function* () {
           var B;
           if (!D) {
             const { data: R } = yield S.resource("collections.fields", o.collectionName).get({
@@ -57402,7 +57426,7 @@ const useRecordIsOwn = () => {
     /* @__PURE__ */ jsx(
       "a",
       {
-        onClick: () => q(void 0, null, function* () {
+        onClick: () => V(void 0, null, function* () {
           var I;
           const { data: S } = yield m.resource("collections.fields", o.collectionName).get({
             filterByTk: o.name,
@@ -57549,7 +57573,7 @@ const getSchema$4 = (e, t, n) => {
   const t = useForm(), { refreshCM: n } = useCollectionManager_deprecated(), o = useActionContext(), { refresh: r } = useResourceActionContext(), { resource: i } = useResourceContext(), a = useField();
   return {
     run() {
-      return q(this, null, function* () {
+      return V(this, null, function* () {
         var c;
         a.data = a.data || {}, a.data.loading = !0;
         try {
@@ -57697,7 +57721,7 @@ const getSchema$4 = (e, t, n) => {
   const { refreshCM: t } = useCollectionManager_deprecated(), n = useForm(), o = useActionContext(), { refresh: r } = useResourceActionContext(), { resource: i, targetKey: a } = useResourceContext(), { [a]: l, template: c } = useRecord(), u = useAPIClient(), d = c === "sql" ? u.resource("sqlCollection") : i;
   return {
     run() {
-      return q(this, null, function* () {
+      return V(this, null, function* () {
         yield n.submit(), yield d.update({
           filterByTk: l,
           values: c === "sql" ? n.values : omit$1(n.values, ["fields"])
@@ -57714,7 +57738,7 @@ const getSchema$4 = (e, t, n) => {
     /* @__PURE__ */ jsx(
       "a",
       P(x({}, i), {
-        onClick: () => q(void 0, null, function* () {
+        onClick: () => V(void 0, null, function* () {
           const g = a(o.template), f = getSchema$3(
             x({}, g),
             o,
@@ -57776,7 +57800,7 @@ const getSchema$4 = (e, t, n) => {
   useEffect(() => {
     const R = [];
     g.forEach((M) => {
-      var V;
+      var q;
       const $ = v(M), z = w(M).map((L) => {
         const G = T(L, M);
         return {
@@ -57791,7 +57815,7 @@ const getSchema$4 = (e, t, n) => {
             };
           })
         };
-      }), E = (V = $.fields.filter((L) => !["obo", "oho", "m2m", "o2m"].includes(L == null ? void 0 : L.interface))) == null ? void 0 : V.map((L) => {
+      }), E = (q = $.fields.filter((L) => !["obo", "oho", "m2m", "o2m"].includes(L == null ? void 0 : L.interface))) == null ? void 0 : q.map((L) => {
         var G;
         return { value: L.name, key: L.name, label: l(((G = L.uiSchema) == null ? void 0 : G.title) || L.name) };
       }).concat(z);
@@ -57807,7 +57831,7 @@ const getSchema$4 = (e, t, n) => {
       if (R) {
         u(!1), p([]);
         const k = ($ = Object.values((M = R == null ? void 0 : R.data) == null ? void 0 : M.fields)) == null ? void 0 : $.map((z) => {
-          var E, V;
+          var E, q;
           if (z.source) {
             const L = (i == null ? void 0 : i.data.find((G) => G.name === z.name)) || z;
             return P(x({}, z), {
@@ -57816,21 +57840,21 @@ const getSchema$4 = (e, t, n) => {
           } else {
             const L = (i == null ? void 0 : i.data.find((G) => G.name === z.name)) || z;
             return P(x({}, L), {
-              uiSchema: P(x({}, omit(L.uiSchema, "rawTitle")), { title: ((V = L.uiSchema) == null ? void 0 : V.title) || L.name })
+              uiSchema: P(x({}, omit(L.uiSchema, "rawTitle")), { title: ((q = L.uiSchema) == null ? void 0 : q.title) || L.name })
             });
           }
         });
         S.value = k, setTimeout(() => {
-          var z, E, V;
-          p(k), y.setValuesIn("sources", (z = R.data) == null ? void 0 : z.sources), f((E = R.data) == null ? void 0 : E.sources), b((V = R == null ? void 0 : R.data) == null ? void 0 : V.unsupportedFields);
+          var z, E, q;
+          p(k), y.setValuesIn("sources", (z = R.data) == null ? void 0 : z.sources), f((E = R.data) == null ? void 0 : E.sources), b((q = R == null ? void 0 : R.data) == null ? void 0 : q.unsupportedFields);
         });
       }
     }).catch);
   }, [t]);
   const N = (R, M) => {
     d.splice(M, 1, R), p(d), S.value = d.map(($) => {
-      var z, E, V;
-      const k = typeof $.source == "string" ? $.source : (V = (E = (z = $.source) == null ? void 0 : z.filter) == null ? void 0 : E.call(z, Boolean)) == null ? void 0 : V.join(".");
+      var z, E, q;
+      const k = typeof $.source == "string" ? $.source : (q = (E = (z = $.source) == null ? void 0 : z.filter) == null ? void 0 : E.call(z, Boolean)) == null ? void 0 : q.join(".");
       return P(x({}, $), {
         source: k
       });
@@ -57855,8 +57879,8 @@ const getSchema$4 = (e, t, n) => {
           style: { width: "100%" },
           options: D(m),
           onChange: (k, z) => {
-            var V;
-            const E = (V = I(k == null ? void 0 : k[0])) == null ? void 0 : V.find((L) => L.name === last(k));
+            var q;
+            const E = (q = I(k == null ? void 0 : k[0])) == null ? void 0 : q.find((L) => L.name === last(k));
             N(P(x({}, M), { source: k, uiSchema: E == null ? void 0 : E.uiSchema }), $);
           },
           placeholder: l("Select field source")
@@ -57897,10 +57921,10 @@ const getSchema$4 = (e, t, n) => {
             popupMatchSelectWidth: !1,
             onChange: (E) => {
               var L;
-              const V = F(E);
-              N(P(x({}, k), { interface: E, uiSchema: (L = V == null ? void 0 : V.default) == null ? void 0 : L.uiSchema }), $);
+              const q = F(E);
+              N(P(x({}, k), { interface: E, uiSchema: (L = q == null ? void 0 : q.default) == null ? void 0 : L.uiSchema }), $);
             },
-            children: z.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: z.map((E) => /* @__PURE__ */ jsx(Select$1.OptGroup, { label: D(E.label), children: E.children.map((q) => /* @__PURE__ */ jsx(Select$1.Option, { value: q.name, children: D(q.label) }, q.value)) }, E.key))
           }
         );
       }
@@ -57980,7 +58004,7 @@ const mapFields = ["lineString", "point", "circle", "polygon"], PreviewTable$1 =
         key: F.name,
         width: 200,
         render: ($, k, z) => {
-          const E = k[F.name], V = {
+          const E = k[F.name], q = {
             type: "object",
             properties: {
               [F.name]: {
@@ -57992,7 +58016,7 @@ const mapFields = ["lineString", "point", "circle", "polygon"], PreviewTable$1 =
               }
             }
           };
-          return /* @__PURE__ */ jsx(EllipsisWithTooltip, { ellipsis: !0, children: /* @__PURE__ */ jsx(RecursionField, { schema: V, name: z, onlyRenderProperties: !0 }) });
+          return /* @__PURE__ */ jsx(EllipsisWithTooltip, { ellipsis: !0, children: /* @__PURE__ */ jsx(RecursionField, { schema: q, name: z, onlyRenderProperties: !0 }) });
         }
       };
     });
@@ -58123,7 +58147,7 @@ const mapFields = ["lineString", "point", "circle", "polygon"], PreviewTable$1 =
   const e = useForm(), { refreshCM: t } = useCollectionManager_deprecated(), n = useActionContext(), { refresh: o } = useResourceActionContext(), { targetKey: r } = useResourceContext(), { [r]: i } = useRecord(), a = useAPIClient(), l = useField();
   return {
     run() {
-      return q(this, null, function* () {
+      return V(this, null, function* () {
         yield e.submit(), l.data = l.data || {}, l.data.loading = !0;
         try {
           yield a.resource("collections").setFields({
@@ -58551,7 +58575,7 @@ const AsyncDataProvider = (e) => {
   const t = useForm(), n = useActionContext(), { refreshCM: o } = useCollectionManager_deprecated(), { refresh: r } = useResourceActionContext(), { targetKey: i } = useResourceContext(), { [i]: a } = useRecord(), l = useAPIClient(), c = useField();
   return {
     run() {
-      return q(this, null, function* () {
+      return V(this, null, function* () {
         yield t.submit(), c.data = c.data || {}, c.data.loading = !0;
         try {
           yield l.resource("sqlCollection").setFields({
@@ -58595,7 +58619,7 @@ const AsyncDataProvider = (e) => {
   const { run: e } = useDestroyAction(), { refreshCM: t } = useCollectionManager_deprecated();
   return {
     run() {
-      return q(this, null, function* () {
+      return V(this, null, function* () {
         yield e(), yield t();
       });
     }
@@ -58604,7 +58628,7 @@ const AsyncDataProvider = (e) => {
   const { run: t } = useBulkDestroyAction(), { refreshCM: n } = useCollectionManager_deprecated();
   return {
     run() {
-      return q(this, null, function* () {
+      return V(this, null, function* () {
         yield t(e), yield n();
       });
     }
@@ -58613,7 +58637,7 @@ const AsyncDataProvider = (e) => {
   const { refresh: e } = useResourceActionContext(), { resource: t, targetKey: n } = useResourceContext(), { [n]: o } = useRecord(), r = useForm(), { cascade: i } = (r == null ? void 0 : r.values) || {};
   return {
     run() {
-      return q(this, null, function* () {
+      return V(this, null, function* () {
         yield t.destroy({ filterByTk: o, cascade: i }), e();
       });
     }
@@ -58622,7 +58646,7 @@ const AsyncDataProvider = (e) => {
   const { state: e, setState: t, refresh: n } = useResourceActionContext(), { resource: o } = useResourceContext(), r = useActionContext(), { t: i } = useTranslation(), a = useForm(), { cascade: l } = (a == null ? void 0 : a.values) || {}, c = Object.values(e).flat();
   return {
     run(d) {
-      return q(this, null, function* () {
+      return V(this, null, function* () {
         var p;
         if (!(c != null && c.length))
           return message.error(i("Please select the records you want to delete"));
@@ -58772,7 +58796,7 @@ const getSchema$1 = (e) => {
   };
 }, useCreateSubField = () => (useActionContext(), {
   run() {
-    return q(this, null, function* () {
+    return V(this, null, function* () {
     });
   }
 }), AddSubFieldAction = () => {
@@ -58857,7 +58881,7 @@ const getSchema$1 = (e) => {
   const e = useForm(), { run: t } = useUpdateAction(), { refreshCM: n } = useCollectionManager_deprecated();
   return {
     run() {
-      return q(this, null, function* () {
+      return V(this, null, function* () {
         var i, a, l;
         yield e.submit();
         const r = ((l = (a = (i = e == null ? void 0 : e.values) == null ? void 0 : i.uiSchema) == null ? void 0 : a.enum) == null ? void 0 : l.slice()) || [];
@@ -58878,7 +58902,7 @@ const getSchema$1 = (e) => {
     /* @__PURE__ */ jsx(
       "a",
       {
-        onClick: () => q(void 0, null, function* () {
+        onClick: () => V(void 0, null, function* () {
           const c = getSchema(P(x({}, n(t.interface)), {
             default: t
           }));
@@ -62765,7 +62789,7 @@ class SqlCollectionTemplate extends CollectionTemplate {
 }
 class MainDataSource extends DataSource {
   getDataSource() {
-    return q(this, null, function* () {
+    return V(this, null, function* () {
       var o;
       const t = yield this.app.apiClient.request({
         resource: "collections",
@@ -62779,7 +62803,7 @@ class MainDataSource extends DataSource {
 }
 class CollectionPlugin extends Plugin {
   load() {
-    return q(this, null, function* () {
+    return V(this, null, function* () {
       this.dataSourceManager.addCollectionMixins([InheritanceCollectionMixin]), this.addFieldInterfaces(), this.addCollectionTemplates(), this.addFieldInterfaces(), this.addFieldInterfaceGroups(), this.addMainDataSource();
     });
   }
@@ -63260,7 +63284,7 @@ const toItems = (e = {}) => {
         a(((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 === i.length, p = (h, g) => q(void 0, null, function* () {
+  ), u = t.resource("roles.menuUiSchemas", e.name), d = r.length === i.length, p = (h, g) => V(void 0, null, function* () {
     const f = getParentUids(n, (b) => b.uid === g.uid), C = getChildrenUids(g == null ? void 0 : g.children, []);
     if (h) {
       const b = C.concat(g.uid), S = i.filter((y) => !b.includes(y));
@@ -63305,7 +63329,7 @@ const toItems = (e = {}) => {
               Checkbox$1,
               {
                 checked: d,
-                onChange: (h) => q(void 0, null, function* () {
+                onChange: (h) => V(void 0, null, function* () {
                   d ? yield u.set({
                     values: []
                   }) : yield u.set({
@@ -63343,7 +63367,7 @@ const PermissionProvider = (e) => {
     {
       value: {
         currentRecord: i,
-        update: (l, c) => q(void 0, null, function* () {
+        update: (l, c) => V(void 0, null, function* () {
           const { path: u, value: d } = l.getState();
           if (["ui.*", "pm", "pm.*"].includes(u)) {
             const p = t.resource("roles.snippets", n.name);
@@ -63414,7 +63438,7 @@ const PermissionProvider = (e) => {
             );
           },
           effects() {
-            onFieldChange("*", (o, r) => q(this, null, function* () {
+            onFieldChange("*", (o, r) => V(this, null, function* () {
               r.modified && (yield e(o, r));
             }));
           }
@@ -64458,7 +64482,7 @@ const SettingCenterProvider = (e) => {
         l((g == null ? void 0 : g.data) || []);
       }
     }
-  ), m = n.resource("roles.snippets", t.name), h = (g, f) => q(void 0, null, function* () {
+  ), m = n.resource("roles.snippets", t.name), h = (g, f) => V(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)
@@ -64489,7 +64513,7 @@ const SettingCenterProvider = (e) => {
               Checkbox$1,
               {
                 checked: c,
-                onChange: () => q(void 0, null, function* () {
+                onChange: () => V(void 0, null, function* () {
                   const g = i.map((f) => "!" + f);
                   c ? yield m.add({
                     values: g
@@ -64536,7 +64560,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 V(this, null, function* () {
       this.app.addComponents({
         ACLCollectionFieldProvider,
         ACLActionProvider,
@@ -64574,7 +64598,7 @@ function AntdConfigProvider(e) {
 }
 class AntdConfigPlugin extends Plugin {
   load() {
-    return q(this, null, function* () {
+    return V(this, null, function* () {
       var t;
       this.app.use(AntdConfigProvider, ((t = this.options) == null ? void 0 : t.config) || {});
     });