vislite 0.8.0 → 1.0.0-next.0

package/miniprogram/ui-canvas/index.js

@@ -1,107 +1,100 @@
-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 { _Canvas as RawCanvas } from "../../lib/index.umd.min.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);
+                            });
+                    } else {
+                        doback(null);
+                    }
+                };
+
+                getCanvasContext("painter", painter => {
+                    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) => {
+                                wx.canvasToTempFilePath({
+                                    canvasId: "painter",
+                                    success: function (e) {
+                                        resolveUrl(e.tempFilePath);
+                                    },
+                                }, this);
+                            })
+                        };
+                        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/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/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/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,3 @@
-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 Shader from '../../src/common/webgl/shader'
+
 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/layout/TreeLayout"
-
+import TreeLayout from "../../src/layout/TreeLayout"
+
 export default TreeLayout

package/package/animation/index.ts

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

package/package/getLoopColors/index.ts

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

package/package/index.ts

@@ -1,77 +1,68 @@
-import Cardinal from "./Cardinal/index"
-import Hermite from "./Hermite/index"
-
-import Matrix4 from "./Matrix4/index"
-import rotate from "./rotate/index"
-import move from "./move/index"
-import scale from "./scale/index"
-
-import getLoopColors from "./getLoopColors/index"
-import formatColor from "./formatColor/index"
-import animation from "./animation/index"
-import ruler from "./ruler/index"
-
-import SVG from "./SVG/index"
-import Canvas from "./Canvas/index"
-import WebGL from "./WebGL/index"
-
-import getWebGLContext from "./getWebGLContext/index"
-import Shader from "./Shader/index"
-import Texture from "./Texture/index"
-import Buffer from "./Buffer/index"
-
-import Eoap from "./Eoap/index"
-import Mercator from "./Mercator/index"
-
-import viewHandler from "./viewHandler/index"
-import resizeObserver from "./resizeObserver/index"
-import throttle from "./throttle/index"
-
-import TreeLayout from "./TreeLayout/index"
-
-import Geometry from "./Geometry/index"
-
-export default {
-
-    // 插值
-    Cardinal,
-    Hermite,
-
-    // 变换
-    Matrix4,
-    rotate,
-    move,
-    scale,
-
-    // 工具
-    getLoopColors,
-    formatColor,
-    animation,
-    ruler,
-
-    // 画笔
-    SVG,
-    Canvas,
-    WebGL,
-
-    // WebGL
-    getWebGLContext,
-    Shader,
-    Texture,
-    Buffer,
-
-    // 投影
-    Eoap,
-    Mercator,
-
-    // 辅助
-    viewHandler,
-    resizeObserver,
-    throttle,
-
-    // 布局
-    TreeLayout,
-
-    // 几何&模型数据
-    Geometry
+import Cardinal from "./Cardinal/index"
+import Hermite from "./Hermite/index"
+
+import Matrix4 from "./Matrix4/index"
+import rotate from "./rotate/index"
+import move from "./move/index"
+import scale from "./scale/index"
+
+import getLoopColors from "./getLoopColors/index"
+import animation from "./animation/index"
+import ruler from "./ruler/index"
+
+import SVG from "./SVG/index"
+import Canvas from "./Canvas/index"
+import _Canvas from "../src/common/canvas/index"
+
+import getWebGLContext from "./getWebGLContext/index"
+import Shader from "./Shader/index"
+import Texture from "./Texture/index"
+import Buffer from "./Buffer/index"
+
+import Eoap from "./Eoap/index"
+import Mercator from "./Mercator/index"
+
+import resizeObserver from "./resizeObserver/index"
+import throttle from "./throttle/index"
+
+import TreeLayout from "./TreeLayout/index"
+
+export default {
+
+    // 插值
+    Cardinal,
+    Hermite,
+
+    // 变换
+    Matrix4,
+    rotate,
+    move,
+    scale,
+
+    // 工具
+    getLoopColors,
+    animation,
+    ruler,
+
+    // 画笔
+    SVG,
+    Canvas,
+    _Canvas,
+
+    // WebGL
+    getWebGLContext,
+    Shader,
+    Texture,
+    Buffer,
+
+    // 投影
+    Eoap,
+    Mercator,
+
+    // 辅助
+    resizeObserver,
+    throttle,
+
+    // 布局
+    TreeLayout
 }

package/package/move/index.ts

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

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/scale/index.ts

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

package/package/throttle/index.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vislite",
-  "version": "0.8.0",
+  "version": "1.0.0-next.0",
   "description": "灵活、快速、简单的数据可视化交互式跨端前端库",
   "main": "./lib/index.umd.min.js",
   "typings": "./types/index.d.ts",