vislite 1.3.0 → 1.4.0

package/types/animation.d.ts

@@ -1,4 +1,10 @@
-import { animationType } from "oipage/corejs/animation"
+interface animationFun {
+    (deep: number): void
+}
+
+interface animationType {
+    (doback: animationFun, duration?: number, callback?: animationFun): Function
+}
 
 /**
  * 轮询动画，返回一个函数，调用该函数，可以提前结束动画

package/types/assemble.d.ts

@@ -1,6 +1,6 @@
-/**
- * 步进生成器
- */
-export default interface assembleType {
-    (begin: number, end: number, step: number, count: number): () => Array<number>
+/**
+ * 步进生成器
+ */
+export default interface assembleType {
+    (begin: number, end: number, step: number, count: number): () => Array<number>
 }

package/types/getLoopColors.d.ts

@@ -1,6 +1,6 @@
-/**
- * 获取一组循环色彩
- */
-export default interface getLoopColorsType {
-    (num: number, alpha?: number, colorsFactory?: (alpha: number) => Array<string>): string[]
+/**
+ * 获取一组循环色彩
+ */
+export default interface getLoopColorsType {
+    (num: number, alpha?: number, colorsFactory?: (alpha: number) => Array<string>): string[]
 }

package/types/getWebGLContext.d.ts

@@ -1,8 +1,8 @@
-export type WebGLmodeType = "scaleToFill" | "aspectFit" | "aspectFill"
-
-/**
- * 获取WebGL上下文对象
- */
-export default interface getWebGLContextType {
-    (el: HTMLElement | null, scale?: number, mode?: WebGLmodeType): WebGLRenderingContext
+export type WebGLmodeType = "scaleToFill" | "aspectFit" | "aspectFill"
+
+/**
+ * 获取WebGL上下文对象
+ */
+export default interface getWebGLContextType {
+    (el: HTMLElement | null, scale?: number, mode?: WebGLmodeType): WebGLRenderingContext
 }

package/types/index.d.ts

@@ -33,6 +33,12 @@ import MapCoordinateType from './MapCoordinate'
 import TreeConfigType from './TreeConfig'
 import TreeLayoutType from './TreeLayout'
 
+import PieConfigType from './PieConfig'
+import PieLayoutType from './PieLayout'
+
+import BarConfigType from './BarConfig'
+import BarLayoutType from './BarLayout'
+
 import { initOptionType, mergeOptionType } from './option'
 
 // 插值
@@ -87,6 +93,12 @@ interface NewMapCoordinateType extends MapCoordinateType {
 interface NewTreeLayoutType extends TreeLayoutType {
     new(config?: TreeConfigType): this
 }
+interface NewPieLayoutType extends PieLayoutType {
+    new(config?: PieConfigType): this
+}
+interface NewBarLayoutType extends BarLayoutType {
+    new(config?: BarConfigType): this
+}
 
 export default class VISLite {
 
@@ -129,6 +141,8 @@ export default class VISLite {
 
     // 布局
     static TreeLayout: NewTreeLayoutType
+    static PieLayout: NewPieLayoutType
+    static BarLayout: NewBarLayoutType
 
     // 配置项
     static initOption: initOptionType
@@ -174,6 +188,8 @@ export let MapCoordinate: NewMapCoordinateType
 
 // 布局
 export let TreeLayout: NewTreeLayoutType
+export let PieLayout: NewPieLayoutType
+export let BarLayout: NewBarLayoutType
 
 // 配置项
 export let initOption: initOptionType

package/types/move.d.ts

@@ -1,6 +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/option.d.ts

@@ -1,13 +1,13 @@
-/**
- * 初始化配置
- */
-export interface initOptionType {
-    (setOption: any, defaultOption: any): any
-}
-
-/**
- * 合并配置
- */
-export interface mergeOptionType {
-    (oldOption: any, newOption: any): void
+/**
+ * 初始化配置
+ */
+export interface initOptionType {
+    (setOption: any, defaultOption: any): any
+}
+
+/**
+ * 合并配置
+ */
+export interface mergeOptionType {
+    (oldOption: any, newOption: any): void
 }

package/types/painterConfig.d.ts

@@ -1,5 +1,5 @@
-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 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/rotate.d.ts

@@ -1,6 +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,11 +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,6 +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,4 +1,4 @@
-import { throttleType } from "oipage/corejs/throttle"
+import { throttleType } from "oipage/web/throttle/index"
 
 /**
  * 节流函数

package/types/throttleOption.d.ts

@@ -1 +1 @@
-export * from "oipage/corejs/throttle"
+export * from "oipage/web/throttle/index"

package/types/ui-canvas.d.ts

@@ -1,5 +1,5 @@
-import CanvasType from "./Canvas"
-
-export default interface UiCanvasType {
-    fetch(): Promise<CanvasType>
+import CanvasType from "./Canvas"
+
+export default interface UiCanvasType {
+    fetch(): Promise<CanvasType>
 }

package/types/uni-canvas.d.ts

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

package/uni-app/drawImage.js

@@ -1,20 +1,20 @@
-export default function (_this, drawImage) {
-    return function (imgUrl, x, y, w, h) {
-        return new Promise((resolve) => {
-            if (/^http/.test(imgUrl)) {
-                uni.downloadFile({
-                    url: imgUrl,
-                    success: function (res) {
-                        drawImage.call(_this, res.tempFilePath, x, y, w, h, true).then(() => {
-                            resolve({});
-                        });
-                    },
-                });
-            } else {
-                drawImage.call(_this, imgUrl, x, y, w, h, true).then(() => {
-                    resolve({});
-                });
-            }
-        });
-    };
+export default function (_this, drawImage) {
+    return function (imgUrl, x, y, w, h) {
+        return new Promise((resolve) => {
+            if (/^http/.test(imgUrl)) {
+                uni.downloadFile({
+                    url: imgUrl,
+                    success: function (res) {
+                        drawImage.call(_this, res.tempFilePath, x, y, w, h, true).then(() => {
+                            resolve({});
+                        });
+                    },
+                });
+            } else {
+                drawImage.call(_this, imgUrl, x, y, w, h, true).then(() => {
+                    resolve({});
+                });
+            }
+        });
+    };
 };