11import { Component , OnInit , OnDestroy } from '@angular/core' ;
2- import { MediaChange , ObservableMedia } from '@angular/flex-layout' ;
3- import { Observable , ReplaySubject , Subscription } from 'rxjs' ;
2+ import { MediaObserver } from '@angular/flex-layout' ;
3+ import { Subscription } from 'rxjs' ;
44import { ConfigService } from '../core/config.service' ;
55import { NavigationService } from '../component/navigation' ;
66
@@ -19,25 +19,16 @@ export class AdminComponent implements OnInit, OnDestroy {
1919 onSettingsChanged : Subscription ;
2020 layoutMode : boolean = false ;
2121
22- navigationModel ;
22+ navigationModel : any ;
2323 navigationModelChangeSubscription : Subscription ;
2424
25- private _media$ : ReplaySubject < MediaChange > = new ReplaySubject ( 1 ) ;
26- private _mediaSubscription : Subscription ;
27-
2825 sidenavOpen : boolean = true ;
2926 sidenavMode : string = 'side' ;
3027 sidenavAlign : string = 'start' ;
3128 customizerSidenavAlign : string = 'end' ;
3229
33- title = '中后台前端应用框架 - Power by stbui' ;
34-
35- get media$ ( ) : Observable < MediaChange > {
36- return this . _media$ . asObservable ( ) ;
37- }
38-
3930 constructor (
40- media : ObservableMedia ,
31+ private mediaObserver : MediaObserver ,
4132 private config : ConfigService ,
4233 private translateService : TranslateService ,
4334 private translationService : TranslationService ,
@@ -49,14 +40,6 @@ export class AdminComponent implements OnInit, OnDestroy {
4940 }
5041 ) ;
5142
52- media
53- . asObservable ( )
54- . subscribe (
55- res => this . _media$ . next ( res ) ,
56- err => this . _media$ . error ( err ) ,
57- ( ) => this . _media$ . complete ( )
58- ) ;
59-
6043 this . onSettingsChanged = this . config . onSettingsChanged . subscribe (
6144 settings => {
6245 this . settings = settings ;
@@ -88,16 +71,11 @@ export class AdminComponent implements OnInit, OnDestroy {
8871 }
8972
9073 ngOnInit ( ) {
91- this . _mediaSubscription = this . media$ . subscribe ( ( change : MediaChange ) => {
74+ this . mediaObserver . media$ . subscribe ( change => {
9275 let isMobile = change . mqAlias === 'xs' || change . mqAlias === 'sm' ;
93-
9476 this . sidenavMode = isMobile ? 'over' : 'side' ;
9577 this . sidenavOpen = ! isMobile ;
9678 } ) ;
97-
98- setTimeout ( ( ) => {
99- window . dispatchEvent ( new Event ( 'resize' ) ) ;
100- } , 2000 ) ;
10179 }
10280
10381 ngOnDestroy ( ) {
0 commit comments