vislite 0.8.0 → 1.0.0-next.1

package/types/index.d.ts

@@ -1,176 +1,146 @@
-import CardinalType from './Cardinal'
-import HermiteType from './Hermite'
-
-import Matrix4Type from './Matrix4'
-import rotateType from './rotate'
-import moveType from './move'
-import scaleType from './scale'
-
-import getLoopColorsType from './getLoopColors'
-import formatColorType from './formatColor'
-import animationType from './animation'
-import rulerType from './ruler'
-
-import SVGType from './SVG'
-import CanvasType from './Canvas'
-import WebGLType from './WebGL'
-
-import CanvasOptionType from './CanvasOption'
-import WebGLOptionType from './WebGLOption'
-
-import getWebGLContextType from './getWebGLContext'
-import ShaderType from './Shader'
-import BufferType from './Buffer'
-import TextureType from './Texture'
-
-import MapType from './Map'
-
-import viewHandlerType from './viewHandler'
-import throttleType from './throttle'
-import resizeObserverType from './resizeObserver'
-
-import TreeLayoutType from './TreeLayout'
-import TreeConfigType from './TreeConfig'
-
-import GeometryType from './Geometry'
-import GeometryOptionType from './GeometryOption'
-
-// 插值
-interface NewCardinalType extends CardinalType {
-    new(t?: number): this
-}
-interface NewHermiteType extends HermiteType {
-    new(u?: number): this
-}
-
-// 变换
-interface NewMatrix4Type extends Matrix4Type {
-    new(initMatrix4?: number[]): this
-}
-
-// 画笔
-interface NewSVGType extends SVGType {
-    new(el: HTMLElement | null): this
-}
-interface NewCanvasType extends CanvasType {
-    new(el: HTMLElement | null, option?: CanvasOptionType): this
-}
-interface NewWebGLType extends WebGLType {
-    new(el: HTMLElement | null, option?: WebGLOptionType): this
-}
-
-// WebGL
-interface NewShaderType extends ShaderType {
-    new(painter: WebGLRenderingContext): this
-}
-interface NewBufferType extends BufferType {
-    new(painter: WebGLRenderingContext, isElement?: boolean): this
-}
-interface NewTextureType extends TextureType {
-    new(painter: WebGLRenderingContext, type: string, unit?: number): this
-}
-
-// 投影
-interface NewEoapType extends MapType {
-    new(scale?: number, center?: number[]): this
-}
-interface NewMercatorType extends MapType {
-    new(scale?: number, center?: number[]): this
-}
-
-// 布局
-interface NewTreeLayoutType extends TreeLayoutType {
-    new(config?: TreeConfigType): this
-}
-
-// 几何&模型数据
-interface NewGeometryType extends GeometryType {
-    new(option?: GeometryOptionType): this
-}
-
-export default class VISLite {
-
-    // 插值
-    static Cardinal: NewCardinalType
-    static Hermite: NewHermiteType
-
-    // 变换
-    static Matrix4: NewMatrix4Type
-    static rotate: rotateType
-    static move: moveType
-    static scale: scaleType
-
-    // 工具
-    static getLoopColors: getLoopColorsType
-    static formatColor: formatColorType
-    static animation: animationType
-    static ruler: rulerType
-
-    // 画笔
-    static SVG: NewSVGType
-    static Canvas: NewCanvasType
-    static WebGL: NewWebGLType
-
-    // WebGL
-    static getWebGLContext: getWebGLContextType
-    static Shader: NewShaderType
-    static Buffer: NewBufferType
-    static Texture: NewTextureType
-
-    // 投影
-    static Eoap: NewEoapType
-    static Mercator: NewMercatorType
-
-    // 辅助
-    static viewHandler: viewHandlerType
-    static throttle: throttleType
-    static resizeObserver: resizeObserverType
-
-    // 布局
-    static TreeLayout: NewTreeLayoutType
-
-    // 几何&模型数据
-    static Geometry: NewGeometryType
-}
-
-// 插值
-export let Cardinal: NewCardinalType
-export let Hermite: NewHermiteType
-
-// 变换
-export let Matrix4: NewMatrix4Type
-export let rotate: rotateType
-export let move: moveType
-export let scale: scaleType
-
-// 工具
-export let getLoopColors: getLoopColorsType
-export let formatColor: formatColorType
-export let animation: animationType
-export let ruler: rulerType
-
-// 画笔
-export let SVG: NewSVGType
-export let Canvas: NewCanvasType
-export let WebGL: NewWebGLType
-
-// WebGL
-export let getWebGLContext: getWebGLContextType
-export let Shader: NewShaderType
-export let Buffer: NewBufferType
-export let Texture: NewTextureType
-
-// 投影
-export let Eoap: NewEoapType
-export let Mercator: NewMercatorType
-
-// 辅助
-export let viewHandler: viewHandlerType
-export let throttle: throttleType
-export let resizeObserver: resizeObserverType
-
-// 布局
-export let TreeLayout: NewTreeLayoutType
-
-// 几何&模型数据
-export let Geometry: NewGeometryType
+import CardinalType from './Cardinal'
+import HermiteType from './Hermite'
+
+import Matrix4Type from './Matrix4'
+import rotateType from './rotate'
+import moveType from './move'
+import scaleType from './scale'
+
+import getLoopColorsType from './getLoopColors'
+import animationType from './animation'
+import rulerType from './ruler'
+
+import SVGType from './SVG'
+import CanvasType from './Canvas'
+
+import CanvasOptionType from './CanvasOption'
+
+import getWebGLContextType from './getWebGLContext'
+import ShaderType from './Shader'
+import BufferType from './Buffer'
+import TextureType from './Texture'
+
+import MapType from './Map'
+
+import throttleType from './throttle'
+
+import TreeLayoutType from './TreeLayout'
+import TreeConfigType from './TreeConfig'
+
+// 插值
+interface NewCardinalType extends CardinalType {
+    new(t?: number): this
+}
+interface NewHermiteType extends HermiteType {
+    new(u?: number): this
+}
+
+// 变换
+interface NewMatrix4Type extends Matrix4Type {
+    new(initMatrix4?: number[]): this
+}
+
+// 画笔
+interface NewSVGType extends SVGType {
+    new(el: HTMLElement | null): this
+}
+interface NewCanvasType extends CanvasType {
+    new(el: HTMLElement | null, option?: CanvasOptionType): this
+}
+
+// WebGL
+interface NewShaderType extends ShaderType {
+    new(painter: WebGLRenderingContext): this
+}
+interface NewBufferType extends BufferType {
+    new(painter: WebGLRenderingContext, isElement?: boolean): this
+}
+interface NewTextureType extends TextureType {
+    new(painter: WebGLRenderingContext, type: string, unit?: number): this
+}
+
+// 投影
+interface NewEoapType extends MapType {
+    new(scale?: number, center?: number[]): this
+}
+interface NewMercatorType extends MapType {
+    new(scale?: number, center?: number[]): this
+}
+
+// 布局
+interface NewTreeLayoutType extends TreeLayoutType {
+    new(config?: TreeConfigType): this
+}
+
+export default class VISLite {
+
+    // 插值
+    static Cardinal: NewCardinalType
+    static Hermite: NewHermiteType
+
+    // 变换
+    static Matrix4: NewMatrix4Type
+    static rotate: rotateType
+    static move: moveType
+    static scale: scaleType
+
+    // 工具
+    static getLoopColors: getLoopColorsType
+    static animation: animationType
+    static ruler: rulerType
+
+    // 画笔
+    static SVG: NewSVGType
+    static Canvas: NewCanvasType
+
+    // WebGL
+    static getWebGLContext: getWebGLContextType
+    static Shader: NewShaderType
+    static Buffer: NewBufferType
+    static Texture: NewTextureType
+
+    // 投影
+    static Eoap: NewEoapType
+    static Mercator: NewMercatorType
+
+    // 辅助
+    static throttle: throttleType
+
+    // 布局
+    static TreeLayout: NewTreeLayoutType
+}
+
+// 插值
+export let Cardinal: NewCardinalType
+export let Hermite: NewHermiteType
+
+// 变换
+export let Matrix4: NewMatrix4Type
+export let rotate: rotateType
+export let move: moveType
+export let scale: scaleType
+
+// 工具
+export let getLoopColors: getLoopColorsType
+export let animation: animationType
+export let ruler: rulerType
+
+// 画笔
+export let SVG: NewSVGType
+export let Canvas: NewCanvasType
+
+// WebGL
+export let getWebGLContext: getWebGLContextType
+export let Shader: NewShaderType
+export let Buffer: NewBufferType
+export let Texture: NewTextureType
+
+// 投影
+export let Eoap: NewEoapType
+export let Mercator: NewMercatorType
+
+// 辅助
+export let throttle: throttleType
+
+// 布局
+export let TreeLayout: NewTreeLayoutType

