@nocobase/client 1.5.2 → 1.5.3

package/es/index.mjs

@@ -12789,28 +12789,26 @@ const setFieldProps$1 = (e, t, n) => {
 }, setRequired$1 = (e, t, n) => {
   typeof t.required == "undefined" && (e.required = !!n.required);
 }, FilterCollectionFieldInternalField = (e) => {
-  var g, f, C, b;
-  const t = useCompile(), n = useField(), o = 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(
-    (S, y) => S.value === o["x-filter-operator"] || y === 0
-  ), p = useComponent(
-    ((C = d == null ? void 0 : d.schema) == null ? void 0 : C["x-component"]) || ((b = o["x-component-props"]) == null ? void 0 : b.component) || (i == null ? void 0 : i["x-component"]) || "Input"
+  var g, f, C, b, S, y;
+  const t = useCompile(), n = useField(), o = 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((v, F) => v.value === (o == null ? void 0 : o["x-filter-operator"]))) || ((b = (C = u == null ? void 0 : u.filterable) == null ? void 0 : C.operators) == null ? void 0 : b[0]), p = useComponent(
+    ((S = d == null ? void 0 : d.schema) == null ? void 0 : S["x-component"]) || ((y = o["x-component-props"]) == null ? void 0 : y.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 v;
+    var I;
     if (!i)
       return;
-    const S = t(i);
-    if (setFieldProps$1(n, "content", S["x-content"]), setFieldProps$1(n, "title", S.title), setFieldProps$1(n, "description", S.description), m != null && m.form) {
-      const F = c() ? o.default || a : void 0;
-      F != null && setFieldProps$1(n, "initialValue", F);
-    }
-    if (!n.validator && (S["x-validator"] || o["x-validator"])) {
-      const F = concat([], S["x-validator"] || [], o["x-validator"] || []);
-      n.validator = F;
-    }
-    o["x-disabled"] === !0 && (n.disabled = !0), o["x-read-pretty"] === !0 && (n.readPretty = !0), setRequired$1(n, o, S), n.dataSource = S.enum;
-    const y = t(x(x({}, ((v = d == null ? void 0 : d.schema) == null ? void 0 : v["x-component-props"]) || {}), S["x-component-props"] || {})) || {};
-    n.componentProps = merge(y, n.componentProps || {}, h || {});
+    const v = t(i);
+    if (setFieldProps$1(n, "content", v["x-content"]), setFieldProps$1(n, "title", v.title), setFieldProps$1(n, "description", v.description), m != null && m.form) {
+      const R = c() ? o.default || a : void 0;
+      R != null && setFieldProps$1(n, "initialValue", R);
+    }
+    if (!n.validator && (v["x-validator"] || o["x-validator"])) {
+      const R = concat([], v["x-validator"] || [], o["x-validator"] || []);
+      n.validator = R;
+    }
+    o["x-disabled"] === !0 && (n.disabled = !0), o["x-read-pretty"] === !0 && (n.readPretty = !0), setRequired$1(n, o, v), n.dataSource = v.enum;
+    const F = t(x(x({}, ((I = d == null ? void 0 : d.schema) == null ? void 0 : I["x-component-props"]) || {}), v["x-component-props"] || {})) || {};
+    n.componentProps = merge(F, n.componentProps || {}, h || {});
   }, [i]), i ? /* @__PURE__ */ jsx(p, x(x({}, e), h)) : null;
 }, FilterCollectionField = connect((e) => {
   const t = useFieldSchema();
@@ -19528,7 +19526,7 @@ DatePicker.FilterWithPicker = function e(t) {
       });
     }
   }), g = useField(), [f, C] = useState(h);
