@nocobase/client 1.3.45-beta → 1.3.47-beta

package/es/index.mjs

@@ -4140,7 +4140,7 @@ function addAppVersion(e, t) {
       addAppVersion((n = e.properties) == null ? void 0 : n[o], t);
     }), e;
 }
-const name = "@nocobase/client", version$1 = "1.3.45-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.47-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",
@@ -4161,9 +4161,9 @@ const name = "@nocobase/client", version$1 = "1.3.45-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.45-beta",
-  "@nocobase/sdk": "1.3.45-beta",
-  "@nocobase/utils": "1.3.45-beta",
+  "@nocobase/evaluators": "1.3.47-beta",
+  "@nocobase/sdk": "1.3.47-beta",
+  "@nocobase/utils": "1.3.47-beta",
   ahooks: "^3.7.2",
   antd: "5.12.8",
   "antd-style": "3.7.1",
@@ -11975,7 +11975,7 @@ function isSpecialCaseField({
   fieldSchema: t,
   getCollectionField: o
 }) {
-  if (t.default.includes("$iteration"))
+  if (!t.default || !t.default.includes("$context"))
     return !1;
   if (e && ["hasOne", "belongsTo"].includes(e.type) && t) {
     const n = getParentFieldSchema(t);
@@ -16168,7 +16168,7 @@ function getLinkageRules$1(e) {
     return (t = e["x-linkage-rules"]) == null ? void 0 : t.filter((o) => !o.disabled);
 }
 const useParseDefaultValue = () => {
-  const e = useField(), t = useFieldSchema(), o = useVariables(), n = useLocalVariables(), r = useCollectionRecord(), { isInAssignFieldValues: i, isInSetDefaultValueDialog: a, isInFormDataTemplate: l, isInSubTable: c, isInSubForm: u } = useFlag() || {}, { getField: d } = useCollection_deprecated(), { isSpecialCase: p, setDefaultValue: m } = useSpecialCase(), g = useRecordIndex(), { type: x, form: f } = useFormBlockContext(), { getOperator: C } = useOperators(), S = useDataSourceManager(), y = useCallback(
+  const e = useField(), t = useFieldSchema(), o = useVariables(), n = useLocalVariables(), r = useCollectionRecord(), { isInAssignFieldValues: i, isInSetDefaultValueDialog: a, isInFormDataTemplate: l, isInSubTable: c, isInSubForm: u } = useFlag() || {}, d = useCollection(), { isSpecialCase: p, setDefaultValue: m } = useSpecialCase(), g = useRecordIndex(), { type: x, form: f } = useFormBlockContext(), { getOperator: C } = useOperators(), S = useDataSourceManager(), y = useCallback(
     (v) => {
       let b = o == null ? void 0 : o.getVariable(v);
       return b || (b = n.find((P) => P.name === v)), b;
@@ -16182,7 +16182,7 @@ const useParseDefaultValue = () => {
     const v = (...T) => z(void 0, [...T], function* ({ forceUpdate: k = !1 } = {}) {
       if (o && e && (isVariable(t.default) && e.value == null || e.value === t.default || k)) {
         isVariable(e.value) && (yield e.reset({ forceClear: !0 })), e.loading = !0;
-        const D = !t.name.toString().includes(".") && d(t.name), {
+        const D = !t.name.toString().includes(".") && (d == null ? void 0 : d.getField(t.name)), {
           value: N,
           collectionName: V,
           dataSource: O = "main"
@@ -16219,7 +16219,7 @@ const useParseDefaultValue = () => {
       )) : console.error(`useParseDefaultValue: can not find variable ${k}`);
     } else
       e.value == null && (c || u) && e.setValue(t.default);
-  }, [t.default, n, x, C, S]);
+  }, [t.default, n, x, C, S, d]);
 }, isInherit = ({
   collectionName: e,
   targetCollectionName: t,
@@ -32371,10 +32371,10 @@ const getValues = (e, t) => castArray(e).filter((o) => o != null).map((o) => typ
       "optionFilter",
       "dataSource"
     ]), x = useDataSourceKey(), f = useDataSourceHeaders(m || x), [C, S] = useState(!1), y = useRef(!1), v = useFieldSchema(), b = ((G = v["x-component-props"]) == null ? void 0 : G.addMode) === "quickAdd", { getField: P } = useCollection_deprecated(), A = useRef(null), { getCollectionJoinField: k, getInterface: T } = useCollectionManager_deprecated(), D = v["x-collection-field"] || v.name, N = P(D) || k(D), V = u || (N == null ? void 0 : N.target) && (t == null ? void 0 : t.label) && k(`${N.target}.${t.label}`), O = useMemo(() => {
-      var H, Y;
+      var H;
       if (V != null && V.interface) {
-        const X = ((Y = (H = T(V.interface)) == null ? void 0 : H.filterable) == null ? void 0 : Y.operators[0].value) || "$includes";
-        return X !== "$eq" ? X : "$includes";
+        const Y = T(V.interface), X = ((H = Y == null ? void 0 : Y.filterable) == null ? void 0 : H.operators[0].value) || "$includes";
+        return V.type === "string" ? "$includes" : X;
       }
       return "$includes";
     }, [V]), $ = useCompile(), R = useCallback(