@nocobase/client 1.4.30 → 1.4.32

package/es/collection-manager/interfaces/checkbox.d.ts

@@ -48,10 +48,30 @@ export declare class CheckboxFieldInterface extends CollectionFieldInterface {
             value: string;
             selected: boolean;
             noValue: boolean;
+            schema: {
+                'x-component': string;
+                'x-component-props': {
+                    multiple: boolean;
+                    options: {
+                        label: string;
+                        value: boolean;
+                    }[];
+                };
+            };
         } | {
             label: string;
             value: string;
             noValue: boolean;
+            schema: {
+                'x-component': string;
+                'x-component-props': {
+                    multiple: boolean;
+                    options: {
+                        label: string;
+                        value: boolean;
+                    }[];
+                };
+            };
             selected?: undefined;
         })[];
     };

package/es/collection-manager/interfaces/properties/operators.d.ts

@@ -184,10 +184,30 @@ export declare const boolean: ({
     value: string;
     selected: boolean;
     noValue: boolean;
+    schema: {
+        'x-component': string;
+        'x-component-props': {
+            multiple: boolean;
+            options: {
+                label: string;
+                value: boolean;
+            }[];
+        };
+    };
 } | {
     label: string;
     value: string;
     noValue: boolean;
+    schema: {
+        'x-component': string;
+        'x-component-props': {
+            multiple: boolean;
+            options: {
+                label: string;
+                value: boolean;
+            }[];
+        };
+    };
     selected?: undefined;
 })[];
 export declare const tableoid: {

package/es/index.mjs

@@ -54,7 +54,7 @@ export * from "@emotion/css";
 import jsxRuntime, { jsx, Fragment, jsxs } from "react/jsx-runtime";
 import * as formilyReact from "@formily/react";
 import { SchemaOptionsContext, SchemaExpressionScopeContext, Schema, useField, useFieldSchema, useExpressionScope, connect, mapProps, useForm, Observer, observer as observer$1, SchemaComponentsContext, ExpressionScope, FormProvider as FormProvider$1, RecursionField, mapReadPretty, FormContext, useFormEffects, FieldContext, ObjectField, ArrayField, createSchemaField, SchemaContext } from "@formily/react";
-import _, { filter, get, capitalize, cloneDeep as cloneDeep$1, isArray, uniqBy, every, some, findIndex, set as set$1, isObject as isObject$1, isString, isEmpty as isEmpty$1, isEqual, last, concat, clone, debounce, castArray, differenceBy, unionBy, omit as omit$1, isFunction as isFunction$1, isBoolean, uniq as uniq$2, pick as pick$1 } from "lodash";
+import _, { filter, get, capitalize, cloneDeep as cloneDeep$1, isArray, uniqBy, every, some, findIndex, set as set$1, isObject as isObject$1, isString, isEmpty as isEmpty$1, isEqual, concat, last, clone, debounce, castArray, differenceBy, unionBy, omit as omit$1, isFunction as isFunction$1, isBoolean, uniq as uniq$2, pick as pick$1 } from "lodash";
 import React, { createContext, useContext, useCallback, useRef, useEffect, isValidElement, useMemo, useState, memo, createElement, Fragment as Fragment$1, useLayoutEffect, useTransition, forwardRef, useImperativeHandle, createRef, startTransition } from "react";
 import * as ReactRouterDom from "react-router-dom";
 import { useNavigate, useLocation, Outlet, useHref, UNSAFE_RouteContext, UNSAFE_LocationContext, useRoutes, HashRouter, BrowserRouter, MemoryRouter, useParams, Link as Link$1, Navigate, NavLink, useSearchParams, useOutletContext, useMatch, Router } from "react-router-dom";
@@ -4277,7 +4277,19 @@ const useAttach = (e) => {
   const t = useContext(SchemaOptionsContext), o = useContext(SchemaExpressionScopeContext);
   return (n, r) => {
     let i = !1, a;
-    if (typeof n == "string" && n.startsWith("{{") && (i = !0, a = n), n && typeof n == "object" && !isValidElement(n) && (a = JSON.stringify(n), i = hasVariable(a)), Array.isArray(n) && (i = hasVariable(JSON.stringify(n))), i) {
+    if (typeof n == "string" && n.startsWith("{{") && (i = !0, a = n), n && typeof n == "object" && !isValidElement(n))
+      try {
+        a = JSON.stringify(n), i = hasVariable(a);
+      } catch (l) {
+        console.error(l), i = !1;
+      }
+    if (Array.isArray(n))
+      try {
+        i = hasVariable(JSON.stringify(n));
+      } catch (l) {
+        console.error(l), i = !1;
+      }
+    if (i) {
       const l = x(x(x({}, t.scope), o), r);
       if (!a)
         return Schema.compile(n, l);
@@ -4301,7 +4313,7 @@ function addAppVersion(e, t) {
       addAppVersion((n = e.properties) == null ? void 0 : n[o], t);
     }), e;
 }
-const name = "@nocobase/client", version$1 = "1.4.30", 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.4.32", 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",
@@ -4323,9 +4335,9 @@ const name = "@nocobase/client", version$1 = "1.4.30", license = "AGPL-3.0", mai
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "1.4.30",
-  "@nocobase/sdk": "1.4.30",
-  "@nocobase/utils": "1.4.30",
+  "@nocobase/evaluators": "1.4.32",
+  "@nocobase/sdk": "1.4.32",
+  "@nocobase/utils": "1.4.32",
   ahooks: "^3.7.2",
   antd: "5.12.8",
   "antd-style": "3.7.1",
@@ -5730,8 +5742,49 @@ const date = dayjs(), spaceCSS = css`
   { label: '{{t("is empty")}}', value: "$empty", noValue: !0 },
   { label: '{{t("is not empty")}}', value: "$notEmpty", noValue: !0 }
 ], boolean = [
-  { label: '{{t("Yes")}}', value: "$isTruly", selected: !0, noValue: !0 },
-  { label: '{{t("No")}}', value: "$isFalsy", noValue: !0 }
+  {
+    label: '{{t("Yes")}}',
+    value: "$isTruly",
+    selected: !0,
+    noValue: !0,
+    schema: {
+      "x-component": "Select",
+      "x-component-props": {
+        multiple: !1,
+        options: [
+          {
+            label: '{{t("Yes")}}',
+            value: !0
+          },
+          {
+            label: '{{t("No")}}',
+            value: !1
+          }
+        ]
+      }
+    }
+  },
+  {
+    label: '{{t("No")}}',
+    value: "$isFalsy",
+    noValue: !0,
+    schema: {
+      "x-component": "Select",
+      "x-component-props": {
+        multiple: !1,
+        options: [
+          {
+            label: '{{t("Yes")}}',
+            value: !0
+          },
+          {
+            label: '{{t("No")}}',
+            value: !1
+          }
+        ]
+      }
+    }
+  }
 ], tableoid = [
   {
     label: '{{t("is any of")}}',
@@ -11397,13 +11450,13 @@ const ParentCollectionProvider = (e) => {
   const e = useCollectionField();
   return e ? `${e.collectionName}.${e.name}` : null;
 }, useCurrentParentRecordContext = () => {
-  var l, c;
-  const e = useCollectionRecord(), { name: t, dataSource: o } = useParentCollection() || {}, n = useCollection(), { isInSubForm: r, isInSubTable: i } = useFlag() || {}, a = t ? o : n == null ? void 0 : n.dataSource;
+  var c, u;
+  const e = useCollectionRecord(), { name: t, dataSource: o } = useParentCollection() || {}, n = useCollection(), { isInSubForm: r, isInSubTable: i } = useFlag() || {}, a = t ? o : n == null ? void 0 : n.dataSource, l = useCollectionField();
   return {
     // 当该变量使用在区块数据范围的时候，由于某些区块（如 Table）是在 DataBlockProvider 之前解析 filter 的，
     // 导致此时 record.parentRecord 的值还是空的，此时正确的值应该是 record，所以在后面加了 record?.data 来防止这种情况
-    currentParentRecordCtx: ((l = e == null ? void 0 : e.parentRecord) == null ? void 0 : l.data) || (e == null ? void 0 : e.data),
-    shouldDisplayCurrentParentRecord: !!((c = e == null ? void 0 : e.parentRecord) != null && c.data) && !r && !i,
+    currentParentRecordCtx: ((c = e == null ? void 0 : e.parentRecord) == null ? void 0 : c.data) || (e == null ? void 0 : e.data),
+    shouldDisplayCurrentParentRecord: !!((u = e == null ? void 0 : e.parentRecord) != null && u.data) && !r && !i && l,
     // 在后面加上 collection?.name 的原因如上面的变量一样
     collectionName: t || (n == null ? void 0 : n.name),
     dataSource: a
@@ -12518,7 +12571,7 @@ const useDef$3 = () => ({}), useProps = (e = {}) => {
   return x(x({}, o), r);
 }, PopupLevelContext = React.createContext(0), ActionContainer = observer$1(
   (e) => {
-    const { getComponentByOpenMode: t, defaultOpenMode: o } = useOpenModeContext(), { openMode: n = o } = useActionContext(), i = React.useContext(PopupLevelContext) + 1, a = t(n);
+    const { getComponentByOpenMode: t, defaultOpenMode: o } = useOpenModeContext() || {}, { openMode: n = o } = useActionContext(), i = React.useContext(PopupLevelContext) + 1, a = t(n) || ActionDrawer;
     return /* @__PURE__ */ jsx(PopupLevelContext.Provider, { value: i, children: /* @__PURE__ */ jsx(a, x({ footerNodeName: "Action.Container.Footer", level: i || 1 }, e)) });
   },
   { displayName: "ActionContainer" }
@@ -13371,9 +13424,106 @@ const useCollectOperator = () => {
   }, [e.name, o]), e["x-filter-operator"] && t(e.name, e["x-filter-operator"]);
 }, useFormItemProps = () => {
   useCollectOperator();
-}, FilterFormBlockProvider = withDynamicSchemaProps((e) => {
+}, isPatternDisabled = (e) => {
+  var t;
+  return ((t = e == null ? void 0 : e["x-component-props"]) == null ? void 0 : t["pattern-disable"]) == !0;
+}, DefaultValueContext = React.createContext(null), DefaultValueProvider = (e) => {
+  const t = useMemo(() => ({
+    isAllowToSetDefaultValue: e.isAllowToSetDefaultValue
+  }), [e.isAllowToSetDefaultValue]);
+  return /* @__PURE__ */ jsx(DefaultValueContext.Provider, { value: t, children: e.children });
+}, useIsAllowToSetDefaultValue = ({ form: e, fieldSchema: t, collectionField: o } = {}) => {
+  const n = useDataSourceManager(), r = useCollectionManager(), i = useCollection(), { form: a } = useFormBlockContext(), l = useFieldSchema(), { type: c } = useFormBlockType(), { isAllowToSetDefaultValue: u = _isAllowToSetDefaultValue } = useContext(DefaultValueContext) || {};
+  return {
+    isAllowToSetDefaultValue: useCallback(
+      (p) => {
+        const m = i.getField(l.name) || r.getCollectionField(l["x-collection-field"]);
+        return u({
+          collectionField: o || m,
+          getInterface: n == null ? void 0 : n.collectionFieldInterfaceManager.getFieldInterface.bind(n == null ? void 0 : n.collectionFieldInterfaceManager),
+          form: e || a,
+          formBlockType: c,
+          fieldSchema: t || l,
+          isSubTableColumn: p
+        });
+      },
+      [
+        r,
+        i,
+        o,
+        n == null ? void 0 : n.collectionFieldInterfaceManager,
+        t,
+        e,
+        l,
+        a,
+        u,
+        c
+      ]
+    )
+  };
+}, interfacesOfUnsupportedDefaultValue = [
+  "o2o",
+  "oho",
+  "obo",
+  "o2m",
+  "attachment",
+  "expression",
+  "point",
+  "lineString",
+  "circle",
+  "polygon",
+  "sequence",
+  "formula"
+];
+function _isAllowToSetDefaultValue({
+  collectionField: e,
+  getInterface: t,
+  formBlockType: o,
+  form: n,
+  fieldSchema: r,
+  isSubTableColumn: i
+}) {
+  var a;
+  return i ? !interfacesOfUnsupportedDefaultValue.includes(e == null ? void 0 : e.interface) && !isSystemField(e, t) : !e || e.target && ((a = r["x-component-props"]) != null && a.mode) && !["Picker", "Select"].includes(r["x-component-props"].mode) || o !== "create" ? !1 : !(n != null && n.readPretty) && !isPatternDisabled(r) && !interfacesOfUnsupportedDefaultValue.includes(e == null ? void 0 : e.interface) && !isSystemField(e, t);
+}
+const setFieldProps$1 = (e, t, o) => {
+  untracked(() => {
+    e[t] === void 0 && (e[t] = o);
+  });
+}, setRequired$1 = (e, t, o) => {
+  typeof t.required == "undefined" && (e.required = !!o.required);
+}, FilterCollectionFieldInternalField = (e) => {
+  var g, f, C, S;
+  const t = useCompile(), o = useField(), n = useFieldSchema(), { getInterface: r } = useCollectionManager_deprecated(), { uiSchema: i, defaultValue: a, interface: l } = useCollectionField(), { isAllowToSetDefaultValue: c } = useIsAllowToSetDefaultValue(), u = r(l), d = (f = (g = u == null ? void 0 : u.filterable) == null ? void 0 : g.operators) == null ? void 0 : f.find(
+    (b, y) => b.value === n["x-filter-operator"] || y === 0
+  ), p = useComponent(
+    ((C = d == null ? void 0 : d.schema) == null ? void 0 : C["x-component"]) || ((S = n["x-component-props"]) == null ? void 0 : S.component) || (i == null ? void 0 : i["x-component"]) || "Input"
+  ), m = useFormBlockContext(), h = useDynamicComponentProps(i == null ? void 0 : i["x-use-component-props"], e);
+  return useEffect(() => {
+    var F;
+    if (!i)
+      return;
+    const b = t(i);
+    if (setFieldProps$1(o, "content", b["x-content"]), setFieldProps$1(o, "title", b.title), setFieldProps$1(o, "description", b.description), m != null && m.form) {
+      const P = c() ? n.default || a : void 0;
+      P != null && setFieldProps$1(o, "initialValue", P);
+    }
+    if (!o.validator && (b["x-validator"] || n["x-validator"])) {
+      const P = concat([], b["x-validator"] || [], n["x-validator"] || []);
+      o.validator = P;
+    }
+    n["x-disabled"] === !0 && (o.disabled = !0), n["x-read-pretty"] === !0 && (o.readPretty = !0), setRequired$1(o, n, b), o.dataSource = b.enum;
+    const y = t(x(x({}, ((F = d == null ? void 0 : d.schema) == null ? void 0 : F["x-component-props"]) || {}), b["x-component-props"] || {})) || {};
+    o.componentProps = merge(y, o.componentProps || {}, h || {});
+  }, [i]), i ? /* @__PURE__ */ jsx(p, x(x({}, e), h)) : null;
+}, FilterCollectionField = connect((e) => {
+  const t = useFieldSchema();
+  return useField(), /* @__PURE__ */ jsx(ErrorBoundary, { FallbackComponent: ErrorFallback.Modal, onError: (o) => console.log(o), children: /* @__PURE__ */ jsx(CollectionFieldProvider, { name: t.name, children: /* @__PURE__ */ jsx(FilterCollectionFieldInternalField, x({}, e)) }) });
+});
+FilterCollectionField.displayName = "FilterCollectionField";
+const FilterFormBlockProvider = withDynamicSchemaProps((e) => {
   const o = useFieldSchema()["x-filter-operators"] || {};
-  return /* @__PURE__ */ jsx(CollectOperators, { defaultOperators: o, children: /* @__PURE__ */ jsx(DatePickerProvider, { value: { utc: !1 }, children: /* @__PURE__ */ jsx(
+  return /* @__PURE__ */ jsx(SchemaComponentOptions, { components: { CollectionField: FilterCollectionField }, children: /* @__PURE__ */ jsx(CollectOperators, { defaultOperators: o, children: /* @__PURE__ */ jsx(DatePickerProvider, { value: { utc: !1 }, children: /* @__PURE__ */ jsx(
     ActionBarProvider,
     {
       forceProps: {
@@ -13385,7 +13535,7 @@ const useCollectOperator = () => {
       },
       children: /* @__PURE__ */ jsx(DefaultValueProvider, { isAllowToSetDefaultValue: () => !1, children: /* @__PURE__ */ jsx(FormBlockProvider, x({ name: "filter-form" }, e)) })
     }
-  ) }) });
+  ) }) }) });
 }), FormFieldContext = createContext({});
 FormFieldContext.displayName = "FormFieldContext";
 const InternalFormFieldProvider = (e) => {
@@ -14267,17 +14417,17 @@ function useTableColumnInitializerFields() {
   });
 }
 function useAssociatedTableColumnInitializerFields() {
-  var l;
-  const { name: e, fields: t } = useCollection_deprecated(), { t: o } = useTranslation(), { getInterface: n, getCollectionFields: r, getCollection: i } = useCollectionManager_deprecated();
-  return (l = t == null ? void 0 : t.filter((c) => ["o2o", "oho", "obo", "m2o"].includes(c.interface))) == null ? void 0 : l.map((c) => getGroupItemForTable({
-    getCollectionFields: r,
-    field: c,
-    getInterface: n,
-    getCollection: i,
-    schemaName: c.name,
+  var a;
+  const { fields: e } = useCollection_deprecated(), { t } = useTranslation(), { getInterface: o, getCollectionFields: n, getCollection: r } = useCollectionManager_deprecated();
+  return (a = e == null ? void 0 : e.filter((l) => ["o2o", "oho", "obo", "m2o"].includes(l.interface))) == null ? void 0 : a.map((l) => getGroupItemForTable({
+    getCollectionFields: n,
+    field: l,
+    getInterface: o,
+    getCollection: r,
+    schemaName: l.name,
     maxDepth: 2,
     depth: 1,
-    t: o
+    t
   }));
 }
 function getGroupItemForTable({
@@ -16155,69 +16305,7 @@ const createSubmitActionSettings = new SchemaSettings({
     ] });
   },
   { displayName: "GeneralSchemaItems" }
-), isPatternDisabled = (e) => {
-  var t;
-  return ((t = e == null ? void 0 : e["x-component-props"]) == null ? void 0 : t["pattern-disable"]) == !0;
-}, DefaultValueContext = React.createContext(null), DefaultValueProvider = (e) => {
-  const t = useMemo(() => ({
-    isAllowToSetDefaultValue: e.isAllowToSetDefaultValue
-  }), [e.isAllowToSetDefaultValue]);
-  return /* @__PURE__ */ jsx(DefaultValueContext.Provider, { value: t, children: e.children });
-}, useIsAllowToSetDefaultValue = ({ form: e, fieldSchema: t, collectionField: o } = {}) => {
-  const n = useDataSourceManager(), r = useCollectionManager(), i = useCollection(), { form: a } = useFormBlockContext(), l = useFieldSchema(), { type: c } = useFormBlockType(), { isAllowToSetDefaultValue: u = _isAllowToSetDefaultValue } = useContext(DefaultValueContext) || {};
-  return {
-    isAllowToSetDefaultValue: useCallback(
-      (p) => {
-        const m = i.getField(l.name) || r.getCollectionField(l["x-collection-field"]);
-        return u({
-          collectionField: o || m,
-          getInterface: n == null ? void 0 : n.collectionFieldInterfaceManager.getFieldInterface.bind(n == null ? void 0 : n.collectionFieldInterfaceManager),
-          form: e || a,
-          formBlockType: c,
-          fieldSchema: t || l,
-          isSubTableColumn: p
-        });
-      },
-      [
-        r,
-        i,
-        o,
-        n == null ? void 0 : n.collectionFieldInterfaceManager,
-        t,
-        e,
-        l,
-        a,
-        u,
-        c
-      ]
-    )
-  };
-}, interfacesOfUnsupportedDefaultValue = [
-  "o2o",
-  "oho",
-  "obo",
-  "o2m",
-  "attachment",
-  "expression",
-  "point",
-  "lineString",
-  "circle",
-  "polygon",
-  "sequence",
-  "formula"
-];
-function _isAllowToSetDefaultValue({
-  collectionField: e,
-  getInterface: t,
-  formBlockType: o,
-  form: n,
-  fieldSchema: r,
-  isSubTableColumn: i
-}) {
-  var a;
-  return i ? !interfacesOfUnsupportedDefaultValue.includes(e == null ? void 0 : e.interface) && !isSystemField(e, t) : !e || e.target && ((a = r["x-component-props"]) != null && a.mode) && !["Picker", "Select"].includes(r["x-component-props"].mode) || o !== "create" ? !1 : !(n != null && n.readPretty) && !isPatternDisabled(r) && !interfacesOfUnsupportedDefaultValue.includes(e == null ? void 0 : e.interface) && !isSystemField(e, t);
-}
-const validateJSON$1 = {
+), validateJSON$1 = {
   validator: `{{(value, rule)=> {
     if (!value) {
       return '';
@@ -25433,7 +25521,7 @@ const getAppends = ({
       }
     } else
       [
-        "ActionBar",
+        // 'ActionBar',
         "Action",
         "Action.Link",
         "Action.Modal",
@@ -25468,7 +25556,7 @@ const getAppends = ({
       getCollectionJoinField: t,
       getCollection: o,
       dataSource: e
-    }), a = fillParentFields(a), console.log("appends", a), { appends: [...a], updateAssociationValues: [...i] };
+    }), a = fillParentFields(a), { appends: [...a], updateAssociationValues: [...i] };
   } };
 };
 function getTargetField(e) {
@@ -26478,43 +26566,51 @@ function forEachLinkageRule(e, t) {
     });
   });
 }
