feat(textarea): 当disabled为true时，taro小程序不换行

jdf2e · Sep 25, 2023 · 7e34606 · 7e34606
1 parent 363a173
commit 7e34606
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git 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
@@ -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) => {