@nocobase/client 1.4.3 → 1.4.4

package/es/index.mjs

@@ -4295,7 +4295,7 @@ function addAppVersion(e, t) {
       addAppVersion((n = e.properties) == null ? void 0 : n[o], t);
     }), e;
 }
-const name = "@nocobase/client", version$1 = "1.4.3", 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.4", 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",
@@ -4317,9 +4317,9 @@ const name = "@nocobase/client", version$1 = "1.4.3", license = "AGPL-3.0", main
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "1.4.3",
-  "@nocobase/sdk": "1.4.3",
-  "@nocobase/utils": "1.4.3",
+  "@nocobase/evaluators": "1.4.4",
+  "@nocobase/sdk": "1.4.4",
+  "@nocobase/utils": "1.4.4",
   ahooks: "^3.7.2",
   antd: "5.12.8",
   "antd-style": "3.7.1",
@@ -8823,20 +8823,20 @@ class PluginSettingsManager {
 const AppComponent = observer(
   (o) => {
     var n = o, { children: e } = n, t = K(n, ["children"]);
-    var l;
-    const { app: r } = t, i = useCallback((c, u) => {
-      console.error(c);
-      const d = new Error();
-      d.stack = u.componentStack.trim(), console.error(d);
+    var l, c;
+    const { app: r } = t, i = useCallback((u, d) => {
+      console.error(u);
+      const p = new Error();
+      p.stack = d.componentStack.trim(), console.error(p);
     }, []);
     useEffect(() => {
       r.load();
     }, [r]);
     const a = r.getComponent("AppError");
-    return r.loading ? r.renderComponent("AppSpin", { app: r }) : !r.maintained && r.maintaining ? r.renderComponent("AppMaintaining", { app: r }) : (l = r.error) != null && l.code ? /* @__PURE__ */ jsx(a, { app: r, error: r.error }) : /* @__PURE__ */ jsx(
+    return r.loading ? r.renderComponent("AppSpin", { app: r }) : !r.maintained && r.maintaining ? r.renderComponent("AppMaintaining", { app: r }) : (l = r.error) != null && l.code && ((c = r.error) == null ? void 0 : c.code) !== "APP_COMMANDING" ? /* @__PURE__ */ jsx(a, { app: r, error: r.error }) : /* @__PURE__ */ jsx(
       ErrorBoundary,
       {
-        FallbackComponent: (c) => /* @__PURE__ */ jsx(a, x({ app: r, error: r.error }, c)),
+        FallbackComponent: (u) => /* @__PURE__ */ jsx(a, x({ app: r, error: r.error }, u)),
         onError: i,
         children: /* @__PURE__ */ jsxs(ApplicationContext.Provider, { value: r, children: [
           r.maintained && r.maintaining && r.renderComponent("AppMaintainingDialog", { app: r }),
@@ -14203,7 +14203,7 @@ const useUpdateSchemaTemplateActionProps = () => {
 ];
 function useTableColumnInitializerFields() {
   const { name: e, currentFields: t = [] } = useCollection_deprecated(), { getInterface: o, getCollection: n } = useCollectionManager_deprecated(), i = useFieldSchema()["x-component"] === "AssociationField.SubTable", a = useForm(), l = i ? a.readPretty : !0;
-  return t.filter((c) => (c == null ? void 0 : c.interface) && (c == null ? void 0 : c.interface) !== "subTable" && !(c != null && c.treeChildren)).map((c) => {
+  return t.filter((c) => !c.collectionName || c.collectionName === e).filter((c) => (c == null ? void 0 : c.interface) && (c == null ? void 0 : c.interface) !== "subTable" && !(c != null && c.treeChildren)).map((c) => {
     var h, g, f, C;
     const u = o(c.interface), d = (c == null ? void 0 : c.target) && ((h = n(c == null ? void 0 : c.target)) == null ? void 0 : h.template) === "file", p = ((g = c == null ? void 0 : c.uiSchema) == null ? void 0 : g["x-component"]) === "Preview", m = {
       name: c.name,
@@ -14384,62 +14384,62 @@ function useInheritsTableColumnInitializerFields() {
   });
 }
 const useFormItemInitializerFields = (e) => {
-  var d;
+  var d, p;
   const { name: t, currentFields: o } = useCollection_deprecated(), { getInterface: n, getCollection: r } = useCollectionManager_deprecated(), i = useForm(), { readPretty: a = i.readPretty, block: l = "Form" } = e || {}, { fieldSchema: c } = useActionContext(), u = c == null ? void 0 : c["x-action"];
-  return (d = o == null ? void 0 : o.filter((p) => (p == null ? void 0 : p.interface) && !(p != null && p.treeChildren))) == null ? void 0 : d.map((p) => {
-    var y, v, I, w, k;
-    const m = n(p.interface), h = r(p.target), g = (p == null ? void 0 : p.target) && ((y = r(p == null ? void 0 : p.target)) == null ? void 0 : y.template) === "file", f = h, C = (I = (v = p == null ? void 0 : p.uiSchema) == null ? void 0 : v["x-component-props"]) == null ? void 0 : I.fieldNames, S = {
+  return (p = (d = o.filter((m) => !m.collectionName || m.collectionName === t)) == null ? void 0 : d.filter((m) => (m == null ? void 0 : m.interface) && !(m != null && m.treeChildren))) == null ? void 0 : p.map((m) => {
+    var v, I, w, k, A;
+    const h = n(m.interface), g = r(m.target), f = (m == null ? void 0 : m.target) && ((v = r(m == null ? void 0 : m.target)) == null ? void 0 : v.template) === "file", C = g, S = (w = (I = m == null ? void 0 : m.uiSchema) == null ? void 0 : I["x-component-props"]) == null ? void 0 : w.fieldNames, b = {
       type: "string",
-      name: p.name,
+      name: m.name,
       "x-toolbar": "FormItemSchemaToolbar",
       "x-settings": "fieldSettings:FormItem",
       "x-component": "CollectionField",
       "x-decorator": "FormItem",
-      "x-collection-field": `${t}.${p.name}`,
-      "x-component-props": g ? {
+      "x-collection-field": `${t}.${m.name}`,
+      "x-component-props": f ? {
         fieldNames: {
           label: "preview",
           value: "id"
         }
-      } : f && C ? {
-        fieldNames: F(x({}, C), { label: (h == null ? void 0 : h.titleField) || C.label })
+      } : C && S ? {
+        fieldNames: F(x({}, S), { label: (g == null ? void 0 : g.titleField) || S.label })
       } : {},
-      "x-read-pretty": (w = p == null ? void 0 : p.uiSchema) == null ? void 0 : w["x-read-pretty"]
-    }, b = {
+      "x-read-pretty": (k = m == null ? void 0 : m.uiSchema) == null ? void 0 : k["x-read-pretty"]
+    }, y = {
       type: "item",
-      name: p.name,
-      title: ((k = p == null ? void 0 : p.uiSchema) == null ? void 0 : k.title) || p.name,
+      name: m.name,
+      title: ((A = m == null ? void 0 : m.uiSchema) == null ? void 0 : A.title) || m.name,
       Component: "CollectionFieldInitializer",
       remove: removeGridFormItem,
-      schemaInitialize: (A) => {
-        var D;
-        (D = m == null ? void 0 : m.schemaInitialize) == null || D.call(m, A, {
-          field: p,
+      schemaInitialize: (D) => {
+        var $;
+        ($ = h == null ? void 0 : h.schemaInitialize) == null || $.call(h, D, {
+          field: m,
           block: l,
           readPretty: a,
           action: u,
-          targetCollection: h
+          targetCollection: g
         });
       },
-      schema: S
+      schema: b
     };
-    return l == "Kanban" && (b.find = (A, D, $) => {
-      const L = findSchema(A, "x-component", l);
-      return findSchema(L, D, $);
-    }), b;
+    return l == "Kanban" && (y.find = (D, $, L) => {
+      const z = findSchema(D, "x-component", l);
+      return findSchema(z, $, L);
+    }), y;
   });
 }, useFilterFormItemInitializerFields = (e) => {
-  var p;
+  var p, m;
   const { name: t, currentFields: o } = useCollection_deprecated(), { getInterface: n, getCollection: r } = useCollectionManager_deprecated(), i = useForm(), { readPretty: a = i.readPretty, block: l = "FilterForm" } = e || {}, { snapshot: c, fieldSchema: u } = useActionContext(), d = u == null ? void 0 : u["x-action"];
-  return (p = o == null ? void 0 : o.filter((m) => {
-    var h;
-    return (m == null ? void 0 : m.interface) && ((h = n(m.interface)) == null ? void 0 : h.filterable);
-  })) == null ? void 0 : p.map((m) => {
-    var S, b, y;
-    const h = n(m.interface), g = r(m.target);
-    let f = {
+  return (m = (p = o.filter((h) => !h.collectionName || h.collectionName === t)) == null ? void 0 : p.filter((h) => {
+    var g;
+    return (h == null ? void 0 : h.interface) && ((g = n(h.interface)) == null ? void 0 : g.filterable);
+  })) == null ? void 0 : m.map((h) => {
+    var b, y, v;
+    const g = n(h.interface), f = r(h.target);
+    let C = {
       type: "string",
-      name: m.name,
+      name: h.name,
       required: !1,
       // 'x-designer': 'FormItem.FilterFormDesigner',
       "x-toolbar": "FormItemSchemaToolbar",
@@ -14447,15 +14447,15 @@ const useFormItemInitializerFields = (e) => {
       "x-component": "CollectionField",
       "x-decorator": "FormItem",
       "x-use-decorator-props": "useFormItemProps",
-      "x-collection-field": `${t}.${m.name}`,
+      "x-collection-field": `${t}.${h.name}`,
       "x-component-props": {
         utc: !1,
         underFilter: !0
       }
     };
-    return isAssocField(m) && (f = {
+    return isAssocField(h) && (C = {
       type: "string",
-      name: `${m.name}`,
+      name: `${h.name}`,
       required: !1,
       // 'x-designer': 'FormItem.FilterFormDesigner',
       "x-toolbar": "FormItemSchemaToolbar",
@@ -14463,25 +14463,25 @@ const useFormItemInitializerFields = (e) => {
       "x-component": "CollectionField",
       "x-decorator": "FormItem",
       "x-use-decorator-props": "useFormItemProps",
-      "x-collection-field": `${t}.${m.name}`,
-      "x-component-props": F(x({}, (S = m.uiSchema) == null ? void 0 : S["x-component-props"]), { utc: !1, underFilter: !0 })
+      "x-collection-field": `${t}.${h.name}`,
+      "x-component-props": F(x({}, (b = h.uiSchema) == null ? void 0 : b["x-component-props"]), { utc: !1, underFilter: !0 })
     }), {
-      name: ((b = m == null ? void 0 : m.uiSchema) == null ? void 0 : b.title) || m.name,
+      name: ((y = h == null ? void 0 : h.uiSchema) == null ? void 0 : y.title) || h.name,
       type: "item",
-      title: ((y = m == null ? void 0 : m.uiSchema) == null ? void 0 : y.title) || m.name,
+      title: ((v = h == null ? void 0 : h.uiSchema) == null ? void 0 : v.title) || h.name,
       Component: "CollectionFieldInitializer",
       remove: removeGridFormItem,
-      schemaInitialize: (v) => {
-        var I;
-        (I = h == null ? void 0 : h.schemaInitialize) == null || I.call(h, v, {
-          field: m,
+      schemaInitialize: (I) => {
+        var w;
+        (w = g == null ? void 0 : g.schemaInitialize) == null || w.call(g, I, {
+          field: h,
           block: l,
           readPretty: a,
           action: d,
-          targetCollection: g
+          targetCollection: f
         });
       },
-      schema: f
+      schema: C
     };
   });
 }, useAssociatedFormItemInitializerFields = (e) => {
@@ -33904,7 +33904,7 @@ const ReadPretty$b = observer$1(
       const l = x(x({}, defaultFieldNames$1), e.fieldNames), c = i.dataSource || e.options || (a == null ? void 0 : a.uiSchema.enum) || [], u = getCurrentOptions(i.value, c, l);
       if (!isValid(e.value) && !u.length || isArrayField(i) && ((p = i == null ? void 0 : i.value) == null ? void 0 : p.length) === 0)
         return;
-      const d = i.value && u.map((m, h) => /* @__PURE__ */ jsx(Tag, { color: m[l.color], icon: m.icon, children: m[l.label] }, h));
+      const d = i.value !== null && u.map((m, h) => /* @__PURE__ */ jsx(Tag, { color: m[l.color], icon: m.icon, children: m[l.label] }, h));
       r(d), o(!1);
     }, [
       a == null ? void 0 : a.uiSchema.enum,
@@ -36724,7 +36724,7 @@ const InternalFileManager = (e) => {
   const w = {
     size: "small",
     fieldNames: p,
-    multiple: ["o2m", "m2m"].includes(S == null ? void 0 : S.interface) && o,
+    multiple: ["o2m", "m2m", "mbm"].includes(S == null ? void 0 : S.interface) && o,
     association: {
       target: S == null ? void 0 : S.target
     },
@@ -46854,11 +46854,11 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
 }, OverridingCollectionField = (e) => {
   const t = useRecord(), o = useCollectionParentRecordData();
   return /* @__PURE__ */ jsx(OverridingFieldAction, x({ item: t, parentItem: o }, e));
-}, getIsOverriding = (e, t) => e.find((n) => n.name === t.name), OverridingFieldAction = (e) => {
+}, getIsOverriding = (e, t, o) => t.find((r) => r.name === o.name).collectionName === e, OverridingFieldAction = (e) => {
   const { scope: t, getContainer: o, item: n, parentItem: r, children: i, currentCollection: a } = e, { target: l, through: c } = n, { getInterface: u, getCollection: d, getCurrentCollectionFields: p, getChildrenCollections: m, collections: h } = useCollectionManager_deprecated(), [g, f] = useState(!1), [C, S] = useState({}), b = useAPIClient(), { t: y } = useTranslation(), v = useCompile(), I = (j) => {
     var B;
     return j && ((B = m(j)) == null ? void 0 : B.map((M) => M.name).concat([j]));
-  }, [w, k] = useState({}), A = p(a), D = getIsOverriding(A, n), $ = useMemo(() => h.map((j) => ({
+  }, [w, k] = useState({}), A = p(a), D = getIsOverriding(a, A, n), $ = useMemo(() => h.map((j) => ({
     label: v(j.title),
     value: j.name
   })), []), L = () => {
@@ -52182,7 +52182,7 @@ 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[o] = a.filter((u) => !c.find((d) => d.name === u.name)), this.parentCollectionFields[o];
+    })), this.parentCollectionFields[o] = a.filter((u) => c.find((p) => p.name === u.name).collectionName !== this.name), this.parentCollectionFields[o];
   }
   getAllCollectionsInheritChain() {
     if (this.allCollectionsInheritChain)
@@ -61472,25 +61472,24 @@ const mockAPIClient = () => {
   const e = new MockAPIClient(), t = e.mockAdapter();
   return { apiClient: e, mockRequest: t };
 }, PopupContextProvider = (e) => {
-  var u, d;
-  const [t, o] = useState(!1), { visible: n, setVisible: r } = useContext(PopupVisibleProviderContext) || {
+  var p, m;
+  const { visible: t, setVisible: o } = e, [n, r] = useState(!1), { visible: i, setVisible: a } = useContext(PopupVisibleProviderContext) || {
     visible: !1,
     setVisible: () => {
     }
-  }, i = useFieldSchema(), a = useCallback(
-    (p) => {
-      var m;
-      (m = e.setVisible) == null || m.call(e, p), o == null || o(p), r == null || r(p);
+  }, l = useFieldSchema(), c = useCallback(
+    (h) => {
+      o == null || o(h), r == null || r(h), a == null || a(h);
     },
-    [e, r]
-  ), l = ((u = i["x-component-props"]) == null ? void 0 : u.openMode) || "drawer", c = (d = i["x-component-props"]) == null ? void 0 : d.openSize;
+    [o, a]
+  ), u = ((p = l["x-component-props"]) == null ? void 0 : p.openMode) || "drawer", d = (m = l["x-component-props"]) == null ? void 0 : m.openSize;
   return /* @__PURE__ */ jsx(PopupVisibleProvider, { visible: !1, children: /* @__PURE__ */ jsx(
     ActionContextProvider,
     {
-      visible: e.visible || t || n,
-      setVisible: a,
-      openMode: l,
-      openSize: c,
+      visible: t || n || i,
+      setVisible: c,
+      openMode: u,
+      openSize: d,
       children: e.children
     }
   ) });