feat: 优化文章页面加载表现

components/codeMirror.vue

@@ -2,9 +2,13 @@
     <div :class="wrapperClass">
         <div class="cm-header">
             <div class="cm-header-title">
-                <span>CodeMirror</span>
+                <span>{{ props.type ?? 'CodeMirror' }}</span>
             </div>
             <div class="cm-header-controls">
+                <div class="cm-header-controls-copy" :class="{ 'cm-header-controls-copy-hide': !show }"
+                    @click="copyCode">
+                    复制
+                </div>
                 <div class="cm-switch-show-hide" @click="show = !show">
                     {{ show ? '收起' : '展开' }}
                 </div>
@@ -50,60 +54,65 @@ const rows = computed(() => {
 })
 
 const useLangExtensions = async () => {
-   const ext = props.type
-   switch (ext) {
-      case 'js':
-      case 'jsx':
-      case 'ts':
-      case 'tsx':
-         const { javascript } = await import('@codemirror/lang-javascript')
-         return [
-            javascript({
-               jsx: ext.substring(2, 3) === 'x',
-               typescript: ext.substring(0, 2) === 'js'
-            })
-         ]
-         break
-      case 'css':
-      case 'scss':
-         const { sass } = await import('@codemirror/lang-sass')
-         return [sass()]
-         break
-      case 'html':
-         const { html } = await import('@codemirror/lang-html')
-         return [html()]
-         break
-      case 'py':
-         const { python } = await import('@codemirror/lang-python')
-         return [python()]
-         break
-      case 'go':
-         const { go } = await import('@codemirror/lang-go')
-         return [go()]
-         break
-      case 'json':
-         const { json } = await import('@codemirror/lang-json')
-         return [json()]
-         break
-      case 'md':
-         const { markdown } = await import('@codemirror/lang-markdown')
-         return [markdown()]
-         break
-      case 'yaml':
-         const { yaml } = await import('@codemirror/lang-yaml')
-         return [yaml()]
-         break
-      case 'vue':
-         const { vue } = await import('@codemirror/lang-vue')
-         return [vue()]
-         break
-      case 'xml':
-         const { xml } = await import('@codemirror/lang-xml')
-         return [xml()]
-         break
-      default:
-         return []
-   }
+    const ext = props.type
+    switch (ext) {
+        case 'js':
+        case 'jsx':
+        case 'ts':
+        case 'tsx':
+            const { javascript } = await import('@codemirror/lang-javascript')
+            return [
+                javascript({
+                    jsx: ext.substring(2, 3) === 'x',
+                    typescript: ext.substring(0, 2) === 'js'
+                })
+            ]
+            break
+        case 'css':
+        case 'scss':
+            const { sass } = await import('@codemirror/lang-sass')
+            return [sass()]
+            break
+        case 'html':
+            const { html } = await import('@codemirror/lang-html')
+            return [html()]
+            break
+        case 'py':
+            const { python } = await import('@codemirror/lang-python')
+            return [python()]
+            break
+        case 'go':
+            const { go } = await import('@codemirror/lang-go')
+            return [go()]
+            break
+        case 'json':
+            const { json } = await import('@codemirror/lang-json')
+            return [json()]
+            break
+        case 'md':
+            const { markdown } = await import('@codemirror/lang-markdown')
+            return [markdown()]
+            break
+        case 'yaml':
+            const { yaml } = await import('@codemirror/lang-yaml')
+            return [yaml()]
+            break
+        case 'vue':
+            const { vue } = await import('@codemirror/lang-vue')
+            return [vue()]
+            break
+        case 'xml':
+            const { xml } = await import('@codemirror/lang-xml')
+            return [xml()]
+            break
+        default:
+            return []
+    }
+}
+
+const copyCode = () => {
+    navigator.clipboard.writeText(props.data)
+    ElMessage.success('复制成功')
 }
 
 let cm: EditorView
