@nutui/nutui-react-taro 3.0.0 → 3.0.2

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 (247) hide show
  1. package/CHANGELOG.md +24 -0
  2. package/dist/cjs/hooks/use-client-rect.js +1 -0
  3. package/dist/cjs/packages/actionsheet/style/style.css +12 -0
  4. package/dist/cjs/packages/address/style/style.css +12 -0
  5. package/dist/cjs/packages/calendar/style/style.css +12 -0
  6. package/dist/cjs/packages/cascader/style/style.css +12 -0
  7. package/dist/cjs/packages/configprovider/types.d.ts +1 -1
  8. package/dist/cjs/packages/datepicker/datepicker.js +8 -6
  9. package/dist/cjs/packages/datepicker/style/style.css +82 -0
  10. package/dist/cjs/packages/datepickerview/datepickerview.d.ts +3 -0
  11. package/dist/cjs/packages/datepickerview/datepickerview.js +119 -0
  12. package/dist/cjs/packages/datepickerview/index.d.ts +3 -0
  13. package/dist/cjs/packages/{subsidenavbar → datepickerview}/index.js +2 -2
  14. package/dist/cjs/packages/datepickerview/style/datepickerview.scss +4 -0
  15. package/dist/cjs/packages/datepickerview/style/index.js +2 -0
  16. package/dist/cjs/packages/datepickerview/style/style.css +78 -0
  17. package/dist/cjs/packages/datepickerview/style/style.harmony.css +8 -0
  18. package/dist/cjs/packages/datepickerview/types.d.ts +15 -0
  19. package/dist/cjs/packages/datepickerview/types.js +4 -0
  20. package/dist/cjs/packages/dialog/dialog.js +8 -3
  21. package/dist/cjs/packages/dialog/style/dialog.scss +0 -1
  22. package/dist/cjs/packages/dialog/style/style.css +0 -1
  23. package/dist/cjs/packages/dialog/style/style.harmony.css +0 -1
  24. package/dist/cjs/packages/drag/drag.js +33 -39
  25. package/dist/cjs/packages/drag/style/drag.scss +1 -0
  26. package/dist/cjs/packages/drag/style/style.css +1 -0
  27. package/dist/cjs/packages/drag/style/style.harmony.css +1 -0
  28. package/dist/cjs/packages/fixednav/fixednav.js +20 -14
  29. package/dist/cjs/packages/fixednav/style/fixednav.scss +0 -15
  30. package/dist/cjs/packages/fixednav/style/style.css +0 -14
  31. package/dist/cjs/packages/fixednav/style/style.harmony.css +0 -14
  32. package/dist/cjs/packages/form/form.d.ts +2 -0
  33. package/dist/cjs/packages/form/form.js +11 -2
  34. package/dist/cjs/packages/form/index.d.ts +2 -1
  35. package/dist/cjs/packages/form/index.js +1 -0
  36. package/dist/cjs/packages/form/style/form.scss +0 -66
  37. package/dist/cjs/packages/form/style/style.css +31 -21
  38. package/dist/cjs/packages/form/style/style.harmony.css +1 -67
  39. package/dist/cjs/packages/form/types.d.ts +2 -1
  40. package/dist/cjs/packages/form/useform.d.ts +2 -1
  41. package/dist/cjs/packages/form/useform.js +338 -247
  42. package/dist/cjs/packages/formitem/formitem.d.ts +1 -0
  43. package/dist/cjs/packages/formitem/formitem.js +57 -45
  44. package/dist/cjs/packages/formitem/style/formitem.scss +101 -21
  45. package/dist/cjs/packages/formitem/style/style.css +89 -12
  46. package/dist/cjs/packages/formitem/style/style.harmony.css +89 -12
  47. package/dist/cjs/packages/imagepreview/style/style.css +12 -0
  48. package/dist/cjs/packages/input/input.js +5 -2
  49. package/dist/cjs/packages/input/style/input.scss +6 -4
  50. package/dist/cjs/packages/input/style/style.css +4 -0
  51. package/dist/cjs/packages/input/style/style.harmony.css +8 -0
  52. package/dist/cjs/packages/numberkeyboard/style/style.css +12 -0
  53. package/dist/cjs/packages/nutui.react.build.d.ts +11 -15
  54. package/dist/cjs/packages/nutui.react.build.js +172 -180
  55. package/dist/cjs/packages/nutui.react.d.ts +16 -22
  56. package/dist/cjs/packages/nutui.react.js +177 -187
  57. package/dist/cjs/packages/nutui.react.scss.d.ts +5 -7
  58. package/dist/cjs/packages/nutui.react.scss.js +5 -7
  59. package/dist/cjs/packages/overlay/overlay.js +4 -5
  60. package/dist/cjs/packages/overlay/style/overlay.scss +0 -4
  61. package/dist/cjs/packages/picker/style/index.js +1 -0
  62. package/dist/cjs/packages/picker/style/style.css +82 -0
  63. package/dist/cjs/packages/popover/style/style.css +12 -0
  64. package/dist/cjs/packages/popup/popup.js +17 -11
  65. package/dist/cjs/packages/popup/style/popup.scss +12 -4
  66. package/dist/cjs/packages/popup/style/style.css +12 -0
  67. package/dist/cjs/packages/popup/style/style.harmony.css +12 -0
  68. package/dist/cjs/packages/shortpassword/shortpassword.js +5 -7
  69. package/dist/cjs/packages/shortpassword/style/shortpassword.scss +10 -0
  70. package/dist/cjs/packages/shortpassword/style/style.css +21 -0
  71. package/dist/cjs/packages/shortpassword/style/style.harmony.css +9 -0
  72. package/dist/cjs/packages/signature/signature.js +1 -1
  73. package/dist/cjs/packages/swipe/style/style.css +3 -3
  74. package/dist/cjs/packages/swipe/style/style.harmony.css +3 -3
  75. package/dist/cjs/packages/swipe/style/swipe.scss +7 -3
  76. package/dist/cjs/packages/swipe/swipe.js +14 -15
  77. package/dist/cjs/packages/tabbar/style/style.css +6 -0
  78. package/dist/cjs/packages/tabbaritem/style/style.css +6 -0
  79. package/dist/cjs/packages/tabbaritem/style/style.harmony.css +6 -0
  80. package/dist/cjs/packages/tabbaritem/style/tabbaritem.scss +6 -0
  81. package/dist/cjs/packages/tabs/tabs.js +6 -13
  82. package/dist/cjs/packages/textarea/textarea.js +1 -1
  83. package/dist/cjs/packages/timeselect/style/style.css +12 -0
  84. package/dist/cjs/packages/tour/style/style.css +12 -0
  85. package/dist/cjs/utils/get-rect-by-taro.d.ts +1 -1
  86. package/dist/cjs/utils/get-rect-by-taro.js +4 -1
  87. package/dist/cjs/utils/get-system-info.js +4 -5
  88. package/dist/cjs/utils/merge.d.ts +14 -0
  89. package/dist/cjs/utils/merge.js +98 -0
  90. package/dist/cjs/utils/platform-taro.js +4 -5
  91. package/dist/cjs/utils/to-array.d.ts +1 -0
  92. package/dist/cjs/utils/to-array.js +18 -0
  93. package/dist/es/hooks/use-client-rect.js +1 -0
  94. package/dist/es/packages/actionsheet/style/style.css +12 -0
  95. package/dist/es/packages/address/style/style.css +12 -0
  96. package/dist/es/packages/calendar/style/style.css +12 -0
  97. package/dist/es/packages/cascader/style/style.css +12 -0
  98. package/dist/es/packages/configprovider/types.d.ts +1 -1
  99. package/dist/es/packages/datepicker/datepicker.js +8 -6
  100. package/dist/es/packages/datepicker/style/style.css +82 -0
  101. package/dist/es/packages/datepickerview/datepickerview.d.ts +3 -0
  102. package/dist/es/packages/datepickerview/datepickerview.js +107 -0
  103. package/dist/es/packages/datepickerview/index.d.ts +3 -0
  104. package/dist/es/packages/datepickerview/index.js +2 -0
  105. package/dist/es/packages/datepickerview/style/datepickerview.scss +4 -0
  106. package/dist/es/packages/datepickerview/style/index.js +2 -0
  107. package/dist/es/packages/datepickerview/style/style.css +78 -0
  108. package/dist/es/packages/datepickerview/style/style.harmony.css +8 -0
  109. package/dist/es/packages/datepickerview/types.d.ts +15 -0
  110. package/dist/es/packages/datepickerview/types.js +1 -0
  111. package/dist/es/packages/dialog/dialog.js +8 -3
  112. package/dist/es/packages/dialog/style/dialog.scss +0 -1
  113. package/dist/es/packages/dialog/style/style.css +0 -1
  114. package/dist/es/packages/dialog/style/style.harmony.css +0 -1
  115. package/dist/es/packages/drag/drag.js +33 -39
  116. package/dist/es/packages/drag/style/drag.scss +1 -0
  117. package/dist/es/packages/drag/style/style.css +1 -0
  118. package/dist/es/packages/drag/style/style.harmony.css +1 -0
  119. package/dist/es/packages/fixednav/fixednav.js +20 -14
  120. package/dist/es/packages/fixednav/style/fixednav.scss +0 -15
  121. package/dist/es/packages/fixednav/style/style.css +0 -14
  122. package/dist/es/packages/fixednav/style/style.harmony.css +0 -14
  123. package/dist/es/packages/form/form.d.ts +10 -0
  124. package/dist/es/packages/form/form.js +11 -2
  125. package/dist/es/packages/form/index.d.ts +2 -1
  126. package/dist/es/packages/form/index.js +2 -1
  127. package/dist/es/packages/form/style/form.scss +0 -66
  128. package/dist/es/packages/form/style/style.css +31 -21
  129. package/dist/es/packages/form/style/style.harmony.css +1 -67
  130. package/dist/es/packages/form/types.d.ts +2 -1
  131. package/dist/es/packages/form/useform.d.ts +2 -1
  132. package/dist/es/packages/form/useform.js +336 -248
  133. package/dist/es/packages/formitem/formitem.d.ts +1 -0
  134. package/dist/es/packages/formitem/formitem.js +58 -46
  135. package/dist/es/packages/formitem/style/formitem.scss +101 -21
  136. package/dist/es/packages/formitem/style/style.css +89 -12
  137. package/dist/es/packages/formitem/style/style.harmony.css +89 -12
  138. package/dist/es/packages/imagepreview/style/style.css +12 -0
  139. package/dist/es/packages/input/input.js +5 -2
  140. package/dist/es/packages/input/style/input.scss +6 -4
  141. package/dist/es/packages/input/style/style.css +4 -0
  142. package/dist/es/packages/input/style/style.harmony.css +8 -0
  143. package/dist/es/packages/numberkeyboard/style/style.css +12 -0
  144. package/dist/es/packages/nutui.react.build.d.ts +11 -15
  145. package/dist/es/packages/nutui.react.build.js +11 -15
  146. package/dist/es/packages/overlay/overlay.js +4 -5
  147. package/dist/es/packages/overlay/style/overlay.scss +0 -4
  148. package/dist/es/packages/picker/style/index.js +1 -0
  149. package/dist/es/packages/picker/style/style.css +82 -0
  150. package/dist/es/packages/popover/style/style.css +12 -0
  151. package/dist/es/packages/popup/popup.js +17 -11
  152. package/dist/es/packages/popup/style/popup.scss +12 -4
  153. package/dist/es/packages/popup/style/style.css +12 -0
  154. package/dist/es/packages/popup/style/style.harmony.css +12 -0
  155. package/dist/es/packages/shortpassword/shortpassword.js +5 -7
  156. package/dist/es/packages/shortpassword/style/shortpassword.scss +10 -0
  157. package/dist/es/packages/shortpassword/style/style.css +21 -0
  158. package/dist/es/packages/shortpassword/style/style.harmony.css +9 -0
  159. package/dist/es/packages/signature/signature.js +2 -2
  160. package/dist/es/packages/swipe/style/style.css +3 -3
  161. package/dist/es/packages/swipe/style/style.harmony.css +3 -3
  162. package/dist/es/packages/swipe/style/swipe.scss +7 -3
  163. package/dist/es/packages/swipe/swipe.js +14 -15
  164. package/dist/es/packages/tabbar/style/style.css +6 -0
  165. package/dist/es/packages/tabbaritem/style/style.css +6 -0
  166. package/dist/es/packages/tabbaritem/style/style.harmony.css +6 -0
  167. package/dist/es/packages/tabbaritem/style/tabbaritem.scss +6 -0
  168. package/dist/es/packages/tabs/tabs.js +6 -13
  169. package/dist/es/packages/textarea/textarea.js +2 -2
  170. package/dist/es/packages/timeselect/style/style.css +12 -0
  171. package/dist/es/packages/tour/style/style.css +12 -0
  172. package/dist/es/utils/get-rect-by-taro.d.ts +1 -1
  173. package/dist/es/utils/get-rect-by-taro.js +4 -1
  174. package/dist/es/utils/get-system-info.js +4 -4
  175. package/dist/es/utils/merge.d.ts +14 -0
  176. package/dist/es/utils/merge.js +68 -0
  177. package/dist/es/utils/platform-taro.js +4 -4
  178. package/dist/es/utils/to-array.d.ts +1 -0
  179. package/dist/es/utils/to-array.js +8 -0
  180. package/dist/nutui.react.umd.js +5593 -5442
  181. package/dist/style.css +1 -1
  182. package/dist/style.scss +34 -36
  183. package/dist/styles/variables-jmapp.scss +0 -50
  184. package/dist/styles/variables-jrkf.scss +0 -50
  185. package/dist/styles/variables.scss +0 -49
  186. package/package.json +1 -1
  187. package/dist/cjs/packages/sidenavbar/context.d.ts +0 -1
  188. package/dist/cjs/packages/sidenavbar/context.js +0 -12
  189. package/dist/cjs/packages/sidenavbar/index.d.ts +0 -3
  190. package/dist/cjs/packages/sidenavbar/index.js +0 -12
  191. package/dist/cjs/packages/sidenavbar/sidenavbar.d.ts +0 -14
  192. package/dist/cjs/packages/sidenavbar/sidenavbar.js +0 -75
  193. package/dist/cjs/packages/sidenavbar/style/index.js +0 -2
  194. package/dist/cjs/packages/sidenavbar/style/sidenavbar.scss +0 -89
  195. package/dist/cjs/packages/sidenavbar/style/style.css +0 -443
  196. package/dist/cjs/packages/sidenavbar/style/style.harmony.css +0 -74
  197. package/dist/cjs/packages/sidenavbar/utils.d.ts +0 -3
  198. package/dist/cjs/packages/sidenavbar/utils.js +0 -23
  199. package/dist/cjs/packages/sidenavbaritem/index.d.ts +0 -3
  200. package/dist/cjs/packages/sidenavbaritem/index.js +0 -12
  201. package/dist/cjs/packages/sidenavbaritem/sidenavbaritem.d.ts +0 -11
  202. package/dist/cjs/packages/sidenavbaritem/sidenavbaritem.js +0 -34
  203. package/dist/cjs/packages/sidenavbaritem/style/index.js +0 -1
  204. package/dist/cjs/packages/sidenavbaritem/style/sidenavbaritem.scss +0 -13
  205. package/dist/cjs/packages/sidenavbaritem/style/style.css +0 -14
  206. package/dist/cjs/packages/sidenavbaritem/style/style.harmony.css +0 -14
  207. package/dist/cjs/packages/subsidenavbar/index.d.ts +0 -3
  208. package/dist/cjs/packages/subsidenavbar/style/css.js +0 -1
  209. package/dist/cjs/packages/subsidenavbar/style/index.js +0 -1
  210. package/dist/cjs/packages/subsidenavbar/style/style.css +0 -20
  211. package/dist/cjs/packages/subsidenavbar/style/style.harmony.css +0 -20
  212. package/dist/cjs/packages/subsidenavbar/style/subsidenavbar.scss +0 -26
  213. package/dist/cjs/packages/subsidenavbar/subsidenavbar.d.ts +0 -13
  214. package/dist/cjs/packages/subsidenavbar/subsidenavbar.js +0 -90
  215. package/dist/es/packages/sidenavbar/context.d.ts +0 -1
  216. package/dist/es/packages/sidenavbar/context.js +0 -2
  217. package/dist/es/packages/sidenavbar/index.d.ts +0 -3
  218. package/dist/es/packages/sidenavbar/index.js +0 -2
  219. package/dist/es/packages/sidenavbar/sidenavbar.d.ts +0 -38
  220. package/dist/es/packages/sidenavbar/sidenavbar.js +0 -63
  221. package/dist/es/packages/sidenavbar/style/css.js +0 -1
  222. package/dist/es/packages/sidenavbar/style/index.js +0 -2
  223. package/dist/es/packages/sidenavbar/style/sidenavbar.scss +0 -89
  224. package/dist/es/packages/sidenavbar/style/style.css +0 -443
  225. package/dist/es/packages/sidenavbar/style/style.harmony.css +0 -74
  226. package/dist/es/packages/sidenavbar/utils.d.ts +0 -3
  227. package/dist/es/packages/sidenavbar/utils.js +0 -14
  228. package/dist/es/packages/sidenavbaritem/index.d.ts +0 -3
  229. package/dist/es/packages/sidenavbaritem/index.js +0 -2
  230. package/dist/es/packages/sidenavbaritem/sidenavbaritem.d.ts +0 -11
  231. package/dist/es/packages/sidenavbaritem/sidenavbaritem.js +0 -23
  232. package/dist/es/packages/sidenavbaritem/style/css.js +0 -1
  233. package/dist/es/packages/sidenavbaritem/style/index.js +0 -1
  234. package/dist/es/packages/sidenavbaritem/style/sidenavbaritem.scss +0 -13
  235. package/dist/es/packages/sidenavbaritem/style/style.css +0 -14
  236. package/dist/es/packages/sidenavbaritem/style/style.harmony.css +0 -14
  237. package/dist/es/packages/subsidenavbar/index.d.ts +0 -3
  238. package/dist/es/packages/subsidenavbar/index.js +0 -2
  239. package/dist/es/packages/subsidenavbar/style/css.js +0 -1
  240. package/dist/es/packages/subsidenavbar/style/index.js +0 -1
  241. package/dist/es/packages/subsidenavbar/style/style.css +0 -20
  242. package/dist/es/packages/subsidenavbar/style/style.harmony.css +0 -20
  243. package/dist/es/packages/subsidenavbar/style/subsidenavbar.scss +0 -26
  244. package/dist/es/packages/subsidenavbar/subsidenavbar.d.ts +0 -13
  245. package/dist/es/packages/subsidenavbar/subsidenavbar.js +0 -79
  246. /package/dist/cjs/packages/{sidenavbar → datepickerview}/style/css.js +0 -0
  247. /package/dist/{cjs/packages/sidenavbaritem → es/packages/datepickerview}/style/css.js +0 -0
