gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NEZ-2505 fix：发送文本到所有窗口bug

Browse Source
This commit is contained in:
zhangyu
2023-01-11 11:24:56 +08:00
parent b5c0fccdf6
commit ae07979e90
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nezha-fronted/src/components/cli/consoleNew.vue
View File

@@ -276,8 +276,8 @@ export default {
}, },
enterStr (message) { enterStr (message) {
if (this.terminalSocket && this.terminal.isLogin) { if (this.terminalSocket && this.terminal.isLogin) {
this.terminalSocket.send(message) this.term.send(message)
this.terminalSocket.send('\n') this.term.send('\n')
this.term.scrollToBottom() this.term.scrollToBottom()
this.historyChange(message) this.historyChange(message)
} }

4
nezha-fronted/src/components/cli/terminal.vue
View File

@@ -94,10 +94,10 @@ export default {
const data = JSON.parse(e.data) const data = JSON.parse(e.data)
self.$get('asset/asset/' + data.id).then(res => { self.$get('asset/asset/' + data.id).then(res => {
const asset = res.data const asset = res.data
self.$refs.websshNew.addConsole(asset.id, asset.manageIp, '', '', 'asset') self.$refs.websshNew.addConsole(asset.id, asset.manageIp, '', '', 'asset', asset)
}) })
} catch (e) { } catch (e) {
// console.log(e) console.log(e)
} }
} }
}) })

4
nezha-fronted/src/components/cli/webSSHNew.vue
View File

@@ -654,7 +654,7 @@ export default {
terminal.userName = res.data.authUsername + '@' + res.data.host terminal.userName = res.data.authUsername + '@' + res.data.host
terminal.host = res.data.host terminal.host = res.data.host
if (id) { if (id) {
console.terminal.terminalType = asset.type.authProtocol console.terminal.terminalType = asset ? asset.type.authProtocol : console.terminal.terminalType
console.terminal.username = '' console.terminal.username = ''
this.editableTabsValue = newTabName this.editableTabsValue = newTabName
this.editableTabs.push(console) this.editableTabs.push(console)
@@ -689,7 +689,7 @@ export default {
console.name = newTabName console.name = newTabName
console.terminal.name = newTabName console.terminal.name = newTabName
console.terminal.isLogin = false console.terminal.isLogin = false
this.editableTabs.push(console) this.addConsole(item.terminal.assetId, item.terminal.host, '', '', 'asset')
} else { } else {
this.customConnect = { this.customConnect = {
...item.terminal.custom, ...item.terminal.custom,