react-toolkits 0.8.36 → 0.8.37

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # react-toolkits
 
+## 0.8.37
+
+### Patch Changes
+
+- cbffc19: feat: add isGlobal context
+
 ## 0.8.36
 
 ### Patch Changes
@@ -64,7 +70,7 @@
 
 ### Patch Changes
 
-- 7046d58: fix: missing isGlobalNS config in useTokenValidation hook
+- 7046d58: fix: missing isGlobal config in useTokenValidation hook
 
 ## 0.8.25
 
@@ -322,7 +328,7 @@
 
 ### Patch Changes
 
-- 46ca83c: fix: missing app-id while isGlobalNS is true
+- 46ca83c: fix: missing app-id while isGlobal is true
 
 ## 0.4.1
 
@@ -576,13 +582,13 @@
 
 ### Patch Changes
 
-- ec2fb3c: feat: set isGlobalNS to true
+- ec2fb3c: feat: set isGlobal to true
 
 ## 0.3.11
 
 ### Patch Changes
 
-- b9b1ce0: feat: remove isGlobalNS prop
+- b9b1ce0: feat: remove isGlobal prop
 
 ## 0.3.10
 
@@ -710,7 +716,7 @@
 
 ### Patch Changes
 
-- fceb92e: fix: missing isGlobalNS prop in ContextProvider
+- fceb92e: fix: missing isGlobal prop in ContextProvider
 
 ## 0.2.19
 

package/lib/{index-WjQ2L06b.chunk.js → index--xP5ZRwk.chunk.js}

