@nocobase/client 1.3.23-beta → 1.3.25-beta

package/es/index.mjs

@@ -4101,7 +4101,7 @@ function addAppVersion(e, t) {
       addAppVersion((n = e.properties) == null ? void 0 : n[o], t);
     }), e;
 }
-const name = "@nocobase/client", version$1 = "1.3.23-beta", license = "AGPL-3.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
+const name = "@nocobase/client", version$1 = "1.3.25-beta", 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.1.4",
@@ -4122,9 +4122,9 @@ const name = "@nocobase/client", version$1 = "1.3.23-beta", license = "AGPL-3.0"
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "1.3.23-beta",
-  "@nocobase/sdk": "1.3.23-beta",
-  "@nocobase/utils": "1.3.23-beta",
+  "@nocobase/evaluators": "1.3.25-beta",
+  "@nocobase/sdk": "1.3.25-beta",
+  "@nocobase/utils": "1.3.25-beta",
   ahooks: "^3.7.2",
   antd: "5.12.8",
   "antd-style": "3.4.5",
@@ -6307,13 +6307,12 @@ function getRenderContent(e, t, o, n, r) {
   return z(this, null, function* () {
     if (t && e === "handlebars")
       try {
-        try {
-          yield replaceVariableValue(t, o, n);
-        } catch (c) {
-          return null;
-        }
-        const i = Handlebars.compile(t), a = getVariablesData(n), l = i(g(g({}, o.ctxRef.current), a));
-        return yield r(l);
+        const i = Handlebars.compile(t), a = getVariablesData(n), { $nDate: l } = o.ctxRef.current, c = {};
+        Object.keys(l).map((d) => {
+          c[d] = l[d]();
+        });
+        const u = i(F(g(g({}, o.ctxRef.current), a), { $nDate: c }));
+        return yield r(u);
       } catch (i) {
         return console.log(i), t;
       }
@@ -10728,7 +10727,7 @@ const BaseVariableContext = React.createContext(null), BaseVariableProvider = (e
     const v = y.field.target;
     return new Promise((A) => {
       setTimeout(() => {
-        const T = (getChildren$2(d(f(v, u), y), {
+        const k = (getChildren$2(d(f(v, u, !0), y), {
           collectionField: e,
           uiSchema: t,
           targetFieldSchema: o,
@@ -10740,12 +10739,12 @@ const BaseVariableContext = React.createContext(null), BaseVariableProvider = (e
           isDisabled: x || isDisabledDefault,
           getCollectionField: C.getCollectionField,
           deprecated: p
-        }) || []).sort((k, D) => k.isLeaf && !D.isLeaf ? -1 : !k.isLeaf && D.isLeaf ? 1 : 0).sort((k, D) => k.disabled && !D.disabled ? 1 : !k.disabled && D.disabled ? -1 : 0);
-        if (T.length === 0) {
+        }) || []).sort((D, $) => D.isLeaf && !$.isLeaf ? -1 : !D.isLeaf && $.isLeaf ? 1 : 0).sort((D, $) => D.disabled && !$.disabled ? 1 : !D.disabled && $.disabled ? -1 : 0);
+        if (k.length === 0) {
           y.disabled = !0, y.isLeaf = !0, A();
           return;
         }
-        y.children = T, A();
+        y.children = k, A();
       }, 5);
     });
   };
@@ -17720,7 +17719,7 @@ const SchemaSettingsDefaultValue = function e(t) {
           type: "switch",
           useVisible() {
             const e = useCollection(), { collectionField: t } = useColumnSchema$1(), { getInterface: o } = useCollectionManager_deprecated(), n = o(t == null ? void 0 : t.interface), { currentMode: r } = useAssociationFieldContext();
-            return (n == null ? void 0 : n.sortable) === !0 && !r && (e == null ? void 0 : e.name) === (t == null ? void 0 : t.collectionName);
+            return (n == null ? void 0 : n.sortable) === !0 && !r && ((e == null ? void 0 : e.name) === (t == null ? void 0 : t.collectionName) || !(t != null && t.collectionName));
           },
           useComponentProps() {
             const e = useField(), { t } = useTranslation(), o = useFieldSchema(), { dn: n } = useDesignable();
@@ -23773,48 +23772,48 @@ Filter.Action = FilterAction;
 Filter.Action.Designer = FilterActionDesigner;
 const useGetFilterOptions = () => {
   const { getCollectionFields: e } = useCollectionManager_deprecated(), t = useGetFilterFieldOptions();
-  return (o, n) => {
-    const r = e(o, n);
-    return t(r);
+  return (o, n, r) => {
+    const i = e(o, n);
+    return t(i, r);
   };
 }, useFilterOptions = (e) => {
   const { getCollectionFields: t } = useCollectionManager_deprecated(), o = t(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) || [], { getCollectionFields: o, getInterface: n } = useCollectionManager_deprecated(), r = (l, c) => {
-    var f, x;
+  const e = useFieldSchema(), t = ((a = e == null ? void 0 : e["x-component-props"]) == null ? void 0 : a.nonfilterable) || [], { getCollectionFields: o, getInterface: n } = useCollectionManager_deprecated(), r = (l, c, u) => {
+    var x, C;
     if (t.length && c === 1 && t.includes(l.name) || !l.interface)
       return;
-    const u = n(l.interface);
-    if (!(u != null && u.filterable))
+    const d = n(l.interface);
+    if (!(d != null && d.filterable) && !u)
       return;
-    const { nested: d, children: p, operators: m } = u.filterable, h = {
+    const { nested: p, children: m, operators: h } = (d == null ? void 0 : d.filterable) || {}, f = {
       name: l.name,
       type: l.type,
       target: l.target,
-      title: ((f = l == null ? void 0 : l.uiSchema) == null ? void 0 : f.title) || l.name,
+      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: ((x = m == null ? void 0 : m.filter) == null ? void 0 : x.call(m, (C) => !(C != null && C.visible) || C.visible(l))) || []
+      operators: ((C = h == null ? void 0 : h.filter) == null ? void 0 : C.call(h, (S) => !(S != null && S.visible) || S.visible(l))) || []
     };
     if (!(l.target && c > 2)) {
       if (c > 2)
-        return h;
-      if (p != null && p.length && (h.children = p), d) {
-        const C = o(l.target), S = i(C, c + 1).filter(Boolean);
-        h.children = h.children || [], h.children.push(...S);
+        return f;
+      if (m != null && m.length && (f.children = m), p) {
+        const S = o(l.target), b = i(S, c + 1).filter(Boolean);
+        f.children = f.children || [], f.children.push(...b);
       }
-      return h;
+      return f;
     }
-  }, i = (l, c) => {
-    const u = [];
-    return l.forEach((d) => {
-      const p = r(d, c);
-      p && u.push(p);
-    }), u;
+  }, i = (l, c, u) => {
+    const d = [];
+    return l.forEach((p) => {
+      const m = r(p, c, u);
+      m && d.push(m);
+    }), d;
   };
-  return (l) => i(l, 1);
+  return (l, c) => i(l, 1, c);
 }, useFilterFieldOptions = (e) => {
   var l;
   const t = useFieldSchema(), o = ((l = t == null ? void 0 : t["x-component-props"]) == null ? void 0 : l.nonfilterable) || [], { getCollectionFields: n, getInterface: r } = useCollectionManager_deprecated(), i = (c, u) => {

package/es/schema-component/antd/filter/useFilterActionProps.d.ts

@@ -6,9 +6,9 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
-export declare const useGetFilterOptions: () => (collectionName: any, dataSource?: string) => any[];
+export declare const useGetFilterOptions: () => (collectionName: any, dataSource?: string, usedInVariable?: boolean) => any[];
 export declare const useFilterOptions: (collectionName: string) => any[];
-export declare const useGetFilterFieldOptions: () => (fields: any) => any[];
+export declare const useGetFilterFieldOptions: () => (fields: any, usedInVariable: any) => any[];
 export declare const useFilterFieldOptions: (fields: any) => any[];
 export declare const removeNullCondition: (filter: any, customFlat?: any) => any;
 export declare const useFilterActionProps: () => {