Merge pull request #2550 from tangly1024/fix/url-prefix-empty-to-open

修复配置了prefix后,部分页面无法打开的bug
This commit is contained in:
tangly1024
2024-06-28 17:38:31 +08:00
committed by GitHub
2 changed files with 10 additions and 5 deletions

View File

@@ -6,9 +6,9 @@ import formatDate from '../utils/formatDate'
import md5 from 'js-md5' import md5 from 'js-md5'
import { siteConfig } from '../config' import { siteConfig } from '../config'
import { import {
checkStartWithHttp, checkStartWithHttp,
convertUrlStartWithOneSlash, convertUrlStartWithOneSlash,
getLastSegmentFromUrl getLastSegmentFromUrl
} from '../utils' } from '../utils'
import { extractLangPrefix } from '../utils/pageId' import { extractLangPrefix } from '../utils/pageId'
import { mapImgUrl } from './mapImage' import { mapImgUrl } from './mapImage'
@@ -290,5 +290,10 @@ function generateCustomizeSlug(postProperties, NOTION_CONFIG) {
if (fullPrefix.endsWith('/')) { if (fullPrefix.endsWith('/')) {
fullPrefix = fullPrefix.substring(0, fullPrefix.length - 1) // 去掉尾部部的"/" fullPrefix = fullPrefix.substring(0, fullPrefix.length - 1) // 去掉尾部部的"/"
} }
return `${fullPrefix}/${postProperties.slug ?? postProperties.id}`
if(fullPrefix){
return `${fullPrefix}/${postProperties.slug ?? postProperties.id}`
}else{
return `${postProperties.slug ?? postProperties.id}`
}
} }

View File

@@ -129,7 +129,7 @@ export async function getStaticProps({ params: { prefix }, locale }) {
fullSlug += '.html' fullSlug += '.html'
} }
} }
// 在列表内查找文章 // 在列表内查找文章
props.post = props?.allPages?.find(p => { props.post = props?.allPages?.find(p => {
return ( return (