@nocobase/client 2.0.0-beta.2 → 2.0.0-beta.3

package/es/index.mjs

@@ -9679,7 +9679,7 @@ function addAppVersion(e, t) {
       addAppVersion((n = e.properties) == null ? void 0 : n[o], t);
     }), e;
 }
-const name = "@nocobase/client", version = "2.0.0-beta.2", 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-beta.3", license = "AGPL-3.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
   "@ahooksjs/use-url-state": "3.5.1",
   "@ant-design/cssinjs": "^1.11.1",
   "@ant-design/icons": "^5.6.1",
@@ -9702,10 +9702,10 @@ const name = "@nocobase/client", version = "2.0.0-beta.2", 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-beta.2",
-  "@nocobase/flow-engine": "2.0.0-beta.2",
-  "@nocobase/sdk": "2.0.0-beta.2",
-  "@nocobase/utils": "2.0.0-beta.2",
+  "@nocobase/evaluators": "2.0.0-beta.3",
+  "@nocobase/flow-engine": "2.0.0-beta.3",
+  "@nocobase/sdk": "2.0.0-beta.3",
+  "@nocobase/utils": "2.0.0-beta.3",
   "@tanstack/react-table": "^8.21.3",
   "@types/tabulator-tables": "^6.2.6",
   "acorn-jsx": "^5.3.2",
