From a94c1a7b5998b6836f8bb41e07fe6bc8c99ddbe9 Mon Sep 17 00:00:00 2001
From: windy <1374721899@qq.com>
Date: Thu, 2 Apr 2020 09:08:02 +0800
Subject: [PATCH] REPORT-29022

---
 changelog.md      | 3 +++
 src/core/alias.js | 3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/changelog.md b/changelog.md
index 5412b15c3..0a07e7d2e 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,4 +1,7 @@
 # 更新日志
+2.0(2020-04)
+- 支持文本区域水印可滚动
+
 2.0(2020-03)
 - 修复了IE9下使用bi.file上传包含特殊字符的excel出错的问题
 - 修复了下拉类型控件不允许编辑的时候没有title的问题
diff --git a/src/core/alias.js b/src/core/alias.js
index bcb82eef0..5ea9ef1e0 100644
--- a/src/core/alias.js
+++ b/src/core/alias.js
@@ -416,8 +416,7 @@
         "&": "&amp;",
         "\"": "&quot;",
         "<": "&lt;",
-        ">": "&gt;",
-        " ": "&nbsp;"
+        ">": "&gt;"
     };
     BI.htmlEncode = function (text) {
         return BI.isNull(text) ? "" : BI.replaceAll(text + "", "&|\"|<|>|\\s", function (v) {