@nocobase/client 1.9.39 → 1.9.41

package/es/index.mjs

@@ -53,7 +53,7 @@ import { css, cx } from "@emotion/css";
 export * from "@emotion/css";
 import jsxRuntime, { jsx, jsxs, Fragment as Fragment$1 } from "react/jsx-runtime";
 import * as formilyReact from "@formily/react";
-import { Observer, SchemaOptionsContext, SchemaComponentsContext, ExpressionScope, Schema, connect, mapProps, useField, useExpressionScope, useFieldSchema, SchemaExpressionScopeContext, observer as observer$1, FormContext, FormProvider as FormProvider$1, useForm, mapReadPretty, FieldContext, ObjectField, ArrayField, RecursionField, SchemaContext, VoidField, Field, createSchemaField } from "@formily/react";
+import { Observer, SchemaOptionsContext, SchemaComponentsContext, ExpressionScope, Schema, connect, mapProps, useField, useExpressionScope, useFieldSchema, SchemaExpressionScopeContext, observer as observer$1, FormContext, FormProvider as FormProvider$1, useForm, mapReadPretty, FieldContext, ObjectField, ArrayField, RecursionField, SchemaContext, VoidField, Field, createSchemaField, useFormEffects } from "@formily/react";
 import * as ahooks from "ahooks";
 import { useSetState, useRequest as useRequest$1, useBoolean, useUpdate, useMemoizedFn, useDeepCompareEffect, useEventListener, useLocalStorageState, useCreation, useDebounce } from "ahooks";
 import * as antd from "antd";
@@ -97,7 +97,7 @@ import { matchRoutes } from "react-router";
 import omit$1 from "lodash/omit";
 import qs from "qs";
 import * as formilyCore from "@formily/core";
-import { createForm, onFormValuesChange, onFieldValueChange, onFieldChange, isArrayField, onFormInputChange, onFieldInit, onFieldInputValueChange, onFormSubmitSuccess, registerValidateFormats, registerValidateRules as registerValidateRules$1 } from "@formily/core";
+import { createForm, onFormValuesChange, onFieldValueChange, onFieldChange, isArrayField, onFormInputChange, onFieldInit, onFieldInputValueChange, onFormReset, onFormSubmitSuccess, registerValidateFormats, registerValidateRules as registerValidateRules$1 } from "@formily/core";
 import dayjs from "dayjs";
 import flat, { unflatten } from "flat";
 import * as nocobaseEvaluators from "@nocobase/evaluators/client";
@@ -2785,6 +2785,9 @@ const bp = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   get VariablePopupRecordProvider() {
     return VariablePopupRecordProvider;
   },
+  get VariableScope() {
+    return VariableScope;
+  },
   get VariableScopeProvider() {
     return VariableScopeProvider;
   },
@@ -8855,7 +8858,7 @@ function addAppVersion(e, t) {
       addAppVersion((o = e.properties) == null ? void 0 : o[n], t);
     }), e;
 }
-const name = "@nocobase/client", version = "1.9.39", 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.41", 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",
@@ -8876,9 +8879,9 @@ const name = "@nocobase/client", version = "1.9.39", license = "AGPL-3.0", main
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "1.9.39",
-  "@nocobase/sdk": "1.9.39",
-  "@nocobase/utils": "1.9.39",
+  "@nocobase/evaluators": "1.9.41",
+  "@nocobase/sdk": "1.9.41",
+  "@nocobase/utils": "1.9.41",
   ahooks: "^3.7.2",
   antd: "5.24.2",
   "antd-mobile": "^5.41.1",
