diff --git a/app/performance-survey/[[...path]]/page.tsx b/app/performance-survey/[[...path]]/page.tsx index 895b752d..f77512bb 100644 --- a/app/performance-survey/[[...path]]/page.tsx +++ b/app/performance-survey/[[...path]]/page.tsx @@ -588,9 +588,11 @@ export default function PerformanceSurveyPage() { const isSurveySubmitPage = path[0] === 'survey' && Boolean(path[1]) const isResultsPage = path[0] === 'results' && Boolean(path[1]) - let content = + const canCreateSurvey = Boolean(currentUser.data?.permissions?.canCreate) + const permissionsLoading = currentUser.loading || (!currentUser.data && !currentUser.error) + let content = if (isSurveySubmitPage && path[1]) { - content = + content = } if (isResultsPage && path[1]) { content = @@ -653,7 +655,7 @@ function PerformanceSurveyMobileHeader({ session }: { session: any }) { ) } -function Dashboard({ me }: { me: any | null }) { +function Dashboard({ me, permissionsLoading }: { me: any | null; permissionsLoading: boolean }) { const router = useRouter() const searchParams = useSearchParams() const requestedTabRaw = searchParams.get('tab') || 'personal' @@ -663,12 +665,23 @@ function Dashboard({ me }: { me: any | null }) { const displayName = me?.employee?.flowerName || me?.employee?.displayName || me?.user?.name || '当前用户' const avatar = me?.user?.avatar || me?.user?.image || '' const canCreateSurvey = Boolean(me?.permissions?.canCreate) + const permissionsResolved = !permissionsLoading const availableTabIds = useMemo( () => canCreateSurvey ? ['personal', 'public', 'manage'] : ['personal', 'public'], [canCreateSurvey], ) useEffect(() => { + if (!permissionsResolved) return + if (requestedTab === 'manage' && !canCreateSurvey) { + setTab('personal') + const query = new URLSearchParams(searchParamsKey) + query.set('tab', 'personal') + query.delete('prefillMonth') + query.delete('prefillTemplate') + router.replace(`/performance-survey?${query.toString()}`, { scroll: false }) + return + } if (availableTabIds.includes(requestedTab) && tab !== requestedTab) { setTab(requestedTab) return @@ -676,7 +689,7 @@ function Dashboard({ me }: { me: any | null }) { if (!availableTabIds.includes(tab)) { setTab('personal') } - }, [availableTabIds, requestedTab, tab]) + }, [availableTabIds, canCreateSurvey, permissionsResolved, requestedTab, router, searchParamsKey, tab]) useEffect(() => { if (requestedTabRaw === requestedTab) return @@ -724,7 +737,7 @@ function Dashboard({ me }: { me: any | null }) { {tab === 'personal' && } {tab === 'public' && } - {tab === 'manage' && ( + {tab === 'manage' && permissionsResolved && canCreateSurvey && ( )} @@ -3823,7 +3836,7 @@ function NotificationList({ ) } -function SurveySubmit({ surveyId, session }: { surveyId: string; session: any }) { +function SurveySubmit({ surveyId, session, canCreateSurvey }: { surveyId: string; session: any; canCreateSurvey: boolean }) { const router = useRouter() const searchParams = useSearchParams() const targetIdParam = searchParams.get('targetId') @@ -4088,13 +4101,15 @@ function SurveySubmit({ surveyId, session }: { surveyId: string; session: any }) > 公共看板 - + {canCreateSurvey && ( + + )} )}