vislite 0.4.1 → 0.5.0

package/miniprogram/ui-canvas/index.js

@@ -1,107 +1,107 @@
-import OralCanvas from "../../lib/OralCanvas/index.es.js";
-
-let dpr = wx.getSystemInfoSync().pixelRatio;
-
-Component({
-    properties: {
-        width: {
-            type: Number,
-            default: 300
-        },
-        height: {
-            type: Number,
-            default: 150
-        },
-        region: {
-            type: Boolean,
-            default: true
-        },
-        touchstart: {
-            type: Function,
-            default: () => { }
-        }
-    },
-    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);
-                            });
-                    } else {
-                        doback(null);
-                    }
-                };
-
-                getCanvasContext("painter", painter => {
-                    getCanvasContext("region", region => {
-                        this.data.help.instance = new OralCanvas({
-                            getContext() {
-                                return painter;
-                            }
-                        }, this.data.region ? {
-                            getContext() {
-                                return region;
-                            }
-                        } : null);
-
-                        this.data.help.instance.toDataURL = () => {
-                            return new Promise((resolveUrl) => {
-                                wx.canvasToTempFilePath({
-                                    canvasId: "painter",
-                                    success: function (e) {
-                                        resolveUrl(e.tempFilePath);
-                                    },
-                                }, this);
-                            })
-                        };
-                        resolve(this.data.help.instance);
-                    });
-                });
-
-            });
-        },
-        doit(event, doback) {
-            let x = event.touches[0].x;
-            let y = event.touches[0].y;
-
-            this.data.help.instance.getRegion(x, y).then((regionName) => {
-                // 兼容旧语法
-                if (doback) doback(regionName);
-
-                this.triggerEvent('dotouchstart', {
-                    name: regionName,
-                    x: x,
-                    y: y
-                })
-            });
-        },
-        doitstart(event) {
-            this.doit(event, this.data.touchstart);
-        }
-    }
-
-});
+import OralCanvas from "../../lib/OralCanvas/index.es.js";
+
+let dpr = wx.getSystemInfoSync().pixelRatio;
+
+Component({
+    properties: {
+        width: {
+            type: Number,
+            default: 300
+        },
+        height: {
+            type: Number,
+            default: 150
+        },
+        region: {
+            type: Boolean,
+            default: true
+        },
+        touchstart: {
+            type: Function,
+            default: () => { }
+        }
+    },
+    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);
+                            });
+                    } else {
+                        doback(null);
+                    }
+                };
+
+                getCanvasContext("painter", painter => {
+                    getCanvasContext("region", region => {
+                        this.data.help.instance = new OralCanvas({
+                            getContext() {
+                                return painter;
+                            }
+                        }, this.data.region ? {
+                            getContext() {
+                                return region;
+                            }
+                        } : null);
+
+                        this.data.help.instance.toDataURL = () => {
+                            return new Promise((resolveUrl) => {
+                                wx.canvasToTempFilePath({
+                                    canvasId: "painter",
+                                    success: function (e) {
+                                        resolveUrl(e.tempFilePath);
+                                    },
+                                }, this);
+                            })
+                        };
+                        resolve(this.data.help.instance);
+                    });
+                });
+
+            });
+        },
+        doit(event, doback) {
+            let x = event.touches[0].x;
+            let y = event.touches[0].y;
+
+            this.data.help.instance.getRegion(x, y).then((regionName) => {
+                // 兼容旧语法
+                if (doback) doback(regionName);
+
+                this.triggerEvent('dotouchstart', {
+                    name: regionName,
+                    x: x,
+                    y: y
+                })
+            });
+        },
+        doitstart(event) {
+            this.doit(event, this.data.touchstart);
+        }
+    }
+
+});

package/miniprogram/ui-canvas/index.json

@@ -1,4 +1,4 @@
-{
-    "usingComponents": {},
-    "component": true
-  }
+{
+    "usingComponents": {},
+    "component": true
+  }

package/miniprogram/ui-canvas/index.wxml

@@ -1,4 +1,4 @@
-<view>
-    <canvas type="2d" id="painter" style='width:{{width}}px;height:{{height}}px;' bindtouchstart="doitstart"></canvas>
-    <canvas wx:if="{{region}}" type="2d" id="region" style='width:{{width}}px;height:{{height}}px;' class="region"></canvas>
-</view>
+<view>
+    <canvas type="2d" id="painter" style='width:{{width}}px;height:{{height}}px;' bindtouchstart="doitstart"></canvas>
+    <canvas wx:if="{{region}}" type="2d" id="region" style='width:{{width}}px;height:{{height}}px;' class="region"></canvas>
+</view>

package/miniprogram/ui-canvas/index.wxss

@@ -1,5 +1,5 @@
-/* 辅助的区域不应该可以看见 */
-.region {
-  position: fixed;
-  left: 50000px;
-}
+/* 辅助的区域不应该可以看见 */
+.region {
+  position: fixed;
+  left: 50000px;
+}

package/package/Buffer/index.ts

@@ -1,3 +1,3 @@
-import Buffer from '../../src/common/webgl/buffer'
-
+import Buffer from '../../src/common/webgl/buffer'
+
 export default Buffer

