@nutui/nutui-react 4.0.0-beta.1 → 4.0.0-beta.3

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 (259) hide show
  1. package/CHANGELOG.md +33 -18
  2. package/dist/cjs/packages/actionsheet/style/style.css +1 -5
  3. package/dist/cjs/packages/address/style/style.css +2 -6
  4. package/dist/cjs/packages/animate/style/style.css +0 -4
  5. package/dist/cjs/packages/animatingnumbers/style/style.css +1 -6
  6. package/dist/cjs/packages/audio/style/style.css +2 -6
  7. package/dist/cjs/packages/avatar/style/style.css +0 -4
  8. package/dist/cjs/packages/avatarcropper/style/style.css +0 -4
  9. package/dist/cjs/packages/avatargroup/style/style.css +0 -4
  10. package/dist/cjs/packages/backtop/style/style.css +0 -4
  11. package/dist/cjs/packages/badge/style/style.css +5 -9
  12. package/dist/cjs/packages/barrage/style/style.css +0 -4
  13. package/dist/cjs/packages/button/style/style.css +21 -25
  14. package/dist/cjs/packages/calendar/style/style.css +8 -12
  15. package/dist/cjs/packages/calendarcard/style/style.css +4 -8
  16. package/dist/cjs/packages/calendaritem/style/style.css +1 -6
  17. package/dist/cjs/packages/card/style/style.css +0 -4
  18. package/dist/cjs/packages/cascader/style/style.css +0 -4
  19. package/dist/cjs/packages/cell/style/style.css +0 -4
  20. package/dist/cjs/packages/cellgroup/style/style.css +0 -4
  21. package/dist/cjs/packages/checkbox/style/style.css +6 -10
  22. package/dist/cjs/packages/checkboxgroup/style/style.css +0 -4
  23. package/dist/cjs/packages/circleprogress/style/style.css +0 -4
  24. package/dist/cjs/packages/col/style/style.css +0 -4
  25. package/dist/cjs/packages/collapse/style/style.css +1 -6
  26. package/dist/cjs/packages/collapseitem/style/style.css +3 -7
  27. package/dist/cjs/packages/configprovider/style/style.css +1 -6
  28. package/dist/cjs/packages/configprovider/types.d.ts +1 -1
  29. package/dist/cjs/packages/countdown/style/style.css +1 -5
  30. package/dist/cjs/packages/countup/style/style.css +0 -4
  31. package/dist/cjs/packages/datepicker/style/style.css +1 -6
  32. package/dist/cjs/packages/datepickerview/style/style.css +0 -4
  33. package/dist/cjs/packages/dialog/style/style.css +1 -5
  34. package/dist/cjs/packages/divider/style/style.css +0 -4
  35. package/dist/cjs/packages/drag/style/style.css +0 -4
  36. package/dist/cjs/packages/elevator/style/style.css +1 -5
  37. package/dist/cjs/packages/ellipsis/style/style.css +0 -4
  38. package/dist/cjs/packages/empty/style/style.css +0 -4
  39. package/dist/cjs/packages/fixednav/style/style.css +0 -4
  40. package/dist/cjs/packages/form/style/style.css +1 -6
  41. package/dist/cjs/packages/formitem/style/style.css +0 -4
  42. package/dist/cjs/packages/grid/style/style.css +0 -4
  43. package/dist/cjs/packages/griditem/style/style.css +0 -4
  44. package/dist/cjs/packages/hoverbutton/style/style.css +0 -4
  45. package/dist/cjs/packages/hoverbuttonitem/style/style.css +0 -4
  46. package/dist/cjs/packages/image/style/style.css +0 -4
  47. package/dist/cjs/packages/imagepreview/style/style.css +0 -4
  48. package/dist/cjs/packages/indicator/indicator.js +6 -7
  49. package/dist/cjs/packages/indicator/style/indicator.scss +85 -37
  50. package/dist/cjs/packages/indicator/style/style.css +71 -36
  51. package/dist/cjs/packages/indicator/style-jmapp/indicator.scss +85 -37
  52. package/dist/cjs/packages/indicator/style-jmapp/style.css +65 -26
  53. package/dist/cjs/packages/indicator/style-jrkf/indicator.scss +85 -37
  54. package/dist/cjs/packages/indicator/style-jrkf/style.css +65 -26
  55. package/dist/cjs/packages/infiniteloading/style/style.css +0 -4
  56. package/dist/cjs/packages/input/style/style.css +4 -8
  57. package/dist/cjs/packages/inputnumber/style/style.css +3 -7
  58. package/dist/cjs/packages/layout/style/style.css +1 -6
  59. package/dist/cjs/packages/loading/style/style.css +0 -4
  60. package/dist/cjs/packages/lottie/style/style.css +1 -6
  61. package/dist/cjs/packages/menu/style/style.css +1 -5
  62. package/dist/cjs/packages/menuitem/style/style.css +0 -4
  63. package/dist/cjs/packages/navbar/style/style.css +0 -4
  64. package/dist/cjs/packages/noticebar/style/style.css +0 -4
  65. package/dist/cjs/packages/notify/style/style.css +0 -4
  66. package/dist/cjs/packages/numberkeyboard/style/style.css +0 -4
  67. package/dist/cjs/packages/overlay/style/style.css +0 -4
  68. package/dist/cjs/packages/pagination/style/style.css +2 -6
  69. package/dist/cjs/packages/picker/style/style.css +0 -4
  70. package/dist/cjs/packages/pickerview/style/style.css +0 -4
  71. package/dist/cjs/packages/popover/style/style.css +1 -5
  72. package/dist/cjs/packages/popup/style/style.css +0 -4
  73. package/dist/cjs/packages/price/style/style.css +0 -4
  74. package/dist/cjs/packages/progress/style/style.css +0 -4
  75. package/dist/cjs/packages/pulltorefresh/style/style.css +0 -4
  76. package/dist/cjs/packages/quickenter/style/style.css +0 -4
  77. package/dist/cjs/packages/radio/style/style.css +6 -10
  78. package/dist/cjs/packages/radiogroup/style/style.css +2 -6
  79. package/dist/cjs/packages/range/style/style.css +1 -5
  80. package/dist/cjs/packages/rate/style/style.css +0 -4
  81. package/dist/cjs/packages/resultpage/style/style.css +0 -4
  82. package/dist/cjs/packages/row/style/style.css +0 -4
  83. package/dist/cjs/packages/safearea/style/style.css +0 -4
  84. package/dist/cjs/packages/searchbar/style/style.css +1 -5
  85. package/dist/cjs/packages/segmented/style/style.css +1 -5
  86. package/dist/cjs/packages/shortpassword/style/style.css +1 -5
  87. package/dist/cjs/packages/sidebar/style/style.css +1 -5
  88. package/dist/cjs/packages/sidebaritem/style/style.css +0 -4
  89. package/dist/cjs/packages/signature/style/style.css +0 -4
  90. package/dist/cjs/packages/skeleton/style/style.css +0 -4
  91. package/dist/cjs/packages/space/style/style.css +0 -4
  92. package/dist/cjs/packages/step/style/style.css +1 -5
  93. package/dist/cjs/packages/steps/style/style.css +0 -4
  94. package/dist/cjs/packages/sticky/style/style.css +0 -4
  95. package/dist/cjs/packages/swipe/style/style.css +0 -4
  96. package/dist/cjs/packages/swiper/style/style.css +0 -4
  97. package/dist/cjs/packages/swiperitem/style/style.css +0 -4
  98. package/dist/cjs/packages/switch/style/style.css +35 -34
  99. package/dist/cjs/packages/switch/style/switch.scss +31 -18
  100. package/dist/cjs/packages/switch/style-jmapp/style.css +22 -17
  101. package/dist/cjs/packages/switch/style-jmapp/switch.scss +31 -18
  102. package/dist/cjs/packages/switch/style-jrkf/style.css +22 -17
  103. package/dist/cjs/packages/switch/style-jrkf/switch.scss +31 -18
  104. package/dist/cjs/packages/tabbar/style/style.css +0 -4
  105. package/dist/cjs/packages/tabbaritem/style/style.css +0 -4
  106. package/dist/cjs/packages/table/style/style.css +0 -4
  107. package/dist/cjs/packages/tabpane/style/style.css +0 -4
  108. package/dist/cjs/packages/tabs/style/style.css +3 -7
  109. package/dist/cjs/packages/tag/style/style.css +0 -4
  110. package/dist/cjs/packages/textarea/style/style.css +5 -9
  111. package/dist/cjs/packages/timedetail/style/style.css +0 -4
  112. package/dist/cjs/packages/timeselect/style/style.css +0 -4
  113. package/dist/cjs/packages/toast/style/style.css +0 -4
  114. package/dist/cjs/packages/tour/style/style.css +1 -5
  115. package/dist/cjs/packages/trendarrow/style/style.css +0 -4
  116. package/dist/cjs/packages/uploader/style/style.css +2 -6
  117. package/dist/cjs/packages/video/style/style.css +0 -4
  118. package/dist/cjs/packages/virtuallist/style/style.css +0 -4
  119. package/dist/cjs/packages/watermark/style/style.css +0 -4
  120. package/dist/cjs/types/spec/indicator/base.d.ts +2 -0
  121. package/dist/cjs/utils/scale-f.d.ts +0 -17
  122. package/dist/cjs/utils/scale-f.js +14 -105
  123. package/dist/es/packages/actionsheet/style/style.css +1 -5
  124. package/dist/es/packages/address/style/style.css +2 -6
  125. package/dist/es/packages/animate/style/style.css +0 -4
  126. package/dist/es/packages/animatingnumbers/style/style.css +1 -6
  127. package/dist/es/packages/audio/style/style.css +2 -6
  128. package/dist/es/packages/avatar/style/style.css +0 -4
  129. package/dist/es/packages/avatarcropper/style/style.css +0 -4
  130. package/dist/es/packages/avatargroup/style/style.css +0 -4
  131. package/dist/es/packages/backtop/style/style.css +0 -4
  132. package/dist/es/packages/badge/style/style.css +5 -9
  133. package/dist/es/packages/barrage/style/style.css +0 -4
  134. package/dist/es/packages/button/style/style.css +21 -25
  135. package/dist/es/packages/calendar/style/style.css +8 -12
  136. package/dist/es/packages/calendarcard/style/style.css +4 -8
  137. package/dist/es/packages/calendaritem/style/style.css +1 -6
  138. package/dist/es/packages/card/style/style.css +0 -4
  139. package/dist/es/packages/cascader/style/style.css +0 -4
  140. package/dist/es/packages/cell/style/style.css +0 -4
  141. package/dist/es/packages/cellgroup/style/style.css +0 -4
  142. package/dist/es/packages/checkbox/style/style.css +6 -10
  143. package/dist/es/packages/checkboxgroup/style/style.css +0 -4
  144. package/dist/es/packages/circleprogress/style/style.css +0 -4
  145. package/dist/es/packages/col/style/style.css +0 -4
  146. package/dist/es/packages/collapse/style/style.css +1 -6
  147. package/dist/es/packages/collapseitem/style/style.css +3 -7
  148. package/dist/es/packages/configprovider/style/style.css +1 -6
  149. package/dist/es/packages/configprovider/types.d.ts +1 -1
  150. package/dist/es/packages/countdown/style/style.css +1 -5
  151. package/dist/es/packages/countup/style/style.css +0 -4
  152. package/dist/es/packages/datepicker/style/style.css +1 -6
  153. package/dist/es/packages/datepickerview/style/style.css +0 -4
  154. package/dist/es/packages/dialog/style/style.css +1 -5
  155. package/dist/es/packages/divider/style/style.css +0 -4
  156. package/dist/es/packages/drag/style/style.css +0 -4
  157. package/dist/es/packages/elevator/style/style.css +1 -5
  158. package/dist/es/packages/ellipsis/style/style.css +0 -4
  159. package/dist/es/packages/empty/style/style.css +0 -4
  160. package/dist/es/packages/fixednav/style/style.css +0 -4
  161. package/dist/es/packages/form/style/style.css +1 -6
  162. package/dist/es/packages/formitem/style/style.css +0 -4
  163. package/dist/es/packages/grid/style/style.css +0 -4
  164. package/dist/es/packages/griditem/style/style.css +0 -4
  165. package/dist/es/packages/hoverbutton/style/style.css +0 -4
  166. package/dist/es/packages/hoverbuttonitem/style/style.css +0 -4
  167. package/dist/es/packages/image/style/style.css +0 -4
  168. package/dist/es/packages/imagepreview/style/style.css +0 -4
  169. package/dist/es/packages/indicator/indicator.js +6 -7
  170. package/dist/es/packages/indicator/style/indicator.scss +85 -37
  171. package/dist/es/packages/indicator/style/style.css +71 -36
  172. package/dist/es/packages/indicator/style-jmapp/indicator.scss +85 -37
  173. package/dist/es/packages/indicator/style-jmapp/style.css +65 -26
  174. package/dist/es/packages/indicator/style-jrkf/indicator.scss +85 -37
  175. package/dist/es/packages/indicator/style-jrkf/style.css +65 -26
  176. package/dist/es/packages/infiniteloading/style/style.css +0 -4
  177. package/dist/es/packages/input/style/style.css +4 -8
  178. package/dist/es/packages/inputnumber/style/style.css +3 -7
  179. package/dist/es/packages/layout/style/style.css +1 -6
  180. package/dist/es/packages/loading/style/style.css +0 -4
  181. package/dist/es/packages/lottie/style/style.css +1 -6
  182. package/dist/es/packages/menu/style/style.css +1 -5
  183. package/dist/es/packages/menuitem/style/style.css +0 -4
  184. package/dist/es/packages/navbar/style/style.css +0 -4
  185. package/dist/es/packages/noticebar/style/style.css +0 -4
  186. package/dist/es/packages/notify/style/style.css +0 -4
  187. package/dist/es/packages/numberkeyboard/style/style.css +0 -4
  188. package/dist/es/packages/overlay/style/style.css +0 -4
  189. package/dist/es/packages/pagination/style/style.css +2 -6
  190. package/dist/es/packages/picker/style/style.css +0 -4
  191. package/dist/es/packages/pickerview/style/style.css +0 -4
  192. package/dist/es/packages/popover/style/style.css +1 -5
  193. package/dist/es/packages/popup/style/style.css +0 -4
  194. package/dist/es/packages/price/style/style.css +0 -4
  195. package/dist/es/packages/progress/style/style.css +0 -4
  196. package/dist/es/packages/pulltorefresh/style/style.css +0 -4
  197. package/dist/es/packages/quickenter/style/style.css +0 -4
  198. package/dist/es/packages/radio/style/style.css +6 -10
  199. package/dist/es/packages/radiogroup/style/style.css +2 -6
  200. package/dist/es/packages/range/style/style.css +1 -5
  201. package/dist/es/packages/rate/style/style.css +0 -4
  202. package/dist/es/packages/resultpage/style/style.css +0 -4
  203. package/dist/es/packages/row/style/style.css +0 -4
  204. package/dist/es/packages/safearea/style/style.css +0 -4
  205. package/dist/es/packages/searchbar/style/style.css +1 -5
  206. package/dist/es/packages/segmented/style/style.css +1 -5
  207. package/dist/es/packages/shortpassword/style/style.css +1 -5
  208. package/dist/es/packages/sidebar/style/style.css +1 -5
  209. package/dist/es/packages/sidebaritem/style/style.css +0 -4
  210. package/dist/es/packages/signature/style/style.css +0 -4
  211. package/dist/es/packages/skeleton/style/style.css +0 -4
  212. package/dist/es/packages/space/style/style.css +0 -4
  213. package/dist/es/packages/step/style/style.css +1 -5
  214. package/dist/es/packages/steps/style/style.css +0 -4
  215. package/dist/es/packages/sticky/style/style.css +0 -4
  216. package/dist/es/packages/swipe/style/style.css +0 -4
  217. package/dist/es/packages/swiper/style/style.css +0 -4
  218. package/dist/es/packages/swiperitem/style/style.css +0 -4
  219. package/dist/es/packages/switch/style/style.css +35 -34
  220. package/dist/es/packages/switch/style/switch.scss +31 -18
  221. package/dist/es/packages/switch/style-jmapp/style.css +22 -17
  222. package/dist/es/packages/switch/style-jmapp/switch.scss +31 -18
  223. package/dist/es/packages/switch/style-jrkf/style.css +22 -17
  224. package/dist/es/packages/switch/style-jrkf/switch.scss +31 -18
  225. package/dist/es/packages/tabbar/style/style.css +0 -4
  226. package/dist/es/packages/tabbaritem/style/style.css +0 -4
  227. package/dist/es/packages/table/style/style.css +0 -4
  228. package/dist/es/packages/tabpane/style/style.css +0 -4
  229. package/dist/es/packages/tabs/style/style.css +3 -7
  230. package/dist/es/packages/tag/style/style.css +0 -4
  231. package/dist/es/packages/textarea/style/style.css +5 -9
  232. package/dist/es/packages/timedetail/style/style.css +0 -4
  233. package/dist/es/packages/timeselect/style/style.css +0 -4
  234. package/dist/es/packages/toast/style/style.css +0 -4
  235. package/dist/es/packages/tour/style/style.css +1 -5
  236. package/dist/es/packages/trendarrow/style/style.css +0 -4
  237. package/dist/es/packages/uploader/style/style.css +2 -6
  238. package/dist/es/packages/video/style/style.css +0 -4
  239. package/dist/es/packages/virtuallist/style/style.css +0 -4
  240. package/dist/es/packages/watermark/style/style.css +0 -4
  241. package/dist/es/types/spec/indicator/base.d.ts +5 -0
  242. package/dist/es/utils/scale-f.d.ts +0 -17
  243. package/dist/es/utils/scale-f.js +15 -106
  244. package/dist/nutui.react.umd.js +12 -102
  245. package/dist/style-jmapp.css +1 -1
  246. package/dist/style-jmapp.scss +33 -33
  247. package/dist/style-jrkf.css +1 -1
  248. package/dist/style-jrkf.scss +34 -34
  249. package/dist/style.css +1 -1
  250. package/dist/style.scss +42 -42
  251. package/dist/styles/theme-dark.scss +5 -2
  252. package/dist/styles/theme-default.scss +4 -1
  253. package/dist/styles/themes/dark.css +1 -1
  254. package/dist/styles/themes/default.css +1 -1
  255. package/dist/styles/variables-daojia.scss +28 -0
  256. package/dist/styles/variables-jmapp.scss +28 -0
  257. package/dist/styles/variables-jrkf.scss +28 -0
  258. package/dist/styles/variables.scss +41 -22
  259. package/package.json +1 -1
