From a27276969bc2b800414f79a0c49e063f1ae2b5ea Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Sun, 14 Aug 2022 21:35:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E3=80=8A=E6=88=91?=
 =?UTF-8?q?=E7=9A=84=E5=BD=92=E6=A1=A3=E3=80=8B=E7=94=9F=E4=BA=A7=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=E7=AD=9B=E9=80=89=E6=97=A0=E6=95=88=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98,=E7=A7=BB=E9=99=A4router=EF=BC=88dev=E6=95=88?=
 =?UTF-8?q?=E6=9E=9C=E8=89=AF=E5=A5=BD=EF=BC=8Cbuild=E5=90=8E=E4=B8=8D?=
 =?UTF-8?q?=E7=94=9F=E6=95=88=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/.vitepress/theme/components/Archive.vue  | 23 ++++++++-----------
 .../theme/components/ArticleMetadata.vue      |  9 ++++----
 .../.vitepress/theme/components/WordCloud.vue |  3 +--
 docs/.vitepress/theme/utils.ts                | 13 +++++++++++
 4 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/docs/.vitepress/theme/components/Archive.vue b/docs/.vitepress/theme/components/Archive.vue
index 5b7f58e55..6130b9635 100644
--- a/docs/.vitepress/theme/components/Archive.vue
+++ b/docs/.vitepress/theme/components/Archive.vue
@@ -6,7 +6,7 @@
         v-if="$category"
         class="content"
         closable
-        @close="router.go('/archives.html')"
+        @close="goToLink('/archives.html')"
       >
         <template #icon>
           <svg class="icon" role="img" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg"><title>所属分类</title><path d="M928 444H820V330.4c0-17.7-14.3-32-32-32H473L355.7 186.2a8.15 8.15 0 0 0-5.5-2.2H96c-17.7 0-32 14.3-32 32v592c0 17.7 14.3 32 32 32h698c13 0 24.8-7.9 29.7-20l134-332c1.5-3.8 2.3-7.9 2.3-12 0-17.7-14.3-32-32-32zM136 256h188.5l119.6 114.4H748V444H238c-13 0-24.8 7.9-29.7 20L136 643.2V256z m635.3 512H159l103.3-256h612.4L771.3 768z"></path></svg>
@@ -17,7 +17,7 @@
         v-else-if="$tag"
         class="content"
         closable
-        @close="router.go('/archives.html')"
+        @close="goToLink('/archives.html')"
       >
         <template #icon>
           <svg class="icon" role="img" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg"><title>标签列表</title><path d="M483.2 790.3L861.4 412c1.7-1.7 2.5-4 2.3-6.3l-25.5-301.4c-0.7-7.8-6.8-13.9-14.6-14.6L522.2 64.3c-2.3-0.2-4.7 0.6-6.3 2.3L137.7 444.8a8.03 8.03 0 0 0 0 11.3l334.2 334.2c3.1 3.2 8.2 3.2 11.3 0z m62.6-651.7l224.6 19 19 224.6L477.5 694 233.9 450.5l311.9-311.9z m60.16 186.23a48 48 0 1 0 67.88-67.89 48 48 0 1 0-67.88 67.89zM889.7 539.8l-39.6-39.5a8.03 8.03 0 0 0-11.3 0l-362 361.3-237.6-237a8.03 8.03 0 0 0-11.3 0l-39.6 39.5a8.03 8.03 0 0 0 0 11.3l243.2 242.8 39.6 39.5c3.1 3.1 8.2 3.1 11.3 0l407.3-406.6c3.1-3.1 3.1-8.2 0-11.3z"></path></svg>
@@ -28,7 +28,7 @@
         v-else-if="$year"
         class="content"
         closable
-        @close="router.go('/archives.html')"
+        @close="goToLink('/archives.html')"
       >
         <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>
@@ -49,7 +49,7 @@
     <!-- 时间轴主体 -->
     <div class="timeline-item" v-for="(item, year) in archiveData">
       <div class="year">
-        <img class="chinese-zodiac" @click="router.go('/archives.html?year=' + year.replace('年', ''))" :src="'/img/svg/chinese-zodiac/' + getChineseZodiac(year.replace('年', '')) + '.svg'" :title="getChineseZodiac(year.replace('年', ''))" alt="生肖">
+        <img class="chinese-zodiac" @click="goToLink('/archives.html', 'year', year.replace('年', ''))" :src="'/img/svg/chinese-zodiac/' + getChineseZodiac(year.replace('年', '')) + '.svg'" :title="getChineseZodiac(year.replace('年', ''))" alt="生肖">
         <span>{{ year }}</span>
       </div>
       <div class="timeline-item-content">
@@ -59,13 +59,13 @@
           </span>
           <div class="articles">
             <span v-for="article in articles" class="article">
