vislite 1.6.0 → 1.6.1

package/src/common/svg/tool.ts

@@ -1,52 +1,52 @@
-import type SVGConfigType from '../../../types/SVGConfig'
-
-import { XLINK_ATTRIBUTE } from "./dictionary"
-
-const setLineAttr = (el: SVGElement, config: SVGConfigType) => {
-    setAttribute(el, "stroke-dasharray", (config.lineDash as Array<number>).join(','))
-    setAttribute(el, "stroke-width", config.lineWidth + "")
-    setAttribute(el, "stroke-linecap", config.lineCap + "")
-    setAttribute(el, "stroke-linejoin", config.lineJoin + "")
-}
-
-// 新建节点
-export function toNode(tagname: string) {
-    return document.createElementNS('http://www.w3.org/2000/svg', tagname)
-}
-
-// 设置属性
-const _setAttribute = function (el: SVGElement, key: string, value: string | number) {
-
-    // 需要使用xlink命名空间的xml属性
-    if (XLINK_ATTRIBUTE.indexOf(key) > -1) {
-        el.setAttributeNS("http://www.w3.org/1999/xlink", 'xlink:' + key, value + "")
-    }
-
-    // 否则
-    else {
-        el.setAttribute(key, value + "")
-    }
-}
-export const setAttribute = _setAttribute
-
-// 获取属性
-export function getAttribute(el: SVGElement, key: string) {
-    if (XLINK_ATTRIBUTE.indexOf(key) > -1) key = 'xlink:' + key
-    return el.getAttribute(key)
-}
-
-export function full(el: SVGElement, config: SVGConfigType) {
-    setLineAttr(el, config)
-    _setAttribute(el, "stroke", config.strokeStyle as string)
-    _setAttribute(el, "fill", config.fillStyle as string)
-}
-
-export function fill(el: SVGElement, config: SVGConfigType) {
-    _setAttribute(el, "fill", config.fillStyle as string)
-}
-
-export function stroke(el: SVGElement, config: SVGConfigType) {
-    setLineAttr(el, config)
-    _setAttribute(el, "stroke", config.strokeStyle as string)
-    _setAttribute(el, "fill", "none")
+import type SVGConfigType from '../../../types/SVGConfig'
+
+import { XLINK_ATTRIBUTE } from "./dictionary"
+
+const setLineAttr = (el: SVGElement, config: SVGConfigType) => {
+    setAttribute(el, "stroke-dasharray", (config.lineDash as Array<number>).join(','))
+    setAttribute(el, "stroke-width", config.lineWidth + "")
+    setAttribute(el, "stroke-linecap", config.lineCap + "")
+    setAttribute(el, "stroke-linejoin", config.lineJoin + "")
+}
+
+// 新建节点
+export function toNode(tagname: string) {
+    return document.createElementNS('http://www.w3.org/2000/svg', tagname)
+}
+
+// 设置属性
+const _setAttribute = function (el: SVGElement, key: string, value: string | number) {
+
+    // 需要使用xlink命名空间的xml属性
+    if (XLINK_ATTRIBUTE.indexOf(key) > -1) {
+        el.setAttributeNS("http://www.w3.org/1999/xlink", 'xlink:' + key, value + "")
+    }
+
+    // 否则
+    else {
+        el.setAttribute(key, value + "")
+    }
+}
+export const setAttribute = _setAttribute
+
+// 获取属性
+export function getAttribute(el: SVGElement, key: string) {
+    if (XLINK_ATTRIBUTE.indexOf(key) > -1) key = 'xlink:' + key
+    return el.getAttribute(key)
+}
+
+export function full(el: SVGElement, config: SVGConfigType) {
+    setLineAttr(el, config)
+    _setAttribute(el, "stroke", config.strokeStyle as string)
+    _setAttribute(el, "fill", config.fillStyle as string)
+}
+
+export function fill(el: SVGElement, config: SVGConfigType) {
+    _setAttribute(el, "fill", config.fillStyle as string)
+}
+
+export function stroke(el: SVGElement, config: SVGConfigType) {
+    setLineAttr(el, config)
+    _setAttribute(el, "stroke", config.strokeStyle as string)
+    _setAttribute(el, "fill", "none")
 }

package/src/common/tree/index.ts

@@ -1,26 +1,26 @@
-import type TreeConfigType from '../../../types/TreeConfig'
-import type { TreeResultType } from '../../../types/Tree'
-
-import toPlainTree from './toPlainTree'
-import { initOption } from '../option'
-
-class Tree {
-    readonly name: string = 'Tree'
-
-    private __config: TreeConfigType
-
-    constructor(config: TreeConfigType = {}) {
-        this.__config = initOption(config, {
-            root: (initTree: any) => initTree,
-            children: (parentTree: any) => parentTree.children,
-            id: (treedata: any) => treedata.name
-        })
-    }
-
-    use(initTree: any, noOpens = {}): TreeResultType {
-        return toPlainTree(initTree, this.__config, noOpens)
-    }
-
-}
-
+import type TreeConfigType from '../../../types/TreeConfig'
+import type { TreeResultType } from '../../../types/Tree'
+
+import toPlainTree from './toPlainTree'
+import { initOption } from '../option'
+
+class Tree {
+    readonly name: string = 'Tree'
+
+    private __config: TreeConfigType
+
+    constructor(config: TreeConfigType = {}) {
+        this.__config = initOption(config, {
+            root: (initTree: any) => initTree,
+            children: (parentTree: any) => parentTree.children,
+            id: (treedata: any) => treedata.name
+        })
+    }
+
+    use(initTree: any, noOpens = {}): TreeResultType {
+        return toPlainTree(initTree, this.__config, noOpens)
+    }
+
+}
+
 export default Tree

package/src/common/tree/toInnerTree.ts

@@ -1,62 +1,62 @@
-import type { default as TreeConfigType, rootType, childrenType, idType } from '../../../types/TreeConfig'
-
-/**
- * 根据配置的层次关系（配置的id,child,root）把原始数据变成内部结构，方便后期位置计算
- *
- * tempTree[id] = {
- *  "data": 原始数据,
- *  "pid": 父亲ID,
- *  "id": 唯一标识ID,
- *  "show": boolean,
- *  "isOpen": boolean,
- *  "children": [cid1、cid2、...]
- * }
- */
-export default (initTree: any, config: TreeConfigType) => {
-    const tempTree: {
-        [key: string]: any
-    } = {}
-
-    // 根结点
-    const temp = (config.root as rootType)(initTree)
-    let id: number | string, rid: number | string
-    id = rid = (config.id as idType)(temp)
-    tempTree[id] = {
-        "data": temp,
-        "pid": null,
-        "id": id,
-        "isOpen": true,
-        "show": true,
-        "deg": 0,
-        "children": []
-    }
-
-    let num: number = 1
-
-        // 根据传递的原始数据，生成内部统一结构
-        ; (function createTree(pdata: any, pid: number | string) {
-            const children = (config.children as childrenType)(pdata, initTree)
-            num += children ? children.length : 0
-            for (let flag = 0; children && flag < children.length; flag++) {
-                id = (config.id as idType)(children[flag])
-                tempTree[pid].children.push(id);
-                tempTree[id] = {
-                    "data": children[flag],
-                    "pid": pid,
-                    "id": id,
-                    "isOpen": true,
-                    "show": true,
-                    "deg": 0,
-                    "children": []
-                }
-                createTree(children[flag], id)
-            }
-        })(temp, id)
-
-    return {
-        rid,
-        value: tempTree,
-        num
-    }
-
+import type { default as TreeConfigType, rootType, childrenType, idType } from '../../../types/TreeConfig'
+
+/**
+ * 根据配置的层次关系（配置的id,child,root）把原始数据变成内部结构，方便后期位置计算
+ *
+ * tempTree[id] = {
+ *  "data": 原始数据,
+ *  "pid": 父亲ID,
+ *  "id": 唯一标识ID,
+ *  "show": boolean,
+ *  "isOpen": boolean,
+ *  "children": [cid1、cid2、...]
+ * }
+ */
+export default (initTree: any, config: TreeConfigType) => {
+    const tempTree: {
+        [key: string]: any
+    } = {}
+
+    // 根结点
+    const temp = (config.root as rootType)(initTree)
+    let id: number | string, rid: number | string
+    id = rid = (config.id as idType)(temp)
+    tempTree[id] = {
+        "data": temp,
+        "pid": null,
+        "id": id,
+        "isOpen": true,
+        "show": true,
+        "deg": 0,
+        "children": []
+    }
+
+    let num: number = 1
+
+        // 根据传递的原始数据，生成内部统一结构
+        ; (function createTree(pdata: any, pid: number | string) {
+            const children = (config.children as childrenType)(pdata, initTree)
+            num += children ? children.length : 0
+            for (let flag = 0; children && flag < children.length; flag++) {
+                id = (config.id as idType)(children[flag])
+                tempTree[pid].children.push(id);
+                tempTree[id] = {
+                    "data": children[flag],
+                    "pid": pid,
+                    "id": id,
+                    "isOpen": true,
+                    "show": true,
+                    "deg": 0,
+                    "children": []
+                }
+                createTree(children[flag], id)
+            }
+        })(temp, id)
+
+    return {
+        rid,
+        value: tempTree,
+        num
+    }
+
 }

package/src/common/type.ts

@@ -1,27 +1,27 @@
-const 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
+const 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/common/webgl/buffer.ts

@@ -1,80 +1,80 @@
-// 缓冲区分为两种：
-// 1.缓冲区中保存了包含顶点的数据
-// 2.缓冲区保存了包含顶点的索引值
-
-// 获取一个新的缓冲区
-// isElement默认false，创建第一种缓冲区，为true创建第二种
-const newBuffer = (painter: WebGLRenderingContext) => {
-    return painter.createBuffer()
-}
-
-// 数据写入缓冲区
-// data是一个类型化数组，表示写入的数据
-// usage表示程序如何使用存储在缓冲区的数据
-const writeBuffer = (painter: WebGLRenderingContext, data: ArrayBuffer, isElement: boolean, usage: number) => {
-    const TYPE = isElement ? painter.ELEMENT_ARRAY_BUFFER : painter.ARRAY_BUFFER
-    painter.bufferData(TYPE, data, usage)
-}
-
-// 使用缓冲区数据
-// location指定待分配的attribute变量的存储位置
-// size每个分量个数
-// type数据类型，应该是以下的某个：
-//      gl.UNSIGNED_BYTE    Uint8Array
-//      gl.SHORT            Int16Array
-//      gl.UNSIGNED_SHORT   Uint16Array
-//      gl.INT              Int32Array
-//      gl.UNSIGNED_INT     Uint32Array
-//      gl.FLOAT            Float32Array
-// stride相邻两个数据项的字节数
-// offset数据的起点字节位置
-// normalized是否把非浮点型的数据归一化到[0,1]或[-1,1]区间
-const useBuffer = (painter: WebGLRenderingContext, location: number, size: number, type: number, stride: number, offset: number, normalized: boolean) => {
-
-    // 把缓冲区对象分配给目标变量
-    painter.vertexAttribPointer(location, size, type, normalized, stride, offset)
-
-    // 连接目标对象和缓冲区对象
-    painter.enableVertexAttribArray(location)
-}
-
-class BufferObject {
-
-    private __painter: WebGLRenderingContext
-    private __isElement: boolean
-
-    private __buffer: WebGLBuffer
-    private __type: number
-    private __fsize: number
-
-    constructor(painter: WebGLRenderingContext, isElement: boolean = false) {
-        this.__painter = painter
-        this.__isElement = isElement
-
-        this.__buffer = newBuffer(painter) as WebGLBuffer
-        this.__type = isElement ? painter.ELEMENT_ARRAY_BUFFER : painter.ARRAY_BUFFER
-    }
-
-    // 使用这个缓冲区对象
-    // （先于写入和分配）
-    use() {
-        this.__painter.bindBuffer(this.__type, this.__buffer) // 绑定到目标
-        return this
-    }
-
-    // 写入数据
-    write(data: Uint8Array | Int16Array | Uint16Array | Int32Array | Uint32Array | Float32Array) {
-        writeBuffer(this.__painter, data, this.__isElement, this.__painter.STATIC_DRAW)
-        this.__fsize = data.BYTES_PER_ELEMENT
-        return this
-    }
-
-    // 分配使用
-    // 第2～4位参数分别表示：一个完整数据的长度、一组数据的长度、读取位置偏移
-    divide(location: number, size: number, stride: number, offset: number = 0) {
-        useBuffer(this.__painter, location, size, this.__painter.FLOAT, stride * this.__fsize, offset * this.__fsize, false)
-        return this
-    }
-}
-
+// 缓冲区分为两种：
+// 1.缓冲区中保存了包含顶点的数据
+// 2.缓冲区保存了包含顶点的索引值
+
+// 获取一个新的缓冲区
+// isElement默认false，创建第一种缓冲区，为true创建第二种
+const newBuffer = (painter: WebGLRenderingContext) => {
+    return painter.createBuffer()
+}
+
+// 数据写入缓冲区
+// data是一个类型化数组，表示写入的数据
+// usage表示程序如何使用存储在缓冲区的数据
+const writeBuffer = (painter: WebGLRenderingContext, data: ArrayBuffer, isElement: boolean, usage: number) => {
+    const TYPE = isElement ? painter.ELEMENT_ARRAY_BUFFER : painter.ARRAY_BUFFER
+    painter.bufferData(TYPE, data, usage)
+}
+
+// 使用缓冲区数据
+// location指定待分配的attribute变量的存储位置
+// size每个分量个数
+// type数据类型，应该是以下的某个：
+//      gl.UNSIGNED_BYTE    Uint8Array
+//      gl.SHORT            Int16Array
+//      gl.UNSIGNED_SHORT   Uint16Array
+//      gl.INT              Int32Array
+//      gl.UNSIGNED_INT     Uint32Array
+//      gl.FLOAT            Float32Array
+// stride相邻两个数据项的字节数
+// offset数据的起点字节位置
+// normalized是否把非浮点型的数据归一化到[0,1]或[-1,1]区间
+const useBuffer = (painter: WebGLRenderingContext, location: number, size: number, type: number, stride: number, offset: number, normalized: boolean) => {
+
+    // 把缓冲区对象分配给目标变量
+    painter.vertexAttribPointer(location, size, type, normalized, stride, offset)
+
+    // 连接目标对象和缓冲区对象
+    painter.enableVertexAttribArray(location)
+}
+
+class BufferObject {
+
+    private __painter: WebGLRenderingContext
+    private __isElement: boolean
+
+    private __buffer: WebGLBuffer
+    private __type: number
+    private __fsize: number
+
+    constructor(painter: WebGLRenderingContext, isElement: boolean = false) {
+        this.__painter = painter
+        this.__isElement = isElement
+
+        this.__buffer = newBuffer(painter) as WebGLBuffer
+        this.__type = isElement ? painter.ELEMENT_ARRAY_BUFFER : painter.ARRAY_BUFFER
+    }
+
+    // 使用这个缓冲区对象
+    // （先于写入和分配）
+    use() {
+        this.__painter.bindBuffer(this.__type, this.__buffer) // 绑定到目标
+        return this
+    }
+
+    // 写入数据
+    write(data: Uint8Array | Int16Array | Uint16Array | Int32Array | Uint32Array | Float32Array) {
+        writeBuffer(this.__painter, data, this.__isElement, this.__painter.STATIC_DRAW)
+        this.__fsize = data.BYTES_PER_ELEMENT
+        return this
+    }
+
+    // 分配使用
+    // 第2～4位参数分别表示：一个完整数据的长度、一组数据的长度、读取位置偏移
+    divide(location: number, size: number, stride: number, offset: number = 0) {
+        useBuffer(this.__painter, location, size, this.__painter.FLOAT, stride * this.__fsize, offset * this.__fsize, false)
+        return this
+    }
+}
+
 export default BufferObject

package/src/common/webgl/getWebGLContext.ts

@@ -1,46 +1,46 @@
-import type { WebGLmodeType } from "../../../types/getWebGLContext"
-
-interface OptsType {
-    preserveDrawingBuffer?: boolean
-}
-export default function (canvas: HTMLCanvasElement, scale: number, opts: OptsType = {}, mode: WebGLmodeType = "scaleToFill") {
-    const names = ["experimental-webgl", "webkit-3d", "moz-webgl"]
-    let painter = canvas.getContext("webgl", opts) as WebGL2RenderingContext
-    for (let i = 0; i < names.length; i++) {
-        try {
-            painter = canvas.getContext(names[i], opts) as WebGL2RenderingContext
-        } catch (e) { }
-        if (painter) break
-    }
-    if (!painter) throw new Error('Non canvas or browser does not support webgl.')
-
-    const width = painter.canvas.width, height = painter.canvas.height
-
-    let scaleX = scale, scaleY = scale
-    if (mode == "aspectFit") {
-        if (width > height) {
-            scaleX *= height / width
-        } else if (height > width) {
-            scaleY *= width / height
-        }
-    } else if (mode == "aspectFill") {
-        if (width > height) {
-            scaleY *= width / height
-        } else if (height > width) {
-            scaleX *= height / width
-        }
-    }
-
-    const viewWidth = width * scaleX
-    const viewHeight = height * scaleY
-
-    painter.viewport((width - viewWidth) * 0.5, (height - viewHeight) * 0.5, viewWidth, viewHeight)
-
-    // https://developer.mozilla.org/zh-CN/docs/Web/API/WebGLRenderingContext/depthFunc
-    painter.depthFunc(painter.LEQUAL)
-
-    // 开启深度计算
-    painter.enable(painter.DEPTH_TEST)
-
-    return painter
+import type { WebGLmodeType } from "../../../types/getWebGLContext"
+
+interface OptsType {
+    preserveDrawingBuffer?: boolean
+}
+export default function (canvas: HTMLCanvasElement, scale: number, opts: OptsType = {}, mode: WebGLmodeType = "scaleToFill") {
+    const names = ["experimental-webgl", "webkit-3d", "moz-webgl"]
+    let painter = canvas.getContext("webgl", opts) as WebGL2RenderingContext
+    for (let i = 0; i < names.length; i++) {
+        try {
+            painter = canvas.getContext(names[i], opts) as WebGL2RenderingContext
+        } catch (e) { }
+        if (painter) break
+    }
+    if (!painter) throw new Error('Non canvas or browser does not support webgl.')
+
+    const width = painter.canvas.width, height = painter.canvas.height
+
+    let scaleX = scale, scaleY = scale
+    if (mode == "aspectFit") {
+        if (width > height) {
+            scaleX *= height / width
+        } else if (height > width) {
+            scaleY *= width / height
+        }
+    } else if (mode == "aspectFill") {
+        if (width > height) {
+            scaleY *= width / height
+        } else if (height > width) {
+            scaleX *= height / width
+        }
+    }
+
+    const viewWidth = width * scaleX
+    const viewHeight = height * scaleY
+
+    painter.viewport((width - viewWidth) * 0.5, (height - viewHeight) * 0.5, viewWidth, viewHeight)
+
+    // https://developer.mozilla.org/zh-CN/docs/Web/API/WebGLRenderingContext/depthFunc
+    painter.depthFunc(painter.LEQUAL)
+
+    // 开启深度计算
+    painter.enable(painter.DEPTH_TEST)
+
+    return painter
 }