Skip to content

L
luna
Unverified Commit 1a442346 authored by liuzheng712's avatar liuzheng712
Browse files
Options

feat: merge

parents 69b5fb89 03e0d61b
Show whitespace changes
Inline Side-by-side
Showing with 26 additions and 19 deletions
asciinema-player @ 9e8f949f
Subproject commit 9e8f949f64479cbfc4551dd81a20897de6121da5
src/app/ControlPage/cleftbar/cleftbar.component.css
View file @ 1a442346
......@@ -34,7 +34,7 @@ label {
overflow: hidden;
}
.filetree > li input:checked ~ ul , .filetree > li ul.insearch{
.filetree > li input:checked ~ ul, .filetree > li ul.insearch {
height: auto;
}
......@@ -67,7 +67,11 @@ label {
background: #2f2a2a;
font-size: 9pt;
border-top-width: 1px;
<<<<<<< HEAD
left: 0;
=======
left: 0px;
>>>>>>> github_dev
padding: 1px 20px 0 20px;
position: absolute;
}
......
src/app/ControlPage/controlpage.component.css
View file @ 1a442346
......@@ -7,8 +7,8 @@ div, term-leftbar, term-body {
div {
background-color: black;
margin: 0;
top:30px;
position: absolute;
padding-top: 30px;
position: initial;
}
app-cleftbar {
......
src/app/elements/term/term.component.ts
View file @ 1a442346
import {AfterViewInit, Component, OnInit, ViewChild} from '@angular/core';
import {ElementRef, Renderer2} from '@angular/core';
import {ElementRef} from '@angular/core';
import {term} from '../../globals';
import {Terminal} from '../../globals';
import * as jQuery from 'jquery/dist/jquery.min.js';
@Component({
selector: 'app-element-term',
......@@ -12,7 +12,7 @@ export class ElementTermComponent implements OnInit, AfterViewInit {
@ViewChild('term') el: ElementRef;
constructor(private rd: Renderer2) {
constructor() {
}
ngOnInit() {
......@@ -20,16 +20,15 @@ export class ElementTermComponent implements OnInit, AfterViewInit {
}
ngAfterViewInit() {
// term.col = Math.floor(jQuery(this.el.nativeElement).width() / jQuery('#liuzheng').width() * 8) - 3;
// term.row = Math.floor(jQuery(this.el.nativeElement).height() / jQuery('#liuzheng').height()) - 5;
term.col = 90;
term.row = 90;
term.term = Terminal({
cols: term.col,
rows: term.row,
useStyle: true,
screenKeys: true,
});
term.col = Math.floor(jQuery(this.el.nativeElement).width() / jQuery('#liuzheng').width() * 8) - 3;
term.row = Math.floor(jQuery(this.el.nativeElement).height() / jQuery('#liuzheng').height()) - 5;
console.log(term);
// term.term = Terminal({
// cols: term.col,
// rows: term.row,
// useStyle: true,
// screenKeys: true,
// });
term.term.open(this.el.nativeElement, true);
// const that = this;
// window.onresize = function () {
......
src/app/globals.ts
View file @ 1a442346
......@@ -11,7 +11,12 @@ export let term: {
col: number;
row: number;
} = {
term: Terminal({}),
term: Terminal({
cols: 80,
rows: 24,
useStyle: true,
screenKeys: true,
}),
col: 80,
row: 24,
};
......
src/index.html
View file @ 1a442346
......@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
<title>JumpServer</title>
<title>Jumpserver</title>
<base href="/luna">
<meta name="viewport" content="width=device-width, initial-scale=1">
......
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