package/package/Canvas/index.ts

@@ -1,3 +1,3 @@
-import Canvas from "../../src/Canvas"
-
+import Canvas from "../../src/Canvas"
+
 export default Canvas

package/package/Cardinal/index.ts

@@ -1,3 +1,3 @@
-import Cardinal from "../../src/interpolation/Cardinal"
-
+import Cardinal from "../../src/interpolation/Cardinal"
+
 export default Cardinal

package/package/Eoap/index.ts

@@ -1,3 +1,3 @@
-import Eoap from "../../src/Eoap"
-
+import Eoap from "../../src/Eoap"
+
 export default Eoap

package/package/Geometry/index.ts

@@ -0,0 +1,3 @@
+import Geometry from "../../src/Geometry"
+
+export default Geometry

package/package/Hermite/index.ts

@@ -1,3 +1,3 @@
-import Hermite from "../../src/interpolation/Hermite"
-
+import Hermite from "../../src/interpolation/Hermite"
+
 export default Hermite

package/package/Matrix4/index.ts

@@ -1,3 +1,3 @@
-import Matrix4 from "../../src/Matrix4/index"
-
+import Matrix4 from "../../src/Matrix4/index"
+
 export default Matrix4

package/package/Mercator/index.ts

@@ -1,3 +1,3 @@
-import Mercator from "../../src/Mercator"
-
+import Mercator from "../../src/Mercator"
+
 export default Mercator

package/package/OralCanvas/index.ts

@@ -1,3 +1,3 @@
-import _Canvas from "../../src/common/canvas/index"
-
+import _Canvas from "../../src/common/canvas/index"
+
 export default _Canvas

package/package/OralWebGL/index.ts

@@ -1,3 +1,3 @@
-import _WebGL from "../../src/common/webgl/index"
-
+import _WebGL from "../../src/common/webgl/index"
+
 export default _WebGL

package/package/SVG/index.ts

@@ -1,3 +1,3 @@
-import SVG from "../../src/SVG"
-
+import SVG from "../../src/SVG"
+
 export default SVG

package/package/Shader/index.ts

@@ -1,40 +1,40 @@
-import type ShaderType from '../../types/Shader'
-
-import OralShader from '../../src/common/webgl/shader'
-
-import vsColor from '../../src/shader/vsColor.c'
-import vsColors from '../../src/shader/vsColors.c'
-import vsImage from '../../src/shader/vsImage.c'
-import vsCube from '../../src/shader/vsCube.c'
-
-import fsColor from '../../src/shader/fsColor.c'
-import fsColors from '../../src/shader/fsColors.c'
-import fsImage from '../../src/shader/fsImage.c'
-import fsCube from '../../src/shader/fsCube.c'
-
-class Shader extends OralShader implements ShaderType {
-
-    compile(vshaderSource: string, fshaderSource: string): this
-    compile(shaderName: string): this
-    compile(arg1: string, arg2?: string) {
-        if (arg2) {
-            super.compile(arg1, arg2)
-        } else {
-            super.compile({
-                "color": vsColor,
-                "colors": vsColors,
-                "image": vsImage,
-                "cube": vsCube
-            }[arg1], {
-                "color": fsColor,
-                "colors": fsColors,
-                "image": fsImage,
-                "cube": fsCube
-            }[arg1])
-        }
-        return this
-    }
-
-}
-
+import type ShaderType from '../../types/Shader'
+
+import OralShader from '../../src/common/webgl/shader'
+
+import vsColor from '../../src/shader/vsColor.c'
+import vsColors from '../../src/shader/vsColors.c'
+import vsImage from '../../src/shader/vsImage.c'
+import vsCube from '../../src/shader/vsCube.c'
+
+import fsColor from '../../src/shader/fsColor.c'
+import fsColors from '../../src/shader/fsColors.c'
+import fsImage from '../../src/shader/fsImage.c'
+import fsCube from '../../src/shader/fsCube.c'
+
+class Shader extends OralShader implements ShaderType {
+
+    compile(vshaderSource: string, fshaderSource: string): this
+    compile(shaderName: string): this
+    compile(arg1: string, arg2?: string) {
+        if (arg2) {
+            super.compile(arg1, arg2)
+        } else {
+            super.compile({
+                "color": vsColor,
+                "colors": vsColors,
+                "image": vsImage,
+                "cube": vsCube
+            }[arg1], {
+                "color": fsColor,
+                "colors": fsColors,
+                "image": fsImage,
+                "cube": fsCube
+            }[arg1])
+        }
+        return this
+    }
+
+}
+
 export default Shader

package/package/Texture/index.ts

@@ -1,3 +1,3 @@
-import Texture from '../../src/common/webgl/texture'
-
+import Texture from '../../src/common/webgl/texture'
+
 export default Texture

package/package/TreeLayout/index.ts

@@ -1,3 +1,3 @@
-import TreeLayout from "../../src/TreeLayout/index"
-
+import TreeLayout from "../../src/TreeLayout/index"
+
 export default TreeLayout

package/package/WebGL/index.ts

