vislite 1.2.0-alpha.1 → 1.2.0-alpha.2

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

@@ -0,0 +1,5 @@
+/*!
+* mergeOption of VISLite JavaScript Library v1.2.0-alpha.2
+* git+https://github.com/oi-contrib/VISLite.git
+*/
+var t=Object.prototype.toString;function e(e){if(null===e||"object"!=typeof e||"[object Object]"!=function(e){return null==e?void 0===e?"[object Undefined]":"[object Null]":t.call(e)}(e))return!1;if(null===Object.getPrototypeOf(e))return!0;for(var o=e;null!==Object.getPrototypeOf(o);)o=Object.getPrototypeOf(o);return Object.getPrototypeOf(e)===o}function o(t,o){!function t(o,r){for(var n in r){var c=r[n];e(c)?(o[n]||(o[n]={}),t(o[n],r[n])):o[n]=c}}(t,o)}export{o as default};

package/lib/move/index.es.js

@@ -1,5 +1,5 @@
 /*!
-* move of VISLite JavaScript Library v1.2.0-alpha.1
+* move of VISLite JavaScript Library v1.2.0-alpha.2
 * git+https://github.com/oi-contrib/VISLite.git
 */
 function move (ax, ay, d, x, y) {

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

@@ -1,5 +1,5 @@
 /*!
-* move of VISLite JavaScript Library v1.2.0-alpha.1
+* move of VISLite JavaScript Library v1.2.0-alpha.2
 * git+https://github.com/oi-contrib/VISLite.git
 */
 function t(t,r,a,e,n){var u=Math.sqrt(t*t+r*r);return[t*a/u+e,r*a/u+n]}export{t as default};

package/lib/rotate/index.es.js

@@ -1,5 +1,5 @@
 /*!
-* rotate of VISLite JavaScript Library v1.2.0-alpha.1
+* rotate of VISLite JavaScript Library v1.2.0-alpha.2
 * git+https://github.com/oi-contrib/VISLite.git
 */
 function rotate (cx, cy, deg, x, y) {

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

@@ -1,5 +1,5 @@
 /*!
-* rotate of VISLite JavaScript Library v1.2.0-alpha.1
+* rotate of VISLite JavaScript Library v1.2.0-alpha.2
 * git+https://github.com/oi-contrib/VISLite.git
 */
 function t(t,a,n,r,e){var o=Math.cos(n),s=Math.sin(n);return[(r-t)*o-(e-a)*s+t,(r-t)*s+(e-a)*o+a]}export{t as default};

package/lib/ruler/index.es.js

@@ -1,5 +1,5 @@
 /*!
-* ruler of VISLite JavaScript Library v1.2.0-alpha.1
+* ruler of VISLite JavaScript Library v1.2.0-alpha.2
 * git+https://github.com/oi-contrib/VISLite.git
 */
 function ruler (maxValue, minValue, num, option) {

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

@@ -1,5 +1,5 @@
 /*!
-* ruler of VISLite JavaScript Library v1.2.0-alpha.1
+* ruler of VISLite JavaScript Library v1.2.0-alpha.2
 * git+https://github.com/oi-contrib/VISLite.git
 */
 function n(n,r,t,e){if(n<r){var i=r;r=n,n=i}else if(n==r)return[n];var a=function(n){for(var r=n<100&&n>-100?10:.1,t=-1,e=n;10==r?e>=-100&&e<=100:e<=-100||e>=100;)t+=1,e*=r;if(10==r)return Math.pow(10,t);for(var i="0.",a=1;a<t;a++)i+="0";return+(i+"1")}(n-r),u=Math.ceil((n-r)*a/t),f=function(t){var e=({3:2,4:5,6:5,7:5,8:10,9:10,11:10,12:10,13:15,14:15,16:15,17:15,18:20,19:20,21:20,22:20,23:25,24:25,26:25,27:25}[u+t]||u+t)/a,i=Math.floor(r/e)*e,f=[];f.push(i);for(var l=1;f[f.length-1]<n;l++)f.push(i+e*l);return f},l=f(0),o=function(){for(var n=[],t=l[l.length-1]-(null==e?void 0:e.max),i=0;i<l.length;i++)i+1<l.length&&l[i+1]-t<r||n.push(l[i]-t);return n},h=function(){for(var r=[],t=l[0]-(null==e?void 0:e.min),i=0;i<l.length&&(r[i]=l[i]-t,!(n<=r[i]));i++);return r};if(e){if("max"in e&&"min"in e&&e.max>=n&&e.min<=r){var m=function(){if(l[0]>=e.min&&l[l.length-1]<=e.max)return!0;var n=o();if(n[0]>=e.min&&n[n.length-1]<=e.max)return l=n,!0;var r=h();return r[0]>=e.min&&r[n.length-1]<=e.max?(l=r,!0):void 0};if(m())return l;for(var v=1;v<100;v++){if(l=f(v),m())return l;if(l=f(-v),m())return l}}"max"in e&&e.max>=n?e.max<l[l.length-1]&&(l=o()):"min"in e&&e.min<=r&&e.min>l[0]&&(l=h())}for(var g=0;g<l.length;g++){var s=l[g]+"";/\./.test(s)&&(/9{7,}$/.test(s)?(s=s.replace(/9{7,}$/,""),l[g]=+(s.substring(0,s.length-1)+(+s[s.length-1]+1))):/0{7,}\d$/.test(s)&&(l[g]=+s.replace(/0{7,}\d$/,"")))}return l}export{n as default};

package/lib/scale/index.es.js

@@ -1,5 +1,5 @@
 /*!
-* scale of VISLite JavaScript Library v1.2.0-alpha.1
+* scale of VISLite JavaScript Library v1.2.0-alpha.2
 * git+https://github.com/oi-contrib/VISLite.git
 */
 function scale (cx, cy, times, x, y) {

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

@@ -1,5 +1,5 @@
 /*!
-* scale of VISLite JavaScript Library v1.2.0-alpha.1
+* scale of VISLite JavaScript Library v1.2.0-alpha.2
 * git+https://github.com/oi-contrib/VISLite.git
 */
 function t(t,e,n,r,u){return[n*(r-t)+t,n*(u-e)+e]}export{t as default};

package/lib/throttle/index.es.js

@@ -1,17 +1,17 @@
 /*!
-* throttle of VISLite JavaScript Library v1.2.0-alpha.1
+* throttle of VISLite JavaScript Library v1.2.0-alpha.2
 * git+https://github.com/oi-contrib/VISLite.git
 */
-function mergeOption (option, defaultOption) {
-    for (var key in option) {
-        defaultOption[key] = option[key];
+function initOption(setOption, defaultOption) {
+    for (var key in setOption) {
+        defaultOption[key] = setOption[key];
     }
     return defaultOption;
 }
 
 function throttle (callback, option) {
     if (option === void 0) { option = {}; }
-    option = mergeOption(option, {
+    option = initOption(option, {
         time: 200,
         keep: false,
         opportunity: "end"

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

@@ -1,5 +1,5 @@
 /*!
-* throttle of VISLite JavaScript Library v1.2.0-alpha.1
+* throttle of VISLite JavaScript Library v1.2.0-alpha.2
 * git+https://github.com/oi-contrib/VISLite.git
 */
 function t(t,n){void 0===n&&(n={}),n=function(t,n){for(var e in t)n[e]=t[e];return n}(n,{time:200,keep:!1,opportunity:"end"});var e,p=!1,r=!1,i=!1;return function(){var o=this;if(e=arguments,p)r=!0,i=!0;else{"end"!=n.opportunity&&t.apply(o,e),p=!0;var a=setInterval((function(){r?n.keep||t.apply(o,e):("begin"!=n.opportunity&&(i||"end"==n.opportunity)&&t.apply(o,e),p=!1,i=!1,clearInterval(a)),r=!1}),n.time)}}}export{t as default};

package/package/assemble/index.ts

@@ -0,0 +1,3 @@
+import assemble from "../../src/common/assemble"
+
+export default assemble

package/package/index.ts

@@ -26,6 +26,11 @@ import throttle from "./throttle/index"
 
 import TreeLayout from "./TreeLayout/index"
 
+import initOption from "./initOption/index"
+import mergeOption from "./mergeOption/index"
+
+import assemble from "./assemble/index"
+
 export default {
 
     // 插值
@@ -60,7 +65,12 @@ export default {
 
     // 辅助
     throttle,
+    assemble,
 
     // 布局
-    TreeLayout
+    TreeLayout,
+
+    // 配置项
+    initOption,
+    mergeOption
 }

package/package/initOption/index.ts

@@ -0,0 +1,3 @@
+import { initOption } from "../../src/common/option"
+
+export default initOption

package/package/mergeOption/index.ts

@@ -0,0 +1,3 @@
+import { mergeOption } from "../../src/common/option"
+
+export default mergeOption

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vislite",
-  "version": "1.2.0-alpha.1",
+  "version": "1.2.0-alpha.2",
   "description": "灵活、快速、简单的数据可视化交互式跨端前端库",
   "main": "./lib/index.umd.min.js",
   "typings": "./types/index.d.ts",

package/src/Canvas.ts

@@ -2,7 +2,7 @@ import type CanvasType from '../types/Canvas'
 import type CanvasOptionType from '../types/CanvasOption'
 
 import OralCanvas from './common/canvas/index'
-import mergeOption from './common/mergeOption'
+import { initOption } from './common/option'
 
 class Canvas extends OralCanvas implements CanvasType {
     private __canvas: HTMLCanvasElement
@@ -12,7 +12,7 @@ class Canvas extends OralCanvas implements CanvasType {
             throw new Error("VISLite Canvas:The mount point requires an HTMLElement type but encountered null.")
         }
 
-        option = mergeOption(option, {
+        option = initOption(option, {
             region: true,
             willReadFrequently: false
         })

package/src/animation.ts

@@ -1,99 +1,99 @@
-//当前正在运动的动画的tick函数堆栈
-let $timers: any[] = []
-//唯一定时器的定时间隔
-const $interval = 13
-//定时器ID
-let $timerId: any
-
-/**
- * 动画轮播
- * @param {function} doback 轮询函数，有一个形参deep，0-1，表示执行进度
- * @param {number} duration 动画时长，可选
- * @param {function} callback 动画结束回调，可选，有一个形参deep，0-1，表示执行进度
- *
- * @returns {function} 返回一个函数，调用该函数，可以提前结束动画
- */
-export default function (doback: (deep: number) => void, duration: number = 400, callback: (deep: number) => void = () => { }): Function {
-
-    const clock = {
-        //把tick函数推入堆栈
-        "timer": function (tick: (deep: number) => void, duration: number, callback: (deep: number) => void) {
-            if (!tick) {
-                throw new Error('Tick is required!')
-            }
-            const 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 () {
-            let createTime: Date, flag: number, tick: (deep: number) => void, callback: (deep: number) => void, timer: any, duration: number, passTime: number
-            const timers: any[] = $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
-            }
-        }
-    }
-
-    const id = clock.timer(function (deep: number) {
-        //其中deep为0-1，表示改变的程度
-        doback(deep)
-    }, duration, callback)
-
-    // 返回一个函数
-    // 用于在动画结束前结束动画
-    return function () {
-        let i: string
-        for (i in $timers) {
-            if ($timers[i].id == id) {
-                $timers[i].id = void 0
-                return
-            }
-        }
-    }
-
+//当前正在运动的动画的tick函数堆栈
+let $timers: any[] = []
+//唯一定时器的定时间隔
+const $interval = 13
+//定时器ID
+let $timerId: any
+
+/**
+ * 动画轮播
+ * @param {function} doback 轮询函数，有一个形参deep，0-1，表示执行进度
+ * @param {number} duration 动画时长，可选
+ * @param {function} callback 动画结束回调，可选，有一个形参deep，0-1，表示执行进度
+ *
+ * @returns {function} 返回一个函数，调用该函数，可以提前结束动画
+ */
+export default function (doback: (deep: number) => void, duration: number = 400, callback: (deep: number) => void = () => { }): Function {
+
+    const clock = {
+        //把tick函数推入堆栈
+        "timer": function (tick: (deep: number) => void, duration: number, callback: (deep: number) => void) {
+            if (!tick) {
+                throw new Error('Tick is required!')
+            }
+            const 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 () {
+            let createTime: Date, flag: number, tick: (deep: number) => void, callback: (deep: number) => void, timer: any, duration: number, passTime: number
+            const timers: any[] = $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
+            }
+        }
+    }
+
+    const id = clock.timer(function (deep: number) {
+        //其中deep为0-1，表示改变的程度
+        doback(deep)
+    }, duration, callback)
+
+    // 返回一个函数
+    // 用于在动画结束前结束动画
+    return function () {
+        let i: string
+        for (i in $timers) {
+            if ($timers[i].id == id) {
+                $timers[i].id = void 0
+                return
+            }
+        }
+    }
+
 }

package/src/common/option.ts

@@ -0,0 +1,30 @@
+import { isPlainObject } from "./type"
+
+// 初始化配置
+export function initOption(setOption: any, defaultOption: any) {
+    for (const key in setOption) {
+        defaultOption[key] = setOption[key]
+    }
+
+    return defaultOption
+}
+
+// 合并配置
+export function mergeOption(oldOption: any, newOption: any) {
+    (function doit(oldOption, newOption) {
+
+        for (const key in newOption) {
+            const value = newOption[key]
+
+            if (isPlainObject(value)) {
+                if (!oldOption[key]) oldOption[key] = {}
+
+                doit(oldOption[key], newOption[key])
+            } else {
+                oldOption[key] = value
+            }
+
+        }
+
+    })(oldOption, newOption)
+}

package/src/common/tree/index.ts

@@ -2,7 +2,7 @@ import type TreeConfigType from '../../../types/TreeConfig'
 import type { TreeResultType } from '../../../types/Tree'
 
 import toPlainTree from './toPlainTree'
-import mergeOption from '../mergeOption'
+import { initOption } from '../option'
 
 class Tree {
     readonly name: string = 'Tree'
@@ -10,7 +10,7 @@ class Tree {
     private __config: TreeConfigType
 
     constructor(config: TreeConfigType = {}) {
-        this.__config = mergeOption(config, {
+        this.__config = initOption(config, {
             root: (initTree: any) => initTree,
             children: (parentTree: any) => parentTree.children,
             id: (treedata: any) => treedata.name

package/src/common/type.ts

@@ -0,0 +1,27 @@
+let toString = Object.prototype.toString
+
+// 获取一个值的类型字符串[object type]
+export function getType(value: any) {
+    if (value == null) {
+        return value === undefined ? '[object Undefined]' : '[object Null]'
+    }
+    return toString.call(value)
+}
+
+// 判断一个值是不是一个朴素的'对象'
+export function isPlainObject(value: any) {
+    if (value === null || typeof value !== 'object' || getType(value) != '[object Object]') {
+        return false
+    }
+
+    // 如果原型为null
+    if (Object.getPrototypeOf(value) === null) {
+        return true
+    }
+
+    let proto = value
+    while (Object.getPrototypeOf(proto) !== null) {
+        proto = Object.getPrototypeOf(proto)
+    }
+    return Object.getPrototypeOf(value) === proto
+}

package/src/layout/TreeLayout.ts

@@ -3,7 +3,7 @@ import type { TreeResultType } from '../../types/Tree'
 import type TreeOptionType from '../../types/TreeOption'
 
 import Tree from '../common/tree/index'
-import mergeOption from '../common/mergeOption'
+import { initOption } from '../common/option'
 import animation from '../animation'
 import rotate from '../rotate'
 
@@ -30,7 +30,7 @@ class TreeLayout extends Tree implements TreeLayoutType {
     private __noOpens = {}
 
     setOption(option: TreeOptionType) {
-        mergeOption(option, this.__option)
+        initOption(option, this.__option)
         return this
     }
 

package/src/throttle.ts

@@ -1,11 +1,11 @@
 import type throttleOptionType from '../types/throttleOption'
 
-import mergeOption from './common/mergeOption'
+import { initOption } from './common/option'
 
 export default function (callback: Function, option: throttleOptionType = {}) {
 
     // 校对缺省值
-    option = mergeOption(option, <throttleOptionType>{
+    option = initOption(option, <throttleOptionType>{
         time: 200,
         keep: false,
         opportunity: "end"

package/types/assemble.d.ts

@@ -0,0 +1,6 @@
+/**
+ * 步进生成器
+ */
+export default interface assembleType {
+    (begin: number, end: number, step: number, count: number): () => Array<number>
+}

package/types/index.d.ts

@@ -23,10 +23,13 @@ import TextureType from './Texture'
 import MapType from './Map'
 
 import throttleType from './throttle'
+import assembleType from './assemble'
 
 import TreeLayoutType from './TreeLayout'
 import TreeConfigType from './TreeConfig'
 
+import { initOptionType, mergeOptionType } from './option'
+
 // 插值
 interface NewCardinalType extends CardinalType {
     new(t?: number): this
@@ -105,9 +108,14 @@ export default class VISLite {
 
     // 辅助
     static throttle: throttleType
+    static assemble: assembleType
 
     // 布局
     static TreeLayout: NewTreeLayoutType
+
+    // 配置项
+    static initOption: initOptionType
+    static mergeOption: mergeOptionType
 }
 
 // 插值
@@ -141,6 +149,11 @@ export let Mercator: NewMercatorType
 
 // 辅助
 export let throttle: throttleType
+export let assemble: assembleType
 
 // 布局
-export let TreeLayout: NewTreeLayoutType
+export let TreeLayout: NewTreeLayoutType
+
+// 配置项
+export let initOption: initOptionType
+export let mergeOption: mergeOptionType

package/types/option.d.ts

@@ -0,0 +1,13 @@
+/**
+ * 初始化配置
+ */
+export interface initOptionType {
+    (setOption: any, defaultOption: any): any
+}
+
+/**
+ * 合并配置
+ */
+export interface mergeOptionType {
+    (oldOption: any, newOption: any): void
+}

package/src/common/mergeOption.ts

@@ -1,7 +0,0 @@
-export default function (option: any, defaultOption: any) {
-    for (const key in option) {
-        defaultOption[key] = option[key]
-    }
-
-    return defaultOption
-}