fix(vuepress-theme-reco): fix content display error

vuepress-reco · Feb 12, 2021 · 1da9000 · 1da9000
1 parent 26006fe
commit 1da9000
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 21 deletions.
diff --git a/packages/vuepress-reco.github.io b/packages/vuepress-reco.github.io
diff --git a/packages/vuepress-theme-reco/components/Page.vue b/packages/vuepress-theme-reco/components/Page.vue
@@ -1,15 +1,14 @@
 <template>
   <main class="page" :style="pageStyle">
-    <ModuleTransition>
-      <div v-if="recoShowModule && $page.title" class="page-title">
-        <h1 class="title">{{$page.title}}</h1>
-        <PageInfo :pageInfo="$page" :showAccessNumber="showAccessNumber"></PageInfo>
-      </div>
-    </ModuleTransition>
-
     <ModuleTransition delay="0.08">
-      <!-- 这里使用 v-show，否则影响 SSR -->
-      <Content v-show="recoShowModule" class="theme-reco-content" />
+      <section v-show="recoShowModule">
+        <div class="page-title">
+          <h1 class="title">{{$page.title}}</h1>
+          <PageInfo :pageInfo="$page" :showAccessNumber="showAccessNumber"></PageInfo>
+        </div>
+        <!-- 这里使用 v-show，否则影响 SSR -->
+        <Content class="theme-reco-content" />
+      </section>
     </ModuleTransition>
 
     <ModuleTransition delay="0.16">
@@ -53,10 +52,6 @@
     <ModuleTransition delay="0.32">
       <Comments v-if="recoShowModule" :isShowComments="shouldShowComments"/>
     </ModuleTransition>
-
-    <ModuleTransition delay="0.08">
-      <SubSidebar v-if="recoShowModule" class="side-bar" />
-    </ModuleTransition>
   </main>
 </template>
 

diff --git a/packages/vuepress-theme-reco/layouts/Layout.vue b/packages/vuepress-theme-reco/layouts/Layout.vue
@@ -23,16 +23,20 @@ export default defineComponent({
     const instance = getCurrentInstance()
 
     const sidebarItems = computed(() => {
-      return resolveSidebarItems(
-        instance.$page,
-        instance.$page.regularPath,
-        instance.$site,
-        instance.$localePath
-      )
+      if (instance.$page) {
+        return resolveSidebarItems(
+          instance.$page,
+          instance.$page.regularPath,
+          instance.$site,
+          instance.$localePath
+        )
+      } else {
+        return []
+      }
     })
 
     const homeCom = computed(() => {
-      const { type } = instance.$themeConfig
+      const { type } = instance.$themeConfig || {}
       if (type !== undefined) {
         return type == 'blog' ? 'HomeBlog' : type
       }
+37 −25		.vuepress/components/HomePageOne.vue
+52 −4		.vuepress/data/examplesData.js
+1 −0		README.md
+1 −0		en/README.md
+2 −2		package.json
+2 −0		views/other/donate.md