taro-react-uilib 1.0.26 → 1.0.28

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (37) hide show
  1. package/dist/components/Dialog/Alert/index.js +1 -1
  2. package/dist/components/Dialog/Alert/index.js.map +1 -1
  3. package/dist/components/Dialog/Confirm/index.js +1 -1
  4. package/dist/components/Dialog/Confirm/index.js.map +1 -1
  5. package/dist/components/DialogComponent/index.js +1 -1
  6. package/dist/components/DialogComponent/index.js.map +1 -1
  7. package/dist/components/DialogRef/index.js +1 -1
  8. package/dist/components/DialogRef/index.js.map +1 -1
  9. package/dist/components/Image/index.js +1 -1
  10. package/dist/components/Image/index.js.map +1 -1
  11. package/dist/components/Toast/Toast.js +1 -1
  12. package/dist/components/Toast/Toast.js.map +1 -1
  13. package/dist/index.js +2 -2
  14. package/dist/index.js.map +1 -1
  15. package/dist/index.umd.js +2 -2
  16. package/dist/index.umd.js.map +1 -1
  17. package/dist/styles/components/dialog.scss +13 -15
  18. package/dist/styles/components/dialogref.scss +19 -24
  19. package/dist/styles/components/index.scss +0 -2
  20. package/dist/styles/components/toast.scss +9 -13
  21. package/lib/components/Dialog/Alert/index.js +1 -2
  22. package/lib/components/Dialog/Alert/index.js.map +1 -1
  23. package/lib/components/Dialog/Confirm/index.js +3 -5
  24. package/lib/components/Dialog/Confirm/index.js.map +1 -1
  25. package/lib/components/DialogComponent/index.js +9 -2
  26. package/lib/components/DialogComponent/index.js.map +1 -1
  27. package/lib/components/DialogRef/index.js +16 -8
  28. package/lib/components/DialogRef/index.js.map +1 -1
  29. package/lib/components/Image/index.js +3 -3
  30. package/lib/components/Image/index.js.map +1 -1
  31. package/lib/components/Toast/Toast.js +3 -2
  32. package/lib/components/Toast/Toast.js.map +1 -1
  33. package/package.json +1 -1
  34. package/types/components/Dialog/Alert/index.d.ts +0 -1
  35. package/types/components/Dialog/Confirm/index.d.ts +0 -1
  36. package/dist/styles/components/alert.scss +0 -9
  37. package/dist/styles/components/confirm.scss +0 -20
@@ -30,42 +30,40 @@
30
30
  padding: 0 60px;
31
31
  }
32
32
  &-content {
33
- margin: 66px auto 0;
34
- font-size: 34px;
33
+ margin: 40px auto 0;
34
+ font-size: 30px;
35
35
  font-family: PingFang SC;
36
36
  color: #999;
37
37
  padding: 0 60px;
38
+ &.headless {
39
+ color: #333;
40
+ font-size: 34px;
41
+ }
38
42
  }
39
43
  &-footer {
40
44
  margin-top: 60px;
41
45
  .xh-alert-button {
42
- color: #f6ab00;
43
46
  font-size: 32px;
44
47
  font-weight: 800;
45
- border-top: 2px solid #f8f8f8;
46
- border-bottom-left-radius: 10px;
47
- border-bottom-right-radius: 10px;
48
- padding: 18px 0;
48
+ margin-bottom: 60px;
49
+ width: 300px;
50
+ height: 90px;
49
51
  }
50
52
 
51
53
  .xh-confirm-footer {
52
54
  display: flex;
53
55
  justify-content: space-between;
54
- border-top: 2px solid #f8f8f8;
56
+ padding: 0 40px 50px;
55
57
  &-button {
56
58
  flex: 1;
57
59
  font-size: 32px;
58
60
  font-weight: 800;
59
- padding: 18px 0;
61
+ padding: 8px 0;
60
62
  }
61
63
  &-cancel-button {
62
64
  color: #000;
63
- border-right: 2px solid #f8f8f8;
64
- border-bottom-left-radius: 10px;
65
- }
66
- &-confirm-button {
67
- color: #f6ab00;
68
- border-bottom-right-radius: 10px;
65
+ margin-right: 40px;
66
+ color: #999999;
69
67
  }
70
68
  }
71
69
  }
