From 190839c66eec7aacf112eb2b0e2286bc4bb0ddbc Mon Sep 17 00:00:00 2001
From: xuliangzhan
Date: Wed, 7 Jul 2021 12:21:29 +0800
Subject: [PATCH] =?UTF-8?q?table=20=E4=BC=98=E5=8C=96=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
examples/views/table/scroll/ScrollFullRows.vue | 2 +-
examples/views/table/scroll/ScrollRows.vue | 2 +-
styles/textarea.scss | 1 +
styles/variable.scss | 1 +
4 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/examples/views/table/scroll/ScrollFullRows.vue b/examples/views/table/scroll/ScrollFullRows.vue
index 10f4d0719..c359ea68c 100644
--- a/examples/views/table/scroll/ScrollFullRows.vue
+++ b/examples/views/table/scroll/ScrollFullRows.vue
@@ -4,7 +4,7 @@
虚拟滚动渲染,左右固定列
大数据不建议使用双向绑定的 data 属性,建议使用 / 函数
对于多选 type= 当数据量海量时应该绑定 属性渲染速度更快
- (注:启用纵向虚拟滚的后不支持动态行高;如果需要支持,将虚拟滚动关闭即可)
+ (注:启用纵向虚拟滚启动后不支持动态行高;如果需要支持,将虚拟滚动关闭即可)
diff --git a/examples/views/table/scroll/ScrollRows.vue b/examples/views/table/scroll/ScrollRows.vue
index a6362bde9..eb9c6b26a 100644
--- a/examples/views/table/scroll/ScrollRows.vue
+++ b/examples/views/table/scroll/ScrollRows.vue
@@ -4,7 +4,7 @@
虚拟滚动渲染
大数据不建议使用双向绑定的 属性,建议使用 / 函数
和 / 不应该同时使用,请根据数据量决定使用哪种方式,保证一致性
- (注:启用纵向虚拟滚的后不支持动态行高;如果需要支持,将虚拟滚动关闭即可)
+ (注:启用纵向虚拟滚启动后不支持动态行高;如果需要支持,将虚拟滚动关闭即可)
diff --git a/styles/textarea.scss b/styles/textarea.scss
index d22fa6ae0..232f848a5 100644
--- a/styles/textarea.scss
+++ b/styles/textarea.scss
@@ -36,6 +36,7 @@
.vxe-textarea--inner,
.vxe-textarea--autosize {
+ line-height: $vxe-textarea-line-height;
color: $vxe-font-color;
font-family: $vxe-font-family;
}
diff --git a/styles/variable.scss b/styles/variable.scss
index fb3c809e0..dd808850d 100644
--- a/styles/variable.scss
+++ b/styles/variable.scss
@@ -211,6 +211,7 @@ $vxe-input-height-small: $vxe-button-height-small;
$vxe-input-height-mini: $vxe-button-height-mini;
/*textarea*/
+$vxe-textarea-line-height: 1.5715;
$vxe-textarea-background-color: #fff;
$vxe-textarea-count-color: #999;
$vxe-textarea-count-background-color: #fff;