From 1dfc8bc300a6ae0822514ddf2e1399d4762fa1b1 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Thu, 12 Jul 2018 14:01:00 +0800
Subject: [PATCH] updates
---
src/app/app.component.ts | 57 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 36 insertions(+), 21 deletions(-)
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index acc7507..deb9587 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -1,9 +1,10 @@
-import { Component, HostBinding, OnInit, Inject } from '@angular/core';
-import { Router, NavigationEnd } from '@angular/router';
+import { element } from 'protractor';
+import { LoginService } from '@business/services/http/login.service';
+import { Component, HostBinding, OnInit } from '@angular/core';
+import { Router, NavigationEnd, NavigationStart } from '@angular/router';
import { ThemesService, SettingsService, TitleService } from '@delon/theme';
-import { filter, map } from 'rxjs/operators';
-import { TokenService, DA_SERVICE_TOKEN } from '@delon/auth';
-
+import { filter } from 'rxjs/operators';
+import * as $ from 'jquery';
@Component({
selector: 'app-root',
template: `<router-outlet></router-outlet>`
@@ -19,25 +20,39 @@
private settings: SettingsService,
private router: Router,
private titleSrv: TitleService,
- @Inject(DA_SERVICE_TOKEN) private tokenService: TokenService,
- ) {
+ private loginService: LoginService) {
}
ngOnInit() {
- // ������Token������
- this.tokenService.set({
- token: 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJhZG1pbiIsIm9pZCI6NSwibW9kZSI6IldlYiIsInNjb3BlcyI6WyJ0ZW1wIl0sImlzcyI6Imh0dHA6Ly9tb25pdG9yLjdkcmxiLmNvbSIsImlhdCI6MTUzMTMxNjU4MCwiZXhwIjoxNTM5MDkyNTgwfQ.tWE7AqGfLwwK-nO1FUveJ8xKqpxitqG1GdhKHp9JDyRPjNDYX7ocgkEw0W2G8hKL_tJIjjrQ1pc0zvCmLTJ-pg',
- name: 'admin',
- email: `admin@qq.com`,
- id: 10000,
- time: +new Date(),
- });
+ this.router.events
+ .pipe(filter(evt => evt instanceof NavigationEnd))
+ .subscribe(() => this.titleSrv.setTitle());
this.router.events.pipe(
- filter(evt => evt instanceof NavigationEnd),
- map(() => this.router.url)
- )
- .subscribe(url => {
- this.titleSrv.setTitleByUrl(url);
- });
+ filter(evt => evt instanceof NavigationStart)
+ )
+ .subscribe(() => {
+ // ������������������������
+ if ($('.ant-modal-close').length > 0) {
+ $('.ant-modal-close').click();
+ }
+ // ������������������������
+ if ($('.ant-select-open').length > 0) {
+ $('.ant-select-open').click();
+ }
+ // ���������������������������������
+ const cdkOverlayContainer = $('.cdk-overlay-container');
+ if (cdkOverlayContainer != null && cdkOverlayContainer.children().length > 2) {
+ cdkOverlayContainer.children('div:first-child').next().nextAll().each(
+ function (index, el) {
+ if ($(el).hasClass('cdk-overlay-backdrop-showing')) {
+ $(el).remove();
+ } else {
+ $(el).empty();
+ }
+ }
+ );
+ }
+
+ });
}
}
--
Gitblit v1.8.0