From 11c561f180ec3289a80f5f705c0e47304b449ba2 Mon Sep 17 00:00:00 2001 From: crusader Date: Wed, 19 Sep 2018 19:04:35 +0900 Subject: [PATCH] ing --- package.json | 1 + src/commons/commons.module.ts | 26 +- .../component/host-detail.component.html | 14 -- .../component/zone-detail.component.html | 230 +++++++++--------- src/electron/app-window.ts | 2 +- yarn.lock | 19 +- 6 files changed, 145 insertions(+), 147 deletions(-) diff --git a/package.json b/package.json index ea0bec8..7058133 100644 --- a/package.json +++ b/package.json @@ -74,6 +74,7 @@ "karma-jasmine": "~1.1.1", "karma-jasmine-html-reporter": "^0.2.2", "ngrx-store-freeze": "^0.2.4", + "ngx-perfect-scrollbar": "^6.3.1", "npm-run-all": "^4.1.3", "primeicons": "^1.0.0-beta.10", "primeng": "^6.1.3", diff --git a/src/commons/commons.module.ts b/src/commons/commons.module.ts index b4bb72a..9a5c00f 100644 --- a/src/commons/commons.module.ts +++ b/src/commons/commons.module.ts @@ -2,21 +2,21 @@ import { NgModule, APP_INITIALIZER } from '@angular/core'; import { CommonModule } from '@angular/common'; import { CommonsUIModule } from '@overflow/commons/ui/commons-ui.module'; -// import { PerfectScrollbarModule } from 'ngx-perfect-scrollbar'; -// import { PERFECT_SCROLLBAR_CONFIG } from 'ngx-perfect-scrollbar'; -// import { PerfectScrollbarConfigInterface } from 'ngx-perfect-scrollbar'; +import { PerfectScrollbarModule } from 'ngx-perfect-scrollbar'; +import { PERFECT_SCROLLBAR_CONFIG } from 'ngx-perfect-scrollbar'; +import { PerfectScrollbarConfigInterface } from 'ngx-perfect-scrollbar'; import { COMPONENTS } from './component'; -// const DEFAULT_PERFECT_SCROLLBAR_CONFIG: PerfectScrollbarConfigInterface = { -// suppressScrollX: true -// }; +const DEFAULT_PERFECT_SCROLLBAR_CONFIG: PerfectScrollbarConfigInterface = { + suppressScrollX: true +}; @NgModule({ imports: [ CommonModule, CommonsUIModule, - // PerfectScrollbarModule + PerfectScrollbarModule ], exports: [ ...COMPONENTS, @@ -24,11 +24,11 @@ import { COMPONENTS } from './component'; declarations: [ ...COMPONENTS, ], - // providers: [ - // { - // provide: PERFECT_SCROLLBAR_CONFIG, - // useValue: DEFAULT_PERFECT_SCROLLBAR_CONFIG - // } - // ] + providers: [ + { + provide: PERFECT_SCROLLBAR_CONFIG, + useValue: DEFAULT_PERFECT_SCROLLBAR_CONFIG + } + ] }) export class CommonsModule { } diff --git a/src/commons/component/host-detail.component.html b/src/commons/component/host-detail.component.html index 2a9b380..871458c 100644 --- a/src/commons/component/host-detail.component.html +++ b/src/commons/component/host-detail.component.html @@ -52,20 +52,6 @@ - - The story begins as Don Vito Corleone, the head of a New York Mafia family, oversees his daughter's wedding. - His - beloved - son Michael has just come home from the war, but does not intend to become part of his father's business. - Through Michael's life the nature of the family business becomes clear. The business of the family is just - like the head of the family, kind and benevolent to those who give respect, but given to ruthless violence - whenever anything stands against the good of the family. The story begins as Don Vito Corleone, the head - of a New York Mafia family, oversees his daughter's wedding. His beloved son Michael has just come home from - the war, but does not intend to become part of his father's business. Through Michael's life the nature of - the family business becomes clear. The business of the family is just like the head of the family, kind and - benevolent to those who give respect, but given to ruthless violence whenever anything stands against the - good of the family. - diff --git a/src/commons/component/zone-detail.component.html b/src/commons/component/zone-detail.component.html index 5812a85..916269f 100644 --- a/src/commons/component/zone-detail.component.html +++ b/src/commons/component/zone-detail.component.html @@ -17,124 +17,124 @@ - -
    -
  • - Interface - {{zone.iface}} -
    • -
  • - Mac Address - {{zone.mac}} -
    • -
  • - IP Version - {{zone.metaIPType.key}} -
    • -
  • - Network - {{zone.network}} -
    • -
  • - IP Range - {{ipRange}} -
    • - -
  • - Interface - {{zone.iface}} -
    • -
  • - Mac Address - {{zone.mac}} -
    • -
  • - IP Version - {{zone.metaIPType.key}} -
    • -
  • - Network - {{zone.network}} -
    • -
  • - IP Range - {{ipRange}} -
    • -
  • - Interface - {{zone.iface}} -
    • -
  • - Mac Address - {{zone.mac}} -
    • -
  • - IP Version - {{zone.metaIPType.key}} -
    • -
  • - Network - {{zone.network}} -
    • -
  • - IP Range - {{ipRange}} -
    • -
  • - Interface - {{zone.iface}} -
    • -
  • - Mac Address - {{zone.mac}} -
    • -
  • - IP Version - {{zone.metaIPType.key}} -
    • -
  • - Network - {{zone.network}} -
    • -
  • - IP Range - {{ipRange}} -
    • -
  • - Interface - {{zone.iface}} -
    • -
  • - Mac Address - {{zone.mac}} -
    • -
  • - IP Version - {{zone.metaIPType.key}} -
    • -
  • - Network - {{zone.network}} -
    • -
  • - IP Range - {{ipRange}} -
    • -
