Skip to content

Commit b21bd32

Browse files
committed
ndarray中去掉kwargs的原型扩展,bug fix in force
1 parent 2709b07 commit b21bd32

File tree

4 files changed

+77
-75
lines changed

4 files changed

+77
-75
lines changed

doc/example/force1.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,9 +188,9 @@
188188
) { //点击的是边
189189
var sourceNode = nodes[data.source];
190190
var targetNode = nodes[data.target];
191-
console.log("选中了边 " + sourceNode.name + ' -> ' + targetNode.name);
191+
console.log("选中了边 " + sourceNode.name + ' -> ' + targetNode.name + ' (' + data.weight + ')');
192192
} else { // 点击的是点
193-
console.log("选中了" + data.name);
193+
console.log("选中了" + data.name + '(' + data.value + ')');
194194
}
195195
console.log(param);
196196
}

src/chart/force.js

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -399,10 +399,13 @@ define(function(require) {
399399

400400
for (var i = 0; i < l; i++) {
401401
var link = links[i];
402-
//var source = nodes[link.source];
402+
// var source = nodes[link.source];
403403
// var target = nodes[link.target];
404-
var weight = link.weight || 1;
405-
linkWeights.push(weight);
404+
if (link.weight !== undefined) {
405+
linkWeights.push(link.weight);
406+
} else {
407+
linkWeights.push(1);
408+
}
406409

407410
var linkShape = {
408411
id : zr.newShapeId(self.type),
@@ -453,14 +456,14 @@ define(function(require) {
453456
{
454457
source : link.source,
455458
target : link.target,
456-
value : link.value || 0
459+
weight : link.weight || 0
457460
},
458461
// link data index
459462
link.rawIndex,
460463
// source name - target name
461464
source.name + ' - ' + target.name,
462-
// link value
463-
link.value || 0,
465+
// link weight
466+
link.weight || 0,
464467
// special
465468
// 这一项只是为了表明这是条边
466469
true

src/util/kwargs.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
define(function(){
2-
function kwargs(defaults) {
3-
var func = this;
2+
function kwargs(func, defaults) {
43
/*jshint maxlen : 200*/
54
var removeComments = new RegExp('(\\/\\*[\\w\\\'\\,\\(\\)\\s\\r\\n\\*]*\\*\\/)|(\\/\\/[\\w\\s\\\'][^\\n\\r]*$)|(<![\\-\\-\\s\\w\\>\\/]*>)', 'gim');
65
var removeWhitespc = new RegExp('\\s+', 'gim');
@@ -42,5 +41,6 @@ define(function(){
4241
};
4342
}
4443
// As function prototype
45-
Function.prototype.kwargs = kwargs;
44+
// Function.prototype.kwargs = kwargs;
45+
return kwargs;
4646
});

0 commit comments

Comments
 (0)