Skip to content

L
luna
Commit 2a926e18 authored by liuzheng712's avatar liuzheng712
Browse files
Options

feat: ok ok

parent 36603617
Show whitespace changes
Inline Side-by-side
Showing with 318 additions and 160 deletions
package-lock.json
View file @ 2a926e18
......@@ -5303,7 +5303,7 @@
"is-my-json-valid": {
"version": "2.16.1",
"resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.1.tgz",
"integrity": "sha512-ochPsqWS1WXj8ZnMIV0vnNXooaMhp7cyL4FMSIPKTtnV0Ha/T19G2b9kkhcNsabV9bxYkze7/aLZJb/bYuFduQ==",
"integrity": "sha1-WoRnd+LCYg0eaRBOXToDsfYIjxE=",
"dev": true,
"requires": {
"generate-function": "2.0.0",
......@@ -7077,9 +7077,9 @@
}
},
"npm": {
"version": "5.5.1",
"resolved": "https://registry.npmjs.org/npm/-/npm-5.5.1.tgz",
"integrity": "sha512-M3aO8EjHebaCw6uur4C86SZqkypnoaEVo5R63FEEU0dw9wLxf/JlwWtJItShYVyQS2WDxG2It10GEe5GmVEM2Q==",
"version": "5.6.0",
"resolved": "https://registry.npmjs.org/npm/-/npm-5.6.0.tgz",
"integrity": "sha512-mt839mCsI5hzdBJLf1iRBwt610P35iUfvqLVuL7VFdanUwRBAmGtbsjdGIuzegplR95xx+fTHE0vBMuMJp1sLQ==",
"requires": {
"JSONStream": "1.3.1",
"abbrev": "1.1.1",
......@@ -7088,8 +7088,9 @@
"ansistyles": "0.1.3",
"aproba": "1.2.0",
"archy": "1.0.0",
"bluebird": "3.5.0",
"cacache": "9.2.9",
"bin-links": "1.1.0",
"bluebird": "3.5.1",
"cacache": "10.0.1",
"call-limit": "1.1.0",
"chownr": "1.0.1",
"cli-table2": "0.2.0",
......@@ -7100,8 +7101,10 @@
"detect-indent": "5.0.0",
"dezalgo": "1.0.3",
"editor": "1.0.0",
"find-npm-prefix": "1.0.1",
"fs-vacuum": "1.2.10",
"fs-write-stream-atomic": "1.0.10",
"gentle-fs": "2.0.1",
"glob": "7.1.2",
"graceful-fs": "4.1.11",
"has-unicode": "2.0.1",
......@@ -7114,7 +7117,7 @@
"init-package-json": "1.10.1",
"is-cidr": "1.0.0",
"lazy-property": "1.0.0",
"libnpx": "9.6.0",
"libnpx": "9.7.1",
"lockfile": "1.0.3",
"lodash._baseindexof": "3.1.0",
"lodash._baseuniq": "4.6.0",
......@@ -7132,26 +7135,25 @@
"mississippi": "1.3.0",
"mkdirp": "0.5.1",
"move-concurrently": "1.0.1",
"node-gyp": "3.6.2",
"nopt": "4.0.1",
"normalize-package-data": "2.4.0",
"npm-cache-filename": "1.0.2",
"npm-install-checks": "3.0.0",
"npm-lifecycle": "1.0.3",
"npm-package-arg": "5.1.2",
"npm-packlist": "1.1.9",
"npm-profile": "2.0.4",
"npm-lifecycle": "2.0.0",
"npm-package-arg": "6.0.0",
"npm-packlist": "1.1.10",
"npm-profile": "2.0.5",
"npm-registry-client": "8.5.0",
"npm-user-validate": "1.0.0",
"npmlog": "4.1.2",
"once": "1.4.0",
"opener": "1.4.3",
"osenv": "0.1.4",
"pacote": "6.0.2",
"pacote": "7.0.2",
"path-is-inside": "1.0.2",
"promise-inflight": "1.0.1",
"qrcode-terminal": "0.11.0",
"query-string": "5.0.0",
"query-string": "5.0.1",
"qw": "1.0.1",
"read": "1.0.7",
"read-cmd-shim": "1.0.1",
......@@ -7169,20 +7171,20 @@
"slide": "1.1.6",
"sorted-object": "2.0.1",
"sorted-union-stream": "2.1.3",
"ssri": "4.1.6",
"ssri": "5.0.0",
"strip-ansi": "4.0.0",
"tar": "4.0.1",
"tar": "4.0.2",
"text-table": "0.2.0",
"uid-number": "0.0.6",
"umask": "1.1.0",
"unique-filename": "1.1.0",
"unpipe": "1.0.0",
"update-notifier": "2.2.0",
"update-notifier": "2.3.0",
"uuid": "3.1.0",
"validate-npm-package-license": "3.0.1",
"validate-npm-package-name": "3.0.0",
"which": "1.3.0",
"worker-farm": "1.5.0",
"worker-farm": "1.5.1",
"wrappy": "1.0.2",
"write-file-atomic": "2.1.0"
},
......@@ -7229,15 +7231,27 @@
"version": "1.0.0",
"bundled": true
},
"bin-links": {
"version": "1.1.0",
"bundled": true,
"requires": {
"bluebird": "3.5.1",
"cmd-shim": "2.0.2",
"fs-write-stream-atomic": "1.0.10",
"gentle-fs": "2.0.1",
"graceful-fs": "4.1.11",
"slide": "1.1.6"
}
},
"bluebird": {
"version": "3.5.0",
"version": "3.5.1",
"bundled": true
},
"cacache": {
"version": "9.2.9",
"version": "10.0.1",
"bundled": true,
"requires": {
"bluebird": "3.5.0",
"bluebird": "3.5.1",
"chownr": "1.0.1",
"glob": "7.1.2",
"graceful-fs": "4.1.11",
......@@ -7247,27 +7261,16 @@
"move-concurrently": "1.0.1",
"promise-inflight": "1.0.1",
"rimraf": "2.6.2",
"ssri": "4.1.6",
"ssri": "5.0.0",
"unique-filename": "1.1.0",
"y18n": "3.2.1"
},
"dependencies": {
"lru-cache": {
"version": "4.1.1",
"ssri": {
"version": "5.0.0",
"bundled": true,
"requires": {
"pseudomap": "1.0.2",
"yallist": "2.1.2"
},
"dependencies": {
"pseudomap": {
"version": "1.0.2",
"bundled": true
},
"yallist": {
"version": "2.1.2",
"bundled": true
}
"safe-buffer": "5.1.1"
}
},
"y18n": {
......@@ -7438,6 +7441,10 @@
"version": "1.0.0",
"bundled": true
},
"find-npm-prefix": {
"version": "1.0.1",
"bundled": true
},
"fs-vacuum": {
"version": "1.2.10",
"bundled": true,
......@@ -7457,6 +7464,20 @@
"readable-stream": "2.3.3"
}
},
"gentle-fs": {
"version": "2.0.1",
"bundled": true,
"requires": {
"aproba": "1.2.0",
"fs-vacuum": "1.2.10",
"graceful-fs": "4.1.11",
"iferr": "0.1.5",
"mkdirp": "0.5.1",
"path-is-inside": "1.0.2",
"read-cmd-shim": "1.0.1",
"slide": "1.1.6"
}
},
"glob": {
"version": "7.1.2",
"bundled": true,
......@@ -7556,6 +7577,16 @@
"validate-npm-package-name": "3.0.0"
},
"dependencies": {
"npm-package-arg": {
"version": "5.1.2",
"bundled": true,
"requires": {
"hosted-git-info": "2.5.0",
"osenv": "0.1.4",
"semver": "5.4.1",
"validate-npm-package-name": "3.0.0"
}
},
"promzard": {
"version": "0.3.0",
"bundled": true,
......@@ -7583,14 +7614,14 @@
"bundled": true
},
"libnpx": {
"version": "9.6.0",
"version": "9.7.1",
"bundled": true,
"requires": {
"dotenv": "4.0.0",
"npm-package-arg": "5.1.2",
"rimraf": "2.6.2",
"safe-buffer": "5.1.1",
"update-notifier": "2.2.0",
"update-notifier": "2.3.0",
"which": "1.3.0",
"y18n": "3.2.1",
"yargs": "8.0.2"
......@@ -7600,6 +7631,16 @@
"version": "4.0.0",
"bundled": true
},
"npm-package-arg": {
"version": "5.1.2",
"bundled": true,
"requires": {
"hosted-git-info": "2.5.0",
"osenv": "0.1.4",
"semver": "5.4.1",
"validate-npm-package-name": "3.0.0"
}
},
"y18n": {
"version": "3.2.1",
"bundled": true
......@@ -8210,7 +8251,7 @@
"bundled": true,
"requires": {
"aproba": "1.2.0",
"copy-concurrently": "1.0.3",
"copy-concurrently": "1.0.5",
"fs-write-stream-atomic": "1.0.10",
"mkdirp": "0.5.1",
"rimraf": "2.6.2",
......@@ -8218,7 +8259,7 @@
},
"dependencies": {
"copy-concurrently": {
"version": "1.0.3",
"version": "1.0.5",
"bundled": true,
"requires": {
"aproba": "1.2.0",
......@@ -8370,18 +8411,31 @@
}
},
"npm-lifecycle": {
"version": "1.0.3",
"version": "2.0.0",
"bundled": true,
"requires": {
"byline": "5.0.0",
"graceful-fs": "4.1.11",
"node-gyp": "3.6.2",
"resolve-from": "4.0.0",
"slide": "1.1.6",
"uid-number": "0.0.6",
"umask": "1.1.0",
"which": "1.3.0"
},
"dependencies": {
"byline": {
"version": "5.0.0",
"bundled": true
},
"resolve-from": {
"version": "4.0.0",
"bundled": true
}
}
},
"npm-package-arg": {
"version": "5.1.2",
"version": "6.0.0",
"bundled": true,
"requires": {
"hosted-git-info": "2.5.0",
......@@ -8391,15 +8445,15 @@
}
},
"npm-packlist": {
"version": "1.1.9",
"version": "1.1.10",
"bundled": true,
"requires": {
"ignore-walk": "3.0.0",
"ignore-walk": "3.0.1",
"npm-bundled": "1.0.3"
},
"dependencies": {
"ignore-walk": {
"version": "3.0.0",
"version": "3.0.1",
"bundled": true,
"requires": {
"minimatch": "3.0.4"
......@@ -8441,7 +8495,7 @@
}
},
"npm-profile": {
"version": "2.0.4",
"version": "2.0.5",
"bundled": true,
"requires": {
"aproba": "1.2.0",
......@@ -8453,8 +8507,8 @@
"bundled": true,
"requires": {
"agentkeepalive": "3.3.0",
"cacache": "9.2.9",
"http-cache-semantics": "3.7.3",
"cacache": "9.3.0",
"http-cache-semantics": "3.8.0",
"http-proxy-agent": "2.0.0",
"https-proxy-agent": "2.1.0",
"lru-cache": "4.1.1",
......@@ -8487,8 +8541,33 @@
}
}
},
"cacache": {
"version": "9.3.0",
"bundled": true,
"requires": {
"bluebird": "3.5.1",
"chownr": "1.0.1",
"glob": "7.1.2",
"graceful-fs": "4.1.11",
"lru-cache": "4.1.1",
"mississippi": "1.3.0",
"mkdirp": "0.5.1",
"move-concurrently": "1.0.1",
"promise-inflight": "1.0.1",
"rimraf": "2.6.2",
"ssri": "4.1.6",
"unique-filename": "1.1.0",
"y18n": "3.2.1"
},
"dependencies": {
"y18n": {
"version": "3.2.1",
"bundled": true
}
}
},
"http-cache-semantics": {
"version": "3.7.3",
"version": "3.8.0",
"bundled": true
},
"http-proxy-agent": {
......@@ -8672,6 +8751,13 @@
}
}
}
},
"ssri": {
"version": "4.1.6",
"bundled": true,
"requires": {
"safe-buffer": "5.1.1"
}
}
}
}
......@@ -8708,6 +8794,23 @@
"bundled": true
}
}
},
"npm-package-arg": {
"version": "5.1.2",
"bundled": true,
"requires": {
"hosted-git-info": "2.5.0",
"osenv": "0.1.4",
"semver": "5.4.1",
"validate-npm-package-name": "3.0.0"
}
},
"ssri": {
"version": "4.1.6",
"bundled": true,
"requires": {
"safe-buffer": "5.1.1"
}
}
}
},
......@@ -8851,47 +8954,52 @@
}
},
"pacote": {
"version": "6.0.2",
"version": "7.0.2",
"bundled": true,
"requires": {
"bluebird": "3.5.0",
"cacache": "9.2.9",
"bluebird": "3.5.1",
"cacache": "10.0.1",
"get-stream": "3.0.0",
"glob": "7.1.2",
"lru-cache": "4.1.1",
"make-fetch-happen": "2.5.0",
"make-fetch-happen": "2.6.0",
"minimatch": "3.0.4",
"mississippi": "1.3.0",
"normalize-package-data": "2.4.0",
"npm-package-arg": "5.1.2",
"npm-packlist": "1.1.9",
"npm-pick-manifest": "1.0.4",
"npm-package-arg": "6.0.0",
"npm-packlist": "1.1.10",
"npm-pick-manifest": "2.1.0",
"osenv": "0.1.4",
"promise-inflight": "1.0.1",
"promise-retry": "1.1.1",
"protoduck": "4.0.0",
"safe-buffer": "5.1.1",
"semver": "5.4.1",
"ssri": "4.1.6",
"tar": "4.0.1",
"ssri": "5.0.0",
"tar": "4.0.2",
"unique-filename": "1.1.0",
"which": "1.3.0"
},
"dependencies": {
"get-stream": {
"version": "3.0.0",
"bundled": true
},
"make-fetch-happen": {
"version": "2.5.0",
"version": "2.6.0",
"bundled": true,
"requires": {
"agentkeepalive": "3.3.0",
"cacache": "9.2.9",
"http-cache-semantics": "3.7.3",
"cacache": "10.0.1",
"http-cache-semantics": "3.8.0",
"http-proxy-agent": "2.0.0",
"https-proxy-agent": "2.1.0",
"lru-cache": "4.1.1",
"mississippi": "1.3.0",
"node-fetch-npm": "2.0.2",
"promise-retry": "1.1.1",
"socks-proxy-agent": "3.0.0",
"ssri": "4.1.6"
"socks-proxy-agent": "3.0.1",
"ssri": "5.0.0"
},
"dependencies": {
"agentkeepalive": {
......@@ -8917,19 +9025,19 @@
}
},
"http-cache-semantics": {
"version": "3.7.3",
"version": "3.8.0",
"bundled": true
},
"http-proxy-agent": {
"version": "2.0.0",
"bundled": true,
"requires": {
"agent-base": "4.1.1",
"debug": "2.6.8"
"agent-base": "4.1.2",
"debug": "2.6.9"
},
"dependencies": {
"agent-base": {
"version": "4.1.1",
"version": "4.1.2",
"bundled": true,
"requires": {
"es6-promisify": "5.0.0"
......@@ -8951,7 +9059,7 @@
}
},
"debug": {
"version": "2.6.8",
"version": "2.6.9",
"bundled": true,
"requires": {
"ms": "2.0.0"
......@@ -8969,12 +9077,12 @@
"version": "2.1.0",
"bundled": true,
"requires": {
"agent-base": "4.1.1",
"debug": "2.6.8"
"agent-base": "4.1.2",
"debug": "2.6.9"
},
"dependencies": {
"agent-base": {
"version": "4.1.1",
"version": "4.1.2",
"bundled": true,
"requires": {
"es6-promisify": "5.0.0"
......@@ -8996,7 +9104,7 @@
}
},
"debug": {
"version": "2.6.8",
"version": "2.6.9",
"bundled": true,
"requires": {
"ms": "2.0.0"
......@@ -9023,11 +9131,11 @@
"version": "0.1.12",
"bundled": true,
"requires": {
"iconv-lite": "0.4.18"
"iconv-lite": "0.4.19"
},
"dependencies": {
"iconv-lite": {
"version": "0.4.18",
"version": "0.4.19",
"bundled": true
}
}
......@@ -9039,15 +9147,15 @@
}
},
"socks-proxy-agent": {
"version": "3.0.0",
"version": "3.0.1",
"bundled": true,
"requires": {
"agent-base": "4.1.1",
"agent-base": "4.1.2",
"socks": "1.1.10"
},
"dependencies": {
"agent-base": {
"version": "4.1.1",
"version": "4.1.2",
"bundled": true,
"requires": {
"es6-promisify": "5.0.0"
......@@ -9118,10 +9226,10 @@
}
},
"npm-pick-manifest": {
"version": "1.0.4",
"version": "2.1.0",
"bundled": true,
"requires": {
"npm-package-arg": "5.1.2",
"npm-package-arg": "6.0.0",
"semver": "5.4.1"
}
},
......@@ -9167,7 +9275,7 @@
"bundled": true
},
"query-string": {
"version": "5.0.0",
"version": "5.0.1",
"bundled": true,
"requires": {
"decode-uri-component": "0.2.0",
......@@ -9752,7 +9860,7 @@
}
},
"ssri": {
"version": "4.1.6",
"version": "5.0.0",
"bundled": true,
"requires": {
"safe-buffer": "5.1.1"
......@@ -9772,12 +9880,12 @@
}
},
"tar": {
"version": "4.0.1",
"version": "4.0.2",
"bundled": true,
"requires": {
"chownr": "1.0.1",
"minipass": "2.2.1",
"minizlib": "1.0.3",
"minizlib": "1.0.4",
"mkdirp": "0.5.1",
"yallist": "3.0.2"
},
......@@ -9790,7 +9898,7 @@
}
},
"minizlib": {
"version": "1.0.3",
"version": "1.0.4",
"bundled": true,
"requires": {
"minipass": "2.2.1"
......@@ -9835,13 +9943,14 @@
"bundled": true
},
"update-notifier": {
"version": "2.2.0",
"version": "2.3.0",
"bundled": true,
"requires": {
"boxen": "1.1.0",
"chalk": "1.1.3",
"configstore": "3.1.0",
"boxen": "1.2.1",
"chalk": "2.1.0",
"configstore": "3.1.1",
"import-lazy": "2.1.0",
"is-installed-globally": "0.1.0",
"is-npm": "1.0.0",
"latest-version": "3.1.0",
"semver-diff": "2.1.0",
......@@ -9849,15 +9958,15 @@
},
"dependencies": {
"boxen": {
"version": "1.1.0",
"version": "1.2.1",
"bundled": true,
"requires": {
"ansi-align": "2.0.0",
"camelcase": "4.1.0",
"chalk": "1.1.3",
"chalk": "2.1.0",
"cli-boxes": "1.0.0",
"string-width": "2.1.0",
"term-size": "0.1.1",
"string-width": "2.1.1",
"term-size": "1.2.0",
"widest-line": "1.0.0"
},
"dependencies": {
......@@ -9865,7 +9974,7 @@
"version": "2.0.0",
"bundled": true,
"requires": {
"string-width": "2.1.0"
"string-width": "2.1.1"
}
},
"camelcase": {
......@@ -9877,7 +9986,7 @@
"bundled": true
},
"string-width": {
"version": "2.1.0",
"version": "2.1.1",
"bundled": true,
"requires": {
"is-fullwidth-code-point": "2.0.0",
......@@ -9887,62 +9996,82 @@
"is-fullwidth-code-point": {
"version": "2.0.0",
"bundled": true
},
"strip-ansi": {
"version": "4.0.0",
"bundled": true,
"requires": {
"ansi-regex": "3.0.0"
}
}
}
},
"term-size": {
"version": "0.1.1",
"version": "1.2.0",
"bundled": true,
"requires": {
"execa": "0.4.0"
"execa": "0.7.0"
},
"dependencies": {
"execa": {
"version": "0.4.0",
"version": "0.7.0",
"bundled": true,
"requires": {
"cross-spawn-async": "2.2.5",
"cross-spawn": "5.1.0",
"get-stream": "3.0.0",
"is-stream": "1.1.0",
"npm-run-path": "1.0.0",
"object-assign": "4.1.1",
"path-key": "1.0.0",
"npm-run-path": "2.0.2",
"p-finally": "1.0.0",
"signal-exit": "3.0.2",
"strip-eof": "1.0.0"
},
"dependencies": {
"cross-spawn-async": {
"version": "2.2.5",
"cross-spawn": {
"version": "5.1.0",
"bundled": true,
"requires": {
"lru-cache": "4.1.1",
"shebang-command": "1.2.0",
"which": "1.3.0"
},
"dependencies": {
"shebang-command": {
"version": "1.2.0",
"bundled": true,
"requires": {
"shebang-regex": "1.0.0"
},
"dependencies": {
"shebang-regex": {
"version": "1.0.0",
"bundled": true
}
}
}
}
},
"get-stream": {
"version": "3.0.0",
"bundled": true
},
"is-stream": {
"version": "1.1.0",
"bundled": true
},
"npm-run-path": {
"version": "1.0.0",
"version": "2.0.2",
"bundled": true,
"requires": {
"path-key": "1.0.0"
}
"path-key": "2.0.1"
},
"object-assign": {
"version": "4.1.1",
"dependencies": {
"path-key": {
"version": "2.0.1",
"bundled": true
}
}
},
"path-key": {
"p-finally": {
"version": "1.0.0",
"bundled": true
},
"signal-exit": {
"version": "3.0.2",
"bundled": true
},
"strip-eof": {
"version": "1.0.0",
"bundled": true
......@@ -10004,61 +10133,60 @@
}
},
"chalk": {
"version": "1.1.3",
"version": "2.1.0",
"bundled": true,
"requires": {
"ansi-styles": "2.2.1",
"ansi-styles": "3.2.0",
"escape-string-regexp": "1.0.5",
"has-ansi": "2.0.0",
"strip-ansi": "3.0.1",
"supports-color": "2.0.0"
"supports-color": "4.4.0"
},
"dependencies": {
"ansi-styles": {
"version": "2.2.1",
"bundled": true
},
"escape-string-regexp": {
"version": "1.0.5",
"bundled": true
"version": "3.2.0",
"bundled": true,
"requires": {
"color-convert": "1.9.0"
},
"has-ansi": {
"version": "2.0.0",
"dependencies": {
"color-convert": {
"version": "1.9.0",
"bundled": true,
"requires": {
"ansi-regex": "2.1.1"
"color-name": "1.1.3"
},
"dependencies": {
"ansi-regex": {
"version": "2.1.1",
"color-name": {
"version": "1.1.3",
"bundled": true
}
}
}
}
},
"strip-ansi": {
"version": "3.0.1",
"escape-string-regexp": {
"version": "1.0.5",
"bundled": true
},
"supports-color": {
"version": "4.4.0",
"bundled": true,
"requires": {
"ansi-regex": "2.1.1"
"has-flag": "2.0.0"
},
"dependencies": {
"ansi-regex": {
"version": "2.1.1",
"has-flag": {
"version": "2.0.0",
"bundled": true
}
}
},
"supports-color": {
"version": "2.0.0",
"bundled": true
}
}
},
"configstore": {
"version": "3.1.0",
"version": "3.1.1",
"bundled": true,
"requires": {
"dot-prop": "4.1.1",
"dot-prop": "4.2.0",
"graceful-fs": "4.1.11",
"make-dir": "1.0.0",
"unique-string": "1.0.0",
......@@ -10067,7 +10195,7 @@
},
"dependencies": {
"dot-prop": {
"version": "4.1.1",
"version": "4.2.0",
"bundled": true,
"requires": {
"is-obj": "1.0.1"
......@@ -10111,6 +10239,30 @@
"version": "2.1.0",
"bundled": true
},
"is-installed-globally": {
"version": "0.1.0",
"bundled": true,
"requires": {
"global-dirs": "0.1.0",
"is-path-inside": "1.0.0"
},
"dependencies": {
"global-dirs": {
"version": "0.1.0",
"bundled": true,
"requires": {
"ini": "1.3.4"
}
},
"is-path-inside": {
"version": "1.0.0",
"bundled": true,
"requires": {
"path-is-inside": "1.0.2"
}
}
}
},
"is-npm": {
"version": "1.0.0",
"bundled": true
......@@ -10351,7 +10503,7 @@
}
},
"worker-farm": {
"version": "1.5.0",
"version": "1.5.1",
"bundled": true,
"requires": {
"errno": "0.1.4",
......
package.json
View file @ 2a926e18
......@@ -40,7 +40,7 @@
"ng2-charts": "^1.5.0",
"ng2-cookies": "^1.0.12",
"ngx-bootstrap": "^1.6.6",
"npm": "^5.5.1",
"npm": "^5.6.0",
"peity": "^3.2.1",
"roboto-fontface": "^0.8.0",
"rxjs": "^5.4.2",
......
src/app/ControlPage/cleftbar/cleftbar.component.html
View file @ 2a926e18
......@@ -9,8 +9,8 @@
<input type="checkbox" id="hostgroup-{{i}}">
<label for="hostgroup-{{i}}">{{hostGroup.name}}</label>
<ul>
<li *ngFor="let host of hostGroup.assets | SearchFilter: q" (click)="Connect(host)">
<i class="fa" [ngClass]="'fa-'+host.system" id="rdp-{{i}}"></i>
<li *ngFor="let host of hostGroup.assets_granted | SearchFilter: q" (click)="Connect(host)">
<i class="fa" [ngClass]="'fa-'+host.system" id="fa-{{i}}"></i>
{{host.hostname}}
</li>
</ul>
......
src/app/ControlPage/cleftbar/cleftbar.component.ts
View file @ 2a926e18
......@@ -20,13 +20,13 @@ declare let jQuery: any;
export class HostGroup {
name: string;
id: number;
id: string;
children: Array<Host>;
}
export class Host {
name: string;
uuid: string;
id: string;
type: string;
}
......@@ -95,9 +95,9 @@ export class CleftbarComponent implements OnInit {
Connect(host) {
console.log(host);
let username: string;
if (host.system_users.length > 1) {
if (host.system_users_granted.length > 1) {
let options = '';
for (let u of host.system_users) {
for (let u of host.system_users_granted) {
options += '<option value="' + u.username + '">' + u.username + '</option>';
}
layer.open({
......@@ -118,12 +118,15 @@ export class CleftbarComponent implements OnInit {
// return false 开启该代码可禁止点击该按钮关闭
}
});
} else if (host.system_users.length === 1) {
username = host.system_users[0].username;
} else if (host.system_users_granted.length === 1) {
username = host.system_users_granted[0].username;
}
if (username === '') {
return;
}
jQuery('app-ssh').show();
jQuery('app-rdp').hide();
this._term.TerminalConnect(host, username);
if (host.system === 'linux') {
jQuery('app-ssh').show();
jQuery('app-rdp').hide();
......
src/app/ControlPage/control/ssh/ssh.component.ts
View file @ 2a926e18
......@@ -49,6 +49,7 @@ export class SshComponent implements OnInit {
}
TerminalConnect(host, username) {
console.log(host,username);
const socket = io.connect('/ssh');
let cols = '80';
let rows = '24';
......@@ -69,7 +70,7 @@ export class SshComponent implements OnInit {
NavList.List[id].closed = false;
NavList.List[id].type = 'ssh';
NavList.List[id].Term = new Term;
NavList.List[id].Term.machine = host.uuid;
NavList.List[id].Term.machine = host.id;
NavList.List[id].Term.socket = socket;
NavList.List[id].Term.term = new Terminal({
cols: cols,
......@@ -98,7 +99,7 @@ export class SshComponent implements OnInit {
NavList.List[id].Term.term.write('\x1b[31mWelcome to Jumpserver!\x1b[m\r\n');
socket.on('connect', function () {
socket.emit('host', {'uuid': host.uuid, 'user': username});
socket.emit('host', {'uuid': host.id, 'user': username});
NavList.List[id].Term.term.on('data', function (data) {
socket.emit('data', data);
......
src/app/app.service.ts
View file @ 2a926e18
......@@ -18,14 +18,14 @@ declare let jQuery: any;
import * as io from 'socket.io-client';
export class Group {
id: number;
id: string;
name: string;
membercount: number;
comment: string;
}
export let User: {
id: number;
id: string;
name: string;
username: string;
password: string;
......@@ -39,7 +39,7 @@ export let User: {
groups: Array<Group>;
logined: boolean;
} = {
id: 0,
id: '',
name: 'nobody',
username: '',
password: '',
......
src/styles.css
View file @ 2a926e18
......@@ -30,7 +30,9 @@ app-root {
padding-bottom: 16px !important;
font-family: 'Monaco', iosevka !important;
}
.terminal{
white-space: nowrap;
}
.terminal, .terminal .xterm-viewport {
background-color: inherit;
}
......
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