manager/orion-visor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

📝 修改文档.

Browse Source
This commit is contained in:
lijiahang
2024-10-15 15:05:11 +08:00
parent 6306baa51a
commit 6e3abab232
6 changed files with 91 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
orion-visor-ui/src/views/host/terminal/components/ssh/ssh-view.vue
View File

@@ -32,8 +32,8 @@
<!-- 连接状态 -->
<a-badge v-if="preference.actionBarSetting.connectStatus !== false"
class="status-bridge"
:status="getDictValue(connectStatusKey, session ? session.status : 0, 'status')"
:text="getDictValue(connectStatusKey, session ? session.status : 0)" />
:status="getDictValue(sessionStatusKey, session ? session.status : 0, 'status')"
:text="getDictValue(sessionStatusKey, session ? session.status : 0)" />
</div>
</div>
<!-- 终端右键菜单 -->
@@ -75,7 +75,7 @@
import { computed, onMounted, onUnmounted, ref } from 'vue';
import { useDictStore, useTerminalStore } from '@/store';
import { copy } from '@/hooks/copy';
import { ActionBarItems, connectStatusKey } from '../../types/const';
import { ActionBarItems, sessionStatusKey } from '../../types/const';
import ShellEditorModal from '@/components/view/shell-editor/modal/index.vue';
import IconActions from '../layout/icon-actions.vue';
import SshContextMenu from './ssh-context-menu.vue';

6
orion-visor-ui/src/views/host/terminal/handler/ssh-session.ts
View File

@@ -7,7 +7,7 @@ import type { XtermAddons } from '@/types/xterm';
import { defaultFontFamily } from '@/types/xterm';
import { useTerminalStore } from '@/store';
import { InputProtocol } from '@/types/protocol/terminal.protocol';
import { PanelSessionType, TerminalShortcutType, TerminalStatus } from '../types/const';
import { PanelSessionType, TerminalShortcutType, TerminalSessionStatus } from '../types/const';
import { Terminal } from '@xterm/xterm';
import { FitAddon } from '@xterm/addon-fit';
import { WebLinksAddon } from '@xterm/addon-web-links';
@@ -41,7 +41,7 @@ export default class SshSession extends BaseSession implements ISshSession {
super(PanelSessionType.SSH.type, tab);
this.channel = channel;
this.canUseWebgl = canUseWebgl;
this.status = TerminalStatus.CONNECTING;
this.status = TerminalSessionStatus.CONNECTING;
this.inst = undefined as unknown as Terminal;
this.handler = undefined as unknown as ISshSessionHandler;
this.addons = {} as XtermAddons;
@@ -207,7 +207,7 @@ export default class SshSession extends BaseSession implements ISshSession {
// 设置已连接
connect(): void {
super.connect();
this.status = TerminalStatus.CONNECTED;
this.status = TerminalSessionStatus.CONNECTED;
this.inst.focus();
}

8
orion-visor-ui/src/views/host/terminal/handler/terminal-output-processor.ts
View File

@@ -1,7 +1,7 @@
import type { ISftpSession, ISshSession, ITerminalChannel, ITerminalOutputProcessor, ITerminalSession, ITerminalSessionManager } from '../types/define';
import type { OutputPayload } from '@/types/protocol/terminal.protocol';
import { InputProtocol } from '@/types/protocol/terminal.protocol';
import { PanelSessionType, TerminalStatus } from '../types/const';
import { PanelSessionType, TerminalSessionStatus } from '../types/const';
import { useTerminalStore } from '@/store';
import { Message } from '@arco-design/web-vue';
@@ -37,7 +37,7 @@ export default class TerminalOutputProcessor implements ITerminalOutputProcessor
} else {
// 未成功展示错误信息
ssh.write(`${msg || ''}\r\n\r\n输入回车重新连接...\r\n\r\n`);
ssh.status = TerminalStatus.CLOSED;
ssh.status = TerminalSessionStatus.CLOSED;
}
}, sftp => {
// sftp 会话
@@ -70,7 +70,7 @@ export default class TerminalOutputProcessor implements ITerminalOutputProcessor
} else {
// 未成功展示错误信息
ssh.write(`${msg || ''}\r\n\r\n输入回车重新连接...\r\n\r\n`);
ssh.status = TerminalStatus.CLOSED;
ssh.status = TerminalSessionStatus.CLOSED;
}
}, sftp => {
// sftp 会话
@@ -105,7 +105,7 @@ export default class TerminalOutputProcessor implements ITerminalOutputProcessor
ssh.write('输入回车重新连接...\r\n\r\n');
}
// 设置状态
ssh.status = TerminalStatus.CLOSED;
ssh.status = TerminalSessionStatus.CLOSED;
// 设置不可写
ssh.setCanWrite(false);
}, sftp => {

10
orion-visor-ui/src/views/host/terminal/types/const.ts
View File

@@ -112,8 +112,8 @@ export const FILE_TYPE = {
}
};
// 终端状态
export const TerminalStatus = {
// 终端会话状态
export const TerminalSessionStatus = {
// 连接中
CONNECTING: 0,
// 已连接
@@ -392,8 +392,8 @@ export const newConnectionTypeKey = 'hostNewConnectionType';
// ssh 认证类型
export const extraSshAuthTypeKey = 'hostExtraSshAuthType';
// 终端状态
export const connectStatusKey = 'terminalConnectStatus';
// 终端会话状态
export const sessionStatusKey = 'terminalSessionStatus';
// 终端类型
export const emulationTypeKey = 'terminalEmulationType';
@@ -412,7 +412,7 @@ export const dictKeys = [
fontFamilyKey, fontSizeKey,
fontWeightKey, cursorStyleKey,
newConnectionTypeKey, extraSshAuthTypeKey,
connectStatusKey, emulationTypeKey,
sessionStatusKey, emulationTypeKey,
tabColorKey, transferStatusKey,
pathBookmarkTypeKey,
];