taro-react-uilib 1.4.4 → 1.4.5

package/lib/utils/index.js

@@ -213,4 +213,87 @@ export function verifyIdcard(idcard) {
     }
     return false;
 }
+export function tripleDefer(func) {
+    setTimeout(() => setTimeout(() => setTimeout(() => func())));
+}
+export function isString(v) {
+    return typeof v === "string";
+}
+export function isFunction(v) {
+    return typeof v === "function";
+}
+export function isEqual(x, y) {
+    if (x === y) {
+        return true;
+    }
+    else if (typeof x === "object" &&
+        x !== null &&
+        typeof y === "object" &&
+        y !== null) {
+        const keysX = Object.keys(x);
+        const keysY = Object.keys(y);
+        if (keysX.length !== keysY.length) {
+            return false;
+        }
+        for (const key of keysX) {
+            if (!isEqual(x[key], y[key])) {
+                return false;
+            }
+        }
+        return true;
+    }
+    return false;
+}
+export function pick(obj, keys) {
+    const r = {};
+    keys.forEach(key => {
+        r[key] = obj[key];
+    });
+    return r;
+}
+const idCounter = {};
+export function uniqueId(prefix = "$unique$") {
+    if (!idCounter[prefix]) {
+        idCounter[prefix] = 0;
+    }
+    const id = ++idCounter[prefix];
+    if (prefix === "$unique$") {
+        return `${id}`;
+    }
+    return `${prefix}${id}`;
+}
+/**
+ * 版本号比较进阶版
+ * @param {string} ver1  5.19.1  前一个版本
+ * @param {string} ver2  5.18.3  后一个版本
+ * @returns {number}  1: 前一个版本 大于 后一个版本
+ *                   -1: 前一个版本 小于 后一个版本
+ *                    0: 前一个版本 等于 后一个版本
+ */
+export function compareVersion(ver1, ver2) {
+    let v1 = ver1.split(".");
+    let v2 = ver2.split(".");
+    const len = Math.max(v1.length, v2.length);
+    // 调整两个版本号位数相同
+    while (v1.length < len) {
+        v1.push("0");
+    }
+    while (v2.length < len) {
+        v2.push("0");
+    }
+    // 循环判断每位数的大小
+    for (let i = 0; i < len; i++) {
+        const num1 = parseInt(v1[i]);
+        const num2 = parseInt(v2[i]);
+        if (num1 > num2) {
+            //前一个版本 大于 后一个版本
+            return 1;
+        }
+        else if (num1 < num2) {
+            //前一个版本 小于 后一个版本
+            return -1;
+        }
+    }
+    return 0;
+}
 //# sourceMappingURL=index.js.map

