vislite 1.2.0-alpha.2 → 1.2.0-alpha.4

package/miniprogram/ui-canvas/index.js

@@ -1,115 +1,115 @@
-import RawCanvas from "../../lib/RawCanvas/index.es.min.js";
-import drawImage from "./drawImage.js";
-
-let dpr = wx.getSystemInfoSync().pixelRatio;
-
-Component({
-    properties: {
-        width: {
-            type: Number,
-            default: 300
-        },
-        height: {
-            type: Number,
-            default: 150
-        },
-        region: {
-            type: Boolean,
-            default: true
-        }
-    },
-    data: {
-        help: {}
-    },
-    lifetimes: {
-        ready() {
-
-        }
-    },
-    methods: {
-        fetch() {
-            return new Promise((resolve, reject) => {
-
-                let getCanvasContext = (idName, doback) => {
-                    if (idName != 'region' || this.data.region) {
-                        const query = wx.createSelectorQuery().in(this);
-                        query.select('#' + idName)
-                            .fields({ node: true, size: true })
-                            .exec((res) => {
-                                const canvas = res[0].node;
-                                const ctx = canvas.getContext('2d');
-
-                                canvas.width = res[0].width * (idName == "region" ? 1 : dpr);
-                                canvas.height = res[0].height * (idName == "region" ? 1 : dpr);
-
-                                if (idName != "region") {
-                                    ctx.scale(dpr, dpr);
-                                }
-
-                                doback(ctx, idName != 'region' ? canvas : null);
-                            });
-                    } else {
-                        doback(null);
-                    }
-                };
-
-                getCanvasContext("painter", (painter, panvas) => {
-                    getCanvasContext("region", region => {
-                        this.data.help.instance = new RawCanvas({
-                            getContext() {
-                                return painter;
-                            }
-                        }, this.data.region ? {
-                            getContext() {
-                                return region;
-                            }
-                        } : null);
-
-                        this.data.help.instance.toDataURL = () => {
-                            return new Promise((resolveUrl) => {
-                                if (panvas.toDataURL) {
-                                    resolveUrl(panvas.toDataURL());
-                                } else {
-                                    wx.canvasToTempFilePath({
-                                        canvasId: "painter",
-                                        success: function (e) {
-                                            resolveUrl(e.tempFilePath);
-                                        },
-                                        fail: function (e) {
-                                            console.log(e)
-                                        }
-                                    }, this);
-                                }
-                            });
-                        };
-
-                        this.data.help.instance.drawImage = drawImage(
-                            this.data.help.instance,
-                            this.data.help.instance.drawImage,
-                            panvas
-                        );
-
-                        resolve(this.data.help.instance);
-                    });
-                });
-
-            });
-        },
-        doit(event) {
-            let x = event.touches[0].x;
-            let y = event.touches[0].y;
-
-            this.data.help.instance.getRegion(x, y).then((regionName) => {
-                this.triggerEvent('dotouchstart', {
-                    name: regionName,
-                    x: x,
-                    y: y
-                })
-            });
-        },
-        doitstart(event) {
-            this.doit(event);
-        }
-    }
-
-});
+import RawCanvas from "../../lib/RawCanvas/index.es.min.js";
+import drawImage from "./drawImage.js";
+
+let dpr = wx.getSystemInfoSync().pixelRatio;
+
+Component({
+    properties: {
+        width: {
+            type: Number,
+            default: 300
+        },
+        height: {
+            type: Number,
+            default: 150
+        },
+        region: {
+            type: Boolean,
+            default: false
+        }
+    },
+    data: {
+        help: {}
+    },
+    lifetimes: {
+        ready() {
+
+        }
+    },
+    methods: {
+        fetch() {
+            return new Promise((resolve, reject) => {
+
+                let getCanvasContext = (idName, doback) => {
+                    if (idName != 'region' || this.data.region) {
+                        const query = wx.createSelectorQuery().in(this);
+                        query.select('#' + idName)
+                            .fields({ node: true, size: true })
+                            .exec((res) => {
+                                const canvas = res[0].node;
+                                const ctx = canvas.getContext('2d');
+
+                                canvas.width = res[0].width * (idName == "region" ? 1 : dpr);
+                                canvas.height = res[0].height * (idName == "region" ? 1 : dpr);
+
+                                if (idName != "region") {
+                                    ctx.scale(dpr, dpr);
+                                }
+
+                                doback(ctx, idName != 'region' ? canvas : null);
+                            });
+                    } else {
+                        doback(null);
+                    }
+                };
+
+                getCanvasContext("painter", (painter, panvas) => {
+                    getCanvasContext("region", region => {
+                        this.data.help.instance = new RawCanvas({
+                            getContext() {
+                                return painter;
+                            }
+                        }, this.data.region ? {
+                            getContext() {
+                                return region;
+                            }
+                        } : null);
+
+                        this.data.help.instance.toDataURL = () => {
+                            return new Promise((resolveUrl) => {
+                                if (panvas.toDataURL) {
+                                    resolveUrl(panvas.toDataURL());
+                                } else {
+                                    wx.canvasToTempFilePath({
+                                        canvasId: "painter",
+                                        success: function (e) {
+                                            resolveUrl(e.tempFilePath);
+                                        },
+                                        fail: function (e) {
+                                            console.log(e)
+                                        }
+                                    }, this);
+                                }
+                            });
+                        };
+
+                        this.data.help.instance.drawImage = drawImage(
+                            this.data.help.instance,
+                            this.data.help.instance.drawImage,
+                            panvas
+                        );
+
+                        resolve(this.data.help.instance);
+                    });
+                });
+
+            });
+        },
+        doit(event) {
+            let x = event.touches[0].x;
+            let y = event.touches[0].y;
+
+            this.data.help.instance.getRegion(x, y).then((regionName) => {
+                this.triggerEvent('dotouchstart', {
+                    name: regionName,
+                    x: x,
+                    y: y
+                })
+            });
+        },
+        doitstart(event) {
+            this.doit(event);
+        }
+    }
+
+});

