vislite 0.4.0 → 0.4.1-alpha.1

package/src/ruler.ts

@@ -1,7 +1,9 @@
 // 刻度尺刻度求解
 
+import { rulerOptionType } from '../types/ruler'
+
 // 需要注意的是，实际的间距个数可能是 num-1 或 num 或 num+1 或 1
-export default function (maxValue: number, minValue: number, num: number) {
+export default function (maxValue: number, minValue: number, num: number, option?: rulerOptionType) {
 
     // 如果最大值最小值反了
     if (maxValue < minValue) {
@@ -57,43 +59,130 @@ export default function (maxValue: number, minValue: number, num: number) {
 
 
     // 求解出 -100 ~ 100 的最佳间距值 后直接转换原来的倍数
-    let distance100 = Math.ceil((maxValue - minValue) * times100 / num)
-
-    // 校对一下
-    distance100 = {
-        3: 2,
-        4: 5,
-        6: 5,
-        7: 5,
-        8: 10,
-        9: 10,
-        11: 10,
-        12: 10,
-        13: 15,
-        14: 15,
-        16: 15,
-        17: 15,
-        18: 20,
-        19: 20,
-        21: 20,
-        22: 20,
-        23: 25,
-        24: 25,
-        26: 25,
-        27: 25
-    }[distance100] || distance100
-
-    let distance = distance100 / times100
-
-    // 最小值，也就是起点
-    let begin = Math.floor(minValue / distance) * distance
-
-    let rulerArray = []
-    // 获取最终的刻度尺数组
-    rulerArray.push(begin)
-    for (let index = 1; rulerArray[rulerArray.length - 1] < maxValue; index++) {
-        rulerArray.push(begin + distance * index)
+    let distance100_oral = Math.ceil((maxValue - minValue) * times100 / num)
+
+    let getResult = (changValue: number) => {
+        // 校对一下
+        let distance100 = {
+            3: 2,
+            4: 5,
+            6: 5,
+            7: 5,
+            8: 10,
+            9: 10,
+            11: 10,
+            12: 10,
+            13: 15,
+            14: 15,
+            16: 15,
+            17: 15,
+            18: 20,
+            19: 20,
+            21: 20,
+            22: 20,
+            23: 25,
+            24: 25,
+            26: 25,
+            27: 25
+        }[distance100_oral + changValue] || (distance100_oral + changValue)
+
+        let distance = distance100 / times100
+
+        // 最小值，也就是起点
+        let begin = Math.floor(minValue / distance) * distance
+
+        let rulerArray = []
+        // 获取最终的刻度尺数组
+        rulerArray.push(begin)
+        for (let index = 1; rulerArray[rulerArray.length - 1] < maxValue; index++) {
+            rulerArray.push(begin + distance * index)
+        }
+
+        return rulerArray
     }
 
+    let rulerArray = getResult(0)
+
+    let balanceMax = () => {
+        let rulerArray_temp = []
+
+        let 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) {
+                // 多余的
+            } else {
+                rulerArray_temp.push(rulerArray[index] - changeDist)
+            }
+        }
+
+        return rulerArray_temp
+    }
+
+    let balanceMin = () => {
+        let rulerArray_temp = []
+
+        let 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
+        }
+
+        return rulerArray_temp
+    }
+
+    if (option) {
+
+        // 上下界限制
+        if ('max' in option && 'min' in option && option.max >= maxValue && option.min <= minValue) {
+
+            let isAnswer = () => {
+
+                // 先判断原始的是否可行
+                if (rulerArray[0] >= option.min && rulerArray[rulerArray.length - 1] <= option.max) return true
+
+                // 再判断max调整是否可行
+                let 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()
+                if (rulerArray_min[0] >= option.min && rulerArray_min[rulerArray_max.length - 1] <= option.max) {
+                    rulerArray = rulerArray_min
+                    return true
+                }
+
+            }
+
+            if (isAnswer()) return rulerArray
+
+            for (let changValue = 1; changValue < 100; changValue++) {
+
+                rulerArray = getResult(changValue)
+                if (isAnswer()) return rulerArray
+
+                rulerArray = getResult(-changValue)
+                if (isAnswer()) return rulerArray
+
+            }
+        }
+
+        // 单界限制
+        if ('max' in option && option.max >= maxValue) {
+
+            // 上越界了
+            if (option.max < rulerArray[rulerArray.length - 1]) {
+                rulerArray = balanceMax()
+            }
+        } else if ('min' in option && option.min <= minValue) {
+
+            // 下越界了
+            if (option.min > rulerArray[0]) {
+                rulerArray = balanceMin()
+            }
+        }
+    }
     return rulerArray
 }

package/src/viewHandler.ts

@@ -30,7 +30,8 @@ export default function (callback: callbackFun) {
             callback({
                 type: "lookUp",
                 normal: [],
-                value: 0.1
+                value: 0.1,
+                event
             })
         }
 
@@ -39,7 +40,8 @@ export default function (callback: callbackFun) {
             callback({
                 type: "lookDown",
                 normal: [],
-                value: 0.1
+                value: 0.1,
+                event
             })
         }
 
@@ -48,7 +50,8 @@ export default function (callback: callbackFun) {
             callback({
                 type: "lookLeft",
                 normal: [],
-                value: 0.1
+                value: 0.1,
+                event
             })
         }
 
@@ -57,7 +60,8 @@ export default function (callback: callbackFun) {
             callback({
                 type: "lookRight",
                 normal: [],
-                value: 0.1
+                value: 0.1,
+                event
             })
         }
 
@@ -66,30 +70,44 @@ export default function (callback: callbackFun) {
     // 鼠标控制
     let mouseP = null;
     let doMove = function (event) {
-        if (mouseP == null) return
 
-        let tempMouseP = mousePosition(el, event)
+        // 单纯移动
+        if (mouseP == null) {
+            callback({
+                type: "hover",
+                normal: [],
+                value: 0,
+                event
+            })
+        }
 
-        // 先求解出轨迹向量
-        let normal = [tempMouseP.x - mouseP.x, tempMouseP.y - mouseP.y]
+        // 按下移动
+        else {
 
-        // 方向向量旋转90deg得到旋转向量
-        let rotateNormal = [
-            normal[1],
-            normal[0],
-            0
-        ]
+            let tempMouseP = mousePosition(el, event)
 
-        // 非法射线忽略
-        if (rotateNormal[0] == 0 && rotateNormal[1] == 0) return
+            // 先求解出轨迹向量
+            let normal = [tempMouseP.x - mouseP.x, tempMouseP.y - mouseP.y]
 
-        callback({
-            type: "rotate",
-            normal: rotateNormal,
-            value: (Math.abs(tempMouseP.x - mouseP.x) + Math.abs(tempMouseP.y - mouseP.y)) * 0.01
-        })
+            // 方向向量旋转90deg得到旋转向量
+            let rotateNormal = [
+                normal[1],
+                normal[0],
+                0
+            ]
 
-        mouseP = tempMouseP
+            // 非法射线忽略
+            if (rotateNormal[0] == 0 && rotateNormal[1] == 0) return
+
+            callback({
+                type: "rotate",
+                normal: rotateNormal,
+                value: (Math.abs(tempMouseP.x - mouseP.x) + Math.abs(tempMouseP.y - mouseP.y)) * 0.01,
+                event
+            })
+
+            mouseP = tempMouseP
+        }
     }
 
     el.addEventListener("mousedown", (event) => {
@@ -113,27 +131,28 @@ export default function (callback: callbackFun) {
         doMove(event.touches[0])
     })
 
-    let doScale = function (value: number) {
+    let doScale = function (value: number, event: Event) {
         if (value == 0) return
 
         let baseTimes = 0.899
         callback({
             type: "scale",
             value: value < 0 ? baseTimes : 2 - baseTimes,
-            normal: []
+            normal: [],
+            event
         })
     }
 
     // 滚轮控制
     el.addEventListener("mousewheel", function (event: any) {
-        doScale(event.wheelDelta)
+        doScale(event.wheelDelta, event)
     })
 
     if (window.addEventListener) {
 
         // 针对火狐浏览器
         window.addEventListener('DOMMouseScroll', function (event: any) {
-            doScale(-1 * event.detail)
+            doScale(-1 * event.detail, event)
         }, false)
     }
 

package/types/ruler.d.ts

@@ -1,3 +1,8 @@
+export interface rulerOptionType {
+    max?: number
+    min?: number
+}
+
 export default interface rulerType {
-    (maxValue: number, minValue: number, num: number): number[]
+    (maxValue: number, minValue: number, num: number, option: rulerOptionType): number[]
 }

package/types/viewHandler.d.ts

@@ -1,7 +1,8 @@
 export interface paramsType {
     type: string
     value: number,
-    normal: number[]
+    normal: number[],
+    event: Event
 }
 
 export interface callbackFun {

package/uni-app/ui-canvas.vue

@@ -112,9 +112,9 @@ export default {
           },
         }
       );
-      this.help.instance.draw = () => {
-        painter.draw();
-        region.draw();
+      this.help.instance.draw = (reserve = false, callback = () => { }) => {
+        painter.draw(reserve, callback);
+        region.draw(reserve, callback);
 
         // 如果不使用原生渲染
         if (!this.cover && !this.isH5) {