@@ -6,7 +6,7 @@
6
6
  align-items: center;
7
7
 
8
8
  &-fixed-width {
9
- width: scale-px(21px);
9
+ width: $indicator-track-width;
10
10
  }
11
11
 
12
12
  &-dot,
@@ -16,9 +16,10 @@
16
16
  width: $indicator-dot-size;
17
17
  height: $indicator-dot-size;
18
18
  border-radius: 50%;
19
- background-color: $color-border-disabled;
19
+ background-color: $indicator-dot-inactive-color;
20
+ border: $indicator-dot-border;
21
+ box-sizing: border-box;
20
22
  margin-left: $indicator-dot-margin;
21
- opacity: 0.4;
22
23
 
23
24
  &-0 {
24
25
  margin-left: 0;
@@ -26,21 +27,23 @@
26
27
 
27
28
  &-active {
28
29
  width: $indicator-dot-active-size;
30
+ height: $indicator-dot-size;
29
31
  border-radius: $indicator-border-radius;
30
32
  background: $indicator-color;
31
- opacity: 1;
33
+ border: $indicator-dot-border;
32
34
  }
33
35
  }
34
36
 
35
- // 固定宽度
37
+ // 双屏模式
36
38
  &-fixed-width {
37
- // 两个页码的时候
38
39
  .nut-indicator-dot {
39
- width: scale-px(12px);
40
+ width: $indicator-dual-screen-inactive-width;
41
+ height: $indicator-dot-size;
40
42
  border-radius: $indicator-border-radius;
41
43
 
42
44
  &-active {
43
- width: scale-px(6px);
45
+ width: $indicator-dot-active-size;
46
+ height: $indicator-dot-size;
44
47
  }
45
48
  }
46
49
  }
@@ -49,44 +52,71 @@
49
52
  // 竖向固定高度
50
53
  &.nut-indicator-fixed-width {
51
54
  justify-content: flex-start;
52
- height: scale-px(21px);
55
+ height: $indicator-track-width;
53
56
  width: auto;
54
57
 
55
- // 竖向两个页码
58
+ // 竖向双屏
56
59
  .nut-indicator-dot {
57
- width: scale-px(3px);
58
- height: scale-px(12px);
60
+ width: $indicator-dot-size;
61
+ height: $indicator-dual-screen-inactive-width;
59
62
  border-radius: $indicator-border-radius;
60
63
 
61
64
  &-active {
62
- height: scale-px(6px);
63
- }
64
- }
65
-
66
- &.nut-indicator-fixed-width {
67
- &.nut-indicator-white {
68
- .nut-indicator-dot {
69
- &-active {
70
- height: scale-px(6px);
71
- }
72
- }
65
+ width: $indicator-dot-size;
66
+ height: $indicator-dot-active-size;
73
67
  }
74
68
  }
75
69
  }
76
70
  }
77
71
 
78
72
  &-line {
79
- width: $indicator-dot-active-size;
73
+ width: $indicator-slider-width;
80
74
  margin: 0;
81
-
82
75
  border-radius: $indicator-border-radius;
83
76
  background-color: transparent;
77
+ border: none;
84
78
 
85
79
  &-active {
80
+ position: relative;
81
+ z-index: 1;
86
82
  transition: transform 0.3s ease-in-out;
87
83
  background: $indicator-color;
84
+ border: $indicator-dot-border;
85
+ transform: translateX(
86
+ calc(
87
+ var(--nutui-indicator-current, 0) /
88
+ (var(--nutui-indicator-total, 2) - 1) *
89
+ (#{$indicator-track-width} - #{$indicator-slider-width})
90
+ )
91
+ );
88
92
  }
89
93
  }
94
+
95
+ // 定位布局
96
+ &-outside {
97
+ margin-top: $indicator-placement-gap;
98
+ margin-bottom: $indicator-placement-safe-gap;
99
+ justify-content: center;
100
+ }
101
+
102
+ &-inside-top-right {
103
+ position: absolute;
104
+ top: $indicator-placement-gap;
105
+ right: $indicator-placement-gap;
106
+ }
107
+
108
+ &-inside-bottom-center {
109
+ position: absolute;
110
+ bottom: $indicator-placement-gap;
111
+ left: 50%;
112
+ transform: translateX(-50%);
113
+ }
114
+
115
+ &-inside-bottom-left {
116
+ position: absolute;
117
+ bottom: $indicator-placement-gap;
118
+ left: $indicator-placement-gap;
119
+ }
90
120
  }
