@plotdb/chart 2.1.10 → 2.1.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +8 -0
- package/index.js +58 -31
- package/index.min.js +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,13 @@
|
|
|
1
1
|
# Change Logs
|
|
2
2
|
|
|
3
|
+
## v2.1.11
|
|
4
|
+
|
|
5
|
+
- support binding normalization based on `multiple` value of dimension definition.
|
|
6
|
+
- pie chart: use chart.utils.config.from for configuration
|
|
7
|
+
- rewrite parser which generates data based on dimension instead of binding
|
|
8
|
+
to prevent unwanted data injected, and ensure array from dimensions with multiple flag
|
|
9
|
+
|
|
10
|
+
|
|
3
11
|
## v2.1.10
|
|
4
12
|
|
|
5
13
|
- base chart: support font lib loading from konfig font widget
|
package/index.js
CHANGED
|
@@ -236,6 +236,9 @@
|
|
|
236
236
|
this.cfg = opt.config || {};
|
|
237
237
|
this.seed = opt.seed || Math.random();
|
|
238
238
|
this.binding = opt.binding || {};
|
|
239
|
+
if (opt.binding) {
|
|
240
|
+
this._normalizeBinding();
|
|
241
|
+
}
|
|
239
242
|
this.evtHandler = {};
|
|
240
243
|
this.init = proxise.once(function(){
|
|
241
244
|
return this$._init();
|
|
@@ -396,45 +399,40 @@
|
|
|
396
399
|
});
|
|
397
400
|
},
|
|
398
401
|
parse: function(){
|
|
399
|
-
var
|
|
402
|
+
var dim, ref$, bind;
|
|
403
|
+
dim = (ref$ = this.mod).dimension || (ref$.dimension = {});
|
|
404
|
+
bind = this.binding;
|
|
400
405
|
this.data = this.raw.map(function(r, i){
|
|
401
|
-
var ret, k, v;
|
|
406
|
+
var ret, k, ref$, v, b;
|
|
402
407
|
ret = {};
|
|
403
|
-
(
|
|
404
|
-
|
|
405
|
-
|
|
406
|
-
v
|
|
407
|
-
|
|
408
|
-
|
|
409
|
-
|
|
410
|
-
});
|
|
411
|
-
}
|
|
412
|
-
return results$;
|
|
413
|
-
}.call(this$)).map(function(arg$){
|
|
414
|
-
var k, v, ref$, ref1$, t;
|
|
415
|
-
k = arg$.k, v = arg$.v;
|
|
416
|
-
if (!v) {
|
|
417
|
-
return;
|
|
408
|
+
for (k in ref$ = dim) {
|
|
409
|
+
v = ref$[k];
|
|
410
|
+
if (!(b = bind[k])) {
|
|
411
|
+
if (v.multiple) {
|
|
412
|
+
ret[k] = [];
|
|
413
|
+
}
|
|
414
|
+
continue;
|
|
418
415
|
}
|
|
419
|
-
ret[k] =
|
|
420
|
-
?
|
|
421
|
-
|
|
422
|
-
|
|
423
|
-
|
|
424
|
-
|
|
425
|
-
|
|
426
|
-
|
|
427
|
-
if (/[RIT]/.exec(t) && !/[CN]/.exec(t)) {
|
|
428
|
-
return ret[k] = Array.isArray(ret[k])
|
|
429
|
-
? ret[k].map(function(it){
|
|
430
|
-
return parseFloat(it);
|
|
431
|
-
})
|
|
416
|
+
ret[k] = !v.multiple
|
|
417
|
+
? r[b.key]
|
|
418
|
+
: (b.map
|
|
419
|
+
? b
|
|
420
|
+
: [b]).map(fn$);
|
|
421
|
+
if (/[RIT]/.exec(v.type) && !/[CN]/.exec(v.type)) {
|
|
422
|
+
ret[k] = Array.isArray(ret[k])
|
|
423
|
+
? ret[k].map(fn1$)
|
|
432
424
|
: parseFloat(ret[k]);
|
|
433
425
|
}
|
|
434
|
-
}
|
|
426
|
+
}
|
|
435
427
|
ret._raw = r;
|
|
436
428
|
ret._idx = i;
|
|
437
429
|
return ret;
|
|
430
|
+
function fn$(it){
|
|
431
|
+
return r[it.key];
|
|
432
|
+
}
|
|
433
|
+
function fn1$(it){
|
|
434
|
+
return parseFloat(it);
|
|
435
|
+
}
|
|
438
436
|
});
|
|
439
437
|
if (this.mod.parse) {
|
|
440
438
|
return this.mod.parse.apply(this);
|
|
@@ -508,8 +506,36 @@
|
|
|
508
506
|
withDefault(o, this._defcfg);
|
|
509
507
|
return import$(this.cfg, o);
|
|
510
508
|
},
|
|
509
|
+
_normalizeBinding: function(k){
|
|
510
|
+
var k, res$, i$, len$, n, d, b, a, results$ = [];
|
|
511
|
+
if (k == null) {
|
|
512
|
+
res$ = [];
|
|
513
|
+
for (k in this.binding) {
|
|
514
|
+
res$.push(k);
|
|
515
|
+
}
|
|
516
|
+
k = res$;
|
|
517
|
+
}
|
|
518
|
+
if (!Array.isArray(k)) {
|
|
519
|
+
k = [k];
|
|
520
|
+
}
|
|
521
|
+
for (i$ = 0, len$ = k.length; i$ < len$; ++i$) {
|
|
522
|
+
n = k[i$];
|
|
523
|
+
d = (this.mod.dimension || {})[n] || {};
|
|
524
|
+
b = this.binding[n];
|
|
525
|
+
a = Array.isArray(b);
|
|
526
|
+
if (!d.multiple !== !a && (d.multiple || a)) {
|
|
527
|
+
results$.push(this.binding[n] = a
|
|
528
|
+
? b[0]
|
|
529
|
+
: b
|
|
530
|
+
? [b]
|
|
531
|
+
: []);
|
|
532
|
+
}
|
|
533
|
+
}
|
|
534
|
+
return results$;
|
|
535
|
+
},
|
|
511
536
|
setBind: function(n, b){
|
|
512
537
|
this.binding[n] = b;
|
|
538
|
+
this._normalizeBinding([n]);
|
|
513
539
|
this.parse();
|
|
514
540
|
this.bind();
|
|
515
541
|
this.resize();
|
|
@@ -526,6 +552,7 @@
|
|
|
526
552
|
}
|
|
527
553
|
if (binding != null) {
|
|
528
554
|
this.binding = binding;
|
|
555
|
+
this._normalizeBinding();
|
|
529
556
|
}
|
|
530
557
|
if (this.renderLock) {
|
|
531
558
|
this.renderLock.resolve();
|
package/index.min.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
!function(){var n,
|
|
1
|
+
!function(){var n,r,o,s,u,a,t;function l(t,e){var n,i={}.hasOwnProperty;for(n in e)i.call(e,n)&&(t[n]=e[n]);return t}n=function(t,e,n){for(var i=t;t&&t!==n;)t=t.parentNode;if(t!==n)return null;if(!e)return t;for(t=i;t&&t!==n&&(!t.matches||t.matches&&!t.matches(e));)t=t.parentNode;return t!==n||n.matches&&n.matches(e)?t:null},(r=function(){return this.running=!1,this.time={now:0,last:0},this.fps(60),this.evtHandler={},this}).prototype=l(Object.create(Object.prototype),{on:function(t,n){var i=this;return(Array.isArray(t)?t:[t]).map(function(t){var e;return((e=i.evtHandler)[t]||(e[t]=[])).push(n)})},fire:function(t){for(var e,n,i,r,o=[],s=[],u=1,a=arguments.length;u<a;++u)s.push(arguments[u]);for(e=s,u=0,i=(n=this.evtHandler[t]||[]).length;u<i;++u)r=n[u],o.push(r.apply(this,e));return o},reset:function(){return this.time={now:0}},setTime:function(t){return this.time.now=t},getTime:function(){return this.time.now},isRunning:function(){return this.running},toggle:function(t){return null!=t&&(this.running=!t),this.running?this.pause():this.run()},pause:function(){return this.running=!1},render:function(){return this.fire("tick",this.time.now)},run:function(t){var e=this;if(null!=t&&this.fps(t),!this.running)return this.running=!0,requestAnimationFrame(function(t){return e.handler(e.time.last=t,!0)})},throttle:function(t){return this.isThrottled=t=null==t?!0:t},fps:function(t){return null==t?this._fps_val:(this._fps_val=.01<t?t:.01,this._fps_delay=1e3/this._fps_val)},handler:function(t,e){var n,i=this;if(null==e&&(e=!1),this.running)return this.time.now=t,n=this.isThrottled?1e3<(n=this._fps_delay)?n:1e3:this._fps_delay,(e||this.time.now-this.time.last>=n)&&(this.time.last=t,this.render()),requestAnimationFrame(function(t){return i.handler(t,!1)})}}),o={list:[],init:function(){var t,n,i=this;return this.inited=!0,t=null==document.hidden&&null==document.msHidden&&null!=document.webkiHidden?["webkitHidden","webkitvisibilitychange"]:["hidden","visibilitychange"],n=t[0],document.addEventListener(t[1],debounce(150,function(){var e=!!document[n];return i.list.map(function(t){return t.throttle(e)})},!1))},add:function(t){return this.inited||this.init(),this.list.push(t)}},s={wm:new WeakMap,ro:new ResizeObserver(function(t){return t.map(function(t){return s.wm.get(t.target)._resize()})}),add:function(t,e){return this.wm.set(t,e),this.ro.observe(t)},delete:function(t){return this.ro.unobserve(t),this.wm.delete(t)}},u=function(t,e){return null==e&&(e={}),function(t,e){var n,i;for(n in e)i=e[n],null==t[n]?t[n]=i:"object"==typeof t[n]&&"object"==typeof i&&u(t[n],e[n]);return t}(t=null==t?{}:t,e=JSON.parse(JSON.stringify(e)))},a=function(t){var o=function(t,e){var n,i,r;for(i in null==e&&(e={}),n=t.child,t)(r=t[i]).type?r.default&&(e[i]=r.default):o(r,e[i]||(e[i]={}));return e};return o(t)},(t=function(t){var e=this;return this.root="string"==typeof(t=null==t?{}:t).root?document.querySelector(t.root):t.root,this.useSample=null==t.useSample||t.useSample,this.autoSelect=null==t.autoSelect||t.autoSelect,this.forceInit=t.forceInit||!1,this.prepareSvg=null==t.prepareSvg||t.prepareSvg,this.layoutOpt=null==t.layout||t.layout,this.delayRender=t.delayRender||!1,this.dataAccessor=null!=t.dataAccessor?t.dataAccessor:function(t){return t?t.data._raw:null},this.raw=t.raw||null,this.mod=t.mod||{},this.cfg=t.config||{},this.seed=t.seed||Math.random(),this.binding=t.binding||{},t.binding&&this._normalizeBinding(),this.evtHandler={},this.init=proxise.once(function(){return e._init()}),this._resize=null,this.autoSelect&&(this.root.addEventListener("click",this._select=function(t){if(t=n(t.target,".data",e.root))return e.fire("select",[{data:e.dataAccessor(t),node:t}])}),this.root.addEventListener("mouseover",this._hover=function(t){if(t=ld$.parent(t.target,".data",e.root))return e.fire("hover",[{data:e.dataAccessor(t),node:t}])})),this}).prototype=l(Object.create(Object.prototype),{_init:function(){var n,t,e,i=this;return"static"===window.getComputedStyle(this.root).position&&(this.root.style.position="relative"),n=this.layoutOpt?"object"!=typeof this.layoutOpt?this.root.querySelector(".pdl-layout"):"string"==typeof this.layoutOpt.root?this.root.querySelector(this.layoutOpt.root):this.layoutOpt.root||null:null,this.prepareSvg&&!(this.svg=this.root.querySelector("svg"))&&(this.svg=document.createElementNS("http://www.w3.org/2000/svg","svg"),(t=this.svg.style).width="100%",t.height="100%",this.layoutOpt&&(n||console.error("[@plotdb/chart] layout enabled yet layout root isn't configured properly. "),(e=n.querySelector("[data-type=render]"))||console.warn("[@plotdb/chart] prepareSvg and layout is configured at the same time,\nyet render container for layout is not found. svg is thus appended in the root.")),(e||this.root).appendChild(this.svg)),this._aniloop=new r,o.add(this._aniloop),this._aniloop.on("tick",function(){return i.tick()}),Promise.resolve().then(function(){var t;if(i._defcfg=t=a(i.mod.config||{}),u(i.cfg,t),(!i.raw||!Array.isArray(i.raw))&&i.useSample&&i.mod.sample)return(t=i.mod.sample.apply(i)).then?t.then():Promise.resolve(t)}).then(function(t){return i.raw=(t=t||{}).raw,i.binding=t.binding,i}).then(function(){var t,e;if(i.raw||(i.raw=[]),i.layoutOpt&&("undefined"==typeof layout||null===layout?console.warn("[@plotdb/chart] layout-opt is set yet @plotdb/layout is not found."):(n||(console.error("[@plotdb/chart] cannot determine root node for @plotdb/layout."),console.error("[@plotdb/chart] config layout properly or disable layout by setting layout to false")),i.layout=new layout("object"==typeof i.layoutOpt?((t=l({},i.layoutOpt)).watchResize=!1,t):{root:n,watchResize:!1}))),e=proxise(function(){return s.add(i.root,i),null}),!i.forceInit&&i.root.offsetParent&&"none"!==window.getComputedStyle(i.root).display)return i._resize=function(){return e.resolve()},e()}).then(function(){return i._resize=function(){}}).then(function(){var t,e=function(){if(i.mod.init)return i.mod.init.apply(i)};return i.layout?(t=proxise(function(){return Promise.resolve(i.layout.init(e)),null}),i._layout=function(){return t.resolve()},i.layout.on("render",function(){return i._layout()}),t()):e()}).then(function(){i._layout=function(){},Promise.resolve().then(function(){if(i.delayRender)return i.renderLock=proxise(function(){}),i.renderLock()}).then(function(){return i._resize=function(){return i.resize(),i.render()},i._layout=function(){return i.parse(),i.bind(),i.resize(),i.render()},i.parse(),i.bind(),i.resize(),i.render()})})},parse:function(){var t,l=(t=this.mod).dimension||(t.dimension={}),h=this.binding;if(this.data=this.raw.map(function(e,t){var n,i,r,o,s={};for(n in i=l)r=i[n],(o=h[n])?(s[n]=r.multiple?(o.map?o:[o]).map(u):e[o.key],/[RIT]/.exec(r.type)&&!/[CN]/.exec(r.type)&&(s[n]=Array.isArray(s[n])?s[n].map(a):parseFloat(s[n]))):r.multiple&&(s[n]=[]);return s._raw=e,s._idx=t,s;function u(t){return e[t.key]}function a(t){return parseFloat(t)}}),this.mod.parse)return this.mod.parse.apply(this)},bind:function(){if(this.mod.bind)return this.mod.bind.apply(this)},start:function(){if(this._aniloop.run(),this.mod.start)return this.mod.start.apply(this)},stop:function(){if(this._aniloop.pause(),this.mod.stop)return this.mod.stop.apply(this)},resize:function(){if(this.layout&&this.layout.update(!1),this.box=this.root.getBoundingClientRect(),this.mod.resize)return this.mod.resize.apply(this)},tick:function(){if(this.mod.tick)return this.mod.tick.apply(this)},render:function(){if(this.mod.render)return this.mod.render.apply(this)},destroy:function(){var t=this;return Promise.resolve().then(function(){if(t._select&&t.root.removeEventListener("click",t._select),t._hover&&t.root.removeEventListener("mouseover",t._hover),s.delete(t.root),t.layout&&t.layout.destroy(),t.stop(),t.mod.destroy)return t.mod.destroy.apply(t)})},config:function(){var t,e,n;if(!arguments.length)return this.cfg;for(t={},e=0,n=arguments.length;e<n;++e)u(t,arguments[e]);return u(t,this._defcfg),l(this.cfg,t)},_normalizeBinding:function(t){var e,n,i,r,o,s,u,a=[];if(null==t){for(t in e=[],this.binding)e.push(t);t=e}for(n=0,i=(t=!Array.isArray(t)?[t]:t).length;n<i;++n)r=t[n],o=(this.mod.dimension||{})[r]||{},s=this.binding[r],u=Array.isArray(s),!o.multiple!=!u&&(o.multiple||u)&&a.push(this.binding[r]=u?s[0]:s?[s]:[]);return a},setBind:function(t,e){return this.binding[t]=e,this._normalizeBinding([t]),this.parse(),this.bind(),this.resize(),this.render()},setRaw:function(t,e,n){var i;return null==n&&(n=!1),Array.isArray(t)||(t=(i=t).raw,e=i.binding,n=i.reinit),null!=t&&(this.raw=t),null!=e&&(this.binding=e,this._normalizeBinding()),this.renderLock?(this.renderLock.resolve(),this.renderLock=null):(n&&this.mod.init&&this.mod.init.apply(this),this.parse(),this.bind(),this.resize(),this.render())},on:function(t,n){var i=this;return(Array.isArray(t)?t:[t]).map(function(t){var e;return((e=i.evtHandler)[t]||(e[t]=[])).push(n)})},fire:function(t){for(var e,n,i,r,o=[],s=[],u=1,a=arguments.length;u<a;++u)s.push(arguments[u]);for(e=s,u=0,i=(n=this.evtHandler[t]||[]).length;u<i;++u)r=n[u],o.push(r.apply(this,e));return o},filter:function(t,e){var n,i,r,o,s;for(i in null==t&&(t={}),null==e&&(e=!1),n=[],r=this.binding)o=r[i],s=(s=Array.isArray(o)?o:[o]).map(u),n=n.concat(s);for(i in t)o=t[i],n.filter(a).map(l);return e&&this.fire("filter",t),this.mod.filter&&this.mod.filter.apply(this,[t,e]),this.parse(),this.bind(),this.resize(),this.render();function u(t){return{k:i,v:t}}function a(t){return t.k===i}function l(t){return t.v.filter=o}},sample:function(){return this.mod.sample?this.mod.sample.apply(this):{raw:[],binding:{}}}}),"undefined"!=typeof module&&null!==module?module.exports=t:"undefined"!=typeof window&&null!==window&&(window.chart=t)}.call(this);
|
package/package.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"author":"zbryikt","name":"@plotdb/chart","license":"MIT","description":"plotdb charts","style":"index.min.css","browser":"index.min.js","main":"index.min.js","version":"2.1.
|
|
1
|
+
{"author":"zbryikt","name":"@plotdb/chart","license":"MIT","description":"plotdb charts","style":"index.min.css","browser":"index.min.js","main":"index.min.js","version":"2.1.11","homepage":"https://github.com/plotdb/chart","repository":{"type":"git","url":"https://github.com/plotdb/chart"},"engines":{"node":">=10.14.1","npm":">=6.4.1"},"scripts":{"start":"npx server -r web -o true"},"devDependencies":{"@loadingio/bootstrap.ext":"^0.0.9","@loadingio/ldquery":"^3.0.4","@loadingio/loading.css":"^3.1.0","@loadingio/vscroll":"^0.0.8","@plotdb/layout":"^0.0.12","@plotdb/pdmap-world":"^0.0.5","@plotdb/semver":"^0.0.3","@plotdb/sheet":"^0.2.0","@xlfont/choose":"^0.0.13","@xlfont/load":"^2.1.0","@zbryikt/template":"^2.3.38","bootstrap":"^4.6.1","bootstrap.native":"^3.0.15","fedep":"^1.1.7","ldbutton":"^2.0.1","ldfile":"^2.0.0","ldiconfont":"^0.2.3","ldloader":"^3.0.1","ldview":"^1.2.1","livescript":"^1.6.0","pdmaptw":"2.1.0","uglify-js":"^3.13.1","uglifycss":"^0.0.29","zmgr":"^2.2.3"},"frontendDependencies":{"root":"web/static/assets/lib","modules":["bootstrap","bootstrap.native","@loadingio/bootstrap.ext","@loadingio/ldquery","@loadingio/loading.css","@loadingio/ldcolorpicker","@loadingio/debounce.js","@loadingio/vscroll","@plotdb/pdmap-world","@plotdb/block","@plotdb/csscope","@plotdb/rescope","@plotdb/layout","@plotdb/sheet","@plotdb/konfig","@plotdb/semver","@xlfont/choose","@xlfont/load","@zbryikt/voronoijs","d3","d3-array","d3-axis","d3-brush","d3-color","d3-dispatch","d3-drag","d3-ease","d3-force","d3-force-boundary","d3-format","d3-hierarchy","d3-interpolate","d3-path","d3-quadtree","d3-random","d3-scale-chromatic","d3-selection","d3-shape","d3-timer","d3-transition","choosefont.js","pdmaptw","proxise","ldiconfont","ldloader","ldbutton","ldcover","ldcolor","ldfile","ldslider","wrap-svg-text","ldpalettepicker","zmgr","ldview"]},"dependencies":{"@loadingio/debounce.js":"^1.0.1","@loadingio/ldcolorpicker":"^3.0.0","@plotdb/block":"^4.7.1","@plotdb/csscope":"^4.0.6","@plotdb/konfig":"^4.7.2","@plotdb/rescope":"^4.1.6","@zbryikt/voronoijs":"^1.0.0","choosefont.js":"^0.0.1","d3":"^4.13.0","d3-array":"^3.1.1","d3-axis":"^3.0.0","d3-brush":"^3.0.0","d3-color":"^3.1.0","d3-dispatch":"^3.0.1","d3-drag":"^3.0.0","d3-ease":"^3.0.1","d3-force":"^3.0.0","d3-force-boundary":"^0.0.2","d3-format":"^3.1.0","d3-hierarchy":"^3.1.1","d3-interpolate":"^3.0.1","d3-path":"^3.0.1","d3-quadtree":"^3.0.1","d3-random":"^3.0.1","d3-scale-chromatic":"^3.0.0","d3-selection":"^3.0.0","d3-shape":"^3.1.0","d3-timer":"^3.0.1","d3-transition":"^3.0.1","ldcolor":"^1.0.0","ldcover":"^3.2.1","ldpalettepicker":"^4.0.1","ldslider":"^3.1.1","proxise":"^1.0.1","wrap-svg-text":"^0.0.7"}}
|