@nutui/nutui-react-taro 2.0.0-alpha.9 → 2.0.0-beta.2

package/dist/esm/types/src/packages/watermark/watermark.taro.d.ts

@@ -0,0 +1,21 @@
+import React, { FunctionComponent } from 'react';
+import { BasicComponent } from '@/utils/typings';
+export interface WaterMarkProps extends BasicComponent {
+    content: string;
+    fullPage: boolean;
+    zIndex: number;
+    gapX: number;
+    gapY: number;
+    width: number;
+    height: number;
+    image: string;
+    imageWidth: number;
+    imageHeight: number;
+    rotate: number;
+    color: string;
+    fontStyle: string;
+    fontFamily: string;
+    fontWeight: string;
+    fontSize: string | number;
+}
+export declare const WaterMark: FunctionComponent<Partial<WaterMarkProps> & React.HTMLAttributes<HTMLDivElement>>;

package/dist/esm/types/src/utils/bound.d.ts

@@ -0,0 +1 @@
+export declare function bound(position: number, min: number | undefined, max: number | undefined): number;

package/dist/esm/types/src/utils/camel-case.d.ts

@@ -0,0 +1 @@
+export declare const camelCase: (input: any, options: any) => string;

package/dist/esm/types/src/utils/can-use-dom.d.ts

@@ -0,0 +1 @@
+export declare const canUseDom: boolean;

package/dist/esm/types/src/utils/date.d.ts

@@ -0,0 +1,65 @@
+export declare const Utils: {
+    /**
+     * 是否为闫年
+     * @return {Boolse} true|false
+     */
+    isLeapYear(y: number): boolean;
+    /**
+     * 返回星期数
+     * @return {String}
+     */
+    getWhatDay(year: number, month: number, day: number): string;
+    /**
+     * 返回上一个月在当前面板中的天数
+     * @return {Number}
+     */
+    getMonthPreDay(year: number, month: number): number;
+    /**
+     * 返回月份天数
+     * @return {Number}
+     */
+    getMonthDays(year: string, month: string): number;
+    /**
+     * 补齐数字位数
+     * @return {string}
+     */
+    getNumTwoBit(n: number): string;
+    /**
+     * 日期对象转成字符串
+     * @return {string}
+     */
+    date2Str(date: Date, split?: string): string;
+    /**
+     * 返回日期格式字符串
+     * @param {Number} 0返回今天的日期、1返回明天的日期，2返回后天得日期，依次类推
+     * @return {string} '2014-12-31'
+     */
+    getDay(i: number): string;
+    /**
+     * 时间比较
+     * @return {Boolean}
+     */
+    compareDate(date1: string, date2: string): boolean;
+    /**
+     * 时间是否相等
+     * @return {Boolean}
+     */
+    isEqual(date1: string | undefined, date2: string): boolean;
+    getMonthWeek(year: string, month: string, date: string, firstDayOfWeek?: number): number;
+    getYearWeek(year: string, month: string, date: string, firstDayOfWeek?: number): number;
+    getWeekDate(year: string, month: string, date: string, firstDayOfWeek?: number): string[];
+    formatResultDate(date: string): string[];
+};
+export declare const getCurrMonthData: (type: string, year: number, month: number) => (string | number)[];
+export declare const getDaysStatus: (type: string, year: number, month: number) => {
+    day: number;
+    type: string;
+    year: number;
+    month: number;
+}[];
+export declare const getPreMonthDates: (type: string, year: number, month: number, firstDayOfWeek: number) => {
+    day: number;
+    type: string;
+    preYear: number;
+    preMonth: number;
+}[];

package/dist/esm/types/src/utils/get-scroll-parent.d.ts

@@ -0,0 +1,3 @@
+type ScrollElement = HTMLElement | Window;
+export declare function getScrollParent(el: Element, root?: ScrollElement | null | undefined): Window | Element | null | undefined;
+export {};

package/dist/esm/types/src/utils/index.d.ts

@@ -0,0 +1,4 @@
+export declare const isObject: (val: unknown) => val is Record<any, any>;
+export declare const isFunction: (val: unknown) => val is Function;
+export declare const isPromise: <T = any>(val: unknown) => val is Promise<T>;
+export declare const upperCaseFirst: (str: string) => string;

