Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
赵月辉
/
fastgpt-migrated
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Unverified
Commit
222ff0d4
authored
Mar 21, 2025
by
Finley Ge
Committed by
archer
Mar 27, 2025
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: member count (#4269)
parent
2c73e9dc
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
5 deletions
+24
-5
projects/app/src/pageComponents/account/team/context.tsx
+22
-5
projects/app/src/web/support/user/team/api.ts
+2
-0
No files found.
projects/app/src/pageComponents/account/team/context.tsx
View file @
222ff0d4
import
React
,
{
ReactNode
,
useState
}
from
'react'
;
import
React
,
{
ReactNode
,
use
Callback
,
use
State
}
from
'react'
;
import
{
createContext
}
from
'use-context-selector'
;
import
{
createContext
}
from
'use-context-selector'
;
import
type
{
EditTeamFormDataType
}
from
'./EditInfoModal'
;
import
type
{
EditTeamFormDataType
}
from
'./EditInfoModal'
;
import
dynamic
from
'next/dynamic'
;
import
dynamic
from
'next/dynamic'
;
import
{
getTeamList
,
getTeamMembers
,
putSwitchTeam
}
from
'@/web/support/user/team/api'
;
import
{
getTeamList
,
getTeamMemberCount
,
getTeamMembers
,
putSwitchTeam
}
from
'@/web/support/user/team/api'
;
import
{
TeamMemberStatusEnum
}
from
'@fastgpt/global/support/user/team/constant'
;
import
{
TeamMemberStatusEnum
}
from
'@fastgpt/global/support/user/team/constant'
;
import
{
useUserStore
}
from
'@/web/support/user/useUserStore'
;
import
{
useUserStore
}
from
'@/web/support/user/useUserStore'
;
import
type
{
TeamTmbItemType
,
TeamMemberItemType
}
from
'@fastgpt/global/support/user/team/type'
;
import
type
{
TeamTmbItemType
,
TeamMemberItemType
}
from
'@fastgpt/global/support/user/team/type'
;
...
@@ -84,12 +89,19 @@ export const TeamModalContextProvider = ({ children }: { children: ReactNode })
...
@@ -84,12 +89,19 @@ export const TeamModalContextProvider = ({ children }: { children: ReactNode })
refreshDeps
:
[
userInfo
?.
team
?.
teamId
]
refreshDeps
:
[
userInfo
?.
team
?.
teamId
]
});
});
const
{
data
:
teamMemberCountData
,
refresh
:
refetchTeamMemberCount
}
=
useRequest2
(
getTeamMemberCount
,
{
manual
:
false
,
refreshDeps
:
[
userInfo
?.
team
?.
teamId
]
}
);
// member action
// member action
const
{
const
{
data
:
members
=
[],
data
:
members
=
[],
isLoading
:
loadingMembers
,
isLoading
:
loadingMembers
,
refreshList
:
refetchMembers
,
refreshList
:
refetchMemberList
,
total
:
memberTotal
,
ScrollData
:
MemberScrollData
ScrollData
:
MemberScrollData
}
=
useScrollPagination
(
getTeamMembers
,
{
}
=
useScrollPagination
(
getTeamMembers
,
{
pageSize
:
1000
,
pageSize
:
1000
,
...
@@ -98,6 +110,11 @@ export const TeamModalContextProvider = ({ children }: { children: ReactNode })
...
@@ -98,6 +110,11 @@ export const TeamModalContextProvider = ({ children }: { children: ReactNode })
}
}
});
});
const
refetchMembers
=
useCallback
(()
=>
{
refetchTeamMemberCount
();
refetchMemberList
();
},
[
refetchTeamMemberCount
,
refetchMemberList
]);
const
{
runAsync
:
onSwitchTeam
,
loading
:
isSwitchingTeam
}
=
useRequest2
(
const
{
runAsync
:
onSwitchTeam
,
loading
:
isSwitchingTeam
}
=
useRequest2
(
async
(
teamId
:
string
)
=>
{
async
(
teamId
:
string
)
=>
{
await
putSwitchTeam
(
teamId
);
await
putSwitchTeam
(
teamId
);
...
@@ -135,7 +152,7 @@ export const TeamModalContextProvider = ({ children }: { children: ReactNode })
...
@@ -135,7 +152,7 @@ export const TeamModalContextProvider = ({ children }: { children: ReactNode })
refetchMembers
,
refetchMembers
,
groups
,
groups
,
refetchGroups
,
refetchGroups
,
teamSize
:
memberTotal
,
teamSize
:
teamMemberCountData
?.
count
||
0
,
MemberScrollData
MemberScrollData
};
};
...
...
projects/app/src/web/support/user/team/api.ts
View file @
222ff0d4
...
@@ -36,6 +36,8 @@ export const putSwitchTeam = (teamId: string) =>
...
@@ -36,6 +36,8 @@ export const putSwitchTeam = (teamId: string) =>
/* --------------- team member ---------------- */
/* --------------- team member ---------------- */
export
const
getTeamMembers
=
(
props
:
PaginationProps
<
{
withLeaved
?:
boolean
}
>
)
=>
export
const
getTeamMembers
=
(
props
:
PaginationProps
<
{
withLeaved
?:
boolean
}
>
)
=>
GET
<
PaginationResponse
<
TeamMemberItemType
>>
(
`/proApi/support/user/team/member/list`
,
props
);
GET
<
PaginationResponse
<
TeamMemberItemType
>>
(
`/proApi/support/user/team/member/list`
,
props
);
export
const
getTeamMemberCount
=
()
=>
GET
<
{
count
:
number
}
>
(
`/proApi/support/user/team/member/count`
);
// export const postInviteTeamMember = (data: InviteMemberProps) =>
// export const postInviteTeamMember = (data: InviteMemberProps) =>
// POST<InviteMemberResponse>(`/proApi/support/user/team/member/invite`, data);
// POST<InviteMemberResponse>(`/proApi/support/user/team/member/invite`, data);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment