@nutui/nutui-react-taro 3.0.19-cpp.1 → 3.0.19-cpp.10

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 (255) hide show
  1. package/dist/cjs/packages/actionsheet/style/style.harmony.css +2 -2
  2. package/dist/cjs/packages/address/style/style.harmony.css +9 -3
  3. package/dist/cjs/packages/audio/style/style.harmony.css +8 -5
  4. package/dist/cjs/packages/badge/style/badge.scss +1 -1
  5. package/dist/cjs/packages/badge/style/style.css +1 -1
  6. package/dist/cjs/packages/badge/style/style.harmony.css +1 -1
  7. package/dist/cjs/packages/badge/style-jmapp/badge.scss +1 -1
  8. package/dist/cjs/packages/badge/style-jmapp/style.css +1 -1
  9. package/dist/cjs/packages/badge/style-jrkf/badge.scss +1 -1
  10. package/dist/cjs/packages/badge/style-jrkf/style.css +1 -1
  11. package/dist/cjs/packages/button/style/button.scss +3 -0
  12. package/dist/cjs/packages/button/style/style.css +8 -5
  13. package/dist/cjs/packages/button/style/style.harmony.css +8 -5
  14. package/dist/cjs/packages/button/style-jmapp/button.scss +3 -0
  15. package/dist/cjs/packages/button/style-jmapp/style.css +3 -0
  16. package/dist/cjs/packages/button/style-jrkf/button.scss +3 -0
  17. package/dist/cjs/packages/button/style-jrkf/style.css +3 -0
  18. package/dist/cjs/packages/calendar/style/style.css +2 -2
  19. package/dist/cjs/packages/calendar/style/style.harmony.css +4 -4
  20. package/dist/cjs/packages/calendarcard/style/style.css +1 -1
  21. package/dist/cjs/packages/calendarcard/style/style.harmony.css +1 -1
  22. package/dist/cjs/packages/card/style/style.harmony.css +4 -4
  23. package/dist/cjs/packages/cascader/style/cascader.scss +2 -0
  24. package/dist/cjs/packages/cascader/style/style.css +2 -0
  25. package/dist/cjs/packages/cascader/style/style.harmony.css +9 -3
  26. package/dist/cjs/packages/cascader/style-jmapp/cascader.scss +2 -0
  27. package/dist/cjs/packages/cascader/style-jmapp/style.css +2 -0
  28. package/dist/cjs/packages/cascader/style-jrkf/cascader.scss +2 -0
  29. package/dist/cjs/packages/cascader/style-jrkf/style.css +2 -0
  30. package/dist/cjs/packages/checkbox/checkbox.js +1 -1
  31. package/dist/cjs/packages/checkbox/style/style.css +1 -1
  32. package/dist/cjs/packages/checkbox/style/style.harmony.css +1 -1
  33. package/dist/cjs/packages/circleprogress/style/style.css +1 -1
  34. package/dist/cjs/packages/circleprogress/style/style.harmony.css +1 -1
  35. package/dist/cjs/packages/col/col.js +16 -11
  36. package/dist/cjs/packages/configprovider/types.d.ts +1 -1
  37. package/dist/cjs/packages/countdown/style/countdown.scss +1 -1
  38. package/dist/cjs/packages/countdown/style/style.css +1 -1
  39. package/dist/cjs/packages/countdown/style/style.harmony.css +1 -1
  40. package/dist/cjs/packages/countdown/style-jmapp/countdown.scss +1 -1
  41. package/dist/cjs/packages/countdown/style-jmapp/style.css +1 -1
  42. package/dist/cjs/packages/countdown/style-jrkf/countdown.scss +1 -1
  43. package/dist/cjs/packages/countdown/style-jrkf/style.css +1 -1
  44. package/dist/cjs/packages/datepicker/style/style.harmony.css +4 -4
  45. package/dist/cjs/packages/dialog/style/dialog.scss +8 -2
  46. package/dist/cjs/packages/dialog/style/style.css +11 -5
  47. package/dist/cjs/packages/dialog/style/style.harmony.css +19 -10
  48. package/dist/cjs/packages/dialog/style-jmapp/dialog.scss +8 -2
  49. package/dist/cjs/packages/dialog/style-jmapp/style.css +8 -2
  50. package/dist/cjs/packages/dialog/style-jrkf/dialog.scss +8 -2
  51. package/dist/cjs/packages/dialog/style-jrkf/style.css +8 -2
  52. package/dist/cjs/packages/empty/style/style.css +2 -2
  53. package/dist/cjs/packages/empty/style/style.harmony.css +10 -7
  54. package/dist/cjs/packages/fixednav/style/style.harmony.css +1 -1
  55. package/dist/cjs/packages/imagepreview/style/style.harmony.css +2 -2
  56. package/dist/cjs/packages/input/style/input.scss +0 -1
  57. package/dist/cjs/packages/input/style/style.css +0 -1
  58. package/dist/cjs/packages/input/style/style.harmony.css +0 -1
  59. package/dist/cjs/packages/input/style-jmapp/input.scss +0 -1
  60. package/dist/cjs/packages/input/style-jmapp/style.css +0 -1
  61. package/dist/cjs/packages/input/style-jrkf/input.scss +0 -1
  62. package/dist/cjs/packages/input/style-jrkf/style.css +0 -1
  63. package/dist/cjs/packages/noticebar/noticebar.js +82 -76
  64. package/dist/cjs/packages/noticebar/style/noticebar.scss +4 -0
  65. package/dist/cjs/packages/noticebar/style/style.css +4 -0
  66. package/dist/cjs/packages/noticebar/style/style.harmony.css +4 -0
  67. package/dist/cjs/packages/noticebar/style-jmapp/noticebar.scss +4 -0
  68. package/dist/cjs/packages/noticebar/style-jmapp/style.css +4 -0
  69. package/dist/cjs/packages/noticebar/style-jrkf/noticebar.scss +4 -0
  70. package/dist/cjs/packages/noticebar/style-jrkf/style.css +4 -0
  71. package/dist/cjs/packages/numberkeyboard/style/style.css +3 -3
  72. package/dist/cjs/packages/numberkeyboard/style/style.harmony.css +5 -5
  73. package/dist/cjs/packages/picker/style/style.css +2 -2
  74. package/dist/cjs/packages/picker/style/style.harmony.css +4 -4
  75. package/dist/cjs/packages/popover/style/style.harmony.css +2 -2
  76. package/dist/cjs/packages/popup/style/style.css +2 -2
  77. package/dist/cjs/packages/popup/style/style.harmony.css +2 -2
  78. package/dist/cjs/packages/price/style/price.scss +3 -3
  79. package/dist/cjs/packages/price/style/style.css +4 -4
  80. package/dist/cjs/packages/price/style/style.harmony.css +4 -4
  81. package/dist/cjs/packages/price/style-jmapp/price.scss +3 -3
  82. package/dist/cjs/packages/price/style-jmapp/style.css +3 -3
  83. package/dist/cjs/packages/price/style-jrkf/price.scss +3 -3
  84. package/dist/cjs/packages/price/style-jrkf/style.css +3 -3
  85. package/dist/cjs/packages/radio/style/style.css +1 -1
  86. package/dist/cjs/packages/radio/style/style.harmony.css +1 -1
  87. package/dist/cjs/packages/rate/style/rate.scss +1 -1
  88. package/dist/cjs/packages/rate/style/style.css +1 -1
  89. package/dist/cjs/packages/rate/style/style.harmony.css +1 -1
  90. package/dist/cjs/packages/rate/style-jmapp/rate.scss +1 -1
  91. package/dist/cjs/packages/rate/style-jmapp/style.css +1 -1
  92. package/dist/cjs/packages/rate/style-jrkf/rate.scss +1 -1
  93. package/dist/cjs/packages/rate/style-jrkf/style.css +1 -1
  94. package/dist/cjs/packages/resultpage/style/style.harmony.css +8 -5
  95. package/dist/cjs/packages/shortpassword/style/style.css +1 -1
  96. package/dist/cjs/packages/shortpassword/style/style.harmony.css +3 -3
  97. package/dist/cjs/packages/sidebar/style/style.css +1 -1
  98. package/dist/cjs/packages/sidebar/style/style.harmony.css +1 -1
  99. package/dist/cjs/packages/steps/style/style.css +1 -1
  100. package/dist/cjs/packages/steps/style/style.harmony.css +1 -1
  101. package/dist/cjs/packages/tabbar/style/style.harmony.css +3 -3
  102. package/dist/cjs/packages/tabbaritem/style/style.css +2 -2
  103. package/dist/cjs/packages/tabbaritem/style/style.harmony.css +3 -3
  104. package/dist/cjs/packages/tabs/style/style.css +5 -1
  105. package/dist/cjs/packages/tabs/style/style.harmony.css +5 -1
  106. package/dist/cjs/packages/tabs/style/tabs.scss +4 -0
  107. package/dist/cjs/packages/tabs/style-jmapp/style.css +4 -0
  108. package/dist/cjs/packages/tabs/style-jmapp/tabs.scss +4 -0
  109. package/dist/cjs/packages/tabs/style-jrkf/style.css +4 -0
  110. package/dist/cjs/packages/tabs/style-jrkf/tabs.scss +4 -0
  111. package/dist/cjs/packages/timeselect/style/style.harmony.css +2 -2
  112. package/dist/cjs/packages/toast/style/style.css +7 -1
  113. package/dist/cjs/packages/toast/style/style.harmony.css +7 -1
  114. package/dist/cjs/packages/toast/style/toast.scss +6 -0
  115. package/dist/cjs/packages/toast/style-jmapp/style.css +6 -0
  116. package/dist/cjs/packages/toast/style-jmapp/toast.scss +6 -0
  117. package/dist/cjs/packages/toast/style-jrkf/style.css +6 -0
  118. package/dist/cjs/packages/toast/style-jrkf/toast.scss +6 -0
  119. package/dist/cjs/packages/toast/toast.js +1 -1
  120. package/dist/cjs/packages/tour/style/style.harmony.css +2 -2
  121. package/dist/es/packages/actionsheet/style/style.harmony.css +2 -2
  122. package/dist/es/packages/address/style/style.harmony.css +9 -3
  123. package/dist/es/packages/audio/style/style.harmony.css +8 -5
  124. package/dist/es/packages/badge/style/badge.scss +1 -1
  125. package/dist/es/packages/badge/style/style.css +1 -1
  126. package/dist/es/packages/badge/style/style.harmony.css +1 -1
  127. package/dist/es/packages/badge/style-jmapp/badge.scss +1 -1
  128. package/dist/es/packages/badge/style-jmapp/style.css +1 -1
  129. package/dist/es/packages/badge/style-jrkf/badge.scss +1 -1
  130. package/dist/es/packages/badge/style-jrkf/style.css +1 -1
  131. package/dist/es/packages/button/style/button.scss +3 -0
  132. package/dist/es/packages/button/style/style.css +8 -5
  133. package/dist/es/packages/button/style/style.harmony.css +8 -5
  134. package/dist/es/packages/button/style-jmapp/button.scss +3 -0
  135. package/dist/es/packages/button/style-jmapp/style.css +3 -0
  136. package/dist/es/packages/button/style-jrkf/button.scss +3 -0
  137. package/dist/es/packages/button/style-jrkf/style.css +3 -0
  138. package/dist/es/packages/calendar/style/style.css +2 -2
  139. package/dist/es/packages/calendar/style/style.harmony.css +4 -4
  140. package/dist/es/packages/calendarcard/style/style.css +1 -1
  141. package/dist/es/packages/calendarcard/style/style.harmony.css +1 -1
  142. package/dist/es/packages/card/style/style.harmony.css +4 -4
  143. package/dist/es/packages/cascader/style/cascader.scss +2 -0
  144. package/dist/es/packages/cascader/style/style.css +2 -0
  145. package/dist/es/packages/cascader/style/style.harmony.css +9 -3
  146. package/dist/es/packages/cascader/style-jmapp/cascader.scss +2 -0
  147. package/dist/es/packages/cascader/style-jmapp/style.css +2 -0
  148. package/dist/es/packages/cascader/style-jrkf/cascader.scss +2 -0
  149. package/dist/es/packages/cascader/style-jrkf/style.css +2 -0
  150. package/dist/es/packages/checkbox/checkbox.js +1 -1
  151. package/dist/es/packages/checkbox/style/style.css +1 -1
  152. package/dist/es/packages/checkbox/style/style.harmony.css +1 -1
  153. package/dist/es/packages/circleprogress/style/style.css +1 -1
  154. package/dist/es/packages/circleprogress/style/style.harmony.css +1 -1
  155. package/dist/es/packages/col/col.js +17 -12
  156. package/dist/es/packages/configprovider/types.d.ts +1 -1
  157. package/dist/es/packages/countdown/style/countdown.scss +1 -1
  158. package/dist/es/packages/countdown/style/style.css +1 -1
  159. package/dist/es/packages/countdown/style/style.harmony.css +1 -1
  160. package/dist/es/packages/countdown/style-jmapp/countdown.scss +1 -1
  161. package/dist/es/packages/countdown/style-jmapp/style.css +1 -1
  162. package/dist/es/packages/countdown/style-jrkf/countdown.scss +1 -1
  163. package/dist/es/packages/countdown/style-jrkf/style.css +1 -1
  164. package/dist/es/packages/datepicker/style/style.harmony.css +4 -4
  165. package/dist/es/packages/dialog/style/dialog.scss +8 -2
  166. package/dist/es/packages/dialog/style/style.css +11 -5
  167. package/dist/es/packages/dialog/style/style.harmony.css +19 -10
  168. package/dist/es/packages/dialog/style-jmapp/dialog.scss +8 -2
  169. package/dist/es/packages/dialog/style-jmapp/style.css +8 -2
  170. package/dist/es/packages/dialog/style-jrkf/dialog.scss +8 -2
  171. package/dist/es/packages/dialog/style-jrkf/style.css +8 -2
  172. package/dist/es/packages/empty/style/style.css +2 -2
  173. package/dist/es/packages/empty/style/style.harmony.css +10 -7
  174. package/dist/es/packages/fixednav/style/style.harmony.css +1 -1
  175. package/dist/es/packages/imagepreview/style/style.harmony.css +2 -2
  176. package/dist/es/packages/input/style/input.scss +0 -1
  177. package/dist/es/packages/input/style/style.css +0 -1
  178. package/dist/es/packages/input/style/style.harmony.css +0 -1
  179. package/dist/es/packages/input/style-jmapp/input.scss +0 -1
  180. package/dist/es/packages/input/style-jmapp/style.css +0 -1
  181. package/dist/es/packages/input/style-jrkf/input.scss +0 -1
  182. package/dist/es/packages/input/style-jrkf/style.css +0 -1
  183. package/dist/es/packages/noticebar/noticebar.js +114 -112
  184. package/dist/es/packages/noticebar/style/noticebar.scss +4 -0
  185. package/dist/es/packages/noticebar/style/style.css +4 -0
  186. package/dist/es/packages/noticebar/style/style.harmony.css +4 -0
  187. package/dist/es/packages/noticebar/style-jmapp/noticebar.scss +4 -0
  188. package/dist/es/packages/noticebar/style-jmapp/style.css +4 -0
  189. package/dist/es/packages/noticebar/style-jrkf/noticebar.scss +4 -0
  190. package/dist/es/packages/noticebar/style-jrkf/style.css +4 -0
  191. package/dist/es/packages/numberkeyboard/style/style.css +3 -3
  192. package/dist/es/packages/numberkeyboard/style/style.harmony.css +5 -5
  193. package/dist/es/packages/picker/style/style.css +2 -2
  194. package/dist/es/packages/picker/style/style.harmony.css +4 -4
  195. package/dist/es/packages/popover/style/style.harmony.css +2 -2
  196. package/dist/es/packages/popup/style/style.css +2 -2
  197. package/dist/es/packages/popup/style/style.harmony.css +2 -2
  198. package/dist/es/packages/price/style/price.scss +3 -3
  199. package/dist/es/packages/price/style/style.css +4 -4
  200. package/dist/es/packages/price/style/style.harmony.css +4 -4
  201. package/dist/es/packages/price/style-jmapp/price.scss +3 -3
  202. package/dist/es/packages/price/style-jmapp/style.css +3 -3
  203. package/dist/es/packages/price/style-jrkf/price.scss +3 -3
  204. package/dist/es/packages/price/style-jrkf/style.css +3 -3
  205. package/dist/es/packages/radio/style/style.css +1 -1
  206. package/dist/es/packages/radio/style/style.harmony.css +1 -1
  207. package/dist/es/packages/rate/style/rate.scss +1 -1
  208. package/dist/es/packages/rate/style/style.css +1 -1
  209. package/dist/es/packages/rate/style/style.harmony.css +1 -1
  210. package/dist/es/packages/rate/style-jmapp/rate.scss +1 -1
  211. package/dist/es/packages/rate/style-jmapp/style.css +1 -1
  212. package/dist/es/packages/rate/style-jrkf/rate.scss +1 -1
  213. package/dist/es/packages/rate/style-jrkf/style.css +1 -1
  214. package/dist/es/packages/resultpage/style/style.harmony.css +8 -5
  215. package/dist/es/packages/shortpassword/style/style.css +1 -1
  216. package/dist/es/packages/shortpassword/style/style.harmony.css +3 -3
  217. package/dist/es/packages/sidebar/style/style.css +1 -1
  218. package/dist/es/packages/sidebar/style/style.harmony.css +1 -1
  219. package/dist/es/packages/steps/style/style.css +1 -1
  220. package/dist/es/packages/steps/style/style.harmony.css +1 -1
  221. package/dist/es/packages/tabbar/style/style.harmony.css +3 -3
  222. package/dist/es/packages/tabbaritem/style/style.css +2 -2
  223. package/dist/es/packages/tabbaritem/style/style.harmony.css +3 -3
  224. package/dist/es/packages/tabs/style/style.css +5 -1
  225. package/dist/es/packages/tabs/style/style.harmony.css +5 -1
  226. package/dist/es/packages/tabs/style/tabs.scss +4 -0
  227. package/dist/es/packages/tabs/style-jmapp/style.css +4 -0
  228. package/dist/es/packages/tabs/style-jmapp/tabs.scss +4 -0
  229. package/dist/es/packages/tabs/style-jrkf/style.css +4 -0
  230. package/dist/es/packages/tabs/style-jrkf/tabs.scss +4 -0
  231. package/dist/es/packages/timeselect/style/style.harmony.css +2 -2
  232. package/dist/es/packages/toast/style/style.css +7 -1
  233. package/dist/es/packages/toast/style/style.harmony.css +7 -1
  234. package/dist/es/packages/toast/style/toast.scss +6 -0
  235. package/dist/es/packages/toast/style-jmapp/style.css +6 -0
  236. package/dist/es/packages/toast/style-jmapp/toast.scss +6 -0
  237. package/dist/es/packages/toast/style-jrkf/style.css +6 -0
  238. package/dist/es/packages/toast/style-jrkf/toast.scss +6 -0
  239. package/dist/es/packages/toast/toast.js +1 -1
  240. package/dist/es/packages/tour/style/style.harmony.css +2 -2
  241. package/dist/nutui.react.umd.js +100 -94
  242. package/dist/style-jmapp.css +1 -1
  243. package/dist/style-jmapp.scss +32 -32
  244. package/dist/style-jrkf.css +1 -1
  245. package/dist/style-jrkf.scss +23 -23
  246. package/dist/style.css +1 -1
  247. package/dist/style.scss +31 -31
  248. package/dist/styles/jd-font.scss +4 -4
  249. package/dist/styles/theme-default.scss +4 -1
  250. package/dist/styles/themes/dark.css +1 -1
  251. package/dist/styles/themes/default.css +1 -1
  252. package/dist/styles/variables-jmapp.scss +9 -0
  253. package/dist/styles/variables-jrkf.scss +9 -0
  254. package/dist/styles/variables.scss +20 -10
  255. package/package.json +1 -1
