From bd4280dd13ad309bdbc30900ca27179473b7bf1c Mon Sep 17 00:00:00 2001
From: qiang <guoshengqiang@live.com>
Date: Fri, 14 Jun 2019 17:48:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=20textarea=20?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E8=AE=BE=E7=BD=AE=20auto-height=20=E6=97=B6?=
 =?UTF-8?q?=E4=BB=8D=E7=84=B6=E5=87=BA=E7=8E=B0=E6=BB=9A=E5=8A=A8=E6=9D=A1?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/core/view/components/textarea/index.vue | 48 ++++++++++++---------
 1 file changed, 28 insertions(+), 20 deletions(-)

diff --git a/src/core/view/components/textarea/index.vue b/src/core/view/components/textarea/index.vue
index 7eac3f564..acadb4c33 100644
--- a/src/core/view/components/textarea/index.vue
+++ b/src/core/view/components/textarea/index.vue
@@ -1,5 +1,19 @@
 <template>
-  <uni-textarea v-on="$listeners">
+  <uni-textarea
+    :value="_checkEmpty(value)"
+    :maxlength="maxlengthNumber"
+    :placeholder="_checkEmpty(placeholder)"
+    :disabled="disabled"
+    :focus="focus"
+    :auto-focus="autoFocus"
+    :placeholder-class="_checkEmpty(placeholderClass)"
+    :placeholder-style="_checkEmpty(placeholderStyle)"
+    :auto-height="autoHeight"
+    :cursor="cursorNumber"
+    :selection-start="selectionStartNumber"
+    :selection-end="selectionEndNumber"
+    v-on="$listeners"
+  >
     <div
       ref="wrapped"
       class="uni-textarea-wrapped">
@@ -13,7 +27,7 @@
       <div class="uni-textarea-compute">
         <div
           v-for="(item,index) in valueCompute"
-          :key="index">{{ item||'.' }}</div>
+          :key="index">{{ item.trim() ? item : '.' }}</div>
         <v-uni-resize-sensor
           ref="sensor"
           @resize="_resize"/>
@@ -23,7 +37,6 @@
         v-model="valueSync"
         :disabled="disabled"
         :maxlength="maxlengthNumber"
-        :placeholder="placeholder"
         :autofocus="autoFocus"
         class="uni-textarea-textarea"
         @compositionstart="_compositionstart"
@@ -88,10 +101,6 @@ export default {
       type: [Boolean, String],
       default: false
     },
-    bindinput: {
-      type: String,
-      default: ''
-    },
     cursor: {
       type: [Number, String],
       default: -1
@@ -267,6 +276,9 @@ export default {
     },
     _resetFormData () {
       this.valueSync = ''
+    },
+    _checkEmpty (str) {
+      return str || false
     }
   }
 }
@@ -279,7 +291,13 @@ uni-textarea {
   display: block;
   position: relative;
   font-size: 16px;
-  line-height: 1.2;
+  line-height: normal;
+}
+uni-textarea[hidden] {
+  display: none;
+}
+uni-textarea[auto-height] .uni-textarea-textarea {
+  overflow-y: hidden;
 }
 .uni-textarea-wrapped {
   position: relative;
@@ -295,6 +313,7 @@ uni-textarea {
   letter-spacing: inherit;
   text-indent: inherit;
   color: inherit;
+  text-align: inherit;
 }
 .uni-textarea-placeholder,
 .uni-textarea-compute,
@@ -315,6 +334,7 @@ uni-textarea {
   letter-spacing: inherit;
   text-indent: inherit;
   color: inherit;
+  text-align: inherit;
 }
 .uni-textarea-placeholder {
   color: grey;
@@ -331,16 +351,4 @@ uni-textarea {
   background-color: transparent;
   opacity: inherit;
 }
-.uni-textarea-textarea::-webkit-input-placeholder {
-  color: transparent;
-}
-.uni-textarea-textarea:-moz-placeholder {
-  color: transparent;
-}
-.uni-textarea-textarea::-moz-placeholder {
-  color: transparent;
-}
-.uni-textarea-textarea:-ms-input-placeholder {
-  color: transparent;
-}
 </style>
-- 
GitLab