fanruan
/
fineui
4
1
Fork 3
Code Issues 1 Pull Requests Releases Wiki Activity
Browse Source

Pull request #1969: 无JIRA任务 null值显示成(null) 

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

* commit '8fc440f1ce25249aae216f5980e4cf133bfcf54b':
  bugfix
  bugfix
  bugfix
  bugfix
  bugfix
  bugfix
es6
guy 3 years ago
parent
07b6ff20b6 8fc440f1ce
commit
4d27b045d5
7 changed files with 34 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/base/single/1.text.js
  2. 10
      src/case/ztree/0.treeview.js
  3. 15
      src/core/platform/web/jquery/fn.js
  4. 8
      src/widget/multiselect/trigger/searcher.multiselect.insert.js
  5. 8
      src/widget/multiselect/trigger/searcher.multiselect.js
  6. 2
      src/widget/multitree/trigger/searcher.list.multi.tree.js
  7. 4
      src/widget/multitree/trigger/searcher.multi.tree.js

6
src/base/single/1.text.js
Unescape View File

@ -77,6 +77,7 @@
}
var text = this._getShowText();
// 只要不是undefined就可以显示text值，否则显示value
if (!BI.isUndefined(text)) {
this.setText(text);
} else if (BI.isKey(o.value)) {
@ -111,7 +112,7 @@
_doRedMark: function (keyword) {
var o = this.options;
// render之后做的doredmark,这个时候虽然标红了，但是之后text mounted执行的时候并没有keyword
// render之后做的doRedMark,这个时候虽然标红了，但是之后text mounted执行的时候并没有keyword
o.keyword = keyword;
this.text.element.__textKeywordMarked__(this._getShowText(), keyword, o.py);
},
@ -149,8 +150,7 @@
setText: function (text) {
BI.Text.superclass.setText.apply(this, arguments);
// 为textContext赋值为undefined时在ie和edge下会真的显示undefined
this.options.text = BI.isNotNull(text) ? text : "";
this.options.text = text;
this._doRedMark(this.options.keyword);
}
});

10
src/case/ztree/0.treeview.js
Unescape View File

@ -334,9 +334,15 @@ BI.TreeView = BI.inherit(BI.Pane, {
var self = this, o = this.options;
var ns = BI.Tree.arrayFormat(nodes);
BI.each(ns, function (i, n) {
n.title = n.title || n.text || n.value;
n.isParent = n.isParent || n.parent;
n.value = BI.isUndefined(n.value) ? n.text : n.value;
n.text = BI.isUndefined(n.text) ? n.value : n.text;
if (n.text === null) {
n.text = "(null)";
}
if (BI.isNull(n.title)) {
n.title = n.text;
}
// 处理标红
if (BI.isNotNull(n.text)) {
if (BI.isKey(o.paras.keyword)) {
@ -344,8 +350,6 @@ BI.TreeView = BI.inherit(BI.Pane, {
} else {
n.text = BI.htmlEncode(BI.Text.formatText(n.text + ""));
}
} else {
n.text = "";
}
});
return nodes;

15
src/core/platform/web/jquery/fn.js vendored
Unescape View File

@ -77,17 +77,28 @@ if (BI.jQuery) {
* 3、text和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)) {
text = "";
}
if (!BI.isKey(keyword) || (text + "").length > 100) {
if (BI.isIE9Below()) {
return this.html(BI.htmlEncode(text));
}
// textContent性能更好,并且原生防xss
// textContent性能更好,并且原生防xss
this[0].textContent = text;
return this;
}
keyword = keyword + "";
keyword = BI.toUpperCase(keyword);
var textLeft = (text || "") + "";
var textLeft = text + "";
py = (py || BI.makeFirstPY(text, {
splitChar: "\u200b"
})) + "";

8
src/widget/multiselect/trigger/searcher.multiselect.insert.js
Unescape View File

@ -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 ? "" : (o.valueFormatter(v + "") || v));
state += "" + (v === null ? "(null)" : (o.valueFormatter(v + "") || v));
} else {
state += "," + (v === null ? "" : (o.valueFormatter(v + "") || v));
state += "," + (v === null ? "(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 ? "" : (o.valueFormatter(v + "") || v));
state += "" + (v === null ? "(null)" : (o.valueFormatter(v + "") || v));
} else {
state += "," + (v === null ? "" : (o.valueFormatter(v + "") || v));
state += "," + (v === null ? "(null)" : (o.valueFormatter(v + "") || v));
}
});
this.editor.setState(state);

8
src/widget/multiselect/trigger/searcher.multiselect.js
Unescape View File

@ -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 ? "" : (o.valueFormatter(v + "") || v));
state += "" + (v === null ? "(null)" : (o.valueFormatter(v + "") || v));
} else {
state += "," + (v === null ? "" : (o.valueFormatter(v + "") || v));
state += "," + (v === null ? "(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 ? "" : (o.valueFormatter(v + "") || v));
state += "" + (v === null ? "(null)" : (o.valueFormatter(v + "") || v));
} else {
state += "," + (v === null ? "" : (o.valueFormatter(v + "") || v));
state += "," + (v === null ? "(null)" : (o.valueFormatter(v + "") || v));
}
});
this.editor.setState(state);

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

@ -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" ? "" : (o.valueFormatter(childValue + "") || childValue) + "; ");
text += (path === "null" ? "(null)" : (o.valueFormatter(childValue + "") || childValue) + "; ");
count++;
});

4
src/widget/multitree/trigger/searcher.multi.tree.js
Unescape View File

@ -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" ? "" : (o.valueFormatter(name + "") || name)) + (childNodes === "" ? "" : (":" + childNodes)) + "; ";
text += (name === "null" ? "(null)" : (o.valueFormatter(name + "") || name)) + (childNodes === "" ? "" : (":" + childNodes)) + "; ";
if (childNodes === "") {
count++;
}
@ -156,7 +156,7 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, {
BI.each(names, function (idx, name) {
index++;
var childNodes = getChildrenNode(ob[name]);
text += (name === "null" ? "" : (o.valueFormatter(name + "") || name)) + (childNodes === "" ? "" : (":" + childNodes)) + (index === size ? "" : ",");
text += (name === "null" ? "(null)" : (o.valueFormatter(name + "") || name)) + (childNodes === "" ? "" : (":" + childNodes)) + (index === size ? "" : ",");
if (childNodes === "") {
count++;
}

Write Preview
Loading…
Cancel
Save