Merge branch 'main' into release/4.0.0

This commit is contained in:
tangly1024
2023-07-09 21:10:50 +08:00
2 changed files with 11 additions and 12 deletions

View File

@@ -10,13 +10,12 @@ import NavPostItem from './NavPostItem'
* @constructor
*/
const NavPostList = (props) => {
const { filteredPosts } = props
const { filteredPostGroups } = props
const router = useRouter()
let selectedSth = false
// 处理是否选中
filteredPosts?.map((group) => {
filteredPostGroups.map((group) => {
let groupSelected = false
for (const post of group?.items) {
if (router.asPath.split('?')[0] === '/' + post.slug) {
@@ -29,16 +28,16 @@ const NavPostList = (props) => {
})
// 如果都没有选中默认打开第一个
if (!selectedSth && filteredPosts && filteredPosts.length > 0) {
filteredPosts[0].selected = true
if (!selectedSth && filteredPostGroups && filteredPostGroups.length > 0) {
filteredPostGroups[0].selected = true
}
if (!filteredPosts || filteredPosts.length === 0) {
if (!filteredPostGroups || filteredPostGroups.length === 0) {
return <NavPostListEmpty />
} else {
return <div id='posts-wrapper' className='w-full flex-grow'>
{/* 文章列表 */}
{filteredPosts?.map((group, index) => <NavPostItem key={index} group={group} onHeightChange={props.onHeightChange}/>)}
{filteredPostGroups?.map((group, index) => <NavPostItem key={index} group={group} onHeightChange={props.onHeightChange}/>)}
</div>
}
}