dchart-core - npm Package Compare versions

Comparing version 1.1.10 to 1.1.11

com/legend.js

@@ -1,1 +0,1 @@
-function Legend(e,t,n){this.reset(),this.options={type:"horizontal",renderType:"defaults"},this.init(e,t,n),this._valid()}var _=require("../util"),Com=require("./index"),d3=require("d3");Legend=Com.extend(Legend,{_valid:function(){var e=this.options,t=["horizontal","vertical"];-1===_.indexOf(t,e.type.toLowerCase())&&(this.msg="legend arguments error. there is no "+e.type+" in types.",e.type=t[0],this.valid=!1),e.type=_.initialUpperCase(e.type);var n=["defaults"];-1===_.indexOf(n,e.renderType.toLowerCase())&&(this.msg="legend arguments error. there is no "+e.renderType+" in types.",e.renderType=n[0],this.valid=!1),e.renderType=_.initialUpperCase(e.renderType)},renderSeries:function(){var e=this.options,t=this.alloptions,n=t.beforeLayout.legend,i=e.margin||t.margin,r=_.extend(_.omit(n,"position"),{margin:i.top+"px "+i.right+"px "+i.bottom+"px "+i.left+"px"});return this.el=this.el.append("div").attr({"class":"legend"}).style(r),this.svg=this.el.append("svg").attr({width:n.width,height:n.height}).append("g"),this["cal"+e.type](),this},calHorizontal:function(){for(var e=this.options,t=this.alloptions,n=this.data(),i=t.yaxis.key,r=Math.max(e.legendLabels.length,_.maxBy(n,function(e){return e[i].length})[i].length),a=t.beforeLayout.legend,s=a.width/r,l=this,d=0;r>d;d++){var o=e.legendLabels[d]||"legend"+(d+1),h={x:d*s,y:0,width:s,height:a.height},p=l.svg.append("g").attr({"class":"legend-label legend"+(d+1)});"function"==typeof e.customRender?e.customRender.call(p,o,h,d):this["render"+e.renderType](p,o,h,d)}},calVertical:function(){for(var e=this.options,t=this.alloptions,n=t.yaxis.key,i=Math.max(e.legendLabels.length,_.maxBy(data,function(e){return e[n].length})[n].length),r=e.beforeLayout.legend,a=r.height/i,s=this,l=0;i>l;l++){var d=e.legendLabels[l]||"legend"+(l+1),o={x:0,y:l*a,width:r.width,height:a},h=s.svg.append("g").attr({"class":"legend-label legend"+(l+1)});"function"==typeof e.customRender?e.customRender.call(h,d,o,l):this["render"+e.renderType](h,d,o,l)}},renderDefaults:function(e,t,n){e.attr({transform:"translate("+(n.x+n.width/2)+", "+(n.y+n.height/2)+")"}),e.append("text").html(t).attr({x:30,y:5,dy:".35em"})}}),module.exports=Legend;
+function Legend(e,t,n){this.reset(),this.options={type:"horizontal",renderType:"defaults"},this.init(e,t,n),this._valid()}var _=require("../util"),Com=require("./index"),d3=require("d3");Legend=Com.extend(Legend,{_valid:function(){var e=this.options,t=["horizontal","vertical"];-1===_.indexOf(t,e.type.toLowerCase())&&(this.msg="legend arguments error. there is no "+e.type+" in types.",e.type=t[0],this.valid=!1),e.type=_.initialUpperCase(e.type);var n=["defaults"];-1===_.indexOf(n,e.renderType.toLowerCase())&&(this.msg="legend arguments error. there is no "+e.renderType+" in types.",e.renderType=n[0],this.valid=!1),e.renderType=_.initialUpperCase(e.renderType)},renderSeries:function(){var e=this.options,t=this.alloptions,n=t.beforeLayout.legend,i=e.margin||t.margin,r=_.extend(_.omit(n,"position"),{margin:i.top+"px "+i.right+"px "+i.bottom+"px "+i.left+"px"});return this.el=this.el.append("div").attr({"class":"legend"}).style(r),this.svg=this.el.append("svg").attr({width:n.width,height:n.height}).append("g"),this["cal"+e.type](),this},calHorizontal:function(){for(var e=this.options,t=this.alloptions,n=this.data(),i=t.yaxis.key,r=Math.max(e.legendLabels.length,_.maxBy(n,function(e){return e[i].length})[i].length),s=t.beforeLayout.legend,a=s.width/r,l=this,d=0;r>d;d++){var o=e.legendLabels[d]||"legend"+(d+1),h={x:d*a,y:0,width:a,height:s.height},g=l.svg.select(".legend"+(d+1))[0][0]?l.svg.select(".legend"+(d+1)):l.svg.append("g").attr({"class":"legend-label legend"+(d+1)});"function"==typeof e.customRender?e.customRender.call(g,o,h,d):this["render"+e.renderType](g,o,h,d)}},calVertical:function(){for(var e=this.options,t=this.alloptions,n=t.yaxis.key,i=Math.max(e.legendLabels.length,_.maxBy(data,function(e){return e[n].length})[n].length),r=e.beforeLayout.legend,s=r.height/i,a=this,l=0;i>l;l++){var d=e.legendLabels[l]||"legend"+(l+1),o={x:0,y:l*s,width:r.width,height:s},h=a.svg.select(".legend"+(l+1))[0][0]?a.svg.select(".legend"+(l+1)):a.svg.append("g").attr({"class":"legend-label legend"+(l+1)});"function"==typeof e.customRender?e.customRender.call(h,d,o,l):this["render"+e.renderType](h,d,o,l)}},renderDefaults:function(e,t,n){e.attr({transform:"translate("+(n.x+n.width/2)+", "+(n.y+n.height/2)+")"}),e.append("text").html(t).attr({x:30,y:5,dy:".35em"})},updateSeries:function(){return this["cal"+this.options.type](),this}}),module.exports=Legend;