@@ -11655,47 +11658,38 @@ ResourceActionContext.displayName = "ResourceActionContext";
 const ResourceContext = createContext(null);
 ResourceContext.displayName = "ResourceContext";
 const CollectionResourceActionProvider = (e) => {
-  var g, f, C, b;
+  var v, I, F;
   const { collection: t, request: n, uid: o, dragSort: r } = e, a = useAPIClient(), i = useRecord(), l = n == null ? void 0 : n.action, c = {};
   l === "get" && (c.filterByTk = i[t.targetKey || t.filterTargetKey || "id"]);
-  const u = ((g = n == null ? void 0 : n.params) == null ? void 0 : g.appends) || [], d = useRequest(
+  const y = (n == null ? void 0 : n.params) || {}, { appends: u, disableDefaultAppends: d } = y, p = W(y, ["appends", "disableDefaultAppends"]), m = ((I = (v = t == null ? void 0 : t.fields) == null ? void 0 : v.filter) == null ? void 0 : I.call(v, (w) => w.target).map((w) => w.name)) || [], h = d ? u || [] : [...m, ...u || []], g = h.length > 0, f = useRequest(
     P(x({}, n), {
-      params: P(x(x({}, c), n == null ? void 0 : n.params), {
-        appends: [
-          ...((C = (f = t == null ? void 0 : t.fields) == null ? void 0 : f.filter) == null ? void 0 : C.call(f, (S) => S.target).map((S) => S.name)) || [],
-          ...u
-        ],
-        sort: r ? [t.sortable === !0 ? "sort" : t.sortable] : (b = n == null ? void 0 : n.params) == null ? void 0 : b.sort
+      params: P(x(x(x({}, c), p), g ? { appends: h } : {}), {
+        sort: r ? [t.sortable === !0 ? "sort" : t.sortable] : (F = n == null ? void 0 : n.params) == null ? void 0 : F.sort
       })
     }),
     { uid: o }
-  ), p = a.resource(n.resource), m = useMemo(
-    () => P(x({}, d), { defaultRequest: n, dragSort: r }),
-    [r, n, d]
-  ), h = useMemo(() => ({ type: "collection", resource: p, collection: t }), [t, p]);
-  return /* @__PURE__ */ jsx(ResourceContext.Provider, { value: h, children: /* @__PURE__ */ jsx(ResourceActionContext.Provider, { value: m, children: /* @__PURE__ */ jsx(CollectionProvider_deprecated, { collection: t, children: e.children }) }) });
+  ), C = a.resource(n.resource), b = useMemo(
+    () => P(x({}, f), { defaultRequest: n, dragSort: r }),
+    [r, n, f]
+  ), S = useMemo(() => ({ type: "collection", resource: C, collection: t }), [t, C]);
+  return /* @__PURE__ */ jsx(ResourceContext.Provider, { value: S, children: /* @__PURE__ */ jsx(ResourceActionContext.Provider, { value: b, children: /* @__PURE__ */ jsx(CollectionProvider_deprecated, { collection: t, children: e.children }) }) });
 }, AssociationResourceActionProvider = (e) => {
-  var g, f, C;
-  const { collection: t, association: n, request: o, uid: r, dragSort: a } = e, i = useAPIClient(), c = useRecord()[n.sourceKey], u = ((g = o == null ? void 0 : o.params) == null ? void 0 : g.appends) || [], d = useRequest(
+  var v, I;
+  const { collection: t, association: n, request: o, uid: r, dragSort: a } = e, i = useAPIClient(), c = useRecord()[n.sourceKey], y = (o == null ? void 0 : o.params) || {}, { appends: u, disableDefaultAppends: d } = y, p = W(y, ["appends", "disableDefaultAppends"]), m = ((I = (v = t == null ? void 0 : t.fields) == null ? void 0 : v.filter) == null ? void 0 : I.call(v, (F) => F.target).map((F) => F.name)) || [], h = d ? u || [] : [...m, ...u || []], g = h.length > 0, f = useRequest(
     P(x({
       resourceOf: c
     }, o), {
-      params: P(x({}, o == null ? void 0 : o.params), {
-        appends: [
-          ...((C = (f = t == null ? void 0 : t.fields) == null ? void 0 : f.filter) == null ? void 0 : C.call(f, (b) => b.target).map((b) => b.name)) || [],
-          ...u
-        ]
-      })
+      params: x(x({}, p), g ? { appends: h } : {})
     }),
     { uid: r }
-  ), p = i.resource(o.resource, c), m = useMemo(
-    () => ({ type: "association", resource: p, association: n, collection: t }),
-    [n, t, p]
-  ), h = useMemo(
-    () => P(x({}, d), { defaultRequest: o, dragSort: a }),
-    [a, o, d]
+  ), C = i.resource(o.resource, c), b = useMemo(
+    () => ({ type: "association", resource: C, association: n, collection: t }),
+    [n, t, C]
+  ), S = useMemo(
+    () => P(x({}, f), { defaultRequest: o, dragSort: a }),
+    [a, o, f]
   );
-  return /* @__PURE__ */ jsx(ResourceContext.Provider, { value: m, children: /* @__PURE__ */ jsx(ResourceActionContext.Provider, { value: h, children: /* @__PURE__ */ jsx(CollectionProvider_deprecated, { collection: t, children: e.children }) }) });
+  return /* @__PURE__ */ jsx(ResourceContext.Provider, { value: b, children: /* @__PURE__ */ jsx(ResourceActionContext.Provider, { value: S, children: /* @__PURE__ */ jsx(CollectionProvider_deprecated, { collection: t, children: e.children }) }) });
 }, ResourceActionProvider = (e) => {
   var r;
   let { collection: t, request: n } = e;
@@ -45261,7 +45255,7 @@ const InternalFileManager = (e) => {
       var C, b;
       (C = a.values) != null && C[i.name] || (n && n.values.select_array && !((b = a.values) != null && b[i.name]) ? (n.setValuesIn("select_array", void 0), setTimeout(() => {
         n.setValuesIn("select_array", [{}]);
-      })) : n.reset());
+      })) : n.setValuesIn(i.name, null));
     }, [(f = a.values) == null ? void 0 : f[i.name]]);
     const g = {
       type: "object",
@@ -45328,6 +45322,9 @@ const InternalFileManager = (e) => {
         schema: P(x({}, i), {
           default: u,
           title: "",
+          "x-decorator-props": {
+            feedbackLayout: "none"
+          },
           "x-component": AssociationCascadeSelect,
           "x-component-props": x({}, e)
         })
@@ -46314,51 +46311,52 @@ function FinallyButton(h) {
     form: p,
     designable: m
   } = g;
-  var v, I, F, w, T, D;
-  const { getCollection: b } = useCollectionManager_deprecated(), S = useACLActionParamsContext(), y = useMemo(() => {
-    var M;
-    const B = m && (((M = d == null ? void 0 : d.data) == null ? void 0 : M.hidden) || !S);
+  var I, F, w, T, D, B, N, M;
+  const { getCollection: b } = useCollectionManager_deprecated(), S = useACLActionParamsContext(), y = (p == null ? void 0 : p.disabled) || ((I = d == null ? void 0 : d.data) == null ? void 0 : I.disabled) || ((F = d == null ? void 0 : d.componentProps) == null ? void 0 : F.disabled) || (r == null ? void 0 : r.disabled), v = useMemo(() => {
+    var O;
+    const j = m && (((O = d == null ? void 0 : d.data) == null ? void 0 : O.hidden) || !S);
     return {
-      opacity: a !== "link" && B ? 0.1 : 1
+      opacity: a !== "link" && j ? 0.1 : 1
     };
-  }, [m, (v = d == null ? void 0 : d.data) == null ? void 0 : v.hidden, S, a]);
+  }, [m, (w = d == null ? void 0 : d.data) == null ? void 0 : w.hidden, S, a]);
   return (e == null ? void 0 : e.length) > 0 ? t ? /* @__PURE__ */ jsx(
     Button,
     {
       "aria-label": r["aria-label"],
       type: a,
-      disabled: d.disabled,
+      disabled: y,
       danger: r.danger,
       icon: u,
-      onClick: (B) => {
-        const N = getLinkageCollection(t, p, d), M = e.find((R) => R.name === N) ? N : c.name, j = b(M);
-        l == null || l(j);
+      onClick: (j) => {
+        const R = getLinkageCollection(t, p, d), O = e.find((A) => A.name === R) ? R : c.name, $ = b(O);
+        l == null || l($);
       },
       style: x({
-        display: !m && ((I = d == null ? void 0 : d.data) == null ? void 0 : I.hidden) && "none",
-        opacity: m && ((F = d == null ? void 0 : d.data) == null ? void 0 : F.hidden) && 0.1
-      }, y),
+        display: !m && ((T = d == null ? void 0 : d.data) == null ? void 0 : T.hidden) && "none",
+        opacity: m && ((D = d == null ? void 0 : d.data) == null ? void 0 : D.hidden) && 0.1
+      }, v),
       children: r.children
     }
   ) : n === void 0 || n ? /* @__PURE__ */ jsxs(
     Dropdown.Button,
     {
       "aria-label": r["aria-label"],
+      disabled: y,
       danger: r.danger,
       type: a,
       icon: /* @__PURE__ */ jsx(DownOutlined, {}),
-      style: x(x({}, r == null ? void 0 : r.style), y),
-      buttonsRender: ([B, N]) => [
-        React.cloneElement(B, {
+      style: x(x({}, r == null ? void 0 : r.style), v),
+      buttonsRender: ([j, R]) => [
+        React.cloneElement(j, {
           style: r == null ? void 0 : r.style
         }),
-        React.cloneElement(N, {
+        React.cloneElement(R, {
           loading: !1,
           style: P(x({}, r == null ? void 0 : r.style), { justifyContent: "center" })
         })
       ],
       menu: i,
-      onClick: (B) => {
+      onClick: (j) => {
         l == null || l(c);
       },
       children: [
@@ -46366,14 +46364,15 @@ function FinallyButton(h) {
         r.children
       ]
     }
-  ) : /* @__PURE__ */ jsx(Dropdown, { menu: i, children: /* @__PURE__ */ jsxs(
+  ) : /* @__PURE__ */ jsx(Dropdown, { menu: i, disabled: y, children: /* @__PURE__ */ jsxs(
     Button,
     {
       "aria-label": r["aria-label"],
+      disabled: y,
       icon: u,
       type: a,
       danger: r.danger,
-      style: x(x({}, r == null ? void 0 : r.style), y),
+      style: x(x({}, r == null ? void 0 : r.style), v),
       children: [
         r.children,
         " ",
@@ -46385,17 +46384,17 @@ function FinallyButton(h) {
     P(x({}, r), {
       "aria-label": r["aria-label"],
       type: a,
-      disabled: d.disabled,
+      disabled: y,
       danger: r.danger,
       icon: u,
-      onClick: (B) => {
+      onClick: (j) => {
         l == null || l(c);
       },
       style: x(P(x({}, r == null ? void 0 : r.style), {
-        display: !m && ((w = d == null ? void 0 : d.data) != null && w.hidden) ? "none" : "inline-block",
-        opacity: m && ((T = d == null ? void 0 : d.data) == null ? void 0 : T.hidden) && 0.1
-      }), y),
-      children: o ? (D = r == null ? void 0 : r.children) == null ? void 0 : D[1] : r == null ? void 0 : r.children
+        display: !m && ((B = d == null ? void 0 : d.data) != null && B.hidden) ? "none" : "inline-block",
+        opacity: m && ((N = d == null ? void 0 : d.data) == null ? void 0 : N.hidden) && 0.1
+      }), v),
+      children: o ? (M = r == null ? void 0 : r.children) == null ? void 0 : M[1] : r == null ? void 0 : r.children
     })
   );
 }
@@ -50397,19 +50396,26 @@ const NanoIDInput = Object.assign(
   connect(
     Input$3,
     mapProps((e, t) => {
-      const { size: n, customAlphabet: o } = useCollectionField() || { size: 21 }, { t: r } = useTranslation(), a = useForm(), { isInFilterFormBlock: i } = useFlag();
-      function l(c) {
-        if ((c == null ? void 0 : c.length) !== n)
-          return r("Field value size is") + ` ${n || 21}`;
-        for (let u = 0; u < c.length; u++)
-          if ((o == null ? void 0 : o.indexOf(c[u])) === -1)
-            return r("Field value do not meet the requirements");
+      const { size: n, customAlphabet: o, autoFill: r } = useCollectionField() || { size: 21 }, { t: a } = useTranslation(), i = useForm(), { isInFilterFormBlock: l } = useFlag();
+      function c(u) {
+        if ((u == null ? void 0 : u.length) !== n)
+          return a("Field value size is") + ` ${n || 21}`;
+        for (let d = 0; d < u.length; d++)
+          if ((o == null ? void 0 : o.indexOf(u[d])) === -1)
+            return a("Field value do not meet the requirements");
       }
       return useEffect(() => {
-        !t.initialValue && o && !i && t.setInitialValue(customAlphabet(o, n)()), a.setFieldState(t.props.name, (c) => {
-          c.validator = l;
+        !t.initialValue && o && !l && t.setInitialValue(customAlphabet(o, n)()), i.setFieldState(t.props.name, (u) => {
+          u.validator = c;
+        });
+      }, [l]), useFormEffects(() => {
+        onFormReset(() => {
+          if (!o || l || r === !1)
+            return;
+          const u = customAlphabet(o, n)();
+          t.setInitialValue(u), t.setValue(u);
         });
-      }, [i]), P(x({}, e), {
+      }), P(x({}, e), {
         suffix: /* @__PURE__ */ jsx("span", { children: t != null && t.loading || t != null && t.validating ? /* @__PURE__ */ jsx(LoadingOutlined, {}) : e.suffix })
       });
     }),
@@ -70497,6 +70503,7 @@ export {
   Variable,
   VariableInput,
   VariablePopupRecordProvider,
+  VariableScope,
   VariableScopeProvider,
   VariablesContext,
   VariablesProvider$1 as VariablesProvider,

package/es/variables/index.d.ts

@@ -16,4 +16,4 @@ export * from './utils/isVariable';
 export * from './utils/transformVariableValue';
 export * from './constants';
 export type { VariablesContextType } from './types';
-export { useVariableScopeInfo } from './VariableScope';
+export { VariableScope, useVariableScopeInfo } from './VariableScope';