@@ -16269,78 +16269,83 @@ const useGetFilterOptions = () => {
   const t = useCollectionManager(), o = t == null ? void 0 : t.getCollectionFields(e);
   return useFilterFieldOptions(o);
 }, useGetFilterFieldOptions = () => {
-  var a;
-  const e = useFieldSchema(), t = ((a = e == null ? void 0 : e["x-component-props"]) == null ? void 0 : a.nonfilterable) || [], o = useCollectionManager(), n = useDataSourceManager(), r = (l, c, u) => {
-    var x, b;
-    if (t.length && c === 1 && t.includes(l.name) || !l.interface)
+  var a, l;
+  const e = useFieldSchema(), t = Array.isArray((a = e == null ? void 0 : e["x-component-props"]) == null ? void 0 : a.nonfilterable) ? (l = e == null ? void 0 : e["x-component-props"]) == null ? void 0 : l.nonfilterable : [], o = useCollectionManager(), n = useDataSourceManager(), r = (c, u, d, p) => {
+    var y, v;
+    const m = p ? `${p}.${c.name}` : c.name;
+    if (t.length && t.includes(m) || !c.interface)
       return;
-    const d = n == null ? void 0 : n.collectionFieldInterfaceManager.getFieldInterface(l.interface);
-    if (!(d != null && d.filterable) && !u)
+    const h = n == null ? void 0 : n.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: ((x = l == null ? void 0 : l.uiSchema) == null ? void 0 : x.title) || l.name,
-      schema: l == null ? void 0 : l.uiSchema,
-      interface: l.interface,
-      operators: ((b = h == null ? void 0 : h.filter) == null ? void 0 : b.call(h, (C) => !(C != null && C.visible) || C.visible(l))) || []
+    const { nested: g, children: x, operators: b } = (h == null ? void 0 : h.filterable) || {}, C = {
+      name: c.name,
+      type: c.type,
+      target: c.target,
+      title: ((y = c == null ? void 0 : c.uiSchema) == null ? void 0 : y.title) || c.name,
+      schema: c == null ? void 0 : c.uiSchema,
+      interface: c.interface,
+      operators: ((v = b == null ? void 0 : b.filter) == null ? void 0 : v.call(b, (S) => !(S != null && S.visible) || S.visible(c))) || []
     };
-    if (!(l.target && c > 2)) {
-      if (c > 2)
-        return g;
-      if (m != null && m.length && (g.children = m), p) {
-        const C = o == null ? void 0 : o.getCollectionFields(l.target), y = i(C, c + 1).filter(Boolean);
-        g.children = g.children || [], g.children.push(...y);
+    if (!(c.target && u > 2)) {
+      if (u > 2)
+        return C;
+      if (x != null && x.length && (C.children = x), g) {
+        const S = o == null ? void 0 : o.getCollectionFields(c.target), F = i(S, u + 1, d, m).filter(Boolean);
+        C.children = C.children || [], C.children.push(...F);
       }
-      return g;
+      return C;
     }
-  }, i = (l, c, u) => {
-    const d = [];
-    return l == null || l.forEach((p) => {
-      const m = r(p, c, u);
-      m && d.push(m);
-    }), d;
+  }, i = (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) => i(l, 1, c);
-}, field2option$1 = (e, t, o, n, r) => {
-  var d, p;
-  if (o.length && t === 1 && o.includes(e.name) || !e.interface || e.filterable === !1)
+  return (c, u) => i(c, 1, u);
+}, field2option$1 = (e, t, o, n, r, i) => {
+  var m, h, g, x, b;
+  const a = i ? `${i}.${e.name}` : e.name;
+  if (o.length && o.includes(a) || !e.interface || e.filterable === !1)
     return;
-  const i = n == null ? void 0 : n.collectionFieldInterfaceManager.getFieldInterface(e.interface);
-  if (!(i != null && i.filterable))
+  const l = n == null ? void 0 : n.collectionFieldInterfaceManager.getFieldInterface(e.interface);
+  if (!(l != null && l.filterable))
     return;
-  const { nested: a, children: l, operators: c } = i.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, (C) => !(C != null && C.visible) || C.visible(e))) || []
   };
   if (!(e.target && t > 2)) {
     if (t > 2)
-      return u;
-    if (l != null && l.length && (u.children = l), a) {
-      const m = n.getDataSource(e.dataSourceKey).collectionManager.getCollectionFields(e.target), h = getOptions$3(m, t + 1, o, n).filter(
-        Boolean
-      );
-      u.children = u.children || [], u.children.push(...h);
+      return p;
+    if (u != null && u.length && (p.children = u), c) {
+      const C = (g = r == null ? void 0 : r.dataSource) == null ? void 0 : g.key, y = e.dataSourceKey || C, v = y && y !== C ? ((x = n == null ? void 0 : n.getDataSource(y)) == null ? void 0 : x.collectionManager) || r : r || ((b = n == null ? void 0 : n.getDataSource(y)) == null ? void 0 : b.collectionManager), S = v == null ? void 0 : v.getCollectionFields(e.target), F = getOptions$3(
+        S || [],
+        t + 1,
+        o,
+        n,
+        v || r,
+        a
+      ).filter(Boolean);
+      p.children = p.children || [], p.children.push(...F);
     }
-    return u;
+    return p;
   }
-}, getOptions$3 = (e, t, o, n, r) => {
-  const i = [];
-  return e.forEach((a) => {
-    const l = field2option$1(a, t, o, n);
-    l && i.push(l);
-  }), i;
+}, getOptions$3 = (e = [], t, o, n, r, i) => {
+  const a = [];
+  return e.forEach((l) => {
+    const c = field2option$1(l, t, o, n, r, i);
+    c && a.push(c);
+  }), a;
 }, useFilterFieldOptions = (e) => {
-  var r;
-  const t = useFieldSchema(), o = ((r = t == null ? void 0 : t["x-component-props"]) == null ? void 0 : r.nonfilterable) || [];
-  useCollectionManager();
-  const n = useDataSourceManager();
-  return getOptions$3(e, 1, o, n);
+  var i, a;
+  const t = useFieldSchema(), o = Array.isArray((i = t == null ? void 0 : t["x-component-props"]) == null ? void 0 : i.nonfilterable) ? (a = t == null ? void 0 : t["x-component-props"]) == null ? void 0 : a.nonfilterable : [], n = useCollectionManager(), r = useDataSourceManager();
+  return getOptions$3(e, 1, o, r, n);
 }, isEmpty = (e) => Array.isArray(e) && e.length === 0 || e && Object.keys(e).length === 0 && Object.getPrototypeOf(e) === Object.prototype, removeNullCondition = (e, t = flat) => {
   const o = t(e || {}), n = {};
   for (const r in o) {