@nocobase/client 1.9.32 → 1.9.34

package/es/index.mjs

@@ -8000,23 +8000,23 @@ ApplicationContext.displayName = "ApplicationContext";
 const AppComponent = observer(
   (n) => {
     var o = n, { children: e } = o, t = W(o, ["children"]);
-    var l;
-    const { app: r } = t, a = useCallback((c, u) => {
-      console.error(c);
-      const d = new Error();
-      d.stack = u.componentStack.trim(), console.error(d);
+    var l, c, u, d, p, m, h, g, f;
+    const { app: r } = t, a = useCallback((C, b) => {
+      console.error(C);
+      const S = new Error();
+      S.stack = b.componentStack.trim(), console.error(S);
     }, []);
     useEffect(() => {
       r.load();
     }, [r]);
     const i = r.getComponent("AppError");
-    return r.loading ? r.renderComponent("AppSpin", { app: r }) : !r.maintained && r.maintaining ? r.renderComponent("AppMaintaining", { app: r }) : (l = r.error) != null && l.code && !(r.maintained && r.maintaining) ? /* @__PURE__ */ jsx(i, { app: r, error: r.error }) : /* @__PURE__ */ jsx(
+    return r.loading ? r.renderComponent("AppSpin", { app: r }) : !r.maintained && r.maintaining ? r.renderComponent((d = (u = (c = (l = r.error) == null ? void 0 : l.command) == null ? void 0 : c.components) == null ? void 0 : u.maintaining) != null ? d : "AppMaintaining", { app: r }) : (p = r.error) != null && p.code && !(r.maintained && r.maintaining) ? /* @__PURE__ */ jsx(i, { app: r, error: r.error }) : /* @__PURE__ */ jsx(
       ErrorBoundary,
       {
-        FallbackComponent: (c) => /* @__PURE__ */ jsx(i, x({ app: r, error: r.error }, c)),
+        FallbackComponent: (C) => /* @__PURE__ */ jsx(i, x({ app: r, error: r.error }, C)),
         onError: a,
         children: /* @__PURE__ */ jsxs(ApplicationContext.Provider, { value: r, children: [
-          r.maintained && r.maintaining && r.renderComponent("AppMaintainingDialog", { app: r }),
+          r.maintained && r.maintaining && r.renderComponent((f = (g = (h = (m = r.error) == null ? void 0 : m.command) == null ? void 0 : h.components) == null ? void 0 : g.maintainingDialog) != null ? f : "AppMaintainingDialog", { app: r }),
           r.renderComponent("AppMain", void 0, e)
         ] })
       }
@@ -8856,7 +8856,7 @@ function addAppVersion(e, t) {
       addAppVersion((o = e.properties) == null ? void 0 : o[n], t);
     }), e;
 }
-const name = "@nocobase/client", version = "1.9.32", license = "AGPL-3.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
+const name = "@nocobase/client", version = "1.9.34", 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",
@@ -8877,9 +8877,9 @@ const name = "@nocobase/client", version = "1.9.32", license = "AGPL-3.0", main
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "1.9.32",
-  "@nocobase/sdk": "1.9.32",
-  "@nocobase/utils": "1.9.32",
+  "@nocobase/evaluators": "1.9.34",
+  "@nocobase/sdk": "1.9.34",
+  "@nocobase/utils": "1.9.34",
   ahooks: "^3.7.2",
   antd: "5.24.2",
   "antd-mobile": "^5.41.1",
@@ -15404,78 +15404,83 @@ const useGetFilterOptions = () => {
   const t = useCollectionManager(), n = t == null ? void 0 : t.getCollectionFields(e);
   return useFilterFieldOptions(n);
 }, useGetFilterFieldOptions = () => {
-  var i;
-  const e = useFieldSchema(), t = ((i = e == null ? void 0 : e["x-component-props"]) == null ? void 0 : i.nonfilterable) || [], n = useCollectionManager(), o = useDataSourceManager(), r = (l, c, u) => {
-    var f, C;
-    if (t.length && c === 1 && t.includes(l.name) || !l.interface)
+  var i, l;
+  const e = useFieldSchema(), t = Array.isArray((i = e == null ? void 0 : e["x-component-props"]) == null ? void 0 : i.nonfilterable) ? (l = e == null ? void 0 : e["x-component-props"]) == null ? void 0 : l.nonfilterable : [], n = useCollectionManager(), o = useDataSourceManager(), r = (c, u, d, p) => {
+    var S, y;
+    const m = p ? `${p}.${c.name}` : c.name;
+    if (t.length && t.includes(m) || !c.interface)
       return;
-    const d = o == null ? void 0 : o.collectionFieldInterfaceManager.getFieldInterface(l.interface);
-    if (!(d != null && d.filterable) && !u)
+    const h = o == null ? void 0 : o.collectionFieldInterfaceManager.getFieldInterface(c.interface);
+    if (!(h != null && h.filterable) && !d)
       return;
-    const { nested: p, children: m, operators: h } = (d == null ? void 0 : d.filterable) || {}, g = {
-      name: l.name,
-      type: l.type,
-      target: l.target,
-      title: ((f = l == null ? void 0 : l.uiSchema) == null ? void 0 : f.title) || l.name,
-      schema: l == null ? void 0 : l.uiSchema,
-      interface: l.interface,
-      operators: ((C = h == null ? void 0 : h.filter) == null ? void 0 : C.call(h, (b) => !(b != null && b.visible) || b.visible(l))) || []
+    const { nested: g, children: f, operators: C } = (h == null ? void 0 : h.filterable) || {}, b = {
+      name: c.name,
+      type: c.type,
+      target: c.target,
+      title: ((S = c == null ? void 0 : c.uiSchema) == null ? void 0 : S.title) || c.name,
+      schema: c == null ? void 0 : c.uiSchema,
+      interface: c.interface,
+      operators: ((y = C == null ? void 0 : C.filter) == null ? void 0 : y.call(C, (v) => !(v != null && v.visible) || v.visible(c))) || []
     };
-    if (!(l.target && c > 2)) {
-      if (c > 2)
-        return g;
-      if (m != null && m.length && (g.children = m), p) {
-        const b = n == null ? void 0 : n.getCollectionFields(l.target), S = a(b, c + 1).filter(Boolean);
-        g.children = g.children || [], g.children.push(...S);
+    if (!(c.target && u > 2)) {
+      if (u > 2)
+        return b;
+      if (f != null && f.length && (b.children = f), g) {
+        const v = n == null ? void 0 : n.getCollectionFields(c.target), I = a(v, u + 1, d, m).filter(Boolean);
+        b.children = b.children || [], b.children.push(...I);
       }
-      return g;
+      return b;
     }
-  }, a = (l, c, u) => {
-    const d = [];
-    return l == null || l.forEach((p) => {
-      const m = r(p, c, u);
-      m && d.push(m);
-    }), d;
+  }, a = (c, u, d, p) => {
+    const m = [];
+    return c == null || c.forEach((h) => {
+      const g = r(h, u, d, p);
+      g && m.push(g);
+    }), m;
   };
-  return (l, c) => a(l, 1, c);
-}, field2option = (e, t, n, o, r) => {
-  var d, p;
-  if (n.length && t === 1 && n.includes(e.name) || !e.interface || e.filterable === !1)
+  return (c, u) => a(c, 1, u);
+}, field2option = (e, t, n, o, r, a) => {
+  var m, h, g, f, C;
+  const i = a ? `${a}.${e.name}` : e.name;
+  if (n.length && n.includes(i) || !e.interface || e.filterable === !1)
     return;
-  const a = o == null ? void 0 : o.collectionFieldInterfaceManager.getFieldInterface(e.interface);
-  if (!(a != null && a.filterable))
+  const l = o == null ? void 0 : o.collectionFieldInterfaceManager.getFieldInterface(e.interface);
+  if (!(l != null && l.filterable))
     return;
-  const { nested: i, children: l, operators: c } = a.filterable, u = {
+  const { nested: c, children: u, operators: d } = l.filterable, p = {
     name: e.name,
     type: e.type,
     target: e.target,
-    title: ((d = e == null ? void 0 : e.uiSchema) == null ? void 0 : d.title) || e.name,
+    title: ((m = e == null ? void 0 : e.uiSchema) == null ? void 0 : m.title) || e.name,
     schema: e == null ? void 0 : e.uiSchema,
-    operators: ((p = c == null ? void 0 : c.filter) == null ? void 0 : p.call(c, (m) => !(m != null && m.visible) || m.visible(e))) || []
+    operators: ((h = d == null ? void 0 : d.filter) == null ? void 0 : h.call(d, (b) => !(b != null && b.visible) || b.visible(e))) || []
   };
   if (!(e.target && t > 2)) {
     if (t > 2)
-      return u;
-    if (l != null && l.length && (u.children = l), i) {
-      const m = o.getDataSource(e.dataSourceKey).collectionManager.getCollectionFields(e.target), h = getOptions$1(m, t + 1, n, o).filter(
-        Boolean
-      );
-      u.children = u.children || [], u.children.push(...h);
+      return p;
+    if (u != null && u.length && (p.children = u), c) {
+      const b = (g = r == null ? void 0 : r.dataSource) == null ? void 0 : g.key, S = e.dataSourceKey || b, y = S && S !== b ? ((f = o == null ? void 0 : o.getDataSource(S)) == null ? void 0 : f.collectionManager) || r : r || ((C = o == null ? void 0 : o.getDataSource(S)) == null ? void 0 : C.collectionManager), v = y == null ? void 0 : y.getCollectionFields(e.target), I = getOptions$1(
+        v || [],
+        t + 1,
+        n,
+        o,
+        y || r,
+        i
+      ).filter(Boolean);
+      p.children = p.children || [], p.children.push(...I);
     }
-    return u;
+    return p;
   }
-}, getOptions$1 = (e, t, n, o, r) => {
-  const a = [];
-  return e.forEach((i) => {
-    const l = field2option(i, t, n, o);
-    l && a.push(l);
-  }), a;
+}, getOptions$1 = (e = [], t, n, o, r, a) => {
+  const i = [];
+  return e.forEach((l) => {
+    const c = field2option(l, t, n, o, r, a);
+    c && i.push(c);
+  }), i;
 }, useFilterFieldOptions = (e) => {
-  var r;
-  const t = useFieldSchema(), n = ((r = t == null ? void 0 : t["x-component-props"]) == null ? void 0 : r.nonfilterable) || [];
-  useCollectionManager();
-  const o = useDataSourceManager();
-  return getOptions$1(e, 1, n, o);
+  var a, i;
+  const t = useFieldSchema(), n = Array.isArray((a = t == null ? void 0 : t["x-component-props"]) == null ? void 0 : a.nonfilterable) ? (i = t == null ? void 0 : t["x-component-props"]) == null ? void 0 : i.nonfilterable : [], o = useCollectionManager(), r = useDataSourceManager();
+  return getOptions$1(e, 1, n, r, o);
 }, isEmpty = (e) => Array.isArray(e) && e.length === 0 || e && Object.keys(e).length === 0 && Object.getPrototypeOf(e) === Object.prototype, removeNullCondition = (e, t = flat) => {
   const n = t(e || {}), o = {};
   for (const r in n) {
@@ -30774,7 +30779,7 @@ function SchemaSettingsConnectDataBlocks(e) {
   if (!l)
     return null;
   const h = c.map((g) => {
-    const f = `${p(g.collection.title)} #${g.uid.slice(0, 4)}`, C = () => {
+    const f = `${p(g.collection.title)} ${g.uid ? `#${g.uid.slice(0, 4)}` : ""}`, C = () => {
       g.highlightBlock();
     }, b = () => {
       g.unhighlightBlock();
@@ -31686,7 +31691,8 @@ const DragHandler = (e) => {
     const v = {
       name: "$nForm",
       ctx: f,
-      collectionName: e
+      collectionName: e,
+      dataSource: m.current.dataSourceKey
     }, I = `{{ $nForm.${p} }}`;
     if (S == null)
       return;