fix: HTML 渲染异常 (#152)

* fix: 修复 `API` 版本 HTML 会被渲染的问题[#146]

* chore: version 2.8.1

.github/workflows/build_docker.yml

@@ -3,6 +3,8 @@ name: build_docker
 on:
   push:
     branches: [main]
+  release:
+    types: [created] # 表示在创建新的 Release 时触发
 
 jobs:
   build_docker:
@@ -11,11 +13,11 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-      - name: Docker meta
+
-        id: meta
+      - run: |
-        uses: docker/metadata-action@v4
+          echo "本次构建的版本为：${GITHUB_REF_NAME} (但是这个变量目前上下文中无法获取到)"
-        with:
+          echo 本次构建的版本为：${{ github.ref_name }}
-          images: chenzhaoyu94/chatgpt-web
+          env
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -32,6 +34,8 @@ jobs:
         with:
           context: .
           push: true
-          tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           platforms: linux/amd64,linux/arm64
+          tags: |
+            ${{ secrets.DOCKERHUB_USERNAME }}/chatgpt-web:${{ github.ref_name }}
+            ${{ secrets.DOCKERHUB_USERNAME }}/chatgpt-web:latest

CHANGELOG.md

@@ -1,3 +1,10 @@
+## v2.8.1
+
+`2023-02-27`
+
+### BugFix
+- 修复 `API` 版本不是 `Markdown` 时，普通 `HTML` 代码会被渲染的问题 [#146]
+
 ## v2.8.0
 
 `2023-02-27`

README.md

@@ -174,7 +174,7 @@ version: '3'
 
 services:
   app:
-    image: chenzhaoyu94/chatgpt-web:main
+    image: chenzhaoyu94/chatgpt-web  # 总是使用latest,更新时重新pull该tag镜像即可
     ports:
       - 3002:3002
     environment:

package.json

@@ -1,6 +1,6 @@
 {
   "name": "chatgpt-web",
-  "version": "2.8.0",
+  "version": "2.8.1",
   "private": false,
   "description": "ChatGPT Web",
   "author": "ChenZhaoYu <chenzhaoyu1994@gmail.com>",

src/directives/highlight.ts

@@ -0,0 +1,23 @@
+import type { App, Directive } from 'vue'
+import hljs from 'highlight.js'
+import { includeCode } from '@/utils/format'
+
+hljs.configure({ ignoreUnescapedHTML: true })
+
+function highlightCode(el: HTMLElement) {
+  if (includeCode(el.textContent))
+    hljs.highlightBlock(el)
+}
+
+export default function setupHighlightDirective(app: App) {
+  const highLightDirective: Directive<HTMLElement> = {
+    mounted(el: HTMLElement) {
+      highlightCode(el)
+    },
+    updated(el: HTMLElement) {
+      highlightCode(el)
+    },
+  }
+
+  app.directive('highlight', highLightDirective)
+}

src/directives/index.ts

@@ -1 +1,6 @@
-export function setupDirectives() {}
+import type { App } from 'vue'
+import setupHighlightDirective from './highlight'
+
+export function setupDirectives(app: App) {
+  setupHighlightDirective(app)
+}

src/main.ts

@@ -1,5 +1,6 @@
 import { createApp } from 'vue'
 import App from './App.vue'
+import { setupDirectives } from './directives'
 import { setupAssets } from '@/plugins'
 import { setupStore } from '@/store'
 import { setupRouter } from '@/router'
@@ -10,6 +11,8 @@ async function bootstrap() {
 
   setupStore(app)
 
+  setupDirectives(app)
+
   await setupRouter(app)
 
   app.mount('#app')

src/utils/format/index.ts

@@ -0,0 +1,15 @@
+// 转义 HTML 字符
+export function encodeHTML(source: string) {
+  return source
+    .replace(/&/g, '&')
+    .replace(/</g, '&lt;')
+    .replace(/>/g, '&gt;')
+    .replace(/"/g, '&quot;')
+    .replace(/'/g, '&#39;')
+}
+
+// 判断是否为代码块
+export function includeCode(text: string | null | undefined) {
+  const regexp = /^(?:\s{4}|\t).+/gm
+  return !!(text?.includes(' = ') || text?.match(regexp))
+}

src/utils/functions/includeCode.ts

@@ -1,6 +0,0 @@
-function includeCode(text: string | null | undefined) {
-  const regexp = /^(?:\s{4}|\t).+/gm
-  return !!(text?.includes(' = ') || text?.match(regexp))
-}
-
-export default includeCode

src/views/chat/components/Message/Text.vue

@@ -3,6 +3,7 @@ import { computed } from 'vue'
 import { marked } from 'marked'
 import hljs from 'highlight.js'
 import { useBasicLayout } from '@/hooks/useBasicLayout'
+import { encodeHTML } from '@/utils/format'
 
 interface Props {
   inversion?: boolean
@@ -15,12 +16,19 @@ const props = defineProps<Props>()
 
 const { isMobile } = useBasicLayout()
 
-marked.setOptions({
+const renderer = new marked.Renderer()
-  renderer: new marked.Renderer(),
+
-  highlight(code) {
+renderer.html = (html) => {
-    return hljs.highlightAuto(code).value
+  return `<p>${encodeHTML(html)}</p>`
-  },
+}
-})
+
+renderer.code = (code, language) => {
+  const validLang = !!(language && hljs.getLanguage(language))
+  const highlighted = validLang ? hljs.highlight(language, code).value : code
+  return `<pre><code class="hljs ${language}">${highlighted}</code></pre>`
+}
+
+marked.setOptions({ renderer })
 
 const wrapClass = computed(() => {
   return [
@@ -35,9 +43,10 @@ const wrapClass = computed(() => {
 })
 
 const text = computed(() => {
-  if (props.text && !props.inversion)
+  const value = props.text ?? ''
-    return marked(props.text)
+  if (!props.inversion)
-  return props.text
+    return marked(value)
+  return value
 })
 </script>
 
@@ -48,7 +57,7 @@ const text = computed(() => {
     </template>
     <template v-else>
       <div class="leading-relaxed break-all">
-        <pre v-if="!inversion" class="markdown-body" v-html="text" />
+        <div v-if="!inversion" class="markdown-body" v-html="text" />
         <div v-else class="whitespace-pre-wrap" v-text="text" />
       </div>
     </template>