@@ -0,0 +1,4 @@
1
+ .nut-datepickerview {
2
+ display: flex;
3
+ width: 100%;
4
+ }
@@ -0,0 +1,2 @@
1
+ import '../../pickerview/style';
2
+ import './datepickerview.scss';
@@ -0,0 +1,78 @@
1
+ /* #ifdef harmony */
2
+ /* #endif */
3
+ /* #ifndef harmony */
4
+ /* #endif */
5
+ .nut-pickerview {
6
+ --nutui-picker-item-height: 36px;
7
+ position: relative;
8
+ display: flex;
9
+ width: 100%;
10
+ height: calc(var(--nutui-picker-item-height, 36px) * 7);
11
+ overflow: hidden;
12
+ }
13
+ .nut-pickerview-mask, .nut-pickerview-indicator {
14
+ position: absolute;
15
+ left: 0;
16
+ right: 0;
17
+ z-index: 3;
18
+ pointer-events: none;
19
+ }
20
+ .nut-pickerview-mask {
21
+ top: 0;
22
+ bottom: 0;
23
+ background-image: var(--picker-mask-background, linear-gradient(180deg, var(--nutui-white-12), var(--nutui-white-7)), linear-gradient(0deg, var(--nutui-white-12), var(--nutui-white-7)));
24
+ background-position: top, bottom;
25
+ background-size: 100% calc((var(--nutui-picker-item-height, 36px) * 7 - var(--nutui-picker-item-height, 36px)) / 2);
26
+ background-repeat: no-repeat;
27
+ transform: translateZ(0);
28
+ }
29
+ .nut-pickerview-indicator {
30
+ top: calc((var(--nutui-picker-item-height, 36px) * 7 - var(--nutui-picker-item-height, 36px)) / 2);
31
+ height: var(--nutui-picker-item-height, 36px);
32
+ border: var(--nutui-picker-item-active-line-border, 1px solid var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
33
+ border-left: 0;
34
+ border-right: 0;
35
+ box-sizing: border-box;
36
+ }
37
+ .nut-pickerview-list {
38
+ position: relative;
39
+ flex: 1;
40
+ height: calc(var(--nutui-picker-item-height, 36px) * 7);
41
+ overflow: hidden;
42
+ touch-action: none;
43
+ }
44
+ .nut-pickerview-roller {
45
+ position: absolute;
46
+ top: calc((var(--nutui-picker-item-height, 36px) * 7 - var(--nutui-picker-item-height, 36px)) / 2);
47
+ width: 100%;
48
+ height: var(--nutui-picker-item-height, 36px);
49
+ z-index: 1;
50
+ transform-style: preserve-3d;
51
+ }
52
+ .nut-pickerview-roller-item {
53
+ position: absolute;
54
+ top: 0;
55
+ backface-visibility: hidden;
56
+ -moz-backface-visibility: hidden;
57
+ -webkit-backface-visibility: hidden;
58
+ }
59
+ .nut-pickerview-roller-item-hidden {
60
+ visibility: hidden;
61
+ opacity: 0;
62
+ }
63
+ .nut-pickerview-roller-item, .nut-pickerview-roller-item-tiled {
64
+ width: 100%;
65
+ height: var(--nutui-picker-item-height, 36px);
66
+ line-height: var(--nutui-picker-item-height, 36px);
67
+ color: var(--nutui-picker-item-text-color, var(--nutui-color-title, #1a1a1a));
68
+ font-size: var(--nutui-picker-item-text-font-size, var(--nutui-font-size-base, 14px));
69
+ text-align: center;
70
+ overflow: hidden;
71
+ text-overflow: ellipsis;
72
+ white-space: nowrap;
73
+ }
74
+
75
+ .nut-datepickerview {
76
+ display: flex;
77
+ width: 100%;
78
+ }
@@ -0,0 +1,8 @@
1
+ /* #ifdef harmony */
2
+ /* #endif */
3
+ /* #ifndef harmony */
4
+ /* #endif */
5
+ .nut-datepickerview {
6
+ display: flex;
7
+ width: 100%;
8
+ }
@@ -0,0 +1,15 @@
1
+ import { BasicComponent } from "../../utils/typings";
2
+ import { PickerOptions, PickerValue, PickerOption } from "../pickerview/types";
3
+ export interface DatePickerViewProps extends BasicComponent {
4
+ value?: Date;
5
+ defaultValue?: Date;
6
+ type: 'date' | 'time' | 'year-month' | 'month-day' | 'datehour' | 'datetime' | 'hour-minutes';
7
+ showChinese: boolean;
8
+ minuteStep: number;
9
+ startDate: Date;
10
+ endDate: Date;
11
+ threeDimensional: boolean;
12
+ formatter: (type: string, option: PickerOption) => PickerOption;
13
+ filter: (type: string, options: PickerOptions) => PickerOptions;
14
+ onChange: (selectedOptions: PickerOptions, selectedValue: PickerValue[], columnIndex: number) => void;
15
+ }
@@ -0,0 +1,4 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", {
3
+ value: true
4
+ });
@@ -40,6 +40,7 @@ var _usecustomevent = require("../../hooks/use-custom-event");
40
40
  var _uselockscolltaro = require("../../hooks/use-lock-scoll-taro");
41
41
  var _mergeprops = require("../../utils/merge-props");
42
42
  var _overlay = require("../overlay/overlay");
43
+ var _platformtaro = require("../../utils/platform-taro");
43
44
  var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _overlay.defaultOverlayProps, _content.defaultContentProps), {
44
45
  title: '',
45
46
  content: '',
@@ -195,6 +196,8 @@ var BaseDialog = function BaseDialog(props) {
195
196
  }
196
197
  };
