@nutui/nutui-react-taro 3.0.19-cpp.22-3 → 3.0.19-cpp.22-5

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 (136) hide show
  1. package/dist/cjs/hooks/taro/use-custom-event.js +5 -5
  2. package/dist/cjs/hooks/use-ref-state.js +3 -3
  3. package/dist/cjs/hooks/use-touch.js +2 -1
  4. package/dist/cjs/packages/address/utils.js +3 -3
  5. package/dist/cjs/packages/avatarcropper/avatarcropper.js +28 -16
  6. package/dist/cjs/packages/badge/badge.js +7 -4
  7. package/dist/cjs/packages/barrage/barrage.js +24 -14
  8. package/dist/cjs/packages/calendar/style/calendar.scss +32 -1
  9. package/dist/cjs/packages/calendar/style/style.css +21 -1
  10. package/dist/cjs/packages/calendar/style/style.harmony.css +21 -1
  11. package/dist/cjs/packages/calendar/style-jmapp/calendar.scss +32 -1
  12. package/dist/cjs/packages/calendar/style-jmapp/style.css +21 -1
  13. package/dist/cjs/packages/calendar/style-jrkf/calendar.scss +32 -1
  14. package/dist/cjs/packages/calendar/style-jrkf/style.css +21 -1
  15. package/dist/cjs/packages/calendar/utils.js +8 -8
  16. package/dist/cjs/packages/calendarcard/icon.js +9 -19
  17. package/dist/cjs/packages/calendarcard/style/calendarcard.scss +19 -0
  18. package/dist/cjs/packages/calendarcard/style/style.css +13 -0
  19. package/dist/cjs/packages/calendarcard/style/style.harmony.css +13 -0
  20. package/dist/cjs/packages/calendarcard/style-jmapp/calendarcard.scss +19 -0
  21. package/dist/cjs/packages/calendarcard/style-jmapp/style.css +13 -0
  22. package/dist/cjs/packages/calendarcard/style-jrkf/calendarcard.scss +19 -0
  23. package/dist/cjs/packages/calendarcard/style-jrkf/style.css +13 -0
  24. package/dist/cjs/packages/calendarcard/utils.js +6 -6
  25. package/dist/cjs/packages/cascader/cascader.js +21 -12
  26. package/dist/cjs/packages/cascader/utils.js +3 -3
  27. package/dist/cjs/packages/collapseitem/collapseitem.js +7 -4
  28. package/dist/cjs/packages/configprovider/configprovider.js +7 -7
  29. package/dist/cjs/packages/configprovider/index.js +6 -6
  30. package/dist/cjs/packages/countdown/countdown.js +2 -1
  31. package/dist/cjs/packages/datepicker/utils.js +9 -9
  32. package/dist/cjs/packages/dialog/content.js +3 -3
  33. package/dist/cjs/packages/dialog/dialog.js +11 -8
  34. package/dist/cjs/packages/drag/drag.js +7 -4
  35. package/dist/cjs/packages/elevator/elevator.js +10 -7
  36. package/dist/cjs/packages/ellipsis/ellipsis.js +30 -17
  37. package/dist/cjs/packages/form/index.js +2 -0
  38. package/dist/cjs/packages/form/useform.js +57 -50
  39. package/dist/cjs/packages/infiniteloading/infiniteloading.js +14 -8
  40. package/dist/cjs/packages/inputnumber/inputnumber.js +28 -16
  41. package/dist/cjs/packages/lottie/types.js +2 -0
  42. package/dist/cjs/packages/menuitem/menuitem.js +22 -24
  43. package/dist/cjs/packages/noticebar/noticebar.js +70 -74
  44. package/dist/cjs/packages/notify/notify.js +4 -4
  45. package/dist/cjs/packages/nutui.react.build.js +105 -105
  46. package/dist/cjs/packages/nutui.react.js +105 -105
  47. package/dist/cjs/packages/overlay/overlay.js +3 -3
  48. package/dist/cjs/packages/pickerview/pickerroller.js +7 -4
  49. package/dist/cjs/packages/pickerview/pickerview.js +2 -1
  50. package/dist/cjs/packages/pickerview/utils.js +3 -3
  51. package/dist/cjs/packages/popover/popover.js +77 -75
  52. package/dist/cjs/packages/popup/popup.js +14 -8
  53. package/dist/cjs/packages/pulltorefresh/pulltorefresh.js +56 -52
  54. package/dist/cjs/packages/radio/index.js +2 -0
  55. package/dist/cjs/packages/range/range.js +28 -16
  56. package/dist/cjs/packages/shortpassword/shortpassword.js +3 -3
  57. package/dist/cjs/packages/sticky/sticky.js +7 -4
  58. package/dist/cjs/packages/swipe/swipe.js +14 -8
  59. package/dist/cjs/packages/swiper/index.js +1 -0
  60. package/dist/cjs/packages/switch/switch.js +7 -4
  61. package/dist/cjs/packages/toast/toast.js +4 -4
  62. package/dist/cjs/packages/uploader/uploader.js +51 -38
  63. package/dist/cjs/packages/virtuallist/utils.js +6 -6
  64. package/dist/cjs/packages/watermark/watermark.js +8 -4
  65. package/dist/cjs/types/spec/address/base.js +2 -0
  66. package/dist/cjs/utils/date.js +5 -5
  67. package/dist/cjs/utils/event-mocker.js +18 -10
  68. package/dist/cjs/utils/get-rect.js +4 -4
  69. package/dist/cjs/utils/get-scroll-parent.js +3 -3
  70. package/dist/cjs/utils/merge-props.js +3 -3
  71. package/dist/cjs/utils/merge.js +6 -6
  72. package/dist/cjs/utils/raf.js +3 -3
  73. package/dist/cjs/utils/render.js +9 -5
  74. package/dist/cjs/utils/rubberband.js +3 -3
  75. package/dist/cjs/utils/should-render-price-raw.js +3 -3
  76. package/dist/cjs/utils/taro/get-rect.js +24 -14
  77. package/dist/cjs/utils/taro/get-system-info.js +4 -4
  78. package/dist/cjs/utils/taro/platform.js +5 -5
  79. package/dist/es/hooks/use-touch.js +1 -1
  80. package/dist/es/packages/avatarcropper/avatarcropper.js +28 -16
  81. package/dist/es/packages/badge/badge.js +7 -4
  82. package/dist/es/packages/barrage/barrage.js +24 -14
  83. package/dist/es/packages/calendar/style/calendar.scss +32 -1
  84. package/dist/es/packages/calendar/style/style.css +21 -1
  85. package/dist/es/packages/calendar/style/style.harmony.css +21 -1
  86. package/dist/es/packages/calendar/style-jmapp/calendar.scss +32 -1
  87. package/dist/es/packages/calendar/style-jmapp/style.css +21 -1
  88. package/dist/es/packages/calendar/style-jrkf/calendar.scss +32 -1
  89. package/dist/es/packages/calendar/style-jrkf/style.css +21 -1
  90. package/dist/es/packages/calendarcard/icon.js +5 -15
  91. package/dist/es/packages/calendarcard/style/calendarcard.scss +19 -0
  92. package/dist/es/packages/calendarcard/style/style.css +13 -0
  93. package/dist/es/packages/calendarcard/style/style.harmony.css +13 -0
  94. package/dist/es/packages/calendarcard/style-jmapp/calendarcard.scss +19 -0
  95. package/dist/es/packages/calendarcard/style-jmapp/style.css +13 -0
  96. package/dist/es/packages/calendarcard/style-jrkf/calendarcard.scss +19 -0
  97. package/dist/es/packages/calendarcard/style-jrkf/style.css +13 -0
  98. package/dist/es/packages/cascader/cascader.js +21 -12
  99. package/dist/es/packages/collapseitem/collapseitem.js +7 -4
  100. package/dist/es/packages/countdown/countdown.js +2 -1
  101. package/dist/es/packages/dialog/dialog.js +7 -4
  102. package/dist/es/packages/drag/drag.js +7 -4
  103. package/dist/es/packages/elevator/elevator.js +7 -4
  104. package/dist/es/packages/ellipsis/ellipsis.js +30 -17
  105. package/dist/es/packages/form/index.js +1 -0
  106. package/dist/es/packages/form/useform.js +53 -46
  107. package/dist/es/packages/infiniteloading/infiniteloading.js +14 -8
  108. package/dist/es/packages/inputnumber/inputnumber.js +28 -16
  109. package/dist/es/packages/lottie/types.js +1 -1
  110. package/dist/es/packages/menuitem/menuitem.js +22 -24
  111. package/dist/es/packages/noticebar/noticebar.js +70 -74
  112. package/dist/es/packages/pickerview/pickerroller.js +7 -4
  113. package/dist/es/packages/pickerview/pickerview.js +2 -1
  114. package/dist/es/packages/popover/popover.js +77 -75
  115. package/dist/es/packages/popup/popup.js +14 -8
  116. package/dist/es/packages/pulltorefresh/pulltorefresh.js +56 -52
  117. package/dist/es/packages/radio/index.js +1 -0
  118. package/dist/es/packages/range/range.js +28 -16
  119. package/dist/es/packages/sticky/sticky.js +7 -4
  120. package/dist/es/packages/swipe/swipe.js +14 -8
  121. package/dist/es/packages/swiper/index.js +1 -0
  122. package/dist/es/packages/switch/switch.js +7 -4
  123. package/dist/es/packages/uploader/uploader.js +51 -38
  124. package/dist/es/packages/watermark/watermark.js +8 -4
  125. package/dist/es/types/spec/address/base.js +1 -1
  126. package/dist/es/utils/event-mocker.js +12 -4
  127. package/dist/es/utils/render.js +6 -2
  128. package/dist/es/utils/taro/get-rect.js +20 -10
  129. package/dist/nutui.react.umd.js +860 -660
  130. package/dist/style-jmapp.css +1 -1
  131. package/dist/style-jmapp.scss +38 -38
  132. package/dist/style-jrkf.css +1 -1
  133. package/dist/style-jrkf.scss +31 -31
  134. package/dist/style.css +1 -1
  135. package/dist/style.scss +26 -26
  136. package/package.json +1 -1