@@ -19,7 +19,9 @@
19
19
  position: fixed;
20
20
  max-height: 100%;
21
21
  background-color: var(--nutui-dialog-background, var(--nutui-color-surface-2));
22
+ /* #ifndef dynamic*/
22
23
  transition: transform 0.2s, -webkit-transform 0.2s;
24
+ /* #endif */
23
25
  -webkit-overflow-scrolling: touch;
24
26
  top: 50%;
25
27
  left: 50%;
@@ -75,6 +77,7 @@
75
77
  font-size: var(--nutui-dialog-header-font-size, var(--nutui-font-text-large));
76
78
  font-weight: var(--nutui-dialog-header-font-weight, normal);
77
79
  color: var(--nutui-color-title);
80
+ margin-bottom: var(--nutui-dialog-title-margin-bottom, 8px);
78
81
  width: 100%;
79
82
  overflow: hidden;
80
83
  text-overflow: ellipsis;
@@ -115,21 +118,24 @@
115
118
  }
116
119
  .nut-dialog-footer .nut-button {
117
120
  min-width: var(--nutui-dialog-footer-button-min-width, 117px);
121
+ border-radius: var(--nutui-dialog-footer-button-border, 6px);
122
+ padding: var(--nutui-button-large-padding, 0 12px);
118
123
  }