91
121
 
92
122
  .nut-indicator-track {
@@ -100,8 +130,8 @@
100
130
  height: 100%;
101
131
  box-sizing: border-box;
102
132
  border-radius: $indicator-border-radius;
103
- background-color: $color-border-disabled;
104
- opacity: 0.4;
133
+ background-color: $indicator-dot-inactive-color;
134
+ border: $indicator-dot-border;
105
135
  }
106
136
  }
107
137
 
@@ -110,11 +140,8 @@
110
140
  &-dot,
111
141
  &-line {
112
142
  position: relative;
113
- /* #ifndef dynamic*/
114
- box-sizing: content-box;
115
- /* #endif */
116
- background: rgba(255, 255, 255, 0.4);
117
- opacity: 1;
143
+ background: $color-primary-text;
144
+ opacity: 0.4;
118
145
  }
119
146
 
120
147
  &-line {
@@ -122,13 +149,14 @@
122
149
 
123
150
  &-active {
124
151
  opacity: 1;
125
- background: rgba(255, 255, 255, 1);
152
+ background: $color-primary-text;
126
153
  }
127
154
  }
128
155
 
129
156
  &-dot {
130
157
  &-active {
131
- background: rgba(255, 255, 255, 1);
158
+ background: $color-primary-text;
159
+ opacity: 1;
132
160
  }
133
161
  }
