mirror of
https://github.com/wavetermdev/backup.git
synced 2026-04-22 15:26:58 -07:00
Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| f03598bde1 | |||
| 97af45d4a0 | |||
| 818bcd5094 | |||
| 53398ef499 |
@@ -54,6 +54,8 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.remote-detail {
|
.remote-detail {
|
||||||
|
width: 100%;
|
||||||
|
|
||||||
.settings-field {
|
.settings-field {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
@@ -91,8 +93,9 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.terminal-wrapper {
|
.terminal-wrapper {
|
||||||
width: 100%;
|
|
||||||
margin-top: 5px;
|
margin-top: 5px;
|
||||||
|
overflow-x: auto;
|
||||||
|
overflow-y: hidden;
|
||||||
|
|
||||||
.terminal-connectelem {
|
.terminal-connectelem {
|
||||||
height: 163px !important; // Needed to override plugin height
|
height: 163px !important; // Needed to override plugin height
|
||||||
@@ -111,7 +114,6 @@
|
|||||||
|
|
||||||
.xterm-screen {
|
.xterm-screen {
|
||||||
padding: 10px;
|
padding: 10px;
|
||||||
width: 541px !important; // Needed to override plugin width
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,12 +12,10 @@ import * as T from "../../../types/types";
|
|||||||
import { Modal, Tooltip, Button, Status } from "../elements";
|
import { Modal, Tooltip, Button, Status } from "../elements";
|
||||||
import * as util from "../../../util/util";
|
import * as util from "../../../util/util";
|
||||||
import * as textmeasure from "../../../util/textmeasure";
|
import * as textmeasure from "../../../util/textmeasure";
|
||||||
|
import * as appconst from "../../appconst";
|
||||||
|
|
||||||
import "./viewremoteconndetail.less";
|
import "./viewremoteconndetail.less";
|
||||||
|
|
||||||
const RemotePtyRows = 9;
|
|
||||||
const RemotePtyCols = 80;
|
|
||||||
|
|
||||||
@mobxReact.observer
|
@mobxReact.observer
|
||||||
class ViewRemoteConnDetailModal extends React.Component<{}, {}> {
|
class ViewRemoteConnDetailModal extends React.Component<{}, {}> {
|
||||||
termRef: React.RefObject<any> = React.createRef();
|
termRef: React.RefObject<any> = React.createRef();
|
||||||
@@ -293,7 +291,7 @@ class ViewRemoteConnDetailModal extends React.Component<{}, {}> {
|
|||||||
let model = this.model;
|
let model = this.model;
|
||||||
let isTermFocused = this.model.remoteTermWrapFocus.get();
|
let isTermFocused = this.model.remoteTermWrapFocus.get();
|
||||||
let termFontSize = GlobalModel.termFontSize.get();
|
let termFontSize = GlobalModel.termFontSize.get();
|
||||||
let termWidth = textmeasure.termWidthFromCols(RemotePtyCols, termFontSize);
|
let termWidth = textmeasure.termWidthFromCols(appconst.RemotePtyCols, termFontSize);
|
||||||
let remoteAliasText = util.isBlank(remote.remotealias) ? "(none)" : remote.remotealias;
|
let remoteAliasText = util.isBlank(remote.remotealias) ? "(none)" : remote.remotealias;
|
||||||
let selectedRemoteStatus = this.getSelectedRemote().status;
|
let selectedRemoteStatus = this.getSelectedRemote().status;
|
||||||
|
|
||||||
@@ -371,7 +369,7 @@ class ViewRemoteConnDetailModal extends React.Component<{}, {}> {
|
|||||||
ref={this.termRef}
|
ref={this.termRef}
|
||||||
data-remoteid={remote.remoteid}
|
data-remoteid={remote.remoteid}
|
||||||
style={{
|
style={{
|
||||||
height: textmeasure.termHeightFromRows(RemotePtyRows, termFontSize),
|
height: textmeasure.termHeightFromRows(appconst.RemotePtyRows, termFontSize),
|
||||||
width: termWidth,
|
width: termWidth,
|
||||||
}}
|
}}
|
||||||
></div>
|
></div>
|
||||||
|
|||||||
@@ -12,9 +12,6 @@ import { GlobalCommandRunner } from "./global";
|
|||||||
import { Model } from "./model";
|
import { Model } from "./model";
|
||||||
import { getTermPtyData } from "../util/modelutil";
|
import { getTermPtyData } from "../util/modelutil";
|
||||||
|
|
||||||
const RemotePtyRows = 8; // also in main.tsx
|
|
||||||
const RemotePtyCols = 80;
|
|
||||||
|
|
||||||
class RemotesModel {
|
class RemotesModel {
|
||||||
globalModel: Model;
|
globalModel: Model;
|
||||||
selectedRemoteId: OV<string> = mobx.observable.box(null, {
|
selectedRemoteId: OV<string> = mobx.observable.box(null, {
|
||||||
@@ -180,14 +177,14 @@ class RemotesModel {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
let termOpts = {
|
let termOpts = {
|
||||||
rows: RemotePtyRows,
|
rows: appconst.RemotePtyRows,
|
||||||
cols: RemotePtyCols,
|
cols: appconst.RemotePtyCols,
|
||||||
flexrows: false,
|
flexrows: false,
|
||||||
maxptysize: 64 * 1024,
|
maxptysize: 64 * 1024,
|
||||||
};
|
};
|
||||||
let termWrap = new TermWrap(elem, {
|
let termWrap = new TermWrap(elem, {
|
||||||
termContext: { remoteId: remoteId },
|
termContext: { remoteId: remoteId },
|
||||||
usedRows: RemotePtyRows,
|
usedRows: appconst.RemotePtyRows,
|
||||||
termOpts: termOpts,
|
termOpts: termOpts,
|
||||||
winSize: null,
|
winSize: null,
|
||||||
keyHandler: (e, termWrap) => {
|
keyHandler: (e, termWrap) => {
|
||||||
|
|||||||
@@ -3,10 +3,10 @@
|
|||||||
|
|
||||||
.terminal-wrapper {
|
.terminal-wrapper {
|
||||||
.xterm-viewport {
|
.xterm-viewport {
|
||||||
overflow-y: hidden;
|
overflow: hidden;
|
||||||
}
|
}
|
||||||
&:hover .xterm-viewport,
|
&:hover .xterm-viewport,
|
||||||
&:focus-within .xterm-viewport {
|
&:focus-within .xterm-viewport {
|
||||||
overflow-y: auto;
|
overflow: auto;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user