vislite 0.5.0-alpha.0 → 0.5.2-alpha.0

package/src/common/canvas/texts.ts

@@ -1,19 +1,19 @@
-export default function (painter: CanvasRenderingContext2D, contents: string, width: number, height: number, doback: (content: string, top: number) => void) {
-
-    let lineNumber = 0, content = ""
-    for (let i = 0; i < contents.length; i++) {
-        if (painter.measureText(content + contents[i]).width > width || /\n$/.test(content)) {
-            lineNumber += 1
-            doback(content, (lineNumber - 0.5) * height)
-
-            content = contents[i]
-        } else if (i == contents.length - 1) {
-            lineNumber += 1
-            doback(content + contents[i], (lineNumber - 0.5) * height)
-        } else {
-            content += contents[i]
-        }
-    }
-
-    return lineNumber * height
+export default function (painter: CanvasRenderingContext2D, contents: string, width: number, height: number, doback: (content: string, top: number) => void) {
+
+    let lineNumber = 0, content = ""
+    for (let i = 0; i < contents.length; i++) {
+        if (painter.measureText(content + contents[i]).width > width || /\n$/.test(content)) {
+            lineNumber += 1
+            doback(content, (lineNumber - 0.5) * height)
+
+            content = contents[i]
+        } else if (i == contents.length - 1) {
+            lineNumber += 1
+            doback(content + contents[i], (lineNumber - 0.5) * height)
+        } else {
+            content += contents[i]
+        }
+    }
+
+    return lineNumber * height
 }

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
 }

package/src/common/mergeOption.ts

@@ -1,7 +1,7 @@
-export default function (option: any, defaultOption: any) {
-    for (let key in option) {
-        defaultOption[key] = option[key]
-    }
-
-    return defaultOption
+export default function (option: any, defaultOption: any) {
+    for (let key in option) {
+        defaultOption[key] = option[key]
+    }
+
+    return defaultOption
 }

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]
+    }
 }

package/src/common/svg/config.ts

