vislite 1.6.0 → 1.6.1

package/lib/TreeLayout/index.es.min.js

@@ -1,9 +1,9 @@
 /*!
-* TreeLayout of VISLite JavaScript Library v1.6.0
+* TreeLayout of VISLite JavaScript Library v1.6.1
 * git+https://github.com/oi-contrib/VISLite.git
 */
 var t=function(e,o){return t=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}||function(t,e){for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&(t[o]=e[o])},t(e,o)};"function"==typeof SuppressedError&&SuppressedError;function e(t,e){for(var o in t)e[o]=t[o];return e}var o,n=function(){function t(t){void 0===t&&(t={}),this.name="Tree",this.__config=e(t,{root:function(t){return t},children:function(t){return t.children},id:function(t){return t.name}})}return t.prototype.use=function(t,e){return void 0===e&&(e={}),function(t,e,o){void 0===o&&(o={});var n=function(t,e){var o,n,i={},r=e.root(t);o=n=e.id(r),i[o]={data:r,pid:null,id:o,isOpen:!0,show:!0,deg:0,children:[]};var p=1;return function n(r,s){var d=e.children(r,t);p+=d?d.length:0;for(var h=0;d&&h<d.length;h++)o=e.id(d[h]),i[s].children.push(o),i[o]={data:d[h],pid:s,id:o,isOpen:!0,show:!0,deg:0,children:[]},n(d[h],o)}(r,o),{rid:n,value:i,num:p}}(t,e),i=n.value,r=n.rid;if(1==n.num)return i[r].left=.5,i[r].top=.5,i[r].show=!0,{deep:1,node:i,root:r,size:1};var p=[],s=0,d=0;for(var h in o[r]?(i[r].left=.5,i[r].top=.5,i[r].show=!0,s=1):function t(e,n){n>d&&(d=n);var r=0;if(!o[e.id])for(r=0;r<e.children.length;r++)t(i[e.children[r]],n+1);if(i[e.id].left=n+.5,0==r?(null==p[n]&&(p[n]=-.5),null==p[n-1]&&(p[n-1]=-.5),i[e.id].top=p[n]+1,p[n]+1+.5*(i[e.pid].children.length-1)-1<p[n-1]&&(i[e.id].top=p[n-1]+1-.5*(i[e.pid].children.length-1))):i[e.id].top=.5*(i[e.children[0]].top+i[e.children[r-1]].top),i[e.id].top<=p[n])var h=p[n]+1-i[e.id].top((function t(e,o){i[e].top+=h,p[o]<i[e].top&&(p[o]=i[e].top);for(var n=0;n<i[e].children.length;n++)t(i[e].children[n],o+1)}))(e.id,n);p[n]=i[e.id].top,i[e.id].top+.5>s&&(s=i[e.id].top+.5)}(i[r],0),o)o[h]&&(i[h].isOpen=!1,function t(e,o,n){for(var r=0;r<i[e].children.length;r++)i[i[e].children[r]].left=o,i[i[e].children[r]].top=n,i[i[e].children[r]].show=!1,t(i[e].children[r],o,n)}(h,i[h].left,i[h].top));return{node:i,root:r,size:s,deep:d+1}}(t,this.__config,e)},t}(),i=[];
 /*!
-* animation of OIPage v1.3.0
+* animation of OIPage v1.5.0
 * git+https://github.com/oi-contrib/OIPage.git
 */function r(t,e,o,n,i){var r=Math.cos(o),p=Math.sin(o);return[(n-t)*r-(i-e)*p+t,(n-t)*p+(i-e)*r+e]}var p=function(n){function p(){var t=null!==n&&n.apply(this,arguments)||this;return t.name="TreeLayout",t.__option={offsetX:0,offsetY:0,duration:500,type:"plain",direction:"LR",x:100,y:100,width:100,height:100,radius:100},t.__noOpens={},t}return function(e,o){if("function"!=typeof o&&null!==o)throw new TypeError("Class extends value "+String(o)+" is not a constructor or null");function n(){this.constructor=e}t(e,o),e.prototype=null===o?Object.create(o):(n.prototype=o.prototype,new n)}(p,n),p.prototype.setOption=function(t){return e(t,this.__option),this},p.prototype.use=function(t,e){void 0===e&&(e={});var o=n.prototype.use.call(this,t,e);if(0!=this.__option.offsetX||0!=this.__option.offsetY)for(var i in o.node)if(!o.node[i].show){var p=0,s=i;do{s=o.node[s].pid,p++}while(!o.node[s].show);o.node[i].left+=this.__option.offsetX*p,o.node[i].top+=this.__option.offsetY*p}if("rect"==this.__option.type){if("LR"==this.__option.direction||"RL"==this.__option.direction){var d=this.__option.height/o.size,h=this.__option.width/(o.deep-1),_=this.__option.y-.5*this.__option.height,f="LR"==this.__option.direction?1:-1;for(var i in o.node)1==o.deep?(o.node[i].left=this.__option.x+.5*this.__option.width*f,o.node[i].top=this.__option.y):(o.node[i].left=this.__option.x+(o.node[i].left-.5)*h*f,o.node[i].top=o.node[i].top*d+_)}else if("TB"==this.__option.direction||"BT"==this.__option.direction){d=this.__option.width/o.size,h=this.__option.height/(o.deep-1),_=this.__option.x-.5*this.__option.width,f="TB"==this.__option.direction?1:-1;for(var i in o.node)if(o.node[i].deg="TB"==this.__option.direction?.5*Math.PI:-.5*Math.PI,1==o.deep)o.node[i].left=this.__option.x,o.node[i].top=this.__option.y+.5*this.__option.height*f;else{var l=o.node[i].left;o.node[i].left=o.node[i].top*d+_,o.node[i].top=this.__option.y+(l-.5)*h*f}}}else if("circle"==this.__option.type){var u=this.__option.x,c=this.__option.y,a=2*Math.PI/o.size,v=this.__option.radius/(o.deep-1);for(var i in o.node)if(.5==o.node[i].left)o.node[i].left=u,o.node[i].top=c;else{var y=r(u,c,a*o.node[i].top,u+(o.node[i].left-.5)*v,c);o.node[i].deg=a*o.node[i].top,o.node[i].left=y[0],o.node[i].top=y[1]}}return o},p.prototype.bind=function(t,e,o){return void 0===o&&(o={}),this.__rback=e,this.__oralTree=t,this.__noOpens=o,this.__preTree=this.use(this.__oralTree,this.__noOpens),this.__rback(this.__preTree),this},p.prototype.unbind=function(){return this.__rback=function(){return null},this.__oralTree=null,this.__preTree=null,this.__noOpens={},this},p.prototype.doUpdate=function(){var t=this,e=this.use(this.__oralTree,this.__noOpens),n=JSON.parse(JSON.stringify(e));return function(t,e,n){arguments.length<2&&(e=400),arguments.length<3&&(n=function(){});var r={timer:function(t,e,o){if(!t)throw new Error("Tick is required!");var n=(new Date).valueOf()+"_"+(1e3*Math.random()).toFixed(0);return i.push({id:n,createTime:new Date,tick:t,duration:e,callback:o}),r.start(),n},start:function(){o||(o=setInterval(r.tick,13))},tick:function(){var t,e,o,n,p,s,d,h=i;for((i=[]).length=0,e=0;e<h.length;e++)t=(p=h[e]).createTime,o=p.tick,s=p.duration,n=p.callback,o(d=(d=(+(new Date).valueOf()-t.valueOf())/s)>1?1:d),d<1&&p.id?i.push(p):n(d);i.length<=0&&r.stop()},stop:function(){o&&(clearInterval(o),o=null)}},p=r.timer((function(e){t(e)}),e,n)}((function(o){if(t.__preTree)for(var i in n.node)(e.node[i].show||t.__preTree.node[i].show)&&(n.node[i].show=!0,n.node[i].left=t.__preTree.node[i].left+(e.node[i].left-t.__preTree.node[i].left)*o,n.node[i].top=t.__preTree.node[i].top+(e.node[i].top-t.__preTree.node[i].top)*o);t.__rback(n)}),this.__option.duration,(function(){t.__preTree=e,t.__rback(t.__preTree)})),this},p.prototype.closeNode=function(t){return this.__preTree?(this.__noOpens[t]=!0,this.doUpdate(),this):this},p.prototype.openNode=function(t){return this.__preTree?(this.__noOpens[t]=!1,this.doUpdate(),this):this},p.prototype.toggleNode=function(t){return this.__preTree?(this.__noOpens[t]=!this.__noOpens[t],this.doUpdate(),this):this},p}(n);export{p as default};

