vislite 1.8.0 → 1.9.0-alpha.0

package/lib/index.umd.js

@@ -1,5 +1,5 @@
 /*!
-* VISLite JavaScript Library v1.8.0
+* VISLite JavaScript Library v1.9.0-alpha.0
 * git+https://github.com/oi-contrib/VISLite.git
 */
 (function (global, factory) {
@@ -294,121 +294,121 @@
     }
 
     /*!
-    * animation of OIPage v1.7.0-alpha.3
+    * animation of OIPage v1.7.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 {object} 返回一个对象，包含一个stop方法，用于在动画结束前结束动画
-     */
-    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) {
-                    if (!globalThis.requestAnimationFrame) {
-                        $timerId = setInterval(clock.tick, $interval);
-                    } else {
-                        $timerId = globalThis.requestAnimationFrame(function step() {
-                            clock.tick();
-                            if ($timerId) $timerId = globalThis.requestAnimationFrame(step);
-                        });
-                    }
-                }
-            },
-
-            //被定时器调用，遍历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) {
-                    if (!globalThis.requestAnimationFrame) clearInterval($timerId);
-                    else globalThis.cancelAnimationFrame($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 {object} 返回一个对象，包含一个stop方法，用于在动画结束前结束动画
+     */
+    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) {
+                    if (!globalThis.requestAnimationFrame) {
+                        $timerId = setInterval(clock.tick, $interval);
+                    } else {
+                        $timerId = globalThis.requestAnimationFrame(function step() {
+                            clock.tick();
+                            if ($timerId) $timerId = globalThis.requestAnimationFrame(step);
+                        });
+                    }
+                }
+            },
+
+            //被定时器调用，遍历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) {
+                    if (!globalThis.requestAnimationFrame) clearInterval($timerId);
+                    else globalThis.cancelAnimationFrame($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) {
@@ -1399,6 +1399,7 @@
             this.__isPainter = isPainter;
             this.painter.textBaseline = 'middle';
             this.painter.textAlign = 'left';
+            this.painter.shadowColor = 'black';
         }
         Painter.prototype.useConfig = function (key, value) {
             if (this.__region && !this.__onlyView) {
@@ -2273,59 +2274,59 @@
     }());
 
     /*!
-    * throttle of OIPage v1.7.0-alpha.3
+    * throttle of OIPage v1.7.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) {
@@ -2781,7 +2782,7 @@
             var beginDeg = Math.PI * -0.5, currenDeg;
             for (var i = 0; i < initPie.length; i++) {
                 currenDeg = values[i] / totalValue * Math.PI * 2;
-                var radius = [this.__option.radius[0], this.__option.radius[1] * (1 + (hoverIndex === i ? 0.05 : 0))];
+                var radius = [this.__option.radius[0] * (1 + (this.__option.radius[0] > 0 && hoverIndex === i ? -0.1 : 0)), this.__option.radius[1] * (1 + (hoverIndex === i ? 0.05 : 0))];
                 var pdeg = beginDeg + currenDeg * 0.5, pradius = Math.max(this.__option.radius[0], this.__option.radius[1]);
                 var p0 = rotate$1(pie.cx, pie.cy, pdeg, pie.cx + pradius, pie.cy);
                 var p1 = rotate$1(pie.cx, pie.cy, pdeg, pie.cx + pradius + 15, pie.cy);
@@ -2833,6 +2834,7 @@
             animation$1(function (deep) {
                 if (_this.__prePie) {
                     for (var i = 0; i < cachePie.count; i++) {
+                        cachePie.node[i].radius[0] = _this.__prePie.node[i].radius[0] + (newPie.node[i].radius[0] - _this.__prePie.node[i].radius[0]) * deep;
                         cachePie.node[i].radius[1] = _this.__prePie.node[i].radius[1] + (newPie.node[i].radius[1] - _this.__prePie.node[i].radius[1]) * deep;
                     }
                 }