").__textKeywordMarked__(n.text, keyword, n.py).html();
- });
- }
+ var ns = BI.Tree.arrayFormat(nodes);
+ BI.each(ns, function (i, n) {
+ //处理标红
+ if (BI.isKey(o.paras.keyword)) {
+ n.text = $("
").__textKeywordMarked__(n.text, o.paras.keyword, n.py).html();
+ } else {
+ n.text = (n.text + "").replaceAll(" ", " ");
+ }
+ });
return nodes;
},
@@ -399,7 +400,8 @@ BI.TreeView = BI.inherit(BI.Pane, {
},
view: {
showIcon: false,
- expandSpeed: ""
+ expandSpeed: "",
+ nameIsHTML: true
},
callback: {}
};
diff --git a/src/core/func/dom.js b/src/core/func/dom.js
index 82f28d01c0..6a6f2dc3b1 100644
--- a/src/core/func/dom.js
+++ b/src/core/func/dom.js
@@ -20,7 +20,7 @@ BI.extend(jQuery.fn, {
*/
__textKeywordMarked__: function (text, keyword, py) {
if (!BI.isKey(keyword)) {
- return this.text(text);
+ return this.text((text + "").replaceAll(" ", " "));
}
keyword = keyword + "";
keyword = BI.toUpperCase(keyword);
@@ -43,7 +43,7 @@ BI.extend(jQuery.fn, {
if (tidx >= 0) {
this.append(textLeft.substr(0, tidx));
this.append($("").addClass("bi-keyword-red-mark")
- .text(textLeft.substr(tidx, keyword.length)));
+ .text(textLeft.substr(tidx, keyword.length).replaceAll(" ", " ")));
textLeft = textLeft.substr(tidx + keyword.length);
if (py != null) {
@@ -52,7 +52,7 @@ BI.extend(jQuery.fn, {
} else if (pidx != null && pidx >= 0 && Math.floor(pidx / text.length) === Math.floor((pidx + keyword.length - 1) / text.length)) {
this.append(textLeft.substr(0, pidx));
this.append($("").addClass("bi-keyword-red-mark")
- .text(textLeft.substr(pidx, keyword.length)));
+ .text(textLeft.substr(pidx, keyword.length).replaceAll(" ", " ")));
if (py != null) {
py = py.substr(pidx + keyword.length);
}
diff --git a/src/widget/downlist/combo.downlist.js b/src/widget/downlist/combo.downlist.js
index e77844e1a8..ed37eb40c8 100644
--- a/src/widget/downlist/combo.downlist.js
+++ b/src/widget/downlist/combo.downlist.js
@@ -47,7 +47,7 @@ BI.DownListCombo = BI.inherit(BI.Widget, {
popup: {
el: this.popupview,
stopPropagation: true,
- maxHeight: 400
+ maxHeight: 1000
}
});
diff --git a/src/widget/sequencetable/listnumber.sequencetable.js b/src/widget/sequencetable/listnumber.sequencetable.js
index 813f961f41..db308d56f4 100644
--- a/src/widget/sequencetable/listnumber.sequencetable.js
+++ b/src/widget/sequencetable/listnumber.sequencetable.js
@@ -35,12 +35,6 @@ BI.SequenceTableListNumber = BI.inherit(BI.Widget, {
this.renderedCells = [];
this.renderedKeys = [];
- this.header = BI.createWidget(o.sequenceHeaderCreator || {
- type: "bi.table_style_cell",
- cls: "sequence-table-title-cell bi-border",
- styleGetter: o.headerCellStyleGetter,
- text: BI.i18nText("BI-Number_Index")
- });
this.container = BI.createWidget({
type: "bi.absolute",
width: 60,
@@ -54,12 +48,19 @@ BI.SequenceTableListNumber = BI.inherit(BI.Widget, {
items: [this.container]
});
+ this.headerContainer = BI.createWidget({
+ type: "bi.absolute",
+ cls: "bi-border",
+ width: 58,
+ scrollable: false
+ });
+
this.layout = BI.createWidget({
type: "bi.vtape",
element: this,
items: [{
- el: this.header,
- height: o.headerRowSize * o.header.length
+ el: this.headerContainer,
+ height: o.headerRowSize * o.header.length - 2
}, {
el: this.scrollContainer
}]
@@ -82,6 +83,26 @@ BI.SequenceTableListNumber = BI.inherit(BI.Widget, {
this.scrollContainer.element.scrollTop(o.scrollTop);
},
+ _createHeader: function () {
+ var o = this.options;
+ BI.createWidget({
+ type: "bi.absolute",
+ element: this.headerContainer,
+ items: [{
+ el: o.sequenceHeaderCreator || {
+ type: "bi.table_style_cell",
+ cls: "sequence-table-title-cell",
+ styleGetter: o.headerCellStyleGetter,
+ text: BI.i18nText("BI-Number_Index")
+ },
+ left: 0,
+ top: 0,
+ right: 0,
+ bottom: 0
+ }]
+ });
+ },
+
_calculateChildrenToRender: function () {
var self = this, o = this.options;
var scrollTop = BI.clamp(o.scrollTop, 0, o.rowSize * o.items.length - (o.height - o.header.length * o.headerRowSize) + BI.DOM.getScrollWidth());
diff --git a/src/widget/sequencetable/treenumber.sequencetable.js b/src/widget/sequencetable/treenumber.sequencetable.js
index 5965bee775..8c26902e65 100644
--- a/src/widget/sequencetable/treenumber.sequencetable.js
+++ b/src/widget/sequencetable/treenumber.sequencetable.js
@@ -35,12 +35,6 @@ BI.SequenceTableTreeNumber = BI.inherit(BI.Widget, {
this.renderedCells = [];
this.renderedKeys = [];
- this.header = BI.createWidget(o.sequenceHeaderCreator || {
- type: "bi.table_style_cell",
- cls: "sequence-table-title-cell bi-border",
- styleGetter: o.headerCellStyleGetter,
- text: BI.i18nText("BI-Number_Index")
- });
this.container = BI.createWidget({
type: "bi.absolute",
width: 60,
@@ -54,13 +48,20 @@ BI.SequenceTableTreeNumber = BI.inherit(BI.Widget, {
items: [this.container]
});
+ this.headerContainer = BI.createWidget({
+ type: "bi.absolute",
+ cls: "bi-border",
+ width: 58,
+ scrollable: false
+ });
+
this.layout = BI.createWidget({
type: "bi.vtape",
element: this,
items: [{
- el: this.header,
- height: this._getHeaderHeight()
- }, {
+ el: this.headerContainer,
+ height: this._getHeaderHeight() - 2
+ }, {el: {type: "bi.layout"}, height: 2}, {
el: this.scrollContainer
}]
});
@@ -168,7 +169,7 @@ BI.SequenceTableTreeNumber = BI.inherit(BI.Widget, {
_layout: function () {
var self = this, o = this.options;
- var headerHeight = this._getHeaderHeight();
+ var headerHeight = this._getHeaderHeight() - 2;
var items = this.layout.attr("items");
if (o.isNeedFreeze === false) {
items[0].height = 0;
@@ -217,6 +218,26 @@ BI.SequenceTableTreeNumber = BI.inherit(BI.Widget, {
return Math.max(0, cnt * this.options.rowSize - (this.options.height - this._getHeaderHeight()) + BI.DOM.getScrollWidth());
},
+ _createHeader: function () {
+ var o = this.options;
+ BI.createWidget({
+ type: "bi.absolute",
+ element: this.headerContainer,
+ items: [{
+ el: o.sequenceHeaderCreator || {
+ type: "bi.table_style_cell",
+ cls: "sequence-table-title-cell",
+ styleGetter: o.headerCellStyleGetter,
+ text: BI.i18nText("BI-Number_Index")
+ },
+ left: 0,
+ top: 0,
+ right: 0,
+ bottom: 0
+ }]
+ });
+ },
+
_calculateChildrenToRender: function () {
var self = this, o = this.options;
@@ -322,7 +343,8 @@ BI.SequenceTableTreeNumber = BI.inherit(BI.Widget, {
task.apply(self);
});
this.tasks = [];
- this.header.populate();
+ this.headerContainer.empty();
+ this._createHeader();
this._layout();
this._calculateChildrenToRender();
},