-              <svg v-if="article.categories.includes('Bug万象集')" @click="router.go('/archives.html?category=' + article.categories[0])" role="img" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg" stroke="currentColor" class="arco-icon arco-icon-bug" stroke-width="4" stroke-linecap="butt" stroke-linejoin="miter" style="color: #f53f3f;"><title>Bug万象集</title><path d="M24 42c-6.075 0-11-4.925-11-11V18h22v13c0 6.075-4.925 11-11 11Zm0 0V23m11 4h8M5 27h8M7 14a4 4 0 0 0 4 4h26a4 4 0 0 0 4-4m0 28v-.5a6.5 6.5 0 0 0-6.5-6.5M7 42v-.5a6.5 6.5 0 0 1 6.5-6.5M17 14a7 7 0 1 1 14 0"></path></svg>
+              <svg v-if="article.categories.includes('Bug万象集')" @click="goToLink('/archives.html', 'category', article.categories[0])" role="img" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg" stroke="currentColor" class="arco-icon arco-icon-bug" stroke-width="4" stroke-linecap="butt" stroke-linejoin="miter" style="color: #f53f3f;"><title>Bug万象集</title><path d="M24 42c-6.075 0-11-4.925-11-11V18h22v13c0 6.075-4.925 11-11 11Zm0 0V23m11 4h8M5 27h8M7 14a4 4 0 0 0 4 4h26a4 4 0 0 0 4-4m0 28v-.5a6.5 6.5 0 0 0-6.5-6.5M7 42v-.5a6.5 6.5 0 0 1 6.5-6.5M17 14a7 7 0 1 1 14 0"></path></svg>
               
-              <svg v-else-if="article.categories.includes('杂碎逆袭史')" @click="router.go('/archives.html?category=' + article.categories[0])" role="img" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg" stroke="currentColor" class="arco-icon arco-icon-bulb" stroke-width="4" stroke-linecap="butt" stroke-linejoin="miter" style="color: #ff7d00;"><title>杂碎逆袭史</title><path d="M17 42h14m6-24c0 2.823-.9 5.437-2.43 7.568-1.539 2.147-3.185 4.32-3.77 6.897l-.623 2.756A1 1 0 0 1 29.2 36H18.8a1 1 0 0 1-.976-.779l-.624-2.756c-.584-2.576-2.23-4.75-3.77-6.897A12.94 12.94 0 0 1 11 18c0-7.18 5.82-13 13-13s13 5.82 13 13Z"></path></svg>
+              <svg v-else-if="article.categories.includes('杂碎逆袭史')" @click="goToLink('/archives.html', 'category', article.categories[0])" role="img" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg" stroke="currentColor" class="arco-icon arco-icon-bulb" stroke-width="4" stroke-linecap="butt" stroke-linejoin="miter" style="color: #ff7d00;"><title>杂碎逆袭史</title><path d="M17 42h14m6-24c0 2.823-.9 5.437-2.43 7.568-1.539 2.147-3.185 4.32-3.77 6.897l-.623 2.756A1 1 0 0 1 29.2 36H18.8a1 1 0 0 1-.976-.779l-.624-2.756c-.584-2.576-2.23-4.75-3.77-6.897A12.94 12.94 0 0 1 11 18c0-7.18 5.82-13 13-13s13 5.82 13 13Z"></path></svg>
               
-              <svg v-else-if="article.categories.includes('方案春秋志')" @click="router.go('/archives.html?category=' + article.categories[0])" role="img" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg" stroke="currentColor" class="arco-icon arco-icon-code" stroke-width="4" stroke-linecap="butt" stroke-linejoin="miter" style="color: #165dff;"><title>方案春秋志</title><path d="M16.734 12.686 5.42 24l11.314 11.314m14.521-22.628L42.57 24 31.255 35.314M27.2 6.28l-6.251 35.453"></path></svg>
+              <svg v-else-if="article.categories.includes('方案春秋志')" @click="goToLink('/archives.html', 'category', article.categories[0])" role="img" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg" stroke="currentColor" class="arco-icon arco-icon-code" stroke-width="4" stroke-linecap="butt" stroke-linejoin="miter" style="color: #165dff;"><title>方案春秋志</title><path d="M16.734 12.686 5.42 24l11.314 11.314m14.521-22.628L42.57 24 31.255 35.314M27.2 6.28l-6.251 35.453"></path></svg>
               
