dchart-core - npm Package Compare versions

Comparing version 1.0.49 to 1.0.50

bar/barCustom.js

@@ -1,1 +0,1 @@
-function BarCustom(t,a){var s={margin:{top:20,right:20,bottom:20,left:20},xaxis:{orient:"bottom",type:"category"}};_.deepMerge(s,a),DataV.call(this,t,s)}var DataV=require("../datav"),d3=require("d3"),_=require("../util");BarCustom=DataV.extend(BarCustom,{renderSeries:function(){this.series.classed("bar-chart-g",!0);var t,a,s=this.options,e=this.data(),i=this;t=this.getComs("axis","xaxis"),a=this.getComs("axis","yaxis");var n=t.getX(),o=a.getX(),r=s.yaxis.key,c=s.xaxis.key;this.series=this.series.selectAll(".serie").data(e).enter().append("path").each(function(t,e){var u=d3.select(this);s.withAnimated?u.attr({"class":"serie",d:function(t){var r=[{x:n(t[c]),y:o(a.getMin())},{x:n(t[c]),y:o(a.getMin())},{x:n(t[c])+n.rangeBand(),y:o(a.getMin())},{x:n(t[c])+n.rangeBand(),y:o(a.getMin())}];return"function"==typeof s.customPos?(r=s.customPos.call(i,r,e),_.pos2Path(r)):"function"==typeof s.customPath?s.customPath.call(i,r,e):_.pos2Path(r)}}).transition().duration(s.animatedTiming).ease(s.animatedEasing).attr({"class":"serie",d:function(t){var u=[{x:n(t[c]),y:o(a.getMin())},{x:n(t[c]),y:o(t[r])},{x:n(t[c])+n.rangeBand(),y:o(t[r])},{x:n(t[c])+n.rangeBand(),y:o(a.getMin())}];return"function"==typeof s.customPos?(u=s.customPos.call(i,u,e),_.pos2Path(u)):"function"==typeof s.customPath?s.customPath.call(i,u,e):_.pos2Path(u)}}):u.attr({"class":"serie",d:function(t){var u=[{x:n(t[c]),y:o(a.getMin())},{x:n(t[c]),y:o(t[r])},{x:n(t[c])+n.rangeBand(),y:o(t[r])},{x:n(t[c])+n.rangeBand(),y:o(a.getMin())}];return"function"==typeof s.customPos?(u=s.customPos.call(i,u,e),_.pos2Path(u)):"function"==typeof s.customPath?s.customPath.call(i,u,e):_.pos2Path(u)}})})},updateSeries:function(){var t=this.options,a=this.data(),s=this,e=this.getComs("axis","xaxis"),i=this.getComs("axis","yaxis"),n=e.getX(),o=i.getX(),r=t.yaxis.key,c=t.xaxis.key;this.series.data(a),this.series.each(function(a,e){var u=d3.select(this);u.attr({d:function(a){var u=[{x:n(a[c]),y:o(i.getMin())},{x:n(a[c]),y:o(a[r])},{x:n(a[c])+n.rangeBand(),y:o(a[r])},{x:n(a[c])+n.rangeBand(),y:o(i.getMin())}];return"function"==typeof t.customPos?(u=t.customPos.call(s,u,e),_.pos2Path(u)):"function"==typeof t.customPath?t.customPath.call(s,u,e):_.pos2Path(u)}})})}}),module.exports=BarCustom;
+function BarCustom(t,a){var s={margin:{top:20,right:20,bottom:20,left:20},xaxis:{orient:"bottom",type:"category"},yaxis:{}};_.deepMerge(s,a),DataV.call(this,t,s)}var DataV=require("../datav"),d3=require("d3"),_=require("../util");BarCustom=DataV.extend(BarCustom,{renderSeries:function(){this.series.classed("bar-chart-g",!0);var t,a,s=this.options,e=this.data(),i=this;t=this.getComs("axis","xaxis"),a=this.getComs("axis","yaxis");var n=t.getX(),o=a.getX(),r=s.yaxis.key,c=s.xaxis.key;this.series=this.series.selectAll(".serie").data(e).enter().append("path").each(function(t,e){var u=d3.select(this);s.withAnimated?u.attr({"class":"serie",d:function(t){var r=[{x:n(t[c]),y:o(a.getMin())},{x:n(t[c]),y:o(a.getMin())},{x:n(t[c])+n.rangeBand(),y:o(a.getMin())},{x:n(t[c])+n.rangeBand(),y:o(a.getMin())}];return"function"==typeof s.customPos?(r=s.customPos.call(i,r,e),_.pos2Path(r)):"function"==typeof s.customPath?s.customPath.call(i,r,e):_.pos2Path(r)}}).transition().duration(s.animatedTiming).ease(s.animatedEasing).attr({"class":"serie",d:function(t){var u=[{x:n(t[c]),y:o(a.getMin())},{x:n(t[c]),y:o(t[r])},{x:n(t[c])+n.rangeBand(),y:o(t[r])},{x:n(t[c])+n.rangeBand(),y:o(a.getMin())}];return"function"==typeof s.customPos?(u=s.customPos.call(i,u,e),_.pos2Path(u)):"function"==typeof s.customPath?s.customPath.call(i,u,e):_.pos2Path(u)}}):u.attr({"class":"serie",d:function(t){var u=[{x:n(t[c]),y:o(a.getMin())},{x:n(t[c]),y:o(t[r])},{x:n(t[c])+n.rangeBand(),y:o(t[r])},{x:n(t[c])+n.rangeBand(),y:o(a.getMin())}];return"function"==typeof s.customPos?(u=s.customPos.call(i,u,e),_.pos2Path(u)):"function"==typeof s.customPath?s.customPath.call(i,u,e):_.pos2Path(u)}})})},updateSeries:function(){var t=this.options,a=this.data(),s=this,e=this.getComs("axis","xaxis"),i=this.getComs("axis","yaxis"),n=e.getX(),o=i.getX(),r=t.yaxis.key,c=t.xaxis.key;this.series.data(a),this.series.each(function(a,e){var u=d3.select(this);u.attr({d:function(a){var u=[{x:n(a[c]),y:o(i.getMin())},{x:n(a[c]),y:o(a[r])},{x:n(a[c])+n.rangeBand(),y:o(a[r])},{x:n(a[c])+n.rangeBand(),y:o(i.getMin())}];return"function"==typeof t.customPos?(u=t.customPos.call(s,u,e),_.pos2Path(u)):"function"==typeof t.customPath?t.customPath.call(s,u,e):_.pos2Path(u)}})})}}),module.exports=BarCustom;

bar/barMatrix.js

@@ -1,1 +0,1 @@
-function BarMatrix(e,t){var i={xaxis:{type:"category",orient:"bottom"},yaxis:{min:0},matrixHeight:10};_.deepMerge(i,t),DataV.call(this,e,i)}var DataV=require("../datav"),d3=require("d3"),_=require("../util");BarMatrix=DataV.extend(BarMatrix,{beforeRender:function(){var e=this.options,t=this.data(),i=(e.xaxis.key,e.yaxis.key),r=[];t.forEach(function(e){r=_.union(r,e[i])});var a=_.max(r);e.yaxis.max=e.yaxis.max||a},renderSeries:function(){this.series.classed("bar-chart-g",!0);var e,t,i=this.options,r=this.data();e=this.getComs("axis","xaxis"),t=this.getComs("axis","yaxis");var a=e.getX(),n=t.getX(),s=r[0][ykey].length,x=r.length;this.series=this.series.selectAll(".series-group").data(r).enter().append("g").attr("class","series-group").each(function(t,o){var u=d3.select(this);if(i.withAnimated)for(var c=0;s>c;c++)!function(t){u.append("rect").attr({"class":"serie serie"+(t+1),x:function(e){return a(e[xkey])},y:function(e){return n(e[ykey][t])},width:function(t){return"category"===i.xaxis.type?a.rangeBand():o+1>=x?a(e.getMax())-a(t[xkey]):a(r[o+1][xkey])-a(t[xkey])},height:0}).transition().duration(i.animatedTiming).ease(i.animatedEasing).attr({x:function(e){return a(e[xkey])},y:function(e){return n(e[ykey][t])},width:function(t){return"category"===i.xaxis.type?a.rangeBand():o+1>=x?a(e.getMax())-a(t[xkey]):a(r[o+1][xkey])-a(t[xkey])},height:function(){return i.matrixHeight}})}(c);else for(var c=0;s>c;c++)u.append("rect").attr({"class":"serie serie"+(c+1),x:function(e){return a(e[xkey])},y:function(e){return n(e[ykey][c])},width:function(t){return"category"===i.xaxis.type?a.rangeBand():o+1>=x?a(e.getMax())-a(t[xkey]):a(r[o+1][xkey])-a(t[xkey])},height:function(){return i.matrixHeight}})})},updateBeforeRender:function(){this.beforeRender()},updateSeries:function(){var e=this.options,t=this.data(),i=this.getComs("axis","xaxis"),r=this.getComs("axis","yaxis"),a=i.getX(),n=r.getX(),s=e.xaxis.key,x=e.yaxis.key;this.series.data(t),this.series.each(function(){for(var t=d3.select(this),i=0;i<len;i++)t.select(".serie"+(i+1)).attr({x:function(e){return a(e[s])},y:function(e){return n(e[x][i])},width:function(){return 10},height:function(){return e.matrixHeight}})})}}),module.exports=BarMatrix;
+function BarMatrix(t,e){var i={xaxis:{type:"category",orient:"bottom"},yaxis:{min:0},matrixHeight:10};_.deepMerge(i,e),DataV.call(this,t,i)}var DataV=require("../datav"),d3=require("d3"),_=require("../util");BarMatrix=DataV.extend(BarMatrix,{beforeRender:function(){var t=this.options,e=this.data(),i=(t.xaxis.key,t.yaxis.key),r=[];e.forEach(function(t){r=_.union(r,t[i])});var a=_.max(r);t.yaxis.max=t.yaxis.max||a},renderSeries:function(){this.series.classed("bar-chart-g",!0);var t,e,i=this.options,r=this.data();t=this.getComs("axis","xaxis"),e=this.getComs("axis","yaxis");var a=t.getX(),n=e.getX(),s=i.yaxis.key,o=i.xaxis.key,u=r[0][s].length,x=r.length;this.series=this.series.selectAll(".series-group").data(r).enter().append("g").attr("class","series-group").each(function(e,c){var h=d3.select(this);if(i.withAnimated)for(var g=0;u>g;g++)!function(e){h.append("rect").attr({"class":"serie serie"+(e+1),x:function(t){return a(t[o])},y:function(t){return n(t[s][e])},width:function(e){return"category"===i.xaxis.type?a.rangeBand():c+1>=x?a(t.getMax())-a(e[o]):a(r[c+1][o])-a(e[o])},height:0}).transition().duration(i.animatedTiming).ease(i.animatedEasing).attr({x:function(t){return a(t[o])},y:function(t){return n(t[s][e])},width:function(e){return"category"===i.xaxis.type?a.rangeBand():c+1>=x?a(t.getMax())-a(e[o]):a(r[c+1][o])-a(e[o])},height:function(){return i.matrixHeight}})}(g);else for(var g=0;u>g;g++)h.append("rect").attr({"class":"serie serie"+(g+1),x:function(t){return a(t[o])},y:function(t){return n(t[s][g])},width:function(e){return"category"===i.xaxis.type?a.rangeBand():c+1>=x?a(t.getMax())-a(e[o]):a(r[c+1][o])-a(e[o])},height:function(){return i.matrixHeight}})})},updateBeforeRender:function(){this.beforeRender()},updateSeries:function(){var t=this.options,e=this.data(),i=this.getComs("axis","xaxis"),r=this.getComs("axis","yaxis"),a=i.getX(),n=r.getX(),s=t.xaxis.key,o=t.yaxis.key;this.series.data(e),this.series.each(function(){for(var e=d3.select(this),i=0;i<len;i++)e.select(".serie"+(i+1)).attr({x:function(t){return a(t[s])},y:function(t){return n(t[o][i])},width:function(){return 10},height:function(){return t.matrixHeight}})})}}),module.exports=BarMatrix;

com/axis.js

@@ -1,1 +0,1 @@
-function Axis(i,t,e){this.reset(),this.options={key:"x",type:"defaults",orient:null,dy:0,padding:.3,groupPadding:null,min:0,max:null,tickSize:1,tickValues:null,tickFormat:null,nondecile:{key:"y",tickPadding:10},format:"%Y-%m-%d",label:null,labelInAxis:!0},this.x=null,this.axisx=null,this.init(i,t,e),this._valid()}var _=require("../util"),Com=require("./index"),d3=require("d3");Axis=Com.extend(Axis,{_valid:function(){var i=this.options,t=["defaults","category","time","nondecile"];-1===_.indexOf(t,i.type.toLowerCase())&&(this.msg="axis arguments error. there is no "+i.type+" in types.",i.type=t[0],this.valid=!1),i.type=_.initialUpperCase(i.type);var e=["left","top","right","bottom"];-1===_.indexOf(e,i.orient.toLowerCase())&&(this.msg="axis arguments error. there is no "+i.orient+" in orients.",i.orient=e[0],this.valid=!1),i.orient=_.initialUpperCase(i.orient)},renderSeries:function(){var i=this.options;this["cal"+i.orient](),this.renderLabel(),"function"==typeof i.afterRender&&i.afterRender.call(this)},format:function(){var i=this.options;if("function"==typeof i.format){var t=this;this.axisx.tickFormat(function(e,a){return i.format.call(t._data[a],e,a)})}},_afterAxis:function(){var i=this.options;"function"==typeof i._afterAxis&&i._afterAxis.call(this)},renderLabel:function(){var i=this.options;if(i.label&&i.labelInAxis){var t=this.el.selectAll(".tick")[0];d3.select(t[t.length-1]).select("text").text(i.label)}},calLeft:function(){var i=this.options,t=this.alloptions,e=this.x=this["axis"+i.type].call(this,[i.innerHeight||t.innerHeight,0]),a=this.axisx=d3.svg.axis().scale(e).orient("left").tickPadding(i.dy).tickFormat(i.tickFormat);"object"==typeof i.tickSize?a.tickSize.apply(this,i.tickSize):a.tickSize(i.tickSize),i.tickValues&&a.tickValues(i.tickValues),i.ticks&&a.ticks.apply(this,i.ticks),this.format(),this._afterAxis();this.el=this.el.append("g").attr("class","axis").call(a)},updateLeft:function(){var i=this.options,t=this.alloptions;this["updateAxis"+i.type].call(this,[i.innerHeight||t.innerHeight,0]),this._afterAxis(),t.withAnimated?this.el.transition().duration(t.animatedTiming).ease(t.animatedEasing).call(this.axisx):this.el.call(this.axisx)},calRight:function(){var i=this.options,t=this.alloptions,e=this.x=this["axis"+i.type].call(this,[i.innerHeight||t.innerHeight,0]),a=this.axisx=d3.svg.axis().scale(e).orient("right").tickPadding(i.dy).tickFormat(i.tickFormat);"object"==typeof i.tickSize?a.tickSize.apply(this,i.tickSize):a.tickSize(i.tickSize),i.tickValues&&a.tickValues(i.tickValues),i.ticks&&a.ticks.apply(this,i.ticks),this.format(),this._afterAxis();this.el=this.el.append("g").attr({"class":"axis",transform:"translate("+(i.innerWidth||t.innerWidth)+", 0)"}).call(a)},updateRight:function(){var i=this.options,t=this.alloptions;this["updateAxis"+i.type].call(this,[i.innerHeight||t.innerHeight,0]),this._afterAxis(),t.withAnimated?this.el.transition().duration(t.animatedTiming).ease(t.animatedEasing).attr({transform:"translate("+(i.innerWidth||t.innerWidth)+", 0)"}).call(this.axisx):this.el.attr({transform:"translate("+(i.innerWidth||t.innerWidth)+", 0)"}).call(this.axisx)},calTop:function(){var i=this.options,t=this.alloptions,e=this.x=this["axis"+i.type].call(this,[0,i.innerWidth||t.innerWidth]),a=this.axisx=d3.svg.axis().scale(e).orient("top").tickPadding(i.dy).tickFormat(i.tickFormat);"object"==typeof i.tickSize?a.tickSize.apply(this,i.tickSize):a.tickSize(i.tickSize),i.tickValues&&a.tickValues(i.tickValues),i.ticks&&a.ticks.apply(this,i.ticks),this.format(),this._afterAxis();this.el=this.el.append("g").attr("class","axis").call(a)},updateTop:function(){var i=this.options,t=this.alloptions;this["updateAxis"+i.type].call(this,[0,i.innerWidth||t.innerWidth]),this._afterAxis(),t.withAnimated?this.el.transition().duration(t.animatedTiming).ease(t.animatedEasing).call(this.axisx):this.el.call(this.axisx)},calBottom:function(){var i=this.options,t=this.alloptions,e=this.x=this["axis"+i.type].call(this,[0,i.innerWidth||t.innerWidth]),a=this.axisx=d3.svg.axis().scale(e).orient("bottom").tickPadding(i.dy).tickFormat(i.tickFormat);"object"==typeof i.tickSize?a.tickSize.apply(this,i.tickSize):a.tickSize(i.tickSize),i.tickValues&&a.tickValues(i.tickValues),i.ticks&&a.ticks.apply(this,i.ticks),this.format(),this._afterAxis();this.el=this.el.append("g").attr("class","axis").attr("transform","translate(0,"+(i.innerHeight||t.innerHeight)+")").call(a)},updateBottom:function(){var i=this.options,t=this.alloptions;this["updateAxis"+i.type].call(this,[0,i.innerWidth||t.innerWidth]),this._afterAxis(),t.withAnimated?this.el.transition().duration(t.animatedTiming).ease(t.animatedEasing).attr("transform","translate(0,"+(i.innerHeight||t.innerHeight)+")").call(this.axisx):this.el.attr("transform","translate(0,"+(i.innerHeight||t.innerHeight)+")").call(this.axisx)},axisDefaults:function(i){var t=this.x=d3.scale.linear().range(i),e=this.calExtent();return t.domain(e),t},updateAxisDefaults:function(i){return this.x.range(i),this.x.domain(this.calExtent()),this.x},axisCategory:function(i){var t,e=this.options;t=this.x=_.isArray(e.padding)?d3.scale.ordinal().rangeBands(i,e.padding[0],e.padding[1]):d3.scale.ordinal().rangeBands(i,e.padding/2,e.padding);var a=this.calExtent();return t.domain(a),t},updateAxisCategory:function(i){var t=this.options;return _.isArray(t.padding)?this.x.rangeBands(i,t.padding[0],t.padding[1]):this.x.rangeBands(i,t.padding/2,t.padding),this.x.domain(this.calExtent()),this.x},axisTime:function(i){var t,e=this.options,a=this.x=d3.time.scale().range(i);return t=_.isDate(e.min)&&_.isDate(e.max)?[e.min,e.max]:e.min&&e.max?[new Date(e.min),new Date(e.max)]:d3.extent(_.map(this._data,function(i){return"string"==typeof i[e.key]?d3.time.format(e.format).parse(i[e.key]):"object"==typeof i[e.key]?i[e.key]:(console.log("date error: "+i[e.key]+"is not a Date"),e.min&&(t[0]=_.isDate(e.min)?e.min:new Date(e.min)),void(e.max&&(t[1]=_.isDate(e.max)?e.max:new Date(e.max))))})),a.domain(t),a},updateAxisTime:function(i){var t,e=this.options,a=this.x=d3.time.scale().range(i);return t=_.isDate(e.min)&&_.isDate(e.max)?[e.min,e.max]:e.min&&e.max?[new Date(e.min),new Date(e.max)]:d3.extent(_.map(this._data,function(i){return"string"==typeof i[e.key]?d3.time.format(e.format).parse(i[e.key]):"object"==typeof i[e.key]?i[e.key]:void console.log("date error: "+i[e.key]+"is not a Date")})),a.domain(t),a},axisNondecile:function(i){var t=this.options,e=this.x=d3.scale.linear().range(i);t.max=_.sum(this._data,t.nondecile.key),e.domain(this.calExtent());var a=_.groupBy(this._data,t.key),n=this._data=[],s=0,r=n.length,o=(i[1]-i[0])/(e.domain()[1]-e.domain()[0]);for(var d in a){var l={sum:_.sum(a[d],t.nondecile.key),begin:s,end:0,center:0,radio:0};r--,l[t.key]=d,l.end=l.begin+l.sum,s+=l.sum,l.center=(l.begin+l.end)/2,t.nondecile.tickPadding&&0!==l.begin&&(l.begin=(e(l.begin)-t.nondecile.tickPadding/2-i[0])/o+e.domain()[0]),t.nondecile.tickPadding&&0!==r&&(l.end=(e(l.end)+t.nondecile.tickPadding/2-i[0])/o+e.domain()[0]),l.radio=(l.end-l.begin)/l.sum,n.push(l)}return t._afterAxis=function(){this.axisx.tickValues(_.pluck(this._data,"center"))},t.afterRender=function(){this.el.selectAll(".tick").data(this._data)},e},updateAxisNondecile:function(i){var t=this.options,e=this.x.range(i);t.max=_.sum(this._data,t.nondecile.key),e.domain(this.calExtent());var a=_.groupBy(this._data,t.key),n=this._data=[],s=0,r=n.length,o=(i[1]-i[0])/(e.domain()[1]-e.domain()[0]);for(var d in a){var l={sum:_.sum(a[d],t.nondecile.key),begin:s,end:0,center:0,radio:0};r--,l[t.key]=d,l.end=l.begin+l.sum,s+=l.sum,l.center=(l.begin+l.end)/2,t.nondecile.tickPadding&&0!==l.begin&&(l.begin=(e(l.begin)-t.nondecile.tickPadding/2-i[0])/o+e.domain()[0]),t.nondecile.tickPadding&&0!==r&&(l.end=(e(l.end)+t.nondecile.tickPadding/2-i[0])/o+e.domain()[0]),l.radio=(l.end-l.begin)/l.sum,n.push(l)}return e.domain(this.calExtent()),t._afterAxis=function(){this.axisx.tickValues(_.pluck(this._data,"center")),this.el&&this.el.selectAll(".tick").data(_.pluck(this._data,"center"))},e},calExtent:function(){var i=this.options,t=[];return _.isNumber(i.min)&&_.isNumber(i.max)?t=[i.min,i.max]:"category"!==i.type.toLocaleLowerCase()?(t=d3.extent(_.map(this._data,function(t){return t[i.key]})),_.isNumber(i.min)&&(t[0]=i.min),_.isNumber(i.max)&&(t[1]=i.max)):t=_.map(this._data,function(t){return t[i.key]}),t},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(i){var t=this.options,e=t.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(i)||(i=this._createCategory(parseInt(i))),this.groupX.domain(i),this.groupX},getGroupStep:function(i){return this.groupX?this.groupX.rangeBand():(this.calGroupStep(i),this.groupX.rangeBand())},_createCategory:function(i){for(var t=[],e=0;i>e;e++)t.push(""+e);return t},getGroupX:function(){return this.groupX||this.calGroupStep()},updateSeries:function(){var i=this.options;this["update"+i.orient](),this.renderLabel(),"function"==typeof i.afterRender&&i.afterRender.call(this)}}),module.exports=Axis;
+function Axis(i,t,e){this.reset(),this.options={key:"x",type:"defaults",orient:null,dy:0,padding:.3,groupPadding:null,min:0,max:null,tickSize:1,tickValues:null,tickFormat:null,nondecile:{key:"y",tickPadding:10},format:"%Y-%m-%d",label:null,labelInAxis:!0},this.x=null,this.axisx=null,this.groupX=null,this.init(i,t,e),this._valid()}var _=require("../util"),Com=require("./index"),d3=require("d3");Axis=Com.extend(Axis,{_valid:function(){var i=this.options,t=["defaults","category","time","nondecile"];-1===_.indexOf(t,i.type.toLowerCase())&&(this.msg="axis arguments error. there is no "+i.type+" in types.",i.type=t[0],this.valid=!1),i.type=_.initialUpperCase(i.type);var e=["left","top","right","bottom"];-1===_.indexOf(e,i.orient.toLowerCase())&&(this.msg="axis arguments error. there is no "+i.orient+" in orients.",i.orient=e[0],this.valid=!1),i.orient=_.initialUpperCase(i.orient)},renderSeries:function(){var i=this.options;this["cal"+i.orient](),this.renderLabel(),"function"==typeof i.afterRender&&i.afterRender.call(this)},format:function(){var i=this.options;if("function"==typeof i.format){var t=this;this.axisx.tickFormat(function(e,a){return i.format.call(t._data[a],e,a)})}},_afterAxis:function(){var i=this.options;"function"==typeof i._afterAxis&&i._afterAxis.call(this)},renderLabel:function(){var i=this.options;if(i.label&&i.labelInAxis){var t=this.el.selectAll(".tick")[0];d3.select(t[t.length-1]).select("text").text(i.label)}},calLeft:function(){var i=this.options,t=this.alloptions,e=this.x=this["axis"+i.type].call(this,[i.innerHeight||t.innerHeight,0]),a=this.axisx=d3.svg.axis().scale(e).orient("left").tickPadding(i.dy).tickFormat(i.tickFormat);"object"==typeof i.tickSize?a.tickSize.apply(this,i.tickSize):a.tickSize(i.tickSize),i.tickValues&&a.tickValues(i.tickValues),i.ticks&&a.ticks.apply(this,i.ticks),this.format(),this._afterAxis();this.el=this.el.append("g").attr("class","axis").call(a)},updateLeft:function(){var i=this.options,t=this.alloptions;this["updateAxis"+i.type].call(this,[i.innerHeight||t.innerHeight,0]),this._afterAxis(),t.withAnimated?this.el.transition().duration(t.animatedTiming).ease(t.animatedEasing).call(this.axisx):this.el.call(this.axisx)},calRight:function(){var i=this.options,t=this.alloptions,e=this.x=this["axis"+i.type].call(this,[i.innerHeight||t.innerHeight,0]),a=this.axisx=d3.svg.axis().scale(e).orient("right").tickPadding(i.dy).tickFormat(i.tickFormat);"object"==typeof i.tickSize?a.tickSize.apply(this,i.tickSize):a.tickSize(i.tickSize),i.tickValues&&a.tickValues(i.tickValues),i.ticks&&a.ticks.apply(this,i.ticks),this.format(),this._afterAxis();this.el=this.el.append("g").attr({"class":"axis",transform:"translate("+(i.innerWidth||t.innerWidth)+", 0)"}).call(a)},updateRight:function(){var i=this.options,t=this.alloptions;this["updateAxis"+i.type].call(this,[i.innerHeight||t.innerHeight,0]),this._afterAxis(),t.withAnimated?this.el.transition().duration(t.animatedTiming).ease(t.animatedEasing).attr({transform:"translate("+(i.innerWidth||t.innerWidth)+", 0)"}).call(this.axisx):this.el.attr({transform:"translate("+(i.innerWidth||t.innerWidth)+", 0)"}).call(this.axisx)},calTop:function(){var i=this.options,t=this.alloptions,e=this.x=this["axis"+i.type].call(this,[0,i.innerWidth||t.innerWidth]),a=this.axisx=d3.svg.axis().scale(e).orient("top").tickPadding(i.dy).tickFormat(i.tickFormat);"object"==typeof i.tickSize?a.tickSize.apply(this,i.tickSize):a.tickSize(i.tickSize),i.tickValues&&a.tickValues(i.tickValues),i.ticks&&a.ticks.apply(this,i.ticks),this.format(),this._afterAxis();this.el=this.el.append("g").attr("class","axis").call(a)},updateTop:function(){var i=this.options,t=this.alloptions;this["updateAxis"+i.type].call(this,[0,i.innerWidth||t.innerWidth]),this._afterAxis(),t.withAnimated?this.el.transition().duration(t.animatedTiming).ease(t.animatedEasing).call(this.axisx):this.el.call(this.axisx)},calBottom:function(){var i=this.options,t=this.alloptions,e=this.x=this["axis"+i.type].call(this,[0,i.innerWidth||t.innerWidth]),a=this.axisx=d3.svg.axis().scale(e).orient("bottom").tickPadding(i.dy).tickFormat(i.tickFormat);"object"==typeof i.tickSize?a.tickSize.apply(this,i.tickSize):a.tickSize(i.tickSize),i.tickValues&&a.tickValues(i.tickValues),i.ticks&&a.ticks.apply(this,i.ticks),this.format(),this._afterAxis();this.el=this.el.append("g").attr("class","axis").attr("transform","translate(0,"+(i.innerHeight||t.innerHeight)+")").call(a)},updateBottom:function(){var i=this.options,t=this.alloptions;this["updateAxis"+i.type].call(this,[0,i.innerWidth||t.innerWidth]),this._afterAxis(),t.withAnimated?this.el.transition().duration(t.animatedTiming).ease(t.animatedEasing).attr("transform","translate(0,"+(i.innerHeight||t.innerHeight)+")").call(this.axisx):this.el.attr("transform","translate(0,"+(i.innerHeight||t.innerHeight)+")").call(this.axisx)},axisDefaults:function(i){var t=this.x=d3.scale.linear().range(i),e=this.calExtent();return t.domain(e),t},updateAxisDefaults:function(i){return this.x.range(i),this.x.domain(this.calExtent()),this.x},axisCategory:function(i){var t,e=this.options;t=this.x=_.isArray(e.padding)?d3.scale.ordinal().rangeBands(i,e.padding[0],e.padding[1]):d3.scale.ordinal().rangeBands(i,e.padding/2,e.padding);var a=this.calExtent();return t.domain(a),t},updateAxisCategory:function(i){var t=this.options;return _.isArray(t.padding)?this.x.rangeBands(i,t.padding[0],t.padding[1]):this.x.rangeBands(i,t.padding/2,t.padding),this.x.domain(this.calExtent()),this.x},axisTime:function(i){var t,e=this.options,a=this.x=d3.time.scale().range(i);return t=_.isDate(e.min)&&_.isDate(e.max)?[e.min,e.max]:e.min&&e.max?[new Date(e.min),new Date(e.max)]:d3.extent(_.map(this._data,function(i){return"string"==typeof i[e.key]?d3.time.format(e.format).parse(i[e.key]):"object"==typeof i[e.key]?i[e.key]:(console.log("date error: "+i[e.key]+"is not a Date"),e.min&&(t[0]=_.isDate(e.min)?e.min:new Date(e.min)),void(e.max&&(t[1]=_.isDate(e.max)?e.max:new Date(e.max))))})),a.domain(t),a},updateAxisTime:function(i){var t,e=this.options,a=this.x=d3.time.scale().range(i);return t=_.isDate(e.min)&&_.isDate(e.max)?[e.min,e.max]:e.min&&e.max?[new Date(e.min),new Date(e.max)]:d3.extent(_.map(this._data,function(i){return"string"==typeof i[e.key]?d3.time.format(e.format).parse(i[e.key]):"object"==typeof i[e.key]?i[e.key]:void console.log("date error: "+i[e.key]+"is not a Date")})),a.domain(t),a},axisNondecile:function(i){var t=this.options,e=this.x=d3.scale.linear().range(i);t.max=_.sum(this._data,t.nondecile.key),e.domain(this.calExtent());var a=_.groupBy(this._data,t.key),n=this._data=[],s=0,r=n.length,o=(i[1]-i[0])/(e.domain()[1]-e.domain()[0]);for(var l in a){var d={sum:_.sum(a[l],t.nondecile.key),begin:s,end:0,center:0,radio:0};r--,d[t.key]=l,d.end=d.begin+d.sum,s+=d.sum,d.center=(d.begin+d.end)/2,t.nondecile.tickPadding&&0!==d.begin&&(d.begin=(e(d.begin)-t.nondecile.tickPadding/2-i[0])/o+e.domain()[0]),t.nondecile.tickPadding&&0!==r&&(d.end=(e(d.end)+t.nondecile.tickPadding/2-i[0])/o+e.domain()[0]),d.radio=(d.end-d.begin)/d.sum,n.push(d)}return t._afterAxis=function(){this.axisx.tickValues(_.pluck(this._data,"center"))},t.afterRender=function(){this.el.selectAll(".tick").data(this._data)},e},updateAxisNondecile:function(i){var t=this.options,e=this.x.range(i);t.max=_.sum(this._data,t.nondecile.key),e.domain(this.calExtent());var a=_.groupBy(this._data,t.key),n=this._data=[],s=0,r=n.length,o=(i[1]-i[0])/(e.domain()[1]-e.domain()[0]);for(var l in a){var d={sum:_.sum(a[l],t.nondecile.key),begin:s,end:0,center:0,radio:0};r--,d[t.key]=l,d.end=d.begin+d.sum,s+=d.sum,d.center=(d.begin+d.end)/2,t.nondecile.tickPadding&&0!==d.begin&&(d.begin=(e(d.begin)-t.nondecile.tickPadding/2-i[0])/o+e.domain()[0]),t.nondecile.tickPadding&&0!==r&&(d.end=(e(d.end)+t.nondecile.tickPadding/2-i[0])/o+e.domain()[0]),d.radio=(d.end-d.begin)/d.sum,n.push(d)}return e.domain(this.calExtent()),t._afterAxis=function(){this.axisx.tickValues(_.pluck(this._data,"center")),this.el&&this.el.selectAll(".tick").data(_.pluck(this._data,"center"))},e},calExtent:function(){var i=this.options,t=[];return _.isNumber(i.min)&&_.isNumber(i.max)?t=[i.min,i.max]:"category"!==i.type.toLocaleLowerCase()?(t=d3.extent(_.map(this._data,function(t){return t[i.key]})),_.isNumber(i.min)&&(t[0]=i.min),_.isNumber(i.max)&&(t[1]=i.max)):t=_.map(this._data,function(t){return t[i.key]}),t},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(i){var t=this.options,e=t.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(i)||(i=this._createCategory(parseInt(i))),this.groupX.domain(i),this.groupX},getGroupStep:function(i){return this.groupX?this.groupX.rangeBand():(this.calGroupStep(i),this.groupX.rangeBand())},_createCategory:function(i){for(var t=[],e=0;i>e;e++)t.push(""+e);return t},getGroupX:function(){return this.groupX},updateSeries:function(){var i=this.options;this["update"+i.orient](),this.renderLabel(),"function"==typeof i.afterRender&&i.afterRender.call(this)}}),module.exports=Axis;

package.json

 {
   "name": "dchart-core",
-  "version": "1.0.49",
+  "version": "1.0.50",
   "description": "",
@@ -5,0 +5,0 @@ "scripts": {

pie/pie.js

@@ -1,1 +0,1 @@
-function Pie(e,t){var r={arc:{startAngle:function(e){return e.startAngle},endAngle:function(e){return e.endAngle}},pyaxis:{key:"y"},paxis:null};_.deepMerge(r,t),DataV.call(this,e,r)}var DataV=require("../datav"),d3=require("d3"),_=require("../util");Pie=DataV.extend(Pie,{beforeRender:function(){var e=this.options;e.arc.radius||(e.arc.radius=Math.min(e.innerHeight,e.innerWidth)/2)},updateBeforeRender:function(){this.beforeRender()},changeSeries:function(){var e=this.options,t=this.data(),r=d3.layout.pie().sort(null).value(function(t){return t[e.pyaxis.key]}),a=this.getComs("arc","arc").getArc(),n=this.series.selectAll(".series-group").attr("transform","translate("+e.innerWidth/2+","+e.innerHeight/2+")").data(r(t)),i=function(t){if(console.log(t,a.centroid(t)),!e.paxis.dr)return"translate("+a.centroid(t)+")";var r=e.paxis.dr,n=(t.startAngle+t.endAngle)/2;return"translate("+r*Math.sin(n)+", "+-r*Math.cos(n)+")"},s=function(t,r){return"function"==typeof e.paxis.label?e.paxis.label.call(t,t.data):e.paxis.label&&e.paxis.label.length?e.paxis.label[r]:t.data[e.paxis.key]};this.series.selectAll(".series-group").each(function(t,r){var n=d3.select(this);n.selectAll(".serie").attr({d:function(){return a(t,r)}}),e.paxis&&n.selectAll(".serie-label").attr("transform",i.bind(null,t)).html(s.bind(null,t,r))}),this.enterSeries=n.enter().append("g").attr("class","series-group").attr("transform","translate("+e.innerWidth/2+","+e.innerHeight/2+")").each(function(t,r){var n=d3.select(this);n.append("path").attr({"class":function(){return"serie serie"+(r+1)},d:function(){return a(t,r)}}),e.paxis&&n.append("text").attr({"class":"serie-label",transform:i.bind(null,t),dy:".35em"}).style("text-anchor","middle").html(s.bind(null,t,r))}),n.exit().remove()},renderSeries:function(){this.series.classed("pie-chart-g",!0);{var e=this.options;this.renderCom("arc","arc",this.svg[0][0],e.arc).getArc()}this.changeSeries()},updateSeries:function(){var e=this.options,t=this.data(),r=this.getComs("arc","arc");r.update(t,e.arc),r=r.getArc(),this.changeSeries()}}),module.exports=Pie;
+function Pie(e,t){var r={arc:{startAngle:function(e){return e.startAngle},endAngle:function(e){return e.endAngle}},pyaxis:{key:"y"},paxis:null};_.deepMerge(r,t),DataV.call(this,e,r)}var DataV=require("../datav"),d3=require("d3"),_=require("../util");Pie=DataV.extend(Pie,{beforeRender:function(){var e=this.options;e.arc.radius||(e.arc.radius=Math.min(e.innerHeight,e.innerWidth)/2)},updateBeforeRender:function(){this.beforeRender()},changeSeries:function(){var e=this.options,t=this.data(),r=d3.layout.pie().sort(null).value(function(t){return t[e.pyaxis.key]}),a=this.getComs("arc","arc").getArc(),i=this.series.selectAll(".series-group").attr("transform","translate("+e.innerWidth/2+","+e.innerHeight/2+")").data(r(t)),n=function(t){if(!e.paxis.dr)return"translate("+a.centroid(t)+")";var r=e.paxis.dr,i=(t.startAngle+t.endAngle)/2;return"translate("+r*Math.sin(i)+", "+-r*Math.cos(i)+")"},s=function(t,r){return"function"==typeof e.paxis.label?e.paxis.label.call(t,t.data):e.paxis.label&&e.paxis.label.length?e.paxis.label[r]:t.data[e.paxis.key]};this.series.selectAll(".series-group").each(function(t,r){var i=d3.select(this);i.selectAll(".serie").attr({d:function(){return a(t,r)}}),e.paxis&&i.selectAll(".serie-label").attr("transform",n.bind(null,t)).html(s.bind(null,t,r))}),this.enterSeries=i.enter().append("g").attr("class","series-group").attr("transform","translate("+e.innerWidth/2+","+e.innerHeight/2+")").each(function(t,r){var i=d3.select(this);i.append("path").attr({"class":function(){return"serie serie"+(r+1)},d:function(){return a(t,r)}}),e.paxis&&i.append("text").attr({"class":"serie-label",transform:n.bind(null,t),dy:".35em"}).style("text-anchor","middle").html(s.bind(null,t,r))}),i.exit().remove()},renderSeries:function(){this.series.classed("pie-chart-g",!0);{var e=this.options;this.renderCom("arc","arc",this.svg[0][0],e.arc).getArc()}this.changeSeries()},updateSeries:function(){var e=this.options,t=this.data(),r=this.getComs("arc","arc");r.update(t,e.arc),r=r.getArc(),this.changeSeries()}}),module.exports=Pie;

radar/radar.js

@@ -1,1 +0,1 @@
-function Radar(a,r){var t={raxis:{key:"y",orient:"top",min:0,dr:0},rlabel:{key:"x",dr:null}};_.deepMerge(t,r),this.axiss=[],DataV.call(this,a,t)}var DataV=require("../datav"),d3=require("d3"),_=require("../util"),Axis=require("../com/axis");Radar=DataV.extend(Radar,{renderSeries:function(){this.series.classed("radar-chart-g",!0);var a=this.options,r=this.data(),t=this;a.arc.radius=Math.min(a.innerHeight,a.innerWidth)/2;var i=(this.renderCom("arc","arc",this.svg[0][0],a.arc).getArc(),360/r.length),e=[];r.forEach(function(n,s){var d=new Axis(t.svg[0][0],a.raxis,{innerWidth:a.arc.radius,innerHeight:a.arc.radius,animatedEasing:a.animatedEasing,animatedTiming:a.animatedTiming});d.render(r),d.attr({transform:"translate("+a.innerWidth/2+","+a.innerHeight/2+")rotate("+(s*i+a.raxis.dr)+")"}),t.axiss.push(d);var h=d.getX();e.push({x:a.innerWidth/2+h(n[a.raxis.key])*Math.cos(2*(s*i+a.raxis.dr)*Math.PI/360),y:a.innerHeight/2+h(n[a.raxis.key])*Math.sin(2*(s*i+a.raxis.dr)*Math.PI/360)})}),this.series.append("path").attr({"class":"serie",d:function(){return _.pos2Path(e)}});{var n=this.axiss[0],s=n.getX();this.svg.selectAll(".serie-label").data(r).enter().append("text").attr({"class":"serie-label",dy:function(r,t){var e=(t*i+a.raxis.dr)%360;return e>45&&135>e?5:0},transform:function(r,t){var e=t*i+a.raxis.dr;return"translate("+(a.innerWidth/2+(a.rlabel.dr||s(n.getMax()))*Math.cos(2*e*Math.PI/360))+","+(a.innerHeight/2+(a.rlabel.dr||s(n.getMax()))*Math.sin(2*e*Math.PI/360))+")"}}).text(function(r){return r[a.rlabel.key]}).style("text-anchor",function(r,t){var e=(t*i+a.raxis.dr)%360;return e>=0&&45>e||e>315&&360>e?"start":e>=135&&225>e?"end":"middle"})}},updateSeries:function(){var a=this.options,r=this.data(),t=this;a.arc.radius=Math.min(a.innerHeight,a.innerWidth)/2;var i=this.getComs("arc","arc");i.update(r,a.arc),i=i.getArc();var e=360/r.length,n=[];r.forEach(function(i,s){if(t.axiss[s]){var d=t.axiss[s];d.update(r,a.raxis)}else{var d=new Axis(t.svg[0][0],a.raxis,{innerWidth:a.arc.radius,innerHeight:a.arc.radius,animatedEasing:a.animatedEasing,animatedTiming:a.animatedTiming});d.render(r),d.attr({transform:"translate("+a.innerWidth/2+","+a.innerHeight/2+")rotate("+(s*e+a.raxis.dr)+")"}),t.axiss.push(d)}var h=d.getX();n.push({x:a.innerWidth/2+h(i[a.raxis.key])*Math.cos(2*(s*e+a.raxis.dr)*Math.PI/360),y:a.innerHeight/2+h(i[a.raxis.key])*Math.sin(2*(s*e+a.raxis.dr)*Math.PI/360)})}),this.series.select(".serie").attr({d:function(){return _.pos2Path(n)}});var s=this.axiss[0],d=s.getX(),h=this.svg.selectAll(".serie-label").data(r);h.attr({transform:function(r,t){return"translate("+(a.innerWidth/2+(a.rlabel.dr||d(s.getMax()))*Math.cos(2*(t*e+a.raxis.dr)*Math.PI/360))+","+(a.innerHeight/2+(a.rlabel.dr||d(s.getMax()))*Math.sin(2*(t*e+a.raxis.dr)*Math.PI/360))+")"}}).text(function(r){return r[a.rlabel.key]})}}),module.exports=Radar;
+function Radar(a,r){var t={raxis:{key:"y",orient:"top",min:0,dr:0},rlabel:{key:"x",dr:null},arc:{}};_.deepMerge(t,r),this.axiss=[],DataV.call(this,a,t)}var DataV=require("../datav"),d3=require("d3"),_=require("../util"),Axis=require("../com/axis");Radar=DataV.extend(Radar,{renderSeries:function(){this.series.classed("radar-chart-g",!0);var a=this.options,r=this.data(),t=this;a.arc.radius=Math.min(a.innerHeight,a.innerWidth)/2;var i=(this.renderCom("arc","arc",this.svg[0][0],a.arc).getArc(),360/r.length),e=[];r.forEach(function(n,s){var d=new Axis(t.svg[0][0],a.raxis,{innerWidth:a.arc.radius,innerHeight:a.arc.radius,animatedEasing:a.animatedEasing,animatedTiming:a.animatedTiming});d.render(r),d.attr({transform:"translate("+a.innerWidth/2+","+a.innerHeight/2+")rotate("+(s*i+a.raxis.dr)+")"}),t.axiss.push(d);var h=d.getX();e.push({x:a.innerWidth/2+h(n[a.raxis.key])*Math.cos(2*(s*i+a.raxis.dr)*Math.PI/360),y:a.innerHeight/2+h(n[a.raxis.key])*Math.sin(2*(s*i+a.raxis.dr)*Math.PI/360)})}),this.series.append("path").attr({"class":"serie",d:function(){return _.pos2Path(e)}});{var n=this.axiss[0],s=n.getX();this.svg.selectAll(".serie-label").data(r).enter().append("text").attr({"class":"serie-label",dy:function(r,t){var e=(t*i+a.raxis.dr)%360;return e>45&&135>e?5:0},transform:function(r,t){var e=t*i+a.raxis.dr;return"translate("+(a.innerWidth/2+(a.rlabel.dr||s(n.getMax()))*Math.cos(2*e*Math.PI/360))+","+(a.innerHeight/2+(a.rlabel.dr||s(n.getMax()))*Math.sin(2*e*Math.PI/360))+")"}}).text(function(r){return r[a.rlabel.key]}).style("text-anchor",function(r,t){var e=(t*i+a.raxis.dr)%360;return e>=0&&45>e||e>315&&360>e?"start":e>=135&&225>e?"end":"middle"})}},updateSeries:function(){var a=this.options,r=this.data(),t=this;a.arc.radius=Math.min(a.innerHeight,a.innerWidth)/2;var i=this.getComs("arc","arc");i.update(r,a.arc),i=i.getArc();var e=360/r.length,n=[];r.forEach(function(i,s){if(t.axiss[s]){var d=t.axiss[s];d.update(r,a.raxis)}else{var d=new Axis(t.svg[0][0],a.raxis,{innerWidth:a.arc.radius,innerHeight:a.arc.radius,animatedEasing:a.animatedEasing,animatedTiming:a.animatedTiming});d.render(r),d.attr({transform:"translate("+a.innerWidth/2+","+a.innerHeight/2+")rotate("+(s*e+a.raxis.dr)+")"}),t.axiss.push(d)}var h=d.getX();n.push({x:a.innerWidth/2+h(i[a.raxis.key])*Math.cos(2*(s*e+a.raxis.dr)*Math.PI/360),y:a.innerHeight/2+h(i[a.raxis.key])*Math.sin(2*(s*e+a.raxis.dr)*Math.PI/360)})}),this.series.select(".serie").attr({d:function(){return _.pos2Path(n)}});var s=this.axiss[0],d=s.getX(),h=this.svg.selectAll(".serie-label").data(r);h.attr({transform:function(r,t){return"translate("+(a.innerWidth/2+(a.rlabel.dr||d(s.getMax()))*Math.cos(2*(t*e+a.raxis.dr)*Math.PI/360))+","+(a.innerHeight/2+(a.rlabel.dr||d(s.getMax()))*Math.sin(2*(t*e+a.raxis.dr)*Math.PI/360))+")"}}).text(function(r){return r[a.rlabel.key]})}}),module.exports=Radar;

No alert changes

Worsened metrics

Total package byte prevSize

81614

decreased by-0.05%

No dependency changes