v4.6-3 (#471)

projects/app/src/components/support/apikey/Table.tsx

@@ -33,7 +33,7 @@ import dayjs from 'dayjs';
 import { AddIcon, QuestionOutlineIcon } from '@chakra-ui/icons';
 import { useCopyData } from '@/web/common/hooks/useCopyData';
 import { feConfigs } from '@/web/common/system/staticData';
-import { useTranslation } from 'react-i18next';
+import { useTranslation } from 'next-i18next';
 import MyIcon from '@/components/Icon';
 import MyModal from '@/components/MyModal';
 import { useForm } from 'react-hook-form';

projects/app/src/components/support/permission/IconText/index.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { PermissionTypeEnum, PermissionTypeMap } from '@fastgpt/global/support/permission/constant';
 import { Box, Flex, FlexProps } from '@chakra-ui/react';
 import MyIcon from '@/components/Icon';
-import { useTranslation } from 'react-i18next';
+import { useTranslation } from 'next-i18next';
 
 const PermissionIconText = ({
   permission,

projects/app/src/components/support/permission/Radio/index.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import MyRadio from '@/components/Radio';
 import { PermissionTypeEnum } from '@fastgpt/global/support/permission/constant';
-import { useTranslation } from 'react-i18next';
+import { useTranslation } from 'next-i18next';
 
 const PermissionRadio = ({
   value,

projects/app/src/components/support/user/team/TeamManageModal/EditModal.tsx

@@ -1,6 +1,6 @@
 import React, { useCallback, useState } from 'react';
 import { useForm } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
+import { useTranslation } from 'next-i18next';
 import { useSelectFile } from '@/web/common/file/hooks/useSelectFile';
 import { compressImgAndUpload } from '@/web/common/file/controller';
 import { useToast } from '@/web/common/hooks/useToast';

projects/app/src/components/support/user/team/TeamManageModal/InviteModal.tsx

@@ -1,6 +1,6 @@
 import React, { useMemo, useState } from 'react';
 import MyModal from '@/components/MyModal';
-import { useTranslation } from 'react-i18next';
+import { useTranslation } from 'next-i18next';
 import { ModalCloseButton, ModalBody, Box, ModalFooter, Button } from '@chakra-ui/react';
 import TagTextarea from '@/components/common/Textarea/TagTextarea';
 import MySelect from '@/components/Select';
@@ -57,8 +57,8 @@ const InviteModal = ({
         undefined,
         t('user.team.Invite Member Success Tip', {
           success: res.invite.length,
-          inValid: res.inValid.join(', '),
-          inTeam: res.inTeam.join(', ')
+          inValid: res.inValid.map((item) => item.username).join(', '),
+          inTeam: res.inTeam.map((item) => item.username).join(', ')
         })
       )();
     },

projects/app/src/components/support/user/team/TeamManageModal/index.tsx

@@ -1,6 +1,6 @@
 import React, { useMemo, useState } from 'react';
 import MyModal from '@/components/MyModal';
-import { useTranslation } from 'react-i18next';
+import { useTranslation } from 'next-i18next';
 import { useQuery } from '@tanstack/react-query';
 import {
   getTeamList,
@@ -100,7 +100,9 @@ const TeamManageModal = ({ onClose }: { onClose: () => void }) => {
     mutationFn: delRemoveMember,
     onSuccess() {
       refetchMembers();
-    }
+    },
+    successToast: t('user.team.Remove Member Success'),
+    errorToast: t('user.team.Remove Member Failed')
   });
   const { mutate: onLeaveTeam, isLoading: isLoadingLeaveTeam } = useRequest({
     mutationFn: async (teamId?: string) => {
@@ -306,7 +308,7 @@ const TeamManageModal = ({ onClose }: { onClose: () => void }) => {
                         <Td display={'flex'} alignItems={'center'}>
                           <Avatar src={item.avatar} w={['18px', '22px']} />
                           <Box flex={'1 0 0'} w={0} ml={1} className={'textEllipsis'}>
-                            {item.memberUsername}
+                            {item.memberName}
                           </Box>
                         </Td>
                         <Td>{t(TeamMemberRoleMap[item.role]?.label || '')}</Td>
@@ -383,7 +385,7 @@ const TeamManageModal = ({ onClose }: { onClose: () => void }) => {
                                           }),
                                         undefined,
                                         t('user.team.Remove Member Confirm Tip', {
-                                          username: item.memberUsername
+                                          username: item.memberName
                                         })
                                       )()
                                   }

projects/app/src/components/support/user/team/TeamMenu/index.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { Box, Button, Flex, Image, useDisclosure, useTheme } from '@chakra-ui/react';
 import { useUserStore } from '@/web/support/user/useUserStore';
-import { useTranslation } from 'react-i18next';
+import { useTranslation } from 'next-i18next';
 import MyTooltip from '@/components/MyTooltip';
 import dynamic from 'next/dynamic';
 import { feConfigs } from '@/web/common/system/staticData';

projects/app/src/components/support/user/team/UpdateInviteModal/index.tsx

@@ -1,5 +1,5 @@
 import React, { useEffect } from 'react';
-import { useTranslation } from 'react-i18next';
+import { useTranslation } from 'next-i18next';
 import MyModal from '@/components/MyModal';
 import {
   Button,