From 82f78599bf54ada613e68f9d4c73c5290b9a06e7 Mon Sep 17 00:00:00 2001
From: zhangyu <m13716206235@163.com>
Date: Sun, 28 Jun 2020 10:09:48 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-339=20feat=EF=BC=9A=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=BB=91=E7=AA=97=E5=8F=A3=E6=96=87=E5=AD=97?=
 =?UTF-8?q?=E5=A4=A7=E5=B0=8F=EF=BC=8Cstyle=EF=BC=9A=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=BB=91=E7=AA=97=E5=8F=A3=E5=BA=95=E9=83=A8=E5=9C=A8=E6=9C=89?=
 =?UTF-8?q?=E7=9A=84=E5=88=86=E8=BE=A8=E7=8E=87=E4=B8=8B=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=B8=8D=E4=BA=86=E6=9C=80=E5=90=8E=E4=B8=80=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/cli/console.vue | 24 +++++++++++
 nezha-fronted/src/components/cli/webSSH.scss | 14 ++++++-
 nezha-fronted/src/components/cli/webSSH.vue  | 42 +++++++++++---------
 3 files changed, 61 insertions(+), 19 deletions(-)

diff --git a/nezha-fronted/src/components/cli/console.vue b/nezha-fronted/src/components/cli/console.vue
index b66b924e4..39063567c 100644
--- a/nezha-fronted/src/components/cli/console.vue
+++ b/nezha-fronted/src/components/cli/console.vue
@@ -3,6 +3,7 @@
     height:270px;
     padding:5px 5px;
     background-color: black;
+    position: relative;
   }
 </style>
 <template>
@@ -300,6 +301,29 @@ export default {
       }
       this.conFinish = false;
     },
+    setFontSize(fontSize){
+      this.term.setOption('fontSize',fontSize);
+      const consoleBox = document.getElementById('ternimalContainer'+this.idIndex);
+      let width = document.body.clientWidth;//可视宽度
+      let height = parseInt(consoleBox.style.height);
+      if(height==null||!height){height=this.termimalHeight;}
+      const winStyle={
+        width:width,
+        height:height,
+        cols:this.term.cols,//cols和rows在resizeConsole方法已经设置
+        rows:this.term.rows,
+      };
+      alert(JSON.stringify(winStyle));
+      this.$post('terminal/resize',winStyle).then(response => {
+        if (response.code === 200) {
+          this.term.fit();
+          //this.term.scrollToBottom();
+        } else {
+          this.$message.error(response.msg);
+        }
+      });
+      // console.log(winStyle)
+    }
   },
   mounted () {
     this.create();
diff --git a/nezha-fronted/src/components/cli/webSSH.scss b/nezha-fronted/src/components/cli/webSSH.scss
index fc6264d04..2230a3f2c 100644
--- a/nezha-fronted/src/components/cli/webSSH.scss
+++ b/nezha-fronted/src/components/cli/webSSH.scss
@@ -3,7 +3,7 @@
   width: 100%;
   left: 0;
   position: fixed;
-  bottom: 0;
+  bottom: 20px;
   background: #fff;
   z-index: 2000;
   height: 300px;
@@ -142,6 +142,18 @@
   background: black !important;
 }
 
+.fontSet{
+  margin-left: 5px;
+}
+.smallFont{
+  font-size: 12px;
+}
+.middleFont{
+  font-size: 15px;
+}
+.bigFont{
+  font-size: 20px;
+}
 /*-------*/
 .dailog-custom{
   width:100%;
diff --git a/nezha-fronted/src/components/cli/webSSH.vue b/nezha-fronted/src/components/cli/webSSH.vue
index 8cb4a4c48..7f2fc6385 100644
--- a/nezha-fronted/src/components/cli/webSSH.vue
+++ b/nezha-fronted/src/components/cli/webSSH.vue
@@ -6,24 +6,23 @@
     <div id="shell-service-resize-mask"></div>
     <div id="shell-split" class="shell-split shell-iconfont" @mousedown="dragEagle" v-show="!isFullScreen">一</div>
     <div style='position: relative;'>
-      <el-menu  mode="horizontal" @select="handleSelect" style='position: absolute;left:0px;top:0px;border-top: 1px solid #DCDFE6;'>
-        <!--
+      <el-menu  mode="horizontal" @select="handleSelect" style='position: absolute;left:0px;top:0px;border-top: 1px solid #DCDFE6;' default-active="1-2">
         <el-submenu index="1"  style="width:40px;">
           <template slot="title" ><i class="el-icon-setting " style="position: absolute;left: 10px;top: 4px;"></i></template>
-          <el-submenu index="1-1">
-            <template slot="title">文字大小</template>
-            <el-menu-item index="1-1-1">最小</el-menu-item>
-            <el-menu-item index="1-1-2">小</el-menu-item>
-            <el-menu-item index="1-1-3">中</el-menu-item>
-            <el-menu-item index="1-1-4">大</el-menu-item>
-          </el-submenu>
-          <el-submenu index="1-2" >
-            <template slot="title">字体</template>
-            <el-menu-item index="1-2-1">Monosapace</el-menu-item>
-            <el-menu-item index="1-2-2">Courier New</el-menu-item>
-          </el-submenu>
-        </el-submenu>-->
-        <el-submenu index="2" style="width:50px;margin-left:40px;">
+          <!--<el-submenu index="1-1">-->
+            <!--<template slot="title">文字大小</template>-->
+            <el-menu-item @click="changeFontSize(12)" class="fontSet smallFont" index="1-1">A</el-menu-item>
+            <el-menu-item @click="changeFontSize(15)" class="fontSet middleFont" index="1-2">A</el-menu-item>
+            <el-menu-item @click="changeFontSize(20)" class="fontSet bigFont" index="1-3">A</el-menu-item>
+            <!--<el-menu-item class="fontSet" index="1-4">大</el-menu-item>-->
+          <!--</el-submenu>-->
+          <!--<el-submenu index="1-2" >-->
+            <!--<template slot="title">字体</template>-->
+            <!--<el-menu-item index="1-2-1">Monosapace</el-menu-item>-->
+            <!--<el-menu-item index="1-2-2">Courier New</el-menu-item>-->
+          <!--</el-submenu>-->
+        </el-submenu>
+        <el-submenu index="2" style="width:50px;">
           <template slot="title" ><i class="el-icon-upload console-title-icon" style="position: absolute;left: 10px;top: 4px;"></i></template>
           <el-menu-item index="2-1" @click="showUploadBox">
               <div>{{$t('webshell.upload')}}</div>
@@ -518,7 +517,7 @@
               targetDiv.style.height=height+'px';
             }
             if(parseInt(targetDiv.style.height)<=10){
-              targetDiv.style.height=10+'px';
+              targetDiv.style.height=20+'px';
             }
 
             _this.editableTabs.forEach((tab, index) => {
@@ -570,7 +569,14 @@
               this.$refs['console'+index][0].resize(targetDivHeight,width);
             });
           }
-        }
+        },
+      //改变黑窗口字体大小
+      changeFontSize(fontSize){
+        // this.$refs['console'+this.index].setFontSize(fontSize);
+        this.editableTabs.forEach((tab, index) => {
+          this.$refs['console'+index][0].setFontSize(fontSize);
+        });
+      }
     },
     watch: {
       '$store.state.consoleShow':function(val){