@@ -16,7 +16,6 @@
16
16
  z-index: 999;
17
17
  &.show {
18
18
  visibility: visible;
19
-
20
19
  .xh-dialog-ref-content {
21
20
  animation: scaleDialog 0.3s;
22
21
  }
@@ -44,35 +43,31 @@
44
43
  font-size: 34px;
45
44
  font-family: PingFang SC;
46
45
  color: #999;
46
+ text-align: left;
47
47
  }
48
48
  &-footer {
49
49
  // margin-top: 60px;
50
- border-top: 2px solid #f8f8f8;
51
- .xh-dialog-ref-content-footer-button {
50
+ .xh-dialog-ref-content-footer-buttons {
52
51
  display: flex;
53
- width: 100%;
54
- &-button {
55
- padding: 18px 0;
56
- flex: 1;
57
- font-size: 32px;
58
- font-weight: 800;
59
- border: 0;
52
+ padding: 0 40px 60px;
53
+ &.microApp {
54
+ border-top: 2px solid #f8f8f8;
55
+ padding: 0;
56
+ }
57
+ &-microapp-cancel {
58
+ color: #999999;
60
59
  border-bottom-left-radius: 10px;
61
60
  border-right: 2px solid #f8f8f8;
62
- color: #000;
63
- position: relative;
64
- outline: 0;
65
- box-sizing: border-box;
66
- overflow: hidden;
67
- text-overflow: ellipsis;
68
- white-space: nowrap;
69
- line-height: 2.55555556;
70
- background-color: #fff;
71
- &:last-child {
72
- color: #f6ab00;
73
- border-bottom-right-radius: 10px;
74
- border-right: 0;
75
- }
61
+ padding: 10px 0;
62
+ }
63
+ &-microapp-confirm {
64
+ color: #f6ab00;
65
+ border-bottom-right-radius: 10px;
66
+ padding: 10px 0;
67
+ }
68
+ &-h5-cancel {
69
+ margin-right: 40px;
70
+ color: #999999;
76
71
  }
77
72
  }
78
73
  }
@@ -1,9 +1,7 @@
1
- @import './alert.scss';
2
1
  @import './animated.scss';
3
2
  @import './bankicon.scss';
4
3
  @import './button.scss';
5
4
  @import './captcha.scss';
6
- @import './confirm.scss';
7
5
  @import './dialog.scss';
8
6
  @import './dialogref.scss';
9
7
  @import './fade.scss';
@@ -1,12 +1,11 @@
1
- @import '../../styles/themes/variable.scss';
2
- @import '../../styles/themes/default.scss';
3
-
1
+ @import "../../styles/themes/variable.scss";
2
+ @import "../../styles/themes/default.scss";
4
3
 
5
4
  @font-face {
6
- font-family: 'iconfont';
7
- src: url('./font/iconfont.ttf?t=1656570936378') format('woff2'),
8
- url('./font/iconfont.woff?t=1656570936378') format('woff'),
9
- url('./font/iconfont.woff2?t=1656570936378') format('truetype');
5
+ font-family: "iconfont";
6
+ src: url("./font/iconfont.ttf?t=1656570936378") format("woff2"),
7
+ url("./font/iconfont.woff?t=1656570936378") format("woff"),
8
+ url("./font/iconfont.woff2?t=1656570936378") format("truetype");
10
9
  }
11
10
 
12
11
  .iconfont {
@@ -31,10 +30,10 @@
31
30
 
32
31
  @keyframes rotate {
33
32
  from {
34
- transform: rotate(0deg)
33
+ transform: rotate(0deg);
35
34
  }
36
35
  to {
37
- transform: rotate(180deg)
36
+ transform: rotate(180deg);
38
37
  }
39
38
  }
40
39
 
@@ -45,8 +44,6 @@
45
44
  content: "\e676";
46
45
  }
47
46
 
48
-
49
-
50
47
  #{$xh-prefix}-toast {
51
48
  position: fixed;
52
49
  top: 0;
@@ -64,13 +61,12 @@
64
61
  box-sizing: border-box;
65
62
  border-radius: 10px;
66
63
  text-align: center;
67
- padding: 24px 0;
64
+ padding: 24px;
68
65
  background-color: var(--toast-bg-color);
69
66
  color: var(--dialog-color);
70
67
  }
71
68
  }
