Skip to content

L
luna
Unverified Commit 1071415c authored by BaiJiangJie's avatar BaiJiangJie Committed by GitHub
Browse files
Options

Merge pull request #114 from jumpserver/dev 

Dev
parents 669c22ad b5665827
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1239 additions and 1537 deletions
.angular-cli.json deleted 100644 → 0
View file @ 669c22ad
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"project": {
"name": "WebTerminal"
},
"apps": [
{
"root": "src",
"outDir": "dist",
"assets": [
"static",
"theme/default/",
"favicon.ico"
],
"index": "index.html",
"main": "main.ts",
"polyfills": "polyfills.ts",
"test": "test.ts",
"tsconfig": "tsconfig.app.json",
"testTsconfig": "tsconfig.spec.json",
"prefix": "app",
"styles": [
"../node_modules/animate.css/animate.min.css",
"../node_modules/xterm/dist/xterm.css",
"sass/style.scss",
"styles.css",
"assets/ztree/awesomeStyle/awesome.css"
],
"scripts": [
"../node_modules/jquery/dist/jquery.min.js",
"../node_modules/metismenu/dist/metisMenu.js",
"../node_modules/jquery-sparkline/jquery.sparkline.js",
"../node_modules/tether/dist/js/tether.min.js",
"../node_modules/bootstrap/dist/js/bootstrap.min.js",
"assets/inspinia/inspinia.js",
"assets/slimscroll/jquery.slimscroll.min.js",
"../node_modules/xterm/dist/xterm.js",
"assets/ztree/jquery.ztree.all.min.js",
"assets/ztree/jquery.ztree.exhide.min.js"
],
"environmentSource": "environments/environment.ts",
"environments": {
"dev": "environments/environment.ts",
"prod": "environments/environment.prod.ts"
}
}
],
"e2e": {
"protractor": {
"config": "./protractor.conf.js"
}
},
"lint": [
{
"project": "src/tsconfig.app.json",
"exclude": "**/node_modules/**"
},
{
"project": "src/tsconfig.spec.json",
"exclude": "**/node_modules/**"
},
{
"project": "e2e/tsconfig.e2e.json",
"exclude": "**/node_modules/**"
}
],
"test": {
"karma": {
"config": "./karma.conf.js"
}
},
"defaults": {
"styleExt": "scss",
"component": {}
}
}
Dockerfile
View file @ 1071415c
...@@ -8,6 +8,6 @@ RUN npm run-script build ...@@ -8,6 +8,6 @@ RUN npm run-script build
FROM nginx:alpine FROM nginx:alpine
COPY --from=stage-build /data/dist /opt/luna/ COPY --from=stage-build /data/luna /opt/luna/
COPY i18n /opt/luna/i18n COPY ./src/assets/i18n /opt/luna/i18n
COPY nginx.conf /etc/nginx/conf.d/default.conf COPY nginx.conf /etc/nginx/conf.d/default.conf
angular.json 0 → 100644
View file @ 1071415c
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"version": 1,
"newProjectRoot": "projects",
"projects": {
"WebTerminal": {
"root": "",
"sourceRoot": "src",
"projectType": "application",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"outputPath": "dist",
"index": "src/index.html",
"main": "src/main.ts",
"tsConfig": "src/tsconfig.app.json",
"polyfills": "src/polyfills.ts",
"assets": [
"src/assets",
"src/static",
"src/theme/default",
"src/favicon.ico"
],
"styles": [
"node_modules/animate.css/animate.min.css",
"node_modules/xterm/dist/xterm.css",
"src/sass/style.scss",
"src/styles.css",
"src/assets/ztree/awesomeStyle/awesome.css"
],
"scripts": [
"node_modules/jquery/dist/jquery.min.js",
"node_modules/xterm/dist/xterm.js",
"src/assets/ztree/jquery.ztree.all.min.js",
"src/assets/ztree/jquery.ztree.exhide.min.js"
]
},
"configurations": {
"production": {
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.prod.ts"
}
]
}
}
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "WebTerminal:build"
},
"configurations": {
"production": {
"browserTarget": "WebTerminal:build:production"
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "WebTerminal:build"
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "src/test.ts",
"karmaConfig": "./karma.conf.js",
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.spec.json",
"scripts": [
"node_modules/jquery/dist/jquery.min.js",
"node_modules/xterm/dist/xterm.js",
"src/assets/ztree/jquery.ztree.all.min.js",
"src/assets/ztree/jquery.ztree.exhide.min.js"
],
"styles": [
"node_modules/animate.css/animate.min.css",
"node_modules/xterm/dist/xterm.css",
"src/sass/style.scss",
"src/styles.css",
"src/assets/ztree/awesomeStyle/awesome.css"
],
"assets": [
"src/assets",
"src/static",
"src/theme/default",
"src/favicon.ico"
]
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"src/tsconfig.app.json",
"src/tsconfig.spec.json"
],
"exclude": [
"**/node_modules/**"
]
}
}
}
},
"WebTerminal-e2e": {
"root": "e2e",
"sourceRoot": "e2e",
"projectType": "application",
"architect": {
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
"protractorConfig": "./protractor.conf.js",
"devServerTarget": "WebTerminal:serve"
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"e2e/tsconfig.e2e.json"
],
"exclude": [
"**/node_modules/**"
]
}
}
}
}
},
"defaultProject": "WebTerminal",
"schematics": {
"@schematics/angular:component": {
"prefix": "app",
"styleext": "scss"
},
"@schematics/angular:directive": {
"prefix": "app"
}
}
}
\ No newline at end of file
i18n/cn.json deleted 100644 → 0
View file @ 669c22ad
{
"reset": "重置",
"submit": "提交",
"email subject prefix": "邮件主题前缀",
"basic setting": "基本设置",
"email setting": "邮件设置",
"ldap setting": "LDAP设置",
"terminal setting": "终端设置",
"current site url": "当前站点URL",
"user guide url": "用户向导URL",
"user first login update profile done redirect to it": "用户第一次登录，修改profile后重定向到地址",
"server": "服务器",
"view": "视图",
"help": "帮助",
"hide left manager": "隐藏左边栏",
"show left manager": "显示左边栏",
"disconnect all": "断开所有链接",
"disconnect": "断开链接",
"website": "官网",
"search": "搜索",
"settings": "系统设置",
"job center": "作业中心",
"sessions": "会话管理",
"perms": "权限管理",
"assets": "资产管理",
"users": "用户管理",
"dashboard": "仪表盘",
"task": "任务",
"session online": "在线会话",
"session offline": "离线会话",
"commands": "命令记录",
"terminal": "终端管理",
"asset perminssion": "资产授权",
"asset": "资产",
"asset group": "资产组",
"cluster": "集群",
"admin user": "管理用户",
"system user": "系统用户",
"labels": "标签管理",
"user": "用户",
"user group": "用户组",
"login logs": "登陆日志",
"language": "语言选择",
"found": "发现",
"users ": "用户",
"choose a user": "选择一个用户",
"please choose a user": "请选择一个用户",
"cancel": "取消",
"confirm": "确认",
"document": "文档",
"support": "商业支持",
"speed": "速度",
"file manager": "文件管理",
"file": "文件管理",
"new connection": "连接",
"connect": "连接",
"rdp resolution": "RDP分辨率",
"set rdp solution": "设置分辨率",
"select a solution": "选择分辨率",
"set font": "设置字体",
"font": "字体",
"font size": "字体大小",
"full screen": "全屏显示",
"please input password": "请输入密码",
"username": "用户名",
"password": "密码"
}
i18n/zh-CN.json deleted 100644 → 0
View file @ 669c22ad
{
"reset": "重置",
"submit": "提交",
"email subject prefix": "邮件主题前缀",
"basic setting": "基本设置",
"email setting": "邮件设置",
"ldap setting": "LDAP设置",
"terminal setting": "终端设置",
"current site url": "当前站点URL",
"user guide url": "用户向导URL",
"user first login update profile done redirect to it": "用户第一次登录，修改profile后重定向到地址",
"server": "服务器",
"view": "视图",
"help": "帮助",
"hide left manager": "隐藏左边栏",
"show left manager": "显示左边栏",
"disconnect all": "断开所有链接",
"disconnect": "断开链接",
"website": "官网",
"search": "搜索",
"settings": "系统设置",
"job center": "作业中心",
"sessions": "会话管理",
"perms": "权限管理",
"assets": "资产管理",
"users": "用户管理",
"dashboard": "仪表盘",
"task": "任务",
"session online": "在线会话",
"session offline": "离线会话",
"commands": "命令记录",
"terminal": "终端管理",
"asset perminssion": "资产授权",
"asset": "资产",
"asset group": "资产组",
"cluster": "集群",
"admin user": "管理用户",
"system user": "系统用户",
"labels": "标签管理",
"user": "用户",
"user group": "用户组",
"login logs": "登陆日志",
"language": "语言选择",
"found": "发现",
"users ": "用户",
"choose a user": "选择一个用户",
"please choose a user": "请选择一个用户",
"cancel": "取消",
"confirm": "确认",
"document": "文档",
"support": "商业支持",
"speed": "速度",
"file manager": "文件管理",
"file": "文件管理",
"new connection": "连接",
"connect": "连接",
"rdp resolution": "RDP分辨率",
"set rdp solution": "设置分辨率",
"select a solution": "选择分辨率",
"set font": "设置字体",
"font": "字体",
"font size": "字体大小",
"full screen": "全屏显示",
"please input password": "请输入密码",
"username": "用户名",
"password": "密码"
}
karma.conf.js
View file @ 1071415c
...@@ -4,24 +4,22 @@ ...@@ -4,24 +4,22 @@
module.exports = function (config) { module.exports = function (config) {
config.set({ config.set({
basePath: '', basePath: '',
frameworks: ['jasmine', '@angular/cli'], frameworks: ['jasmine', '@angular-devkit/build-angular'],
plugins: [ plugins: [
require('karma-jasmine'), require('karma-jasmine'),
require('karma-chrome-launcher'), require('karma-chrome-launcher'),
require('karma-jasmine-html-reporter'), require('karma-jasmine-html-reporter'),
require('karma-coverage-istanbul-reporter'), require('karma-coverage-istanbul-reporter'),
require('@angular/cli/plugins/karma') require('@angular-devkit/build-angular/plugins/karma')
], ],
client:{ client:{
clearContext: false // leave Jasmine Spec Runner output visible in browser clearContext: false // leave Jasmine Spec Runner output visible in browser
}, },
coverageIstanbulReporter: { coverageIstanbulReporter: {
reports: [ 'html', 'lcovonly' ], dir: require('path').join(__dirname, 'coverage'), reports: [ 'html', 'lcovonly' ],
fixWebpackSourcePaths: true fixWebpackSourcePaths: true
}, },
angularCli: {
environment: 'dev'
},
reporters: ['progress', 'kjhtml'], reporters: ['progress', 'kjhtml'],
port: 9876, port: 9876,
colors: true, colors: true,
......
package-lock.json
View file @ 1071415c
This diff is collapsed.
package.json
View file @ 1071415c
...@@ -5,97 +5,93 @@ ...@@ -5,97 +5,93 @@
"scripts": { "scripts": {
"ng": "ng", "ng": "ng",
"start": "ng serve --proxy-config proxy.conf.json --host 0.0.0.0", "start": "ng serve --proxy-config proxy.conf.json --host 0.0.0.0",
"build": "ng build --environment prod --aot --prod --base-href=/luna/ --deploy '/luna/'", "build": "ng build --prod --base-href=/luna/ --output-path 'luna'",
"test": "ng test", "test": "ng test",
"lint": "ng lint", "lint": "ng lint",
"e2e": "ng e2e" "e2e": "ng e2e"
}, },
"private": true, "private": true,
"dependencies": { "abandon": {
"@angular/animations": "^5.2.10",
"@angular/cdk": "^5.2.5",
"@angular/common": "5.2.0",
"@angular/compiler": "5.2.0",
"@angular/core": "5.2.0",
"@angular/forms": "5.2.0",
"@angular/http": "5.2.0",
"@angular/material": "^5.2.5",
"@angular/platform-browser": "5.2.0",
"@angular/platform-browser-dynamic": "5.2.0",
"@angular/router": "5.2.0",
"@swimlane/ngx-datatable": "^11.3.2", "@swimlane/ngx-datatable": "^11.3.2",
"@swimlane/ngx-ui": "^20.2.1",
"@types/jquery": "^3.3.6",
"@types/neffos.js": "^0.1.1",
"@types/socket.io-client": "^1.4.32",
"ajv": "^6.5.0",
"animate.css": "^3.6.1",
"body-parser": "^1.18.2", "body-parser": "^1.18.2",
"bootstrap": "^4.1.1",
"clipboard": "^1.7.1", "clipboard": "^1.7.1",
"compass-mixins": "^0.12.10", "compass-mixins": "^0.12.10",
"core-js": "2.5.3",
"directory-encoder": "^0.9.2", "directory-encoder": "^0.9.2",
"elfinder": "git+https://github.com/Studio-42/elFinder.git#2.1.33", "handlebars": "^4.1.2",
"filetree-css": "^1.0.0",
"font-awesome": "4.7.0",
"guacamole-common-js": "0.9.14-b",
"handlebars": "^4.0.11",
"intl": "1.2.5", "intl": "1.2.5",
"jquery": "3.2.1",
"jquery-slimscroll": "^1.3.8", "jquery-slimscroll": "^1.3.8",
"jquery-sparkline": "^2.4.0", "jquery-sparkline": "^2.4.0",
"jvectormap": "1.2.2", "jvectormap": "1.2.2",
"lodash": "^4.17.10", "lodash": "^4.17.15",
"material-design-icons": "^3.0.1", "material-design-icons": "^3.0.1",
"materialize-css": "^0.100.2", "materialize-css": "^0.100.2",
"metismenu": "^2.7.9",
"neffos.js": "^0.1.19",
"ng2-charts": "^1.5.0", "ng2-charts": "^1.5.0",
"ngx-bootstrap": "^1.6.6", "ngx-bootstrap": "^1.6.6",
"ngx-cookie-service": "^1.0.10",
"ngx-layer": "0.0.4", "ngx-layer": "0.0.4",
"ngx-logger": "^2.2.4",
"ngx-perfect-scrollbar": "5.2.0", "ngx-perfect-scrollbar": "5.2.0",
"ngx-progressbar": "^2.1.1",
"npm-font-open-sans": "^1.1.0",
"peity": "^3.3.0", "peity": "^3.3.0",
"popper.js": "1.12.9",
"requirejs": "^2.3.5",
"roboto-fontface": "^0.8.0", "roboto-fontface": "^0.8.0",
"rxjs": "5.5.6",
"sass-math": "^1.0.0", "sass-math": "^1.0.0",
"socket.io": "^1.4.32",
"socket.io-client": "^1.4.32",
"ssh-keygen": "^0.4.1",
"tether": "^1.4.4", "tether": "^1.4.4",
"npm-font-open-sans": "^1.1.0",
"@swimlane/ngx-ui": "^25.11.0",
"utf-8-validate": "^5.0.2"
},
"dependencies": {
"@angular/animations": "~7.2.0",
"@angular/cdk": "^7.3.7",
"@angular/common": "~7.2.0",
"@angular/compiler": "~7.2.0",
"@angular/core": "~7.2.0",
"@angular/flex-layout": "^7.0.0-beta.19",
"@angular/forms": "~7.2.0",
"@angular/http": "^7.2.15",
"@angular/material": "^7.3.7",
"@angular/platform-browser": "~7.2.0",
"@angular/platform-browser-dynamic": "~7.2.0",
"@angular/router": "~7.2.0",
"@types/jquery": "^3.3.6",
"@types/neffos.js": "^0.1.1",
"ajv": "^6.5.0",
"animate.css": "^3.6.1",
"bootstrap": "^4.3.1",
"codemirror": "^5.42.0",
"core-js": "^2.5.4",
"font-awesome": "4.7.0",
"guacamole-common-js": "1.1.0",
"jquery": "^3.4.1",
"metismenu": "^2.7.9",
"neffos.js": "^0.1.19",
"ngx-cookie-service": "^1.0.10",
"ngx-logger": "4.0.4",
"popper.js": "^1.14.7",
"requirejs": "^2.3.5",
"rxjs": "~6.3.3",
"rxjs-compat": "^6.0.0-rc.0",
"tslib": "^1.9.0", "tslib": "^1.9.0",
"utf-8-validate": "^5.0.2",
"uuid-js": "^0.7.5", "uuid-js": "^0.7.5",
"xterm": "3.3.0", "xterm": "3.3.0",
"zone.js": "0.8.20" "zone.js": "~0.8.26"
}, },
"devDependencies": { "devDependencies": {
"@angular-devkit/core": "^0.4.9", "@angular-devkit/build-angular": "~0.13.0",
"@angular-devkit/schematics": "^0.4.9", "@angular/cli": "~7.3.9",
"@angular/cli": "^1.7.4", "@angular/compiler-cli": "~7.2.0",
"@angular/compiler-cli": "5.2.0", "@angular/language-service": "~7.2.0",
"@angular/language-service": "5.2.0", "@types/node": "~8.9.4",
"@types/jasmine": "2.8.4", "@types/jasmine": "~2.8.8",
"@types/jasminewd2": "~2.0.2", "@types/jasminewd2": "~2.0.3",
"codelyzer": "4.0.2", "codelyzer": "~4.5.0",
"jasmine-core": "2.8.0", "jasmine-core": "~2.99.1",
"jasmine-spec-reporter": "4.2.1", "jasmine-spec-reporter": "~4.2.1",
"karma": "2.0.0", "karma": "~4.0.0",
"karma-chrome-launcher": "2.2.0", "karma-chrome-launcher": "~2.2.0",
"karma-cli": "1.0.1", "karma-coverage-istanbul-reporter": "~2.0.1",
"karma-coverage-istanbul-reporter": "1.3.3", "karma-jasmine": "~1.1.2",
"karma-jasmine": "1.1.1", "karma-jasmine-html-reporter": "^0.2.2",
"karma-jasmine-html-reporter": "0.2.2", "protractor": "~5.4.0",
"node-sass": "^4.11.0", "ts-node": "~7.0.0",
"protractor": "^5.4.2", "tslint": "~5.11.0",
"ts-node": "3.3.0", "typescript": "~3.2.2"
"tslint": "5.9.1",
"typescript": "2.6.2"
} }
} }
proxy.conf.json
View file @ 1071415c
{ {
"/api": { "/api": {
"target": "http://127.0.0.1:5001", "target": "http://127.0.0.1:8080",
"secure": false "secure": false
}, },
"/luna/i18n": { "/luna/i18n": {
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
"secure": false "secure": false
}, },
"/socket.io/": { "/socket.io/": {
"target": "http://127.0.0.1:5001", "target": "http://127.0.0.1:5000",
"secure": false, "secure": false,
"ws": true "ws": true
}, },
...@@ -27,5 +27,17 @@ ...@@ -27,5 +27,17 @@
"^/rdp": "" "^/rdp": ""
}, },
"secure": false "secure": false
},
"/media/": {
"target": "http://127.0.0.1:8080",
"secure": false
},
"/guacamole/": {
"target": "http://127.0.0.1:8083",
"secure": false,
"ws": true,
"pathRewrite": {
"^/guacamole": ""
}
} }
} }
src/app/app.module.ts
View file @ 1071415c
/**
* app 模块
*
*
* @date 2017-11-07
* @author liuzheng <liuzheng712@gmail.com>
*/
import {BrowserModule} from '@angular/platform-browser'; import {BrowserModule} from '@angular/platform-browser';
import {NgModule} from '@angular/core'; import {NgModule} from '@angular/core';
import {FormsModule, ReactiveFormsModule} from '@angular/forms'; // <-- NgModel lives here import {FormsModule, ReactiveFormsModule} from '@angular/forms'; // <-- NgModel lives here
import {NGXLogger} from 'ngx-logger'; import {NGXLogger} from 'ngx-logger';
import {HttpClientModule} from '@angular/common/http'; import {HttpClientModule} from '@angular/common/http';
import {AppRouterModule} from './router/router.module';
import {AppComponent} from './pages/app.component';
// service
import {AppService, HttpService, LocalStorageService, LogService, UUIDService} from './app.service';
import {CookieService} from 'ngx-cookie-service'; import {CookieService} from 'ngx-cookie-service';
import {MAT_LABEL_GLOBAL_OPTIONS} from '@angular/material'; import {MAT_LABEL_GLOBAL_OPTIONS} from '@angular/material';
// service
import {AllServices} from '@app/services';
import {AppRouterModule} from './router/router.module';
import {Pipes} from './pipes/pipes'; import {Pipes} from './pipes/pipes';
import {AppComponent} from './pages/app.component';
import {PagesComponents} from './pages/pages.component'; import {PagesComponents} from './pages/pages.component';
import {ElementComponents} from './elements/elements.component'; import {ElementComponents} from './elements/elements.component';
import {ChangLanWarningDialogComponent, RDPSolutionDialogComponent, FontDialogComponent} from './elements/nav/nav.component'; import {PageMainComponent} from '@app/pages/main/main.component';
import {DialogService, ElementDialogAlertComponent} from './elements/dialog/dialog.service';
import {PluginModules} from './plugins/plugins'; import {PluginModules} from './plugins/plugins';
import {TestPageComponent} from './test-page/test-page.component'; import {ChangLanWarningDialogComponent} from './elements/nav/nav.component';
import {AssetTreeDialogComponent, ManualPasswordDialogComponent} from './elements/asset-tree/asset-tree.component'; import {ElementSettingComponent} from '@app/elements/setting/setting.component';
import {SftpComponent} from './elements/sftp/sftp.component'; import {AssetTreeDialogComponent, ManualPasswordDialogComponent} from './elements/connect/connect.component';
@NgModule({ @NgModule({
...@@ -45,34 +32,25 @@ import {SftpComponent} from './elements/sftp/sftp.component'; ...@@ -45,34 +32,25 @@ import {SftpComponent} from './elements/sftp/sftp.component';
], ],
declarations: [ declarations: [
AppComponent, AppComponent,
TestPageComponent,
...Pipes, ...Pipes,
...ElementComponents, ...ElementComponents,
...PagesComponents, ...PagesComponents,
SftpComponent, ],
],
entryComponents: [ entryComponents: [
AssetTreeDialogComponent, AssetTreeDialogComponent,
ManualPasswordDialogComponent, ManualPasswordDialogComponent,
ElementDialogAlertComponent,
ChangLanWarningDialogComponent, ChangLanWarningDialogComponent,
RDPSolutionDialogComponent, PageMainComponent,
FontDialogComponent ElementSettingComponent,
], ],
bootstrap: [AppComponent], bootstrap: [AppComponent],
providers: [ providers: [
// {provide: LoggerConfig, useValue: {level: LoggerLevel.WARN}}, // {provide: LoggerConfig, useValue: {level: LoggerLevel.WARN}},
// {provide: BrowserXhr, useClass: NgProgressBrowserXhr}, // {provide: BrowserXhr, useClass: NgProgressBrowserXhr},
AppService, ...AllServices,
HttpService,
LogService,
UUIDService,
LocalStorageService,
DialogService,
CookieService, CookieService,
NGXLogger, NGXLogger,
{provide: MAT_LABEL_GLOBAL_OPTIONS, useValue: {float: 'always'}} {provide: MAT_LABEL_GLOBAL_OPTIONS, useValue: {float: 'always'}}
] ]
}) })
export class AppModule { export class AppModule {
......
src/app/app.service.ts deleted 100644 → 0
View file @ 669c22ad
This diff is collapsed.
src/app/elements/asset-tree/asset-tree.component.html
View file @ 1071415c
<ul id="ztree" class="ztree"></ul> <div>
<ul id="assetsTree" class="ztree">
{{ "Loading"|trans }} ...
</ul>
<ul id="remoteAppsTree" class="ztree">
{{ "Loading"|trans }} ...
</ul>
</div>
<div #rMenu *ngIf="isShowRMenu" class="basicContext" [style.top]="pos.top" [style.left]="pos.left"> <div #rMenu *ngIf="isShowRMenu" class="basicContext" [style.top]="pos.top" [style.left]="pos.left">
<table> <table>
<tbody> <tbody>
<tr class="basicContext__item "> <tr *ngFor="let menu of RMenuList; let i = index" class="basicContext__item ">
<td class="basicContext__data" data-num="0" (click)="connectTerminal()"> <span class="basicContext__icon fa fa-terminal new-connection"></span> {{ "New Connection"|trans }} </td> <td class="basicContext__data" [attr.data-num]="i" (click)="menu.click()" [ngStyle]="{'display': menu.hide ? 'none': ''}">
</tr> <span class="basicContext__icon fa" [ngClass]="menu.fa"></span> {{ menu.name|trans }}
<tr class="basicContext__item basicContext__item--separator"></tr> </td>
<tr class="basicContext__item ">
<td class="basicContext__data" data-num="2" (click)="connectFileManager()"><span class="basicContext__icon fa fa-file refresh"></span> {{ "File Manager"|trans }} </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
......
src/app/elements/asset-tree/asset-tree.component.scss
View file @ 1071415c
#ztree .fa { .tree-refresh .fa {
width: 24px; width: 24px;
height: 24px; height: 24px;
line-height: 24px; line-height: 24px;
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
user-select: none; user-select: none;
} }
.basicContext, .basicContext * { .basicContext, .basicContext * {
box-sizing: border-box; box-sizing: border-box;
} }
.basicContextContainer { .basicContextContainer {
...@@ -57,8 +57,9 @@ ...@@ -57,8 +57,9 @@
.basicContext td { .basicContext td {
display: block; display: block;
padding: 0 35px; padding: 0 15px;
text-decoration: none; text-decoration: none;
min-width: 150px;
width: auto; width: auto;
opacity: 1; opacity: 1;
white-space: nowrap; white-space: nowrap;
...@@ -69,6 +70,11 @@ ...@@ -69,6 +70,11 @@
border-radius: 0; border-radius: 0;
cursor: pointer; cursor: pointer;
} }
.basicContext__icon {
padding-right: 5px;
}
.basicContext__item.basicContext__item--separator { .basicContext__item.basicContext__item--separator {
background: #181414; background: #181414;
border: 0; border: 0;
...@@ -92,11 +98,11 @@ tr { ...@@ -92,11 +98,11 @@ tr {
} }
tr:hover { tr:hover {
background-color: #463e3e; background-color: #463e3e;
} }
.basicContext table { .basicContext table {
border-spacing: 0 !important; border-spacing: 0 !important;
} }
.basicContext__data { .basicContext__data {
......
src/app/elements/connect/connect.component.ts 0 → 100644
View file @ 1071415c
import {Component, OnInit, Output, Inject, OnDestroy, EventEmitter} from '@angular/core';
import 'rxjs/add/operator/toPromise';
import {connectEvt} from '@app/globals';
import {AppService, HttpService, LogService, NavService, SettingService} from '@app/services';
import {MAT_DIALOG_DATA, MatDialog, MatDialogRef} from '@angular/material';
import {FormControl, Validators} from '@angular/forms';
import {ActivatedRoute} from '@angular/router';
import {SystemUser, TreeNode, Asset} from '@app/model';
import {View} from '@app/model';
@Component({
selector: 'elements-connect',
templateUrl: './connect.component.html',
})
export class ElementConnectComponent implements OnInit, OnDestroy {
@Output() onNewView: EventEmitter<View> = new EventEmitter<View>();
hasLoginTo = false;
constructor(private _appSvc: AppService,
public _dialog: MatDialog,
public _logger: LogService,
private settingSvc: SettingService,
private activatedRoute: ActivatedRoute,
private _http: HttpService,
) {
}
ngOnInit(): void {
connectEvt.asObservable().subscribe(evt => {
switch (evt.action) {
case 'asset': {
this.Connect(evt.node);
break;
}
case 'sftp': {
this.connectFileManager(evt.node);
break;
}
}
});
const loginTo = this._appSvc.getQueryString('login_to');
const tp = this._appSvc.getQueryString('type') || 'asset';
if (this.hasLoginTo || !loginTo) {
return;
}
switch (tp) {
case 'asset':
this._http.filterMyGrantedAssetsById(loginTo).subscribe(
nodes => {
if (nodes.length === 1) {
this.hasLoginTo = true;
const node = nodes[0];
this.Connect(node);
}
}
);
break;
case 'remote_app':
this._http.getMyGrantedRemoteApps(loginTo).subscribe(
nodes => {
if (nodes.length === 1) {
this.hasLoginTo = true;
const node = nodes[0];
this.Connect(node);
}
}
);
break;
}
}
ngOnDestroy(): void {
connectEvt.unsubscribe();
}
Connect(node: TreeNode) {
switch (node.meta.type) {
case 'asset':
this.connectAsset(node);
break;
case 'remote_app':
this.connectRemoteApp(node);
break;
default:
alert('Unknown type: ' + node.meta.type);
}
}
async connectAsset(node: TreeNode) {
const host = node.meta.asset as Asset;
const systemUsers = await this._http.getMyAssetSystemUsers(host.id).toPromise();
let sysUser = await this.selectLoginSystemUsers(systemUsers);
sysUser = await this.manualSetUserAuthLoginIfNeed(sysUser);
if (sysUser && sysUser.id) {
this.loginAsset(host, sysUser);
} else {
alert('该主机没有授权系统用户');
}
}
selectLoginSystemUsers(systemUsers: Array<SystemUser>): Promise<SystemUser> {
const systemUserMaxPriority = this.filterMaxPrioritySystemUsers(systemUsers);
let user: SystemUser;
if (systemUsers.length > 1) {
return new Promise<SystemUser>(resolve => {
const dialogRef = this._dialog.open(AssetTreeDialogComponent, {
height: '200px',
width: '300px',
data: {users: systemUserMaxPriority}
});
dialogRef.afterClosed().subscribe(result => {
if (result) {
for (const i of systemUserMaxPriority) {
if (i.id.toString() === result.toString()) {
user = i;
resolve(user);
}
}
}
return null;
});
});
} else if (systemUserMaxPriority.length === 1) {
user = systemUserMaxPriority[0];
return Promise.resolve(user);
} else {
return Promise.resolve(null);
}
}
manualSetUserAuthLoginIfNeed(user: SystemUser): Promise<SystemUser> {
if (!user || user.login_mode !== 'manual' || user.protocol !== 'rdp' || this.settingSvc.isSkipAllManualPassword()) {
return Promise.resolve(user);
}
user = Object.assign({}, user);
return new Promise(resolve => {
const dialogRef = this._dialog.open(ManualPasswordDialogComponent, {
height: '250px',
width: '500px',
data: {username: user.username}
});
dialogRef.afterClosed().subscribe(result => {
if (!result) {
return resolve(null);
}
if (result.skip) {
return resolve(user);
}
user.username = result.username;
user.password = result.password;
return resolve(user);
});
});
}
async connectRemoteApp(node: TreeNode) {
this._logger.debug('Connect remote app: ', node.id);
const systemUsers = await this._http.getMyRemoteAppSystemUsers(node.id).toPromise();
let sysUser = await this.selectLoginSystemUsers(systemUsers);
sysUser = await this.manualSetUserAuthLoginIfNeed(sysUser);
if (sysUser && sysUser.id) {
return this.loginRemoteApp(node, sysUser);
} else {
alert('该应用没有授权系统用户');
}
}
loginRemoteApp(node: TreeNode, user: SystemUser) {
if (node) {
const view = new View();
view.nick = node.name;
view.connected = true;
view.editable = false;
view.closed = false;
view.remoteApp = node.id;
view.user = user;
view.type = 'rdp';
this.onNewView.emit(view);
}
}
connectFileManager(node: TreeNode) {
const host = node.meta.asset as Asset;
if (host) {
const view = new View();
view.nick = '[FILE] ' + host.hostname;
view.connected = true;
view.editable = false;
view.closed = false;
view.host = host;
view.type = 'sftp';
this.onNewView.emit(view);
// jQuery('.tabs').animate({'scrollLeft': 150 * id}, 400);
}
}
connectTerminal(node: TreeNode) {
this.Connect(node);
}
loginAsset(host: Asset, user: SystemUser) {
if (user) {
const view = new View();
view.nick = host.hostname;
view.connected = true;
view.editable = false;
view.closed = false;
view.host = host;
view.user = user;
if (user.protocol === 'ssh' || user.protocol === 'telnet') {
view.type = 'ssh';
} else if (user.protocol === 'rdp' || user.protocol === 'vnc') {
view.type = 'rdp';
}
this.onNewView.emit(view);
}
}
filterMaxPrioritySystemUsers(sysUsers: Array<SystemUser>): Array<SystemUser> {
const priorityAll: Array<number> = sysUsers.map(s => s.priority);
const maxPriority = Math.max(...priorityAll);
return sysUsers.filter(s => s.priority === maxPriority);
}
}
@Component({
selector: 'elements-asset-tree-dialog',
templateUrl: 'dialog.html',
})
export class AssetTreeDialogComponent implements OnInit {
UserSelectControl = new FormControl('', [Validators.required]);
selected: any;
constructor(public dialogRef: MatDialogRef<AssetTreeDialogComponent>,
@Inject(MAT_DIALOG_DATA) public data: any,
private _logger: LogService) {
}
ngOnInit() {
this.selected = this.data.users[0].id;
this.UserSelectControl.setValue(this.selected);
// this._logger.debug(this.UserSelectControl);
}
onNoClick(): void {
this.dialogRef.close();
}
compareFn: ((f1: any, f2: any) => boolean) | null = this.compareByValue;
compareByValue(f1: any, f2: any) {
return f1 && f2 && f1.value === f2.value;
}
}
@Component({
selector: 'elements-manual-password-dialog',
templateUrl: 'manual-password-dialog.html',
})
export class ManualPasswordDialogComponent implements OnInit {
constructor(@Inject(MAT_DIALOG_DATA) public data: any,
public dialogRef: MatDialogRef<ManualPasswordDialogComponent>) {
}
onSkip() {
this.data.skip = true;
this.dialogRef.close(this.data);
}
onSkipAll() {
this.data.skipAll = true;
this.dialogRef.close(this.data);
}
onNoClick() {
this.dialogRef.close();
}
onEnter() {
this.dialogRef.close(this.data);
}
ngOnInit(): void {
}
}
src/app/elements/asset-tree/manual-password-dialog.html → src/app/elements/connect/manual-password-dialog.html
View file @ 1071415c
...@@ -5,12 +5,13 @@ ...@@ -5,12 +5,13 @@
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 100%"> <mat-form-field style="width: 100%">
<input matInput [type]="'password'" [(ngModel)]="data.password" <input matInput [type]="'password'" [(ngModel)]="data.password" required
[formControl]="PasswordControl" placeholder="{{'Password'|trans}}" placeholder="{{'Password'|trans}}"
(keyup.enter)="onEnter()" [attr.cdkFocusInitial]="data.username? true : null"> (keyup.enter)="onEnter()" [attr.cdkFocusInitial]="data.username? true : null">
</mat-form-field> </mat-form-field>
<div style="float: right"> <div style="float: right">
<button mat-raised-button (click)="onSkip()" >{{"Skip"|trans}}</button>
<button mat-raised-button (click)="onNoClick()" >{{"Cancel"|trans}}</button> <button mat-raised-button (click)="onNoClick()" >{{"Cancel"|trans}}</button>
<button mat-raised-button color="primary" [type]="'submit'" [mat-dialog-close]="data" >{{"Confirm"|trans}}</button> <button mat-raised-button color="primary" [type]="'submit'" [mat-dialog-close]="data" >{{"Confirm"|trans}}</button>
</div> </div>
......
src/app/pages/control/control/controlnav/nav.component.css → src/app/elements/content-tab/content-tab.component.css
View file @ 1071415c
.tabs { .window {
height: 30px; display: none;
overflow-y: hidden; /*padding: 15px;*/
overflow-x: hidden;
position: relative;
} }
.tabs ul li.disconnected { li.disconnected {
background-color: darkgray; background-color: darkgray;
} }
.tabs ul li.hidden { li.hidden {
display: none; display: none;
} }
.tabs ul { li {
list-style-type: none;
height: 30px;
background-color: #3a3333;
display: block;
min-width: 100%;
padding-left: 0;
}
.tabs ul li {
display: inline-table; display: inline-table;
width: 150px; width: 150px;
height: 30px; height: 30px;
position: relative; position: relative;
box-sizing: content-box; box-sizing: content-box;
float: left;; float: left;;
background-color: #463a3a66;
border-right: 1px solid #6b6565c2;
border-radius: 2px;
} }
.tabs ul li.active { li.active {
box-sizing: border-box; box-sizing: border-box;
border-bottom: 3px solid #19aa8d !important; border-bottom: 3px solid #19aa8d;
} }
.tabs ul li span { li span {
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
color: gray; color: #f1f0f0;
font-family: 'Roboto', sans-serif; font-family: 'Roboto', sans-serif;
font-size: 13px; font-size: 13px;
text-decoration: none; text-decoration: none;
...@@ -48,11 +40,12 @@ ...@@ -48,11 +40,12 @@
padding-right: 14px; padding-right: 14px;
line-height: 26px; line-height: 26px;
cursor: default; cursor: default;
width: 115px; /*width: 145px;*/
height: 21px; height: 26px;
display: block;
} }
.tabs ul li a.close { li a.close {
font-family: 'Roboto', sans-serif; font-family: 'Roboto', sans-serif;
font-size: 13px; font-size: 13px;
position: absolute; position: absolute;
...@@ -64,49 +57,25 @@ ...@@ -64,49 +57,25 @@
display: inline-block; display: inline-block;
} }
.tabs ul li.active a { li.active a {
color: white; color: white;
} }
.tabs ul li.active span { li.active span {
padding-left: 12px; padding-left: 12px;
line-height: 26px; line-height: 26px;
color: white; color: white;
height: 18px; height: 26px;
} }
.tabs ul li input { li input {
font-family: 'Roboto', sans-serif; font-family: 'Roboto', sans-serif;
font-size: 13px; font-size: 13px;
width: 115px; width: 120px;
border: none; border: none;
background-color: inherit; background-color: inherit;
color: white; color: white;
padding: 5px 20px 4px 15px; padding: 5px 20px 4px 15px;
height: 18px; height: 26px;
} }
/*
* scrollbar
*/
.tabs::-webkit-scrollbar-track {
-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
background-color: #676a6c;
}
.tabs::-webkit-scrollbar {
height: 2px;
}
.tabs::-webkit-scrollbar-thumb {
background-color: #F5F5F5;
}
.scroll-botton {
font-size: 20px;
float: left;
height: 30px;
overflow: hidden;
background-color: #3a3333;
color: white
}
src/app/elements/content-tab/content-tab.component.html 0 → 100644
View file @ 1071415c
<li
[ngClass]="{'active': view.active,'disconnected': !view.connected, 'hidden': view.closed != false}"
[id]="view.id" (click)="setActive()" (dblclick)="view.editable=true;setActive()"
>
<span *ngIf="view.nick && !view.editable">{{view.nick | truncatechars:25 }}</span>
<input *ngIf="view.editable" [(ngModel)]="view.nick" (blur)="view.editable=false" (keyup.enter)="view.editable=false" autofocus="autofocus"/>
<a class="close" (click)="close()">&times;</a>
</li>
src/app/elements/content-tab/content-tab.component.ts 0 → 100644
View file @ 1071415c
import {Component, OnInit, Input, Output, EventEmitter} from '@angular/core';
import {View, ViewAction} from '@app/model';
@Component({
selector: 'elements-content-tab',
templateUrl: './content-tab.component.html',
styleUrls: ['./content-tab.component.css'],
})
export class ElementContentTabComponent implements OnInit {
@Input() view: View;
@Output() onAction: EventEmitter<ViewAction> = new EventEmitter<ViewAction>();
ngOnInit(): void {
}
close() {
const action = new ViewAction(this.view, 'close');
this.onAction.emit(action);
}
setActive() {
const action = new ViewAction(this.view, 'active');
this.onAction.emit(action);
}
}
src/app/pages/control/control/control.component.css → src/app/elements/content-window/content-window.component.css
View file @ 1071415c
div, elements-term, elements-guacamole, elements-settings { div, elements-term, elements-guacamole {
height: 100%; height: 100%;
} }
elements-term, elements-guacamole, elements-settings { elements-term, elements-guacamole {
/*padding-bottom: 30px;*/ /*padding-bottom: 30px;*/
} }
.window { .window {
display: none; display: none;
height: 100%;
/*padding: 15px;*/ /*padding: 15px;*/
} }
.active { .active {
display: block; display: block;
} }
.right-side {
height: 100%;
width: 100%;
background-color: gray;
}
src/app/elements/content-window/content-window.component.html 0 → 100644
View file @ 1071415c
<div class="window" [ngClass]="{'active':view.active}" style="height: 100%">
<elements-ssh-term
[view]="view"
[host]="view.host"
[sysUser]="view.user"
*ngIf="view.type=='ssh'"
>
</elements-ssh-term>
<elements-guacamole
[view]="view"
[host]="view.host"
[sysUser]="view.user"
[remoteAppId]="view.remoteApp"
*ngIf="view.type=='rdp'"
>
</elements-guacamole>
<app-sftp *ngIf="view.type=='sftp'" [host]="view.host"></app-sftp>
</div>
src/app/elements/content-window/content-window.component.ts 0 → 100644
View file @ 1071415c
import {Component, OnInit, Input} from '@angular/core';
import {View} from '@app/model';
@Component({
selector: 'elements-content-window',
templateUrl: './content-window.component.html',
styleUrls: ['./content-window.component.css']
})
export class ElementContentViewComponent implements OnInit {
@Input() view: View;
static active() {
// viewList.List.forEach((v, k) => {
// v.hide = id.toString() !== k;
// });
// viewList.Active = id;
}
static TerminalDisconnect(id) {
// if (viewList.List[id].connected) {
// viewList.List[id].connected = false;
// viewList.List[id].Term.write('\r\n\x1b[31mBye Bye!\x1b[m\r\n');
// TermWS.emit('logout', viewList.List[id].room);
// }
}
static RdpDisconnect(id) {
// viewList.List[id].connected = false;
}
static DisconnectAll() {
}
constructor() {
}
ngOnInit() {
}
// trackByFn(index: number, item: View) {
// return item.id;
// }
}
src/app/elements/content/content.component.html 0 → 100644
View file @ 1071415c
<div id="content">
<div>
<div class="scroll-button">
<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>
</div>
<div class="tabs" #tabs>
<ul [ngStyle]="{'width':tabsWidth+'px'}">
<elements-content-tab
*ngFor="let view of viewList"
[view]="view" (onAction)="onViewAction($event)">
</elements-content-tab>
</ul>
</div>
</div>
<div id="winContainer">
<elements-content-window *ngFor="let view of viewList" [view]="view" ></elements-content-window>
</div>
</div>
<elements-connect [ngStyle]="{'display': 'none'}" (onNewView)="onNewView($event)" ></elements-connect>
src/app/elements/content/content.component.scss 0 → 100644
View file @ 1071415c
.tabs {
height: 30px;
overflow-y: hidden;
overflow-x: hidden;
position: relative;
}
.tabs ul {
list-style-type: none;
height: 30px;
background-color: #3a3333;
//display: block;
display: inline-block;
min-width: 100%;
padding-left: 0;
margin: 0;
}
/*
* scrollbar
*/
.tabs::-webkit-scrollbar-track {
-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
background-color: #676a6c;
}
.tabs::-webkit-scrollbar {
height: 2px;
}
.tabs::-webkit-scrollbar-thumb {
background-color: #F5F5F5;
}
.scroll-button {
font-size: 20px;
float: left;
height: 30px;
overflow: hidden;
background-color: #3a3333;
color: white;
padding: 0 5px;
}
.scroll-button .right {
padding-left: 5px;
}
.scroll-button a.disabled {
color: #676A6D;
cursor: not-allowed;
}
#content {
height: 100%;
}
#winContainer {
height: calc(100% - 30px);
}
//
//.window {
// height: 100%;
//}
src/app/elements/content/content.component.ts 0 → 100644
View file @ 1071415c
import {Component, ElementRef, OnInit, ViewChild} from '@angular/core';
import {View, ViewAction} from '@app/model';
import {ViewService} from '@app/services';
@Component({
selector: 'elements-content',
templateUrl: './content.component.html',
styleUrls: ['./content.component.scss']
})
export class ElementContentComponent implements OnInit {
@ViewChild('tabs') tabsRef: ElementRef;
viewList: Array<View>;
static DisconnectAll() {
}
get tabsWidth() {
return (this.viewList.length + 1) * 151 + 10;
}
constructor(private viewSrv: ViewService) {
}
ngOnInit() {
this.viewList = this.viewSrv.viewList;
}
onNewView(view) {
this.scrollToEnd();
setTimeout(() => {
this.viewSrv.addView(view);
this.setViewActive(view);
}, 100);
}
onViewAction(action: ViewAction) {
switch (action.name) {
case 'active': {
this.setViewActive(action.view);
break;
}
case 'close': {
this.closeView(action.view);
break;
}
}
}
setViewActive(view) {
this.viewSrv.activeView(view);
}
closeView(view) {
let nextActiveView = null;
const index = this.viewList.indexOf(view);
if (view.active) {
// 如果关掉的是最后一个, 存在上一个
if (index === this.viewList.length - 1 && index !== 0) {
nextActiveView = this.viewList[index - 1];
} else if (index < this.viewList.length) {
nextActiveView = this.viewList[index + 1];
}
}
this.viewSrv.removeView(view);
if (nextActiveView) {
this.setViewActive(nextActiveView);
}
}
scrollLeft() {
this.tabsRef.nativeElement.scrollLeft -= 150 * 2;
}
scrollRight() {
this.tabsRef.nativeElement.scrollLeft += 150 * 2;
}
scrollToEnd() {
this.tabsRef.nativeElement.scrollLeft = this.tabsRef.nativeElement.scrollWidth;
}
}
src/app/elements/dialog/dialog.service.ts
View file @ 1071415c
import {Component, Inject, Injectable, OnInit} from '@angular/core'; import {Component, Inject, Injectable, OnInit} from '@angular/core';
import {MAT_DIALOG_DATA, MatDialog, MatDialogRef} from '@angular/material'; import {MAT_DIALOG_DATA, MatDialog, MatDialogRef} from '@angular/material';
import {LogService} from '../../app.service'; import {LogService} from '@app/services';
import {FormControl, Validators} from '@angular/forms'; import {FormControl, Validators} from '@angular/forms';
// import * as layer from 'layui-layer/src/layer.js'; // import * as layer from 'layui-layer/src/layer.js';
......
src/app/elements/elements.component.ts
View file @ 1071415c
// Elements // Elements
import {ElementTableComponent} from './table/table.component'; import {ElementLeftBarComponent} from './left-bar/left-bar.component';
import {ElementLeftbarComponent} from './leftbar/leftbar.component'; import {ElementContentComponent} from './content/content.component';
import {ElementOfooterComponent} from './ofooter/ofooter.component'; import {ElementContentViewComponent} from './content-window/content-window.component';
import {ElementFooterComponent} from './footer/footer.component'; import {ElementContentTabComponent} from './content-tab/content-tab.component';
import {ElementAssetTreeComponent} from './asset-tree/asset-tree.component';
import {ElementTreeFilterComponent} from './tree-filter/tree-filter.component';
import {ElementTermComponent} from './term/term.component'; import {ElementTermComponent} from './term/term.component';
import {ElementInteractiveComponent} from './interactive/interactive.component';
import {ChangLanWarningDialogComponent, ElementNavComponent} from './nav/nav.component'; import {ChangLanWarningDialogComponent, ElementNavComponent} from './nav/nav.component';
import {ElementPopupComponent} from './popup/popup.component';
import {ElementRdpComponent} from './rdp/rdp.component'; import {ElementRdpComponent} from './rdp/rdp.component';
import {ElementServerMenuComponent} from './server-menu/server-menu.component';
import {ElementIframeComponent} from './iframe/iframe.component'; import {ElementIframeComponent} from './iframe/iframe.component';
import {ElementDialogAlertComponent} from './dialog/dialog.service'; import {ElementDialogAlertComponent} from './dialog/dialog.service';
import {ElementGuacamoleComponent} from './guacamole/guacamole.component'; import {ElementGuacamoleComponent} from './guacamole/guacamole.component';
import {ElementSshTermComponent} from './ssh-term/ssh-term.component'; import {ElementSshTermComponent} from './ssh-term/ssh-term.component';
import {AssetTreeDialogComponent, ElementAssetTreeComponent, ManualPasswordDialogComponent} from './asset-tree/asset-tree.component'; import {ElementConnectComponent, AssetTreeDialogComponent, ManualPasswordDialogComponent} from './connect/connect.component';
import {RDPSolutionDialogComponent, FontDialogComponent} from './nav/nav.component'; import {ElementSftpComponent} from '@app/elements/sftp/sftp.component';
import {ElementSettingComponent} from '@app/elements/setting/setting.component';
export const ElementComponents = [ export const ElementComponents = [
ElementLeftbarComponent, ElementLeftBarComponent,
ElementOfooterComponent, ElementContentComponent,
ElementTableComponent, ElementContentTabComponent,
ElementFooterComponent, ElementContentViewComponent,
ElementConnectComponent,
ElementTreeFilterComponent,
ElementTermComponent, ElementTermComponent,
ElementInteractiveComponent, ElementNavComponent,
ElementNavComponent, ChangLanWarningDialogComponent,
ElementPopupComponent,
ElementRdpComponent, ElementRdpComponent,
ElementServerMenuComponent,
ElementIframeComponent, ElementIframeComponent,
ElementDialogAlertComponent, ElementDialogAlertComponent,
ElementGuacamoleComponent, ElementGuacamoleComponent,
ElementAssetTreeComponent, ElementAssetTreeComponent,
ElementSshTermComponent, ElementSshTermComponent,
ElementConnectComponent,
ElementSftpComponent,
AssetTreeDialogComponent, AssetTreeDialogComponent,
ChangLanWarningDialogComponent,
ManualPasswordDialogComponent, ManualPasswordDialogComponent,
RDPSolutionDialogComponent, ElementSettingComponent
FontDialogComponent
]; ];
src/app/elements/footer/footer.component.html deleted 100644 → 0
View file @ 669c22ad
<div class="footer fixed">
<div class="pull-right">
Version <strong>{{version}}</strong> GPL.
</div>
<div>
<strong>Copyright</strong> Jumpserver.org Team &copy; 2014-2018
</div>
</div>
src/app/elements/footer/footer.component.spec.ts deleted 100644 → 0
View file @ 669c22ad
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { ElementFooterComponent } from './footer.component';
describe('FooterComponent', () => {
let component: ElementFooterComponent;
let fixture: ComponentFixture<ElementFooterComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ ElementFooterComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(ElementFooterComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});
src/app/elements/footer/footer.component.ts deleted 100644 → 0
View file @ 669c22ad
/**
* footer
*
* @date 2017-11-07
* @author liuzheng <liuzheng712@gmail.com>
*/
import {Component, OnInit} from '@angular/core';
import {AppService, LogService} from '../../app.service';
import {DataStore, User} from '../../globals';
import {version} from '../../../environments/environment';
@Component({
selector: 'elements-footer',
templateUrl: './footer.component.html',
styleUrls: ['./footer.component.css']
})
export class ElementFooterComponent implements OnInit {
DataStore = DataStore;
User = User;
version = version;
constructor(private _appService: AppService,
private _logger: LogService) {
this._logger.log('nav.ts:NavComponent');
// this._appService.getnav()
}
ngOnInit() {
}
}
src/app/elements/guacamole/guacamole.component.html
View file @ 1071415c
<!--<iframe #rdp [src]="trust('https://inews.gtimg.com/newsapp_bt/0/3460971429/1000')" width="100%" height="100%" (mouseenter)="active()"></iframe>--> <div class="rdpIframe">
<iframe *ngIf="target" #rdp [src]="trust(target)" width="100%" height="100%" (mouseenter)="active()"></iframe> <iframe #rdpRef *ngIf="target" [src]="trust(target)" width="100%" height="100%" (mouseenter)="active()"></iframe>
</div>
src/app/elements/guacamole/guacamole.component.scss
View file @ 1071415c
...@@ -2,3 +2,7 @@ iframe { ...@@ -2,3 +2,7 @@ iframe {
border: none; border: none;
background-color: white; background-color: white;
} }
.rdpIframe {
height: 100%;
}
src/app/elements/guacamole/guacamole.component.ts
View file @ 1071415c
import {Component, ElementRef, Input, OnInit, ViewChild} from '@angular/core'; import {Component, ElementRef, Input, OnInit, ViewChild} from '@angular/core';
import {CookieService} from 'ngx-cookie-service'; import {CookieService} from 'ngx-cookie-service';
import {HttpService, LogService} from '../../app.service'; import {HttpService, LogService} from '@app/services';
import {DataStore, User} from '../../globals'; import {DataStore, User} from '@app/globals';
import {DomSanitizer} from '@angular/platform-browser'; import {DomSanitizer} from '@angular/platform-browser';
import {environment} from '../../../environments/environment'; import {View} from '@app/model';
import {NavList} from '../../pages/control/control/control.component';
@Component({ @Component({
selector: 'elements-guacamole', selector: 'elements-guacamole',
...@@ -12,12 +11,13 @@ import {NavList} from '../../pages/control/control/control.component'; ...@@ -12,12 +11,13 @@ import {NavList} from '../../pages/control/control/control.component';
styleUrls: ['./guacamole.component.scss'] styleUrls: ['./guacamole.component.scss']
}) })
export class ElementGuacamoleComponent implements OnInit { export class ElementGuacamoleComponent implements OnInit {
@Input() view: View;
@Input() host: any; @Input() host: any;
@Input() sysUser: any; @Input() sysUser: any;
@Input() remoteAppId: string; @Input() remoteAppId: string;
@Input() target: string; @Input() target: string;
@Input() index: number; @Input() index: number;
@ViewChild('rdp') el: ElementRef; @ViewChild('rdpRef') el: ElementRef;
registered = false; registered = false;
constructor(private sanitizer: DomSanitizer, constructor(private sanitizer: DomSanitizer,
...@@ -28,20 +28,20 @@ export class ElementGuacamoleComponent implements OnInit { ...@@ -28,20 +28,20 @@ export class ElementGuacamoleComponent implements OnInit {
registerHost() { registerHost() {
let action: any; let action: any;
console.log(this.sysUser);
if (this.remoteAppId) { if (this.remoteAppId) {
action = this._http.guacamole_add_remote_app(User.id, this.remoteAppId); action = this._http.guacamoleAddRemoteApp(User.id, this.remoteAppId, this.sysUser.id, this.sysUser.username, this.sysUser.password);
} else { } else {
action = this._http.guacamole_add_asset(User.id, this.host.id, this.sysUser.id, this.sysUser.username, this.sysUser.password); action = this._http.guacamoleAddAsset(User.id, this.host.id, this.sysUser.id, this.sysUser.username, this.sysUser.password);
} }
action.subscribe( action.subscribe(
data => { data => {
const base = data.result; const base = data.result;
this.target = document.location.origin + '/guacamole/#/client/' + base + '?token=' + DataStore.guacamole_token; this.target = document.location.origin + '/guacamole/#/client/' + base + '?token=' + DataStore.guacamoleToken;
NavList.List[this.index].Rdp = this.el.nativeElement;
}, },
error => { error => {
if (!this.registered) { if (!this.registered) {
console.log('Register host error, register token then connect'); this._logger.debug('Register host error, register token then connect');
this.registerToken(); this.registerToken();
} }
} }
...@@ -52,11 +52,12 @@ export class ElementGuacamoleComponent implements OnInit { ...@@ -52,11 +52,12 @@ export class ElementGuacamoleComponent implements OnInit {
const now = new Date(); const now = new Date();
const nowTime = now.getTime() / 1000; const nowTime = now.getTime() / 1000;
this.registered = true; this.registered = true;
this._http.get_guacamole_token(User.id, '').subscribe( this._logger.debug('User id is', User.id);
this._http.getGuacamoleToken(User.id, '').subscribe(
data => { data => {
// /guacamole/client will redirect to http://guacamole/#/client // /guacamole/client will redirect to http://guacamole/#/client
DataStore.guacamole_token = data['authToken']; DataStore.guacamoleToken = data['authToken'];
DataStore.guacamole_token_time = nowTime; DataStore.guacamoleTokenTime = nowTime;
this.registerHost(); this.registerHost();
}, },
error => { error => {
...@@ -68,8 +69,8 @@ export class ElementGuacamoleComponent implements OnInit { ...@@ -68,8 +69,8 @@ export class ElementGuacamoleComponent implements OnInit {
ngOnInit() { ngOnInit() {
// /guacamole/api/tokens will redirect to http://guacamole/api/tokens // /guacamole/api/tokens will redirect to http://guacamole/api/tokens
this.view.type = 'rdp';
if (this.target) { if (this.target) {
NavList.List[this.index].Rdp = this.el.nativeElement;
return null; return null;
} }
...@@ -85,10 +86,6 @@ export class ElementGuacamoleComponent implements OnInit { ...@@ -85,10 +86,6 @@ export class ElementGuacamoleComponent implements OnInit {
return this.sanitizer.bypassSecurityTrustResourceUrl(url); return this.sanitizer.bypassSecurityTrustResourceUrl(url);
} }
Disconnect() {
NavList.List[this.index].connected = false;
}
active() { active() {
this.el.nativeElement.focus(); this.el.nativeElement.focus();
} }
......
src/app/elements/iframe/iframe.component.ts
View file @ 1071415c
import {Component, Input, OnInit} from '@angular/core'; import {Component, OnInit} from '@angular/core';
import {DomSanitizer} from '@angular/platform-browser'; import {DomSanitizer} from '@angular/platform-browser';
import {NavList} from '../../pages/control/control/control.component';
import {User, DataStore} from '../../globals';
import {HttpService, LogService} from '../../app.service';
import {environment} from '../../../environments/environment';
import {CookieService} from 'ngx-cookie-service';
@Component({ @Component({
selector: 'elements-iframe', selector: 'elements-iframe',
...@@ -13,15 +8,9 @@ import {CookieService} from 'ngx-cookie-service'; ...@@ -13,15 +8,9 @@ import {CookieService} from 'ngx-cookie-service';
styleUrls: ['./iframe.component.scss'] styleUrls: ['./iframe.component.scss']
}) })
export class ElementIframeComponent implements OnInit { export class ElementIframeComponent implements OnInit {
@Input() host: any;
@Input() userid: any;
@Input() index: number;
target: string; target: string;
constructor(private sanitizer: DomSanitizer, constructor(private sanitizer: DomSanitizer) {
private _http: HttpService,
private _cookie: CookieService,
private _logger: LogService) {
} }
ngOnInit() { ngOnInit() {
...@@ -30,8 +19,4 @@ export class ElementIframeComponent implements OnInit { ...@@ -30,8 +19,4 @@ export class ElementIframeComponent implements OnInit {
trust(url) { trust(url) {
return this.sanitizer.bypassSecurityTrustResourceUrl(url); return this.sanitizer.bypassSecurityTrustResourceUrl(url);
} }
Disconnect() {
NavList.List[this.index].connected = false;
}
} }
src/app/elements/interactive/interactive.component.html deleted 100644 → 0
View file @ 669c22ad
<div class="menu">
<input type="checkbox" href="#" class="menu-open" name="menu-open" id="menu-open"/>
<label class="menu-open-button" for="menu-open">
<span class="hamburger hamburger-1"></span>
<span class="hamburger hamburger-2"></span>
<span class="hamburger hamburger-3"></span>
</label>
<a href="#" class="menu-item"> <i class="fa fa-bar-chart"></i> </a>
<a href="#" class="menu-item"> <i class="fa fa-plus"></i> </a>
<a href="#" class="menu-item"> <i class="fa fa-heart"></i> </a>
<a href="#" class="menu-item"> <i class="fa fa-envelope"></i> </a>
</div>
src/app/elements/interactive/interactive.component.scss deleted 100644 → 0
View file @ 669c22ad
@import "~sass-math/math";
//vars
$fg: #ff4081;
$bg: #3f51b5;
$pi: pi();
//config
$menu-items: 5;
$open-distance: 115px;
$opening-angle: $pi - .2;
%goo {
filter: url('#shadowed-goo');
// debug
//background:rgba(255,0,0,0.2);
}
%ball {
background: $fg;
border-radius: 100%;
width: 80px;
height: 80px;
margin-left: -40px;
position: absolute;
top: 20px;
color: white;
text-align: center;
line-height: 80px;
transform: translate3d(0, 0, 0);
transition: transform ease-out 200ms;
}
.menu-open {
display: none;
}
.menu-item {
@extend %ball;
}
.hamburger {
$width: 25px;
$height: 3px;
width: $width;
height: $height;
background: white;
display: block;
position: absolute;
top: 50%;
left: 50%;
margin-left: -$width/2;
margin-top: -$height/2;
transition: transform 200ms;
}
$hamburger-spacing: 8px;
.hamburger-1 {
transform: translate3d(0, -$hamburger-spacing, 0);
}
.hamburger-2 {
transform: translate3d(0, 0, 0);
}
.hamburger-3 {
transform: translate3d(0, $hamburger-spacing, 0);
}
.menu-open:checked + .menu-open-button {
.hamburger-1 {
transform: translate3d(0, 0, 0) rotate(45deg);
}
.hamburger-2 {
transform: translate3d(0, 0, 0) scale(0.1, 1);
}
.hamburger-3 {
transform: translate3d(0, 0, 0) rotate(-45deg);
}
}
.menu {
@extend %goo;
$width: 380px;
$height: 250px;
position: absolute;
left: 50%;
margin-left: -$width/2;
padding-top: 20px;
padding-left: $width/2;
width: $width;
height: $height;
box-sizing: border-box;
font-size: 20px;
text-align: left;
}
.menu-item {
&:hover {
background: white;
color: $fg;
}
@for $i from 1 through $menu-items {
&:nth-child(#{$i+2}) {
transition-duration: 10ms+(60ms*($i));
}
}
}
.menu-open-button {
@extend %ball;
z-index: 2;
transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.275);
transition-duration: 400ms;
transform: scale(1.1, 1.1) translate3d(0, 0, 0);
cursor: pointer;
}
.menu-open-button:hover {
transform: scale(1.2, 1.2) translate3d(0, 0, 0);
}
.menu-open:checked + .menu-open-button {
transition-timing-function: linear;
transition-duration: 200ms;
transform: scale(0.8, 0.8) translate3d(0, 0, 0);
}
.menu-open:checked ~ .menu-item {
transition-timing-function: cubic-bezier(0.935, 0.000, 0.340, 1.330);
@for $i from 1 through $menu-items {
$angle: (($pi - $opening-angle)/2)+(($opening-angle/($menu-items - 1))*($i - 1)+($pi*0.43));
&:nth-child(#{$i+2}) {
transition-duration: 80ms+(80ms*$i);
transform: translate3d(sin($angle)*$open-distance, cos($angle)*$open-distance, 0);
}
}
}
src/app/elements/interactive/interactive.component.spec.ts deleted 100644 → 0
View file @ 669c22ad
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { ElementInteractiveComponent } from './interactive.component';
describe('ElementInteractiveComponent', () => {
let component: ElementInteractiveComponent;
let fixture: ComponentFixture<ElementInteractiveComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ ElementInteractiveComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(ElementInteractiveComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});
src/app/elements/interactive/interactive.component.ts deleted 100644 → 0
View file @ 669c22ad
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'elements-interactive',
templateUrl: './interactive.component.html',
styleUrls: ['./interactive.component.scss']
})
export class ElementInteractiveComponent implements OnInit {
constructor() { }
ngOnInit() {
}
}
src/app/elements/left-bar/left-bar.component.html 0 → 100644
View file @ 1071415c
<div class="sidebar" fxLayout="column" >
<div fxflex="30px" class="tree-filter">
<elements-tree-filter ></elements-tree-filter>
</div>
<div fxflex="calc(100% - 60px)" class="overflow ngx-scroll-overlay">
<elements-asset-tree ></elements-asset-tree>
</div>
<div fxflex="30px" class="footer-version">
<p> Version <strong>{{version}}</strong></p>
</div>
</div>
src/app/elements/left-bar/left-bar.component.scss 0 → 100644
View file @ 1071415c
.sidebar {
height: 100%;
width: 100%;
overflow: auto;
}
label {
margin-bottom: 0;
}
.fa.fa-undefined:before {
content: "\f26c";
}
.overflow {
display: flex;
width: 100%;
height: 100%;
float: left;
position: inherit;
background: #2f2a2a;
color: #d6cbcb;
}
.footer-version {
background: #2f2a2a;
font-size: 9pt;
left: 0;
width: 100%;
padding: 1px 20px 0 20px;
border-top: 1px solid #e7eaec;
bottom: 0;
height: 30px;
}
.footer-version > p {
height: 8px;
font-size: 13px;
padding-top: 2px;
padding-bottom: 2px;
color: #d6cbcb;
}
.ngx-scroll-overlay {
overflow: auto; // for FF
}
src/app/elements/left-bar/left-bar.component.ts 0 → 100644
View file @ 1071415c
import {Component} from '@angular/core';
import {DataStore} from '@app/globals';
import {version} from '@src/environments/environment';
@Component({
selector: 'elements-left-bar',
templateUrl: './left-bar.component.html',
styleUrls: ['./left-bar.component.scss'],
})
export class ElementLeftBarComponent {
DataStore = DataStore;
version = version;
static Hide() {
DataStore.showLeftBar = false;
window.dispatchEvent(new Event('resize'));
}
static Show() {
DataStore.showLeftBar = true;
window.dispatchEvent(new Event('resize'));
}
}
src/app/elements/leftbar/leftbar.component.html deleted 100644 → 0
View file @ 669c22ad
<mat-sidenav-container>
<mat-sidenav #sidenav mode="side" opened="true" class="example-sidenav"
[fixedInViewport]="options.value.fixed" [fixedTopGap]="options.value.top"
[fixedBottomGap]="options.value.bottom">
<nav>
<div class="header">
<a href="http://www.jumpserver.org" target="_blank">
<img alt="image" height="55" src="/static/imgs/logo-text.png" style="margin-left: 10px">
</a>
</div>
<div class="body">
<ul class="nav metismenu nav-frist-level">
<li *ngFor="let bar of leftbar;let i = index" [ngClass]="{'active':i==active}">
<a (click)="gotoLink(bar.link,i,-1)">
<i class="{{bar.class}}"></i>
<span class="nav-label">{{bar.name|trans}}</span>
<span class="{{bar.label}}"></span>
</a>
<ul class="nav nav-second-level collapse">
<li *ngFor="let child of bar.child;let ii = index" [ngClass]="{'active':ii==active2}">
<a (click)="gotoLink(child.link,i,ii)">{{child.name|trans}}</a>
</li>
</ul>
</li>
</ul>
</div>
</nav>
</mat-sidenav>
<div class="navbar-header">
<button class="navbar-minimalize minimalize-styl-2 btn btn-primary " (click)="sidenav.toggle()"><i
class="fa fa-bars"></i></button>
</div>
</mat-sidenav-container>
src/app/elements/leftbar/leftbar.component.scss deleted 100644 → 0
View file @ 669c22ad
li a {
background-color: rgba(0, 0, 0, 0);
box-sizing: border-box;
color: rgb(167, 177, 194);
cursor: pointer;
display: block;
font-family: "open sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 13px;
font-weight: 600;
height: 46px;
line-height: 18.5714px;
list-style-image: none;
list-style-position: outside;
list-style-type: none;
padding-bottom: 14px;
padding-left: 25px;
padding-right: 20px;
padding-top: 14px;
position: relative;
text-align: left;
text-decoration-color: rgb(167, 177, 194);
text-decoration-line: none;
text-decoration-style: solid;
text-size-adjust: 100%;
width: 220px;
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
}
li.active > a {
width: 216px;
color: white;
}
li.active ul.nav.nav-second-level li {;
border-bottom-style: none;
border-bottom-width: 0px;
box-sizing: border-box;
color: rgb(103, 106, 108);
display: block;
font-family: "open sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 13px;
height: 32px;
line-height: 18.5714px;
list-style-image: none;
list-style-position: outside;
list-style-type: none;
position: relative;
text-align: left;
text-size-adjust: 100%;
visibility: visible;
width: 216px;
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
}
li.active ul.nav.nav-second-level {
box-sizing: border-box;
color: rgb(103, 106, 108);
display: block;
font-family: "open sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 13px;
line-height: 18.5714px;
list-style-image: none;
list-style-position: outside;
list-style-type: none;
margin-bottom: 0px;
margin-top: 0px;
padding-left: 0px;
text-align: left;
text-size-adjust: 100%;
visibility: visible;
width: 216px;
-webkit-margin-after: 0px;
-webkit-margin-before: 0px;
-webkit-margin-end: 0px;
-webkit-margin-start: 0px;
-webkit-padding-start: 0px;
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
}
mat-sidenav {
background-color: #2f4050;
}
nav {
width: 220px;
font-family: "open sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 13px;
}
div.header {
background-color: #202c37;
}
div.body {
background-color: #2f4050;
height: 100%;
}
li:hover {
color: white !important;
}
.nav-second-level li a {
padding: 7px 10px 7px 52px;
}
src/app/elements/leftbar/leftbar.component.spec.ts deleted 100644 → 0
View file @ 669c22ad
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { ElementLeftbarComponent } from './leftbar.component';
describe('ElementLeftbarComponent', () => {
let component: ElementLeftbarComponent;
let fixture: ComponentFixture<ElementLeftbarComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ ElementLeftbarComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(ElementLeftbarComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});
src/app/elements/leftbar/leftbar.component.ts deleted 100644 → 0
View file @ 669c22ad
import {Component, OnInit} from '@angular/core';
import {FormBuilder, FormGroup} from '@angular/forms';
import {Router} from '@angular/router';
@Component({
selector: 'elements-leftbar',
templateUrl: './leftbar.component.html',
styleUrls: ['./leftbar.component.scss']
})
export class ElementLeftbarComponent implements OnInit {
leftbar = [
{
'name': 'Dashboard',
'class': 'fa fa-dashboard',
'label': '',
'link': '/'
},
{
'name': 'Users',
'class': 'fa fa-group',
'label': 'fa arrow',
'child': [
{
'name': 'User',
}, {
'name': 'User group',
}, {
'name': 'Login logs',
}
]
},
{
'name': 'Assets',
'class': 'fa fa-inbox',
'label': 'fa arrow',
'child': [
{
'name': 'Asset',
}, {
'name': 'Asset group',
}, {
'name': 'Cluster',
}, {
'name': 'Admin user',
}, {
'name': 'System user',
}, {
'name': 'Labels',
}
]
},
{
'name': 'Perms',
'class': 'fa fa-edit',
'label': 'fa arrow',
'child': [{'name': 'Asset permission'}]
},
{
'name': 'Sessions',
'class': 'fa fa-rocket',
'label': 'fa arrow',
'child': [
{
'name': 'Session online'
},
{
'name': 'Session offline'
},
{
'name': 'Commands'
},
{
'name': 'Terminal'
},
]
},
{
'name': 'Job Center',
'class': 'fa fa-coffee',
'label': 'fa arrow',
'child': [
{
'name': 'Task',
'link': '/task'
},
]
},
{
'name': 'Settings',
'class': 'fa fa-gears',
'label': '',
'link': '/luna/setting'
},
];
options: FormGroup;
active: number;
active2: number;
constructor(fb: FormBuilder,
private _router: Router) {
this.options = fb.group({
'fixed': true,
'top': 0,
'bottom': 0,
});
}
ngOnInit() {
this.active = 6;
this.active2 = 0;
}
gotoLink(link: string, index: number, index2: number) {
if (link) {
if (link === '/luna/setting') {
this._router.navigate(['setting']);
} else {
window.location.href = link;
}
}
this.active = index;
this.active2 = index2;
}
}
src/app/elements/nav/fontDialog.html deleted 100644 → 0
View file @ 669c22ad
<h1 mat-dialog-title>{{"Set font"|trans}}</h1>
<mat-form-field>
<input matInput placeholder='{{"Font size"|trans}}' name="fontSize" type="number" min="5" max="60" [(ngModel)]="fontSize">
</mat-form-field>
<div style="float: right">
<button mat-raised-button (click)="onNoClick()">{{"Cancel"|trans}}</button>
<button mat-raised-button color="primary" [disabled]="!isValid()" (click)="onSubmit()">{{"Confirm"|trans}}</button>
</div>
src/app/elements/nav/nav.component.css
View file @ 1071415c
.nav { .nav {
display: block; display: block;
margin-top: 2px; height: 30px;
height: 30px padding-top: 0;
background-color: #463e3e;
list-style: none;
} }
.nav ul { .nav ul {
list-style-type: none; list-style-type: none;
line-height: 24px; line-height: 24px;
margin: 0;
box-sizing: border-box;
font-weight: 400;
text-align: left;
} }
.nav li { .nav li {
display: inline-block; display: inline-block;
} }
.nav a { .nav .dropdown a {
color: #f0f0f1; color: #f0f0f1;
font-family: Roboto,sans-serif;
font-size: 13px;
font-weight: 300;
text-decoration: none; text-decoration: none;
padding: 6px 15px 6px 15px; padding: 6px 15px;
height: 30px;
} }
.nav a:hover { .nav a:hover {
...@@ -46,9 +56,9 @@ ...@@ -46,9 +56,9 @@
direction: ltr; direction: ltr;
width: auto; width: auto;
top: auto; top: auto;
left: 0px; left: 0;
margin-left: 0px; margin-left: 0;
margin-top: 0px; margin-top: 0;
min-width: 150px; min-width: 150px;
} }
...@@ -57,11 +67,11 @@ ...@@ -57,11 +67,11 @@
} }
.nav .dropdown-content li { .nav .dropdown-content li {
float: left; /*float: left;*/
display: flex; display: flex;
} }
.nav .dropdown-content li a { .nav .dropdown-content a {
padding: 6px 14px 6px 25px; padding: 6px 14px 6px 25px;
white-space: nowrap; white-space: nowrap;
font-family: 'Roboto', sans-serif; font-family: 'Roboto', sans-serif;
...@@ -74,7 +84,7 @@ ...@@ -74,7 +84,7 @@
} }
.nav .dropdown-content li a span { .nav .dropdown-content li a span {
float: right; /*float: right;*/
} }
.dropdown-content li:hover { .dropdown-content li:hover {
...@@ -95,3 +105,19 @@ ...@@ -95,3 +105,19 @@
cursor: default; cursor: default;
color: #c5babc; color: #c5babc;
} }
.nav ul li.disconnected {
background-color: darkgray;
}
.flag {
display: none;
color: #19aa8d;
padding-right: 10px;
}
.active .flag {
display: inline;
}
src/app/elements/nav/nav.component.html
View file @ 1071415c
<script src="../../trans.pipe.spec.ts"></script>
<div class="nav"> <div class="nav">
<ul> <ul class="nav-main">
<li><a href="/"><img src="static/imgs/logo.png" height="26px"/></a> <li style="padding-right: 10px">
<a href="/"><img src="static/imgs/logo.png" height="26px"/></a>
</li> </li>
<li *ngFor="let v of DataStore.Nav" [ngClass]="{'dropdown': v.children}"> <li *ngFor="let v of navs" [ngClass]="{'dropdown': v.children}" >
<a>{{v.name|trans}}</a> <a>{{v.name|trans}}</a>
<ul [ngClass]="{'dropdown-content': v.children}"> <ul [ngClass]="{'dropdown-content': v.children}" *ngIf="v.children">
<li *ngFor="let vv of v.children" [ngClass]="{'disabled': vv.disable}"> <li *ngFor="let vv of v.children" [ngClass]="{'disabled': vv.disable}">
<a *ngIf="vv.href" [routerLink]="[vv.href]">{{vv.name|trans}}</a> <a *ngIf="vv.href" [routerLink]="[vv.href]">{{vv.name|trans}}</a>
<a id="{{vv.id}}" *ngIf="vv.click" (click)="click(vv.click)">{{vv.name|trans}}</a> <a id="{{vv.id}}" *ngIf="vv.click && !vv.hide" (click)="click(vv.click)">{{vv.name|trans}}</a>
</li> </li>
</ul> </ul>
</li> </li>
<li [ngClass]="{'dropdown': true}">
<a>{{"Tab List"|trans}}</a>
<ul *ngIf="viewList.length > 0" [ngClass]="{'dropdown-content': true}">
<ng-container *ngFor="let v of viewList, let idx = index" >
<li *ngIf="v.nick!=null" [ngClass]="{'disconnected':!v.connected, 'hidden': v.closed != false}">
<span [class.active]="v.active">
<a id="{{ 'tab' + idx }}" (click)="_viewSrv.activeView(v)"><i class="fa fa-circle flag"></i> {{v.nick}} </a>
</span>
</li>
</ng-container>
</ul>
</li>
</ul> </ul>
</div> </div>
src/app/elements/nav/nav.component.ts
View file @ 1071415c
This diff is collapsed.
src/app/elements/nav/rdpSolutionDialog.html deleted 100644 → 0
View file @ 669c22ad
<h1 mat-dialog-title>{{"Set RDP solution"|trans}}</h1>
<mat-form-field>
<mat-select [(value)]="solution"
placeholder="{{'Select a solution'|trans}}" >
<mat-option *ngFor="let s of solutions" value="{{s}}">{{s}}</mat-option>
</mat-select>
</mat-form-field>
<div style="float: right">
<button mat-raised-button (click)="onNoClick()">{{"Cancel"|trans}}</button>
<button mat-raised-button color="primary" (click)="onSubmit()">{{"Confirm"|trans}}</button>
</div>
src/app/elements/ofooter/ofooter.component.html deleted 100644 → 0
View file @ 669c22ad
<div class="footer fixed">
<div class="pull-right">
Version <strong>{{version}}</strong> GPLv2.
<img style="display: none" src="http://www.jumpserver.org/img/evaluate_avatar1.jpg">
</div>
<div>
<strong>Copyright</strong> 北京堆栈科技有限公司 &copy; 2014-2018
</div>
</div>
src/app/elements/ofooter/ofooter.component.spec.ts deleted 100644 → 0
View file @ 669c22ad
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { ElementOfooterComponent } from './ofooter.component';
describe('ElementOfooterComponent', () => {
let component: ElementOfooterComponent;
let fixture: ComponentFixture<ElementOfooterComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ ElementOfooterComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(ElementOfooterComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});
src/app/elements/ofooter/ofooter.component.ts deleted 100644 → 0
View file @ 669c22ad
import {Component, OnInit} from '@angular/core';
import {version} from '../../../environments/environment';
import {DataStore} from '../../globals';
@Component({
selector: 'elements-ofooter',
templateUrl: './ofooter.component.html',
styleUrls: ['./ofooter.component.scss']
})
export class ElementOfooterComponent implements OnInit {
version = version;
constructor() {
DataStore.NavShow = false;
}
ngOnInit() {
}
}
src/app/elements/popup/popup.component.spec.ts deleted 100644 → 0
View file @ 669c22ad
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { ElementPopupComponent } from './popup.component';
describe('ElementPopupComponent', () => {
let component: ElementPopupComponent;
let fixture: ComponentFixture<ElementPopupComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ ElementPopupComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(ElementPopupComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should be created', () => {
expect(component).toBeTruthy();
});
});
src/app/elements/popup/popup.component.ts deleted 100644 → 0
View file @ 669c22ad
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'elements-popup',
templateUrl: './popup.component.html',
styleUrls: ['./popup.component.css']
})
export class ElementPopupComponent implements OnInit {
constructor() { }
ngOnInit() {
}
}
src/app/elements/rdp/rdp.component.ts
View file @ 1071415c
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
*/ */
import {AfterViewInit, Component, ElementRef, OnInit, ViewChild} from '@angular/core'; import {AfterViewInit, Component, ElementRef, OnInit, ViewChild} from '@angular/core';
import {ActivatedRoute, Params} from '@angular/router'; import {ActivatedRoute, Params} from '@angular/router';
import {DataStore} from '../../globals'; import {DataStore} from '@app/globals';
declare let Mstsc: any; declare let Mstsc: any;
......
src/app/elements/server-menu/server-menu.component.html deleted 100644 → 0
View file @ 669c22ad
<div class="ES-menu" [ngStyle]="{'top':top,'left':left}">
<ul class="dropdown-content">
<li [ngClass]="m.type" *ngFor="let m of MenuList">
<a (click)="m.action" *ngIf="m.type!='line'">{{m.name}}</a>
</li>
</ul>
</div>
src/app/elements/server-menu/server-menu.component.scss deleted 100644 → 0
View file @ 669c22ad
.ES-menu {
display: block;
width: 120px;
background-color: #2f2a2a;
position: absolute;
}
.ES-menu ul {
list-style-type: none;
line-height: 24px;
}
.ES-menu li {
display: inline-block;
}
.dropdown {
position: relative;
display: inline-block;
}
.dropdown:hover {
background-color: #2d2828;
}
.dropdown-content {
position: absolute;
background-color: black;
color: #c6bcbc;
padding: 4px 0;
z-index: 999;
float: none;
list-style: none;
line-height: normal;
direction: ltr;
width: auto;
top: auto;
left: 0px;
margin-left: 0px;
margin-top: 0px;
min-width: 150px;
}
.ES-menu:hover .dropdown-content {
display: block;
}
.ES-menu .dropdown-content li {
float: left;
display: flex;
}
.ES-menu .dropdown-content li a {
padding: 6px 14px 6px 14px;
white-space: nowrap;
font-family: 'Roboto', sans-serif;
font-size: 13px;
font-weight: 300;
position: relative;
text-decoration: none;
min-width: 150px;
line-height: normal;
}
.ES-menu .dropdown-content li a span {
float: right;
}
.dropdown-content li:hover {
background-color: #3a3333;
color: black;
width: 100%;
}
.dropdown-content li.disabled:hover {
background-color: black;
}
.dropdown-content li.disabled a {
color: #c5babc;
}
.dropdown-content li.disabled a:hover {
cursor: default;
color: #c5babc;
}
.ES-menu a {
color: #f0f0f1;
text-align: center;
text-decoration: none;
padding: 6px 15px 6px 15px;
}
.ES-menu a:hover {
color: #fff;
cursor: pointer
}
.ES-menu .line {
height: 1px;
width: 100%;
background-color: white;
}
src/app/elements/server-menu/server-menu.component.spec.ts deleted 100644 → 0
View file @ 669c22ad
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { ElementServerMenuComponent } from './server-menu.component';
describe('ElementServerMenuComponent', () => {
let component: ElementServerMenuComponent;
let fixture: ComponentFixture<ElementServerMenuComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ ElementServerMenuComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(ElementServerMenuComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});
src/app/elements/server-menu/server-menu.component.ts deleted 100644 → 0
View file @ 669c22ad
import {Component, OnInit} from '@angular/core';
import {DialogService} from '../dialog/dialog.service';
export class Menu {
name: string;
type: string;
action: any;
}
@Component({
selector: 'elements-server-menu',
templateUrl: './server-menu.component.html',
styleUrls: ['./server-menu.component.scss'],
})
export class ElementServerMenuComponent implements OnInit {
MenuList: Array<any>;
top: number;
left: number;
constructor(private _dialog: DialogService) {
}
ngOnInit() {
const m = new Menu();
const line = new Menu();
m.action = '';
m.name = 'test';
m.type = 'lll';
line.type = 'line';
this.MenuList = [m, m, line, m, m];
this._dialog.alert('sss');
}
public contextmenu(top: number, left: number) {
this.top = top;
this.left = left;
}
}
src/app/elements/setting/setting.component.html 0 → 100644
View file @ 1071415c
<h1 mat-dialog-title>{{"Setting"|trans}}</h1>
<mat-form-field>
<mat-select [(value)]="setting.rdpSolution"
placeholder="{{'Select a solution'|trans}}" >
<mat-option *ngFor="let s of solutionsChoices" value="{{s}}">{{s}}</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field>
<input [(value)]="setting.fontSize" matInput placeholder='{{"Font size"|trans}}' name="fontSize" type="number" min="5" max="60" >
</mat-form-field>
<mat-form-field>
<mat-select [(value)]="setting.isLoadTreeAsync"
placeholder="{{'Load tree async'|trans }}" >
<mat-option *ngFor="let s of boolChoices" value="{{s.value}}">{{s.name|trans}}</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field>
<mat-select [(value)]="setting.isSkipAllManualPassword"
placeholder="{{'Skip manual password'|trans }}" >
<mat-option *ngFor="let s of boolChoices" value="{{s.value}}">{{s.name|trans}}</mat-option>
</mat-select>
</mat-form-field>
<div style="float: right">
<button mat-raised-button (click)="onNoClick()">{{"Cancel"|trans}}</button>
<button mat-raised-button color="primary" (click)="onSubmit()">{{"Confirm"|trans}}</button>
</div>
src/app/elements/setting/setting.component.ts 0 → 100644
View file @ 1071415c
import {Component, OnInit} from '@angular/core';
import { MatDialogRef} from '@angular/material';
import {SettingService} from '@app/services';
import {Setting} from '@app/model';
@Component({
selector: 'elements-setting',
templateUrl: './setting.component.html',
styles: ['.mat-form-field { width: 100%;}']
})
export class ElementSettingComponent implements OnInit {
solutionsChoices = ['Auto', '1024x768', '1366x768', '1600x900', '1920×1080'];
boolChoices = [{name: 'Yes', value: '1'}, {name: 'No', value: '0'}];
setting: Setting;
constructor(public dialogRef: MatDialogRef<ElementSettingComponent>,
private settingSrv: SettingService) {
}
ngOnInit() {
this.setting = this.settingSrv.setting;
}
onSubmit() {
this.settingSrv.save();
this.dialogRef.close();
}
onNoClick(): void {
this.dialogRef.close();
}
}
src/app/elements/sftp/sftp.component.spec.ts
View file @ 1071415c
import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { SftpComponent } from './sftp.component'; import { ElementSftpComponent } from './sftp.component';
describe('SftpComponent', () => { describe('ElementSftpComponent', () => {
let component: SftpComponent; let component: ElementSftpComponent;
let fixture: ComponentFixture<SftpComponent>; let fixture: ComponentFixture<ElementSftpComponent>;
beforeEach(async(() => { beforeEach(async(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
declarations: [ SftpComponent ] declarations: [ ElementSftpComponent ]
}) })
.compileComponents(); .compileComponents();
})); }));
beforeEach(() => { beforeEach(() => {
fixture = TestBed.createComponent(SftpComponent); fixture = TestBed.createComponent(ElementSftpComponent);
component = fixture.componentInstance; component = fixture.componentInstance;
fixture.detectChanges(); fixture.detectChanges();
}); });
......
src/app/elements/sftp/sftp.component.ts
View file @ 1071415c
import {Component, OnInit, Input, ElementRef, ViewChild} from '@angular/core'; import {Component, OnInit, Input, ElementRef, ViewChild} from '@angular/core';
import {DataStore} from '../../globals'; import {DataStore} from '@app/globals';
import {DomSanitizer} from '@angular/platform-browser'; import {DomSanitizer} from '@angular/platform-browser';
@Component({ @Component({
...@@ -7,7 +7,7 @@ import {DomSanitizer} from '@angular/platform-browser'; ...@@ -7,7 +7,7 @@ import {DomSanitizer} from '@angular/platform-browser';
templateUrl: './sftp.component.html', templateUrl: './sftp.component.html',
styleUrls: ['./sftp.component.scss'] styleUrls: ['./sftp.component.scss']
}) })
export class SftpComponent implements OnInit { export class ElementSftpComponent implements OnInit {
@Input() host: any; @Input() host: any;
target: any; target: any;
@ViewChild('sftp') el: ElementRef; @ViewChild('sftp') el: ElementRef;
......
src/app/elements/ssh-term/ssh-term.component.ts
View file @ 1071415c
import {AfterViewInit, Component, Input, OnInit, OnDestroy } from '@angular/core'; import {Component, Input, OnInit, OnDestroy } from '@angular/core';
import {Terminal} from 'xterm'; import {Terminal} from 'xterm';
import {NavList, View} from '../../pages/control/control/control.component'; import {View} from '@app/model';
import {UUIDService} from '../../app.service'; import {LogService, SettingService, UUIDService} from '@app/services';
import {CookieService} from 'ngx-cookie-service'; import {Socket} from '@app/utils/socket';
import {Socket} from '../../utils/socket'; import {getWsSocket, translate} from '@app/globals';
import {getWsSocket} from '../../globals';
@Component({ @Component({
...@@ -12,8 +11,9 @@ import {getWsSocket} from '../../globals'; ...@@ -12,8 +11,9 @@ import {getWsSocket} from '../../globals';
templateUrl: './ssh-term.component.html', templateUrl: './ssh-term.component.html',
styleUrls: ['./ssh-term.component.scss'] styleUrls: ['./ssh-term.component.scss']
}) })
export class ElementSshTermComponent implements OnInit, AfterViewInit, OnDestroy { export class ElementSshTermComponent implements OnInit, OnDestroy {
@Input() host: any; @Input() host: any;
@Input() view: View;
@Input() sysUser: any; @Input() sysUser: any;
@Input() index: number; @Input() index: number;
@Input() token: string; @Input() token: string;
...@@ -22,29 +22,25 @@ export class ElementSshTermComponent implements OnInit, AfterViewInit, OnDestroy ...@@ -22,29 +22,25 @@ export class ElementSshTermComponent implements OnInit, AfterViewInit, OnDestroy
secret: string; secret: string;
ws: Socket; ws: Socket;
roomID: string; roomID: string;
view: View;
constructor(private _uuid: UUIDService, private _cookie: CookieService) { constructor(private _uuid: UUIDService, private _logger: LogService, private settingSvc: SettingService) {
} }
ngOnInit() { ngOnInit() {
this.view = NavList.List[this.index];
this.secret = this._uuid.gen(); this.secret = this._uuid.gen();
this.newTerm(); this.newTerm();
getWsSocket().then(sock => { getWsSocket().then(sock => {
this.ws = sock; this.ws = sock;
this.connectHost(); this.connectHost();
}); });
} this.view.type = 'ssh';
ngAfterViewInit() {
} }
newTerm() { newTerm() {
const fontSize = localStorage.getItem('fontSize') || '14'; const fontSize = this.settingSvc.setting.fontSize;
this.term = new Terminal({ this.term = new Terminal({
fontFamily: 'monaco, Consolas, "Lucida Console", monospace', fontFamily: 'monaco, Consolas, "Lucida Console", monospace',
fontSize: parseInt(fontSize, 10), fontSize: fontSize,
rightClickSelectsWord: true, rightClickSelectsWord: true,
theme: { theme: {
background: '#1f1b1b' background: '#1f1b1b'
...@@ -52,14 +48,14 @@ export class ElementSshTermComponent implements OnInit, AfterViewInit, OnDestroy ...@@ -52,14 +48,14 @@ export class ElementSshTermComponent implements OnInit, AfterViewInit, OnDestroy
}); });
this.view.Term = this.term; this.view.Term = this.term;
this.term.attachCustomKeyEventHandler(e => { this.term.attachCustomKeyEventHandler(e => {
if (e.ctrlKey && e.key == 'c' && term.hasSelection()) { if (e.ctrlKey && e.key === 'c' && this.term.hasSelection()) {
return false; return false;
} }
if (e.ctrlKey && e.key == 'v') { if (e.ctrlKey && e.key === 'v') {
return false; return false;
} }
return true; return true;
}) });
} }
changeWinSize(size: Array<number>) { changeWinSize(size: Array<number>) {
...@@ -68,7 +64,17 @@ export class ElementSshTermComponent implements OnInit, AfterViewInit, OnDestroy ...@@ -68,7 +64,17 @@ export class ElementSshTermComponent implements OnInit, AfterViewInit, OnDestroy
} }
} }
connectHost() { reconnect() {
if (this.view.connected !== true) {
if (!confirm(translate('Are you sure to reconnect it?(RDP not support)'))) {
return;
}
}
this.secret = this._uuid.gen();
this.emitHostAndTokenData();
}
emitHostAndTokenData() {
if (this.host) { if (this.host) {
const data = { const data = {
uuid: this.host.id, uuid: this.host.id,
...@@ -83,9 +89,13 @@ export class ElementSshTermComponent implements OnInit, AfterViewInit, OnDestroy ...@@ -83,9 +89,13 @@ export class ElementSshTermComponent implements OnInit, AfterViewInit, OnDestroy
'token': this.token, 'secret': this.secret, 'token': this.token, 'secret': this.secret,
'size': [this.term.cols, this.term.rows] 'size': [this.term.cols, this.term.rows]
}; };
console.log('On token event trigger'); this._logger.debug('On token event trigger');
this.ws.emit('token', data); this.ws.emit('token', data);
} }
}
connectHost() {
this.emitHostAndTokenData();
this.term.on('data', data => { this.term.on('data', data => {
const d = {'data': data, 'room': this.roomID}; const d = {'data': data, 'room': this.roomID};
...@@ -100,39 +110,36 @@ export class ElementSshTermComponent implements OnInit, AfterViewInit, OnDestroy ...@@ -100,39 +110,36 @@ export class ElementSshTermComponent implements OnInit, AfterViewInit, OnDestroy
// 服务器主动断开 // 服务器主动断开
this.ws.on('disconnect', () => { this.ws.on('disconnect', () => {
console.log('On disconnect event trigger'); this._logger.debug('On disconnect event trigger');
this.close(); this.view.connected = false;
}); });
this.ws.on('logout', data => { this.ws.on('logout', data => {
if (data.room === this.roomID) { if (data.room === this.roomID) {
console.log('On logout event trigger: ', data.room, this.roomID); this._logger.debug('On logout event trigger: ', data.room, this.roomID);
this.view.connected = false; this.view.connected = false;
} }
}); });
this.ws.on('room', data => { this.ws.on('room', data => {
if (data.secret === this.secret && data.room) { if (data.secret === this.secret && data.room) {
console.log('On room', data); this._logger.debug('On room', data);
this.roomID = data.room; this.roomID = data.room;
this.view.room = data.room; this.view.room = data.room;
this.view.connected = true;
} }
}); });
} }
// 客户端主动关闭
close() {
if (this.view && (this.view.room === this.roomID)) {
this.view.connected = false;
this.ws.emit('logout', this.roomID);
}
}
active() { active() {
this.term.focus(); this.term.focus();
} }
ngOnDestroy(): void { ngOnDestroy(): void {
this.close(); this._logger.debug('Close view');
if (this.view && (this.view.room === this.roomID)) {
this.view.connected = false;
this.ws.emit('logout', this.roomID);
}
} }
} }
src/app/elements/table/table.component.html deleted 100644 → 0
View file @ 669c22ad
<div>
<input
type='text'
placeholder='Type to filter the name column...'
(keyup)='updateFilter($event)'
*ngIf="config.search"/>
<ngx-datatable
#table
class="material"
[rows]="rows"
[columns]="columns"
[limit]="config.limit"
[columnMode]="config.columnMode"
[headerHeight]="config.headerHeight"
[footerHeight]="config.footerHeight"
[rowHeight]="config.rowHeight"
[scrollbarV]="config.scrollbarV"
[scrollbarH]="config.scrollbarH"
></ngx-datatable>
<mat-paginator #paginator
[pageSize]="config.pageSize"
[pageSizeOptions]="config.pageSizeOptions"
(click)="test()">
</mat-paginator>
</div>
<button (click)="test()">ssss</button>
src/app/elements/table/table.component.scss deleted 100644 → 0
View file @ 669c22ad
input {
padding: 8px;
margin: 15px auto;
width: 30%;
}
.material {
box-shadow: 0 3px 5px -3px rgba(0, 0, 0, 0.2);
}
src/app/elements/table/table.component.spec.ts deleted 100644 → 0
View file @ 669c22ad
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { ElementTableComponent } from './table.component';
describe('ElementTableComponent', () => {
let component: ElementTableComponent;
let fixture: ComponentFixture<ElementTableComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ ElementTableComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(ElementTableComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});
src/app/elements/table/table.component.ts deleted 100644 → 0
View file @ 669c22ad
import {Component, Input, OnInit, ViewChild} from '@angular/core';
import {DatatableComponent} from '@swimlane/ngx-datatable';
import {MatPaginator} from '@angular/material';
import {LogService} from '../../app.service';
export let Config: {
search: boolean,
scrollbarV: boolean,
scrollbarH: boolean,
rowHeight: number,
footerHeight: number,
headerHeight: number,
limit: number,
columnMode: string,
pageSize: number,
pageSizeOptions: Array<number>,
} = {
search: false,
scrollbarV: false,
scrollbarH: false,
rowHeight: 50,
footerHeight: 50,
headerHeight: 50,
limit: 10,
columnMode: 'force',
pageSize: 10,
pageSizeOptions: [5, 10, 20],
};
@Component({
selector: 'elements-table',
templateUrl: './table.component.html',
styleUrls: ['./table.component.scss']
})
export class ElementTableComponent implements OnInit {
@Input() rows: Array<any>;
@Input() columns: Array<any>;
@Input() config: any;
temp = [];
@ViewChild(DatatableComponent) table: DatatableComponent;
@ViewChild(MatPaginator) paginator: MatPaginator;
constructor(private _logger: LogService) {
}
ngOnInit() {
Config = this.config;
this.paginator.length = this.rows.length;
}
updateFilter(event) {
const val = event.target.value.toLowerCase();
// filter our data
const temp = this.temp.filter(function (d) {
return d.name.toLowerCase().indexOf(val) !== -1 || !val;
});
// update the rows
this.rows = temp;
// Whenever the filter changes, always go back to the first page
this.table.offset = 0;
}
test() {
console.log(this.paginator._pageIndex);
console.log(this.paginator._pageIndex * this.paginator.pageSize + 1);
this.table.limit = this.paginator.pageSize;
}
}
src/app/elements/term/term.component.ts
View file @ 1071415c
...@@ -2,14 +2,11 @@ import {AfterViewInit, Component, Input, Output, OnInit, ViewChild, EventEmitter ...@@ -2,14 +2,11 @@ import {AfterViewInit, Component, Input, Output, OnInit, ViewChild, EventEmitter
import {ElementRef} from '@angular/core'; import {ElementRef} from '@angular/core';
import {Terminal} from 'xterm'; import {Terminal} from 'xterm';
import {fit} from 'xterm/lib/addons/fit/fit'; import {fit} from 'xterm/lib/addons/fit/fit';
import {Observable} from 'rxjs/Rx'; import {LogService} from '@app/services';
import {CookieService} from 'ngx-cookie-service'; import {Observable, fromEvent} from 'rxjs';
import {debounceTime, distinctUntilChanged } from 'rxjs/operators';
import * as $ from 'jquery/dist/jquery.min.js'; import * as $ from 'jquery/dist/jquery.min.js';
import 'rxjs/Observable'; import 'rxjs/Observable';
import 'rxjs/add/operator/debounceTime';
import 'rxjs/add/operator/distinctUntilChanged';
import {NavList} from '../../pages/control/control/control.component';
@Component({ @Component({
...@@ -24,19 +21,20 @@ export class ElementTermComponent implements OnInit, AfterViewInit { ...@@ -24,19 +21,20 @@ export class ElementTermComponent implements OnInit, AfterViewInit {
@Output() winSizeChangeTrigger = new EventEmitter<Array<number>>(); @Output() winSizeChangeTrigger = new EventEmitter<Array<number>>();
winSizeChange$: Observable<any>; winSizeChange$: Observable<any>;
constructor(private _cookie: CookieService) { constructor(private _logger: LogService) {
} }
ngOnInit() { ngOnInit() {
this.winSizeChange$ = Observable.fromEvent(window, 'resize') this.winSizeChange$ = fromEvent(window, 'resize').pipe(
.debounceTime(500) debounceTime(500),
.distinctUntilChanged(); distinctUntilChanged(),
);
this.winSizeChange$ this.winSizeChange$
.subscribe(() => { .subscribe(() => {
if (NavList.List[NavList.Active].type !== 'rdp') { this._logger.debug('Get win size change event');
this.resizeTerm(); this.resizeTerm();
}
}); });
} }
...@@ -48,11 +46,11 @@ export class ElementTermComponent implements OnInit, AfterViewInit { ...@@ -48,11 +46,11 @@ export class ElementTermComponent implements OnInit, AfterViewInit {
getWinSize() { getWinSize() {
let availableHeight = 0; let availableHeight = 0;
let availableWidth = 0; let availableWidth = 0;
if (document.fullscreenElement) { const activeEle = $('#winContainer');
if (document['fullscreenElement']) {
availableWidth = document.body.clientWidth - 10; availableWidth = document.body.clientWidth - 10;
availableHeight = document.body.clientHeight; availableHeight = document.body.clientHeight;
} else { } else if (activeEle) {
const activeEle = $('#winContainer');
const elementStyle = window.getComputedStyle(this.term.element); const elementStyle = window.getComputedStyle(this.term.element);
const elementPadding = { const elementPadding = {
top: parseInt(elementStyle.getPropertyValue('padding-top'), 10), top: parseInt(elementStyle.getPropertyValue('padding-top'), 10),
...@@ -65,11 +63,21 @@ export class ElementTermComponent implements OnInit, AfterViewInit { ...@@ -65,11 +63,21 @@ export class ElementTermComponent implements OnInit, AfterViewInit {
availableHeight = activeEle.height() - elementPaddingVer; availableHeight = activeEle.height() - elementPaddingVer;
availableWidth = activeEle.width() - elementPaddingHor - (<any>this.term).viewport.scrollBarWidth; availableWidth = activeEle.width() - elementPaddingHor - (<any>this.term).viewport.scrollBarWidth;
} }
this._logger.debug('Winsize: ', availableWidth, availableHeight);
const dimensions = (<any>this.term).renderer.dimensions;
const geometry = [ const geometry = [
Math.floor(availableWidth / (<any>this.term).renderer.dimensions.actualCellWidth) - 1, Math.floor(availableWidth / dimensions.actualCellWidth) - 1,
Math.floor(availableHeight / (<any>this.term).renderer.dimensions.actualCellHeight) - 1 Math.floor(availableHeight / dimensions.actualCellHeight) - 1
]; ];
if (!isFinite(geometry[0])) {
geometry[0] = 80;
}
if (!isFinite(geometry[1])) {
geometry[1] = 24;
}
this._logger.debug('size: ', geometry);
return geometry; return geometry;
} }
......
src/app/elements/tree-filter/tree-filter.component.css 0 → 100644
View file @ 1071415c
/*.left-search {*/
/*padding-left: 14px;*/
/*width: 100%;*/
/*border: none;*/
/*}*/
.search {
border: none;
border-left-width: 0;
border-bottom: #19aa8d 1px inset;
width: 100%;
background: #2f2a2a;
color: #d6cbcb;
height: 30px;
padding-left: 10px;
/* padding-top: 30px;
//position: fixed;
//height: 28px;
*/
}
src/app/elements/tree-filter/tree-filter.component.html 0 → 100644
View file @ 1071415c
<input id="search" class="search"
[formControl]="searchControl"
placeholder=" {{'Search'| trans }} ..."
maxlength="2048"
name="keyword"
autocomplete="off"
title="Search"
type="text" tabindex="1" spellcheck="false"
>
src/app/elements/tree-filter/tree-filter.component.ts 0 → 100644
View file @ 1071415c
import {Component, OnInit} from '@angular/core';
import {FormControl} from '@angular/forms';
import {debounceTime, distinctUntilChanged} from 'rxjs/operators';
import {LogService, TreeFilterService} from '@app/services';
@Component({
selector: 'elements-tree-filter',
templateUrl: './tree-filter.component.html',
styleUrls: ['./tree-filter.component.css'],
})
export class ElementTreeFilterComponent implements OnInit {
searchControl: FormControl;
private debounce = 400;
constructor(private _treeFilterService: TreeFilterService,
private _logger: LogService) {
}
ngOnInit(): void {
this.searchControl = new FormControl('');
this.searchControl.valueChanges
.pipe(debounceTime(this.debounce), distinctUntilChanged())
.subscribe(query => {
this._logger.debug('Tree filter: ', query);
this._treeFilterService.filter(query);
});
}
}
src/app/elements/tree/tree.component.html deleted 100644 → 0
View file @ 669c22ad
<div *ngFor="let node of TreeData">
<div *ngIf="node.leafs?.length>0">
{{node.id}}
<elements-tree [TreeData]="node.leafs"></elements-tree>
</div>
<div *ngIf="node.leafs?.length==0">
{{node.id}}
</div>
</div>
<!--<ul class="filetree ">-->
<!--<li *ngFor="let hostGroup of HostGroups | SearchFilter: q; let i = index ">-->
<!--<input type="checkbox" id="hostgroup-{{i}}">-->
<!--<label for="hostgroup-{{i}}" matTooltip="{{hostGroup.name}}" [matTooltipPosition]="TooltipPosition">{{hostGroup.name}}</label>-->
<!--</li>-->
<!--</ul>-->
src/app/elements/tree/tree.component.spec.ts deleted 100644 → 0
View file @ 669c22ad
This diff is collapsed.
src/app/elements/tree/tree.component.ts deleted 100644 → 0
View file @ 669c22ad
This diff is collapsed.
src/app/elements/tree/tree.module.ts deleted 100644 → 0
View file @ 669c22ad
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import {ElementTreeComponent} from './tree.component';
@NgModule({
imports: [
CommonModule
],
declarations: [
ElementTreeComponent
]
})
export class TreeModule {
}
src/app/globals.ts
View file @ 1071415c
This diff is collapsed.
src/app/model.ts 0 → 100644
View file @ 1071415c
This diff is collapsed.
src/app/pages/app.component.html
View file @ 1071415c
<ng-progress></ng-progress>
<elements-nav *ngIf="DataStore.NavShow"></elements-nav>
<router-outlet></router-outlet> <router-outlet></router-outlet>
<!--<elements-interactive></elements-interactive>-->
src/app/pages/app.component.spec.ts deleted 100644 → 0
View file @ 669c22ad
This diff is collapsed.
src/app/pages/app.component.ts
View file @ 1071415c
This diff is collapsed.
src/app/pages/blank/blank.component.ts
View file @ 1071415c
import {Component, OnInit} from '@angular/core'; import {Component, OnInit} from '@angular/core';
import {DataStore} from '../../globals'; import {DataStore} from '@app/globals';
@Component({ @Component({
selector: 'pages-blank', selector: 'pages-blank',
......
src/app/pages/connect/connect.component.ts
View file @ 1071415c
This diff is collapsed.
src/app/pages/control/cleftbar/cleftbar.component.html deleted 100644 → 0
View file @ 669c22ad
This diff is collapsed.
src/app/pages/control/cleftbar/cleftbar.component.scss deleted 100644 → 0
View file @ 669c22ad
This diff is collapsed.
src/app/pages/control/cleftbar/cleftbar.component.ts deleted 100644 → 0
View file @ 669c22ad
This diff is collapsed.
src/app/pages/control/control.component.css deleted 100644 → 0
View file @ 669c22ad
This diff is collapsed.
src/app/pages/control/control.component.html deleted 100644 → 0
View file @ 669c22ad
This diff is collapsed.
src/app/pages/control/control.component.spec.ts deleted 100644 → 0
View file @ 669c22ad
This diff is collapsed.
src/app/pages/control/control.component.ts deleted 100644 → 0
View file @ 669c22ad
This diff is collapsed.
src/app/pages/control/control/control.component.html deleted 100644 → 0
View file @ 669c22ad
This diff is collapsed.
src/app/pages/control/control/control.component.ts deleted 100644 → 0
View file @ 669c22ad
This diff is collapsed.
src/app/pages/control/search/search.component.css deleted 100644 → 0
View file @ 669c22ad
This diff is collapsed.
src/app/pages/control/search/search.component.html deleted 100644 → 0
View file @ 669c22ad
This diff is collapsed.
src/app/pages/control/search/search.component.spec.ts deleted 100644 → 0
View file @ 669c22ad
This diff is collapsed.
src/app/pages/control/search/search.component.ts deleted 100644 → 0
View file @ 669c22ad
This diff is collapsed.
src/app/pages/index/index.component.html deleted 100644 → 0
View file @ 669c22ad
This diff is collapsed.
src/app/pages/index/index.component.spec.ts deleted 100644 → 0
View file @ 669c22ad
This diff is collapsed.
src/app/pages/index/index.component.ts deleted 100644 → 0
View file @ 669c22ad
This diff is collapsed.
src/app/pages/login/login.component.ts
View file @ 1071415c
This diff is collapsed.
src/app/pages/main/main.component.css 0 → 100644
View file @ 1071415c
This diff is collapsed.
src/app/pages/main/main.component.html 0 → 100644
View file @ 1071415c
This diff is collapsed.
src/app/pages/main/main.component.ts 0 → 100644
View file @ 1071415c
This diff is collapsed.
src/app/pages/monitor/monitor.component.ts
View file @ 1071415c
This diff is collapsed.
src/app/pages/pages.component.ts
View file @ 1071415c
This diff is collapsed.
src/app/pages/replay/json/json.component.ts
View file @ 1071415c
This diff is collapsed.
src/app/pages/replay/replay.component.ts
View file @ 1071415c
This diff is collapsed.
src/app/pipes/pipes.ts
View file @ 1071415c
This diff is collapsed.
src/app/pipes/search.pipe.ts 0 → 100644
View file @ 1071415c
This diff is collapsed.
src/app/pipes/trans.pipe.ts
View file @ 1071415c
This diff is collapsed.
src/app/plugins/MaterialModule.component.ts
View file @ 1071415c
This diff is collapsed.
src/app/plugins/plugins.ts
View file @ 1071415c
This diff is collapsed.
src/app/plugins/split/split-area.directive.ts 0 → 100644
View file @ 1071415c
This diff is collapsed.
src/app/plugins/split/split-handle.directive.ts 0 → 100644
View file @ 1071415c
This diff is collapsed.
src/app/plugins/split/split.directive.ts 0 → 100644
View file @ 1071415c
This diff is collapsed.
src/app/plugins/split/split.module.ts 0 → 100644
View file @ 1071415c
This diff is collapsed.
src/app/router/router.module.ts
View file @ 1071415c
This diff is collapsed.
src/app/services/app.ts 0 → 100644
View file @ 1071415c
This diff is collapsed.
src/app/services/http.ts 0 → 100644
View file @ 1071415c
This diff is collapsed.
src/app/services/index.ts 0 → 100644
View file @ 1071415c
This diff is collapsed.
src/app/services/nav.ts 0 → 100644
View file @ 1071415c
This diff is collapsed.
src/app/services/setting.ts 0 → 100644
View file @ 1071415c
This diff is collapsed.
src/app/services/share.ts 0 → 100644
View file @ 1071415c
This diff is collapsed.
src/app/services/treeFilter.ts 0 → 100644
View file @ 1071415c
This diff is collapsed.
src/app/services/view.ts 0 → 100644
View file @ 1071415c
This diff is collapsed.
src/app/test-page/test-page.component.html deleted 100644 → 0
View file @ 669c22ad
This diff is collapsed.
src/app/test-page/test-page.component.scss deleted 100644 → 0
View file @ 669c22ad
This diff is collapsed.
src/app/test-page/test-page.component.spec.ts deleted 100644 → 0
View file @ 669c22ad
This diff is collapsed.
src/app/test-page/test-page.component.ts deleted 100644 → 0
View file @ 669c22ad
This diff is collapsed.
src/app/utils/socket.ts
View file @ 1071415c
This diff is collapsed.
i18n/zh.json → src/assets/i18n/zh.json
View file @ 1071415c
This diff is collapsed.
src/environments/environment.prod.ts
View file @ 1071415c
This diff is collapsed.
src/index.html
View file @ 1071415c
This diff is collapsed.
src/sass/style.scss
View file @ 1071415c
This diff is collapsed.
src/styles.css
View file @ 1071415c
This diff is collapsed.
src/tsconfig.spec.json
View file @ 1071415c
This diff is collapsed.
tools/build.sh
View file @ 1071415c
This diff is collapsed.
tsconfig.json
View file @ 1071415c
This diff is collapsed.
tslint.json
View file @ 1071415c
This diff is collapsed.
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