fix: code block (#310)

doocs · Jul 4, 2024 · 9d8757b · 9d8757b
1 parent 74eba4e
commit 9d8757b
Show file tree

Hide file tree

Showing 7 changed files with 2,553 additions and 18,408 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -30,7 +30,6 @@
     "minio": "7.0.33",
     "node-fetch": "^3.2.10",
     "pinia": "^2.1.6",
-    "prettify": "^0.1.7",
     "qiniu-js": "^3.4.1",
     "uuid": "^8.3.2",
     "vue": "^2.7.14"

diff --git a/public/index.html b/public/index.html
@@ -30,8 +30,7 @@
     />
     <!-- KaTeX CSS -->
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/katex.min.css" integrity="sha384-n8MVd4RsNIU0tAv4ct0nTaAbDJwPJzDEaqSD1odI+WdtXRGWt2kTvGFasHpSy3SV" crossorigin="anonymous">
-
-    <script src="https://cdn-doocs.oss-cn-shenzhen.aliyuncs.com/npm/prettify/r298/prettify.min.js"></script>
+
     <style>
       /**
         解决公众号复制字体问题

diff --git a/src/assets/scripts/renderers/wx-renderer.js b/src/assets/scripts/renderers/wx-renderer.js
@@ -145,7 +145,7 @@ class WxRenderer {
 
         return `<pre class="hljs code__pre" ${getStyles(
           "code_pre"
-        )}><code class="prettyprint language-${lang}" ${getStyles(
+        )}><code class="language-${lang}" ${getStyles(
           "code"
         )}>${text}</code></pre>`;
       };

diff --git a/src/assets/scripts/util.js b/src/assets/scripts/util.js
@@ -285,8 +285,7 @@ export function exportHTML() {
     // 判断是否是包裹代码块的 code 元素
     function isCode(element) {
       return (
-        element.tagName === `CODE` &&
-        Array.from(element.classList).includes(`prettyprint`)
+        element.tagName === `CODE`
       )
     }
 

diff --git a/src/components/CodemirrorEditor/EditorHeader/index.vue b/src/components/CodemirrorEditor/EditorHeader/index.vue
@@ -397,13 +397,6 @@ export default {
           )
           // 公众号不支持 position， 转换为等价的 translateY
           .replace(/top:(.*?)em/g, `transform: translateY($1em)`)
-
-        if (this.isMacCodeBlock) {
-          clipboardDiv.innerHTML = clipboardDiv.innerHTML.replaceAll(
-            /(<code class="prettyprint[^>]*)(style=")/g,
-            `$1style="font-family: Menlo, 'Operator Mono', Consolas, Monaco, monospace;`
-          )
-        }
         clipboardDiv.focus()
         window.getSelection().removeAllRanges()
         let range = document.createRange()

diff --git a/src/views/CodemirrorEditor.vue b/src/views/CodemirrorEditor.vue
@@ -440,7 +440,6 @@ export default {
     onEditorRefresh() {
       this.codeThemeChanged(this.codeTheme)
       this.editorRefresh()
-      setTimeout(() => window.PR.prettyPrint(), 0)
     },
     // 复制结束
     endCopy() {
@@ -607,7 +606,6 @@ export default {
   mounted() {
     setTimeout(() => {
       this.leftAndRightScroll()
-      window.PR.prettyPrint()
     }, 300)
   },
   setup() {