dchart-core - npm Package Compare versions

Comparing version 2.3.13 to 2.3.14

com/axis.js

@@ -1,1 +0,1 @@
-function Axis(t,i,e){this.reset(),this.options={fontSize:12,fontColor:"#fff",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,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),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)),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"),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})},axisDefaults:function(t){var i=this.x=d3.scale.linear().range(t),e=this.calExtent(),n=this.options;if(_.isNumber(n.ticks)&&!_.isNumber(n.min)&&Math.abs(e[1]-e[0])%(n.ticks-1)){var s=Math.max(Math.abs(e[1]-e[0])/(n.ticks-1),.1);e[0]=e[1]-s*(n.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 n=Math.max(Math.abs(i[1]-i[0])/(e.ticks-1),.1);i[0]=i[1]-n*(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 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);return _.isDate(e.min)&&_.isDate(e.max)?i=[e.min,e.max]:e.min&&e.max?i=[new Date(e.min),new Date(e.max)]:(i=d3.extent(_.map(this._data,function(t){return"string"==typeof t[e.key]?d3.time.format(e.format).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:new Date(e.min)),e.max&&(i[1]=_.isDate(e.max)?e.max:new Date(e.max))),n.domain(i),n},updateAxisTime:function(t){var i=this.options;this.x.range(t);var e;return _.isDate(i.min)&&_.isDate(i.max)?e=[i.min,i.max]:i.min&&i.max?e=[new Date(i.min),new Date(i.max)]:(e=d3.extent(_.map(this._data,function(t){return"string"==typeof t[i.key]?d3.time.format(i.format).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:new Date(i.min)),i.max&&(e[1]=_.isDate(i.max)?i.max:new Date(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(_.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 n=i[t.key];_.isArray(n)?e=_.union(e,n):e.push(n)}),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,"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;
+function Axis(t,i,e){this.reset(),this.options={fontSize:12,fontColor:"#fff",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,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),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)),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"),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})},axisDefaults:function(t){var i=this.x=d3.scale.linear().range(t),e=this.calExtent(),n=this.options;if(_.isNumber(n.ticks)&&!_.isNumber(n.min)&&Math.abs(e[1]-e[0])%(n.ticks-1)){var s=Math.max(Math.abs(e[1]-e[0])/(n.ticks-1),.1);e[0]=e[1]-s*(n.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 n=Math.max(Math.abs(i[1]-i[0])/(e.ticks-1),.1);i[0]=i[1]-n*(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 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);return _.isDate(e.min)&&_.isDate(e.max)?i=[e.min,e.max]:e.min&&e.max?i=[new Date(e.min),new Date(e.max)]:(i=d3.extent(_.map(this._data,function(t){return"string"==typeof t[e.key]?d3.time.format(e.format).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:new Date(e.min)),e.max&&(i[1]=_.isDate(e.max)?e.max:new Date(e.max))),n.domain(i),n},updateAxisTime:function(t){var i=this.options;this.x.range(t);var e;return _.isDate(i.min)&&_.isDate(i.max)?e=[i.min,i.max]:i.min&&i.max?e=[new Date(i.min),new Date(i.max)]:(e=d3.extent(_.map(this._data,function(t){return"string"==typeof t[i.key]?d3.time.format(i.format).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:new Date(i.min)),i.max&&(e[1]=_.isDate(i.max)?i.max:new Date(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(_.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 n=i[t.key];"defaults"===t.type.toLocaleLowerCase()&&(n=_.toNumber(n)),_.isArray(n)?e=_.union(e,n):e.push(n)}),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,"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;

core/source.js

@@ -1,1 +0,1 @@
-var exports=module.exports,_=require("../util");exports._source=function(t){var e=this.options;return void 0===t||null===t?this._data:(t.length&&t.length>e.incrementSize&&(t=t.splice(e.incrementSize,t.length-e.incrementSize)),void(e.incremental?(this._data||(this._data=[]),this._data=this._data.concat(t),this._data.length>e.incrementSize&&(this._data=this._data.splice(-e.incrementSize,e.incrementSize))):this._data="object"==typeof t&&_.clone(t)||t))},exports.data=function(t){return void 0!==t&&null!==t&&(this._data=t),this._data},exports.getComs=function(t,e){return this._com.getComs(t,e)};
+var exports=module.exports,_=require("../util");exports._source=function(t){var e=this.options;return void 0===t||null===t?this._data:void(e.incremental?(this._data||(this._data=[]),this._data=this._data.concat(t),this._data.length>e.incrementSize&&(this._data=this._data.splice(-e.incrementSize,e.incrementSize))):this._data="object"==typeof t&&_.clone(t)||t)},exports.data=function(t){return void 0!==t&&null!==t&&(this._data=t),this._data},exports.getComs=function(t,e){return this._com.getComs(t,e)};

package.json

 {
   "name": "dchart-core",
-  "version": "2.3.13",
+  "version": "2.3.14",
   "description": "",
@@ -5,0 +5,0 @@ "scripts": {

No alert changes

Worsened metrics

Total package byte prevSize

132795

decreased by-0.03%

No dependency changes