@nocobase/client 1.9.0-beta.12 → 1.9.0-beta.14

package/es/block-provider/hooks/index.d.ts

@@ -6,6 +6,7 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
+import { Form } from '@formily/core';
 import { ChangeEvent } from 'react';
 import { NavigateFunction } from 'react-router-dom';
 import { CollectionOptions } from '../../collection-manager';
@@ -26,7 +27,7 @@ export declare function getFormValues({ filterByTk, field, form, fieldNames, get
     resource: any;
     actionFields: any[];
 }): any;
-export declare function useCollectValuesToSubmit(): () => Promise<any>;
+export declare function useCollectValuesToSubmit(f?: Form): () => Promise<any>;
 export declare const useCreateActionProps: () => {
     onClick(): Promise<void>;
 };

package/es/index.mjs

@@ -8850,7 +8850,7 @@ function addAppVersion(e, t) {
       addAppVersion((o = e.properties) == null ? void 0 : o[n], t);
     }), e;
 }
-const name = "@nocobase/client", version = "1.9.0-beta.12", license = "AGPL-3.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
+const name = "@nocobase/client", version = "1.9.0-beta.14", 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",
@@ -8871,9 +8871,9 @@ const name = "@nocobase/client", version = "1.9.0-beta.12", license = "AGPL-3.0"
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "1.9.0-beta.12",
-  "@nocobase/sdk": "1.9.0-beta.12",
-  "@nocobase/utils": "1.9.0-beta.12",
+  "@nocobase/evaluators": "1.9.0-beta.14",
+  "@nocobase/sdk": "1.9.0-beta.14",
+  "@nocobase/utils": "1.9.0-beta.14",
   ahooks: "^3.7.2",
   antd: "5.24.2",
   "antd-style": "3.7.1",
@@ -29456,46 +29456,46 @@ function getFormValues({
   }
   return getFilteredFormValues(n);
 }
