vislite 1.3.0 → 1.4.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/map/getBoundary.ts

@@ -1,16 +1,16 @@
-import { mllData } from "./tool"
-
-export default function (...geos: any[]) {
-    let minLongitude: any = null, maxLongitude: any = null, minLatitude: any = null, maxLatitude: any = null
-
-    for (const geoJson of geos) {
-        const [_minLongitude, _maxLongitude, _minLatitude, _maxLatitude] = mllData(geoJson)
-
-        if (minLongitude == void 0 || _minLongitude < minLongitude) minLongitude = _minLongitude
-        if (maxLongitude == void 0 || _maxLongitude > maxLongitude) maxLongitude = _maxLongitude
-        if (minLatitude == void 0 || _minLatitude < minLatitude) minLatitude = _minLatitude
-        if (maxLatitude == void 0 || _maxLatitude > maxLatitude) maxLatitude = _maxLatitude
-    }
-
-    return [minLongitude, maxLongitude, minLatitude, maxLatitude]
+import { mllData } from "./tool"
+
+export default function (...geos: any[]) {
+    let minLongitude: any = null, maxLongitude: any = null, minLatitude: any = null, maxLatitude: any = null
+
+    for (const geoJson of geos) {
+        const [_minLongitude, _maxLongitude, _minLatitude, _maxLatitude] = mllData(geoJson)
+
+        if (minLongitude == void 0 || _minLongitude < minLongitude) minLongitude = _minLongitude
+        if (maxLongitude == void 0 || _maxLongitude > maxLongitude) maxLongitude = _maxLongitude
+        if (minLatitude == void 0 || _minLatitude < minLatitude) minLatitude = _minLatitude
+        if (maxLatitude == void 0 || _maxLatitude > maxLatitude) maxLatitude = _maxLatitude
+    }
+
+    return [minLongitude, maxLongitude, minLatitude, maxLatitude]
 }

package/src/common/map/tool.ts

@@ -1,30 +1,30 @@
-export function mllData(geoJson: any) {
-    let minLongitude: any = null, maxLongitude: any = null, minLatitude: any = null, maxLatitude: any = null
-
-    const forPolygon = function (coordinates: any) {
-        for (let j = 0; j < coordinates.length; j++) {
-            for (let k = 0; k < coordinates[j].length; k++) {
-                const longitude = coordinates[j][k][0], latitude = coordinates[j][k][1]
-
-                if (minLongitude == void 0 || minLongitude > longitude) minLongitude = longitude
-                if (maxLongitude == void 0 || maxLongitude < longitude) maxLongitude = longitude
-
-                if (minLatitude == void 0 || minLatitude > latitude) minLatitude = latitude
-                if (maxLatitude == void 0 || maxLatitude < latitude) maxLatitude = latitude
-            }
-        }
-    };
-
-    const features = geoJson.features
-    for (let i = 0; i < features.length; i++) {
-        if (features[i].geometry.type == "Polygon") {
-            forPolygon(features[i].geometry.coordinates)
-        } else if (features[i].geometry.type == "MultiPolygon") {
-            for (let j = 0; j < features[i].geometry.coordinates.length; j++) {
-                forPolygon(features[i].geometry.coordinates[j])
-            }
-        }
-    }
-
-    return [minLongitude, maxLongitude, minLatitude, maxLatitude]
+export function mllData(geoJson: any) {
+    let minLongitude: any = null, maxLongitude: any = null, minLatitude: any = null, maxLatitude: any = null
+
+    const forPolygon = function (coordinates: any) {
+        for (let j = 0; j < coordinates.length; j++) {
+            for (let k = 0; k < coordinates[j].length; k++) {
+                const longitude = coordinates[j][k][0], latitude = coordinates[j][k][1]
+
+                if (minLongitude == void 0 || minLongitude > longitude) minLongitude = longitude
+                if (maxLongitude == void 0 || maxLongitude < longitude) maxLongitude = longitude
+
+                if (minLatitude == void 0 || minLatitude > latitude) minLatitude = latitude
+                if (maxLatitude == void 0 || maxLatitude < latitude) maxLatitude = latitude
+            }
+        }
+    };
+
+    const features = geoJson.features
+    for (let i = 0; i < features.length; i++) {
+        if (features[i].geometry.type == "Polygon") {
+            forPolygon(features[i].geometry.coordinates)
+        } else if (features[i].geometry.type == "MultiPolygon") {
+            for (let j = 0; j < features[i].geometry.coordinates.length; j++) {
+                forPolygon(features[i].geometry.coordinates[j])
+            }
+        }
+    }
+
+    return [minLongitude, maxLongitude, minLatitude, maxLatitude]
 }

package/src/common/option.ts

@@ -1,30 +1,30 @@
-import { isPlainObject } from "./type"
-
-// 初始化配置
-export function initOption(setOption: any, defaultOption: any) {
-    for (const key in setOption) {
-        defaultOption[key] = setOption[key]
-    }
-
-    return defaultOption
-}
-
-// 合并配置
-export function mergeOption(oldOption: any, newOption: any) {
-    (function doit(oldOption, newOption) {
-
-        for (const key in newOption) {
-            const value = newOption[key]
-
-            if (isPlainObject(value)) {
-                if (!oldOption[key]) oldOption[key] = {}
-
-                doit(oldOption[key], newOption[key])
-            } else {
-                oldOption[key] = value
-            }
-
-        }
-
-    })(oldOption, newOption)
+import { isPlainObject } from "./type"
+
+// 初始化配置
+export function initOption(setOption: any, defaultOption: any) {
+    for (const key in setOption) {
+        defaultOption[key] = setOption[key]
+    }
+
+    return defaultOption
+}
+
+// 合并配置
+export function mergeOption(oldOption: any, newOption: any) {
+    (function doit(oldOption, newOption) {
+
+        for (const key in newOption) {
+            const value = newOption[key]
+
+            if (isPlainObject(value)) {
+                if (!oldOption[key]) oldOption[key] = {}
+
+                doit(oldOption[key], newOption[key])
+            } else {
+                oldOption[key] = value
+            }
+
+        }
+
+    })(oldOption, newOption)
 }

package/src/common/setStyle.ts

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

package/src/common/svg/config.ts

@@ -1,213 +1,213 @@
-import type SVGConfigType from "../../../types/SVGConfig"
-
-import { setAttribute } from "./tool"
-import setStyle from "../setStyle"
-import arc from "../canvas/arc"
-import { toNode } from "./tool"
-
-export const initDefs = (el: SVGElement) => {
-    const defs = el.getElementsByTagName('defs')
-    if (defs.length <= 0) {
-        const newDefs = toNode("defs")
-        el.appendChild(newDefs)
-        return newDefs
-    } else {
-        return defs[0]
-    }
-}
-
-// 文字统一设置方法
-export const 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"] as number) * 0.5,
-            middle: 0,
-            bottom: -(config["fontSize"] as number) * 0.5,
-        } as {
-            [key: string]: number
-        })[config.textBaseline as string]
-    )
-
-    setStyle(el, {
-        // 文字对齐方式
-        "text-anchor": ({
-            left: "start",
-            right: "end",
-            center: "middle",
-        } as {
-            [key: string]: string
-        })[config.textAlign as string],
-        "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 const 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 const initPath = (el: SVGElement, path: string) => {
-    if (el.nodeName.toLowerCase() !== "path") throw new Error("Need a <path> !")
-    setAttribute(el, "d", path)
-}
-
-// 画矩形统一设置方法
-export const initRect = (
-    el: SVGElement,
-    config: SVGConfigType,
-    x: number,
-    y: number,
-    width: number,
-    height: number
-) => {
-    if (el.nodeName.toLowerCase() !== "path") throw new Error("Need a <path> !")
-
-    const rectRadius: Array<number> = [];
-    if (Array.isArray(config.rectRadius) && config.rectRadius.length > 0) {
-        for (let index = 0; index < 4; index++) {
-            rectRadius.push(...config.rectRadius)
-        }
-    }
-
-    // 由于高和宽不可以是负数，校对一下
-    if (height < 0) {
-        height *= -1
-        y -= height
-    }
-    if (width < 0) {
-        width *= -1
-        x -= width
-    }
-
-    let d = ""
-    if (rectRadius.length >= 4) {
-        d = "M" + (x + rectRadius[0]) + " " + y
-        d += "L" + (x + width - rectRadius[1]) + " " + y
-        d += "A" + rectRadius[1] + " " + rectRadius[1] + " 0 0 1 " + (x + width) + " " + (y + rectRadius[1])
-        d += "L" + (x + width) + " " + (y + height - rectRadius[2])
-        d += "A" + rectRadius[2] + " " + rectRadius[2] + " 0 0 1 " + (x + width - rectRadius[2]) + " " + (y + height)
-        d += "L" + (x + rectRadius[3]) + " " + (y + height)
-        d += "A" + rectRadius[3] + " " + rectRadius[3] + " 0 0 1 " + x + " " + (y + height - rectRadius[3])
-        d += "L" + x + " " + (y + rectRadius[0])
-        d += "A" + rectRadius[0] + " " + rectRadius[0] + " 0 0 1 " + (x + rectRadius[0]) + " " + y
-    } else {
-        d = "M" + x + " " + y
-        d += "L" + (x + width) + " " + y
-        d += "L" + (x + width) + " " + (y + height)
-        d += "L" + x + " " + (y + height)
-        d += "Z"
-    }
-    setAttribute(el, "d", d)
-}
-
-// 画弧统一设置方法
-export const 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) {
-        const 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
-        ) {
-            const f = endA - beginA > Math.PI ? 1 : 0
-            let 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"
+import { toNode } from "./tool"
+
+export const initDefs = (el: SVGElement) => {
+    const defs = el.getElementsByTagName('defs')
+    if (defs.length <= 0) {
+        const newDefs = toNode("defs")
+        el.appendChild(newDefs)
+        return newDefs
+    } else {
+        return defs[0]
+    }
+}
+
+// 文字统一设置方法
+export const 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"] as number) * 0.5,
+            middle: 0,
+            bottom: -(config["fontSize"] as number) * 0.5,
+        } as {
+            [key: string]: number
+        })[config.textBaseline as string]
+    )
+
+    setStyle(el, {
+        // 文字对齐方式
+        "text-anchor": ({
+            left: "start",
+            right: "end",
+            center: "middle",
+        } as {
+            [key: string]: string
+        })[config.textAlign as string],
+        "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 const 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 const initPath = (el: SVGElement, path: string) => {
+    if (el.nodeName.toLowerCase() !== "path") throw new Error("Need a <path> !")
+    setAttribute(el, "d", path)
+}
+
+// 画矩形统一设置方法
+export const initRect = (
+    el: SVGElement,
+    config: SVGConfigType,
+    x: number,
+    y: number,
+    width: number,
+    height: number
+) => {
+    if (el.nodeName.toLowerCase() !== "path") throw new Error("Need a <path> !")
+
+    const rectRadius: Array<number> = [];
+    if (Array.isArray(config.rectRadius) && config.rectRadius.length > 0) {
+        for (let index = 0; index < 4; index++) {
+            rectRadius.push(...config.rectRadius)
+        }
+    }
+
+    // 由于高和宽不可以是负数，校对一下
+    if (height < 0) {
+        height *= -1
+        y -= height
+    }
+    if (width < 0) {
+        width *= -1
+        x -= width
+    }
+
+    let d = ""
+    if (rectRadius.length >= 4) {
+        d = "M" + (x + rectRadius[0]) + " " + y
+        d += "L" + (x + width - rectRadius[1]) + " " + y
+        d += "A" + rectRadius[1] + " " + rectRadius[1] + " 0 0 1 " + (x + width) + " " + (y + rectRadius[1])
+        d += "L" + (x + width) + " " + (y + height - rectRadius[2])
+        d += "A" + rectRadius[2] + " " + rectRadius[2] + " 0 0 1 " + (x + width - rectRadius[2]) + " " + (y + height)
+        d += "L" + (x + rectRadius[3]) + " " + (y + height)
+        d += "A" + rectRadius[3] + " " + rectRadius[3] + " 0 0 1 " + x + " " + (y + height - rectRadius[3])
+        d += "L" + x + " " + (y + rectRadius[0])
+        d += "A" + rectRadius[0] + " " + rectRadius[0] + " 0 0 1 " + (x + rectRadius[0]) + " " + y
+    } else {
+        d = "M" + x + " " + y
+        d += "L" + (x + width) + " " + y
+        d += "L" + (x + width) + " " + (y + height)
+        d += "L" + x + " " + (y + height)
+        d += "Z"
+    }
+    setAttribute(el, "d", d)
+}
+
+// 画弧统一设置方法
+export const 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) {
+        const 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
+        ) {
+            const f = endA - beginA > Math.PI ? 1 : 0
+            let 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)
+        }
+    )
+}

