From c06fe4199c937cde6305633a3ccc5860e88fa5fe Mon Sep 17 00:00:00 2001
From: windy <1374721899@qq.com>
Date: Thu, 2 Apr 2020 09:06:55 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-20059=20fix:=20textarea=E6=B0=B4?=
 =?UTF-8?q?=E5=8D=B0=E6=BB=9A=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/base/single/editor/editor.textarea.js | 13 ++++++++-----
 src/base/single/label/abstract.label.js   |  1 +
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/base/single/editor/editor.textarea.js b/src/base/single/editor/editor.textarea.js
index 59cd55ca11..e91f9df4a7 100644
--- a/src/base/single/editor/editor.textarea.js
+++ b/src/base/single/editor/editor.textarea.js
@@ -33,7 +33,7 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
                 left: 4,
                 right: 4,
                 top: 4,
-                bottom: 8
+                bottom: 4
             }]
         });
 
@@ -86,7 +86,9 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
                         whiteSpace: "normal",
                         text: o.watermark,
                         invalid: o.invalid,
-                        disabled: o.disabled
+                        disabled: o.disabled,
+                        hgap: 4,
+                        vgap: 4
                     });
                     this.watermark.on(BI.TextButton.EVENT_CHANGE, function () {
                         self.focus();
@@ -96,9 +98,10 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
                         element: this,
                         items: [{
                             el: this.watermark,
-                            left: 4,
-                            top: 4,
-                            right: 0
+                            left: 0,
+                            top: 0,
+                            right: 0,
+                            bottom: 0
                         }]
                     });
                 } else {
diff --git a/src/base/single/label/abstract.label.js b/src/base/single/label/abstract.label.js
index 3d6759e4bf..a3954e0946 100644
--- a/src/base/single/label/abstract.label.js
+++ b/src/base/single/label/abstract.label.js
@@ -324,6 +324,7 @@ BI.AbstractLabel = BI.inherit(BI.Single, {
         BI.createWidget({
             type: adaptLayout,
             element: this,
+            scrollable: o.whiteSpace === "normal",
             items: [this.text]
         });
     },