-const useLinkageRulesForSubTableOrSubForm = () => {
-  const { isInSubForm: e, isInSubTable: t } = useFlag();
-  if (!e && !t)
-    return;
-  const o = useField(), n = useFieldSchema(), { fieldSchema: r, formValue: i } = useSubFormValue(), a = useLocalVariables(), l = useVariables(), c = getLinkageRules$1(r);
+const isSubFormOrSubTableField = (e) => {
+  for (; e; ) {
+    if (isSubMode(e))
+      return !0;
+    if (e["x-component"] === "FormV2")
+      return !1;
+    e = e.parent;
+  }
+  return !1;
+}, useLinkageRulesForSubTableOrSubForm = () => {
+  const e = useFieldSchema(), t = useField(), { fieldSchema: o, formValue: n } = useSubFormValue(), r = useLocalVariables(), i = useVariables(), a = getLinkageRules$1(o);
   useEffect(() => {
-    if (!o.onUnmount.__rested) {
-      const d = o.onUnmount;
-      o.onUnmount = () => {
-        var p;
-        (p = o.__disposes) == null || p.forEach((m) => {
-          m();
-        }), d();
-      }, o.onUnmount.__rested = !0;
+    if (!isSubFormOrSubTableField(e))
+      return;
+    if (!t.onUnmount.__rested) {
+      const c = t.onUnmount;
+      t.onUnmount = () => {
+        var u;
+        (u = t.__disposes) == null || u.forEach((d) => {
+          d();
+        }), c();
+      }, t.onUnmount.__rested = !0;
     }
-    if (!c)
+    if (!a)
       return;
-    o.__disposes && o.__disposes.forEach((d) => {
-      d();
+    t.__disposes && t.__disposes.forEach((c) => {
+      c();
     });
-    const u = o.__disposes = [];
-    forEachLinkageRule(c, (d, p) => {
-      var m;
-      (m = d.targetFields) != null && m.includes(n.name) && u.push(
+    const l = t.__disposes = [];
+    forEachLinkageRule(a, (c, u) => {
+      var d;
+      (d = c.targetFields) != null && d.includes(e.name) && l.push(
         bindLinkageRulesToFiled({
-          field: o,
-          linkageRules: c,
-          formValues: i,
-          localVariables: a,
-          action: d,
-          rule: p,
-          variables: l,
+          field: t,
+          linkageRules: a,
+          formValues: n,
+          localVariables: r,
+          action: c,
+          rule: u,
+          variables: i,
           variableNameOfLeftCondition: "$iteration"
         })
       );
-    }), o.__linkageRules = c;
-  }, [o, n == null ? void 0 : n.name, i, JSON.stringify(c), a, l]);
+    }), t.__linkageRules = a;
+  }, [t, e == null ? void 0 : e.name, n, JSON.stringify(a), r, i]);
 };
 function getLinkageRules$1(e) {
   var t;
@@ -32362,7 +32458,11 @@ const tableBlockSettings = new SchemaSettings({
         return e && !t;
       }
     }),
-    getAllowMultiple({ title: "Allow multiple selection" }),
+    v(x({}, getAllowMultiple({ title: "Allow multiple selection" })), {
+      useVisible() {
+        return useField().componentProps.multiple !== !1;
+      }
+    }),
     v(x({}, titleField$1), {
       useVisible: useIsAssociationField
     }),
@@ -34086,9 +34186,9 @@ const ReadPretty$b = observer$1(
   return ((o = t == null ? void 0 : t.label) != null ? o : "").toLowerCase().includes((e || "").toLowerCase());
 }, InternalSelect = connect(
   (e) => {
-    const u = e, { objectValue: t, loading: o, value: n, rawOptions: r, defaultValue: i } = u, a = K(u, ["objectValue", "loading", "value", "rawOptions", "defaultValue"]);
-    let l = e.multiple ? "multiple" : e.mode;
-    if (l && !["multiple", "tags"].includes(l) && (l = void 0), t)
+    const d = e, { objectValue: t, loading: o, value: n, rawOptions: r, defaultValue: i } = d, a = K(d, ["objectValue", "loading", "value", "rawOptions", "defaultValue"]), l = useCompile();
+    let c = e.multiple ? "multiple" : e.mode;
+    if (c && !["multiple", "tags"].includes(c) && (c = void 0), t)
       return /* @__PURE__ */ jsx(
         ObjectSelect,
         v(x({
@@ -34096,16 +34196,16 @@ const ReadPretty$b = observer$1(
         }, a), {
           defaultValue: i,
           value: n,
-          mode: l,
+          mode: c,
           loading: o
         })
       );
-    const c = (d) => ["tags", "multiple"].includes(e.mode) || e.multiple ? d ? toArr$3(d) : void 0 : d;
+    const u = (p) => ["tags", "multiple"].includes(e.mode) || e.multiple ? p ? toArr$3(p) : void 0 : p;
     return /* @__PURE__ */ jsx(
       Select$1,
       v(x({
         role: "button",
-        "data-testid": `select-${l || "single"}`,
+        "data-testid": `select-${c || "single"}`,
         showSearch: !0,
         filterOption,
         allowClear: {
@@ -34113,27 +34213,27 @@ const ReadPretty$b = observer$1(
         },
         popupMatchSelectWidth: !1,
         notFoundContent: o ? /* @__PURE__ */ jsx(Spin, {}) : /* @__PURE__ */ jsx(Empty, { image: Empty.PRESENTED_IMAGE_SIMPLE }),
-        value: c(n),
-        defaultValue: c(i),
-        tagRender: (d) => (
+        value: u(n),
+        defaultValue: u(i),
+        tagRender: (p) => (
           // @ts-ignore
           /* @__PURE__ */ jsx(
             Tag,
             v(x({
               role: "button",
-              "aria-label": d.label,
+              "aria-label": p.label,
               closeIcon: /* @__PURE__ */ jsx(CloseOutlined, { role: "button", "aria-label": "icon-close-tag" })
-            }, d), {
-              children: d.label
+            }, p), {
+              children: p.label
             })
           )
         )
-      }, a), {
-        onChange: (d) => {
-          var p;
-          (p = e.onChange) == null || p.call(e, d === void 0 ? null : d);
+      }, l(a)), {
+        onChange: (p) => {
+          var m;
+          (m = e.onChange) == null || m.call(e, p === void 0 ? null : p);
         },
-        mode: l,
+        mode: c,
         maxTagCount: "responsive"
       })
     );
@@ -35929,7 +36029,7 @@ const AppendsTreeSelect = (e) => {
           CustomDropdownRender: m === "quickAdd" && P
         })
       ),
-      m === "modalAdd" && /* @__PURE__ */ jsx(SchemaComponentContext.Provider, { value: v(x({}, y), { draggable: !1 }), children: /* @__PURE__ */ jsx(RecordProvider, { isNew: !0, record: null, parent: b, children: /* @__PURE__ */ jsx(ClearCollectionFieldContext, { children: /* @__PURE__ */ jsx(
+      m === "modalAdd" && /* @__PURE__ */ jsx(SchemaComponentContext.Provider, { value: v(x({}, y), { draggable: !1 }), children: /* @__PURE__ */ jsx(RecordProvider, { isNew: !0, record: null, parent: b, children: /* @__PURE__ */ jsx(VariablePopupRecordProvider, { children: /* @__PURE__ */ jsx(ClearCollectionFieldContext, { children: /* @__PURE__ */ jsx(
         RecursionField,
         {
           onlyRenderProperties: !0,
@@ -35937,7 +36037,7 @@ const AppendsTreeSelect = (e) => {
           schema: i,
           filterProperties: (A) => A["x-component"] === "Action"
         }
-      ) }) }) })
+      ) }) }) }) })
     ] }) }, i.name);
   },
   { displayName: "AssociationSelect" }