package/dist/esm/types/src/utils/interceptor.d.ts

@@ -0,0 +1,6 @@
+export type Interceptor = (...args: any[]) => Promise<boolean> | boolean | undefined | void;
+export declare const funcInterceptor: (interceptor: Interceptor | undefined, { args, done, canceled, }: {
+    args?: unknown[] | undefined;
+    done: (val?: any) => void;
+    canceled?: (() => void) | undefined;
+}) => void;

package/dist/esm/types/src/utils/is-forward-ref-component.d.ts

@@ -0,0 +1 @@
+export declare function isForwardRefComponent(component: any): any;

package/dist/esm/types/src/utils/merge-props.d.ts

@@ -0,0 +1,5 @@
+export declare function mergeProps<T, U>(defaultProps: T, props: U): {
+    [Key in Extract<keyof T, keyof U>]: U[Key];
+} & {
+    [Key in Exclude<keyof U, keyof T>]?: U[Key];
+};

package/dist/esm/types/src/utils/px-check.d.ts

@@ -0,0 +1 @@
+export declare const pxCheck: (value: string | number) => string;

package/dist/esm/types/src/utils/raf.d.ts

@@ -0,0 +1,4 @@
+export declare const inBrowser: boolean;
+export declare function cancelRaf(id: number): void;
+declare const _default: any;
+export default _default;

package/dist/esm/types/src/utils/render.d.ts

@@ -0,0 +1,9 @@
+import { ReactElement } from 'react';
+import type { Root } from 'react-dom/client';
+declare const MARK = "__nutui_react_root__";
+type ContainerType = (Element | DocumentFragment) & {
+    [MARK]?: Root;
+};
+export declare function render(node: ReactElement, container: ContainerType): void;
+export declare function unmount(container: ContainerType): boolean | Promise<void>;
+export {};

package/dist/esm/types/src/utils/rubberband.d.ts

@@ -0,0 +1,2 @@
+export declare function rubberband(distance: number, dimension: number, constant: number): number;
+export declare function rubberbandIfOutOfBounds(position: number, min: number, max: number, dimension: number, constant?: number): number;

package/dist/esm/types/src/utils/sleep.d.ts

@@ -0,0 +1 @@
+export declare const sleep: (time: number) => Promise<unknown>;

package/dist/esm/types/src/utils/supports-passive.d.ts

@@ -0,0 +1 @@
+export declare let passiveSupported: boolean;

package/dist/esm/types/src/utils/test/event.d.ts

@@ -0,0 +1,3 @@
+export declare function trigger(wrapper: any, eventName: string, x?: number, y?: number, options?: any): void;
+export declare function sleep(delay?: number): Promise<void>;
+export declare function triggerDrag(el: any, relativeX?: number, relativeY?: number): void;

package/dist/esm/types/src/utils/typings.d.ts

@@ -0,0 +1,10 @@
+import type { CSSProperties, ReactNode } from 'react';
+export interface BasicComponent {
+    className?: string;
+    style?: CSSProperties;
+    children?: ReactNode;
+}
+export declare const ComponentDefaults: {
+    className: string;
+    style: {};
+};

package/dist/esm/types/src/utils/use-click-away.d.ts

@@ -0,0 +1,3 @@
+type TargetType = Function | HTMLElement | Element;
+export default function useClickAway(onClickAway: () => void, target: TargetType | TargetType[], eventName: string | undefined, useCapture: boolean, isListener?: boolean, outerVar?: boolean): void;
+export {};

package/dist/esm/types/src/utils/use-client-rect.d.ts

@@ -0,0 +1,18 @@
+/**
+  获取元素的大小及其相对于视口的位置，等价于 Element.getBoundingClientRect。
+  width 宽度	number
+  height 高度	number
+  top	顶部与视图窗口左上角的距离	number
+  left	左侧与视图窗口左上角的距离	number
+  right	右侧与视图窗口左上角的距离	number
+  bottom	底部与视图窗口左上角的距离	number
+ */
+export declare const getRect: (elementRef: Element | Window | undefined) => DOMRect | {
+    top: number;
+    left: number;
+    right: number;
+    bottom: number;
+    width: number;
+    height: number;
+};
+export declare const getRectByTaro: (element: any) => Promise<any>;

package/dist/esm/types/src/utils/use-force-update.d.ts

@@ -0,0 +1 @@
+export declare function useForceUpdate(): () => void;

package/dist/esm/types/src/utils/use-props-value.d.ts

@@ -0,0 +1,8 @@
+interface UsePropsValue<T> {
+    value?: T;
+    defaultValue?: T;
+    finalValue?: T;
+    onChange?: (value: T) => void;
+}
+export declare function usePropsValue<T>({ value, defaultValue, finalValue, onChange, }: UsePropsValue<T>): [value: T, onChange: (value: T) => void];
+export {};

package/dist/esm/types/src/utils/use-refs.d.ts

@@ -0,0 +1 @@
+export default function useRefs(): any[];

package/dist/esm/types/src/utils/use-touch.d.ts

@@ -0,0 +1,18 @@
+type Direction = '' | 'vertical' | 'horizontal';
+export declare function useTouch(): {
+    move: EventListener;
+    start: EventListener;
+    reset: () => void;
+    startX: number;
+    startY: number;
+    moveX: number;
+    moveY: number;
+    deltaX: number;
+    deltaY: number;
+    offsetX: number;
+    offsetY: number;
+    direction: Direction;
+    isVertical: () => boolean;
+    isHorizontal: () => boolean;
+};
+export {};

package/dist/esm/types/src/utils/use-watch.d.ts

@@ -0,0 +1,6 @@
+type Callback<T> = (prev: T | undefined) => void;
+type Config = {
+    immediate: boolean;
+};
+declare function useWatch<T>(dep: T, callback: Callback<T>, config?: Config): () => void;
+export default useWatch;

package/dist/esm/{uploader.taro-92977813.js → uploader.taro-d9add90e.js}

@@ -9,9 +9,9 @@ import classNames from "classnames";
 import Taro, { uploadFile, getEnv, chooseMedia, chooseImage } from "@tarojs/taro";
 import { Failure, Loading, Link, Del, Photograph } from "@nutui/icons-react-taro";
 import { Image } from "@tarojs/components";
