From 72444bc606c0d7586dcf739b3af172f48aec5183 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A1=94=E5=AD=90?= <juzi214032@qq.com>
Date: Tue, 6 Apr 2021 22:33:30 +0800
Subject: [PATCH] =?UTF-8?q?fix(Textarea):=20=E4=BF=AE=E5=A4=8D=E5=AE=89?=
 =?UTF-8?q?=E5=8D=93=E5=B9=B3=E5=8F=B0=E5=AD=97=E6=95=B0=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=87=86=E7=A1=AE=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

close #1328
---
 src/core/wxs/math.wxs   | 7 +++++++
 src/textarea/index.wxml | 8 ++++----
 2 files changed, 11 insertions(+), 4 deletions(-)
 create mode 100644 src/core/wxs/math.wxs

diff --git a/src/core/wxs/math.wxs b/src/core/wxs/math.wxs
new file mode 100644
index 00000000..38ed7a89
--- /dev/null
+++ b/src/core/wxs/math.wxs
@@ -0,0 +1,7 @@
+function min(a,b){
+    return Math.min(a,b);
+}
+
+module.exports = {
+    min:min
+}
\ No newline at end of file
diff --git a/src/textarea/index.wxml b/src/textarea/index.wxml
index 5bb42b57..e5878a33 100644
--- a/src/textarea/index.wxml
+++ b/src/textarea/index.wxml
@@ -1,4 +1,5 @@
-<!--  input/input.wxml -->
+<wxs src="../core/wxs/math.wxs" module="Math" />
+
 <label class='form-item {{disabled? "disabled": ""}}'>
   <view class='default-border {{border? "border": ""}} l-class'>
     <view class='mask' wx:if="{{disabled}}"></view>
@@ -21,9 +22,8 @@
       bindblur="handleInputBlur"
       bindconfirm="handleInputConfirm"
       />
-      <view
-        class="indicator"
-        wx:if="{{indicator}}">{{value.length + '/' +  maxlength}}</view>
+      <!-- 使用 Math.min 的原因：在安卓平台上，由于微信的 bug，value.length 会超过 maxlength，导致显示不准确 -->
+      <view class="indicator" wx:if="{{indicator}}">{{Math.min(value.length,maxlength) + '/' +  maxlength}}</view>
   </view>
 </label>
   <l-error-tip l-error-text-class="l-error-text l-error-text-class" errorText="{{errorText}}" wx:if="{{errorText}}"/>