From d6a021b4d9d1e7ddd6b0cc0b0e2cd1c902f04101 Mon Sep 17 00:00:00 2001
From: lijiahang <ljh1553488six@139.com>
Date: Wed, 24 Apr 2024 16:43:59 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E8=B7=AF=E5=BE=84=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../asset/entity/domain/PathBookmarkDO.java   |  4 ++
 .../entity/dto/PathBookmarkCacheDTO.java      |  3 +
 .../path/PathBookmarkCreateRequest.java       |  5 ++
 .../path/PathBookmarkUpdateRequest.java       |  5 ++
 .../asset/entity/vo/PathBookmarkVO.java       |  3 +
 .../asset/mapper/PathBookmarkMapper.xml       |  3 +-
 .../request/dict/DictValueQueryRequest.java   |  3 +
 .../service/impl/DictValueServiceImpl.java    |  1 +
 orion-ops-ui/src/api/asset/path-bookmark.ts   |  2 +
 orion-ops-ui/src/api/system/dict-value.ts     |  3 -
 .../src/store/modules/terminal/index.ts       | 55 +++++++++-------
 .../components/connect-log-table.vue          |  6 ++
 .../connect-log/types/table.columns.ts        |  2 +-
 .../command-snippet-list-drawer.vue           |  8 ++-
 .../components/command-snippet-list-item.vue  |  8 ++-
 .../components/path-bookmark-form-drawer.vue  | 11 ++++
 .../components/path-bookmark-list-drawer.vue  | 19 ++++--
 .../components/path-bookmark-list-item.vue    | 62 ++++++++++++++-----
 .../views/host/path-bookmark/types/const.ts   | 12 ++++
 .../host/path-bookmark/types/form.rules.ts    |  9 +++
 .../components/layout/main-content.vue        |  9 +--
 .../components/layout/right-sidebar.vue       | 11 ++--
 .../terminal/components/sftp/sftp-view.vue    |  1 -
 .../host/terminal/handler/sftp-session.ts     |  1 +
 .../components/dict-value-table.vue           | 10 ++-
 25 files changed, 188 insertions(+), 68 deletions(-)

diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/domain/PathBookmarkDO.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/domain/PathBookmarkDO.java
index 31418a8b..a1e1b135 100644
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/domain/PathBookmarkDO.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/domain/PathBookmarkDO.java
@@ -42,6 +42,10 @@ public class PathBookmarkDO extends BaseDO {
     @TableField("name")
     private String name;
 
+    @Schema(description = "类型")
+    @TableField("type")
+    private String type;
+
     @Schema(description = "路径")
     @TableField("path")
     private String path;
diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/dto/PathBookmarkCacheDTO.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/dto/PathBookmarkCacheDTO.java
index a99e11a8..232694a9 100644
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/dto/PathBookmarkCacheDTO.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/dto/PathBookmarkCacheDTO.java
@@ -34,6 +34,9 @@ public class PathBookmarkCacheDTO implements LongCacheIdModel, Serializable {
     @Schema(description = "名称")
     private String name;
 
+    @Schema(description = "类型")
+    private String type;
+
     @Schema(description = "路径")
     private String path;
 
diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/path/PathBookmarkCreateRequest.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/path/PathBookmarkCreateRequest.java
index 16ce34d5..a02ba7fc 100644
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/path/PathBookmarkCreateRequest.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/path/PathBookmarkCreateRequest.java
@@ -34,6 +34,11 @@ public class PathBookmarkCreateRequest implements Serializable {
     @Schema(description = "名称")
     private String name;
 
+    @NotBlank
+    @Size(max = 4)
+    @Schema(description = "类型")
+    private String type;
+
     @NotBlank
     @Size(max = 1024)
     @Schema(description = "路径")
diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/path/PathBookmarkUpdateRequest.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/path/PathBookmarkUpdateRequest.java
index f0533e4d..76dd371d 100644
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/path/PathBookmarkUpdateRequest.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/path/PathBookmarkUpdateRequest.java
@@ -39,6 +39,11 @@ public class PathBookmarkUpdateRequest implements Serializable {
     @Schema(description = "名称")
     private String name;
 
+    @NotBlank
+    @Size(max = 4)
+    @Schema(description = "类型")
+    private String type;
+
     @NotBlank
     @Size(max = 1024)
     @Schema(description = "路径")
diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/vo/PathBookmarkVO.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/vo/PathBookmarkVO.java
index ce56ce09..551ba746 100644
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/vo/PathBookmarkVO.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/vo/PathBookmarkVO.java
@@ -36,6 +36,9 @@ public class PathBookmarkVO implements Serializable {
     @Schema(description = "名称")
     private String name;
 
+    @Schema(description = "类型")
+    private String type;
+
     @Schema(description = "路径")
     private String path;
 
diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/mapper/PathBookmarkMapper.xml b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/mapper/PathBookmarkMapper.xml
index 9dd14ff2..12581fc7 100644
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/mapper/PathBookmarkMapper.xml
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/mapper/PathBookmarkMapper.xml
@@ -8,6 +8,7 @@
         <result column="user_id" property="userId"/>
         <result column="group_id" property="groupId"/>
         <result column="name" property="name"/>
+        <result column="type" property="type"/>
         <result column="path" property="path"/>
         <result column="create_time" property="createTime"/>
         <result column="update_time" property="updateTime"/>
@@ -18,7 +19,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, user_id, group_id, name, path, create_time, update_time, creator, updater, deleted
+        id, user_id, group_id, name, type, path, create_time, update_time, creator, updater, deleted
     </sql>
 
 </mapper>
diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/dict/DictValueQueryRequest.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/dict/DictValueQueryRequest.java
index ab7b6365..a66356fc 100644
--- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/dict/DictValueQueryRequest.java
+++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/dict/DictValueQueryRequest.java
@@ -36,4 +36,7 @@ public class DictValueQueryRequest extends PageRequest {
     @Schema(description = "配置描述")
     private String label;
 
+    @Schema(description = "额外参数")
+    private String extra;
+
 }
diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/DictValueServiceImpl.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/DictValueServiceImpl.java
index 72168b9a..78976b6a 100644
--- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/DictValueServiceImpl.java
+++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/DictValueServiceImpl.java
@@ -374,6 +374,7 @@ public class DictValueServiceImpl implements DictValueService {
                 .like(DictValueDO::getKeyName, request.getKeyName())
                 .like(DictValueDO::getValue, request.getValue())
                 .like(DictValueDO::getLabel, request.getLabel())
+                .like(DictValueDO::getExtra, request.getExtra())
                 .orderByDesc(DictValueDO::getId);
     }
 
diff --git a/orion-ops-ui/src/api/asset/path-bookmark.ts b/orion-ops-ui/src/api/asset/path-bookmark.ts
index 6e38c26e..e83ac0cf 100644
--- a/orion-ops-ui/src/api/asset/path-bookmark.ts
+++ b/orion-ops-ui/src/api/asset/path-bookmark.ts
@@ -7,6 +7,7 @@ import axios from 'axios';
 export interface PathBookmarkCreateRequest {
   groupId?: number;
   name?: string;
+  type?: string;
   path?: string;
 }
 
@@ -24,6 +25,7 @@ export interface PathBookmarkQueryResponse extends PathBookmarkQueryResponseExtr
   id: number;
   groupId: number;
   name: string;
+  type: string;
   path: string;
 }
 
diff --git a/orion-ops-ui/src/api/system/dict-value.ts b/orion-ops-ui/src/api/system/dict-value.ts
index 2de4f3cc..090fa1a7 100644
--- a/orion-ops-ui/src/api/system/dict-value.ts
+++ b/orion-ops-ui/src/api/system/dict-value.ts
@@ -34,14 +34,11 @@ export interface DictValueRollbackRequest {
  * 字典配置值查询请求
  */
 export interface DictValueQueryRequest extends Pagination {
-  searchValue?: string;
-  id?: number;
   keyId?: number;
   keyName?: string;
   value?: string;
   label?: string;
   extra?: string;
-  sort?: number;
 }
 
 /**
diff --git a/orion-ops-ui/src/store/modules/terminal/index.ts b/orion-ops-ui/src/store/modules/terminal/index.ts
index fcc3548f..8d539f2e 100644
--- a/orion-ops-ui/src/store/modules/terminal/index.ts
+++ b/orion-ops-ui/src/store/modules/terminal/index.ts
@@ -8,7 +8,7 @@ import type {
   TerminalShortcutSetting,
   TerminalState
 } from './types';
-import type { ISftpSession, ISshSession, PanelSessionTabType, TerminalPanelTabItem } from '@/views/host/terminal/types/terminal.type';
+import type { ITerminalSession, PanelSessionTabType, TerminalPanelTabItem } from '@/views/host/terminal/types/terminal.type';
 import type { AuthorizedHostQueryResponse } from '@/api/asset/asset-authorized-data';
 import { getCurrentAuthorizedHost } from '@/api/asset/asset-authorized-data';
 import type { HostQueryResponse } from '@/api/asset/host';
@@ -18,7 +18,7 @@ import { defineStore } from 'pinia';
 import { getPreference, updatePreference } from '@/api/user/preference';
 import { nextId } from '@/utils';
 import { Message } from '@arco-design/web-vue';
-import { PanelSessionType, TerminalTabs } from '@/views/host/terminal/types/terminal.const';
+import { TerminalTabs } from '@/views/host/terminal/types/terminal.const';
 import TerminalTabManager from '@/views/host/terminal/handler/terminal-tab-manager';
 import TerminalSessionManager from '@/views/host/terminal/handler/terminal-session-manager';
 import TerminalPanelManager from '@/views/host/terminal/handler/terminal-panel-manager';
@@ -195,8 +195,30 @@ export default defineStore('terminal', {
       }
     },
 
-    // 检查当前是否为终端页面 并且获取当前 ssh 会话
-    getAndCheckCurrentSshSession(tips: boolean = true) {
+    // 获取当前会话类型
+    getCurrentSessionType(tips: boolean = false) {
+      // 获取当前 activeTab
+      const activeTab = this.tabManager.active;
+      if (activeTab !== TerminalTabs.TERMINAL_PANEL.key) {
+        if (tips) {
+          Message.warning('请切换到终端标签页');
+        }
+        return;
+      }
+      // 获取面板会话
+      const type = this.panelManager
+        .getCurrentPanel()
+        .getCurrentTab()
+        ?.type;
+      if (!type && tips) {
+        Message.warning(`请打开 ${type}`);
+        return;
+      }
+      return type;
+    },
+
+    // 获取当前会话
+    getCurrentSession<T extends ITerminalSession>(type: string, tips: boolean = false) {
       // 获取当前 activeTab
       const activeTab = this.tabManager.active;
       if (activeTab !== TerminalTabs.TERMINAL_PANEL.key) {
@@ -206,37 +228,24 @@ export default defineStore('terminal', {
         return;
       }
       // 获取当前会话
-      const session = this.getCurrentSshSession();
+      const session = this._getCurrentSession<T>(type);
       if (!session && tips) {
-        Message.warning('请打开终端');
+        Message.warning(`请打开 ${type}`);
       }
       return session;
     },
 
-    // 获取当前 ssh 会话
-    getCurrentSshSession() {
+    // 获取当前会话
+    _getCurrentSession<T extends ITerminalSession>(type: string): T | undefined {
       // 获取面板会话
       const sessionTab = this.panelManager
         .getCurrentPanel()
         .getCurrentTab();
-      if (!sessionTab || sessionTab.type !== PanelSessionType.SSH.type) {
+      if (!sessionTab || sessionTab.type !== type) {
         return;
       }
       // 获取会话
-      return this.sessionManager.getSession<ISshSession>(sessionTab.sessionId);
-    },
-
-    // 获取当前 sftp 会话
-    getCurrentSftpSession() {
-      // 获取面板会话
-      const sessionTab = this.panelManager
-        .getCurrentPanel()
-        .getCurrentTab();
-      if (!sessionTab || sessionTab.type !== PanelSessionType.SFTP.type) {
-        return;
-      }
-      // 获取会话
-      return this.sessionManager.getSession<ISftpSession>(sessionTab.sessionId);
+      return this.sessionManager.getSession<T>(sessionTab.sessionId);
     },
 
   },
diff --git a/orion-ops-ui/src/views/asset-audit/connect-log/components/connect-log-table.vue b/orion-ops-ui/src/views/asset-audit/connect-log/components/connect-log-table.vue
index 96174248..651aa121 100644
--- a/orion-ops-ui/src/views/asset-audit/connect-log/components/connect-log-table.vue
+++ b/orion-ops-ui/src/views/asset-audit/connect-log/components/connect-log-table.vue
@@ -114,6 +114,12 @@
           {{ record.hostAddress }}
         </span>
       </template>
+      <!-- 类型 -->
+      <template #type="{ record }">
+        <a-tag :color="getDictValue(connectTypeKey, record.type, 'color')">
+          {{ getDictValue(connectTypeKey, record.type) }}
+        </a-tag>
+      </template>
       <!-- 状态 -->
       <template #status="{ record }">
         <span class="circle" :style="{
diff --git a/orion-ops-ui/src/views/asset-audit/connect-log/types/table.columns.ts b/orion-ops-ui/src/views/asset-audit/connect-log/types/table.columns.ts
index f269cc61..b239509c 100644
--- a/orion-ops-ui/src/views/asset-audit/connect-log/types/table.columns.ts
+++ b/orion-ops-ui/src/views/asset-audit/connect-log/types/table.columns.ts
@@ -25,7 +25,7 @@ const columns = [
     title: '状态',
     dataIndex: 'status',
     slotName: 'status',
-    align: 'left',
+    align: 'center',
     width: 106,
   }, {
     title: '留痕地址',
diff --git a/orion-ops-ui/src/views/host/command-snippet/components/command-snippet-list-drawer.vue b/orion-ops-ui/src/views/host/command-snippet/components/command-snippet-list-drawer.vue
index 6513b1a6..68b2cec8 100644
--- a/orion-ops-ui/src/views/host/command-snippet/components/command-snippet-list-drawer.vue
+++ b/orion-ops-ui/src/views/host/command-snippet/components/command-snippet-list-drawer.vue
@@ -78,6 +78,7 @@
 </script>
 
 <script lang="ts" setup>
+  import type { ISshSession } from '@/views/host/terminal/types/terminal.type';
   import type { CommandSnippetWrapperResponse, CommandSnippetQueryResponse } from '@/api/asset/command-snippet';
   import { ref, provide } from 'vue';
   import useVisible from '@/hooks/visible';
@@ -85,13 +86,14 @@
   import { deleteCommandSnippet, getCommandSnippetList } from '@/api/asset/command-snippet';
   import { useCacheStore, useTerminalStore } from '@/store';
   import { openUpdateSnippetKey, removeSnippetKey } from '../types/const';
+  import { PanelSessionType } from '@/views/host/terminal/types/terminal.const';
   import CommandSnippetListItem from './command-snippet-list-item.vue';
   import CommandSnippetListGroup from './command-snippet-list-group.vue';
   import CommandSnippetFormDrawer from './command-snippet-form-drawer.vue';
 
   const { loading, setLoading } = useLoading();
   const { visible, setVisible } = useVisible();
-  const { getCurrentSshSession } = useTerminalStore();
+  const { getCurrentSession } = useTerminalStore();
   const cacheStore = useCacheStore();
 
   const formDrawer = ref();
@@ -274,8 +276,8 @@
 
   // 关闭回调
   const onClose = () => {
-    // 聚焦终端
-    getCurrentSshSession()?.focus();
+    // 关闭时候如果打开的是终端 则聚焦终端
+    getCurrentSession<ISshSession>(PanelSessionType.SSH.type)?.focus();
   };
 
 </script>
diff --git a/orion-ops-ui/src/views/host/command-snippet/components/command-snippet-list-item.vue b/orion-ops-ui/src/views/host/command-snippet/components/command-snippet-list-item.vue
index d631ec93..c3f38aab 100644
--- a/orion-ops-ui/src/views/host/command-snippet/components/command-snippet-list-item.vue
+++ b/orion-ops-ui/src/views/host/command-snippet/components/command-snippet-list-item.vue
@@ -113,18 +113,20 @@
 </script>
 
 <script lang="ts" setup>
+  import type { ISshSession } from '@/views/host/terminal/types/terminal.type';
   import type { CommandSnippetQueryResponse } from '@/api/asset/command-snippet';
   import { useTerminalStore } from '@/store';
   import { useDebounceFn } from '@vueuse/core';
   import { copy } from '@/hooks/copy';
   import { inject } from 'vue';
   import { openUpdateSnippetKey, removeSnippetKey } from '../types/const';
+  import { PanelSessionType } from '@/views/host/terminal/types/terminal.const';
 
   const props = defineProps<{
     item: CommandSnippetQueryResponse;
   }>();
 
-  const { getAndCheckCurrentSshSession } = useTerminalStore();
+  const { getCurrentSession } = useTerminalStore();
 
   let clickCount = 0;
 
@@ -137,9 +139,11 @@
   // 点击命令
   const clickItem = () => {
     if (++clickCount == 2) {
+      // 双击执行
       clickCount = 0;
       exec();
     } else {
+      // 单击展开
       expandItem();
     }
   };
@@ -183,7 +187,7 @@
 
   // 写入命令
   const write = (command: string) => {
-    const handler = getAndCheckCurrentSshSession()?.handler;
+    const handler = getCurrentSession<ISshSession>(PanelSessionType.SSH.type, true)?.handler;
     if (handler && handler.enabledStatus('checkAppendMissing')) {
       handler.checkAppendMissing(command);
     }
diff --git a/orion-ops-ui/src/views/host/path-bookmark/components/path-bookmark-form-drawer.vue b/orion-ops-ui/src/views/host/path-bookmark/components/path-bookmark-form-drawer.vue
index 8883776f..2dc816e8 100644
--- a/orion-ops-ui/src/views/host/path-bookmark/components/path-bookmark-form-drawer.vue
+++ b/orion-ops-ui/src/views/host/path-bookmark/components/path-bookmark-form-drawer.vue
@@ -24,6 +24,13 @@
         <a-form-item field="groupId" label="分组">
           <path-bookmark-group-select v-model="formModel.groupId" />
         </a-form-item>
+        <!-- 类型 -->
+        <a-form-item field="type" label="类型">
+          <a-select v-model="formModel.type"
+                    :options="toOptions(pathBookmarkTypeKey)"
+                    placeholder="请选择类型"
+                    allow-clear />
+        </a-form-item>
         <!-- 文件路径 -->
         <a-form-item field="path" label="路径">
           <a-textarea v-model="formModel.path"
@@ -49,11 +56,14 @@
   import useVisible from '@/hooks/visible';
   import { createPathBookmark, updatePathBookmark } from '@/api/asset/path-bookmark';
   import formRules from '../types/form.rules';
+  import { PathBookmarkType, pathBookmarkTypeKey } from '../types/const';
+  import { useDictStore } from '@/store';
   import { Message } from '@arco-design/web-vue';
   import PathBookmarkGroupSelect from './path-bookmark-group-select.vue';
 
   const { visible, setVisible } = useVisible();
   const { loading, setLoading } = useLoading();
+  const { toOptions } = useDictStore();
 
   const title = ref<string>();
   const isAddHandle = ref<boolean>(true);
@@ -63,6 +73,7 @@
       id: undefined,
       groupId: undefined,
       name: undefined,
+      type: PathBookmarkType.DIR,
       path: undefined,
     };
   };
diff --git a/orion-ops-ui/src/views/host/path-bookmark/components/path-bookmark-list-drawer.vue b/orion-ops-ui/src/views/host/path-bookmark/components/path-bookmark-list-drawer.vue
index f0dea547..e427a758 100644
--- a/orion-ops-ui/src/views/host/path-bookmark/components/path-bookmark-list-drawer.vue
+++ b/orion-ops-ui/src/views/host/path-bookmark/components/path-bookmark-list-drawer.vue
@@ -78,20 +78,22 @@
 </script>
 
 <script lang="ts" setup>
+  import { ISshSession } from '@/views/host/terminal/types/terminal.type';
   import type { PathBookmarkWrapperResponse, PathBookmarkQueryResponse } from '@/api/asset/path-bookmark';
-  import { ref, provide } from 'vue';
+  import { ref, provide, onMounted } from 'vue';
   import useVisible from '@/hooks/visible';
   import useLoading from '@/hooks/loading';
   import { deletePathBookmark, getPathBookmarkList } from '@/api/asset/path-bookmark';
-  import { useCacheStore, useTerminalStore } from '@/store';
-  import { openUpdatePathKey, removePathKey } from '../types/const';
+  import { useCacheStore, useDictStore, useTerminalStore } from '@/store';
+  import { PanelSessionType } from '@/views/host/terminal/types/terminal.const';
+  import { dictKeys, openUpdatePathKey, removePathKey } from '../types/const';
   import PathBookmarkListItem from './path-bookmark-list-item.vue';
   import PathBookmarkListGroup from './path-bookmark-list-group.vue';
   import PathBookmarkFormDrawer from './path-bookmark-form-drawer.vue';
 
   const { loading, setLoading } = useLoading();
   const { visible, setVisible } = useVisible();
-  const { getCurrentSshSession } = useTerminalStore();
+  const { getCurrentSession } = useTerminalStore();
   const cacheStore = useCacheStore();
 
   const formDrawer = ref();
@@ -274,10 +276,15 @@
 
   // 关闭回调
   const onClose = () => {
-    // 聚焦终端
-    getCurrentSshSession()?.focus();
+    // 关闭时候如果打开的是终端 则聚焦终端
+    getCurrentSession<ISshSession>(PanelSessionType.SSH.type)?.focus();
   };
 
+  // 加载字典值
+  onMounted(() => {
+    useDictStore().loadKeys(dictKeys);
+  });
+
 </script>
 
 <style lang="less" scoped>
diff --git a/orion-ops-ui/src/views/host/path-bookmark/components/path-bookmark-list-item.vue b/orion-ops-ui/src/views/host/path-bookmark/components/path-bookmark-list-item.vue
index 0d9e387d..e7bfb1a3 100644
--- a/orion-ops-ui/src/views/host/path-bookmark/components/path-bookmark-list-item.vue
+++ b/orion-ops-ui/src/views/host/path-bookmark/components/path-bookmark-list-item.vue
@@ -28,16 +28,16 @@
                 </template>
                 进入
               </a-tag>
-              <!-- 粘贴 -->
+              <!-- 复制 -->
               <a-tag class="pointer usn"
                      size="small"
                      :checkable="true"
                      :checked="true"
-                     @click.stop.prevent="paste">
+                     @click.stop.prevent="copyPath">
                 <template #icon>
-                  <icon-paste />
+                  <icon-copy />
                 </template>
-                粘贴
+                复制
               </a-tag>
             </a-space>
           </div>
@@ -50,12 +50,12 @@
     </div>
     <!-- 右键菜单 -->
     <template #content>
-      <!-- 进入父目录 -->
+      <!-- 进入 -->
       <a-doption @click="changePath">
         <div class="terminal-context-menu-icon">
           <icon-link />
         </div>
-        <div>进入父目录</div>
+        <div>进入</div>
       </a-doption>
       <!-- 复制 -->
       <a-doption @click="copyPath">
@@ -112,19 +112,21 @@
 </script>
 
 <script lang="ts" setup>
+  import type { ISftpSession, ISshSession } from '@/views/host/terminal/types/terminal.type';
   import type { PathBookmarkQueryResponse } from '@/api/asset/path-bookmark';
   import { useTerminalStore } from '@/store';
   import { useDebounceFn } from '@vueuse/core';
   import { copy } from '@/hooks/copy';
   import { inject } from 'vue';
-  import { openUpdatePathKey, removePathKey } from '../types/const';
   import { getParentPath } from '@/utils/file';
+  import { openUpdatePathKey, PathBookmarkType, removePathKey } from '../types/const';
+  import { PanelSessionType } from '@/views/host/terminal/types/terminal.const';
 
   const props = defineProps<{
     item: PathBookmarkQueryResponse;
   }>();
 
-  const { getAndCheckCurrentSshSession } = useTerminalStore();
+  const { getCurrentSession, getCurrentSessionType } = useTerminalStore();
 
   let clickCount = 0;
 
@@ -138,8 +140,17 @@
   const clickItem = () => {
     if (++clickCount == 2) {
       clickCount = 0;
-      changePath();
+      // 双击
+      const type = getCurrentSessionType(true);
+      if (type === PanelSessionType.SSH.type) {
+        // SSH 粘贴
+        paste();
+      } else if (type === PanelSessionType.SFTP.type) {
+        // SFTP 切换目录
+        listFiles();
+      }
     } else {
+      // 单击展开
       expandItem();
     }
   };
@@ -173,18 +184,37 @@
 
   // 粘贴
   const paste = () => {
-    write(props.item.path);
+    writeCommand(props.item.path);
   };
 
-  // 进入父目录
+  // 切换目录
   const changePath = () => {
-    const parentPath = getParentPath(props.item.path);
-    write( parentPath+ '\r\n');
+    const type = getCurrentSessionType(true);
+    if (type === PanelSessionType.SSH.type) {
+      const path = props.item.type === PathBookmarkType.DIR
+        ? props.item.path
+        : getParentPath(props.item.path);
+      // SSH cd
+      writeCommand('cd ' + path + '\r\n');
+    } else if (type === PanelSessionType.SFTP.type) {
+      // SFTP 切换目录
+      listFiles();
+    }
   };
 
-  // 写入路径
-  const write = (command: string) => {
-    const handler = getAndCheckCurrentSshSession()?.handler;
+  // 查询 sftp 文件列表
+  const listFiles = () => {
+    // 如果非文件夹则查询父文件夹
+    const path = props.item.type === PathBookmarkType.DIR
+      ? props.item.path
+      : getParentPath(props.item.path);
+    // 查询列表
+    getCurrentSession<ISftpSession>(PanelSessionType.SFTP.type, true)?.list(path);
+  };
+
+  // 写入 ssh 命令
+  const writeCommand = (command: string) => {
+    const handler = getCurrentSession<ISshSession>(PanelSessionType.SSH.type, true)?.handler;
     if (handler && handler.enabledStatus('checkAppendMissing')) {
       handler.checkAppendMissing(command);
     }
diff --git a/orion-ops-ui/src/views/host/path-bookmark/types/const.ts b/orion-ops-ui/src/views/host/path-bookmark/types/const.ts
index 16e72701..b24f2675 100644
--- a/orion-ops-ui/src/views/host/path-bookmark/types/const.ts
+++ b/orion-ops-ui/src/views/host/path-bookmark/types/const.ts
@@ -1,5 +1,17 @@
+// 路径书签类型
+export const PathBookmarkType = {
+  FILE: 'FILE',
+  DIR: 'DIR',
+};
+
 // 打开 updatePath key
 export const openUpdatePathKey = Symbol();
 
 // 删除 path key
 export const removePathKey = Symbol();
+
+// 路径书签类型 字典项
+export const pathBookmarkTypeKey = 'pathBookmarkType';
+
+// 加载的字典值
+export const dictKeys = [pathBookmarkTypeKey];
diff --git a/orion-ops-ui/src/views/host/path-bookmark/types/form.rules.ts b/orion-ops-ui/src/views/host/path-bookmark/types/form.rules.ts
index ce8b7075..c4323520 100644
--- a/orion-ops-ui/src/views/host/path-bookmark/types/form.rules.ts
+++ b/orion-ops-ui/src/views/host/path-bookmark/types/form.rules.ts
@@ -12,13 +12,22 @@ export const name = [{
   message: '名称长度不能大于64位'
 }] as FieldRule[];
 
+export const type = [{
+  required: true,
+  message: '请选择类型'
+}] as FieldRule[];
+
 export const path = [{
   required: true,
   message: '请输入路径'
+}, {
+  maxLength: 1000,
+  message: '名称长度不能大于1000位'
 }] as FieldRule[];
 
 export default {
   groupId,
   name,
+  type,
   path,
 } as Record<string, FieldRule | FieldRule[]>;
diff --git a/orion-ops-ui/src/views/host/terminal/components/layout/main-content.vue b/orion-ops-ui/src/views/host/terminal/components/layout/main-content.vue
index 8855850d..7fac4797 100644
--- a/orion-ops-ui/src/views/host/terminal/components/layout/main-content.vue
+++ b/orion-ops-ui/src/views/host/terminal/components/layout/main-content.vue
@@ -33,7 +33,8 @@
 </script>
 
 <script lang="ts" setup>
-  import { TerminalTabs, TerminalShortcutKeys } from '../../types/terminal.const';
+  import type { ISshSession } from '../../types/terminal.type';
+  import { TerminalTabs, TerminalShortcutKeys, PanelSessionType } from '../../types/terminal.const';
   import { useTerminalStore } from '@/store';
   import { onMounted, onUnmounted, watch } from 'vue';
   import { addEventListen, removeEventListen } from '@/utils/event';
@@ -45,17 +46,17 @@
   import TerminalShortcutSetting from '../setting/shortcut/terminal-shortcut-setting.vue';
   import TerminalPanelsView from '@/views/host/terminal/components/layout/terminal-panels-view.vue';
 
-  const { preference, tabManager, getCurrentSshSession } = useTerminalStore();
+  const { preference, tabManager, getCurrentSession } = useTerminalStore();
 
   // 监听 tab 切换
   watch(() => tabManager.active, (active, before) => {
     // 失焦 tab
     if (before === TerminalTabs.TERMINAL_PANEL.key) {
-      getCurrentSshSession()?.blur();
+      getCurrentSession<ISshSession>(PanelSessionType.SSH.type)?.blur();
     }
     // 聚焦 tab
     if (active === TerminalTabs.TERMINAL_PANEL.key) {
-      getCurrentSshSession()?.focus();
+      getCurrentSession<ISshSession>(PanelSessionType.SSH.type)?.focus();
     }
     // 修改标题
     document.title = Object.values(TerminalTabs)
diff --git a/orion-ops-ui/src/views/host/terminal/components/layout/right-sidebar.vue b/orion-ops-ui/src/views/host/terminal/components/layout/right-sidebar.vue
index 8c2eec3c..cae07693 100644
--- a/orion-ops-ui/src/views/host/terminal/components/layout/right-sidebar.vue
+++ b/orion-ops-ui/src/views/host/terminal/components/layout/right-sidebar.vue
@@ -24,15 +24,16 @@
 </script>
 
 <script lang="ts" setup>
-  import type { SidebarAction } from '../../types/terminal.type';
+  import type { ISshSession, SidebarAction } from '../../types/terminal.type';
   import { useTerminalStore } from '@/store';
   import { ref } from 'vue';
+  import { PanelSessionType } from '../../types/terminal.const';
   import IconActions from './icon-actions.vue';
-  import CommandSnippetListDrawer from '../../../command-snippet/components/command-snippet-list-drawer.vue';
-  import PathBookmarkListDrawer from '../../../path-bookmark/components/path-bookmark-list-drawer.vue';
+  import CommandSnippetListDrawer from '@/views/host/command-snippet/components/command-snippet-list-drawer.vue';
+  import PathBookmarkListDrawer from '@/views/host/path-bookmark/components/path-bookmark-list-drawer.vue';
   import TransferDrawer from '@/views/host/terminal/components/transfer/transfer-drawer.vue';
 
-  const { getAndCheckCurrentSshSession } = useTerminalStore();
+  const { getCurrentSession } = useTerminalStore();
 
   const snippetRef = ref();
   const pathRef = ref();
@@ -69,7 +70,7 @@
 
   // 终端截屏
   const screenshot = () => {
-    const handler = getAndCheckCurrentSshSession()?.handler;
+    const handler = getCurrentSession<ISshSession>(PanelSessionType.SSH.type, true)?.handler;
     if (handler && handler.enabledStatus('screenshot')) {
       handler.screenshot();
     }
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 5f73e90b..78221595 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
@@ -173,7 +173,6 @@
 
   // 加载文件列表
   const loadFiles = (path: string) => {
-    setTableLoading(true);
     session.value?.list(path);
   };
 
diff --git a/orion-ops-ui/src/views/host/terminal/handler/sftp-session.ts b/orion-ops-ui/src/views/host/terminal/handler/sftp-session.ts
index 1ae6bd48..e3025b33 100644
--- a/orion-ops-ui/src/views/host/terminal/handler/sftp-session.ts
+++ b/orion-ops-ui/src/views/host/terminal/handler/sftp-session.ts
@@ -50,6 +50,7 @@ export default class SftpSession implements ISftpSession {
 
   // 查询文件列表
   list(path: string) {
+    this.resolver.setLoading(true);
     this.channel.send(InputProtocol.SFTP_LIST, {
       sessionId: this.sessionId,
       showHiddenFile: ~~this.showHiddenFile,
diff --git a/orion-ops-ui/src/views/system/dict-value/components/dict-value-table.vue b/orion-ops-ui/src/views/system/dict-value/components/dict-value-table.vue
index 03c22acc..643325f0 100644
--- a/orion-ops-ui/src/views/system/dict-value/components/dict-value-table.vue
+++ b/orion-ops-ui/src/views/system/dict-value/components/dict-value-table.vue
@@ -13,13 +13,17 @@
                            allow-create
                            allow-clear />
       </a-form-item>
+      <!-- 配置描述 -->
+      <a-form-item field="label" label="配置描述">
+        <a-input v-model="formModel.label" placeholder="请输入配置描述" allow-clear />
+      </a-form-item>
       <!-- 配置值 -->
       <a-form-item field="value" label="配置值">
         <a-input v-model="formModel.value" placeholder="请输入配置值" allow-clear />
       </a-form-item>
-      <!-- 配置描述 -->
-      <a-form-item field="label" label="配置描述">
-        <a-input v-model="formModel.label" placeholder="请输入配置描述" allow-clear />
+      <!-- 配置值 -->
+      <a-form-item field="extra" label="额外参数">
+        <a-input v-model="formModel.extra" placeholder="额外参数" allow-clear />
       </a-form-item>
     </query-header>
   </a-card>