core/init.js

@@ -1,1 +0,1 @@
-var exports=module.exports,_=require("../util"),d3=require("d3"),Com=require("./com"),Opt=require("./config").Options;exports.init=function(t,i){return this._com=new Com,this._data=null,this.options=new Opt,i=i||{},i.xaxis&&(i.xaxis=_.deepMerge(this.options.xaxisDefault,i.xaxis)),i.yaxis&&(i.yaxis=_.deepMerge(this.options.yaxisDefault,i.yaxis)),_.deepMerge(this.options,i),t?(this.el=d3.select(t),this._initArgu(),void this._initEvent()):!1},exports._initBeforeLayout=function(t){var i=this.options,e={left:0,top:0,right:0,bottom:0};for(var s in t){var h=t[s];if(_.has(h,"position")&&"center"!==h.position)switch(h.position){case"bottom":case"top":i.height-=-1===h.height.indexOf("%")?parseInt(h.height):parseInt(h.height)*i.height/100,e[h.position]+=i.height;break;case"left":case"right":i.width-=-1===h.width.indexOf("%")?parseInt(h.width):parseInt(h.width)*i.width/100,e[h.position]+=i.width}}t.series={margin:e.top+"px "+e.right+"px "+e.bottom+"px "+e.left+"px"}},exports._initArgu=function(){var t=this.options;t.svgWidth||(t.width||(t.width=parseInt(this.el.style("width"))),this.el.style("width",t.width)),t.svgHeight||(t.height||(t.height=parseInt(this.el.style("height"))),this.el.style("height",t.height)),t.beforeLayout&&this._initBeforeLayout(t.beforeLayout),t.svgWidth=t.width,t.svgHeight=t.height,t.innerWidth=t.svgWidth-t.margin.left-t.margin.right,t.innerHeight=t.svgHeight-t.margin.top-t.margin.bottom},exports.initLayout=function(){var t=this.options;this.svg=this.el&&this.el.append("svg").attr({"class":"con-svg",width:t.svgWidth,height:t.svgHeight}).append("g").attr({"class":"con-g",transform:"translate("+t.margin.left+","+t.margin.top+")"}),this.series=this.svg.append("g").attr("class","series")};
+var exports=module.exports,_=require("../util"),d3=require("d3"),Com=require("./com"),Opt=require("./config").Options;exports.init=function(t,i){return this._com=new Com,this._data=null,this.options=new Opt,i=i||{},i.xaxis&&(i.xaxis=_.deepMerge(this.options.xaxisDefault,i.xaxis)),i.yaxis&&(i.yaxis=_.deepMerge(this.options.yaxisDefault,i.yaxis)),_.deepMerge(this.options,i),t?(this.el=d3.select(t),this._initArgu(),void this._initEvent()):!1},exports._initBeforeLayout=function(t){var i=this.options,e={left:0,top:0,right:0,bottom:0};for(var s in t){var h=t[s];if(_.has(h,"position")&&"center"!==h.position)switch(h.position){case"bottom":case"top":i.height-=(-1===h.height.indexOf("%")?parseInt(h.height):parseInt(h.height)*i.height/100)-(i[h]&&i[h].margin?i[h].margin.top+i[h].margin.bottom:0),e[h.position]+=i.height;break;case"left":case"right":i.width-=(-1===h.width.indexOf("%")?parseInt(h.width):parseInt(h.width)*i.width/100)-(i[h]&&i[h].margin?i[h].margin.left+i[h].margin.right:0),e[h.position]+=i.width}}t.series={margin:e.top+"px "+e.right+"px "+e.bottom+"px "+e.left+"px"}},exports._initArgu=function(){var t=this.options;t.width=(t.isFirst?t.width:0)||parseInt(this.el.style("width"))||600,this.el.style("width",t.width),t.height=(t.isFirst?t.height:0)||parseInt(this.el.style("height"))||400,this.el.style("height",t.height),t.beforeLayout&&this._initBeforeLayout(t.beforeLayout),t.svgWidth=t.width,t.svgHeight=t.height,t.innerWidth=t.svgWidth-t.margin.left-t.margin.right,t.innerHeight=t.svgHeight-t.margin.top-t.margin.bottom},exports.initLayout=function(){var t=this.options;this.svg=this.el&&this.el.append("svg").attr({"class":"con-svg",width:t.svgWidth,height:t.svgHeight}).append("g").attr({"class":"con-g",transform:"translate("+t.margin.left+","+t.margin.top+")"}),this.series=this.svg.append("g").attr("class","series")};

line/line.js

@@ -1,1 +0,1 @@
-function LineMulti(e,t){var i={xaxis:{orient:"bottom"},yaxis:{key:"y"}};_.deepMerge(i,t),DataV.call(this,e,i)}var DataV=require("../datav"),d3=require("d3"),_=require("../util");LineMulti=DataV.extend(LineMulti,{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]])}),this._data=e},renderSeries:function(){this.svg.classed("line-chart-g",!0);var e,t,i=this.options,a=this.data(),s=i.xaxis.key,n=i.yaxis.key;e=this.getComs("axis","xaxis"),t=this.getComs("axis","yaxis");var r=e.getX(),x=t.getX(),o=_.maxBy(a,function(e){return e[n].length})[n].length;this.series=this.series.datum(a).each(function(){for(var e=d3.select(this),a=0;o>a;a++){var u=d3.svg.line().x(function(e){return"time"===i.xaxis.type&&"string"==typeof e[s]?r(new Date(e[s]))+(r.rangeBand?r.rangeBand()/2:0):r(e[s])+("category"===i.xaxis.type?r.rangeBand()/2:0)}).y(function(e){return x(e[n][a]||t.getMin())});i.interpolate&&u.interpolate(i.interpolate),e.append("path").attr({"class":"serie serie"+(a+1),d:u})}})},updateSeries:function(){var e=this.options,t=this._data,i=this.getComs("axis","xaxis"),a=this.getComs("axis","yaxis"),s=e.xaxis.key,n=e.yaxis.key;i.update(t,e.xaxis),a.update(t,e.yaxis);var r=[];t.forEach(function(e){r=_.union(r,e[n])});var x=_.maxBy(r),o=_.min(r);e.yaxis.max=Math.max(e.yaxis.max,x),e.yaxis.min=Math.min(e.yaxis.min,o),i.update(t,e.xaxis),a.update(t,e.yaxis);var u=i.getX(),d=a.getX(),y=_.maxBy(t,function(e){return e[n].length})[n].length;this.series.datum(t),this.series.each(function(){for(var t=d3.select(this),i=0;y>i;i++){var r=d3.svg.line().x(function(t){return"time"===e.xaxis.type&&"string"==typeof t[s]?u(new Date(t[s]))+(u.rangeBand?u.rangeBand()/2:0):u(t[s])+("category"===e.xaxis.type?u.rangeBand()/2:0)}).y(function(e){return d(e[n][i]||a.getMax())});e.interpolate&&r.interpolate(e.interpolate),t.select(".serie"+(i+1)).transition().duration(e.animatedTiming).ease(e.animatedEasing).attr({d:r})}}),this.series.selectAll(".serie.serie"+y+" + .serie").remove()}}),module.exports=LineMulti;
+function LineMulti(e,t){var i={xaxis:{orient:"bottom"},yaxis:{key:"y"}};_.deepMerge(i,t),DataV.call(this,e,i)}var DataV=require("../datav"),d3=require("d3"),_=require("../util");LineMulti=DataV.extend(LineMulti,{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]])}),this._data=e},renderSeries:function(){this.svg.classed("line-chart-g",!0);var e,t,i=this.options,a=this.data(),n=i.xaxis.key,r=i.yaxis.key;e=this.getComs("axis","xaxis"),t=this.getComs("axis","yaxis");var s=e.getX(),o=t.getX(),d=_.maxBy(a,function(e){return e[r].length})[r].length;this.series=this.series.datum(a).each(function(){for(var e=d3.select(this),t=0;d>t;t++){var a=d3.svg.line().x(function(e){return"time"===i.xaxis.type&&"string"==typeof e[n]?s(new Date(e[n]))+(s.rangeBand?s.rangeBand()/2:0):s(e[n])+("category"===i.xaxis.type?s.rangeBand()/2:0)}).y(function(e){return o(e[r][t]||yaxis.getMax())});i.interpolate&&a.interpolate(i.interpolate);var u=e.select(".serie"+(t+1))[0][0]?e.select(".serie"+(t+1)):e.append("path").attr({"class":"serie serie"+(t+1)});i.withAnimated&&u.transition().duration(i.animatedTiming).ease(i.animatedEasing),u.attr({d:a})}})},updateSeries:function(){LineMulti.prototype.renderSeries.call(this)}}),module.exports=LineMulti;