package/package/animation/index.ts

@@ -1,3 +1,3 @@
-import animation from "../../src/animation"
+import { animation } from "@oipage/core.js/src/animation/index"
 
 export default animation

package/package/throttle/index.ts

@@ -1,3 +1,3 @@
-import throttle from "../../src/throttle"
+import { throttle } from "@oipage/core.js/src/throttle/index"
 
 export default throttle

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "vislite",
-  "version": "1.2.0-alpha.2",
+  "version": "1.2.0-alpha.4",
   "description": "灵活、快速、简单的数据可视化交互式跨端前端库",
   "main": "./lib/index.umd.min.js",
   "typings": "./types/index.d.ts",
   "unpkg": "./lib/index.umd.min.js",
-  "jsdelivr":"./lib/index.umd.min.js",
+  "jsdelivr": "./lib/index.umd.min.js",
   "sideEffects": false,
   "scripts": {
     "init": "npm install && devby --copy ./node_modules/pageby/dist/pageby.min.js ./docs/js/min/pageby.min.js",
@@ -50,6 +50,8 @@
   },
   "homepage": "https://oi-contrib.github.io/VISLite",
   "devDependencies": {
+    "@rollup/plugin-commonjs": "^25.0.7",
+    "@rollup/plugin-node-resolve": "^15.2.3",
     "@rollup/plugin-typescript": "^11.1.0",
     "@types/jasmine": "^4.3.1",
     "@typescript-eslint/eslint-plugin": "^6.14.0",
@@ -69,5 +71,8 @@
     "webpack": "^5.70.0",
     "webpack-cli": "^4.9.2",
     "webpack-dev-server": "^4.7.4"
+  },
+  "dependencies": {
+    "@oipage/core.js": "^0.1.0-alpha.1"
   }
 }

