taro-react-uilib 1.3.4-1 → 1.3.4-10

package/lib/components/LinkMan/index.js

@@ -0,0 +1,341 @@
+import { View, Input } from "@tarojs/components";
+import React, { useCallback, useEffect, useState, forwardRef, useImperativeHandle, useMemo, } from "react";
+import { inputRange } from "@/utils";
+import ActionSheet from "../ActionSheet";
+import "./index.scss";
+const LinkManTitleMap = [
+    "一",
+    "二",
+    "三",
+    "四",
+    "五",
+    "六",
+    "七",
+    "八",
+    "九",
+    "十",
+];
+/**
+ * 错误信息提示
+ */
+const errorMessageMap = {
+    linkmanName: "请输入联系人姓名",
+    linkmanPhone: "请输入正确的手机号",
+    relationType: "请选择与联系人关系",
+};
+const defaultActionSheet = [
+    {
+        value: "FATHER",
+        text: "父亲",
+    },
+    {
+        value: "MOTHER",
+        text: "母亲",
+    },
+    {
+        value: "MATE",
+        text: "配偶",
+    },
+    {
+        value: "CHILDREN",
+        text: "子女",
+    },
+    {
+        value: "SIBLING",
+        text: "兄弟姐妹",
+    },
+    {
+        value: "FRIENDS",
+        text: "朋友",
+    },
+    {
+        value: "COLLEAGUE",
+        text: "同事",
+    },
+    {
+        value: "RELATIVES",
+        text: "亲戚",
+    },
+    {
+        value: "OTHER",
+        text: "其他",
+    },
+];
+const defaultShowImportIcon = process.env.TARO_ENV === "h5"
+    ? window.navigator.userAgent.includes("xhqb")
+    : true;
+const XHAddLinMan = forwardRef((props, fromRef) => {
+    const { linkManNum, relations = defaultActionSheet, onChange, onGetContacts, showImportIcon = defaultShowImportIcon, onBlur, onCheckRelation, onInputChange, } = props;
+    // form信息
+    const [formData, setFormData] = useState([]);
+    // 错误提示语信息
+    const [errMessage, setErrMessage] = useState([]);
+    useEffect(() => {
+        setFormData(Array(linkManNum)
+            .fill(1)
+            .map(() => {
+            return {
+                linkmanName: "",
+                linkmanPhone: "",
+                relationType: "",
+                relationValue: "",
+            };
+        }));
+        setErrMessage(Array(linkManNum)
+            .fill(1)
+            .map(() => {
+            return {
+                linkmanName: "",
+                linkmanPhone: "",
+                relationType: "",
+            };
+        }));
+    }, [linkManNum]);
+    /**
+     * 校验手机号
+     */
+    const validatePhone = useCallback((phone) => {
+        if (/1\d{10}/.test(phone)) {
+            return true;
+        }
+        return false;
+    }, []);
+    /**
+     * 非空校验
+     */
+    const validateForm = useCallback((type, name) => {
+        if (type === "linkmanName") {
+            if (!name || !name.replace(/^\s+|\s+$/gm, ""))
+                return false;
+            if (name.length > 20)
+                return false;
+            return true;
+        }
+        else if (type === "linkmanPhone") {
+            if (!name || !validatePhone(name))
+                return false;
+            return true;
+        }
+        else if (type === "relationType") {
+            if (!name)
+                return false;
+            return true;
+        }
+        return false;
+    }, []);
+    /**
+     * 校验联系人是否合法，默认找到不合法的就退出循环
+     */
+    const validateCanSubmit = useMemo(() => {
+        const finalData = formData;
+        const length = finalData.length;
+        const map = {
+            linkmanName: [],
+            linkmanPhone: [],
+            relationValue: [],
+        };
+        let flag = true;
+        /**
+         * 每次循环formData，不符合直接break，退出循环
+         */
+        for (let index = 0; index < length; index++) {
+            const isNameValid = validateForm("linkmanName", finalData[index].linkmanName);
+            if (!isNameValid) {
+                flag = false;
+                break;
+            }
+            const isPhoneValid = validateForm("linkmanPhone", finalData[index].linkmanPhone);
+            if (!isPhoneValid) {
+                flag = false;
+                break;
+            }
+            if (index !== 0 &&
+                map.linkmanPhone.includes(finalData[index].linkmanPhone)) {
+                flag = false;
+                break;
+            }
+            map.linkmanPhone.push(finalData[index].linkmanPhone);
+            const isRelationValid = validateForm("relationType", finalData[index].relationValue);
+            if (!isRelationValid) {
+                flag = false;
+                break;
+            }
+            map.relationValue.push(finalData[index].relationValue);
+        }
+        if (map.relationValue.filter(item => item === "MATE").length >= 2) {
+            flag = false;
+        }
+        return flag;
+    }, [formData]);
+    useEffect(() => {
+        onChange === null || onChange === void 0 ? void 0 : onChange(formData, validateCanSubmit);
+    }, [formData, validateCanSubmit]);
+    useImperativeHandle(fromRef, () => ({
+        canSubmit: validateCanSubmit,
+        setContacts(item, index) {
+            setFormData(old => {
+                old[index].linkmanName = item.linkmanName;
+                old[index].linkmanPhone = item.linkmanPhone;
+                return [...old];
+            });
+            onFormBlur("linkmanName", index);
+            onFormBlur("linkmanPhone", index);
+        },
+    }), [validateCanSubmit]);
+    /**
+     * 重复校验
+     */
+    const validateDuplicate = (type, currentIndex) => {
+        const currentItem = formData[currentIndex];
+        // const validStub: Record<
+        //   Exclude<keyof LinkManItem, "relationType">,
+        //   string[]
+        // > = {
+        //   linkmanName: [],
+        //   linkmanPhone: [],
+        //   relationValue: [],
+        // };
+        for (let index = 0, length = formData.length; index < length; index++) {
+            if (index === currentIndex)
+                continue; // 不能跟自己比较
+            const current = formData[index];
+            if (type === "linkmanPhone") {
+                if (currentItem.linkmanPhone !== "" &&
+                    current.linkmanPhone !== "" &&
+                    current.linkmanPhone === currentItem.linkmanPhone) {
+                    // 如果没有重复需要清空错误信息
+                    return {
+                        pass: false,
+                        message: `手机号与第${index + 1}联系人号码重复，请修改`,
+                    };
+                }
+                else {
+                    // setErrMessage(old => {
+                    //   old[index].linkmanPhone = "";
+                    //   old[currentIndex].linkmanPhone = "";
+                    //   return [...old];
+                    // });
+                }
+            }
+            else if (type === "relationValue") {
+                if (currentItem.relationValue !== "" &&
+                    current.relationValue === "MATE" &&
+                    currentItem.relationValue === "MATE") {
+                    return {
+                        pass: false,
+                        message: `关系与第${index + 1}联系人关系重复，请修改`,
+                    };
+                }
+                else {
+                    // setErrMessage(old => {
+                    //   old[index].relationType = "";
+                    //   old[currentIndex].relationType = "";
+                    //   return [...old];
+                    // });
+                }
+            }
+        }
+        return { pass: true, message: "" };
+    };
+    /**
+     * 联系人姓名改变
+     */
+    const onNameChange = useCallback((evt, index) => {
+        const value = process.env.TARO_ENV === "h5" ? evt.target.value : evt.detail.value;
+        const name = inputRange(value);
+        setFormData(old => {
+            old[index].linkmanName = name;
+            return [...old];
+        });
+        onInputChange === null || onInputChange === void 0 ? void 0 : onInputChange("linkmanName", index);
+    }, []);
+    /**
+     * 联系人手机号改变
+     */
+    const onPhoneChange = useCallback((evt, index) => {
+        const value = process.env.TARO_ENV === "h5" ? evt.target.value : evt.detail.value;
+        const phone = inputRange(value);
+        setFormData(old => {
+            old[index].linkmanPhone = phone;
+            return [...old];
+        });
+        onInputChange === null || onInputChange === void 0 ? void 0 : onInputChange("linkmanPhone", index);
+    }, []);
+    /**
+     * 输入框失去焦点做校验
+     */
+    const onFormBlur = useCallback((type, index) => {
+        const flag = validateForm(type, formData[index][type]); // 先做值的校验，再做重复校验
+        if (!flag) {
+            setErrMessage(old => {
+                old[index][type] = errorMessageMap[type];
+                return [...old];
+            });
+            return;
+        }
+        const { pass, message } = validateDuplicate(type, index);
+        if (!pass) {
+            setErrMessage(old => {
+                old[index][type] = message;
+                return [...old];
+            });
+        }
+        onBlur === null || onBlur === void 0 ? void 0 : onBlur(type, index);
+    }, [formData]);
+    /**
+     * 聚焦的时候设置错误信息为空
+     */
+    const onFormFocus = useCallback((type, index) => {
+        setErrMessage(old => {
+            old[index][type] = "";
+            return [...old];
+        });
+    }, []);
+    return (React.createElement(View, { className: "xh-linkman" }, formData.map((item, num) => (React.createElement(View, { key: num, className: "xh-linkman-item" },
+        React.createElement(View, { className: "xh-linkman-title" },
+            "\u7B2C",
+            LinkManTitleMap[num],
+            "\u8054\u7CFB\u4EBA"),
+        React.createElement(View, { className: "xh-linkman-main" },
+            React.createElement(View, { className: "xh-linkman-main-input" },
+                React.createElement(View, { className: "xh-linkman-main-input-label" }, "\u59D3\u540D"),
+                React.createElement(View, { className: "xh-linkman-main-input-main" },
+                    process.env.TARO_ENV === "h5" ? (React.createElement("input", { className: "xh-linkman-main-input-main-input", type: "text", placeholder: "\u7D27\u6025\u8054\u7CFB\u4EBA\u59D3\u540D", onChange: e => onNameChange(e, num), value: item.linkmanName, onBlur: () => onFormBlur("linkmanName", num), onFocus: () => onFormFocus("linkmanName", num) })) : (React.createElement(Input, { placeholder: "\u7D27\u6025\u8054\u7CFB\u4EBA\u59D3\u540D", className: "xh-linkman-main-input-main-input", onBlur: () => onFormBlur("linkmanName", num), value: item.linkmanName, type: "text", onInput: e => onNameChange(e, num), onFocus: () => onFormFocus("linkmanName", num) })),
+                    errMessage[num].linkmanName && (React.createElement(View, { className: "xh-linkman-main-input-main-err" }, errMessage[num].linkmanName))),
+                showImportIcon && (React.createElement(View, { className: "xh-linkman-main-input-contacts", onClick: () => onGetContacts === null || onGetContacts === void 0 ? void 0 : onGetContacts(num) })))),
+        React.createElement(View, { className: "xh-linkman-main" },
+            React.createElement(View, { className: "xh-linkman-main-input" },
+                React.createElement(View, { className: "xh-linkman-main-input-label" }, "\u7535\u8BDD"),
+                React.createElement(View, { className: "xh-linkman-main-input-main" },
+                    process.env.TARO_ENV === "h5" ? (React.createElement("input", { className: "xh-linkman-main-input-main-input", type: "tel", placeholder: "\u7D27\u6025\u8054\u7CFB\u4EBA\u624B\u673A\u53F7", onBlur: () => onFormBlur("linkmanPhone", num), maxLength: 11, onChange: e => onPhoneChange(e, num), value: item.linkmanPhone, onFocus: () => onFormFocus("linkmanPhone", num) })) : (React.createElement(Input, { placeholder: "\u7D27\u6025\u8054\u7CFB\u4EBA\u624B\u673A\u53F7", className: "xh-linkman-main-input-main-input", type: "number", maxlength: 11, onBlur: () => onFormBlur("linkmanPhone", num), value: item.linkmanPhone, onInput: e => onPhoneChange(e, num), onFocus: () => onFormFocus("linkmanPhone", num) })),
+                    errMessage[num].linkmanPhone && (React.createElement(View, { className: "xh-linkman-main-input-main-err" }, errMessage[num].linkmanPhone))))),
+        React.createElement(ActionSheet, { data: relations, title: "\u9009\u62E9\u4E0E\u8054\u7CFB\u4EBA\u7684\u5173\u7CFB", onConfirm: value => {
+                setErrMessage(old => {
+                    old[num].relationType = "";
+                    return [...old];
+                });
+                setFormData(old => {
+                    old[num].relationType = value.text;
+                    old[num].relationValue = value.value;
+                    return [...old];
+                });
+                Promise.resolve().then(() => {
+                    const { pass, message } = validateDuplicate("relationValue", num);
+                    if (!pass)
+                        setErrMessage(old => {
+                            old[num].relationType = message;
+                            return [...old];
+                        });
+                    onCheckRelation === null || onCheckRelation === void 0 ? void 0 : onCheckRelation(value, num);
+                });
+            }, onCancel: () => onFormBlur("relationType", num) },
+            React.createElement(View, { className: "xh-linkman-main" },
+                React.createElement(View, { className: "xh-linkman-main-input" },
+                    React.createElement(View, { className: "xh-linkman-main-input-label" }, "\u5173\u7CFB"),
+                    React.createElement(View, { className: "xh-linkman-main-input-main" },
+                        process.env.TARO_ENV === "h5" ? (React.createElement("input", { type: "text", maxLength: 11, className: "xh-linkman-main-input-main-input", readOnly: true, placeholder: "\u9009\u62E9\u4E0E\u8054\u7CFB\u4EBA\u5173\u7CFB", value: item.relationType })) : (React.createElement(Input, { placeholder: "\u9009\u62E9\u4E0E\u8054\u7CFB\u4EBA\u5173\u7CFB", className: "xh-linkman-main-input-main-input", type: "digit", maxlength: 11, value: item.relationType, disabled: true })),
+                        errMessage[num].relationType && (React.createElement(View, { className: "xh-linkman-main-input-main-err" }, errMessage[num].relationType))),
+                    React.createElement(View, { className: "xh-linkman-main-input-arrow" })))))))));
+});
+export default XHAddLinMan;
+//# sourceMappingURL=index.js.map

package/lib/components/LinkMan/index.js.map

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

package/lib/components/List/index.js

@@ -18,7 +18,9 @@ const XHList = props => {
             React.createElement(Text, { className: "xh-list-main-description", style: { color: descriptionColor } }, description)),
         React.createElement(View, { className: "xh-list-extra" },
             React.createElement(View, { className: "xh-list-extra-info", style: { color: extraColor } }, extra),
-            React.createElement(View, { className: "xh-list-extra-icon" }, extraIcon ? extraIcon : arrow && React.createElement(View, { className: "arrow" })))));
+            React.createElement(View, { className: "xh-list-extra-icon" }, extraIcon
+                ? extraIcon
+                : arrow && React.createElement(View, { className: "xh-list-extra-icon-arrow" })))));
 };
 export default XHList;
 //# sourceMappingURL=index.js.map

package/lib/components/List/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/List/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAwB,MAAM,OAAO,CAAC;AAC7C,OAAO,EAAE,IAAI,EAAE,IAAI,EAAe,MAAM,oBAAoB,CAAC;AAC7D,OAAO,UAAU,MAAM,YAAY,CAAC;AAGpC,OAAO,cAAc,CAAC;AAmBtB,MAAM,MAAM,GAAoB,KAAK,CAAC,EAAE;IACtC,MAAM,EACJ,KAAK,GAAG,EAAE,EACV,WAAW,GAAG,EAAE,EAChB,IAAI,EACJ,KAAK,GAAG,EAAE,EACV,SAAS,GAAG,EAAE,EACd,KAAK,EACL,MAAM,GAAG,IAAI,EACb,OAAO,EACP,SAAS,EACT,OAAO,GAAG,IAAI,EACd,SAAS,GAAG,KAAK,EACjB,gBAAgB,GAAG,EAAE,EACrB,UAAU,GAAG,EAAE,EACf,QAAQ,GAAG,IAAI,EACf,OAAO,GAAG,KAAK,GAChB,GAAG,KAAK,CAAC;IAEV,MAAM,OAAO,GAAG,UAAU,CACxB,SAAS,EACT,EAAE,MAAM,EAAE,EACV,EAAE,OAAO,EAAE,EACX,EAAE,SAAS,EAAE,EACb,EAAE,OAAO,EAAE,EACX,SAAS,CACV,CAAC;IAEF,MAAM,OAAO,GAAG,UAAU,CAAC,cAAc,EAAE;QACzC,QAAQ;KACT,CAAC,CAAC;IAEH,MAAM,WAAW,GAAG,CAAC,CAAc,EAAE,EAAE;QACrC,OAAO,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;IACxB,CAAC,CAAC;IAEF,OAAO,CACL,oBAAC,IAAI,IAAC,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW;QAC3C,IAAI,IAAI,oBAAC,IAAI,IAAC,SAAS,EAAC,cAAc,IAAE,IAAI,CAAQ;QACrD,oBAAC,IAAI,IAAC,SAAS,EAAE,OAAO;YACrB,KAAK,IAAI,oBAAC,IAAI,IAAC,SAAS,EAAC,oBAAoB,IAAE,KAAK,CAAQ;YAC7D,oBAAC,IAAI,IACH,SAAS,EAAC,0BAA0B,EACpC,KAAK,EAAE,EAAE,KAAK,EAAE,gBAAgB,EAAE,IAEjC,WAAW,CACP,CACF;QACP,oBAAC,IAAI,IAAC,SAAS,EAAC,eAAe;YAC7B,oBAAC,IAAI,IAAC,SAAS,EAAC,oBAAoB,EAAC,KAAK,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,IAC9D,KAAK,CACD;YACP,oBAAC,IAAI,IAAC,SAAS,EAAC,oBAAoB,IACjC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,IAAI,oBAAC,IAAI,IAAC,SAAS,EAAC,OAAO,GAAG,CACvD,CACF,CACF,CACR,CAAC;AACJ,CAAC,CAAC;AACF,eAAe,MAAM,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/List/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAwB,MAAM,OAAO,CAAC;AAC7C,OAAO,EAAE,IAAI,EAAE,IAAI,EAAe,MAAM,oBAAoB,CAAC;AAC7D,OAAO,UAAU,MAAM,YAAY,CAAC;AAGpC,OAAO,cAAc,CAAC;AAmBtB,MAAM,MAAM,GAAoB,KAAK,CAAC,EAAE;IACtC,MAAM,EACJ,KAAK,GAAG,EAAE,EACV,WAAW,GAAG,EAAE,EAChB,IAAI,EACJ,KAAK,GAAG,EAAE,EACV,SAAS,GAAG,EAAE,EACd,KAAK,EACL,MAAM,GAAG,IAAI,EACb,OAAO,EACP,SAAS,EACT,OAAO,GAAG,IAAI,EACd,SAAS,GAAG,KAAK,EACjB,gBAAgB,GAAG,EAAE,EACrB,UAAU,GAAG,EAAE,EACf,QAAQ,GAAG,IAAI,EACf,OAAO,GAAG,KAAK,GAChB,GAAG,KAAK,CAAC;IAEV,MAAM,OAAO,GAAG,UAAU,CACxB,SAAS,EACT,EAAE,MAAM,EAAE,EACV,EAAE,OAAO,EAAE,EACX,EAAE,SAAS,EAAE,EACb,EAAE,OAAO,EAAE,EACX,SAAS,CACV,CAAC;IAEF,MAAM,OAAO,GAAG,UAAU,CAAC,cAAc,EAAE;QACzC,QAAQ;KACT,CAAC,CAAC;IAEH,MAAM,WAAW,GAAG,CAAC,CAAc,EAAE,EAAE;QACrC,OAAO,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;IACxB,CAAC,CAAC;IAEF,OAAO,CACL,oBAAC,IAAI,IAAC,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW;QAC3C,IAAI,IAAI,oBAAC,IAAI,IAAC,SAAS,EAAC,cAAc,IAAE,IAAI,CAAQ;QACrD,oBAAC,IAAI,IAAC,SAAS,EAAE,OAAO;YACrB,KAAK,IAAI,oBAAC,IAAI,IAAC,SAAS,EAAC,oBAAoB,IAAE,KAAK,CAAQ;YAC7D,oBAAC,IAAI,IACH,SAAS,EAAC,0BAA0B,EACpC,KAAK,EAAE,EAAE,KAAK,EAAE,gBAAgB,EAAE,IAEjC,WAAW,CACP,CACF;QACP,oBAAC,IAAI,IAAC,SAAS,EAAC,eAAe;YAC7B,oBAAC,IAAI,IAAC,SAAS,EAAC,oBAAoB,EAAC,KAAK,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,IAC9D,KAAK,CACD;YACP,oBAAC,IAAI,IAAC,SAAS,EAAC,oBAAoB,IACjC,SAAS;gBACR,CAAC,CAAC,SAAS;gBACX,CAAC,CAAC,KAAK,IAAI,oBAAC,IAAI,IAAC,SAAS,EAAC,0BAA0B,GAAG,CACrD,CACF,CACF,CACR,CAAC;AACJ,CAAC,CAAC;AACF,eAAe,MAAM,CAAC"}

package/lib/components/Loading/index.js

@@ -2,14 +2,17 @@ import React from "react";
 import classNames from "classnames";
 import { View } from "@tarojs/components";
 import Mask from "../Mask";
+import Activityindicator from "../ActivityIndicator";
 import "./index.scss";
-const Loading = ({ mask, className, tip = "", color = "", }) => {
+const Loading = ({ mask, className, tip = "加载中", color = "#FFF", size = 60, }) => {
     const cls = classNames("xh-loading", className);
     return (React.createElement(View, { className: cls },
         React.createElement(Mask, { mask: mask }),
-        React.createElement(View, { className: "xh-loading-main" },
-            React.createElement(View, { className: "xh-loading-main-spinner" }, [...Array(12).keys()].map((index) => (React.createElement(View, { className: classNames("xh-loading-main-spinner-circle", `is-circle${index + 1}`), key: `spinner${index}` },
-                React.createElement(View, { className: "dot-rotate", style: { backgroundColor: color } }))))),
+        React.createElement(View, { className: classNames("xh-loading-main", { hasTip: tip }) },
+            React.createElement(Activityindicator, { size: size, style: {
+                    "--loading-border-color": color,
+                    "--loading-border-width": "3px",
+                } }),
             tip && React.createElement(View, { className: "xh-loading-main-tip" }, tip))));
 };
 export default Loading;

package/lib/components/Loading/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/Loading/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAwB,MAAM,OAAO,CAAC;AAC7C,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC1C,OAAO,IAAmB,MAAM,SAAS,CAAC;AAE1C,OAAO,cAAc,CAAC;AAQtB,MAAM,OAAO,GAAqB,CAAC,EACjC,IAAI,EACJ,SAAS,EACT,GAAG,GAAG,EAAE,EACR,KAAK,GAAG,EAAE,GACX,EAAE,EAAE;IACH,MAAM,GAAG,GAAG,UAAU,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC;IAEhD,OAAO,CACL,oBAAC,IAAI,IAAC,SAAS,EAAE,GAAG;QAClB,oBAAC,IAAI,IAAC,IAAI,EAAE,IAAI,GAAI;QACpB,oBAAC,IAAI,IAAC,SAAS,EAAC,iBAAiB;YAC/B,oBAAC,IAAI,IAAC,SAAS,EAAC,yBAAyB,IACtC,CAAC,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CACpC,oBAAC,IAAI,IACH,SAAS,EAAE,UAAU,CACnB,gCAAgC,EAChC,YAAY,KAAK,GAAG,CAAC,EAAE,CACxB,EACD,GAAG,EAAE,UAAU,KAAK,EAAE;gBAEtB,oBAAC,IAAI,IACH,SAAS,EAAC,YAAY,EACtB,KAAK,EAAE,EAAE,eAAe,EAAE,KAAK,EAAE,GAC3B,CACH,CACR,CAAC,CACG;YACN,GAAG,IAAI,oBAAC,IAAI,IAAC,SAAS,EAAC,qBAAqB,IAAE,GAAG,CAAQ,CACrD,CACF,CACR,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,OAAO,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/Loading/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAwB,MAAM,OAAO,CAAC;AAC7C,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC1C,OAAO,IAAmB,MAAM,SAAS,CAAC;AAC1C,OAAO,iBAAiB,MAAM,sBAAsB,CAAC;AAErD,OAAO,cAAc,CAAC;AAStB,MAAM,OAAO,GAAqB,CAAC,EACjC,IAAI,EACJ,SAAS,EACT,GAAG,GAAG,KAAK,EACX,KAAK,GAAG,MAAM,EACd,IAAI,GAAG,EAAE,GACV,EAAE,EAAE;IACH,MAAM,GAAG,GAAG,UAAU,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC;IAEhD,OAAO,CACL,oBAAC,IAAI,IAAC,SAAS,EAAE,GAAG;QAClB,oBAAC,IAAI,IAAC,IAAI,EAAE,IAAI,GAAI;QACpB,oBAAC,IAAI,IAAC,SAAS,EAAE,UAAU,CAAC,iBAAiB,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;YAC7D,oBAAC,iBAAiB,IAChB,IAAI,EAAE,IAAI,EACV,KAAK,EAAE;oBACL,wBAAwB,EAAE,KAAK;oBAC/B,wBAAwB,EAAE,KAAK;iBAChC,GACD;YAkBD,GAAG,IAAI,oBAAC,IAAI,IAAC,SAAS,EAAC,qBAAqB,IAAE,GAAG,CAAQ,CACrD,CACF,CACR,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,OAAO,CAAC"}

package/lib/components/NavBar/index.js

@@ -1,11 +1,15 @@
 import React from "react";
 import { View, Text } from "@tarojs/components";
 import classNames from "classnames";
-import { navigateBack } from "@tarojs/taro";
+import { navigateBack, getSystemInfoSync } from "@tarojs/taro";
 import useCustomNavBar from "@/hooks/useCustomNavbar";
 import "./index.scss";
+// 小程序中判断设备系统
+const isMiniProgramIos = process.env.TARO_ENV !== "h5"
+    ? getSystemInfoSync().platform === "ios"
+    : false;
 const NavBar = props => {
-    const { leftIcon = true, rightIcon = false, title, onBack, className, } = props;
+    const { leftIcon = true, rightIcon = false, title, onBack, navBarBorder = false, className, } = props;
     const { navBarHeight, statusBar, buttonRight } = useCustomNavBar();
     function goBackPage() {
         onBack ? onBack() : navigateBack();
@@ -23,10 +27,13 @@ const NavBar = props => {
         };
     const NavBarCls = classNames("xh-nav-bar", className, {
         h5: process.env.TARO_ENV === "h5",
+        border: navBarBorder,
     });
     return (React.createElement(View, { className: NavBarCls, style: wrapStyle },
         React.createElement(View, { className: classNames("xh-nav-bar-back", { hidden: !leftIcon }), style: backStyle, onClick: goBackPage }),
-        React.createElement(Text, { className: "xh-nav-bar-title" }, title),
+        React.createElement(Text, { className: classNames("xh-nav-bar-title", {
+                isAndroid: !isMiniProgramIos,
+            }) }, title),
         process.env.TARO_ENV === "h5" && rightIcon && (React.createElement(View, { className: "xh-nav-bar-right" }, rightIcon)),
         React.createElement(View, null)));
 };

package/lib/components/NavBar/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/NavBar/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAwB,MAAM,OAAO,CAAC;AAC7C,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,eAAe,MAAM,yBAAyB,CAAC;AAGtD,OAAO,cAAc,CAAC;AAStB,MAAM,MAAM,GAAoB,KAAK,CAAC,EAAE;IACtC,MAAM,EACJ,QAAQ,GAAG,IAAI,EACf,SAAS,GAAG,KAAK,EACjB,KAAK,EACL,MAAM,EACN,SAAS,GACV,GAAG,KAAK,CAAC;IAEV,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,WAAW,EAAE,GAAG,eAAe,EAAE,CAAC;IAEnE,SAAS,UAAU;QACjB,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,YAAY,EAAE,CAAC;IACrC,CAAC;IAED,MAAM,SAAS,GACb,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,IAAI;QAC3B,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC;YACE,MAAM,EAAE,GAAG,YAAY,IAAI;YAC3B,UAAU,EAAE,GAAG,SAAS,IAAI;SAC7B,CAAC;IAER,MAAM,SAAS,GACb,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,IAAI;QAC3B,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC;YACE,IAAI,EAAE,GAAG,WAAW,IAAI;SACzB,CAAC;IAER,MAAM,SAAS,GAAG,UAAU,CAAC,YAAY,EAAE,SAAS,EAAE;QACpD,EAAE,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,IAAI;KAClC,CAAC,CAAC;IAEH,OAAO,CACL,oBAAC,IAAI,IAAC,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS;QAC1C,oBAAC,IAAI,IACH,SAAS,EAAE,UAAU,CAAC,iBAAiB,EAAE,EAAE,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,EAC/D,KAAK,EAAE,SAAS,EAChB,OAAO,EAAE,UAAU,GACb;QACR,oBAAC,IAAI,IAAC,SAAS,EAAC,kBAAkB,IAAE,KAAK,CAAQ;QAChD,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,IAAI,IAAI,SAAS,IAAI,CAC7C,oBAAC,IAAI,IAAC,SAAS,EAAC,kBAAkB,IAAE,SAAS,CAAQ,CACtD;QACD,oBAAC,IAAI,OAAG,CACH,CACR,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,MAAM,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/NavBar/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAwB,MAAM,OAAO,CAAC;AAC7C,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAC/D,OAAO,eAAe,MAAM,yBAAyB,CAAC;AAGtD,OAAO,cAAc,CAAC;AAUtB,aAAa;AACb,MAAM,gBAAgB,GACpB,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,IAAI;IAC3B,CAAC,CAAC,iBAAiB,EAAE,CAAC,QAAQ,KAAK,KAAK;IACxC,CAAC,CAAC,KAAK,CAAC;AACZ,MAAM,MAAM,GAAoB,KAAK,CAAC,EAAE;IACtC,MAAM,EACJ,QAAQ,GAAG,IAAI,EACf,SAAS,GAAG,KAAK,EACjB,KAAK,EACL,MAAM,EACN,YAAY,GAAG,KAAK,EACpB,SAAS,GACV,GAAG,KAAK,CAAC;IAEV,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,WAAW,EAAE,GAAG,eAAe,EAAE,CAAC;IAEnE,SAAS,UAAU;QACjB,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,YAAY,EAAE,CAAC;IACrC,CAAC;IAED,MAAM,SAAS,GACb,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,IAAI;QAC3B,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC;YACE,MAAM,EAAE,GAAG,YAAY,IAAI;YAC3B,UAAU,EAAE,GAAG,SAAS,IAAI;SAC7B,CAAC;IAER,MAAM,SAAS,GACb,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,IAAI;QAC3B,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC;YACE,IAAI,EAAE,GAAG,WAAW,IAAI;SACzB,CAAC;IAER,MAAM,SAAS,GAAG,UAAU,CAAC,YAAY,EAAE,SAAS,EAAE;QACpD,EAAE,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,IAAI;QACjC,MAAM,EAAE,YAAY;KACrB,CAAC,CAAC;IAEH,OAAO,CACL,oBAAC,IAAI,IAAC,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS;QAC1C,oBAAC,IAAI,IACH,SAAS,EAAE,UAAU,CAAC,iBAAiB,EAAE,EAAE,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,EAC/D,KAAK,EAAE,SAAS,EAChB,OAAO,EAAE,UAAU,GACb;QACR,oBAAC,IAAI,IACH,SAAS,EAAE,UAAU,CAAC,kBAAkB,EAAE;gBACxC,SAAS,EAAE,CAAC,gBAAgB;aAC7B,CAAC,IAED,KAAK,CACD;QACN,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,IAAI,IAAI,SAAS,IAAI,CAC7C,oBAAC,IAAI,IAAC,SAAS,EAAC,kBAAkB,IAAE,SAAS,CAAQ,CACtD;QACD,oBAAC,IAAI,OAAG,CACH,CACR,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,MAAM,CAAC"}

package/lib/components/NumberKeyboard/index.js

@@ -4,7 +4,7 @@ import { CSSTransition } from "react-transition-group";
 import { View } from "@tarojs/components";
 import "./index.scss";
 const NumberKeyboard = props => {
-    const { onBlur, show, maxLength = Number.MAX_SAFE_INTEGER, showClose = true, closeOnClickSpace = true, onClose, onChange, value, className, } = props;
+    const { onBlur, show, maxLength = Number.MAX_SAFE_INTEGER, showClose = true, closeOnClickSpace = true, onClose, onChange, value, title = "安全键盘", closeText = "收起", className, } = props;
     const [input, setInput] = useState(value);
     const keys = getKeys();
     useEffect(() => {
@@ -49,7 +49,9 @@ const NumberKeyboard = props => {
     const keyboardcls = classNames("xh-number-keyboard", className);
     return (React.createElement(CSSTransition, { classNames: "slide-up", in: show, unmountOnExit: true, timeout: 200 },
         React.createElement(View, { className: keyboardcls },
-            React.createElement(View, { className: "xh-number-keyboard-header" }, showClose && (React.createElement(View, { className: "xh-number-keyboard-close", onClick: handleClose }, "\u5B8C\u6210"))),
+            React.createElement(View, { className: "xh-number-keyboard-header" },
+                React.createElement(View, { className: "xh-number-keyboard-header-title" }, title),
+                showClose && (React.createElement(View, { className: "xh-number-keyboard-header-close", onClick: handleClose }, closeText))),
             React.createElement(View, { className: "xh-number-keyboard-body" }, keys.map((key, index) => (React.createElement(View, { key: index, className: classNames("xh-number-keyboard-body-key", {
                     none: key.type === "none",
                     delete: key.type === "delete",

package/lib/components/NumberKeyboard/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/NumberKeyboard/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAM,QAAQ,EAAE,SAAS,EAAc,MAAM,OAAO,CAAC;AACnE,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAE1C,OAAO,cAAc,CAAC;AAyBtB,MAAM,cAAc,GAA4B,KAAK,CAAC,EAAE;IACtD,MAAM,EACJ,MAAM,EACN,IAAI,EACJ,SAAS,GAAG,MAAM,CAAC,gBAAgB,EACnC,SAAS,GAAG,IAAI,EAChB,iBAAiB,GAAG,IAAI,EACxB,OAAO,EACP,QAAQ,EACR,KAAK,EACL,SAAS,GACV,GAAG,KAAK,CAAC;IACV,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC1C,MAAM,IAAI,GAAG,OAAO,EAAE,CAAC;IAEvB,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,iBAAiB,EAAE;YACrB,QAAQ,CAAC,gBAAgB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;SACjD;QAED,OAAO,GAAG,EAAE;YACV,QAAQ,CAAC,mBAAmB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QACrD,CAAC,CAAC;IACJ,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,SAAS,CAAC,GAAG,EAAE;QACb,QAAQ,CAAC,KAAK,CAAC,CAAC;IAClB,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IAEZ,SAAS,WAAW,CAAC,CAAC;QACpB,OAAO,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;QACtB,MAAM,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC;IACtB,CAAC;IAED,SAAS,cAAc,CAAC,CAAC,EAAE,EAAE,IAAI,EAAE,KAAK,EAAQ;QAC9C,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,IAAI,EAAE;YACjC,CAAC,CAAC,wBAAwB,EAAE,CAAC;SAC9B;QACD,IAAI,IAAI,KAAK,MAAM;YAAE,OAAO;QAE5B,IAAI,QAAQ,GAAG,KAAK,CAAC;QAErB,IAAI,IAAI,KAAK,QAAQ,EAAE;YACrB,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;SAC7C;aAAM,IAAI,QAAQ,CAAC,MAAM,GAAG,SAAS,EAAE;YACtC,QAAQ,GAAG,KAAK,GAAG,KAAK,CAAC;SAC1B;QAED,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAEnB,QAAQ,IAAI,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACjC,CAAC;IAED,SAAS,OAAO;QACd,MAAM,IAAI,GAAW,EAAE,CAAC;QAExB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE;YAC3B,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;SAClD;QAED,IAAI,CAAC,IAAI,CACP,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,EACrC,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EACrC,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,CACxC,CAAC;QAEF,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,WAAW,GAAG,UAAU,CAAC,oBAAoB,EAAE,SAAS,CAAC,CAAC;IAEhE,OAAO,CACL,oBAAC,aAAa,IAAC,UAAU,EAAC,UAAU,EAAC,EAAE,EAAE,IAAI,EAAE,aAAa,QAAC,OAAO,EAAE,GAAG;QACvE,oBAAC,IAAI,IAAC,SAAS,EAAE,WAAW;YAC1B,oBAAC,IAAI,IAAC,SAAS,EAAC,2BAA2B,IACxC,SAAS,IAAI,CACZ,oBAAC,IAAI,IAAC,SAAS,EAAC,0BAA0B,EAAC,OAAO,EAAE,WAAW,mBAExD,CACR,CACI;YACP,oBAAC,IAAI,IAAC,SAAS,EAAC,yBAAyB,IACtC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,CACxB,oBAAC,IAAI,IACH,GAAG,EAAE,KAAK,EACV,SAAS,EAAE,UAAU,CAAC,6BAA6B,EAAE;oBACnD,IAAI,EAAE,GAAG,CAAC,IAAI,KAAK,MAAM;oBACzB,MAAM,EAAE,GAAG,CAAC,IAAI,KAAK,QAAQ;iBAC9B,CAAC,EACF,OAAO,EAAE,CAAC,CAAC,EAAE;oBACX,cAAc,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;gBACzB,CAAC,IAEA,GAAG,CAAC,IAAI,CACJ,CACR,CAAC,CACG,CACF,CACO,CACjB,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,cAAc,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/NumberKeyboard/index.tsx"],"names":[],"mappings":"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"}

package/lib/components/Page/index.js

@@ -16,7 +16,7 @@ import "./index.scss";
 import Loading from "../Loading";
 import NavBar from "../NavBar";
 const Page = props => {
-    const { children, loading = false, className = "", mask = "normal", tip, loadingColor, customNavBar = false, title = "" } = props, rest = __rest(props, ["children", "loading", "className", "mask", "tip", "loadingColor", "customNavBar", "title"]);
+    const { children, loading = false, className = "", mask = "normal", tip = "加载中", loadingColor = "#FFF", customNavBar = false, title = "" } = props, rest = __rest(props, ["children", "loading", "className", "mask", "tip", "loadingColor", "customNavBar", "title"]);
     const classObj = classname("xh-page", className, {
         flex: process.env.TARO_ENV !== "h5" && customNavBar,
     });

package/lib/components/Page/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/Page/index.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAwB,MAAM,OAAO,CAAC;AAC7C,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC1C,OAAO,SAAS,MAAM,YAAY,CAAC;AAEnC,OAAO,cAAc,CAAC;AACtB,OAAO,OAAyB,MAAM,YAAY,CAAC;AACnD,OAAO,MAAM,MAAM,WAAW,CAAC;AAkB/B,MAAM,IAAI,GAAkB,KAAK,CAAC,EAAE;IAClC,MAAM,EACJ,QAAQ,EACR,OAAO,GAAG,KAAK,EACf,SAAS,GAAG,EAAE,EACd,IAAI,GAAG,QAAQ,EACf,GAAG,EACH,YAAY,EACZ,YAAY,GAAG,KAAK,EACpB,KAAK,GAAG,EAAE,KAER,KAAK,EADJ,IAAI,UACL,KAAK,EAVH,4FAUL,CAAQ,CAAC;IAEV,MAAM,QAAQ,GAAG,SAAS,CAAC,SAAS,EAAE,SAAS,EAAE;QAC/C,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,IAAI,IAAI,YAAY;KACpD,CAAC,CAAC;IAEH,OAAO,CACL,oBAAC,IAAI,IAAC,SAAS,EAAE,QAAQ;QACtB,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,IAAI,IAAI,YAAY,IAAI,CAChD,oBAAC,MAAM,kBAAC,KAAK,EAAE,KAAK,IAAM,IAAI,EAAI,CACnC;QACA,OAAO,IAAI,CACV,oBAAC,IAAI,IAAC,SAAS,EAAC,iBAAiB;YAC/B,oBAAC,OAAO,IAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,GAAI,CACjD,CACR;QACA,YAAY,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,CAC/C,oBAAC,IAAI,IAAC,SAAS,EAAC,iBAAiB,IAAE,QAAQ,CAAQ,CACpD,CAAC,CAAC,CAAC,CACF,QAAQ,CACT,CACI,CACR,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,IAAI,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/Page/index.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAwB,MAAM,OAAO,CAAC;AAC7C,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC1C,OAAO,SAAS,MAAM,YAAY,CAAC;AAEnC,OAAO,cAAc,CAAC;AACtB,OAAO,OAAyB,MAAM,YAAY,CAAC;AACnD,OAAO,MAAM,MAAM,WAAW,CAAC;AAmB/B,MAAM,IAAI,GAAkB,KAAK,CAAC,EAAE;IAClC,MAAM,EACJ,QAAQ,EACR,OAAO,GAAG,KAAK,EACf,SAAS,GAAG,EAAE,EACd,IAAI,GAAG,QAAQ,EACf,GAAG,GAAG,KAAK,EACX,YAAY,GAAG,MAAM,EACrB,YAAY,GAAG,KAAK,EACpB,KAAK,GAAG,EAAE,KAER,KAAK,EADJ,IAAI,UACL,KAAK,EAVH,4FAUL,CAAQ,CAAC;IAEV,MAAM,QAAQ,GAAG,SAAS,CAAC,SAAS,EAAE,SAAS,EAAE;QAC/C,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,IAAI,IAAI,YAAY;KACpD,CAAC,CAAC;IAEH,OAAO,CACL,oBAAC,IAAI,IAAC,SAAS,EAAE,QAAQ;QACtB,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,IAAI,IAAI,YAAY,IAAI,CAChD,oBAAC,MAAM,kBAAC,KAAK,EAAE,KAAK,IAAM,IAAI,EAAI,CACnC;QACA,OAAO,IAAI,CACV,oBAAC,IAAI,IAAC,SAAS,EAAC,iBAAiB;YAC/B,oBAAC,OAAO,IAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,GAAI,CACjD,CACR;QACA,YAAY,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,CAC/C,oBAAC,IAAI,IAAC,SAAS,EAAC,iBAAiB,IAAE,QAAQ,CAAQ,CACpD,CAAC,CAAC,CAAC,CACF,QAAQ,CACT,CACI,CACR,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,IAAI,CAAC"}

package/lib/components/Popup/index.js

@@ -12,7 +12,7 @@ const positionMap = {
     right: "left",
 };
 const Popup = props => {
-    const { visible, position = "bottom", children, onClose } = props;
+    const { visible, position = "bottom", children, onClose, className } = props;
     const direction = positionMap[position];
     const cls = classNames("xh-popup-content", {
         "xh-popup-content-left": position === "left",
@@ -45,13 +45,13 @@ const Popup = props => {
         onClose && onClose();
     }
     if (process.env.TARO_ENV !== "h5") {
-        const minicls = classNames("xh-popup", visible ? "visible" : "hidden");
+        const minicls = classNames("xh-popup", className, visible ? "visible" : "hidden");
         return (React.createElement(View, { className: minicls },
             React.createElement(Mask, { onClick: handleClickOnMask }),
             React.createElement(View, { className: cls }, children)));
     }
     return ReactDOM.createPortal(React.createElement(Fade, { in: visible },
-        React.createElement("div", { className: "xh-popup" },
+        React.createElement("div", { className: classNames("xh-popup", className) },
             React.createElement(Mask, { onClick: handleClickOnMask }),
             React.createElement(Slide, { direction: direction, in: visible },
                 React.createElement("div", { className: cls }, children)))), document.body);

package/lib/components/Popup/index.js.map

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

package/lib/components/Progress/index.js

@@ -3,18 +3,23 @@ import classNames from "classnames";
 import { View } from "@tarojs/components";
 import { pxTransform } from "@tarojs/taro";
 import "./index.scss";
-const Progress = (props) => {
-    const { percent = 88, className, showPercent = false, doneColor = "", percentColor = "", height, } = props;
-    const progresslcs = classNames("xh-progress", className);
-    const showPercentcls = classNames("progress-bar");
+const Progress = props => {
+    const { percent = 88, className, showPercent = false, doneColor = "", percentColor = "", height, dots = [], } = props;
+    const progresslcs = classNames("xh-progress", className, {
+        dots: dots.length > 0,
+    });
+    const showPercentcls = classNames("progress-bar", { dots: dots.length > 0 });
     const showbarPercentcls = classNames("progress-bar-percent");
     return (React.createElement(View, { className: progresslcs },
-        React.createElement(View, { className: "progress", style: { height: height && `${pxTransform(height)}` } },
-            React.createElement(View, { style: {
-                    width: `${percent}%`,
-                    backgroundColor: doneColor,
-                    color: percentColor,
-                }, className: showPercentcls }, showPercent && (React.createElement(View, { className: showbarPercentcls }, `${percent}%`))))));
+        React.createElement(View, { className: "progress", style: { height: height && `${pxTransform(height)}` } }, dots.length > 0 ? (React.createElement(React.Fragment, null,
+            dots.map(item => (React.createElement(View, { style: {
+                    width: `${item}%`,
+                }, key: item, "data-progress": item, className: showPercentcls }))),
+            React.createElement(View, { className: "progress-cover", style: { width: `${percent}%` } }))) : (React.createElement(View, { style: {
+                width: `${percent}%`,
+                backgroundColor: doneColor,
+                color: percentColor,
+            }, className: showPercentcls }, showPercent && (React.createElement(View, { className: showbarPercentcls }, `${percent}%`)))))));
 };
 export default Progress;
 //# sourceMappingURL=index.js.map

package/lib/components/Progress/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/Progress/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAE3C,OAAO,cAAc,CAAC;AAUtB,MAAM,QAAQ,GAA4B,CAAC,KAAK,EAAE,EAAE;IAClD,MAAM,EACJ,OAAO,GAAG,EAAE,EACZ,SAAS,EACT,WAAW,GAAG,KAAK,EACnB,SAAS,GAAG,EAAE,EACd,YAAY,GAAG,EAAE,EACjB,MAAM,GACP,GAAG,KAAK,CAAC;IACV,MAAM,WAAW,GAAG,UAAU,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;IAEzD,MAAM,cAAc,GAAG,UAAU,CAAC,cAAc,CAAC,CAAC;IAClD,MAAM,iBAAiB,GAAG,UAAU,CAAC,sBAAsB,CAAC,CAAC;IAC7D,OAAO,CACL,oBAAC,IAAI,IAAC,SAAS,EAAE,WAAW;QAC1B,oBAAC,IAAI,IACH,SAAS,EAAC,UAAU,EACpB,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,IAAI,GAAG,WAAW,CAAC,MAAM,CAAC,EAAE,EAAE;YAErD,oBAAC,IAAI,IACH,KAAK,EAAE;oBACL,KAAK,EAAE,GAAG,OAAO,GAAG;oBACpB,eAAe,EAAE,SAAS;oBAC1B,KAAK,EAAE,YAAY;iBACpB,EACD,SAAS,EAAE,cAAc,IAExB,WAAW,IAAI,CACd,oBAAC,IAAI,IAAC,SAAS,EAAE,iBAAiB,IAAG,GAAG,OAAO,GAAG,CAAQ,CAC3D,CACI,CACF,CACF,CACR,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,QAAQ,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/Progress/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAE3C,OAAO,cAAc,CAAC;AActB,MAAM,QAAQ,GAA4B,KAAK,CAAC,EAAE;IAChD,MAAM,EACJ,OAAO,GAAG,EAAE,EACZ,SAAS,EACT,WAAW,GAAG,KAAK,EACnB,SAAS,GAAG,EAAE,EACd,YAAY,GAAG,EAAE,EACjB,MAAM,EACN,IAAI,GAAG,EAAE,GACV,GAAG,KAAK,CAAC;IACV,MAAM,WAAW,GAAG,UAAU,CAAC,aAAa,EAAE,SAAS,EAAE;QACvD,IAAI,EAAE,IAAI,CAAC,MAAM,GAAG,CAAC;KACtB,CAAC,CAAC;IAEH,MAAM,cAAc,GAAG,UAAU,CAAC,cAAc,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,CAAC;IAC7E,MAAM,iBAAiB,GAAG,UAAU,CAAC,sBAAsB,CAAC,CAAC;IAC7D,OAAO,CACL,oBAAC,IAAI,IAAC,SAAS,EAAE,WAAW;QAC1B,oBAAC,IAAI,IACH,SAAS,EAAC,UAAU,EACpB,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,IAAI,GAAG,WAAW,CAAC,MAAM,CAAC,EAAE,EAAE,IAEpD,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CACjB,oBAAC,KAAK,CAAC,QAAQ;YACZ,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAChB,oBAAC,IAAI,IACH,KAAK,EAAE;oBACL,KAAK,EAAE,GAAG,IAAI,GAAG;iBAClB,EACD,GAAG,EAAE,IAAI,mBACM,IAAI,EACnB,SAAS,EAAE,cAAc,GACzB,CACH,CAAC;YACF,oBAAC,IAAI,IAAC,SAAS,EAAC,gBAAgB,EAAC,KAAK,EAAE,EAAE,KAAK,EAAE,GAAG,OAAO,GAAG,EAAE,GAAI,CACrD,CAClB,CAAC,CAAC,CAAC,CACF,oBAAC,IAAI,IACH,KAAK,EAAE;gBACL,KAAK,EAAE,GAAG,OAAO,GAAG;gBACpB,eAAe,EAAE,SAAS;gBAC1B,KAAK,EAAE,YAAY;aACpB,EACD,SAAS,EAAE,cAAc,IAExB,WAAW,IAAI,CACd,oBAAC,IAAI,IAAC,SAAS,EAAE,iBAAiB,IAAG,GAAG,OAAO,GAAG,CAAQ,CAC3D,CACI,CACR,CACI,CACF,CACR,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,QAAQ,CAAC"}

package/lib/components/ProgressCircle/index.js

@@ -0,0 +1,22 @@
+import React from "react";
+import classNames from "classnames";
+import { View } from "@tarojs/components";
+import { pxTransform } from "@/utils";
+import "./index.scss";
+const Progress = props => {
+    const { percent = 88, className, 
+    // showPercent = false,
+    doneColor = "#DDD", backgroundColor = "rgba(0,0,0, 0.25)", maskColor = "#FFF", size, style, } = props;
+    const progresslcs = classNames("xh-progress-circle", className);
+    const finalSize = size
+        ? {
+            width: pxTransform(size),
+            height: pxTransform(size),
+        }
+        : {};
+    const done = percent === 100;
+    const finalStyle = Object.assign(Object.assign(Object.assign({}, finalSize), { "--percent": `${percent / 100}turn`, "--doneColor": doneColor, "--backgroundColor": backgroundColor, "--maskContent": "percent", "--maskColor": maskColor }), style);
+    return (React.createElement(View, { className: progresslcs, style: finalStyle }, done && React.createElement(View, { className: "xh-progress-circle-done" })));
+};
+export default Progress;
+//# sourceMappingURL=index.js.map