package/dist/es/packages/calendar/style/style.css CHANGED
@@ -104,9 +104,17 @@
104
104
  font-weight: var(--nutui-calendar-day-font-weight, var(--nutui-font-weight-bold, 600));
105
105
  margin-bottom: 4px;
106
106
  }
107
+ .nut-calendar-day-day, .nut-calendar-day-info-curr {
108
+ color: var(--nutui-color-title, #1a1a1a);
109
+ }
107
110
  .nut-calendar-day:nth-child(7n+0), .nut-calendar-day:nth-child(7n+1) {
108
111
  color: var(--nutui-color-primary, #ff0f23);
109
112
  }
113
+ .nut-calendar-day:nth-child(7n+0) .nut-calendar-day-day,
114
+ .nut-calendar-day:nth-child(7n+0) .nut-calendar-day-info-curr, .nut-calendar-day:nth-child(7n+1) .nut-calendar-day-day,
115
+ .nut-calendar-day:nth-child(7n+1) .nut-calendar-day-info-curr {
116
+ color: var(--nutui-color-primary, #ff0f23);
117
+ }
110
118
  .nut-calendar-day-info, .nut-calendar-day-info-curr {
111
119
  position: absolute;
112
120
  bottom: 5px;
@@ -139,12 +147,18 @@
139
147
  border-top-right-radius: var(--nutui-calendar-day-active-border-radius, 4px);
140
148
  border-bottom-right-radius: var(--nutui-calendar-day-active-border-radius, 4px);
141
149
  }
142
- .nut-calendar-day-active .nut-calendar-day-info {
150
+ .nut-calendar-day-active.nut-calendar-day-active .nut-calendar-day-info {
151
+ color: #ffffff;
152
+ }
153
+ .nut-calendar-day-active.nut-calendar-day-active .nut-calendar-day-day, .nut-calendar-day-active.nut-calendar-day-active .nut-calendar-day-info-curr {
143
154
  color: #ffffff;
144
155
  }
145
156
  .nut-calendar-day-disabled {
146
157
  color: var(--nutui-calendar-disable-color, var(--nutui-color-text-disabled, #c2c4cc)) !important;
147
158
  }
159
+ .nut-calendar-day-disabled.nut-calendar-day-disabled .nut-calendar-day-day, .nut-calendar-day-disabled.nut-calendar-day-disabled .nut-calendar-day-info-curr {
160
+ color: var(--nutui-calendar-disable-color, var(--nutui-color-text-disabled, #c2c4cc));
161
+ }
148
162
  .nut-calendar-day-disabled .nut-calendar-day-info-curr {
149
163
  display: none;
150
164
  }
@@ -152,10 +166,16 @@
152
166
  background-color: var(--nutui-calendar-choose-background-color, var(--nutui-color-primary-light-pressed, #ffebf1));
153
167
  color: var(--nutui-calendar-choose-color, var(--nutui-color-primary, #ff0f23));
154
168
  }
169
+ .nut-calendar-day-choose.nut-calendar-day-choose .nut-calendar-day-day, .nut-calendar-day-choose.nut-calendar-day-choose .nut-calendar-day-info-curr {
170
+ color: var(--nutui-calendar-choose-color, var(--nutui-color-primary, #ff0f23));
171
+ }
155
172
  .nut-calendar-day-choose-disabled {
156
173
  background-color: var(--nutui-calendar-choose-disable-background-color, rgba(191, 191, 191, 0.09));
157
174
  color: var(--nutui-calendar-disable-color, var(--nutui-color-text-disabled, #c2c4cc)) !important;
158
175
  }
176
+ .nut-calendar-day-choose-disabled.nut-calendar-day-choose-disabled .nut-calendar-day-day, .nut-calendar-day-choose-disabled.nut-calendar-day-choose-disabled .nut-calendar-day-info-curr {
177
+ color: var(--nutui-calendar-disable-color, var(--nutui-color-text-disabled, #c2c4cc));
178
+ }
159
179
  .nut-calendar-day-choose-disabled .nut-calendar-day-info-curr {
160
180
  display: none;
161
181
  }
package/dist/es/packages/calendar/style/style.harmony.css CHANGED
@@ -484,9 +484,17 @@
484
484
  font-weight: var(--nutui-calendar-day-font-weight, var(--nutui-font-weight-bold, 600));
485
485
  margin-bottom: 4px;
486
486
  }
487
+ .nut-calendar-day-day, .nut-calendar-day-info-curr {
488
+ color: var(--nutui-color-title, #1a1a1a);
489
+ }
487
490
  .nut-calendar-day:nth-child(7n+0), .nut-calendar-day:nth-child(7n+1) {
488
491
  color: var(--nutui-color-primary, #ff0f23);
489
492
  }
493
+ .nut-calendar-day:nth-child(7n+0) .nut-calendar-day-day,
494
+ .nut-calendar-day:nth-child(7n+0) .nut-calendar-day-info-curr, .nut-calendar-day:nth-child(7n+1) .nut-calendar-day-day,
495
+ .nut-calendar-day:nth-child(7n+1) .nut-calendar-day-info-curr {
496
+ color: var(--nutui-color-primary, #ff0f23);
497
+ }
490
498
  .nut-calendar-day-info, .nut-calendar-day-info-curr {
491
499
  position: absolute;
492
500
  bottom: 5px;
@@ -519,12 +527,18 @@
519
527
  border-top-right-radius: var(--nutui-calendar-day-active-border-radius, 4px);
520
528
  border-bottom-right-radius: var(--nutui-calendar-day-active-border-radius, 4px);
521
529
  }
522
- .nut-calendar-day-active .nut-calendar-day-info {
530
+ .nut-calendar-day-active.nut-calendar-day-active .nut-calendar-day-info {
531
+ color: #ffffff;
532
+ }
533
+ .nut-calendar-day-active.nut-calendar-day-active .nut-calendar-day-day, .nut-calendar-day-active.nut-calendar-day-active .nut-calendar-day-info-curr {
523
534
  color: #ffffff;
524
535
  }
525
536
  .nut-calendar-day-disabled {
526
537
  color: var(--nutui-calendar-disable-color, var(--nutui-color-text-disabled, #c2c4cc)) !important;
527
538
  }
539
+ .nut-calendar-day-disabled.nut-calendar-day-disabled .nut-calendar-day-day, .nut-calendar-day-disabled.nut-calendar-day-disabled .nut-calendar-day-info-curr {
540
+ color: var(--nutui-calendar-disable-color, var(--nutui-color-text-disabled, #c2c4cc));
541
+ }
528
542
  .nut-calendar-day-disabled .nut-calendar-day-info-curr {
529
543
  display: none;
530
544
  }
@@ -532,10 +546,16 @@
532
546
  background-color: var(--nutui-calendar-choose-background-color, var(--nutui-color-primary-light-pressed, #ffebf1));
533
547
  color: var(--nutui-calendar-choose-color, var(--nutui-color-primary, #ff0f23));
534
548
  }
549
+ .nut-calendar-day-choose.nut-calendar-day-choose .nut-calendar-day-day, .nut-calendar-day-choose.nut-calendar-day-choose .nut-calendar-day-info-curr {
550
+ color: var(--nutui-calendar-choose-color, var(--nutui-color-primary, #ff0f23));
551
+ }
535
552
  .nut-calendar-day-choose-disabled {
536
553
  background-color: var(--nutui-calendar-choose-disable-background-color, rgba(191, 191, 191, 0.09));
537
554
  color: var(--nutui-calendar-disable-color, var(--nutui-color-text-disabled, #c2c4cc)) !important;
538
555
  }
556
+ .nut-calendar-day-choose-disabled.nut-calendar-day-choose-disabled .nut-calendar-day-day, .nut-calendar-day-choose-disabled.nut-calendar-day-choose-disabled .nut-calendar-day-info-curr {
557
+ color: var(--nutui-calendar-disable-color, var(--nutui-color-text-disabled, #c2c4cc));
558
+ }
539
559
  .nut-calendar-day-choose-disabled .nut-calendar-day-info-curr {
540
560
  display: none;
541
561
  }
package/dist/es/packages/calendar/style-jmapp/calendar.scss CHANGED
@@ -125,9 +125,20 @@
125
125
  font-weight: $calendar-day-font-weight;
126
126
  margin-bottom: 4px;
127
127
 
128
+ // 部分 Taro 机型下子节点不会稳定继承父级 color，颜色直接落到最内层文案。
129
+ &-day,
130
+ &-info-curr {
131
+ color: $color-title;
132
+ }
133
+
128
134
  &:nth-child(7n + 0),
129
135
  &:nth-child(7n + 1) {
130
136
  color: $color-primary;
137
+
138
+ .nut-calendar-day-day,
139
+ .nut-calendar-day-info-curr {
140
+ color: $color-primary;
141
+ }
131
142
  }
132
143
 
133
144
  &-info,
@@ -168,7 +179,12 @@
168
179
  border-bottom-right-radius: $calendar-day-active-border-radius;
169
180
  }
170
181
 
171
- .nut-calendar-day-info {
182
+ &.nut-calendar-day-active .nut-calendar-day-info {
183
+ color: $color-primary-text;
184
+ }
185
+
186
+ &.nut-calendar-day-active .nut-calendar-day-day,
187
+ &.nut-calendar-day-active .nut-calendar-day-info-curr {
172
188
  color: $color-primary-text;
173
189
  }
174
190
  }
@@ -176,6 +192,11 @@
176
192
  &-disabled {
177
193
  color: $calendar-disable-color !important;
178
194
 
195
+ &.nut-calendar-day-disabled .nut-calendar-day-day,
196
+ &.nut-calendar-day-disabled .nut-calendar-day-info-curr {
197
+ color: $calendar-disable-color;
198
+ }
199
+
179
200
  .nut-calendar-day-info-curr {
180
201
  display: none;
181
202
  }
@@ -185,10 +206,20 @@
185
206
  background-color: $calendar-choose-background-color;
186
207
  color: $calendar-choose-color;
187
208
 
209
+ &.nut-calendar-day-choose .nut-calendar-day-day,
210
+ &.nut-calendar-day-choose .nut-calendar-day-info-curr {
211
+ color: $calendar-choose-color;
212
+ }
213
+
188
214
  &-disabled {
189
215
  background-color: $calendar-choose-disable-background-color;
190
216
  color: $calendar-disable-color !important;
191
217
 
218
+ &.nut-calendar-day-choose-disabled .nut-calendar-day-day,
219
+ &.nut-calendar-day-choose-disabled .nut-calendar-day-info-curr {
220
+ color: $calendar-disable-color;
221
+ }
222
+
192
223
  .nut-calendar-day-info-curr {
193
224
  display: none;
194
225
  }
package/dist/es/packages/calendar/style-jmapp/style.css CHANGED
@@ -104,9 +104,17 @@
104
104
  font-weight: var(--nutui-calendar-day-font-weight, var(--nutui-font-weight-bold));
105
105
  margin-bottom: 4px;
106
106
  }
107
+ .nut-calendar-day-day, .nut-calendar-day-info-curr {
108
+ color: var(--nutui-color-title);
109
+ }
107
110
  .nut-calendar-day:nth-child(7n+0), .nut-calendar-day:nth-child(7n+1) {
108
111
  color: var(--nutui-color-primary);
109
112
  }
113
+ .nut-calendar-day:nth-child(7n+0) .nut-calendar-day-day,
114
+ .nut-calendar-day:nth-child(7n+0) .nut-calendar-day-info-curr, .nut-calendar-day:nth-child(7n+1) .nut-calendar-day-day,
115
+ .nut-calendar-day:nth-child(7n+1) .nut-calendar-day-info-curr {
116
+ color: var(--nutui-color-primary);
117
+ }
110
118
  .nut-calendar-day-info, .nut-calendar-day-info-curr {
111
119
  position: absolute;
112
120
  bottom: 5px;
@@ -139,12 +147,18 @@
139
147
  border-top-right-radius: var(--nutui-calendar-day-active-border-radius, 4px);
140
148
  border-bottom-right-radius: var(--nutui-calendar-day-active-border-radius, 4px);
141
149
  }
142
- .nut-calendar-day-active .nut-calendar-day-info {
150
+ .nut-calendar-day-active.nut-calendar-day-active .nut-calendar-day-info {
151
+ color: var(--nutui-color-text-dark);
152
+ }
153
+ .nut-calendar-day-active.nut-calendar-day-active .nut-calendar-day-day, .nut-calendar-day-active.nut-calendar-day-active .nut-calendar-day-info-curr {
143
154
  color: var(--nutui-color-text-dark);
144
155
  }
145
156
  .nut-calendar-day-disabled {
146
157
  color: var(--nutui-calendar-disable-color, var(--nutui-color-text-disabled)) !important;
147
158
  }
159
+ .nut-calendar-day-disabled.nut-calendar-day-disabled .nut-calendar-day-day, .nut-calendar-day-disabled.nut-calendar-day-disabled .nut-calendar-day-info-curr {
160
+ color: var(--nutui-calendar-disable-color, var(--nutui-color-text-disabled));
161
+ }
148
162
  .nut-calendar-day-disabled .nut-calendar-day-info-curr {
149
163
  display: none;
150
164
  }
@@ -152,10 +166,16 @@
152
166
  background-color: var(--nutui-calendar-choose-background-color, var(--nutui-color-primary-light-pressed));
153
167
  color: var(--nutui-calendar-choose-color, var(--nutui-color-primary));
154
168
  }
169
+ .nut-calendar-day-choose.nut-calendar-day-choose .nut-calendar-day-day, .nut-calendar-day-choose.nut-calendar-day-choose .nut-calendar-day-info-curr {
170
+ color: var(--nutui-calendar-choose-color, var(--nutui-color-primary));
171
+ }
155
172
  .nut-calendar-day-choose-disabled {
156
173
  background-color: var(--nutui-calendar-choose-disable-background-color, rgba(191, 191, 191, 0.09));
157
174
  color: var(--nutui-calendar-disable-color, var(--nutui-color-text-disabled)) !important;
158
175
  }
176
+ .nut-calendar-day-choose-disabled.nut-calendar-day-choose-disabled .nut-calendar-day-day, .nut-calendar-day-choose-disabled.nut-calendar-day-choose-disabled .nut-calendar-day-info-curr {
177
+ color: var(--nutui-calendar-disable-color, var(--nutui-color-text-disabled));
178
+ }
159
179
  .nut-calendar-day-choose-disabled .nut-calendar-day-info-curr {
160
180
  display: none;
161
181
  }
package/dist/es/packages/calendar/style-jrkf/calendar.scss CHANGED
@@ -125,9 +125,20 @@
125
125
  font-weight: $calendar-day-font-weight;
126
126
  margin-bottom: 4px;
127
127
 
128
+ // 部分 Taro 机型下子节点不会稳定继承父级 color，颜色直接落到最内层文案。
129
+ &-day,
130
+ &-info-curr {
131
+ color: $color-title;
132
+ }
133
+
128
134
  &:nth-child(7n + 0),
129
135
  &:nth-child(7n + 1) {
130
136
  color: $color-primary;
137
+
138
+ .nut-calendar-day-day,
139
+ .nut-calendar-day-info-curr {
140
+ color: $color-primary;
141
+ }
131
142
  }
132
143
 
133
144
  &-info,
@@ -168,7 +179,12 @@
168
179
  border-bottom-right-radius: $calendar-day-active-border-radius;
169
180
  }
170
181
 
171
- .nut-calendar-day-info {
182
+ &.nut-calendar-day-active .nut-calendar-day-info {
183
+ color: $color-primary-text;
184
+ }
185
+
186
+ &.nut-calendar-day-active .nut-calendar-day-day,
187
+ &.nut-calendar-day-active .nut-calendar-day-info-curr {
172
188
  color: $color-primary-text;
173
189
  }
174
190
  }
@@ -176,6 +192,11 @@
176
192
  &-disabled {
177
193
  color: $calendar-disable-color !important;
178
194
 
195
+ &.nut-calendar-day-disabled .nut-calendar-day-day,
196
+ &.nut-calendar-day-disabled .nut-calendar-day-info-curr {
197
+ color: $calendar-disable-color;
198
+ }
199
+
179
200
  .nut-calendar-day-info-curr {
180
201
  display: none;
181
202
  }
@@ -185,10 +206,20 @@
185
206
  background-color: $calendar-choose-background-color;
186
207
  color: $calendar-choose-color;
187
208
 
209
+ &.nut-calendar-day-choose .nut-calendar-day-day,
210
+ &.nut-calendar-day-choose .nut-calendar-day-info-curr {
211
+ color: $calendar-choose-color;
212
+ }
213
+
188
214
  &-disabled {
189
215
  background-color: $calendar-choose-disable-background-color;
190
216
  color: $calendar-disable-color !important;
191
217
 
218
+ &.nut-calendar-day-choose-disabled .nut-calendar-day-day,
219
+ &.nut-calendar-day-choose-disabled .nut-calendar-day-info-curr {
220
+ color: $calendar-disable-color;
221
+ }
222
+
192
223
  .nut-calendar-day-info-curr {
193
224
  display: none;
194
225
  }
package/dist/es/packages/calendar/style-jrkf/style.css CHANGED
@@ -104,9 +104,17 @@
104
104
  font-weight: var(--nutui-calendar-day-font-weight, var(--nutui-font-weight-bold));
105
105
  margin-bottom: 4px;
106
106
  }
107
+ .nut-calendar-day-day, .nut-calendar-day-info-curr {
108
+ color: var(--nutui-color-title);
109
+ }
107
110
  .nut-calendar-day:nth-child(7n+0), .nut-calendar-day:nth-child(7n+1) {
108
111
  color: var(--nutui-color-primary, #ff6666);
109
112
  }
113
+ .nut-calendar-day:nth-child(7n+0) .nut-calendar-day-day,
114
+ .nut-calendar-day:nth-child(7n+0) .nut-calendar-day-info-curr, .nut-calendar-day:nth-child(7n+1) .nut-calendar-day-day,
115
+ .nut-calendar-day:nth-child(7n+1) .nut-calendar-day-info-curr {
116
+ color: var(--nutui-color-primary, #ff6666);
117
+ }
110
118
  .nut-calendar-day-info, .nut-calendar-day-info-curr {
111
119
  position: absolute;
112
120
  bottom: 5px;
@@ -139,12 +147,18 @@
139
147
  border-top-right-radius: var(--nutui-calendar-day-active-border-radius, 4px);
140
148
  border-bottom-right-radius: var(--nutui-calendar-day-active-border-radius, 4px);
141
149
  }
142
- .nut-calendar-day-active .nut-calendar-day-info {
150
+ .nut-calendar-day-active.nut-calendar-day-active .nut-calendar-day-info {
151
+ color: var(--nutui-color-text-dark);
152
+ }
153
+ .nut-calendar-day-active.nut-calendar-day-active .nut-calendar-day-day, .nut-calendar-day-active.nut-calendar-day-active .nut-calendar-day-info-curr {
143
154
  color: var(--nutui-color-text-dark);
144
155
  }
145
156
  .nut-calendar-day-disabled {
146
157
  color: var(--nutui-calendar-disable-color, var(--nutui-color-text-disabled)) !important;
147
158
  }
159
+ .nut-calendar-day-disabled.nut-calendar-day-disabled .nut-calendar-day-day, .nut-calendar-day-disabled.nut-calendar-day-disabled .nut-calendar-day-info-curr {
160
+ color: var(--nutui-calendar-disable-color, var(--nutui-color-text-disabled));
161
+ }
148
162
  .nut-calendar-day-disabled .nut-calendar-day-info-curr {
149
163
  display: none;
150
164
  }
@@ -152,10 +166,16 @@
152
166
  background-color: var(--nutui-calendar-choose-background-color, var(--nutui-color-primary-light, #ffe5e5));
153
167
  color: var(--nutui-calendar-choose-color, var(--nutui-color-primary, #ff6666));
154
168
  }
169
+ .nut-calendar-day-choose.nut-calendar-day-choose .nut-calendar-day-day, .nut-calendar-day-choose.nut-calendar-day-choose .nut-calendar-day-info-curr {
170
+ color: var(--nutui-calendar-choose-color, var(--nutui-color-primary, #ff6666));
171
+ }
155
172
  .nut-calendar-day-choose-disabled {
156
173
  background-color: var(--nutui-calendar-choose-disable-background-color, rgba(191, 191, 191, 0.09));
157
174
  color: var(--nutui-calendar-disable-color, var(--nutui-color-text-disabled)) !important;
158
175
  }
176
+ .nut-calendar-day-choose-disabled.nut-calendar-day-choose-disabled .nut-calendar-day-day, .nut-calendar-day-choose-disabled.nut-calendar-day-choose-disabled .nut-calendar-day-info-curr {
177
+ color: var(--nutui-calendar-disable-color, var(--nutui-color-text-disabled));
178
+ }
159
179
  .nut-calendar-day-choose-disabled .nut-calendar-day-info-curr {
160
180
  display: none;
161
181
  }
package/dist/es/packages/calendarcard/icon.js CHANGED
@@ -1,5 +1,5 @@
1
1
  import React from "react";
2
- import { Image, View } from "@tarojs/components";
2
+ import { Image } from "@tarojs/components";
3
3
  var left = 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxOCIgaGVpZ2h0PSIxOCIgdmlld0JveD0iMCAwIDE4IDE4Ij48cGF0aCBkPSJNNi42MDUgOS40OWEuNzcxLjc3MSAwIDAgMSAwLS45OGwzLjYtNC4zNzJhLjc3MS43NzEgMCAwIDEgMS4xOS45ODFMOC4yIDlsMy4xOTcgMy44ODFhLjc3MS43NzEgMCAxIDEtMS4xOTEuOThsLTMuNi00LjM3eiIvPjwvc3ZnPg==';
4
4
  var right = 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxOCIgaGVpZ2h0PSIxOCIgdmlld0JveD0iMCAwIDE4IDE4Ij48cGF0aCBkPSJNMTEuMzk2IDkuNDlhLjc3MS43NzEgMCAwIDAgMC0uOThsLTMuNi00LjM3MmEuNzcxLjc3MSAwIDAgMC0xLjE5MS45ODFMOS44IDlsLTMuMTk2IDMuODgxYS43NzEuNzcxIDAgMCAwIDEuMTkuOThsMy42LTQuMzd6Ii8+PC9zdmc+';
5
5
  var doubleLeft = 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxOCIgaGVpZ2h0PSIxOCIgdmlld0JveD0iMCAwIDE4IDE4Ij48cGF0aCBkPSJNMTMuODUzIDQuMDI2YS43NzEuNzcxIDAgMCAxIC4xMiAxLjA4NUwxMC44NjQgOWwzLjExIDMuODg5YS43NzEuNzcxIDAgMSAxLTEuMjA0Ljk2M2wtMy40OTgtNC4zN2EuNzcxLjc3MSAwIDAgMSAwLS45NjRsMy40OTctNC4zNzFhLjc3MS43NzEgMCAwIDEgMS4wODQtLjEyem0tNS4yNDUgMGEuNzcxLjc3MSAwIDAgMSAuMTIgMS4wODVMNS42MTcgOWwzLjExMSAzLjg4OWEuNzcxLjc3MSAwIDAgMS0xLjIwNS45NjNsLTMuNDk3LTQuMzdhLjc3MS43NzEgMCAwIDEgMC0uOTY0bDMuNDk3LTQuMzcxYS43NzEuNzcxIDAgMCAxIDEuMDg1LS4xMnoiLz48L3N2Zz4=';
@@ -12,20 +12,10 @@ if (process.env.TARO_ENV === 'jdharmony_cpp') {
12
12
  }
13
13
  var Icon = function(param) {
14
14
  var url = param.url;
15
- var style = {
16
- background: "url('".concat(url, "') no-repeat center"),
17
- backgroundSize: '100% 100%',
18
- width: 18,
19
- height: 18
20
- };
21
- if (process.env.TARO_ENV === 'jdharmony_cpp') {
22
- return /*#__PURE__*/ React.createElement(Image, {
23
- src: url,
24
- style: style
25
- });
26
- }
27
- return /*#__PURE__*/ React.createElement(View, {
28
- style: style
15
+ return /*#__PURE__*/ React.createElement(Image, {
16
+ className: "nut-calendarcard-icon",
17
+ src: url,
18
+ mode: "aspectFit"
29
19
  });
30
20
  };
31
21
  export var ArrowLeft = function() {
package/dist/es/packages/calendarcard/style/calendarcard.scss CHANGED
@@ -30,6 +30,12 @@
30
30
  }
31
31
  }
32
32
 
33
+ &-icon {
34
+ width: 18px;
35
+ height: 18px;
36
+ display: block;
37
+ }
38
+
33
39
  &-days {
34
40
  display: flex;
35
41
  flex-direction: row;
@@ -49,6 +55,13 @@
49
55
  margin-bottom: 4px;
50
56
  text-align: center;
51
57
 
58
+ // 部分 Taro 机型下子节点不会稳定继承父级 color，颜色直接落到最内层文案。
59
+ &-top,
60
+ &-inner,
61
+ &-bottom {
62
+ color: $color-title;
63
+ }
64
+
52
65
  &.header {
53
66
  cursor: auto;
54
67
  }
@@ -66,6 +79,12 @@
66
79
 
67
80
  &.weekend {
68
81
  color: $calendar-choose-color;
82
+
83
+ .nut-calendarcard-day-top,
84
+ .nut-calendarcard-day-inner,
85
+ .nut-calendarcard-day-bottom {
86
+ color: $calendar-choose-color;
87
+ }
69
88
  }
70
89
 
71
90
  &.active {
package/dist/es/packages/calendarcard/style/style.css CHANGED
@@ -29,6 +29,11 @@
29
29
  .nut-calendarcard-header-left .right, .nut-calendarcard-header-right .right {
30
30
  margin-right: 8px;
31
31
  }
32
+ .nut-calendarcard-icon {
33
+ width: 18px;
34
+ height: 18px;
35
+ display: block;
36
+ }
32
37
  .nut-calendarcard-days {
33
38
  display: flex;
34
39
  flex-direction: row;
@@ -47,6 +52,9 @@
47
52
  margin-bottom: 4px;
48
53
  text-align: center;
49
54
  }
55
+ .nut-calendarcard-day-top, .nut-calendarcard-day-inner, .nut-calendarcard-day-bottom {
56
+ color: var(--nutui-color-title, #1a1a1a);
57
+ }
50
58
  .nut-calendarcard-day.header {
51
59
  cursor: auto;
52
60
  }
@@ -62,6 +70,11 @@
62
70
  .nut-calendarcard-day.weekend {
63
71
  color: var(--nutui-calendar-choose-color, var(--nutui-color-primary, #ff0f23));
64
72
  }
73
+ .nut-calendarcard-day.weekend .nut-calendarcard-day-top,
74
+ .nut-calendarcard-day.weekend .nut-calendarcard-day-inner,
75
+ .nut-calendarcard-day.weekend .nut-calendarcard-day-bottom {
76
+ color: var(--nutui-calendar-choose-color, var(--nutui-color-primary, #ff0f23));
77
+ }
65
78
  .nut-calendarcard-day.active {
66
79
  background-color: var(--nutui-calendar-active-background-color, var(--nutui-color-primary, #ff0f23));
67
80
  border-radius: var(--nutui-calendar-day-active-border-radius, 4px);
package/dist/es/packages/calendarcard/style/style.harmony.css CHANGED
@@ -29,6 +29,11 @@
29
29
  .nut-calendarcard-header-left .right, .nut-calendarcard-header-right .right {
30
30
  margin-right: 8px;
31
31
  }
32
+ .nut-calendarcard-icon {
33
+ width: 18px;
34
+ height: 18px;
35
+ display: block;
36
+ }
32
37
  .nut-calendarcard-days {
33
38
  display: flex;
34
39
  flex-direction: row;
@@ -47,6 +52,9 @@
47
52
  margin-bottom: 4px;
48
53
  text-align: center;
49
54
  }
55
+ .nut-calendarcard-day-top, .nut-calendarcard-day-inner, .nut-calendarcard-day-bottom {
56
+ color: var(--nutui-color-title, #1a1a1a);
57
+ }
50
58
  .nut-calendarcard-day.header {
51
59
  cursor: auto;
52
60
  }
@@ -62,6 +70,11 @@
62
70
  .nut-calendarcard-day.weekend {
63
71
  color: var(--nutui-calendar-choose-color, var(--nutui-color-primary, #ff0f23));
64
72
  }
73
+ .nut-calendarcard-day.weekend .nut-calendarcard-day-top,
74
+ .nut-calendarcard-day.weekend .nut-calendarcard-day-inner,
75
+ .nut-calendarcard-day.weekend .nut-calendarcard-day-bottom {
76
+ color: var(--nutui-calendar-choose-color, var(--nutui-color-primary, #ff0f23));
77
+ }
65
78
  .nut-calendarcard-day.active {
66
79
  background-color: var(--nutui-calendar-active-background-color, var(--nutui-color-primary, #ff0f23));
67
80
  border-radius: var(--nutui-calendar-day-active-border-radius, 4px);
package/dist/es/packages/calendarcard/style-jmapp/calendarcard.scss CHANGED
@@ -30,6 +30,12 @@
30
30
  }
31
31
  }
32
32
 
33
+ &-icon {
34
+ width: 18px;
35
+ height: 18px;
36
+ display: block;
37
+ }
38
+
33
39
  &-days {
34
40
  display: flex;
35
41
  flex-direction: row;
@@ -49,6 +55,13 @@
49
55
  margin-bottom: 4px;
50
56
  text-align: center;
51
57
 
58
+ // 部分 Taro 机型下子节点不会稳定继承父级 color，颜色直接落到最内层文案。
59
+ &-top,
60
+ &-inner,
61
+ &-bottom {
62
+ color: $color-title;
63
+ }
64
+
52
65
  &.header {
53
66
  cursor: auto;
54
67
  }
@@ -66,6 +79,12 @@
66
79
 
67
80
  &.weekend {
68
81
  color: $calendar-choose-color;
82
+
83
+ .nut-calendarcard-day-top,
84
+ .nut-calendarcard-day-inner,
85
+ .nut-calendarcard-day-bottom {
86
+ color: $calendar-choose-color;
87
+ }
69
88
  }
70
89
 
71
90
  &.active {
package/dist/es/packages/calendarcard/style-jmapp/style.css CHANGED
@@ -29,6 +29,11 @@
29
29
  .nut-calendarcard-header-left .right, .nut-calendarcard-header-right .right {
30
30
  margin-right: 8px;
31
31
  }
32
+ .nut-calendarcard-icon {
33
+ width: 18px;
34
+ height: 18px;
35
+ display: block;
36
+ }
32
37
  .nut-calendarcard-days {
33
38
  display: flex;
34
39
  flex-direction: row;
@@ -47,6 +52,9 @@
47
52
  margin-bottom: 4px;
48
53
  text-align: center;
49
54
  }
55
+ .nut-calendarcard-day-top, .nut-calendarcard-day-inner, .nut-calendarcard-day-bottom {
56
+ color: var(--nutui-color-title);
57
+ }
50
58
  .nut-calendarcard-day.header {
51
59
  cursor: auto;
52
60
  }
@@ -62,6 +70,11 @@
62
70
  .nut-calendarcard-day.weekend {
63
71
  color: var(--nutui-calendar-choose-color, var(--nutui-color-primary));
64
72
  }
73
+ .nut-calendarcard-day.weekend .nut-calendarcard-day-top,
74
+ .nut-calendarcard-day.weekend .nut-calendarcard-day-inner,
75
+ .nut-calendarcard-day.weekend .nut-calendarcard-day-bottom {
76
+ color: var(--nutui-calendar-choose-color, var(--nutui-color-primary));
77
+ }
65
78
  .nut-calendarcard-day.active {
66
79
  background-color: var(--nutui-calendar-active-background-color, var(--nutui-color-primary));
67
80
  border-radius: var(--nutui-calendar-day-active-border-radius, 4px);
package/dist/es/packages/calendarcard/style-jrkf/calendarcard.scss CHANGED
@@ -30,6 +30,12 @@
30
30
  }
31
31
  }
32
32
 
33
+ &-icon {
34
+ width: 18px;
35
+ height: 18px;
36
+ display: block;
37
+ }
38
+
33
39
  &-days {
34
40
  display: flex;
35
41
  flex-direction: row;
@@ -49,6 +55,13 @@
49
55
  margin-bottom: 4px;
50
56
  text-align: center;
51
57
 
58
+ // 部分 Taro 机型下子节点不会稳定继承父级 color，颜色直接落到最内层文案。
59
+ &-top,
60
+ &-inner,
61
+ &-bottom {
62
+ color: $color-title;
63
+ }
64
+
52
65
  &.header {
53
66
  cursor: auto;
54
67
  }
@@ -66,6 +79,12 @@
66
79
 
67
80
  &.weekend {
68
81
  color: $calendar-choose-color;
82
+
83
+ .nut-calendarcard-day-top,
84
+ .nut-calendarcard-day-inner,
85
+ .nut-calendarcard-day-bottom {
86
+ color: $calendar-choose-color;
87
+ }
69
88
  }
70
89
 
71
90
  &.active {
package/dist/es/packages/calendarcard/style-jrkf/style.css CHANGED
@@ -29,6 +29,11 @@
29
29
  .nut-calendarcard-header-left .right, .nut-calendarcard-header-right .right {
30
30
  margin-right: 8px;
31
31
  }
32
+ .nut-calendarcard-icon {
33
+ width: 18px;
34
+ height: 18px;
35
+ display: block;
36
+ }
32
37
  .nut-calendarcard-days {
33
38
  display: flex;
34
39
  flex-direction: row;
@@ -47,6 +52,9 @@
47
52
  margin-bottom: 4px;
48
53
  text-align: center;
49
54
  }
55
+ .nut-calendarcard-day-top, .nut-calendarcard-day-inner, .nut-calendarcard-day-bottom {
56
+ color: var(--nutui-color-title);
57
+ }
50
58
  .nut-calendarcard-day.header {
51
59
  cursor: auto;
52
60
  }
@@ -62,6 +70,11 @@
62
70
  .nut-calendarcard-day.weekend {
63
71
  color: var(--nutui-calendar-choose-color, var(--nutui-color-primary, #ff6666));
64
72
  }
73
+ .nut-calendarcard-day.weekend .nut-calendarcard-day-top,
74
+ .nut-calendarcard-day.weekend .nut-calendarcard-day-inner,
75
+ .nut-calendarcard-day.weekend .nut-calendarcard-day-bottom {
76
+ color: var(--nutui-calendar-choose-color, var(--nutui-color-primary, #ff6666));
77
+ }
65
78
  .nut-calendarcard-day.active {
66
79
  background-color: var(--nutui-calendar-active-background-color, var(--nutui-color-primary, #ff6666));
67
80
  border-radius: var(--nutui-calendar-day-active-border-radius, 4px);