react-toolkits 2.9.12 → 2.9.13

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # react-toolkits
 
+## 2.9.13
+
+### Patch Changes
+
+- 7d51c81: feat: remove 'isGlobal' flag
+
 ## 2.9.12
 
 ### Patch Changes

package/lib/index.d.ts

@@ -26,7 +26,6 @@ interface RequestOptions extends Omit<RequestInit, 'body'> {
     body?: Record<string | number, any> | FormData | null;
     params?: Record<string | number, any> | URLSearchParams | null;
     responseType?: 'json' | 'blob' | 'text';
-    isGlobal?: boolean;
 }
 type RequestResponse<T> = Pick<Response, 'headers' | 'status' | 'statusText' | 'url'> & {
     data: T;
@@ -396,12 +395,12 @@ declare function useFormModal<Values extends AnyObject = AnyObject, ExtraValues
     modal: react_jsx_runtime.JSX.Element;
 };
 
-declare function usePermissions(codes: string[], isGlobal?: boolean): {
+declare function usePermissions(codes: string[], options?: Omit<RequestOptions, 'method' | 'body'>): {
     data: Record<string, boolean> | undefined;
     isValidating: boolean;
     isLoading: boolean;
 };
-declare function usePermission(code: string | undefined, isGlobal?: boolean): {
+declare function usePermission(code: string | undefined, options?: Omit<RequestOptions, 'method' | 'body'>): {
     accessible: boolean;
     isValidating: boolean;
     isLoading: boolean;

package/lib/index.js

@@ -389,7 +389,7 @@ var init_NavMenu = __esm({
       const location = useLocation();
       const flattenItems = useMemo(() => flatItems(items ?? []), [items]);
       const codes = useMemo(() => flattenItems.map((item) => item.code).filter(Boolean), [flattenItems]);
-      const { data: permissions, isLoading } = usePermissions(codes, true);
+      const { data: permissions, isLoading } = usePermissions(codes, { headers: { "App-ID": "global" } });
       const internalItems = useMemo(() => transformItems(items ?? [], permissions), [items, permissions]);
       const { openKeys, selectedKeys, setOpenKeys, setSelectedKeys } = useNavStore();
       const onOpenChange = useCallback(
@@ -447,7 +447,7 @@ function useTokenValidation(options) {
       body: {
         permissions: ["100001"]
       },
-      isGlobal: true
+      headers: { "App-ID": "global" }
     })
   );
 }
@@ -827,7 +827,7 @@ var init_layout = __esm({
 });
 async function request(url, opts = {}) {
   const _opts = Object.assign(opts, { responseType: opts.responseType ?? "json" });
-  const { body, params, responseType, isGlobal, ...rest } = _opts;
+  const { body, params, responseType, ...rest } = _opts;
   if (!url) {
     throw new RequestError({
       status: 400,
@@ -849,14 +849,10 @@ async function request(url, opts = {}) {
   if (token) {
     headers.set("Authorization", `Bearer ${token}`);
   }
-  if (contextStore.getState().usePermissionApiV2) {
-    if (isGlobal) {
-      headers.set("App-ID", "global");
-    } else {
-      const game = useGameStore.getState().game;
-      if (game) {
-        headers.set("App-ID", String(game.game_id ?? game.id));
-      }
+  if (!headers.has("App-ID") && contextStore.getState().usePermissionApiV2) {
+    const game = useGameStore.getState().game;
+    if (game) {
+      headers.set("App-ID", String(game.game_id ?? game.id));
     }
   }
   if (responseType === "blob") {
@@ -920,16 +916,16 @@ var init_request = __esm({
     };
   }
 });
-function usePermissions(codes, isGlobal) {
+function usePermissions(codes, options) {
   const usePermissionApiV2 = useToolkitsContext((state) => state.usePermissionApiV2);
   const { data, isValidating, isLoading } = useSWR3(
     codes.length > 0 ? [usePermissionApiV2 ? "/api/usystem/user/checkV2" : "/api/usystem/user/check", codes] : null,
     ([url]) => request(url, {
+      ...options,
       method: "POST",
       body: {
         permissions: codes
-      },
-      isGlobal
+      }
     }).then((response) => {
       if (response.data?.has_all) {
         return codes.reduce(
@@ -954,8 +950,8 @@ function usePermissions(codes, isGlobal) {
   );
   return { data, isValidating, isLoading };
 }
-function usePermission(code, isGlobal) {
-  const { data, isValidating, isLoading } = usePermissions(code ? [code] : [], isGlobal);
+function usePermission(code, options) {
+  const { data, isValidating, isLoading } = usePermissions(code ? [code] : [], options);
   if (code === void 0) {
     return {
       accessible: true,
@@ -978,11 +974,11 @@ var init_permission = __esm({
 var PermissionButton, PermissionButton_default;
 var init_PermissionButton = __esm({
   "src/components/permissionButton/PermissionButton.tsx"() {
-    init_locale();
     init_permission();
+    init_locale();
     PermissionButton = (props) => {
       const { children, code, showLoading, isGlobal, disabled, ...restProps } = props;
-      const { data, isLoading } = usePermissions(Array.isArray(code) ? code : [code], isGlobal);
+      const { data, isLoading } = usePermissions(Array.isArray(code) ? code : [code], { headers: { "App-ID": "global" } });
       const { t } = useTranslation();
       if (isLoading) {
         return /* @__PURE__ */ jsx(Button, { loading: showLoading, disabled: !showLoading, ...restProps, children });
@@ -1082,7 +1078,9 @@ var init_QueryList = __esm({
       const { notification } = App.useApp();
       const { t } = useTranslation();
       const [_form] = Form.useForm(form);
-      const { accessible, isLoading } = usePermission(code, isGlobal);
+      const { accessible, isLoading } = usePermission(code, {
+        headers: isGlobal ? { "App-ID": "global" } : void 0
+      });
       const action = useRef(3 /* Init */);
       const { game } = useGameStore();
       const usePermissionApiV2 = useToolkitsContext((state) => state.usePermissionApiV2);
@@ -1377,27 +1375,27 @@ var init_formModal = __esm({
 function useAllPermissions() {
   return useSWR3(
     "/api/usystem/user/allPermssions",
-    (url) => request(url, { isGlobal: true }).then((response) => response.data)
+    (url) => request(url, { headers: { "App-ID": "global" } }).then((response) => response.data)
   );
 }
 function useAllPermissionsV2() {
   return useSWR3(
     "/api/usystem/user/allPermissionsV2",
-    (url) => request(url, { isGlobal: true }).then((response) => response.data)
+    (url) => request(url, { headers: { "App-ID": "global" } }).then((response) => response.data)
   );
 }
 function useAllRoles() {
-  const { accessible } = usePermission("200005", true);
+  const { accessible } = usePermission("200005", { headers: { "App-ID": "global" } });
   return useSWR3(
     accessible ? "/api/usystem/role/all" : null,
-    (url) => request(url, { isGlobal: true }).then((response) => response.data)
+    (url) => request(url, { headers: { "App-ID": "global" } }).then((response) => response.data)
   );
 }
 function useRole(name) {
   const usePermissionApiV2 = useToolkitsContext((state) => state.usePermissionApiV2);
   return useSWR3(
     `/api/usystem/role/${usePermissionApiV2 ? "infoV2" : "info"}?name=${name}`,
-    (url) => request(url, { isGlobal: true }).then((response) => response.data)
+    (url) => request(url, { headers: { "App-ID": "global" } }).then((response) => response.data)
   );
 }
 function useCreateRole() {
@@ -1409,7 +1407,7 @@ function useCreateRole() {
     }) => request(url, {
       method: "post",
       body: arg,
-      isGlobal: true
+      headers: { "App-ID": "global" }
     })
   );
 }
@@ -1422,7 +1420,7 @@ function useUpdateRole() {
     }) => request(url, {
       method: "post",
       body: arg,
-      isGlobal: true
+      headers: { "App-ID": "global" }
     })
   );
 }
@@ -1434,7 +1432,7 @@ function useRemoveRole() {
     }) => request(url, {
       method: "post",
       body: arg,
-      isGlobal: true
+      headers: { "App-ID": "global" }
     })
   );
 }
@@ -1446,7 +1444,7 @@ function useCreateUser() {
     }) => request(url, {
       method: "post",
       body: arg,
-      isGlobal: true
+      headers: { "App-ID": "global" }
     })
   );
 }
@@ -1458,7 +1456,7 @@ function useUpdateUser() {
     }) => request(url, {
       method: "post",
       body: arg,
-      isGlobal: true
+      headers: { "App-ID": "global" }
     })
   );
 }
@@ -1470,7 +1468,7 @@ function useRemoveUser() {
     }) => request(url, {
       method: "post",
       body: arg,
-      isGlobal: true
+      headers: { "App-ID": "global" }
     })
   );
 }
@@ -2004,7 +2002,7 @@ var init_roleList = __esm({
       });
     };
     RoleList = () => {
-      const { accessible: viewable } = usePermission("200005", true);
+      const { accessible: viewable } = usePermission("200005", { headers: { "App-ID": "global" } });
       const { modal, message } = App.useApp();
       const { t } = useTranslation();
       const usePermissionApiV2 = useToolkitsContext((state) => state.usePermissionApiV2);
@@ -2015,7 +2013,7 @@ var init_roleList = __esm({
       const handleUpdateBtnClick = async (record) => {
         const { data: role } = await request(
           `/api/usystem/role/info${usePermissionApiV2 ? "V2" : ""}?name=${record.name}`,
-          { isGlobal: true }
+          { headers: { "App-ID": "global" } }
         );
         showUpdateModal({
           initialValues: {
@@ -2349,7 +2347,9 @@ init_highlight();
 // src/components/infiniteList/InfiniteList.tsx
 init_permission();
 init_request();
+init_contextProvider();
 init_filterFormWrapper();
+init_layout();
 init_locale();
 var InfiniteList = (props) => {
   const {
@@ -2377,6 +2377,19 @@ var InfiniteList = (props) => {
     const queryString = qs.stringify(args);
     return queryString ? `${action}?${qs.stringify(args)}` : action;
   };
+  const { game } = useGameStore();
+  const usePermissionApiV2 = useToolkitsContext((state) => state.usePermissionApiV2);
+  const _headers = useMemo(() => {
+    const newHeaders = new Headers(typeof headers === "function" ? headers(form) : headers);
+    if (usePermissionApiV2) {
+      if (isGlobal) {
+        newHeaders.set("App-ID", "global");
+      } else if (game) {
+        newHeaders.set("App-ID", String(game.id));
+      }
+    }
+    return newHeaders;
+  }, [usePermissionApiV2, isGlobal, game, headers]);
   const {
     data,
     size,
@@ -2386,8 +2399,7 @@ var InfiniteList = (props) => {
     getKey,
     (arg) => {
       return request(arg, {
-        headers: typeof headers === "function" ? headers(form) : headers,
-        isGlobal
+        headers: _headers
       }).then((response) => response.data);
     },
     {
@@ -2491,7 +2503,7 @@ init_permission();
 init_locale();
 var RequirePermission = (props) => {
   const { code, isGlobal, children } = props;
-  const { accessible, isValidating } = usePermission(code, isGlobal);
+  const { accessible, isValidating } = usePermission(code, isGlobal ? { headers: { "App-ID": "global" } } : void 0);
   const { t } = useTranslation();
   if (isValidating) {
     return /* @__PURE__ */ jsx(
@@ -2605,6 +2617,7 @@ var OperationLogList = () => {
   return /* @__PURE__ */ jsx(Card, { title: "\u64CD\u4F5C\u65E5\u5FD7", children: /* @__PURE__ */ jsx(
     QueryList_default,
     {
+      isGlobal: true,
       rowKey: "id",
       code: "300001",
       columns,