@@ -37981,7 +38081,7 @@ const CreateRecordAction$1 = forwardRef(InternalCreateRecordAction), initializer
     };
     return /* @__PURE__ */ jsxs(CollectionProvider_deprecated, { name: a == null ? void 0 : a.target, children: [
       /* @__PURE__ */ jsx(CreateAction, v(x({}, e), { onClick: (f) => g(f) })),
-      /* @__PURE__ */ jsx(ActionContextProvider, { value: v(x({}, n), { visible: l, setVisible: c }), children: /* @__PURE__ */ jsx(CollectionProvider_deprecated, { name: d, dataSource: m, children: /* @__PURE__ */ jsx(
+      /* @__PURE__ */ jsx(ActionContextProvider, { value: v(x({}, n), { visible: l, setVisible: c }), children: /* @__PURE__ */ jsx(CollectionProvider_deprecated, { name: d, dataSource: m, children: /* @__PURE__ */ jsx(TabsContextProvider, { children: /* @__PURE__ */ jsx(
         RecursionField,
         {
           onlyRenderProperties: !0,
@@ -37989,7 +38089,7 @@ const CreateRecordAction$1 = forwardRef(InternalCreateRecordAction), initializer
           schema: o,
           filterProperties: (f) => f["x-component"] === "AssociationField.AddNewer"
         }
-      ) }) })
+      ) }) }) })
     ] });
   },
   { displayName: "CreateRecordAction" }