119
124
  .nut-dialog-footer-cancel.nut-dialog-footer-cancel {
120
125
  margin-right: var(--nutui-dialog-footer-cancel-margin-right, 12px);
121
126
  background: var(--nutui-dialog-footer-cancel-bg, transparent);
122
127
  color: var(--nutui-button-default-color, var(--nutui-color-text));
128
+ border-color: var(--nutui-button-default-border-color, transparent);
123
129
  }
124
130
  .nut-dialog-footer-cancel.nut-dialog-footer-cancel .nut-button-children {
125
131
  color: var(--nutui-button-default-color, var(--nutui-color-text));
126
132
  }
127
133
  .nut-dialog-footer-ok {
128
134
  max-width: var(--nutui-dialog-footer-ok-max-width, 128px);
129
- font-weight: var(--nutui-font-weight-bold);
135
+ font-weight: var(--nutui-font-weight-medium, 500);
130
136
  }
131
137
  .nut-dialog-footer-ok .nut-button-children {
132
- font-weight: var(--nutui-font-weight-bold);
138
+ font-weight: var(--nutui-font-weight-medium, 500);
133
139
  }
134
140
  .nut-dialog-footer-block.nut-button {
135
141
  min-width: 100%;
@@ -17,9 +17,11 @@
17
17
  position: fixed;
18
18
  max-height: 100%;
19
19
  background-color: $dialog-background;
20
+ /* #ifndef dynamic*/
20
21
  transition:
21
22
  transform 0.2s,
22
23
  -webkit-transform 0.2s;
24
+ /* #endif */
23
25
  -webkit-overflow-scrolling: touch;
24
26
  top: 50%;
25
27
  left: 50%;
@@ -81,6 +83,7 @@
81
83
  font-size: $dialog-header-font-size;
82
84
  font-weight: $dialog-header-font-weight;
83
85
  color: $color-title;
86
+ margin-bottom: $dialog-title-margin-bottom;
84
87
  @include oneline-ellipsis();
85
88
  }
86
89
 
@@ -123,12 +126,15 @@
123
126
 
124
127
  .nut-button {
125
128
  min-width: $dialog-footer-button-min-width;
129
+ border-radius: $dialog-footer-button-border;
130
+ padding: var(--nutui-button-large-padding, 0 12px);
126
131
  }
127
132
 
128
133
  &-cancel.nut-dialog-footer-cancel {
129
134
  margin-right: $dialog-footer-cancel-margin-right;
130
135
  background: $dialog-footer-cancel-bg;
131
136
  color: $button-default-color;
137
+ border-color: var(--nutui-button-default-border-color, transparent);
132
138
  .nut-button-children {
133
139
  color: $button-default-color;
134
140
  }
@@ -136,9 +142,9 @@
136
142
 
137
143
  &-ok {
138
144
  max-width: $dialog-footer-ok-max-width;
139
- font-weight: $font-weight-bold;
145
+ font-weight: $font-weight-medium;
140
146
  .nut-button-children {
141
- font-weight: $font-weight-bold;
147
+ font-weight: $font-weight-medium;
142
148
  }
143
149
  }
144
150
 
@@ -19,7 +19,9 @@
19
19
  position: fixed;
20
20
  max-height: 100%;
21
21
  background-color: var(--nutui-dialog-background, var(--nutui-color-surface-2));
22
+ /* #ifndef dynamic*/
22
23
  transition: transform 0.2s, -webkit-transform 0.2s;
24
+ /* #endif */
23
25
  -webkit-overflow-scrolling: touch;
24
26
  top: 50%;
25
27
  left: 50%;
@@ -75,6 +77,7 @@
75
77
  font-size: var(--nutui-dialog-header-font-size, var(--nutui-font-text-large));
76
78
  font-weight: var(--nutui-dialog-header-font-weight, normal);
77
79
  color: var(--nutui-color-title);
80
+ margin-bottom: var(--nutui-dialog-title-margin-bottom, 8px);
78
81
  width: 100%;
79
82
  overflow: hidden;
80
83
  text-overflow: ellipsis;
@@ -115,21 +118,24 @@
115
118
  }
116
119
  .nut-dialog-footer .nut-button {
117
120
  min-width: var(--nutui-dialog-footer-button-min-width, 117px);
121
+ border-radius: var(--nutui-dialog-footer-button-border, 6px);
122
+ padding: var(--nutui-button-large-padding, 0 12px);
118
123
  }
119
124
  .nut-dialog-footer-cancel.nut-dialog-footer-cancel {
120
125
  margin-right: var(--nutui-dialog-footer-cancel-margin-right, 12px);
121
126
  background: var(--nutui-dialog-footer-cancel-bg, var(--nutui-button-default-background-color, var(--nutui-color-default)));
122
127
  color: var(--nutui-button-default-color, var(--nutui-color-text));
128
+ border-color: var(--nutui-button-default-border-color, transparent);
123
129
  }
124
130
  .nut-dialog-footer-cancel.nut-dialog-footer-cancel .nut-button-children {
125
131
  color: var(--nutui-button-default-color, var(--nutui-color-text));
126
132
  }
127
133
  .nut-dialog-footer-ok {
128
134
  max-width: var(--nutui-dialog-footer-ok-max-width, 128px);
129
- font-weight: var(--nutui-font-weight-bold);
135
+ font-weight: var(--nutui-font-weight-medium, 500);
130
136
  }
131
137
  .nut-dialog-footer-ok .nut-button-children {
132
- font-weight: var(--nutui-font-weight-bold);
138
+ font-weight: var(--nutui-font-weight-medium, 500);
133
139
  }