package/src/Canvas.ts

@@ -1,85 +1,85 @@
-import type CanvasType from '../types/Canvas'
-import type CanvasOptionType from '../types/CanvasOption'
-
-import OralCanvas from './common/canvas/index'
-import { initOption } from './common/option'
-
-class Canvas extends OralCanvas implements CanvasType {
-    private __canvas: HTMLCanvasElement
-    private __el: HTMLElement
-    constructor(el: HTMLElement | null, option: CanvasOptionType = {}, width: number = 0, height: number = 0) {
-        if (!el) {
-            throw new Error("VISLite Canvas:The mount point requires an HTMLElement type but encountered null.")
-        }
-
-        option = initOption(option, {
-            region: true,
-            willReadFrequently: false
-        })
-
-        width = width || el.clientWidth
-        height = height || el.clientHeight
-
-        let ViewCanvas: HTMLCanvasElement, RegionCanvas: HTMLCanvasElement | null = null
-
-        const _el = el as any
-
-        // 如果已经初始化过了
-        if (_el._vislite_canvas_) {
-            ViewCanvas = _el._vislite_canvas_[0]
-            RegionCanvas = _el._vislite_canvas_[1]
-        }
-
-        // 否则就初始化
-        else {
-            ViewCanvas = document.createElement('canvas')
-            el.appendChild(ViewCanvas)
-
-            if (option.region) {
-                RegionCanvas = document.createElement('canvas')
-            }
-
-            _el._vislite_canvas_ = [ViewCanvas, RegionCanvas]
-
-            el.setAttribute('vislite', 'Canvas')
-        }
-
-        // 设置画布大小
-        const canvasArray = [RegionCanvas, ViewCanvas]
-        for (let index = 0; index < canvasArray.length; index++) {
-            const canvas = canvasArray[index]
-            if (canvas) {
-                canvas.style.width = width + "px"
-                canvas.setAttribute('width', (index * width + width) + "")
-
-                canvas.style.height = height + "px"
-                canvas.setAttribute('height', (index * height + height) + "")
-            }
-        }
-
-        super(ViewCanvas, RegionCanvas, {
-            willReadFrequently: option.willReadFrequently,
-        }, 2)
-
-        this.__canvas = ViewCanvas
-        this.__el = el
-        this.painter.scale(2, 2)
-    }
-
-    toDataURL(): Promise<string> {
-        return new Promise(resolve => {
-            resolve(this.__canvas.toDataURL())
-        })
-    }
-
-    bind(eventName: string, callback: (regionName: string) => void) {
-        this.__el.addEventListener(eventName, (event: any) => {
-            this.getRegion(event.offsetX, event.offsetY).then(regionName => {
-                callback(regionName)
-            })
-        })
-        return this
-    }
-}
-
+import type CanvasType from '../types/Canvas'
+import type CanvasOptionType from '../types/CanvasOption'
+
+import OralCanvas from './common/canvas/index'
+import { initOption } from './common/option'
+
+class Canvas extends OralCanvas implements CanvasType {
+    private __canvas: HTMLCanvasElement
+    private __el: HTMLElement
+    constructor(el: HTMLElement | null, option: CanvasOptionType = {}, width: number = 0, height: number = 0) {
+        if (!el) {
+            throw new Error("VISLite Canvas:The mount point requires an HTMLElement type but encountered null.")
+        }
+
+        option = initOption(option, {
+            region: true,
+            willReadFrequently: false
+        })
+
+        width = width || el.clientWidth
+        height = height || el.clientHeight
+
+        let ViewCanvas: HTMLCanvasElement, RegionCanvas: HTMLCanvasElement | null = null
+
+        const _el = el as any
+
+        // 如果已经初始化过了
+        if (_el._vislite_canvas_) {
+            ViewCanvas = _el._vislite_canvas_[0]
+            RegionCanvas = _el._vislite_canvas_[1]
+        }
+
+        // 否则就初始化
+        else {
+            ViewCanvas = document.createElement('canvas')
+            el.appendChild(ViewCanvas)
+
+            if (option.region) {
+                RegionCanvas = document.createElement('canvas')
+            }
+
+            _el._vislite_canvas_ = [ViewCanvas, RegionCanvas]
+
+            el.setAttribute('vislite', 'Canvas')
+        }
+
+        // 设置画布大小
+        const canvasArray = [RegionCanvas, ViewCanvas]
+        for (let index = 0; index < canvasArray.length; index++) {
+            const canvas = canvasArray[index]
+            if (canvas) {
+                canvas.style.width = width + "px"
+                canvas.setAttribute('width', (index * width + width) + "")
+
+                canvas.style.height = height + "px"
+                canvas.setAttribute('height', (index * height + height) + "")
+            }
+        }
+
+        super(ViewCanvas, RegionCanvas, {
+            willReadFrequently: option.willReadFrequently,
+        }, 2)
+
+        this.__canvas = ViewCanvas
+        this.__el = el
+        this.painter.scale(2, 2)
+    }
+
+    toDataURL(): Promise<string> {
+        return new Promise(resolve => {
+            resolve(this.__canvas.toDataURL())
+        })
+    }
+
+    bind(eventName: string, callback: (regionName: string, x: number, y: number) => void) {
+        this.__el.addEventListener(eventName, (event: any) => {
+            this.getRegion(event.offsetX, event.offsetY).then(regionName => {
+                callback(regionName, event.offsetX, event.offsetY)
+            })
+        })
+        return this
+    }
+}
+
 export default Canvas

