From 309d1f9d649daa08bb9b068af014749f6d4a5bce Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 06 Jul 2018 14:00:45 +0800
Subject: [PATCH] 设备和监控点父页面 筛选条件不予 编辑页面联动
---
src/app/app.component.ts | 59 ++++++++++++++++++++++++++++-------------------------------
1 files changed, 28 insertions(+), 31 deletions(-)
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index efcceed..deb9587 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -3,7 +3,7 @@
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 { filter } from 'rxjs/operators';
import * as $ from 'jquery';
@Component({
selector: 'app-root',
@@ -20,42 +20,39 @@
private settings: SettingsService,
private router: Router,
private titleSrv: TitleService,
- private loginService:LoginService) {
+ private loginService: LoginService) {
}
ngOnInit() {
+ 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);
- });
- this.router.events.pipe(
- filter(evt => evt instanceof NavigationStart)
- )
+ filter(evt => evt instanceof NavigationStart)
+ )
.subscribe(() => {
- // ���������������������������������
- let cdkOverlayContainer = $('.cdk-overlay-container');
- if(cdkOverlayContainer!=null&&cdkOverlayContainer.children().length>1){
- cdkOverlayContainer.children('div:first-child').nextAll().each(
- function(index,element){
- if($(element).hasClass('cdk-overlay-backdrop-showing')){
- $(element).remove();
- }else{
- $(element).empty();
- }
- }
- );
- }
- // ������������������������
- if($('.ant-modal-close').length>0){
- $('.ant-modal-close').click();
- }
- // ������������������������
- if($('.ant-select-open').length>0){
+ // ������������������������
+ 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