Commit dce09d39 authored by ibuler's avatar ibuler

[Bugfix] 解决录像播放高度问题

parent 78b1b2dd
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -108,8 +108,11 @@ export class ElementAssetTreeComponent implements OnInit, OnChanges { ...@@ -108,8 +108,11 @@ export class ElementAssetTreeComponent implements OnInit, OnChanges {
this.nodes.sort(function(node1, node2) { this.nodes.sort(function(node1, node2) {
if (node1.isParent && !node2.isParent) { if (node1.isParent && !node2.isParent) {
return -1; return -1;
} } else if (!node1.isParent && node2.isParent) {
return 1;
} else {
return node1.name < node2.name ? -1 : 1; return node1.name < node2.name ? -1 : 1;
}
}); });
$.fn.zTree.init($('#ztree'), this.setting, this.nodes); $.fn.zTree.init($('#ztree'), this.setting, this.nodes);
} }
......
...@@ -20,6 +20,7 @@ import {NavList} from '../../pages/control/control/control.component'; ...@@ -20,6 +20,7 @@ import {NavList} from '../../pages/control/control/control.component';
export class ElementTermComponent implements OnInit, AfterViewInit { export class ElementTermComponent implements OnInit, AfterViewInit {
@ViewChild('term') el: ElementRef; @ViewChild('term') el: ElementRef;
@Input() term: Terminal; @Input() term: Terminal;
@Input() offset: Array<number>;
@Output() winSizeChangeTrigger = new EventEmitter<Array<number>>(); @Output() winSizeChangeTrigger = new EventEmitter<Array<number>>();
winSizeChange$: Observable<any>; winSizeChange$: Observable<any>;
...@@ -33,7 +34,7 @@ export class ElementTermComponent implements OnInit, AfterViewInit { ...@@ -33,7 +34,7 @@ export class ElementTermComponent implements OnInit, AfterViewInit {
this.winSizeChange$ this.winSizeChange$
.subscribe(() => { .subscribe(() => {
if (NavList.List[NavList.Active].type === 'ssh') { if (NavList.List[NavList.Active].type !== 'rdp') {
this.resizeTerm(); this.resizeTerm();
} }
}); });
...@@ -70,7 +71,6 @@ export class ElementTermComponent implements OnInit, AfterViewInit { ...@@ -70,7 +71,6 @@ export class ElementTermComponent implements OnInit, AfterViewInit {
resizeTerm() { resizeTerm() {
const size = this.getWinSize(); const size = this.getWinSize();
console.log('get SIze', size);
if (isNaN(size[0]) || isNaN(size[1])) { if (isNaN(size[0]) || isNaN(size[1])) {
fit(this.term); fit(this.term);
} else { } else {
......
...@@ -33,5 +33,7 @@ ...@@ -33,5 +33,7 @@
{{"Speed"|trans}}: {{speed}} {{"Speed"|trans}}: {{speed}}
</div> </div>
<elements-term [term]="term"></elements-term> <div id="winContainer" style="height: 90%;width: 100%">
<elements-term [term]="term"></elements-term>
</div>
<!--<asciinema-player></asciinema-player>--> <!--<asciinema-player></asciinema-player>-->
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment