diff --git a/components/NotionPage.js b/components/NotionPage.js index 0930eef4..03b1f1eb 100644 --- a/components/NotionPage.js +++ b/components/NotionPage.js @@ -75,8 +75,14 @@ const NotionPage = ({ post }) => { } +/** + * 将id映射成博文内部链接。 + * @param {*} id + * @returns + */ const mapPageUrl = id => { - return 'https://www.notion.so/' + id.replace(/-/g, '') + // return 'https://www.notion.so/' + id.replace(/-/g, '') + return '/article/' + id.replace(/-/g, '') } function getMediumZoomMargin() { diff --git a/lib/notion/getAllCategories.js b/lib/notion/getAllCategories.js index 61aab49c..b9a543d8 100644 --- a/lib/notion/getAllCategories.js +++ b/lib/notion/getAllCategories.js @@ -1,9 +1,11 @@ +import { isIterable } from '../utils' + /** * 获取所有文章的分类 * @param allPosts * @returns {Promise<{}|*[]>} */ -export async function getAllCategories ({ allPosts, categoryOptions, sliceCount = 0 }) { +export async function getAllCategories({ allPosts, categoryOptions, sliceCount = 0 }) { if (!allPosts || !categoryOptions) { return [] } @@ -19,12 +21,14 @@ export async function getAllCategories ({ allPosts, categoryOptions, sliceCount } }) const list = [] - categoryOptions.forEach(c => { - const count = categoryObj[c.value] - if (count) { - list.push({ id: c.id, name: c.value, color: c.color, count }) + if (isIterable(categoryOptions)) { + for (const c of categoryOptions) { + const count = categoryObj[c.value] + if (count) { + list.push({ id: c.id, name: c.value, color: c.color, count }) + } } - }) + } // 按照数量排序 // list.sort((a, b) => b.count - a.count) diff --git a/lib/notion/getAllTags.js b/lib/notion/getAllTags.js index 3ac01f54..174055d1 100644 --- a/lib/notion/getAllTags.js +++ b/lib/notion/getAllTags.js @@ -1,3 +1,4 @@ +import { isIterable } from '../utils' /** * 获取所有文章的标签 @@ -6,7 +7,7 @@ * @param tagOptions tags的下拉选项 * @returns {Promise<{}|*[]>} */ -export async function getAllTags ({ allPosts, sliceCount = 0, tagOptions }) { +export async function getAllTags({ allPosts, sliceCount = 0, tagOptions }) { if (!allPosts || !tagOptions) { return [] } @@ -22,12 +23,14 @@ export async function getAllTags ({ allPosts, sliceCount = 0, tagOptions }) { } }) const list = [] - tagOptions.forEach(c => { - const count = tagObj[c.value] - if (count) { - list.push({ id: c.id, name: c.value, color: c.color, count }) - } - }) + if (isIterable(tagOptions)) { + tagOptions.forEach(c => { + const count = tagObj[c.value] + if (count) { + list.push({ id: c.id, name: c.value, color: c.color, count }) + } + }) + } // 按照数量排序 // list.sort((a, b) => b.count - a.count) diff --git a/lib/utils.js b/lib/utils.js index be47e17f..be9db197 100644 --- a/lib/utils.js +++ b/lib/utils.js @@ -64,10 +64,19 @@ export function mergeDeep(target, ...sources) { } /** - * 对象检查 + * 是否对象 * @param item * @returns {boolean} */ export function isObject(item) { return (item && typeof item === 'object' && !Array.isArray(item)) } + +/** + * 是否可迭代 + * @param {*} obj + * @returns + */ +export function isIterable(obj) { + return obj != null && typeof obj[Symbol.iterator] === 'function' +} diff --git a/pages/article/[slug].js b/pages/article/[slug].js index b190738d..538cbc90 100644 --- a/pages/article/[slug].js +++ b/pages/article/[slug].js @@ -5,6 +5,7 @@ import { useGlobal } from '@/lib/global' import * as ThemeMap from '@/themes' import { useEffect, useState } from 'react' import { useRouter } from 'next/router' +import { idToUuid } from 'notion-utils' /** * 根据notion的slug访问页面 @@ -30,7 +31,7 @@ const Slug = props => { } }, 3000) }) - const meta = { title: `${props?.siteInfo?.title} | loading` } + const meta = { title: `${props?.siteInfo?.title || BLOG.TITLE} | loading` } return } @@ -92,7 +93,9 @@ export async function getStaticProps({ params: { slug } }) { const from = `slug-props-${slug}` const props = await getGlobalNotionData({ from, pageType: ['Post'] }) const allPosts = props.allPosts - props.post = props.allPosts.find(p => p.slug === slug) + props.post = props.allPosts.find((p) => { + return p.slug === slug || p.id === idToUuid(slug) + }) if (!props.post) { return { props, revalidate: 1 } } diff --git a/styles/notion.css b/styles/notion.css index d42d3b11..b176aed2 100644 --- a/styles/notion.css +++ b/styles/notion.css @@ -1601,7 +1601,7 @@ svg.notion-page-icon { } svg.notion-page-icon { - @apply hidden; + /* @apply hidden;*/ } svg + .notion-page-title-text { diff --git a/themes/fukasawa/components/BlogListPage.js b/themes/fukasawa/components/BlogListPage.js index a418ff47..04ef2b47 100644 --- a/themes/fukasawa/components/BlogListPage.js +++ b/themes/fukasawa/components/BlogListPage.js @@ -20,6 +20,8 @@ const BlogListPage = ({ page = 1, posts = [], postCount }) => { function updateCol() { if (window.outerWidth > 1200) { changeCol(3) + } else if (window.outerWidth > 900) { + changeCol(2) } else { changeCol(1) } diff --git a/themes/hexo/LayoutBase.js b/themes/hexo/LayoutBase.js index 6d78abee..d7fdbf2b 100644 --- a/themes/hexo/LayoutBase.js +++ b/themes/hexo/LayoutBase.js @@ -59,12 +59,12 @@ const LayoutBase = props => { {headerSlot} -
+
-
+
{onLoading ? : children}
diff --git a/themes/hexo/LayoutSlug.js b/themes/hexo/LayoutSlug.js index ee3143cf..e914a191 100644 --- a/themes/hexo/LayoutSlug.js +++ b/themes/hexo/LayoutSlug.js @@ -54,7 +54,7 @@ export const LayoutSlug = props => {
{lock && } - {!lock &&
+ {!lock &&
{/* Notion文章主体 */} diff --git a/themes/hexo/components/BlogPostCard.js b/themes/hexo/components/BlogPostCard.js index ea95f425..a11af155 100644 --- a/themes/hexo/components/BlogPostCard.js +++ b/themes/hexo/components/BlogPostCard.js @@ -85,7 +85,7 @@ const BlogPostCard = ({ post, showSummary }) => { {post.title} {/* {post.title} */}