Skip to content

B
beyond-clouds-front
Commit 4ace35b9 by yanju
Options

文章代码添加行号

parent ac00a2c5
Showing with 490 additions and 19 deletions
assets/base.scss
...@@ -530,5 +530,44 @@ ...@@ -530,5 +530,44 @@
} }
} }
.hljs-ln{
tr{
border:none;
td{
background-color: #fcfcfc;
border:none;
.hljs-ln-numbers {
text-align: center;
color: #ccc;
border-right: 1px solid #999;
vertical-align: top;
padding-right: 5px;
-webkit-touch-callout: none;
-webkit-user-select: none;
-khtml-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}
.hljs-ln-code {
padding-left: 10px;
}
/* .hljs-ln-code,
.hljs-ln-numbers {
line-height: 14px;
} */
code {
white-space: pre-wrap;
overflow: auto;
}
}
}
}
} }
nuxt.config.js
...@@ -19,7 +19,7 @@ module.exports = { ...@@ -19,7 +19,7 @@ module.exports = {
], ],
link: [ link: [
{ rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' } { rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' }
] ],
}, },
/* /*
** Customize the progress-bar color ** Customize the progress-bar color
...@@ -46,6 +46,7 @@ module.exports = { ...@@ -46,6 +46,7 @@ module.exports = {
plugins: [ plugins: [
'~/plugins/axios', '~/plugins/axios',
{src: '~/plugins/baidu.js', ssr: false}, {src: '~/plugins/baidu.js', ssr: false},
{src: '~/plugins/highlight.js', ssr: false},
{src: '~/plugins/websocket.js', ssr: false}, {src: '~/plugins/websocket.js', ssr: false},
{src: '~/plugins/notifications.js', ssr: false}, {src: '~/plugins/notifications.js', ssr: false},
{src:'~/plugins/mavonEditor.js',ssr:false}, {src:'~/plugins/mavonEditor.js',ssr:false},
......
package-lock.json
...@@ -7456,6 +7456,14 @@ ...@@ -7456,6 +7456,14 @@
"type-check": "~0.3.2" "type-check": "~0.3.2"
} }
}, },
"linkify-it": {
"version": "2.2.0",
"resolved": "https://registry.npm.taobao.org/linkify-it/download/linkify-it-2.2.0.tgz",
"integrity": "sha1-47VGl+eL+RXHCjis14/QngBYsc8=",
"requires": {
"uc.micro": "^1.0.1"
}
},
"load-json-file": { "load-json-file": {
"version": "4.0.0", "version": "4.0.0",
"resolved": "https://registry.npm.taobao.org/load-json-file/download/load-json-file-4.0.0.tgz", "resolved": "https://registry.npm.taobao.org/load-json-file/download/load-json-file-4.0.0.tgz",
...@@ -7656,6 +7664,88 @@ ...@@ -7656,6 +7664,88 @@
"object-visit": "^1.0.0" "object-visit": "^1.0.0"
} }
}, },
"markdown-it": {
"version": "10.0.0",
"resolved": "https://registry.npm.taobao.org/markdown-it/download/markdown-it-10.0.0.tgz",
"integrity": "sha1-q/xk8UGxci1mNAIETkOSfx9QqNw=",
"requires": {
"argparse": "^1.0.7",
"entities": "~2.0.0",
"linkify-it": "^2.0.0",
"mdurl": "^1.0.1",
"uc.micro": "^1.0.5"
}
},
"markdown-it-abbr": {
"version": "1.0.4",
"resolved": "https://registry.npm.taobao.org/markdown-it-abbr/download/markdown-it-abbr-1.0.4.tgz",
"integrity": "sha1-1mtTZFIcuz3Yqlna37ovtoZcj9g="
},
"markdown-it-container": {
"version": "2.0.0",
"resolved": "https://registry.npm.taobao.org/markdown-it-container/download/markdown-it-container-2.0.0.tgz",
"integrity": "sha1-ABm0P9Au7+zi8ZYKKJX7qBpARpU="
},
"markdown-it-deflist": {
"version": "2.0.3",
"resolved": "https://registry.npm.taobao.org/markdown-it-deflist/download/markdown-it-deflist-2.0.3.tgz",
"integrity": "sha1-VyfbBBhNPLK8buSpZB46EJHV/W8="
},
"markdown-it-emoji": {
"version": "1.4.0",
"resolved": "https://registry.npm.taobao.org/markdown-it-emoji/download/markdown-it-emoji-1.4.0.tgz",
"integrity": "sha1-m+4OmpkKljupbfaYDE/dsF37Tcw="
},
"markdown-it-footnote": {
"version": "3.0.2",
"resolved": "https://registry.npm.taobao.org/markdown-it-footnote/download/markdown-it-footnote-3.0.2.tgz",
"integrity": "sha1-FXXuegk2SNTglqozOGsFjZKsi8E="
},
"markdown-it-highlightjs-external": {
"version": "1.0.1",
"resolved": "https://registry.npm.taobao.org/markdown-it-highlightjs-external/download/markdown-it-highlightjs-external-1.0.1.tgz",
"integrity": "sha1-hZX9SwIH7EKckzQfmWY3+jHaLVM="
},
"markdown-it-images-preview": {
"version": "1.0.1",
"resolved": "https://registry.npm.taobao.org/markdown-it-images-preview/download/markdown-it-images-preview-1.0.1.tgz",
"integrity": "sha1-F9brhJHMzSND1ORBmhq+nKQ8C7s="
},
"markdown-it-ins": {
"version": "3.0.0",
"resolved": "https://registry.npm.taobao.org/markdown-it-ins/download/markdown-it-ins-3.0.0.tgz",
"integrity": "sha1-sbVoJMeNxm5SsPyXUxsxfNeNedI="
},
"markdown-it-katex-external": {
"version": "1.0.0",
"resolved": "https://registry.npm.taobao.org/markdown-it-katex-external/download/markdown-it-katex-external-1.0.0.tgz",
"integrity": "sha1-eNF4bZTfhlDgvqef+8Cx8D/XxgY="
},
"markdown-it-mark": {
"version": "3.0.0",
"resolved": "https://registry.npm.taobao.org/markdown-it-mark/download/markdown-it-mark-3.0.0.tgz",
"integrity": "sha1-J8PjnvPMMQst3lN1CCyfqRKYPNo="
},
"markdown-it-sub": {
"version": "1.0.0",
"resolved": "https://registry.npm.taobao.org/markdown-it-sub/download/markdown-it-sub-1.0.0.tgz",
"integrity": "sha1-N1/WAm6ufdywEkl/ZBEZXqHjr+g="
},
"markdown-it-sup": {
"version": "1.0.0",
"resolved": "https://registry.npm.taobao.org/markdown-it-sup/download/markdown-it-sup-1.0.0.tgz",
"integrity": "sha1-y5yf+RpSVawI8/09YyhuFd8KH8M="
},
"markdown-it-task-lists": {
"version": "2.1.1",
"resolved": "https://registry.npm.taobao.org/markdown-it-task-lists/download/markdown-it-task-lists-2.1.1.tgz",
"integrity": "sha1-9o9NKsK61aLDc7qTCBoaaEhBcIg="
},
"markdown-it-toc": {
"version": "1.1.0",
"resolved": "https://registry.npm.taobao.org/markdown-it-toc/download/markdown-it-toc-1.1.0.tgz",
"integrity": "sha1-bRiYWOMrPetP860nE/qSdDnJV+A="
},
"mavon-editor": { "mavon-editor": {
"version": "2.7.7", "version": "2.7.7",
"resolved": "https://registry.npm.taobao.org/mavon-editor/download/mavon-editor-2.7.7.tgz", "resolved": "https://registry.npm.taobao.org/mavon-editor/download/mavon-editor-2.7.7.tgz",
...@@ -7680,6 +7770,11 @@ ...@@ -7680,6 +7770,11 @@
"resolved": "https://registry.npm.taobao.org/mdn-data/download/mdn-data-2.0.4.tgz?cache=0&sync_timestamp=1573816302294&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmdn-data%2Fdownload%2Fmdn-data-2.0.4.tgz", "resolved": "https://registry.npm.taobao.org/mdn-data/download/mdn-data-2.0.4.tgz?cache=0&sync_timestamp=1573816302294&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmdn-data%2Fdownload%2Fmdn-data-2.0.4.tgz",
"integrity": "sha1-aZs8OKxvHXKAkaZGULZdOIUC/Vs=" "integrity": "sha1-aZs8OKxvHXKAkaZGULZdOIUC/Vs="
}, },
"mdurl": {
"version": "1.0.1",
"resolved": "https://registry.npm.taobao.org/mdurl/download/mdurl-1.0.1.tgz",
"integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4="
},
"media-typer": { "media-typer": {
"version": "0.3.0", "version": "0.3.0",
"resolved": "https://registry.npm.taobao.org/media-typer/download/media-typer-0.3.0.tgz", "resolved": "https://registry.npm.taobao.org/media-typer/download/media-typer-0.3.0.tgz",
...@@ -10042,6 +10137,15 @@ ...@@ -10042,6 +10137,15 @@
} }
} }
}, },
"raw-loader": {
"version": "4.0.0",
"resolved": "https://registry.npm.taobao.org/raw-loader/download/raw-loader-4.0.0.tgz?cache=0&sync_timestamp=1574695176795&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fraw-loader%2Fdownload%2Fraw-loader-4.0.0.tgz",
"integrity": "sha1-1jnED7nXK1x/irwfst2yWynT1UA=",
"requires": {
"loader-utils": "^1.2.3",
"schema-utils": "^2.5.0"
}
},
"rc": { "rc": {
"version": "1.2.8", "version": "1.2.8",
"resolved": "http://registry.npm.taobao.org/rc/download/rc-1.2.8.tgz", "resolved": "http://registry.npm.taobao.org/rc/download/rc-1.2.8.tgz",
...@@ -11972,6 +12076,11 @@ ...@@ -11972,6 +12076,11 @@
"resolved": "https://registry.npm.taobao.org/ua-parser-js/download/ua-parser-js-0.7.20.tgz", "resolved": "https://registry.npm.taobao.org/ua-parser-js/download/ua-parser-js-0.7.20.tgz",
"integrity": "sha1-dScXi4L2pioPJD0flP0w4+PCEJg=" "integrity": "sha1-dScXi4L2pioPJD0flP0w4+PCEJg="
}, },
"uc.micro": {
"version": "1.0.6",
"resolved": "https://registry.npm.taobao.org/uc.micro/download/uc.micro-1.0.6.tgz",
"integrity": "sha1-nEEagCpAmpH8bPdAgbq6NLJEmaw="
},
"uglify-js": { "uglify-js": {
"version": "3.7.0", "version": "3.7.0",
"resolved": "https://registry.npm.taobao.org/uglify-js/download/uglify-js-3.7.0.tgz?cache=0&sync_timestamp=1574701612100&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fuglify-js%2Fdownload%2Fuglify-js-3.7.0.tgz", "resolved": "https://registry.npm.taobao.org/uglify-js/download/uglify-js-3.7.0.tgz?cache=0&sync_timestamp=1574701612100&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fuglify-js%2Fdownload%2Fuglify-js-3.7.0.tgz",
......
pages/answer/detail/_id.vue
...@@ -212,9 +212,14 @@ ...@@ -212,9 +212,14 @@
highlightCode () { highlightCode () {
if(process.browser){ if(process.browser){
this.$hljs.initHighlightingOnLoad();
this.$hljs.initLineNumbersOnLoad({
singleLine: true
});
const preEl = document.querySelectorAll('pre'); const preEl = document.querySelectorAll('pre');
preEl.forEach((el) => { preEl.forEach((el) => {
hljs.highlightBlock(el) this.$hljs.highlightBlock(el)
this.$hljs.lineNumbersBlock(el);
}) })
} }
......
pages/blog/detail/_id.vue
...@@ -138,8 +138,6 @@ ...@@ -138,8 +138,6 @@
import {dateConvert} from "../../../action/utils/dataConvert"; import {dateConvert} from "../../../action/utils/dataConvert";
import {globalBus} from '../../../components/common/globalBus' import {globalBus} from '../../../components/common/globalBus'
import hljs from 'highlight.js'
export default { export default {
async asyncData ({ $axios ,params}) { async asyncData ({ $axios ,params}) {
let articleDetail = await $axios.$get(config.api.get.Blog.detail+params.id); let articleDetail = await $axios.$get(config.api.get.Blog.detail+params.id);
...@@ -200,6 +198,7 @@ ...@@ -200,6 +198,7 @@
mounted(){ mounted(){
this.highlightCode(); this.highlightCode();
}, },
...@@ -221,9 +220,14 @@ ...@@ -221,9 +220,14 @@
highlightCode () { highlightCode () {
if(process.browser){ if(process.browser){
this.$hljs.initHighlightingOnLoad();
this.$hljs.initLineNumbersOnLoad({
singleLine: true
});
const preEl = document.querySelectorAll('pre'); const preEl = document.querySelectorAll('pre');
preEl.forEach((el) => { preEl.forEach((el) => {
hljs.highlightBlock(el) this.$hljs.highlightBlock(el)
this.$hljs.lineNumbersBlock(el);
}) })
} }
...@@ -342,6 +346,10 @@ ...@@ -342,6 +346,10 @@
@extend %flex-row-spb; @extend %flex-row-spb;
align-items: flex-start; align-items: flex-start;
@extend %detail-container; @extend %detail-container;
} }
</style> </style>
<style lang="css">@import "assets/github-markdown.min.css";</style> <style lang="css">@import "assets/github-markdown.min.css";</style>
pages/dynamic/index.vue
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
<release-card @listenReleaseState="restartPagination()"></release-card> <release-card @listenReleaseState="restartPagination()"></release-card>
<social-card @listenSocialCardState="restartPagination()" v-for="(val,index) in postList" :key="val.postId" :info="val"></social-card> <social-card @listenSocialCardState="restartPagination()" v-for="(val,index) in postList" :key="val.postId" :info="val"></social-card>
<pagination ref="pagination" :paginationState="paginationState" :type="2" key="container5" style="margin:20px auto;" :pages="pages" v-on:listenPageChange="changePage"></pagination> <pagination ref="pagination" :paginationState="paginationState" :type="2" key="container5" style="margin:20px auto;" :pages="pages" v-on:listenPageChange="changePage"></pagination>
</div> </div>
<div class="dynamic-container__right"> <div class="dynamic-container__right">
<hot-topic-list ></hot-topic-list> <hot-topic-list ></hot-topic-list>
...@@ -93,7 +92,6 @@ ...@@ -93,7 +92,6 @@
}, },
created() { created() {
this.dataGetHotTopic();
this.dataGetActiveUser(); this.dataGetActiveUser();
if(!this.$store.state.userProfile.userId){ if(!this.$store.state.userProfile.userId){
...@@ -332,16 +330,6 @@ ...@@ -332,16 +330,6 @@
}) })
}, },
dataGetHotTopic(){
this.$axios.$get(config.api.get.Topic.hotSearch,{
params:{
page:1,
size:10
}
}).then((response)=>{
this.topicList = response.data.dataList;
})
},
changePage(currentPage){ changePage(currentPage){
//返回页数 请求新的数据 //返回页数 请求新的数据
......
pages/news/detail/_id.vue
...@@ -177,9 +177,14 @@ ...@@ -177,9 +177,14 @@
}, },
highlightCode () { highlightCode () {
if(process.browser){ if(process.browser){
this.$hljs.initHighlightingOnLoad();
this.$hljs.initLineNumbersOnLoad({
singleLine: true
});
const preEl = document.querySelectorAll('pre'); const preEl = document.querySelectorAll('pre');
preEl.forEach((el) => { preEl.forEach((el) => {
hljs.highlightBlock(el) this.$hljs.highlightBlock(el)
this.$hljs.lineNumbersBlock(el);
}) })
} }
......
pages/project/detail/_id.vue
...@@ -212,9 +212,14 @@ ...@@ -212,9 +212,14 @@
}, },
highlightCode () { highlightCode () {
if(process.browser){ if(process.browser){
this.$hljs.initHighlightingOnLoad();
this.$hljs.initLineNumbersOnLoad({
singleLine: true
});
const preEl = document.querySelectorAll('pre'); const preEl = document.querySelectorAll('pre');
preEl.forEach((el) => { preEl.forEach((el) => {
hljs.highlightBlock(el) this.$hljs.highlightBlock(el)
this.$hljs.lineNumbersBlock(el);
}) })
} }
......
plugins/highlight.js 0 → 100644
import hljs from 'highlight.js'
import Vue from 'vue';
Vue.prototype.$hljs = hljs
import lineNumber from '../components/pc/highlightjs-line-numbers.js'
lineNumber(window,document,Vue.prototype);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment