diff --git a/src/base/single/text.js b/src/base/single/text.js index 0a1f9c306..0c224d9c8 100644 --- a/src/base/single/text.js +++ b/src/base/single/text.js @@ -55,7 +55,7 @@ BI.Text = BI.inherit(BI.Single, { this.element.css({ textAlign: o.textAlign, whiteSpace: o.whiteSpace, - textOverflow: o.whiteSpace === 'nowrap' ? "ellipsis" : "", + textOverflow: o.whiteSpace === "nowrap" ? "ellipsis" : "" }); if (o.handler) { this.text = BI.createWidget({ @@ -73,15 +73,7 @@ BI.Text = BI.inherit(BI.Single, { } else { this.text = this; } - }, - _getShowText: function () { - var o = this.options; - return BI.isFunction(o.text) ? o.text() : o.text; - }, - - mounted: function () { - var o = this.options; var text = this._getShowText(); if (BI.isKey(text)) { this.setText(text); @@ -96,6 +88,12 @@ BI.Text = BI.inherit(BI.Single, { } }, + _getShowText: function () { + var o = this.options; + return BI.isFunction(o.text) ? o.text() : o.text; + }, + + doRedMark: function (keyword) { var o = this.options; // render之后做的doredmark,这个时候虽然标红了,但是之后text mounted执行的时候并没有keyword diff --git a/src/core/alias.js b/src/core/alias.js index da396cc31..4f332f2da 100644 --- a/src/core/alias.js +++ b/src/core/alias.js @@ -411,21 +411,16 @@ }; // replace the html special tags + var specialTags = { + "&": "&", + "\"": """, + "<": "<", + ">": ">", + " ": " " + }; BI.htmlEncode = function (text) { return BI.isNull(text) ? "" : BI.replaceAll(text + "", "&|\"|<|>|\\s", function (v) { - switch (v) { - case "&": - return "&"; - case "\"": - return """; - case "<": - return "<"; - case ">": - return ">"; - case " ": - default: - return " "; - } + return specialTags[v] ? specialTags[v] : " "; }); }; // html decode