vislite 0.2.0 → 0.3.0-alpha.1

package/src/common/canvas/config.ts

@@ -1,76 +1,157 @@
-import arc from './arc'
-import CanvasConfigType from '../../../types/CanvasConfig'
+import arc from "./arc"
+import CanvasConfigType from "../../../types/CanvasConfig"
 
 // 文字统一设置方法
-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 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) {
+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
+  }
 
-    if (r1 > r2) {
-        let temp = r1
-        r1 = r2
-        r2 = temp
-    }
+  beginDeg = beginDeg % (Math.PI * 2)
 
-    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)
+  }
 
-    // 当|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
+  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)
+      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(
-            // (圆心x，圆心y，半径，开始角度，结束角度，true逆时针/false顺时针)
-            cx, cy, r1, beginA, endA, false)
-        // 结尾
-        if (config.arcEndCap != 'round')
-            painter.lineTo(endOuterX, endOuterY)
-        else
-            painter.arc((endInnerX + endOuterX) * 0.5, (endInnerY + endOuterY) * 0.5, r, endA - Math.PI, endA, true)
-        painter.arc(cx, cy, r2, endA, beginA, true)
-        // 开头
-        if (config.arcStartCap != 'round')
-            painter.lineTo(begInnerX, begInnerY);
-        else
-            painter.arc((begInnerX + begOuterX) * 0.5, (begInnerY + begOuterY) * 0.5, r, beginA, beginA - Math.PI, true)
-    })
-    if (config.arcStartCap == 'butt') painter.closePath()
-    return painter
+          (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 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
+export let initRect = function (
+  painter: CanvasRenderingContext2D,
+  x: number,
+  y: number,
+  width: number,
+  height: number
+) {
+  painter.beginPath()
+  painter.rect(x, y, width, height)
+  return painter
 }

package/src/common/canvas/gradient.ts

@@ -0,0 +1,29 @@
+// 线性渐变
+export let linearGradient = function (painter: CanvasRenderingContext2D, x0: number, y0: number, x1: number, y1: number) {
+    let gradient = painter.createLinearGradient(x0, y0, x1, y1)
+    let enhanceGradient = {
+        "value": function () {
+            return gradient
+        },
+        "setColor": function (stop: number, color: string) {
+            gradient.addColorStop(stop, color)
+            return enhanceGradient
+        }
+    };
+    return enhanceGradient
+}
+
+// 环形渐变
+export let radialGradient = function (painter: CanvasRenderingContext2D, cx: number, cy: number, r: number) {
+    let gradient = painter.createRadialGradient(cx, cy, 0, cx, cy, r)
+    let enhanceGradient = {
+        "value": function () {
+            return gradient
+        },
+        "setColor": function (stop: number, color: string) {
+            gradient.addColorStop(stop, color)
+            return enhanceGradient
+        }
+    }
+    return enhanceGradient
+}

package/src/common/canvas/index.ts

@@ -1,97 +1,137 @@
-import CanvasConfigType from '../../../types/CanvasConfig'
-import PainterRender from './painter'
-import assemble from '../assemble'
+import CanvasConfigType from "../../../types/CanvasConfig"
+import PainterRender from "./painter"
+import assemble from "../assemble"
+import { linearGradient, radialGradient } from "./gradient"
 
 // 属性名向下兼容
 let oldAttrName = {
-    "font-size": "fontSize",
-    "font-family": "fontFamily",
-    "font-weight": "fontWeight",
-    "font-style": "fontStyle",
-    "arc-start-cap": "arcStartCap",
-    "arc-end-cap": "arcEndCap"
+  "font-size": "fontSize",
+  "font-family": "fontFamily",
+  "font-weight": "fontWeight",
+  "font-style": "fontStyle",
+  "arc-start-cap": "arcStartCap",
+  "arc-end-cap": "arcEndCap",
 }
 
 class Canvas extends PainterRender {
-
-    readonly name: string = "Canvas"
-
-    private __regionList = {} //区域映射表
-    private __regionAssemble = assemble(0, 255, 1, 3)
-
-    constructor(ViewCanvas: HTMLCanvasElement, RegionCanvas: HTMLCanvasElement) {
-        super(ViewCanvas, {}, new PainterRender(RegionCanvas, {
-            willReadFrequently: true
-        }))
-
-        this.setRegion("")
+  readonly name: string = "Canvas"
+
+  private __regionList = {} //区域映射表
+  private __regionAssemble = assemble(0, 255, 1, 3)
+
+  constructor(ViewCanvas: HTMLCanvasElement, RegionCanvas: HTMLCanvasElement) {
+    super(
+      ViewCanvas,
+      {},
+      new PainterRender(RegionCanvas, {
+        willReadFrequently: true,
+      })
+    )
+
+    this.setRegion("")
+  }
+
+  config(configs: CanvasConfigType) {
+    for (let key in configs) {
+      let _key = oldAttrName[key] || key
+      this.useConfig(_key, configs[key])
     }
 
-    config(configs: CanvasConfigType) {
-        for (let key in configs) {
-            let _key = oldAttrName[key] || key
-            this.useConfig(_key, configs[key])
+    return this
+  }
+
+  // 设置当前绘制区域名称
+  setRegion(regionName: string | number) {
+    if (regionName) {
+      if (this.__regionList[regionName] == undefined) {
+        let tempColor = this.__regionAssemble()
+        this.__regionList[regionName] =
+          "rgb(" + tempColor[0] + "," + tempColor[1] + "," + tempColor[2] + ")"
+      }
+
+      this.__region.useConfig("fillStyle", this.__regionList[regionName]) &&
+        this.__region.useConfig("strokeStyle", this.__regionList[regionName])
+    } else {
+      this.__region.useConfig("fillStyle", "#000000") &&
+        this.__region.useConfig("strokeStyle", "#000000")
+    }
+    return this
+  }
+
+  // 获取当前事件触发的区域名称
+  getRegion(x: number, y: number): Promise<string> {
+    return new Promise((resolve, reject) => {
+      let imgData = this.__region.painter.getImageData(x - 0.5, y - 0.5, 1, 1)
+
+      // 获取点击点的颜色
+      let currentRGBA = imgData.data
+
+      let doit = () => {
+        // 查找当前点击的区域
+        for (let key in this.__regionList) {
+          if (
+            "rgb(" +
+              currentRGBA[0] +
+              "," +
+              currentRGBA[1] +
+              "," +
+              currentRGBA[2] +
+              ")" ==
+            this.__regionList[key]
+          ) {
+            resolve(key)
+            break
+          }
         }
 
-        return this
-    }
+        resolve("")
+      }
 
-    // 设置当前绘制区域名称
-    setRegion(regionName: string | number) {
-        if (regionName) {
-            if (this.__regionList[regionName] == undefined) {
-                let tempColor = this.__regionAssemble()
-                this.__regionList[regionName] = "rgb(" + tempColor[0] + "," + tempColor[1] + "," + tempColor[2] + ")"
-            }
-
-            this.__region.useConfig("fillStyle", this.__regionList[regionName]) &&
-                this.__region.useConfig("strokeStyle", this.__regionList[regionName])
-        } else {
-            this.__region.useConfig("fillStyle", "#000000") &&
-                this.__region.useConfig("strokeStyle", "#000000")
-        }
-        return this
-    }
+      // 如果有值
+      if (currentRGBA) {
+        doit()
+      }
 
-    // 获取当前事件触发的区域名称
-    getRegion(x: number, y: number): Promise<string> {
-        return new Promise((resolve, reject) => {
-            let imgData = this.__region.painter.getImageData(x - 0.5, y - 0.5, 1, 1)
-
-            // 获取点击点的颜色
-            let currentRGBA = imgData.data
-
-            let doit = () => {
-                // 查找当前点击的区域
-                for (let key in this.__regionList) {
-                    if ("rgb(" + currentRGBA[0] + "," + currentRGBA[1] + "," + currentRGBA[2] + ")" == this.__regionList[key]) {
-                        resolve(key)
-                        break
-                    }
-                }
-
-                resolve("")
-            }
-
-            // 如果有值
-            if (currentRGBA) {
-                doit()
-            }
-
-            // 否则就是在Promise中
-            else {
-                (imgData as any).then((data: Uint8ClampedArray) => {
-                    currentRGBA = data
-                    doit()
-                })
-            }
+      // 否则就是在Promise中
+      else {
+        (imgData as any).then((data: Uint8ClampedArray) => {
+          currentRGBA = data
+          doit()
         })
-    }
-
-    // 获取原始画笔
-    getContext(isRegion = false) {
-        return isRegion ? this.__region.painter : this.painter
-    }
+      }
+    })
+  }
+
+  // 获取原始画笔
+  getContext(isRegion = false) {
+    return isRegion ? this.__region.painter : this.painter
+  }
+
+  // 线性渐变
+  createLinearGradient(x0: number, y0: number, x1: number, y1: number) {
+    return linearGradient(this.painter, x0, y0, x1, y1)
+  }
+
+  // 环形渐变
+  createRadialGradient(cx: number, cy: number, r: number) {
+    return radialGradient(this.painter, cx, cy, r)
+  }
+
+  // 获取指定位置颜色
+  getColor(x: number, y: number) {
+    let currentRGBA = this.painter.getImageData(x - 0.5, y - 0.5, 1, 1).data
+    return (
+      "rgba(" +
+      currentRGBA[0] +
+      "," +
+      currentRGBA[1] +
+      "," +
+      currentRGBA[2] +
+      "," +
+      currentRGBA[3] +
+      ")"
+    )
+  }
 }
 
-export default Canvas
+export default Canvas

package/src/common/canvas/painter.ts

@@ -101,6 +101,12 @@ class Painter {
 
         // 如果已经存在默认配置中，说明只需要缓存起来即可
         else if (key in this.__specialConfig) {
+
+            // 文字非整数可能存在问题，修复一下
+            if (key == 'fontSize') {
+                value = Math.round(value)
+            }
+
             this.__specialConfig[key] = value
         }
 
@@ -251,6 +257,12 @@ class Painter {
         this.painter.restore()
         return this
     }
+    clip() {
+        if (this.__region) this.__region.clip()
+
+        this.painter.clip()
+        return this
+    }
 
     // 路径 - 贝塞尔曲线
     quadraticCurveTo(cpx: number, cpy: number, x: number, y: number) {

package/src/common/setStyle.ts

@@ -1,6 +1,6 @@
-// 修改样式
-export default function (el: HTMLElement | SVGElement, styles: any) {
-    for (let key in styles) {
-        el.style[key] = styles[key]
-    }
+// 修改样式
+export default function (el: HTMLElement | SVGElement, styles: any) {
+    for (let key in styles) {
+        el.style[key] = styles[key]
+    }
 }