taro-react-uilib 1.0.27 → 1.0.29

package/dist/styles/components/dialog.scss

@@ -30,42 +30,40 @@
       padding: 0 60px;
     }
     &-content {
-      margin: 66px auto 0;
-      font-size: 34px;
+      margin: 40px auto 0;
+      font-size: 30px;
       font-family: PingFang SC;
       color: #999;
       padding: 0 60px;
+      &.headless {
+        color: #333;
+        font-size: 34px;
+      }
     }
     &-footer {
       margin-top: 60px;
       .xh-alert-button {
-        color: #f6ab00;
         font-size: 32px;
         font-weight: 800;
-        border-top: 2px solid #f8f8f8;
-        border-bottom-left-radius: 10px;
-        border-bottom-right-radius: 10px;
-        padding: 18px 0;
+        margin-bottom: 60px;
+        width: 300px;
+        height: 90px;
       }
 
       .xh-confirm-footer {
         display: flex;
         justify-content: space-between;
-        border-top: 2px solid #f8f8f8;
+        padding: 0 40px 50px;
         &-button {
           flex: 1;
           font-size: 32px;
           font-weight: 800;
-          padding: 18px 0;
+          padding: 8px 0;
         }
         &-cancel-button {
-          color: #666;
-          border-right: 2px solid #f8f8f8;
-          border-bottom-left-radius: 10px;
-        }
-        &-confirm-button {
-          color: #f6ab00;
-          border-bottom-right-radius: 10px;
+          color: #000;
+          margin-right: 40px;
+          color: #999999;
         }
       }
     }

package/dist/styles/components/dialogref.scss

@@ -16,7 +16,6 @@
   z-index: 999;
   &.show {
     visibility: visible;
-
     .xh-dialog-ref-content {
       animation: scaleDialog 0.3s;
     }
@@ -44,35 +43,31 @@
       font-size: 34px;
       font-family: PingFang SC;
       color: #999;
+      text-align: left;
     }
     &-footer {
       // margin-top: 60px;
-      border-top: 2px solid #f8f8f8;
-      .xh-dialog-ref-content-footer-button {
+      .xh-dialog-ref-content-footer-buttons {
         display: flex;
-        width: 100%;
-        &-button {
-          padding: 18px 0;
-          flex: 1;
-          font-size: 32px;
-          font-weight: 800;
-          border: 0;
+        padding: 0 40px 60px;
+        &.microApp {
+          border-top: 2px solid #f8f8f8;
+          padding: 0;
+        }
+        &-microapp-cancel {
+          color: #999999;
           border-bottom-left-radius: 10px;
           border-right: 2px solid #f8f8f8;
-          color: #666;
-          position: relative;
-          outline: 0;
-          box-sizing: border-box;
-          overflow: hidden;
-          text-overflow: ellipsis;
-          white-space: nowrap;
-          line-height: 2.55555556;
-          background-color: #fff;
-          &:last-child {
-            color: #f6ab00;
-            border-bottom-right-radius: 10px;
-            border-right: 0;
-          }
+          padding: 10px 0;
+        }
+        &-microapp-confirm {
+          color: #f6ab00;
+          border-bottom-right-radius: 10px;
+          padding: 10px 0;
+        }
+        &-h5-cancel {
+          margin-right: 40px;
+          color: #999999;
         }
       }
     }

package/dist/styles/components/index.scss

@@ -1,9 +1,7 @@
-@import './alert.scss';
 @import './animated.scss';
 @import './bankicon.scss';
 @import './button.scss';
 @import './captcha.scss';
-@import './confirm.scss';
 @import './dialog.scss';
 @import './dialogref.scss';
 @import './fade.scss';

package/lib/components/Dialog/Alert/index.js

@@ -14,14 +14,13 @@ import ReactDOM from "react-dom";
 import { showModal } from "@tarojs/taro";
 import Dialog from "../../DialogComponent";
 import Button from "../../../../src/components/Button";
-import "./index.scss";
 const Alert = (props) => {
     const { title = "", content, confirmText = "我知道了" } = props, rest = __rest(props, ["title", "content", "confirmText"]);
     return new Promise(resolve => {
         if (process.env.TARO_ENV === "h5") {
             const div = document.createElement("div");
             const dialogRef = createRef();
-            const alertFooter = (React.createElement(Button, { className: "xh-alert-button", shape: "rectangle", type: "ghost", size: "full", onClick: () => {
+            const alertFooter = (React.createElement(Button, { className: "xh-alert-button", type: "primary", onClick: () => {
                     ReactDOM.unmountComponentAtNode(div);
                     resolve();
                 } }, confirmText));

package/lib/components/Dialog/Alert/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/components/Dialog/Alert/index.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAK,EAAE,EAAE,SAAS,EAAa,MAAM,OAAO,CAAC;AACpD,OAAO,QAAQ,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,MAAqB,MAAM,uBAAuB,CAAC;AAC1D,OAAO,MAAM,MAAM,mCAAmC,CAAC;AACvD,OAAO,cAAc,CAAC;AAyBtB,MAAM,KAAK,GAAG,CAAC,KAAiB,EAAiB,EAAE;IACjD,MAAM,EAAE,KAAK,GAAG,EAAE,EAAE,OAAO,EAAE,WAAW,GAAG,MAAM,KAAc,KAAK,EAAd,IAAI,UAAK,KAAK,EAA9D,mCAAsD,CAAQ,CAAC;IACrE,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;QAC3B,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,IAAI,EAAE;YACjC,MAAM,GAAG,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;YAC1C,MAAM,SAAS,GAAG,SAAS,EAAa,CAAC;YACzC,MAAM,WAAW,GAAG,CAClB,oBAAC,MAAM,IACL,SAAS,EAAC,iBAAiB,EAC3B,KAAK,EAAC,WAAW,EACjB,IAAI,EAAC,OAAO,EACZ,IAAI,EAAC,MAAM,EACX,OAAO,EAAE,GAAG,EAAE;oBACZ,QAAQ,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC;oBACrC,OAAO,EAAE,CAAC;gBACZ,CAAC,IAEA,WAAW,CACL,CACV,CAAC;YACF,QAAQ,CAAC,MAAM,CACb,oBAAC,MAAM,IACL,MAAM,EAAE,KAAK,EACb,MAAM,EAAE,WAAW,EACnB,OAAO,EAAE,OAAO,EAChB,OAAO,QACP,GAAG,EAAE,SAAS,GACd,EACF,GAAG,CACJ,CAAC;SACH;aAAM;YACL,SAAS,iBACP,KAAK,EAAE,KAAe,EACtB,OAAO,EAAE,OAAiB,EAC1B,UAAU,EAAE,KAAK,EACjB,YAAY,EAAE,SAAS,EACvB,WAAW,EAAE,WAAqB,IAC/B,IAAI,EACP,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;SAC1B;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,eAAe,KAAK,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/components/Dialog/Alert/index.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAK,EAAE,EAAE,SAAS,EAAa,MAAM,OAAO,CAAC;AACpD,OAAO,QAAQ,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,MAAqB,MAAM,uBAAuB,CAAC;AAC1D,OAAO,MAAM,MAAM,mCAAmC,CAAC;AAyBvD,MAAM,KAAK,GAAG,CAAC,KAAiB,EAAiB,EAAE;IACjD,MAAM,EAAE,KAAK,GAAG,EAAE,EAAE,OAAO,EAAE,WAAW,GAAG,MAAM,KAAc,KAAK,EAAd,IAAI,UAAK,KAAK,EAA9D,mCAAsD,CAAQ,CAAC;IACrE,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;QAC3B,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,IAAI,EAAE;YACjC,MAAM,GAAG,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;YAC1C,MAAM,SAAS,GAAG,SAAS,EAAa,CAAC;YACzC,MAAM,WAAW,GAAG,CAClB,oBAAC,MAAM,IACL,SAAS,EAAC,iBAAiB,EAC3B,IAAI,EAAC,SAAS,EACd,OAAO,EAAE,GAAG,EAAE;oBACZ,QAAQ,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC;oBACrC,OAAO,EAAE,CAAC;gBACZ,CAAC,IAEA,WAAW,CACL,CACV,CAAC;YACF,QAAQ,CAAC,MAAM,CACb,oBAAC,MAAM,IACL,MAAM,EAAE,KAAK,EACb,MAAM,EAAE,WAAW,EACnB,OAAO,EAAE,OAAO,EAChB,OAAO,QACP,GAAG,EAAE,SAAS,GACd,EACF,GAAG,CACJ,CAAC;SACH;aAAM;YACL,SAAS,iBACP,KAAK,EAAE,KAAe,EACtB,OAAO,EAAE,OAAiB,EAC1B,UAAU,EAAE,KAAK,EACjB,YAAY,EAAE,SAAS,EACvB,WAAW,EAAE,WAAqB,IAC/B,IAAI,EACP,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;SAC1B;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,eAAe,KAAK,CAAC"}

package/lib/components/Dialog/Confirm/index.js

@@ -14,7 +14,6 @@ import ReactDOM from "react-dom";
 import { showModal } from "@tarojs/taro";
 import DialogComponent from "../../DialogComponent";
 import Button from "../../Button";
-import "./index.scss";
 const Comfirm = (props) => {
     const { title = "", content, confirmText = "确定", cancelText = "取消" } = props, rest = __rest(props, ["title", "content", "confirmText", "cancelText"]);
     return new Promise(resolve => {
@@ -22,11 +21,11 @@ const Comfirm = (props) => {
             const div = document.createElement("div");
             const dialogRef = createRef();
             const alertFooter = (React.createElement("div", { className: "xh-confirm-footer" },
-                React.createElement(Button, { shape: "rectangle", type: "ghost", className: "xh-confirm-footer-button xh-confirm-footer-cancel-button", onClick: () => {
+                React.createElement(Button, { className: "xh-confirm-footer-button xh-confirm-footer-cancel-button", onClick: () => {
                         ReactDOM.unmountComponentAtNode(div);
                         resolve({ errMsg: "ok", confirm: false, cancel: true });
                     } }, cancelText),
-                React.createElement(Button, { shape: "rectangle", type: "ghost", className: "xh-confirm-footer-button xh-confirm-footer-confirm-button", onClick: () => {
+                React.createElement(Button, { type: "primary", className: "xh-confirm-footer-button xh-confirm-footer-confirm-button", onClick: () => {
                         ReactDOM.unmountComponentAtNode(div);
                         resolve({ errMsg: "ok", confirm: true, cancel: false });
                     } }, confirmText)));

package/lib/components/Dialog/Confirm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/components/Dialog/Confirm/index.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACzC,OAAO,QAAQ,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,eAA8B,MAAM,uBAAuB,CAAC;AACnE,OAAO,MAAM,MAAM,cAAc,CAAC;AAClC,OAAO,cAAc,CAAC;AAqCtB,MAAM,OAAO,GAAG,CAAC,KAAmB,EAA+B,EAAE;IACnE,MAAM,EACJ,KAAK,GAAG,EAAE,EACV,OAAO,EACP,WAAW,GAAG,IAAI,EAClB,UAAU,GAAG,IAAI,KAEf,KAAK,EADJ,IAAI,UACL,KAAK,EANH,iDAML,CAAQ,CAAC;IACV,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;QAC3B,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,IAAI,EAAE;YACjC,MAAM,GAAG,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;YAE1C,MAAM,SAAS,GAAG,SAAS,EAAa,CAAC;YACzC,MAAM,WAAW,GAAG,CAClB,6BAAK,SAAS,EAAC,mBAAmB;gBAChC,oBAAC,MAAM,IACL,KAAK,EAAC,WAAW,EACjB,IAAI,EAAC,OAAO,EACZ,SAAS,EAAC,0DAA0D,EACpE,OAAO,EAAE,GAAG,EAAE;wBACZ,QAAQ,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC;wBACrC,OAAO,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;oBAC1D,CAAC,IAEA,UAAU,CACJ;gBACT,oBAAC,MAAM,IACL,KAAK,EAAC,WAAW,EACjB,IAAI,EAAC,OAAO,EACZ,SAAS,EAAC,2DAA2D,EACrE,OAAO,EAAE,GAAG,EAAE;wBACZ,QAAQ,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC;wBACrC,OAAO,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;oBAC1D,CAAC,IAEA,WAAW,CACL,CACL,CACP,CAAC;YACF,QAAQ,CAAC,MAAM,CACb,oBAAC,eAAe,IACd,MAAM,EAAE,KAAK,EACb,MAAM,EAAE,WAAW,EACnB,OAAO,EAAE,OAAO,EAChB,OAAO,QACP,GAAG,EAAE,SAAS,GACd,EACF,GAAG,CACJ,CAAC;SACH;aAAM;YACL,SAAS,iBACP,KAAK;gBACL,OAAO,EACP,YAAY,EAAE,SAAS,EACvB,UAAU,EACV,WAAW,EAAE,MAAM,EACnB,WAAW,IACR,IAAI,EACP,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SAClB;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,eAAe,OAAO,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/components/Dialog/Confirm/index.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACzC,OAAO,QAAQ,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,eAA8B,MAAM,uBAAuB,CAAC;AACnE,OAAO,MAAM,MAAM,cAAc,CAAC;AAqClC,MAAM,OAAO,GAAG,CAAC,KAAmB,EAA+B,EAAE;IACnE,MAAM,EACJ,KAAK,GAAG,EAAE,EACV,OAAO,EACP,WAAW,GAAG,IAAI,EAClB,UAAU,GAAG,IAAI,KAEf,KAAK,EADJ,IAAI,UACL,KAAK,EANH,iDAML,CAAQ,CAAC;IACV,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;QAC3B,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,IAAI,EAAE;YACjC,MAAM,GAAG,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;YAE1C,MAAM,SAAS,GAAG,SAAS,EAAa,CAAC;YACzC,MAAM,WAAW,GAAG,CAClB,6BAAK,SAAS,EAAC,mBAAmB;gBAChC,oBAAC,MAAM,IACL,SAAS,EAAC,0DAA0D,EACpE,OAAO,EAAE,GAAG,EAAE;wBACZ,QAAQ,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC;wBACrC,OAAO,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;oBAC1D,CAAC,IAEA,UAAU,CACJ;gBACT,oBAAC,MAAM,IACL,IAAI,EAAC,SAAS,EACd,SAAS,EAAC,2DAA2D,EACrE,OAAO,EAAE,GAAG,EAAE;wBACZ,QAAQ,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC;wBACrC,OAAO,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;oBAC1D,CAAC,IAEA,WAAW,CACL,CACL,CACP,CAAC;YACF,QAAQ,CAAC,MAAM,CACb,oBAAC,eAAe,IACd,MAAM,EAAE,KAAK,EACb,MAAM,EAAE,WAAW,EACnB,OAAO,EAAE,OAAO,EAChB,OAAO,QACP,GAAG,EAAE,SAAS,GACd,EACF,GAAG,CACJ,CAAC;SACH;aAAM;YACL,SAAS,iBACP,KAAK;gBACL,OAAO,EACP,YAAY,EAAE,SAAS,EACvB,UAAU,EACV,WAAW,EAAE,MAAM,EACnB,WAAW,IACR,IAAI,EACP,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SAClB;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,eAAe,OAAO,CAAC"}

package/lib/components/DialogComponent/index.js

@@ -17,13 +17,20 @@ const DialogCom = forwardRef((props, fromRef) => {
     useEffect(() => {
         setSelfVisible(visible);
     }, [visible]);
-    const dialogcls = classNames("xh-dialog", className);
+    const dialogcls = classNames("xh-dialog", className, {
+        microApp: process.env.TARO_ENV !== "h5",
+    });
+    console.log(header);
+    console.log("title");
+    const dialogContent = classNames("xh-dialog-content-content", {
+        headless: !header,
+    });
     const DialogMain = (React.createElement(View, { className: dialogcls },
         React.createElement(Mask, null),
         React.createElement(CSSTransition, { in: selfVisible, timeout: 200, classNames: "scale", unmountOnExit: true },
             React.createElement(View, { className: "xh-dialog-content" },
                 React.createElement(View, { className: "xh-dialog-content-header" }, header),
-                React.createElement(View, { className: "xh-dialog-content-content" }, content),
+                React.createElement(View, { className: dialogContent }, content),
                 React.createElement(View, { className: "xh-dialog-content-footer" }, footer)))));
     return ReactDOM.createPortal(DialogMain, document.body);
 });

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/DialogComponent/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAEZ,QAAQ,EACR,mBAAmB,EACnB,UAAU,EACV,SAAS,GACV,MAAM,OAAO,CAAC;AACf,OAAO,QAAQ,MAAM,WAAW,CAAC;AACjC,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAEvD,OAAO,IAAI,MAAM,SAAS,CAAC;AAC3B,OAAO,cAAc,CAAC;AAYtB,MAAM,SAAS,GAAG,UAAU,CAAyB,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;IACtE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,GAAG,EAAE,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IACnE,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAEtD,mBAAmB,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;QAClC,KAAK,EAAE,GAAG,EAAE;YACV,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YACtB,cAAc,CAAC,KAAK,CAAC,CAAC;QACxB,CAAC;KACF,CAAC,CAAC,CAAC;IAEJ,SAAS,CAAC,GAAG,EAAE;QACb,cAAc,CAAC,OAAO,CAAC,CAAC;IAC1B,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IAEd,MAAM,SAAS,GAAG,UAAU,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;IAErD,MAAM,UAAU,GAAG,CACjB,oBAAC,IAAI,IAAC,SAAS,EAAE,SAAS;QACxB,oBAAC,IAAI,OAAG;QACR,oBAAC,aAAa,IACZ,EAAE,EAAE,WAAW,EACf,OAAO,EAAE,GAAG,EACZ,UAAU,EAAC,OAAO,EAClB,aAAa;YAEb,oBAAC,IAAI,IAAC,SAAS,EAAC,mBAAmB;gBACjC,oBAAC,IAAI,IAAC,SAAS,EAAC,0BAA0B,IAAE,MAAM,CAAQ;gBAC1D,oBAAC,IAAI,IAAC,SAAS,EAAC,2BAA2B,IAAE,OAAO,CAAQ;gBAC5D,oBAAC,IAAI,IAAC,SAAS,EAAC,0BAA0B,IAAE,MAAM,CAAQ,CACrD,CACO,CACX,CACR,CAAC;IAEF,OAAO,QAAQ,CAAC,YAAY,CAAC,UAAU,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;AAC1D,CAAC,CAAC,CAAC;AAEH,eAAe,SAAS,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/DialogComponent/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAEZ,QAAQ,EACR,mBAAmB,EACnB,UAAU,EACV,SAAS,GACV,MAAM,OAAO,CAAC;AACf,OAAO,QAAQ,MAAM,WAAW,CAAC;AACjC,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAEvD,OAAO,IAAI,MAAM,SAAS,CAAC;AAC3B,OAAO,cAAc,CAAC;AAYtB,MAAM,SAAS,GAAG,UAAU,CAAyB,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;IACtE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,GAAG,EAAE,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IACnE,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAEtD,mBAAmB,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;QAClC,KAAK,EAAE,GAAG,EAAE;YACV,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YACtB,cAAc,CAAC,KAAK,CAAC,CAAC;QACxB,CAAC;KACF,CAAC,CAAC,CAAC;IAEJ,SAAS,CAAC,GAAG,EAAE;QACb,cAAc,CAAC,OAAO,CAAC,CAAC;IAC1B,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IAEd,MAAM,SAAS,GAAG,UAAU,CAAC,WAAW,EAAE,SAAS,EAAE;QACnD,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,IAAI;KACxC,CAAC,CAAC;IACH,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACpB,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAErB,MAAM,aAAa,GAAG,UAAU,CAAC,2BAA2B,EAAE;QAC5D,QAAQ,EAAE,CAAC,MAAM;KAClB,CAAC,CAAC;IACH,MAAM,UAAU,GAAG,CACjB,oBAAC,IAAI,IAAC,SAAS,EAAE,SAAS;QACxB,oBAAC,IAAI,OAAG;QACR,oBAAC,aAAa,IACZ,EAAE,EAAE,WAAW,EACf,OAAO,EAAE,GAAG,EACZ,UAAU,EAAC,OAAO,EAClB,aAAa;YAEb,oBAAC,IAAI,IAAC,SAAS,EAAC,mBAAmB;gBACjC,oBAAC,IAAI,IAAC,SAAS,EAAC,0BAA0B,IAAE,MAAM,CAAQ;gBAC1D,oBAAC,IAAI,IAAC,SAAS,EAAE,aAAa,IAAG,OAAO,CAAQ;gBAChD,oBAAC,IAAI,IAAC,SAAS,EAAC,0BAA0B,IAAE,MAAM,CAAQ,CACrD,CACO,CACX,CACR,CAAC;IAEF,OAAO,QAAQ,CAAC,YAAY,CAAC,UAAU,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;AAC1D,CAAC,CAAC,CAAC;AAEH,eAAe,SAAS,CAAC"}

package/lib/components/DialogRef/index.js

@@ -1,4 +1,4 @@
-import React, { useState, useImperativeHandle, forwardRef, useEffect, } from "react";
+import React, { useState, useImperativeHandle, forwardRef, useEffect, useMemo, } from "react";
 import classNames from "classnames";
 import { View } from "@tarojs/components";
 import { CSSTransition } from "react-transition-group";
@@ -36,20 +36,28 @@ const DialogCom = forwardRef((props, fromRef) => {
     const dialogcls = classNames("xh-dialog-ref", className, {
         show: selfVisible,
     });
-    const comfirmCls = classNames("xh-dialog-ref-content-footer-button-button");
-    const footercls = classNames("xh-dialog-ref-content-footer-button", {
-        "xh-dialog-ref-content-footer-button-center": !showCancel,
+    const footercls = classNames("xh-dialog-ref-content-footer-buttons", {
+        microApp: process.env.TARO_ENV !== "h5",
     });
-    const dialogFooter = (React.createElement(View, { className: footercls },
-        showCancel && (React.createElement(Button, { type: "ghost", shape: "rectangle", preventTime: 0, onClick: handleCancel, className: "xh-dialog-ref-content-footer-button-button" }, cancelText)),
-        React.createElement(Button, { type: "ghost", shape: "rectangle", className: comfirmCls, onClick: handleConfirm, preventTime: 0 }, confirmText)));
+    const dialogFooterMicroApp = (React.createElement(View, { className: footercls },
+        showCancel && (React.createElement(Button, { type: "ghost", shape: "rectangle", preventTime: 0, onClick: handleCancel, className: "xh-dialog-ref-content-footer-buttons-microapp-cancel" }, cancelText)),
+        React.createElement(Button, { type: "ghost", shape: "rectangle", className: "xh-dialog-ref-content-footer-buttons-microapp-confirm", onClick: handleConfirm, preventTime: 0 }, confirmText)));
+    const dialogFooterH5 = (React.createElement(View, { className: footercls },
+        showCancel && (React.createElement(Button, { preventTime: 0, onClick: handleCancel, className: "xh-dialog-ref-content-footer-buttons-h5-cancel" }, cancelText)),
+        React.createElement(Button, { type: "primary", className: "xh-dialog-ref-content-footer-buttons-h5-confirm", onClick: handleConfirm, preventTime: 0 }, confirmText)));
+    const footerRender = useMemo(() => {
+        if (process.env.TARO_ENV === "h5") {
+            return dialogFooterH5;
+        }
+        return dialogFooterMicroApp;
+    }, []);
     const DialogMain = (React.createElement(View, { className: dialogcls },
         React.createElement(Mask, null),
         React.createElement(CSSTransition, { in: selfVisible, timeout: 200, classNames: "scale" },
             React.createElement(View, { className: "xh-dialog-ref-content" },
                 React.createElement(View, { className: "xh-dialog-ref-content-header" }, header),
                 React.createElement(View, { className: "xh-dialog-ref-content-content" }, content),
-                footer || (React.createElement(View, { className: "xh-dialog-ref-content-footer" }, dialogFooter))))));
+                footer || (React.createElement(View, { className: "xh-dialog-ref-content-footer" }, footerRender))))));
     return DialogMain;
 });
 export default DialogCom;

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/DialogRef/index.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/DialogRef/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAEZ,QAAQ,EACR,mBAAmB,EACnB,UAAU,EACV,SAAS,EACT,OAAO,GACR,MAAM,OAAO,CAAC;AACf,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,MAAM,MAAM,WAAW,CAAC;AAE/B,OAAO,IAAI,MAAM,SAAS,CAAC;AAC3B,OAAO,cAAc,CAAC;AAmBtB,MAAM,SAAS,GAAG,UAAU,CAA0B,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;IACvE,MAAM,EACJ,MAAM,EACN,OAAO,EACP,SAAS,GAAG,EAAE,EACd,OAAO,EACP,UAAU,GAAG,IAAI,EACjB,WAAW,GAAG,IAAI,EAClB,UAAU,GAAG,IAAI,EACjB,MAAM,GAAG,KAAK,EACd,SAAS,EACT,QAAQ,EACR,OAAO,GACR,GAAG,KAAK,CAAC;IACV,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAEtD,mBAAmB,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;QAClC,KAAK;QACL,IAAI;KACL,CAAC,CAAC,CAAC;IAEJ,MAAM,KAAK,GAAG,GAAG,EAAE;QACjB,OAAO,IAAI,OAAO,EAAE,CAAC;QACrB,cAAc,CAAC,KAAK,CAAC,CAAC;IACxB,CAAC,CAAC;IAEF,MAAM,IAAI,GAAG,GAAG,EAAE;QAChB,cAAc,CAAC,IAAI,CAAC,CAAC;IACvB,CAAC,CAAC;IAEF,MAAM,aAAa,GAAG,GAAG,EAAE;QACzB,SAAS,IAAI,SAAS,EAAE,CAAC;QACzB,WAAW;IACb,CAAC,CAAC;IACF,MAAM,YAAY,GAAG,GAAG,EAAE;QACxB,QAAQ,IAAI,QAAQ,EAAE,CAAC;QACvB,KAAK,EAAE,CAAC;IACV,CAAC,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO,IAAI,OAAO,EAAE,CAAC;SACtB;QACD,cAAc,CAAC,OAAO,CAAC,CAAC;IAC1B,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IAEd,MAAM,SAAS,GAAG,UAAU,CAAC,eAAe,EAAE,SAAS,EAAE;QACvD,IAAI,EAAE,WAAW;KAClB,CAAC,CAAC;IACH,MAAM,SAAS,GAAG,UAAU,CAAC,sCAAsC,EAAE;QACnE,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,IAAI;KACxC,CAAC,CAAC;IACH,MAAM,oBAAoB,GAAG,CAC3B,oBAAC,IAAI,IAAC,SAAS,EAAE,SAAS;QACvB,UAAU,IAAI,CACb,oBAAC,MAAM,IACL,IAAI,EAAC,OAAO,EACZ,KAAK,EAAC,WAAW,EACjB,WAAW,EAAE,CAAC,EACd,OAAO,EAAE,YAAY,EACrB,SAAS,EAAC,sDAAsD,IAE/D,UAAU,CACJ,CACV;QACD,oBAAC,MAAM,IACL,IAAI,EAAC,OAAO,EACZ,KAAK,EAAC,WAAW,EACjB,SAAS,EAAC,uDAAuD,EACjE,OAAO,EAAE,aAAa,EACtB,WAAW,EAAE,CAAC,IAEb,WAAW,CACL,CACJ,CACR,CAAC;IAEF,MAAM,cAAc,GAAG,CACrB,oBAAC,IAAI,IAAC,SAAS,EAAE,SAAS;QACvB,UAAU,IAAI,CACb,oBAAC,MAAM,IACL,WAAW,EAAE,CAAC,EACd,OAAO,EAAE,YAAY,EACrB,SAAS,EAAC,gDAAgD,IAEzD,UAAU,CACJ,CACV;QACD,oBAAC,MAAM,IACL,IAAI,EAAC,SAAS,EACd,SAAS,EAAC,iDAAiD,EAC3D,OAAO,EAAE,aAAa,EACtB,WAAW,EAAE,CAAC,IAEb,WAAW,CACL,CACJ,CACR,CAAC;IAEF,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,EAAE;QAChC,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,IAAI,EAAE;YACjC,OAAO,cAAc,CAAC;SACvB;QACD,OAAO,oBAAoB,CAAC;IAC9B,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,UAAU,GAAG,CACjB,oBAAC,IAAI,IAAC,SAAS,EAAE,SAAS;QACxB,oBAAC,IAAI,OAAG;QACR,oBAAC,aAAa,IAAC,EAAE,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,EAAE,UAAU,EAAC,OAAO;YAC9D,oBAAC,IAAI,IAAC,SAAS,EAAC,uBAAuB;gBACrC,oBAAC,IAAI,IAAC,SAAS,EAAC,8BAA8B,IAAE,MAAM,CAAQ;gBAC9D,oBAAC,IAAI,IAAC,SAAS,EAAC,+BAA+B,IAAE,OAAO,CAAQ;gBAC/D,MAAM,IAAI,CACT,oBAAC,IAAI,IAAC,SAAS,EAAC,8BAA8B,IAAE,YAAY,CAAQ,CACrE,CACI,CACO,CACX,CACR,CAAC;IACF,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC,CAAC;AAEH,eAAe,SAAS,CAAC"}

package/lib/components/Image/index.js

@@ -1,9 +1,21 @@
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 import React, { useEffect, useMemo, useState } from "react";
 import { Image } from "@tarojs/components";
 import { getImageInfo } from "@tarojs/taro";
+import { pxTransform } from "../../utils/index";
 import "./index.scss";
 const XHImage = props => {
-    const { width = "", height = "", src, className } = props;
+    const { width = 0, height = 0, src, className } = props, rest = __rest(props, ["width", "height", "src", "className"]);
     const [defaultSize, setDefaultSize] = useState({});
     useEffect(() => {
         if (process.env.TARO_ENV !== "h5" && !className) {
@@ -17,21 +29,18 @@ const XHImage = props => {
                 },
             });
         }
-        else {
-        }
     }, []);
     const size = useMemo(() => {
         let computedSize = defaultSize || {};
         if (width) {
-            computedSize.width = `${width}`;
+            computedSize.width = `${pxTransform(width)}`;
         }
         if (height) {
-            computedSize.height = `${height}`;
+            computedSize.height = `${pxTransform(height)}`;
         }
-        console.log("size");
         return computedSize;
     }, [width, height, defaultSize]);
-    return process.env.TARO_ENV !== "h5" ? (React.createElement(Image, { src: src, style: size, className: className })) : (React.createElement("img", { src: src, alt: "", style: size, className: className }));
+    return process.env.TARO_ENV !== "h5" ? (React.createElement(Image, { src: src, style: size, className: className })) : (React.createElement("img", Object.assign({ src: src, style: size, className: className }, rest)));
 };
 export default XHImage;
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/Image/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAM,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAChE,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,cAAc,CAAC;AAStB,MAAM,OAAO,GAAmB,KAAK,CAAC,EAAE;IACtC,MAAM,EAAE,KAAK,GAAG,EAAE,EAAE,MAAM,GAAG,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IAC1D,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,QAAQ,CAGpC,EAAE,CAAC,CAAC;IAEd,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,IAAI,IAAI,CAAC,SAAS,EAAE;YAC/C,YAAY,CAAC;gBACX,GAAG;gBACH,OAAO,EAAE,GAAG,CAAC,EAAE;oBACb,IAAI,GAAG,CAAC,MAAM,KAAK,iBAAiB,EAAE;wBACpC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;wBACjB,cAAc,CAAC,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC;qBAC1D;gBACH,CAAC;aACF,CAAC,CAAC;SACJ;aAAM;SACN;IACH,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,EAAE;QACxB,IAAI,YAAY,GAAG,WAAW,IAAI,EAAE,CAAC;QACrC,IAAI,KAAK,EAAE;YACR,YAAoB,CAAC,KAAK,GAAG,GAAG,KAAK,EAAE,CAAC;SAC1C;QACD,IAAI,MAAM,EAAE;YACT,YAAoB,CAAC,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC;SAC5C;QACD,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAEpB,OAAO,YAAY,CAAC;IACtB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC;IAEjC,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,CACrC,oBAAC,KAAK,IAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,GAAI,CACvD,CAAC,CAAC,CAAC,CACF,6BAAK,GAAG,EAAE,GAAG,EAAE,GAAG,EAAC,EAAE,EAAC,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,GAAI,CAC5D,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,OAAO,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/Image/index.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAK,EAAE,EAAM,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAChE,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,cAAc,CAAC;AAUtB,MAAM,OAAO,GAAmB,KAAK,CAAC,EAAE;IACtC,MAAM,EAAE,KAAK,GAAG,CAAC,EAAE,MAAM,GAAG,CAAC,EAAE,GAAG,EAAE,SAAS,KAAc,KAAK,EAAd,IAAI,UAAK,KAAK,EAA1D,uCAAkD,CAAQ,CAAC;IACjE,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,QAAQ,CAG3C,EAAE,CAAC,CAAC;IAEP,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,IAAI,IAAI,CAAC,SAAS,EAAE;YAC/C,YAAY,CAAC;gBACX,GAAG;gBACH,OAAO,EAAE,GAAG,CAAC,EAAE;oBACb,IAAI,GAAG,CAAC,MAAM,KAAK,iBAAiB,EAAE;wBACpC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;wBACjB,cAAc,CAAC,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC;qBAC1D;gBACH,CAAC;aACF,CAAC,CAAC;SACJ;IACH,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,EAAE;QACxB,IAAI,YAAY,GACd,WAAW,IAAI,EAAE,CAAC;QACpB,IAAI,KAAK,EAAE;YACT,YAAY,CAAC,KAAK,GAAG,GAAG,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC;SAC9C;QACD,IAAI,MAAM,EAAE;YACV,YAAY,CAAC,MAAM,GAAG,GAAG,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC;SAChD;QAED,OAAO,YAAY,CAAC;IACtB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC;IAEjC,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,CACrC,oBAAC,KAAK,IAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,GAAI,CACvD,CAAC,CAAC,CAAC,CACF,2CAAK,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,IAAM,IAAI,EAAI,CAC/D,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,OAAO,CAAC"}

package/lib/components/Toast/Toast.js

@@ -6,8 +6,8 @@ import { CSSTransition } from "react-transition-group";
 import Mask from "../Mask";
 import Image from "../Image";
 import "./index.scss";
-const ToastCom = (props) => {
-    const { title, className = "", icon = "success", image = "" } = props;
+const ToastCom = props => {
+    const { title, className = "", icon = "none", image = "" } = props;
     const toastcls = classNames("xh-toast", className);
     // icon-success_toast
     // icon-alert_toast
@@ -17,6 +17,7 @@ const ToastCom = (props) => {
         success: "icon-success_toast",
         error: "icon-failure_toast",
         loading: "icon-loading_toast",
+        none: "",
     };
     const cls = classNames("iconfont", classConfig[icon]);
     const showIcon = useMemo(() => {

package/lib/components/Toast/Toast.js.map

@@ -1 +1 @@
-{"version":3,"file":"Toast.js","sourceRoot":"","sources":["../../../src/components/Toast/Toast.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAM,OAAO,EAAE,MAAM,OAAO,CAAC;AAC3C,OAAO,QAAQ,MAAM,WAAW,CAAC;AACjC,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAEvD,OAAO,IAAI,MAAM,SAAS,CAAC;AAC3B,OAAO,KAAK,MAAM,UAAU,CAAC;AAE7B,OAAO,cAAc,CAAC;AAkBtB,MAAM,QAAQ,GAAmB,CAAC,KAAK,EAAE,EAAE;IACzC,MAAM,EAAE,KAAK,EAAE,SAAS,GAAG,EAAE,EAAE,IAAI,GAAG,SAAS,EAAE,KAAK,GAAG,EAAE,EAAE,GAAG,KAAK,CAAC;IAEtE,MAAM,QAAQ,GAAG,UAAU,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;IAEnD,qBAAqB;IACrB,mBAAmB;IACnB,qBAAqB;IACrB,qBAAqB;IAErB,MAAM,WAAW,GAAG;QAClB,OAAO,EAAE,oBAAoB;QAC7B,KAAK,EAAE,oBAAoB;QAC3B,OAAO,EAAE,oBAAoB;KAC9B,CAAC;IACF,MAAM,GAAG,GAAG,UAAU,CAAC,UAAU,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;IACtD,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,EAAE;QAC5B,IAAI,KAAK;YAAE,OAAO,oBAAC,KAAK,IAAC,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,GAAI,CAAC;QAC/D,IAAI,IAAI;YAAE,OAAO,8BAAM,SAAS,EAAE,GAAG,GAAS,CAAC;IACjD,CAAC,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;IAElB,MAAM,UAAU,GAAG,CACjB,oBAAC,IAAI,IAAC,SAAS,EAAE,QAAQ;QACvB,oBAAC,IAAI,IAAC,IAAI,EAAC,aAAa,GAAG;QAC3B,oBAAC,aAAa,IAAC,EAAE,QAAC,OAAO,EAAE,GAAG,EAAE,UAAU,EAAC,MAAM,EAAC,aAAa;YAC7D,oBAAC,IAAI,IAAC,SAAS,EAAC,kBAAkB;gBAC/B,QAAQ;gBACT,oBAAC,IAAI,QAAE,KAAK,CAAQ,CACf,CACO,CACX,CACR,CAAC;IAEF,OAAO,QAAQ,CAAC,YAAY,CAAC,UAAU,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;AAC1D,CAAC,CAAC;AAEF,eAAe,QAAQ,CAAC"}
+{"version":3,"file":"Toast.js","sourceRoot":"","sources":["../../../src/components/Toast/Toast.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAM,OAAO,EAAE,MAAM,OAAO,CAAC;AAC3C,OAAO,QAAQ,MAAM,WAAW,CAAC;AACjC,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAEvD,OAAO,IAAI,MAAM,SAAS,CAAC;AAC3B,OAAO,KAAK,MAAM,UAAU,CAAC;AAE7B,OAAO,cAAc,CAAC;AAkBtB,MAAM,QAAQ,GAAmB,KAAK,CAAC,EAAE;IACvC,MAAM,EAAE,KAAK,EAAE,SAAS,GAAG,EAAE,EAAE,IAAI,GAAG,MAAM,EAAE,KAAK,GAAG,EAAE,EAAE,GAAG,KAAK,CAAC;IAEnE,MAAM,QAAQ,GAAG,UAAU,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;IAEnD,qBAAqB;IACrB,mBAAmB;IACnB,qBAAqB;IACrB,qBAAqB;IAErB,MAAM,WAAW,GAAG;QAClB,OAAO,EAAE,oBAAoB;QAC7B,KAAK,EAAE,oBAAoB;QAC3B,OAAO,EAAE,oBAAoB;QAC7B,IAAI,EAAE,EAAE;KACT,CAAC;IACF,MAAM,GAAG,GAAG,UAAU,CAAC,UAAU,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;IACtD,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,EAAE;QAC5B,IAAI,KAAK;YAAE,OAAO,oBAAC,KAAK,IAAC,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,GAAI,CAAC;QAC/D,IAAI,IAAI;YAAE,OAAO,8BAAM,SAAS,EAAE,GAAG,GAAS,CAAC;IACjD,CAAC,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;IAElB,MAAM,UAAU,GAAG,CACjB,oBAAC,IAAI,IAAC,SAAS,EAAE,QAAQ;QACvB,oBAAC,IAAI,IAAC,IAAI,EAAC,aAAa,GAAG;QAC3B,oBAAC,aAAa,IAAC,EAAE,QAAC,OAAO,EAAE,GAAG,EAAE,UAAU,EAAC,MAAM,EAAC,aAAa;YAC7D,oBAAC,IAAI,IAAC,SAAS,EAAC,kBAAkB;gBAC/B,QAAQ;gBACT,oBAAC,IAAI,QAAE,KAAK,CAAQ,CACf,CACO,CACX,CACR,CAAC;IAEF,OAAO,QAAQ,CAAC,YAAY,CAAC,UAAU,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;AAC1D,CAAC,CAAC;AAEF,eAAe,QAAQ,CAAC"}

package/lib/utils/index.js

@@ -64,4 +64,18 @@ export const throtte = (fn, delay = 1500) => {
         }, delay);
     };
 };
+export function pxTransform(size, designWidth = 750) {
+    if (!size)
+        return "";
+    const deviceRatio = {
+        640: 2.34 / 2,
+        750: 1,
+        828: 1.81 / 2,
+    };
+    if (process.env.TARO_ENV === "h5")
+        return (Math.ceil((((parseInt(`${size}`, 10) / 40) * 640) / designWidth) * 10000) /
+            10000 +
+            "rem");
+    return `${size / deviceRatio[designWidth]}rpx`;
+}
 //# 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":"AAAA;;;;GAIG;AACH,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,GAAW,EAAU,EAAE;IAChD,IAAI,SAAS,GACX,4OAA4O,CAAC;IAC/O,OAAO,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;AACpC,CAAC,CAAC;AAEF,yBAAyB;AACzB,uBAAuB;AACvB,sBAAsB;AACtB,IAAI;AAEJ,oDAAoD;AACpD,mBAAmB;AACnB,cAAc;AACd,KAAK;AAEL,gDAAgD;AAChD,qDAAqD;AACrD,YAAY;AACZ,gBAAgB;AAChB,kBAAkB;AAClB,MAAM;AAEN,WAAW;AACX,qBAAqB;AACrB,gEAAgE;AAChE,MAAM;AACN,gBAAgB;AAChB,KAAK;AAEL,6BAA6B;AAC7B,0CAA0C;AAC1C,gBAAgB;AAChB,gDAAgD;AAChD,uBAAuB;AACvB,MAAM;AACN,8CAA8C;AAC9C,2BAA2B;AAC3B,sBAAsB;AACtB,MAAM;AACN,+BAA+B;AAC/B,kDAAkD;AAClD,qBAAqB;AACrB,sBAAsB;AACtB,QAAQ;AAER,+BAA+B;AAC/B,yDAAyD;AACzD,QAAQ;AAER,oBAAoB;AACpB,MAAM;AACN,IAAI;AAEJ,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,EAAY,EAAE,QAAgB,IAAI,EAAE,EAAE;IAC5D,IAAI,KAAmB,CAAC;IACxB,IAAI,OAAO,GAAG,IAAI,CAAC;IACnB,OAAO,UAAU,GAAG;QAClB,IAAI,OAAO,EAAE;YACX,OAAO,GAAG,KAAK,CAAC;YAChB,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACjB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YACnB,EAAE,CAAC,GAAG,CAAC,CAAC;SACT;QACD,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;YACtB,OAAO,GAAG,IAAI,CAAC;YACf,YAAY,CAAC,KAAK,CAAC,CAAC;QACtB,CAAC,EAAE,KAAK,CAAC,CAAC;IACZ,CAAC,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,GAAW,EAAU,EAAE;IAChD,IAAI,SAAS,GACX,4OAA4O,CAAC;IAC/O,OAAO,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;AACpC,CAAC,CAAC;AAEF,yBAAyB;AACzB,uBAAuB;AACvB,sBAAsB;AACtB,IAAI;AAEJ,oDAAoD;AACpD,mBAAmB;AACnB,cAAc;AACd,KAAK;AAEL,gDAAgD;AAChD,qDAAqD;AACrD,YAAY;AACZ,gBAAgB;AAChB,kBAAkB;AAClB,MAAM;AAEN,WAAW;AACX,qBAAqB;AACrB,gEAAgE;AAChE,MAAM;AACN,gBAAgB;AAChB,KAAK;AAEL,6BAA6B;AAC7B,0CAA0C;AAC1C,gBAAgB;AAChB,gDAAgD;AAChD,uBAAuB;AACvB,MAAM;AACN,8CAA8C;AAC9C,2BAA2B;AAC3B,sBAAsB;AACtB,MAAM;AACN,+BAA+B;AAC/B,kDAAkD;AAClD,qBAAqB;AACrB,sBAAsB;AACtB,QAAQ;AAER,+BAA+B;AAC/B,yDAAyD;AACzD,QAAQ;AAER,oBAAoB;AACpB,MAAM;AACN,IAAI;AAEJ,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,EAAY,EAAE,QAAgB,IAAI,EAAE,EAAE;IAC5D,IAAI,KAAmB,CAAC;IACxB,IAAI,OAAO,GAAG,IAAI,CAAC;IACnB,OAAO,UAAU,GAAG;QAClB,IAAI,OAAO,EAAE;YACX,OAAO,GAAG,KAAK,CAAC;YAChB,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACjB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YACnB,EAAE,CAAC,GAAG,CAAC,CAAC;SACT;QACD,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;YACtB,OAAO,GAAG,IAAI,CAAC;YACf,YAAY,CAAC,KAAK,CAAC,CAAC;QACtB,CAAC,EAAE,KAAK,CAAC,CAAC;IACZ,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,UAAU,WAAW,CAAC,IAAY,EAAE,WAAW,GAAG,GAAG;IACzD,IAAI,CAAC,IAAI;QAAE,OAAO,EAAE,CAAC;IACrB,MAAM,WAAW,GAAG;QAClB,GAAG,EAAE,IAAI,GAAG,CAAC;QACb,GAAG,EAAE,CAAC;QACN,GAAG,EAAE,IAAI,GAAG,CAAC;KACd,CAAC;IACF,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,IAAI;QAC/B,OAAO,CACL,IAAI,CAAC,IAAI,CACP,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,IAAI,EAAE,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,GAAG,GAAG,CAAC,GAAG,WAAW,CAAC,GAAG,KAAK,CAC/D;YACC,KAAK;YACP,KAAK,CACN,CAAC;IACJ,OAAO,GAAG,IAAI,GAAG,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC;AACjD,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "taro-react-uilib",
-  "version": "1.0.27",
+  "version": "1.0.29",
   "description": "基于taro的跨端组件库",
   "templateInfo": {
     "name": "default",
@@ -37,6 +37,7 @@
     "test:ci": "yarn run build:h5 && yarn run test",
     "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0 && git add CHANGELOG.md",
     "clean": "rimraf .temp dist lib coverage",
+    "version": "yarn run build && yarn run changelog",
     "prepare": "husky install"
   },
   "husky": {

package/types/components/Dialog/Alert/index.d.ts

@@ -1,5 +1,4 @@
 import { ReactNode } from "react";
-import "./index.scss";
 export declare type AlertProps = {
     title?: string | ReactNode;
     content?: string | ReactNode;

package/types/components/Dialog/Confirm/index.d.ts

@@ -1,4 +1,3 @@
-import "./index.scss";
 export declare type ConfirmProps = {
     title?: string;
     header?: string;

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

@@ -5,6 +5,7 @@ export declare type ImageProps = {
     width?: number;
     height?: number;
     src: string;
+    alt?: string;
 } & XHComponentCommonProps;
 declare const XHImage: FC<ImageProps>;
 export default XHImage;

package/types/utils/index.d.ts

@@ -5,3 +5,4 @@
  */
 export declare const inputRange: (val: string) => string;
 export declare const throtte: (fn: Function, delay?: number) => (arg: any) => void;
+export declare function pxTransform(size: number, designWidth?: number): string;

package/dist/styles/components/alert.scss

@@ -1,9 +0,0 @@
-.xh-alert-button {
-  color: #f6ab00;
-  font-size: 32px;
-  font-weight: 800;
-  border-top: 2px solid #f8f8f8;
-  border-bottom-left-radius: 10px;
-  border-bottom-right-radius: 10px;
-  padding: 18px 0;
-}

package/dist/styles/components/confirm.scss

@@ -1,20 +0,0 @@
-.xh-confirm-footer {
-  display: flex;
-  justify-content: space-between;
-  border-top: 2px solid #f8f8f8;
-  &-button {
-    flex: 1;
-    font-size: 32px;
-    font-weight: 800;
-    padding: 18px 0;
-  }
-  &-cancel-button {
-    color: #000;
-    border-right: 2px solid #f8f8f8;
-    border-bottom-left-radius: 10px;
-  }
-  &-confirm-button {
-    color: #f6ab00;
-    border-bottom-right-radius: 10px;
-  }
-}