package/lib/animation/index.es.js

@@ -1,115 +1,115 @@
 /*!
-* animation of VISLite JavaScript Library v1.6.0
+* animation of VISLite JavaScript Library v1.6.1
 * git+https://github.com/oi-contrib/VISLite.git
 */
 /*!
-* animation of OIPage v1.3.0
+* animation of OIPage v1.5.0
 * git+https://github.com/oi-contrib/OIPage.git
 */
 
-//当前正在运动的动画的tick函数堆栈
-var $timers = [];
-//唯一定时器的定时间隔
-var $interval = 13;
-//定时器ID
-var $timerId;
-
-/**
- * 动画轮播
- * @param {function} doback 轮询函数，有一个形参deep，0-1，表示执行进度
- * @param {number} duration 动画时长，可选
- * @param {function} callback 动画结束回调，可选，有一个形参deep，0-1，表示执行进度
- *
- * @returns {function} 返回一个函数，调用该函数，可以提前结束动画
- */
-function animation(doback, duration, callback) {
-    if (arguments.length < 2) duration = 400;
-    if (arguments.length < 3) callback = function () { };
-
-    var clock = {
-        //把tick函数推入堆栈
-        "timer": function (tick, duration, callback) {
-            if (!tick) {
-                throw new Error('Tick is required!');
-            }
-            var id = new Date().valueOf() + "_" + (Math.random() * 1000).toFixed(0);
-            $timers.push({
-                "id": id,
-                "createTime": new Date(),
-                "tick": tick,
-                "duration": duration,
-                "callback": callback
-            });
-            clock.start();
-            return id;
-        },
-
-        //开启唯一的定时器timerId
-        "start": function () {
-            if (!$timerId) {
-                $timerId = setInterval(clock.tick, $interval);
-            }
-        },
-
-        //被定时器调用，遍历timers堆栈
-        "tick": function () {
-            var createTime, flag, tick, callback, timer, duration, passTime, timers = $timers;
-
-            $timers = [];
-            $timers.length = 0;
-
-            for (flag = 0; flag < timers.length; flag++) {
-                //初始化数据
-                timer = timers[flag];
-                createTime = timer.createTime;
-                tick = timer.tick;
-                duration = timer.duration;
-                callback = timer.callback;
-
-                //执行
-                passTime = (+new Date().valueOf() - createTime.valueOf()) / duration;
-                passTime = passTime > 1 ? 1 : passTime;
-                tick(passTime);
-                if (passTime < 1 && timer.id) {
-                    //动画没有结束再添加
-                    $timers.push(timer);
-                } else {
-                    callback(passTime);
-                }
-            }
-            if ($timers.length <= 0) {
-                clock.stop();
-            }
-        },
-
-        //停止定时器，重置timerId=null
-        "stop": function () {
-            if ($timerId) {
-                clearInterval($timerId);
-                $timerId = null;
-            }
-        }
-    };
-
-    var id = clock.timer(function (deep) {
-        //其中deep为0-1，表示改变的程度
-        doback(deep);
-    }, duration, callback);
-
-    return {
-        // 一个函数
-        // 用于在动画结束前结束动画
-        stop: function () {
-            var i;
-            for (i in $timers) {
-                if ($timers[i].id == id) {
-                    $timers[i].id = void 0;
-                    return;
-                }
-            }
-        }
-    };
-
+//当前正在运动的动画的tick函数堆栈
+var $timers = [];
+//唯一定时器的定时间隔
+var $interval = 13;
+//定时器ID
+var $timerId;
+
+/**
+ * 动画轮播
+ * @param {function} doback 轮询函数，有一个形参deep，0-1，表示执行进度
+ * @param {number} duration 动画时长，可选
+ * @param {function} callback 动画结束回调，可选，有一个形参deep，0-1，表示执行进度
+ *
+ * @returns {function} 返回一个函数，调用该函数，可以提前结束动画
+ */
+function animation(doback, duration, callback) {
+    if (arguments.length < 2) duration = 400;
+    if (arguments.length < 3) callback = function () { };
+
+    var clock = {
+        //把tick函数推入堆栈
+        "timer": function (tick, duration, callback) {
+            if (!tick) {
+                throw new Error('Tick is required!');
+            }
+            var id = new Date().valueOf() + "_" + (Math.random() * 1000).toFixed(0);
+            $timers.push({
+                "id": id,
+                "createTime": new Date(),
+                "tick": tick,
+                "duration": duration,
+                "callback": callback
+            });
+            clock.start();
+            return id;
+        },
+
+        //开启唯一的定时器timerId
+        "start": function () {
+            if (!$timerId) {
+                $timerId = setInterval(clock.tick, $interval);
+            }
+        },
+
+        //被定时器调用，遍历timers堆栈
+        "tick": function () {
+            var createTime, flag, tick, callback, timer, duration, passTime, timers = $timers;
+
+            $timers = [];
+            $timers.length = 0;
+
+            for (flag = 0; flag < timers.length; flag++) {
+                //初始化数据
+                timer = timers[flag];
+                createTime = timer.createTime;
+                tick = timer.tick;
+                duration = timer.duration;
+                callback = timer.callback;
+
+                //执行
+                passTime = (+new Date().valueOf() - createTime.valueOf()) / duration;
+                passTime = passTime > 1 ? 1 : passTime;
+                tick(passTime);
+                if (passTime < 1 && timer.id) {
+                    //动画没有结束再添加
+                    $timers.push(timer);
+                } else {
+                    callback(passTime);
+                }
+            }
+            if ($timers.length <= 0) {
+                clock.stop();
+            }
+        },
+
+        //停止定时器，重置timerId=null
+        "stop": function () {
+            if ($timerId) {
+                clearInterval($timerId);
+                $timerId = null;
+            }
+        }
+    };
+
+    var id = clock.timer(function (deep) {
+        //其中deep为0-1，表示改变的程度
+        doback(deep);
+    }, duration, callback);
+
+    return {
+        // 一个函数
+        // 用于在动画结束前结束动画
+        stop: function () {
+            var i;
+            for (i in $timers) {
+                if ($timers[i].id == id) {
+                    $timers[i].id = void 0;
+                    return;
+                }
+            }
+        }
+    };
+
 }
 
 function index (doback, duration, callback) {

package/lib/animation/index.es.min.js

@@ -1,9 +1,9 @@
 /*!
-* animation of VISLite JavaScript Library v1.6.0
+* animation of VISLite JavaScript Library v1.6.1
 * git+https://github.com/oi-contrib/VISLite.git
 */
 /*!
-* animation of OIPage v1.3.0
+* animation of OIPage v1.5.0
 * git+https://github.com/oi-contrib/OIPage.git
 */
 var t,n=[],e=13;function r(r,i,a){return function(r,i,a){arguments.length<2&&(i=400),arguments.length<3&&(a=function(){});var o={timer:function(t,e,r){if(!t)throw new Error("Tick is required!");var i=(new Date).valueOf()+"_"+(1e3*Math.random()).toFixed(0);return n.push({id:i,createTime:new Date,tick:t,duration:e,callback:r}),o.start(),i},start:function(){t||(t=setInterval(o.tick,e))},tick:function(){var t,e,r,i,a,u,c,f=n;for((n=[]).length=0,e=0;e<f.length;e++)t=(a=f[e]).createTime,r=a.tick,u=a.duration,i=a.callback,r(c=(c=(+(new Date).valueOf()-t.valueOf())/u)>1?1:c),c<1&&a.id?n.push(a):i(c);n.length<=0&&o.stop()},stop:function(){t&&(clearInterval(t),t=null)}},u=o.timer((function(t){r(t)}),i,a);return{stop:function(){var t;for(t in n)if(n[t].id==u)return void(n[t].id=void 0)}}}(r,i||400,a||function(){}).stop}export{r as default};

package/lib/assemble/index.es.js

@@ -1,5 +1,5 @@
 /*!
-* assemble of VISLite JavaScript Library v1.6.0
+* assemble of VISLite JavaScript Library v1.6.1
 * git+https://github.com/oi-contrib/VISLite.git
 */
 function assemble (begin, end, step, count) {

package/lib/assemble/index.es.min.js

@@ -1,5 +1,5 @@
 /*!
-* assemble of VISLite JavaScript Library v1.6.0
+* assemble of VISLite JavaScript Library v1.6.1
 * git+https://github.com/oi-contrib/VISLite.git
 */
 function r(r,t,e,f){for(var n=[],o=0;o<f;o++)n[o]=r;return function(){for(var o=0;o<f;o++){if(n[o]+e<t){n[o]=+(n[o]+e).toFixed(7);break}o<f-1&&(n[o]=r)}return n}}export{r as default};

package/lib/getLoopColors/index.es.js

@@ -1,5 +1,5 @@
 /*!
-* getLoopColors of VISLite JavaScript Library v1.6.0
+* getLoopColors of VISLite JavaScript Library v1.6.1
 * git+https://github.com/oi-contrib/VISLite.git
 */
 function getLoopColors (num, alpha, colorsFactory) {

package/lib/getLoopColors/index.es.min.js

@@ -1,5 +1,5 @@
 /*!
-* getLoopColors of VISLite JavaScript Library v1.6.0
+* getLoopColors of VISLite JavaScript Library v1.6.1
 * git+https://github.com/oi-contrib/VISLite.git
 */
 function r(r,a,g){void 0===a&&(a=1);var t=g?g(a):["rgba(84,112,198,"+a+")","rgba(145,204,117,"+a+")","rgba(250,200,88,"+a+")","rgba(238,102,102,"+a+")","rgba(115,192,222,"+a+")","rgba(59,162,114,"+a+")","rgba(252,132,82,"+a+")","rgba(154,96,180,"+a+")","rgba(234,124,204,"+a+")"],e=[];if(r<=t.length)return t;if(r%t.length==0)for(var n=0;n<r/t.length;n++)e=e.concat(t);else{for(var o=1;o<r/t.length;o++)e=e.concat(t);if(r%t.length==1)e=e.concat(t[4]);else for(var b=0;b<r%t.length;b++)e=e.concat(t[b])}return e}export{r as default};

package/lib/getWebGLContext/index.es.js

@@ -1,5 +1,5 @@
 /*!
-* getWebGLContext of VISLite JavaScript Library v1.6.0
+* getWebGLContext of VISLite JavaScript Library v1.6.1
 * git+https://github.com/oi-contrib/VISLite.git
 */
 function getWebGLContext (canvas, scale, opts, mode) {

package/lib/getWebGLContext/index.es.min.js

@@ -1,5 +1,5 @@
 /*!
-* getWebGLContext of VISLite JavaScript Library v1.6.0
+* getWebGLContext of VISLite JavaScript Library v1.6.1
 * git+https://github.com/oi-contrib/VISLite.git
 */
 var e=function(e,t,i){if(void 0===t&&(t=1),!e)throw new Error("VISLite getWebGLContext:The mount point requires an HTMLElement type but encountered null.");var n,r=e.clientWidth,a=e.clientHeight,o=e;return o._vislite_canvas_?n=o._vislite_canvas_:(n=document.createElement("canvas"),e.appendChild(n),o._vislite_canvas_=n,e.setAttribute("vislite","WebGL")),n.style.width=r+"px",n.setAttribute("width",r+""),n.style.height=a+"px",n.setAttribute("height",a+""),function(e,t,i,n){void 0===i&&(i={}),void 0===n&&(n="scaleToFill");for(var r=["experimental-webgl","webkit-3d","moz-webgl"],a=e.getContext("webgl",i),o=0;o<r.length;o++){try{a=e.getContext(r[o],i)}catch(e){}if(a)break}if(!a)throw new Error("Non canvas or browser does not support webgl.");var l=a.canvas.width,s=a.canvas.height,c=t,v=t;"aspectFit"==n?l>s?c*=s/l:s>l&&(v*=l/s):"aspectFill"==n&&(l>s?v*=l/s:s>l&&(c*=s/l));var h=l*c,u=s*v;return a.viewport(.5*(l-h),.5*(s-u),h,u),a.depthFunc(a.LEQUAL),a.enable(a.DEPTH_TEST),a}(n,t,{},i)};export{e as default};

package/lib/index.umd.js

@@ -1,5 +1,5 @@
 /*!
-* VISLite JavaScript Library v1.6.0
+* VISLite JavaScript Library v1.6.1
 * git+https://github.com/oi-contrib/VISLite.git
 */
 (function (global, factory) {
@@ -294,113 +294,113 @@
     }
 
     /*!
-    * animation of OIPage v1.3.0
+    * animation of OIPage v1.5.0
     * git+https://github.com/oi-contrib/OIPage.git
     */
 
-    //当前正在运动的动画的tick函数堆栈
-    var $timers = [];
-    //唯一定时器的定时间隔
-    var $interval = 13;
-    //定时器ID
-    var $timerId;
-
-    /**
-     * 动画轮播
-     * @param {function} doback 轮询函数，有一个形参deep，0-1，表示执行进度
-     * @param {number} duration 动画时长，可选
-     * @param {function} callback 动画结束回调，可选，有一个形参deep，0-1，表示执行进度
-     *
-     * @returns {function} 返回一个函数，调用该函数，可以提前结束动画
-     */
-    function animation$1(doback, duration, callback) {
-        if (arguments.length < 2) duration = 400;
-        if (arguments.length < 3) callback = function () { };
-
-        var clock = {
-            //把tick函数推入堆栈
-            "timer": function (tick, duration, callback) {
-                if (!tick) {
-                    throw new Error('Tick is required!');
-                }
-                var id = new Date().valueOf() + "_" + (Math.random() * 1000).toFixed(0);
-                $timers.push({
-                    "id": id,
-                    "createTime": new Date(),
-                    "tick": tick,
-                    "duration": duration,
-                    "callback": callback
-                });
-                clock.start();
-                return id;
-            },
-
-            //开启唯一的定时器timerId
-            "start": function () {
-                if (!$timerId) {
-                    $timerId = setInterval(clock.tick, $interval);
-                }
-            },
-
-            //被定时器调用，遍历timers堆栈
-            "tick": function () {
-                var createTime, flag, tick, callback, timer, duration, passTime, timers = $timers;
-
-                $timers = [];
-                $timers.length = 0;
-
-                for (flag = 0; flag < timers.length; flag++) {
-                    //初始化数据
-                    timer = timers[flag];
-                    createTime = timer.createTime;
-                    tick = timer.tick;
-                    duration = timer.duration;
-                    callback = timer.callback;
-
-                    //执行
-                    passTime = (+new Date().valueOf() - createTime.valueOf()) / duration;
-                    passTime = passTime > 1 ? 1 : passTime;
-                    tick(passTime);
-                    if (passTime < 1 && timer.id) {
-                        //动画没有结束再添加
-                        $timers.push(timer);
-                    } else {
-                        callback(passTime);
-                    }
-                }
-                if ($timers.length <= 0) {
-                    clock.stop();
-                }
-            },
-
-            //停止定时器，重置timerId=null
-            "stop": function () {
-                if ($timerId) {
-                    clearInterval($timerId);
-                    $timerId = null;
-                }
-            }
-        };
-
-        var id = clock.timer(function (deep) {
-            //其中deep为0-1，表示改变的程度
-            doback(deep);
-        }, duration, callback);
-
-        return {
-            // 一个函数
-            // 用于在动画结束前结束动画
-            stop: function () {
-                var i;
-                for (i in $timers) {
-                    if ($timers[i].id == id) {
-                        $timers[i].id = void 0;
-                        return;
-                    }
-                }
-            }
-        };
-
+    //当前正在运动的动画的tick函数堆栈
+    var $timers = [];
+    //唯一定时器的定时间隔
+    var $interval = 13;
+    //定时器ID
+    var $timerId;
+
+    /**
+     * 动画轮播
+     * @param {function} doback 轮询函数，有一个形参deep，0-1，表示执行进度
+     * @param {number} duration 动画时长，可选
+     * @param {function} callback 动画结束回调，可选，有一个形参deep，0-1，表示执行进度
+     *
+     * @returns {function} 返回一个函数，调用该函数，可以提前结束动画
+     */
+    function animation$1(doback, duration, callback) {
+        if (arguments.length < 2) duration = 400;
+        if (arguments.length < 3) callback = function () { };
+
+        var clock = {
+            //把tick函数推入堆栈
+            "timer": function (tick, duration, callback) {
+                if (!tick) {
+                    throw new Error('Tick is required!');
+                }
+                var id = new Date().valueOf() + "_" + (Math.random() * 1000).toFixed(0);
+                $timers.push({
+                    "id": id,
+                    "createTime": new Date(),
+                    "tick": tick,
+                    "duration": duration,
+                    "callback": callback
+                });
+                clock.start();
+                return id;
+            },
+
+            //开启唯一的定时器timerId
+            "start": function () {
+                if (!$timerId) {
+                    $timerId = setInterval(clock.tick, $interval);
+                }
+            },
+
+            //被定时器调用，遍历timers堆栈
+            "tick": function () {
+                var createTime, flag, tick, callback, timer, duration, passTime, timers = $timers;
+
+                $timers = [];
+                $timers.length = 0;
+
+                for (flag = 0; flag < timers.length; flag++) {
+                    //初始化数据
+                    timer = timers[flag];
+                    createTime = timer.createTime;
+                    tick = timer.tick;
+                    duration = timer.duration;
+                    callback = timer.callback;
+
+                    //执行
+                    passTime = (+new Date().valueOf() - createTime.valueOf()) / duration;
+                    passTime = passTime > 1 ? 1 : passTime;
+                    tick(passTime);
+                    if (passTime < 1 && timer.id) {
+                        //动画没有结束再添加
+                        $timers.push(timer);
+                    } else {
+                        callback(passTime);
+                    }
+                }
+                if ($timers.length <= 0) {
+                    clock.stop();
+                }
+            },
+
+            //停止定时器，重置timerId=null
+            "stop": function () {
+                if ($timerId) {
+                    clearInterval($timerId);
+                    $timerId = null;
+                }
+            }
+        };
+
+        var id = clock.timer(function (deep) {
+            //其中deep为0-1，表示改变的程度
+            doback(deep);
+        }, duration, callback);
+
+        return {
+            // 一个函数
+            // 用于在动画结束前结束动画
+            stop: function () {
+                var i;
+                for (i in $timers) {
+                    if ($timers[i].id == id) {
+                        $timers[i].id = void 0;
+                        return;
+                    }
+                }
+            }
+        };
+
     }
 
     function animation (doback, duration, callback) {
@@ -900,7 +900,7 @@
                         path: "path",
                         arc: "path",
                         circle: "circle",
-                        rect: "rect",
+                        rect: "path",
                     }[el] || "";
             if (_el == "")
                 throw new Error("Unsupported drawing method:" + el);
@@ -2174,59 +2174,59 @@
     }());
 
     /*!
-    * throttle of OIPage v1.3.0
+    * throttle of OIPage v1.5.0
     * git+https://github.com/oi-contrib/OIPage.git
     */
 
-    function throttle(callback, _option) {
-
-        // 缺省值
-        var option = {
-            time: 200,
-            keep: false,
-            opportunity: "end"
-        };
-        
-        // 校对
-        if (_option) {
-            for (var key in _option) {
-                option[key] = _option[key];
-            }
-        }
-
-        var hadInterval = false, hadClick = false, oneClick = false, arg;
-        return function () {
-            const _this = this;
-            arg = arguments;
-
-            // 如果前置任务都完成了
-            if (!hadInterval) {
-                if (option.opportunity != 'end') {
-                    callback.apply(_this, arg);
-                }
-                hadInterval = true;
-
-                var interval = setInterval(() => {
-                    if (hadClick) {
-                        if (!option.keep) {
-                            callback.apply(_this, arg);
-                        }
-                    } else {
-                        if (option.opportunity != 'begin') {
-                            if (oneClick || option.opportunity == 'end') callback.apply(_this, arg);
-                        }
-                        hadInterval = false;
-                        oneClick = false;
-                        clearInterval(interval);
-                    }
-                    hadClick = false;
-                }, option.time);
-            } else {
-                hadClick = true;
-                oneClick = true;
-            }
-
-        };
+    function throttle(callback, _option) {
+
+        // 缺省值
+        var option = {
+            time: 200,
+            keep: false,
+            opportunity: "end"
+        };
+        
+        // 校对
+        if (_option) {
+            for (var key in _option) {
+                option[key] = _option[key];
+            }
+        }
+
+        var hadInterval = false, hadClick = false, oneClick = false, arg;
+        return function () {
+            const _this = this;
+            arg = arguments;
+
+            // 如果前置任务都完成了
+            if (!hadInterval) {
+                if (option.opportunity != 'end') {
+                    callback.apply(_this, arg);
+                }
+                hadInterval = true;
+
+                var interval = setInterval(() => {
+                    if (hadClick) {
+                        if (!option.keep) {
+                            callback.apply(_this, arg);
+                        }
+                    } else {
+                        if (option.opportunity != 'begin') {
+                            if (oneClick || option.opportunity == 'end') callback.apply(_this, arg);
+                        }
+                        hadInterval = false;
+                        oneClick = false;
+                        clearInterval(interval);
+                    }
+                    hadClick = false;
+                }, option.time);
+            } else {
+                hadClick = true;
+                oneClick = true;
+            }
+
+        };
     }
 
     function mllData(geoJson) {