fix: 优化生成记录处理逻辑,修复数据过滤和加载状态管理
This commit is contained in:
parent
4198ffc974
commit
804ae8f6fc
|
|
@ -78,39 +78,37 @@ const Sync = observer(() => {
|
|||
|
||||
// 将生成记录转换为 posts 格式
|
||||
const posts = useMemo(() => {
|
||||
const generations = generationsData?.data || []
|
||||
return generations
|
||||
.filter((gen: any) => gen?.id) // 过滤掉没有 id 的记录
|
||||
.map((gen: any) => {
|
||||
const imageUrl = Array.isArray(gen?.resultUrl) ? gen?.resultUrl[0] : gen?.resultUrl
|
||||
const coverUrl = gen?.template?.coverImageUrl
|
||||
return {
|
||||
id: gen?.id,
|
||||
const generations = generationsData || []
|
||||
return generations?.map((gen: any) => {
|
||||
const imageUrl = Array.isArray(gen?.resultUrl) ? gen?.resultUrl[0] : gen?.resultUrl
|
||||
const coverUrl = gen?.template?.coverImageUrl
|
||||
return {
|
||||
id: gen?.id,
|
||||
|
||||
// 模板静态图片
|
||||
coverUrl: coverUrl,
|
||||
// 模板静态图片
|
||||
coverUrl: coverUrl,
|
||||
|
||||
imageUrl: imageUrl,
|
||||
url: imageUrl,
|
||||
imageUrl: imageUrl,
|
||||
url: imageUrl,
|
||||
|
||||
webpPreviewUrl: gen.webpPreviewUrl,
|
||||
webpHighPreviewUrl: gen.webpHighPreviewUrl,
|
||||
webpPreviewUrl: gen.webpPreviewUrl,
|
||||
webpHighPreviewUrl: gen.webpHighPreviewUrl,
|
||||
|
||||
originalUrl: gen?.originalUrl,
|
||||
templateId: gen?.templateId,
|
||||
type: gen?.type,
|
||||
status: gen?.status,
|
||||
createdAt: gen?.createdAt,
|
||||
price: gen?.template?.price || -1,
|
||||
title: `生成-${gen?.id.slice(0, 6)}`,
|
||||
rank: 'S',
|
||||
author: user?.name || 'User',
|
||||
avatarUrl:
|
||||
user?.image ||
|
||||
'https://image.pollinations.ai/prompt/cool%20anime%20boy%20avatar%20hoodie?seed=123&nologo=true',
|
||||
}
|
||||
})
|
||||
}, [generationsData, user])
|
||||
originalUrl: gen?.originalUrl,
|
||||
templateId: gen?.templateId,
|
||||
type: gen?.type,
|
||||
status: gen?.status,
|
||||
createdAt: gen?.createdAt,
|
||||
price: gen?.template?.price || -1,
|
||||
title: `生成-${gen?.id.slice(0, 6)}`,
|
||||
rank: 'S',
|
||||
author: user?.name || 'User',
|
||||
avatarUrl:
|
||||
user?.image ||
|
||||
'https://image.pollinations.ai/prompt/cool%20anime%20boy%20avatar%20hoodie?seed=123&nologo=true',
|
||||
}
|
||||
})
|
||||
}, [generationsData])
|
||||
|
||||
useEffect(() => {
|
||||
if (!selectedItem?.id && posts.length > 0) {
|
||||
|
|
@ -425,9 +423,9 @@ const Sync = observer(() => {
|
|||
<FlashList
|
||||
contentContainerStyle={{ paddingHorizontal: 12, paddingBottom: 200 }}
|
||||
data={posts}
|
||||
// drawDistance={300}
|
||||
drawDistance={300}
|
||||
maxItemsInRecyclePool={0}
|
||||
// removeClippedSubviews={true}
|
||||
removeClippedSubviews={true}
|
||||
ItemSeparatorComponent={() => <Block style={{ height: 6 }} />}
|
||||
keyExtractor={(item: any) => item?.id}
|
||||
ListFooterComponent={ListFooter}
|
||||
|
|
@ -439,7 +437,7 @@ const Sync = observer(() => {
|
|||
<RefreshControl colors={['#FFE500']} refreshing={refreshing} tintColor="#FFE500" onRefresh={onRefresh} />
|
||||
}
|
||||
onEndReached={onLoadMore}
|
||||
onEndReachedThreshold={0.1}
|
||||
onEndReachedThreshold={0.3}
|
||||
/>
|
||||
</Block>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,36 +1,32 @@
|
|||
import { root } from '@repo/core'
|
||||
import {
|
||||
type ListTemplateGenerationsInput,
|
||||
type ListTemplateGenerationsResult,
|
||||
TemplateGenerationController,
|
||||
} from '@repo/sdk'
|
||||
import { type ListTemplateGenerationsInput, type TemplateGeneration, TemplateGenerationController } from '@repo/sdk'
|
||||
import { useCallback, useRef, useState } from 'react'
|
||||
|
||||
import { type ApiError } from '@/lib/types'
|
||||
|
||||
import { handleError } from './use-error'
|
||||
|
||||
const pageSize = 12
|
||||
|
||||
export const useTemplateGenerations = () => {
|
||||
const [loading, setLoading] = useState(false)
|
||||
const [loading, setLoading] = useState(true)
|
||||
const [loadingMore, setLoadingMore] = useState(false)
|
||||
const [error, setError] = useState<ApiError | null>(null)
|
||||
const [data, setData] = useState<ListTemplateGenerationsResult | undefined>()
|
||||
const [data, setData] = useState<TemplateGeneration[]>([])
|
||||
const currentPageRef = useRef(1)
|
||||
const hasMoreRef = useRef(true)
|
||||
|
||||
const pageSize = 12
|
||||
|
||||
const load = useCallback(async (params?: ListTemplateGenerationsInput) => {
|
||||
setLoading(true)
|
||||
setError(null)
|
||||
currentPageRef.current = params?.page || 1
|
||||
|
||||
currentPageRef.current = 1
|
||||
const templateGeneration = root.get(TemplateGenerationController)
|
||||
|
||||
const { data, error } = await handleError(
|
||||
async () =>
|
||||
await templateGeneration.list({
|
||||
page: params?.page || 1,
|
||||
page: currentPageRef.current,
|
||||
limit: params?.limit || pageSize,
|
||||
...params,
|
||||
}),
|
||||
|
|
@ -39,24 +35,23 @@ export const useTemplateGenerations = () => {
|
|||
if (error) {
|
||||
setError(error)
|
||||
setLoading(false)
|
||||
return { data: undefined, error }
|
||||
return
|
||||
}
|
||||
|
||||
const items = data?.data || []
|
||||
|
||||
hasMoreRef.current = items.length >= (params?.limit || pageSize)
|
||||
|
||||
// console.log(' hasMoreRef.current----------------', hasMoreRef.current)
|
||||
setData(data)
|
||||
const filterData = items?.filter((item) => !!item.id)
|
||||
|
||||
setData(filterData)
|
||||
setLoading(false)
|
||||
return { data, error: null }
|
||||
}, [])
|
||||
|
||||
const loadMore = useCallback(
|
||||
async (params?: Omit<ListTemplateGenerationsInput, 'page'>) => {
|
||||
const hasMore = loadingMore || loading || hasMoreRef.current
|
||||
|
||||
// console.log('loadmOre-----------', hasMore)
|
||||
|
||||
const hasMore = hasMoreRef.current
|
||||
if (!hasMore) return
|
||||
|
||||
setLoadingMore(true)
|
||||
|
|
@ -82,10 +77,8 @@ export const useTemplateGenerations = () => {
|
|||
hasMoreRef.current = newItems.length >= (params?.limit || pageSize)
|
||||
currentPageRef.current = nextPage
|
||||
|
||||
setData((prev) => ({
|
||||
...newData,
|
||||
data: [...prev?.data, ...newItems],
|
||||
}))
|
||||
const filterData = newItems?.filter((item) => !!item.id)
|
||||
setData((prev) => [...prev, ...filterData])
|
||||
setLoadingMore(false)
|
||||
return { data: newData, error: null }
|
||||
},
|
||||
|
|
|
|||
Loading…
Reference in New Issue