react-toolkits 2.13.9 → 2.13.10

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # react-toolkits
 
+## 2.13.10
+
+### Patch Changes
+
+- 23a74d1: fix: some issues
+
 ## 2.13.9
 
 ### Patch Changes

package/lib/index.d.ts

@@ -170,7 +170,7 @@ declare function useFormModal<Values extends AnyObject = AnyObject, ExtraValues
     id: number;
     show: (options?: {
         initialValues?: RecursivePartial<Values>;
-        extraValues: ExtraValues;
+        extraValues?: ExtraValues;
     }) => void;
     hide: () => void;
     modal: react_jsx_runtime.JSX.Element;
@@ -385,9 +385,13 @@ interface ContextSlice {
 }
 
 interface GameSlice {
-    game?: Game;
-    setGame: (game?: Game) => void;
-    getGameId: () => string | number | undefined;
+    gameId?: string | number;
+    setGameId: (id?: string | number) => void;
+}
+
+interface SignInSlice {
+    unregistered: boolean;
+    setUnregistered: () => void;
 }
 
 interface UserInfo {
@@ -400,10 +404,8 @@ interface TokenSlice {
     setToken: (token: string) => void;
 }
 
-type ToolkitsState = TokenSlice & GameSlice & ContextSlice & AxiosSlice & {
-    unregistered: boolean;
+type ToolkitsState = TokenSlice & GameSlice & ContextSlice & AxiosSlice & SignInSlice & {
     clearToken: () => void;
-    setUnregistered: () => void;
 };
 
 declare function useToolkitsStore<T>(selector: (state: ToolkitsState) => T): T;

package/lib/index.js

@@ -192,12 +192,22 @@ var init_context = __esm({
 var createGameSlice;
 var init_game = __esm({
   "src/stores/game.ts"() {
-    createGameSlice = (set, get2) => ({
-      setGame(game) {
-        set({ game });
-      },
-      getGameId() {
-        return get2().gameApiV2 ? get2().game?.game_id : get2().game?.id;
+    createGameSlice = (set) => ({
+      setGameId: (id2) => {
+        set({ gameId: id2 });
+      }
+    });
+  }
+});
+
+// src/stores/signIn.ts
+var createSignInSlice;
+var init_signIn = __esm({
+  "src/stores/signIn.ts"() {
+    createSignInSlice = (set) => ({
+      unregistered: false,
+      setUnregistered() {
+        set({ unregistered: true });
       }
     });
   }
@@ -228,26 +238,24 @@ var init_stores = __esm({
     init_axios();
     init_context();
     init_game();
+    init_signIn();
     init_token();
     createToolkitsStore = (initProps) => {
       return createStore()(
         persist(
           (...args) => {
-            const [set, get2, store] = args;
+            const [_set, get2, store] = args;
             return {
               ...createTokenSlice(...args),
               ...createGameSlice(...args),
               ...createContextSlice(...args),
               ...createAxiosSlice(...args),
-              ...initProps,
-              unregistered: false,
+              ...createSignInSlice(...args),
               clearToken() {
                 get2().setToken("");
                 store.persist.clearStorage();
               },
-              setUnregistered() {
-                set({ unregistered: true });
-              }
+              ...initProps
             };
           },
           {
@@ -255,7 +263,7 @@ var init_stores = __esm({
             storage: createJSONStorage(() => mixedStorage),
             partialize: (state) => ({
               token: state.token,
-              game: state.game
+              gameId: state.gameId
             })
           }
         )
@@ -270,17 +278,7 @@ var init_Interceptors = __esm({
     init_toolkitsProvider();
     Interceptors = ({ children }) => {
       const { notification } = App.useApp();
-      const {
-        axios: axios2,
-        interceptors,
-        token,
-        isGlobal,
-        signInPath,
-        clearToken,
-        setUnregistered,
-        getGameId,
-        permissionVersion
-      } = useToolkitsStore((s) => s);
+      const { axios: axios2, interceptors, token, isGlobal, signInPath, gameId, clearToken, setUnregistered, permissionVersion } = useToolkitsStore((s) => s);
       let requestInterceptorId;
       let responseInterceptorId;
       if (interceptors?.request) {
@@ -293,7 +291,6 @@ var init_Interceptors = __esm({
             headers.setAuthorization(`Bearer ${token}`);
           }
           if (!headers.has(APP_ID_HEADER) && permissionVersion !== "v1" /* V1 */) {
-            const gameId = getGameId();
             if (isGlobal || !gameId) {
               headers.set(APP_ID_HEADER, "global");
             } else {
@@ -521,8 +518,7 @@ var init_highlight = __esm({
   }
 });
 function useMenuList() {
-  const { getGameId, signInPath, axios: axios2, token } = useToolkitsStore((s) => s);
-  const gameId = getGameId();
+  const { signInPath, axios: axios2, token, gameId } = useToolkitsStore((s) => s);
   return useSWR5(
     window.location.pathname !== signInPath ? ["/api/usystem/menu/navbar", gameId] : null,
     ([url4]) => axios2(url4, {
@@ -731,7 +727,7 @@ var init_RequireGame = __esm({
     init_toolkitsProvider();
     ({ Spin: Spin3 } = Antd2);
     RequireGame = ({ children }) => {
-      const { permissionVersion, game, getGameId, isGlobal } = useToolkitsStore((s) => s);
+      const { permissionVersion, gameId, isGlobal } = useToolkitsStore((s) => s);
       const { isLoading } = useGames();
       const { t } = useTranslation();
       if (isLoading) {
@@ -751,10 +747,9 @@ var init_RequireGame = __esm({
       if (permissionVersion === "v1" /* V1 */ || isGlobal) {
         return children;
       }
-      if (!game) {
+      if (!gameId) {
         return /* @__PURE__ */ jsx(Empty, { image: Empty.PRESENTED_IMAGE_SIMPLE, description: t("RequireGame.description") });
       }
-      const gameId = getGameId();
       return /* @__PURE__ */ jsx(Fragment$1, { children }, gameId);
     };
     RequireGame_default = RequireGame;
@@ -836,28 +831,24 @@ var init_GameSelect = __esm({
     GameSelect = (props) => {
       const { filter } = props;
       const { t } = useTranslation();
-      const { gameApiV2, setGame, getGameId } = useToolkitsStore((s) => s);
+      const { gameApiV2, gameId, setGameId } = useToolkitsStore((s) => s);
       const { data, isLoading } = useGames();
-      const defaultValue = getGameId();
-      const [internalValue, setInternalValue] = useState(defaultValue);
       const options = data?.filter((item) => filter?.(item) ?? true)?.map((item) => ({
         label: item.name,
         value: gameApiV2 ? item.game_id : item.id
       }));
-      const findGame = (value) => data?.find((item) => String(gameApiV2 ? item.game_id : item.id) === String(value));
       const onChange = async (value) => {
-        const game = findGame(value);
-        setGame(game);
-        setInternalValue(value);
+        setGameId(value);
       };
       useEffect(() => {
-        if (data?.every((item) => String(gameApiV2 ? item.game_id : item.id) !== defaultValue)) {
-          const gameId = gameApiV2 ? data?.[0]?.game_id : data?.[0]?.id;
-          setInternalValue(gameId);
-          const game = findGame(gameId);
-          setGame(game);
+        let id2 = gameId;
+        if (data?.every((item) => String(gameApiV2 ? item.game_id : item.id) !== String(id2))) {
+          id2 = gameApiV2 ? data?.[0]?.game_id : data?.[0]?.id;
         }
-      }, [data]);
+        if (id2 !== gameId) {
+          setGameId(id2);
+        }
+      }, [gameId, data, gameApiV2]);
       return /* @__PURE__ */ jsxs(Space, { children: [
         /* @__PURE__ */ jsx(Text, { children: t("GameSelect.label") }),
         /* @__PURE__ */ jsx(
@@ -865,7 +856,7 @@ var init_GameSelect = __esm({
           {
             showSearch: true,
             optionFilterProp: "label",
-            value: internalValue,
+            value: gameId,
             placeholder: t("GameSelect.placeholder"),
             loading: isLoading,
             style: { width: "200px" },
@@ -2665,9 +2656,11 @@ var init_userDetail = __esm({
   "src/pages/permission/userDetail/index.tsx"() {
     init_layout();
     init_locale();
+    init_permissionButton();
     init_toolkitsProvider();
     init_constants();
     init_permission();
+    init_hooks2();
     UserDetail = () => {
       const { message } = App.useApp();
       const params = useParams();
@@ -2678,6 +2671,7 @@ var init_userDetail = __esm({
         (url4) => axios2.get(url4).then((res) => res.data.data)
       );
       const { data: games } = useGames();
+      const { accessible: roleViewable } = usePermission("200005");
       const { show, modal } = useUpdateUserModalV2({
         onSuccess() {
           mutate2();
@@ -2709,7 +2703,7 @@ var init_userDetail = __esm({
           title: t("global.role"),
           dataIndex: "role",
           render(value) {
-            return /* @__PURE__ */ jsx(Link, { to: `../../role/${value}`, relative: "path", children: value });
+            return roleViewable ? /* @__PURE__ */ jsx(Link, { to: `../../role/${value}`, relative: "path", children: value }) : value;
           }
         }
       ];
@@ -2736,8 +2730,9 @@ var init_userDetail = __esm({
             title: "\u7528\u6237\u8BE6\u60C5",
             loading: isLoading,
             extra: /* @__PURE__ */ jsx(
-              Button,
+              PermissionButton_default,
               {
+                code: "100003",
                 onClick: () => {
                   show({
                     initialValues: {
@@ -2941,6 +2936,7 @@ var RoleDetail, roleDetail_default;
 var init_roleDetail = __esm({
   "src/pages/permission/roleDetail/index.tsx"() {
     init_locale();
+    init_permissionButton();
     init_toolkitsProvider();
     init_permission();
     RoleDetail = () => {
@@ -2982,14 +2978,21 @@ var init_roleDetail = __esm({
             ]
           }
         ),
-        /* @__PURE__ */ jsx(Card, { title: t("RoleDetail.title"), extra: /* @__PURE__ */ jsx(Button, { onClick: handleUpdateBtnClick, children: t("global.update") }), children: /* @__PURE__ */ jsxs(Skeleton, { loading: isLoading, children: [
-          /* @__PURE__ */ jsxs(Descriptions, { column: 2, layout: "vertical", className: "mb-6", children: [
-            /* @__PURE__ */ jsx(Descriptions.Item, { label: t("global.name"), children: data?.name }),
-            /* @__PURE__ */ jsx(Descriptions.Item, { label: "ID", children: data?.id }),
-            /* @__PURE__ */ jsx(Descriptions.Item, { label: t("global.creationTime"), children: data?.ctime })
-          ] }),
-          /* @__PURE__ */ jsx(permissionList_default, { readonly: true, value: data?.permissions })
-        ] }) }),
+        /* @__PURE__ */ jsx(
+          Card,
+          {
+            title: t("RoleDetail.title"),
+            extra: /* @__PURE__ */ jsx(PermissionButton_default, { code: "200003", onClick: handleUpdateBtnClick, children: t("global.update") }),
+            children: /* @__PURE__ */ jsxs(Skeleton, { loading: isLoading, children: [
+              /* @__PURE__ */ jsxs(Descriptions, { column: 2, layout: "vertical", className: "mb-6", children: [
+                /* @__PURE__ */ jsx(Descriptions.Item, { label: t("global.name"), children: data?.name }),
+                /* @__PURE__ */ jsx(Descriptions.Item, { label: "ID", children: data?.id }),
+                /* @__PURE__ */ jsx(Descriptions.Item, { label: t("global.creationTime"), children: data?.ctime })
+              ] }),
+              /* @__PURE__ */ jsx(permissionList_default, { readonly: true, value: data?.permissions })
+            ] })
+          }
+        ),
         modal
       ] });
     };