From 8f175ee42298029aa8a4222747d4fd43a8b1db34 Mon Sep 17 00:00:00 2001 From: zsmj1994 Date: Tue, 15 Dec 2020 09:13:09 +0800 Subject: [PATCH 1/3] =?UTF-8?q?DEC-16252=20fix=20:=20bi.editor=E6=B0=B4?= =?UTF-8?q?=E5=8D=B0=E7=9A=84=E9=97=B4=E8=B7=9D=E4=B8=8Esign=5Feditor,shil?= =?UTF-8?q?ter=5Feditro=20=E7=AD=89=E5=85=B6=E4=BB=96editor=E7=9A=84text?= =?UTF-8?q?=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/base/single/editor/editor.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/base/single/editor/editor.js b/src/base/single/editor/editor.js index 9af71c408..f24d4b3fe 100644 --- a/src/base/single/editor/editor.js +++ b/src/base/single/editor/editor.js @@ -251,8 +251,8 @@ BI.Editor = BI.inherit(BI.Single, { element: this.contentWrapper, items: [{ el: this.watermark, - left: 3, - right: 3, + left: this.options.hgap, + right: this.options.hgap, top: 0, bottom: 0, }], From 44137f7e9a3c4ee36072b022ffd7022e38b5c390 Mon Sep 17 00:00:00 2001 From: zsmj1994 Date: Tue, 15 Dec 2020 09:36:04 +0800 Subject: [PATCH 2/3] =?UTF-8?q?DEC-16252=20fix=20:=20bi.editor=E6=B0=B4?= =?UTF-8?q?=E5=8D=B0=E7=9A=84=E9=97=B4=E8=B7=9D=E4=B8=8Esign=5Feditor,shil?= =?UTF-8?q?ter=5Feditro=20=E7=AD=89=E5=85=B6=E4=BB=96editor=E7=9A=84text?= =?UTF-8?q?=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/base/single/editor/editor.js | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/base/single/editor/editor.js b/src/base/single/editor/editor.js index f24d4b3fe..0d042cb00 100644 --- a/src/base/single/editor/editor.js +++ b/src/base/single/editor/editor.js @@ -53,7 +53,7 @@ BI.Editor = BI.inherit(BI.Single, { var items = [{ el: { type: "bi.absolute", - ref: function(_ref) { + ref: function (_ref) { self.contentWrapper = _ref; }, items: [{ @@ -183,14 +183,15 @@ BI.Editor = BI.inherit(BI.Single, { } }, - _assertWaterMark: function() { + _assertWaterMark: function () { var self = this, o = this.options; - if(BI.isNull(this.watermark)) { + if (BI.isNull(this.watermark)) { this.watermark = BI.createWidget({ type: "bi.label", cls: "bi-water-mark", text: this.options.watermark, height: o.height - 2 * o.vgap - o.tgap, + hgap: o.hgap - 2, whiteSpace: "nowrap", textAlign: "left" }); @@ -237,7 +238,7 @@ BI.Editor = BI.inherit(BI.Single, { return this.options.errorText; }, - setWaterMark: function(v) { + setWaterMark: function (v) { if (!BI.isKey(v)) { return; } @@ -251,8 +252,8 @@ BI.Editor = BI.inherit(BI.Single, { element: this.contentWrapper, items: [{ el: this.watermark, - left: this.options.hgap, - right: this.options.hgap, + left: 0, + right: 0, top: 0, bottom: 0, }], @@ -368,4 +369,4 @@ BI.Editor.EVENT_RESTRICT = "EVENT_RESTRICT"; BI.Editor.EVENT_REMOVE = "EVENT_REMOVE"; BI.Editor.EVENT_EMPTY = "EVENT_EMPTY"; -BI.shortcut("bi.editor", BI.Editor); \ No newline at end of file +BI.shortcut("bi.editor", BI.Editor); From 220da4adb3131fb1c84fef090b189c26d04b3477 Mon Sep 17 00:00:00 2001 From: zsmj1994 Date: Tue, 15 Dec 2020 10:01:55 +0800 Subject: [PATCH 3/3] =?UTF-8?q?DEC-16252=20fix=20:=20bi.editor=E6=B0=B4?= =?UTF-8?q?=E5=8D=B0=E7=9A=84=E9=97=B4=E8=B7=9D=E4=B8=8Esign=5Feditor,shil?= =?UTF-8?q?ter=5Feditro=20=E7=AD=89=E5=85=B6=E4=BB=96editor=E7=9A=84text?= =?UTF-8?q?=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/base/single/editor/editor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/base/single/editor/editor.js b/src/base/single/editor/editor.js index 0d042cb00..8fbd987a3 100644 --- a/src/base/single/editor/editor.js +++ b/src/base/single/editor/editor.js @@ -191,7 +191,7 @@ BI.Editor = BI.inherit(BI.Single, { cls: "bi-water-mark", text: this.options.watermark, height: o.height - 2 * o.vgap - o.tgap, - hgap: o.hgap - 2, + hgap: 2, whiteSpace: "nowrap", textAlign: "left" });