package/types/move.d.ts

@@ -1,3 +1,6 @@
-export default interface moveType {
-    (ax: number, ay: number, d: number, x: number, y: number): [number, number]
+/**
+ * 移动
+ */
+export default interface moveType {
+    (ax: number, ay: number, d: number, x: number, y: number): [number, number]
 }

package/types/painterConfig.d.ts

@@ -1,3 +1,3 @@
-export type arcCapType = "butt" | "round" | "-round"
-export type textAlignType = "left" | "center" | "right"
+export type arcCapType = "butt" | "round" | "-round"
+export type textAlignType = "left" | "center" | "right"
 export type textBaselineType = "top" | "middle" | "bottom"

package/types/rotate.d.ts

@@ -1,3 +1,6 @@
-export default interface rotateType {
-    (cx: number, cy: number, deg: number, x: number, y: number): [number, number]
+/**
+ * 旋转
+ */
+export default interface rotateType {
+    (cx: number, cy: number, deg: number, x: number, y: number): [number, number]
 }

package/types/ruler.d.ts

@@ -1,8 +1,11 @@
-export interface rulerOptionType {
-    max?: number
-    min?: number
-}
-
-export default interface rulerType {
-    (maxValue: number, minValue: number, num: number, option?: rulerOptionType): number[]
+export interface rulerOptionType {
+    max?: number
+    min?: number
+}
+
+/**
+ * 刻度尺刻度运算，返回一个数组，表示刻度尺上应该显示的刻度
+ */
+export default interface rulerType {
+    (maxValue: number, minValue: number, num: number, option?: rulerOptionType): number[]
 }

package/types/scale.d.ts

@@ -1,3 +1,6 @@
-export default interface scaleType {
-    (cx: number, cy: number, times: number, x: number, y: number): [number, number]
+/**
+ * 缩放
+ */
+export default interface scaleType {
+    (cx: number, cy: number, times: number, x: number, y: number): [number, number]
 }

package/types/throttle.d.ts

@@ -1,5 +1,8 @@
-import throttleOptionType from './throttleOption'
-
-export default interface throttle {
-    (callback: Function, option?: throttleOptionType): Function
+import throttleOptionType from './throttleOption'
+
+/**
+ * 节流函数
+ */
+export default interface throttle {
+    (callback: Function, option?: throttleOptionType): Function
 }

package/types/throttleOption.d.ts

@@ -1,22 +1,22 @@
-export type throttleOpportunityType = "begin" | "end" | "wide"
-
-export default interface throttleOptionType {
-
-    /**
-     * 节流时长
-     */
-    time?: number
-
-    /**
-     * 是否持续节流
-     */
-    keep?: boolean
-
-    /**
-     * 执行时机
-     *
-     * begin（开始触发）、end（结束触发）、wide（第一次开始触发，其余结束触发）
-     */
-    opportunity?: throttleOpportunityType
-
+export type throttleOpportunityType = "begin" | "end" | "wide"
+
+export default interface throttleOptionType {
+
+    /**
+     * 节流时长
+     */
+    time?: number
+
+    /**
+     * 是否持续节流
+     */
+    keep?: boolean
+
+    /**
+     * 执行时机
+     *
+     * begin（开始触发）、end（结束触发）、wide（第一次开始触发，其余结束触发）
+     */
+    opportunity?: throttleOpportunityType
+
 }

package/uni-app/ui-canvas.vue

@@ -85,7 +85,7 @@
   </view>
 </template>
 <script>
-import OralCanvas from "../lib/OralCanvas/index.es.js";
+import { _Canvas as RawCanvas } from "../lib/index.umd.min.js";
 import drawImage from "./drawImage.js";
 export default {
   data() {
@@ -111,10 +111,6 @@ export default {
       type: Number,
       default: 150,
     },
-    touchstart: {
-      type: Function,
-      default: () => {},
-    },
     cover: {
       type: Boolean,
       default: true,
@@ -152,7 +148,7 @@ export default {
       // #endif
 
       let _this = this;
-      this.help.instance = new OralCanvas(
+      this.help.instance = new RawCanvas(
         {
           getContext() {
             return painter;
@@ -244,12 +240,9 @@ export default {
         resolve(this.help.instance);
       });
     },
-    doit(event, doback) {
+    doit(event) {
       let doRun = (x, y) => {
         this.help.instance.getRegion(x, y).then((regionName) => {
-          // 兼容旧语法
-          if (typeof doback == "function") doback(regionName);
-
           this.$emit("dotouchstart", {
             name: regionName,
             x: x,
@@ -283,7 +276,7 @@ export default {
       }
     },
     doitstart(event) {
-      this.doit(event, this.touchstart);
+      this.doit(event);
     },
   },
 };

package/lib/Geometry/index.umd.d.ts

@@ -1,3 +0,0 @@
-import { Geometry } from "../../types/index"
-
-export default Geometry