gitea/FastGPT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: load member list (#2536)

Browse Source 
* fix: load member list

* fix: extract field type error

* fix: workflow runtime error

* fix: ts
This commit is contained in:
Archer
2024-08-27 12:07:57 +08:00
committed by GitHub
parent 77e6cf4157
commit f6e2d13e21
13 changed files with 50 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
projects/app/src/components/support/permission/ChangeOwnerModal/index.tsx
View File

@@ -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);
});

6
projects/app/src/components/support/permission/MemberManager/AddMemberModal.tsx
View File

@@ -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;
},
{