From 97266b130f1b87fbf1ce499e9ba38160636da626 Mon Sep 17 00:00:00 2001
From: tangly <tlyong1992@hotmail.com>
Date: Mon, 6 Dec 2021 20:39:26 +0800
Subject: [PATCH] =?UTF-8?q?feature:=20=E9=80=82=E9=85=8D=E6=97=A0=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E6=96=87=E7=AB=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/TagItem.js      | 5 +++++
 lib/cache/cache_manager.js | 2 +-
 lib/global.js              | 1 -
 lib/lang/en-US.js          | 1 +
 lib/lang/zh-CN.js          | 1 +
 lib/notion/getAllPosts.js  | 8 +++-----
 lib/notion/getAllTags.js   | 2 +-
 7 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/components/TagItem.js b/components/TagItem.js
index efd322fd..c9d6a4a7 100644
--- a/components/TagItem.js
+++ b/components/TagItem.js
@@ -2,8 +2,13 @@ import { faTag } from '@fortawesome/free-solid-svg-icons'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import Link from 'next/link'
 import React from 'react'
+import { useGlobal } from '@/lib/global'
 
 const TagItem = ({ tag, selected }) => {
+  const { locale } = useGlobal()
+  if (!tag) {
+    <>{locale.COMMON.NOTAG}</>
+  }
   return (
   <Link href={selected ? '/' : `/tag/${encodeURIComponent(tag.name)}`} passHref>
     <li
diff --git a/lib/cache/cache_manager.js b/lib/cache/cache_manager.js
index b28c2c0f..f27d544f 100644
--- a/lib/cache/cache_manager.js
+++ b/lib/cache/cache_manager.js
@@ -2,7 +2,7 @@ import { getCacheFromFile, setCacheToFile } from '@/lib/cache/local_file_cache'
 import { getCacheFromMemory, setCacheToMemory } from '@/lib/cache/memory_cache'
 import BLOG from '@/blog.config'
 // 关闭本地缓存
-const enableCache = true
+const enableCache = false
 
 /**
  * 为减少频繁接口请求，notion数据将被缓存
diff --git a/lib/global.js b/lib/global.js
index b9d0b123..a228295f 100644
--- a/lib/global.js
+++ b/lib/global.js
@@ -1,4 +1,3 @@
-import BLOG from '@/blog.config'
 import lang from './lang'
 import { useContext, createContext, useState, useEffect } from 'react'
 import cookie from 'react-cookies'
diff --git a/lib/lang/en-US.js b/lib/lang/en-US.js
index 69609b76..a7dfb2f9 100644
--- a/lib/lang/en-US.js
+++ b/lib/lang/en-US.js
@@ -11,6 +11,7 @@ export default {
     MORE: 'More',
     LATEST_POSTS: 'Latest posts',
     TAGS: 'Tags',
+    NO_TAG: 'NoTag',
     CATEGORY: 'Category',
     SHARE: 'Share',
     SCAN_QR_CODE: 'Scan QRCode',
diff --git a/lib/lang/zh-CN.js b/lib/lang/zh-CN.js
index dd5369ff..bed04aac 100644
--- a/lib/lang/zh-CN.js
+++ b/lib/lang/zh-CN.js
@@ -12,6 +12,7 @@ export default {
     MORE: '更多',
     LATEST_POSTS: '最新文章',
     TAGS: '标签',
+    NO_TAG: 'NoTag',
     CATEGORY: '分类',
     SHARE: '分享',
     SCAN_QR_CODE: '扫一扫二维码',
diff --git a/lib/notion/getAllPosts.js b/lib/notion/getAllPosts.js
index becd9ca3..b51b181d 100644
--- a/lib/notion/getAllPosts.js
+++ b/lib/notion/getAllPosts.js
@@ -3,8 +3,6 @@ import getAllPageIds from './getAllPageIds'
 import getPageProperties from './getPageProperties'
 import { defaultMapImageUrl } from 'react-notion-x'
 import { getNotionPageData } from '@/lib/notion/getNotionData'
-import TagItemMini from '@/components/TagItemMini'
-import React from 'react'
 
 /**
  * 获取所有文章列表
@@ -26,19 +24,19 @@ export async function getAllPosts ({ notionPageData, from, includePage = false }
   const tagOptions = notionPageData.tagOptions
   const collectionQuery = notionPageData.collectionQuery
 
-  // 获取每篇文章信息
   const data = []
   const pageIds = getAllPageIds(collectionQuery)
   for (let i = 0; i < pageIds.length; i++) {
     const id = pageIds[i]
     const properties = (await getPageProperties(id, pageBlock, schema)) || null
-    const tagItems = properties?.tags?.map(tag => { return { name: tag, color: tagOptions.find(t => t.value === tag).color } }) || ['默认']
     properties.createdTime = new Date(pageBlock[id].value?.created_time).toString()
     properties.lastEditedTime = new Date(pageBlock[id].value?.last_edited_time).toString()
     properties.fullWidth = pageBlock[id].value?.format?.page_full_width ?? false
     properties.page_cover = getPostCover(id, pageBlock) ?? BLOG.defaultImgCover
     properties.content = pageBlock[id].value?.content ?? []
-    properties.tagItems = tagItems
+    properties.tagItems = properties?.tags?.map(tag => {
+      return { name: tag, color: tagOptions.find(t => t.value === tag)?.color || 'gray' }
+    }) || []
     data.push(properties)
   }
 
diff --git a/lib/notion/getAllTags.js b/lib/notion/getAllTags.js
index 96af611c..1fe5523f 100644
--- a/lib/notion/getAllTags.js
+++ b/lib/notion/getAllTags.js
@@ -26,7 +26,7 @@ export async function getAllTags ({ allPosts, sliceCount = 12, tagOptions }) {
 
   // 按照标签数量排序
   const list = Object.keys(tagObj).map((tag) => {
-    const color = tagOptions.find(option => option.value === tag).color
+    const color = tagOptions.find(option => option.value === tag)?.color || 'gray'
     return { name: tag, count: tagObj[tag], color }
   })
   list.sort((a, b) => b.count - a.count)