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 = ({ />
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) => {
           
         
       ),
-      content: (
-        
-          {lastLog}
-        
- ), + content:
{lastLog}
, 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: ( -
-          {value}
-        
- ), + content:
{value}
, }); }; @@ -185,14 +167,7 @@ const CheckUpdate = ({ socketMessage, systemInfo }: any) => { okButtonProps: { disabled: !updateFailed }, content: ( <> -
-            {newMessage}
-          
+
{newMessage}
),