Browse Source

Pull request #1970: 无JIRA任务 bugfix

Merge in VISUAL/fineui from ~GUY/fineui:master to master

* commit '6032a49006c745533799e3df6a7204adaa6611e9':
  bugfix
es6
guy 4 years ago
parent
commit
191de812c8
  1. 10
      src/core/platform/web/jquery/fn.js
  2. 8
      src/widget/multiselect/trigger/searcher.multiselect.insert.js
  3. 8
      src/widget/multiselect/trigger/searcher.multiselect.js
  4. 2
      src/widget/multitree/trigger/searcher.list.multi.tree.js
  5. 2
      src/widget/multitree/trigger/searcher.multi.tree.js

10
src/core/platform/web/jquery/fn.js vendored

@ -77,15 +77,7 @@ if (BI.jQuery) {
* 3text和py各自取tidx/pidx + keyword.length索引开始的子串作为新的text和py, 重复1, 直到text和py有一个为""
*/
__textKeywordMarked__: function (text, keyword, py) {
if (text === null) {
if (BI.isIE9Below()) {
return this.html("(null)");
}
// textContent性能更好,并且原生防xss
this[0].textContent = "(null)";
return this;
}
if (BI.isUndefined(text)) {
if (BI.isNull(text)) {
text = "";
}
if (!BI.isKey(keyword) || (text + "").length > 100) {

8
src/widget/multiselect/trigger/searcher.multiselect.insert.js

@ -135,9 +135,9 @@ BI.MultiSelectInsertSearcher = BI.inherit(BI.Widget, {
var state = "";
BI.each(ob.assist, function (i, v) {
if (i === 0) {
state += "" + (v === null ? "(null)" : (o.valueFormatter(v + "") || v));
state += "" + (v === null ? "" : (o.valueFormatter(v + "") || v));
} else {
state += "," + (v === null ? "(null)" : (o.valueFormatter(v + "") || v));
state += "," + (v === null ? "" : (o.valueFormatter(v + "") || v));
}
});
this.editor.setState(state);
@ -151,9 +151,9 @@ BI.MultiSelectInsertSearcher = BI.inherit(BI.Widget, {
var state = "";
BI.each(ob.value, function (i, v) {
if (i === 0) {
state += "" + (v === null ? "(null)" : (o.valueFormatter(v + "") || v));
state += "" + (v === null ? "" : (o.valueFormatter(v + "") || v));
} else {
state += "," + (v === null ? "(null)" : (o.valueFormatter(v + "") || v));
state += "," + (v === null ? "" : (o.valueFormatter(v + "") || v));
}
});
this.editor.setState(state);

8
src/widget/multiselect/trigger/searcher.multiselect.js

@ -133,9 +133,9 @@ BI.MultiSelectSearcher = BI.inherit(BI.Widget, {
var state = "";
BI.each(ob.assist, function (i, v) {
if (i === 0) {
state += "" + (v === null ? "(null)" : (o.valueFormatter(v + "") || v));
state += "" + (v === null ? "" : (o.valueFormatter(v + "") || v));
} else {
state += "," + (v === null ? "(null)" : (o.valueFormatter(v + "") || v));
state += "," + (v === null ? "" : (o.valueFormatter(v + "") || v));
}
});
this.editor.setState(state);
@ -149,9 +149,9 @@ BI.MultiSelectSearcher = BI.inherit(BI.Widget, {
var state = "";
BI.each(ob.value, function (i, v) {
if (i === 0) {
state += "" + (v === null ? "(null)" : (o.valueFormatter(v + "") || v));
state += "" + (v === null ? "" : (o.valueFormatter(v + "") || v));
} else {
state += "," + (v === null ? "(null)" : (o.valueFormatter(v + "") || v));
state += "," + (v === null ? "" : (o.valueFormatter(v + "") || v));
}
});
this.editor.setState(state);

2
src/widget/multitree/trigger/searcher.list.multi.tree.js

@ -122,7 +122,7 @@ BI.MultiListTreeSearcher = BI.inherit(BI.Widget, {
var text = "";
BI.each(ob.value, function (idx, path) {
var childValue = BI.last(path);
text += (path === "null" ? "(null)" : (o.valueFormatter(childValue + "") || childValue) + "; ");
text += (path === "null" ? "" : (o.valueFormatter(childValue + "") || childValue) + "; ");
count++;
});

2
src/widget/multitree/trigger/searcher.multi.tree.js

@ -136,7 +136,7 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, {
var names = BI.Func.getSortedResult(BI.keys(value));
BI.each(names, function (idx, name) {
var childNodes = getChildrenNode(value[name]);
text += (name === "null" ? "(null)" : (o.valueFormatter(name + "") || name)) + (childNodes === "" ? "" : (":" + childNodes)) + "; ";
text += (name === "null" ? "" : (o.valueFormatter(name + "") || name)) + (childNodes === "" ? "" : (":" + childNodes)) + "; ";
if (childNodes === "") {
count++;
}

Loading…
Cancel
Save