Merge branch 'develop' of github.com:vuepress-reco/vuepress-theme-reco into develop

reco_luan · reco_luan · commit f3476f38d160 · 2020-08-24T10:20:15.000+08:00
diff --git a/example/.vuepress/config.js b/example/.vuepress/config.js
@@ -58,7 +58,7 @@ module.exports = {
     search: true,
     searchMaxSuggestions: 10,
     // 自动形成侧边导航
-    // sidebar: 'auto',
+    subSidebar: 'auto',
     sidebarDepth: 4,
     // 最后更新时间
     lastUpdated: 'Last Updated',
diff --git a/example/views/sidebargroup/bar1.md b/example/views/sidebargroup/bar1.md
@@ -1,5 +1,3 @@
----
-title: bar1
----
+# bar test
 
 bar1
diff --git a/example/views/sidebargroup/bar2.md b/example/views/sidebargroup/bar2.md
@@ -4,10 +4,14 @@ title: bar2
 
 bar2
 
+## sidebar
+
 ## 二级标题1
 
 ### 三级标题1-1
 
+
+
 #### 四级标题1-1-1
 #### 四级标题1-1-2
 #### 四级标题1-1-3
diff --git a/packages/vuepress-theme-reco/components/Home.vue b/packages/vuepress-theme-reco/components/Home.vue
@@ -134,59 +134,6 @@ export default {
       transform scale(1.05)
     }
   }
-
-//   &.reco-hide {
-//   .hero {
-//     img {
-//       load-start()
-//     }
-//     .h1 {
-//       load-start()
-//     }
-//     .description {
-//       load-start()
-//     }
-//     .huawei {
-//       load-start()
-//     }
-//     .action-button {
-//       load-start()
-//     }
-//   }
-//   .features {
-//     load-start()
-//   }
-//   .home-center {
-//     load-start()
-//     padding 0
-//   }
-// }
-
-//   &.reco-show {
-//     .hero {
-//       img {
-//         load-end(0.08s)
-//       }
-//       .h1 {
-//         load-end(0.16s)
-//       }
-//       .description {
-//         load-end(0.24s)
-//       }
-//       .huawei {
-//         load-end(0.32s)
-//       }
-//       .action-button {
-//         load-end(0.4s)
-//       }
-//     }
-//     .features {
-//       load-end(0.40s)
-//     }
-//     .home-center {
-//       load-end(0.48s)
-//     }
-//   }
 }
 
 @media (max-width: $MQMobile) {
diff --git a/packages/vuepress-theme-reco/components/Page.vue b/packages/vuepress-theme-reco/components/Page.vue
@@ -2,7 +2,7 @@
   <main class="page" :style="pageStyle">
     <ModuleTransition>
       <div v-show="recoShowModule && $page.title" class="page-title">
-        <h1>{{$page.title}}</h1>
+        <h1 class="title">{{$page.title}}</h1>
         <PageInfo :pageInfo="$page" :showAccessNumber="showAccessNumber"></PageInfo>
       </div>
     </ModuleTransition>
@@ -171,11 +171,14 @@ export default {
       )
     },
     pageStyle () {
-      const headers = this.$page.headers || []
-      return headers.length > 0 ? {} : { paddingRight: '0' }
+      return this.$showSubSideBar ? {} : { paddingRight: '0' }
     }
   },
 
