From de7e62a824ee0ad7a2da66b0c88b6cdab6f7cbac Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Tue, 16 Aug 2022 17:53:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=EF=BC=9A=E4=B8=BB=E9=A2=98?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/.vitepress/config/markdown.ts           |  2 +-
 docs/.vitepress/config/sidebar.ts            | 43 ++++++++------------
 docs/.vitepress/config/theme.ts              |  2 +-
 docs/.vitepress/theme/components/Archive.vue |  3 +-
 docs/categories/fragments/index.md           |  2 +-
 docs/categories/issues/index.md              |  2 +-
 docs/categories/solutions/index.md           |  2 +-
 7 files changed, 23 insertions(+), 33 deletions(-)

diff --git a/docs/.vitepress/config/markdown.ts b/docs/.vitepress/config/markdown.ts
index f14a89164..5637ff3b9 100644
--- a/docs/.vitepress/config/markdown.ts
+++ b/docs/.vitepress/config/markdown.ts
@@ -12,7 +12,7 @@ export const markdown: MarkdownOptions = {
   config: (md) => {
     md.renderer.rules.heading_close = (tokens, idx, options, env, slf) => {
       let htmlResult = slf.renderToken(tokens, idx, options, env, slf)
-      if (tokens[idx].tag === 'h1') htmlResult += `\n<ArticleMetadata v-if="$frontmatter?.aside ?? true" :article="$frontmatter" />`
+      if (tokens[idx].tag === 'h1') htmlResult += `\n<ArticleMetadata v-if="($frontmatter?.aside ?? true) && ($frontmatter?.showArticleMetadata ?? true)" :article="$frontmatter" />`
       return htmlResult
     }
   }
diff --git a/docs/.vitepress/config/sidebar.ts b/docs/.vitepress/config/sidebar.ts
index 61315c9cf..829f044aa 100644
--- a/docs/.vitepress/config/sidebar.ts
+++ b/docs/.vitepress/config/sidebar.ts
@@ -17,10 +17,8 @@ export const sidebar: DefaultTheme.Config['sidebar'] = {
  * @returns {DefaultTheme.SidebarGroup[]}
  */
 function getItemsByDate (path: string) {
-  // 侧边栏分组数组
-  let groups: DefaultTheme.SidebarGroup[] = []
-  // 侧边栏分组下标题数组
-  let items: DefaultTheme.SidebarItem[] = []
+  // 侧边栏年份分组数组
+  let yearGroups: DefaultTheme.SidebarGroup[] = []
 
   // 1.获取所有年份目录
   sync(`docs/${path}/*`, {
@@ -28,12 +26,16 @@ function getItemsByDate (path: string) {
     objectMode: true
   }).forEach(({ name }) => {
     let year = name
+    // 侧边栏文章标题数组
+    let articleItems: DefaultTheme.SidebarItem[] = []
+
     // 2.获取所有月份目录
     sync(`docs/${path}/${year}/*`, {
       onlyDirectories: true,
       objectMode: true
     }).forEach(({ name }) => {
       let month = name
+
       // 3.获取所有日期目录
       sync(`docs/${path}/${year}/${month}/*`, {
         onlyDirectories: true,
@@ -46,36 +48,25 @@ function getItemsByDate (path: string) {
           objectMode: true
         }).forEach(({ name }) => {
           // 向前追加标题
-          items.unshift({
-            text: name,
+          articleItems.unshift({
+            text: name.replace('.md', ''),
             link: `/${path}/${year}/${month}/${day}/${name}`
           })
         })
       })
+    })
 
-      // 5.向前追加到分组
-      if (items.length > 0) {
-        // 去除标题名中的扩展名
-        for (let i = 0; i < items.length; i++) {
-          let text = items[i].text
-          items[i].text = text.replace('.md', '')
-        }
-        groups.unshift({
-          text: `${year}年${month}月 (${items.length}篇)`,
-          collapsible: true,
-          collapsed: true,
-          items: items
-        })
-      }
-
-      // 6.清空侧边栏分组下标题数组
-      items = []
+    yearGroups.unshift({
+      text: `${year}年 (共 ${articleItems.length} 篇)`,
+      collapsible: true,
+      collapsed: true,
+      items: articleItems
     })
   })
 
-  // 7.将第一个侧边栏分组的标题展开
-  groups[0].collapsed = false
-  return groups
+  // 将第一个侧边栏分组展开
+  yearGroups[0].collapsed = false
+  return yearGroups
 }
 
 /**
diff --git a/docs/.vitepress/config/theme.ts b/docs/.vitepress/config/theme.ts
index ba7e27467..75dc42271 100644
--- a/docs/.vitepress/config/theme.ts
+++ b/docs/.vitepress/config/theme.ts
@@ -7,7 +7,7 @@ export const themeConfig: DefaultTheme.Config = {
   sidebar, // 侧边栏配置
 
   logo: '/logo.png',
-  outlineTitle: '目录', // 右侧边栏的大纲标题文本配置
+  outlineTitle: '目录', // 右侧大纲标题文本配置
   lastUpdatedText: '最后更新', // 最后更新时间文本配置, 需先配置lastUpdated为true
   // 文档页脚文本配置
   docFooter: {
diff --git a/docs/.vitepress/theme/components/Archive.vue b/docs/.vitepress/theme/components/Archive.vue
index 6130b9635..b5a7db63b 100644
--- a/docs/.vitepress/theme/components/Archive.vue
+++ b/docs/.vitepress/theme/components/Archive.vue
@@ -33,7 +33,7 @@
         <template #icon>
           <svg class="icon" role="img" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg"><path d="M832 64H192c-17.7 0-32 14.3-32 32v832c0 17.7 14.3 32 32 32h640c17.7 0 32-14.3 32-32V96c0-17.7-14.3-32-32-32z m-260 72h96v209.9L621.5 312 572 347.4V136z m220 752H232V136h280v296.9c0 3.3 1 6.6 3 9.3a15.9 15.9 0 0 0 22.3 3.7l83.8-59.9 81.4 59.4c2.7 2 6 3.1 9.4 3.1 8.8 0 16-7.2 16-16V136h64v752z"></path></svg>
         </template>
-        {{ $year }} (共 {{ $articleData.length }} 篇)
+        {{ $year }}年 (共 {{ $articleData.length }} 篇)
       </a-tag>
       <a-tag
         v-else
@@ -79,7 +79,6 @@
 </template>
 
 <script lang="ts" setup>
-import { onMounted, watchEffect } from 'vue'
 import articleData from '../../../../article-data.json'
 import { formatDate, getQueryParam, goToLink } from '../utils.ts'
 
diff --git a/docs/categories/fragments/index.md b/docs/categories/fragments/index.md
index 59847a366..33eb71da3 100644
--- a/docs/categories/fragments/index.md
+++ b/docs/categories/fragments/index.md
@@ -1,7 +1,7 @@
 ---
+showArticleMetadata: false
 editLink: false
 lastUpdated: false
-aside: false
 showComment: false
 ---
 
diff --git a/docs/categories/issues/index.md b/docs/categories/issues/index.md
index 1660e352b..1896e1386 100644
--- a/docs/categories/issues/index.md
+++ b/docs/categories/issues/index.md
@@ -1,7 +1,7 @@
 ---
+showArticleMetadata: false
 editLink: false
 lastUpdated: false
-aside: false
 showComment: false
 ---
 
diff --git a/docs/categories/solutions/index.md b/docs/categories/solutions/index.md
index 5943f0558..c7cf3f9b5 100644
--- a/docs/categories/solutions/index.md
+++ b/docs/categories/solutions/index.md
@@ -1,7 +1,7 @@
 ---
+showArticleMetadata: false
 editLink: false
 lastUpdated: false
-aside: false
 showComment: false
 ---