dchart-core - npm Package Compare versions

Comparing version 2.3.37 to 2.4.0

area/area.js

@@ -1,1 +0,1 @@
-"use strict";function AreaMulti(e,t){var i={xaxis:{orient:"bottom"},yaxis:{},series:[]};i=_.deepMerge(i,t),DataV.call(this,e,i)}var DataV=require("../datav"),d3=require("d3"),_=require("../util");AreaMulti=DataV.extend(AreaMulti,{data:function(e){if(!e)return this._data;var t=this.options,i=t.yaxis.key;e.forEach(function(e){_.isArray(e[i])||(e[i]=[e[i]]),e[i]=_.map(e[i],function(e){return"string"==typeof e&&(e=_.toNumber(e)),e||(e=0),e})}),this._data=e},updateBeforeRender:function(){this.beforeRender()},beforeRender:function(){var e=this.options,t=this;e.series&&e.series.length&&e.series.forEach(function(i,r){i.color&&t.dealColor(e,"series2["+r+"].color")})},afterRender:function(){var e=this.options;if(e.tooltip&&e.tooltip.show){var t=this.getComs("tooltip","tooltip");t.updateEvent()}},updateAfterRender:function(){AreaMulti.prototype.afterRender.call(this)},renderSeries:function(){var e=this.options,t=this.data(),i=this.getComs("axis","xaxis"),r=this.getComs("axis","yaxis"),a=e.xaxis.key,n=e.yaxis.key,s=i.getX(),o=r.getX(),d=_.maxBy(t,function(e){return e[n].length})[n].length,u=function(t,d,u){var l=d3.select(this).select(".serie"+(u+1)),p=d3.svg.area().x(function(t){return"time"===e.xaxis.type&&"string"==typeof t[a]?s(d3.time.format(i.options.format).parse(t[a]))+(s.rangeBand?s.rangeBand()/2:0):s(t[a])+(s.rangeBand?s.rangeBand()/2:0)}).y0(o(r.getMin())).y1(function(e){return o(e[n][u]||r.getMin())});(e.series[u]&&e.series[u].interpolate||e.interpolate)&&p.interpolate(e.series[u]&&e.series[u].interpolate||e.interpolate||""),e.withAnimated?l.transition().duration(e.animatedTiming).ease(e.animatedEasing).attr({d:p}):l.attr({d:p})};this.series.datum(t),this.series.each(function(t,n){for(var l=d3.select(this),p=0;d>p;p++){var f=l.select(".serie"+(p+1));f[0][0]||l.append("path").attr({"class":"serie serie"+(p+1),d:d3.svg.area().x(function(t){return"time"===e.xaxis.type&&"string"==typeof t[a]?s(d3.time.format(i.options.format).parse(t[a]))+(s.rangeBand?s.rangeBand()/2:0):s(t[a])+(s.rangeBand?s.rangeBand()/2:0)}).y0(o(r.getMin())).y1(o(r.getMin()))}),u.call(this,t,n,p)}}),this.series.selectAll(".serie.serie"+d+" ~ .serie").remove()},updateSeries:function(){AreaMulti.prototype.renderSeries.call(this)}}),module.exports=AreaMulti;
+"use strict";function AreaMulti(e,t){var i={xaxis:{orient:"bottom"},yaxis:{},series:[]};i=_.deepMerge(i,t),DataV.call(this,e,i)}var DataV=require("../datav"),d3=require("d3"),_=require("../util");AreaMulti=DataV.extend(AreaMulti,{data:function(e){if(!e)return this._data;var t=this.options,i=t.yaxis.key;e.forEach(function(e){_.isArray(e[i])||(e[i]=[e[i]]),e[i]=_.map(e[i],function(e){return"string"==typeof e&&(e=_.toNumber(e)),e||(e=0),e})}),this._data=e},updateBeforeRender:function(){AreaMulti.prototype.beforeRender.call(this)},beforeRender:function(){var e=this.options,t=this;e.series&&e.series.length&&e.series.forEach(function(i,r){i.color&&t.dealColor(e,"series["+r+"].color")})},afterRender:function(){var e=this.options;if(e.tooltip&&e.tooltip.show){var t=this.getComs("tooltip","tooltip");t.updateEvent()}},updateAfterRender:function(){AreaMulti.prototype.afterRender.call(this)},renderSeries:function(){var e=this.options,t=this.data(),i=this.getComs("axis","xaxis"),r=this.getComs("axis","yaxis"),a=e.xaxis.key,n=e.yaxis.key,s=i.getX(),o=r.getX(),d=_.maxBy(t,function(e){return e[n].length})[n].length,l=function(t,d,l){var u=d3.select(this).select(".serie"+(l+1)),p=d3.svg.area().x(function(t){return"time"===e.xaxis.type&&"string"==typeof t[a]?s(d3.time.format(i.options.format).parse(t[a]))+(s.rangeBand?s.rangeBand()/2:0):s(t[a])+(s.rangeBand?s.rangeBand()/2:0)}).y0(o(r.getMin())).y1(function(e){return o(e[n][l]||r.getMin())});(e.series[l]&&e.series[l].interpolate||e.interpolate)&&p.interpolate(e.series[l]&&e.series[l].interpolate||e.interpolate||""),e.withAnimated?u.transition().duration(e.animatedTiming).ease(e.animatedEasing).attr({d:p}):u.attr({d:p})};this.series.datum(t),this.series.each(function(t,n){for(var u=d3.select(this),p=0;d>p;p++){var f=u.select(".serie"+(p+1));f[0][0]||u.append("path").attr({"class":"serie serie"+(p+1),d:d3.svg.area().x(function(t){return"time"===e.xaxis.type&&"string"==typeof t[a]?s(d3.time.format(i.options.format).parse(t[a]))+(s.rangeBand?s.rangeBand()/2:0):s(t[a])+(s.rangeBand?s.rangeBand()/2:0)}).y0(o(r.getMin())).y1(o(r.getMin()))}),l.call(this,t,n,p)}}),this.series.selectAll(".serie.serie"+d+" ~ .serie").remove()},updateSeries:function(){AreaMulti.prototype.renderSeries.call(this)}}),module.exports=AreaMulti;

area/areaMultiVerti.js

@@ -1,1 +0,1 @@
-"use strict";function AreaMultiVerti(e,t){var r={xaxis:{type:"category",orient:"bottom"},groupLabel:null,yaxis:{},label:{show:!1,pos:"center",dx:"0",dy:".4em",anchor:"middle",strokeWidth:0},series:[{label:{}},{label:{}}]};r=_.deepMerge(r,t),DataV.call(this,e,r)}var DataV=require("./area"),d3=require("d3"),_=require("../util");AreaMultiVerti=DataV.extend(AreaMultiVerti,{beforeRender:function(){DataV.prototype.beforeRender.call(this);var e=this.options,t=this.data(),r=e.yaxis.key,i=this;if(e.series&&e.series.length&&e.series.forEach(function(t,r){t&&i.dealColor(e,"series["+r+"].color")}),!e.yaxis.maxAmount||!e.yaxis.minAmount){var a=[];t.length&&t.forEach(function(e,t){e.minSum=0,e.maxSum=0,a[t]||(a[t]={max:0,min:0}),e[r].forEach(function(e){e>=0&&(a[t].max+=e),0>e&&(a[t].min+=e)})}),e.yaxis.maxAmount||(e.yaxis.max=_.maxBy(a,function(e){return e.max}).max),e.yaxis.minAmount||(e.yaxis.min=_.minBy(a,function(e){return e.min}).min)}},updateBeforeRender:function(){AreaMultiVerti.prototype.beforeRender.call(this)},renderSeries:function(){var e=this.options,t=this.data(),r=e.xaxis.key,i=e.yaxis.key;this.svg.classed("bar-chart-g",!0);var a,s;a=this.getComs("axis","xaxis"),s=this.getComs("axis","yaxis");var n=a.getX(),o=s.getX(),l=_.maxBy(t,function(e){return e[i].length})[i].length,m=function(t,s,l){var m=d3.select(this).select(".serie"+(l+1)),u=d3.svg.area().x(function(t){return"time"===e.xaxis.type&&"string"==typeof t[r]?n(d3.time.format(a.options.format).parse(t[r]))+(n.rangeBand?n.rangeBand()/2:0):n(t[r])+(n.rangeBand?n.rangeBand()/2:0)}).y0(function(e){return e[i][l]=e[i][l]||0,o(e[i][l]>=0?e.maxSum:e.minSum)}).y1(function(e){return e[i][l]=e[i][l]||0,e[i][l]>=0?(e.maxSum+=e[i][l],o(e.maxSum)):(e.minSum+=e[i][l],o(e.minSum)-Math.abs(o(0)-o(e[i][l])))});(e.series[l]&&e.series[l].interpolate||e.interpolate)&&u.interpolate(e.series[l]&&e.series[l].interpolate||e.interpolate||""),e.withAnimated?m.transition().duration(e.animatedTiming).ease(e.animatedEasing).attr({d:u}).style({fill:e.series[l]&&e.series[l].color&&e.series[l].color.res||e.color&&e.color.res}):m.attr({d:u}).style({fill:e.series[l]&&e.series[l].color&&e.series[l].color.res||e.color&&e.color.res})};this.series.datum(t),this.series.each(function(t,i){for(var u=d3.select(this),c=0;l>c;c++){var d=u.select(".serie"+(c+1));d[0][0]||u.append("path").attr({"class":"serie serie"+(c+1),d:d3.svg.area().x(function(t){return"time"===e.xaxis.type&&"string"==typeof t[r]?n(d3.time.format(a.options.format).parse(t[r]))+(n.rangeBand?n.rangeBand()/2:0):n(t[r])+(n.rangeBand?n.rangeBand()/2:0)}).y0(o(s.getMin())).y1(o(s.getMin()))}).style("stroke","none"),m.call(this,t,i,c)}}),this.series.selectAll(".serie.serie"+l+" ~ .serie").remove()},updateSeries:function(){AreaMultiVerti.prototype.renderSeries.call(this)}}),module.exports=AreaMultiVerti;
+"use strict";function AreaMultiVerti(e,t){var r={xaxis:{type:"category",orient:"bottom"},groupLabel:null,yaxis:{},label:{show:!1,pos:"center",dx:"0",dy:".4em",anchor:"middle",strokeWidth:0},series:[{label:{}},{label:{}}]};r=_.deepMerge(r,t),DataV.call(this,e,r)}var DataV=require("./area"),d3=require("d3"),_=require("../util");AreaMultiVerti=DataV.extend(AreaMultiVerti,{renderSeries:function(){var e=this.options,t=this.data(),r=e.xaxis.key,i=e.yaxis.key;this.svg.classed("bar-chart-g",!0);var a,s;a=this.getComs("axis","xaxis"),s=this.getComs("axis","yaxis");var n=a.getX(),o=s.getX(),l=_.maxBy(t,function(e){return e[i].length})[i].length,d=function(t,s,l){var d=d3.select(this).select(".serie"+(l+1)),u=d3.svg.area().x(function(t){return"time"===e.xaxis.type&&"string"==typeof t[r]?n(d3.time.format(a.options.format).parse(t[r]))+(n.rangeBand?n.rangeBand()/2:0):n(t[r])+(n.rangeBand?n.rangeBand()/2:0)}).y0(function(e){return e[i][l]=e[i][l]||0,o(e[i][l]>=0?e.maxSum:e.minSum)}).y1(function(e){return e[i][l]=e[i][l]||0,e[i][l]>=0?(e.maxSum+=e[i][l],o(e.maxSum)):(e.minSum+=e[i][l],o(e.minSum)-Math.abs(o(0)-o(e[i][l])))});(e.series[l]&&e.series[l].interpolate||e.interpolate)&&u.interpolate(e.series[l]&&e.series[l].interpolate||e.interpolate||""),e.withAnimated?d.transition().duration(e.animatedTiming).ease(e.animatedEasing).attr({d:u}).style({fill:e.series[l]&&e.series[l].color&&e.series[l].color.res||e.color&&e.color.res}):d.attr({d:u}).style({fill:e.series[l]&&e.series[l].color&&e.series[l].color.res||e.color&&e.color.res})};this.series.datum(t),this.series.each(function(t,i){for(var u=d3.select(this),c=0;l>c;c++){var m=u.select(".serie"+(c+1));m[0][0]||u.append("path").attr({"class":"serie serie"+(c+1),d:d3.svg.area().x(function(t){return"time"===e.xaxis.type&&"string"==typeof t[r]?n(d3.time.format(a.options.format).parse(t[r]))+(n.rangeBand?n.rangeBand()/2:0):n(t[r])+(n.rangeBand?n.rangeBand()/2:0)}).y0(o(s.getMin())).y1(o(s.getMin()))}).style("stroke","none"),d.call(this,t,i,c)}}),this.series.selectAll(".serie.serie"+l+" ~ .serie").remove()},updateSeries:function(){AreaMultiVerti.prototype.renderSeries.call(this)}}),module.exports=AreaMultiVerti;

bar/barMultiHoriColumn.js

@@ -1,1 +0,1 @@
-"use strict";function BarMultiHoriColumn(e,i){var r={xaxis:{orient:"bottom",key:"y",min:0},yaxis:{type:"category",key:"x"},label:{pos:"center",dy:".5em"}};this.enterSerie=[],this.outerSerie=[],r=_.deepMerge(r,i),DataV.call(this,e,r)}var DataV=require("./barHorizontal"),d3=require("d3"),_=require("../util");BarMultiHoriColumn=DataV.extend(BarMultiHoriColumn,{beforeRender:function(){DataV.prototype.beforeRender.call(this);var e=this.options,i=this.data(),r=e.xaxis.key;if(e.xaxis.maxAmount&&e.xaxis.minAmount)e.xaxis.max=e.xaxis.maxAmount,e.xaxis.min=e.xaxis.minAmount;else{var s=[];i.length&&i.forEach(function(e,i){e.minSum=0,e.maxSum=0,s[i]||(s[i]={max:0,min:0}),e[r].forEach(function(e){e>=0&&(s[i].max+=e),0>e&&(s[i].min+=e)})}),e.xaxis.max=e.xaxis.maxAmount?e.xaxis.maxAmount:_.maxBy(s,function(e){return e.max}).max,e.xaxis.min=e.xaxis.minAmount?e.xaxis.minAmount:_.minBy(s,function(e){return e.min}).min}},updateBeforeRender:function(){BarMultiHoriColumn.prototype.beforeRender.call(this)},renderSeries:function(){this.svg.classed("bar-chart-g",!0);var e,i,r=this.options,s=this.data(),a=this,t=r.xaxis.key,n=r.yaxis.key;e=this.getComs("axis","xaxis"),i=this.getComs("axis","yaxis");var l=e.getX(),o=i.getX(),m=(_.maxBy(s,function(e){return e[t].length})[t].length,function(e,i,s){e.each(function(e,m){var u=d3.select(this),x=u.selectAll(".serie"),c=u.selectAll(".serie-label"),d=Math.abs(l(0)-l(e[t]));r.withAnimated?(x.transition().duration(r.animatedTiming).ease(r.animatedEasing).attr({x:function(){return e[t]>=0?l(Math.max(i.maxSum,r.xaxis.min)):(i.minSum+=e[t],l(i.minSum))},y:o(e[n]),width:function(){return r.xaxis.min>i.maxSum?(i.maxSum+=e[t],Math.abs(l(r.xaxis.min)-l(e[t]))):(i.maxSum+=e[t],d)},height:o.rangeBand(),"class":"serie serie"+(m+1)}),c.transition().duration(r.animatedTiming).ease(r.animatedEasing).attr({x:function(){var s=r.label.pos;return"left"===s?e[t]>=0&&l(i.maxSum)-d||l(i.minSum):"center"===s?e[t]>=0&&l(i.maxSum)-d/2||l(i.minSum)+d/2:e[t]>=0&&l(i.maxSum)||l(i.minSum)-d},y:o(e[n])+o.rangeBand()/2,dx:r.series[m]&&r.series[m].label&&r.series[m].label.dx||r.label.dx||0,dy:r.series[m]&&r.series[m].label&&r.series[m].label.dy||r.label.dy||0})):(x.attr({x:function(){return e[t]>=0?l(Math.max(i.maxSum,r.xaxis.min)):(i.minSum+=e[t],l(i.minSum))},y:o(e[n]),width:function(){return r.xaxis.min>i.maxSum?(i.maxSum+=e[t],Math.abs(l(r.xaxis.min)-l(e[t]))):(i.maxSum+=e[t],d)},height:o.rangeBand(),"class":"serie serie"+(m+1)}),c.attr({x:function(){var s=r.label.pos;return"left"===s?e[t]>=0&&l(i.maxSum)-d||l(i.minSum):"center"===s?e[t]>=0&&l(i.maxSum)-d/2||l(i.minSum)+d/2:e[t]>=0&&l(i.maxSum)||l(i.minSum)-d},y:o(e[n])+o.rangeBand()/2,dx:r.series[m]&&r.series[m].label&&r.series[m].label.dx||r.label.dx||0,dy:r.series[m]&&r.series[m].label&&r.series[m].label.dy||r.label.dy||0})),x.style({fill:function(){return r.series[m]&&r.series[m].color&&r.series[m].color.res||r.color&&r.color.res},stroke:function(){return r.series[m]&&r.series[m].frameColor&&r.series[m].frameColor.res||r.frameColor&&r.frameColor.res},"stroke-width":function(){return r.series[m]&&r.series[m].frameColorWidth||r.frameColorWidth}}),c.html(function(){var n=r.series[m]&&r.series[m].label&&r.series[m].label.format||r.label.format||null;return n?n.call(a,e,s):i[t][m]}).style({"text-anchor":function(){return r.series[m]&&r.series[m].label&&r.series[m].label.anchor||r.label.anchor||"middle"},display:function(){var e=r.series[m]&&"boolean"==typeof r.series[m].show?r.series[m].show:"boolean"==typeof r.label.show?r.label.show:!1;return e&&"block"||"none"},"font-size":function(){return(r.series[m]&&r.series[m].label&&r.series[m].label.fontSize||r.label.fontSize||"10")+"px"},"font-weight":function(){return r.series[m]&&r.series[m].label&&r.series[m].label.fontWeight||r.label.fontWeight},fill:function(){return r.series[m]&&r.series[m].label&&r.series[m].label.color||r.label.color},stroke:r.label.strokeWidth&&r.series[m]&&r.series[m].label&&r.series[m].label.color||r.label.color||"#fff","stroke-width":r.label.strokeWidth})})}),u=this.series.selectAll(".series-group").data(this._data,function(e){return e[n]});this.outerSeries=u.exit().remove(),this.enterSeries=u.enter().append("g").attr("class","series-group"),u.each(function(i,s){var t=d3.select(this),u=t.selectAll(".serie-single").data(a.trans(i)),x=u.enter().append("g").attr("class","serie serie-single").each(function(i,s){var a=d3.select(this);a.append("rect").attr({"class":"serie serie"+(s+1),x:l(e.getMin()),y:o(i[n]),width:0,height:o.rangeBand()}),a.append("text").attr({"class":"serie-label serie"+(s+1)+"-label",x:l(e.getMin()),y:o(i[n])+o.rangeBand()/2,dx:r.series[s]&&r.series[s].label&&r.series[s].label.dx||r.label.dx||0,dy:r.series[s]&&r.series[s].label&&r.series[s].label.dy||r.label.dy||0})});m(u,i,s),a.enterSerie[s]=x,a.outerSerie[s]=u.exit().remove()})},updateSeries:function(){BarMultiHoriColumn.prototype.renderSeries.call(this)}}),module.exports=BarMultiHoriColumn;
+"use strict";function BarMultiHoriColumn(e,r){var s={xaxis:{orient:"bottom",key:"y",min:0},yaxis:{type:"category",key:"x"},label:{pos:"center",dy:".5em"}};this.enterSerie=[],this.outerSerie=[],s=_.deepMerge(s,r),DataV.call(this,e,s)}var DataV=require("./barHorizontal"),d3=require("d3"),_=require("../util");BarMultiHoriColumn=DataV.extend(BarMultiHoriColumn,{renderSeries:function(){this.svg.classed("bar-chart-g",!0);var e,r,s=this.options,i=this.data(),a=this,t=s.xaxis.key,l=s.yaxis.key;e=this.getComs("axis","xaxis"),r=this.getComs("axis","yaxis");var n=e.getX(),o=r.getX(),u=(_.maxBy(i,function(e){return e[t].length})[t].length,function(e,r,i){e.each(function(e,u){var m=d3.select(this),d=m.selectAll(".serie"),c=m.selectAll(".serie-label"),x=Math.abs(n(0)-n(e[t]));s.withAnimated?(d.transition().duration(s.animatedTiming).ease(s.animatedEasing).attr({x:function(){return e[t]>=0?n(Math.max(r.maxSum,s.xaxis.min)):(r.minSum+=e[t],n(r.minSum))},y:o(e[l]),width:function(){return s.xaxis.min>r.maxSum?(r.maxSum+=e[t],Math.abs(n(s.xaxis.min)-n(e[t]))):(r.maxSum+=e[t],x)},height:o.rangeBand(),"class":"serie serie"+(u+1)}),c.transition().duration(s.animatedTiming).ease(s.animatedEasing).attr({x:function(){var i=s.label.pos;return"left"===i?e[t]>=0&&n(r.maxSum)-x||n(r.minSum):"center"===i?e[t]>=0&&n(r.maxSum)-x/2||n(r.minSum)+x/2:e[t]>=0&&n(r.maxSum)||n(r.minSum)-x},y:o(e[l])+o.rangeBand()/2,dx:s.series[u]&&s.series[u].label&&s.series[u].label.dx||s.label.dx||0,dy:s.series[u]&&s.series[u].label&&s.series[u].label.dy||s.label.dy||0})):(d.attr({x:function(){return e[t]>=0?n(Math.max(r.maxSum,s.xaxis.min)):(r.minSum+=e[t],n(r.minSum))},y:o(e[l]),width:function(){return s.xaxis.min>r.maxSum?(r.maxSum+=e[t],Math.abs(n(s.xaxis.min)-n(e[t]))):(r.maxSum+=e[t],x)},height:o.rangeBand(),"class":"serie serie"+(u+1)}),c.attr({x:function(){var i=s.label.pos;return"left"===i?e[t]>=0&&n(r.maxSum)-x||n(r.minSum):"center"===i?e[t]>=0&&n(r.maxSum)-x/2||n(r.minSum)+x/2:e[t]>=0&&n(r.maxSum)||n(r.minSum)-x},y:o(e[l])+o.rangeBand()/2,dx:s.series[u]&&s.series[u].label&&s.series[u].label.dx||s.label.dx||0,dy:s.series[u]&&s.series[u].label&&s.series[u].label.dy||s.label.dy||0})),d.style({fill:function(){return s.series[u]&&s.series[u].color&&s.series[u].color.res||s.color&&s.color.res},stroke:function(){return s.series[u]&&s.series[u].frameColor&&s.series[u].frameColor.res||s.frameColor&&s.frameColor.res},"stroke-width":function(){return s.series[u]&&s.series[u].frameColorWidth||s.frameColorWidth}}),c.html(function(){var l=s.series[u]&&s.series[u].label&&s.series[u].label.format||s.label.format||null;return l?l.call(a,e,i):r[t][u]}).style({"text-anchor":function(){return s.series[u]&&s.series[u].label&&s.series[u].label.anchor||s.label.anchor||"middle"},display:function(){var e=s.series[u]&&"boolean"==typeof s.series[u].show?s.series[u].show:"boolean"==typeof s.label.show?s.label.show:!1;return e&&"block"||"none"},"font-size":function(){return(s.series[u]&&s.series[u].label&&s.series[u].label.fontSize||s.label.fontSize||"10")+"px"},"font-weight":function(){return s.series[u]&&s.series[u].label&&s.series[u].label.fontWeight||s.label.fontWeight},fill:function(){return s.series[u]&&s.series[u].label&&s.series[u].label.color||s.label.color},stroke:s.label.strokeWidth&&s.series[u]&&s.series[u].label&&s.series[u].label.color||s.label.color||"#fff","stroke-width":s.label.strokeWidth})})}),m=this.series.selectAll(".series-group").data(this._data,function(e){return e[l]});this.outerSeries=m.exit().remove(),this.enterSeries=m.enter().append("g").attr("class","series-group"),m.each(function(r,i){var t=d3.select(this),m=t.selectAll(".serie-single").data(a.trans(r)),d=m.enter().append("g").attr("class","serie serie-single").each(function(r,i){var a=d3.select(this);a.append("rect").attr({"class":"serie serie"+(i+1),x:n(e.getMin()),y:o(r[l]),width:0,height:o.rangeBand()}),a.append("text").attr({"class":"serie-label serie"+(i+1)+"-label",x:n(e.getMin()),y:o(r[l])+o.rangeBand()/2,dx:s.series[i]&&s.series[i].label&&s.series[i].label.dx||s.label.dx||0,dy:s.series[i]&&s.series[i].label&&s.series[i].label.dy||s.label.dy||0})});u(m,r,i),a.enterSerie[i]=d,a.outerSerie[i]=m.exit().remove()})},updateSeries:function(){BarMultiHoriColumn.prototype.renderSeries.call(this)}}),module.exports=BarMultiHoriColumn;

bar/barMultiVerti.js

@@ -1,1 +0,1 @@
-"use strict";function BarMultiVerti(e,i){var r={xaxis:{type:"category",orient:"bottom"},groupLabel:null,yaxis:{},label:{show:!1,pos:"center",dx:"0",dy:".4em",anchor:"middle",strokeWidth:0},series:[{label:{}},{label:{}}]};r=_.deepMerge(r,i),DataV.call(this,e,r)}var DataV=require("./bar"),d3=require("d3"),_=require("../util");BarMultiVerti=DataV.extend(BarMultiVerti,{beforeRender:function(){DataV.prototype.beforeRender.call(this);var e=this.options,i=this.data(),r=e.yaxis.key;if(e.yaxis.maxAmount&&e.yaxis.minAmount)e.yaxis.max=e.yaxis.maxAmount,e.yaxis.min=e.yaxis.minAmount;else{var s=[];i.length&&i.forEach(function(e,i){e.minSum=0,e.maxSum=0,s[i]||(s[i]={max:0,min:0}),e[r].forEach(function(e){e>=0&&(s[i].max+=e),0>e&&(s[i].min+=e)})}),e.yaxis.max=e.yaxis.maxAmount?e.yaxis.maxAmount:_.maxBy(s,function(e){return e.max}).max,e.yaxis.min=e.yaxis.minAmount?e.yaxis.minAmount:_.minBy(s,function(e){return e.min}).min}},updateBeforeRender:function(){BarMultiVerti.prototype.beforeRender.call(this)},renderSeries:function(){var e=this.options,i=this,r=this.data(),s=e.xaxis.key,a=e.yaxis.key;this.svg.classed("bar-chart-g",!0);var t,n;t=this.getComs("axis","xaxis"),n=this.getComs("axis","yaxis");var l=t.getX(),o=n.getX(),m=_.maxBy(r,function(e){return e[a].length})[a].length,u=function(r,t,n){r.each(function(r,m){var u=d3.select(this),x=u.selectAll(".serie"),d=u.selectAll(".serie-label"),c=Math.abs(o(0)-o(r[a]));e.withAnimated?(x.transition().duration(e.animatedTiming).ease(e.animatedEasing).attr({x:l(r[s]),y:function(){return r[a]>=0?(t.maxSum+=r[a],o(t.maxSum)):(t.minSum+=r[a],o(t.minSum)-c)},width:l.rangeBand(),height:t.maxSum-r[a]<e.yaxis.min?Math.abs(o(e.yaxis.min)-o(r[a])):c,"class":"serie serie"+(m+1)}),d.transition().duration(e.animatedTiming).ease(e.animatedEasing).attr({x:l(r[s])+l.rangeBand()/2,y:function(){var i=e.label.pos;return"top"===i?r[a]>=0&&o(t.maxSum)||o(t.minSum)-c:"center"===i?r[a]>=0&&o(t.maxSum)+c/2||o(t.minSum)-c/2:r[a]>=0&&o(t.maxSum)+c||o(t.minSum)},dx:e.series[m]&&e.series[m].label&&e.series[m].label.dx||e.label.dx||0,dy:e.series[m]&&e.series[m].label&&e.series[m].label.dy||e.label.dy||0})):(x.attr({x:l(r[s]),y:function(){return r[a]>=0?(t.maxSum+=r[a],o(t.maxSum)):(t.minSum+=r[a],o(t.minSum)-c)},width:l.rangeBand(),height:t.maxSum-r[a]<e.yaxis.min?Math.abs(o(e.yaxis.min)-o(r[a])):c,"class":"serie serie"+(m+1)}),d.attr({x:l(r[s])+l.rangeBand()/2,y:function(){var i=e.label.pos;return"top"===i?r[a]>=0&&o(t.maxSum)||o(t.minSum)-c:"center"===i?r[a]>=0&&o(t.maxSum)+c/2||o(t.minSum)-c/2:r[a]>=0&&o(t.maxSum)+c||o(t.minSum)},dx:e.series[m]&&e.series[m].label&&e.series[m].label.dx||e.label.dx||0,dy:e.series[m]&&e.series[m].label&&e.series[m].label.dy||e.label.dy||0})),x.style({fill:function(){return e.series[m]&&e.series[m].color&&e.series[m].color.res||e.color&&e.color.res},stroke:function(){return e.series[m]&&e.series[m].frameColor&&e.series[m].frameColor.res||e.frameColor&&e.frameColor.res},"stroke-width":function(){return e.series[m]&&e.series[m].frameColorWidth||e.frameColorWidth}}),d.html(function(){var s=e.series[m]&&e.series[m].label&&e.series[m].label.format||e.label.format||null;return s?s.call(i,r,n):r[a]}).style({"text-anchor":function(){return e.series[m]&&e.series[m].label&&e.series[m].label.anchor||e.label.anchor||"middle"},display:function(){var i=e.series[m]&&"boolean"==typeof e.series[m].show?e.series[m].show:"boolean"==typeof e.label.show?e.label.show:!1;return i&&"block"||"none"},"font-size":function(){return(e.series[m]&&e.series[m].label&&e.series[m].label.fontSize||e.label.fontSize||"10")+"px"},"font-weight":function(){return e.series[m]&&e.series[m].label&&e.series[m].label.fontWeight||e.label.fontWeight},fill:function(){return e.series[m]&&e.series[m].label&&e.series[m].label.color||e.label.color},stroke:e.label.strokeWidth?e.series[m]&&e.series[m].label&&e.series[m].label.color||e.label.color:"#fff","stroke-width":e.label.strokeWidth||0})})},x=this.series.selectAll(".series-group").data(this._data,function(e){return e[s]});this.enterSeries=x.enter().append("g").attr("class","series-group"),this.outerSeries=x.exit().remove(),x.each(function(r,a){{var t=d3.select(this),m=t.selectAll(".serie-single").data(i.trans(r));m.enter().append("g").attr("class","serie serie-single").each(function(i,r){var a=d3.select(this);a.append("rect").attr({"class":"serie serie"+(r+1),x:l(i[s]),y:o(n.getMin()),width:l.rangeBand(),height:0}),a.append("text").attr({"class":"serie-label serie"+(r+1)+"-label",x:l(i[s])+l.rangeBand()/2,y:o(n.getMin()),dx:e.series[r]&&e.series[r].label&&e.series[r].label.dx||e.label.dx||0,dy:e.series[r]&&e.series[r].label&&e.series[r].label.dy||e.label.dy||0})})}u(m,r,a),i.outerSerie=m.exit().remove()}),x.selectAll(".serie.serie"+m+" ~ .serie").remove()},updateSeries:function(){BarMultiVerti.prototype.renderSeries.call(this)}}),module.exports=BarMultiVerti;
+"use strict";function BarMultiVerti(e,r){var s={xaxis:{type:"category",orient:"bottom"},groupLabel:null,yaxis:{},label:{show:!1,pos:"center",dx:"0",dy:".4em",anchor:"middle",strokeWidth:0},series:[{label:{}},{label:{}}]};s=_.deepMerge(s,r),DataV.call(this,e,s)}var DataV=require("./bar"),d3=require("d3"),_=require("../util");BarMultiVerti=DataV.extend(BarMultiVerti,{renderSeries:function(){var e=this.options,r=this,s=this.data(),i=e.xaxis.key,a=e.yaxis.key;this.svg.classed("bar-chart-g",!0);var t,l;t=this.getComs("axis","xaxis"),l=this.getComs("axis","yaxis");var n=t.getX(),o=l.getX(),u=_.maxBy(s,function(e){return e[a].length})[a].length,m=function(s,t,l){s.each(function(s,u){var m=d3.select(this),d=m.selectAll(".serie"),c=m.selectAll(".serie-label"),b=Math.abs(o(0)-o(s[a]));e.withAnimated?(d.transition().duration(e.animatedTiming).ease(e.animatedEasing).attr({x:n(s[i]),y:function(){return s[a]>=0?(t.maxSum+=s[a],o(t.maxSum)):(t.minSum+=s[a],o(t.minSum)-b)},width:n.rangeBand(),height:t.maxSum-s[a]<e.yaxis.min?Math.abs(o(e.yaxis.min)-o(s[a])):b,"class":"serie serie"+(u+1)}),c.transition().duration(e.animatedTiming).ease(e.animatedEasing).attr({x:n(s[i])+n.rangeBand()/2,y:function(){var r=e.label.pos;return"top"===r?s[a]>=0&&o(t.maxSum)||o(t.minSum)-b:"center"===r?s[a]>=0&&o(t.maxSum)+b/2||o(t.minSum)-b/2:s[a]>=0&&o(t.maxSum)+b||o(t.minSum)},dx:e.series[u]&&e.series[u].label&&e.series[u].label.dx||e.label.dx||0,dy:e.series[u]&&e.series[u].label&&e.series[u].label.dy||e.label.dy||0})):(d.attr({x:n(s[i]),y:function(){return s[a]>=0?(t.maxSum+=s[a],o(t.maxSum)):(t.minSum+=s[a],o(t.minSum)-b)},width:n.rangeBand(),height:t.maxSum-s[a]<e.yaxis.min?Math.abs(o(e.yaxis.min)-o(s[a])):b,"class":"serie serie"+(u+1)}),c.attr({x:n(s[i])+n.rangeBand()/2,y:function(){var r=e.label.pos;return"top"===r?s[a]>=0&&o(t.maxSum)||o(t.minSum)-b:"center"===r?s[a]>=0&&o(t.maxSum)+b/2||o(t.minSum)-b/2:s[a]>=0&&o(t.maxSum)+b||o(t.minSum)},dx:e.series[u]&&e.series[u].label&&e.series[u].label.dx||e.label.dx||0,dy:e.series[u]&&e.series[u].label&&e.series[u].label.dy||e.label.dy||0})),d.style({fill:function(){return e.series[u]&&e.series[u].color&&e.series[u].color.res||e.color&&e.color.res},stroke:function(){return e.series[u]&&e.series[u].frameColor&&e.series[u].frameColor.res||e.frameColor&&e.frameColor.res},"stroke-width":function(){return e.series[u]&&e.series[u].frameColorWidth||e.frameColorWidth}}),c.html(function(){var i=e.series[u]&&e.series[u].label&&e.series[u].label.format||e.label.format||null;return i?i.call(r,s,l):s[a]}).style({"text-anchor":function(){return e.series[u]&&e.series[u].label&&e.series[u].label.anchor||e.label.anchor||"middle"},display:function(){var r=e.series[u]&&"boolean"==typeof e.series[u].show?e.series[u].show:"boolean"==typeof e.label.show?e.label.show:!1;return r&&"block"||"none"},"font-size":function(){return(e.series[u]&&e.series[u].label&&e.series[u].label.fontSize||e.label.fontSize||"10")+"px"},"font-weight":function(){return e.series[u]&&e.series[u].label&&e.series[u].label.fontWeight||e.label.fontWeight},fill:function(){return e.series[u]&&e.series[u].label&&e.series[u].label.color||e.label.color},stroke:e.label.strokeWidth?e.series[u]&&e.series[u].label&&e.series[u].label.color||e.label.color:"#fff","stroke-width":e.label.strokeWidth||0})})},d=this.series.selectAll(".series-group").data(this._data,function(e){return e[i]});this.enterSeries=d.enter().append("g").attr("class","series-group"),this.outerSeries=d.exit().remove(),d.each(function(s,a){{var t=d3.select(this),u=t.selectAll(".serie-single").data(r.trans(s));u.enter().append("g").attr("class","serie serie-single").each(function(r,s){var a=d3.select(this);a.append("rect").attr({"class":"serie serie"+(s+1),x:n(r[i]),y:o(l.getMin()),width:n.rangeBand(),height:0}),a.append("text").attr({"class":"serie-label serie"+(s+1)+"-label",x:n(r[i])+n.rangeBand()/2,y:o(l.getMin()),dx:e.series[s]&&e.series[s].label&&e.series[s].label.dx||e.label.dx||0,dy:e.series[s]&&e.series[s].label&&e.series[s].label.dy||e.label.dy||0})})}m(u,s,a),r.outerSerie=u.exit().remove()}),d.selectAll(".serie.serie"+u+" ~ .serie").remove()},updateSeries:function(){BarMultiVerti.prototype.renderSeries.call(this)}}),module.exports=BarMultiVerti;

com/axis.js

@@ -1,1 +0,1 @@
-"use strict";function Axis(t,i,e){this.reset(),this.options={fontSize:12,fontColor:"#fff",fontWeight:"normal",fontStrokeWidth:0,key:"x",type:"defaults",orient:null,dy:0,padding:.4,groupPadding:[.4,.4],assistLine:!0,assistLineColor:"#fff",rotate:0,min:null,max:null,tickSize:0,tickValues:null,tickFormat:null,ticks:null,nondecile:{key:"y",tickPadding:10},format:"%Y-%m-%d",label:null,labelColor:"#aaa",labelInAxis:!0,labelFontSize:12,labelFontWeight:"normal",labelFontStrokeWidth:0,textAnchor:"middle",textShow:!0,net:!1,netColor:"#aaa",digit:0,show:!0},this.x=null,this.axisx=null,this.groupX=null,this.net=null,this.init(t,i,e),this._valid()}var _=require("../util"),Com=require("./index"),d3=require("d3");Axis=Com.extend(Axis,{init:function(t,i,e){return t||this.el?(t&&(this.el=d3.select(t)),this.isReset=this.options&&_.toLower(this.options.type)!==_.toLower(i.type)?!0:!1,this.options=_.deepMerge(this.options,i),void(this.alloptions=e||this.alloptions)):!1},_valid:function(){var t=this.options,i=["defaults","category","time","nondecile"];-1===_.indexOf(i,t.type.toLowerCase())&&(this.msg="axis arguments error. there is no "+t.type+" in types.",t.type=i[0],this.valid=!1),t.type=_.initialUpperCase(t.type);var e=["left","top","right","bottom"];-1===_.indexOf(e,t.orient.toLowerCase())&&(this.msg="axis arguments error. there is no "+t.orient+" in orients.",t.orient=e[0],this.valid=!1),t.orient=_.initialUpperCase(t.orient)},renderSeries:function(){var t=this.options;this["cal"+t.orient](),this.renderStyle(),this.renderLabel(),"function"==typeof t.afterRender&&t.afterRender.call(this),this.el.selectAll(".tick line").style("display",!t.net&&"none"||"block"),this.isReset=!1},cut:function(t,i){for(var e=(t[1]-t[0])/(i-1),s=0;i-1>s;s++)t[s+1]=t[0]+e*(s+1);return t},format:function(){var t=this.options,i=this.axisx,e=this.x;if(i.tickPadding(t.dy),"object"==typeof t.tickSize?i.tickSize.apply(this,t.tickSize):i.tickSize(t.tickSize),t.tickValues&&i.tickValues(t.tickValues),t.ticks)if("Category"===t.type&&_.isNumber(t.ticks)){var s=this._data;t.tickFormat=function(i,e){var n=_.toNumber(t.ticks),a=s.length,r=parseInt((a-1)/(n-1));if(0===r)return i;var o=(a-1)%(n-1),l=parseInt(o%2&&o/2+1||o/2),h=o-l;return l>e?"":h>=a-e?"":(e-l)%r?"":i}}else if("array"==typeof t.ticks)i.ticks.apply(this,t.ticks);else if(_.isNumber(t.ticks))if("Time"!==t.type){t.ticks=_.toNumber(t.ticks);var n=_.clone(e.domain());switch(t.ticks){case 0:i.tickValues([n[0]]);break;case 1:i.tickValues([n[1]]);break;case 2:i.tickValues(n);break;default:n=this.cut(n,t.ticks),i.tickValues(n)}}else i.ticks.call(this,t.ticks);if("string"==typeof t.tickFormat)i.tickFormat(d3.format(t.tickFormat));else if("function"==typeof t.tickFormat){var a=this;i.tickFormat(function(i,e){return t.tickFormat.call(a._data[e],i,e)})}},_afterAxis:function(){var t=this.options;"function"==typeof t._afterAxis&&t._afterAxis.call(this)},renderLabel:function(){var t=this.options,i=this.alloptions;if(!t.label)return void this.el.select(".axis-unit").remove();if(t.labelInAxis){var e=this.el.select(".axis-unit")[0][0]&&this.el.select(".axis-unit")||this.el.append("g").attr({"class":"axis-unit"}),s=this.el.selectAll(".tick:nth-last-child(3)"),n=s.select("text");"Left"===t.orient||"Right"===t.orient?e.attr("transform","translate(0,"+-1.5*parseInt(n.style("font-size"))+")"):e.attr("transform","translate("+((t.innerWidth||i.innerWidth)+3*parseInt(n.style("font-size")))+", 0)");var a=e.select("text")[0][0]&&e.select("text")||e.append("text");a.attr({dy:n.attr("dy"),x:n.attr("x"),y:n.attr("y"),transform:n.attr("transform")}).text(t.label).style({"text-anchor":n.style("text-anchor"),"font-size":n.style("font-size"),"font-weight":n.style("font-weight"),fill:n.style("fill")})}},calLeft:function(){var t=this.options,i=this.alloptions,e=this.x=this["axis"+t.type].call(this,[t.innerHeight||i.innerHeight,0]),s=this.axisx=d3.svg.axis().scale(e).orient("left");this.format(),this._afterAxis(),-1!==this.el.attr("class").indexOf("axis")?this.el.call(s):this.el=this.el.append("g").attr("class","axis").call(s),this.net=this.el.selectAll(".tick"+("Category"!==t.type&&1!==t.ticks?":not(:first-child)":"")).append("line").attr({"class":"net-line",x2:t.innerWidth||i.innerWidth,y2:"0"}).style({"stroke-dasharray":"2 2",stroke:t.netColor})},updateLeft:function(){var t=this.options,i=this.alloptions;this["updateAxis"+t.type].call(this,[t.innerHeight||i.innerHeight,0]),this.format(),this._afterAxis(),this.el.call(this.axisx),this.net=this.el.selectAll(".tick"+("Category"!==t.type&&1!==t.ticks?":not(:first-child)":"")).append("line").attr({"class":"net-line",x2:t.innerWidth||i.innerWidth,y2:"0"}).style({"stroke-dasharray":"2 2",stroke:t.netColor})},calRight:function(){var t=this.options,i=this.alloptions,e=this.x=this["axis"+t.type].call(this,[t.innerHeight||i.innerHeight,0]),s=this.axisx=d3.svg.axis().scale(e).orient("right");this.format(),this._afterAxis(),-1!==this.el.attr("class").indexOf("axis")?this.el.attr({transform:"translate("+(t.innerWidth||i.innerWidth)+", 0)"}).call(s):this.el=this.el.append("g").attr({"class":"axis",transform:"translate("+(t.innerWidth||i.innerWidth)+", 0)"}).call(s),this.net=this.el.selectAll(".tick"+("Category"!==t.type&&1!==t.ticks?":not(:first-child)":"")).append("line").attr({"class":"net-line",x2:-t.innerWidth||-i.innerWidth,y2:"0"}).style({"stroke-dasharray":"2 2",stroke:t.netColor})},updateRight:function(){var t=this.options,i=this.alloptions;this["updateAxis"+t.type].call(this,[t.innerHeight||i.innerHeight,0]),this.format(),this._afterAxis(),this.el.attr({transform:"translate("+(t.innerWidth||i.innerWidth)+", 0)"}).call(this.axisx),this.net=this.el.selectAll(".tick"+("Category"!==t.type&&1!==t.ticks?":not(:first-child)":"")).append("line").attr({"class":"net-line",x2:-t.innerWidth||-i.innerWidth,y2:"0"}).style({stroke:t.netColor})},calTop:function(){var t=this.options,i=this.alloptions,e=this.x=this["axis"+t.type].call(this,[0,t.innerWidth||i.innerWidth]),s=this.axisx=d3.svg.axis().scale(e).orient("top");this.format(),this._afterAxis(),-1!==this.el.attr("class").indexOf("axis")?this.el.call(s):this.el=this.el.append("g").attr("class","axis").call(s),this.net=this.el.selectAll(".tick"+("Category"!==t.type&&1!==t.ticks?":not(:first-child)":"")).append("line").attr({"class":"net-line",y2:t.innerHeight||i.innerHeight,x2:"0"}).style({"stroke-dasharray":"2 2",stroke:t.netColor})},updateTop:function(){var t=this.options,i=this.alloptions;this["updateAxis"+t.type].call(this,[0,t.innerWidth||i.innerWidth]),this.format(),this._afterAxis(),this.el.call(this.axisx),this.net=this.el.selectAll(".tick"+("Category"!==t.type&&1!==t.ticks?":not(:first-child)":"")).append("line").attr({"class":"net-line",y2:t.innerHeight||i.innerHeight,x2:"0"}).style({"stroke-dasharray":"2 2",stroke:t.netColor})},calBottom:function(){var t=this.options,i=this.alloptions,e=this.x=this["axis"+t.type].call(this,[0,t.innerWidth||i.innerWidth]),s=this.axisx=d3.svg.axis().scale(e).orient("bottom");this.format(),this._afterAxis(),-1!==this.el.attr("class").indexOf("axis")?this.el.attr({transform:"translate(0,"+(t.innerHeight||i.innerHeight)+")"}).call(s):this.el=this.el.append("g").attr({"class":"axis",transform:"translate(0,"+(t.innerHeight||i.innerHeight)+")"}).call(s),this.net=this.el.selectAll(".tick"+("Category"!==t.type&&1!==t.ticks?":not(:first-child)":"")).append("line").attr({"class":"net-line",y2:-t.innerHeight||-i.innerHeight,x2:"0"}).style({"stroke-dasharray":"2 2",stroke:t.netColor})},updateBottom:function(){var t=this.options,i=this.alloptions;this["updateAxis"+t.type].call(this,[0,t.innerWidth||i.innerWidth]),this.format(),this._afterAxis(),this.el.attr("transform","translate(0,"+(t.innerHeight||i.innerHeight)+")").call(this.axisx),this.net=this.el.selectAll(".tick"+("Category"!==t.type&&1!==t.ticks?":not(:first-child)":"")).append("line").attr({"class":"net-line",y2:-t.innerHeight||-i.innerHeight,x2:"0"}).style({"stroke-dasharray":"2 2",stroke:t.netColor})},axisDefaults:function(t){var i=this.x=d3.scale.linear().range(t),e=this.calExtent(),s=this.options;if(_.isNumber(s.ticks)&&!_.isNumber(s.min)&&Math.abs(e[1]-e[0])%(s.ticks-1)){var n=Math.max(Math.abs(e[1]-e[0])/(s.ticks-1),.1);e[0]=e[1]-n*(s.ticks-1)}return i.domain(e),i},updateAxisDefaults:function(t){this.x.range(t);var i=this.calExtent(),e=this.options;if(_.isNumber(e.ticks)&&!_.isNumber(e.min)&&Math.abs(i[1]-i[0])%(e.ticks-1)){var s=Math.max(Math.abs(i[1]-i[0])/(e.ticks-1),.1);i[0]=i[1]-s*(e.ticks-1)}return this.x.domain(i),this.x},axisCategory:function(t){var i,e=this.options;i=this.x=_.isArray(e.padding)?d3.scale.ordinal().rangeBands(t,e.padding[0],e.padding[1]):d3.scale.ordinal().rangeBands(t,e.padding/2,e.padding);var s=this.calExtent();return i.domain(s),i},updateAxisCategory:function(t){var i=this.options;return _.isArray(i.padding)?this.x.rangeBands(t,i.padding[0],i.padding[1]):this.x.rangeBands(t,i.padding/2,i.padding),this.x.domain(this.calExtent()),this.x},axisTime:function(t){var i,e=this.options,s=this.x=d3.time.scale().range(t),n=d3.time.format(e.format);return _.isDate(e.min)&&_.isDate(e.max)?i=[e.min,e.max]:e.min&&e.max?i=[n.parse(e.min),n.parse(e.max)]:(i=d3.extent(_.map(this._data,function(t){return"string"==typeof t[e.key]?n.parse(t[e.key]):"object"==typeof t[e.key]?t[e.key]:void console.log("date error: "+t[e.key]+"is not a Date")})),e.min&&(i[0]=_.isDate(e.min)?e.min:n.parse(e.min)),e.max&&(i[1]=_.isDate(e.max)?e.max:n.parse(e.max))),s.domain(i),s},updateAxisTime:function(t){var i=this.options;this.x.range(t);var e,s=d3.time.format(i.format);return _.isDate(i.min)&&_.isDate(i.max)?e=[i.min,i.max]:i.min&&i.max?e=[s.parse(i.min),s.parse(i.max)]:(e=d3.extent(_.map(this._data,function(t){return"string"==typeof t[i.key]?s.parse(t[i.key]):"object"==typeof t[i.key]?t[i.key]:void console.log("date error: "+t[i.key]+"is not a Date")})),i.min&&(e[0]=_.isDate(i.min)?i.min:s.parse(i.min)),i.max&&(e[1]=_.isDate(i.max)?i.max:s.parse(i.max))),this.x.domain(e),this.x},axisNondecile:function(t){var i=this.options,e=this.x=d3.scale.linear().range(t);i.max=_.sum(this._data,i.nondecile.key),e.domain(this.calExtent());var s=_.groupBy(this._data,i.key),n=this._data=[],a=0,r=n.length,o=(t[1]-t[0])/(e.domain()[1]-e.domain()[0]);for(var l in s){var h={sum:_.sum(s[l],i.nondecile.key),begin:a,end:0,center:0,radio:0};r--,h[i.key]=l,h.end=h.begin+h.sum,a+=h.sum,h.center=(h.begin+h.end)/2,i.nondecile.tickPadding&&0!==h.begin&&(h.begin=(e(h.begin)-i.nondecile.tickPadding/2-t[0])/o+e.domain()[0]),i.nondecile.tickPadding&&0!==r&&(h.end=(e(h.end)+i.nondecile.tickPadding/2-t[0])/o+e.domain()[0]),h.radio=(h.end-h.begin)/h.sum,n.push(h)}return i._afterAxis=function(){this.axisx.tickValues(_.pluck(this._data,"center"))},i.afterRender=function(){this.el.selectAll(".tick").data(this._data)},e},updateAxisNondecile:function(t){var i=this.options,e=this.x.range(t);i.max=_.sum(this._data,i.nondecile.key),e.domain(this.calExtent());var s=_.groupBy(this._data,i.key),n=this._data=[],a=0,r=n.length,o=(t[1]-t[0])/(e.domain()[1]-e.domain()[0]);for(var l in s){var h={sum:_.sum(s[l],i.nondecile.key),begin:a,end:0,center:0,radio:0};r--,h[i.key]=l,h.end=h.begin+h.sum,a+=h.sum,h.center=(h.begin+h.end)/2,i.nondecile.tickPadding&&0!==h.begin&&(h.begin=(e(h.begin)-i.nondecile.tickPadding/2-t[0])/o+e.domain()[0]),i.nondecile.tickPadding&&0!==r&&(h.end=(e(h.end)+i.nondecile.tickPadding/2-t[0])/o+e.domain()[0]),h.radio=(h.end-h.begin)/h.sum,n.push(h)}return e.domain(this.calExtent()),i._afterAxis=function(){this.axisx.tickValues(_.pluck(this._data,"center")),this.el&&this.el.selectAll(".tick").data(_.pluck(this._data,"center"))},e},calExtent:function(){var t=this.options,i=[];if(_.isNumber(t.min)&&_.isNumber(t.max))i=[t.min,t.max];else if("category"!==t.type.toLocaleLowerCase()){var e=[];this._data.forEach(function(i){var s=i[t.key];_.isArray(s)?("defaults"===t.type.toLocaleLowerCase()&&(s=_.map(s,function(t){return _.toNumber(t)})),e=_.union(e,s)):("defaults"===t.type.toLocaleLowerCase()&&(s=_.toNumber(s)),e.push(s))}),i=d3.extent(e),_.isNumber(t.min)&&(i[0]=t.min),_.isNumber(t.max)&&(i[1]=t.max)}else i=_.map(this._data,function(i){return i[t.key]});return i},getX:function(){return this.x},getAxisX:function(){return this.axisx},getMin:function(){return _.first(this.x.domain())},getMax:function(){return _.last(this.x.domain())},calGroupStep:function(t){var i=this.options,e=i.groupPadding;return this.groupX=Array.isArray(e)?d3.scale.ordinal().rangeBands([0,this.x.rangeBand()],_.isNumber(e[0])?e[0]:.4,_.isNumber(e[1])?e[1]:0):d3.scale.ordinal().rangeBands([0,this.x.rangeBand()],_.isNumber(e)?e:.4),Array.isArray(t)||(t=this._createCategory(parseInt(t))),this.groupX.domain(t),this.groupX},getGroupStep:function(t){return this.groupX?this.groupX.rangeBand():(this.calGroupStep(t),this.groupX.rangeBand())},_createCategory:function(t){for(var i=[],e=0;t>e;e++)i.push(""+e);return i},getGroupX:function(){return this.groupX},updateSeries:function(){var t=this.options;this.el.selectAll(".net-line").remove(),this.isReset&&this["cal"+t.orient]()||this["update"+t.orient](),this.renderStyle(),this.renderLabel(),"function"==typeof t.afterRender&&t.afterRender.call(this),this.el.selectAll(".net-line").style("display",!t.net&&"none"||"block"),this.isReset=!1},renderStyle:function(){var t=this.options,i=this.el.selectAll(".tick text").style({fill:t.fontColor,"font-size":t.fontSize,"font-weight":t.fontWeight,"stroke-width":0,display:t.textShow&&"block"||"none"});t.fontStrokeWidth&&i.style({stroke:t.fontColor,"stroke-width":t.fontStrokeWidth}),t.rotate&&_.isNumber(t.rotate)?i.each(function(){var i=d3.select(this),e=_.toNumber(i.attr("x")),s=_.toNumber(i.attr("y")),n=t.rotate/360*2*Math.PI;i.attr("transform",(("Top"===t.orient||"Bottom"===t.orient)&&"translate(0 "+.5*Math.sin(n)*t.fontSize*("Bottom"===t.orient&&.01||-1.99)+")"||"")+" rotate("+t.rotate+" "+e+" "+s+")").style({"text-anchor":"start"})}):i.attr("transform",""),this.el.selectAll(".domain, .tick line:not(.net-line)").style({display:t.assistLine&&"block"||"none",fill:"none",stroke:t.assistLineColor}),this.el.style("display",t.show&&"block"||"none")}}),module.exports=Axis;
+"use strict";function Axis(t,i,e){this.reset(),this.options={fontSize:12,fontColor:"#fff",fontWeight:"normal",fontStrokeWidth:0,key:"x",type:"defaults",orient:null,dy:0,padding:.4,groupPadding:[.4,.4],assistLine:!0,assistLineColor:"#fff",rotate:0,min:null,max:null,tickSize:0,tickValues:null,tickFormat:null,ticks:null,nondecile:{key:"y",tickPadding:10},format:"%Y-%m-%d",label:null,labelColor:"#aaa",labelInAxis:!0,labelFontSize:12,labelFontWeight:"normal",labelFontStrokeWidth:0,textAnchor:"middle",textShow:!0,net:!1,netColor:"#aaa",digit:0,show:!0},this.x=null,this.axisx=null,this.groupX=null,this.net=null,this.init(t,i,e),this._valid()}var _=require("../util"),Com=require("./index"),d3=require("d3"),numberUtil=require("../util/number");Axis=Com.extend(Axis,{init:function(t,i,e){return t||this.el?(t&&(this.el=d3.select(t)),this.isReset=this.options&&_.toLower(this.options.type)!==_.toLower(i.type)?!0:!1,this.options=_.deepMerge(this.options,i),void(this.alloptions=e||this.alloptions)):!1},_valid:function(){var t=this.options,i=["defaults","category","time","nondecile"];-1===_.indexOf(i,t.type.toLowerCase())&&(this.msg="axis arguments error. there is no "+t.type+" in types.",t.type=i[0],this.valid=!1),t.type=_.initialUpperCase(t.type);var e=["left","top","right","bottom"];-1===_.indexOf(e,t.orient.toLowerCase())&&(this.msg="axis arguments error. there is no "+t.orient+" in orients.",t.orient=e[0],this.valid=!1),t.orient=_.initialUpperCase(t.orient)},renderSeries:function(){var t=this.options;this["cal"+t.orient](),this.renderStyle(),this.renderLabel(),"function"==typeof t.afterRender&&t.afterRender.call(this),this.el.selectAll(".tick line").style("display",!t.net&&"none"||"block"),this.isReset=!1},cut:function(t,i){for(var e=(t[1]-t[0])/(i-1),n=0;i-1>n;n++)t[n+1]=t[0]+e*(n+1);return t},format:function(){var t=this.options,i=this.axisx,e=this.x;if(i.tickPadding(t.dy),"object"==typeof t.tickSize?i.tickSize.apply(this,t.tickSize):i.tickSize(t.tickSize),t.tickValues&&i.tickValues(t.tickValues),t.ticks)if("Category"===t.type&&_.isNumber(t.ticks)){var n=this._data;t.tickFormat=function(i,e){var s=_.toNumber(t.ticks),a=n.length,r=parseInt((a-1)/(s-1));if(0===r)return i;var o=(a-1)%(s-1),l=parseInt(o%2&&o/2+1||o/2),h=o-l;return l>e?"":h>=a-e?"":(e-l)%r?"":i}}else if("array"==typeof t.ticks)i.ticks.apply(this,t.ticks);else if(_.isNumber(t.ticks))if("Time"!==t.type){t.ticks=_.toNumber(t.ticks);var s=_.clone(e.domain());switch(t.ticks){case 0:i.tickValues([s[0]]);break;case 1:i.tickValues([s[1]]);break;case 2:i.tickValues(s);break;default:s=this.cut(s,t.ticks),i.tickValues(s)}}else i.ticks.call(this,t.ticks);if("string"==typeof t.tickFormat)i.tickFormat(d3.format(t.tickFormat));else if("function"==typeof t.tickFormat){var a=this;i.tickFormat(function(i,e){return t.tickFormat.call(a._data[e],i,e)})}},_afterAxis:function(){var t=this.options;"function"==typeof t._afterAxis&&t._afterAxis.call(this)},renderLabel:function(){var t=this.options,i=this.alloptions;if(!t.label)return void this.el.select(".axis-unit").remove();if(t.labelInAxis){var e=this.el.select(".axis-unit")[0][0]&&this.el.select(".axis-unit")||this.el.append("g").attr({"class":"axis-unit"}),n=this.el.selectAll(".tick:nth-last-child(3)"),s=n.select("text");"Left"===t.orient||"Right"===t.orient?e.attr("transform","translate(0,"+-1.5*parseInt(s.style("font-size"))+")"):e.attr("transform","translate("+((t.innerWidth||i.innerWidth)+3*parseInt(s.style("font-size")))+", 0)");var a=e.select("text")[0][0]&&e.select("text")||e.append("text");a.attr({dy:s.attr("dy"),x:s.attr("x"),y:s.attr("y"),transform:s.attr("transform")}).text(t.label).style({"text-anchor":s.style("text-anchor"),"font-size":s.style("font-size"),"font-weight":s.style("font-weight"),fill:s.style("fill")})}},calLeft:function(){var t=this.options,i=this.alloptions,e=this.x=this["axis"+t.type].call(this,[t.innerHeight||i.innerHeight,0]),n=this.axisx=d3.svg.axis().scale(e).orient("left");this.format(),this._afterAxis(),-1!==this.el.attr("class").indexOf("axis")?this.el.call(n):this.el=this.el.append("g").attr("class","axis").call(n),this.net=this.el.selectAll(".tick"+("Category"!==t.type&&1!==t.ticks?":not(:first-child)":"")).append("line").attr({"class":"net-line",x2:t.innerWidth||i.innerWidth,y2:"0"}).style({"stroke-dasharray":"2 2",stroke:t.netColor})},updateLeft:function(){var t=this.options,i=this.alloptions;this["updateAxis"+t.type].call(this,[t.innerHeight||i.innerHeight,0]),this.format(),this._afterAxis(),this.el.call(this.axisx),this.net=this.el.selectAll(".tick"+("Category"!==t.type&&1!==t.ticks?":not(:first-child)":"")).append("line").attr({"class":"net-line",x2:t.innerWidth||i.innerWidth,y2:"0"}).style({"stroke-dasharray":"2 2",stroke:t.netColor})},calRight:function(){var t=this.options,i=this.alloptions,e=this.x=this["axis"+t.type].call(this,[t.innerHeight||i.innerHeight,0]),n=this.axisx=d3.svg.axis().scale(e).orient("right");this.format(),this._afterAxis(),-1!==this.el.attr("class").indexOf("axis")?this.el.attr({transform:"translate("+(t.innerWidth||i.innerWidth)+", 0)"}).call(n):this.el=this.el.append("g").attr({"class":"axis",transform:"translate("+(t.innerWidth||i.innerWidth)+", 0)"}).call(n),this.net=this.el.selectAll(".tick"+("Category"!==t.type&&1!==t.ticks?":not(:first-child)":"")).append("line").attr({"class":"net-line",x2:-t.innerWidth||-i.innerWidth,y2:"0"}).style({"stroke-dasharray":"2 2",stroke:t.netColor})},updateRight:function(){var t=this.options,i=this.alloptions;this["updateAxis"+t.type].call(this,[t.innerHeight||i.innerHeight,0]),this.format(),this._afterAxis(),this.el.attr({transform:"translate("+(t.innerWidth||i.innerWidth)+", 0)"}).call(this.axisx),this.net=this.el.selectAll(".tick"+("Category"!==t.type&&1!==t.ticks?":not(:first-child)":"")).append("line").attr({"class":"net-line",x2:-t.innerWidth||-i.innerWidth,y2:"0"}).style({stroke:t.netColor})},calTop:function(){var t=this.options,i=this.alloptions,e=this.x=this["axis"+t.type].call(this,[0,t.innerWidth||i.innerWidth]),n=this.axisx=d3.svg.axis().scale(e).orient("top");this.format(),this._afterAxis(),-1!==this.el.attr("class").indexOf("axis")?this.el.call(n):this.el=this.el.append("g").attr("class","axis").call(n),this.net=this.el.selectAll(".tick"+("Category"!==t.type&&1!==t.ticks?":not(:first-child)":"")).append("line").attr({"class":"net-line",y2:t.innerHeight||i.innerHeight,x2:"0"}).style({"stroke-dasharray":"2 2",stroke:t.netColor})},updateTop:function(){var t=this.options,i=this.alloptions;this["updateAxis"+t.type].call(this,[0,t.innerWidth||i.innerWidth]),this.format(),this._afterAxis(),this.el.call(this.axisx),this.net=this.el.selectAll(".tick"+("Category"!==t.type&&1!==t.ticks?":not(:first-child)":"")).append("line").attr({"class":"net-line",y2:t.innerHeight||i.innerHeight,x2:"0"}).style({"stroke-dasharray":"2 2",stroke:t.netColor})},calBottom:function(){var t=this.options,i=this.alloptions,e=this.x=this["axis"+t.type].call(this,[0,t.innerWidth||i.innerWidth]),n=this.axisx=d3.svg.axis().scale(e).orient("bottom");this.format(),this._afterAxis(),-1!==this.el.attr("class").indexOf("axis")?this.el.attr({transform:"translate(0,"+(t.innerHeight||i.innerHeight)+")"}).call(n):this.el=this.el.append("g").attr({"class":"axis",transform:"translate(0,"+(t.innerHeight||i.innerHeight)+")"}).call(n),this.net=this.el.selectAll(".tick"+("Category"!==t.type&&1!==t.ticks?":not(:first-child)":"")).append("line").attr({"class":"net-line",y2:-t.innerHeight||-i.innerHeight,x2:"0"}).style({"stroke-dasharray":"2 2",stroke:t.netColor})},updateBottom:function(){var t=this.options,i=this.alloptions;this["updateAxis"+t.type].call(this,[0,t.innerWidth||i.innerWidth]),this.format(),this._afterAxis(),this.el.attr("transform","translate(0,"+(t.innerHeight||i.innerHeight)+")").call(this.axisx),this.net=this.el.selectAll(".tick"+("Category"!==t.type&&1!==t.ticks?":not(:first-child)":"")).append("line").attr({"class":"net-line",y2:-t.innerHeight||-i.innerHeight,x2:"0"}).style({"stroke-dasharray":"2 2",stroke:t.netColor})},niceExtent:function(t,i){var e=this.options,n=Math.abs(i[1]-i[0]);1>=t&&(t=2);var s=numberUtil.nice(n/t,!0),a=numberUtil.getPrecisionSafe(s)+2,r=[e.minNeedNice?numberUtil.round(Math.floor(i[0]/s)*s,a):i[0],e.maxNeedNice?numberUtil.round(Math.ceil(i[1]/s)*s,a):i[1]];return r[0]>r[1]&&_.reverse(r),r},axisDefaults:function(t){var i=this.x=d3.scale.linear().range(t),e=this.calExtent(),n=this.options,s=this.niceExtent(n.ticks,e);return i.domain(s),i},updateAxisDefaults:function(t){this.x.range(t);var i=this.calExtent(),e=this.options,n=this.niceExtent(e.ticks,i);return this.x.domain(n),this.x},axisCategory:function(t){var i,e=this.options;i=this.x=_.isArray(e.padding)?d3.scale.ordinal().rangeBands(t,e.padding[0],e.padding[1]):d3.scale.ordinal().rangeBands(t,e.padding/2,e.padding);var n=this.calExtent();return i.domain(n),i},updateAxisCategory:function(t){var i=this.options;return _.isArray(i.padding)?this.x.rangeBands(t,i.padding[0],i.padding[1]):this.x.rangeBands(t,i.padding/2,i.padding),this.x.domain(this.calExtent()),this.x},axisTime:function(t){var i,e=this.options,n=this.x=d3.time.scale().range(t),s=d3.time.format(e.format);return _.isDate(e.min)&&_.isDate(e.max)?i=[e.min,e.max]:e.min&&e.max?i=[s.parse(e.min),s.parse(e.max)]:(i=d3.extent(_.map(this._data,function(t){return"string"==typeof t[e.key]?s.parse(t[e.key]):"object"==typeof t[e.key]?t[e.key]:void console.log("date error: "+t[e.key]+"is not a Date")})),e.min&&(i[0]=_.isDate(e.min)?e.min:s.parse(e.min)),e.max&&(i[1]=_.isDate(e.max)?e.max:s.parse(e.max))),n.domain(i),n},updateAxisTime:function(t){var i=this.options;this.x.range(t);var e,n=d3.time.format(i.format);return _.isDate(i.min)&&_.isDate(i.max)?e=[i.min,i.max]:i.min&&i.max?e=[n.parse(i.min),n.parse(i.max)]:(e=d3.extent(_.map(this._data,function(t){return"string"==typeof t[i.key]?n.parse(t[i.key]):"object"==typeof t[i.key]?t[i.key]:void console.log("date error: "+t[i.key]+"is not a Date")})),i.min&&(e[0]=_.isDate(i.min)?i.min:n.parse(i.min)),i.max&&(e[1]=_.isDate(i.max)?i.max:n.parse(i.max))),this.x.domain(e),this.x},axisNondecile:function(t){var i=this.options,e=this.x=d3.scale.linear().range(t);i.max=_.sum(this._data,i.nondecile.key),e.domain(this.calExtent());var n=_.groupBy(this._data,i.key),s=this._data=[],a=0,r=s.length,o=(t[1]-t[0])/(e.domain()[1]-e.domain()[0]);for(var l in n){var h={sum:_.sum(n[l],i.nondecile.key),begin:a,end:0,center:0,radio:0};r--,h[i.key]=l,h.end=h.begin+h.sum,a+=h.sum,h.center=(h.begin+h.end)/2,i.nondecile.tickPadding&&0!==h.begin&&(h.begin=(e(h.begin)-i.nondecile.tickPadding/2-t[0])/o+e.domain()[0]),i.nondecile.tickPadding&&0!==r&&(h.end=(e(h.end)+i.nondecile.tickPadding/2-t[0])/o+e.domain()[0]),h.radio=(h.end-h.begin)/h.sum,s.push(h)}return i._afterAxis=function(){this.axisx.tickValues(_.pluck(this._data,"center"))},i.afterRender=function(){this.el.selectAll(".tick").data(this._data)},e},updateAxisNondecile:function(t){var i=this.options,e=this.x.range(t);i.max=_.sum(this._data,i.nondecile.key),e.domain(this.calExtent());var n=_.groupBy(this._data,i.key),s=this._data=[],a=0,r=s.length,o=(t[1]-t[0])/(e.domain()[1]-e.domain()[0]);for(var l in n){var h={sum:_.sum(n[l],i.nondecile.key),begin:a,end:0,center:0,radio:0};r--,h[i.key]=l,h.end=h.begin+h.sum,a+=h.sum,h.center=(h.begin+h.end)/2,i.nondecile.tickPadding&&0!==h.begin&&(h.begin=(e(h.begin)-i.nondecile.tickPadding/2-t[0])/o+e.domain()[0]),i.nondecile.tickPadding&&0!==r&&(h.end=(e(h.end)+i.nondecile.tickPadding/2-t[0])/o+e.domain()[0]),h.radio=(h.end-h.begin)/h.sum,s.push(h)}return e.domain(this.calExtent()),i._afterAxis=function(){this.axisx.tickValues(_.pluck(this._data,"center")),this.el&&this.el.selectAll(".tick").data(_.pluck(this._data,"center"))},e},calExtent:function(){var t=this.options,i=[];if("category"!==t.type.toLocaleLowerCase()){var e=[];this._data.forEach(function(i){var n=i[t.key];_.isArray(n)?("defaults"===t.type.toLocaleLowerCase()&&(n=_.map(n,function(t){return _.toNumber(t)})),e=_.union(e,n)):("defaults"===t.type.toLocaleLowerCase()&&(n=_.toNumber(n)),e.push(n))}),i=d3.extent(e),i[0]=t.min||i[0],i[1]=t.max||i[1]}else i=_.map(this._data,function(i){return i[t.key]});return i},getX:function(){return this.x},getAxisX:function(){return this.axisx},getMin:function(){return _.first(this.x.domain())},getMax:function(){return _.last(this.x.domain())},calGroupStep:function(t){var i=this.options,e=i.groupPadding;return this.groupX=Array.isArray(e)?d3.scale.ordinal().rangeBands([0,this.x.rangeBand()],_.isNumber(e[0])?e[0]:.4,_.isNumber(e[1])?e[1]:0):d3.scale.ordinal().rangeBands([0,this.x.rangeBand()],_.isNumber(e)?e:.4),Array.isArray(t)||(t=this._createCategory(parseInt(t))),this.groupX.domain(t),this.groupX},getGroupStep:function(t){return this.groupX?this.groupX.rangeBand():(this.calGroupStep(t),this.groupX.rangeBand())},_createCategory:function(t){for(var i=[],e=0;t>e;e++)i.push(""+e);return i},getGroupX:function(){return this.groupX},updateSeries:function(){var t=this.options;this.el.selectAll(".net-line").remove(),this.isReset&&this["cal"+t.orient]()||this["update"+t.orient](),this.renderStyle(),this.renderLabel(),"function"==typeof t.afterRender&&t.afterRender.call(this),this.el.selectAll(".net-line").style("display",!t.net&&"none"||"block"),this.isReset=!1},renderStyle:function(){var t=this.options,i=this.el.selectAll(".tick text").style({fill:t.fontColor,"font-size":t.fontSize,"font-weight":t.fontWeight,"stroke-width":0,display:t.textShow&&"block"||"none"});t.fontStrokeWidth&&i.style({stroke:t.fontColor,"stroke-width":t.fontStrokeWidth}),t.rotate&&_.isNumber(t.rotate)?i.each(function(){var i=d3.select(this),e=_.toNumber(i.attr("x")),n=_.toNumber(i.attr("y")),s=t.rotate/360*2*Math.PI;i.attr("transform",(("Top"===t.orient||"Bottom"===t.orient)&&"translate(0 "+.5*Math.sin(s)*t.fontSize*("Bottom"===t.orient&&.01||-1.99)+")"||"")+" rotate("+t.rotate+" "+e+" "+n+")").style({"text-anchor":"start"})}):i.attr("transform",""),this.el.selectAll(".domain, .tick line:not(.net-line)").style({display:t.assistLine&&"block"||"none",fill:"none",stroke:t.assistLineColor}),this.el.style("display",t.show&&"block"||"none")}}),module.exports=Axis;

package.json

 {
   "name": "dchart-core",
-  "version": "2.3.37",
+  "version": "2.4.0",
   "description": "",
@@ -5,0 +5,0 @@ "scripts": {

scatterplot/bubble.js

@@ -1,1 +0,1 @@
-"use strict";function Bubble(e,r){var t={margin:{top:30},xaxis:{orient:"bottom"},yaxis:{key:"y"},raxis:{key:"r",type:"defaults",orient:"bottom",min:0,show:!1,likey:!1},series:[]};t=_.deepMerge(t,r),DataV.call(this,e,t)}var DataV=require("../datav"),d3=require("d3"),_=require("../util");Bubble=DataV.extend(Bubble,{data:function(e){if(!e)return this._data;var r=this.options,t=r.yaxis.key,i=r.raxis.key;e.forEach(function(e){_.isArray(e[t])||(e[t]=[e[t]]),e[i]||(e[i]=[]),_.isArray(e[i])||(e[i]=[e[i]]),e[t]=_.map(e[t],function(r,t){return"string"==typeof r&&(r=_.toNumber(r)),e[i][t]=e[i][t],r})}),this._data=e},renderSeries:function(){this.svg.classed("scatterplot-chart-g",!0);var e,r=this.options,t=this.data(),i=r.xaxis.key,s=r.yaxis.key,a=r.raxis.key,n=this.getComs("axis","xaxis"),o=n.getX(),c=this.getComs("axis","yaxis"),l=c.getX(),u=_.maxBy(t,function(e){return e[s].length})[s].length;if(r.raxis.innerWidth=o.rangeBand?o.rangeBand()/2:r.innerWidth/t.length/2,r.isFirst)e=this.renderAxis("raxis",this.svg[0][0],r.raxis).getX(),this.svg.select("#raxis").style("display","none");else{var d=this.getComs("axis","raxis");d.update(t,r.raxis),e=d.getX()}for(var f=function(t,u,d){var f=d3.select(this);_.isNumber(t[s][d])?r.withAnimated?f.transition().duration(r.animatedTiming).ease(r.animatedEasing).attr({cx:function(){return"time"===r.xaxis.type&&"string"==typeof t[i]?o(d3.time.format(n.options.format).parse(t[i]))+(o.rangeBand?o.rangeBand()/2:0):o(t[i])+(o.rangeBand?o.rangeBand()/2:0)},cy:function(){return l(t[s][d])},r:function(){return r.raxis.likey?l(c.getMin())-l(t[a][d]):t[a]&&t[a][d]&&e(t[a][d])||2}}):f.attr({cx:function(){return o("time"===r.xaxis.type?d3.time.format(n.options.format).parse(t[i]):t[i])+("category"===r.xaxis.type?o.rangeBand()/2:0)},cy:function(){return l(t[s][d])},r:function(){return r.raxis.likey?l(c.getMin())-l(t[a][d]):t[a]&&t[a][d]&&e(t[a][d])||2}}):f.attr({cx:function(){return o("time"===r.xaxis.type?d3.time.format(n.options.format).parse(t[i]):t[i])+("category"===r.xaxis.type?o.rangeBand()/2:0)},cy:function(){return l(c.getMin())},r:0}),f.style({fill:function(){return r.series[d]&&r.series[d].color&&r.series[d].color.res||r.color&&r.color.res},stroke:function(){return r.series[d]&&r.series[d].frameColor&&r.series[d].frameColor.res||r.frameColor&&r.frameColor.res},"stroke-width":function(){return r.series[d]&&r.series[d].frameColorWidth||r.frameColorWidth}})},g=this.series.selectAll(".series-group").data(t),x=0;u>x;x++)g.each(function(e,t){var a=d3.select(this),u=a.select(".serie"+(x+1))[0][0]||a.append("circle").attr({"class":"serie serie"+(x+1),cx:function(e){return"time"===r.xaxis.type&&"string"==typeof e[i]?o(d3.time.format(n.options.format).parse(e[i]))+(o.rangeBand?o.rangeBand()/2:0):o(e[i])+(o.rangeBand?o.rangeBand()/2:0)},cy:function(e){return l(e[s][x]||c.getMin())},r:0})[0][0];u&&f.call(u,e,t,x)});this.enterSeries=g.enter().append("g").attr("class","series-group");for(var x=0;u>x;x++)this.enterSeries.append("circle").attr({"class":"serie serie"+(x+1),cx:function(e){return"time"===r.xaxis.type&&"string"==typeof e[i]?o(d3.time.format(n.options.format).parse(e[i]))+(o.rangeBand?o.rangeBand()/2:0):o(e[i])+(o.rangeBand?o.rangeBand()/2:0)},cy:function(e){return l(e[s][x]||c.getMin())},r:0}).each(function(e,r){f.call(this,e,r,x)});g.selectAll(".serie.serie"+u+" ~ .serie").remove(),this.outerSeries=g.exit().remove()},updateBeforeRender:function(){Bubble.prototype.beforeRender.call(this)},beforeRender:function(){var e=this.options,r=this;this.dealColor(e,"color"),this.dealColor(e,"frameColor"),e.series&&e.series.length&&e.series.forEach(function(t,i){t.color&&r.dealColor(e,"series["+i+"].color"),t.frameColor&&r.dealColor(e,"series["+i+"].frameColor")})},updateSeries:function(){Bubble.prototype.renderSeries.call(this)}}),module.exports=Bubble;
+"use strict";function Bubble(e,r){var t={margin:{top:30},xaxis:{orient:"bottom"},yaxis:{key:"y"},raxis:{key:"r",type:"defaults",orient:"bottom",min:0,show:!1,likey:!1},series:[]};t=_.deepMerge(t,r),DataV.call(this,e,t)}var DataV=require("../datav"),d3=require("d3"),_=require("../util");Bubble=DataV.extend(Bubble,{data:function(e){if(!e)return this._data;var r=this.options,t=r.yaxis.key,i=r.raxis.key;e.forEach(function(e){_.isArray(e[t])||(e[t]=[e[t]]),e[i]||(e[i]=[]),_.isArray(e[i])||(e[i]=[e[i]]),e[t]=_.map(e[t],function(r,t){return"string"==typeof r&&(r=_.toNumber(r)),e[i][t]=e[i][t],r})}),this._data=e},renderSeries:function(){this.svg.classed("scatterplot-chart-g",!0);var e,r=this.options,t=this.data(),i=r.xaxis.key,s=r.yaxis.key,a=r.raxis.key,n=this.getComs("axis","xaxis"),o=n.getX(),c=this.getComs("axis","yaxis"),l=c.getX(),u=_.maxBy(t,function(e){return e[s].length})[s].length;if(r.raxis.innerWidth=o.rangeBand?o.rangeBand()/2:r.innerWidth/t.length/2,r.isFirst)e=this.renderAxis("raxis",this.svg[0][0],r.raxis).getX(),this.svg.select("#raxis").style("display","none");else{var d=this.getComs("axis","raxis");d.update(t,r.raxis),e=d.getX()}for(var f=function(t,u,d){var f=d3.select(this);_.isNumber(t[s][d])?r.withAnimated?f.transition().duration(r.animatedTiming).ease(r.animatedEasing).attr({cx:function(){return"time"===r.xaxis.type&&"string"==typeof t[i]?o(d3.time.format(n.options.format).parse(t[i]))+(o.rangeBand?o.rangeBand()/2:0):o(t[i])+(o.rangeBand?o.rangeBand()/2:0)},cy:function(){return l(t[s][d])},r:function(){return r.raxis.likey?l(c.getMin())-l(t[a][d]):t[a]&&t[a][d]&&e(t[a][d])||2}}):f.attr({cx:function(){return o("time"===r.xaxis.type?d3.time.format(n.options.format).parse(t[i]):t[i])+("category"===r.xaxis.type?o.rangeBand()/2:0)},cy:function(){return l(t[s][d])},r:function(){return r.raxis.likey?Math.max(l(c.getMin())-l(t[a][d]),2):t[a]&&t[a][d]&&e(t[a][d])||2}}):f.attr({cx:function(){return o("time"===r.xaxis.type?d3.time.format(n.options.format).parse(t[i]):t[i])+("category"===r.xaxis.type?o.rangeBand()/2:0)},cy:function(){return l(c.getMin())},r:0}),f.style({fill:function(){return r.series[d]&&r.series[d].color&&r.series[d].color.res||r.color&&r.color.res},stroke:function(){return r.series[d]&&r.series[d].frameColor&&r.series[d].frameColor.res||r.frameColor&&r.frameColor.res},"stroke-width":function(){return r.series[d]&&r.series[d].frameColorWidth||r.frameColorWidth}})},g=this.series.selectAll(".series-group").data(t),x=0;u>x;x++)g.each(function(e,t){var a=d3.select(this),u=a.select(".serie"+(x+1))[0][0]||a.append("circle").attr({"class":"serie serie"+(x+1),cx:function(e){return"time"===r.xaxis.type&&"string"==typeof e[i]?o(d3.time.format(n.options.format).parse(e[i]))+(o.rangeBand?o.rangeBand()/2:0):o(e[i])+(o.rangeBand?o.rangeBand()/2:0)},cy:function(e){return l(e[s][x]||c.getMin())},r:0})[0][0];u&&f.call(u,e,t,x)});this.enterSeries=g.enter().append("g").attr("class","series-group");for(var x=0;u>x;x++)this.enterSeries.append("circle").attr({"class":"serie serie"+(x+1),cx:function(e){return"time"===r.xaxis.type&&"string"==typeof e[i]?o(d3.time.format(n.options.format).parse(e[i]))+(o.rangeBand?o.rangeBand()/2:0):o(e[i])+(o.rangeBand?o.rangeBand()/2:0)},cy:function(e){return l(e[s][x]||c.getMin())},r:0}).each(function(e,r){f.call(this,e,r,x)});g.selectAll(".serie.serie"+u+" ~ .serie").remove(),this.outerSeries=g.exit().remove()},updateBeforeRender:function(){Bubble.prototype.beforeRender.call(this)},beforeRender:function(){var e=this.options,r=this;this.dealColor(e,"color"),this.dealColor(e,"frameColor"),e.series&&e.series.length&&e.series.forEach(function(t,i){t.color&&r.dealColor(e,"series["+i+"].color"),t.frameColor&&r.dealColor(e,"series["+i+"].frameColor")})},updateSeries:function(){Bubble.prototype.renderSeries.call(this)}}),module.exports=Bubble;

New alerts

Major refactor

Supply chain risk

Package has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.

Found 1 instance in 1 package

Improved metrics

Number of package files

53

increased by1.92%

Worsened metrics

Total package byte prevSize

134276

decreased by-1.03%

Number of medium supply chain risk alerts

2

increased by100%

No dependency changes