Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
L
luna
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ops
luna
Commits
42d6a902
Commit
42d6a902
authored
May 02, 2018
by
ibuler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Update] 更新排版和修复bug
parent
2f757918
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
28 additions
and
27 deletions
+28
-27
asset-tree.component.ts
src/app/elements/asset-tree/asset-tree.component.ts
+6
-9
term.component.css
src/app/elements/term/term.component.css
+1
-0
term.component.ts
src/app/elements/term/term.component.ts
+4
-4
control.component.html
src/app/pages/control/control.component.html
+4
-3
control.component.html
src/app/pages/control/control/control.component.html
+4
-4
nav.component.css
src/app/pages/control/control/controlnav/nav.component.css
+6
-3
nav.component.html
src/app/pages/control/control/controlnav/nav.component.html
+1
-1
index.html
src/index.html
+1
-2
styles.css
src/styles.css
+1
-1
No files found.
src/app/elements/asset-tree/asset-tree.component.ts
View file @
42d6a902
...
@@ -47,14 +47,6 @@ export class ElementAssetTreeComponent implements OnInit, OnChanges {
...
@@ -47,14 +47,6 @@ export class ElementAssetTreeComponent implements OnInit, OnChanges {
if
(
this
.
Data
)
{
if
(
this
.
Data
)
{
this
.
draw
();
this
.
draw
();
}
}
// clearInterval(this.timer);
//
// this.timer = setInterval(() => {
// if (this.Data) {
// this.draw();
// clearInterval(this.timer);
// }
// }, 100);
}
}
ngOnChanges
(
changes
:
SimpleChanges
)
{
ngOnChanges
(
changes
:
SimpleChanges
)
{
...
@@ -113,10 +105,15 @@ export class ElementAssetTreeComponent implements OnInit, OnChanges {
...
@@ -113,10 +105,15 @@ export class ElementAssetTreeComponent implements OnInit, OnChanges {
});
});
assets
[
vv
[
'id'
]
+
'@'
+
vvv
[
'id'
]]
=
true
;
assets
[
vv
[
'id'
]
+
'@'
+
vvv
[
'id'
]]
=
true
;
}
}
});
});
});
});
});
});
this
.
nodes
.
sort
(
function
(
node1
,
node2
)
{
if
(
node1
.
isParent
&&
!
node2
.
isParent
)
{
return
-
1
;
}
return
node1
.
name
<
node2
.
name
?
-
1
:
1
;
});
$
.
fn
.
zTree
.
init
(
$
(
'#ztree'
),
this
.
setting
,
this
.
nodes
);
$
.
fn
.
zTree
.
init
(
$
(
'#ztree'
),
this
.
setting
,
this
.
nodes
);
}
}
...
...
src/app/elements/term/term.component.css
View file @
42d6a902
...
@@ -13,6 +13,7 @@ div {
...
@@ -13,6 +13,7 @@ div {
white-space
:
nowrap
;
white-space
:
nowrap
;
display
:
inline-block
;
display
:
inline-block
;
height
:
100%
;
height
:
100%
;
background
:
#0d8ddb
;
}
}
div
.terminal
div
span
{
div
.terminal
div
span
{
...
...
src/app/elements/term/term.component.ts
View file @
42d6a902
...
@@ -46,15 +46,15 @@ export class ElementTermComponent implements OnInit, AfterViewInit {
...
@@ -46,15 +46,15 @@ export class ElementTermComponent implements OnInit, AfterViewInit {
term
.
row
=
parseInt
(
this
.
_cookie
.
get
(
'rows'
),
10
);
term
.
row
=
parseInt
(
this
.
_cookie
.
get
(
'rows'
),
10
);
}
}
}
else
{
}
else
{
term
.
col
=
Math
.
floor
(
jQuery
(
this
.
el
.
nativeElement
).
width
()
/
jQuery
(
'#
liuzheng'
).
width
()
*
8
)
-
3
;
term
.
col
=
Math
.
floor
(
jQuery
(
this
.
el
.
nativeElement
).
width
()
/
jQuery
(
'#
marker'
).
width
()
*
6
)
-
3
;
term
.
row
=
Math
.
floor
(
jQuery
(
this
.
el
.
nativeElement
).
height
()
/
jQuery
(
'#
liuzheng
'
).
height
())
-
3
;
term
.
row
=
Math
.
floor
(
jQuery
(
this
.
el
.
nativeElement
).
height
()
/
jQuery
(
'#
marker
'
).
height
())
-
3
;
term
.
term
=
this
.
term
;
term
.
term
=
this
.
term
;
}
}
this
.
term
.
open
(
this
.
el
.
nativeElement
,
true
);
this
.
term
.
open
(
this
.
el
.
nativeElement
,
true
);
const
that
=
this
;
const
that
=
this
;
window
.
onresize
=
function
()
{
window
.
onresize
=
function
()
{
term
.
col
=
Math
.
floor
(
jQuery
(
that
.
el
.
nativeElement
).
width
()
/
jQuery
(
'#
liuzheng'
).
width
()
*
8
)
-
3
;
term
.
col
=
Math
.
floor
(
jQuery
(
that
.
el
.
nativeElement
).
width
()
/
jQuery
(
'#
marker'
).
width
()
*
6
)
-
3
;
term
.
row
=
Math
.
floor
(
jQuery
(
that
.
el
.
nativeElement
).
height
()
/
jQuery
(
'#
liuzheng'
).
height
())
-
3
;
term
.
row
=
Math
.
floor
(
jQuery
(
that
.
el
.
nativeElement
).
height
()
/
jQuery
(
'#
marker'
).
height
())
;
if
(
term
.
col
<
80
)
{
if
(
term
.
col
<
80
)
{
term
.
col
=
80
;
term
.
col
=
80
;
}
}
...
...
src/app/pages/control/control.component.html
View file @
42d6a902
<div
class=
"container-fluid row"
fxLayout=
"row"
ngxSplit=
"row"
>
<div
class=
"container-fluid row"
fxLayout=
"row"
ngxSplit=
"row"
>
<div
fxFlex=
"
20%"
ngxSplitArea
*
ngIf=
"DataStore.leftbarshow"
>
<div
fxFlex=
"
1 1 20%"
minBasis=
"100px"
maxBasis=
"800px"
fxFlexFill
ngxSplitArea
*
ngIf=
"DataStore.leftbarshow"
>
<pages-control-cleftbar></pages-control-cleftbar>
<pages-control-cleftbar></pages-control-cleftbar>
</div>
</div>
<div
fxFlex=
"
15px"
ngxSplitHandle
></div>
<div
fxFlex=
"
0"
ngxSplitHandle
></div>
<div
fxFlex
>
<div
fxFlex
=
"1 1 80%"
ngxSplitArea
class=
"content"
>
<pages-control-control></pages-control-control>
<pages-control-control></pages-control-control>
</div>
</div>
</div>
</div>
src/app/pages/control/control/control.component.html
View file @
42d6a902
<div
fxLayout=
"column"
ngxSplit=
"column"
style=
"width: 100%;height: 100%;"
>
<div
fxLayout=
"column"
ngxSplit=
"column"
style=
"width: 100%;height: 100%;"
>
<div
fx
flex=
"0 0 5
0px"
class=
"search"
>
<div
fx
Flex=
"1 1 3
0px"
class=
"search"
>
<pages-control-nav></pages-control-nav>
<pages-control-nav></pages-control-nav>
</div>
</div>
<div
fxFlex
>
<div
fxFlex
>
...
@@ -15,9 +15,9 @@
...
@@ -15,9 +15,9 @@
[
userid
]="
m
.
user
.
id
"
[
userid
]="
m
.
user
.
id
"
*
ngIf=
"m.type=='rdp'"
>
*
ngIf=
"m.type=='rdp'"
>
</elements-guacamole>
</elements-guacamole>
<
elements-settings
[
index
]="
i
"
<
!--<elements-settings [index]="i"-->
*
ngIf=
"m.type=='settings'"
>
<!--*ngIf="m.type=='settings'">--
>
<
/elements-settings
>
<
!--</elements-settings>--
>
</div>
</div>
</div>
</div>
</div>
</div>
src/app/pages/control/control/controlnav/nav.component.css
View file @
42d6a902
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
height
:
30px
;
height
:
30px
;
overflow-y
:
hidden
;
overflow-y
:
hidden
;
overflow-x
:
auto
;
overflow-x
:
auto
;
position
:
relative
;
}
}
.tabs
ul
li
.disconnected
{
.tabs
ul
li
.disconnected
{
...
@@ -32,7 +33,7 @@
...
@@ -32,7 +33,7 @@
.tabs
ul
li
.active
{
.tabs
ul
li
.active
{
box-sizing
:
border-box
;
box-sizing
:
border-box
;
border-bottom
:
5
px
solid
#19aa8d
!important
;
border-bottom
:
3
px
solid
#19aa8d
!important
;
}
}
.tabs
ul
li
span
{
.tabs
ul
li
span
{
...
@@ -43,7 +44,8 @@
...
@@ -43,7 +44,8 @@
font-family
:
'Roboto'
,
sans-serif
;
font-family
:
'Roboto'
,
sans-serif
;
font-size
:
13px
;
font-size
:
13px
;
text-decoration
:
none
;
text-decoration
:
none
;
padding
:
8px
20px
6px
15px
;
padding-left
:
24px
;
line-height
:
26px
;
cursor
:
default
;
cursor
:
default
;
width
:
115px
;
width
:
115px
;
height
:
21px
;
height
:
21px
;
...
@@ -66,7 +68,8 @@
...
@@ -66,7 +68,8 @@
}
}
.tabs
ul
li
.active
span
{
.tabs
ul
li
.active
span
{
padding
:
5px
20px
4px
15px
;
padding-left
:
24px
;
line-height
:
26px
;
color
:
white
;
color
:
white
;
height
:
18px
;
height
:
18px
;
}
}
...
...
src/app/pages/control/control/controlnav/nav.component.html
View file @
42d6a902
<div
class=
"scroll-botton"
>
<div
class=
"scroll-botton"
>
<a
class=
"left"
(
click
)="
scrollleft
()"
><i
class=
"fa fa-caret-left"
></i></a>
<a
class=
"left"
(
click
)="
scrollleft
()"
><i
class=
"fa fa-caret-left"
></i></a>
<a
class=
"right"
(
click
)="
scrollright
()"
><i
class=
"fa fa-caret-right"
></i></a>
<a
class=
"right"
(
click
)="
scrollright
()"
><i
class=
"fa fa-caret-right"
></i></a>
</div>
</div>
...
...
src/index.html
View file @
42d6a902
...
@@ -10,7 +10,6 @@
...
@@ -10,7 +10,6 @@
</head>
</head>
<body>
<body>
<app-root></app-root>
<app-root></app-root>
<span
id=
"liuzheng"
style=
"display: none"
>
liuzheng
</span>
<span
id=
"marker"
style=
"display: none"
>
marker
</span>
</body>
</body>
</html>
</html>
src/styles.css
View file @
42d6a902
...
@@ -16,7 +16,7 @@ app-root {
...
@@ -16,7 +16,7 @@ app-root {
height
:
100%
;
height
:
100%
;
}
}
#
liuzheng
{
#
marker
{
position
:
fixed
;
position
:
fixed
;
top
:
0
;
top
:
0
;
left
:
0
;
left
:
0
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment