@nocobase/client 2.0.0-alpha.4 → 2.0.0-alpha.5

package/es/index.mjs

@@ -9556,7 +9556,7 @@ function addAppVersion(e, t) {
       addAppVersion((n = e.properties) == null ? void 0 : n[o], t);
     }), e;
 }
-const name = "@nocobase/client", version = "2.0.0-alpha.4", license = "AGPL-3.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
+const name = "@nocobase/client", version = "2.0.0-alpha.5", 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",
@@ -9579,10 +9579,10 @@ const name = "@nocobase/client", version = "2.0.0-alpha.4", license = "AGPL-3.0"
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "2.0.0-alpha.4",
-  "@nocobase/flow-engine": "2.0.0-alpha.4",
-  "@nocobase/sdk": "2.0.0-alpha.4",
-  "@nocobase/utils": "2.0.0-alpha.4",
+  "@nocobase/evaluators": "2.0.0-alpha.5",
+  "@nocobase/flow-engine": "2.0.0-alpha.5",
+  "@nocobase/sdk": "2.0.0-alpha.5",
+  "@nocobase/utils": "2.0.0-alpha.5",
   "@tanstack/react-table": "^8.21.3",
   "@types/tabulator-tables": "^6.2.6",
   ahooks: "^3.7.2",
@@ -11246,7 +11246,7 @@ const Table$2 = withDynamicSchemaProps(
   withSkeletonComponent(
     observer$1((e) => {
       var ye, ie;
-      const { token: t } = useToken$1(), ge = omit(e, ["onBlur", "onFocus"]), { pagination: o, useProps: n } = ge, r = W(ge, ["pagination", "useProps"]), me = (n == null ? void 0 : n()) || {}, { pagination: i } = me, a = W(me, ["pagination"]), fe = f(f({}, r), a), {
+      const { token: t } = useToken$1(), fe = omit(e, ["onBlur", "onFocus"]), { pagination: o, useProps: n } = fe, r = W(fe, ["pagination", "useProps"]), he = (n == null ? void 0 : n()) || {}, { pagination: i } = he, a = W(he, ["pagination"]), xe = f(f({}, r), a), {
         dragSort: l = !1,
         showIndex: c = !0,
         onRowSelectionChange: u,
@@ -11258,7 +11258,7 @@ const Table$2 = withDynamicSchemaProps(
         loading: x,
         onClickRow: b,
         value: y
-      } = fe, S = W(fe, [
+      } = xe, S = W(xe, [
         "dragSort",
         "showIndex",
         "onRowSelectionChange",
@@ -11285,14 +11285,14 @@ const Table$2 = withDynamicSchemaProps(
           U.field.data.selectedRowKeys = [], L([]);
         }, U.field.data.setSelectedRowKeys = L);
       }, [U == null ? void 0 : U.field]);
-      const J = useMemo(() => b ? G : "", [G, b]), Y = useMemo(() => b ? (oe, se) => ({
-        onClick: (ae) => {
-          isPortalInBody(ae.target) || b(oe, z, q);
+      const J = useMemo(() => b ? G : "", [G, b]), Y = useMemo(() => b ? (oe, re) => ({
+        onClick: (le) => {
+          isPortalInBody(le.target) || b(oe, z, q);
         },
-        rowIndex: se,
+        rowIndex: re,
         record: oe
-      }) : (oe, se) => ({
-        rowIndex: se,
+      }) : (oe, re) => ({
+        rowIndex: re,
         record: oe
       }), [b, q]);
       useDeepCompareEffect(() => {
@@ -11306,28 +11306,28 @@ const Table$2 = withDynamicSchemaProps(
           return oe.key;
         if (H.current.has(oe))
           return H.current.get(oe);
-        const se = uid();
-        return H.current.set(oe, se), se;
+        const re = uid();
+        return H.current.set(oe, re), re;
       }, []), Z = useCallback(
         (oe) => {
-          var se;
-          return Array.isArray(m) ? m.map((ae) => {
-            var he;
-            return ((he = oe[ae]) == null ? void 0 : he.toString()) || "";
-          }).join("-") : typeof m == "string" ? oe[m] : (se = (m != null ? m : X)(oe)) == null ? void 0 : se.toString();
+          var re;
+          return Array.isArray(m) ? m.map((le) => {
+            var pe;
+            return ((pe = oe[le]) == null ? void 0 : pe.toString()) || "";
+          }).join("-") : typeof m == "string" ? oe[m] : (re = (m != null ? m : X)(oe)) == null ? void 0 : re.toString();
         },
         [JSON.stringify(m), X]
       ), Q = useMemo(() => (Array.isArray(y) ? y : []).filter(Boolean), [y, y == null ? void 0 : y.length]), ee = useMemo(() => (oe) => {
-        const se = useCallback((ae) => {
+        const re = useCallback((le) => {
           var Fe, Pe, Ie, ke, Ae, Ne, Ee, Oe;
-          if (!ae.active || !ae.over) {
+          if (!le.active || !le.over) {
             console.warn("move cancel");
             return;
           }
-          const he = (Ie = (Pe = (Fe = ae.active) == null ? void 0 : Fe.data.current) == null ? void 0 : Pe.sortable) == null ? void 0 : Ie.index, be = (Ne = (Ae = (ke = ae.over) == null ? void 0 : ke.data.current) == null ? void 0 : Ae.sortable) == null ? void 0 : Ne.index, ve = ((Ee = K.current) == null ? void 0 : Ee[he]) || ae.active, Te = ((Oe = K.current) == null ? void 0 : Oe[be]) || ae.over;
-          C.move(he, be), j({ from: ve, to: Te });
+          const pe = (Ie = (Pe = (Fe = le.active) == null ? void 0 : Fe.data.current) == null ? void 0 : Pe.sortable) == null ? void 0 : Ie.index, be = (Ne = (Ae = (ke = le.over) == null ? void 0 : ke.data.current) == null ? void 0 : Ae.sortable) == null ? void 0 : Ne.index, ve = ((Ee = K.current) == null ? void 0 : Ee[pe]) || le.active, Te = ((Oe = K.current) == null ? void 0 : Oe[be]) || le.over;
+          C.move(pe, be), j({ from: ve, to: Te });
         }, []);
-        return /* @__PURE__ */ jsx(DndContext, { onDragEnd: se, children: /* @__PURE__ */ jsx("tbody", f({}, oe)) });
+        return /* @__PURE__ */ jsx(DndContext, { onDragEnd: re, children: /* @__PURE__ */ jsx("tbody", f({}, oe)) });
       }, [C, j]);
       ee.displayName = "BodyWrapperComponent";
       const te = useMemo(() => ({
@@ -11340,39 +11340,39 @@ const Table$2 = withDynamicSchemaProps(
           row: BodyRowComponent$1,
           cell: BodyCellComponent$1
         }
-      }), [ee]), re = useMemo(() => p, [JSON.stringify(p)]), ne = useMemo(
+      }), [ee]), ne = useMemo(() => p, [JSON.stringify(p)]), se = useMemo(
         () => ({
-          rowSelection: $ !== !1 && re ? f({
+          rowSelection: $ !== !1 && ne ? f({
             type: "checkbox",
             selectedRowKeys: M,
-            onChange(oe, se) {
-              C.data = C.data || {}, C.data.selectedRowKeys = oe, C.data.selectedRowData = se, L(oe), u == null || u(oe, se, L);
+            onChange(oe, re) {
+              C.data = C.data || {}, C.data.selectedRowKeys = oe, C.data.selectedRowData = re, L(oe), u == null || u(oe, re, L);
             },
-            onSelect: (oe, se, ae, he) => {
+            onSelect: (oe, re, le, pe) => {
               var be;
-              U && (U.field.data = ((be = U.field) == null ? void 0 : be.data) || {}, U.field.data.selectedRecord = oe, U.field.data.selected = se);
+              U && (U.field.data = ((be = U.field) == null ? void 0 : be.data) || {}, U.field.data.selectedRecord = oe, U.field.data.selected = re);
             },
             getCheckboxProps(oe) {
               return {
                 "aria-label": "checkbox"
               };
             },
-            renderCell: (oe, se, ae, he) => {
+            renderCell: (oe, re, le, pe) => {
               if (!l && !c)
-                return he;
+                return pe;
               const be = B == null ? void 0 : B.current, ve = (B == null ? void 0 : B.pageSize) || 20;
-              return be ? ae = ae + (be - 1) * ve + 1 : ae = ae + 1, se.__index && (ae = extractIndex$1(se.__index)), /* @__PURE__ */ jsxs(
+              return be ? le = le + (be - 1) * ve + 1 : le = le + 1, re.__index && (le = extractIndex$1(re.__index)), /* @__PURE__ */ jsxs(
                 "div",
                 {
                   role: "button",
-                  "aria-label": `table-index-${ae}`,
+                  "aria-label": `table-index-${le}`,
                   className: classNames(oe ? "checked" : null, rowSelectCheckboxWrapperClass$2, {
                     [rowSelectCheckboxWrapperClassHover$2]: V
                   }),
                   children: [
                     /* @__PURE__ */ jsxs("div", { className: classNames(oe ? "checked" : null, rowSelectCheckboxContentClass$2), children: [
-                      l && /* @__PURE__ */ jsx(SortHandle$2, { id: Z(se) }),
-                      c && /* @__PURE__ */ jsx(TableIndex$4, { index: ae })
+                      l && /* @__PURE__ */ jsx(SortHandle$2, { id: Z(re) }),
+                      c && /* @__PURE__ */ jsx(TableIndex$4, { index: le })
                     ] }),
                     V && /* @__PURE__ */ jsx(
                       "div",
@@ -11382,17 +11382,17 @@ const Table$2 = withDynamicSchemaProps(
                           oe ? "checked" : null,
                           rowSelectCheckboxCheckedClassHover$2
                         ),
-                        children: he
+                        children: pe
                       }
                     )
                   ]
                 }
               );
             }
-          }, re) : void 0
+          }, ne) : void 0
         }),
         [
-          re,
+          ne,
           M,
           u,
           c,
@@ -11400,61 +11400,61 @@ const Table$2 = withDynamicSchemaProps(
           C,
           Z,
           V,
-          re,
+          ne,
           B,
           U,
           $
         ]
-      ), ue = useCallback(
+      ), ae = useCallback(
         ({ children: oe }) => {
-          var se, ae;
+          var re, le;
           return l ? React.createElement(
             SortableContext$1,
             {
-              items: ((ae = (se = K.current) == null ? void 0 : se.map) == null ? void 0 : ae.call(se, Z)) || []
+              items: ((le = (re = K.current) == null ? void 0 : re.map) == null ? void 0 : le.call(re, Z)) || []
             },
             oe
           ) : React.createElement(React.Fragment, {}, oe);
         },
         [l, Z]
         // Don't put 'value' in dependencies, otherwise it will cause the dropdown component to disappear immediately when adding association fields to the table
-      ), { height: le, tableSizeRefCallback: de } = useTableSize(), xe = useMemo(() => ({
+      ), { height: ce, tableSizeRefCallback: ge } = useTableSize(), ue = useMemo(() => ({
         x: "max-content",
-        y: (Q == null ? void 0 : Q.length) === 0 ? void 0 : le
+        y: (Q == null ? void 0 : Q.length) === 0 ? void 0 : ce
         // 当数据为空且设置了 y 轴高度时，表格头会缩到一起。为了解决这个问题，在数据为空时，y 轴高度需要设置为 undefined
-      }), [le, Q]), Ce = useCallback(
+      }), [ce, Q]), Ce = useCallback(
         (oe) => q.includes(oe[m]) ? J : "",
         [q, J, JSON.stringify(m)]
-      ), ce = useCallback(
-        (oe, se) => {
-          const ae = oe ? [...O, se[P.getPrimaryKey()]] : O.filter((he) => se[P.getPrimaryKey()] !== he);
-          N(ae), g == null || g(oe, se);
+      ), de = useCallback(
+        (oe, re) => {
+          const le = oe ? [...O, re[P.getPrimaryKey()]] : O.filter((pe) => re[P.getPrimaryKey()] !== pe);
+          N(le), g == null || g(oe, re);
         },
         [O, g, P]
-      ), pe = useMemo(() => ({
-        onExpand: ce,
+      ), me = useMemo(() => ({
+        onExpand: de,
         expandedRowKeys: O
-      }), [O, ce]);
+      }), [O, de]);
       return (
         // If spinning is set to undefined, it will cause the subtable to always display loading, so we need to convert it here.
         // We use Spin here instead of Table's loading prop because using Spin here reduces unnecessary re-renders.
         /* @__PURE__ */ jsx(HighPerformanceSpin, { spinning: !!x, children: /* @__PURE__ */ jsx(BlockRequestLoadingContext.Provider, { value: !1, children: /* @__PURE__ */ jsx(
           InternalNocoBaseTable$1,
           I(f(f({
-            tableHeight: le,
-            SortableWrapper: ue,
-            tableSizeRefCallback: de,
+            tableHeight: ce,
+            SortableWrapper: ae,
+            tableSizeRefCallback: ge,
             defaultRowKey: X,
             dataSource: Q
-          }, S), ne), {
+          }, S), se), {
             paginationProps: B,
             components: te,
             onTableChange: d,
             onRow: Y,
             rowClassName: Ce,
-            scroll: xe,
+            scroll: ue,
             columns: R,
-            expandable: pe,
+            expandable: me,
             field: C,
             size: F
           })
@@ -11708,7 +11708,7 @@ const InternalTableBlockProvider = (e) => {
       const Y = y(R, J), X = (Z = Y == null ? void 0 : Y.filter(
         (Q) => Q.interface && !G.includes(Q.interface) && (H || O && O.includes(Q.type) || N && N.includes(Q.interface) || (L && Q.target && Q.target !== R && Array.isArray(L) ? L.includes(Q.interface) : !1))
       )) == null ? void 0 : Z.map((Q) => {
-        var te, re;
+        var te, ne;
         const ee = f({
           value: K && U ? `${U}.${Q.name}` : Q.name,
           label: x((te = Q == null ? void 0 : Q.uiSchema) == null ? void 0 : te.title) || Q.name
@@ -11719,7 +11719,7 @@ const InternalTableBlockProvider = (e) => {
           collectionNames: [...z, Q.target],
           prefixFieldValue: K ? U ? `${U}.${Q.name}` : Q.name : "",
           usePrefix: K
-        })), !((re = ee.children) != null && re.length)) ? null : ee;
+        })), !((ne = ee.children) != null && ne.length)) ? null : ee;
       }).filter(Boolean);
       return q[R] = X, X;
     },
@@ -24313,7 +24313,7 @@ function Input$1(e) {
   } : i ? getTypedConstantOption(O, i, M) : null : null, [O, i]), q = (Y = L == null ? void 0 : L.component) != null ? Y : NullComponent, z = Array.isArray(i) ? (Z = (X = i.find((Q) => Array.isArray(Q) && Q[0] === O)) == null ? void 0 : X[1]) != null ? Z : {} : {};
   let V;
   t == null ? a ? n && $ ? V = ["$"] : V = [""] : n ? V = ["$"] : V = [" ", O] : V = n ? ["$"] : [" ", O], m && (V = ["$"]), useEffect(() => {
-    const re = L != null ? L : {}, { component: Q } = re, ee = W(re, ["component"]), te = [
+    const ne = L != null ? L : {}, { component: Q } = ne, ee = W(ne, ["component"]), te = [
       ...a ? [
         {
           value: "",
@@ -24324,26 +24324,26 @@ function Input$1(e) {
       ] : [],
       ...L ? [v(ee)] : [],
       ...x ? [...x] : []
-    ].filter((ne) => !ne.deprecated || (N == null ? void 0 : N[0]) === ne[M.value]);
+    ].filter((se) => !se.deprecated || (N == null ? void 0 : N[0]) === se[M.value]);
     A(te);
   }, [x, N, L, a]);
   const H = (Q) => E(this, null, function* () {
     var te;
     const ee = Q[Q.length - 1];
     if (!((te = ee.children) != null && te.length) && !ee.isLeaf && ee.loadChildren) {
-      let re;
+      let ne;
       if (N && N.length >= 2) {
-        for (const ne of N)
-          if (ne === ee[M.value]) {
-            re = ne;
+        for (const se of N)
+          if (se === ee[M.value]) {
+            ne = se;
             break;
           }
       }
-      yield ee.loadChildren(ee, re, N), A((ne) => [...ne]);
+      yield ee.loadChildren(ee, ne, N), A((se) => [...se]);
     }
   }), G = useCallback(
     (Q, ee) => {
-      var te, re, ne;
+      var te, ne, se;
       if (Q[0] === "$") {
         j(!0), N && o(null, ee);
         return;
@@ -24354,7 +24354,7 @@ function Input$1(e) {
         return;
       }
       if (Q[0] === " ") {
-        Q[1] ? Q[1] !== O && o((ne = (re = (te = ConstantTypes[Q[1]]) == null ? void 0 : te.default) == null ? void 0 : re.call(te)) != null ? ne : null, ee) : N && o(null, ee);
+        Q[1] ? Q[1] !== O && o((se = (ne = (te = ConstantTypes[Q[1]]) == null ? void 0 : te.default) == null ? void 0 : ne.call(te)) != null ? se : null, ee) : N && o(null, ee);
         return;
       }
       o(`{{${Q.join(".")}}}`, ee);
@@ -24370,19 +24370,19 @@ function Input$1(e) {
   }, [L]);
   useEffect(() => {
     E(this, null, function* () {
-      var re;
+      var ne;
       if (!N || T.length <= 1)
         return;
       let ee = null;
       const te = [];
-      for (let ne = 0; ne < N.length; ne++) {
-        const ue = N[ne];
+      for (let se = 0; se < N.length; se++) {
+        const ae = N[se];
         try {
-          if (ne === 0 ? ee = T.find((le) => le[M.value] === ue) : (ee.loadChildren && !((re = ee.children) != null && re.length) && (yield ee.loadChildren(ee, ue, N)), ee = ee.children.find((le) => le[M.value] === ue)), !ee)
+          if (se === 0 ? ee = T.find((ce) => ce[M.value] === ae) : (ee.loadChildren && !((ne = ee.children) != null && ne.length) && (yield ee.loadChildren(ee, ae, N)), ee = ee.children.find((ce) => ce[M.value] === ae)), !ee)
             return;
           te.push(ee[M.label]);
-        } catch (le) {
-          error(le);
+        } catch (ce) {
+          error(ce);
         }
       }
       A([...T]), D([...te]);
@@ -27961,19 +27961,19 @@ https://requirejs.org/docs/errors.html#` + e);
         }
     }
     function y(M, L, q) {
-      var z, V, H, G, U, K, J, Y, X, Z, Q, ee, te = L && L.split("/"), re = a.map, ne = re && re["*"];
-      if (M && (M = M.split("/"), J = M.length - 1, a.nodeIdCompat && jsSuffixRegExp.test(M[J]) && (M[J] = M[J].replace(jsSuffixRegExp, "")), M[0].charAt(0) === "." && te && (ee = te.slice(0, te.length - 1), M = ee.concat(M)), b(M), M = M.join("/")), q && re && (te || ne)) {
+      var z, V, H, G, U, K, J, Y, X, Z, Q, ee, te = L && L.split("/"), ne = a.map, se = ne && ne["*"];
+      if (M && (M = M.split("/"), J = M.length - 1, a.nodeIdCompat && jsSuffixRegExp.test(M[J]) && (M[J] = M[J].replace(jsSuffixRegExp, "")), M[0].charAt(0) === "." && te && (ee = te.slice(0, te.length - 1), M = ee.concat(M)), b(M), M = M.join("/")), q && ne && (te || se)) {
         H = M.split("/");
         e:
           for (G = H.length; G > 0; G -= 1) {
             if (K = H.slice(0, G).join("/"), te) {
               for (U = te.length; U > 0; U -= 1)
-                if (V = getOwn(re, te.slice(0, U).join("/")), V && (V = getOwn(V, K), V)) {
+                if (V = getOwn(ne, te.slice(0, U).join("/")), V && (V = getOwn(V, K), V)) {
                   Y = V, X = G;
                   break e;
                 }
             }
-            !Z && ne && getOwn(ne, K) && (Z = getOwn(ne, K), Q = G);
+            !Z && se && getOwn(se, K) && (Z = getOwn(se, K), Q = G);
           }
         !Y && Z && (Y = Z, X = Q), Y && (H.splice(0, X, Y), M = H.join("/"));
       }
@@ -28196,11 +28196,11 @@ https://requirejs.org/docs/errors.html#` + e);
             Z && (X = Z), te && (useInteractive = !1), P(ee), hasProp(a.config, L) && (a.config[Q] = a.config[L]);
             try {
               req.exec(X);
-            } catch (re) {
+            } catch (ne) {
               return A(makeError(
                 "fromtexteval",
-                "fromText eval for " + L + " failed: " + re,
-                re,
+                "fromText eval for " + L + " failed: " + ne,
+                ne,
                 [L]
               ));
             }
@@ -29976,7 +29976,7 @@ const useStyles$a = genStyleHook("nb-markdown", (e, { isDarkTheme: t }) => {
     }, t ? i : r)
   };
 }), parseMarkdown$1 = _.memoize((e) => E(void 0, null, function* () {
-  return e && (yield import("./md-oH2RssNY.mjs")).default.render(e);
+  return e && (yield import("./md-BbvRKckr.mjs")).default.render(e);
 }));
 function useParseMarkdown$1(e) {
   const [t, o] = useState(""), [n, r] = useState(!0);
@@ -40992,7 +40992,7 @@ const ActionLink = withDynamicSchemaProps(
           forEachLinkageRule(D, (Z, Q) => {
             X.push(
               reaction(
-                () => [getVariableValuesInCondition({ linkageRules: D, localVariables: R })].map((re) => JSON.stringify(re)).join(","),
+                () => [getVariableValuesInCondition({ linkageRules: D, localVariables: R })].map((ne) => JSON.stringify(ne)).join(","),
                 () => {
                   F.stateOfLinkageRules = {}, linkageAction(
                     {
@@ -41028,12 +41028,12 @@ const ActionLink = withDynamicSchemaProps(
       yield c == null ? void 0 : c(Y, X);
       const Z = ((ee = (Q = P["x-action-settings"]) == null ? void 0 : Q.onSuccess) == null ? void 0 : ee.blocksToRefresh) || [];
       Z.length > 0 && V().forEach((te) => {
-        var re;
+        var ne;
         if (Z.includes(te.uid))
           try {
-            (re = te.service) == null || re.refresh();
-          } catch (ne) {
-            console.error("Failed to refresh block:", te.uid, ne);
+            (ne = te.service) == null || ne.refresh();
+          } catch (se) {
+            console.error("Failed to refresh block:", te.uid, se);
           }
       });
     })), [c, P, V]);
@@ -41072,8 +41072,8 @@ const ActionLink = withDynamicSchemaProps(
   }),
   { displayName: "Action" }
 ), InternalAction = observer$1(function e(t) {
-  var xe, Ce, ce, pe, ge;
-  const de = t, {
+  var ue, Ce, de, me, fe;
+  const ge = t, {
     containerRefKey: o,
     fieldSchema: n,
     designable: r,
@@ -41101,7 +41101,7 @@ const ActionLink = withDynamicSchemaProps(
     setSubmitted: D,
     getAriaLabel: $,
     parentRecordData: j
-  } = de, B = W(de, [
+  } = ge, B = W(ge, [
     "containerRefKey",
     "fieldSchema",
     "designable",
@@ -41129,25 +41129,25 @@ const ActionLink = withDynamicSchemaProps(
     "setSubmitted",
     "getAriaLabel",
     "parentRecordData"
-  ]), [R, O] = useState(!1), { wrapSSR: N, componentCls: M, hashId: L } = useStyles$8(), [q, z] = useState(!1), V = n["x-toolbar-props"] || n["x-designer-props"], H = (xe = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : xe.openMode, G = (Ce = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : Ce.openSize, U = (ce = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : ce.refreshDataBlockRequest, { modal: K } = App.useApp(), J = useForm(), Y = useACLActionParamsContext(), {
+  ]), [R, O] = useState(!1), { wrapSSR: N, componentCls: M, hashId: L } = useStyles$8(), [q, z] = useState(!1), V = n["x-toolbar-props"] || n["x-designer-props"], H = (ue = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : ue.openMode, G = (Ce = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : Ce.openSize, U = (de = n == null ? void 0 : n["x-component-props"]) == null ? void 0 : de.refreshDataBlockRequest, { modal: K } = App.useApp(), J = useForm(), Y = useACLActionParamsContext(), {
     run: X,
     element: Z,
     disabled: Q,
     loading: ee
-  } = (P == null ? void 0 : P(T)) || {}, te = J.disabled || i.disabled || ((pe = i.data) == null ? void 0 : pe.disabled) || F || Q, re = useMemo(() => {
-    var me;
+  } = (P == null ? void 0 : P(T)) || {}, te = J.disabled || i.disabled || ((me = i.data) == null ? void 0 : me.disabled) || F || Q, ne = useMemo(() => {
+    var he;
     return I(f({}, v), {
-      opacity: r && (((me = i == null ? void 0 : i.data) == null ? void 0 : me.hidden) || !Y) && 0.1,
+      opacity: r && (((he = i == null ? void 0 : i.data) == null ? void 0 : he.hidden) || !Y) && 0.1,
       color: te ? "rgba(0, 0, 0, 0.25)" : v == null ? void 0 : v.color
     });
-  }, [Y, r, (ge = i == null ? void 0 : i.data) == null ? void 0 : ge.hidden, v, te]), ne = {
+  }, [Y, r, (fe = i == null ? void 0 : i.data) == null ? void 0 : fe.hidden, v, te]), se = {
     designable: r,
     field: i,
     aclCtx: Y,
     icon: a,
     loading: typeof ee == "boolean" ? ee : l,
     disabled: te,
-    buttonStyle: re,
+    buttonStyle: ne,
     handleMouseEnter: c,
     tarComponent: u,
     designerProps: V,
@@ -41168,18 +41168,18 @@ const ActionLink = withDynamicSchemaProps(
     setSubmitted: D,
     confirmTitle: x,
     title: C
-  }, ue = useCallback(
-    (me) => {
-      O == null || O(me), w == null || w(me);
+  }, ae = useCallback(
+    (he) => {
+      O == null || O(he), w == null || w(he);
     },
     [w]
   );
-  let le = /* @__PURE__ */ jsx(PopupVisibleProvider, { visible: !1, children: /* @__PURE__ */ jsxs(
+  let ce = /* @__PURE__ */ jsx(PopupVisibleProvider, { visible: !1, children: /* @__PURE__ */ jsxs(
     ActionContextProvider,
     {
-      button: RenderButton(ne),
+      button: RenderButton(se),
       visible: R || A,
-      setVisible: ue,
+      setVisible: ae,
       formValueChanged: q,
       setFormValueChanged: z,
       openMode: H,
@@ -41189,13 +41189,13 @@ const ActionLink = withDynamicSchemaProps(
       setSubmitted: D,
       children: [
         b && /* @__PURE__ */ jsx(NocoBaseRecursionField, { basePath: i.address, onlyRenderProperties: !0, schema: n }),
-        !b && /* @__PURE__ */ jsx(RenderButton, f({}, ne)),
+        !b && /* @__PURE__ */ jsx(RenderButton, f({}, se)),
         /* @__PURE__ */ jsx(VariablePopupRecordProvider, { children: !b && t.children }),
         Z
       ]
     }
   ) });
-  return isBulkEditAction(n) && (le = /* @__PURE__ */ jsx(TabsContextProvider, { children: le })), N(y ? /* @__PURE__ */ jsx(TreeRecordProvider, { parent: S, children: le }) : le);
+  return isBulkEditAction(n) && (ce = /* @__PURE__ */ jsx(TabsContextProvider, { children: ce })), N(y ? /* @__PURE__ */ jsx(TreeRecordProvider, { parent: S, children: ce }) : ce);
 });
 InternalAction.displayName = "InternalAction";
 Action.Popover = function e(t) {
@@ -41309,11 +41309,11 @@ const RenderButton = ({
     );
     if (!K.disabled && K.aclCtx) {
       const ee = () => {
-        var te, re;
+        var te, ne;
         K.onClick ? K.onClick(G, () => {
-          var ne, ue, le;
-          K.refreshDataBlockRequest !== !1 && ((ne = K.setSubmitted) == null || ne.call(K, !0), (le = (ue = K.getDataBlockRequest()) == null ? void 0 : ue.refresh) == null || le.call(ue));
-        }) : isBulkEditAction(K.fieldSchema) || !K.isPopupVisibleControlledByURL() ? (K.setVisible(!0), (te = K.run) == null || te.call(K)) : ["view", "update", "create", "customize:popup"].includes(K.fieldSchema["x-action"]) && K.fieldSchema["x-uid"] ? M.current() : (K.setVisible(!0), (re = K.run) == null || re.call(K));
+          var se, ae, ce;
+          K.refreshDataBlockRequest !== !1 && ((se = K.setSubmitted) == null || se.call(K, !0), (ce = (ae = K.getDataBlockRequest()) == null ? void 0 : ae.refresh) == null || ce.call(ae));
+        }) : isBulkEditAction(K.fieldSchema) || !K.isPopupVisibleControlledByURL() ? (K.setVisible(!0), (te = K.run) == null || te.call(K)) : ["view", "update", "create", "customize:popup"].includes(K.fieldSchema["x-action"]) && K.fieldSchema["x-uid"] ? M.current() : (K.setVisible(!0), (ne = K.run) == null || ne.call(K));
       };
       K.confirmEnable !== !1 && K.confirmContent ? (yield (X = q == null ? void 0 : q.submit) == null ? void 0 : X.call(q), K.modal.confirm({
         title: K.t(J, { title: K.confirmTitleProp || K.title || ((Z = K.field) == null ? void 0 : Z.title) }),
@@ -41928,8 +41928,8 @@ const getValues = (e, t) => castArray(e).filter((o) => o != null).map((o) => typ
               if ((Q = j == null ? void 0 : j.uiSchema) != null && Q.enum)
                 if (Array.isArray(Z))
                   Z = Z.map((ee, te) => {
-                    const re = j.uiSchema.enum.find((ne) => ne.value === ee);
-                    return re ? /* @__PURE__ */ jsx(Tag, { role: "button", color: re.color, style: { marginRight: 3 }, children: (re == null ? void 0 : re.label) || ee }, te) : /* @__PURE__ */ jsx(Tag, { role: "button", children: ee }, ee);
+                    const ne = j.uiSchema.enum.find((se) => se.value === ee);
+                    return ne ? /* @__PURE__ */ jsx(Tag, { role: "button", color: ne.color, style: { marginRight: 3 }, children: (ne == null ? void 0 : ne.label) || ee }, te) : /* @__PURE__ */ jsx(Tag, { role: "button", children: ee }, ee);
                   }).reverse();
                 else {
                   const ee = j.uiSchema.enum.find((te) => te.value === Z);
@@ -46787,7 +46787,7 @@ const AssignedFieldInner = (e) => {
       targetFieldSchema: l
     }
   ) });
-}, AssignedField = (e) => (useFormBlockContext(), useBlockContext(), /* @__PURE__ */ jsx(AssignedFieldInner, f({}, e)));
+}, AssignedField = withDynamicSchemaProps(AssignedFieldInner);
 function useAclCheck(e) {
   return useAclCheckFn()(e);
 }
@@ -47639,8 +47639,8 @@ const useColumnsDeepMemoized = (e) => {
 InternalNocoBaseTable.displayName = "InternalNocoBaseTable";
 const Table$1 = withDynamicSchemaProps(
   observer$1((e) => {
-    var me, fe, ye;
-    const { token: t } = useToken$1(), ce = omit(e, ["onBlur", "onFocus", "value"]), { pagination: o, useProps: n } = ce, r = W(ce, ["pagination", "useProps"]), pe = (n == null ? void 0 : n()) || {}, { pagination: i } = pe, a = W(pe, ["pagination"]), ge = f(f({}, r), a), {
+    var he, xe, ye;
+    const { token: t } = useToken$1(), de = omit(e, ["onBlur", "onFocus", "value"]), { pagination: o, useProps: n } = de, r = W(de, ["pagination", "useProps"]), me = (n == null ? void 0 : n()) || {}, { pagination: i } = me, a = W(me, ["pagination"]), fe = f(f({}, r), a), {
       dragSort: l = !1,
       showIndex: c = !0,
       onRowSelectionChange: u,
@@ -47652,7 +47652,7 @@ const Table$1 = withDynamicSchemaProps(
       loading: x,
       onClickRow: b,
       enableIndexColumn: y
-    } = ge, S = W(ge, [
+    } = fe, S = W(fe, [
       "dragSort",
       "showIndex",
       "onRowSelectionChange",
@@ -47664,8 +47664,8 @@ const Table$1 = withDynamicSchemaProps(
       "loading",
       "onClickRow",
       "enableIndexColumn"
-    ]), C = useArrayField(S), v = useFieldSchema(), { size: F = "small" } = (v == null ? void 0 : v["x-component-props"]) || {}, P = useCollection(), A = ((me = v == null ? void 0 : v.parent) == null ? void 0 : me["x-decorator"]) === "TableSelectorProvider" ? useTableSelectorContext() : useTableBlockContext(), { expandFlag: w, allIncludesChildren: D } = A, $ = useMemoizedFn(S.onRowDragEnd || (() => {
-    })), j = usePaginationProps$2(o, i), B = useTableColumns$1(S, j), [R, O] = useState(() => w ? D : []), [N, M] = useState(((fe = C == null ? void 0 : C.data) == null ? void 0 : fe.selectedRowKeys) || []), [L, q] = useState([]), z = (p == null ? void 0 : p.type) !== "none", V = useRef(/* @__PURE__ */ new Map()), H = useMemo(() => css`
+    ]), C = useArrayField(S), v = useFieldSchema(), { size: F = "small" } = (v == null ? void 0 : v["x-component-props"]) || {}, P = useCollection(), A = ((he = v == null ? void 0 : v.parent) == null ? void 0 : he["x-decorator"]) === "TableSelectorProvider" ? useTableSelectorContext() : useTableBlockContext(), { expandFlag: w, allIncludesChildren: D } = A, $ = useMemoizedFn(S.onRowDragEnd || (() => {
+    })), j = usePaginationProps$2(o, i), B = useTableColumns$1(S, j), [R, O] = useState(() => w ? D : []), [N, M] = useState(((xe = C == null ? void 0 : C.data) == null ? void 0 : xe.selectedRowKeys) || []), [L, q] = useState([]), z = (p == null ? void 0 : p.type) !== "none", V = useRef(/* @__PURE__ */ new Map()), H = useMemo(() => css`
         & > td {
           background-color: ${t.controlItemBgActive} !important;
         }
@@ -47673,8 +47673,8 @@ const Table$1 = withDynamicSchemaProps(
           background-color: ${t.controlItemBgActiveHover} !important;
         }
       `, [t.controlItemBgActive, t.controlItemBgActiveHover]), G = useMemo(() => b ? H : "", [H, b]), U = useMemo(() => b ? (ie, oe) => ({
-      onClick: (se) => {
-        isPortalInBody(se.target) || b(ie, q, L);
+      onClick: (re) => {
+        isPortalInBody(re.target) || b(ie, q, L);
       },
       rowIndex: oe
     }) : null, [b, L]);
@@ -47694,21 +47694,21 @@ const Table$1 = withDynamicSchemaProps(
     }, []), J = useCallback(
       (ie) => {
         var oe;
-        return Array.isArray(m) ? m.map((se) => {
-          var ae;
-          return ((ae = ie[se]) == null ? void 0 : ae.toString()) || "";
+        return Array.isArray(m) ? m.map((re) => {
+          var le;
+          return ((le = ie[re]) == null ? void 0 : le.toString()) || "";
         }).join("-") : typeof m == "string" ? ie[m] : (oe = (m != null ? m : K)(ie)) == null ? void 0 : oe.toString();
       },
       [JSON.stringify(m), K]
     ), Y = useMemo(() => (Array.isArray(C == null ? void 0 : C.value) ? C.value : []).filter(Boolean), [C == null ? void 0 : C.value, (ye = C == null ? void 0 : C.value) == null ? void 0 : ye.length]), X = useMemo(() => (ie) => {
-      const oe = useCallback((se) => {
+      const oe = useCallback((re) => {
         var Te, Fe, Pe, Ie, ke, Ae;
-        if (!se.active || !se.over) {
+        if (!re.active || !re.over) {
           console.warn("move cancel");
           return;
         }
-        const ae = (Pe = (Fe = (Te = se.active) == null ? void 0 : Te.data.current) == null ? void 0 : Fe.sortable) == null ? void 0 : Pe.index, he = (Ae = (ke = (Ie = se.over) == null ? void 0 : Ie.data.current) == null ? void 0 : ke.sortable) == null ? void 0 : Ae.index, be = C.value[ae] || se.active, ve = C.value[he] || se.over;
-        C.move(ae, he), $({ from: be, to: ve });
+        const le = (Pe = (Fe = (Te = re.active) == null ? void 0 : Te.data.current) == null ? void 0 : Fe.sortable) == null ? void 0 : Pe.index, pe = (Ae = (ke = (Ie = re.over) == null ? void 0 : Ie.data.current) == null ? void 0 : ke.sortable) == null ? void 0 : Ae.index, be = C.value[le] || re.active, ve = C.value[pe] || re.over;
+        C.move(le, pe), $({ from: be, to: ve });
       }, []);
       return /* @__PURE__ */ jsx(DndContext, { onDragEnd: oe, children: /* @__PURE__ */ jsx("tbody", f({}, ie)) });
     }, [C, $]);
@@ -47736,22 +47736,22 @@ const Table$1 = withDynamicSchemaProps(
               "aria-label": "checkbox"
             };
           },
-          renderCell: (ie, oe, se, ae) => {
+          renderCell: (ie, oe, re, le) => {
             if (!l && !c)
-              return ae;
-            const he = j == null ? void 0 : j.current, be = (j == null ? void 0 : j.pageSize) || 20;
-            return he ? se = se + (he - 1) * be + 1 : se = se + 1, oe.__index && (se = extractIndex$1(oe.__index)), /* @__PURE__ */ jsxs(
+              return le;
+            const pe = j == null ? void 0 : j.current, be = (j == null ? void 0 : j.pageSize) || 20;
+            return pe ? re = re + (pe - 1) * be + 1 : re = re + 1, oe.__index && (re = extractIndex$1(oe.__index)), /* @__PURE__ */ jsxs(
               "div",
               {
                 role: "button",
-                "aria-label": `table-index-${se}`,
+                "aria-label": `table-index-${re}`,
                 className: classNames(ie ? "checked" : null, rowSelectCheckboxWrapperClass$1, {
                   [rowSelectCheckboxWrapperClassHover$1]: z
                 }),
                 children: [
                   /* @__PURE__ */ jsxs("div", { className: classNames(ie ? "checked" : null, rowSelectCheckboxContentClass$1), children: [
                     l && /* @__PURE__ */ jsx(SortHandle$1, { id: J(oe) }),
-                    c && /* @__PURE__ */ jsx(TableIndex$3, { index: se })
+                    c && /* @__PURE__ */ jsx(TableIndex$3, { index: re })
                   ] }),
                   z && /* @__PURE__ */ jsx(
                     "div",
@@ -47761,7 +47761,7 @@ const Table$1 = withDynamicSchemaProps(
                         ie ? "checked" : null,
                         rowSelectCheckboxCheckedClassHover$1
                       ),
-                      children: ae
+                      children: le
                     }
                   )
                 ]
@@ -47785,42 +47785,42 @@ const Table$1 = withDynamicSchemaProps(
       ]
     ), te = useCallback(
       ({ children: ie }) => {
-        var oe, se;
+        var oe, re;
         return l ? React.createElement(
           SortableContext$1,
           {
-            items: ((se = (oe = C.value) == null ? void 0 : oe.map) == null ? void 0 : se.call(oe, J)) || []
+            items: ((re = (oe = C.value) == null ? void 0 : oe.map) == null ? void 0 : re.call(oe, J)) || []
           },
           ie
         ) : React.createElement(React.Fragment, {}, ie);
       },
       [C, l, J]
-    ), { height: re, tableSizeRefCallback: ne } = useTableSize(), ue = useMemo(() => ({
+    ), { height: ne, tableSizeRefCallback: se } = useTableSize(), ae = useMemo(() => ({
       x: "max-content"
-    }), []), le = useMemo(() => ({
+    }), []), ce = useMemo(() => ({
       x: "max-content",
-      y: Y.length > 0 ? re : void 0
-    }), [re, ue, Y]), de = useCallback(
+      y: Y.length > 0 ? ne : void 0
+    }), [ne, ae, Y]), ge = useCallback(
       (ie) => L.includes(ie[m]) ? G : "",
       [L, G, JSON.stringify(m)]
-    ), xe = useCallback(
+    ), ue = useCallback(
       (ie, oe) => {
-        const se = ie ? [...R, oe[P.getPrimaryKey()]] : R.filter((ae) => oe[P.getPrimaryKey()] !== ae);
-        O(se), g == null || g(ie, oe);
+        const re = ie ? [...R, oe[P.getPrimaryKey()]] : R.filter((le) => oe[P.getPrimaryKey()] !== le);
+        O(re), g == null || g(ie, oe);
       },
       [R, g, P]
     ), Ce = useMemo(() => ({
-      onExpand: xe,
+      onExpand: ue,
       expandedRowKeys: R
-    }), [R, xe]);
+    }), [R, ue]);
     return (
       // If spinning is set to undefined, it will cause the subtable to always display loading, so we need to convert it here
       /* @__PURE__ */ jsx(Spin, { spinning: !!x, children: /* @__PURE__ */ jsx(
         InternalNocoBaseTable,
         I(f(f({
-          tableHeight: re,
+          tableHeight: ne,
           SortableWrapper: te,
-          tableSizeRefCallback: ne,
+          tableSizeRefCallback: se,
           defaultRowKey: K,
           dataSource: Y
         }, S), ee), {
@@ -47828,8 +47828,8 @@ const Table$1 = withDynamicSchemaProps(
           components: Z,
           onTableChange: d,
           onRow: U,
-          rowClassName: de,
-          scroll: le,
+          rowClassName: ge,
+          scroll: ce,
           columns: B,
           expandable: Ce,
           field: C,
@@ -55361,10 +55361,10 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
                       mode: "tags",
                       value: ee,
                       onChange: (te) => {
-                        const re = Array.from(
-                          new Set(te.map((ne) => String(ne).trim()).filter(Boolean))
+                        const ne = Array.from(
+                          new Set(te.map((se) => String(se).trim()).filter(Boolean))
                         );
-                        U.value === "allow" ? P(j.key, "tlds", { allow: re }) : P(j.key, "tlds", { deny: re });
+                        U.value === "allow" ? P(j.key, "tlds", { allow: ne }) : P(j.key, "tlds", { deny: ne });
                       },
                       tokenSeparators: [",", " ", `
 `, "	"],
@@ -66483,16 +66483,16 @@ const getKey = (e) => `${e.params.viewUid}_${e.index}`, FlowRoute = () => {
   },
   handler(e, t) {
     return E(this, null, function* () {
-      var b, y, S, C, v, F, P, T, A, w, D, $, j, B, R, O, N, M, L, q, z, V, H, G, U, K, J, Y, X, Z, Q, ee, te, re;
+      var b, y, S, C, v, F, P, T, A, w, D, $, j, B, R, O, N, M, L, q, z, V, H, G, U, K, J, Y, X, Z, Q, ee, te, ne, se;
       if (t != null && t.uid && t.uid !== e.model.uid) {
-        const ne = ((y = (b = e.model) == null ? void 0 : b.getInputArgs) == null ? void 0 : y.call(b)) || {};
+        const ae = ((y = (b = e.model) == null ? void 0 : b.getInputArgs) == null ? void 0 : y.call(b)) || {};
         yield e.openView(t.uid, I(f({}, t), {
           target: e.inputArgs.target || e.layoutContentElement,
-          dataSourceKey: (S = t.dataSourceKey) != null ? S : ne.dataSourceKey,
-          collectionName: (C = t.collectionName) != null ? C : ne.collectionName,
-          associationName: (v = t.associationName) != null ? v : ne.associationName,
-          filterByTk: (F = t.filterByTk) != null ? F : ne.filterByTk,
-          sourceId: (P = t.sourceId) != null ? P : ne.sourceId,
+          dataSourceKey: (S = t.dataSourceKey) != null ? S : ae.dataSourceKey,
+          collectionName: (C = t.collectionName) != null ? C : ae.collectionName,
+          associationName: (v = t.associationName) != null ? v : ae.associationName,
+          filterByTk: (F = t.filterByTk) != null ? F : ae.filterByTk,
+          sourceId: (P = t.sourceId) != null ? P : ae.sourceId,
           tabUid: t.tabUid
         }));
         return;
@@ -66501,7 +66501,7 @@ const getKey = (e) => `${e.params.viewUid}_${e.index}`, FlowRoute = () => {
       o.filterByTk = o.filterByTk || t.filterByTk || (n == null ? void 0 : n.filterByTk), o.sourceId = o.sourceId || t.sourceId || (n == null ? void 0 : n.sourceId), o.tabUid = o.tabuid || t.tabUid || (n == null ? void 0 : n.tabUid);
       const r = (A = o.navigation) != null ? A : t.navigation;
       if (r !== !1 && !e.inputArgs.navigation && (w = e.view) != null && w.navigation) {
-        const ne = (D = e.inputArgs) != null && D.isMobileLayout ? "embed" : (($ = e.inputArgs) == null ? void 0 : $.mode) || (t == null ? void 0 : t.mode) || "drawer", ue = I(f({}, e.inputArgs), {
+        const ae = (D = e.inputArgs) != null && D.isMobileLayout ? "embed" : (($ = e.inputArgs) == null ? void 0 : $.mode) || (t == null ? void 0 : t.mode) || "drawer", ce = I(f({}, e.inputArgs), {
           dataSourceKey: (j = t.dataSourceKey) != null ? j : e.inputArgs.dataSourceKey,
           collectionName: (B = t.collectionName) != null ? B : e.inputArgs.collectionName,
           associationName: (R = t.associationName) != null ? R : e.inputArgs.associationName,
@@ -66509,21 +66509,21 @@ const getKey = (e) => `${e.params.viewUid}_${e.index}`, FlowRoute = () => {
           sourceId: (N = o.sourceId) != null ? N : t.sourceId,
           tabUid: (M = o.tabUid) != null ? M : t.tabUid,
           viewUid: ((q = (L = e.model.context) == null ? void 0 : L.inputArgs) == null ? void 0 : q.viewUid) || e.model.uid
-        }), le = {
-          type: ne,
-          inputArgs: ue,
+        }), ge = {
+          type: ae,
+          inputArgs: ce,
           navigation: (z = e.view) == null ? void 0 : z.navigation,
           preventClose: !!(t != null && t.preventClose),
           engineCtx: e.engine.context
         };
-        e.model.context.defineProperty("view", { value: le });
-        const de = {
+        e.model.context.defineProperty("view", { value: ge });
+        const ue = {
           viewUid: ((H = (V = e.model.context) == null ? void 0 : V.inputArgs) == null ? void 0 : H.viewUid) || e.model.uid,
           filterByTk: (G = o.filterByTk) != null ? G : t.filterByTk,
           sourceId: (U = o.sourceId) != null ? U : t.sourceId,
           tabUid: (K = o.tabUid) != null ? K : t.tabUid
         };
-        e.view.navigation.navigateTo(de);
+        e.view.navigation.navigateTo(ue);
         return;
       }
       const i = {
@@ -66541,14 +66541,14 @@ const getKey = (e) => `${e.params.viewUid}_${e.index}`, FlowRoute = () => {
       }, a = e.inputArgs.pageModelClass || t.pageModelClass || "ChildPageModel", l = e.inputArgs.mode || t.mode || "drawer", c = e.inputArgs.size || t.size || "medium";
       let u = null, d = null, p = e.model.uid;
       if (t.subModelKey) {
-        const ne = yield e.engine.loadOrCreateModel({
+        const ae = yield e.engine.loadOrCreateModel({
           async: !0,
           parentId: e.model.uid,
           subKey: t.subModelKey,
           subType: "object",
           use: "FlowModel"
         });
-        ne != null && ne.uid && (p = ne.uid);
+        ae != null && ae.uid && (p = ae.uid);
       }
       const m = !!((J = e.inputArgs) != null && J.navigation), h = ((X = (Y = e.view) == null ? void 0 : Y.inputArgs) == null ? void 0 : X.openerUids) || o.openerUids || [], g = m ? o.openerUids || h : [...h, ((Q = (Z = e.model.context) == null ? void 0 : Z.inputArgs) == null ? void 0 : Q.viewUid) || e.model.uid], x = I(f(f({}, e.inputArgs), o), {
         dataSourceKey: t.dataSourceKey,
@@ -66557,7 +66557,7 @@ const getKey = (e) => `${e.params.viewUid}_${e.index}`, FlowRoute = () => {
         tabUid: (ee = o.tabUid) != null ? ee : t.tabUid,
         openerUids: g
       });
-      x.filterByTk = (te = o.filterByTk) != null ? te : t.filterByTk, x.sourceId = (re = o.sourceId) != null ? re : t.sourceId, yield e.viewer.open({
+      x.filterByTk = (te = o.filterByTk) != null ? te : t.filterByTk, x.sourceId = (ne = o.sourceId) != null ? ne : t.sourceId, yield e.viewer.open({
         type: e.inputArgs.isMobileLayout ? "embed" : l,
         // 移动端中只需要显示子页面
         inputArgs: x,
@@ -66566,28 +66566,28 @@ const getKey = (e) => `${e.params.viewUid}_${e.index}`, FlowRoute = () => {
         inheritContext: !1,
         target: e.inputArgs.target || e.layoutContentElement,
         width: i[l][c],
-        content: (ne) => (e.inputArgs.closeRef && (e.inputArgs.closeRef.current = ne.close), e.inputArgs.updateRef && (e.inputArgs.updateRef.current = ne.update), /* @__PURE__ */ jsx(
+        content: (ae) => (e.inputArgs.closeRef && (e.inputArgs.closeRef.current = ae.close), e.inputArgs.updateRef && (e.inputArgs.updateRef.current = ae.update), /* @__PURE__ */ jsx(
           FlowPage,
           {
             parentId: p,
             pageModelClass: a,
-            onModelLoaded: (ue, le) => {
-              var ce, pe, ge, me, fe, ye, ie, oe;
-              u = ue;
-              const de = le || e.engine.getModel(u);
-              d = de || null;
-              const xe = (me = (ge = o.defineProperties) != null ? ge : (pe = (ce = e.model.context) == null ? void 0 : ce.inputArgs) == null ? void 0 : pe.defineProperties) != null ? me : {}, Ce = (oe = (ie = o.defineMethods) != null ? ie : (ye = (fe = e.model.context) == null ? void 0 : fe.inputArgs) == null ? void 0 : ye.defineMethods) != null ? oe : {};
-              de.context.defineProperty("currentView", {
-                get: () => ne
-              }), de.context.defineProperty("view", {
-                get: () => ne
-              }), de.context.defineProperty("closable", {
+            onModelLoaded: (ce, ge) => {
+              var me, fe, he, xe, ye, ie, oe, re;
+              u = ce;
+              const ue = ge || e.engine.getModel(u);
+              d = ue || null;
+              const Ce = (xe = (he = o.defineProperties) != null ? he : (fe = (me = e.model.context) == null ? void 0 : me.inputArgs) == null ? void 0 : fe.defineProperties) != null ? xe : {}, de = (re = (oe = o.defineMethods) != null ? oe : (ie = (ye = e.model.context) == null ? void 0 : ye.inputArgs) == null ? void 0 : ie.defineMethods) != null ? re : {};
+              ue.context.defineProperty("currentView", {
+                get: () => ae
+              }), ue.context.defineProperty("view", {
+                get: () => ae
+              }), ue.context.defineProperty("closable", {
                 get: () => l !== "embed"
-              }), Object.entries(xe).forEach(([se, ae]) => {
-                de.context.defineProperty(se, ae);
-              }), Object.entries(Ce).forEach(([se, ae]) => {
-                de.context.defineMethod(se, ae);
-              }), de.invalidateAutoFlowCache(!0), de._rerunLastAutoRun();
+              }), Object.entries(Ce).forEach(([le, pe]) => {
+                ue.context.defineProperty(le, pe);
+              }), Object.entries(de).forEach(([le, pe]) => {
+                ue.context.defineMethod(le, pe);
+              }), ue.invalidateAutoFlowCache(!0), ue._rerunLastAutoRun();
             }
           }
         )),
@@ -66601,16 +66601,16 @@ const getKey = (e) => `${e.params.viewUid}_${e.index}`, FlowRoute = () => {
           }
         },
         onClose: () => {
-          var ue, le;
-          const ne = ((ue = e.inputArgs) == null ? void 0 : ue.navigation) || ((le = e.view) == null ? void 0 : le.navigation);
+          var ce, ge;
+          const ae = ((ce = e.inputArgs) == null ? void 0 : ce.navigation) || ((ge = e.view) == null ? void 0 : ge.navigation);
           if (u) {
-            const de = d || e.model.flowEngine.getModel(u);
-            de == null || de.invalidateAutoFlowCache(!0);
+            const ue = d || e.model.flowEngine.getModel(u);
+            ue == null || ue.invalidateAutoFlowCache(!0);
           }
-          r !== !1 && ne != null && ne.back && ne.back();
+          r !== !1 && ae != null && ae.back && ae.back();
         },
         onOpen: e.inputArgs.onOpen
-      });
+      }), yield (se = e.resource) == null ? void 0 : se.refresh();
     });
   }
 }), InjectableRendingEventTrigger = (n) => {
@@ -67807,7 +67807,7 @@ const CodeEditor = (e) => {
     });
   }
 }), parseMarkdown = _.memoize((e) => E(void 0, null, function* () {
-  return e && (yield import("./md-BbvRKckr.mjs")).default.render(e);
+  return e && (yield import("./md-oH2RssNY.mjs")).default.render(e);
 }));
 function useParseMarkdown(e) {
   const [t, o] = useState(""), [n, r] = useState(!0);
@@ -68775,7 +68775,7 @@ const displayFieldComponent = defineAction({
   },
   handler(e, t) {
     return E(this, null, function* () {
-      t.use !== e.model.subModels.field.use && (e.model.setStepParams(e.flowKey, "model", { use: e.model.subModels.field.use }), console.log(t.use, e.model.subModels.field.use));
+      t.use !== e.model.subModels.field.use && e.model.setStepParams(e.flowKey, "model", { use: e.model.subModels.field.use });
     });
   }
 }), fieldComponent = defineAction({
@@ -69026,7 +69026,7 @@ const validation = defineAction({
     }
     return p(T), () => {
       var ee, te;
-      (te = (ee = T.subModels.fields).forEach) == null || te.call(ee, (re) => re.remove()), T.remove();
+      (te = (ee = T.subModels.fields).forEach) == null || te.call(ee, (ne) => ne.remove()), T.remove();
     };
   }, [r, i, a, l, u, n]), React.useEffect(() => {
     var v, F, P, T;
@@ -72738,7 +72738,6 @@ FormSubmitActionModel.registerFlow({
     saveResource: {
       handler(e, t) {
         return E(this, null, function* () {
-          var i;
           if (!(e != null && e.resource))
             throw new Error("Resource is not initialized");
           if (!e.blockModel)
@@ -72746,28 +72745,26 @@ FormSubmitActionModel.registerFlow({
           const o = e.resource, n = e.blockModel;
           try {
             yield n.form.validateFields();
-            const a = n.form.getFieldsValue();
+            const r = n.form.getFieldsValue();
             if (o instanceof SingleRecordResource) {
               if (n instanceof EditFormModel) {
-                const l = o.getMeta("currentFilterByTk");
-                l ? o.setFilterByTk(l) : o.isNewRecord = !0;
+                const i = o.getMeta("currentFilterByTk");
+                i ? o.setFilterByTk(i) : o.isNewRecord = !0;
               }
-              yield o.save(a, t.requestConfig), n instanceof EditFormModel ? (o.isNewRecord = !1, yield o.refresh()) : (n.form.resetFields(), n.emitter.emit("onFieldReset"));
+              yield o.save(r, t.requestConfig), n instanceof EditFormModel ? (o.isNewRecord = !1, yield o.refresh()) : (n.form.resetFields(), n.emitter.emit("onFieldReset"));
             } else if (o instanceof MultiRecordResource) {
-              const l = o.getMeta("currentFilterByTk");
-              if (!l) {
+              const i = o.getMeta("currentFilterByTk");
+              if (!i) {
                 e.message.error(e.t("No filterByTk found for multi-record resource."));
                 return;
               }
-              yield o.update(l, a, t.requestConfig);
+              yield o.update(i, r, t.requestConfig);
             }
-          } catch (a) {
-            e.message.error(e.t("Save failed")), console.error("Form submission error:", a);
+          } catch (r) {
+            e.message.error(e.t("Save failed")), console.error("Form submission error:", r);
             return;
           }
-          e.message.success(e.t("Saved successfully"));
-          const r = (i = e.currentFlow) == null ? void 0 : i.blockModel;
-          r && r.resource.refresh(), e.view && e.view.close();
+          e.message.success(e.t("Saved successfully")), e.view && e.view.close();
         });
       }
     }
@@ -73769,10 +73766,10 @@ class AssignFormItemModel extends FormItemModel {
       var y, S, C, v, F, P, T;
       const [u, d] = React.useState(null);
       React.useEffect(() => {
-        var V, H, G, U, K, J, Y, X, Z, Q, ee, te, re, ne, ue, le, de, xe, Ce;
+        var V, H, G, U, K, J, Y, X, Z, Q, ee, te, ne, se, ae, ce, ge, ue, Ce;
         if (!a)
           return;
-        const w = (((V = n == null ? void 0 : n.getFields) == null ? void 0 : V.call(n)) || []).find((ce) => (ce == null ? void 0 : ce.name) === a);
+        const w = (((V = n == null ? void 0 : n.getFields) == null ? void 0 : V.call(n)) || []).find((de) => (de == null ? void 0 : de.name) === a);
         n.getField(a);
         const D = EditableItemModel.getDefaultBindingByField(o, w);
         if (!D)
@@ -73801,23 +73798,23 @@ class AssignFormItemModel extends FormItemModel {
           enumerable: !0,
           get: () => O == null ? void 0 : O.resource
         });
-        const N = (ne = (re = j == null ? void 0 : j.subModels) == null ? void 0 : re.fields) == null ? void 0 : ne[0], M = (ue = n == null ? void 0 : n.getField) == null ? void 0 : ue.call(n, r == null ? void 0 : r.fieldPath), L = M == null ? void 0 : M.type, q = M == null ? void 0 : M.interface, z = L === "belongsToMany" || L === "hasMany" || L === "belongsToArray" || q === "m2m" || q === "o2m" || q === "mbm";
-        if ((le = N == null ? void 0 : N.setProps) == null || le.call(N, {
+        const N = (se = (ne = j == null ? void 0 : j.subModels) == null ? void 0 : ne.fields) == null ? void 0 : se[0], M = (ae = n == null ? void 0 : n.getField) == null ? void 0 : ae.call(n, r == null ? void 0 : r.fieldPath), L = M == null ? void 0 : M.type, q = M == null ? void 0 : M.interface, z = L === "belongsToMany" || L === "hasMany" || L === "belongsToArray" || q === "m2m" || q === "o2m" || q === "mbm";
+        if ((ce = N == null ? void 0 : N.setProps) == null || ce.call(N, {
           disabled: !1,
           readPretty: !1,
           pattern: "editable",
           updateAssociation: !1,
           multiple: z
-        }), (de = N == null ? void 0 : N.applyAutoFlows) == null || de.call(N), ensureOptionsFromUiSchemaEnumIfAbsent(N, M), !((xe = N == null ? void 0 : N.props) != null && xe.fieldNames) && (M != null && M.targetCollection)) {
-          const ce = M.targetCollection, pe = (M == null ? void 0 : M.targetKey) || (ce == null ? void 0 : ce.filterTargetKey) || "id";
-          (Ce = N == null ? void 0 : N.setProps) == null || Ce.call(N, { fieldNames: { label: ce == null ? void 0 : ce.titleField, value: pe } });
+        }), (ge = N == null ? void 0 : N.applyAutoFlows) == null || ge.call(N), ensureOptionsFromUiSchemaEnumIfAbsent(N, M), !((ue = N == null ? void 0 : N.props) != null && ue.fieldNames) && (M != null && M.targetCollection)) {
+          const de = M.targetCollection, me = (M == null ? void 0 : M.targetKey) || (de == null ? void 0 : de.filterTargetKey) || "id";
+          (Ce = N == null ? void 0 : N.setProps) == null || Ce.call(N, { fieldNames: { label: de == null ? void 0 : de.titleField, value: me } });
         }
         return d(j), () => {
-          var ce, pe, ge, me;
-          (ge = (pe = (ce = j == null ? void 0 : j.subModels) == null ? void 0 : ce.fields) == null ? void 0 : pe.forEach) == null || ge.call(pe, (fe) => {
+          var de, me, fe, he;
+          (fe = (me = (de = j == null ? void 0 : j.subModels) == null ? void 0 : de.fields) == null ? void 0 : me.forEach) == null || fe.call(me, (xe) => {
             var ye;
-            return (ye = fe == null ? void 0 : fe.remove) == null ? void 0 : ye.call(fe);
-          }), (me = j == null ? void 0 : j.remove) == null || me.call(j);
+            return (ye = xe == null ? void 0 : xe.remove) == null ? void 0 : ye.call(xe);
+          }), (he = j == null ? void 0 : j.remove) == null || he.call(j);
         };
       }, []);
       const p = (A) => (React.useEffect(() => {
@@ -76560,7 +76557,7 @@ TableColumnModel.registerFlow({
       use: "titleField",
       title: escapeT("Label field"),
       beforeParamsSave: (e, t, o) => E(void 0, null, function* () {
-        if (!e.collectionField.isAssociationField())
+        if (!e.collectionField || !e.collectionField.isAssociationField())
           return null;
         if (t.label !== o.label) {
           const n = e.collectionField.targetCollection, r = n.getField(t.label), i = e.model.constructor.getDefaultBindingByField(
@@ -76587,6 +76584,8 @@ TableColumnModel.registerFlow({
       }),
       handler(e, t) {
         var o, n;
+        if (!e.collectionField || !e.collectionField.isAssociationField())
+          return null;
         e.model.setProps(f({
           titleField: t.label
         }, (n = (o = e.collectionField.targetCollection) == null ? void 0 : o.getField(t.label)) == null ? void 0 : n.getComponentProps()));