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

package/types/index.d.ts

@@ -1,159 +1,161 @@
-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 assembleType from './assemble'
-
-import TreeLayoutType from './TreeLayout'
-import TreeConfigType from './TreeConfig'
-
-import { initOptionType, mergeOptionType } from './option'
-
-// 插值
-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, width?: number, height?: number): 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 assemble: assembleType
-
-    // 布局
-    static TreeLayout: NewTreeLayoutType
-
-    // 配置项
-    static initOption: initOptionType
-    static mergeOption: mergeOptionType
-}
-
-// 插值
-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 assemble: assembleType
-
-// 布局
-export let TreeLayout: NewTreeLayoutType
-
-// 配置项
-export let initOption: initOptionType
+/// <reference path="./uni-canvas.d.ts" />
+
+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 assembleType from './assemble'
+
+import TreeLayoutType from './TreeLayout'
+import TreeConfigType from './TreeConfig'
+
+import { initOptionType, mergeOptionType } from './option'
+
+// 插值
+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, width?: number, height?: number): 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 assemble: assembleType
+
+    // 布局
+    static TreeLayout: NewTreeLayoutType
+
+    // 配置项
+    static initOption: initOptionType
+    static mergeOption: mergeOptionType
+}
+
+// 插值
+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 assemble: assembleType
+
+// 布局
+export let TreeLayout: NewTreeLayoutType
+
+// 配置项
+export let initOption: initOptionType
 export let mergeOption: mergeOptionType

package/types/painterConfig.d.ts

@@ -1,3 +1,5 @@
-export type arcCapType = "butt" | "round" | "-round"
-export type textAlignType = "left" | "center" | "right"
-export type textBaselineType = "top" | "middle" | "bottom"
+export type arcCapType = "butt" | "round" | "-round"
+export type textAlignType = "left" | "center" | "right"
+export type textBaselineType = "top" | "middle" | "bottom"
+export type lineCapType = "butt" | "round" | "square"
+export type lineJoinType = "miter" | "bevel" | "round"

package/types/throttle.d.ts

@@ -1,8 +1,6 @@
-import throttleOptionType from './throttleOption'
+import { throttleType } from "@oipage/core.js/src/throttle"
 
 /**
  * 节流函数
  */
-export default interface throttle {
-    (callback: Function, option?: throttleOptionType): Function
-}
+export default throttleType

package/types/throttleOption.d.ts

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

package/types/uni-canvas.d.ts

@@ -0,0 +1,4 @@
+/**
+ * ui-canvas
+ */
+declare module "vislite/uni-app/ui-canvas.vue";

package/src/animation.ts

@@ -1,99 +0,0 @@
-//当前正在运动的动画的tick函数堆栈
-let $timers: any[] = []
-//唯一定时器的定时间隔
-const $interval = 13
-//定时器ID
-let $timerId: any
-
-/**
- * 动画轮播
- * @param {function} doback 轮询函数，有一个形参deep，0-1，表示执行进度
- * @param {number} duration 动画时长，可选
- * @param {function} callback 动画结束回调，可选，有一个形参deep，0-1，表示执行进度
- *
- * @returns {function} 返回一个函数，调用该函数，可以提前结束动画
- */
-export default function (doback: (deep: number) => void, duration: number = 400, callback: (deep: number) => void = () => { }): Function {
-
-    const clock = {
-        //把tick函数推入堆栈
-        "timer": function (tick: (deep: number) => void, duration: number, callback: (deep: number) => void) {
-            if (!tick) {
-                throw new Error('Tick is required!')
-            }
-            const id = new Date().valueOf() + "_" + (Math.random() * 1000).toFixed(0)
-            $timers.push({
-                "id": id,
-                "createTime": new Date(),
-                "tick": tick,
-                "duration": duration,
-                "callback": callback
-            })
-            clock.start()
-            return id
-        },
-
-        //开启唯一的定时器timerId
-        "start": function () {
-            if (!$timerId) {
-                $timerId = setInterval(clock.tick, $interval)
-            }
-        },
-
-        //被定时器调用，遍历timers堆栈
-        "tick": function () {
-            let createTime: Date, flag: number, tick: (deep: number) => void, callback: (deep: number) => void, timer: any, duration: number, passTime: number
-            const timers: any[] = $timers
-            $timers = []
-            $timers.length = 0
-            for (flag = 0; flag < timers.length; flag++) {
-                //初始化数据
-                timer = timers[flag]
-                createTime = timer.createTime
-                tick = timer.tick
-                duration = timer.duration
-                callback = timer.callback
-
-                //执行
-                passTime = (+new Date().valueOf() - createTime.valueOf()) / duration
-                passTime = passTime > 1 ? 1 : passTime
-                tick(passTime)
-                if (passTime < 1 && timer.id) {
-                    //动画没有结束再添加
-                    $timers.push(timer)
-                } else {
-                    callback(passTime)
-                }
-            }
-            if ($timers.length <= 0) {
-                clock.stop()
-            }
-        },
-
-        //停止定时器，重置timerId=null
-        "stop": function () {
-            if ($timerId) {
-                clearInterval($timerId)
-                $timerId = null
-            }
-        }
-    }
-
-    const id = clock.timer(function (deep: number) {
-        //其中deep为0-1，表示改变的程度
-        doback(deep)
-    }, duration, callback)
-
-    // 返回一个函数
-    // 用于在动画结束前结束动画
-    return function () {
-        let i: string
-        for (i in $timers) {
-            if ($timers[i].id == id) {
-                $timers[i].id = void 0
-                return
-            }
-        }
-    }
-
-}

package/src/throttle.ts

@@ -1,53 +0,0 @@
-import type throttleOptionType from '../types/throttleOption'
-
-import { initOption } from './common/option'
-
-export default function (callback: Function, option: throttleOptionType = {}) {
-
-    // 校对缺省值
-    option = initOption(option, <throttleOptionType>{
-        time: 200,
-        keep: false,
-        opportunity: "end"
-    })
-
-    let hadInterval = false
-    let hadClick = false
-    let oneClick = false
-
-    let arg: any
-    return function () {
-        const _this = this
-        // eslint-disable-next-line prefer-rest-params
-        arg = arguments
-
-        // 如果前置任务都完成了
-        if (!hadInterval) {
-            if (option.opportunity != 'end') {
-                callback.apply(_this, arg)
-            }
-            hadInterval = true
-
-            const interval = setInterval(() => {
-                if (hadClick) {
-                    if (!option.keep) {
-                        callback.apply(_this, arg)
-                    }
-                } else {
-                    if (option.opportunity != 'begin') {
-                        if (oneClick || option.opportunity == 'end') callback.apply(_this, arg)
-                    }
-                    hadInterval = false
-                    oneClick = false
-                    clearInterval(interval)
-                }
-                hadClick = false
-            }, option.time)
-        } else {
-            hadClick = true
-            oneClick = true
-        }
-
-    }
-
-}