package/src/common/svg/default.ts

@@ -3,8 +3,8 @@ import type { arcCapType, textAlignType, textBaselineType, lineCapType, lineJoin
 export default function () {
     return {
         // 颜色
-        fillStyle: "#000",
-        strokeStyle: "#000",
+        fillStyle: "rgb(0,0,0)",
+        strokeStyle: "rgb(0,0,0)",
 
         // 文字对齐方式
         textAlign: <textAlignType>"left",

package/src/common/svg/gradient.ts

@@ -23,7 +23,7 @@ const enhanceGradient = function (gradient: SVGElement, gradientId: string) {
 export const linearGradient = function (el: SVGElement, x0: number, y0: number, x1: number, y1: number) {
 
     const defs = initDefs(el)
-    const gradientId = "vislite-lg-" + new Date().valueOf() + "-" + Math.random()
+    const gradientId = "visliteLg" + new Date().valueOf() + "" + (Math.random() * 1000000).toFixed(0)
 
     const linearGradient = toNode("linearGradient")
     defs.appendChild(linearGradient)
@@ -40,7 +40,7 @@ export const linearGradient = function (el: SVGElement, x0: number, y0: number,
 export const radialGradient = function (el: SVGElement, cx: number, cy: number, r: number) {
 
     const defs = initDefs(el)
-    const gradientId = "vislite-rg-" + new Date().valueOf() + "-" + Math.random()
+    const gradientId = "visliteRg" + new Date().valueOf() + "" + (Math.random() * 1000000).toFixed(0)
 
     const radialGradient = toNode("radialGradient")
     defs.appendChild(radialGradient)