@nocobase/client 1.6.23 → 1.6.24

package/es/index.mjs

@@ -9194,7 +9194,7 @@ function addAppVersion(e, t) {
       addAppVersion((o = e.properties) == null ? void 0 : o[n], t);
     }), e;
 }
-const name = "@nocobase/client", version = "1.6.23", 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.24", 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",
@@ -9216,9 +9216,9 @@ const name = "@nocobase/client", version = "1.6.23", 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.23",
-  "@nocobase/sdk": "1.6.23",
-  "@nocobase/utils": "1.6.23",
+  "@nocobase/evaluators": "1.6.24",
+  "@nocobase/sdk": "1.6.24",
+  "@nocobase/utils": "1.6.24",
   ahooks: "^3.7.2",
   antd: "5.12.8",
   "antd-style": "3.7.1",
@@ -27429,6 +27429,23 @@ function renderTemplate(e, t) {
     return get$1(t, r) || "";
   });
 }
+function getFilteredFormValues(e) {
+  const t = _.cloneDeep(e.values), n = [];
+  e.query("*").forEach((r) => {
+    r && n.push(r);
+  });
+  const o = n.filter((r) => {
+    var i;
+    return (i = r == null ? void 0 : r.componentProps) == null ? void 0 : i.readOnlySubmit;
+  }).map((r) => {
+    var a;
+    const i = ((a = r.path) == null ? void 0 : a.segments) || [];
+    return i.length <= 1 ? i.join(".") : i.slice(0, -1).join(".");
+  });
+  for (const r of o)
+    _.unset(t, r);
+  return t;
+}
 function getFormValues({
   filterByTk: e,
   field: t,
@@ -27445,7 +27462,7 @@ function getFormValues({
     });
     return omit$1(x({}, n.values), l);
   }
-  return n.values;
+  return getFilteredFormValues(n);
 }
 function useCollectValuesToSubmit() {
   const e = useForm(), t = useFilterByTk(), { field: n, resource: o } = useBlockRequestContext(), { fields: r, getField: i, getTreeParentField: a, 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();
@@ -29376,7 +29393,9 @@ const DragHandler = (e) => {
     r.parseVariable(S, b, { appends: y }).then(({ value: v }) => {
       nextTick(() => {
         const F = transformVariableValue(v, { targetCollectionField: p.current });
-        _.isEmpty(F) && !_.isNumber(F) ? i.value = null : i.value = F;
+        _.isEmpty(F) && !_.isNumber(F) ? i.value = null : (i.value = F, i.componentProps = P(x({}, i.componentProps), {
+          readOnlySubmit: !0
+        }));
       });
     }).catch((v) => {
       console.error(v);
@@ -36668,11 +36687,11 @@ const useBuiltInVariables = () => {
     }
   ], [t, e, o, a, r, i]) };
 }, filterEmptyValues = (e) => Array.isArray(e) ? e.filter((t) => t === 0 || t === !1 || t) : e, TYPE_TO_ACTION = {
-  hasMany: "list?pageSize=9999",
+  hasMany: "list?paginate=false",
   belongsTo: "get",
   hasOne: "get",
-  belongsToMany: "list?pageSize=9999",
-  belongsToArray: "get"
+  belongsToMany: "list?paginate=false",
+  belongsToArray: "list?paginate=false"
 }, getAction = (e) => TYPE_TO_ACTION[e], requested = {}, hasRequested = (e) => !!requested[e], getRequested = (e) => requested[e], stashRequested = (e, t) => {
   requested[e] = t;
 }, clearRequested = (e) => {
@@ -41490,11 +41509,15 @@ function Uploader(n) {
   var o = n, { rules: e } = o, t = Y(o, ["rules"]);
   const { disabled: r, multiple: i, value: a, onChange: l, toValueItem: c = toValueItem } = t, [u, d] = useState([]), [p, m] = useState([]), { t: h } = useTranslation(), { componentCls: g } = useStyles$6(), f = useField(), C = useUploadProps(t), b = useBeforeUpload(e);
   useEffect(() => {
-    p.length ? f.setFeedback({
-      type: "error",
-      code: "ValidateError",
-      messages: [h("Incomplete uploading files need to be resolved")]
-    }) : f.setFeedback({});
+    if (p.length) {
+      const O = p.filter((j) => j.status === "error");
+      f.setFeedback({
+        type: "error",
+        code: "ValidateError",
+        messages: [O.length ? h("Some files are not uploaded correctly, please check.") : " "]
+      });
+    } else
+      f.setFeedback({});
   }, [f, p, h]);
   const S = useCallback(
     (O) => {
@@ -48583,7 +48606,7 @@ const AppendsTreeSelect = (e) => {
       loadData: I
     }, u)
   );
-}, removeIfKeyEmpty = (e, t) => !e || typeof e != "object" || !t || Array.isArray(e) || e[t] ? e : null, AssociationFieldAddNewer = (e) => {
+}, removeIfKeyEmpty = (e, t) => !e || typeof e != "object" || !t || Array.isArray(e) || e[t] ? e : void 0, AssociationFieldAddNewer = (e) => {
   const t = useContext(SchemaComponentContext);
   return /* @__PURE__ */ jsx(SchemaComponentContext.Provider, { value: P(x({}, t), { draggable: !0 }), children: /* @__PURE__ */ jsx(Action.Container, x({}, e)) });
 }, filterAnalyses = (e) => {
@@ -48608,9 +48631,9 @@ const InternalAssociationSelect$1 = observer$1(
     var O;
     const D = e, { objectValue: t = !0, addMode: n } = D, o = Y(D, ["objectValue", "addMode"]), r = useField(), i = useFieldSchema(), a = useServiceOptions$1((i == null ? void 0 : i["x-component-props"]) || e), { options: l } = useAssociationFieldContext(), c = isVariable$1(e.value) ? void 0 : e.value, u = Array.isArray(c) ? c.filter(Boolean) : c, [d, p] = useState(u), m = (O = i["x-component-props"]) == null ? void 0 : O.addMode, { t: h } = useTranslation(), { multiple: g } = e, f = useForm(), b = useAPIClient().resource(l.target), S = useCollectionRecordData(), y = useContext(SchemaComponentContext), { getCollection: v } = useCollectionManager_deprecated(), F = v(l.target), { filterTargetKey: I } = F;
     useEffect(() => {
-      const j = isVariable$1(r.value) ? void 0 : r.value, N = Array.isArray(j) ? j.filter(Boolean) : j;
-      p(N);
-    }, [r.value]), useEffect(() => {
+      const j = isVariable$1(r.value) ? void 0 : r.value, N = Array.isArray(j) ? j.filter(Boolean) : j, B = removeIfKeyEmpty(N, I);
+      p(B), isEqual(r.value, B) || (r.value = B);
+    }, [r.value, I]), useEffect(() => {
       const j = uid();
       return f.addEffects(j, () => {
         onFieldInputValueChange("*", (N) => {
@@ -63215,13 +63238,13 @@ const ACLCollectionProvider = (e) => {
 }, ACLActionProvider = (e) => {
   const t = useCollection(), n = useRecordPkValue(), o = useResourceName(), { parseAction: r, uiButtonSchemasBlacklist: i } = useACLRoleContext(), a = useFieldSchema(), l = a["x-uid"];
   let c = a["x-acl-action"];
-  const u = ["create", "update", "destroy", "importXlsx", "export"];
+  const u = ["create", "update", "destroy", "importXlsx", "export"], d = ["create", "update", "destroy", "importXlsx", "bulkDestroy", "bulkUpdate"];
   !c && o && a["x-action"] && u.includes(a["x-action"]) && (c = `${o}:${a["x-action"]}`), c && !(c != null && c.includes(":")) && (c = `${o}:${c}`);
-  const d = useMemo(
+  const p = useMemo(
     () => c && r(c, { schema: a, recordPkValue: n }),
     [r, c, a, n]
   );
-  return i != null && i.includes(l) ? /* @__PURE__ */ jsx(ACLActionParamsContext.Provider, { value: !1, children: e.children }) : c ? o ? d ? u.includes(c) || u.includes(c == null ? void 0 : c.split(":")[1]) ? t && t.template !== "view" || t != null && t.writableView ? /* @__PURE__ */ jsx(ACLActionParamsContext.Provider, { value: d, children: e.children }) : null : /* @__PURE__ */ jsx(ACLActionParamsContext.Provider, { value: d, children: e.children }) : /* @__PURE__ */ jsx(ACLActionParamsContext.Provider, { value: d, children: e.children }) : /* @__PURE__ */ jsx(Fragment$1, { children: e.children }) : /* @__PURE__ */ jsx(Fragment$1, { children: e.children });
+  return i != null && i.includes(l) ? /* @__PURE__ */ jsx(ACLActionParamsContext.Provider, { value: !1, children: e.children }) : c ? o ? p ? d.includes(c) || d.includes(c == null ? void 0 : c.split(":")[1]) ? t && t.template !== "view" || t != null && t.writableView ? /* @__PURE__ */ jsx(ACLActionParamsContext.Provider, { value: p, children: e.children }) : /* @__PURE__ */ jsx(ACLActionParamsContext.Provider, { value: !1, children: e.children }) : /* @__PURE__ */ jsx(ACLActionParamsContext.Provider, { value: p, children: e.children }) : /* @__PURE__ */ jsx(ACLActionParamsContext.Provider, { value: p, children: e.children }) : /* @__PURE__ */ jsx(Fragment$1, { children: e.children }) : /* @__PURE__ */ jsx(Fragment$1, { children: e.children });
 }, useACLFieldWhitelist = () => {
   const e = useContext(ACLActionParamsContext), t = useMemo(() => [].concat((e == null ? void 0 : e.whitelist) || []).concat((e == null ? void 0 : e.fields) || []).concat((e == null ? void 0 : e.appends) || []), [e == null ? void 0 : e.whitelist, e == null ? void 0 : e.fields, e == null ? void 0 : e.appends]);
   return {