vislite 0.5.2 → 0.6.0-alpha.2

package/src/interpolation/Hermite.ts

@@ -1,66 +1,66 @@
-import type HermiteType from '../../types/Hermite'
-
-class Hermite implements HermiteType {
-    readonly name: string = 'Hermite'
-
-    private __u: number // 张弛系数
-
-    private __MR: number[]
-    private __a: number
-    private __b: number
-
-    constructor(u: number = 0.5) {
-        this.__u = u
-    }
-
-    /**
-    * 设置点的位置
-    * @param {Number} x1 左边点的位置
-    * @param {Number} y1
-    * @param {Number} x2 右边点的位置
-    * @param {Number} y2
-    * @param {Number} s1 两个点的斜率
-    * @param {Number} s2
-    */
-    setP(x1: number, y1: number, x2: number, y2: number, s1: number, s2: number) {
-        if (x1 < x2) {
-            // 记录原始尺寸
-            this.__a = x1
-            this.__b = x2
-            let p3 = this.__u * s1,
-                p4 = this.__u * s2
-            // 缩放到[0,1]定义域
-            y1 /= (x2 - x1)
-            y2 /= (x2 - x1)
-            // MR是提前计算好的多项式通解矩阵
-            // 为了加速计算
-            // 如上面说的
-            // 统一在[0,1]上计算后再通过缩放和移动恢复
-            // 避免了动态求解矩阵的麻烦
-            this.__MR = [
-                2 * y1 - 2 * y2 + p3 + p4,
-                3 * y2 - 3 * y1 - 2 * p3 - p4,
-                p3,
-                y1
-            ]
-        } else throw new Error('The point x-position should be increamented!')
-        return this
-    }
-
-
-    /**
-     * 根据x值返回y值
-     * @param {Number} x
-     */
-    use(x: number) {
-        if (this.__MR) {
-            let sx = (x - this.__a) / (this.__b - this.__a),
-                sx2 = sx * sx,
-                sx3 = sx * sx2
-            let sResult = sx3 * this.__MR[0] + sx2 * this.__MR[1] + sx * this.__MR[2] + this.__MR[3]
-            return sResult * (this.__b - this.__a)
-        } else throw new Error('You shoud first set the position!')
-    }
-}
-
+import type HermiteType from '../../types/Hermite'
+
+class Hermite implements HermiteType {
+    readonly name: string = 'Hermite'
+
+    private __u: number // 张弛系数
+
+    private __MR: number[]
+    private __a: number
+    private __b: number
+
+    constructor(u: number = 0.5) {
+        this.__u = u
+    }
+
+    /**
+    * 设置点的位置
+    * @param {Number} x1 左边点的位置
+    * @param {Number} y1
+    * @param {Number} x2 右边点的位置
+    * @param {Number} y2
+    * @param {Number} s1 两个点的斜率
+    * @param {Number} s2
+    */
+    setP(x1: number, y1: number, x2: number, y2: number, s1: number, s2: number) {
+        if (x1 < x2) {
+            // 记录原始尺寸
+            this.__a = x1
+            this.__b = x2
+            const p3 = this.__u * s1,
+                p4 = this.__u * s2
+            // 缩放到[0,1]定义域
+            y1 /= (x2 - x1)
+            y2 /= (x2 - x1)
+            // MR是提前计算好的多项式通解矩阵
+            // 为了加速计算
+            // 如上面说的
+            // 统一在[0,1]上计算后再通过缩放和移动恢复
+            // 避免了动态求解矩阵的麻烦
+            this.__MR = [
+                2 * y1 - 2 * y2 + p3 + p4,
+                3 * y2 - 3 * y1 - 2 * p3 - p4,
+                p3,
+                y1
+            ]
+        } else throw new Error('The point x-position should be increamented!')
+        return this
+    }
+
+
+    /**
+     * 根据x值返回y值
+     * @param {Number} x
+     */
+    use(x: number) {
+        if (this.__MR) {
+            const sx = (x - this.__a) / (this.__b - this.__a),
+                sx2 = sx * sx,
+                sx3 = sx * sx2
+            const sResult = sx3 * this.__MR[0] + sx2 * this.__MR[1] + sx * this.__MR[2] + this.__MR[3]
+            return sResult * (this.__b - this.__a)
+        } else throw new Error('You shoud first set the position!')
+    }
+}
+
 export default Hermite

