@nocobase/client 1.6.18 → 1.6.19

package/es/index.mjs

@@ -106,7 +106,7 @@ import * as formilyReactiveReact from "@formily/reactive-react";
 import { observer } from "@formily/reactive-react";
 import cronstrue from "cronstrue";
 import * as antdStyle from "antd-style";
-import { createStyles, useAntdToken } from "antd-style";
+import { createStyles, createGlobalStyle, useAntdToken } from "antd-style";
 import { createStyles as yn } from "antd-style";
 import JSON5 from "json5";
 import { usePrefixCls as usePrefixCls$1, dayjsable, formatDayjsValue } from "@formily/antd-v5/esm/__builtins__";
@@ -9184,7 +9184,7 @@ function addAppVersion(e, t) {
       addAppVersion((o = e.properties) == null ? void 0 : o[n], t);
     }), e;
 }
-const name = "@nocobase/client", version = "1.6.18", license = "AGPL-3.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
+const name = "@nocobase/client", version = "1.6.19", 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",
@@ -9206,9 +9206,9 @@ const name = "@nocobase/client", version = "1.6.18", license = "AGPL-3.0", main
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "1.6.18",
-  "@nocobase/sdk": "1.6.18",
-  "@nocobase/utils": "1.6.18",
+  "@nocobase/evaluators": "1.6.19",
+  "@nocobase/sdk": "1.6.19",
+  "@nocobase/utils": "1.6.19",
   ahooks: "^3.7.2",
   antd: "5.12.8",
   "antd-style": "3.7.1",