+  created () {
+    console.log(this)
+  },
+
   methods: {
     createEditLink (repo, docsRepo, docsDir, docsBranch, path) {
       const bitbucket = /bitbucket.org/
diff --git a/packages/vuepress-theme-reco/components/SubSidebar.vue b/packages/vuepress-theme-reco/components/SubSidebar.vue
@@ -4,17 +4,15 @@ import { isActive } from '@theme/helpers/utils'
 export default {
   computed: {
     headers () {
-      const headers = (this.$page.headers || []).filter(header => header.level === 2)
-      return headers
+      return this.$showSubSideBar ? this.$page.headers : []
     }
   },
   methods: {
     isLinkActive (header) {
       const active = isActive(this.$route, this.$page.path + '#' + header.slug)
       if (active) {
         setTimeout(() => {
-          console.log(document.querySelector(`.${header.slug}`))
-          document.querySelector(`.${header.slug}`).scrollIntoView()
+          document.querySelector(`.reco-${header.slug}`).scrollIntoView()
         }, 300)
       }
       return active
@@ -23,9 +21,9 @@ export default {
   render (h) {
     return h('ul', {
       class: { 'sub-sidebar-wrapper': true },
-      style: { width: (this.$page.headers || []).length > 0 ? '12rem' : '0' }
+      style: { width: this.headers.length > 0 ? '12rem' : '0' }
     }, [
-      ...(this.$page.headers || []).map(header => {
+      ...this.headers.map(header => {
         return h('li', {
           class: {
             active: this.isLinkActive(header),
@@ -34,7 +32,7 @@ export default {
           attr: { key: header.title }
         }, [
           h('router-link', {
-            class: { 'sidebar-link': true, [`${header.slug}`]: true },
+            class: { 'sidebar-link': true, [`reco-${header.slug}`]: true },
             props: { to: `${this.$page.path}#${header.slug}` }
           }, header.title)
         ])
diff --git a/packages/vuepress-theme-reco/mixins/index.js b/packages/vuepress-theme-reco/mixins/index.js
diff --git a/packages/vuepress-theme-reco/mixins/locales.js b/packages/vuepress-theme-reco/mixins/locales.js
@@ -3,23 +3,21 @@ import { zhHans, zhHant, en, ja, ko } from '../locales/index'
 export default {
   computed: {
     $recoLocales () {
-      const recoLocales = this.$themeLocaleConfig.recoLocales
-      if (recoLocales && recoLocales.homeBlog) {
-        return { homeBlog: recoLocales.homeBlog }
-      }
+      const recoLocales = this.$themeLocaleConfig.recoLocales || {}
+
       if (/^zh\-(CN|SG)$/.test(this.$lang)) {
-        return zhHans
+        return { ...zhHans, ...recoLocales }
       }
       if (/^zh\-(HK|MO|TW)$/.test(this.$lang)) {
-        return zhHant
+        return { ...zhHant, ...recoLocales }
       }
       if (/^ja\-JP$/.test(this.$lang)) {
-        return ja
+        return { ...ja, ...recoLocales }
       }
       if (/^ko\-KR$/.test(this.$lang)) {
-        return ko
+        return { ...ko, ...recoLocales }
       }
-      return en
+      return { ...en, ...recoLocales }
     }
   }
 }
diff --git a/packages/vuepress-theme-reco/mixins/posts.js b/packages/vuepress-theme-reco/mixins/posts.js
@@ -41,6 +41,18 @@ export default {
       }
 
       return formatPagesArr
+    },
+    $showSubSideBar () {
+      const {
+        $themeConfig: { subSidebar: themeSidebar },
+        $frontmatter: { subSidebar: pageSidebar }
+      } = this
+      const headers = this.$page.headers || []
+
+      if ((themeSidebar === 'auto' || pageSidebar === 'auto') && headers.length > 0) {
+        return true
+      }
+      return false
     }
   }
 }
diff --git a/packages/vuepress-theme-reco/styles/theme.styl b/packages/vuepress-theme-reco/styles/theme.styl
@@ -64,6 +64,8 @@ body
     border-radius 4px
   img
     max-width 100%
+  *:first-child
+    margin-top 0
 
 .content__default.custom
   padding 0
@@ -111,17 +113,17 @@ h1, h2, h3, h4, h5, h6
   font-weight 500
   line-height 1.25
   .content__default:not(.custom) > &
-    margin-top (0.5rem - $navbarHeight)
-    padding-top ($navbarHeight + 1rem)
+    margin-top (2.1rem - $navbarHeight)
+    padding-top $navbarHeight
     margin-bottom 0
     &:first-child
       margin-top -3.5rem
-      margin-bottom 1rem
-      + p, + pre, + .custom-block
-        margin-top 2rem
 
 h1
+  display none
   font-size 1.6rem
+  &.title
+    display block
 
 h2
   position relative
@@ -195,7 +197,7 @@ th, td
 @require 'mobile.styl'
 
 .iconfont
-  font-size: 0.9rem;
+  font-size: 12px;
   color: var(--text-color-sub);
 
 /************** 滚动条 **************/
diff --git a/yarn.lock b/yarn.lock
@@ -3141,6 +3141,7 @@ cli-width@^2.0.0:
 clipboard@^2.0.0:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/clipboard/-/clipboard-2.0.6.tgz#52921296eec0fdf77ead1749421b21c968647376"
+  integrity sha512-g5zbiixBRk/wyKakSwCKd7vQXDjFnAMGHoEyBogG/bw9kTD9GvdAvaoRR1ALcEzt3pVKxZR0pViekPMIS0QyGg==
   dependencies:
     good-listener "^1.2.2"
     select "^1.1.2"
@@ -4162,6 +4163,7 @@ delayed-stream@~1.0.0:
 delegate@^3.1.2:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/delegate/-/delegate-3.2.0.tgz#b66b71c3158522e8ab5744f720d8ca0c2af59166"
+  integrity sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==
 
 delegates@^1.0.0:
   version "1.0.0"
@@ -5419,6 +5421,7 @@ globby@^9.2.0:
 good-listener@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/good-listener/-/good-listener-1.2.2.tgz#d53b30cdf9313dffb7dc9a0d477096aa6d145c50"
+  integrity sha1-1TswzfkxPf+33JoNR3CWqm0UXFA=
   dependencies:
     delegate "^3.1.2"
 
@@ -8405,8 +8408,9 @@ pretty-time@^1.1.0:
   resolved "https://registry.yarnpkg.com/pretty-time/-/pretty-time-1.1.0.tgz#ffb7429afabb8535c346a34e41873adf3d74dd0e"
 
 prismjs@^1.13.0:
-  version "1.19.0"
-  resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.19.0.tgz#713afbd45c3baca4b321569f2df39e17e729d4dc"
+  version "1.21.0"
+  resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.21.0.tgz#36c086ec36b45319ec4218ee164c110f9fc015a3"
+  integrity sha512-uGdSIu1nk3kej2iZsLyDoJ7e9bnPzIgY0naW/HdknGj61zScaprVEVGHrPoXqI+M9sP0NDnTK2jpkvmldpuqDw==
   optionalDependencies:
     clipboard "^2.0.0"
 
@@ -9115,6 +9119,7 @@ select-hose@^2.0.0:
 select@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/select/-/select-1.1.2.tgz#0e7350acdec80b1108528786ec1d4418d11b396d"
+  integrity sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0=
 
 selfsigned@^1.10.7:
   version "1.10.7"
@@ -10011,6 +10016,7 @@ timsort@^0.3.0:
 tiny-emitter@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz#1d1a56edfc51c43e863cbb5382a72330e3555423"
+  integrity sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==
 
 tmp@^0.0.33:
   version "0.0.33"

-Original file line number
+Diff line change
@@ @@ -1,5 +1,3 @@ @@
 ----
 -title: bar1
 ----
 +# bar test
 bar1
Original file line number	Diff line number	Diff line change
`@@ -3,23 +3,21 @@ import { zhHans, zhHant, en, ja, ko } from '../locales/index'`
`3`	`3`	`export default {`
`4`	`4`	`computed: {`
`5`	`5`	`$recoLocales () {`
`6`		`- const recoLocales = this.$themeLocaleConfig.recoLocales`
`7`		`- if (recoLocales && recoLocales.homeBlog) {`
`8`		`- return { homeBlog: recoLocales.homeBlog }`
`9`		`- }`
	`6`	`+ const recoLocales = this.$themeLocaleConfig.recoLocales \|\| {}`
	`7`	`+`
`10`	`8`	`if (/^zh\-(CN\|SG)$/.test(this.$lang)) {`
`11`		`- return zhHans`
	`9`	`+ return { ...zhHans, ...recoLocales }`
`12`	`10`	`}`
`13`	`11`	`if (/^zh\-(HK\|MO\|TW)$/.test(this.$lang)) {`
`14`		`- return zhHant`
	`12`	`+ return { ...zhHant, ...recoLocales }`
`15`	`13`	`}`
`16`	`14`	`if (/^ja\-JP$/.test(this.$lang)) {`
`17`		`- return ja`
	`15`	`+ return { ...ja, ...recoLocales }`
`18`	`16`	`}`
`19`	`17`	`if (/^ko\-KR$/.test(this.$lang)) {`
`20`		`- return ko`
	`18`	`+ return { ...ko, ...recoLocales }`
`21`	`19`	`}`
`22`		`- return en`
	`20`	`+ return { ...en, ...recoLocales }`
`23`	`21`	`}`
`24`	`22`	`}`
`25`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,18 @@ export default {`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`return formatPagesArr`
	`44`	`+ },`
	`45`	`+ $showSubSideBar () {`
	`46`	`+ const {`
	`47`	`+ $themeConfig: { subSidebar: themeSidebar },`
	`48`	`+ $frontmatter: { subSidebar: pageSidebar }`
	`49`	`+ } = this`
	`50`	`+ const headers = this.$page.headers \|\| []`
	`51`	`+`
	`52`	`+ if ((themeSidebar === 'auto' \|\| pageSidebar === 'auto') && headers.length > 0) {`
	`53`	`+ return true`
	`54`	`+ }`
	`55`	`+ return false`
`44`	`56`	`}`
`45`	`57`	`}`
`46`	`58`	`}`