From e489f397094cdf8b930b8ab55fc70a9a1295bbf9 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Fri, 4 Aug 2023 18:06:00 +0800
Subject: [PATCH 1/3] =?UTF-8?q?NEZ-3037=20fix=EF=BC=9Aweb=20terminal?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B8=85=E5=B1=8F=E6=8C=89=E9=92=AE=EF=BC=88?=
 =?UTF-8?q?clear=20screen=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/cli/consoleNew.vue |  3 +++
 nezha-fronted/src/components/cli/webSSHNew.vue  | 11 +++++++++++
 2 files changed, 14 insertions(+)

diff --git a/nezha-fronted/src/components/cli/consoleNew.vue b/nezha-fronted/src/components/cli/consoleNew.vue
index 27032f7d0..c34fc9139 100644
--- a/nezha-fronted/src/components/cli/consoleNew.vue
+++ b/nezha-fronted/src/components/cli/consoleNew.vue
@@ -267,6 +267,9 @@ export default {
         this.fileDirectoryShow = show
       })
     },
+    clearTerminal () {
+      this.term.clear()
+    },
     enterStr (message) {
       if (this.terminalSocket && this.terminal.isLogin) {
         this.term.send(message)
diff --git a/nezha-fronted/src/components/cli/webSSHNew.vue b/nezha-fronted/src/components/cli/webSSHNew.vue
index 5d581dec7..a14c24fc7 100644
--- a/nezha-fronted/src/components/cli/webSSHNew.vue
+++ b/nezha-fronted/src/components/cli/webSSHNew.vue
@@ -45,6 +45,11 @@
                     <i class="nz-icon nz-icon-SFTP"></i>
                     {{$t('terminal.sftp')}}
                   </div>
+                  <div @click="clearTerminal(item, index)"  class="webshell-box-item"  v-if="item.terminal.isLogin && item.terminal.terminalType == '1'">
+                    <i class="nz-icon nz-icon-Clear"></i>
+<!--                    {{$t('terminal.sftp')}}-->
+                  Clear Screen CLS
+                  </div>
                 </div>
                 <div class="webshell-box-item webshell-box-bottom" @click="closeShell(item,index)">
                   <div >
@@ -785,6 +790,12 @@ export default {
         this.$refs['popover' + index][0].doClose()
       }
     },
+    clearTerminal (item, index) {
+      this.$refs['console' + index][0].clearTerminal(true)
+      if (this.$refs['popover' + index] && this.$refs['popover' + index][0]) {
+        this.$refs['popover' + index][0].doClose()
+      }
+    },
     closeShell (item, index) {
       this.removeTab(item.name)
       if (this.$refs['popover' + index] && this.$refs['popover' + index][0]) {

From 2b7f0a0fd43b958ab9ea282f320fba338894cdc5 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Fri, 4 Aug 2023 18:07:24 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix=EF=BC=9A3.7=20=E9=9A=90=E8=97=8Ftermina?=
 =?UTF-8?q?l=E6=B8=85=E5=B1=8F=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/cli/webSSHNew.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nezha-fronted/src/components/cli/webSSHNew.vue b/nezha-fronted/src/components/cli/webSSHNew.vue
index a14c24fc7..ad1f5835d 100644
--- a/nezha-fronted/src/components/cli/webSSHNew.vue
+++ b/nezha-fronted/src/components/cli/webSSHNew.vue
@@ -45,11 +45,11 @@
                     <i class="nz-icon nz-icon-SFTP"></i>
                     {{$t('terminal.sftp')}}
                   </div>
-                  <div @click="clearTerminal(item, index)"  class="webshell-box-item"  v-if="item.terminal.isLogin && item.terminal.terminalType == '1'">
-                    <i class="nz-icon nz-icon-Clear"></i>
-<!--                    {{$t('terminal.sftp')}}-->
-                  Clear Screen CLS
-                  </div>
+<!--                  <div @click="clearTerminal(item, index)"  class="webshell-box-item"  v-if="item.terminal.isLogin && item.terminal.terminalType == '1'">-->
+<!--                    <i class="nz-icon nz-icon-Clear"></i>-->
+<!--&lt;!&ndash;                    {{$t('terminal.sftp')}}&ndash;&gt;-->
+<!--                  Clear Screen CLS-->
+<!--                  </div>-->
                 </div>
                 <div class="webshell-box-item webshell-box-bottom" @click="closeShell(item,index)">
                   <div >

From 3b21cee731fc1a5e4892442b67ed6d03ecd22c12 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Mon, 7 Aug 2023 10:29:42 +0800
Subject: [PATCH 3/3] =?UTF-8?q?style=EF=BC=9A=20=E5=9B=BD=E9=99=85?=
 =?UTF-8?q?=E5=8C=96=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/cli/fileDirectory.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nezha-fronted/src/components/cli/fileDirectory.vue b/nezha-fronted/src/components/cli/fileDirectory.vue
index 4dddb1812..3ce4563ac 100644
--- a/nezha-fronted/src/components/cli/fileDirectory.vue
+++ b/nezha-fronted/src/components/cli/fileDirectory.vue
@@ -150,7 +150,7 @@
 <!--            <i class="nz-icon nz-icon-delete" v-if="!item.isDir" @click="delFile(item)"></i>-->
           </div>
         </div>
-        <div class="file-item">
+        <div class="file-item" v-if="overNum">
           {{$t('fileDirectory.overNum', {num: overNum})}}
         </div>
       </div>