Skip to content

Commit 87e2cc7

Browse files
stbuistbui
committed
chore: update to angular 8
1 parent eee5b54 commit 87e2cc7

File tree

21 files changed

+20114
-22278
lines changed

21 files changed

+20114
-22278
lines changed

‎package-lock.json‎

Lines changed: 20024 additions & 22187 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -27,21 +27,20 @@
2727
},
2828
"private": true,
2929
"dependencies": {
30-
"@angular/animations": "^7.0.0",
31-
"@angular/cdk": "^7.0.0",
32-
"@angular/common": "^7.0.0",
33-
"@angular/compiler": "^7.0.0",
34-
"@angular/core": "^7.0.0",
30+
"@angular/animations": "~8.0.0",
31+
"@angular/cdk": "~8.0.0",
32+
"@angular/common": "~8.0.0",
33+
"@angular/compiler": "~8.0.0",
34+
"@angular/core": "~8.0.0",
3535
"@angular/fire": "^5.1.0",
36-
"@angular/flex-layout": "^7.0.0-beta.24",
37-
"@angular/forms": "^7.0.0",
38-
"@angular/http": "^7.0.0",
39-
"@angular/material": "^7.0.0",
40-
"@angular/platform-browser": "^7.0.0",
41-
"@angular/platform-browser-dynamic": "^7.0.0",
42-
"@angular/pwa": "^0.10.1",
43-
"@angular/router": "^7.0.0",
44-
"@angular/service-worker": "^7.0.0",
36+
"@angular/flex-layout": "^8.0.0-beta.26",
37+
"@angular/forms": "~8.0.0",
38+
"@angular/material": "~8.0.0",
39+
"@angular/platform-browser": "~8.0.0",
40+
"@angular/platform-browser-dynamic": "~8.0.0",
41+
"@angular/pwa": "^0.800.0",
42+
"@angular/router": "~8.0.0",
43+
"@angular/service-worker": "~8.0.0",
4544
"@ngx-translate/core": "^11.0.1",
4645
"@swimlane/dragula": "^3.8.0",
4746
"@swimlane/ngx-charts": "^10.1.0",
@@ -63,34 +62,34 @@
6362
"ngx-quill": "^4.8.0",
6463
"normalize.css": "^8.0.1",
6564
"quill": "^1.3.6",
66-
"rxjs": "^6.3.3",
65+
"rxjs": "~6.4.0",
6766
"screenfull": "^4.0.0",
68-
"zone.js": "^0.8.26"
67+
"zone.js": "~0.9.1"
6968
},
7069
"devDependencies": {
71-
"@angular-devkit/build-angular": "~0.10.0",
72-
"@angular/cli": "~7.0.1",
73-
"@angular/compiler-cli": "^7.0.0",
74-
"@angular/language-service": "^7.0.0",
70+
"@angular-devkit/build-angular": "~0.800.0",
71+
"@angular/cli": "~8.0.0",
72+
"@angular/compiler-cli": "~8.0.0",
73+
"@angular/language-service": "~8.0.0",
7574
"@compodoc/compodoc": "^1.1.9",
76-
"@types/jasmine": "~2.8.8",
75+
"@types/jasmine": "~3.3.8",
7776
"@types/jasminewd2": "~2.0.3",
7877
"@types/node": "~8.9.4",
79-
"codelyzer": "~4.5.0",
78+
"codelyzer": "^5.0.0",
8079
"conventional-changelog-cli": "^2.0.5",
8180
"gh-pages": "^2.0.1",
8281
"gitbook-cli": "^2.3.2",
83-
"jasmine-core": "~2.99.1",
82+
"jasmine-core": "~3.4.0",
8483
"jasmine-spec-reporter": "~4.2.1",
85-
"karma": "~3.0.0",
84+
"karma": "~4.1.0",
8685
"karma-chrome-launcher": "~2.2.0",
8786
"karma-coverage-istanbul-reporter": "~2.0.1",
88-
"karma-jasmine": "~1.1.2",
89-
"karma-jasmine-html-reporter": "^0.2.2",
90-
"protractor": "^5.4.0",
87+
"karma-jasmine": "~2.0.1",
88+
"karma-jasmine-html-reporter": "^1.4.0",
89+
"protractor": "~5.4.0",
9190
"ts-node": "~7.0.0",
92-
"tslint": "~5.11.0",
93-
"typescript": "~3.1.3",
91+
"tslint": "~5.15.0",
92+
"typescript": "~3.4.3",
9493
"webpack-bundle-analyzer": "^3.3.2"
9594
}
9695
}