-import { B as Button } from "./button.taro-01eae688.js";
-import { P as Progress } from "./progress.taro-ff63be75.js";
-import { u as useConfig } from "./configprovider.taro-25758d9f.js";
+import { B as Button } from "./button.taro-60dfd83e.js";
+import { P as Progress } from "./progress.taro-437b9f6a.js";
+import { u as useConfig } from "./configprovider.taro-a7f3bcfd.js";
 import { i as isPromise } from "./index-e3184f19.js";
 import { C as ComponentDefaults } from "./typings-11d83a22.js";
 class UploadOptions {
@@ -152,7 +152,7 @@ const defaultProps = {
   uploadIcon: null,
   uploadLabel: "",
   previewType: "picture",
-  imageFit: "cover",
+  fit: "cover",
   name: "file",
   accept: "*",
   disabled: false,
@@ -187,7 +187,7 @@ class FileItem {
 }
 const InternalUploader = (props, ref) => {
   const { locale } = useConfig();
-  const { children, uploadIcon, uploadLabel, accept, name, camera, defaultValue, value, previewType, imageFit, disabled, multiple, url, previewUrl, headers, timeout, method, xhrState, data, preview, deletable, maxCount, maxFileSize, mediaType, className, autoUpload, sizeType, sourceType, maxDuration, onStart, onDelete, onChange, onFileItemClick, onProgress, onSuccess, onUpdate, onFailure, onOversize, beforeXhrUpload, beforeDelete, ...restProps } = { ...defaultProps, ...props };
+  const { children, uploadIcon, uploadLabel, accept, name, camera, defaultValue, value, previewType, fit, disabled, multiple, url, previewUrl, headers, timeout, method, xhrState, data, preview, deletable, maxCount, maxFileSize, mediaType, className, autoUpload, sizeType, sourceType, maxDuration, onStart, onDelete, onChange, onFileItemClick, onProgress, onSuccess, onUpdate, onFailure, onOversize, beforeXhrUpload, beforeDelete, ...restProps } = { ...defaultProps, ...props };
   const [fileList, setFileList] = useState(defaultValue || []);
   const [uploadQueue, setUploadQueue] = useState([]);
   useEffect(() => {
@@ -233,7 +233,7 @@ const InternalUploader = (props, ref) => {
         document.body.appendChild(obj);
       }
     }
-    if (getEnv() === "WEAPP") {
+    if (getEnv() === "WEAPP" && chooseMedia) {
       chooseMedia({
         /** 最多可以选择的文件个数 */
         count: multiple ? maxCount * 1 - fileList.length : 1,
@@ -470,7 +470,7 @@ const InternalUploader = (props, ref) => {
             item.failIcon !== " " && item.loadingIcon !== " " && (item.status === "error" ? item.failIcon || React.createElement(Failure, { color: "#fff" }) : item.loadingIcon || React.createElement(Loading, { color: "#fff" })),
             React.createElement("div", { className: "nut-uploader__preview__progress__msg" }, item.message)
           ),
-          item.type.includes("image") ? React.createElement(React.Fragment, null, item.url && React.createElement(Image, { className: "nut-uploader__preview-img__c", style: { objectFit: imageFit }, mode: "aspectFit", src: item.url, onClick: () => handleItemClick(item) })) : React.createElement(React.Fragment, null, previewUrl ? React.createElement(Image, { className: "nut-uploader__preview-img__c", mode: "aspectFit", src: previewUrl, onClick: () => handleItemClick(item) }) : React.createElement(
+          item.type.includes("image") ? React.createElement(React.Fragment, null, item.url && React.createElement(Image, { className: "nut-uploader__preview-img__c", style: { objectFit: fit }, mode: "aspectFit", src: item.url, onClick: () => handleItemClick(item) })) : React.createElement(React.Fragment, null, previewUrl ? React.createElement(Image, { className: "nut-uploader__preview-img__c", mode: "aspectFit", src: previewUrl, onClick: () => handleItemClick(item) }) : React.createElement(
             "div",
             { className: "nut-uploader__preview-img__file" },
             React.createElement(

package/dist/esm/use-client-rect-2bb6c562.js

@@ -0,0 +1,40 @@
+function isWindow(val) {
+  return val === window;
+}
+const getRect = (elementRef) => {
+  const element = elementRef;
+  if (isWindow(element)) {
+    const width = element.innerWidth;
+    const height = element.innerHeight;
+    return {
+      top: 0,
+      left: 0,
+      right: width,
+      bottom: height,
+      width,
+      height
+    };
+  }
+  if (element && element.getBoundingClientRect) {
+    return element.getBoundingClientRect();
+  }
+  return {
+    top: 0,
+    left: 0,
+    right: 0,
+    bottom: 0,
+    width: 0,
+    height: 0
+  };
+};
+const getRectByTaro = async (element) => {
+  if (element) {
+    const res = await element.getBoundingClientRect();
+    return res;
+  }
+  return Promise.resolve({});
+};
+export {
+  getRect as a,
+  getRectByTaro as g
+};

package/dist/esm/video.taro-2a26d7da.js

@@ -0,0 +1,37 @@
+import React from "react";
+import classNames from "classnames";
+import { Video as Video$1 } from "@tarojs/components";
+import { C as ComponentDefaults } from "./typings-11d83a22.js";
+const defaultProps = {
+  ...ComponentDefaults,
+  source: {
+    type: {},
+    src: ""
+  },
+  options: {
+    controls: true,
+    muted: false,
+    autoplay: false,
+    poster: "",
+    playsinline: false,
+    loop: false
+  }
+};
+const classPrefix = `nut-video`;
+const Video = (props) => {
+  const { children, source, options, className, onPlay, onPause, onPlayEnd, ...restProps } = {
+    ...defaultProps,
+    ...props
+  };
+  const classes = classNames(className, classPrefix);
+  return React.createElement(
+    "div",
+    { className: classes, ...restProps },
+    React.createElement(Video$1, { className: "nut-video-player", muted: options.muted, autoplay: options.autoplay, loop: options.loop, poster: options.poster, controls: options.controls, src: source.src, onPlay, onPause, onEnded: onPlayEnd })
+  );
+};
+Video.defaultProps = defaultProps;
+Video.displayName = "NutVideo";
+export {
+  Video as V
+};

package/dist/esm/{virtuallist.taro-99f03769.js → virtuallist.taro-1de01855.js}

@@ -1,7 +1,7 @@
 import React, { useState, useRef, useEffect, useCallback } from "react";
 import { ScrollView } from "@tarojs/components";
 import { getSystemInfoSync } from "@tarojs/taro";
-import { u as useConfig } from "./configprovider.taro-25758d9f.js";
+import { C as ComponentDefaults } from "./typings-11d83a22.js";
 const initPositinoCache = (reaItemSize, length = 0) => {
   let index = 0;
   const positions = Array(length);
@@ -71,23 +71,24 @@ const updateItemSize = (positions, items, sizeKey) => {
     }
   });
 };
+const clientHeight = getSystemInfoSync().windowHeight - 5 || 667;
 const defaultProps = {
-  sourceData: [],
-  itemSize: 66,
-  itemEqualSize: true,
+  ...ComponentDefaults,
+  list: [],
+  containerHeight: clientHeight,
+  itemHeight: 66,
+  itemEqual: true,
   overscan: 2
 };
-const clientHeight = getSystemInfoSync().windowHeight - 5 || 667;
-getSystemInfoSync().windowWidth || 375;
 const VirtualList = (props) => {
-  const { sourceData = [], ItemRender, itemSize = 66, itemEqualSize = true, overscan = 2, key, onScroll, className, containerSize = clientHeight, ...rest } = props;
+  const { list, itemRender, itemHeight, itemEqual, overscan, key, onScroll, className, containerHeight, ...rest } = {
+    ...defaultProps,
+    ...props
+  };
   const [startOffset, setStartOffset] = useState(0);
   const [start, setStart] = useState(0);
-  const [list, setList] = useState(sourceData.slice());
-  useConfig();
   const scrollRef = useRef(null);
   const itemsRef = useRef(null);
-  const firstItemRef = useRef(null);
   const [positions, setPositions] = useState([
     {
       index: 0,
@@ -99,7 +100,7 @@ const VirtualList = (props) => {
       right: 0
     }
   ]);
-  const [offSetSize, setOffSetSize] = useState(containerSize || 0);
+  const [offSetSize, setOffSetSize] = useState(containerHeight || 0);
   const [options, setOptions] = useState({
     startOffset: 0,
     startIndex: 0,
@@ -107,37 +108,32 @@ const VirtualList = (props) => {
     endIndex: 10
     // 可视区域结束索引
   });
-  useEffect(() => {
-    if (sourceData.length) {
-      setList(sourceData.slice());
-    }
-  }, [sourceData]);
   useEffect(() => {
     setPositions((options2) => {
       return { ...options2, endIndex: visibleCount() };
     });
-  }, [itemSize, overscan, offSetSize]);
+  }, [itemHeight, overscan, offSetSize]);
   useEffect(() => {
-    if (containerSize)
+    if (containerHeight)
       return;
     setOffSetSize(getContainerHeight());
-  }, [containerSize]);
+  }, [containerHeight]);
   useEffect(() => {
-    const pos = initPositinoCache(itemSize, sourceData.length);
+    const pos = initPositinoCache(itemHeight, list.length);
     setPositions(pos);
-  }, [itemSize, sourceData]);
+  }, [itemHeight, list]);
   const getContainerHeight = () => {
-    const initH = itemSize * sourceData.length;
-    return initH < clientHeight ? initH + overscan * itemSize - 5 : Math.min(containerSize, clientHeight);
+    const initH = itemHeight * list.length;
+    return initH < clientHeight ? initH + overscan * itemHeight - 5 : Math.min(containerHeight, clientHeight);
   };
   const visibleCount = () => {
-    return Math.ceil(getContainerHeight() / itemSize) + overscan;
+    return Math.ceil(getContainerHeight() / itemHeight) + overscan;
   };
   const end = () => {
     return start + visibleCount();
   };
   const listHeight = () => {
-    return list.length * itemSize;
+    return list.length * itemHeight;
   };
   const visibleData = () => {
     return list.slice(start, Math.min(end(), list.length));
@@ -156,24 +152,24 @@ const VirtualList = (props) => {
     const startIndex = binarySearch(positions, scrollSize, false);
     const overStart = startIndex - overscan > -1 ? startIndex - overscan : 0;
     const endIndex = end();
-    if (!itemEqualSize) {
+    if (!itemEqual) {
       updateTotalSize();
     }
-    setStart(Math.floor(scrollTop / itemSize));
+    setStart(Math.floor(scrollTop / itemHeight));
     setOptions({ startOffset, startIndex, overStart, endIndex });
     if (end() > list.length - 1) {
       onScroll && onScroll();
     }
-    setStartOffset(scrollTop - scrollTop % itemSize);
+    setStartOffset(scrollTop - scrollTop % itemHeight);
   };
   return React.createElement(
     "div",
     { className: className ? `${className} nut-virtualList-box` : "nut-virtualList-box", ...rest, style: {
-      height: containerSize ? `${offSetSize}px` : ""
+      height: containerHeight ? `${offSetSize}px` : ""
     } },
     React.createElement(
       ScrollView,
-      { scrollTop: 0, scrollY: true, type: "list", ref: scrollRef, className: "nut-virtuallist", style: {
+      { scrollY: true, type: "list", ref: scrollRef, className: "nut-virtuallist", style: {
         height: `${getContainerHeight()}px`
       }, onScroll: listScroll },
       React.createElement("div", { className: "nut-virtuallist-phantom", style: { height: `${listHeight()}px` } }),
@@ -181,9 +177,9 @@ const VirtualList = (props) => {
         const { overStart } = options;
         const dataIndex = overStart + index;
         key && data[key] ? data[key] : dataIndex;
-        return React.createElement("div", { ref: dataIndex === 0 ? firstItemRef : null, "data-index": `${dataIndex}`, className: "nut-virtuallist-item", key: `${data}`, style: {
-          height: `${itemEqualSize ? `${itemSize}px` : "auto"}`
-        } }, ItemRender ? React.createElement(ItemRender, { data, index: `${index}` }) : data);
+        return React.createElement("div", { "data-index": `${dataIndex}`, className: "nut-virtuallist-item", key: `${data}`, style: {
+          height: `${itemEqual ? `${itemHeight}px` : "auto"}`
+        } }, itemRender ? itemRender(data, dataIndex, index) : data);
       }))
     )
   );

package/dist/esm/{watermark.taro-cef29c03.js → watermark.taro-788cb452.js}

@@ -1,9 +1,10 @@
 import React, { useState, useEffect } from "react";
 import { getSystemInfo, createOffscreenCanvas } from "@tarojs/taro";
 import classNames from "classnames";
-import { u as useConfig } from "./configprovider.taro-25758d9f.js";
-import { c as cn } from "./bem-cdccae08.js";
+import { u as useConfig } from "./configprovider.taro-a7f3bcfd.js";
+import { C as ComponentDefaults } from "./typings-11d83a22.js";
 const defaultProps = {
+  ...ComponentDefaults,
   content: "",
   fullPage: true,
   zIndex: 2e3,
@@ -15,23 +16,21 @@ const defaultProps = {
   imageWidth: 120,
   imageHeight: 64,
   rotate: -22,
-  fontColor: "rgba(0,0,0,.15)",
+  color: "rgba(0,0,0,.15)",
   fontStyle: "normal",
-  fontFamily: "PingFang SC",
   fontWeight: "normal",
   fontSize: 14
 };
 const WaterMark = (props) => {
   const { locale } = useConfig();
-  const { content, fullPage, zIndex, className, gapX, gapY, width, height, image, imageWidth, imageHeight, rotate, fontColor, fontStyle, fontFamily, fontWeight, fontSize, style, children } = {
+  const { content, fullPage, zIndex, className, gapX, gapY, width, height, image, imageWidth, imageHeight, rotate, color, fontStyle, fontFamily, fontWeight, fontSize, style } = {
     ...defaultProps,
     ...props
   };
   const [base64Url, setBase64Url] = useState("");
-  const b = cn("watermark");
-  const classes = classNames({
-    [`${b("")}`]: true,
-    [`${b("")}-full-page`]: fullPage
+  const classPrefix = "nut-watermark";
+  const classes = classNames(classPrefix, {
+    [`${classPrefix}-full-page`]: fullPage
   });
   const cls = classNames(classes, className);
   useEffect(() => {
@@ -41,8 +40,8 @@ const WaterMark = (props) => {
     let ratio = 1;
     getSystemInfo().then((res) => {
       ratio = res.pixelRatio;
-      const canvasWidth = `${(gapX + width) * ratio}px`;
-      const canvasHeight = `${(gapY + height) * ratio}px`;
+      const canvasWidth = `${(gapX + width) * ratio}`;
+      const canvasHeight = `${(gapY + height) * ratio}`;
       const markWidth = width * ratio;
       const markHeight = height * ratio;
       let ctx;
@@ -50,8 +49,8 @@ const WaterMark = (props) => {
       if (process.env.TARO_ENV === "h5") {
         canvas = document.createElement("canvas");
         ctx = canvas.getContext("2d");
-        canvas.setAttribute("width", canvasWidth);
-        canvas.setAttribute("height", canvasHeight);
+        canvas.setAttribute("width", `${canvasWidth}px`);
+        canvas.setAttribute("height", `${canvasHeight}px`);
       } else {
         canvas = createOffscreenCanvas({
           type: "2d",
@@ -85,7 +84,7 @@ const WaterMark = (props) => {
           ctx.rotate(Math.PI / 180 * Number(rotate));
           const markSize = Number(fontSize) * ratio;
           ctx.font = `${fontStyle} normal ${fontWeight} ${markSize}px/${markHeight}px ${fontFamily}`;
-          ctx.fillStyle = fontColor;
+          ctx.fillStyle = color;
           ctx.fillText(content, 0, 0);
           ctx.restore();
           setBase64Url(canvas.toDataURL());

package/dist/locales/base.d.ts

@@ -64,7 +64,7 @@ export interface BaseLang {
     };
     signature: {
         reSign: string;
-        unSupportTpl: string;
+        unsupported: string;
     };
     ecard: {
         chooseText: string;

package/dist/locales/base.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui-react-taro v2.0.0-alpha.9 Wed May 17 2023 18:43:26 GMT+0800 (China Standard Time)
+* @nutui/nutui-react-taro v2.0.0-beta.2 Wed Jun 28 2023 16:10:05 GMT+0800 (China Standard Time)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */

package/dist/locales/en-US.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui-react-taro v2.0.0-alpha.9 Wed May 17 2023 18:43:26 GMT+0800 (China Standard Time)
+* @nutui/nutui-react-taro v2.0.0-beta.2 Wed Jun 28 2023 16:10:05 GMT+0800 (China Standard Time)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */
@@ -35,7 +35,7 @@ const o = {
     start: "Start",
     confirm: "Confirm",
     title: "Calendar",
-    monthTitle: (e, t) => `${e}/${t}`,
+    monthTitle: (e, t) => `${e}/${Number(t) < 10 ? `0${Number(t)}` : t}`,
     today: "Today",
     loadPreviousMonth: "Load Previous Month",
     noEarlierMonth: "No Earlier Month"
@@ -61,13 +61,13 @@ const o = {
     second: " Second "
   },
   address: {
-    selectRegion: "Select Region",
+    selectRegion: "Choose Address",
     deliveryTo: "Delivery To",
     chooseAnotherAddress: "Choose Another Address"
   },
   signature: {
     reSign: "Re Sign",
-    unSupportTpl: "Sorry, the current browser doesn't support canvas, so we can't use this control!"
+    unsupported: "Sorry, the current browser doesn't support canvas, so we can't use this control!"
   },
   ecard: {
     chooseText: "Select",