Merge 67ef9dc21c into 23de6453a3

#497

src/utils/renderer.ts

@@ -174,6 +174,8 @@ export function initRenderer(opts: IOpts) {
       const langText = lang.split(` `)[0]
       const language = hljs.getLanguage(langText) ? langText : `plaintext`
       let highlighted = hljs.highlight(text, { language }).value
+      // tab to 4 spaces
+      highlighted = highlighted.replace(/\t/g, '    ')
       highlighted = highlighted
         .replace(/\r\n/g, `<br/>`)
         .replace(/\n/g, `<br/>`)

src/views/CodemirrorEditor.vue

@@ -170,12 +170,15 @@ watch(isDark, () => {
   toRaw(editor.value)?.setOption?.(`theme`, theme)
 })
 
+const charCount = ref(0)
+
 // 初始化编辑器
 function initEditor() {
   const editorDom = document.querySelector<HTMLTextAreaElement>(`#editor`)!
 
   if (!editorDom.value) {
     editorDom.value = store.posts[store.currentPostIndex].content
+    charCount.value = store.posts[store.currentPostIndex].content.replace(/\s/g, ``).length
   }
   editor.value = CodeMirror.fromTextArea(editorDom, {
     mode: `text/x-markdown`,
@@ -222,7 +225,9 @@ function initEditor() {
     clearTimeout(changeTimer.value)
     changeTimer.value = setTimeout(() => {
       onEditorRefresh()
-      store.posts[store.currentPostIndex].content = e.getValue()
+      const value = e.getValue()
+      store.posts[store.currentPostIndex].content = value
+      charCount.value = value.replace(/\s/g, ``).length
     }, 300)
   })
 
@@ -414,23 +419,28 @@ onMounted(() => {
             </ContextMenuContent>
           </ContextMenu>
         </div>
-        <div
+        <div class="relative flex-1">
-          id="preview"
+          <div
-          ref="preview"
+            id="preview"
-          :span="isShowCssEditor ? 8 : 12"
+            ref="preview"
-          class="preview-wrapper flex-1 p-5"
+            :span="isShowCssEditor ? 8 : 12"
-        >
+            class="preview-wrapper flex-1 p-5"
-          <div id="output-wrapper" :class="{ output_night: !backLight }">
+          >
-            <div class="preview border shadow-xl">
+            <div id="output-wrapper" :class="{ output_night: !backLight }">
-              <section id="output" v-html="output" />
+              <div class="preview border shadow-xl">
-              <div v-if="isCoping" class="loading-mask">
+                <section id="output" v-html="output" />
-                <div class="loading-mask-box">
+                <div v-if="isCoping" class="loading-mask">
-                  <div class="loading__img" />
+                  <div class="loading-mask-box">
-                  <span>正在生成</span>
+                    <div class="loading__img" />
+                    <span>正在生成</span>
+                  </div>
                 </div>
               </div>
             </div>
           </div>
+          <div class="bg-muted absolute bottom-0 left-0 p-2 text-xs shadow">
+            {{ charCount }} 个字符
+          </div>
         </div>
         <CssEditor class="flex-1" />
       </div>