package/src/common/canvas/gradient.ts

@@ -1,24 +1,32 @@
-let enhanceGradient = function (gradient: CanvasGradient) {
-    const enhanceGradient = {
-        "value": function () {
-            return gradient
-        },
-        "setColor": function (stop: number, color: string) {
-            gradient.addColorStop(stop, color)
-            return enhanceGradient
-        }
-    };
-    return enhanceGradient
-}
-
-// 线性渐变
-export const linearGradient = function (painter: CanvasRenderingContext2D, x0: number, y0: number, x1: number, y1: number) {
-    const gradient = painter.createLinearGradient(x0, y0, x1, y1)
-    return enhanceGradient(gradient)
-}
-
-// 环形渐变
-export const radialGradient = function (painter: CanvasRenderingContext2D, cx: number, cy: number, r: number) {
-    const gradient = painter.createRadialGradient(cx, cy, 0, cx, cy, r)
-    return enhanceGradient(gradient)
-}
+let enhanceGradient = function (gradient: CanvasGradient, calcStop?: Function) {
+    const enhanceGradient = {
+        "value": function () {
+            return gradient
+        },
+        "setColor": function (stop: number, color: string) {
+            gradient.addColorStop(calcStop ? calcStop(stop) : stop, color)
+            return enhanceGradient
+        }
+    };
+    return enhanceGradient
+}
+
+// 线性渐变
+export const linearGradient = function (painter: CanvasRenderingContext2D, x0: number, y0: number, x1: number, y1: number) {
+    const gradient = painter.createLinearGradient(x0, y0, x1, y1)
+    return enhanceGradient(gradient)
+}
+
+// 环形渐变
+export const radialGradient = function (painter: CanvasRenderingContext2D, cx: number, cy: number, r: number) {
+    const gradient = painter.createRadialGradient(cx, cy, 0, cx, cy, r)
+    return enhanceGradient(gradient)
+}
+
+// 角度渐变
+export const conicGradient = function (painter: CanvasRenderingContext2D, cx: number, cy: number, startDeg: number, deg?: number) {
+    const gradient = painter.createConicGradient(startDeg, cx, cy)
+    return enhanceGradient(gradient, deg ? (stop: number) => {
+        return deg / (Math.PI * 2) * stop
+    } : undefined)
+}