From 7e34606718eab08406f440158a56f757d1cb727a Mon Sep 17 00:00:00 2001
From: Marvin <454846659@qq.com>
Date: Mon, 25 Sep 2023 16:25:29 +0800
Subject: [PATCH] =?UTF-8?q?feat(textarea):=20=E5=BD=93disabled=E4=B8=BAtru?=
 =?UTF-8?q?e=E6=97=B6=EF=BC=8Ctaro=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=B8=8D?=
 =?UTF-8?q?=E6=8D=A2=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/packages/__VUE/textarea/index.scss     | 5 +++++
 src/packages/__VUE/textarea/index.taro.vue | 7 ++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/packages/__VUE/textarea/index.scss b/src/packages/__VUE/textarea/index.scss
index a831b62c4b3..f409232ea22 100644
--- a/src/packages/__VUE/textarea/index.scss
+++ b/src/packages/__VUE/textarea/index.scss
@@ -51,6 +51,11 @@
   &__textarea__readonly {
     padding: 5px 10px;
   }
+  &__textarea__disabled {
+    padding: 5px 10px;
+    color: $textarea-disabled-color !important;
+    background-color: #f9f9f9;
+  }
   &__ali {
     line-height: 17px;
   }
diff --git a/src/packages/__VUE/textarea/index.taro.vue b/src/packages/__VUE/textarea/index.taro.vue
index 7ae505c91b1..bb6d2c51f8d 100644
--- a/src/packages/__VUE/textarea/index.taro.vue
+++ b/src/packages/__VUE/textarea/index.taro.vue
@@ -5,6 +5,11 @@
       class="nut-textarea__textarea nut-textarea__textarea__readonly"
       :nodes="readonlyValue"
     ></rich-text>
+    <rich-text
+      v-else-if="disabled"
+      class="nut-textarea__textarea nut-textarea__textarea__disabled"
+      :nodes="readonlyValue"
+    ></rich-text>
     <textarea
       v-else
       ref="textareaRef"
@@ -115,7 +120,7 @@ export default create({
     });
 
     const readonlyValue = computed(() => {
-      return props.modelValue.replace(/\\n/g, '<br/>');
+      return props.modelValue.replace(/\\n|\\r\\n/g, '<br/>');
     });
 
     const emitChange = (value: string, event: Event) => {