From 6dd45db33aa58dbc63ddc34fe57bec4b1f00147d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BF=98=E4=BF=97=E4=BA=8C=E5=B8=88=E5=85=84?=
 <505097558@qq.com>
Date: Thu, 5 Sep 2024 16:44:56 +0000
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E9=AB=98=E5=BA=A6=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=20=E4=BC=A0=E5=85=A5=E7=9A=84rows=E4=BC=9A=E5=BD=B1?=
 =?UTF-8?q?=E5=93=8D=E8=87=AA=E5=8A=A8=E9=AB=98=E5=BA=A6=EF=BC=8C=E4=B8=94?=
 =?UTF-8?q?=E8=8B=A5autosize=E9=87=8C=E7=9A=84minHeight=E5=A4=A7=E4=BA=8E1?=
 =?UTF-8?q?00px=EF=BC=8C=E4=BC=9A=E5=AF=BC=E8=87=B4=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E9=AB=98=E5=BA=A6=E5=9C=A8=20minHeight=20=E5=92=8C=20100px=20?=
 =?UTF-8?q?=E4=B9=8B=E9=97=B4=E5=A4=B1=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 还俗二师兄 <505097558@qq.com>
---
 packages/component/component/textarea/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/component/component/textarea/index.vue b/packages/component/component/textarea/index.vue
index abf4631b..4c32063e 100644
--- a/packages/component/component/textarea/index.vue
+++ b/packages/component/component/textarea/index.vue
@@ -42,8 +42,8 @@ const heightStyle = ref("auto");
 const defaultStyle = computed(() => {
   return {
     width: props.cols ? "" : "100%",
-    height: props.rows ? "" : heightStyle.value,
-    minHeight: props.rows ? "" : "100px",
+    height: heightStyle.value=='auto' && props.rows ? "" : heightStyle.value,
+    minHeight: props.autosize?.minHeight ? `${props.autosize?.minHeight}px` : props.rows ? "" : "100px",
   };
 });
 
-- 
Gitee