@nocobase/client 1.7.10 → 1.7.13

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

@@ -73,6 +73,12 @@ export declare class CheckboxFieldInterface extends CollectionFieldInterface {
                 };
             };
             selected?: undefined;
+        } | {
+            label: string;
+            value: string;
+            noValue: boolean;
+            selected?: undefined;
+            schema?: undefined;
         })[];
     };
     schemaInitialize(schema: ISchema, { block }: {

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

@@ -211,6 +211,12 @@ export declare const boolean: ({
         };
     };
     selected?: undefined;
+} | {
+    label: string;
+    value: string;
+    noValue: boolean;
+    selected?: undefined;
+    schema?: undefined;
 })[];
 export declare const tableoid: {
     label: string;

package/es/index.mjs

@@ -5241,7 +5241,9 @@ const date = dayjs(), spaceCSS = css`
         ]
       }
     }
-  }
+  },
+  { label: "{{ t('is empty') }}", value: "$empty", noValue: !0 },
+  { label: "{{ t('is not empty') }}", value: "$notEmpty", noValue: !0 }
 ], tableoid = [
   {
     label: '{{t("is any of")}}',
@@ -8709,7 +8711,7 @@ function addAppVersion(e, t) {
       addAppVersion((o = e.properties) == null ? void 0 : o[n], t);
     }), e;
 }
-const name = "@nocobase/client", version = "1.7.10", license = "AGPL-3.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
+const name = "@nocobase/client", version = "1.7.13", 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",
@@ -8730,9 +8732,9 @@ const name = "@nocobase/client", version = "1.7.10", license = "AGPL-3.0", main
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "1.7.10",
-  "@nocobase/sdk": "1.7.10",
-  "@nocobase/utils": "1.7.10",
+  "@nocobase/evaluators": "1.7.13",
+  "@nocobase/sdk": "1.7.13",
+  "@nocobase/utils": "1.7.13",
   ahooks: "^3.7.2",
   antd: "5.24.2",
   "antd-style": "3.7.1",
@@ -10288,7 +10290,7 @@ const Table$2 = withDynamicSchemaProps(
         "loading",
         "onClickRow",
         "value"
-      ]), y = useArrayField$1(S), v = useFieldSchema(), { size: F = "small" } = (v == null ? void 0 : v["x-component-props"]) || {}, I = useCollection(), R = ((be = v == null ? void 0 : v.parent) == null ? void 0 : be["x-decorator"]) === "TableSelectorProvider" ? useTableSelectorContext() : useTableBlockContext(), { expandFlag: D, allIncludesChildren: B, enableIndexÏColumn: N } = R, $ = useMemoizedFn(S.onRowDragEnd || (() => {
+      ]), y = useArrayField$1(S), v = useFieldSchema(), { size: F = "small" } = (v == null ? void 0 : v["x-component-props"]) || {}, I = useCollection(), R = ((be = v == null ? void 0 : v.parent) == null ? void 0 : be["x-decorator"]) === "TableSelectorProvider" ? useTableSelectorContext() : useTableBlockContext(), { expandFlag: D, allIncludesChildren: B, enableIndexColumn: N } = R, $ = useMemoizedFn(S.onRowDragEnd || (() => {
       })), L = usePaginationProps$3(n, a, e), w = useTableColumns$2(S, L), [O, j] = useState(() => D ? B : []), [k, M] = useState(((Se = y == null ? void 0 : y.data) == null ? void 0 : Se.selectedRowKeys) || []), [q, E] = useState([]), V = (p == null ? void 0 : p.type) !== "none", G = useRef(/* @__PURE__ */ new Map()), U = useMemo(() => css`
           & > td {
             background-color: ${t.controlItemBgActive} !important;
@@ -10509,7 +10511,7 @@ const InternalTableBlockProvider = (e) => {
     fieldNames: l,
     collection: c,
     association: u,
-    enableIndexÏColumn: d
+    enableIndexColumn: d
   } = e, p = useField(), { resource: m, service: h } = useBlockRequestContext(), g = useFieldSchema(), [f, C] = useState(!!(l || i)), { heightProps: b } = useBlockHeightProps(), S = useRef(null);
   useEffect(() => {
     C(l || i);
@@ -10550,7 +10552,7 @@ const InternalTableBlockProvider = (e) => {
       setExpandFlag: v,
       heightProps: b,
       association: u,
-      enableIndexÏColumn: d
+      enableIndexColumn: d
     }),
     [
       y,
@@ -16380,7 +16382,8 @@ const BlockTemplateContext = createContext({ componentNamePrefix: "" }), BlockTe
   "polygon",
   "circle",
   "point",
-  "lineString"
+  "lineString",
+  "vditor"
 ];
 function useTableColumnInitializerFields() {
   const { name: e, currentFields: t = [] } = useCollection_deprecated(), { getInterface: n, getCollection: o } = useCollectionManager_deprecated(), a = useFieldSchema()["x-component"] === "AssociationField.SubTable", i = useForm(), l = a ? i.readPretty : !0;
@@ -22632,13 +22635,18 @@ ReadPretty$c.Input = (e) => {
     "div",
     {
       className: cls(t, e.className),
-      style: x({ overflowWrap: "break-word", whiteSpace: "normal" }, e.style),
+      style: x({
+        display: "flex",
+        alignItems: "center",
+        overflowWrap: "break-word",
+        whiteSpace: "normal"
+      }, e.style),
       children: [
-        e.addonBefore,
-        e.prefix,
+        n(e.addonBefore),
+        n(e.prefix),
         e.ellipsis ? /* @__PURE__ */ jsx(EllipsisWithTooltip, { ellipsis: e.ellipsis, children: o }) : o,
-        e.suffix,
-        e.addonAfter
+        n(e.suffix),
+        n(e.addonAfter)
       ]
     }
   );
@@ -24552,7 +24560,6 @@ const useAllAccessDesktopRoutes = () => useContext(AllAccessDesktopRoutesContext
     padding: 0px 50px;
   }
 `, className1$1 = css`
-  width: 168px;
   height: var(--nb-header-height);
   margin-right: 4px;
   display: inline-flex;
@@ -24560,6 +24567,13 @@ const useAllAccessDesktopRoutes = () => useContext(AllAccessDesktopRoutesContext
   color: #fff;
   padding: 0;
   align-items: center;
+`, className1WithFixedWidth = css`
+  ${className1$1}
+  width: 168px;
+`, className1WithAutoWidth = css`
+  ${className1$1}
+  width: auto;
+  min-width: 168px;
 `, className2 = css`
   object-fit: contain;
   width: 100%;
@@ -24599,9 +24613,9 @@ const LayoutContent = () => {
     /* @__PURE__ */ jsx(ShowTipWhenNoPages, {})
   ] }) });
 }, NocoBaseLogo = () => {
-  var r, a, i, l, c, u, d, p;
-  const e = useSystemSettings(), { token: t } = useToken(), n = useMemo(() => ({ fontSize: t.fontSizeHeading3 }), [t.fontSizeHeading3]), o = (i = (a = (r = e == null ? void 0 : e.data) == null ? void 0 : r.data) == null ? void 0 : a.logo) != null && i.url ? /* @__PURE__ */ jsx("img", { className: className2, src: (u = (c = (l = e == null ? void 0 : e.data) == null ? void 0 : l.data) == null ? void 0 : c.logo) == null ? void 0 : u.url }) : /* @__PURE__ */ jsx("span", { style: n, className: className3, children: (p = (d = e == null ? void 0 : e.data) == null ? void 0 : d.data) == null ? void 0 : p.title });
-  return /* @__PURE__ */ jsx("div", { className: className1$1, children: e != null && e.loading ? null : o });
+  var a, i, l, c, u, d, p, m;
+  const e = useSystemSettings(), { token: t } = useToken(), n = useMemo(() => ({ fontSize: t.fontSizeHeading3 }), [t.fontSizeHeading3]), o = (l = (i = (a = e == null ? void 0 : e.data) == null ? void 0 : a.data) == null ? void 0 : i.logo) == null ? void 0 : l.url, r = o ? /* @__PURE__ */ jsx("img", { className: className2, src: (d = (u = (c = e == null ? void 0 : e.data) == null ? void 0 : c.data) == null ? void 0 : u.logo) == null ? void 0 : d.url }) : /* @__PURE__ */ jsx("span", { style: n, className: className3, children: (m = (p = e == null ? void 0 : e.data) == null ? void 0 : p.data) == null ? void 0 : m.title });
+  return /* @__PURE__ */ jsx("div", { className: o ? className1WithFixedWidth : className1WithAutoWidth, children: e != null && e.loading ? null : r });
 }, MenuSchemaToolbarWithContainer = () => {
   const e = useRef(null), [t, n] = React.useState(null);
   return useEffect(() => {
@@ -30251,7 +30265,7 @@ const DragHandler = (e) => {
         Select$1,
         {
           value: t == null ? void 0 : t.unit,
-          style: { maxWidth: 140, minWidth: 130 },
+          style: { maxWidth: 140 },
           onChange: (d) => {
             const p = P(x({}, t), {
               unit: d
@@ -30263,7 +30277,8 @@ const DragHandler = (e) => {
             { value: "week", label: r("Calendar week") },
             { value: "month", label: r("Calendar Month") },
             { value: "year", label: r("Calendar Year") }
-          ]
+          ],
+          popupMatchSelectWidth: !0
         },
         "unit"
       )
@@ -34079,14 +34094,14 @@ const expendableActionSettings = new SchemaSettings({
       options: d,
       value: ((h = l["x-component-props"]) == null ? void 0 : h.component) || ((g = d[0]) == null ? void 0 : g.value),
       onChange(f) {
-        var S;
-        const C = d.find((y) => y.value === f), b = x({
+        var y;
+        const C = d.find((v) => v.value === f), b = ((y = C == null ? void 0 : C.useProps) == null ? void 0 : y.call(C)) || {}, S = x(x({
           component: f
-        }, ((S = C == null ? void 0 : C.useProps) == null ? void 0 : S.call(C)) || {});
-        _.set(l, "x-component-props", b), t.componentProps = b, c.emit("patch", {
+        }, b), f === o.uiSchema["x-component"] ? o.uiSchema["x-component-props"] : {});
+        _.set(l, "x-component-props", S), t.componentProps = S, c.emit("patch", {
           schema: {
             "x-uid": l["x-uid"],
-            "x-component-props": b
+            "x-component-props": S
           }
         });
       }
@@ -35346,9 +35361,9 @@ const enabledIndexColumn$1 = {
     const e = useField(), t = useFieldSchema(), { t: n } = useTranslation(), { dn: o } = useDesignable();
     return {
       title: n("Enable index column"),
-      checked: e.decoratorProps.enableIndexÏColumn !== !1,
+      checked: e.decoratorProps.enableIndexColumn !== !1,
       onChange: (r) => z(void 0, null, function* () {
-        e.decoratorProps = e.decoratorProps || {}, e.decoratorProps.enableIndexÏColumn = r, t["x-decorator-props"].enableIndexÏColumn = r, o.emit("patch", {
+        e.decoratorProps = e.decoratorProps || {}, e.decoratorProps.enableIndexColumn = r, t["x-decorator-props"].enableIndexColumn = r, o.emit("patch", {
           schema: {
             "x-uid": t["x-uid"],
             "x-decorator-props": t["x-decorator-props"]
@@ -37693,9 +37708,9 @@ const dividerSettings = new SchemaSettings({
     const e = useField(), t = useFieldSchema(), { t: n } = useTranslation(), { dn: o } = useDesignable();
     return {
       title: n("Enable index column"),
-      checked: e.componentProps.enableIndexÏColumn !== !1,
+      checked: e.componentProps.enableIndexColumn !== !1,
       onChange: (r) => z(void 0, null, function* () {
-        e.componentProps = e.componentProps || {}, e.componentProps.enableIndexÏColumn = r, t["x-component-props"].enableIndexÏColumn = r, o.emit("patch", {
+        e.componentProps = e.componentProps || {}, e.componentProps.enableIndexColumn = r, t["x-component-props"].enableIndexColumn = r, o.emit("patch", {
           schema: {
             "x-uid": t["x-uid"],
             "x-component-props": t["x-component-props"]
@@ -43128,8 +43143,8 @@ const Upload = connect(
 );
 Upload.ReadPretty = ReadPretty$9;
 function useSizeHint(e) {
-  const t = e != null ? e : FILE_SIZE_LIMIT_DEFAULT, { t: n, i18n: o } = useTranslation();
-  return filesize(t, { base: 2, standard: "jedec", locale: o.language }), t !== 0 ? n("File size should not exceed {{size}}.", { size: 1e7 }) : "";
+  const t = e != null ? e : FILE_SIZE_LIMIT_DEFAULT, { t: n, i18n: o } = useTranslation(), r = filesize(t, { base: 2, standard: "jedec", locale: o.language });
+  return t !== 0 ? n("File size should not exceed {{size}}.", { size: r }) : "";
 }
 function DefaultThumbnailPreviewer({ file: e }) {
   var r;
@@ -44034,7 +44049,11 @@ const InternalNesterCardCss = css`
     }, N = () => {
       const k = (f == null ? void 0 : f.targetKey) || "id", M = T.map((E) => E[k]).filter(Boolean);
       return M.length ? { $and: [{ [`${k}.$ne`]: M }] } : {};
-    }, $ = () => {
+    };
+    useEffect(() => {
+      t || F([]);
+    }, [t]);
+    const $ = () => {
       const { setVisible: k } = useActionContext(), { multiple: M, selectedRows: q, onChange: E, options: V, collectionField: G } = useContext(RecordPickerContext);
       return {
         onClick() {
@@ -44460,76 +44479,95 @@ const defaultModeToComponent = {
   return /* @__PURE__ */ jsx(AssociationFieldModeContext.Provider, { value: a, children: e.children });
 }, useAssociationFieldModeContext = () => React.useContext(AssociationFieldModeContext), AssociationFieldProvider = observer$1(
   (e) => {
-    var f, C, b;
-    const t = useField(), n = useCollectionManager(), o = useFieldSchema(), r = useAPIClient();
+    var S, y, v;
+    const t = useField(), n = useCollectionManager(), o = useFieldSchema(), r = useAPIClient(), a = useSchemaOptionsContext(), i = useRef(null);
     useSchemaComponentContext();
-    const a = ((f = o["x-component-props"]) == null ? void 0 : f.multiple) !== !1, i = ((C = o["x-component-props"]) == null ? void 0 : C.allowDissociate) !== !1, l = useMemo(
+    const l = ((S = o["x-component-props"]) == null ? void 0 : S.multiple) !== !1, c = ((y = o["x-component-props"]) == null ? void 0 : y.allowDissociate) !== !1, u = useMemo(
       () => n.getCollectionField(o["x-collection-field"]),
       // eslint-disable-next-line react-hooks/exhaustive-deps
       [o["x-collection-field"], o.name]
-    ), c = useMemo(
+    ), d = useMemo(
       () => {
-        var S;
-        return ((S = n.getCollection(l == null ? void 0 : l.target)) == null ? void 0 : S.template) === "file";
+        var F;
+        return ((F = n.getCollection(u == null ? void 0 : u.target)) == null ? void 0 : F.template) === "file";
       },
       // eslint-disable-next-line react-hooks/exhaustive-deps
       [o["x-collection-field"]]
-    ), u = useMemo(
+    ), p = useMemo(
       () => {
-        var S;
-        return ((S = o["x-component-props"]) == null ? void 0 : S.mode) || (c ? "FileManager" : "Select");
+        var F;
+        return ((F = o["x-component-props"]) == null ? void 0 : F.mode) || (d ? "FileManager" : "Select");
       },
       // eslint-disable-next-line react-hooks/exhaustive-deps
-      [(b = o["x-component-props"]) == null ? void 0 : b.mode]
-    ), [d, p] = useState(!t.readPretty), { loading: m, run: h } = useRequest(
+      [(v = o["x-component-props"]) == null ? void 0 : v.mode]
+    ), [m, h] = useState(!t.readPretty), { loading: g, run: f } = useRequest(
       () => {
-        var v;
-        const S = l.targetKey;
-        if (!o.default || !["Picker", "Select"].includes(u) || !_.isObject(o.default))
+        var T;
+        const F = u.targetKey;
+        if (!o.default || !["Picker", "Select"].includes(p) || !_.isObject(o.default))
           return Promise.reject(null);
-        const y = Array.isArray(o.default) ? o.default.map((F) => F[S]) : o.default[S];
-        return _.isUndefined(y) || _.isNil(y) || _.isNaN(y) ? Promise.reject(null) : r.request({
-          resource: l.target,
-          action: Array.isArray(y) ? "list" : "get",
-          headers: getDataSourceHeaders((v = n == null ? void 0 : n.dataSource) == null ? void 0 : v.key),
+        const I = Array.isArray(o.default) ? o.default.map((R) => R[F]) : o.default[F];
+        return _.isUndefined(I) || _.isNil(I) || _.isNaN(I) ? Promise.reject(null) : r.request({
+          resource: u.target,
+          action: Array.isArray(I) ? "list" : "get",
+          headers: getDataSourceHeaders((T = n == null ? void 0 : n.dataSource) == null ? void 0 : T.key),
           params: {
             filter: {
-              [S]: y
+              [F]: I
             }
           }
         });
       },
       {
         manual: !0,
-        onSuccess(S) {
-          var y;
-          t.initialValue = (y = S == null ? void 0 : S.data) == null ? void 0 : y.data;
+        onSuccess(F) {
+          var I;
+          t.initialValue = (I = F == null ? void 0 : F.data) == null ? void 0 : I.data;
         }
       }
-    ), { active: g } = useKeepAlive();
-    return useEffect(() => {
-      var S;
-      if (g) {
-        if (p(!0), !l) {
-          p(!1);
+    ), { active: C } = useKeepAlive();
+    if (useEffect(() => {
+      var F;
+      if (C) {
+        if (h(!0), !u) {
+          h(!1);
           return;
         }
-        if (["Picker", "Select"].includes(u) && o.default && h(), t.value && t.form.__template && ["Nester", "SubTable", "PopoverNester"].includes(u) && (["belongsTo", "hasOne"].includes(l.type) ? ((S = t.value) != null && S[l.targetKey] && delete t.value[l.targetKey], t.value = x(x({}, t.initialValue), t.value)) : ["belongsToMany", "hasMany"].includes(l.type) && Array.isArray(t.value) && (t.value = t.value.map((y) => {
-          var v;
-          return delete y[l.targetKey], x(x({}, (v = t.initialValue) == null ? void 0 : v[0]), y);
+        if (["Picker", "Select"].includes(p) && o.default && f(), t.value && t.form.__template && ["Nester", "SubTable", "PopoverNester"].includes(p) && (["belongsTo", "hasOne"].includes(u.type) ? ((F = t.value) != null && F[u.targetKey] && delete t.value[u.targetKey], t.value = x(x({}, t.initialValue), t.value)) : ["belongsToMany", "hasMany"].includes(u.type) && Array.isArray(t.value) && (t.value = t.value.map((I) => {
+          var T;
+          return delete I[u.targetKey], x(x({}, (T = t.initialValue) == null ? void 0 : T[0]), I);
         }))), t.value !== null && t.value !== void 0) {
-          ["Nester", "PopoverNester"].includes(u) && Array.isArray(t.value) && t.value.length === 0 && ["belongsToMany", "hasMany", "belongsToArray"].includes(l.type) && (t.value = [markRecordAsNew({})]), p(!1);
+          ["Nester", "PopoverNester"].includes(p) && Array.isArray(t.value) && t.value.length === 0 && ["belongsToMany", "hasMany", "belongsToArray"].includes(u.type) && (t.value = [markRecordAsNew({})]), h(!1);
           return;
         }
-        ["Nester"].includes(u) && (["belongsTo", "hasOne"].includes(l.type) ? t.value = {} : ["belongsToMany", "hasMany", "belongsToArray"].includes(l.type) && (t.value = [markRecordAsNew({})])), u === "SubTable" && (t.value = []), p(!1);
+        ["Nester"].includes(p) && (["belongsTo", "hasOne"].includes(u.type) ? t.value = {} : ["belongsToMany", "hasMany", "belongsToArray"].includes(u.type) && (t.value = [markRecordAsNew({})])), p === "SubTable" && (t.value = []), h(!1);
       }
-    }, [u, l, t, g]), d || m ? null : l ? /* @__PURE__ */ jsx(
+    }, [p, u, t, C]), m || g)
+      return null;
+    const b = P(x({}, a.components), {
+      FormItem: (F) => /* @__PURE__ */ jsx(
+        FormItem,
+        P(x({}, F), {
+          getPopupContainer: (I) => i.current || document.body
+        })
+      )
+    });
+    return u ? /* @__PURE__ */ jsx("div", { ref: i, children: /* @__PURE__ */ jsx(
       AssociationFieldContext.Provider,
       {
-        value: { options: l, field: t, fieldSchema: o, allowMultiple: a, allowDissociate: i, currentMode: u },
-        children: e.children
+        value: { options: u, field: t, fieldSchema: o, allowMultiple: l, allowDissociate: c, currentMode: p },
+        children: /* @__PURE__ */ jsx(
+          SchemaOptionsContext.Provider,
+          {
+            value: {
+              components: b,
+              scope: a.scope
+            },
+            children: e.children
+          }
+        )
       }
-    ) : null;
+    ) }) : null;
   },
   { displayName: "AssociationFieldProvider" }
 ), InternalField = (e) => {
@@ -45474,7 +45512,7 @@ const Table$1 = withDynamicSchemaProps(
       onExpand: g,
       loading: f,
       onClickRow: C,
-      enableIndexÏColumn: b
+      enableIndexColumn: b
     } = ce, S = W(ce, [
       "dragSort",
       "showIndex",
@@ -45486,7 +45524,7 @@ const Table$1 = withDynamicSchemaProps(
       "onExpand",
       "loading",
       "onClickRow",
-      "enableIndexÏColumn"
+      "enableIndexColumn"
     ]), y = useArrayField(S), v = useFieldSchema(), { size: F = "small" } = (v == null ? void 0 : v["x-component-props"]) || {}, I = useCollection(), R = ((Ce = v == null ? void 0 : v.parent) == null ? void 0 : Ce["x-decorator"]) === "TableSelectorProvider" ? useTableSelectorContext() : useTableBlockContext(), { expandFlag: D, allIncludesChildren: B } = R, N = useMemoizedFn(S.onRowDragEnd || (() => {
     })), $ = usePaginationProps$2(n, a), L = useTableColumns$1(S, $), [w, O] = useState(() => D ? B : []), [j, k] = useState(((be = y == null ? void 0 : y.data) == null ? void 0 : be.selectedRowKeys) || []), [M, q] = useState([]), E = (p == null ? void 0 : p.type) !== "none", V = useRef(/* @__PURE__ */ new Map()), G = useMemo(() => css`
         & > td {
@@ -45714,7 +45752,7 @@ const Table$1 = withDynamicSchemaProps(
 `, SubTable = observer$1(
   (e) => {
     var k, M, q;
-    const { openSize: t } = e, { field: n, options: o, fieldSchema: r } = useAssociationFieldContext(), { t: a } = useTranslation(), [i, l] = useState(!1), [c, u] = useState([]), d = useFieldNames$1(e), p = useFieldSchema(), m = useCompile(), h = useLabelUiSchema$1(o, (d == null ? void 0 : d.label) || "label"), g = useCollectionRecord(), f = useCollection(), { allowSelectExistingRecord: C, allowAddnew: b, allowDisassociation: S, enableIndexÏColumn: y } = n.componentProps;
+    const { openSize: t } = e, { field: n, options: o, fieldSchema: r } = useAssociationFieldContext(), { t: a } = useTranslation(), [i, l] = useState(!1), [c, u] = useState([]), d = useFieldNames$1(e), p = useFieldSchema(), m = useCompile(), h = useLabelUiSchema$1(o, (d == null ? void 0 : d.label) || "label"), g = useCollectionRecord(), f = useCollection(), { allowSelectExistingRecord: C, allowAddnew: b, allowDisassociation: S, enableIndexColumn: y } = n.componentProps;
     useSubTableSpecialCase({ rootField: n, rootSchema: r });
     const v = (E, V) => {
       if (V !== void 0 && isArr(n.value) && E !== V)
@@ -45810,7 +45848,7 @@ const Table$1 = withDynamicSchemaProps(
               n.editable ? a("Please add or select record") : a("No data")
             ] })
           },
-          enableIndexÏColumn: y !== !1,
+          enableIndexColumn: y !== !1,
           footer: () => /* @__PURE__ */ jsx("div", { style: { display: "flex", justifyContent: "space-between", alignItems: "center" }, children: n.editable && /* @__PURE__ */ jsxs(
             Space$1,
             {
@@ -50243,7 +50281,7 @@ const TableActionColumnDesigner = (e) => {
         title: u("Enable index column"),
         checked: ((N = r.decoratorProps) == null ? void 0 : N.enableSelectColumn) !== !1,
         onChange: (k) => z(void 0, null, function* () {
-          r.decoratorProps = r.decoratorProps || {}, r.decoratorProps.enableIndexÏColumn = k, a["x-decorator-props"].enableIndexÏColumn = k, d.emit("patch", {
+          r.decoratorProps = r.decoratorProps || {}, r.decoratorProps.enableIndexColumn = k, a["x-decorator-props"].enableIndexColumn = k, d.emit("patch", {
             schema: {
               "x-uid": a["x-uid"],
               "x-decorator-props": a["x-decorator-props"]
@@ -52796,7 +52834,7 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
           });
           S(T == null ? void 0 : T.data);
           const R = l(o.interface), D = cloneDeep(T == null ? void 0 : T.data) || {};
-          D != null && D.reverseField || (D.autoCreateReverseField = !1, D.reverseField = (N = R == null ? void 0 : R.default) == null ? void 0 : N.reverseField, set$1(D.reverseField, "name", `f_${uid()}`), set$1(D.reverseField, "uiSchema.title", ($ = o.__parent) == null ? void 0 : $.title));
+          D != null && D.reverseField ? D.autoCreateReverseField = !0 : (D.autoCreateReverseField = !1, D.reverseField = (N = R == null ? void 0 : R.default) == null ? void 0 : N.reverseField, set$1(D.reverseField, "name", `f_${uid()}`), set$1(D.reverseField, "uiSchema.title", ($ = o.__parent) == null ? void 0 : $.title));
           const B = getSchema$7(R, D, o, C);
           h(B), p(!0);
         }),
@@ -58011,7 +58049,10 @@ class InheritanceCollectionMixin extends Collection {
     return l > 0 && (r.splice(l), r.forEach((u) => {
       const d = this.collectionManager.getCollection(u);
       c = c.concat(d.getCurrentFields());
-    })), this.parentCollectionFields[n] = i.filter((u) => c.find((p) => p.name === u.name).collectionName !== this.name), this.parentCollectionFields[n];
+    })), this.parentCollectionFields[n] = i.filter((u) => {
+      const d = c.find((p) => p.name === u.name);
+      return (d == null ? void 0 : d.collectionName) !== this.name;
+    }), this.parentCollectionFields[n];
   }
   getAllCollectionsInheritChain() {
     if (this.allCollectionsInheritChain)