From 83ceb0e1e50c625224f98c32c7fec91e00074d55 Mon Sep 17 00:00:00 2001
From: lijiahang <ljh1553488six@139.com>
Date: Thu, 18 Apr 2024 11:59:32 +0800
Subject: [PATCH] =?UTF-8?q?:zap:=20=E4=BC=98=E5=8C=96=20SFTP=20=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E9=80=BB=E8=BE=91.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../command-snippet-group-select.vue          |  6 +--
 .../components/sftp/sftp-editor-header.vue    |  4 +-
 .../components/sftp/sftp-table-header.vue     | 25 ++++++++----
 .../terminal/components/sftp/sftp-table.vue   | 39 +++++++++++++++----
 .../terminal/components/sftp/sftp-view.vue    |  4 +-
 .../components/ssh/ssh-context-menu.vue       |  2 +-
 6 files changed, 57 insertions(+), 23 deletions(-)

diff --git a/orion-ops-ui/src/views/host/command-snippet/components/command-snippet-group-select.vue b/orion-ops-ui/src/views/host/command-snippet/components/command-snippet-group-select.vue
index 2c71d950..e8e2035e 100644
--- a/orion-ops-ui/src/views/host/command-snippet/components/command-snippet-group-select.vue
+++ b/orion-ops-ui/src/views/host/command-snippet/components/command-snippet-group-select.vue
@@ -21,9 +21,9 @@
   import useLoading from '@/hooks/loading';
   import { createCommandSnippetGroup } from '@/api/asset/command-snippet-group';
 
-  const props = defineProps<{
-    modelValue: number | undefined
-  }>();
+  const props = defineProps<Partial<{
+    modelValue: number;
+  }>>();
 
   const emits = defineEmits(['update:modelValue']);
 
diff --git a/orion-ops-ui/src/views/host/terminal/components/sftp/sftp-editor-header.vue b/orion-ops-ui/src/views/host/terminal/components/sftp/sftp-editor-header.vue
index 2fd3a222..2e0bb29d 100644
--- a/orion-ops-ui/src/views/host/terminal/components/sftp/sftp-editor-header.vue
+++ b/orion-ops-ui/src/views/host/terminal/components/sftp/sftp-editor-header.vue
@@ -11,7 +11,7 @@
                  arrow-class="terminal-tooltip-content"
                  content="点击复制">
         <a-tag class="sftp-path-container pointer"
-               color="green"
+               color="arcoblue"
                @click="copy(path, '已复制')">
           <span>{{ name }}</span>
         </a-tag>
@@ -56,13 +56,11 @@
 </script>
 
 <script lang="ts" setup>
-  import type { ISftpSession } from '../../types/terminal.type';
   import { copy } from '@/hooks/copy';
 
   const props = defineProps<{
     name: string;
     path: string;
-    session: ISftpSession | undefined,
   }>();
 
   const emits = defineEmits(['save', 'close']);
diff --git a/orion-ops-ui/src/views/host/terminal/components/sftp/sftp-table-header.vue b/orion-ops-ui/src/views/host/terminal/components/sftp/sftp-table-header.vue
index 84796393..39277e64 100644
--- a/orion-ops-ui/src/views/host/terminal/components/sftp/sftp-table-header.vue
+++ b/orion-ops-ui/src/views/host/terminal/components/sftp/sftp-table-header.vue
@@ -45,8 +45,12 @@
       </div>
     </div>
     <!-- 已关闭-右侧操作 -->
-    <div v-if="isClose" class="sftp-table-header-right">
-      <span class="close-message" :title="closeMessage">{{ closeMessage }}</span>
+    <div v-if="closed" class="sftp-table-header-right">
+      <a-tag class="close-message"
+             color="red"
+             :title="closeMessage">
+        已断开: {{ closeMessage }}
+      </a-tag>
     </div>
     <!-- 路径编辑模式-右侧操作 -->
     <a-space v-else-if="pathEditable" class="sftp-table-header-right">
@@ -189,10 +193,10 @@
   import { openSftpCreateModalKey, openSftpUploadModalKey } from '../../types/terminal.const';
 
   const props = defineProps<{
-    isClose: boolean;
-    closeMessage: string | undefined;
+    closed: boolean;
+    closeMessage?: string;
     currentPath: string;
-    session: ISftpSession | undefined;
+    session?: ISftpSession;
     selectedFiles: Array<string>;
   }>();
 