-  return /* @__PURE__ */ jsxs(Space$1.Compact, { children: [
+  return /* @__PURE__ */ jsxs(Space$1.Compact, { style: { width: "100%" }, children: [
     /* @__PURE__ */ jsx(
       Select$1,
       {
@@ -20152,7 +20150,7 @@ const ParentCollectionProvider = (e) => {
   return r ? /* @__PURE__ */ jsx(CollectionProvider, { name: String(t).split(".")[0], children: /* @__PURE__ */ jsx(ParentCollectionProvider, { children: /* @__PURE__ */ jsx(CollectionFieldProvider, { name: t, children: /* @__PURE__ */ jsx(CollectionProvider, { name: r, children: n }) }) }) }) : /* @__PURE__ */ jsx(CollectionDeletedPlaceholder, { type: "Collection", name: t });
 }, useAssociationName = () => {
   const e = useCollectionField();
-  return e && ["belongsToMany", "belongsTo", "hasMany", "hasOne"].includes(e.type) ? `${e.collectionName}.${e.name}` : null;
+  return e != null && e.target ? `${e.collectionName}.${e.name}` : null;
 }, useCurrentParentRecordContext = () => {
   var c, u;
   const e = useCollectionRecord(), { name: t, dataSource: n } = useParentCollection() || {}, o = useCollection(), { isInSubForm: r, isInSubTable: i } = useFlag() || {}, a = t ? n : o == null ? void 0 : o.dataSource, l = useCollectionField();
@@ -24177,9 +24175,7 @@ const useGetFilterOptions = () => {
   }
   return t.unflatten(o);
 }, useFilterActionProps$1 = () => {
-  const e = useCollection(), t = useFilterOptions(e == null ? void 0 : e.name);
-  console.log(t);
-  const n = useDataBlockProps();
+  const e = useCollection(), t = useFilterOptions(e == null ? void 0 : e.name), n = useDataBlockProps();
   return useFilterFieldProps({ options: t, params: n == null ? void 0 : n.params });
 }, useFilterFieldProps = ({ options: e, service: t, params: n }) => {
   const { getDataBlockRequest: o } = useDataBlockRequestGetter(), { t: r } = useTranslation(), i = useField(), a = useDataLoadingMode(), l = useFieldSchema(), c = useCompile(), u = useCallback(
@@ -35185,7 +35181,7 @@ function addAppVersion(e, t) {
       addAppVersion((o = e.properties) == null ? void 0 : o[n], t);
     }), e;
 }
-const name = "@nocobase/client", version = "1.5.2", license = "AGPL-3.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
+const name = "@nocobase/client", version = "1.5.3", 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",
@@ -35207,9 +35203,9 @@ const name = "@nocobase/client", version = "1.5.2", license = "AGPL-3.0", main =
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "1.5.2",
-  "@nocobase/sdk": "1.5.2",
-  "@nocobase/utils": "1.5.2",
+  "@nocobase/evaluators": "1.5.3",
+  "@nocobase/sdk": "1.5.3",
+  "@nocobase/utils": "1.5.3",
   ahooks: "^3.7.2",
   antd: "5.12.8",
   "antd-style": "3.7.1",
@@ -63543,24 +63539,26 @@ const mockAPIClient = () => {
   const e = new MockAPIClient(), t = e.mockAdapter();
   return { apiClient: e, mockRequest: t };
 }, PopupContextProvider = (e) => {
-  var p, m;
-  const { visible: t, setVisible: n } = e, [o, r] = useState(!1), { visible: i, setVisible: a } = useContext(PopupVisibleProviderContext) || {
+  var h, g;
+  const { visible: t, setVisible: n } = e, [o, r] = useState(!1), [i, a] = useState(!1), { visible: l, setVisible: c } = useContext(PopupVisibleProviderContext) || {
     visible: !1,
     setVisible: () => {
     }
-  }, l = useFieldSchema(), c = useCallback(
-    (h) => {
-      n == null || n(h), r == null || r(h), a == null || a(h);
+  }, u = useFieldSchema(), d = useCallback(
+    (f) => {
+      n == null || n(f), r == null || r(f), c == null || c(f);
     },
-    [n, a]
-  ), u = ((p = l["x-component-props"]) == null ? void 0 : p.openMode) || "drawer", d = (m = l["x-component-props"]) == null ? void 0 : m.openSize;
+    [n, c]
+  ), p = ((h = u["x-component-props"]) == null ? void 0 : h.openMode) || "drawer", m = (g = u["x-component-props"]) == null ? void 0 : g.openSize;
   return /* @__PURE__ */ jsx(PopupVisibleProvider, { visible: !1, children: /* @__PURE__ */ jsx(
     ActionContextProvider,
     {
-      visible: t || o || i,
-      setVisible: c,
-      openMode: u,
-      openSize: d,
+      visible: t || o || l,
+      setVisible: d,
+      openMode: p,
+      openSize: m,
+      formValueChanged: i,
+      setFormValueChanged: a,
       children: e.children
     }
   ) });