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
28ff57ef
Unverified
Commit
28ff57ef
authored
7 years ago
by
liuzheng712
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: update
parent
c82388ab
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
15 additions
and
16 deletions
+15
-16
control.component.html
src/app/ControlPage/control/control.component.html
+2
-2
app.module.ts
src/app/app.module.ts
+2
-2
iframe.component.html
src/app/elements/iframe/iframe.component.html
+0
-0
iframe.component.scss
src/app/elements/iframe/iframe.component.scss
+0
-0
iframe.component.spec.ts
src/app/elements/iframe/iframe.component.spec.ts
+6
-6
iframe.component.ts
src/app/elements/iframe/iframe.component.ts
+5
-6
No files found.
src/app/ControlPage/control/control.component.html
View file @
28ff57ef
...
...
@@ -7,10 +7,10 @@
[
index
]="
i
"
*
ngIf=
"m.type=='ssh'"
>
</app-element-term>
<app-element-
guacamol
e
[
host
]="
m
.
host
"
<app-element-
ifram
e
[
host
]="
m
.
host
"
[
userid
]="
m
.
user
.
id
"
[
index
]="
i
"
*
ngIf=
"m.type=='rdp'"
>
</app-element-
guacamol
e>
</app-element-
ifram
e>
</div>
This diff is collapsed.
Click to expand it.
src/app/app.module.ts
View file @
28ff57ef
...
...
@@ -27,7 +27,7 @@ import {LoginComponent} from './BasicPage/login/login.component';
import
{
ElementPopupComponent
}
from
'./elements/popup/popup.component'
;
import
{
ElementRdpComponent
}
from
'./elements/rdp/rdp.component'
;
import
{
ElementServerMenuComponent
}
from
'./elements/server-menu/server-menu.component'
;
import
{
Element
GuacamoleComponent
}
from
'./elements/guacamole/guacamol
e.component'
;
import
{
Element
IframeComponent
}
from
'./elements/iframe/ifram
e.component'
;
// pages
import
{
IleftbarComponent
}
from
'./IndexPage/ileftbar/ileftbar.component'
;
import
{
SearchComponent
,
SearchFilter
}
from
'./ControlPage/search/search.component'
;
...
...
@@ -63,7 +63,7 @@ import {WindowsComponent} from './monitor-page/windows/windows.component';
ElementInteractiveComponent
,
ElementRdpComponent
,
ElementServerMenuComponent
,
Element
Guacamol
eComponent
,
Element
Ifram
eComponent
,
LoginComponent
,
SearchComponent
,
SearchFilter
,
...
...
This diff is collapsed.
Click to expand it.
src/app/elements/
guacamole/guacamol
e.component.html
→
src/app/elements/
iframe/ifram
e.component.html
View file @
28ff57ef
File moved
This diff is collapsed.
Click to expand it.
src/app/elements/
guacamole/guacamol
e.component.scss
→
src/app/elements/
iframe/ifram
e.component.scss
View file @
28ff57ef
File moved
This diff is collapsed.
Click to expand it.
src/app/elements/
guacamole/guacamol
e.component.spec.ts
→
src/app/elements/
iframe/ifram
e.component.spec.ts
View file @
28ff57ef
import
{
async
,
ComponentFixture
,
TestBed
}
from
'@angular/core/testing'
;
import
{
Element
GuacamoleComponent
}
from
'./guacamol
e.component'
;
import
{
Element
IframeComponent
}
from
'./ifram
e.component'
;
describe
(
'Element
Guacamol
eComponent'
,
()
=>
{
let
component
:
Element
Guacamol
eComponent
;
let
fixture
:
ComponentFixture
<
Element
Guacamol
eComponent
>
;
describe
(
'Element
Ifram
eComponent'
,
()
=>
{
let
component
:
Element
Ifram
eComponent
;
let
fixture
:
ComponentFixture
<
Element
Ifram
eComponent
>
;
beforeEach
(
async
(()
=>
{
TestBed
.
configureTestingModule
({
declarations
:
[
Element
Guacamol
eComponent
]
declarations
:
[
Element
Ifram
eComponent
]
})
.
compileComponents
();
}));
beforeEach
(()
=>
{
fixture
=
TestBed
.
createComponent
(
Element
Guacamol
eComponent
);
fixture
=
TestBed
.
createComponent
(
Element
Ifram
eComponent
);
component
=
fixture
.
componentInstance
;
fixture
.
detectChanges
();
});
...
...
This diff is collapsed.
Click to expand it.
src/app/elements/
guacamole/guacamol
e.component.ts
→
src/app/elements/
iframe/ifram
e.component.ts
View file @
28ff57ef
...
...
@@ -3,11 +3,11 @@ import {DomSanitizer} from '@angular/platform-browser';
import
{
NavList
}
from
'../../ControlPage/control/control.component'
;
@
Component
({
selector
:
'app-element-
guacamol
e'
,
templateUrl
:
'./
guacamol
e.component.html'
,
styleUrls
:
[
'./
guacamol
e.component.scss'
]
selector
:
'app-element-
ifram
e'
,
templateUrl
:
'./
ifram
e.component.html'
,
styleUrls
:
[
'./
ifram
e.component.scss'
]
})
export
class
Element
Guacamol
eComponent
implements
OnInit
{
export
class
Element
Ifram
eComponent
implements
OnInit
{
@
Input
()
host
:
any
;
@
Input
()
userid
:
any
;
@
Input
()
index
:
number
;
...
...
@@ -17,8 +17,7 @@ export class ElementGuacamoleComponent implements OnInit {
}
ngOnInit
()
{
// this.target = '/guacamole/?asset_id=' + '&system_user_id=' + '';
this
.
target
=
'https://www.baidu.com'
;
this
.
target
=
'https://wx.qq.com/'
;
}
trust
(
url
)
{
...
...
This diff is collapsed.
Click to expand it.
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