vislite 0.5.2 → 0.6.0-alpha.0

package/src/animation.ts

@@ -1,99 +1,99 @@
-//当前正在运动的动画的tick函数堆栈
-let $timers: any[] = []
-//唯一定时器的定时间隔
-let $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 {
-
-    let clock = {
-        //把tick函数推入堆栈
-        "timer": function (tick: (deep: number) => void, duration: number, callback: (deep: number) => void) {
-            if (!tick) {
-                throw new Error('Tick is required!')
-            }
-            let 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,
-                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
-            }
-        }
-    }
-
-    let 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[] = []
+//唯一定时器的定时间隔
+let $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 {
+
+    let clock = {
+        //把tick函数推入堆栈
+        "timer": function (tick: (deep: number) => void, duration: number, callback: (deep: number) => void) {
+            if (!tick) {
+                throw new Error('Tick is required!')
+            }
+            let 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,
+                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
+            }
+        }
+    }
+
+    let 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/assemble.ts

@@ -1,23 +1,23 @@
-export default function (begin: number, end: number, step: number, count: number) {
-    let val = []
-    for (let index = 0; index < count; index++) val[index] = begin
-
-    // 非常类似进制数，每次调用都+1
-    return function () {
-        for (let i = 0; i < count; i++) {
-
-            // 如果当前位可以进1
-            if (val[i] + step < end) {
-                val[i] = +(val[i] + step).toFixed(7)
-                break
-            }
-
-            // 如果当前位不可以，那当前位归0，尝试下一位
-            else if (i < count - 1) {
-                val[i] = begin
-            }
-        }
-
-        return val
-    }
+export default function (begin: number, end: number, step: number, count: number) {
+    let val = []
+    for (let index = 0; index < count; index++) val[index] = begin
+
+    // 非常类似进制数，每次调用都+1
+    return function () {
+        for (let i = 0; i < count; i++) {
+
+            // 如果当前位可以进1
+            if (val[i] + step < end) {
+                val[i] = +(val[i] + step).toFixed(7)
+                break
+            }
+
+            // 如果当前位不可以，那当前位归0，尝试下一位
+            else if (i < count - 1) {
+                val[i] = begin
+            }
+        }
+
+        return val
+    }
 }

package/src/common/canvas/arc.ts

@@ -1,50 +1,50 @@
-
-// 点（x,y）围绕中心（cx,cy）旋转deg度
-
-let rotate = function (cx: number, cy: number, deg: number, x: number, y: number) {
-    let cos = Math.cos(deg), sin = Math.sin(deg)
-    return [
-        +((x - cx) * cos - (y - cy) * sin + cx).toFixed(7),
-        +((x - cx) * sin + (y - cy) * cos + cy).toFixed(7)
-    ]
-}
-
-// r1和r2，内半径和外半径
-// beginA起点弧度，rotateA旋转弧度式
-
-export default function (beginA: number, rotateA: number, cx: number, cy: number, r1: number, r2: number, doback: Function) {
-
-    // 保证逆时针也是可以的
-    if (rotateA < 0) {
-        beginA += rotateA
-        rotateA *= -1
-    }
-
-    let temp: number[] = [], p: number[]
-
-    // 内部
-    p = rotate(0, 0, beginA, r1, 0)
-    temp[0] = p[0]
-    temp[1] = p[1]
-    p = rotate(0, 0, rotateA, p[0], p[1])
-    temp[2] = p[0]
-    temp[3] = p[1]
-
-    // 外部
-    p = rotate(0, 0, beginA, r2, 0)
-    temp[4] = p[0]
-    temp[5] = p[1]
-    p = rotate(0, 0, rotateA, p[0], p[1])
-    temp[6] = p[0]
-    temp[7] = p[1]
-
-    doback(
-        beginA, beginA + rotateA,
-        temp[0] + cx, temp[1] + cy,
-        temp[4] + cx, temp[5] + cy,
-        temp[2] + cx, temp[3] + cy,
-        temp[6] + cx, temp[7] + cy,
-        (r2 - r1) * 0.5
-    )
-
-}
+
+// 点（x,y）围绕中心（cx,cy）旋转deg度
+
+let rotate = function (cx: number, cy: number, deg: number, x: number, y: number) {
+    let cos = Math.cos(deg), sin = Math.sin(deg)
+    return [
+        +((x - cx) * cos - (y - cy) * sin + cx).toFixed(7),
+        +((x - cx) * sin + (y - cy) * cos + cy).toFixed(7)
+    ]
+}
+
+// r1和r2，内半径和外半径
+// beginA起点弧度，rotateA旋转弧度式
+
+export default function (beginA: number, rotateA: number, cx: number, cy: number, r1: number, r2: number, doback: Function) {
+
+    // 保证逆时针也是可以的
+    if (rotateA < 0) {
+        beginA += rotateA
+        rotateA *= -1
+    }
+
+    let temp: number[] = [], p: number[]
+
+    // 内部
+    p = rotate(0, 0, beginA, r1, 0)
+    temp[0] = p[0]
+    temp[1] = p[1]
+    p = rotate(0, 0, rotateA, p[0], p[1])
+    temp[2] = p[0]
+    temp[3] = p[1]
+
+    // 外部
+    p = rotate(0, 0, beginA, r2, 0)
+    temp[4] = p[0]
+    temp[5] = p[1]
+    p = rotate(0, 0, rotateA, p[0], p[1])
+    temp[6] = p[0]
+    temp[7] = p[1]
+
+    doback(
+        beginA, beginA + rotateA,
+        temp[0] + cx, temp[1] + cy,
+        temp[4] + cx, temp[5] + cy,
+        temp[2] + cx, temp[3] + cy,
+        temp[6] + cx, temp[7] + cy,
+        (r2 - r1) * 0.5
+    )
+
+}

package/src/common/canvas/config.ts

@@ -1,158 +1,158 @@
-import type CanvasConfigType from "../../../types/CanvasConfig"
-
-import arc from "./arc"
-
-// 文字统一设置方法
-export let initText = function (
-  painter: CanvasRenderingContext2D,
-  config: CanvasConfigType,
-  x: number,
-  y: number,
-  deg: number
-) {
-  painter.beginPath();
-  painter.translate(x, y);
-  painter.rotate(deg);
-  painter.font =
-    config.fontStyle +
-    " " +
-    config.fontWeight +
-    " " +
-    config.fontSize +
-    "px " +
-    config.fontFamily;
-  return painter
-}
-
-// 画弧统一设置方法
-export let initArc = function (
-  painter: CanvasRenderingContext2D,
-  config: CanvasConfigType,
-  cx: number,
-  cy: number,
-  r1: number,
-  r2: number,
-  beginDeg: number,
-  deg: number
-) {
-  if (r1 > r2) {
-    let temp = r1
-    r1 = r2
-    r2 = temp
-  }
-
-  beginDeg = beginDeg % (Math.PI * 2)
-
-  // 当|deg|>=2π的时候都认为是一个圆环
-  // 为什么不取2π比较，是怕部分浏览器浮点不精确
-  if (deg >= Math.PI * 1.999999 || deg <= -Math.PI * 1.999999) {
-    deg = Math.PI * 2
-  } else {
-    deg = deg % (Math.PI * 2)
-  }
-
-  arc(
-    beginDeg,
-    deg,
-    cx,
-    cy,
-    r1,
-    r2,
-    function (
-      beginA: number,
-      endA: number,
-      begInnerX: number,
-      begInnerY: number,
-      begOuterX: number,
-      begOuterY: number,
-      endInnerX: number,
-      endInnerY: number,
-      endOuterX: number,
-      endOuterY: number,
-      r: number
-    ) {
-      if (r < 0) r = -r
-      painter.beginPath()
-      painter.moveTo(begInnerX, begInnerY)
-      painter.arc(
-        // (圆心x，圆心y，半径，开始角度，结束角度，true逆时针/false顺时针)
-        cx,
-        cy,
-        r1,
-        beginA,
-        endA,
-        false
-      )
-      // 结尾
-      if (config.arcEndCap == "round")
-        painter.arc(
-          (endInnerX + endOuterX) * 0.5,
-          (endInnerY + endOuterY) * 0.5,
-          r,
-          endA - Math.PI,
-          endA,
-          true
-        )
-      else if (config.arcEndCap == "-round")
-        painter.arc(
-          (endInnerX + endOuterX) * 0.5,
-          (endInnerY + endOuterY) * 0.5,
-          r,
-          endA - Math.PI,
-          endA,
-          false
-        )
-      else painter.lineTo(endOuterX, endOuterY)
-
-      painter.arc(cx, cy, r2, endA, beginA, true)
-      // 开头
-      if (config.arcStartCap == "round")
-        painter.arc(
-          (begInnerX + begOuterX) * 0.5,
-          (begInnerY + begOuterY) * 0.5,
-          r,
-          beginA,
-          beginA - Math.PI,
-          true
-        )
-      else if (config.arcStartCap == "-round")
-        painter.arc(
-          (begInnerX + begOuterX) * 0.5,
-          (begInnerY + begOuterY) * 0.5,
-          r,
-          beginA,
-          beginA - Math.PI,
-          false
-        )
-      else painter.lineTo(begInnerX, begInnerY)
-    }
-  )
-  if (config.arcStartCap == "butt") painter.closePath()
-  return painter
-}
-
-// 画圆统一设置方法
-export let initCircle = function (
-  painter: CanvasRenderingContext2D,
-  cx: number,
-  cy: number,
-  r: number
-) {
-  painter.beginPath()
-  painter.moveTo(cx + r, cy)
-  painter.arc(cx, cy, r, 0, Math.PI * 2)
-  return painter
-};
-
-// 画矩形统一设置方法
-export let initRect = function (
-  painter: CanvasRenderingContext2D,
-  x: number,
-  y: number,
-  width: number,
-  height: number
-) {
-  painter.beginPath()
-  painter.rect(x, y, width, height)
-  return painter
-}
+import type CanvasConfigType from "../../../types/CanvasConfig"
+
+import arc from "./arc"
+
+// 文字统一设置方法
+export let initText = function (
+  painter: CanvasRenderingContext2D,
+  config: CanvasConfigType,
+  x: number,
+  y: number,
+  deg: number
+) {
+  painter.beginPath();
+  painter.translate(x, y);
+  painter.rotate(deg);
+  painter.font =
+    config.fontStyle +
+    " " +
+    config.fontWeight +
+    " " +
+    config.fontSize +
+    "px " +
+    config.fontFamily;
+  return painter
+}
+
+// 画弧统一设置方法
+export let initArc = function (
+  painter: CanvasRenderingContext2D,
+  config: CanvasConfigType,
+  cx: number,
+  cy: number,
+  r1: number,
+  r2: number,
+  beginDeg: number,
+  deg: number
+) {
+  if (r1 > r2) {
+    let temp = r1
+    r1 = r2
+    r2 = temp
+  }
+
+  beginDeg = beginDeg % (Math.PI * 2)
+
+  // 当|deg|>=2π的时候都认为是一个圆环
+  // 为什么不取2π比较，是怕部分浏览器浮点不精确
+  if (deg >= Math.PI * 1.999999 || deg <= -Math.PI * 1.999999) {
+    deg = Math.PI * 2
+  } else {
+    deg = deg % (Math.PI * 2)
+  }
+
+  arc(
+    beginDeg,
+    deg,
+    cx,
+    cy,
+    r1,
+    r2,
+    function (
+      beginA: number,
+      endA: number,
+      begInnerX: number,
+      begInnerY: number,
+      begOuterX: number,
+      begOuterY: number,
+      endInnerX: number,
+      endInnerY: number,
+      endOuterX: number,
+      endOuterY: number,
+      r: number
+    ) {
+      if (r < 0) r = -r
+      painter.beginPath()
+      painter.moveTo(begInnerX, begInnerY)
+      painter.arc(
+        // (圆心x，圆心y，半径，开始角度，结束角度，true逆时针/false顺时针)
+        cx,
+        cy,
+        r1,
+        beginA,
+        endA,
+        false
+      )
+      // 结尾
+      if (config.arcEndCap == "round")
+        painter.arc(
+          (endInnerX + endOuterX) * 0.5,
+          (endInnerY + endOuterY) * 0.5,
+          r,
+          endA - Math.PI,
+          endA,
+          true
+        )
+      else if (config.arcEndCap == "-round")
+        painter.arc(
+          (endInnerX + endOuterX) * 0.5,
+          (endInnerY + endOuterY) * 0.5,
+          r,
+          endA - Math.PI,
+          endA,
+          false
+        )
+      else painter.lineTo(endOuterX, endOuterY)
+
+      painter.arc(cx, cy, r2, endA, beginA, true)
+      // 开头
+      if (config.arcStartCap == "round")
+        painter.arc(
+          (begInnerX + begOuterX) * 0.5,
+          (begInnerY + begOuterY) * 0.5,
+          r,
+          beginA,
+          beginA - Math.PI,
+          true
+        )
+      else if (config.arcStartCap == "-round")
+        painter.arc(
+          (begInnerX + begOuterX) * 0.5,
+          (begInnerY + begOuterY) * 0.5,
+          r,
+          beginA,
+          beginA - Math.PI,
+          false
+        )
+      else painter.lineTo(begInnerX, begInnerY)
+    }
+  )
+  if (config.arcStartCap == "butt") painter.closePath()
+  return painter
+}
+
+// 画圆统一设置方法
+export let initCircle = function (
+  painter: CanvasRenderingContext2D,
+  cx: number,
+  cy: number,
+  r: number
+) {
+  painter.beginPath()
+  painter.moveTo(cx + r, cy)
+  painter.arc(cx, cy, r, 0, Math.PI * 2)
+  return painter
+};
+
+// 画矩形统一设置方法
+export let initRect = function (
+  painter: CanvasRenderingContext2D,
+  x: number,
+  y: number,
+  width: number,
+  height: number
+) {
+  painter.beginPath()
+  painter.rect(x, y, width, height)
+  return painter
+}