From 5aaad74c575dc8ce24ebc04a4d892090eefd47fa Mon Sep 17 00:00:00 2001
From: chaos-zhu <ggchaos1022@gmail.com>
Date: Thu, 15 Aug 2024 04:27:44 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E5=8F=B3=E9=94=AE=E7=B2=98?=
 =?UTF-8?q?=E8=B4=B4=E5=AE=89=E5=85=A8=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                       | 8 ++++++++
 web/package.json                                   | 2 +-
 web/src/views/terminal/components/terminal-tab.vue | 7 +++++--
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d186ac8..0b38289 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## [2.1.8](https://github.com/chaos-zhu/easynode/releases) (2024-08-15)
+
+### Features
+
+* 终端支持选中复制&右键粘贴 ✔
+* 终端设置支持字体大小 ✔
+* 终端默认字体样式更改为`Cascadia Code` ✔
+
 ## [2.1.7](https://github.com/chaos-zhu/easynode/releases) (2024-08-14)
 
 ### Features
diff --git a/web/package.json b/web/package.json
index 3ed37de..d3b24f2 100644
--- a/web/package.json
+++ b/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "web",
-  "version": "2.1.7",
+  "version": "2.1.8",
   "description": "easynode-web",
   "private": true,
   "scripts": {
diff --git a/web/src/views/terminal/components/terminal-tab.vue b/web/src/views/terminal/components/terminal-tab.vue
index c3ad9b3..86f9afb 100644
--- a/web/src/views/terminal/components/terminal-tab.vue
+++ b/web/src/views/terminal/components/terminal-tab.vue
@@ -338,9 +338,12 @@ const handleRightClick = async () => {
     const clipboardText = await navigator.clipboard.readText()
     if (!clipboardText) return
     // 移除多余空格与换行符
-    const formattedText = clipboardText.trim().replace(/\s+/g, ' ').replace(/\n/g, '')
+    const formattedText = clipboardText.trim().replace(/\s+/g, ' ')
+    // console.log(formattedText)
     if (formattedText.includes('rm -rf /')) return $message.warning(`高危指令,禁止粘贴: ${ formattedText }` )
-    socket.value.emit('input', clipboardText)
+    const safeText = formattedText.replace(/\r?\n|\r/g, '')
+    // console.log(safeText)
+    socket.value.emit('input', safeText)
   } catch (error) {
     $message.warning('右键默认粘贴行为,需要https支持')
   }