- + +
    +
  • + Interface + {{zone.iface}} +
    • +
  • + Mac Address + {{zone.mac}} +
    • +
  • + IP Version + {{zone.metaIPType.key}} +
    • +
  • + Network + {{zone.network}} +
    • +
  • + IP Range + {{ipRange}} +
    • + +
  • + Interface + {{zone.iface}} +
    • +
  • + Mac Address + {{zone.mac}} +
    • +
  • + IP Version + {{zone.metaIPType.key}} +
    • +
  • + Network + {{zone.network}} +
    • +
  • + IP Range + {{ipRange}} +
    • +
  • + Interface + {{zone.iface}} +
    • +
  • + Mac Address + {{zone.mac}} +
    • +
  • + IP Version + {{zone.metaIPType.key}} +
    • +
  • + Network + {{zone.network}} +
    • +
  • + IP Range + {{ipRange}} +
    • +
  • + Interface + {{zone.iface}} +
    • +
  • + Mac Address + {{zone.mac}} +
    • +
  • + IP Version + {{zone.metaIPType.key}} +
    • +
  • + Network + {{zone.network}} +
    • +
  • + IP Range + {{ipRange}} +
    • +
  • + Interface + {{zone.iface}} +
    • +
  • + Mac Address + {{zone.mac}} +
    • +
  • + IP Version + {{zone.metaIPType.key}} +
    • +
  • + Network + {{zone.network}} +
    • +
  • + IP Range + {{ipRange}} +
    • +
+ - - - + + + diff --git a/src/electron/app-window.ts b/src/electron/app-window.ts index 02a41c6..707e795 100644 --- a/src/electron/app-window.ts +++ b/src/electron/app-window.ts @@ -64,7 +64,7 @@ export class AppWindow { if (__DARWIN__) { windowOptions.titleBarStyle = 'hidden'; } else if (__WIN32__) { - windowOptions.frame = false; + // windowOptions.frame = false; } else if (__LINUX__) { windowOptions.icon = path.join(__dirname, 'static', 'icon-logo.png'); } diff --git a/yarn.lock b/yarn.lock index 1e2ed49..8f032c9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5264,6 +5264,13 @@ ngrx-store-freeze@^0.2.4: dependencies: deep-freeze-strict "^1.1.1" +ngx-perfect-scrollbar@^6.3.1: + version "6.3.1" + resolved "https://nexus.loafle.net/repository/npm-all/ngx-perfect-scrollbar/-/ngx-perfect-scrollbar-6.3.1.tgz#38e5e3259a61e911d82ba24f06fc01ab92eaf919" + dependencies: + perfect-scrollbar "^1.4.0" + resize-observer-polyfill "^1.4.0" + nice-try@^1.0.4: version "1.0.5" resolved "https://nexus.loafle.net/repository/npm-all/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" @@ -5870,6 +5877,10 @@ pend@~1.2.0: version "1.2.0" resolved "https://nexus.loafle.net/repository/npm-all/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" +perfect-scrollbar@^1.4.0: + version "1.4.0" + resolved "https://nexus.loafle.net/repository/npm-all/perfect-scrollbar/-/perfect-scrollbar-1.4.0.tgz#5d014ef9775e1f43058a1dbae9ed1daf0e7091f1" + performance-now@^2.1.0: version "2.1.0" resolved "https://nexus.loafle.net/repository/npm-all/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" @@ -6479,6 +6490,10 @@ requires-port@^1.0.0: version "1.0.0" resolved "https://nexus.loafle.net/repository/npm-all/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" +resize-observer-polyfill@^1.4.0: + version "1.5.0" + resolved "https://nexus.loafle.net/repository/npm-all/resize-observer-polyfill/-/resize-observer-polyfill-1.5.0.tgz#660ff1d9712a2382baa2cad450a4716209f9ca69" + resolve-cwd@^2.0.0: version "2.0.0" resolved "https://nexus.loafle.net/repository/npm-all/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a" @@ -6551,10 +6566,6 @@ rx@^4.1.0: version "4.1.0" resolved "https://nexus.loafle.net/repository/npm-all/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782" -rxjs-compat@^6.3.2: - version "6.3.2" - resolved "https://nexus.loafle.net/repository/npm-all/rxjs-compat/-/rxjs-compat-6.3.2.tgz#2386ade05e693480fdf96f56042a629aef6c5ea5" - rxjs@^6.0.0, rxjs@^6.1.0, rxjs@^6.2.2: version "6.3.2" resolved "https://nexus.loafle.net/repository/npm-all/rxjs/-/rxjs-6.3.2.tgz#6a688b16c4e6e980e62ea805ec30648e1c60907f"