134
162
  }
@@ -136,8 +164,8 @@
136
164
 
137
165
  .nut-indicator-track.nut-indicator-white {
138
166
  &:after {
139
- border: scale-px(1px) solid rgba(0, 0, 0, 0.06);
140
- background: rgba(255, 255, 255, 0.4);
167
+ background: $color-primary-text;
168
+ opacity: 0.4;
141
169
  }
142
170
  }
143
171
 
@@ -167,7 +195,17 @@
167
195
  .nut-indicator {
168
196
  &-line {
169
197
  width: $indicator-dot-size;
170
- height: $indicator-dot-active-size;
198
+ height: $indicator-slider-width;
199
+
200
+ &-active {
201
+ transform: translateY(
202
+ calc(
203
+ var(--nutui-indicator-current, 0) /
204
+ (var(--nutui-indicator-total, 2) - 1) *
205
+ (#{$indicator-track-width} - #{$indicator-slider-width})
206
+ )
207
+ );
208
+ }
171
209
  }
172
210
  }
173
211
  }
@@ -181,4 +219,14 @@
181
219
  margin-left: 0;
182
220
  }
183
221
  }
222
+
223
+ &-inside-top-right {
224
+ right: auto;
225
+ left: $indicator-placement-gap;
226
+ }
227
+
228
+ &-inside-bottom-left {
229
+ left: auto;
230
+ right: $indicator-placement-gap;
231
+ }
184
232
  }
@@ -10,7 +10,7 @@
10
10
  align-items: center;
11
11
  }
12
12
  .nut-indicator-fixed-width {
13
- width: scale-px(21px);
13
+ width: var(--nutui-indicator-track-width, 24px);
14
14
  }
