From 0e1bdf804b76b896f4e38606f1ed33558b3cab14 Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Wed, 31 Jul 2024 15:01:12 +0800
Subject: [PATCH] Merge branch 'master_dev'

---
 forms/textarea/CTextArea.vue |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/forms/textarea/CTextArea.vue b/forms/textarea/CTextArea.vue
index daf8cb0..b6aec4b 100644
--- a/forms/textarea/CTextArea.vue
+++ b/forms/textarea/CTextArea.vue
@@ -4,7 +4,10 @@
  */
 
 <template>
-    <view class="c-textarea">
+    <view
+        class="c-textarea"
+        :class="readOnly?'read-only':''"
+    >
         <AtInput
             ref="input"
             :name="itemRes.name"
@@ -16,7 +19,7 @@
         <textarea
             ref="textarea"
             class="textarea"
-            :style="{minHeight: areaHeight}"
+            :style="{minHeight: areaHeight, height: areaHeight}"
             :placeholder="placeholder"
             :value="itemRes.formData[itemRes.name]"
             :autoFocus="false"
@@ -41,9 +44,17 @@
         // 表单数据资源(表单组件内部机制专用)
         itemRes: Object,
         // 文本域输入区域高度
-        height: Number,
+        height: {
+            type: Number,
+            default: 94,
+        },
         // 文本雨输入区行数
         rows: Number,
+        // 只读模式
+        readOnly: {
+            type: Boolean,
+            default: false,
+        },
         // 占位提示
         placeholder: String,
     },

--
Gitblit v1.9.1