package/lib/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "taro-react-uilib",
-  "version": "1.4.4",
+  "version": "1.4.5",
   "description": "基于taro的跨端组件库",
   "templateInfo": {
     "name": "default",
@@ -81,6 +81,7 @@
     "@tarojs/runtime": "3.4.2",
     "@tarojs/taro": "3.4.2",
     "@tarojs/webpack-runner": "3.4.2",
+    "@types/echarts": "^4.9.22",
     "@types/react": "^17.0.2",
     "@types/webpack-env": "^1.13.6",
     "@typescript-eslint/eslint-plugin": "^5.24.0",

package/types/components/Echarts/index.d.ts

@@ -0,0 +1,5 @@
+import React from "react";
+import { EChartsProps, EchartsHandle } from "./types";
+export type { EChartsProps, EChartOption, EChartsInstance, EChartsLoadingOption, EchartsHandle, } from "./types";
+declare const _default: React.MemoExoticComponent<React.ForwardRefExoticComponent<Pick<EChartsProps, "style" | "option" | "className" | "type" | "onError" | "id" | "key" | "hidden" | "animation" | "dangerouslySetInnerHTML" | "onTouchStart" | "onTouchMove" | "onTouchCancel" | "onTouchEnd" | "onClick" | "onLongPress" | "onLongClick" | "onTransitionEnd" | "onAnimationStart" | "onAnimationIteration" | "onAnimationEnd" | "onTouchForceChange" | "nativeProps" | "echarts" | "isPage" | "canvasId" | "disableScroll" | "onLongTap" | "theme" | "notMerge" | "lazyUpdate" | "showLoading" | "loadingOption" | "opts" | "onChartReady" | "onEvents"> & React.RefAttributes<EchartsHandle>>>;
+export default _default;

package/types/components/Echarts/types.d.ts

@@ -0,0 +1,34 @@
+import { CanvasProps } from "@tarojs/components/types/Canvas";
+import { EChartOption, EChartsLoadingOption, ECharts } from "echarts";
+import { CSSProperties, MutableRefObject } from "react";
+export type { EChartOption, ECharts as EChartsInstance, EChartsLoadingOption, } from "echarts";
+export declare type Opts = {
+    devicePixelRatio?: number | undefined;
+    renderer?: string | undefined;
+    width?: number | string | undefined;
+    height?: number | string | undefined;
+};
+export declare type EChartsProps = CanvasProps & {
+    echarts: any;
+    className?: string;
+    style?: CSSProperties;
+    option: EChartOption;
+    theme?: string | Record<string, any>;
+    notMerge?: boolean;
+    lazyUpdate?: boolean;
+    showLoading?: boolean;
+    loadingOption?: EChartsLoadingOption;
+    opts?: Opts;
+    onChartReady?: (instance: ECharts) => void;
+    onEvents?: Record<string, (...args: any[]) => void>;
+    isPage?: boolean;
+};
+export declare type InitEchart = {
+    devicePixelRatio: number | undefined;
+    width: number | string | undefined;
+    height: number | string | undefined;
+};
+export declare type EchartsHandle = {
+    canvasRef: Partial<MutableRefObject<HTMLDivElement | HTMLCanvasElement | null>>;
+    chartRef: Partial<MutableRefObject<ECharts>>;
+};

package/types/components/Echarts/weapp/wx-canvas.d.ts

@@ -0,0 +1,21 @@
+import { CanvasContext } from "@tarojs/taro";
+export default class WxCanvas {
+    private ctx;
+    private chart;
+    private canvasNode;
+    private event;
+    constructor(ctx: CanvasContext, isNew: boolean, canvasNode?: any);
+    getContext(contextType: any): CanvasContext | undefined;
+    setChart(chart: any): void;
+    attachEvent(): void;
+    addEventListener(): void;
+    removeEventListener(): void;
+    detachEvent(): void;
+    _initCanvas(zrender: any, ctx: any): void;
+    _initStyle(ctx: any): void;
+    _initEvent(): void;
+    set width(w: any);
+    set height(h: any);
+    get width(): any;
+    get height(): any;
+}

package/types/components/Echarts/weapp/wx-touch.d.ts

@@ -0,0 +1,13 @@
+export declare function wrapTouch(event: any): any;
+export declare function touchStart({ chart, event }: {
+    chart: any;
+    event: any;
+}): void;
+export declare function touchMove({ chart, event }: {
+    chart: any;
+    event: any;
+}): void;
+export declare function touchEnd({ chart, event }: {
+    chart: any;
+    event: any;
+}): void;

package/types/hooks/useFirstMountState.d.ts

@@ -0,0 +1 @@
+export default function useFirstMountState(): boolean;

package/types/hooks/usePrevious.d.ts

@@ -0,0 +1 @@
+export default function usePrevious<T = unknown>(value: any): T | undefined;

package/types/hooks/useUnMount.d.ts

@@ -0,0 +1 @@
+export default function useUnMount(fn: () => void): void;

package/types/hooks/useUpdateEffect.d.ts

@@ -0,0 +1 @@
+export default function useUpdateEffect(effect: any, deps: any): void;

package/types/index.d.ts

@@ -37,3 +37,4 @@ export { default as XHResult } from "./components/Result";
 export { default as XHProgressCircle } from "./components/ProgressCircle";
 export { default as XHBankCardNumberInput, type BankCardNumberInputRef as Type_BankCardNumberInputRef, } from "./components/BankCardNumberInput";
 export { default as XHIDNumberInput, type IDNumberInputRef as Type_IDNumberInputRef, } from "./components/IDNumberInput";
+export { default as XHEcharts, type EChartsProps as Type_EChartsProps, type EChartOption as Type_EChartOptions, type EChartsInstance as Type_EChartsInstance, type EChartsLoadingOption as Type_EChartsLoadingOption, type EchartsHandle as Type_EchartsHandle, } from "./components/Echarts";

package/types/utils/index.d.ts

@@ -31,3 +31,18 @@ export declare function creditCard(cardNum: string, mask?: boolean): string;
  * @returns {boolean}  true 符合 ｜ false 不符合
  */
 export declare function verifyIdcard(idcard: string): boolean;
+export declare function tripleDefer(func: () => void): void;
+export declare function isString(v: any): boolean;
+export declare function isFunction(v: any): boolean;
+export declare function isEqual(x: any, y: any): boolean;
+export declare function pick(obj: any, keys: any): {};
+export declare function uniqueId(prefix?: string): string;
+/**
+ * 版本号比较进阶版
+ * @param {string} ver1  5.19.1  前一个版本
+ * @param {string} ver2  5.18.3  后一个版本
+ * @returns {number}  1: 前一个版本 大于 后一个版本
+ *                   -1: 前一个版本 小于 后一个版本
+ *                    0: 前一个版本 等于 后一个版本
+ */
+export declare function compareVersion(ver1: string, ver2: string): number;

package/types/components/Result/statusMap.d.ts

@@ -1,9 +0,0 @@
-declare const _default: {
-    success: any;
-    empty: any;
-    fail: any;
-    networkErr: any;
-    submitted: any;
-    wait: any;
-};
-export default _default;

package/types/stories/Button.d.ts

@@ -1,29 +0,0 @@
-/// <reference types="react" />
-import './button.css';
-interface ButtonProps {
-    /**
-     * Is this the principal call to action on the page?
-     */
-    primary?: boolean;
-    /**
-     * What background color to use
-     */
-    backgroundColor?: string;
-    /**
-     * How large should the button be?
-     */
-    size?: 'small' | 'medium' | 'large';
-    /**
-     * Button contents
-     */
-    label: string;
-    /**
-     * Optional click handler
-     */
-    onClick?: () => void;
-}
-/**
- * Primary UI component for user interaction
- */
-export declare const Button: ({ primary, size, backgroundColor, label, ...props }: ButtonProps) => JSX.Element;
-export {};

package/types/stories/Header.d.ts

@@ -1,10 +0,0 @@
-/// <reference types="react" />
-import './header.css';
-interface HeaderProps {
-    user?: {};
-    onLogin: () => void;
-    onLogout: () => void;
-    onCreateAccount: () => void;
-}
-export declare const Header: ({ user, onLogin, onLogout, onCreateAccount }: HeaderProps) => JSX.Element;
-export {};

package/types/stories/Page.d.ts

@@ -1,10 +0,0 @@
-/// <reference types="react" />
-import './page.css';
-interface PageProps {
-    user?: {};
-    onLogin: () => void;
-    onLogout: () => void;
-    onCreateAccount: () => void;
-}
-export declare const Page: ({ user, onLogin, onLogout, onCreateAccount }: PageProps) => JSX.Element;
-export {};