From a39d8efc4d44aaddd7b44baa4a4d1b182366dac7 Mon Sep 17 00:00:00 2001
From: qiang <guoshengqiang@live.com>
Date: Thu, 19 Dec 2019 20:40:37 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3H5=E7=AB=AFtextarea?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=9C=AA=E8=AE=BE=E7=BD=AEline-height?=
 =?UTF-8?q?=E6=97=B6linechange=E4=BA=8B=E4=BB=B6=E5=BE=97=E5=88=B0?=
 =?UTF-8?q?=E5=88=B0lineCount=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=20fixed=20#1123?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/core/view/components/textarea/index.vue | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/core/view/components/textarea/index.vue b/src/core/view/components/textarea/index.vue
index 8820260733..18fc6bc8e4 100644
--- a/src/core/view/components/textarea/index.vue
+++ b/src/core/view/components/textarea/index.vue
@@ -23,13 +23,16 @@
         :class="placeholderClass"
         class="uni-textarea-placeholder"
       >{{ placeholder }}</div>
+      <div
+        ref="line"
+        class="uni-textarea-line">&nbsp;</div>
       <div class="uni-textarea-compute">
         <div
           v-for="(item,index) in valueCompute"
           :key="index">{{ item.trim() ? item : '.' }}</div>
         <v-uni-resize-sensor
           ref="sensor"
-          @resize="_resize"/>
+          @resize="_resize" />
       </div>
       <textarea
         ref="textarea"
@@ -188,7 +191,10 @@ export default {
       this._checkSelection()
     },
     height (height) {
-      const lineHeight = getComputedStyle(this.$el).lineHeight.replace('px', '')
+      let lineHeight = parseFloat(getComputedStyle(this.$el).lineHeight)
+      if (isNaN(lineHeight)) {
+        lineHeight = this.$refs.line.offsetHeight
+      }
       var lineCount = Math.round(height / lineHeight)
       this.$trigger('linechange', {}, {
         height,
@@ -305,6 +311,7 @@ uni-textarea[auto-height] .uni-textarea-textarea {
 }
 .uni-textarea-wrapper,
 .uni-textarea-placeholder,
+.uni-textarea-line,
 .uni-textarea-compute,
 .uni-textarea-textarea {
   outline: none;
@@ -320,6 +327,7 @@ uni-textarea[auto-height] .uni-textarea-textarea {
   height: 100%;
 }
 .uni-textarea-placeholder,
+.uni-textarea-line,
 .uni-textarea-compute,
 .uni-textarea-textarea {
   position: absolute;
@@ -334,10 +342,14 @@ uni-textarea[auto-height] .uni-textarea-textarea {
   color: grey;
   overflow: hidden;
 }
+.uni-textarea-line,
 .uni-textarea-compute {
   visibility: hidden;
   height: auto;
 }
+.uni-textarea-line {
+  width: 1em;
+}
 .uni-textarea-textarea {
   resize: none;
   background: none;
-- 
GitLab