From 6338006e0f85af8d4915abfbe67696b2b17dd6ce Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Thu, 13 May 2021 21:10:19 +0800
Subject: [PATCH] Merge branch 'master' of ssh://dev.zhiheiot.com:29418/mob-components
---
forms/textarea/CTextArea.vue | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/forms/textarea/CTextArea.vue b/forms/textarea/CTextArea.vue
index 6f00ef1..adb8c65 100644
--- a/forms/textarea/CTextArea.vue
+++ b/forms/textarea/CTextArea.vue
@@ -10,6 +10,7 @@
:name="itemRes.name"
:title="itemRes.label"
:required="itemRes.required"
+ :disabled="itemRes.disabled"
:error="itemRes.error"
/>
<textarea
@@ -51,7 +52,7 @@
},
computed: {
areaHeight() {
- return Taro.pxTransform(this.height);
+ return Taro.pxTransform(this.height, 750);
},
},
methods: {},
--
Gitblit v1.9.1