@@ -224,6 +228,10 @@
 
   // 设置命令编辑模式
   const setPathEditable = (editable: boolean) => {
+    // 检查是否断开
+    if (editable && props.closed) {
+      return;
+    }
     pathEditable.value = editable;
     pathInput.value = editable ? props.currentPath : '';
     // 自动聚焦
@@ -242,6 +250,10 @@
 
   // 加载文件列表
   const loadFileList = (path: string = props.currentPath) => {
+    // 检查是否断开
+    if (props.closed) {
+      return;
+    }
     emits('loadFile', path);
   };
 
@@ -332,8 +344,7 @@
     text-overflow: ellipsis;
     white-space: nowrap;
     overflow: hidden;
-    padding-left: 16px;
-    color: rgb(var(--red-6));
+    margin-left: 16px;
   }
 
   .header-action-icon {
diff --git a/orion-ops-ui/src/views/host/terminal/components/sftp/sftp-table.vue b/orion-ops-ui/src/views/host/terminal/components/sftp/sftp-table.vue
index d7556fea..d3d02c41 100644
--- a/orion-ops-ui/src/views/host/terminal/components/sftp/sftp-table.vue
+++ b/orion-ops-ui/src/views/host/terminal/components/sftp/sftp-table.vue
@@ -10,8 +10,8 @@
            :pagination="false"
            :bordered="false"
            :loading="loading"
-           @cell-mouse-enter="setOperable"
-           @cell-mouse-leave="unsetOperable">
+           @cell-mouse-enter="setRowOperable"
+           @cell-mouse-leave="unsetRowOperable">
     <!-- 文件搜索框 -->
     <template #nameFilter="{ filterValue, setFilterValue, handleFilterConfirm, handleFilterReset}">
       <div class="name-filter">
@@ -155,9 +155,10 @@
   const previewSize = import.meta.env.VITE_SFTP_PREVIEW_MB;
 
   const props = defineProps<{
-    session: ISftpSession | undefined;
+    session?: ISftpSession;
     list: Array<SftpFile>;
     loading: boolean;
+    closed: boolean;
     selectedFiles: Array<string>;
   }>();
 
@@ -185,14 +186,14 @@
   const editRowName = ref<string>('');
   const tableRef = ref();
 
-  // 设置可操作状态
-  const setOperable = (record: TableData) => {
+  // 设置行可操作状态
+  const setRowOperable = (record: TableData) => {
     editRowName.value = record.name;
     record.hover = true;
   };
 
-  // 设置不可操作状态
-  const unsetOperable = (record: TableData) => {
+  // 设置行不可操作状态
+  const unsetRowOperable = (record: TableData) => {
     setTimeout(() => {
       // 等待后如果还是当前行 但是未被选中则代表已经被失焦
       if (record.name === editRowName.value && !record.hover) {
@@ -212,6 +213,10 @@
   // 点击文件名称
   const clickFilename = (record: TableData) => {
     if (record.isDir) {
+      // 检查是否断开
+      if (props.closed) {
+        return;
+      }
       // 进入文件夹
       emits('loadFile', record.path);
     } else {
@@ -221,27 +226,47 @@
 
   // 编辑文件
   const editFile = (record: TableData) => {
+    // 检查是否断开
+    if (props.closed) {
+      return;
+    }
     emits('editFile', record.name, record.path);
     props.session?.getContent(record.path);
   };
 
   // 删除文件
   const deleteFile = (path: string) => {
+    // 检查是否断开
+    if (props.closed) {
+      return;
+    }
     props.session?.remove([path]);
   };
 
   // 下载文件
   const downloadFile = (path: string) => {
+    // 检查是否断开
+    if (props.closed) {
+      return;
+    }
     emits('download', [path]);
   };
 
   // 移动文件
   const moveFile = (path: string) => {
+    // 检查是否断开
+    if (props.closed) {
+      return;
+    }
     openSftpMoveModal(props.session?.sessionId as string, path);
   };
 
   // 文件提权
   const chmodFile = (path: string, permission: number) => {
+    // 检查是否断开
+    if (props.closed) {
+      return;
+    }
     openSftpChmodModal(props.session?.sessionId as string, path, permission);
   };
 
diff --git a/orion-ops-ui/src/views/host/terminal/components/sftp/sftp-view.vue b/orion-ops-ui/src/views/host/terminal/components/sftp/sftp-view.vue
index 780f9369..3194a411 100644
--- a/orion-ops-ui/src/views/host/terminal/components/sftp/sftp-view.vue
+++ b/orion-ops-ui/src/views/host/terminal/components/sftp/sftp-view.vue
@@ -12,7 +12,7 @@
           <!-- 表头 -->
           <sftp-table-header class="sftp-table-header"
                              v-model:selected-files="selectFiles"
-                             :is-close="closed"
+                             :closed="closed"
                              :close-message="closeMessage"
                              :current-path="currentPath"
                              :session="session"
@@ -22,6 +22,7 @@
           <sftp-table class="sftp-table-wrapper"
                       v-model:selected-files="selectFiles"
                       :session="session"
+                      :closed="closed"
                       :list="fileList"
                       :loading="tableLoading"
                       @load-file="loadFiles"
@@ -36,7 +37,6 @@
           <sftp-editor-header class="sftp-editor-header"
                               :name="editorFileName"
                               :path="editorFilePath"
-                              :session="session"
                               @save="editorSave"
                               @close="closeEditor" />
           <!-- 编辑器 -->
diff --git a/orion-ops-ui/src/views/host/terminal/components/ssh/ssh-context-menu.vue b/orion-ops-ui/src/views/host/terminal/components/ssh/ssh-context-menu.vue
index d42580e0..5efbe235 100644
--- a/orion-ops-ui/src/views/host/terminal/components/ssh/ssh-context-menu.vue
+++ b/orion-ops-ui/src/views/host/terminal/components/ssh/ssh-context-menu.vue
@@ -36,7 +36,7 @@
   import { useTerminalStore } from '@/store';
 
   defineProps<{
-    session: ISshSession | undefined
+    session?: ISshSession;
   }>();
 
   const emits = defineEmits(['click']);