@@ -52954,12 +53054,12 @@ const useBlockContext = () => useContext(BlockContext), useCompatDataBlockParent
   const { association: e } = useDataBlockProps();
   return useContext(BlockAssociationContext) || e;
 }, useFilterByTk = (e) => {
-  const { resource: t, __parent: o } = useBlockRequestContext(), n = useRecordIndex(), r = useCollectionRecordData(), i = useCollection_deprecated(), { getCollectionField: a } = useCollectionManager_deprecated(), l = useBlockAssociationContext(), c = (e == null ? void 0 : e.association) || l;
-  if (!useContext(WithoutTableFieldResource) && (t instanceof TableFieldResource || (o == null ? void 0 : o.block) === "TableField"))
+  const { resource: t, __parent: o } = useBlockRequestContext(), n = useRecordIndex(), r = useCollectionRecordData(), i = useCollection_deprecated(), a = useBlockAssociationContext(), l = (e == null ? void 0 : e.association) || a, c = useContext(WithoutTableFieldResource), u = useCollectionManager();
+  if (!c && (t instanceof TableFieldResource || (o == null ? void 0 : o.block) === "TableField"))
     return n;
-  if (c) {
-    const d = a(c);
-    return r == null ? void 0 : r[d.targetKey || "id"];
+  if (l) {
+    const d = u.getCollectionField(l);
+    return r == null ? void 0 : r[d.targetKey || d.sourceKey || "id"];
   }
   if (isArray(i.filterTargetKey)) {
     const d = {};

package/es/modules/blocks/filter-blocks/FilterCollectionField.d.ts

@@ -0,0 +1,15 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+import React from 'react';
+/**
+ * TODO: 初步适配
+ * @internal
+ */
+export declare const FilterCollectionFieldInternalField: React.FC;
+export declare const FilterCollectionField: React.ForwardRefExoticComponent<Omit<Partial<any>, "ref"> & React.RefAttributes<unknown>>;