@nocobase/client 1.6.0-beta.13 → 1.6.0-beta.15

package/es/filter-provider/utils.d.ts

@@ -40,6 +40,6 @@ export declare const useFilterAPI: () => {
     /** 当前区块是否已连接其它区块 */
     isConnected: boolean;
     /** 调用该方法进行过滤 */
-    doFilter: (value: any, field?: string | ((target: FilterTarget['targets'][0]) => string), operator?: string | ((target: FilterTarget['targets'][0]) => string)) => void;
+    doFilter: (value: any, field?: string | ((target: FilterTarget['targets'][0], block: DataBlock) => string), operator?: string | ((target: FilterTarget['targets'][0]) => string)) => void;
 };
 export declare const isInFilterFormBlock: (fieldSchema: Schema) => boolean;

package/es/index.mjs

@@ -6715,7 +6715,7 @@ const mergeFilter = (e, t = "$and") => {
         const g = n.find((v) => v.uid === m.uid);
         if (!g)
           return;
-        _.isFunction(d) && (d = d(g)), _.isFunction(p) && (p = p(g));
+        _.isFunction(u) && (u = u(g, m)), _.isFunction(d) && (d = d(g, m)), _.isFunction(p) && (p = p(g));
         const h = ((b = m.service.params) == null ? void 0 : b[0]) || {}, f = ((y = (S = m.service.params) == null ? void 0 : S[1]) == null ? void 0 : y.filters) || {};
         u !== void 0 ? f[o] = {
           $and: [
@@ -9076,7 +9076,7 @@ function addAppVersion(e, t) {
       addAppVersion((o = e.properties) == null ? void 0 : o[n], t);
     }), e;
 }
-const name = "@nocobase/client", version = "1.6.0-beta.13", 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.0-beta.15", 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",
@@ -9098,9 +9098,9 @@ const name = "@nocobase/client", version = "1.6.0-beta.13", license = "AGPL-3.0"
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "1.6.0-beta.13",
-  "@nocobase/sdk": "1.6.0-beta.13",
-  "@nocobase/utils": "1.6.0-beta.13",
+  "@nocobase/evaluators": "1.6.0-beta.15",
+  "@nocobase/sdk": "1.6.0-beta.15",
+  "@nocobase/utils": "1.6.0-beta.15",
   ahooks: "^3.7.2",
   antd: "5.12.8",
   "antd-style": "3.7.1",
@@ -38754,16 +38754,12 @@ const useMenuDragEnd = () => {
   const { moveRoute: e } = useNocoBaseRoutes();
   return { onDragEnd: useCallback(
     (n) => {
-      var u, d, p, m;
-      const { active: o, over: r } = n, i = (d = (u = o == null ? void 0 : o.data) == null ? void 0 : u.current) == null ? void 0 : d.schema, a = (m = (p = r == null ? void 0 : r.data) == null ? void 0 : p.current) == null ? void 0 : m.schema;
-      if (!i || !a)
-        return;
-      const l = i.__route__.sort, c = a.__route__.sort;
-      e({
+      var l, c, u, d;
+      const { active: o, over: r } = n, i = (c = (l = o == null ? void 0 : o.data) == null ? void 0 : l.current) == null ? void 0 : c.schema, a = (d = (u = r == null ? void 0 : r.data) == null ? void 0 : u.current) == null ? void 0 : d.schema;
+      !i || !a || e({
         sourceId: i.__route__.id,
         targetId: a.__route__.id,
-        sortField: "sort",
-        method: l > c ? "prepend" : "insertAfter"
+        sortField: "sort"
       });
     },
     [e]
@@ -59446,7 +59442,7 @@ function useMenuSearch({
   })) : h, [e, c, u, h]);
 }
 const DataBlockInitializer = (e) => {
-  var B;
+  var B, $;
   const {
     templateWrap: t,
     onCreateBlockSchema: n,
@@ -59467,15 +59463,15 @@ const DataBlockInitializer = (e) => {
     currentText: b,
     otherText: S
   } = e, { insert: y, setVisible: v } = useSchemaInitializer(), F = useCompile(), { getTemplateSchemaByMode: A } = useSchemaTemplateManager(), R = useCallback(
-    ($) => q(void 0, null, function* () {
-      const { item: T, fromOthersInPopup: z } = $;
+    (T) => q(void 0, null, function* () {
+      const { item: z, fromOthersInPopup: E } = T;
       if (f)
-        return f($);
-      if (T.template) {
-        const E = yield A(T);
-        y(t ? t(E, { item: T, fromOthersInPopup: z }) : E);
+        return f(T);
+      if (z.template) {
+        const L = yield A(z);
+        y(t ? t(L, { item: z, fromOthersInPopup: E }) : L);
       } else
-        n && n({ item: T, fromOthersInPopup: z });
+        n && n({ item: z, fromOthersInPopup: E });
       v(!1);
     }),
     [A, y, v, n, f, t]
@@ -59494,24 +59490,24 @@ const DataBlockInitializer = (e) => {
     currentText: b,
     otherText: S
   }), D = useGetSchemaInitializerMenuItems(R), M = useMemo(() => D(k, i), [D, k, i]), [N, O] = useState([]), j = useMenuSearch({ data: M, openKeys: N, hideSearch: u }), w = useMemo(() => {
-    let $ = j.filter((T) => T.key !== "search" && T.key !== "empty");
-    return p && $.length === 1 ? $ = $[0].children : $ = j, [
+    let T = j.filter((z) => z.key !== "search" && z.key !== "empty");
+    return p && T.length === 1 ? T = T[0].children : T = j, [
       {
         key: i,
         label: F(a),
         icon: typeof r == "string" ? /* @__PURE__ */ jsx(antIcons__default, { type: r }) : r,
-        onClick: (T) => {
-          T.key === i && R(P(x({}, T), { item: e }));
+        onClick: (z) => {
+          z.key === i && R(P(x({}, z), { item: e }));
         },
-        children: $
+        children: T
       }
     ];
   }, [j, p, i, F, a, r, R, e]);
-  return M.length > 1 || M.length === 1 && ((B = M[0].children) == null ? void 0 : B.length) > 0 ? /* @__PURE__ */ jsx(
+  return M.length > 1 || M.length === 1 && (($ = (B = M[0]) == null ? void 0 : B.children) == null ? void 0 : $.length) > 0 ? /* @__PURE__ */ jsx(
     SchemaInitializerMenu,
     {
-      onOpenChange: ($) => {
-        O($);
+      onOpenChange: (T) => {
+        O(T);
       },
       items: w
     }