‎src/app/apm/behavior/behavior.component.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ export class BehaviorComponent implements OnInit {
2525
devicesDataSource = [];
2626
eventDataSource = [];
2727

28-
@ViewChild(MatPaginator) paginator: MatPaginator;
29-
@ViewChild(SearchComponent) search: SearchComponent;
28+
@ViewChild(MatPaginator, { static: false }) paginator: MatPaginator;
29+
@ViewChild(SearchComponent, { static: false }) search: SearchComponent;
3030

31-
constructor(private service: BehaviorService, private router: Router) {}
31+
constructor(private service: BehaviorService, private router: Router) { }
3232

3333
ngOnInit() {
3434
this.search.onSearch.subscribe(() => (this.paginator.pageIndex = 0));

‎src/app/apm/collection/collection.component.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ export class CollectionComponent implements OnInit {
3535
devicesDataSource = [];
3636
eventDataSource = [];
3737

38-
@ViewChild(MatPaginator) paginator: MatPaginator;
39-
@ViewChild(MatSidenav) sidenav: MatSidenav;
40-
@ViewChild(SearchComponent) search: SearchComponent;
38+
@ViewChild(MatPaginator, { static: false }) paginator: MatPaginator;
39+
@ViewChild(MatSidenav, { static: false }) sidenav: MatSidenav;
40+
@ViewChild(SearchComponent, { static: false }) search: SearchComponent;
4141

4242
body_size = 0;
4343
count = 0;
@@ -59,7 +59,7 @@ export class CollectionComponent implements OnInit {
5959
domain: ['#5AA454', '#A10A28', '#C7B42C', '#AAAAAA']
6060
};
6161

62-
constructor(private service: CollectionService, private datePipe: DatePipe) {}
62+
constructor(private service: CollectionService, private datePipe: DatePipe) { }
6363

6464
ngOnInit() {
6565
this.search.onSearch.subscribe(() => (this.paginator.pageIndex = 0));
@@ -88,7 +88,7 @@ export class CollectionComponent implements OnInit {
8888

8989
data.map(d => {
9090
this.dataChart.push({
91-
name: this.datePipe.transform(d.create_time,'yyyy-MM-dd hh:mm:ss'),
91+
name: this.datePipe.transform(d.create_time, 'yyyy-MM-dd hh:mm:ss'),
9292
value: d.duration
9393
});
9494
});
@@ -171,5 +171,5 @@ export class CollectionComponent implements OnInit {
171171
];
172172
}
173173

174-
onSearchTriggered(event) {}
174+
onSearchTriggered(event) { }
175175
}

‎src/app/apm/manage/manage.component.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ export class ManageComponent implements OnInit {
2020
dataSource: any = new MatTableDataSource([]);
2121
selection = new SelectionModel(true, []);
2222

23-
@ViewChild(MatPaginator) paginator: MatPaginator;
24-
@ViewChild(MatSort) sort: MatSort;
23+
@ViewChild(MatPaginator, { static: false }) paginator: MatPaginator;
24+
@ViewChild(MatSort, { static: false }) sort: MatSort;
2525

26-
constructor(private service: ManageService, private dialog: MatDialog) {}
26+
constructor(private service: ManageService, private dialog: MatDialog) { }
2727

2828
ngOnInit() {
2929
this.service.getList().subscribe(res => {

‎src/app/apm/performance/performance.component.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ export class PerformanceComponent implements OnInit {
4040
devicesDataSource = [];
4141
eventDataSource = [];
4242

43-
@ViewChild(MatPaginator) paginator: MatPaginator;
44-
@ViewChild(MatSidenav) sidenav: MatSidenav;
45-
@ViewChild(SearchComponent) search: SearchComponent;
43+
@ViewChild(MatPaginator, { static: false }) paginator: MatPaginator;
44+
@ViewChild(MatSidenav, { static: false }) sidenav: MatSidenav;
45+
@ViewChild(SearchComponent, { static: false }) search: SearchComponent;
4646

4747
analysisDom_time = 62;
4848
count = 13;
@@ -62,7 +62,7 @@ export class PerformanceComponent implements OnInit {
6262
showLabels = false;
6363
doughnut = false;
6464

65-
constructor(private service: PerformanceService, private router: Router) {}
65+
constructor(private service: PerformanceService, private router: Router) { }
6666

6767
ngOnInit() {
6868
this.search.onSearch.subscribe(() => (this.paginator.pageIndex = 0));

‎src/app/apm/script/script.component.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ export class ScriptComponent implements OnInit {
3838
devicesDataSource = [];
3939
eventDataSource = [];
4040

41-
@ViewChild(MatPaginator) paginator: MatPaginator;
42-
@ViewChild(MatSidenav) sidenav: MatSidenav;
43-
@ViewChild(SearchComponent) search: SearchComponent;
41+
@ViewChild(MatPaginator, { static: false }) paginator: MatPaginator;
42+
@ViewChild(MatSidenav, { static: false }) sidenav: MatSidenav;
43+
@ViewChild(SearchComponent, { static: false }) search: SearchComponent;
4444

45-
constructor(private service: ScriptService, private datePipe: DatePipe) {}
45+
constructor(private service: ScriptService, private datePipe: DatePipe) { }
4646

4747
ngOnInit() {
4848
this.search.onSearch.subscribe(() => (this.paginator.pageIndex = 0));

‎src/app/component/chat-widget/chat-widget-container.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import { ChatWidgetAnimations } from './chat-widget.animation';
3838
}
3939
})
4040
export class ChatWidgetContainer extends BasePortalOutlet implements OnDestroy {
41-
@ViewChild(CdkPortalOutlet) _portalOutlet: CdkPortalOutlet;
41+
@ViewChild(CdkPortalOutlet, { static: false }) _portalOutlet: CdkPortalOutlet;
4242
_animationStateChanged = new EventEmitter<AnimationEvent>();
4343

4444
_animationState: 'void' | 'visible' | 'hidden' = 'void';

‎src/app/component/chat-widget/chat-widget.component.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ const getRandomMessage = () => randomMessages[rand(randomMessages.length)];
2727
styleUrls: ['./chat-widget.component.scss']
2828
})
2929
export class ChatWidgetComponent implements OnInit {
30-
@ViewChild('message') message: ElementRef;
31-
@ViewChild('bottom') bottom: ElementRef;
30+
@ViewChild('message', { static: false }) message: ElementRef;
31+
@ViewChild('bottom', { static: false }) bottom: ElementRef;
3232

3333
visible = false;
3434

@@ -46,7 +46,7 @@ export class ChatWidgetComponent implements OnInit {
4646

4747
messages = [];
4848

49-
constructor() {}
49+
constructor() { }
5050

5151
ngOnInit() {
5252
setTimeout(() => {

‎src/app/component/notification/notification-container.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ export class NotificationContainer extends BasePortalOutlet
4646
implements OnDestroy {
4747
private _destroyed = false;
4848

49-
@ViewChild(CdkPortalOutlet) _portalOutlet: CdkPortalOutlet;
49+
@ViewChild(CdkPortalOutlet, { static: false }) _portalOutlet: CdkPortalOutlet;
5050

5151
readonly _onExit: Subject<any> = new Subject();
5252
readonly _onEnter: Subject<any> = new Subject();
@@ -94,7 +94,7 @@ export class NotificationContainer extends BasePortalOutlet
9494
if (!this._destroyed) {
9595
this._animationState = `visible-${
9696
this.notificationConfig.verticalPosition
97-
}`;
97+
}`;
9898
this._changeDetectorRef.detectChanges();
9999
}
100100
}

0 commit comments

Comments
 (0)