From 2590bd8a31db09e7dbdf3448e8df030fea66a8a7 Mon Sep 17 00:00:00 2001
From: windy <1374721899@qq.com>
Date: Thu, 13 May 2021 10:35:48 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20=E5=9B=9E?=
 =?UTF-8?q?=E6=BB=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/less/base/single/editor/editor.textarea.less | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/less/base/single/editor/editor.textarea.less b/src/less/base/single/editor/editor.textarea.less
index bac545aac..a95850abb 100644
--- a/src/less/base/single/editor/editor.textarea.less
+++ b/src/less/base/single/editor/editor.textarea.less
@@ -10,8 +10,6 @@
     & {
       border: none;
     }
-    // BI-86802 div构造的水印移上去没有输入状态的光标,让编辑框层级比水印高一点
-    z-index: 1;
   }
   & .textarea-watermark{
     max-height: 100%;

From 536dd58f70c1626b3c843e9a26e322bcc4bef598 Mon Sep 17 00:00:00 2001
From: windy <1374721899@qq.com>
Date: Thu, 13 May 2021 11:28:27 +0800
Subject: [PATCH 2/3] =?UTF-8?q?BI-86802=20fix:=20=E9=BC=A0=E6=A0=87?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=20&&=20=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/base/single/editor/editor.textarea.js | 6 +++---
 src/less/core/utils/cursor.less           | 5 +++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/base/single/editor/editor.textarea.js b/src/base/single/editor/editor.textarea.js
index 29ca9589f..4a8bd176b 100644
--- a/src/base/single/editor/editor.textarea.js
+++ b/src/base/single/editor/editor.textarea.js
@@ -87,7 +87,7 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
                 if (!this.watermark) {
                     this.watermark = BI.createWidget({
                         type: "bi.label",
-                        cls: "bi-water-mark cursor-default textarea-watermark",
+                        cls: "bi-water-mark cursor-text textarea-watermark",
                         textAlign: "left",
                         whiteSpace: "normal",
                         text: o.watermark,
@@ -99,9 +99,9 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
                     this.watermark.element.bind({
                         mousedown: function (e) {
                             if (self.isEnabled()) {
-                                self.editor.focus();
+                                self.focus();
                             } else {
-                                self.editor.blur();
+                                self.blur();
                             }
                             e.stopEvent();
                         }
diff --git a/src/less/core/utils/cursor.less b/src/less/core/utils/cursor.less
index 696d08a56..7e7019f30 100644
--- a/src/less/core/utils/cursor.less
+++ b/src/less/core/utils/cursor.less
@@ -8,4 +8,9 @@
 .cursor-move{
   cursor: move;
 }
+
+.cursor-text{
+  cursor: text;
+}
+
 /*****************cursor*****************/
\ No newline at end of file

From e6152e3f6d47eafe57d65a81547a5260311446c1 Mon Sep 17 00:00:00 2001
From: windy <1374721899@qq.com>
Date: Thu, 13 May 2021 11:38:22 +0800
Subject: [PATCH 3/3] update

---
 src/base/single/editor/editor.textarea.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/base/single/editor/editor.textarea.js b/src/base/single/editor/editor.textarea.js
index 4a8bd176b..bfc1c6c05 100644
--- a/src/base/single/editor/editor.textarea.js
+++ b/src/base/single/editor/editor.textarea.js
@@ -87,7 +87,7 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
                 if (!this.watermark) {
                     this.watermark = BI.createWidget({
                         type: "bi.label",
-                        cls: "bi-water-mark cursor-text textarea-watermark",
+                        cls: "bi-water-mark textarea-watermark",
                         textAlign: "left",
                         whiteSpace: "normal",
                         text: o.watermark,