Browse Source

Pull request #1990: BI-88786 fix: 树的null值显示问题

Merge in VISUAL/fineui from ~ZHENFEI.LI/fineui:master to master

* commit '12ed13c28ab663ec83266fba6f2e79ce138927d8':
  BI-88786 fix: null值显示问题
es6
Zhenfei.Li 3 years ago
parent
commit
b2e6d3fde8
  1. 2
      src/case/ztree/0.treeview.js
  2. 2
      src/widget/multitree/trigger/searcher.multi.tree.js

2
src/case/ztree/0.treeview.js

@ -338,7 +338,7 @@ BI.TreeView = BI.inherit(BI.Pane, {
n.value = BI.isUndefined(n.value) ? n.text : n.value; n.value = BI.isUndefined(n.value) ? n.text : n.value;
n.text = BI.isUndefined(n.text) ? n.value : n.text; n.text = BI.isUndefined(n.text) ? n.value : n.text;
if (n.text === null) { if (n.text === null) {
n.text = "(null)"; n.text = "";
} }
if (BI.isNull(n.title)) { if (BI.isNull(n.title)) {
n.title = n.text; n.title = n.text;

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

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

Loading…
Cancel
Save