-function useCollectValuesToSubmit() {
-  const e = useForm(), t = useFilterByTk(), { field: n, resource: o } = useBlockRequestContext(), { fields: r, getField: a, getTreeParentField: i, name: l } = useCollection_deprecated(), c = r.map((f) => f.name), { fieldSchema: u } = useActionContext(), { getActiveFieldsName: d } = useFormActiveFields() || {}, p = useVariables$1(), m = useLocalVariables$1({ currentForm: e }), h = useFieldSchema(), g = useTreeParentRecord();
+function useCollectValuesToSubmit(e) {
+  const t = useForm(), n = e != null ? e : t, o = useFilterByTk(), { field: r, resource: a } = useBlockRequestContext(), { fields: i, getField: l, getTreeParentField: c, name: u } = useCollection_deprecated(), d = i.map((b) => b.name), { fieldSchema: p } = useActionContext(), { getActiveFieldsName: m } = useFormActiveFields() || {}, h = useVariables$1(), g = useLocalVariables$1({ currentForm: n }), f = useFieldSchema(), C = useTreeParentRecord();
   return useCallback(() => q(this, null, function* () {
-    var I, F, R, T;
-    const { assignedValues: f = {}, overwriteValues: C } = (I = h == null ? void 0 : h["x-action-settings"]) != null ? I : {}, b = getFormValues({
-      filterByTk: t,
-      field: n,
-      form: e,
-      fieldNames: c,
-      getField: a,
-      resource: o,
-      actionFields: (d == null ? void 0 : d("form")) || []
-    }), S = {}, y = Object.keys(f).map((D) => q(this, null, function* () {
-      const B = f[D], N = a(D);
-      if (isVariable$1(B)) {
-        const { value: M } = (yield p == null ? void 0 : p.parseVariable(B, m)) || {};
-        S[D] = transformVariableValue(M, { targetCollectionField: N });
+    var R, T, D, B;
+    const { assignedValues: b = {}, overwriteValues: S } = (R = f == null ? void 0 : f["x-action-settings"]) != null ? R : {}, y = getFormValues({
+      filterByTk: o,
+      field: r,
+      form: n,
+      fieldNames: d,
+      getField: l,
+      resource: a,
+      actionFields: (m == null ? void 0 : m("form")) || []
+    }), v = {}, I = Object.keys(b).map((N) => q(this, null, function* () {
+      const M = b[N], j = l(N);
+      if (isVariable$1(M)) {
+        const { value: w } = (yield h == null ? void 0 : h.parseVariable(M, g)) || {};
+        v[N] = transformVariableValue(w, { targetCollectionField: j });
       } else
-        B !== "" && (S[D] = B);
+        M !== "" && (v[N] = M);
     }));
-    if (yield Promise.all(y), (F = u == null ? void 0 : u["x-component-props"]) == null ? void 0 : F.addChild) {
-      const D = i();
-      b[(R = D == null ? void 0 : D.name) != null ? R : "parent"] = g, b[(T = D == null ? void 0 : D.foreignKey) != null ? T : "parentId"] = g == null ? void 0 : g.id;
+    if (yield Promise.all(I), (T = p == null ? void 0 : p["x-component-props"]) == null ? void 0 : T.addChild) {
+      const N = c();
+      y[(D = N == null ? void 0 : N.name) != null ? D : "parent"] = C, y[(B = N == null ? void 0 : N.foreignKey) != null ? B : "parentId"] = C == null ? void 0 : C.id;
     }
-    return x(x(x({}, b), C), S);
+    return x(x(x({}, y), S), v);
   }), [
-    h,
-    n,
-    c,
-    u,
-    t,
-    e,
+    f,
+    r,
     d,
-    a,
-    i,
+    p,
+    o,
+    n,
     m,
     l,
-    o,
+    c,
     g,
-    p
+    u,
+    a,
+    C,
+    h
   ]);
 }
 const useCreateActionProps = () => {
@@ -31089,7 +31089,7 @@ const DragHandler = (e) => {
         open: i,
         onDropdownVisibleChange: l
       }, e), {
-        allowClear: !0,
+        allowClear: !1,
         style: {
           width: "100%",
           minWidth: 100,
@@ -31909,7 +31909,7 @@ const useParseDefaultValue = () => {
         const j = transformVariableValue(B, {
           targetCollectionField: D
         });
-        j == null || j === "" ? e.mounted && (e.setInitialValue(void 0), e.setValue(void 0)) : p() ? h === 0 && m(j) : e.setInitialValue(j), e.loading = !1;
+        j == null || j === "" ? e.mounted && (e.setInitialValue(void 0), e.setValue(void 0)) : p() ? h === 0 && m(j) : (e.setInitialValue(j), e.setValue(j)), e.loading = !1;
       } else
         !/\{\{.+\}\}/g.test(t.default) && e.setInitialValue && e.setInitialValue(t.default);
     }), v = _.debounce(y, DEBOUNCE_WAIT);
@@ -31955,6 +31955,9 @@ const formItemWrapCss = css`
       display: inline;
     }
   }
+  .ant-formily-item-label label {
+    word-break: normal;
+  }
 `, formItemLabelCss = css`
   .ant-card-body {
     padding: 0px !important;
@@ -43189,7 +43192,7 @@ const className1 = css`
       onClick: () => q(void 0, null, function* () {
         const I = yield FormDialog(
           o("Add tab"),
-          () => /* @__PURE__ */ jsx(SchemaComponentOptions, { scope: p.scope, components: x({}, p.components), children: /* @__PURE__ */ jsx(FormLayout, { layout: "vertical", children: /* @__PURE__ */ jsx(
+          () => /* @__PURE__ */ jsx(SchemaComponentOptions, { scope: p.scope, components: x({}, p.components), children: /* @__PURE__ */ jsx(FormLayout, { layout: "vertical", children: /* @__PURE__ */ jsx(zIndexContext.Provider, { value: ICON_POPUP_Z_INDEX, children: /* @__PURE__ */ jsx(
             SchemaComponent,
             {
               schema: {
@@ -43208,7 +43211,7 @@ const className1 = css`
                 }
               }
             }
-          ) }) }),
+          ) }) }) }),
           m
         ).open({
           initialValues: {}
@@ -44034,9 +44037,18 @@ function validate(e, t) {
 function useBeforeUpload(e) {
   const { t } = useTranslation();
   return useCallback(
-    (n) => {
-      const o = validate(n, e);
-      return o ? (n.status = "error", n.response = t(o)) : n.status === "error" && (delete n.status, delete n.response), !o;
+    (n, o) => {
+      var i, l;
+      let r = n;
+      if (!n.type) {
+        const c = (l = (i = n.name) == null ? void 0 : i.match(/\.[^.]+$/)) == null ? void 0 : l[0];
+        c && (r = new File([n], n.name, {
+          type: mime.getType(c) || "application/octet-stream",
+          lastModified: n.lastModified
+        }));
+      }
+      const a = validate(r, e);
+      return a ? (r.status = "error", r.response = t(a)) : r.status === "error" && (delete r.status, delete r.response), a ? !1 : r;
     },
     [e]
   );
@@ -44151,38 +44163,56 @@ attachmentFileTypes.add({
     return e.preview ? e.preview : e.url ? e.url : e.originFileObj ? URL.createObjectURL(e.originFileObj) : null;
   },
   Previewer({ index: e, list: t, onSwitchIndex: n }) {
-    var c, u, d, p;
-    const [o, r] = useState(0), a = useCallback(
-      (m) => {
-        m.preventDefault();
-        const h = t[e];
-        saveAs(h.url, `${h.title}${h.extname}`);
+    var p, m, h, g;
+    const [o, r] = useState(0), a = useRef(!1), i = () => document.querySelector(".ril-image-current"), l = useCallback((f, C) => {
+      if (!f)
+        return;
+      const b = f.style.transform || "", y = `${b.replace(/rotate\([^)]*\)/g, "").trim()} rotate(${(C % 360 + 360) % 360}deg)`.trim();
+      b !== y && (a.current = !0, f.style.transform = y, f.style.transformOrigin = "center center", setTimeout(() => {
+        a.current = !1;
+      }, 0));
+    }, []), c = useCallback(
+      (f) => {
+        f.preventDefault();
+        const C = t[e];
+        saveAs(C.url, `${C.title}${C.extname}`);
       },
       [e, t]
-    ), i = useCallback(() => {
-      r((m) => (m - 90) % 360);
-    }, []), l = useCallback(() => {
-      r((m) => (m + 90) % 360);
+    ), u = useCallback(() => {
+      r((f) => (f - 90) % 360);
+    }, []), d = useCallback(() => {
+      r((f) => (f + 90) % 360);
     }, []);
     return useEffect(() => {
-      const m = document.querySelector(".ril-image-current");
-      if (!m)
+      l(i(), o);
+    }, [o, l]), useEffect(() => {
+      const f = i();
+      if (!f)
         return;
-      let { transform: h } = m.style || {};
-      const g = `rotate(${o}deg)`;
-      (h == null ? void 0 : h.match(/rotate\(-?(\d+)deg\)/)) ? h = h.replace(/rotate\(-?(\d+)deg\)/, g) : h = `${h} ${g}`, m.style.transform = h;
-    }, [o]), /* @__PURE__ */ jsxs(Fragment$1, { children: [
+      l(f, o);
+      const C = new MutationObserver((b) => {
+        a.current || b.some((S) => S.attributeName === "style") && l(f, o);
+      });
+      return C.observe(f, { attributes: !0, attributeFilter: ["style"] }), () => C.disconnect();
+    }, [l, o, e]), /* @__PURE__ */ jsxs(Fragment$1, { children: [
       /* @__PURE__ */ jsx(LightBoxGlobalStyle, {}),
       /* @__PURE__ */ jsx(
         LightBox,
         {
-          mainSrc: (c = t[e]) == null ? void 0 : c.url,
-          nextSrc: (u = t[(e + 1) % t.length]) == null ? void 0 : u.url,
-          prevSrc: (d = t[(e + t.length - 1) % t.length]) == null ? void 0 : d.url,
+          mainSrc: (p = t[e]) == null ? void 0 : p.url,
+          nextSrc: (m = t[(e + 1) % t.length]) == null ? void 0 : m.url,
+          prevSrc: (h = t[(e + t.length - 1) % t.length]) == null ? void 0 : h.url,
           onCloseRequest: () => n(null),
-          onMovePrevRequest: () => n((e + t.length - 1) % t.length),
-          onMoveNextRequest: () => n((e + 1) % t.length),
-          imageTitle: (p = t[e]) == null ? void 0 : p.title,
+          onMovePrevRequest: () => {
+            r(0), n((e + t.length - 1) % t.length);
+          },
+          onMoveNextRequest: () => {
+            r(0), n((e + 1) % t.length);
+          },
+          onAfterOpen: () => {
+            l(i(), o);
+          },
+          imageTitle: (g = t[e]) == null ? void 0 : g.title,
           toolbarButtons: [
             /* @__PURE__ */ jsx(
               "button",
@@ -44192,7 +44222,7 @@ attachmentFileTypes.add({
                 title: "Download",
                 className: "ril-zoom-in ril__toolbarItemChild ril__builtinButton",
                 style: { fontSize: 22, background: "none", lineHeight: 1 },
-                onClick: a,
+                onClick: c,
                 children: /* @__PURE__ */ jsx(DownloadOutlined, {})
               },
               "preview-img"
@@ -44203,7 +44233,7 @@ attachmentFileTypes.add({
                 type: "button",
                 className: "ril-zoom-in ril__toolbarItemChild ril__builtinButton",
                 style: { fontSize: 22, background: "none", lineHeight: 1 },
-                onClick: i,
+                onClick: u,
                 children: /* @__PURE__ */ jsx(UndoOutlined, {})
               },
               "rotate-left"
@@ -44214,7 +44244,7 @@ attachmentFileTypes.add({
                 type: "button",
                 className: "ril-zoom-in ril__toolbarItemChild ril__builtinButton",
                 style: { fontSize: 22, background: "none", lineHeight: 1 },
-                onClick: l,
+                onClick: d,
                 children: /* @__PURE__ */ jsx(RedoOutlined, {})
               },
               "rotate-right"

package/es/schema-component/antd/upload/shared.d.ts

@@ -87,4 +87,4 @@ export declare function toValueItem(data: any): any;
 export declare const toItem: (file: any) => any;
 export declare const toFileList: (fileList: any) => any[];
 export declare function validate(file: any, rules: Record<string, any>): string;
-export declare function useBeforeUpload(rules: any): (file: any) => boolean;
+export declare function useBeforeUpload(rules: any): (file: any, fileList: any) => any;