@@ -1,174 +1,174 @@
-import type SVGConfigType from "../../../types/SVGConfig"
-
-import { setAttribute } from "./tool"
-import setStyle from "../setStyle"
-import arc from "../canvas/arc"
-
-// 文字统一设置方法
-export let initText = (
-  el: SVGElement,
-  config: SVGConfigType,
-  x: number,
-  y: number,
-  deg: number
-) => {
-  if (el.nodeName.toLowerCase() !== "text") throw new Error("Need a <text> !")
-
-  // 垂直对齐采用dy实现
-  setAttribute(
-    el,
-    "dy",
-    {
-      top: config["fontSize"] * 0.5,
-      middle: 0,
-      bottom: -config["fontSize"] * 0.5,
-    }[config.textBaseline]
-  )
-
-  setStyle(el, {
-    // 文字对齐方式
-    "text-anchor": {
-      left: "start",
-      right: "end",
-      center: "middle",
-    }[config.textAlign],
-    "dominant-baseline": "central",
-
-    // 文字大小和字体设置
-    "font-size": config["fontSize"] + "px",
-    "font-family": config["fontFamily"],
-  })
-
-  // 位置
-  setAttribute(el, "x", x)
-  setAttribute(el, "y", y)
-
-  // 旋转
-  if (typeof deg == "number") {
-    deg = deg % 360
-    setAttribute(el, "transform", "rotate(" + deg + "," + x + "," + y + ")")
-  }
-}
-
-// 画圆统一设置方法
-export let initCircle = (el: SVGElement, cx: number, cy: number, r: number) => {
-  if (el.nodeName.toLowerCase() !== "circle")
-    throw new Error("Need a <circle> !")
-  setAttribute(el, "cx", cx)
-  setAttribute(el, "cy", cy)
-  setAttribute(el, "r", r)
-}
-
-// 路径统一设置方法
-export let initPath = (el: SVGElement, path: string) => {
-  if (el.nodeName.toLowerCase() !== "path") throw new Error("Need a <path> !")
-  setAttribute(el, "d", path)
-}
-
-// 画矩形统一设置方法
-export let initRect = (
-  el: SVGElement,
-  x: number,
-  y: number,
-  width: number,
-  height: number
-) => {
-  if (el.nodeName.toLowerCase() !== "rect") throw new Error("Need a <rect> !")
-
-  // 由于高和宽不可以是负数，校对一下
-  if (height < 0) {
-    height *= -1
-    y -= height
-  }
-  if (width < 0) {
-    width *= -1
-    x -= width
-  }
-
-  setAttribute(el, "x", x)
-  setAttribute(el, "y", y)
-  setAttribute(el, "width", width)
-  setAttribute(el, "height", height)
-}
-
-// 画弧统一设置方法
-export let initArc = (
-  el: SVGElement,
-  config: SVGConfigType,
-  cx: number,
-  cy: number,
-  r1: number,
-  r2: number,
-  beginDeg: number,
-  deg: number
-) => {
-  if (el.nodeName.toLowerCase() !== "path") throw new Error("Need a <path> !")
-
-  beginDeg = (beginDeg / 180) * Math.PI
-  deg = (deg / 180) * Math.PI
-
-  beginDeg = beginDeg % (Math.PI * 2)
-
-  if (r1 > r2) {
-    let temp = r1
-    r1 = r2
-    r2 = temp
-  }
-
-  // 当|deg|>=2π的时候都认为是一个圆环
-  if (deg >= Math.PI * 1.999999 || deg <= -Math.PI * 1.999999) {
-    deg = Math.PI * 1.999999
-  } 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
-    ) {
-      let f = endA - beginA > Math.PI ? 1 : 0,
-        d = "M" + begInnerX + " " + begInnerY
-      if (r < 0) r = -r
-
-      d +=
-        // 横半径 竖半径 x轴偏移角度 0小弧/1大弧 0逆时针/1顺时针 终点x 终点y
-        "A" + r1 + " " + r1 + " 0 " + f + " 1 " + endInnerX + " " + endInnerY
-
-      // 结尾
-      if (config.arcEndCap == "round")
-        d += "A" + r + " " + r + " " + " 0 1 0 " + endOuterX + " " + endOuterY
-      else if (config.arcEndCap == "-round")
-        d += "A" + r + " " + r + " " + " 0 1 1 " + endOuterX + " " + endOuterY
-      else d += "L" + endOuterX + " " + endOuterY
-      d +=
-        "A" + r2 + " " + r2 + " 0 " + f + " 0 " + begOuterX + " " + begOuterY
-
-      // 开头
-      if (config.arcStartCap == "round")
-        d += "A" + r + " " + r + " " + " 0 1 0 " + begInnerX + " " + begInnerY
-      else if (config.arcStartCap == "-round")
-        d += "A" + r + " " + r + " " + " 0 1 1 " + begInnerX + " " + begInnerY
-      else d += "L" + begInnerX + " " + begInnerY
-
-      if (config.arcStartCap == "butt") d += "Z"
-
-      setAttribute(el, "d", d)
-    }
-  )
-}
+import type SVGConfigType from "../../../types/SVGConfig"
+
+import { setAttribute } from "./tool"
+import setStyle from "../setStyle"
+import arc from "../canvas/arc"
+
+// 文字统一设置方法
+export let initText = (
+  el: SVGElement,
+  config: SVGConfigType,
+  x: number,
+  y: number,
+  deg: number
+) => {
+  if (el.nodeName.toLowerCase() !== "text") throw new Error("Need a <text> !")
+
+  // 垂直对齐采用dy实现
+  setAttribute(
+    el,
+    "dy",
+    {
+      top: config["fontSize"] * 0.5,
+      middle: 0,
+      bottom: -config["fontSize"] * 0.5,
+    }[config.textBaseline]
+  )
+
+  setStyle(el, {
+    // 文字对齐方式
+    "text-anchor": {
+      left: "start",
+      right: "end",
+      center: "middle",
+    }[config.textAlign],
+    "dominant-baseline": "central",
+
+    // 文字大小和字体设置
+    "font-size": config["fontSize"] + "px",
+    "font-family": config["fontFamily"],
+  })
+
+  // 位置
+  setAttribute(el, "x", x)
+  setAttribute(el, "y", y)
+
+  // 旋转
+  if (typeof deg == "number") {
+    deg = deg % 360
+    setAttribute(el, "transform", "rotate(" + deg + "," + x + "," + y + ")")
+  }
+}
+
+// 画圆统一设置方法
+export let initCircle = (el: SVGElement, cx: number, cy: number, r: number) => {
+  if (el.nodeName.toLowerCase() !== "circle")
+    throw new Error("Need a <circle> !")
+  setAttribute(el, "cx", cx)
+  setAttribute(el, "cy", cy)
+  setAttribute(el, "r", r)
+}
+
+// 路径统一设置方法
+export let initPath = (el: SVGElement, path: string) => {
+  if (el.nodeName.toLowerCase() !== "path") throw new Error("Need a <path> !")
+  setAttribute(el, "d", path)
+}
+
+// 画矩形统一设置方法
+export let initRect = (
+  el: SVGElement,
+  x: number,
+  y: number,
+  width: number,
+  height: number
+) => {
+  if (el.nodeName.toLowerCase() !== "rect") throw new Error("Need a <rect> !")
+
+  // 由于高和宽不可以是负数，校对一下
+  if (height < 0) {
+    height *= -1
+    y -= height
+  }
+  if (width < 0) {
+    width *= -1
+    x -= width
+  }
+
+  setAttribute(el, "x", x)
+  setAttribute(el, "y", y)
+  setAttribute(el, "width", width)
+  setAttribute(el, "height", height)
+}
+
+// 画弧统一设置方法
+export let initArc = (
+  el: SVGElement,
+  config: SVGConfigType,
+  cx: number,
+  cy: number,
+  r1: number,
+  r2: number,
+  beginDeg: number,
+  deg: number
+) => {
+  if (el.nodeName.toLowerCase() !== "path") throw new Error("Need a <path> !")
+
+  beginDeg = (beginDeg / 180) * Math.PI
+  deg = (deg / 180) * Math.PI
+
+  beginDeg = beginDeg % (Math.PI * 2)
+
+  if (r1 > r2) {
+    let temp = r1
+    r1 = r2
+    r2 = temp
+  }
+
+  // 当|deg|>=2π的时候都认为是一个圆环
+  if (deg >= Math.PI * 1.999999 || deg <= -Math.PI * 1.999999) {
+    deg = Math.PI * 1.999999
+  } 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
+    ) {
+      let f = endA - beginA > Math.PI ? 1 : 0,
+        d = "M" + begInnerX + " " + begInnerY
+      if (r < 0) r = -r
+
+      d +=
+        // 横半径 竖半径 x轴偏移角度 0小弧/1大弧 0逆时针/1顺时针 终点x 终点y
+        "A" + r1 + " " + r1 + " 0 " + f + " 1 " + endInnerX + " " + endInnerY
+
+      // 结尾
+      if (config.arcEndCap == "round")
+        d += "A" + r + " " + r + " " + " 0 1 0 " + endOuterX + " " + endOuterY
+      else if (config.arcEndCap == "-round")
+        d += "A" + r + " " + r + " " + " 0 1 1 " + endOuterX + " " + endOuterY
+      else d += "L" + endOuterX + " " + endOuterY
+      d +=
+        "A" + r2 + " " + r2 + " 0 " + f + " 0 " + begOuterX + " " + begOuterY
+
+      // 开头
+      if (config.arcStartCap == "round")
+        d += "A" + r + " " + r + " " + " 0 1 0 " + begInnerX + " " + begInnerY
+      else if (config.arcStartCap == "-round")
+        d += "A" + r + " " + r + " " + " 0 1 1 " + begInnerX + " " + begInnerY
+      else d += "L" + begInnerX + " " + begInnerY
+
+      if (config.arcStartCap == "butt") d += "Z"
+
+      setAttribute(el, "d", d)
+    }
+  )
+}