@@ -4189,7 +4189,7 @@ function af(e = !1) {
       body: {
         permissions: ["100001"]
       },
-      isGlobalNS: !0
+      isGlobal: !0
     }),
     {
       suspense: !0,
@@ -4207,7 +4207,7 @@ class Va extends Error {
 }
 async function ct(e, t) {
   var g;
-  let { body: r, params: n, headers: a, responseType: s = "json", isGlobalNS: c, ...o } = t ?? {};
+  let { body: r, params: n, headers: a, responseType: s = "json", isGlobal: c, ...o } = t ?? {};
   const l = yt.parseUrl(e), f = Object.assign({}, l.query, n), p = {
     skipNull: !0,
     skipEmptyString: !0,
@@ -4216,14 +4216,13 @@ async function ct(e, t) {
   }, u = yt.stringify(f, p);
   e = u ? `${l.url}?${u}` : e, a = new Headers(a);
   const A = (g = Ot == null ? void 0 : Ot.getState()) == null ? void 0 : g.token;
-  if (A && a.set("Authorization", `Bearer ${A}`), Br.getState().usePermissionApiV2) {
-    if (c)
+  if (A && a.set("Authorization", `Bearer ${A}`), Br.getState().usePermissionApiV2)
+    if (c || Br.getState().isGlobal)
       a.set("App-ID", "global");
-    else if (!Br.getState().hideGameSelect) {
+    else {
       const _ = On.getState().game;
       _ && a.set("App-ID", _.id);
     }
-  }
   s === "blob" ? a.append("Accept", "application/octet-stream") : a.append("Accept", "application/json");
   const h = !!(r && typeof r == "object" && !(r instanceof FormData));
   h && a.set("Content-Type", "application/json");
@@ -4279,7 +4278,7 @@ const Hl = {
         e({ isLoading: r });
       },
       refreshGames() {
-        ct("/api/usystem/game/all", { isGlobalNS: !0 }).then((r) => {
+        ct("/api/usystem/game/all", { isGlobal: !0 }).then((r) => {
           t().setGames(r.data), t().setIsLoading(!1);
         });
       }
@@ -4290,7 +4289,7 @@ const Hl = {
       partialize: (e) => ({ game: e.game }),
       onRehydrateStorage: () => (console.log("Game store hydration starts"), (e, t) => {
         e && !t && setTimeout(() => {
-          ct("/api/usystem/game/all", { isGlobalNS: !0 }).then((r) => {
+          ct("/api/usystem/game/all", { isGlobal: !0 }).then((r) => {
             e.setGames(r.data), e.setIsLoading(!1);
           });
         }, 800);
@@ -4523,7 +4522,7 @@ function Tn(e, t, r) {
       body: {
         permissions: e
       },
-      isGlobalNS: t
+      isGlobal: t
     }).then((l) => {
       var f;
       return (f = l.data) != null && f.has_all ? e.reduce(
@@ -4562,7 +4561,7 @@ const ru = (e) => {
     action: r,
     extras: n,
     headers: a,
-    isGlobalNS: s,
+    isGlobal: s,
     getRowKey: c,
     getDataSource: o,
     hasMore: l,
@@ -4583,7 +4582,7 @@ const ru = (e) => {
     T,
     (v) => ct(v, {
       headers: typeof a == "function" ? a(h) : a,
-      isGlobalNS: s
+      isGlobal: s
     }).then((E) => E.data),
     {
       shouldRetryOnError: !1,
@@ -4834,7 +4833,7 @@ const su = Cc, cu = (e) => {
   ] });
 }, gu = Au, yu = (e) => {
   var f;
-  const { children: t, code: r, showLoading: n, isGlobalNS: a, ...s } = e, { data: c, isLoading: o } = Tn(Array.isArray(r) ? r : [r], a), l = we();
+  const { children: t, code: r, showLoading: n, isGlobal: a, ...s } = e, { data: c, isLoading: o } = Tn(Array.isArray(r) ? r : [r], a), l = we();
   return o ? /* @__PURE__ */ d.jsx(ze, { loading: n, disabled: !n, ...s, children: t }) : (f = Object.values(c ?? {})) != null && f.some(Boolean) ? /* @__PURE__ */ d.jsx(ze, { ...s, children: t }) : /* @__PURE__ */ d.jsx(Zc, { defaultOpen: !1, title: l("global.noEntitlement"), children: /* @__PURE__ */ d.jsx(ze, { disabled: !0, ...s, children: t }) });
 }, of = yu, mu = (e) => {
   const { code: t, children: r } = e, { accessible: n, isValidating: a } = Rn(t), s = we();
@@ -4896,7 +4895,7 @@ const bu = (e, t) => {
     action: r,
     code: n,
     headers: a,
-    isGlobalNS: s,
+    isGlobal: s,
     onePage: c,
     method: o = "GET",
     body: l,
@@ -4926,7 +4925,7 @@ const bu = (e, t) => {
         method: o,
         headers: typeof a == "function" ? a({ page: ae, size: ue, arg: pe }) : a,
         body: typeof l == "function" ? l({ page: ae, size: ue, arg: pe }) : l,
-        isGlobalNS: s
+        isGlobal: s
       });
       return {
         dataSource: b(fe.data),
@@ -5512,7 +5511,7 @@ const Mu = /* @__PURE__ */ ln(Du), { Option: Ha } = sn, { Paragraph: Ya } = cn,
 }, zu = Lu, Uu = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   default: zu
-}, Symbol.toStringTag, { value: "Module" })), ku = ot(() => import("./index-7xuXLgqA.chunk.js")), $u = ot(() => import("./index-0bU-UwlE.chunk.js")), Vu = ot(() => import("./index-9G4AkNbR.chunk.js")), Wu = () => /* @__PURE__ */ d.jsxs(ts, { children: [
+}, Symbol.toStringTag, { value: "Module" })), ku = ot(() => import("./index-rOwKhYYf.chunk.js")), $u = ot(() => import("./index-0kLlKKs0.chunk.js")), Vu = ot(() => import("./index-bubqP5K4.chunk.js")), Wu = () => /* @__PURE__ */ d.jsxs(ts, { children: [
   /* @__PURE__ */ d.jsx(He, { index: !0, element: /* @__PURE__ */ d.jsx(Ir, { to: "user" }) }),
   /* @__PURE__ */ d.jsx(He, { path: "user", element: /* @__PURE__ */ d.jsx(ku, {}) }),
   /* @__PURE__ */ d.jsx(He, { path: "role", element: /* @__PURE__ */ d.jsx($u, {}) }),

package/lib/{index-PdAloIXt.chunk.js → index-0LeTY9YL.chunk.js}

@@ -1,6 +1,6 @@
-import { a as S, j as e, d as $ } from "./index-WjQ2L06b.chunk.js";
+import { a as S, j as e, d as $ } from "./index--xP5ZRwk.chunk.js";
 import { Collapse as D, Checkbox as k, Row as G, Col as _, Skeleton as T, Typography as A, Divider as w, Card as K, Space as M, Select as E, Button as N, Empty as O } from "antd";
-import { h as R, i as B } from "./index-EcHXdtfc.chunk.js";
+import { h as R, i as B } from "./index-j7kGPvUz.chunk.js";
 import { useState as P, useCallback as F, useEffect as b } from "react";
 const q = (x) => {
   const { permissions: l, readonly: t, expand: d, value: a, onChange: r } = x, [m, p] = P([]), [g, u] = P({}), [c, f] = P(a ?? []), C = S(), h = F((s) => {

package/lib/{index-0bU-UwlE.chunk.js → index-0kLlKKs0.chunk.js}

@@ -1,47 +1,47 @@
-import { A as T, _ as U, c as N, d as P, u as y, a as b, j as e, P as j, r as _, H as z, Q as $, b as S } from "./index-WjQ2L06b.chunk.js";
-import { App as f, Space as F, Card as G, Form as g, Input as L } from "antd";
-import { p as A } from "./immer-BLf7GM7E.chunk.js";
-import { Link as B } from "react-router-dom";
-import { P as k } from "./index-PdAloIXt.chunk.js";
-import { d as E, e as q, f as D } from "./index-EcHXdtfc.chunk.js";
-import * as v from "react";
+import { A as T, _ as U, c as P, d as _, u as y, a as b, j as e, P as j, r as z, H as $, Q as F, b as L } from "./index--xP5ZRwk.chunk.js";
+import { App as f, Space as G, Card as B, Form as g, Input as A } from "antd";
+import { p as k } from "./immer-BLf7GM7E.chunk.js";
+import { Link as E } from "react-router-dom";
+import { P as v } from "./index-0LeTY9YL.chunk.js";
+import { d as q, e as D, f as N } from "./index-j7kGPvUz.chunk.js";
+import * as I from "react";
 import "react-dom";
 var Q = { icon: { tag: "svg", attrs: { viewBox: "64 64 896 896", focusable: "false" }, children: [{ tag: "path", attrs: { d: "M892 772h-80v-80c0-4.4-3.6-8-8-8h-48c-4.4 0-8 3.6-8 8v80h-80c-4.4 0-8 3.6-8 8v48c0 4.4 3.6 8 8 8h80v80c0 4.4 3.6 8 8 8h48c4.4 0 8-3.6 8-8v-80h80c4.4 0 8-3.6 8-8v-48c0-4.4-3.6-8-8-8zM373.5 498.4c-.9-8.7-1.4-17.5-1.4-26.4 0-15.9 1.5-31.4 4.3-46.5.7-3.6-1.2-7.3-4.5-8.8-13.6-6.1-26.1-14.5-36.9-25.1a127.54 127.54 0 01-38.7-95.4c.9-32.1 13.8-62.6 36.3-85.6 24.7-25.3 57.9-39.1 93.2-38.7 31.9.3 62.7 12.6 86 34.4 7.9 7.4 14.7 15.6 20.4 24.4 2 3.1 5.9 4.4 9.3 3.2 17.6-6.1 36.2-10.4 55.3-12.4 5.6-.6 8.8-6.6 6.3-11.6-32.5-64.3-98.9-108.7-175.7-109.9-110.8-1.7-203.2 89.2-203.2 200 0 62.8 28.9 118.8 74.2 155.5-31.8 14.7-61.1 35-86.5 60.4-54.8 54.7-85.8 126.9-87.8 204a8 8 0 008 8.2h56.1c4.3 0 7.9-3.4 8-7.7 1.9-58 25.4-112.3 66.7-153.5 29.4-29.4 65.4-49.8 104.7-59.7 3.8-1.1 6.4-4.8 5.9-8.8zM824 472c0-109.4-87.9-198.3-196.9-200C516.3 270.3 424 361.2 424 472c0 62.8 29 118.8 74.2 155.5a300.95 300.95 0 00-86.4 60.4C357 742.6 326 814.8 324 891.8a8 8 0 008 8.2h56c4.3 0 7.9-3.4 8-7.7 1.9-58 25.4-112.3 66.7-153.5C505.8 695.7 563 672 624 672c110.4 0 200-89.5 200-200zm-109.5 90.5C690.3 586.7 658.2 600 624 600s-66.3-13.3-90.5-37.5a127.26 127.26 0 01-37.5-91.8c.3-32.8 13.4-64.5 36.3-88 24-24.6 56.1-38.3 90.4-38.7 33.9-.3 66.8 12.9 91 36.6 24.8 24.3 38.4 56.8 38.4 91.4-.1 34.2-13.4 66.3-37.6 90.5z" } }] }, name: "usergroup-add", theme: "outlined" };
 const H = Q;
-var I = function(r, a) {
-  return /* @__PURE__ */ v.createElement(T, U({}, r, {
+var M = function(r, a) {
+  return /* @__PURE__ */ I.createElement(T, U({}, r, {
     ref: a,
     icon: H
   }));
 };
-process.env.NODE_ENV !== "production" && (I.displayName = "UsergroupAddOutlined");
-const K = /* @__PURE__ */ v.forwardRef(I), h = "/api/usystem/role/list", J = () => {
-  const { message: c } = f.useApp(), { setPayload: r } = y(), a = q(), n = b(), l = async (o) => {
+process.env.NODE_ENV !== "production" && (M.displayName = "UsergroupAddOutlined");
+const K = /* @__PURE__ */ I.forwardRef(M), h = "/api/usystem/role/list", J = () => {
+  const { message: c } = f.useApp(), { setPayload: r } = y(), a = D(), n = b(), l = async (o) => {
     await a.trigger({
       name: `role_${o.name}`,
       permissions: o.permissions
     }), r(h, { page: 1 }), c.success(n("RoleList.createSuccessfully"));
   };
-  return S({
+  return L({
     title: n("RoleList.createTitle"),
     width: "50vw",
     formProps: {
       layout: "vertical"
     },
     content: /* @__PURE__ */ e.jsxs(e.Fragment, { children: [
-      /* @__PURE__ */ e.jsx(g.Item, { label: n("global.name"), name: "name", rules: [{ required: !0 }], children: /* @__PURE__ */ e.jsx(L, { addonBefore: "role_" }) }),
-      /* @__PURE__ */ e.jsx(g.Item, { name: "permissions", children: /* @__PURE__ */ e.jsx(k, {}) })
+      /* @__PURE__ */ e.jsx(g.Item, { label: n("global.name"), name: "name", rules: [{ required: !0 }], children: /* @__PURE__ */ e.jsx(A, { addonBefore: "role_" }) }),
+      /* @__PURE__ */ e.jsx(g.Item, { name: "permissions", children: /* @__PURE__ */ e.jsx(v, {}) })
     ] }),
     onConfirm: l
   });
 }, W = () => {
-  const { message: c } = f.useApp(), { mutate: r } = y(), a = D(), n = b();
-  return S({
+  const { message: c } = f.useApp(), { mutate: r } = y(), a = N(), n = b();
+  return L({
     title: n("RoleList.updateTitle"),
     width: "50vw",
     content: /* @__PURE__ */ e.jsxs(e.Fragment, { children: [
-      /* @__PURE__ */ e.jsx(g.Item, { label: n("global.name"), name: "name", rules: [{ required: !0 }], children: /* @__PURE__ */ e.jsx(L, { readOnly: !0, addonBefore: "role_" }) }),
-      /* @__PURE__ */ e.jsx(g.Item, { name: "permissions", children: /* @__PURE__ */ e.jsx(k, {}) })
+      /* @__PURE__ */ e.jsx(g.Item, { label: n("global.name"), name: "name", rules: [{ required: !0 }], children: /* @__PURE__ */ e.jsx(A, { readOnly: !0, addonBefore: "role_" }) }),
+      /* @__PURE__ */ e.jsx(g.Item, { name: "permissions", children: /* @__PURE__ */ e.jsx(v, {}) })
     ] }),
     onConfirm: async (l, o) => {
       await a.trigger({
@@ -50,7 +50,7 @@ const K = /* @__PURE__ */ v.forwardRef(I), h = "/api/usystem/role/list", J = ()
         permissions: l.permissions
       }), r(
         h,
-        (x) => A(x, (m) => {
+        (x) => k(x, (m) => {
           var p;
           const u = (p = m == null ? void 0 : m.dataSource) == null ? void 0 : p.find((t) => t.id === (o == null ? void 0 : o.id));
           u && (u.permissions = l.permissions);
@@ -60,12 +60,12 @@ const K = /* @__PURE__ */ v.forwardRef(I), h = "/api/usystem/role/list", J = ()
     }
   });
 }, oe = () => {
-  const { accessible: c } = N("200005", !0), { modal: r, message: a } = f.useApp(), { usePermissionApiV2: n } = P(), l = E(), { mutate: o } = y(), { show: x, modal: m } = J(), { show: u, modal: p } = W(), t = b(), M = [
+  const { accessible: c } = P("200005", !0), { modal: r, message: a } = f.useApp(), { usePermissionApiV2: n } = _(), l = q(), { mutate: o } = y(), { show: x, modal: m } = J(), { show: u, modal: p } = W(), t = b(), S = [
     {
       title: t("global.name"),
       key: "name",
       render(s) {
-        return c ? /* @__PURE__ */ e.jsx(B, { to: `${s.name}`, relative: "path", children: s.name }) : /* @__PURE__ */ e.jsx(e.Fragment, { children: s.name });
+        return c ? /* @__PURE__ */ e.jsx(E, { to: `${s.name}`, relative: "path", children: s.name }) : /* @__PURE__ */ e.jsx(e.Fragment, { children: s.name });
       }
     },
     {
@@ -82,18 +82,18 @@ const K = /* @__PURE__ */ v.forwardRef(I), h = "/api/usystem/role/list", J = ()
       title: t("global.operation"),
       width: 150,
       align: "center",
-      render: (s) => /* @__PURE__ */ e.jsxs(F, { size: "small", children: [
+      render: (s) => /* @__PURE__ */ e.jsxs(G, { size: "small", children: [
         /* @__PURE__ */ e.jsx(
           j,
           {
-            isGlobalNS: !0,
+            isGlobal: !0,
             code: "200003",
             size: "small",
             type: "link",
             onClick: async () => {
-              const { data: i } = await _(
+              const { data: i } = await z(
                 `/api/usystem/role/info${n ? "V2" : ""}?name=${s.name}`,
-                { isGlobalNS: !0 }
+                { isGlobal: !0 }
               );
               u({
                 initialValues: {
@@ -111,7 +111,7 @@ const K = /* @__PURE__ */ v.forwardRef(I), h = "/api/usystem/role/list", J = ()
         /* @__PURE__ */ e.jsx(
           j,
           {
-            isGlobalNS: !0,
+            isGlobal: !0,
             danger: !0,
             code: "200004",
             size: "small",
@@ -119,12 +119,12 @@ const K = /* @__PURE__ */ v.forwardRef(I), h = "/api/usystem/role/list", J = ()
             onClick: () => {
               r.confirm({
                 title: t("RoleList.deleteTitle"),
-                content: /* @__PURE__ */ e.jsx(z, { texts: [s.name], children: t("RoleList.deleteContent", { role: s.name }) }),
+                content: /* @__PURE__ */ e.jsx($, { texts: [s.name], children: t("RoleList.deleteContent", { role: s.name }) }),
                 async onOk() {
                   await l.trigger({
                     id: s.id,
                     name: s.name
-                  }), o(h, (i) => A(i, (d) => {
+                  }), o(h, (i) => k(i, (d) => {
                     var R, C;
                     const w = (R = d == null ? void 0 : d.dataSource) == null ? void 0 : R.findIndex((O) => O.id === s.id);
                     w && ((C = d == null ? void 0 : d.dataSource) == null || C.splice(w, 1));
@@ -140,13 +140,13 @@ const K = /* @__PURE__ */ v.forwardRef(I), h = "/api/usystem/role/list", J = ()
   ];
   return /* @__PURE__ */ e.jsxs(e.Fragment, { children: [
     /* @__PURE__ */ e.jsx(
-      G,
+      B,
       {
         title: t("global.role"),
         extra: /* @__PURE__ */ e.jsx(
           j,
           {
-            isGlobalNS: !0,
+            isGlobal: !0,
             type: "primary",
             code: "200002",
             icon: /* @__PURE__ */ e.jsx(K, {}),
@@ -157,11 +157,11 @@ const K = /* @__PURE__ */ v.forwardRef(I), h = "/api/usystem/role/list", J = ()
           }
         ),
         children: /* @__PURE__ */ e.jsx(
-          $,
+          F,
           {
-            isGlobalNS: !0,
+            isGlobal: !0,
             rowKey: "name",
-            columns: M,
+            columns: S,
             code: "200001",
             action: h,
             getTotal: (s) => s.Total,

package/lib/{index-9G4AkNbR.chunk.js → index-bubqP5K4.chunk.js}

@@ -1,8 +1,8 @@
-import { a as t, j as i } from "./index-WjQ2L06b.chunk.js";
+import { a as t, j as i } from "./index--xP5ZRwk.chunk.js";
 import { Breadcrumb as m, Card as n, Skeleton as a, Descriptions as l } from "antd";
 import { useParams as c, Link as x } from "react-router-dom";
-import { P as j } from "./index-PdAloIXt.chunk.js";
-import { g as p } from "./index-EcHXdtfc.chunk.js";
+import { P as j } from "./index-0LeTY9YL.chunk.js";
+import { g as p } from "./index-j7kGPvUz.chunk.js";
 import "react";
 import "react-dom";
 const k = () => {

package/lib/{index-EcHXdtfc.chunk.js → index-j7kGPvUz.chunk.js}

@@ -1,13 +1,13 @@
-import { I as O, w as W, e as h, f as x, s as z, m as w, g as V, U as R, h as U, d as G, r as n, c as K } from "./index-WjQ2L06b.chunk.js";
-import L, { useRef as o, useCallback as N, useState as $ } from "react";
-const P = O ? (e) => {
+import { I as W, w as x, e as h, f as z, s as K, m as G, g as P, U as R, h as v, d as S, r as n, c as L } from "./index--xP5ZRwk.chunk.js";
+import N, { useRef as o, useCallback as M, useState as $ } from "react";
+const U = W ? (e) => {
   e();
-} : L.startTransition, j = (e) => {
+} : N.startTransition, j = (e) => {
   const [, t] = $({}), r = o(!1), i = o(e), d = o({
     data: !1,
     error: !1,
     isValidating: !1
-  }), m = N((c) => {
+  }), m = M((c) => {
     let a = !1;
     const g = i.current;
     for (const p in c) {
@@ -16,7 +16,7 @@ const P = O ? (e) => {
     }
     a && !r.current && t({});
   }, []);
-  return U(() => (r.current = !1, () => {
+  return v(() => (r.current = !1, () => {
     r.current = !0;
   })), [
     i,
@@ -24,108 +24,108 @@ const P = O ? (e) => {
     m
   ];
 }, q = () => (e, t, r = {}) => {
-  const { mutate: i } = x(), d = o(e), m = o(t), c = o(r), a = o(0), [g, p, s] = j({
+  const { mutate: i } = z(), d = o(e), m = o(t), c = o(r), a = o(0), [g, p, s] = j({
     data: R,
     error: R,
     isMutating: !1
-  }), S = g.current, v = N(
-    async (T, k) => {
-      const [y, I] = z(d.current);
+  }), b = g.current, D = M(
+    async (k, I) => {
+      const [y, O] = K(d.current);
       if (!m.current)
         throw new Error("Can’t trigger the mutation: missing fetcher.");
       if (!y)
         throw new Error("Can’t trigger the mutation: missing key.");
-      const l = w(w({
+      const l = G(G({
         populateCache: !1,
         throwOnError: !0
-      }, c.current), k), b = V();
-      a.current = b, s({
+      }, c.current), I), w = P();
+      a.current = w, s({
         isMutating: !0
       });
       try {
         const u = await i(
           y,
-          m.current(I, {
-            arg: T
+          m.current(O, {
+            arg: k
           }),
           // We must throw the error here so we can catch and update the states.
-          w(l, {
+          G(l, {
             throwOnError: !0
           })
         );
-        if (a.current <= b) {
-          var M, C;
-          P(() => s({
+        if (a.current <= w) {
+          var C, E;
+          U(() => s({
             data: u,
             isMutating: !1,
             error: void 0
-          })), (M = (C = l).onSuccess) == null || M.call(C, u, y, l);
+          })), (C = (E = l).onSuccess) == null || C.call(E, u, y, l);
         }
         return u;
       } catch (u) {
-        if (a.current <= b) {
-          var E, A;
-          if (P(() => s({
+        if (a.current <= w) {
+          var A, V;
+          if (U(() => s({
             error: u,
             isMutating: !1
-          })), (E = (A = l).onError) == null || E.call(A, u, y, l), l.throwOnError)
+          })), (A = (V = l).onError) == null || A.call(V, u, y, l), l.throwOnError)
             throw u;
         }
       }
     },
     // eslint-disable-next-line react-hooks/exhaustive-deps
     []
-  ), D = N(() => {
-    a.current = V(), s({
+  ), T = M(() => {
+    a.current = P(), s({
       data: R,
       error: R,
       isMutating: !1
     });
   }, []);
-  return U(() => {
+  return v(() => {
     d.current = e, m.current = t, c.current = r;
   }), {
-    trigger: v,
-    reset: D,
+    trigger: D,
+    reset: T,
     get data() {
-      return p.data = !0, S.data;
+      return p.data = !0, b.data;
     },
     get error() {
-      return p.error = !0, S.error;
+      return p.error = !0, b.error;
     },
     get isMutating() {
-      return p.isMutating = !0, S.isMutating;
+      return p.isMutating = !0, b.isMutating;
     }
   };
-}, f = W(h, q);
+}, f = x(h, q);
 function B() {
   return h(
     "/api/usystem/user/allPermssions",
-    (e) => n(e, { isGlobalNS: !0 }).then((t) => t.data)
+    (e) => n(e, { isGlobal: !0 }).then((t) => t.data)
   );
 }
 function H() {
   return h(
     "/api/usystem/user/allPermissionsV2",
-    (e) => n(e, { isGlobalNS: !0 }).then((t) => t.data)
+    (e) => n(e, { isGlobal: !0 }).then((t) => t.data)
   );
 }
 function J() {
-  const { accessible: e } = K("200005", !0);
+  const { accessible: e } = L("200005", !0);
   return h(
     e ? "/api/usystem/role/all" : null,
-    (t) => n(t, { isGlobalNS: !0 }).then((r) => r.data)
+    (t) => n(t, { isGlobal: !0 }).then((r) => r.data)
   );
 }
 function Q(e) {
-  const { usePermissionApiV2: t } = G();
+  const { usePermissionApiV2: t } = S();
   return h(
     `/api/usystem/role/${t ? "infoV2" : "info"}?name=${e}`,
-    (r) => n(r, { isGlobalNS: !0 }).then((i) => i.data)
+    (r) => n(r, { isGlobal: !0 }).then((i) => i.data)
   );
 }
 function X() {
-  const { usePermissionApiV2: e } = G();
+  const { usePermissionApiV2: e } = S();
   return f(
     e ? "/api/usystem/role/createV2" : "/api/usystem/role/create",
     (t, {
@@ -133,12 +133,12 @@ function X() {
     }) => n(t, {
       method: "post",
       body: r,
-      isGlobalNS: !0
+      isGlobal: !0
     })
   );
 }
 function Z() {
-  const { usePermissionApiV2: e } = G();
+  const { usePermissionApiV2: e } = S();
   return f(
     e ? "/api/usystem/role/updateV2" : "/api/usystem/role/update",
     (t, {
@@ -146,7 +146,7 @@ function Z() {
     }) => n(t, {
       method: "post",
       body: r,
-      isGlobalNS: !0
+      isGlobal: !0
     })
   );
 }
@@ -158,7 +158,7 @@ function _() {
     }) => n(e, {
       method: "post",
       body: t,
-      isGlobalNS: !0
+      isGlobal: !0
     })
   );
 }
@@ -170,7 +170,7 @@ function ee() {
     }) => n(e, {
       method: "post",
       body: t,
-      isGlobalNS: !0
+      isGlobal: !0
     })
   );
 }
@@ -182,7 +182,7 @@ function te() {
     }) => n(e, {
       method: "post",
       body: t,
-      isGlobalNS: !0
+      isGlobal: !0
     })
   );
 }
@@ -194,7 +194,7 @@ function re() {
     }) => n(e, {
       method: "post",
       body: t,
-      isGlobalNS: !0
+      isGlobal: !0
     })
   );
 }

package/lib/{index-7xuXLgqA.chunk.js → index-rOwKhYYf.chunk.js}

@@ -1,14 +1,14 @@
-import { A as T, _ as N, u as j, a as b, j as e, P as h, H as R, Q as z, b as w } from "./index-WjQ2L06b.chunk.js";
-import { App as U, Row as F, Col as P, Tag as A, Space as E, Card as G, Form as x, Input as L, Select as y } from "antd";
+import { A as T, _ as R, u as j, a as b, j as e, P as h, H as z, Q as F, b as L } from "./index--xP5ZRwk.chunk.js";
+import { App as U, Row as P, Col as E, Tag as w, Space as G, Card as D, Form as x, Input as S, Select as y } from "antd";
 import { p as I } from "./immer-BLf7GM7E.chunk.js";
-import { Link as D } from "react-router-dom";
-import { u as Q, a as _, b as k, c as $ } from "./index-EcHXdtfc.chunk.js";
+import { Link as N } from "react-router-dom";
+import { u as Q, a as _, b as k, c as $ } from "./index-j7kGPvUz.chunk.js";
 import * as M from "react";
 import "react-dom";
 var q = { icon: { tag: "svg", attrs: { viewBox: "64 64 896 896", focusable: "false" }, children: [{ tag: "path", attrs: { d: "M678.3 642.4c24.2-13 51.9-20.4 81.4-20.4h.1c3 0 4.4-3.6 2.2-5.6a371.67 371.67 0 00-103.7-65.8c-.4-.2-.8-.3-1.2-.5C719.2 505 759.6 431.7 759.6 349c0-137-110.8-248-247.5-248S264.7 212 264.7 349c0 82.7 40.4 156 102.6 201.1-.4.2-.8.3-1.2.5-44.7 18.9-84.8 46-119.3 80.6a373.42 373.42 0 00-80.4 119.5A373.6 373.6 0 00137 888.8a8 8 0 008 8.2h59.9c4.3 0 7.9-3.5 8-7.8 2-77.2 32.9-149.5 87.6-204.3C357 628.2 432.2 597 512.2 597c56.7 0 111.1 15.7 158 45.1a8.1 8.1 0 008.1.3zM512.2 521c-45.8 0-88.9-17.9-121.4-50.4A171.2 171.2 0 01340.5 349c0-45.9 17.9-89.1 50.3-121.6S466.3 177 512.2 177s88.9 17.9 121.4 50.4A171.2 171.2 0 01683.9 349c0 45.9-17.9 89.1-50.3 121.6C601.1 503.1 558 521 512.2 521zM880 759h-84v-84c0-4.4-3.6-8-8-8h-56c-4.4 0-8 3.6-8 8v84h-84c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h84v84c0 4.4 3.6 8 8 8h56c4.4 0 8-3.6 8-8v-84h84c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8z" } }] }, name: "user-add", theme: "outlined" };
 const B = q;
 var O = function(i, n) {
-  return /* @__PURE__ */ M.createElement(T, N({}, i, {
+  return /* @__PURE__ */ M.createElement(T, R({}, i, {
     ref: n,
     icon: B
   }));
@@ -17,13 +17,13 @@ process.env.NODE_ENV !== "production" && (O.displayName = "UserAddOutlined");
 const H = /* @__PURE__ */ M.forwardRef(O), { Option: K } = y, g = "/api/usystem/user/list";
 function J() {
   const { message: d } = U.useApp(), i = _(), { data: n, isLoading: u } = k(), { setPayload: m } = j(), o = b();
-  return w({
+  return L({
     title: o("UserList.createTitle"),
     formProps: {
       labelCol: { flex: "80px" }
     },
     content: /* @__PURE__ */ e.jsxs(e.Fragment, { children: [
-      /* @__PURE__ */ e.jsx(x.Item, { label: o("global.name"), name: "name", rules: [{ required: !0 }], children: /* @__PURE__ */ e.jsx(L, {}) }),
+      /* @__PURE__ */ e.jsx(x.Item, { label: o("global.name"), name: "name", rules: [{ required: !0 }], children: /* @__PURE__ */ e.jsx(S, {}) }),
       /* @__PURE__ */ e.jsx(x.Item, { label: o("global.role"), name: "roles", children: /* @__PURE__ */ e.jsx(y, { allowClear: !0, mode: "multiple", loading: u, children: (n ?? []).map((t) => /* @__PURE__ */ e.jsx(K, { value: t.name, children: t.name }, t.id)) }) })
     ] }),
     async onConfirm(t) {
@@ -33,13 +33,13 @@ function J() {
 }
 function W() {
   const { message: d } = U.useApp(), i = $(), { data: n, isLoading: u } = k(), { mutate: m } = j(), o = b();
-  return w({
+  return L({
     title: o("UserList.updateTitle"),
     formProps: {
       labelCol: { flex: "80px" }
     },
     content: /* @__PURE__ */ e.jsxs(e.Fragment, { children: [
-      /* @__PURE__ */ e.jsx(x.Item, { label: o("global.name"), name: "name", rules: [{ required: !0 }], children: /* @__PURE__ */ e.jsx(L, { readOnly: !0 }) }),
+      /* @__PURE__ */ e.jsx(x.Item, { label: o("global.name"), name: "name", rules: [{ required: !0 }], children: /* @__PURE__ */ e.jsx(S, { readOnly: !0 }) }),
       /* @__PURE__ */ e.jsx(x.Item, { label: o("global.role"), name: "roles", children: /* @__PURE__ */ e.jsx(
         y,
         {
@@ -86,7 +86,7 @@ const te = () => {
       key: "roles",
       width: "40%",
       render(s) {
-        return /* @__PURE__ */ e.jsx(F, { gutter: [4, 4], children: (s || []).map((l) => /* @__PURE__ */ e.jsx(P, { children: l === "root" ? /* @__PURE__ */ e.jsx(A, { color: "#f50", children: l }) : /* @__PURE__ */ e.jsx(A, { color: "#ff5a00", children: /* @__PURE__ */ e.jsx(D, { to: `/permission/role/${l}`, children: l }) }) }, l)) });
+        return /* @__PURE__ */ e.jsx(P, { gutter: [4, 4], children: (s || []).map((l) => /* @__PURE__ */ e.jsx(E, { children: l === "root" ? /* @__PURE__ */ e.jsx(w, { color: "#f50", children: l }) : /* @__PURE__ */ e.jsx(w, { color: "#ff5a00", children: /* @__PURE__ */ e.jsx(N, { to: `/permission/role/${l}`, children: l }) }) }, l)) });
       }
     },
     {
@@ -98,11 +98,11 @@ const te = () => {
       title: a("global.operation"),
       width: 150,
       align: "center",
-      render: (s) => /* @__PURE__ */ e.jsxs(E, { children: [
+      render: (s) => /* @__PURE__ */ e.jsxs(G, { children: [
         /* @__PURE__ */ e.jsx(
           h,
           {
-            isGlobalNS: !0,
+            isGlobal: !0,
             size: "small",
             type: "link",
             code: "100003",
@@ -123,7 +123,7 @@ const te = () => {
         /* @__PURE__ */ e.jsx(
           h,
           {
-            isGlobalNS: !0,
+            isGlobal: !0,
             danger: !0,
             size: "small",
             code: "100004",
@@ -131,15 +131,15 @@ const te = () => {
             onClick: () => {
               d.confirm({
                 title: a("UserList.deleteTitle"),
-                content: /* @__PURE__ */ e.jsx(R, { texts: [s.name], children: a("UserList.deleteContent", { user: s.name }) }),
+                content: /* @__PURE__ */ e.jsx(z, { texts: [s.name], children: a("UserList.deleteContent", { user: s.name }) }),
                 async onOk() {
                   await n.trigger({
                     id: s.id,
                     name: s.name
                   }), u(g, (l) => I(l, (r) => {
-                    var C, S;
+                    var C, A;
                     const f = (C = r == null ? void 0 : r.dataSource) == null ? void 0 : C.findIndex((v) => v.id === s.id);
-                    f && ((S = r == null ? void 0 : r.dataSource) == null || S.splice(f, 1));
+                    f && ((A = r == null ? void 0 : r.dataSource) == null || A.splice(f, 1));
                   })), i.success(a("UserList.deleteSuccessfully"));
                 }
               });
@@ -152,13 +152,13 @@ const te = () => {
   ];
   return /* @__PURE__ */ e.jsxs(e.Fragment, { children: [
     /* @__PURE__ */ e.jsx(
-      G,
+      D,
       {
         title: a("global.user"),
         extra: /* @__PURE__ */ e.jsx(
           h,
           {
-            isGlobalNS: !0,
+            isGlobal: !0,
             type: "primary",
             icon: /* @__PURE__ */ e.jsx(H, {}),
             code: "100002",
@@ -169,9 +169,9 @@ const te = () => {
           }
         ),
         children: /* @__PURE__ */ e.jsx(
-          z,
+          F,
           {
-            isGlobalNS: !0,
+            isGlobal: !0,
             code: "100001",
             action: g,
             rowKey: "id",

package/lib/index.d.ts

@@ -44,6 +44,7 @@ export declare interface ContextState {
         key: Key;
         children: ReactNode;
     }[];
+    isGlobal?: boolean;
 }
 
 export declare const contextStore: StoreApi<ContextState>;
@@ -112,7 +113,7 @@ export declare interface InfiniteListProps<Item, Values, Response> extends Pick<
     renderForm?: (form: FormInstance<Values>) => ReactNode;
     transformArg: (values: Values | undefined, rowKey?: string) => Record<any, any>;
     hasMore?: (data: Response[] | undefined) => boolean;
-    isGlobalNS?: boolean;
+    isGlobal?: boolean;
     extras?: InfiniteListExtra<Values>[];
 }
 
@@ -252,7 +253,7 @@ export declare const PermissionButton: FC<PropsWithChildren<PermissionButtonProp
 export declare interface PermissionButtonProps extends Omit<ButtonProps, 'disabled'> {
     code: string | string[];
     showLoading?: boolean;
-    isGlobalNS?: boolean;
+    isGlobal?: boolean;
 }
 
 export declare const PermissionGuard: FC<PropsWithChildren<PermissionGuardProps>>;
@@ -287,7 +288,7 @@ declare interface QueryListPayload<Arg = any> {
 
 export declare interface QueryListProps<Item = any, Values = any, Response = any, Arg extends Values = Values> extends Pick<TableProps<Item>, 'columns' | 'rowKey' | 'tableLayout' | 'expandable' | 'rowSelection' | 'bordered'> {
     code?: string;
-    isGlobalNS?: boolean;
+    isGlobal?: boolean;
     action: string;
     method?: string;
     refreshInterval?: number;
@@ -337,7 +338,7 @@ declare interface RequestOptions extends Omit<RequestInit, 'body'> {
     body?: Record<string | number, any> | FormData | null;
     params?: Record<string | number, any> | URLSearchParams | null;
     responseType?: 'json' | 'blob';
-    isGlobalNS?: boolean;
+    isGlobal?: boolean;
 }
 
 declare type RequestResponse<T> = Pick<Response, 'headers' | 'status' | 'statusText' | 'url'> & {
@@ -406,13 +407,13 @@ declare interface UseModalProps extends Omit<ModalProps, 'open' | 'confirmLoadin
 
 export declare const useModalStore: UseBoundStore<StoreApi<ModalState>>;
 
-export declare function usePermission(code: string | undefined, isGlobalNS?: boolean, config?: SWRConfiguration): {
+export declare function usePermission(code: string | undefined, isGlobal?: boolean, config?: SWRConfiguration): {
     accessible: boolean;
     isValidating: boolean;
     isLoading: boolean;
 };
 
-export declare function usePermissions(codes: string[], isGlobalNS?: boolean, config?: SWRConfiguration): {
+export declare function usePermissions(codes: string[], isGlobal?: boolean, config?: SWRConfiguration): {
     data: Record<string, boolean> | undefined;
     isValidating: boolean;
     isLoading: boolean;

package/lib/index.js

@@ -1,4 +1,4 @@
-import { C as r, D as u, F as n, G as m, H as d, i as l, L as p, N as L, k as S, O as g, l as y, P, n as x, Q as c, o as F, R as G, p as M, S as T, q as h, t as k, v as q, r as Q, b as R, x as v, y as B, z as C, c as N, B as f, u as w, E as D, J as E, d as H, a as I, K as O, M as W } from "./index-WjQ2L06b.chunk.js";
+import { C as r, D as u, F as n, G as m, H as d, i as l, L as p, N as L, k as S, O as g, l as y, P, n as x, Q as c, o as F, R as G, p as M, S as T, q as h, t as k, v as q, r as Q, b as R, x as v, y as B, z as C, c as N, B as f, u as w, E as D, J as E, d as H, a as I, K as O, M as W } from "./index--xP5ZRwk.chunk.js";
 import "react";
 import "antd";
 import "react-dom";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-toolkits",
-  "version": "0.8.36",
+  "version": "0.8.37",
   "packageManager": "^pnpm@8.7.5",
   "sideEffects": [
     "**/*.css"
@@ -70,8 +70,8 @@
     "vite": "^5.0.10",
     "vite-plugin-dts": "^3.6.4",
     "@flow97/eslint-config-mono": "0.0.4",
-    "tsconfig": "0.0.5",
-    "tailwind-config": "0.1.1"
+    "tailwind-config": "0.1.1",
+    "tsconfig": "0.0.5"
   },
   "peerDependencies": {
     "antd": "^5.12.2",