@@ -13683,13 +13683,16 @@ const setFieldProps$1 = (e, t, n) => {
     n.componentProps = merge(m, n.componentProps || {}, u || {});
   }, [r]), r ? /* @__PURE__ */ jsx(l, x(x({}, e), u)) : null;
 }, CollectionFieldInternalField = (e) => {
-  var a;
+  var l;
   const t = useField(), n = useFieldSchema(), { uiSchema: o } = useCollectionFieldUISchema(), r = useComponent(
-    ((a = n["x-component-props"]) == null ? void 0 : a.component) || (o == null ? void 0 : o["x-component"]) || "Input"
+    ((l = n["x-component-props"]) == null ? void 0 : l.component) || (o == null ? void 0 : o["x-component"]) || "Input"
   ), i = useDynamicComponentProps(o == null ? void 0 : o["x-use-component-props"], e);
-  return useEffect(() => {
+  if (useEffect(() => {
     n["x-read-pretty"] === !0 && !t.readPretty && (t.readPretty = !0), n["x-disabled"] === !0 && (t.disabled = !0);
-  }, [t, n]), o ? /* @__PURE__ */ jsx(r, x(x({}, e), i)) : null;
+  }, [t, n]), !o)
+    return null;
+  const a = x(x({}, e), i);
+  return isVariable$1(a.value) && a.value === n.default && (a.value = void 0), /* @__PURE__ */ jsx(r, x({}, a));
 }, CollectionField$1 = connect((e) => {
   const t = useFieldSchema(), n = useIsInNocoBaseRecursionFieldContext();
   return /* @__PURE__ */ jsx(CollectionFieldProvider, { name: t.name, children: n ? /* @__PURE__ */ jsx(CollectionFieldInternalField, x({}, e)) : /* @__PURE__ */ jsx(CollectionFieldInternalField_deprecated, x({}, e)) });
@@ -29590,7 +29593,7 @@ const useParseDefaultValue = () => {
       return;
     const y = (...T) => V(void 0, [...T], function* ({ forceUpdate: w = !1 } = {}) {
       if (n && e && (isVariable$1(t.default) && e.value == null || e.value === t.default || w)) {
-        isVariable$1(e.value) && (yield e.reset({ forceClear: !0 })), e.loading = !0;
+        e.loading = !0;
         const D = !t.name.toString().includes(".") && (d == null ? void 0 : d.getField(t.name)), {
           value: O,
           collectionName: j,
@@ -29647,13 +29650,15 @@ const formItemWrapCss = css`
   .ant-description-textarea img {
     max-width: 100%;
   }
-  &.ant-formily-item-layout-vertical .ant-formily-item-label {
-    display: inline;
-    .ant-formily-item-label-tooltip-icon {
-      display: inline;
-    }
-    .ant-formily-item-label-content {
+  &.ant-formily-item-layout-horizontal.ant-formily-item-label-wrap {
+    .ant-formily-item-label {
       display: inline;
+      padding-right: 5px;
+
+      .ant-formily-item-label-tooltip-icon,
+      .ant-formily-item-label-content {
+        display: inline;
+      }
     }
   }
 `, formItemLabelCss = css`
@@ -41211,7 +41216,11 @@ const useStyles$6 = genStyleHook("upload", (e) => {
       }
     }
   };
-}), useUploadStyles = useStyles$6;
+}), useUploadStyles = useStyles$6, LightBoxGlobalStyle = createGlobalStyle`
+  .ReactModal__Overlay.ReactModal__Overlay--after-open {
+    z-index: 3000 !important; // 避免预览图片时被遮挡
+  }
+`;
 attachmentFileTypes.add({
   match(e) {
     return matchMimetype(e, "image/*");
@@ -41229,33 +41238,36 @@ attachmentFileTypes.add({
       },
       [e, t]
     );
-    return /* @__PURE__ */ jsx(
-      LightBox,
-      {
-        mainSrc: (r = t[e]) == null ? void 0 : r.url,
-        nextSrc: (i = t[(e + 1) % t.length]) == null ? void 0 : i.url,
-        prevSrc: (a = t[(e + t.length - 1) % t.length]) == null ? void 0 : a.url,
-        onCloseRequest: () => n(null),
-        onMovePrevRequest: () => n((e + t.length - 1) % t.length),
-        onMoveNextRequest: () => n((e + 1) % t.length),
-        imageTitle: (l = t[e]) == null ? void 0 : l.title,
-        toolbarButtons: [
-          /* @__PURE__ */ jsx(
-            "button",
-            {
-              style: { fontSize: 22, background: "none", lineHeight: 1 },
-              type: "button",
-              "aria-label": "Download",
-              title: "Download",
-              className: "ril-zoom-in ril__toolbarItemChild ril__builtinButton",
-              onClick: o,
-              children: /* @__PURE__ */ jsx(DownloadOutlined, {})
-            },
-            "preview-img"
-          )
-        ]
-      }
-    );
+    return /* @__PURE__ */ jsxs(Fragment$1, { children: [
+      /* @__PURE__ */ jsx(LightBoxGlobalStyle, {}),
+      /* @__PURE__ */ jsx(
+        LightBox,
+        {
+          mainSrc: (r = t[e]) == null ? void 0 : r.url,
+          nextSrc: (i = t[(e + 1) % t.length]) == null ? void 0 : i.url,
+          prevSrc: (a = t[(e + t.length - 1) % t.length]) == null ? void 0 : a.url,
+          onCloseRequest: () => n(null),
+          onMovePrevRequest: () => n((e + t.length - 1) % t.length),
+          onMoveNextRequest: () => n((e + 1) % t.length),
+          imageTitle: (l = t[e]) == null ? void 0 : l.title,
+          toolbarButtons: [
+            /* @__PURE__ */ jsx(
+              "button",
+              {
+                style: { fontSize: 22, background: "none", lineHeight: 1 },
+                type: "button",
+                "aria-label": "Download",
+                title: "Download",
+                className: "ril-zoom-in ril__toolbarItemChild ril__builtinButton",
+                onClick: o,
+                children: /* @__PURE__ */ jsx(DownloadOutlined, {})
+              },
+              "preview-img"
+            )
+          ]
+        }
+      )
+    ] });
   }
 });
 const iframePreviewSupportedTypes = ["application/pdf", "audio/*", "image/*", "video/*", "text/plain"];