-              <svg v-else @click="router.go('/archives.html?category=' + article.categories[0])" role="img" viewBox="0 0 48 48" fill="none" stroke="currentColor" xmlns="http://www.w3.org/2000/svg" class="arco-icon arco-icon-bookmark" stroke-width="4" stroke-linecap="butt" stroke-linejoin="miter" style="color: #00b42a;"><path d="M16 16h16M16 24h8"></path><path d="M24 41H8V6h32v17"></path><path d="M30 29h11v13l-5.5-3.5L30 42V29Z"></path></svg>
+              <svg v-else @click="goToLink('/archives.html', 'category', article.categories[0])" role="img" viewBox="0 0 48 48" fill="none" stroke="currentColor" xmlns="http://www.w3.org/2000/svg" class="arco-icon arco-icon-bookmark" stroke-width="4" stroke-linecap="butt" stroke-linejoin="miter" style="color: #00b42a;"><path d="M16 16h16M16 24h8"></path><path d="M24 41H8V6h32v17"></path><path d="M30 29h11v13l-5.5-3.5L30 42V29Z"></path></svg>
               <a :href="article.path" class="title" target="_blank">{{ article.title }}</a>
               <br>
               <ArticleMetadata :article="article" :showCategory="false" />
@@ -79,12 +79,9 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, watchEffect } from 'vue'
-import { useRouter } from 'vitepress'
+import { onMounted, watchEffect } from 'vue'
 import articleData from '../../../../article-data.json'
-import { formatDate, getQueryParam } from '../utils.ts'
-
-const router = useRouter()
+import { formatDate, getQueryParam, goToLink } from '../utils.ts'
 
 // 文章原始数据和归档数据
 let $articleData
diff --git a/docs/.vitepress/theme/components/ArticleMetadata.vue b/docs/.vitepress/theme/components/ArticleMetadata.vue
index e80c656bf..eacbb495e 100644
--- a/docs/.vitepress/theme/components/ArticleMetadata.vue
+++ b/docs/.vitepress/theme/components/ArticleMetadata.vue
@@ -26,7 +26,7 @@
       </span>
       <span class="meta-content">
         <span v-for="(category, index) in categories" :key="index">
-          <a href="javascript:void(0);" @click="router.go('/archives.html?category=' + category)" target="_self" title="按分类归档">{{ category }}</a>
+          <a href="javascript:void(0);" @click="goToLink('/archives.html', 'category', category)" target="_self" title="按分类归档">{{ category }}</a>
           <span v-if="index != categories.length - 1">, </span>
         </span>
       </span>
@@ -37,7 +37,7 @@
       </span>
       <span class="meta-content">
         <span v-for="(tag, index) in tags" :key="index">
-          <a href="javascript:void(0);" @click="router.go('/archives.html?tag=' + tag)" target="_self" title="按标签归档">{{ tag }}</a>
+          <a href="javascript:void(0);" @click="goToLink('/archives.html', 'tag', tag)" target="_self" title="按标签归档">{{ tag }}</a>
           <span v-if="index != tags.length - 1">, </span>
         </span>
       </span>
@@ -47,16 +47,15 @@
 
 <script lang="ts" setup>
 import { reactive, toRefs } from 'vue'
-import { useData, useRouter } from 'vitepress'
+import { useData } from 'vitepress'
 import dayjs from 'dayjs'
 import 'dayjs/locale/zh-cn'
 import relativeTime from 'dayjs/plugin/relativeTime'
+import { goToLink } from '../utils.ts'
 
 dayjs.extend(relativeTime)
 dayjs.locale('zh-cn')
 
-const router = useRouter()
-
 // 定义文章属性
 const props = defineProps({
   article: Object,
diff --git a/docs/.vitepress/theme/components/WordCloud.vue b/docs/.vitepress/theme/components/WordCloud.vue
index 7c1bf6ee3..c185f069b 100644
--- a/docs/.vitepress/theme/components/WordCloud.vue
+++ b/docs/.vitepress/theme/components/WordCloud.vue
@@ -15,7 +15,6 @@ const props = defineProps({
   }
 })
 
-
 // 渲染WordCloud
 const theme = G2.getTheme('dark')
 G2.registerTheme('customize-dark', {
@@ -42,7 +41,7 @@ debounce(() => {
     random: () => 0.5,
   })
   wordCloud.render()
-}, 20)()
+}, 5)()
 
 watch(isDark, (value) => {
   value
diff --git a/docs/.vitepress/theme/utils.ts b/docs/.vitepress/theme/utils.ts
index a21f742be..afd6e50f0 100644
--- a/docs/.vitepress/theme/utils.ts
+++ b/docs/.vitepress/theme/utils.ts
@@ -20,4 +20,17 @@ export function getQueryParam(paramName) {
     return unescape(value[2])
   } 
   return null
+}
+
+/**
+ * 跳转到指定链接
+ * @param paramName 参数名
+ * @param paramValue 参数值
+ */
+export function goToLink(url, paramName, paramValue) {
+  if (paramName) {
+    location.href = url + '?' + paramName + '=' + paramValue
+  } else {
+    location.href = url
+  }
 }
\ No newline at end of file