From 19d9806253966ce2ce8d63d418d7c801398582f3 Mon Sep 17 00:00:00 2001
From: Luo Yi <32430186+yilozt@users.noreply.github.com>
Date: Sat, 18 Mar 2023 14:32:57 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E7=94=A8=E4=BA=8E=E5=8E=9F=E6=96=87=E7=9A=84=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/locales/en-US.ts                        |  2 ++
 src/locales/zh-CN.ts                        |  2 ++
 src/locales/zh-TW.ts                        |  2 ++
 src/views/chat/components/Message/Text.vue  |  5 +++--
 src/views/chat/components/Message/index.vue | 19 +++++++++++++++----
 5 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts
index 0e9e3d3e9f..7021f1659f 100644
--- a/src/locales/en-US.ts
+++ b/src/locales/en-US.ts
@@ -46,6 +46,8 @@ export default {
     deleteMessageConfirm: 'Are you sure to delete this message?',
     deleteHistoryConfirm: 'Are you sure to clear this history?',
     clearHistoryConfirm: 'Are you sure to clear chat history?',
+    preview: 'Preview',
+    showRawText: 'Show as raw text',
   },
   setting: {
     setting: 'Setting',
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index e47b850b07..0d7be6656a 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -46,6 +46,8 @@ export default {
     deleteMessageConfirm: '是否删除此消息?',
     deleteHistoryConfirm: '确定删除此记录?',
     clearHistoryConfirm: '确定清空聊天记录?',
+    preview: '预览',
+    showRawText: '显示原文',
   },
   setting: {
     setting: '设置',
diff --git a/src/locales/zh-TW.ts b/src/locales/zh-TW.ts
index 2b8ffda90b..4433829b25 100644
--- a/src/locales/zh-TW.ts
+++ b/src/locales/zh-TW.ts
@@ -46,6 +46,8 @@ export default {
     deleteMessageConfirm: '是否刪除此訊息?',
     deleteHistoryConfirm: '確定刪除此紀錄?',
     clearHistoryConfirm: '確定清除紀錄?',
+    preview: '預覽',
+    showRawText: '顯示原文',
   },
   setting: {
     setting: '設定',
diff --git a/src/views/chat/components/Message/Text.vue b/src/views/chat/components/Message/Text.vue
index f273443032..e23abac607 100644
--- a/src/views/chat/components/Message/Text.vue
+++ b/src/views/chat/components/Message/Text.vue
@@ -12,6 +12,7 @@ interface Props {
   error?: boolean
   text?: string
   loading?: boolean
+  asRawText?: boolean
 }
 
 const props = defineProps<Props>()
@@ -49,7 +50,7 @@ const wrapClass = computed(() => {
 
 const text = computed(() => {
   const value = props.text ?? ''
-  if (!props.inversion)
+  if (!props.asRawText)
     return mdi.render(value)
   return value
 })
@@ -68,7 +69,7 @@ defineExpose({ textRef })
     </template>
     <template v-else>
       <div ref="textRef" class="leading-relaxed break-words">
-        <div v-if="!inversion" class="markdown-body" v-html="text" />
+        <div v-if="!asRawText" class="markdown-body" v-html="text" />
         <div v-else class="whitespace-pre-wrap" v-text="text" />
       </div>
     </template>
diff --git a/src/views/chat/components/Message/index.vue b/src/views/chat/components/Message/index.vue
index 0d462e923a..0c3bfde107 100644
--- a/src/views/chat/components/Message/index.vue
+++ b/src/views/chat/components/Message/index.vue
@@ -1,5 +1,5 @@
 <script setup lang='ts'>
-import { ref } from 'vue'
+import { computed, ref } from 'vue'
 import { NDropdown } from 'naive-ui'
 import AvatarComponent from './Avatar.vue'
 import TextComponent from './Text.vue'
@@ -29,7 +29,14 @@ const { iconRender } = useIconRender()
 
 const textRef = ref<HTMLElement>()
 
-const options = [
+const asRawText = ref(props.inversion)
+
+const options = computed(() => [
+  {
+    label: asRawText.value ? t('chat.preview') : t('chat.showRawText'),
+    key: 'toggleRenderType',
+    icon: iconRender({ icon: asRawText.value ? 'ic:outline-code-off' : 'ic:outline-code' }),
+  },
   {
     label: t('chat.copy'),
     key: 'copyText',
@@ -40,13 +47,16 @@ const options = [
     key: 'delete',
     icon: iconRender({ icon: 'ri:delete-bin-line' }),
   },
-]
+])
 
-function handleSelect(key: 'copyRaw' | 'copyText' | 'delete') {
+function handleSelect(key: 'copyRaw' | 'copyText' | 'delete' | 'toggleRenderType') {
   switch (key) {
     case 'copyText':
       copyText({ text: props.text ?? '' })
       return
+    case 'toggleRenderType':
+      asRawText.value = !asRawText.value
+      return
     case 'delete':
       emit('delete')
   }
@@ -79,6 +89,7 @@ function handleRegenerate() {
           :error="error"
           :text="text"
           :loading="loading"
+          :as-raw-text="asRawText"
         />
         <div class="flex flex-col">
           <button

From 14bd03a44a30edad0fe041817d7ff95f6edeefb1 Mon Sep 17 00:00:00 2001
From: Luo Yi <32430186+yilozt@users.noreply.github.com>
Date: Mon, 20 Mar 2023 20:49:21 +0800
Subject: [PATCH 2/3] =?UTF-8?q?chore:=20=E4=BF=AE=E5=A4=8D=E6=9A=97?=
 =?UTF-8?q?=E8=89=B2=E4=B8=BB=E9=A2=98=E4=B8=8B=E6=96=87=E6=9C=AC=E9=A2=9C?=
 =?UTF-8?q?=E8=89=B2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

给输入和输出气泡添加了 css 类,用来处理在暗色主题下聊天气泡的文本颜色
---
 src/views/chat/components/Message/Text.vue   |  1 +
 src/views/chat/components/Message/style.less | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/src/views/chat/components/Message/Text.vue b/src/views/chat/components/Message/Text.vue
index e23abac607..372cfcdba8 100644
--- a/src/views/chat/components/Message/Text.vue
+++ b/src/views/chat/components/Message/Text.vue
@@ -44,6 +44,7 @@ const wrapClass = computed(() => {
     isMobile.value ? 'p-2' : 'px-3 py-2',
     props.inversion ? 'bg-[#d2f9d1]' : 'bg-[#f4f6f8]',
     props.inversion ? 'dark:bg-[#a1dc95]' : 'dark:bg-[#1e1e20]',
+    props.inversion ? 'request' : 'reply',
     { 'text-red-500': props.error },
   ]
 })
diff --git a/src/views/chat/components/Message/style.less b/src/views/chat/components/Message/style.less
index ce67447a33..5ec1579b05 100644
--- a/src/views/chat/components/Message/style.less
+++ b/src/views/chat/components/Message/style.less
@@ -1,3 +1,5 @@
+@import url('/src/styles/lib/github-markdown.less');
+
 .markdown-body {
 	background-color: transparent;
 	font-size: 14px;
@@ -55,10 +57,27 @@
 			}
 		}
 	}
+
+}
+
+html .markdown-body {
+
+	h1,h2,h3,h4 {
+		border: none;
+	}
 }
 
 html.dark {
 
+	/* 用户的输入始终使用亮色主题的 Markdown */
+   	.request .markdown-body:extend(html .markdown-body) {
+		--color-canvas-default: #0d1117;
+    }
+
+	.reply .whitespace-pre-wrap {
+		color: var(--n-text-color);
+	}
+
 	.highlight pre,
 	pre {
 		background-color: #282c34;

From 6461b0b0622c842b68bebdbbd2319ecdd288e9fc Mon Sep 17 00:00:00 2001
From: ChenZhaoYu <790348264@qq.com>
Date: Tue, 21 Mar 2023 08:43:23 +0800
Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=E7=94=A8=E6=88=B7=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E4=B8=8D=E5=BA=94=E8=AF=A5=E8=A2=AB=E6=B8=B2=E6=9F=93?=
 =?UTF-8?q?=EF=BC=8C=E9=98=B2=E6=AD=A2=20xss?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/chat/components/Message/Text.vue   |  7 +++-
 src/views/chat/components/Message/index.vue  | 43 ++++++++++++--------
 src/views/chat/components/Message/style.less | 24 ++++-------
 3 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/src/views/chat/components/Message/Text.vue b/src/views/chat/components/Message/Text.vue
index 372cfcdba8..61a11dbcd6 100644
--- a/src/views/chat/components/Message/Text.vue
+++ b/src/views/chat/components/Message/Text.vue
@@ -44,7 +44,7 @@ const wrapClass = computed(() => {
     isMobile.value ? 'p-2' : 'px-3 py-2',
     props.inversion ? 'bg-[#d2f9d1]' : 'bg-[#f4f6f8]',
     props.inversion ? 'dark:bg-[#a1dc95]' : 'dark:bg-[#1e1e20]',
-    props.inversion ? 'request' : 'reply',
+    props.inversion ? 'message-request' : 'message-reply',
     { 'text-red-500': props.error },
   ]
 })
@@ -70,7 +70,10 @@ defineExpose({ textRef })
     </template>
     <template v-else>
       <div ref="textRef" class="leading-relaxed break-words">
-        <div v-if="!asRawText" class="markdown-body" v-html="text" />
+        <div v-if="!inversion">
+          <div v-if="!asRawText" class="markdown-body" v-html="text" />
+          <div v-else class="raw-text" v-text="text" />
+        </div>
         <div v-else class="whitespace-pre-wrap" v-text="text" />
       </div>
     </template>
diff --git a/src/views/chat/components/Message/index.vue b/src/views/chat/components/Message/index.vue
index 0c3bfde107..d625a8a7be 100644
--- a/src/views/chat/components/Message/index.vue
+++ b/src/views/chat/components/Message/index.vue
@@ -31,25 +31,32 @@ const textRef = ref<HTMLElement>()
 
 const asRawText = ref(props.inversion)
 
-const options = computed(() => [
-  {
-    label: asRawText.value ? t('chat.preview') : t('chat.showRawText'),
-    key: 'toggleRenderType',
-    icon: iconRender({ icon: asRawText.value ? 'ic:outline-code-off' : 'ic:outline-code' }),
-  },
-  {
-    label: t('chat.copy'),
-    key: 'copyText',
-    icon: iconRender({ icon: 'ri:file-copy-2-line' }),
-  },
-  {
-    label: t('common.delete'),
-    key: 'delete',
-    icon: iconRender({ icon: 'ri:delete-bin-line' }),
-  },
-])
+const options = computed(() => {
+  const common = [
+    {
+      label: t('chat.copy'),
+      key: 'copyText',
+      icon: iconRender({ icon: 'ri:file-copy-2-line' }),
+    },
+    {
+      label: t('common.delete'),
+      key: 'delete',
+      icon: iconRender({ icon: 'ri:delete-bin-line' }),
+    },
+  ]
 
-function handleSelect(key: 'copyRaw' | 'copyText' | 'delete' | 'toggleRenderType') {
+  if (!props.inversion) {
+    common.unshift({
+      label: asRawText.value ? t('chat.preview') : t('chat.showRawText'),
+      key: 'toggleRenderType',
+      icon: iconRender({ icon: asRawText.value ? 'ic:outline-code-off' : 'ic:outline-code' }),
+    })
+  }
+
+  return common
+})
+
+function handleSelect(key: 'copyText' | 'delete' | 'toggleRenderType') {
   switch (key) {
     case 'copyText':
       copyText({ text: props.text ?? '' })
diff --git a/src/views/chat/components/Message/style.less b/src/views/chat/components/Message/style.less
index 5ec1579b05..b7fa8b8de9 100644
--- a/src/views/chat/components/Message/style.less
+++ b/src/views/chat/components/Message/style.less
@@ -1,5 +1,3 @@
-@import url('/src/styles/lib/github-markdown.less');
-
 .markdown-body {
 	background-color: transparent;
 	font-size: 14px;
@@ -47,10 +45,11 @@
 			align-items: center;
 			color: #b3b3b3;
 
-			&__copy{
+			&__copy {
 				cursor: pointer;
 				margin-left: 0.5rem;
 				user-select: none;
+
 				&:hover {
 					color: #65a665;
 				}
@@ -60,22 +59,13 @@
 
 }
 
-html .markdown-body {
-
-	h1,h2,h3,h4 {
-		border: none;
-	}
-}
-
 html.dark {
 
-	/* 用户的输入始终使用亮色主题的 Markdown */
-   	.request .markdown-body:extend(html .markdown-body) {
-		--color-canvas-default: #0d1117;
-    }
-
-	.reply .whitespace-pre-wrap {
-		color: var(--n-text-color);
+	.message-reply {
+		.raw-text {
+			white-space: pre-wrap;
+			color: var(--n-text-color);
+		}
 	}
 
 	.highlight pre,