mirror of
https://github.com/labring/FastGPT.git
synced 2025-08-01 11:58:38 +00:00
fix: load member list (#2536)
* fix: load member list * fix: extract field type error * fix: workflow runtime error * fix: ts
This commit is contained in:
@@ -46,6 +46,7 @@ const ResponseTags = ({
|
||||
};
|
||||
}>();
|
||||
const [quoteFolded, setQuoteFolded] = useState<boolean>(true);
|
||||
|
||||
const {
|
||||
isOpen: isOpenWholeModal,
|
||||
onOpen: onOpenWholeModal,
|
||||
@@ -56,6 +57,7 @@ const ResponseTags = ({
|
||||
onOpen: onOpenContextModal,
|
||||
onClose: onCloseContextModal
|
||||
} = useDisclosure();
|
||||
|
||||
useSize(quoteListRef);
|
||||
const quoteIsOverflow = quoteListRef.current
|
||||
? quoteListRef.current.scrollHeight > (isPc ? 50 : 55)
|
||||
|
@@ -100,7 +100,7 @@ const WholeResponseModal = ({
|
||||
}) => {
|
||||
const { t } = useTranslation();
|
||||
|
||||
const { appId, chatId, getHistoryResponseData } = useContextSelector(ChatBoxContext, (v) => v);
|
||||
const { getHistoryResponseData } = useContextSelector(ChatBoxContext, (v) => v);
|
||||
const { loading: isLoading, data: response } = useRequest2(
|
||||
() => getHistoryResponseData({ dataId }),
|
||||
{
|
||||
|
@@ -1,4 +1,4 @@
|
||||
import { getTeamMembers } from '@/web/support/user/team/api';
|
||||
import { useUserStore } from '@/web/support/user/useUserStore';
|
||||
import {
|
||||
Box,
|
||||
Flex,
|
||||
@@ -31,11 +31,13 @@ export function ChangeOwnerModal({
|
||||
onChangeOwner
|
||||
}: ChangeOwnerModalProps & { onClose: () => void }) {
|
||||
const { t } = useTranslation();
|
||||
const { loadAndGetTeamMembers } = useUserStore();
|
||||
|
||||
const [inputValue, setInputValue] = React.useState('');
|
||||
const { data: teamMembers = [] } = useRequest2(getTeamMembers, {
|
||||
|
||||
const { data: teamMembers = [] } = useRequest2(loadAndGetTeamMembers, {
|
||||
manual: false
|
||||
});
|
||||
|
||||
const memberList = teamMembers.filter((item) => {
|
||||
return item.memberName.includes(inputValue);
|
||||
});
|
||||
|
@@ -20,7 +20,6 @@ import PermissionSelect from './PermissionSelect';
|
||||
import PermissionTags from './PermissionTags';
|
||||
import { CollaboratorContext } from './context';
|
||||
import { useUserStore } from '@/web/support/user/useUserStore';
|
||||
import { getTeamMembers } from '@/web/support/user/team/api';
|
||||
import MyBox from '@fastgpt/web/components/common/MyBox';
|
||||
import { ChevronDownIcon } from '@chakra-ui/icons';
|
||||
import Avatar from '@fastgpt/web/components/common/Avatar';
|
||||
@@ -33,15 +32,16 @@ export type AddModalPropsType = {
|
||||
|
||||
function AddMemberModal({ onClose }: AddModalPropsType) {
|
||||
const { t } = useTranslation();
|
||||
const { userInfo } = useUserStore();
|
||||
const { userInfo, loadAndGetTeamMembers } = useUserStore();
|
||||
|
||||
const { permissionList, collaboratorList, onUpdateCollaborators, getPerLabelList } =
|
||||
useContextSelector(CollaboratorContext, (v) => v);
|
||||
const [searchText, setSearchText] = useState<string>('');
|
||||
|
||||
const { data: members = [], loading: loadingMembers } = useRequest2(
|
||||
async () => {
|
||||
if (!userInfo?.team?.teamId) return [];
|
||||
const members = await getTeamMembers();
|
||||
const members = await loadAndGetTeamMembers(true);
|
||||
return members;
|
||||
},
|
||||
{
|
||||
|
@@ -6,7 +6,6 @@ import { useQuery } from '@tanstack/react-query';
|
||||
import {
|
||||
delMemberPermission,
|
||||
getTeamList,
|
||||
getTeamMembers,
|
||||
putSwitchTeam,
|
||||
updateMemberPermission
|
||||
} from '@/web/support/user/team/api';
|
||||
@@ -56,7 +55,7 @@ export const TeamModalContext = createContext<TeamModalContextType>({
|
||||
export const TeamModalContextProvider = ({ children }: { children: ReactNode }) => {
|
||||
const { t } = useTranslation();
|
||||
const [editTeamData, setEditTeamData] = useState<EditTeamFormDataType>();
|
||||
const { userInfo, initUserInfo } = useUserStore();
|
||||
const { userInfo, initUserInfo, loadAndGetTeamMembers } = useUserStore();
|
||||
|
||||
const {
|
||||
data: myTeams = [],
|
||||
@@ -72,7 +71,7 @@ export const TeamModalContextProvider = ({ children }: { children: ReactNode })
|
||||
} = useRequest2(
|
||||
() => {
|
||||
if (!userInfo?.team?.teamId) return Promise.resolve([]);
|
||||
return getTeamMembers();
|
||||
return loadAndGetTeamMembers();
|
||||
},
|
||||
{
|
||||
manual: false,
|
||||
|
Reference in New Issue
Block a user