[修复] tab无法监听selectedIndexChange和selectedChange事件 fixes #708

rdkmaster · Aug 28, 2018 · 8668855 · 8668855
1 parent 426fbc0
commit 8668855
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/src/app/demo/tab/basic/demo.component.html b/src/app/demo/tab/basic/demo.component.html
@@ -5,7 +5,7 @@
 
 <!-- start to learn the demo from here -->
 <div class="container">
-    <jigsaw-tabs (selectChange)="testEvent($event)" [selectedIndex]="2" height="200">
+    <jigsaw-tabs (selectChange)="testEvent($event)" (selectedIndexChange)="selectedIndexChange($event)" [selectedIndex]="2" height="200">
         <jigsaw-tab-pane [lazy]="false">
             <div jigsaw-title><span class="fa fa-gift"></span>tab 1</div>
             <ng-template>tab content 1</ng-template>

diff --git a/src/app/demo/tab/basic/demo.component.ts b/src/app/demo/tab/basic/demo.component.ts
@@ -28,6 +28,10 @@ export class JigsawTabsDemoComponent {
         console.info(value);
     }
 
+    selectedIndexChange($event) {
+        console.log($event);
+    }
+
     public lineBarGraphData: LineGraphData;
 
     constructor(http: HttpClient) {

diff --git a/src/jigsaw/component/tabs/tab.ts b/src/jigsaw/component/tabs/tab.ts
@@ -222,8 +222,9 @@ export class JigsawTab extends AbstractJigsawComponent implements AfterViewInit,
     public _$contentHeight: string = 'auto';
 
     ngOnInit() {
+        super.ngOnInit();
         if(this.height) {
-            setTimeout(() => {
+            this.callLater(() => {
                 // 等待dom渲染
                 this._$contentHeight = this._elementRef.nativeElement.offsetHeight - 46 + 'px';
             })