fix(module: textarea-item): fix autoHeight error(#501) (#502)

NG-ZORRO · Jul 22, 2019 · 50ade9b · 50ade9b
1 parent 0c9bc52
commit 50ade9b
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 7 deletions.
diff --git a/components/textarea-item/demo/basic.ts b/components/textarea-item/demo/basic.ts
@@ -33,6 +33,8 @@ import { Component } from '@angular/core';
         <div class="am-list-body">
           <TextareaItem [title]="'高度自适应'" [autoHeight]="true" [labelNumber]="5">
           </TextareaItem>
+          <TextareaItem [editable]="false" [autoHeight]="true" [value]="readonlyValue">
+          </TextareaItem>
           <TextareaItem [rows]="3" [placeholder]="'fixed number of lines'">
           </TextareaItem>
         </div>
@@ -120,6 +122,8 @@ import { Component } from '@angular/core';
 export class DemoTextareaItemBasicComponent {
   value;
   error;
+  readonlyValue = 'This is a very very very very very very very very' +
+    ' very very very very very very very very very very long paragraph of read-only text';
   numberFocus = {
     focus: false,
     date: new Date()
@@ -135,7 +139,7 @@ export class DemoTextareaItemBasicComponent {
   };
   autoFocus = { focus: true, date: new Date() };
 
-  inputErrorClick(e) {}
+  inputErrorClick(e) { }
 
   clickFocus() {
     this.numberFocus = {

diff --git a/components/textarea-item/textarea-item.component.ts b/components/textarea-item/textarea-item.component.ts
@@ -1,6 +1,7 @@
 import {
   Component,
   OnInit,
+  AfterViewInit,
   Input,
   Output,
   EventEmitter,
@@ -25,7 +26,7 @@ import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
     }
   ]
 })
-export class TextareaItemComponent implements OnInit, AfterContentChecked, ControlValueAccessor {
+export class TextareaItemComponent implements OnInit, AfterContentChecked, ControlValueAccessor, AfterViewInit {
   prefixCls: string = 'am-textarea';
   wrapCls: object;
   labelCls: object;
@@ -196,19 +197,19 @@ export class TextareaItemComponent implements OnInit, AfterContentChecked, Contr
   @HostBinding('class.am-textarea-disabled')
   clsDisabled: boolean;
   @HostBinding('class.am-textarea-error')
-  clsError: boolean ;
+  clsError: boolean;
   @HostBinding('class.am-textarea-focus')
-  clsFocus: boolean ;
+  clsFocus: boolean;
   @HostBinding('class.am-textarea-item-single-line')
   clsSingleLine: boolean;
   @HostBinding('class.am-textarea-has-count')
-  clsHasCount: boolean ;
+  clsHasCount: boolean;
 
   constructor(private element: ElementRef, private render: Renderer2) {
     this._el = element.nativeElement;
   }
 
-  _onChange = (_: any) => {};
+  _onChange = (_: any) => { };
 
   setCls() {
     this.hasCount = this._count > 0 && this._rows > 1;
@@ -303,14 +304,22 @@ export class TextareaItemComponent implements OnInit, AfterContentChecked, Contr
     this._onChange = fn;
   }
 
-  registerOnTouched(fn: any): void {}
+  registerOnTouched(fn: any): void { }
 
   ngOnInit() {
     this.setCls();
     this.setCharacterLength();
     this.textRef.nativeElement.value = this._value;
   }
 
+  ngAfterViewInit() {
+    setTimeout(() => {
+      if (this._autoHeight) {
+        this.reAlignHeight();
+      }
+    }, 100);
+  }
+
   ngAfterContentChecked() {
     if (this._autoHeight && this._focus) {
       this.reAlignHeight();