@nocobase/client 1.7.9 → 1.7.10

package/es/index.mjs

@@ -4251,13 +4251,14 @@ class APIClient extends APIClient$1 {
     A(this, "notification", notification);
   }
   cloneInstance() {
+    var r;
     const n = new APIClient(this.options);
     n.options = this.options, n.services = this.services, n.storage = this.storage, n.app = this.app, n.auth = this.auth, n.storagePrefix = this.storagePrefix, n.notification = this.notification;
     const o = [];
-    for (const r of this.axios.interceptors.response.handlers)
-      r.rejected._name === "handleNotificationError" ? o.push(P(x({}, r), {
+    for (const a of this.axios.interceptors.response.handlers)
+      ((r = a == null ? void 0 : a.rejected) == null ? void 0 : r._name) === "handleNotificationError" ? o.push(P(x({}, a), {
         rejected: n.handleNotificationError.bind(n)
-      })) : o.push(r);
+      })) : o.push(a);
     return n.axios.interceptors.response.handlers = o, n;
   }
   getHeaders() {
@@ -6882,7 +6883,10 @@ function bindLinkageRulesToFiled({
     // 1. 条件中的字段值；
     // 2. 条件中的变量值；
     // 3. value 表达式中的变量值；
-    () => (getFieldValuesInCondition({ linkageRules: t, formValues: n }), getVariableValuesInCondition({ linkageRules: t, localVariables: o }), getVariableValuesInExpression({ action: r, localVariables: o }), uid$1()),
+    () => {
+      const f = getFieldValuesInCondition({ linkageRules: t, formValues: n }), C = getVariableValuesInCondition({ linkageRules: t, localVariables: o }), b = getVariableValuesInExpression({ action: r, localVariables: o });
+      return [f, C, b].map((y) => JSON.stringify(y)).join(",");
+    },
     getSubscriber({ action: r, field: e, rule: a, variables: i, localVariables: o, variableNameOfLeftCondition: l }, c),
     { fireImmediately: !0, equals: _.isEqual }
   );
@@ -8705,7 +8709,7 @@ function addAppVersion(e, t) {
       addAppVersion((o = e.properties) == null ? void 0 : o[n], t);
     }), e;
 }
-const name = "@nocobase/client", version = "1.7.9", license = "AGPL-3.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
+const name = "@nocobase/client", version = "1.7.10", 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",
@@ -8726,9 +8730,9 @@ const name = "@nocobase/client", version = "1.7.9", license = "AGPL-3.0", main =
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "1.7.9",
-  "@nocobase/sdk": "1.7.9",
-  "@nocobase/utils": "1.7.9",
+  "@nocobase/evaluators": "1.7.10",
+  "@nocobase/sdk": "1.7.10",
+  "@nocobase/utils": "1.7.10",
   ahooks: "^3.7.2",
   antd: "5.24.2",
   "antd-style": "3.7.1",
