diff --git a/dist/base.js b/dist/base.js index f42b165343..458d2f5e91 100644 --- a/dist/base.js +++ b/dist/base.js @@ -546,7 +546,8 @@ BI.Text = BI.inherit(BI.Single, { tgap: 0, bgap: 0, text: "", - py: "" + py: "", + highLight: false }); }, @@ -611,6 +612,9 @@ BI.Text = BI.inherit(BI.Single, { if (BI.isKey(o.keyword)) { this.text.element.__textKeywordMarked__(o.text, o.keyword, o.py); } + if (o.highLight) { + this.doHighLight(); + } }, doRedMark: function (keyword) { @@ -10945,7 +10949,8 @@ BI.Label = BI.inherit(BI.Single, { bgap: 0, text: "", py: "", - keyword: "" + keyword: "", + highLight: false }); }, @@ -10959,7 +10964,8 @@ BI.Label = BI.inherit(BI.Single, { text: o.text, value: o.value, py: o.py, - keyword: o.keyword + keyword: o.keyword, + highLight: o.highLight }; }, diff --git a/dist/bundle.ie.js b/dist/bundle.ie.js index 3551159c87..c17e9212b1 100644 --- a/dist/bundle.ie.js +++ b/dist/bundle.ie.js @@ -35621,7 +35621,8 @@ BI.Text = BI.inherit(BI.Single, { tgap: 0, bgap: 0, text: "", - py: "" + py: "", + highLight: false }); }, @@ -35686,6 +35687,9 @@ BI.Text = BI.inherit(BI.Single, { if (BI.isKey(o.keyword)) { this.text.element.__textKeywordMarked__(o.text, o.keyword, o.py); } + if (o.highLight) { + this.doHighLight(); + } }, doRedMark: function (keyword) { @@ -46020,7 +46024,8 @@ BI.Label = BI.inherit(BI.Single, { bgap: 0, text: "", py: "", - keyword: "" + keyword: "", + highLight: false }); }, @@ -46034,7 +46039,8 @@ BI.Label = BI.inherit(BI.Single, { text: o.text, value: o.value, py: o.py, - keyword: o.keyword + keyword: o.keyword, + highLight: o.highLight }; }, diff --git a/dist/bundle.js b/dist/bundle.js index 361d768669..304d69d00e 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -36025,7 +36025,8 @@ BI.Text = BI.inherit(BI.Single, { tgap: 0, bgap: 0, text: "", - py: "" + py: "", + highLight: false }); }, @@ -36090,6 +36091,9 @@ BI.Text = BI.inherit(BI.Single, { if (BI.isKey(o.keyword)) { this.text.element.__textKeywordMarked__(o.text, o.keyword, o.py); } + if (o.highLight) { + this.doHighLight(); + } }, doRedMark: function (keyword) { @@ -46424,7 +46428,8 @@ BI.Label = BI.inherit(BI.Single, { bgap: 0, text: "", py: "", - keyword: "" + keyword: "", + highLight: false }); }, @@ -46438,7 +46443,8 @@ BI.Label = BI.inherit(BI.Single, { text: o.text, value: o.value, py: o.py, - keyword: o.keyword + keyword: o.keyword, + highLight: o.highLight }; }, diff --git a/dist/fineui.ie.js b/dist/fineui.ie.js index 76fe139304..507d80a630 100644 --- a/dist/fineui.ie.js +++ b/dist/fineui.ie.js @@ -35866,7 +35866,8 @@ BI.Text = BI.inherit(BI.Single, { tgap: 0, bgap: 0, text: "", - py: "" + py: "", + highLight: false }); }, @@ -35931,6 +35932,9 @@ BI.Text = BI.inherit(BI.Single, { if (BI.isKey(o.keyword)) { this.text.element.__textKeywordMarked__(o.text, o.keyword, o.py); } + if (o.highLight) { + this.doHighLight(); + } }, doRedMark: function (keyword) { @@ -46265,7 +46269,8 @@ BI.Label = BI.inherit(BI.Single, { bgap: 0, text: "", py: "", - keyword: "" + keyword: "", + highLight: false }); }, @@ -46279,7 +46284,8 @@ BI.Label = BI.inherit(BI.Single, { text: o.text, value: o.value, py: o.py, - keyword: o.keyword + keyword: o.keyword, + highLight: o.highLight }; }, diff --git a/dist/fineui.js b/dist/fineui.js index 96851d2e1d..8c1927bbe6 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -36270,7 +36270,8 @@ BI.Text = BI.inherit(BI.Single, { tgap: 0, bgap: 0, text: "", - py: "" + py: "", + highLight: false }); }, @@ -36335,6 +36336,9 @@ BI.Text = BI.inherit(BI.Single, { if (BI.isKey(o.keyword)) { this.text.element.__textKeywordMarked__(o.text, o.keyword, o.py); } + if (o.highLight) { + this.doHighLight(); + } }, doRedMark: function (keyword) { @@ -46669,7 +46673,8 @@ BI.Label = BI.inherit(BI.Single, { bgap: 0, text: "", py: "", - keyword: "" + keyword: "", + highLight: false }); }, @@ -46683,7 +46688,8 @@ BI.Label = BI.inherit(BI.Single, { text: o.text, value: o.value, py: o.py, - keyword: o.keyword + keyword: o.keyword, + highLight: o.highLight }; }, diff --git a/dist/fineui_without_jquery_polyfill.js b/dist/fineui_without_jquery_polyfill.js index 218f895da4..b86246a26b 100644 --- a/dist/fineui_without_jquery_polyfill.js +++ b/dist/fineui_without_jquery_polyfill.js @@ -24750,7 +24750,8 @@ BI.Text = BI.inherit(BI.Single, { tgap: 0, bgap: 0, text: "", - py: "" + py: "", + highLight: false }); }, @@ -24815,6 +24816,9 @@ BI.Text = BI.inherit(BI.Single, { if (BI.isKey(o.keyword)) { this.text.element.__textKeywordMarked__(o.text, o.keyword, o.py); } + if (o.highLight) { + this.doHighLight(); + } }, doRedMark: function (keyword) { @@ -33615,7 +33619,8 @@ BI.Label = BI.inherit(BI.Single, { bgap: 0, text: "", py: "", - keyword: "" + keyword: "", + highLight: false }); }, @@ -33629,7 +33634,8 @@ BI.Label = BI.inherit(BI.Single, { text: o.text, value: o.value, py: o.py, - keyword: o.keyword + keyword: o.keyword, + highLight: o.highLight }; }, diff --git a/dist/font/iconfont.eot b/dist/font/iconfont.eot index aa3d214ce3..1e2f01652b 100644 Binary files a/dist/font/iconfont.eot and b/dist/font/iconfont.eot differ diff --git a/dist/font/iconfont.svg b/dist/font/iconfont.svg index 1f9215b417..87a5cb39b8 100644 --- a/dist/font/iconfont.svg +++ b/dist/font/iconfont.svg @@ -458,10 +458,10 @@ Created by iconfont - + - + @@ -506,7 +506,7 @@ Created by iconfont - + @@ -557,7 +557,7 @@ Created by iconfont - + @@ -1220,6 +1220,66 @@ Created by iconfont + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dist/font/iconfont.ttf b/dist/font/iconfont.ttf index a0058d7af5..dcc3ed349f 100644 Binary files a/dist/font/iconfont.ttf and b/dist/font/iconfont.ttf differ diff --git a/dist/font/iconfont.woff b/dist/font/iconfont.woff index eac500a3d8..9c99db48da 100644 Binary files a/dist/font/iconfont.woff and b/dist/font/iconfont.woff differ diff --git a/src/base/single/label/label.js b/src/base/single/label/label.js index 1746f0cacc..eb2bf30975 100644 --- a/src/base/single/label/label.js +++ b/src/base/single/label/label.js @@ -20,7 +20,8 @@ BI.Label = BI.inherit(BI.Single, { bgap: 0, text: "", py: "", - keyword: "" + keyword: "", + highLight: false }); }, @@ -34,7 +35,8 @@ BI.Label = BI.inherit(BI.Single, { text: o.text, value: o.value, py: o.py, - keyword: o.keyword + keyword: o.keyword, + highLight: o.highLight }; }, diff --git a/src/base/single/text.js b/src/base/single/text.js index 2651372a06..f6ea0f6a48 100644 --- a/src/base/single/text.js +++ b/src/base/single/text.js @@ -19,7 +19,8 @@ BI.Text = BI.inherit(BI.Single, { tgap: 0, bgap: 0, text: "", - py: "" + py: "", + highLight: false }); }, @@ -84,6 +85,9 @@ BI.Text = BI.inherit(BI.Single, { if (BI.isKey(o.keyword)) { this.text.element.__textKeywordMarked__(o.text, o.keyword, o.py); } + if (o.highLight) { + this.doHighLight(); + } }, doRedMark: function (keyword) {