@nocobase/client 1.3.13-beta → 1.3.15-beta

package/es/index.mjs

@@ -4086,7 +4086,7 @@ function addAppVersion(e, t) {
       addAppVersion((n = e.properties) == null ? void 0 : n[o], t);
     }), e;
 }
-const name = "@nocobase/client", version$1 = "1.3.13-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.15-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",
@@ -4107,9 +4107,9 @@ const name = "@nocobase/client", version$1 = "1.3.13-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.13-beta",
-  "@nocobase/sdk": "1.3.13-beta",
-  "@nocobase/utils": "1.3.13-beta",
+  "@nocobase/evaluators": "1.3.15-beta",
+  "@nocobase/sdk": "1.3.15-beta",
+  "@nocobase/utils": "1.3.15-beta",
   ahooks: "^3.7.2",
   antd: "^5.12.8",
   "antd-style": "3.4.5",
@@ -11781,30 +11781,29 @@ const useFormItemInitializerFields = (e) => {
       children: f
     };
   });
-}, getItem = (e, t, o, n, r) => {
+}, associationFieldToMenu = (e, t, o, n, r) => {
   var a, l, c;
-  if (e.interface === "m2o") {
-    if (r.includes(e.target))
-      return null;
+  if (e.target && e.uiSchema) {
+    if (r.includes(e.target) || r.length >= 1)
+      return;
     const u = n(e.target);
-    return {
+    return u != null && u.length ? {
       type: "subMenu",
       name: t,
       title: (a = e.uiSchema) == null ? void 0 : a.title,
       children: u.map(
-        (d) => getItem(d, `${t}.${d.name}`, o, n, [
+        (d) => associationFieldToMenu(d, `${t}.${d.name}`, o, n, [
           ...r,
           e.target
         ])
       ).filter(Boolean)
-    };
+    } : void 0;
   }
-  if (isAssocField(e))
-    return null;
+  if (!e.uiSchema)
+    return;
   const i = {
     type: "string",
     name: t,
-    // 'x-designer': 'FormItem.FilterFormDesigner',
     "x-toolbar": "FormItemSchemaToolbar",
     "x-settings": "fieldSettings:FilterFormItem",
     "x-designer-props": {
@@ -11825,9 +11824,8 @@ const useFormItemInitializerFields = (e) => {
     schema: i
   };
 }, useFilterAssociatedFormItemInitializerFields = () => {
-  var i;
-  const { name: e, fields: t } = useCollection_deprecated(), { getCollectionFields: o } = useCollectionManager_deprecated(), n = ["m2o"];
-  return (i = t == null ? void 0 : t.filter((a) => n.includes(a.interface))) == null ? void 0 : i.map((a) => getItem(a, a.name, e, o, []));
+  const { name: e, fields: t } = useCollection_deprecated(), { getCollectionFields: o } = useCollectionManager_deprecated();
+  return t == null ? void 0 : t.filter((n) => n.target && n.uiSchema).map((n) => associationFieldToMenu(n, n.name, e, o, [])).filter(Boolean);
 }, useInheritsFormItemInitializerFields = (e) => {
   const { name: t } = useCollection_deprecated(), { getInterface: o, getInheritCollections: n, getCollection: r, getParentCollectionFields: i } = useCollectionManager_deprecated(), a = n(t);
   useActionContext();