package/src/{TreeLayout/index.ts → layout/TreeLayout.ts}

@@ -35,11 +35,11 @@ class TreeLayout extends Tree implements TreeLayoutType {
     }
 
     use(initTree: any, noOpens = {}) {
-        let tree = super.use(initTree, noOpens)
+        const tree = super.use(initTree, noOpens)
 
         // 校对偏差
         if (this.__option.offsetX != 0 || this.__option.offsetY != 0) {
-            for (let key in tree.node) {
+            for (const key in tree.node) {
                 if (!tree.node[key].show) {
 
                     let deep = 0, pid = key
@@ -57,13 +57,13 @@ class TreeLayout extends Tree implements TreeLayoutType {
         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)
+                const perW = this.__option.height / tree.size
+                const 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
+                const balanceW = this.__option.y - this.__option.height * 0.5
+                const flag = this.__option.direction == 'LR' ? 1 : -1
 
-                for (let key in tree.node) {
+                for (const 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
@@ -74,18 +74,18 @@ class TreeLayout extends Tree implements TreeLayoutType {
                 }
             } 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)
+                const perW = this.__option.width / tree.size
+                const 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
+                const balanceW = this.__option.x - this.__option.width * 0.5
+                const flag = this.__option.direction == 'TB' ? 1 : -1
 
-                for (let key in tree.node) {
+                for (const 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
+                        const 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
@@ -95,16 +95,16 @@ class TreeLayout extends Tree implements TreeLayoutType {
             }
 
         } 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)
+            const cx = this.__option.x, cy = this.__option.y
+            const deg = Math.PI * 2 / tree.size
+            const per = this.__option.radius / (tree.deep - 1)
 
-            for (let key in tree.node) {
+            for (const 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)
+                    const 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]
@@ -135,13 +135,13 @@ class TreeLayout extends Tree implements TreeLayoutType {
     }
 
     private doUpdate() {
-        let newTree = this.use(this.__oralTree, this.__noOpens)
+        const newTree = this.use(this.__oralTree, this.__noOpens)
 
-        let cacheTree = JSON.parse(JSON.stringify(newTree))
+        const cacheTree = JSON.parse(JSON.stringify(newTree))
 
         animation((deep) => {
 
-            for (let key in cacheTree.node) {
+            for (const key in cacheTree.node) {
                 if (newTree.node[key].show || this.__preTree.node[key].show) {
                     cacheTree.node[key].show = true
 

package/src/move.ts

@@ -1,8 +1,8 @@
-// 点（x,y）沿着向量（ax,ay）方向移动距离d
-export default function (ax: number, ay: number, d: number, x: number, y: number): [number, number] {
-    let sqrt = Math.sqrt(ax * ax + ay * ay)
-    return [
-        ax * d / sqrt + x,
-        ay * d / sqrt + y
-    ]
+// 点（x,y）沿着向量（ax,ay）方向移动距离d
+export default function (ax: number, ay: number, d: number, x: number, y: number): [number, number] {
+    const sqrt = Math.sqrt(ax * ax + ay * ay)
+    return [
+        ax * d / sqrt + x,
+        ay * d / sqrt + y
+    ]
 }

package/src/resizeObserver.ts

@@ -1,37 +1,38 @@
-let observer: ResizeObserver
-
-let attrValueToCallback = {}, uniqueid = 0
-
-export default function (el: HTMLElement | null, callback: Function) {
-
-    try {
-
-        if (!observer) {
-            observer = new ResizeObserver(entries => {
-                for (const entry of entries) {
-                    attrValueToCallback[(entry.target as any)._resize_observer_]()
-                }
-            })
-        }
-
-        uniqueid++
-
-        (el as any)._resize_observer_ = uniqueid
-        attrValueToCallback[uniqueid] = callback
-
-        observer.observe(el)
-
-        return function () {
-            if (observer) {
-                observer.unobserve(el)
-                delete attrValueToCallback[(el as any)._resize_observer_]
-            }
-        }
-
-    } catch (e) {
-        callback()
-
-        // 如果浏览器不支持此接口
-        console.error('ResizeObserver undefined!')
-    }
+let observer: ResizeObserver
+
+const attrValueToCallback = {}
+let uniqueid = 0
+
+export default function (el: HTMLElement | null, callback: Function) {
+
+    try {
+
+        if (!observer) {
+            observer = new ResizeObserver(entries => {
+                for (const entry of entries) {
+                    attrValueToCallback[(entry.target as any)._resize_observer_]()
+                }
+            })
+        }
+
+        uniqueid++
+
+        (el as any)._resize_observer_ = uniqueid
+        attrValueToCallback[uniqueid] = callback
+
+        observer.observe(el)
+
+        return function () {
+            if (observer) {
+                observer.unobserve(el)
+                delete attrValueToCallback[(el as any)._resize_observer_]
+            }
+        }
+
+    } catch (e) {
+        callback()
+
+        // 如果浏览器不支持此接口
+        console.error('ResizeObserver undefined!')
+    }
 }

package/src/rotate.ts

@@ -1,8 +1,8 @@
-// 点（x,y）围绕中心（cx,cy）旋转deg度
-export default function (cx: number, cy: number, deg: number, x: number, y: number): [number, number] {
-    let cos = Math.cos(deg), sin = Math.sin(deg)
-    return [
-        (x - cx) * cos - (y - cy) * sin + cx,
-        (x - cx) * sin + (y - cy) * cos + cy
-    ]
+// 点（x,y）围绕中心（cx,cy）旋转deg度
+export default function (cx: number, cy: number, deg: number, x: number, y: number): [number, number] {
+    const cos = Math.cos(deg), sin = Math.sin(deg)
+    return [
+        (x - cx) * cos - (y - cy) * sin + cx,
+        (x - cx) * sin + (y - cy) * cos + cy
+    ]
 }

package/src/ruler.ts

@@ -7,7 +7,7 @@ export default function (maxValue: number, minValue: number, num: number, option
 
     // 如果最大值最小值反了
     if (maxValue < minValue) {
-        let temp = minValue
+        const temp = minValue
         minValue = maxValue
         maxValue = temp
     }
@@ -18,12 +18,12 @@ export default function (maxValue: number, minValue: number, num: number, option
     }
 
     // 为了变成 -100 ~ 100 需要放大或者缩小的倍数
-    let times100 =
+    const times100 =
 
         (function (_value) {
 
             // 先确定基调，是放大还是缩小
-            let _times100_base = (_value < 100 && _value > -100) ? 10 : 0.1
+            const _times100_base = (_value < 100 && _value > -100) ? 10 : 0.1
 
             // 记录当前缩放倍数
             let _times100 = -1, _tiemsValue = _value
@@ -59,11 +59,11 @@ export default function (maxValue: number, minValue: number, num: number, option
 
 
     // 求解出 -100 ~ 100 的最佳间距值 后直接转换原来的倍数
-    let distance100_oral = Math.ceil((maxValue - minValue) * times100 / num)
+    const distance100_oral = Math.ceil((maxValue - minValue) * times100 / num)
 
-    let getResult = (changValue: number) => {
+    const getResult = (changValue: number) => {
         // 校对一下
-        let distance100 = {
+        const distance100 = {
             3: 2,
             4: 5,
             6: 5,
@@ -86,12 +86,12 @@ export default function (maxValue: number, minValue: number, num: number, option
             27: 25
         }[distance100_oral + changValue] || (distance100_oral + changValue)
 
-        let distance = distance100 / times100
+        const distance = distance100 / times100
 
         // 最小值，也就是起点
-        let begin = Math.floor(minValue / distance) * distance
+        const begin = Math.floor(minValue / distance) * distance
 
-        let rulerArray = []
+        const rulerArray = []
         // 获取最终的刻度尺数组
         rulerArray.push(begin)
         for (let index = 1; rulerArray[rulerArray.length - 1] < maxValue; index++) {
@@ -103,10 +103,10 @@ export default function (maxValue: number, minValue: number, num: number, option
 
     let rulerArray = getResult(0)
 
-    let balanceMax = () => {
-        let rulerArray_temp = []
+    const balanceMax = () => {
+        const rulerArray_temp = []
 
-        let changeDist = rulerArray[rulerArray.length - 1] - option.max
+        const changeDist = rulerArray[rulerArray.length - 1] - option.max
         for (let index = 0; index < rulerArray.length; index++) {
             if (index + 1 < rulerArray.length && rulerArray[index + 1] - changeDist < minValue) {
                 // 多余的
@@ -118,10 +118,10 @@ export default function (maxValue: number, minValue: number, num: number, option
         return rulerArray_temp
     }
 
-    let balanceMin = () => {
-        let rulerArray_temp = []
+    const balanceMin = () => {
+        const rulerArray_temp = []
 
-        let changeDist = rulerArray[0] - option.min
+        const changeDist = rulerArray[0] - option.min
         for (let index = 0; index < rulerArray.length; index++) {
             rulerArray_temp[index] = rulerArray[index] - changeDist
             if (maxValue <= rulerArray_temp[index]) break
@@ -135,20 +135,20 @@ export default function (maxValue: number, minValue: number, num: number, option
         // 上下界限制
         if ('max' in option && 'min' in option && option.max >= maxValue && option.min <= minValue) {
 
-            let isAnswer = () => {
+            const isAnswer = () => {
 
                 // 先判断原始的是否可行
                 if (rulerArray[0] >= option.min && rulerArray[rulerArray.length - 1] <= option.max) return true
 
                 // 再判断max调整是否可行
-                let rulerArray_max = balanceMax()
+                const rulerArray_max = balanceMax()
                 if (rulerArray_max[0] >= option.min && rulerArray_max[rulerArray_max.length - 1] <= option.max) {
                     rulerArray = rulerArray_max
                     return true
                 }
 
                 // 再判断max调整是否可行
-                let rulerArray_min = balanceMin()
+                const rulerArray_min = balanceMin()
                 if (rulerArray_min[0] >= option.min && rulerArray_min[rulerArray_max.length - 1] <= option.max) {
                     rulerArray = rulerArray_min
                     return true
@@ -184,5 +184,27 @@ export default function (maxValue: number, minValue: number, num: number, option
             }
         }
     }
+
+    // 对结果进行对齐
+    // 2023年11月15日 于南京
+    for (let index = 0; index < rulerArray.length; index++) {
+        let valStr = rulerArray[index] + ""
+
+        // 只有小数需要处理
+        if (/\./.test(valStr)) {
+
+            // 1.0999999999999999
+            if (/9{7,}$/.test(valStr)) {
+                valStr = valStr.replace(/9{7,}$/, '')
+                rulerArray[index] = +(valStr.substring(0, valStr.length - 1) + ((+valStr[valStr.length - 1]) + 1))
+            }
+
+            // 0.30000000000000004
+            else if (/0{7,}\d$/.test(valStr)) {
+                rulerArray[index] = +(valStr.replace(/0{7,}\d$/, ''))
+            }
+        }
+    }
+
     return rulerArray
-}
+}

package/src/scale.ts

@@ -1,7 +1,7 @@
-// 点（x,y）围绕中心（cx,cy）缩放times倍
-export default function (cx: number, cy: number, times: number, x: number, y: number): [number, number] {
-    return [
-        times * (x - cx) + cx,
-        times * (y - cy) + cy
-    ]
+// 点（x,y）围绕中心（cx,cy）缩放times倍
+export default function (cx: number, cy: number, times: number, x: number, y: number): [number, number] {
+    return [
+        times * (x - cx) + cx,
+        times * (y - cy) + cy
+    ]
 }

package/src/shader/fsColor.c

@@ -1,8 +1,8 @@
-precision mediump float;
-
-uniform vec4 u_color;
-
-void main()
-{
-    gl_FragColor = u_color;
+precision mediump float;
+
+uniform vec4 u_color;
+
+void main()
+{
+    gl_FragColor = u_color;
 }

package/src/shader/fsColors.c

@@ -1,8 +1,8 @@
-precision mediump float;
-
-varying vec4 v_color;
-
-void main()
-{
-    gl_FragColor = v_color;
+precision mediump float;
+
+varying vec4 v_color;
+
+void main()
+{
+    gl_FragColor = v_color;
 }

package/src/shader/fsCube.c

@@ -1,9 +1,9 @@
-precision mediump float;
-
-varying vec3 v_normal;
-uniform samplerCube u_texture;
-
-void main()
-{
-    gl_FragColor = textureCube(u_texture, normalize(v_normal));
+precision mediump float;
+
+varying vec3 v_normal;
+uniform samplerCube u_texture;
+
+void main()
+{
+    gl_FragColor = textureCube(u_texture, normalize(v_normal));
 }

package/src/shader/fsImage.c

@@ -1,9 +1,9 @@
-precision mediump float;
-
-uniform sampler2D u_sampler;
-varying vec2 v_textcoord;
-
-void main()
-{
-    gl_FragColor = texture2D(u_sampler, v_textcoord);
+precision mediump float;
+
+uniform sampler2D u_sampler;
+varying vec2 v_textcoord;
+
+void main()
+{
+    gl_FragColor = texture2D(u_sampler, v_textcoord);
 }

package/src/shader/vsColor.c

@@ -1,18 +1,18 @@
-attribute vec4 a_position;
-uniform mat4 u_matrix;
-
-void main()
-{
-    vec4 temp = u_matrix * a_position;
-
-    // 把原生的WebGL使用的左手坐标系变成了右手坐标系
-    temp.z = -1.0 * temp.z;
-
-    // 表示眼睛距离vec4(0.0,0.0,1.0)的距离
-    float dist = 4.0;
-
-    // 使用投影直接计算
-    // 为保证纹理和相对位置正确
-    // x、y、z的改变满足线性变换
-    gl_Position = vec4((dist + 1.0) * temp.x, (dist + 1.0) * temp.y, dist * (dist + temp.z) + 1.0 - dist * dist, temp.w * 2.0 * (dist + temp.z));
+attribute vec4 a_position;
+uniform mat4 u_matrix;
+
+void main()
+{
+    vec4 temp = u_matrix * a_position;
+
+    // 把原生的WebGL使用的左手坐标系变成了右手坐标系
+    temp.z = -1.0 * temp.z;
+
+    // 表示眼睛距离vec4(0.0,0.0,1.0)的距离
+    float dist = 4.0;
+
+    // 使用投影直接计算
+    // 为保证纹理和相对位置正确
+    // x、y、z的改变满足线性变换
+    gl_Position = vec4((dist + 1.0) * temp.x, (dist + 1.0) * temp.y, dist * (dist + temp.z) + 1.0 - dist * dist, temp.w * 2.0 * (dist + temp.z));
 }

package/src/shader/vsColors.c

@@ -1,14 +1,14 @@
-attribute vec4 a_position;
-uniform mat4 u_matrix;
-attribute vec4 a_color;
-varying vec4 v_color;
-
-void main()
-{
-    vec4 temp = u_matrix * a_position;
-    temp.z = -1.0 * temp.z;
-    float dist = 4.0;
-    gl_Position = vec4((dist + 1.0) * temp.x, (dist + 1.0) * temp.y, dist * (dist + temp.z) + 1.0 - dist * dist, temp.w * 2.0 * (dist + temp.z));
-
-    v_color = a_color;
+attribute vec4 a_position;
+uniform mat4 u_matrix;
+attribute vec4 a_color;
+varying vec4 v_color;
+
+void main()
+{
+    vec4 temp = u_matrix * a_position;
+    temp.z = -1.0 * temp.z;
+    float dist = 4.0;
+    gl_Position = vec4((dist + 1.0) * temp.x, (dist + 1.0) * temp.y, dist * (dist + temp.z) + 1.0 - dist * dist, temp.w * 2.0 * (dist + temp.z));
+
+    v_color = a_color;
 }

package/src/shader/vsCube.c

@@ -1,14 +1,14 @@
-attribute vec4 a_position;
-uniform mat4 u_matrix;
-attribute vec4 a_normal;
-varying vec3 v_normal;
-
-void main()
-{
-    vec4 temp = u_matrix * a_position;
-    temp.z = -1.0 * temp.z;
-    float dist = 4.0;
-    gl_Position = vec4((dist + 1.0) * temp.x, (dist + 1.0) * temp.y, dist * (dist + temp.z) + 1.0 - dist * dist, temp.w * 2.0 * (dist + temp.z));
-
-    v_normal = normalize(vec3(a_normal));
+attribute vec4 a_position;
+uniform mat4 u_matrix;
+attribute vec4 a_normal;
+varying vec3 v_normal;
+
+void main()
+{
+    vec4 temp = u_matrix * a_position;
+    temp.z = -1.0 * temp.z;
+    float dist = 4.0;
+    gl_Position = vec4((dist + 1.0) * temp.x, (dist + 1.0) * temp.y, dist * (dist + temp.z) + 1.0 - dist * dist, temp.w * 2.0 * (dist + temp.z));
+
+    v_normal = normalize(vec3(a_normal));
 }