line/lineMulti.js

@@ -1,1 +0,1 @@
-function LineMulti(e,t){var i={xaxis:{orient:"bottom"},yaxis:{key:"y"}};_.deepMerge(i,t),DataV.call(this,e,i)}var DataV=require("../datav"),d3=require("d3"),_=require("../util");LineMulti=DataV.extend(LineMulti,{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]])}),this._data=e},renderSeries:function(){this.svg.classed("line-chart-g",!0);var e,t,i=this.options,a=this.data(),n=i.xaxis.key,s=i.yaxis.key;e=this.getComs("axis","xaxis"),t=this.getComs("axis","yaxis");var r=e.getX(),x=t.getX(),o=_.maxBy(a,function(e){return e[s].length})[s].length;this.series=this.series.datum(a).each(function(){for(var e=d3.select(this),a=0;o>a;a++){var u=d3.svg.line().x(function(e){return"time"===i.xaxis.type&&"string"==typeof e[n]?r(new Date(e[n]))+(r.rangeBand?r.rangeBand()/2:0):r(e[n])+("category"===i.xaxis.type?r.rangeBand()/2:0)}).y(function(e){return x(e[s][a]||t.getMin())});i.interpolate&&u.interpolate(i.interpolate),e.append("path").attr({"class":"serie serie"+(a+1),d:u})}})},updateSeries:function(){var e=this.options,t=this._data,i=this.getComs("axis","xaxis"),a=this.getComs("axis","yaxis"),n=e.xaxis.key,s=e.yaxis.key;i.update(t,e.xaxis),a.update(t,e.yaxis);var r=[];t.forEach(function(e){r=_.union(r,e[s])});var x=_.maxBy(r),o=_.min(r);e.yaxis.max=Math.max(e.yaxis.max,x),e.yaxis.min=Math.min(e.yaxis.min,o),i.update(t,e.xaxis),a.update(t,e.yaxis);var u=i.getX(),d=a.getX(),y=_.maxBy(t,function(e){return e[s].length})[s].length;this.series.datum(t),this.series.each(function(){for(var t=d3.select(this),i=0;y>i;i++){var r=d3.svg.line().x(function(t){return"time"===e.xaxis.type&&"string"==typeof t[n]?u(new Date(t[n]))+(u.rangeBand?u.rangeBand()/2:0):u(t[n])+("category"===e.xaxis.type?u.rangeBand()/2:0)}).y(function(e){return d(e[s][i]||a.getMin())});e.interpolate&&r.interpolate(e.interpolate),t.select(".serie"+(i+1)).transition().duration(e.animatedTiming).ease(e.animatedEasing).attr({d:r})}}),this.series.selectAll(".serie.serie"+y+" + .serie").remove()}}),module.exports=LineMulti;
+function LineMulti(e,t){var i={xaxis:{orient:"bottom"},yaxis:{key:"y"}};_.deepMerge(i,t),DataV.call(this,e,i)}var DataV=require("../datav"),d3=require("d3"),_=require("../util");LineMulti=DataV.extend(LineMulti,{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]])}),this._data=e},renderSeries:function(){this.svg.classed("line-chart-g",!0);var e,t,i=this.options,a=this.data(),n=i.xaxis.key,r=i.yaxis.key;e=this.getComs("axis","xaxis"),t=this.getComs("axis","yaxis");var s=e.getX(),o=t.getX(),d=_.maxBy(a,function(e){return e[r].length})[r].length;this.series=this.series.datum(a).each(function(){for(var e=d3.select(this),t=0;d>t;t++){var a=d3.svg.line().x(function(e){return"time"===i.xaxis.type&&"string"==typeof e[n]?s(new Date(e[n]))+(s.rangeBand?s.rangeBand()/2:0):s(e[n])+("category"===i.xaxis.type?s.rangeBand()/2:0)}).y(function(e){return o(e[r][t]||yaxis.getMax())});i.interpolate&&a.interpolate(i.interpolate);var u=e.select(".serie"+(t+1))[0][0]?e.select(".serie"+(t+1)):e.append("path").attr({"class":"serie serie"+(t+1)});i.withAnimated&&u.transition().duration(i.animatedTiming).ease(i.animatedEasing),u.attr({d:a})}})},updateSeries:function(){LineMulti.prototype.renderSeries.call(this)}}),module.exports=LineMulti;