72
69
 
73
-
74
70
  .xh-confirm-footer {
75
71
  display: flex;
76
72
  justify-content: space-between;
@@ -14,14 +14,13 @@ import ReactDOM from "react-dom";
14
14
  import { showModal } from "@tarojs/taro";
15
15
  import Dialog from "../../DialogComponent";
16
16
  import Button from "../../../../src/components/Button";
17
- import "./index.scss";
18
17
  const Alert = (props) => {
19
18
  const { title = "", content, confirmText = "我知道了" } = props, rest = __rest(props, ["title", "content", "confirmText"]);
20
19
  return new Promise(resolve => {
21
20
  if (process.env.TARO_ENV === "h5") {
22
21
  const div = document.createElement("div");
23
22
  const dialogRef = createRef();
24
- const alertFooter = (React.createElement(Button, { className: "xh-alert-button", shape: "rectangle", type: "ghost", size: "full", onClick: () => {
23
+ const alertFooter = (React.createElement(Button, { className: "xh-alert-button", type: "primary", onClick: () => {
25
24
  ReactDOM.unmountComponentAtNode(div);
26
25
  resolve();
27
26
  } }, confirmText));
@@ -1 +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"}
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;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"}
@@ -14,7 +14,6 @@ import ReactDOM from "react-dom";
14
14
  import { showModal } from "@tarojs/taro";
15
15
  import DialogComponent from "../../DialogComponent";
16
16
  import Button from "../../Button";
17
- import "./index.scss";
18
17
  const Comfirm = (props) => {
19
18
  const { title = "", content, confirmText = "确定", cancelText = "取消" } = props, rest = __rest(props, ["title", "content", "confirmText", "cancelText"]);
20
19
  return new Promise(resolve => {
@@ -22,11 +21,11 @@ const Comfirm = (props) => {
22
21
  const div = document.createElement("div");
23
22
  const dialogRef = createRef();
24
23
  const alertFooter = (React.createElement("div", { className: "xh-confirm-footer" },
25
- React.createElement(Button, { shape: "rectangle", type: "ghost", className: "xh-confirm-footer-button xh-confirm-footer-cancel-button", onClick: () => {
24
+ React.createElement(Button, { className: "xh-confirm-footer-button xh-confirm-footer-cancel-button", onClick: () => {
26
25
  ReactDOM.unmountComponentAtNode(div);
27
26
  resolve({ errMsg: "ok", confirm: false, cancel: true });
28
27
  } }, cancelText),
29
- React.createElement(Button, { shape: "rectangle", type: "ghost", className: "xh-confirm-footer-button xh-confirm-footer-confirm-button", onClick: () => {
28
+ React.createElement(Button, { type: "primary", className: "xh-confirm-footer-button xh-confirm-footer-confirm-button", onClick: () => {
30
29
  ReactDOM.unmountComponentAtNode(div);
31
30
  resolve({ errMsg: "ok", confirm: true, cancel: false });
32
31
  } }, confirmText)));
@@ -34,8 +33,7 @@ const Comfirm = (props) => {
34
33
  }
35
34
  else {
36
35
  showModal(Object.assign({ title,
37
- content, confirmColor: "#f6ab00", cancelText,
38
- confirmText }, rest)).then(resolve);
36
+ content, confirmColor: "#f6ab00", cancelText, cancelColor: "#666", confirmText }, rest)).then(resolve);
39
37
  }
40
38
  });
41
39
  };
@@ -1 +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;gBACV,WAAW,IACR,IAAI,EACP,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SAClB;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,eAAe,OAAO,CAAC"}
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;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"}
@@ -17,13 +17,20 @@ const DialogCom = forwardRef((props, fromRef) => {
17
17
  useEffect(() => {
18
18
  setSelfVisible(visible);
19
19
  }, [visible]);
20
- const dialogcls = classNames("xh-dialog", className);
20
+ const dialogcls = classNames("xh-dialog", className, {
21
+ microApp: process.env.TARO_ENV !== "h5",
22
+ });
23
+ console.log(header);
24
+ console.log("title");
25
+ const dialogContent = classNames("xh-dialog-content-content", {
26
+ headless: !header,
27
+ });
21
28
  const DialogMain = (React.createElement(View, { className: dialogcls },
22
29
  React.createElement(Mask, null),
23
30
  React.createElement(CSSTransition, { in: selfVisible, timeout: 200, classNames: "scale", unmountOnExit: true },
24
31
  React.createElement(View, { className: "xh-dialog-content" },
25
32
  React.createElement(View, { className: "xh-dialog-content-header" }, header),
26
- React.createElement(View, { className: "xh-dialog-content-content" }, content),
33
+ React.createElement(View, { className: dialogContent }, content),
27
34
  React.createElement(View, { className: "xh-dialog-content-footer" }, footer)))));
28
35
  return ReactDOM.createPortal(DialogMain, document.body);
29
36
  });
@@ -1 +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"}
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,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"}
@@ -1,4 +1,4 @@
1
- import React, { useState, useImperativeHandle, forwardRef, useEffect, } from "react";
1
+ import React, { useState, useImperativeHandle, forwardRef, useEffect, useMemo, } from "react";
2
2
  import classNames from "classnames";
3
3
  import { View } from "@tarojs/components";
4
4
  import { CSSTransition } from "react-transition-group";
@@ -36,20 +36,28 @@ const DialogCom = forwardRef((props, fromRef) => {
36
36
  const dialogcls = classNames("xh-dialog-ref", className, {
37
37
  show: selfVisible,
38
38
  });
39
- const comfirmCls = classNames("xh-dialog-ref-content-footer-button-button");
40
- const footercls = classNames("xh-dialog-ref-content-footer-button", {
41
- "xh-dialog-ref-content-footer-button-center": !showCancel,
39
+ const footercls = classNames("xh-dialog-ref-content-footer-buttons", {
40
+ microApp: process.env.TARO_ENV !== "h5",
42
41
  });
43
- const dialogFooter = (React.createElement(View, { className: footercls },
44
- showCancel && (React.createElement(Button, { type: "ghost", shape: "rectangle", preventTime: 0, onClick: handleCancel, className: "xh-dialog-ref-content-footer-button-button" }, cancelText)),
45
- React.createElement(Button, { type: "ghost", shape: "rectangle", className: comfirmCls, onClick: handleConfirm, preventTime: 0 }, confirmText)));
42
+ const dialogFooterMicroApp = (React.createElement(View, { className: footercls },
43
+ showCancel && (React.createElement(Button, { type: "ghost", shape: "rectangle", preventTime: 0, onClick: handleCancel, className: "xh-dialog-ref-content-footer-buttons-microapp-cancel" }, cancelText)),
44
+ React.createElement(Button, { type: "ghost", shape: "rectangle", className: "xh-dialog-ref-content-footer-buttons-microapp-confirm", onClick: handleConfirm, preventTime: 0 }, confirmText)));
45
+ const dialogFooterH5 = (React.createElement(View, { className: footercls },
46
+ showCancel && (React.createElement(Button, { preventTime: 0, onClick: handleCancel, className: "xh-dialog-ref-content-footer-buttons-h5-cancel" }, cancelText)),
47
+ React.createElement(Button, { type: "primary", className: "xh-dialog-ref-content-footer-buttons-h5-confirm", onClick: handleConfirm, preventTime: 0 }, confirmText)));
48
+ const footerRender = useMemo(() => {
49
+ if (process.env.TARO_ENV === "h5") {
50
+ return dialogFooterH5;
51
+ }
52
+ return dialogFooterMicroApp;
53
+ }, []);
46
54
  const DialogMain = (React.createElement(View, { className: dialogcls },
47
55
  React.createElement(Mask, null),
48
56
  React.createElement(CSSTransition, { in: selfVisible, timeout: 200, classNames: "scale" },
49
57
  React.createElement(View, { className: "xh-dialog-ref-content" },
50
58
  React.createElement(View, { className: "xh-dialog-ref-content-header" }, header),
51
59
  React.createElement(View, { className: "xh-dialog-ref-content-content" }, content),
52
- footer || (React.createElement(View, { className: "xh-dialog-ref-content-footer" }, dialogFooter))))));
60
+ footer || (React.createElement(View, { className: "xh-dialog-ref-content-footer" }, footerRender))))));
53
61
  return DialogMain;
54
62
  });
55
63
  export default DialogCom;
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/DialogRef/index.tsx"],"names":[],"mappings":"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"}
1
+ {"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"}
@@ -1,6 +1,6 @@
1
1
  import React, { useEffect, useMemo, useState } from "react";
2
2
  import { Image } from "@tarojs/components";
3
- import { getImageInfo } from "@tarojs/taro";
3
+ import { getImageInfo, pxTransform } from "@tarojs/taro";
4
4
  import "./index.scss";
5
5
  const XHImage = props => {
6
6
  const { width = "", height = "", src, className } = props;
@@ -23,10 +23,10 @@ const XHImage = props => {
23
23
  const size = useMemo(() => {
24
24
  let computedSize = defaultSize || {};
25
25
  if (width) {
26
- computedSize.width = `${width}`;
26
+ computedSize.width = `${pxTransform(width)}`;
27
27
  }
28
28
  if (height) {
29
- computedSize.height = `${height}`;
29
+ computedSize.height = `${pxTransform(height)}`;
30
30
  }
31
31
  console.log("size");
32
32
  return computedSize;
@@ -1 +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"}
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,WAAW,EAAE,MAAM,cAAc,CAAC;AACzD,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,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC;SACvD;QACD,IAAI,MAAM,EAAE;YACT,YAAoB,CAAC,MAAM,GAAG,GAAG,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC;SACzD;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"}
@@ -6,8 +6,8 @@ import { CSSTransition } from "react-transition-group";
6
6
  import Mask from "../Mask";
7
7
  import Image from "../Image";
8
8
  import "./index.scss";
9
- const ToastCom = (props) => {
10
- const { title, className = "", icon = "success", image = "" } = props;
9
+ const ToastCom = props => {
10
+ const { title, className = "", icon = "none", image = "" } = props;
11
11
  const toastcls = classNames("xh-toast", className);
12
12
  // icon-success_toast
13
13
  // icon-alert_toast
@@ -17,6 +17,7 @@ const ToastCom = (props) => {
17
17
  success: "icon-success_toast",
18
18
  error: "icon-failure_toast",
19
19
  loading: "icon-loading_toast",
20
+ none: "",
20
21
  };
21
22
  const cls = classNames("iconfont", classConfig[icon]);
22
23
  const showIcon = useMemo(() => {
@@ -1 +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"}
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,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/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "taro-react-uilib",
3
- "version": "1.0.26",
3
+ "version": "1.0.28",
4
4
  "description": "基于taro的跨端组件库",
5
5
  "templateInfo": {
6
6
  "name": "default",
@@ -1,5 +1,4 @@
1
1
  import { ReactNode } from "react";
2
- import "./index.scss";
3
2
  export declare type AlertProps = {
4
3
  title?: string | ReactNode;
5
4
  content?: string | ReactNode;
@@ -1,4 +1,3 @@
1
- import "./index.scss";
2
1
  export declare type ConfirmProps = {
3
2
  title?: string;
4
3
  header?: string;
@@ -1,9 +0,0 @@
1
- .xh-alert-button {
2
- color: #f6ab00;
3
- font-size: 32px;
4
- font-weight: 800;
5
- border-top: 2px solid #f8f8f8;
6
- border-bottom-left-radius: 10px;
7
- border-bottom-right-radius: 10px;
8
- padding: 18px 0;
9
- }
@@ -1,20 +0,0 @@
1
- .xh-confirm-footer {
2
- display: flex;
3
- justify-content: space-between;
4
- border-top: 2px solid #f8f8f8;
5
- &-button {
6
- flex: 1;
7
- font-size: 32px;
8
- font-weight: 800;
9
- padding: 18px 0;
10
- }
11
- &-cancel-button {
12
- color: #000;
13
- border-right: 2px solid #f8f8f8;
14
- border-bottom-left-radius: 10px;
15
- }
16
- &-confirm-button {
17
- color: #f6ab00;
18
- border-bottom-right-radius: 10px;
19
- }
20
- }