diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/preference/model/TerminalPreferenceModel.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/preference/model/TerminalPreferenceModel.java index eb2d8bd7..35ef8217 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/preference/model/TerminalPreferenceModel.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/preference/model/TerminalPreferenceModel.java @@ -324,11 +324,6 @@ public class TerminalPreferenceModel implements GenericsDataModel { */ private Boolean disconnect; - /** - * 关闭终端 - */ - private Boolean closeTab; - } @Data diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/preference/strategy/TerminalPreferenceStrategy.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/preference/strategy/TerminalPreferenceStrategy.java index 88eaec85..deb3b821 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/preference/strategy/TerminalPreferenceStrategy.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/preference/strategy/TerminalPreferenceStrategy.java @@ -115,7 +115,6 @@ public class TerminalPreferenceStrategy extends AbstractGenericsDataStrategy(sessionId.value); - if (session.type === PanelSessionType.SFTP.type) { + if (session?.type === PanelSessionType.SFTP.type) { session.chmod(formModel.value.path, formModel.value.mod); } } catch (e) { diff --git a/orion-visor-ui/src/views/host/terminal/components/sftp/sftp-create-modal.vue b/orion-visor-ui/src/views/host/terminal/components/sftp/sftp-create-modal.vue index 5af17afd..181e1791 100644 --- a/orion-visor-ui/src/views/host/terminal/components/sftp/sftp-create-modal.vue +++ b/orion-visor-ui/src/views/host/terminal/components/sftp/sftp-create-modal.vue @@ -71,7 +71,7 @@ } // 获取会话 const session = sessionManager.getSession(sessionId.value); - if (session.type === PanelSessionType.SFTP.type) { + if (session?.type === PanelSessionType.SFTP.type) { if (touch.value) { // 创建文件 session.touch(formModel.value.path); diff --git a/orion-visor-ui/src/views/host/terminal/components/sftp/sftp-move-modal.vue b/orion-visor-ui/src/views/host/terminal/components/sftp/sftp-move-modal.vue index 13e2fabf..efc0ca25 100644 --- a/orion-visor-ui/src/views/host/terminal/components/sftp/sftp-move-modal.vue +++ b/orion-visor-ui/src/views/host/terminal/components/sftp/sftp-move-modal.vue @@ -79,7 +79,7 @@ } // 获取会话 const session = sessionManager.getSession(sessionId.value); - if (session.type === PanelSessionType.SFTP.type) { + if (session?.type === PanelSessionType.SFTP.type) { session.move(formModel.value.path, formModel.value.target); } } catch (e) { diff --git a/orion-visor-ui/src/views/host/terminal/handler/terminal-output-processor.ts b/orion-visor-ui/src/views/host/terminal/handler/terminal-output-processor.ts index 6c6db002..793c6be5 100644 --- a/orion-visor-ui/src/views/host/terminal/handler/terminal-output-processor.ts +++ b/orion-visor-ui/src/views/host/terminal/handler/terminal-output-processor.ts @@ -201,10 +201,10 @@ export default class TerminalOutputProcessor implements ITerminalOutputProcessor private processWithType(session: ITerminalSession, sshProcess: (ssh: ISshSession) => any | void, sftpProcess: (ssh: ISftpSession) => any | void) { - if (session.type === PanelSessionType.SSH.type) { + if (session?.type === PanelSessionType.SSH.type) { // SSH 操作 return sshProcess(session as ISshSession); - } else if (session.type === PanelSessionType.SFTP.type) { + } else if (session?.type === PanelSessionType.SFTP.type) { // SFTP 操作 return sftpProcess(session as ISftpSession); } diff --git a/orion-visor-ui/src/views/host/terminal/handler/terminal-session-manager.ts b/orion-visor-ui/src/views/host/terminal/handler/terminal-session-manager.ts index 36f4df84..b66a3544 100644 --- a/orion-visor-ui/src/views/host/terminal/handler/terminal-session-manager.ts +++ b/orion-visor-ui/src/views/host/terminal/handler/terminal-session-manager.ts @@ -135,7 +135,7 @@ export default class TerminalSessionManager implements ITerminalSessionManager { private dispatchResize() { // 对所有已连接的会话重置大小 Object.values(this.sessions) - .filter(s => s.type === PanelSessionType.SSH.type) + .filter(s => s?.type === PanelSessionType.SSH.type) .map(s => s as SshSession) .filter(h => h.connected) .forEach(h => h.fit()); diff --git a/orion-visor-ui/src/views/host/terminal/types/terminal.const.ts b/orion-visor-ui/src/views/host/terminal/types/terminal.const.ts index cdba8a11..ddce8287 100644 --- a/orion-visor-ui/src/views/host/terminal/types/terminal.const.ts +++ b/orion-visor-ui/src/views/host/terminal/types/terminal.const.ts @@ -177,10 +177,6 @@ export const ActionBarItems = [ item: 'disconnect', icon: 'icon-poweroff', content: '断开连接', - }, { - item: 'closeTab', - icon: 'icon-close', - content: '关闭终端', } ];