vislite 0.5.0-alpha.0 → 0.5.0

package/src/TreeLayout/index.ts

@@ -1,186 +1,187 @@
-import type TreeLayoutType from '../../types/TreeLayout'
-import type { TreeResultType } from '../../types/Tree'
-import type TreeOptionType from '../../types/TreeOption'
-
-import Tree from '../common/tree/index'
-import mergeOption from '../common/mergeOption'
-import animation from '../animation'
-import rotate from '../rotate'
-
-class TreeLayout extends Tree implements TreeLayoutType {
-    readonly name: string = 'TreeLayout'
-
-    private __option: TreeOptionType = {
-        offsetX: 0,
-        offsetY: 0,
-        duration: 500,
-        type: "plain",
-        direction: "LR",
-        x: 100,
-        y: 100,
-        width: 100,
-        height: 100,
-        radius: 100
-    }
-
-    private __rback: (tree: TreeResultType) => void
-    private __oralTree: any
-    private __preTree: TreeResultType
-
-    private __noOpens = {}
-
-    setOption(option: TreeOptionType) {
-        mergeOption(option, this.__option)
-        return this
-    }
-
-    use(initTree: any, noOpens?: {}) {
-        let tree = super.use(initTree, noOpens)
-
-        // 校对偏差
-        if (this.__option.offsetX != 0 || this.__option.offsetY != 0) {
-            for (let key in tree.node) {
-                if (!tree.node[key].show) {
-
-                    let deep = 0, pid = key
-                    do {
-                        pid = tree.node[pid].pid
-                        deep++
-                    } while (!tree.node[pid].show)
-
-                    tree.node[key].left += this.__option.offsetX * deep
-                    tree.node[key].top += this.__option.offsetY * deep
-                }
-            }
-        }
-
-        if (this.__option.type == 'rect') {
-            if (this.__option.direction == 'LR' || this.__option.direction == "RL") {
-
-                let perW = this.__option.height / tree.size
-                let perD = this.__option.width / (tree.deep - 1)
-
-                let balanceW = this.__option.y - this.__option.height * 0.5
-                let flag = this.__option.direction == 'LR' ? 1 : -1
-
-                for (let key in tree.node) {
-                    if (tree.deep == 1) {
-                        tree.node[key].left = this.__option.x + this.__option.width * 0.5 * flag
-                        tree.node[key].top = this.__option.y
-                    } else {
-                        tree.node[key].left = this.__option.x + (tree.node[key].left - 0.5) * perD * flag
-                        tree.node[key].top = tree.node[key].top * perW + balanceW
-                    }
-                }
-            } else if (this.__option.direction == 'TB' || this.__option.direction == "BT") {
-
-                let perW = this.__option.width / tree.size
-                let perD = this.__option.height / (tree.deep - 1)
-
-                let balanceW = this.__option.x - this.__option.width * 0.5
-                let flag = this.__option.direction == 'TB' ? 1 : -1
-
-                for (let key in tree.node) {
-                    if (tree.deep == 1) {
-                        tree.node[key].left = this.__option.x
-                        tree.node[key].top = this.__option.y + this.__option.height * 0.5 * flag
-                    } else {
-                        let left = tree.node[key].left
-
-                        tree.node[key].left = tree.node[key].top * perW + balanceW
-                        tree.node[key].top = this.__option.y + (left - 0.5) * perD * flag
-                    }
-                }
-
-            }
-
-        } else if (this.__option.type == 'circle') {
-            let cx = this.__option.x, cy = this.__option.y
-            let deg = Math.PI * 2 / tree.size
-            let per = this.__option.radius / (tree.deep - 1)
-
-            for (let key in tree.node) {
-                if (tree.node[key].left == 0.5) {
-                    tree.node[key].left = cx
-                    tree.node[key].top = cy
-                } else {
-                    let position = rotate(cx, cy, deg * tree.node[key].top, cx + (tree.node[key].left - 0.5) * per, cy)
-
-                    tree.node[key].left = position[0]
-                    tree.node[key].top = position[1]
-                }
-            }
-        }
-
-        return tree
-    }
-
-    bind(initTree: any, renderBack: (tree: TreeResultType) => void) {
-        this.__rback = renderBack
-        this.__oralTree = initTree
-
-        this.__preTree = this.use(this.__oralTree)
-        this.__rback(this.__preTree)
-
-        return this
-    }
-
-    unbind() {
-        this.__rback = null
-        this.__oralTree = null
-        this.__preTree = null
-        this.__noOpens = {}
-        return this
-    }
-
-    private doUpdate() {
-        let newTree = this.use(this.__oralTree, this.__noOpens)
-
-        let cacheTree = JSON.parse(JSON.stringify(newTree))
-
-        animation((deep) => {
-
-            for (let key in cacheTree.node) {
-                if (newTree.node[key].show || this.__preTree.node[key].show) {
-                    cacheTree.node[key].show = true
-
-                    cacheTree.node[key].left = this.__preTree.node[key].left + (newTree.node[key].left - this.__preTree.node[key].left) * deep
-                    cacheTree.node[key].top = this.__preTree.node[key].top + (newTree.node[key].top - this.__preTree.node[key].top) * deep
-                }
-            }
-            this.__rback(cacheTree)
-
-
-        }, this.__option.duration, () => {
-            this.__preTree = newTree
-            this.__rback(this.__preTree)
-        })
-    }
-
-    closeNode(id: string) {
-        if (!this.__preTree) return
-        this.__noOpens[id] = true
-
-        this.doUpdate()
-        return this
-    }
-
-    openNode(id: string) {
-        if (!this.__preTree) return
-        this.__noOpens[id] = false
-
-        this.doUpdate()
-        return this
-    }
-
-    toggleNode(id: string) {
-        if (!this.__preTree) return
-        this.__noOpens[id] = !this.__noOpens[id]
-
-        this.doUpdate()
-        return this
-    }
-
-}
-
+import type TreeLayoutType from '../../types/TreeLayout'
+import type { TreeResultType } from '../../types/Tree'
+import type TreeOptionType from '../../types/TreeOption'
+
+import Tree from '../common/tree/index'
+import mergeOption from '../common/mergeOption'
+import animation from '../animation'
+import rotate from '../rotate'
+
+class TreeLayout extends Tree implements TreeLayoutType {
+    readonly name: string = 'TreeLayout'
+
+    private __option: TreeOptionType = {
+        offsetX: 0,
+        offsetY: 0,
+        duration: 500,
+        type: "plain",
+        direction: "LR",
+        x: 100,
+        y: 100,
+        width: 100,
+        height: 100,
+        radius: 100
+    }
+
+    private __rback: (tree: TreeResultType) => void
+    private __oralTree: any
+    private __preTree: TreeResultType
+
+    private __noOpens = {}
+
+    setOption(option: TreeOptionType) {
+        mergeOption(option, this.__option)
+        return this
+    }
+
+    use(initTree: any, noOpens = {}) {
+        let tree = super.use(initTree, noOpens)
+
+        // 校对偏差
+        if (this.__option.offsetX != 0 || this.__option.offsetY != 0) {
+            for (let key in tree.node) {
+                if (!tree.node[key].show) {
+
+                    let deep = 0, pid = key
+                    do {
+                        pid = tree.node[pid].pid
+                        deep++
+                    } while (!tree.node[pid].show)
+
+                    tree.node[key].left += this.__option.offsetX * deep
+                    tree.node[key].top += this.__option.offsetY * deep
+                }
+            }
+        }
+
+        if (this.__option.type == 'rect') {
+            if (this.__option.direction == 'LR' || this.__option.direction == "RL") {
+
+                let perW = this.__option.height / tree.size
+                let perD = this.__option.width / (tree.deep - 1)
+
+                let balanceW = this.__option.y - this.__option.height * 0.5
+                let flag = this.__option.direction == 'LR' ? 1 : -1
+
+                for (let key in tree.node) {
+                    if (tree.deep == 1) {
+                        tree.node[key].left = this.__option.x + this.__option.width * 0.5 * flag
+                        tree.node[key].top = this.__option.y
+                    } else {
+                        tree.node[key].left = this.__option.x + (tree.node[key].left - 0.5) * perD * flag
+                        tree.node[key].top = tree.node[key].top * perW + balanceW
+                    }
+                }
+            } else if (this.__option.direction == 'TB' || this.__option.direction == "BT") {
+
+                let perW = this.__option.width / tree.size
+                let perD = this.__option.height / (tree.deep - 1)
+
+                let balanceW = this.__option.x - this.__option.width * 0.5
+                let flag = this.__option.direction == 'TB' ? 1 : -1
+
+                for (let key in tree.node) {
+                    if (tree.deep == 1) {
+                        tree.node[key].left = this.__option.x
+                        tree.node[key].top = this.__option.y + this.__option.height * 0.5 * flag
+                    } else {
+                        let left = tree.node[key].left
+
+                        tree.node[key].left = tree.node[key].top * perW + balanceW
+                        tree.node[key].top = this.__option.y + (left - 0.5) * perD * flag
+                    }
+                }
+
+            }
+
+        } else if (this.__option.type == 'circle') {
+            let cx = this.__option.x, cy = this.__option.y
+            let deg = Math.PI * 2 / tree.size
+            let per = this.__option.radius / (tree.deep - 1)
+
+            for (let key in tree.node) {
+                if (tree.node[key].left == 0.5) {
+                    tree.node[key].left = cx
+                    tree.node[key].top = cy
+                } else {
+                    let position = rotate(cx, cy, deg * tree.node[key].top, cx + (tree.node[key].left - 0.5) * per, cy)
+
+                    tree.node[key].left = position[0]
+                    tree.node[key].top = position[1]
+                }
+            }
+        }
+
+        return tree
+    }
+
+    bind(initTree: any, renderBack: (tree: TreeResultType) => void, noOpens = {}) {
+        this.__rback = renderBack
+        this.__oralTree = initTree
+        this.__noOpens = noOpens
+
+        this.__preTree = this.use(this.__oralTree, this.__noOpens)
+        this.__rback(this.__preTree)
+
+        return this
+    }
+
+    unbind() {
+        this.__rback = null
+        this.__oralTree = null
+        this.__preTree = null
+        this.__noOpens = {}
+        return this
+    }
+
+    private doUpdate() {
+        let newTree = this.use(this.__oralTree, this.__noOpens)
+
+        let cacheTree = JSON.parse(JSON.stringify(newTree))
+
+        animation((deep) => {
+
+            for (let key in cacheTree.node) {
+                if (newTree.node[key].show || this.__preTree.node[key].show) {
+                    cacheTree.node[key].show = true
+
+                    cacheTree.node[key].left = this.__preTree.node[key].left + (newTree.node[key].left - this.__preTree.node[key].left) * deep
+                    cacheTree.node[key].top = this.__preTree.node[key].top + (newTree.node[key].top - this.__preTree.node[key].top) * deep
+                }
+            }
+            this.__rback(cacheTree)
+
+
+        }, this.__option.duration, () => {
+            this.__preTree = newTree
+            this.__rback(this.__preTree)
+        })
+    }
+
+    closeNode(id: string) {
+        if (!this.__preTree) return
+        this.__noOpens[id] = true
+
+        this.doUpdate()
+        return this
+    }
+
+    openNode(id: string) {
+        if (!this.__preTree) return
+        this.__noOpens[id] = false
+
+        this.doUpdate()
+        return this
+    }
+
+    toggleNode(id: string) {
+        if (!this.__preTree) return
+        this.__noOpens[id] = !this.__noOpens[id]
+
+        this.doUpdate()
+        return this
+    }
+
+}
+
 export default TreeLayout

package/src/common/geometry/prism-horizontal.ts

@@ -15,20 +15,19 @@ export default function (normal: boolean, x: number, y: number, z: number, radiu
         beginZ = z
     }
 
-    let points = [x, y, z], deg = Math.PI * 2 / num
-
-    if (normal) points.push(0, d, 0)
-
-    points.push(beginX, y, beginZ)
+    let point = [beginX, beginZ], points = [], deg = Math.PI * 2 / num
+    for (let i = 0; i < num; i++) {
 
-    if (normal) points.push(0, d, 0)
+        points.push(x, y, z)
+        if (normal) points.push(0, d, 0)
 
-    for (let i = 0; i < num; i++) {
-        let point = rotate(x, z, deg * (i + 1), beginX, beginZ)
         points.push(point[0], y, point[1])
-
         if (normal) points.push(0, d, 0)
 
+        point = rotate(x, z, deg * (i + 1), beginX, beginZ)
+        points.push(point[0], y, point[1])
+        if (normal) points.push(0, d, 0)
     }
+
     return points
 }