197
198
  var renderContent = function renderContent() {
199
+ var contentZIndex = (0, _platformtaro.harmony)() ? zIndex + 1 : zIndex // 解决harmony层级问题
200
+ ;
198
201
  return /*#__PURE__*/ _react.default.createElement(_reacttransitiongroup.CSSTransition, {
199
202
  in: visible,
200
203
  timeout: 300,
@@ -203,7 +206,9 @@ var BaseDialog = function BaseDialog(props) {
203
206
  appear: true
204
207
  }, /*#__PURE__*/ _react.default.createElement(_content.Content, {
205
208
  className: className,
206
- style: style,
209
+ style: (0, _object_spread._)({
210
+ zIndex: contentZIndex
211
+ }, style),
207
212
  title: title,
208
213
  header: header,
209
214
  close: renderCloseIcon(),
@@ -218,7 +223,7 @@ var BaseDialog = function BaseDialog(props) {
218
223
  },
219
224
  ref: refObject,
220
225
  catchMove: lockScroll
221
- }, overlay ? /*#__PURE__*/ _react.default.createElement(_index1.default, {
226
+ }, overlay && /*#__PURE__*/ _react.default.createElement(_index1.default, {
222
227
  zIndex: zIndex,
223
228
  visible: visible,
224
229
  style: overlayStyle,
@@ -226,7 +231,7 @@ var BaseDialog = function BaseDialog(props) {
226
231
  closeOnOverlayClick: closeOnOverlayClick,
227
232
  lockScroll: lockScroll,
228
233
  onClick: onHandleClickOverlay
229
- }, renderContent()) : renderContent());
234
+ }), renderContent());
230
235
  };
231
236
  function open(selector, options) {
232
237
  // eslint-disable-next-line react-hooks/rules-of-hooks
@@ -26,7 +26,6 @@
26
26
  -webkit-transform: translate(-50%, -50%);
27
27
  transform: translate(-50%, -50%);
28
28
  border-radius: $dialog-border-radius;
29
- z-index: $dialog-z-index;
30
29
  animation-duration: 0.3s;
31
30
  }
32
31
 
@@ -470,7 +470,6 @@
470
470
  -webkit-transform: translate(-50%, -50%);
471
471
  transform: translate(-50%, -50%);
472
472
  border-radius: var(--nutui-dialog-border-radius, var(--nutui-radius-xl, 12px));
473
- z-index: var(--nutui-dialog-z-index, 1200);
474
473
  animation-duration: 0.3s;
475
474
  }
