From 7ce9234ffbfa6c5b28e841439d9ba35324b10a89 Mon Sep 17 00:00:00 2001
From: windy <1374721899@qq.com>
Date: Mon, 7 Dec 2020 10:09:55 +0800
Subject: [PATCH] =?UTF-8?q?KERNEL-6382=20=E6=98=BE=E7=A4=BA=E5=80=BC?=
 =?UTF-8?q?=E7=9A=84=E5=B7=A6=E8=BE=B9=E8=B7=9D=E4=B8=8E=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E5=B7=A6=E8=BE=B9=E8=B7=9D=E7=BB=9F=E4=B8=80=20&&=20=E6=96=87?=
 =?UTF-8?q?=E6=9C=AC=E5=9F=9F=E6=B0=B4=E5=8D=B0=E5=8F=AF=E9=80=89=E4=B8=AD?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 changelog.md                              | 1 +
 src/base/single/editor/editor.textarea.js | 2 +-
 src/case/editor/editor.shelter.js         | 2 +-
 src/case/editor/editor.sign.js            | 2 +-
 src/case/editor/editor.state.js           | 2 +-
 src/case/editor/editor.state.simple.js    | 2 +-
 6 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/changelog.md b/changelog.md
index e7b76727c1..44fc7a44f4 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,6 @@
 # 更新日志
 2.0(2020-12)
+- [视觉]editor水印间距统一与文本域水印不可选中
 - 修复bi.file的url参数拼接问题
 - 修复了colorChooser选择透明后, 打开更多选色面板, 直接点保存会选中自动的问题
 - bi.file支持限制上传文件数
diff --git a/src/base/single/editor/editor.textarea.js b/src/base/single/editor/editor.textarea.js
index 91274d7af6..47ee9e186e 100644
--- a/src/base/single/editor/editor.textarea.js
+++ b/src/base/single/editor/editor.textarea.js
@@ -84,7 +84,7 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
                 if (!this.watermark) {
                     this.watermark = BI.createWidget({
                         type: "bi.text_button",
-                        cls: "bi-water-mark cursor-default textarea-watermark",
+                        cls: "bi-water-mark cursor-default textarea-watermark bi-user-select-disable",
                         textAlign: "left",
                         whiteSpace: "normal",
                         text: o.watermark,
diff --git a/src/case/editor/editor.shelter.js b/src/case/editor/editor.shelter.js
index 0962e74d08..562cbe3a41 100644
--- a/src/case/editor/editor.shelter.js
+++ b/src/case/editor/editor.shelter.js
@@ -52,7 +52,7 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
             tipType: o.tipType,
             textAlign: o.textAlign,
             height: o.height,
-            hgap: o.hgap
+            hgap: o.hgap + 2
         });
         BI.createWidget({
             type: "bi.absolute",
diff --git a/src/case/editor/editor.sign.js b/src/case/editor/editor.sign.js
index e71efc3bf6..35ed78e4b3 100644
--- a/src/case/editor/editor.sign.js
+++ b/src/case/editor/editor.sign.js
@@ -52,7 +52,7 @@ BI.SignEditor = BI.inherit(BI.Widget, {
             tipType: o.tipType,
             textAlign: o.textAlign,
             height: o.height,
-            hgap: o.hgap,
+            hgap: o.hgap + 2,
             handler: function () {
                 self._showInput();
                 self.editor.focus();
diff --git a/src/case/editor/editor.state.js b/src/case/editor/editor.state.js
index 450a08f2f8..1773c04f73 100644
--- a/src/case/editor/editor.state.js
+++ b/src/case/editor/editor.state.js
@@ -51,7 +51,7 @@ BI.StateEditor = BI.inherit(BI.Widget, {
             textAlign: "left",
             height: o.height,
             text: o.text,
-            hgap: o.hgap,
+            hgap: o.hgap + 2,
             handler: function () {
                 self._showInput();
                 self.editor.focus();
diff --git a/src/case/editor/editor.state.simple.js b/src/case/editor/editor.state.simple.js
index 10cb450571..6fab8d6f8d 100644
--- a/src/case/editor/editor.state.simple.js
+++ b/src/case/editor/editor.state.simple.js
@@ -51,7 +51,7 @@ BI.SimpleStateEditor = BI.inherit(BI.Widget, {
             textAlign: "left",
             text: o.text,
             height: o.height,
-            hgap: o.hgap,
+            hgap: o.hgap + 2,
             handler: function () {
                 self._showInput();
                 self.editor.focus();