From c51895d2546638b2c3184958a74bec23a99a63c0 Mon Sep 17 00:00:00 2001 From: 07akioni <07akioni2@gmail.com> Date: Mon, 4 Jan 2021 01:03:09 +0800 Subject: [PATCH] fix: md-loader code no line wrap --- build/loaders/md-renderer.js | 13 +++++-------- src/code/src/styles/index.cssr.js | 2 +- vue3.md | 3 +++ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build/loaders/md-renderer.js b/build/loaders/md-renderer.js index 6a96a0727..ddd11706b 100644 --- a/build/loaders/md-renderer.js +++ b/build/loaders/md-renderer.js @@ -40,14 +40,11 @@ function createRenderer (wrapCodeWithCard = true) { `MdRendererError: ${language} is not valid for code - ${code}` ) } - const highlighted = hljs - .highlight(language, code) - .value.replace(/\n/g, '
') - return `${ - wrapCodeWithCard ? '' : '' - }${highlighted}${ - wrapCodeWithCard ? '' : '' - }` + const highlighted = hljs.highlight(language, code).value + const content = `
${highlighted}
` + return wrapCodeWithCard + ? `${content}` + : content }, heading: (text, level) => { const id = text.replace(/ /g, '-') diff --git a/src/code/src/styles/index.cssr.js b/src/code/src/styles/index.cssr.js index 2ca025407..4bf47abfc 100644 --- a/src/code/src/styles/index.cssr.js +++ b/src/code/src/styles/index.cssr.js @@ -24,7 +24,7 @@ export default c([ font-family: var(--font-family); `, [ - c('code', { + c('code, pre', { fontFamily: 'var(--font-family)' }), c('[class^=hljs]', { diff --git a/vue3.md b/vue3.md index e5f301bae..2bfb82734 100644 --- a/vue3.md +++ b/vue3.md @@ -81,6 +81,7 @@ - [x] config-provider - break - `$NOs.theme` => `useOsTheme` + - `theme` => `legacy-theme` - deprecate - `as` => `tag` - `styleScheme` won't working in next version @@ -373,6 +374,8 @@ - [ ] radio-group 影响主题切换,看起来是 vue 的 bug - https://github.com/vuejs/vue-next/issues/2829 - [x] cascader demo async 切换未重置数据,demo 写的有问题 + - [ ] gradient-text transition 又没了 + - [x] md-loader code ## Info