134
140
  .nut-dialog-footer-block.nut-button {
135
141
  min-width: 100%;
@@ -35,8 +35,8 @@
35
35
  font-weight: var(--nutui-font-weight-bold, 600);
36
36
  margin-bottom: var(--nutui-empty-title-margin-bottom, 12px);
37
37
  color: var(--nutui-color-title, #1a1a1a);
38
- font-size: var(--nutui-font-size-l, 16px);
39
- line-height: var(--nutui-empty-title-line-height, var(--nutui-font-size-l, 16px));
38
+ font-size: var(--nutui-font-size-l, 15px);
39
+ line-height: var(--nutui-empty-title-line-height, var(--nutui-font-size-l, 15px));
40
40
  }
41
41
  .nut-empty-description {
42
42
  color: var(--nutui-color-text, #505259);
@@ -57,6 +57,9 @@
57
57
  transform: translate(-50%, -50%);
58
58
  opacity: 0;
59
59
  content: " ";
60
+ /* #ifdef dynamic*/
61
+ pointer-events: none;
62
+ /* #endif */
60
63
  }
61
64
  .nut-button::after {
62
65
  border: none;
@@ -138,7 +141,7 @@
138
141
  .nut-button-large {
139
142
  height: var(--nutui-button-large-height, 40px);
140
143
  padding: var(--nutui-button-large-padding, 0px 16px);
141
- font-size: var(--nutui-button-large-font-size, var(--nutui-font-size-l, 16px));
144
+ font-size: var(--nutui-button-large-font-size, var(--nutui-font-size-l, 15px));
142
145
  border-radius: var(--nutui-button-large-border-radius, var(--nutui-radius-base, 8px));
143
146
  }
144
147
  .nut-button-large .nut-button-text {
@@ -148,12 +151,12 @@
148
151
  margin-right: var(--nutui-button-xlarge-text-icon-margin, 6px);
149
152
  }
150
153
  .nut-button-large .nut-icon {
151
- font-size: var(--nutui-button-large-font-size, var(--nutui-font-size-l, 16px));
152
- width: var(--nutui-button-large-font-size, var(--nutui-font-size-l, 16px));
153
- height: var(--nutui-button-large-font-size, var(--nutui-font-size-l, 16px));
154
+ font-size: var(--nutui-button-large-font-size, var(--nutui-font-size-l, 15px));
155
+ width: var(--nutui-button-large-font-size, var(--nutui-font-size-l, 15px));
156
+ height: var(--nutui-button-large-font-size, var(--nutui-font-size-l, 15px));
154
157
  }
155
158
  .nut-button-large-children {
156
- font-size: var(--nutui-button-large-font-size, var(--nutui-font-size-l, 16px));
159
+ font-size: var(--nutui-button-large-font-size, var(--nutui-font-size-l, 15px));
157
160
  }
158
161
  .nut-button-small {
159
162
  height: var(--nutui-button-small-height, 28px);
@@ -412,8 +415,8 @@
412
415
  font-weight: var(--nutui-font-weight-bold, 600);
413
416
  margin-bottom: var(--nutui-empty-title-margin-bottom, 12px);
414
417
  color: var(--nutui-color-title, #1a1a1a);
415
- font-size: var(--nutui-font-size-l, 16px);
416
- line-height: var(--nutui-empty-title-line-height, var(--nutui-font-size-l, 16px));
418
+ font-size: var(--nutui-font-size-l, 15px);
419
+ line-height: var(--nutui-empty-title-line-height, var(--nutui-font-size-l, 15px));
417
420
  }
418
421
  .nut-empty-description {
419
422
  color: var(--nutui-color-text, #505259);
@@ -110,7 +110,7 @@
110
110
  background: var(--nutui-badge-background-disabled-color, var(--nutui-color-text-disabled, #c2c4cc));
111
111
  }
112
112
  .nut-badge-number {
113
- font-family: "JD";
113
+ font-family: "JDZH-Regular";
114
114
  }
115
115
  .nut-badge-one {
116
116
  height: var(--nutui-badge-height, 14px);
@@ -83,8 +83,8 @@
83
83
  .nut-popup-title-title {
84
84
  color: var(--nutui-color-title, #1a1a1a);
85
85
  font-weight: var(--nutui-font-weight-bold, 600);
86
- font-size: var(--nutui-popup-title-font-size, var(--nutui-font-size-l, 16px));
87
- line-height: var(--nutui-popup-title-font-size, var(--nutui-font-size-l, 16px));
86
+ font-size: var(--nutui-popup-title-font-size, var(--nutui-font-size-xl, 18px));
87
+ line-height: var(--nutui-popup-title-font-size, var(--nutui-font-size-xl, 18px));
88
88
  }
89
89
  .nut-popup-title-description {
90
90
  color: var(--nutui-color-text, #505259);
@@ -33,7 +33,6 @@
33
33
  flex: 1;
34
34
  color: $color-title;
35
35
  font-size: $input-font-size;
36
- line-height: $input-lineheight;
37
36
  padding: 0;
38
37
  border: 0;
39
38
  outline: 0 none;
@@ -34,7 +34,6 @@
34
34
  flex: 1;
35
35
  color: var(--nutui-color-title, #1a1a1a);
36
36
  font-size: var(--nutui-input-font-size, var(--nutui-font-size-base, 14px));
37
- line-height: var(--nutui-input-lineheight, var(--nutui-font-size-l, 16px));
38
37
  padding: 0;
39
38
  border: 0;
40
39
  outline: 0 none;
@@ -34,7 +34,6 @@
34
34
  flex: 1;
35
35
  color: var(--nutui-color-title, #1a1a1a);
36
36
  font-size: var(--nutui-input-font-size, var(--nutui-font-size-base, 14px));
37
- line-height: var(--nutui-input-lineheight, var(--nutui-font-size-l, 16px));
38
37
  padding: 0;
39
38
  border: 0;
40
39
  outline: 0 none;
@@ -33,7 +33,6 @@
33
33
  flex: 1;
34
34
  color: $color-title;
35
35
  font-size: $input-font-size;
36
- line-height: $input-lineheight;
37
36
  padding: 0;
38
37
  border: 0;
39
38
  outline: 0 none;
@@ -34,7 +34,6 @@
34
34
  flex: 1;
35
35
  color: var(--nutui-color-title);
36
36
  font-size: var(--nutui-input-font-size, var(--nutui-font-text));
37
- line-height: var(--nutui-input-lineheight, var(--nutui-font-text-large));
38
37
  padding: 0;
39
38
  border: 0;
40
39
  outline: 0 none;
@@ -33,7 +33,6 @@
33
33
  flex: 1;
34
34
  color: $color-title;
35
35
  font-size: $input-font-size;
36
- line-height: $input-lineheight;
37
36
  padding: 0;
38
37
  border: 0;
39
38
  outline: 0 none;
@@ -34,7 +34,6 @@
34
34
  flex: 1;
35
35
  color: var(--nutui-color-title);
36
36
  font-size: var(--nutui-input-font-size, var(--nutui-font-text));
37
- line-height: var(--nutui-input-lineheight, var(--nutui-font-text-large));
38
37
  padding: 0;
39
38
  border: 0;
40
39
  outline: 0 none;
@@ -9,6 +9,7 @@ import React, { useEffect, useMemo, useRef, useState, useCallback } from "react"
9
9
  import { View } from "@tarojs/components";
10
10
  import { Close, Notice } from "@nutui/icons-react-taro";
11
11
  import classNames from "classnames";
12
+ import { useUuid } from "../../hooks/use-uuid";
12
13
  import { getRectInMultiPlatform } from "../../utils/taro/get-rect";
13
14
  import { ComponentDefaults } from "../../utils/typings";
14
15
  import { useRtl } from "../configprovider/index";
@@ -36,7 +37,10 @@ export var NoticeBar = function(props) {
36
37
  var classPrefix = 'nut-noticebar';
37
38
  var wrapRef = useRef(null);
38
39
  var contentRef = useRef(null);
39
- var _useState = _sliced_to_array(useState(true), 2), showNoticeBar = _useState[0], SetShowNoticeBar = _useState[1];
40
+ var uid = useUuid();
41
+ var wrapRefId = "wrap-ref-".concat(uid);
42
+ var contentRefId = "content-ref-".concat(uid);
43
+ var _useState = _sliced_to_array(useState(true), 2), showNoticeBar = _useState[0], setShowNoticeBar = _useState[1];
40
44
  var scrollList = useRef([]);
41
45
  var _useState1 = _sliced_to_array(useState(0), 2), wrapWidth = _useState1[0], SetWrapWidth = _useState1[1];
42
46
  var _useState2 = _sliced_to_array(useState(true), 2), firstRound = _useState2[0], SetFirstRound = _useState2[1];
@@ -96,7 +100,7 @@ export var NoticeBar = function(props) {
96
100
  startRollEasy();
97
101
  }
98
102
  } else {
99
- initScrollWrap(content);
103
+ initScrollWrap();
100
104
  }
101
105
  return function() {
102
106
  // 销毁事件
@@ -106,7 +110,7 @@ export var NoticeBar = function(props) {
106
110
  childs
107
111
  ]);
108
112
  useEffect(function() {
109
- initScrollWrap(content);
113
+ initScrollWrap();
110
114
  }, [
111
115
  content
112
116
  ]);
@@ -117,7 +121,7 @@ export var NoticeBar = function(props) {
117
121
  }, [
118
122
  list
119
123
  ]);
120
- var initScrollWrap = function(value) {
124
+ var initScrollWrap = function() {
121
125
  if (showNoticeBar === false) {
122
126
  return;
123
127
  }
@@ -125,41 +129,35 @@ export var NoticeBar = function(props) {
125
129
  return _async_to_generator(function() {
126
130
  var warpRes, contentRes, wrapW, offsetW, canScroll;
127
131
  return _ts_generator(this, function(_state) {
128
- switch(_state.label){
129
- case 0:
130
- if (!wrapRef.current || !contentRef.current) {
131
- return [
132
- 2
133
- ];
134
- }
135
- return [
136
- 4,
137
- getRectInMultiPlatform(wrapRef.current)
138
- ];
139
- case 1:
140
- warpRes = _state.sent();
141
- return [
142
- 4,
143
- getRectInMultiPlatform(contentRef.current)
144
- ];
145
- case 2:
146
- contentRes = _state.sent();
147
- wrapW = warpRes.width;
148
- offsetW = contentRes.width;
149
- canScroll = align === 'left' && scrollable == null ? offsetW > wrapW : scrollable;
150
- SetIsCanScroll(canScroll);
151
- if (canScroll) {
152
- SetWrapWidth(wrapW);
153
- SetOffsetW(offsetW);
154
- SetAnimationDuration(offsetW / speed);
155
- SetAnimationClass('play');
156
- } else {
157
- SetAnimationClass('');
158
- }
159
- return [
160
- 2
161
- ];
132
+ if (!wrapRef.current || !contentRef.current) {
133
+ return [
134
+ 2
135
+ ];
136
+ }
137
+ warpRes = wrapRef.current.getBoundingClientRect(); // await getRectInMultiPlatform(wrapRef.current, wrapRefId)
138
+ contentRes = contentRef.current.getBoundingClientRect();
139
+ // await getRectInMultiPlatform(
140
+ // contentRef.current,
141
+ // contentRefId
142
+ // )
143
+ if (!warpRes || !contentRes) return [
144
+ 2
145
+ ];
146
+ wrapW = warpRes.width;
147
+ offsetW = contentRes.width;
148
+ canScroll = align === 'left' && scrollable == null ? offsetW > wrapW : scrollable;
149
+ SetIsCanScroll(canScroll);
150
+ if (canScroll) {
151
+ SetWrapWidth(wrapW);
152
+ SetOffsetW(offsetW);
153
+ SetAnimationDuration(offsetW / speed);
154
+ SetAnimationClass('play');
155
+ } else {
156
+ SetAnimationClass('');
162
157
  }
158
+ return [
159
+ 2
160
+ ];
163
161
  });
164
162
  })();
165
163
  }, 0);
@@ -168,12 +166,6 @@ export var NoticeBar = function(props) {
168
166
  click && click(event);
169
167
  onClick && onClick(event);
170
168
  };
171
- var onClickIcon = function(event) {
172
- event.stopPropagation();
173
- SetShowNoticeBar(!closeable);
174
- close && close(event);
175
- onClose && onClose(event);
176
- };
177
169
  var onAnimationEnd = function() {
178
170
  SetFirstRound(false);
179
171
  setTimeout(function() {
@@ -196,13 +188,16 @@ export var NoticeBar = function(props) {
196
188
  SetAnimate(false);
197
189
  }, time);
198
190
  };
199
- // 点击滚动单元
200
- var handleClickIcon = function(event) {
191
+ var handleClickIcon = useCallback(function(event) {
201
192
  event.stopPropagation();
202
- SetShowNoticeBar(!closeable);
193
+ setShowNoticeBar(!closeable);
203
194
  close && close(event);
204
195
  onClose && onClose(event);
205
- };
196
+ }, [
197
+ close,
198
+ onClose,
199
+ closeable
200
+ ]);
206
201
  var isEllipsis = function() {
207
202
  if (isCanScroll == null && align === 'left') {
208
203
  return wrap;
@@ -350,10 +345,12 @@ export var NoticeBar = function(props) {
350
345
  };
351
346
  // 无缝滚动第一个元素位移控制
352
347
  var itemStyle = function(index) {
353
- var style = {};
348
+ var style = {
349
+ width: '100%'
350
+ };
354
351
  if (height) {
355
352
  style.height = "".concat(height, "px");
356
- style.lineHeight = "".concat(height, "px");
353
+ // style.lineHeight = `${height}px`
357
354
  }
358
355
  var offset = childOffset[index];
359
356
  if (offset) {
@@ -422,74 +419,79 @@ export var NoticeBar = function(props) {
422
419
  container.current = ref;
423
420
  setIsContainerReady(true);
424
421
  }, []);
425
- return (
426
- /*#__PURE__*/ React.createElement(View, {
427
- className: cls,
428
- style: style
429
- }, showNoticeBar && direction === 'horizontal' ? /*#__PURE__*/ React.createElement(View, {
430
- className: noticebarClass,
431
- style: barStyle,
432
- onClick: handleClick
433
- }, leftIcon ? /*#__PURE__*/ React.createElement(View, {
422
+ var renderLeftIcon = useCallback(function() {
423
+ return /*#__PURE__*/ React.createElement(React.Fragment, null, leftIcon ? /*#__PURE__*/ React.createElement(View, {
434
424
  className: "nut-noticebar-box-left-icon"
435
- }, leftIcon) : null, /*#__PURE__*/ React.createElement(View, {
436
- ref: wrapRef,
437
- className: "nut-noticebar-box-wrap"
438
- }, /*#__PURE__*/ React.createElement(View, {
439
- ref: contentRef,
440
- className: "nut-noticebar-box-wrap-content ".concat(animationClass, " ").concat(isEllipsis() ? 'nut-ellipsis' : ''),
441
- style: contentStyle,
442
- onAnimationEnd: onAnimationEnd
443
- }, children, content)), right ? /*#__PURE__*/ React.createElement(View, {
425
+ }, leftIcon) : null);
426
+ }, [
427
+ leftIcon
428
+ ]);
429
+ var renderRight = useCallback(function() {
430
+ return /*#__PURE__*/ React.createElement(React.Fragment, null, right ? /*#__PURE__*/ React.createElement(View, {
444
431
  className: "nut-noticebar-box-right"
445
- }, right) : null, closeable || rightIcon ? /*#__PURE__*/ React.createElement(View, {
432
+ }, right) : null);
433
+ }, [
434
+ right
435
+ ]);
436
+ var renderRightIcon = useCallback(function() {
437
+ return /*#__PURE__*/ React.createElement(React.Fragment, null, rightIcon || closeable ? /*#__PURE__*/ React.createElement(View, {
446
438
  className: "nut-noticebar-box-right-icon",
447
- onClick: onClickIcon
439
+ onClick: handleClickIcon
448
440
  }, rightIcon || /*#__PURE__*/ React.createElement(Close, {
449
441
  size: 12
450
- })) : null) : null, showNoticeBar && hasVerticalContent && isVertical ? /*#__PURE__*/ React.createElement(View, {
451
- className: "nut-noticebar-vertical",
452
- style: barStyle,
453
- ref: containerRefCallback,
454
- onClick: handleClick
455
- }, leftIcon ? /*#__PURE__*/ React.createElement(View, {
456
- className: "nut-noticebar-box-left-icon"
457
- }, leftIcon) : null, children ? /*#__PURE__*/ React.createElement(View, {
458
- className: "nut-noticebar-box-wrap",
459
- ref: innerRef
460
- }, scrollList.current.map(function(item, index) {
461
- return /*#__PURE__*/ React.createElement(View, {
462
- style: itemStyle(index),
463
- key: index,
464
- onClick: function(e) {
465
- handleItemClick(e, item);
466
- }
467
- }, item);
468
- })) : /*#__PURE__*/ React.createElement(View, {
469
- className: "nut-noticebar-box-horseLamp-list",
470
- style: horseLampStyle
471
- }, scrollList.current.map(function(item, index) {
472
- return (
473
- // eslint-disable-next-line jsx-a11y/no-noninteractive-element-interactions
474
- /*#__PURE__*/ (React.createElement(View, {
475
- className: "nut-noticebar-box-horseLamp-list-item",
476
- style: {
477
- height: height
478
- },
479
- key: index,
480
- onClick: function(e) {
481
- handleItemClick(e, item);
482
- }
483
- }, item))
484
- );
485
- })), /*#__PURE__*/ React.createElement(View, {
486
- className: "nut-noticebar-box-right-icon",
442
+ })) : null);
443
+ }, [
444
+ rightIcon,
445
+ closeable,
446
+ handleClickIcon
447
+ ]);
448
+ return /*#__PURE__*/ React.createElement(View, {
449
+ className: cls,
450
+ style: style
451
+ }, showNoticeBar && direction === 'horizontal' ? /*#__PURE__*/ React.createElement(View, {
452
+ className: noticebarClass,
453
+ style: barStyle,
454
+ onClick: handleClick
455
+ }, renderLeftIcon(), /*#__PURE__*/ React.createElement(View, {
456
+ ref: wrapRef,
457
+ className: "nut-noticebar-box-wrap",
458
+ id: wrapRefId
459
+ }, /*#__PURE__*/ React.createElement(View, {
460
+ ref: contentRef,
461
+ id: contentRefId,
462
+ className: "nut-noticebar-box-wrap-content ".concat(animationClass, " ").concat(isEllipsis() ? 'nut-ellipsis' : ''),
463
+ style: contentStyle,
464
+ onAnimationEnd: onAnimationEnd
465
+ }, children, content)), renderRight(), renderRightIcon()) : null, showNoticeBar && hasVerticalContent && isVertical ? /*#__PURE__*/ React.createElement(View, {
466
+ className: "nut-noticebar-vertical",
467
+ style: barStyle,
468
+ ref: containerRefCallback,
469
+ onClick: handleClick
470
+ }, renderLeftIcon(), children ? /*#__PURE__*/ React.createElement(View, {
471
+ className: "nut-noticebar-box-wrap",
472
+ ref: innerRef
473
+ }, scrollList.current.map(function(item, index) {
474
+ return /*#__PURE__*/ React.createElement(View, {
475
+ style: itemStyle(index),
476
+ key: index,
487
477
  onClick: function(e) {
488
- handleClickIcon(e);
478
+ handleItemClick(e, item);
489
479
  }
490
- }, rightIcon || (closeable ? /*#__PURE__*/ React.createElement(Close, {
491
- size: 12
492
- }) : null))) : null)
493
- );
480
+ }, item);
481
+ })) : /*#__PURE__*/ React.createElement(View, {
482
+ className: "nut-noticebar-box-horseLamp-list",
483
+ style: horseLampStyle
484
+ }, scrollList.current.map(function(item, index) {
485
+ return /*#__PURE__*/ React.createElement(View, {
486
+ className: "nut-noticebar-box-horseLamp-list-item",
487
+ style: {
488
+ height: height
489
+ },
490
+ key: index,
491
+ onClick: function(e) {
492
+ handleItemClick(e, item);
493
+ }
494
+ }, item);
495
+ })), renderRight(), renderRightIcon()) : null);
494
496
  };
495
497
  NoticeBar.displayName = 'NutNoticeBar';
@@ -36,11 +36,15 @@
36
36
  justify-content: center;
37
37
 
38
38
  .nut-noticebar-box-wrap {
39
+ /* #ifndef dynamic*/
39
40
  flex: initial;
41
+ /* #endif */
40
42
 
41
43
  .nut-noticebar-box-wrap-content {
42
44
  position: relative;
45
+ /* #ifndef dynamic*/
43
46
  display: initial;
47
+ /* #endif */
44
48
  }
45
49
  }
46
50
  }
@@ -32,11 +32,15 @@
32
32
  justify-content: center;
33
33
  }
34
34
  .nut-noticebar .nut-noticebar-box-center .nut-noticebar-box-wrap {
35
+ /* #ifndef dynamic*/
35
36
  flex: initial;
37
+ /* #endif */
36
38
  }
37
39
  .nut-noticebar .nut-noticebar-box-center .nut-noticebar-box-wrap .nut-noticebar-box-wrap-content {
38
40
  position: relative;
41
+ /* #ifndef dynamic*/
39
42
  display: initial;
43
+ /* #endif */
40
44
  }
41
45
  .nut-noticebar .nut-noticebar-box-left-icon {
42
46
  display: flex;
@@ -32,11 +32,15 @@
32
32
  justify-content: center;
33
33
  }
34
34
  .nut-noticebar .nut-noticebar-box-center .nut-noticebar-box-wrap {
35
+ /* #ifndef dynamic*/
35
36
  flex: initial;
37
+ /* #endif */
36
38
  }
37
39
  .nut-noticebar .nut-noticebar-box-center .nut-noticebar-box-wrap .nut-noticebar-box-wrap-content {
38
40
  position: relative;
41
+ /* #ifndef dynamic*/
39
42
  display: initial;
43
+ /* #endif */
40
44
  }
41
45
  .nut-noticebar .nut-noticebar-box-left-icon {
42
46
  display: flex;
@@ -36,11 +36,15 @@
36
36
  justify-content: center;
37
37
 
38
38
  .nut-noticebar-box-wrap {
39
+ /* #ifndef dynamic*/
39
40
  flex: initial;
41
+ /* #endif */
40
42
 
41
43
  .nut-noticebar-box-wrap-content {
42
44
  position: relative;
45
+ /* #ifndef dynamic*/
43
46
  display: initial;
47
+ /* #endif */
44
48
  }
45
49
  }
46
50
  }