package.json

 {
   "name": "dchart-core",
-  "version": "1.1.10",
+  "version": "1.1.11",
   "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(),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 serie1"},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))}),this.outerSeries=i.exit().remove()},renderSeries:function(){this.svg.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,{data:function(e){if(!e)return this._data;var t=this.options,r=t.pyaxis.key;e.forEach(function(e){_.isArray(e[r])||(e[r]=[e[r]])}),this._data=e},beforeRender:function(){var e=this.options;e.arc.length||(e.arc=[e.arc]),e.radius||(e.radius=Math.min(e.innerHeight,e.innerWidth)/2)},updateBeforeRender:function(){this.beforeRender()},changeSeries:function(){for(var e=this.options,t=this.data(),r=d3.layout.pie().sort(null).value(function(t){return t[e.pyaxis.key]}),a=e.pyaxis.key,n=_.maxBy(t,function(e){return e[a].length})[a].length,i=this.series.selectAll(".series-group").attr("transform","translate("+e.innerWidth/2+","+e.innerHeight/2+")").data(r(t)),s=function(t){if(!e.paxis.dr)return"translate("+o.centroid(t)+")";var r=e.paxis.dr,a=(t.startAngle+t.endAngle)/2;return"translate("+r*Math.sin(a)+", "+-r*Math.cos(a)+")"},l=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]},c=0;n>c;c++){var o=this.arcs[c].getArc();this.series.selectAll(".series-group").each(function(t,r){var a=d3.select(this);a.selectAll(".serie").attr({d:function(){return o(t,r)}}),e.paxis&&a.selectAll(".serie-label").attr("transform",s.bind(null,t)).html(l.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 a=d3.select(this);a.append("path").attr({"class":function(){return"serie serie1"},d:function(){return o(t,r)}}),e.paxis&&a.append("text").attr({"class":"serie-label",transform:s.bind(null,t),dy:".35em"}).style("text-anchor","middle").html(l.bind(null,t,r))})}this.outerSeries=i.exit().remove()},renderSeries:function(){this.svg.classed("pie-chart-g",!0);var e=this.options,t=e.pyaxis.key,r=_.maxBy(data,function(e){return e[t].length})[t].length;this.arcs=[];for(var a=0;r>a;a++){var n=this.renderCom("arc"+(a+1),"arc",this.svg[0][0],e.arc);this.arcs.push(n)}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;

No alert changes

Improved metrics

Total package byte prevSize

100192

increased by2.96%

No dependency changes