@@ -1,3 +1,3 @@
-import WebGL from "../../src/WebGL"
-
+import WebGL from "../../src/WebGL"
+
 export default WebGL

package/package/animation/index.ts

@@ -1,3 +1,3 @@
-import animation from "../../src/animation"
-
+import animation from "../../src/animation"
+
 export default animation

package/package/formatColor/index.ts

@@ -1,3 +1,3 @@
-import formatColor from "../../src/formatColor"
-
+import formatColor from "../../src/formatColor"
+
 export default formatColor

package/package/getLoopColors/index.ts

@@ -1,3 +1,3 @@
-import getLoopColors from "../../src/getLoopColors"
-
+import getLoopColors from "../../src/getLoopColors"
+
 export default getLoopColors

package/package/getWebGLContext/index.ts

@@ -1,40 +1,40 @@
-import getWebGLContext from "../../src/common/webgl/getWebGLContext"
-
-export default (el: HTMLElement | null, scale: number = 1) => {
-    if (!el) {
-        throw new Error("VISLite getWebGLContext:The mount point requires an HTMLElement type but encountered null.")
-    }
-
-    let width = el.clientWidth, height = el.clientHeight
-
-    let ViewCanvas: HTMLCanvasElement
-
-    let _el = el as any
-
-    // 如果已经初始化过了
-    if (_el._vislite_canvas_) {
-        ViewCanvas = _el._vislite_canvas_
-    }
-
-    // 否则就初始化
-    else {
-
-        ViewCanvas = document.createElement('canvas')
-        el.appendChild(ViewCanvas)
-
-        _el._vislite_canvas_ = ViewCanvas
-
-        el.setAttribute('vislite', 'WebGL')
-
-    }
-
-    // 设置画布大小
-
-    ViewCanvas.style.width = width + "px"
-    ViewCanvas.setAttribute('width', width + "")
-
-    ViewCanvas.style.height = height + "px"
-    ViewCanvas.setAttribute('height', height + "")
-
-    return getWebGLContext(ViewCanvas, scale)
+import getWebGLContext from "../../src/common/webgl/getWebGLContext"
+
+export default (el: HTMLElement | null, scale: number = 1) => {
+    if (!el) {
+        throw new Error("VISLite getWebGLContext:The mount point requires an HTMLElement type but encountered null.")
+    }
+
+    let width = el.clientWidth, height = el.clientHeight
+
+    let ViewCanvas: HTMLCanvasElement
+
+    let _el = el as any
+
+    // 如果已经初始化过了
+    if (_el._vislite_canvas_) {
+        ViewCanvas = _el._vislite_canvas_
+    }
+
+    // 否则就初始化
+    else {
+
+        ViewCanvas = document.createElement('canvas')
+        el.appendChild(ViewCanvas)
+
+        _el._vislite_canvas_ = ViewCanvas
+
+        el.setAttribute('vislite', 'WebGL')
+
+    }
+
+    // 设置画布大小
+
+    ViewCanvas.style.width = width + "px"
+    ViewCanvas.setAttribute('width', width + "")
+
+    ViewCanvas.style.height = height + "px"
+    ViewCanvas.setAttribute('height', height + "")
+
+    return getWebGLContext(ViewCanvas, scale)
 }

package/package/index.ts

@@ -27,6 +27,8 @@ import throttle from "./throttle/index"
 
 import TreeLayout from "./TreeLayout/index"
 
+import Geometry from "./Geometry/index"
+
 export default {
 
     // 插值
@@ -64,5 +66,8 @@ export default {
     throttle,
 
     // 布局
-    TreeLayout
+    TreeLayout,
+
+    // 几何&模型数据
+    Geometry
 }

package/package/resizeObserver/index.ts

@@ -1,3 +1,3 @@
-import resizeObserver from "../../src/resizeObserver"
-
+import resizeObserver from "../../src/resizeObserver"
+
 export default resizeObserver

package/package/rotate/index.ts

@@ -1,3 +1,3 @@
-import rotate from "../../src/rotate"
-
+import rotate from "../../src/rotate"
+
 export default rotate

package/package/ruler/index.ts

@@ -1,3 +1,3 @@
-import ruler from "../../src/ruler"
-
+import ruler from "../../src/ruler"
+
 export default ruler

package/package/throttle/index.ts

@@ -1,3 +1,3 @@
-import throttle from "../../src/throttle"
-
+import throttle from "../../src/throttle"
+
 export default throttle

package/package/viewHandler/index.ts

@@ -1,3 +1,3 @@
-import viewHandler from "../../src/viewHandler"
-
+import viewHandler from "../../src/viewHandler"
+
 export default viewHandler

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vislite",
-  "version": "0.4.1",
+  "version": "0.5.0",
   "description": "灵活、快速、简单的数据可视化交互式跨端前端库",
   "main": "./lib/index.umd.min.js",
   "typings": "./types/index.d.ts",
@@ -26,8 +26,10 @@
     "miniprogram",
     "image2d",
     "image3d",
+    "oi-contrib",
     "vislite",
     "d3",
+    "zxl20070701",
     "three",
     "echarts",
     "datav",