476
475
  .nut-dialog-close {
@@ -26,7 +26,6 @@
26
26
  -webkit-transform: translate(-50%, -50%);
27
27
  transform: translate(-50%, -50%);
28
28
  border-radius: 12px;
29
- z-index: 1200;
30
29
  animation-duration: 0.3s;
31
30
  }
32
31
  .nut-dialog-close {
@@ -12,14 +12,14 @@ var _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcar
12
12
  var _async_to_generator = require("@swc/helpers/_/_async_to_generator");
13
13
  var _object_spread = require("@swc/helpers/_/_object_spread");
14
14
  var _object_spread_props = require("@swc/helpers/_/_object_spread_props");
15
- var _object_without_properties = require("@swc/helpers/_/_object_without_properties");
16
15
  var _sliced_to_array = require("@swc/helpers/_/_sliced_to_array");
17
16
  var _ts_generator = require("@swc/helpers/_/_ts_generator");
18
17
  var _react = /*#__PURE__*/ _interop_require_wildcard._(require("react"));
19
- var _taro = require("@tarojs/taro");
20
- var _getsysteminfo = require("../../utils/get-system-info");
18
+ var _components = require("@tarojs/components");
21
19
  var _typings = require("../../utils/typings");
22
20
  var _getrectbytaro = require("../../utils/get-rect-by-taro");
21
+ var _getsysteminfo = require("../../utils/get-system-info");
22
+ var _platformtaro = require("../../utils/platform-taro");
23
23
  var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typings.ComponentDefaults), {
24
24
  attract: false,
25
25
  direction: undefined,
@@ -32,17 +32,7 @@ var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typing
32
32
  className: 'myDrag'
33
33
  });