@@ -141,14 +150,17 @@ onBeforeUnmount(() => {
 <style lang="scss">
 .cm-rander-wrapper {
     &-inline {
-      display: inline-block; 
-      .cm-header {
-        display: none !important;
-      }
-      .cm-gutters {
-        display: none !important; 
-      }
+        display: inline-block;
+
+        .cm-header {
+            display: none !important;
+        }
+
+        .cm-gutters {
+            display: none !important;
+        }
     }
+
     .cm-header {
         display: flex;
         align-items: center;
@@ -161,6 +173,23 @@ onBeforeUnmount(() => {
         user-select: none;
 
         .cm-header-controls {
+            display: flex;
+            align-items: center;
+            gap: 10px;
+
+            .cm-header-controls-copy {
+                cursor: pointer;
+                color: #fff;
+                fill: #fff;
+                transition: all 0.2s ease;
+                opacity: 1;
+            }
+
+            .cm-header-controls-copy-hide {
+                pointer-events: none;
+                opacity: 0;
+            }
+
             .cm-switch-show-hide {
                 cursor: pointer;
                 color: #fff;

components/markdownRender.vue

@@ -2,42 +2,40 @@
 
 <template>
     <div class="md-render-wrapper markdown-body">
-        <!-- <div v-html="renderedData" :key="_key"></div> -->
-        <VNodeArr></VNodeArr>
+        <VNodeMD v-if="VNodeMD && props.data"></VNodeMD>
+        <div v-else>
+            <el-skeleton :rows="12" />
+        </div>
     </div>
 </template>
 
 <script setup lang="ts">
 import useMarkdownit from '~/hooks/useMarkdownit';
 import Html2VNode from '~/utils/html2VNode';
-import codeMirror from './codeMirror.vue';
 
 const props = defineProps<{
     data: string
 }>()
 
-const _key = ref(Math.random())
+const VNodeMD = shallowRef<any>()
 
-const markdownIt = await useMarkdownit()
-
-const VNodeArr = computed(() => {
+watch(() => props.data, async () => {
     if (!props.data) {
         return () => []
     }
+    const markdownIt = await useMarkdownit()
     const renderedData = markdownIt.render(props.data)
-    console.log({
-        renderedData
-    })
     const h2v = new Html2VNode()
     h2v.use(
         {
             filter(tagName) {
                 return tagName === 'code'
             },
-            render({
+            async render({
                 item,
                 tagAttrs,
             }) {
+                const codeMirror = (await import('./codeMirror.vue')).default
                 const codeType = tagAttrs?.class?.slice(1, -1)?.split('-')?.[1] ?? ''
                 // @ts-ignore
                 const inline = (item.children[0].children.trim() as string).includes('\n') ? false : true
@@ -53,12 +51,14 @@ const VNodeArr = computed(() => {
             },
         }
     )
-    const res = h2v.render(renderedData)
-    return {
+    const res = await h2v.render(renderedData)
+    VNodeMD.value = {
         setup: () => {
             return () => res
         },
     }
+}, {
+    immediate: true
 })
 
 // watch(() => renderedData.value, () => {
@@ -90,7 +90,12 @@ const VNodeArr = computed(() => {
     }
 
     /* 恢复标题样式 */
-    h1, h2, h3, h4, h5, h6 {
+    h1,
+    h2,
+    h3,
+    h4,
+    h5,
+    h6 {
         margin-top: 1em;
         margin-bottom: 0.5em;
         font-weight: bold;
@@ -135,7 +140,8 @@ const VNodeArr = computed(() => {
     }
 
     /* 恢复列表样式 */
-    ul, ol {
+    ul,
+    ol {
         margin-top: 0;
         margin-bottom: 1em;
         padding-left: 2em;
@@ -153,7 +159,8 @@ const VNodeArr = computed(() => {
         margin-bottom: 0.25em;
     }
 
-    li > ul, li > ol {
+    li>ul,
+    li>ol {
         margin-top: 0.25em;
         margin-bottom: 0;
     }

pages/posts.vue

@@ -1,6 +1,8 @@
 <template>
     <div class="user-wrapper">
-        <NuxtPage />
+        <Suspense>
+            <NuxtPage />
+        </Suspense>
     </div>
 </template>
 

pages/posts/index.vue

@@ -18,7 +18,7 @@
                 </div>
             </footer>
         </article>
-        <div class="posts-skeleton" v-if="pending">
+        <div class="posts-skeleton" v-if="pending && 0">
             <div class="posts-skeleton-item" v-for="_ in range(5)">
                 <el-skeleton :rows="3" />
             </div>
@@ -48,8 +48,6 @@ const { data, pending } = await useFetch<{ code: number, data: postItem[] }>('/a
     // 添加以下选项
     lazy: true, // 避免客户端自动重新获取
     server: true, // 仅在服务器端获取数据
-    // cache: 'force-cache', // 强制使用缓存
-    // dedupe: 'force', // 强制使用缓存的数据
 })
 // 从响应中提取文章列表
 const posts = computed(() => data.value?.data || []) as ComputedRef<postItem[]>

pages/posts/post-[id].vue

@@ -1,9 +1,9 @@
 <template>
     <div class="md-wrapper">
-        <div class="md" v-if="postData">
+        <div class="md" v-if="!loading && postData">
             <div class="md-title">{{ postData.title }}</div>
             <div class="md-divider"></div>
-            <markdown-render :data="postData.content"></markdown-render>
+            <markdown-render :data="postData.data"></markdown-render>
         </div>
         <div v-else class="md-skeleton-item">
             <el-skeleton :rows="12" />
@@ -12,49 +12,22 @@
 </template>
 
 <script setup lang="ts">
-import useMarkdownit from '~/hooks/useMarkdownit';
-import usePostStore from '~/hooks/pinia/usePostStore';
-import markdownRender from '~/components/markdownRender.vue';
 import type { postContent } from '~/types/post';
 
-const postStore = usePostStore()
+const markdownRender = shallowRef<any>()
 const route = useRoute()
 const id = route.params.id as string
 
-// 使用useFetch来获取文章内容，支持SSR
-const { data: fetchedPost } = await useFetch('/api/posts/getPostContent', {
-    method: 'POST',
-    body: {
-        id
-    },
-    transform: async (response: postContent) => {
-        // 缓存数据
-        postStore.setPostCache(id, response)
+const loading = ref(true)
 
-        // 渲染Markdown
-        const markdownIt = await useMarkdownit()
+const postData = ref<postContent>()
 
-        return {
-            title: response.title,
-            content: response.data,
-            rendered: markdownIt.render(response.data)
-        }
-    },
-    // 使用缓存
-    async onRequest({ options }) {
-        const cache = postStore.getPostCache(id)
-        if (cache) {
-            return { 
-                title: cache.title, 
-                content: cache.data,
-                rendered: (await useMarkdownit()).render(cache.data)
-            }
-        }
-    }
+onBeforeMount(async () => {
+    const postDataPromise = getPostData(Number(id))
+    markdownRender.value = (await import('~/components/markdownRender.vue')).default
+    postData.value = await postDataPromise
+    loading.value = false
 })
-
-// 响应式数据
-const postData = computed(() => fetchedPost.value)
 </script>
 
 <style scoped>

utils/getPost.ts

@@ -1,6 +1,6 @@
 import useDefaultStore from "~/hooks/pinia/useDefaultStore"
 import usePostStore from "~/hooks/pinia/usePostStore"
-import useMiaoFetch from "~/hooks/useMiaoFetch"
+// import useMiaoFetch from "~/hooks/useMiaoFetch"
 // import usePostStore from "~/hooks/pinia/usePostStore"
 import type { postContent, postItem } from "~/types/post"
 

utils/html2VNode.ts

@@ -41,11 +41,11 @@ export default class Html2VNode {
         return middlewareMap;
     }
 
-    private render2VNode = (
+    private render2VNode = async (
         wrinklesResult: (miaoVNodeType | string)[],
         middlewareMap: Map<string, middlewareType[]>
-    ): (VNode | string)[] => {
-        return wrinklesResult.map((item: miaoVNodeType | string): VNode | string => {
+    ): Promise<(VNode | string)[]> => {
+        return Promise.all(wrinklesResult.map((async (item: miaoVNodeType | string): Promise<VNode | string> => {
             if (typeof item === 'string') {
                 return item;
             }
@@ -59,18 +59,18 @@ export default class Html2VNode {
                     middlewareMap
                 })
                 if(_res) {
-                    return _res
+                    return await _res
                 }
             }
             return ''
-        })
+        })))
     }
 
     private defaultMiddleware: middlewareType = {
         filter: (_: string) => {
             return true;
         },
-        render: ({
+        render: async ({
             item, tagName, tagAttrs, middlewareMap
         }) => {
             if (!tagName) {
@@ -78,7 +78,7 @@ export default class Html2VNode {
             }
             let child: string | (string | VNode)[] = item.children as string
             if (typeof item.children !== 'string') {
-                child = this.render2VNode(item.children, middlewareMap)
+                child = await this.render2VNode(item.children, middlewareMap)
             }
             return h(tagName ?? 'span', tagAttrs, child)
         }
@@ -221,5 +221,5 @@ export type middlewareType = {
             tagAttrs: { [key: string]: string },
             middlewareMap: Map<string, middlewareType[]>
         }
-    ) => VNode | string
+    ) => Promise<VNode | string>
 }