vislite 1.2.0-alpha.0 → 1.2.0-alpha.2

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"