From 183b071b12a2c955b48b17f31f2cf91d63826c40 Mon Sep 17 00:00:00 2001
From: vapao <live1989@foxmail.com>
Date: Tue, 14 Dec 2021 13:37:15 +0800
Subject: [PATCH] =?UTF-8?q?U=20=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=B8=8B=E5=B1=95=E7=A4=BA=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 spug_web/src/components/ACEditor.js             | 2 +-
 spug_web/src/index.css                          | 3 ++-
 spug_web/src/layout/layout.module.less          | 2 ++
 spug_web/src/pages/deploy/repository/Console.js | 2 +-
 spug_web/src/pages/deploy/request/OutView.js    | 2 +-
 spug_web/src/pages/exec/task/Output.js          | 2 +-
 spug_web/src/pages/ssh/FileManager.js           | 2 +-
 spug_web/src/pages/ssh/Terminal.js              | 2 +-
 8 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/spug_web/src/components/ACEditor.js b/spug_web/src/components/ACEditor.js
index 40ec4d5..5f27188 100644
--- a/spug_web/src/components/ACEditor.js
+++ b/spug_web/src/components/ACEditor.js
@@ -13,7 +13,7 @@ import 'ace-builds/src-noconflict/mode-python';
 import 'ace-builds/src-noconflict/theme-tomorrow';
 
 export default function (props) {
-  const style = {fontFamily: 'source-code-pro, Menlo, Monaco, Consolas, PingFang SC, Microsoft YaHei', ...props.style}
+  const style = {fontFamily: 'Source Code Pro, Courier New, Courier, Monaco, monospace, PingFang SC, Microsoft YaHei', ...props.style}
   return (
     <Editor
       theme="tomorrow"
diff --git a/spug_web/src/index.css b/spug_web/src/index.css
index b613b46..4005737 100644
--- a/spug_web/src/index.css
+++ b/spug_web/src/index.css
@@ -10,6 +10,7 @@ body {
 
 div::-webkit-scrollbar, textarea::-webkit-scrollbar {
   width: 6px;
+  height: 6px;
 }
 
 div::-webkit-scrollbar-thumb, textarea::-webkit-scrollbar-thumb {
@@ -18,7 +19,7 @@ div::-webkit-scrollbar-thumb, textarea::-webkit-scrollbar-thumb {
 }
 
 code {
-  font-family: source-code-pro, Menlo, Monaco, Consolas, Courier New, monospace, PingFang SC, Microsoft YaHei;
+  font-family: Source Code Pro, Menlo, Monaco, Consolas, Courier New, monospace, Courier, PingFang SC, Microsoft YaHei;
 }
 
 .ant-form-item-extra {
diff --git a/spug_web/src/layout/layout.module.less b/spug_web/src/layout/layout.module.less
index c5dc395..8fc4727 100644
--- a/spug_web/src/layout/layout.module.less
+++ b/spug_web/src/layout/layout.module.less
@@ -76,6 +76,7 @@
 
 .content::-webkit-scrollbar {
   width: 0;
+  height: 0;
 }
 
 .sider {
@@ -91,6 +92,7 @@
 
   .menus::-webkit-scrollbar {
     width: 0;
+    height: 0;
   }
 
   .logo {
diff --git a/spug_web/src/pages/deploy/repository/Console.js b/spug_web/src/pages/deploy/repository/Console.js
index 39be659..1885801 100644
--- a/spug_web/src/pages/deploy/repository/Console.js
+++ b/spug_web/src/pages/deploy/repository/Console.js
@@ -71,7 +71,7 @@ export default observer(function Console() {
   function initialTerm() {
     const fitPlugin = new FitAddon()
     term.loadAddon(fitPlugin)
-    term.setOption('fontFamily', 'source-code-pro, Menlo, Monaco, Consolas, PingFang SC, Microsoft YaHei')
+    term.setOption('fontFamily', 'Source Code Pro, Courier New, Courier, Monaco, monospace, PingFang SC, Microsoft YaHei')
     term.setOption('theme', {background: '#fafafa', foreground: '#000', selection: '#999'})
     term.open(el.current)
     term.fit = () => fitPlugin.fit()
diff --git a/spug_web/src/pages/deploy/request/OutView.js b/spug_web/src/pages/deploy/request/OutView.js
index 1833974..277333c 100644
--- a/spug_web/src/pages/deploy/request/OutView.js
+++ b/spug_web/src/pages/deploy/request/OutView.js
@@ -14,7 +14,7 @@ function OutView(props) {
     setTimeout(() => {
       const fitPlugin = new FitAddon()
       const term = new Terminal({disableStdin: true})
-      term.setOption('fontFamily', 'source-code-pro, Menlo, Monaco, Consolas, PingFang SC, Microsoft YaHei')
+      term.setOption('fontFamily', 'Source Code Pro, Courier New, Courier, Monaco, monospace, PingFang SC, Microsoft YaHei')
       term.loadAddon(fitPlugin)
       term.setOption('theme', {background: '#fff', foreground: '#000', selection: '#999'})
       term.open(el.current)
diff --git a/spug_web/src/pages/exec/task/Output.js b/spug_web/src/pages/exec/task/Output.js
index 75e33ff..3ba9233 100644
--- a/spug_web/src/pages/exec/task/Output.js
+++ b/spug_web/src/pages/exec/task/Output.js
@@ -31,7 +31,7 @@ function OutView(props) {
     gCurrent = current
     const fitPlugin = new FitAddon()
     term.setOption('disableStdin', false)
-    term.setOption('fontFamily', 'source-code-pro, Menlo, Monaco, Consolas, PingFang SC, Microsoft YaHei')
+    term.setOption('fontFamily', 'Source Code Pro, Courier New, Courier, Monaco, monospace, PingFang SC, Microsoft YaHei')
     term.setOption('theme', {background: '#f0f0f0', foreground: '#000', selection: '#999', cursor: '#f0f0f0'})
     term.loadAddon(fitPlugin)
     term.open(el.current)
diff --git a/spug_web/src/pages/ssh/FileManager.js b/spug_web/src/pages/ssh/FileManager.js
index 95baed6..114cb02 100644
--- a/spug_web/src/pages/ssh/FileManager.js
+++ b/spug_web/src/pages/ssh/FileManager.js
@@ -234,7 +234,7 @@ class FileManager extends React.Component {
           pagination={false}
           columns={this.columns}
           scroll={{y: scrollY}}
-          bodyStyle={{fontFamily: "'SFMono-Regular', Consolas, 'Liberation Mono', Menlo, Courier, monospace"}}
+          style={{fontFamily: 'Source Code Pro, Courier New, Courier, Monaco, monospace, PingFang SC, Microsoft YaHei'}}
           dataSource={objects}/>
       </Drawer>
     )
diff --git a/spug_web/src/pages/ssh/Terminal.js b/spug_web/src/pages/ssh/Terminal.js
index fd0eb80..7757b6a 100644
--- a/spug_web/src/pages/ssh/Terminal.js
+++ b/spug_web/src/pages/ssh/Terminal.js
@@ -18,7 +18,7 @@ function WebSSH(props) {
   useEffect(() => {
     const fitPlugin = new FitAddon();
     term.loadAddon(fitPlugin);
-    term.setOption('fontFamily', 'source-code-pro, Menlo, Monaco, Consolas, PingFang SC, Microsoft YaHei')
+    term.setOption('fontFamily', 'Source Code Pro, Courier New, Courier, Monaco, monospace, PingFang SC, Microsoft YaHei')
     term.open(container.current);
     term.write('WebSocket connecting ... ');
     const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:';