From d15e7dd699febfb2d98fed1575fe6741bcb22ad3 Mon Sep 17 00:00:00 2001
From: Hsuan Lee <HsuanGM@gmail.com>
Date: Wed, 27 Mar 2019 17:38:23 +0800
Subject: [PATCH] fix(module:dropdown): fix the style of CDK conflicts (#3133)

close #3075
---
 .../dropdown/nz-dropdown-button.component.html       |  4 +++-
 components/dropdown/nz-dropdown.component.html       |  4 +++-
 components/dropdown/nz-dropdown.module.ts            | 12 +++++++++++-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/components/dropdown/nz-dropdown-button.component.html b/components/dropdown/nz-dropdown-button.component.html
index 95caf21372f..5caa5fca0e8 100644
--- a/components/dropdown/nz-dropdown-button.component.html
+++ b/components/dropdown/nz-dropdown-button.component.html
@@ -19,7 +19,9 @@
     <i nz-icon type="ellipsis"></i>
   </button>
 </div>
-<ng-template cdkConnectedOverlay
+<ng-template
+  cdkConnectedOverlay
+  nzConnectedOverlay
   [cdkConnectedOverlayHasBackdrop]="nzTrigger === 'click'"
   [cdkConnectedOverlayPositions]="positions"
   [cdkConnectedOverlayOrigin]="nzDropDownDirective"
diff --git a/components/dropdown/nz-dropdown.component.html b/components/dropdown/nz-dropdown.component.html
index bea6ae221ae..c8f2660c0a8 100644
--- a/components/dropdown/nz-dropdown.component.html
+++ b/components/dropdown/nz-dropdown.component.html
@@ -1,5 +1,7 @@
 <ng-content select="[nz-dropdown]"></ng-content>
-<ng-template cdkConnectedOverlay
+<ng-template
+  cdkConnectedOverlay
+  nzConnectedOverlay
   [cdkConnectedOverlayHasBackdrop]="nzTrigger === 'click'"
   [cdkConnectedOverlayPositions]="positions"
   [cdkConnectedOverlayOrigin]="nzDropDownDirective"
diff --git a/components/dropdown/nz-dropdown.module.ts b/components/dropdown/nz-dropdown.module.ts
index 57af085c175..f50ac6a4d24 100644
--- a/components/dropdown/nz-dropdown.module.ts
+++ b/components/dropdown/nz-dropdown.module.ts
@@ -6,6 +6,7 @@ import { FormsModule } from '@angular/forms';
 import { NzNoAnimationModule } from '../core/no-animation/nz-no-animation.module';
 
 import { NzButtonModule } from '../button/nz-button.module';
+import { NzOverlayModule } from '../core/overlay/nz-overlay.module';
 import { NzIconModule } from '../icon/nz-icon.module';
 import { NzMenuModule } from '../menu/nz-menu.module';
 import { NzDropDownADirective } from './nz-dropdown-a.directive';
@@ -15,7 +16,16 @@ import { NzDropDownComponent } from './nz-dropdown.component';
 import { NzDropDownDirective } from './nz-dropdown.directive';
 
 @NgModule({
-  imports: [CommonModule, OverlayModule, FormsModule, NzButtonModule, NzMenuModule, NzIconModule, NzNoAnimationModule],
+  imports: [
+    CommonModule,
+    OverlayModule,
+    FormsModule,
+    NzButtonModule,
+    NzMenuModule,
+    NzIconModule,
+    NzNoAnimationModule,
+    NzOverlayModule
+  ],
   entryComponents: [NzDropdownContextComponent],
   declarations: [
     NzDropDownComponent,