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

bug

es6
guy 7 years ago
parent
e15c61b6e4
commit
1795bcbfac
18 changed files with 276 additions and 221 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      bi/base.js
  2. 57
      bi/core.js
  3. 42
      bi/widget.js
  4. 5
      demo/config.js
  5. 21
      demo/js/component/demo.treevaluechoosercombo.js
  6. 26
      demo/js/component/demo.treevaluechooserpane.js
  7. 6
      demo/js/component/demo.valuechooserpane.js
  8. 16
      docs/base.js
  9. 57
      docs/core.js
  10. 58
      docs/demo.js
  11. 42
      docs/widget.js
  12. 2
      src/base/tree/asynctree.js
  13. 2
      src/base/tree/parttree.js
  14. 12
      src/base/tree/treeview.js
  15. 40
      src/component/treevaluechooser/abstract.treevaluechooser.js
  16. 2
      src/component/valuechooser/pane.valuechooser.js
  17. 8
      src/core/base.js
  18. 49
      src/core/utils/tree.js

16
bi/base.js
Unescape View File

@ -1710,7 +1710,7 @@ BI.TreeView = BI.inherit(BI.Pane, {
_getNodeValue: function (node) { _getNodeValue: function (node) {
//去除标红 //去除标红
return node.value || node.text.replace(/<[^>]+>/g, ""); return node.value == null ? node.text.replace(/<[^>]+>/g, "") : node.value;
}, },
//获取半选框值 //获取半选框值
@ -1802,6 +1802,7 @@ BI.TreeView = BI.inherit(BI.Pane, {
var self = this, o = this.options; var self = this, o = this.options;
var ns = BI.Tree.arrayFormat(nodes); var ns = BI.Tree.arrayFormat(nodes);
BI.each(ns, function (i, n) { BI.each(ns, function (i, n) {
n.title = n.title || n.text || n.value;
//处理标红 //处理标红
if (BI.isKey(o.paras.keyword)) { if (BI.isKey(o.paras.keyword)) {
n.text = $("<div>").__textKeywordMarked__(n.text, o.paras.keyword, n.py).html(); n.text = $("<div>").__textKeywordMarked__(n.text, o.paras.keyword, n.py).html();
@ -1944,7 +1945,7 @@ BI.TreeView = BI.inherit(BI.Pane, {
}, },
setSelectedValue: function (value) { setSelectedValue: function (value) {
this.options.paras.selectedValues = value || {}; this.options.paras.selectedValues = BI.deepClone(value) || {};
this.selectedValues = BI.deepClone(value) || {}; this.selectedValues = BI.deepClone(value) || {};
}, },
@ -1980,14 +1981,9 @@ BI.TreeView = BI.inherit(BI.Pane, {
return this._getSelectedValues(); return this._getSelectedValues();
}, },
empty: function () { destroyed: function () {
BI.isNotNull(this.nodes) && this.nodes.destroy();
},
destroy: function () {
this.stop(); this.stop();
this.nodes && this.nodes.destroy(); this.nodes && this.nodes.destroy();
BI.TreeView.superclass.destroy.apply(this, arguments);
} }
}); });
BI.extend(BI.TreeView, { BI.extend(BI.TreeView, {
@ -2190,7 +2186,7 @@ BI.AsyncTree = BI.inherit(BI.TreeView, {
} }
var checkedValues = this._getSelectedValues(); var checkedValues = this._getSelectedValues();
if (BI.isEmpty(checkedValues)) { if (BI.isEmpty(checkedValues)) {
return this.selectedValues; return BI.deepClone(this.selectedValues);
} }
if (BI.isEmpty(this.selectedValues)) { if (BI.isEmpty(this.selectedValues)) {
return checkedValues; return checkedValues;
@ -2257,7 +2253,7 @@ BI.PartTree = BI.inherit(BI.AsyncTree, {
BI.AsyncTree.superclass._selectTreeNode.apply(self, arguments); BI.AsyncTree.superclass._selectTreeNode.apply(self, arguments);
} else { } else {
o.itemsCreator(BI.extend({}, o.paras, { o.itemsCreator(BI.extend({}, o.paras, {
type: BI.TreeView.REQ_TYPE_CALCULATE_SELECT_DATA, type: BI.TreeView.REQ_TYPE_SELECT_DATA,
selectedValues: this.selectedValues, selectedValues: this.selectedValues,
notSelectedValue: name, notSelectedValue: name,
parentValues: parentValues parentValues: parentValues

57
bi/core.js
Unescape View File

@ -2352,15 +2352,15 @@ if (!window.BI) {
}, },
has: function (obj, keys) { has: function (obj, keys) {
if (BI.isKey(keys)) { if (BI.isArray(keys)) {
return _.has.apply(_, arguments); if (keys.length === 0) {
}
if (!keys || BI.isEmpty(keys)) {
return false; return false;
} }
return BI.every(keys, function (i, key) { return BI.every(keys, function (i, key) {
return _.has(obj, key); return _.has(obj, key);
}); });
}
return _.has.apply(_, arguments);
}, },
//数字和字符串可以作为key //数字和字符串可以作为key
@ -9990,7 +9990,7 @@ $.extend(BI, {
}, },
isRoot: function (node) { isRoot: function (node) {
return node === this.root || node.id === this.root.id; return node === this.root;
}, },
getRoot: function () { getRoot: function () {
@ -10367,7 +10367,7 @@ $.extend(BI, {
if (BI.isArray(nodes)) { if (BI.isArray(nodes)) {
for (var i = 0, l = nodes.length; i < l; i++) { for (var i = 0, l = nodes.length; i < l; i++) {
var node = BI.clone(nodes[i]); var node = BI.clone(nodes[i]);
node.pId = pId; node.pId = node.pId == null ? pId : node.pId;
delete node.children; delete node.children;
r.push(node); r.push(node);
if (nodes[i]["children"]) { if (nodes[i]["children"]) {
@ -10376,7 +10376,7 @@ $.extend(BI, {
} }
} else { } else {
var newNodes = BI.clone(nodes); var newNodes = BI.clone(nodes);
newNodes.pId = pId; newNodes.pId = newNodes.pId == null ? pId : newNodes.pId;
delete newNodes.children; delete newNodes.children;
r.push(newNodes); r.push(newNodes);
if (nodes["children"]) { if (nodes["children"]) {
@ -10387,21 +10387,25 @@ $.extend(BI, {
}, },
arrayFormat: function (nodes, pId) { arrayFormat: function (nodes, pId) {
if (!nodes) return []; if (!nodes) {
return [];
}
var r = []; var r = [];
if (BI.isArray(nodes)) { if (BI.isArray(nodes)) {
for (var i = 0, l = nodes.length; i < l; i++) { for (var i = 0, l = nodes.length; i < l; i++) {
var node = nodes[i]; var node = nodes[i];
node.pId = node.pId == null ? pId : node.pId;
r.push(node); r.push(node);
if (nodes[i]["children"]) { if (nodes[i]["children"]) {
r = r.concat(BI.Tree.transformToArrayFormat(nodes[i]["children"], node.id)); r = r.concat(BI.Tree.arrayFormat(nodes[i]["children"], node.id));
} }
} }
} else { } else {
var newNodes = nodes; var newNodes = nodes;
newNodes.pId = newNodes.pId == null ? pId : newNodes.pId;
r.push(newNodes); r.push(newNodes);
if (nodes["children"]) { if (nodes["children"]) {
r = r.concat(BI.Tree.transformToArrayFormat(nodes["children"], newNodes.id)); r = r.concat(BI.Tree.arrayFormat(nodes["children"], newNodes.id));
} }
} }
return r; return r;
@ -10423,7 +10427,7 @@ $.extend(BI, {
tmpMap[sNodes[i].id] = BI.clone(sNodes[i]); tmpMap[sNodes[i].id] = BI.clone(sNodes[i]);
} }
for (i = 0, l = sNodes.length; i < l; i++) { for (i = 0, l = sNodes.length; i < l; i++) {
if (tmpMap[sNodes[i].pId] && sNodes[i].id != sNodes[i].pId) { if (tmpMap[sNodes[i].pId] && sNodes[i].id !== sNodes[i].pId) {
if (!tmpMap[sNodes[i].pId].children) { if (!tmpMap[sNodes[i].pId].children) {
tmpMap[sNodes[i].pId].children = []; tmpMap[sNodes[i].pId].children = [];
} }
@ -10439,6 +10443,37 @@ $.extend(BI, {
} }
}, },
treeFormat: function (sNodes) {
var i, l;
if (!sNodes) {
return [];
}
if (BI.isArray(sNodes)) {
var r = [];
var tmpMap = [];
for (i = 0, l = sNodes.length; i < l; i++) {
if (BI.isNull(sNodes[i].id)) {
return sNodes;
}
tmpMap[sNodes[i].id] = sNodes[i];
}
for (i = 0, l = sNodes.length; i < l; i++) {
if (tmpMap[sNodes[i].pId] && sNodes[i].id !== sNodes[i].pId) {
if (!tmpMap[sNodes[i].pId].children) {
tmpMap[sNodes[i].pId].children = [];
}
tmpMap[sNodes[i].pId].children.push(tmpMap[sNodes[i].id]);
} else {
r.push(tmpMap[sNodes[i].id]);
}
}
return r;
} else {
return [sNodes];
}
},
traversal: function (array, callback) { traversal: function (array, callback) {
if (BI.isNull(array)) { if (BI.isNull(array)) {
return; return;

42
bi/widget.js
Unescape View File

@ -17173,20 +17173,12 @@ BI.shortcut('bi.all_value_chooser_pane', BI.AllValueChooserPane);BI.AbstractTree
_initData: function (items) { _initData: function (items) {
this.items = items; this.items = items;
var nodes = BI.Tree.transformToTreeFormat(items); var nodes = BI.Tree.treeFormat(items);
this.tree = new BI.Tree(); this.tree = new BI.Tree();
this.tree.initTree(nodes); this.tree.initTree(nodes);
this._initMap();
this._initFloors(); this._initFloors();
}, },
_initMap: function () {
var map = this.map = {};
BI.each(this.items, function (i, item) {
map[item.value] = item;
});
},
_initFloors: function () { _initFloors: function () {
this.floors = -1; this.floors = -1;
var root = this.tree.getRoot(); var root = this.tree.getRoot();
@ -17258,7 +17250,7 @@ BI.shortcut('bi.all_value_chooser_pane', BI.AllValueChooserPane);BI.AbstractTree
return; return;
} }
BI.each(selected, function (k) { BI.each(selected, function (k) {
var node = self._getNode(k); var node = self._getNode(parentValues, k);
var newParents = BI.clone(parentValues); var newParents = BI.clone(parentValues);
newParents.push(node.value); newParents.push(node.value);
createOneJson(node, BI.last(parentValues), getCount(selected[k], newParents)); createOneJson(node, BI.last(parentValues), getCount(selected[k], newParents));
@ -17517,7 +17509,7 @@ BI.shortcut('bi.all_value_chooser_pane', BI.AllValueChooserPane);BI.AbstractTree
} }
function createOneJson(parentValues, value, isOpen, checked, half, flag, result) { function createOneJson(parentValues, value, isOpen, checked, half, flag, result) {
var node = self.map[value]; var node = self._getNode(parentValues, value)
result.push({ result.push({
id: node.id, id: node.id,
pId: node.pId, pId: node.pId,
@ -17695,14 +17687,34 @@ BI.shortcut('bi.all_value_chooser_pane', BI.AllValueChooserPane);BI.AbstractTree
return finded.finded.length > 0 || finded.matched.length > 0; return finded.finded.length > 0 || finded.matched.length > 0;
}, },
_getNode: function (v) { _getNode: function (parentValues, v) {
return this.tree.search(v, "value"); var self = this;
var findedParentNode;
var index = 0;
this.tree.traverse(function (node) {
if (self.tree.isRoot(node)) {
return;
}
if (index > parentValues.length) {
return false;
}
if (index === parentValues.length && node.value === v) {
findedParentNode = node;
return false;
}
if (node.value === parentValues[index]) {
index++;
return;
}
return true;
});
return findedParentNode;
}, },
_getChildren: function (parentValues) { _getChildren: function (parentValues) {
if (parentValues.length > 0) { if (parentValues.length > 0) {
var value = BI.last(parentValues); var value = BI.last(parentValues);
var parent = this.tree.search(value, "value"); var parent = this._getNode(parentValues.slice(0, parentValues.length - 1), value);
} else { } else {
var parent = this.tree.getRoot(); var parent = this.tree.getRoot();
} }
@ -17970,8 +17982,6 @@ BI.ValueChooserPane = BI.inherit(BI.AbstractValueChooser, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.ValueChooserPane.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.ValueChooserPane.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-value-chooser-pane", baseCls: "bi-value-chooser-pane",
width: 200,
height: 30,
items: null, items: null,
itemsCreator: BI.emptyFn, itemsCreator: BI.emptyFn,
cache: true cache: true

5
demo/config.js
View File

File diff suppressed because one or more lines are too long

21
demo/js/component/demo.treevaluechoosercombo.js
Unescape View File

@ -4,29 +4,12 @@ Demo.TreeValueChooser = BI.inherit(BI.Widget, {
}, },
render: function () { render: function () {
var tree = [];
for (var i = 0; i < 221; i++) {
tree.push({
value: "" + i + "",
text: "" + i + "",
id: i + "",
pId: null
});
for (var j = 0; j < 9; j++) {
tree.push({
value: i + "-" + j,
text: j + "",
id: i + "-" + j,
pId: i + ""
})
}
}
var widget = BI.createWidget({ var widget = BI.createWidget({
type: "bi.tree_value_chooser_combo", type: "bi.tree_value_chooser_combo",
width: 300, width: 300,
items: tree, // items: BI.deepClone(Demo.CONSTANTS.TREEITEMS),
itemsCreator: function (op, callback) { itemsCreator: function (op, callback) {
callback(tree); callback(BI.deepClone(Demo.CONSTANTS.TREEITEMS));
} }
}); });
return { return {

26
demo/js/component/demo.treevaluechooserpane.js
Unescape View File

@ -4,30 +4,12 @@ Demo.TreeValueChooser = BI.inherit(BI.Widget, {
}, },
render: function () { render: function () {
var tree = [];
for (var i = 0; i < 221; i++) {
tree.push({
value: "" + i + "",
text: "" + i + "",
id: i + "",
pId: null
});
for (var j = 0; j < 9; j++) {
tree.push({
value: i + "-" + j,
text: j + "",
id: i + "-" + j,
pId: i + ""
})
}
}
return { return {
type: "bi.tree_value_chooser_pane", type: "bi.tree_value_chooser_pane",
width: 300, items: BI.deepClone(Demo.CONSTANTS.TREEITEMS),
items: tree, // itemsCreator: function (op, callback) {
itemsCreator: function (op, callback) { // callback(tree);
callback(tree); // }
}
}; };
} }
}); });

6
demo/js/component/demo.valuechooserpane.js
Unescape View File

@ -6,9 +6,9 @@ Demo.ValueChooserPane = BI.inherit(BI.Widget, {
return { return {
type: "bi.value_chooser_pane", type: "bi.value_chooser_pane",
items: BI.deepClone(Demo.CONSTANTS.ITEMS), items: BI.deepClone(Demo.CONSTANTS.ITEMS),
itemsCreator: function (op, callback) { // itemsCreator: function (op, callback) {
callback(BI.deepClone(Demo.CONSTANTS.ITEMS)); // callback(BI.deepClone(Demo.CONSTANTS.ITEMS));
} // }
}; };
} }
}); });

16
docs/base.js
Unescape View File

@ -1710,7 +1710,7 @@ BI.TreeView = BI.inherit(BI.Pane, {
_getNodeValue: function (node) { _getNodeValue: function (node) {
//去除标红 //去除标红
return node.value || node.text.replace(/<[^>]+>/g, ""); return node.value == null ? node.text.replace(/<[^>]+>/g, "") : node.value;
}, },
//获取半选框值 //获取半选框值
@ -1802,6 +1802,7 @@ BI.TreeView = BI.inherit(BI.Pane, {
var self = this, o = this.options; var self = this, o = this.options;
var ns = BI.Tree.arrayFormat(nodes); var ns = BI.Tree.arrayFormat(nodes);
BI.each(ns, function (i, n) { BI.each(ns, function (i, n) {
n.title = n.title || n.text || n.value;
//处理标红 //处理标红
if (BI.isKey(o.paras.keyword)) { if (BI.isKey(o.paras.keyword)) {
n.text = $("<div>").__textKeywordMarked__(n.text, o.paras.keyword, n.py).html(); n.text = $("<div>").__textKeywordMarked__(n.text, o.paras.keyword, n.py).html();
@ -1944,7 +1945,7 @@ BI.TreeView = BI.inherit(BI.Pane, {
}, },
setSelectedValue: function (value) { setSelectedValue: function (value) {
this.options.paras.selectedValues = value || {}; this.options.paras.selectedValues = BI.deepClone(value) || {};
this.selectedValues = BI.deepClone(value) || {}; this.selectedValues = BI.deepClone(value) || {};
}, },
@ -1980,14 +1981,9 @@ BI.TreeView = BI.inherit(BI.Pane, {
return this._getSelectedValues(); return this._getSelectedValues();
}, },
empty: function () { destroyed: function () {
BI.isNotNull(this.nodes) && this.nodes.destroy();
},
destroy: function () {
this.stop(); this.stop();
this.nodes && this.nodes.destroy(); this.nodes && this.nodes.destroy();
BI.TreeView.superclass.destroy.apply(this, arguments);
} }
}); });
BI.extend(BI.TreeView, { BI.extend(BI.TreeView, {
@ -2190,7 +2186,7 @@ BI.AsyncTree = BI.inherit(BI.TreeView, {
} }
var checkedValues = this._getSelectedValues(); var checkedValues = this._getSelectedValues();
if (BI.isEmpty(checkedValues)) { if (BI.isEmpty(checkedValues)) {
return this.selectedValues; return BI.deepClone(this.selectedValues);
} }
if (BI.isEmpty(this.selectedValues)) { if (BI.isEmpty(this.selectedValues)) {
return checkedValues; return checkedValues;
@ -2257,7 +2253,7 @@ BI.PartTree = BI.inherit(BI.AsyncTree, {
BI.AsyncTree.superclass._selectTreeNode.apply(self, arguments); BI.AsyncTree.superclass._selectTreeNode.apply(self, arguments);
} else { } else {
o.itemsCreator(BI.extend({}, o.paras, { o.itemsCreator(BI.extend({}, o.paras, {
type: BI.TreeView.REQ_TYPE_CALCULATE_SELECT_DATA, type: BI.TreeView.REQ_TYPE_SELECT_DATA,
selectedValues: this.selectedValues, selectedValues: this.selectedValues,
notSelectedValue: name, notSelectedValue: name,
parentValues: parentValues parentValues: parentValues

57
docs/core.js
Unescape View File

@ -13494,15 +13494,15 @@ if (!window.BI) {
}, },
has: function (obj, keys) { has: function (obj, keys) {
if (BI.isKey(keys)) { if (BI.isArray(keys)) {
return _.has.apply(_, arguments); if (keys.length === 0) {
}
if (!keys || BI.isEmpty(keys)) {
return false; return false;
} }
return BI.every(keys, function (i, key) { return BI.every(keys, function (i, key) {
return _.has(obj, key); return _.has(obj, key);
}); });
}
return _.has.apply(_, arguments);
}, },
//数字和字符串可以作为key //数字和字符串可以作为key
@ -18448,7 +18448,7 @@ $.extend(BI, {
}, },
isRoot: function (node) { isRoot: function (node) {
return node === this.root || node.id === this.root.id; return node === this.root;
}, },
getRoot: function () { getRoot: function () {
@ -18825,7 +18825,7 @@ $.extend(BI, {
if (BI.isArray(nodes)) { if (BI.isArray(nodes)) {
for (var i = 0, l = nodes.length; i < l; i++) { for (var i = 0, l = nodes.length; i < l; i++) {
var node = BI.clone(nodes[i]); var node = BI.clone(nodes[i]);
node.pId = pId; node.pId = node.pId == null ? pId : node.pId;
delete node.children; delete node.children;
r.push(node); r.push(node);
if (nodes[i]["children"]) { if (nodes[i]["children"]) {
@ -18834,7 +18834,7 @@ $.extend(BI, {
} }
} else { } else {
var newNodes = BI.clone(nodes); var newNodes = BI.clone(nodes);
newNodes.pId = pId; newNodes.pId = newNodes.pId == null ? pId : newNodes.pId;
delete newNodes.children; delete newNodes.children;
r.push(newNodes); r.push(newNodes);
if (nodes["children"]) { if (nodes["children"]) {
@ -18845,21 +18845,25 @@ $.extend(BI, {
}, },
arrayFormat: function (nodes, pId) { arrayFormat: function (nodes, pId) {
if (!nodes) return []; if (!nodes) {
return [];
}
var r = []; var r = [];
if (BI.isArray(nodes)) { if (BI.isArray(nodes)) {
for (var i = 0, l = nodes.length; i < l; i++) { for (var i = 0, l = nodes.length; i < l; i++) {
var node = nodes[i]; var node = nodes[i];
node.pId = node.pId == null ? pId : node.pId;
r.push(node); r.push(node);
if (nodes[i]["children"]) { if (nodes[i]["children"]) {
r = r.concat(BI.Tree.transformToArrayFormat(nodes[i]["children"], node.id)); r = r.concat(BI.Tree.arrayFormat(nodes[i]["children"], node.id));
} }
} }
} else { } else {
var newNodes = nodes; var newNodes = nodes;
newNodes.pId = newNodes.pId == null ? pId : newNodes.pId;
r.push(newNodes); r.push(newNodes);
if (nodes["children"]) { if (nodes["children"]) {
r = r.concat(BI.Tree.transformToArrayFormat(nodes["children"], newNodes.id)); r = r.concat(BI.Tree.arrayFormat(nodes["children"], newNodes.id));
} }
} }
return r; return r;
@ -18881,7 +18885,7 @@ $.extend(BI, {
tmpMap[sNodes[i].id] = BI.clone(sNodes[i]); tmpMap[sNodes[i].id] = BI.clone(sNodes[i]);
} }
for (i = 0, l = sNodes.length; i < l; i++) { for (i = 0, l = sNodes.length; i < l; i++) {
if (tmpMap[sNodes[i].pId] && sNodes[i].id != sNodes[i].pId) { if (tmpMap[sNodes[i].pId] && sNodes[i].id !== sNodes[i].pId) {
if (!tmpMap[sNodes[i].pId].children) { if (!tmpMap[sNodes[i].pId].children) {
tmpMap[sNodes[i].pId].children = []; tmpMap[sNodes[i].pId].children = [];
} }
@ -18897,6 +18901,37 @@ $.extend(BI, {
} }
}, },
treeFormat: function (sNodes) {
var i, l;
if (!sNodes) {
return [];
}
if (BI.isArray(sNodes)) {
var r = [];
var tmpMap = [];
for (i = 0, l = sNodes.length; i < l; i++) {
if (BI.isNull(sNodes[i].id)) {
return sNodes;
}
tmpMap[sNodes[i].id] = sNodes[i];
}
for (i = 0, l = sNodes.length; i < l; i++) {
if (tmpMap[sNodes[i].pId] && sNodes[i].id !== sNodes[i].pId) {
if (!tmpMap[sNodes[i].pId].children) {
tmpMap[sNodes[i].pId].children = [];
}
tmpMap[sNodes[i].pId].children.push(tmpMap[sNodes[i].id]);
} else {
r.push(tmpMap[sNodes[i].id]);
}
}
return r;
} else {
return [sNodes];
}
},
traversal: function (array, callback) { traversal: function (array, callback) {
if (BI.isNull(array)) { if (BI.isNull(array)) {
return; return;

58
docs/demo.js
View File

File diff suppressed because one or more lines are too long

42
docs/widget.js
Unescape View File

@ -17173,20 +17173,12 @@ BI.shortcut('bi.all_value_chooser_pane', BI.AllValueChooserPane);BI.AbstractTree
_initData: function (items) { _initData: function (items) {
this.items = items; this.items = items;
var nodes = BI.Tree.transformToTreeFormat(items); var nodes = BI.Tree.treeFormat(items);
this.tree = new BI.Tree(); this.tree = new BI.Tree();
this.tree.initTree(nodes); this.tree.initTree(nodes);
this._initMap();
this._initFloors(); this._initFloors();
}, },
_initMap: function () {
var map = this.map = {};
BI.each(this.items, function (i, item) {
map[item.value] = item;
});
},
_initFloors: function () { _initFloors: function () {
this.floors = -1; this.floors = -1;
var root = this.tree.getRoot(); var root = this.tree.getRoot();
@ -17258,7 +17250,7 @@ BI.shortcut('bi.all_value_chooser_pane', BI.AllValueChooserPane);BI.AbstractTree
return; return;
} }
BI.each(selected, function (k) { BI.each(selected, function (k) {
var node = self._getNode(k); var node = self._getNode(parentValues, k);
var newParents = BI.clone(parentValues); var newParents = BI.clone(parentValues);
newParents.push(node.value); newParents.push(node.value);
createOneJson(node, BI.last(parentValues), getCount(selected[k], newParents)); createOneJson(node, BI.last(parentValues), getCount(selected[k], newParents));
@ -17517,7 +17509,7 @@ BI.shortcut('bi.all_value_chooser_pane', BI.AllValueChooserPane);BI.AbstractTree
} }
function createOneJson(parentValues, value, isOpen, checked, half, flag, result) { function createOneJson(parentValues, value, isOpen, checked, half, flag, result) {
var node = self.map[value]; var node = self._getNode(parentValues, value)
result.push({ result.push({
id: node.id, id: node.id,
pId: node.pId, pId: node.pId,
@ -17695,14 +17687,34 @@ BI.shortcut('bi.all_value_chooser_pane', BI.AllValueChooserPane);BI.AbstractTree
return finded.finded.length > 0 || finded.matched.length > 0; return finded.finded.length > 0 || finded.matched.length > 0;
}, },
_getNode: function (v) { _getNode: function (parentValues, v) {
return this.tree.search(v, "value"); var self = this;
var findedParentNode;
var index = 0;
this.tree.traverse(function (node) {
if (self.tree.isRoot(node)) {
return;
}
if (index > parentValues.length) {
return false;
}
if (index === parentValues.length && node.value === v) {
findedParentNode = node;
return false;
}
if (node.value === parentValues[index]) {
index++;
return;
}
return true;
});
return findedParentNode;
}, },
_getChildren: function (parentValues) { _getChildren: function (parentValues) {
if (parentValues.length > 0) { if (parentValues.length > 0) {
var value = BI.last(parentValues); var value = BI.last(parentValues);
var parent = this.tree.search(value, "value"); var parent = this._getNode(parentValues.slice(0, parentValues.length - 1), value);
} else { } else {
var parent = this.tree.getRoot(); var parent = this.tree.getRoot();
} }
@ -17970,8 +17982,6 @@ BI.ValueChooserPane = BI.inherit(BI.AbstractValueChooser, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.ValueChooserPane.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.ValueChooserPane.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-value-chooser-pane", baseCls: "bi-value-chooser-pane",
width: 200,
height: 30,
items: null, items: null,
itemsCreator: BI.emptyFn, itemsCreator: BI.emptyFn,
cache: true cache: true

2
src/base/tree/asynctree.js
Unescape View File

@ -187,7 +187,7 @@ BI.AsyncTree = BI.inherit(BI.TreeView, {
} }
var checkedValues = this._getSelectedValues(); var checkedValues = this._getSelectedValues();
if (BI.isEmpty(checkedValues)) { if (BI.isEmpty(checkedValues)) {
return this.selectedValues; return BI.deepClone(this.selectedValues);
} }
if (BI.isEmpty(this.selectedValues)) { if (BI.isEmpty(this.selectedValues)) {
return checkedValues; return checkedValues;

2
src/base/tree/parttree.js
Unescape View File

@ -46,7 +46,7 @@ BI.PartTree = BI.inherit(BI.AsyncTree, {
BI.AsyncTree.superclass._selectTreeNode.apply(self, arguments); BI.AsyncTree.superclass._selectTreeNode.apply(self, arguments);
} else { } else {
o.itemsCreator(BI.extend({}, o.paras, { o.itemsCreator(BI.extend({}, o.paras, {
type: BI.TreeView.REQ_TYPE_CALCULATE_SELECT_DATA, type: BI.TreeView.REQ_TYPE_SELECT_DATA,
selectedValues: this.selectedValues, selectedValues: this.selectedValues,
notSelectedValue: name, notSelectedValue: name,
parentValues: parentValues parentValues: parentValues

12
src/base/tree/treeview.js
Unescape View File

@ -216,7 +216,7 @@ BI.TreeView = BI.inherit(BI.Pane, {
_getNodeValue: function (node) { _getNodeValue: function (node) {
//去除标红 //去除标红
return node.value || node.text.replace(/<[^>]+>/g, ""); return node.value == null ? node.text.replace(/<[^>]+>/g, "") : node.value;
}, },
//获取半选框值 //获取半选框值
@ -308,6 +308,7 @@ BI.TreeView = BI.inherit(BI.Pane, {
var self = this, o = this.options; var self = this, o = this.options;
var ns = BI.Tree.arrayFormat(nodes); var ns = BI.Tree.arrayFormat(nodes);
BI.each(ns, function (i, n) { BI.each(ns, function (i, n) {
n.title = n.title || n.text || n.value;
//处理标红 //处理标红
if (BI.isKey(o.paras.keyword)) { if (BI.isKey(o.paras.keyword)) {
n.text = $("<div>").__textKeywordMarked__(n.text, o.paras.keyword, n.py).html(); n.text = $("<div>").__textKeywordMarked__(n.text, o.paras.keyword, n.py).html();
@ -450,7 +451,7 @@ BI.TreeView = BI.inherit(BI.Pane, {
}, },
setSelectedValue: function (value) { setSelectedValue: function (value) {
this.options.paras.selectedValues = value || {}; this.options.paras.selectedValues = BI.deepClone(value) || {};
this.selectedValues = BI.deepClone(value) || {}; this.selectedValues = BI.deepClone(value) || {};
}, },
@ -486,14 +487,9 @@ BI.TreeView = BI.inherit(BI.Pane, {
return this._getSelectedValues(); return this._getSelectedValues();
}, },
empty: function () { destroyed: function () {
BI.isNotNull(this.nodes) && this.nodes.destroy();
},
destroy: function () {
this.stop(); this.stop();
this.nodes && this.nodes.destroy(); this.nodes && this.nodes.destroy();
BI.TreeView.superclass.destroy.apply(this, arguments);
} }
}); });
BI.extend(BI.TreeView, { BI.extend(BI.TreeView, {

40
src/component/treevaluechooser/abstract.treevaluechooser.js
Unescape View File

@ -13,20 +13,12 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
_initData: function (items) { _initData: function (items) {
this.items = items; this.items = items;
var nodes = BI.Tree.transformToTreeFormat(items); var nodes = BI.Tree.treeFormat(items);
this.tree = new BI.Tree(); this.tree = new BI.Tree();
this.tree.initTree(nodes); this.tree.initTree(nodes);
this._initMap();
this._initFloors(); this._initFloors();
}, },
_initMap: function () {
var map = this.map = {};
BI.each(this.items, function (i, item) {
map[item.value] = item;
});
},
_initFloors: function () { _initFloors: function () {
this.floors = -1; this.floors = -1;
var root = this.tree.getRoot(); var root = this.tree.getRoot();
@ -98,7 +90,7 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
return; return;
} }
BI.each(selected, function (k) { BI.each(selected, function (k) {
var node = self._getNode(k); var node = self._getNode(parentValues, k);
var newParents = BI.clone(parentValues); var newParents = BI.clone(parentValues);
newParents.push(node.value); newParents.push(node.value);
createOneJson(node, BI.last(parentValues), getCount(selected[k], newParents)); createOneJson(node, BI.last(parentValues), getCount(selected[k], newParents));
@ -357,7 +349,7 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
} }
function createOneJson(parentValues, value, isOpen, checked, half, flag, result) { function createOneJson(parentValues, value, isOpen, checked, half, flag, result) {
var node = self.map[value]; var node = self._getNode(parentValues, value)
result.push({ result.push({
id: node.id, id: node.id,
pId: node.pId, pId: node.pId,
@ -535,14 +527,34 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
return finded.finded.length > 0 || finded.matched.length > 0; return finded.finded.length > 0 || finded.matched.length > 0;
}, },
_getNode: function (v) { _getNode: function (parentValues, v) {
return this.tree.search(v, "value"); var self = this;
var findedParentNode;
var index = 0;
this.tree.traverse(function (node) {
if (self.tree.isRoot(node)) {
return;
}
if (index > parentValues.length) {
return false;
}
if (index === parentValues.length && node.value === v) {
findedParentNode = node;
return false;
}
if (node.value === parentValues[index]) {
index++;
return;
}
return true;
});
return findedParentNode;
}, },
_getChildren: function (parentValues) { _getChildren: function (parentValues) {
if (parentValues.length > 0) { if (parentValues.length > 0) {
var value = BI.last(parentValues); var value = BI.last(parentValues);
var parent = this.tree.search(value, "value"); var parent = this._getNode(parentValues.slice(0, parentValues.length - 1), value);
} else { } else {
var parent = this.tree.getRoot(); var parent = this.tree.getRoot();
} }

2
src/component/valuechooser/pane.valuechooser.js
Unescape View File

@ -11,8 +11,6 @@ BI.ValueChooserPane = BI.inherit(BI.AbstractValueChooser, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.ValueChooserPane.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.ValueChooserPane.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-value-chooser-pane", baseCls: "bi-value-chooser-pane",
width: 200,
height: 30,
items: null, items: null,
itemsCreator: BI.emptyFn, itemsCreator: BI.emptyFn,
cache: true cache: true

8
src/core/base.js
Unescape View File

@ -457,15 +457,15 @@ if (!window.BI) {
}, },
has: function (obj, keys) { has: function (obj, keys) {
if (BI.isKey(keys)) { if (BI.isArray(keys)) {
return _.has.apply(_, arguments); if (keys.length === 0) {
}
if (!keys || BI.isEmpty(keys)) {
return false; return false;
} }
return BI.every(keys, function (i, key) { return BI.every(keys, function (i, key) {
return _.has(obj, key); return _.has(obj, key);
}); });
}
return _.has.apply(_, arguments);
}, },
//数字和字符串可以作为key //数字和字符串可以作为key

49
src/core/utils/tree.js
Unescape View File

@ -17,7 +17,7 @@
}, },
isRoot: function (node) { isRoot: function (node) {
return node === this.root || node.id === this.root.id; return node === this.root;
}, },
getRoot: function () { getRoot: function () {
@ -394,7 +394,7 @@
if (BI.isArray(nodes)) { if (BI.isArray(nodes)) {
for (var i = 0, l = nodes.length; i < l; i++) { for (var i = 0, l = nodes.length; i < l; i++) {
var node = BI.clone(nodes[i]); var node = BI.clone(nodes[i]);
node.pId = pId; node.pId = node.pId == null ? pId : node.pId;
delete node.children; delete node.children;
r.push(node); r.push(node);
if (nodes[i]["children"]) { if (nodes[i]["children"]) {
@ -403,7 +403,7 @@
} }
} else { } else {
var newNodes = BI.clone(nodes); var newNodes = BI.clone(nodes);
newNodes.pId = pId; newNodes.pId = newNodes.pId == null ? pId : newNodes.pId;
delete newNodes.children; delete newNodes.children;
r.push(newNodes); r.push(newNodes);
if (nodes["children"]) { if (nodes["children"]) {
@ -414,21 +414,25 @@
}, },
arrayFormat: function (nodes, pId) { arrayFormat: function (nodes, pId) {
if (!nodes) return []; if (!nodes) {
return [];
}
var r = []; var r = [];
if (BI.isArray(nodes)) { if (BI.isArray(nodes)) {
for (var i = 0, l = nodes.length; i < l; i++) { for (var i = 0, l = nodes.length; i < l; i++) {
var node = nodes[i]; var node = nodes[i];
node.pId = node.pId == null ? pId : node.pId;
r.push(node); r.push(node);
if (nodes[i]["children"]) { if (nodes[i]["children"]) {
r = r.concat(BI.Tree.transformToArrayFormat(nodes[i]["children"], node.id)); r = r.concat(BI.Tree.arrayFormat(nodes[i]["children"], node.id));
} }
} }
} else { } else {
var newNodes = nodes; var newNodes = nodes;
newNodes.pId = newNodes.pId == null ? pId : newNodes.pId;
r.push(newNodes); r.push(newNodes);
if (nodes["children"]) { if (nodes["children"]) {
r = r.concat(BI.Tree.transformToArrayFormat(nodes["children"], newNodes.id)); r = r.concat(BI.Tree.arrayFormat(nodes["children"], newNodes.id));
} }
} }
return r; return r;
@ -450,7 +454,7 @@
tmpMap[sNodes[i].id] = BI.clone(sNodes[i]); tmpMap[sNodes[i].id] = BI.clone(sNodes[i]);
} }
for (i = 0, l = sNodes.length; i < l; i++) { for (i = 0, l = sNodes.length; i < l; i++) {
if (tmpMap[sNodes[i].pId] && sNodes[i].id != sNodes[i].pId) { if (tmpMap[sNodes[i].pId] && sNodes[i].id !== sNodes[i].pId) {
if (!tmpMap[sNodes[i].pId].children) { if (!tmpMap[sNodes[i].pId].children) {
tmpMap[sNodes[i].pId].children = []; tmpMap[sNodes[i].pId].children = [];
} }
@ -466,6 +470,37 @@
} }
}, },
treeFormat: function (sNodes) {
var i, l;
if (!sNodes) {
return [];
}
if (BI.isArray(sNodes)) {
var r = [];
var tmpMap = [];
for (i = 0, l = sNodes.length; i < l; i++) {
if (BI.isNull(sNodes[i].id)) {
return sNodes;
}
tmpMap[sNodes[i].id] = sNodes[i];
}
for (i = 0, l = sNodes.length; i < l; i++) {
if (tmpMap[sNodes[i].pId] && sNodes[i].id !== sNodes[i].pId) {
if (!tmpMap[sNodes[i].pId].children) {
tmpMap[sNodes[i].pId].children = [];
}
tmpMap[sNodes[i].pId].children.push(tmpMap[sNodes[i].id]);
} else {
r.push(tmpMap[sNodes[i].id]);
}
}
return r;
} else {
return [sNodes];
}
},
traversal: function (array, callback) { traversal: function (array, callback) {
if (BI.isNull(array)) { if (BI.isNull(array)) {
return; return;

Write Preview
Loading…
Cancel
Save