34
34
  var Drag = function Drag(props) {
35
- var _ref = (0, _object_spread._)({}, defaultProps, props), attract = _ref.attract, direction = _ref.direction, boundary = _ref.boundary, onDrag = _ref.onDrag, onDragStart = _ref.onDragStart, onDragEnd = _ref.onDragEnd, children = _ref.children, className = _ref.className, style = _ref.style, reset = (0, _object_without_properties._)(_ref, [
36
- "attract",
37
- "direction",
38
- "boundary",
39
- "onDrag",
40
- "onDragStart",
41
- "onDragEnd",
42
- "children",
43
- "className",
44
- "style"
45
- ]);
35
+ var _$_object_spread = (0, _object_spread._)({}, defaultProps, props), attract = _$_object_spread.attract, direction = _$_object_spread.direction, boundary = _$_object_spread.boundary, onDrag = _$_object_spread.onDrag, onDragStart = _$_object_spread.onDragStart, onDragEnd = _$_object_spread.onDragEnd, children = _$_object_spread.children, className = _$_object_spread.className, style = _$_object_spread.style;
46
36
  var classPrefix = 'nut-drag';
47
37
  var _useState = (0, _sliced_to_array._)((0, _react.useState)(boundary), 2), boundaryState = _useState[0], setBoundaryState = _useState[1];
48
38
  var myDrag = (0, _react.useRef)(null);
@@ -62,7 +52,7 @@ var Drag = function Drag(props) {
62
52
  var middleLine = (0, _react.useRef)(0);
63
53
  var getInfo = /*#__PURE__*/ function() {
64
54
  var _ref = (0, _async_to_generator._)(function() {
65
- var el, _dragRef_current, top, left, bottom, right, _getWindowInfo, screenWidth, windowHeight, _ref, width, height;
55
+ var el, top, left, bottom, right, _getWindowInfo, screenWidth, windowHeight, _ref, width, height, dragTop, dragLeft;
66
56
  return (0, _ts_generator._)(this, function(_state) {
67
57
  switch(_state.label){
68
58
  case 0:
@@ -78,17 +68,14 @@ var Drag = function Drag(props) {
78
68
  (0, _getrectbytaro.getRectByTaro)(dragRef.current)
79
69
  ];
80
70
  case 1:
81
- _ref = _state.sent(), width = _ref.width, height = _ref.height;
82
- (_dragRef_current = dragRef.current) === null || _dragRef_current === void 0 ? void 0 : _dragRef_current.getBoundingClientRect();
83
- (0, _taro.createSelectorQuery)().select(".".concat(className)).boundingClientRect(function(rec) {
84
- setBoundaryState({
85
- top: -rec.top + top,
86
- left: -rec.left + left,
87
- bottom: windowHeight - rec.top - bottom - Math.ceil(height),
88
- right: screenWidth - rec.left - right - Math.ceil(width)
89
- });
90
- middleLine.current = screenWidth - rec.width - rec.left - (screenWidth - rec.width) / 2;
91
- }).exec();
71
+ _ref = _state.sent(), width = _ref.width, height = _ref.height, dragTop = _ref.top, dragLeft = _ref.left;
72
+ setBoundaryState({
73
+ top: -dragTop + top,
74
+ left: -dragLeft + left,
75
+ bottom: windowHeight - dragTop - bottom - Math.ceil(height),
76
+ right: screenWidth - dragLeft - right - Math.ceil(width)
77
+ });
78
+ middleLine.current = screenWidth - width - dragLeft - (screenWidth - width) / 2;
92
79
  _state.label = 2;
93
80
  case 2:
94
81
  return [
@@ -143,7 +130,7 @@ var Drag = function Drag(props) {
143
130
  });
144
131
  }
145
132
  };
146
- var touchEnd = function touchEnd(e) {
133
+ var touchEnd = function touchEnd() {
147
134
  onDragEnd === null || onDragEnd === void 0 ? void 0 : onDragEnd({
148
135
  offset: [
149
136
  translateX.current,
@@ -163,27 +150,34 @@ var Drag = function Drag(props) {
163
150
  }
164
151
  };
165
152
  (0, _react.useEffect)(function() {
166
- timer.current = window.setTimeout(function() {
167
- getInfo();
168
- }, 300);
153
+ if (dragRef.current) {
154
+ if ((0, _platformtaro.web)()) {
155
+ timer.current = window.setTimeout(function() {
156
+ getInfo();
157
+ }, 300);
158
+ } else {
159
+ getInfo();
160
+ }
161
+ }
169
162
  return function() {
170
163
  clearTimeout(timer.current);
171
164
  };
172
- }, []);
173
- return /*#__PURE__*/ _react.default.createElement("div", (0, _object_spread_props._)((0, _object_spread._)({
165
+ }, [
166
+ dragRef.current
167
+ ]);
168
+ return /*#__PURE__*/ _react.default.createElement(_components.View, {
174
169
  style: style,
175
- className: "".concat(classPrefix, " ").concat(className)
176
- }, reset), {
170
+ className: "".concat(classPrefix, " ").concat(className),
177
171
  ref: myDrag
178
- }), /*#__PURE__*/ _react.default.createElement("div", {
172
+ }, /*#__PURE__*/ _react.default.createElement(_components.View, {
179
173
  className: "".concat(classPrefix, "-inner"),
180
- onTouchStart: function onTouchStart(event) {
181
- return touchStart(event);
182
- },
183
174
  ref: dragRef,
175
+ catchMove: true,
176
+ // @ts-ignore
177
+ onTouchStart: touchStart,
178
+ // @ts-ignore
184
179
  onTouchMove: touchMove,
185
180
  onTouchEnd: touchEnd,
186
- // eslint-disable-next-line react/no-unknown-property
187
181
  style: currstyle
188
182
  }, children));
189
183
  };
@@ -10,5 +10,6 @@
10
10
  display: inline-flex;
11
11
  width: fit-content;
12
12
  height: fit-content;
13
+ touch-action: none;
13
14
  }
14
15
  }
@@ -15,4 +15,5 @@
15
15
  display: inline-flex;
16
16
  width: fit-content;
17
17
  height: fit-content;
18
+ touch-action: none;
18
19
  }
@@ -15,4 +15,5 @@
15
15
  display: inline-flex;
16
16
  width: fit-content;
17
17
  height: fit-content;
18
+ touch-action: none;
18
19
  }
@@ -18,6 +18,7 @@ var _components = require("@tarojs/components");
18
18
  var _index = /*#__PURE__*/ _interop_require_default._(require("../overlay/index"));
19
19
  var _index1 = require("../configprovider/index");
20
20
  var _overlay = require("../overlay/overlay");
21
+ var _index2 = /*#__PURE__*/ _interop_require_default._(require("../badge/index"));
21
22
  var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _overlay.defaultOverlayProps), {
22
23
  activeText: '',
23
24
  inactiveText: '',
@@ -39,6 +40,20 @@ var FixedNav = function FixedNav(props) {
39
40
  var classes = (0, _classnames.default)(classPrefix, {
40
41
  active: visible
41
42
  }, type, className);
43
+ var renderListItem = function renderListItem(item, index) {
44
+ return /*#__PURE__*/ _react.default.createElement(_components.View, {
45
+ className: "".concat(classPrefix, "-list-item"),
46
+ onClick: function onClick(event) {
47
+ return onSelect(item, event);
48
+ },
49
+ key: item.id || index
50
+ }, /*#__PURE__*/ _react.default.isValidElement(item.icon) ? item.icon : /*#__PURE__*/ _react.default.createElement("img", {
51
+ src: item.icon,
52
+ alt: ""
53
+ }), /*#__PURE__*/ _react.default.createElement(_components.View, {
54
+ className: "".concat(classPrefix, "-list-text")
55
+ }, item.text));
56
+ };
42
57
  return /*#__PURE__*/ _react.default.createElement(_components.View, {
43
58
  className: classes,
44
59
  style: (0, _object_spread._)({}, position, style)
@@ -53,20 +68,11 @@ var FixedNav = function FixedNav(props) {
53
68
  }, children || /*#__PURE__*/ _react.default.createElement(_components.View, {
54
69
  className: "".concat(classPrefix, "-list")
55
70
  }, list.map(function(item, index) {
56
- return /*#__PURE__*/ _react.default.createElement(_components.View, {
57
- className: "".concat(classPrefix, "-list-item"),
58
- onClick: function onClick(event) {
59
- return onSelect(item, event);
60
- },
61
- key: item.id || index
62
- }, /*#__PURE__*/ _react.default.isValidElement(item.icon) ? item.icon : /*#__PURE__*/ _react.default.createElement("img", {
63
- src: item.icon,
64
- alt: ""
65
- }), /*#__PURE__*/ _react.default.createElement(_components.View, {
66
- className: "".concat(classPrefix, "-list-text")
67
- }, item.text), item.num && /*#__PURE__*/ _react.default.createElement(_components.View, {
68
- className: "b"
69
- }, item.num));
71
+ return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, item.num ? /*#__PURE__*/ _react.default.createElement(_index2.default, {
72
+ value: item.num,
73
+ top: 8,
74
+ right: 6
75
+ }, renderListItem(item, index)) : /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, renderListItem(item, index)));
70
76
  }))), /*#__PURE__*/ _react.default.createElement(_components.View, {
71
77
  className: "".concat(classPrefix, "-btn"),
72
78
  onClick: function onClick() {
@@ -95,21 +95,6 @@
95
95
  .nut-fixednav-list-text {
96
96
  font-size: 10px;
97
97
  }
98
-
99
- .b {
100
- position: absolute;
101
- right: 0;
102
- top: 1px;
103
- height: 14px;
104
- line-height: 14px;
105
- font-size: 10px;
106
- padding: 0 3px;
107
- color: white;
108
- background: $color-primary;
109
- border-radius: 7px;
110
- text-align: center;
111
- min-width: 12px;
112
- }
113
98
  }
114
99
  }
115
100
 
@@ -136,20 +136,6 @@
136
136
  .nut-fixednav-list-item .nut-fixednav-list-text {
137
137
  font-size: 10px;
138
138
  }
139
- .nut-fixednav-list-item .b {
140
- position: absolute;
141
- right: 0;
142
- top: 1px;
143
- height: 14px;
144
- line-height: 14px;
145
- font-size: 10px;
146
- padding: 0 3px;
147
- color: white;
148
- background: var(--nutui-color-primary, #ff0f23);
149
- border-radius: 7px;
150
- text-align: center;
151
- min-width: 12px;
152
- }
153
139
  .nut-fixednav.left {
154
140
  right: auto;
155
141
  left: 0;
@@ -81,20 +81,6 @@
81
81
  .nut-fixednav-list-item .nut-fixednav-list-text {
82
82
  font-size: 10px;
83
83
  }
84
- .nut-fixednav-list-item .b {
85
- position: absolute;
86
- right: 0;
87
- top: 1px;
88
- height: 14px;
89
- line-height: 14px;
90
- font-size: 10px;
91
- padding: 0 3px;
92
- color: white;
93
- background: #ff0f23;
94
- border-radius: 7px;
95
- text-align: center;
96
- min-width: 12px;
97
- }
98
84
  .nut-fixednav.left {
99
85
  right: auto;
100
86
  left: 0;
@@ -6,7 +6,9 @@ export interface FormProps extends TFormProps {
6
6
  initialValues: any;
7
7
  name: string;
8
8
  form: any;
9
+ disabled: boolean;
9
10
  divider: boolean;
11
+ validateTrigger: string | string[] | false;
10
12
  labelPosition: 'top' | 'left' | 'right';
11
13
  starPosition: 'left' | 'right';
12
14
  onFinish: (values: any) => void;
@@ -23,7 +23,9 @@ var _index = /*#__PURE__*/ _interop_require_default._(require("../cell/index"));
23
23
  var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typings.ComponentDefaults), {
24
24
  labelPosition: 'right',
25
25
  starPosition: 'left',
26
+ disabled: false,
26
27
  divider: false,
28
+ validateTrigger: 'onChange',
27
29
  onFinish: function onFinish(values) {},
28
30
  onFinishFailed: function onFinishFailed(values, errorFields) {}
29
31
  });
@@ -34,15 +36,17 @@ var PositionInfo = {
34
36
  };
35
37
  var Form = /*#__PURE__*/ _react.default.forwardRef(function(props, ref) {
36
38
  var classPrefix = 'nut-form';
37
- var _ref = (0, _object_spread._)({}, defaultProps, props), className = _ref.className, style = _ref.style, footer = _ref.footer, children = _ref.children, initialValues = _ref.initialValues, divider = _ref.divider, onFinish = _ref.onFinish, onFinishFailed = _ref.onFinishFailed, labelPosition = _ref.labelPosition, starPosition = _ref.starPosition, form = _ref.form, rest = (0, _object_without_properties._)(_ref, [
39
+ var _ref = (0, _object_spread._)({}, defaultProps, props), className = _ref.className, style = _ref.style, footer = _ref.footer, children = _ref.children, initialValues = _ref.initialValues, divider = _ref.divider, disabled = _ref.disabled, onFinish = _ref.onFinish, onFinishFailed = _ref.onFinishFailed, validateTrigger = _ref.validateTrigger, labelPosition = _ref.labelPosition, starPosition = _ref.starPosition, form = _ref.form, rest = (0, _object_without_properties._)(_ref, [
38
40
  "className",
39
41
  "style",
40
42
  "footer",
41
43
  "children",
42
44
  "initialValues",
43
45
  "divider",
46
+ "disabled",
44
47
  "onFinish",
45
48
  "onFinishFailed",
49
+ "validateTrigger",
46
50
  "labelPosition",
47
51
  "starPosition",
48
52
  "form"
@@ -89,7 +93,12 @@ var Form = /*#__PURE__*/ _react.default.forwardRef(function(props, ref) {
89
93
  }), /*#__PURE__*/ _react.default.createElement(_index.default.Group, {
90
94
  divider: divider
91
95
  }, /*#__PURE__*/ _react.default.createElement(_context.Context.Provider, {
92
- value: formInstance
96
+ value: {
97
+ formInstance: formInstance,
98
+ labelPosition: labelPosition,
99
+ disabled: disabled,
100
+ validateTrigger: validateTrigger
101
+ }
93
102
  }, children), footer ? /*#__PURE__*/ _react.default.createElement(_index.default, {
94
103
  className: "".concat(classPrefix, "-footer")
95
104
  }, footer) : null));
@@ -2,11 +2,12 @@ import React from 'react';
2
2
  import { FormProps } from "./form";
3
3
  import { FormItem } from "../formitem/formitem";
4
4
  import { FormInstance } from './types';
5
- import { useForm } from "./useform";
5
+ import { useForm, useWatch } from "./useform";
6
6
  export type { FormItemRuleWithoutValidator, FormInstance, FormFieldEntity, } from './types';
7
7
  type CompoundedComponent = React.ForwardRefExoticComponent<Partial<FormProps> & Omit<React.HTMLAttributes<HTMLDivElement>, 'onChange'> & React.RefAttributes<FormInstance>> & {
8
8
  Item: typeof FormItem;
9
9
  useForm: typeof useForm;
10
+ useWatch: typeof useWatch;
10
11
  };
11
12
  declare const InnerForm: CompoundedComponent;
12
13
  export default InnerForm;
@@ -16,4 +16,5 @@ var _useform = require("./useform");
16
16
  var InnerForm = _form.Form;
17
17
  InnerForm.Item = _formitem.FormItem;
18
18
  InnerForm.useForm = _useform.useForm;
19
+ InnerForm.useWatch = _useform.useWatch;
19
20
  var _default = InnerForm;
@@ -1,67 +1 @@
1
- .form-layout-right .nut-form-item-label {
2
- text-align: right;
3
- padding-right: 24px;
4
- white-space: nowrap;
5
- }
6
1
 
7
- .form-layout-left .nut-form-item-label {
8
- position: relative;
9
- text-align: left;
10
- padding-left: 12px;
11
- white-space: nowrap;
12
-
13
- .required {
14
- display: block;
15
- line-height: 1.5;
16
- position: absolute;
17
- left: 0.1em;
18
- }
19
- }
20
-
21
- .form-layout-top .nut-form-item {
22
- flex-direction: column;
23
- align-items: flex-start;
24
- white-space: nowrap;
25
- }
26
-
27
- .form-layout-top .nut-form-item-label {
28
- padding-bottom: 4px;
29
- display: block;
30
- padding-right: 24px;
31
- }
32
-
33
- .form-layout-top .nut-form-item-body {
34
- margin-left: 0;
35
- width: 100%;
36
- }
37
-
38
- [dir='rtl'] .form-layout-right .nut-form-item-label,
39
- .nut-rtl .form-layout-right .nut-form-item-label {
40
- text-align: left;
41
- padding-right: 0;
42
- padding-left: 24px;
43
- }
44
-
45
- [dir='rtl'] .form-layout-left .nut-form-item-label,
46
- .nut-rtl .form-layout-left .nut-form-item-label {
47
- text-align: right;
48
- padding-left: 0;
49
- padding-right: 12px;
50
-
51
- .required {
52
- left: auto;
53
- right: 0.1em;
54
- }
55
- }
56
-
57
- [dir='rtl'] .form-layout-top .nut-form-item-label,
58
- .nut-rtl .form-layout-top .nut-form-item-label {
59
- padding-right: 0;
60
- padding-left: 24px;
61
- }
62
-
63
- [dir='rtl'] .form-layout-top .nut-form-item-body,
64
- .nut-rtl .form-layout-top .nut-form-item-body {
65
- margin-left: 0;
66
- margin-right: 0;
67
- }