From fe934fa4af55b66d85c44921a704d6948a8b9e67 Mon Sep 17 00:00:00 2001
From: whyour <imwhyour@gmail.com>
Date: Fri, 1 Sep 2023 15:15:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=8E=AF=E5=A2=83=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F=E4=B8=AD=E5=8D=95=E5=BC=95=E5=8F=B7=E8=BD=AC=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/services/env.ts              |  4 +---
 src/layouts/index.less            |  7 ++++---
 src/pages/script/editModal.tsx    |  1 -
 src/pages/setting/checkUpdate.tsx | 31 +++----------------------------
 4 files changed, 8 insertions(+), 35 deletions(-)

diff --git a/back/services/env.ts b/back/services/env.ts
index 963f2cf2..3ceb3cbc 100644
--- a/back/services/env.ts
+++ b/back/services/env.ts
@@ -202,9 +202,7 @@ export default class EnvService {
           let value = group
             .map((x) => x.value)
             .join('&')
-            .replace(/(\\)[^n]/g, '\\\\')
-            .replace(/(\\$)/, '\\\\')
-            .replace(/'/g, "\\'")
+            .replace(/'/g, "'\\''")
             .trim();
           env_string += `export ${key}='${value}'\n`;
         }
diff --git a/src/layouts/index.less b/src/layouts/index.less
index f264ab19..c5643332 100644
--- a/src/layouts/index.less
+++ b/src/layouts/index.less
@@ -390,9 +390,10 @@ select:-webkit-autofill:focus {
 }
 
 pre {
-  word-break: break-all !important;
-  white-space: break-spaces !important;
-  padding: 0 !important;
+  word-break: break-all;
+  white-space: break-spaces;
+  padding: 0;
+  height: 100%;
 }
 
 .virtuallist {
diff --git a/src/pages/script/editModal.tsx b/src/pages/script/editModal.tsx
index e6995d86..ba104e11 100644
--- a/src/pages/script/editModal.tsx
+++ b/src/pages/script/editModal.tsx
@@ -241,7 +241,6 @@ const EditModal = ({
         />
         <pre
           style={{
-            height: '100%',
             padding: '0 15px',
           }}
         >
diff --git a/src/pages/setting/checkUpdate.tsx b/src/pages/setting/checkUpdate.tsx
index 9a81d776..495fcbf4 100644
--- a/src/pages/setting/checkUpdate.tsx
+++ b/src/pages/setting/checkUpdate.tsx
@@ -75,16 +75,7 @@ const CheckUpdate = ({ socketMessage, systemInfo }: any) => {
           </div>
         </>
       ),
-      content: (
-        <pre
-          style={{
-            fontSize: 12,
-            fontWeight: 400,
-          }}
-        >
-          {lastLog}
-        </pre>
-      ),
+      content: <pre>{lastLog}</pre>,
       okText: intl.get('下载更新'),
       cancelText: intl.get('以后再说'),
       onOk() {
@@ -109,16 +100,7 @@ const CheckUpdate = ({ socketMessage, systemInfo }: any) => {
       okButtonProps: { disabled: true },
       title: intl.get('下载更新中...'),
       centered: true,
-      content: (
-        <pre
-          style={{
-            fontSize: 12,
-            fontWeight: 400,
-          }}
-        >
-          {value}
-        </pre>
-      ),
+      content: <pre>{value}</pre>,
     });
   };
 
@@ -185,14 +167,7 @@ const CheckUpdate = ({ socketMessage, systemInfo }: any) => {
       okButtonProps: { disabled: !updateFailed },
       content: (
         <>
-          <pre
-            style={{
-              fontSize: 12,
-              fontWeight: 400,
-            }}
-          >
-            {newMessage}
-          </pre>
+          <pre>{newMessage}</pre>
           <div id="log-identifier" style={{ paddingBottom: 5 }}></div>
         </>
       ),