15
15
  .nut-indicator-dot, .nut-indicator-line {
16
16
  display: inline-block;
@@ -18,51 +18,79 @@
18
18
  width: var(--nutui-indicator-dot-size, 6px);
19
19
  height: var(--nutui-indicator-dot-size, 6px);
20
20
  border-radius: 50%;
21
- background-color: var(--nutui-color-border-disabled, #c2c4cc);
21
+ background-color: var(--nutui-indicator-dot-inactive-color, #f0f2f7);
22
+ border: var(--nutui-indicator-dot-border, 0.33px solid var(--nutui-color-border));
23
+ box-sizing: border-box;
22
24
  margin-left: var(--nutui-indicator-dot-margin, var(--nutui-spacing-xs));
23
- opacity: 0.4;
24
25
  }
25
26
  .nut-indicator-dot-0, .nut-indicator-line-0 {
26
27
  margin-left: 0;
27
28
  }
28
29
  .nut-indicator-dot-active, .nut-indicator-line-active {
29
30
  width: var(--nutui-indicator-dot-active-size, 20px);
31
+ height: var(--nutui-indicator-dot-size, 6px);
30
32
  border-radius: var(--nutui-indicator-border-radius, 2px);
31
33
  background: var(--nutui-indicator-color, var(--nutui-color-primary, #ff6666));
32
- opacity: 1;
34
+ border: var(--nutui-indicator-dot-border, 0.33px solid var(--nutui-color-border));
33
35
  }
34
36
  .nut-indicator-fixed-width .nut-indicator-dot {
35
- width: scale-px(12px);
37
+ width: var(--nutui-indicator-dual-screen-inactive-width, 16px);
38
+ height: var(--nutui-indicator-dot-size, 6px);
36
39
  border-radius: var(--nutui-indicator-border-radius, 2px);
37
40
  }
38
41
  .nut-indicator-fixed-width .nut-indicator-dot-active {
39
- width: scale-px(6px);
42
+ width: var(--nutui-indicator-dot-active-size, 20px);
43
+ height: var(--nutui-indicator-dot-size, 6px);
40
44
  }
41
45
  .nut-indicator-vertical.nut-indicator-fixed-width {
42
46
  justify-content: flex-start;
43
- height: scale-px(21px);
47
+ height: var(--nutui-indicator-track-width, 24px);
44
48
  width: auto;
45
49
  }
46
50
  .nut-indicator-vertical.nut-indicator-fixed-width .nut-indicator-dot {
47
- width: scale-px(3px);
48
- height: scale-px(12px);
51
+ width: var(--nutui-indicator-dot-size, 6px);
52
+ height: var(--nutui-indicator-dual-screen-inactive-width, 16px);
49
53
  border-radius: var(--nutui-indicator-border-radius, 2px);
50
54
  }
51
55
  .nut-indicator-vertical.nut-indicator-fixed-width .nut-indicator-dot-active {
52
- height: scale-px(6px);
53
- }
54
- .nut-indicator-vertical.nut-indicator-fixed-width.nut-indicator-fixed-width.nut-indicator-white .nut-indicator-dot-active {
55
- height: scale-px(6px);
56
+ width: var(--nutui-indicator-dot-size, 6px);
57
+ height: var(--nutui-indicator-dot-active-size, 20px);
56
58
  }
57
59
  .nut-indicator-line {
58
- width: var(--nutui-indicator-dot-active-size, 20px);
60
+ width: var(--nutui-indicator-slider-width, 8px);
59
61
  margin: 0;
60
62
  border-radius: var(--nutui-indicator-border-radius, 2px);
61
63
  background-color: transparent;
64
+ border: none;
62
65
  }
63
66
  .nut-indicator-line-active {
67
+ position: relative;
68
+ z-index: 1;
64
69
  transition: transform 0.3s ease-in-out;
65
70
  background: var(--nutui-indicator-color, var(--nutui-color-primary, #ff6666));
71
+ border: var(--nutui-indicator-dot-border, 0.33px solid var(--nutui-color-border));
72
+ transform: translateX(calc(var(--nutui-indicator-current, 0) / (var(--nutui-indicator-total, 2) - 1) * (var(--nutui-indicator-track-width, 24px) - var(--nutui-indicator-slider-width, 8px))));
73
+ }
74
+ .nut-indicator-outside {
75
+ margin-top: var(--nutui-indicator-placement-gap, 8px);
76
+ margin-bottom: var(--nutui-indicator-placement-safe-gap, 12px);
77
+ justify-content: center;
78
+ }
79
+ .nut-indicator-inside-top-right {
80
+ position: absolute;
81
+ top: var(--nutui-indicator-placement-gap, 8px);
82
+ right: var(--nutui-indicator-placement-gap, 8px);
83
+ }
84
+ .nut-indicator-inside-bottom-center {
85
+ position: absolute;
86
+ bottom: var(--nutui-indicator-placement-gap, 8px);
87
+ left: 50%;
88
+ transform: translateX(-50%);
89
+ }
90
+ .nut-indicator-inside-bottom-left {
91
+ position: absolute;
92
+ bottom: var(--nutui-indicator-placement-gap, 8px);
93
+ left: var(--nutui-indicator-placement-gap, 8px);
66
94
  }
67
95
 
68
96
  .nut-indicator-track {
@@ -76,32 +104,30 @@
76
104
  height: 100%;
77
105
  box-sizing: border-box;
78
106
  border-radius: var(--nutui-indicator-border-radius, 2px);
79
- background-color: var(--nutui-color-border-disabled, #c2c4cc);
80
- opacity: 0.4;
107
+ background-color: var(--nutui-indicator-dot-inactive-color, #f0f2f7);
108
+ border: var(--nutui-indicator-dot-border, 0.33px solid var(--nutui-color-border));
81
109
  }
82
110
 
83
111
  .nut-indicator-white .nut-indicator-dot, .nut-indicator-white .nut-indicator-line {
84
112
  position: relative;
85
- /* #ifndef dynamic*/
86
- box-sizing: content-box;
87
- /* #endif */
88
- background: rgba(255, 255, 255, 0.4);
89
- opacity: 1;
113
+ background: var(--nutui-color-text-dark);
114
+ opacity: 0.4;
90
115
  }
91
116
  .nut-indicator-white .nut-indicator-line {
92
117
  opacity: 0;
93
118
  }
94
119
  .nut-indicator-white .nut-indicator-line-active {
95
120
  opacity: 1;
96
- background: rgb(255, 255, 255);
121
+ background: var(--nutui-color-text-dark);
97
122
  }
98
123
  .nut-indicator-white .nut-indicator-dot-active {
99
- background: rgb(255, 255, 255);
124
+ background: var(--nutui-color-text-dark);
125
+ opacity: 1;
100
126
  }
101
127
 
102
128
  .nut-indicator-track.nut-indicator-white:after {
103
- border: scale-px(1px) solid rgba(0, 0, 0, 0.06);
104
- background: rgba(255, 255, 255, 0.4);
129
+ background: var(--nutui-color-text-dark);
130
+ opacity: 0.4;
105
131
  }
106
132
 
107
133
  .nut-indicator-vertical {
@@ -123,11 +149,24 @@
123
149
  }
124
150
  .nut-indicator-vertical.nut-indicator-track .nut-indicator-line {
125
151
  width: var(--nutui-indicator-dot-size, 6px);
126
- height: var(--nutui-indicator-dot-active-size, 20px);
152
+ height: var(--nutui-indicator-slider-width, 8px);
153
+ }
154
+ .nut-indicator-vertical.nut-indicator-track .nut-indicator-line-active {
155
+ transform: translateY(calc(var(--nutui-indicator-current, 0) / (var(--nutui-indicator-total, 2) - 1) * (var(--nutui-indicator-track-width, 24px) - var(--nutui-indicator-slider-width, 8px))));
127
156
  }
128
157
 
129
158
  [dir=rtl] .nut-indicator-dot-0,
130
159
  .nut-rtl .nut-indicator-dot-0 {
131
160
  margin-right: var(--nutui-indicator-dot-margin, var(--nutui-spacing-xs));
132
161
  margin-left: 0;
162
+ }
163
+ [dir=rtl] .nut-indicator-inside-top-right,
164
+ .nut-rtl .nut-indicator-inside-top-right {
165
+ right: auto;
166
+ left: var(--nutui-indicator-placement-gap, 8px);
167
+ }
168
+ [dir=rtl] .nut-indicator-inside-bottom-left,
169
+ .nut-rtl .nut-indicator-inside-bottom-left {
170
+ left: auto;
171
+ right: var(--nutui-indicator-placement-gap, 8px);
133
172
  }
@@ -8,10 +8,6 @@ page {
8
8
  --nut-icon-line-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
9
9
  }
10
10
 
11
- /* #ifdef harmony */
12
- /* #endif */
13
- /* #ifndef harmony */
14
- /* #endif */
15
11
  .nut-infiniteloading {
16
12
  display: block;
17
13
  width: 100%;
@@ -8,10 +8,6 @@ page {
8
8
  --nut-icon-line-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
9
9
  }
10
10
 
11
- /* #ifdef harmony */
12
- /* #endif */
13
- /* #ifndef harmony */
14
- /* #endif */
15
11
  .nut-input {
16
12
  position: relative;
17
13
  display: flex;
@@ -27,7 +23,7 @@ page {
27
23
  font-size: var(--nutui-input-font-size, var(--nutui-font-size-base, calc(14px * var(--nut-scale-font, var(--nut-scale-f, 1)))));
28
24
  }
29
25
  .nut-input .nut-icon {
30
- color: var(--nutui-color-text-disabled, #c2c4cc);
26
+ color: var(--nutui-color-text-disabled, #b4b8bf);
31
27
  width: calc(14px * var(--nut-scale-f, 1));
32
28
  height: calc(14px * var(--nut-scale-f, 1));
33
29
  font-size: var(--nutui-font-size-base, calc(14px * var(--nut-scale-font, var(--nut-scale-f, 1))));
@@ -56,12 +52,12 @@ page {
56
52
  }
57
53
 
58
54
  .nut-input-disabled {
59
- color: var(--nutui-color-text-disabled, #c2c4cc) !important;
55
+ color: var(--nutui-color-text-disabled, #b4b8bf) !important;
60
56
  }
61
57
  .nut-input-disabled input:disabled {
62
- color: var(--nutui-color-text-disabled, #c2c4cc);
58
+ color: var(--nutui-color-text-disabled, #b4b8bf);
63
59
  cursor: not-allowed;
64
60
  background: none;
65
61
  opacity: 1;
66
- -webkit-text-fill-color: var(--nutui-color-text-disabled, #c2c4cc);
62
+ -webkit-text-fill-color: var(--nutui-color-text-disabled, #b4b8bf);
67
63
  }
@@ -8,10 +8,6 @@ page {
8
8
  --nut-icon-line-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
9
9
  }
10
10
 
11
- /* #ifdef harmony */
12
- /* #endif */
13
- /* #ifndef harmony */
14
- /* #endif */
15
11
  .nut-inputnumber {
16
12
  /* #ifdef dynamic*/
17
13
  display: flex;
@@ -43,7 +39,7 @@ page {
43
39
  cursor: pointer;
44
40
  }
45
41
  .nut-inputnumber-icon-disabled {
46
- color: var(--nutui-color-text-disabled, #c2c4cc);
42
+ color: var(--nutui-color-text-disabled, #b4b8bf);
47
43
  cursor: not-allowed;
48
44
  }
49
45
  .nut-inputnumber-divider {
@@ -67,13 +63,13 @@ page {
67
63
  padding: 0;
68
64
  }
69
65
  .nut-inputnumber-input-disabled {
70
- color: var(--nutui-color-text-disabled, #c2c4cc);
66
+ color: var(--nutui-color-text-disabled, #b4b8bf);
71
67
  }
72
68
  .nut-inputnumber-input::-webkit-outer-spin-button, .nut-inputnumber-input::-webkit-inner-spin-button {
73
69
  appearance: none;
74
70
  }
75
71
  .nut-inputnumber-input-disabled {
76
- color: var(--nutui-color-text-disabled, #c2c4cc);
72
+ color: var(--nutui-color-text-disabled, #b4b8bf);
77
73
  }
78
74
  .nut-inputnumber-icon-minus {
79
75
  width: calc(16px * var(--nut-scale-f, 1));
@@ -6,9 +6,4 @@ page {
6
6
  --nut-icon-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
7
7
  --nut-icon-width: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
8
8
  --nut-icon-line-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
9
- }
10
-
11
- /* #ifdef harmony */
12
- /* #endif */
13
- /* #ifndef harmony */
14
- /* #endif */
9
+ }
@@ -8,10 +8,6 @@ page {
8
8
  --nut-icon-line-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
9
9
  }
10
10
 
11
- /* #ifdef harmony */
12
- /* #endif */
13
- /* #ifndef harmony */
14
- /* #endif */
15
11
  .nut-loading {
16
12
  /* #ifdef dynamic*/
17
13
  display: flex;
@@ -6,9 +6,4 @@ page {
6
6
  --nut-icon-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
7
7
  --nut-icon-width: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
8
8
  --nut-icon-line-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
9
- }
10
-
11
- /* #ifdef harmony */
12
- /* #endif */
13
- /* #ifndef harmony */
14
- /* #endif */
9
+ }
@@ -8,10 +8,6 @@ page {
8
8
  --nut-icon-line-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
9
9
  }
10
10
 
11
- /* #ifdef harmony */
12
- /* #endif */
13
- /* #ifndef harmony */
14
- /* #endif */
15
11
  .nut-menu {
16
12
  position: relative;
17
13
  }
@@ -61,7 +57,7 @@ page {
61
57
  color: var(--nutui-menu-item-active-color, var(--nutui-color-primary, #ff0f23));
62
58
  }
63
59
  .nut-menu-title.disabled {
64
- color: var(--nutui-menu-item-disabled-color, var(--nutui-color-text-disabled, #c2c4cc));
60
+ color: var(--nutui-menu-item-disabled-color, var(--nutui-color-text-disabled, #b4b8bf));
65
61
  }
66
62
  .nut-menu-title.active .nut-menu-title-icon {
67
63
  transform: rotate(180deg);
@@ -8,10 +8,6 @@ page {
8
8
  --nut-icon-line-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
9
9
  }
10
10
 
11
- /* #ifdef harmony */
12
- /* #endif */
13
- /* #ifndef harmony */
14
- /* #endif */
15
11
  .nut-menu-container-content {
16
12
  padding: var(--nutui-menu-content-padding, calc(12px * var(--nut-scale-f, 1)) calc(24px * var(--nut-scale-f, 1)));
17
13
  max-height: var(--nutui-menu-content-max-height, calc(214px * var(--nut-scale-f, 1)));
@@ -8,10 +8,6 @@ page {
8
8
  --nut-icon-line-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
9
9
  }
10
10
 
11
- /* #ifdef harmony */
12
- /* #endif */
13
- /* #ifndef harmony */
14
- /* #endif */
15
11
  .nut-navbar {
16
12
  width: var(--nutui-navbar-width, 100%);
17
13
  position: relative;
@@ -8,10 +8,6 @@ page {
8
8
  --nut-icon-line-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
9
9
  }
10
10
 
11
- /* #ifdef harmony */
12
- /* #endif */
13
- /* #ifndef harmony */
14
- /* #endif */
15
11
  .nut-noticebar {
16
12
  width: 100%;
17
13
  }
@@ -9,10 +9,6 @@ page {
9
9
  --nut-icon-line-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
10
10
  }
11
11
 
12
- /* #ifdef harmony */
13
- /* #endif */
14
- /* #ifndef harmony */
15
- /* #endif */
16
12
  /*入场动画开始*/
17
13
  .fade-enter {
18
14
  opacity: 0;
@@ -8,10 +8,6 @@ page {
8
8
  --nut-icon-line-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
9
9
  }
10
10
 
11
- /* #ifdef harmony */
12
- /* #endif */
13
- /* #ifndef harmony */
14
- /* #endif */
15
11
  .nut-numberkeyboard {
16
12
  width: 100%;
17
13
  padding: var(--nutui-numberkeyboard-padding, 0 0 calc(22px * var(--nut-scale-f, 1)) 0);
@@ -8,10 +8,6 @@ page {
8
8
  --nut-icon-line-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
9
9
  }
10
10
 
11
- /* #ifdef harmony */
12
- /* #endif */
13
- /* #ifndef harmony */
14
- /* #endif */
15
11
  .nut-overlay {
16
12
  position: fixed;
17
13
  top: 0;
@@ -8,10 +8,6 @@ page {
8
8
  --nut-icon-line-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
9
9
  }
10
10
 
11
- /* #ifdef harmony */
12
- /* #endif */
13
- /* #ifndef harmony */
14
- /* #endif */
15
11
  .nut-pagination {
16
12
  display: flex;
17
13
  flex-direction: row;
@@ -61,7 +57,7 @@ page {
61
57
  .nut-pagination-item-disabled,
62
58
  .nut-pagination-next-disabled,
63
59
  .nut-pagination-prev-disabled {
64
- color: var(--nutui-pagination-disable-color, var(--nutui-color-text-disabled, #c2c4cc));
60
+ color: var(--nutui-pagination-disable-color, var(--nutui-color-text-disabled, #b4b8bf));
65
61
  background-color: var(--nutui-pagination-disable-background-color, #f7f8fa);
66
62
  cursor: not-allowed;
67
63
  }
@@ -85,7 +81,7 @@ page {
85
81
  display: flex;
86
82
  flex-direction: row;
87
83
  align-items: center;
88
- color: #ffffff;
84
+ color: var(--nutui-color-primary-text, #ffffff);
89
85
  background-color: var(--nutui-pagination-lite-background-color, rgba(0, 0, 0, 0.45));
90
86
  border-radius: var(--nutui-pagination-lite-radius, var(--nutui-radius-xs, calc(4px * var(--nut-scale-f, 1))));
91
87
  }
@@ -8,10 +8,6 @@ page {
8
8
  --nut-icon-line-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
9
9
  }
10
10
 
11
- /* #ifdef harmony */
12
- /* #endif */
13
- /* #ifndef harmony */
14
- /* #endif */
15
11
  .nut-picker {
16
12
  width: 100%;
17
13
  }
@@ -8,10 +8,6 @@ page {
8
8
  --nut-icon-line-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
9
9
  }
10
10
 
11
- /* #ifdef harmony */
12
- /* #endif */
13
- /* #ifndef harmony */
14
- /* #endif */
15
11
  .nut-pickerview {
16
12
  position: relative;
17
13
  display: flex;
@@ -8,10 +8,6 @@ page {
8
8
  --nut-icon-line-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
9
9
  }
10
10
 
11
- /* #ifdef harmony */
12
- /* #endif */
13
- /* #ifndef harmony */
14
- /* #endif */
15
11
  .nut-popover {
16
12
  position: absolute;
17
13
  display: inline-block;
@@ -124,7 +120,7 @@ page {
124
120
  margin-left: var(--nutui-spacing-base, calc(8px * var(--nut-scale-f, 1)));
125
121
  }
126
122
  .nut-popover .nut-popover-content .nut-popover-item.nut-popover-item-disabled {
127
- color: var(--nutui-popover-disable-color, var(--nutui-color-text-disabled, #c2c4cc));
123
+ color: var(--nutui-popover-disable-color, var(--nutui-color-text-disabled, #b4b8bf));
128
124
  cursor: not-allowed;
129
125
  }
130
126
  .nut-popover .nut-popover-content .nut-popover-item.nut-popover-taroitem {