@@ -39351,8 +39355,8 @@ const RenderButton = ({
 RenderButton.displayName = "RenderButton";
 const RenderButtonInner = observer$1(
   (e) => {
-    var O, k;
-    const w = e, {
+    var j, M;
+    const O = e, {
       designable: t,
       field: n,
       aclCtx: o,
@@ -39373,7 +39377,7 @@ const RenderButtonInner = observer$1(
       title: S,
       isLink: y,
       onlyIcon: v
-    } = w, F = W(w, [
+    } = O, F = W(O, [
       "designable",
       "field",
       "aclCtx",
@@ -39396,27 +39400,32 @@ const RenderButtonInner = observer$1(
       "onlyIcon"
     ]), { t: I } = useTranslation(), T = useCallback(
       debounce$1(
-        (M, q = !0) => {
-          d(M, q);
+        (q, E = !0) => {
+          d(q, E);
         },
         300,
         { leading: !0, trailing: !1 }
       ),
       [d]
     );
-    if (useEffect(() => () => {
+    useEffect(() => () => {
       T.cancel();
-    }, []), !t && ((O = n == null ? void 0 : n.data) != null && O.hidden || !o))
-      return null;
-    const R = S != null ? S : n == null ? void 0 : n.title, D = typeof R == "string" ? I(R, { ns: NAMESPACE_UI_SCHEMA }) : R, j = l, { opacity: B } = j, N = W(j, ["opacity"]), $ = y && B ? { opacity: B } : void 0, L = React.forwardRef(
-      (H, U) => {
-        var Y = H, { component: M = p || Button, icon: q, onlyIcon: E, children: V } = Y, G = W(Y, ["component", "icon", "onlyIcon", "children"]);
-        return /* @__PURE__ */ jsxs(M, P(x({ ref: U }, G), { children: [
-          E ? /* @__PURE__ */ jsx(Tooltip, { title: G.title, children: /* @__PURE__ */ jsx("span", { style: { padding: 3 }, children: q && typeof q == "string" ? /* @__PURE__ */ jsx(Icon, { type: q }) : q }) }) : /* @__PURE__ */ jsx("span", { style: { paddingRight: 3 }, children: q && typeof q == "string" ? /* @__PURE__ */ jsx(Icon, { type: q }) : q }),
-          E ? V[1] : V
-        ] }));
-      }
+    }, []);
+    const R = useMemo(
+      () => React.forwardRef(
+        (Y, H) => {
+          var J = Y, { component: q = p || Button, icon: E, onlyIcon: V, children: G } = J, U = W(J, ["component", "icon", "onlyIcon", "children"]);
+          return /* @__PURE__ */ jsxs(q, P(x({ ref: H }, U), { children: [
+            V ? /* @__PURE__ */ jsx(Tooltip, { title: U.title, children: /* @__PURE__ */ jsx("span", { style: { padding: 3 }, children: E && typeof E == "string" ? /* @__PURE__ */ jsx(Icon, { type: E }) : E }) }) : /* @__PURE__ */ jsx("span", { style: { paddingRight: 3 }, children: E && typeof E == "string" ? /* @__PURE__ */ jsx(Icon, { type: E }) : E }),
+            V ? G[1] : G
+          ] }));
+        }
+      ),
+      [v]
     );
+    if (!t && ((j = n == null ? void 0 : n.data) != null && j.hidden || !o))
+      return null;
+    const D = S != null ? S : n == null ? void 0 : n.title, B = typeof D == "string" ? I(D, { ns: NAMESPACE_UI_SCHEMA }) : D, k = l, { opacity: N } = k, $ = W(k, ["opacity"]), L = y && N ? { opacity: N } : void 0, w = v || p ? R : p || Button;
     return /* @__PURE__ */ jsxs(
       SortableItem,
       P(x({
@@ -39424,18 +39433,18 @@ const RenderButtonInner = observer$1(
         "aria-label": u()
       }, F), {
         onMouseEnter: c,
-        loading: ((k = n == null ? void 0 : n.data) == null ? void 0 : k.loading) || a,
-        icon: typeof r == "string" ? /* @__PURE__ */ jsx(Icon, { type: r, style: $ }) : r,
+        loading: ((M = n == null ? void 0 : n.data) == null ? void 0 : M.loading) || a,
+        icon: typeof r == "string" ? /* @__PURE__ */ jsx(Icon, { type: r, style: L }) : r,
         disabled: i,
-        style: y ? N : l,
+        style: y ? $ : l,
         onClick: T,
-        component: v || p ? L : p || Button,
+        component: w,
         className: cls(m, h, g, "nb-action"),
         type: f === "danger" ? void 0 : f,
-        title: D,
+        title: B,
         onlyIcon: v,
         children: [
-          !v && D && /* @__PURE__ */ jsx("span", { className: r ? "nb-action-title" : null, style: $, children: D }),
+          !v && B && /* @__PURE__ */ jsx("span", { className: r ? "nb-action-title" : null, style: L, children: B }),
           /* @__PURE__ */ jsx(C, x({}, b))
         ]
       })