@nutui/nutui-react 2.0.0-alpha.16 → 2.0.0-alpha.17

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 (106) hide show
  1. package/CHANGELOG.md +12 -0
  2. package/dist/esm/ActionSheet/style/style.css +1 -1
  3. package/dist/esm/Button.js +4 -2
  4. package/dist/esm/Divider/style/style.css +1 -1
  5. package/dist/esm/Form/style/index.js +3 -1
  6. package/dist/esm/Form/style/style.css +1 -1
  7. package/dist/esm/Form.js +64 -48
  8. package/dist/esm/FormItem/style/index.js +1 -1
  9. package/dist/esm/FormItem/style/style.css +1 -1
  10. package/dist/esm/FormItem.js +1 -1
  11. package/dist/esm/InputNumber.js +7 -7
  12. package/dist/esm/Pagination/style/style.css +1 -1
  13. package/dist/esm/Picker.js +31 -11
  14. package/dist/esm/Popover.js +7 -7
  15. package/dist/esm/Popup.js +1 -0
  16. package/dist/esm/SearchBar.js +2 -2
  17. package/dist/esm/Swipe.js +4 -6
  18. package/dist/esm/formitem2.js +87 -69
  19. package/dist/esm/types/src/packages/button/button.d.ts +1 -0
  20. package/dist/esm/types/src/packages/elevator/elevator.d.ts +0 -1
  21. package/dist/esm/types/src/packages/elevator/elevator.taro.d.ts +0 -1
  22. package/dist/esm/types/src/packages/form/__tests__/form.spec.d.ts +1 -0
  23. package/dist/esm/types/src/packages/form/context.d.ts +4 -0
  24. package/dist/esm/types/src/packages/form/form.d.ts +11 -4
  25. package/dist/esm/types/src/packages/form/form.taro.d.ts +14 -4
  26. package/dist/esm/types/src/packages/form/index.d.ts +1 -0
  27. package/dist/esm/types/src/packages/form/index.taro.d.ts +1 -0
  28. package/dist/esm/types/src/packages/form/types.d.ts +4 -52
  29. package/dist/esm/types/src/packages/formitem/formitem.d.ts +16 -15
  30. package/dist/esm/types/src/packages/formitem/formitem.taro.d.ts +16 -12
  31. package/dist/esm/types/src/packages/formitem/index.d.ts +1 -0
  32. package/dist/esm/types/src/packages/formitem/index.taro.d.ts +1 -0
  33. package/dist/esm/types/src/packages/formitem/types.d.ts +1 -31
  34. package/dist/esm/types/src/packages/inputnumber/inputnumber.d.ts +1 -1
  35. package/dist/esm/types/src/packages/inputnumber/inputnumber.taro.d.ts +1 -1
  36. package/dist/esm/types/src/packages/picker/picker.d.ts +7 -2
  37. package/dist/esm/types/src/packages/picker/picker.taro.d.ts +7 -2
  38. package/dist/esm/types/src/packages/sticky/sticky.d.ts +0 -1
  39. package/dist/esm/types/src/packages/swipe/swipe.d.ts +2 -6
  40. package/dist/esm/types/src/packages/swipe/swipe.taro.d.ts +2 -6
  41. package/dist/esm/types/src/utils/is-forward-ref-component.d.ts +1 -0
  42. package/dist/locales/base.js +1 -1
  43. package/dist/locales/en-US.js +1 -1
  44. package/dist/locales/id-ID.js +1 -1
  45. package/dist/locales/tr-TR.js +1 -1
  46. package/dist/locales/zh-CN.js +1 -1
  47. package/dist/locales/zh-TW.js +1 -1
  48. package/dist/locales/zh-UG.js +1 -1
  49. package/dist/nutui.react.es.js +244 -173
  50. package/dist/nutui.react.umd.js +244 -173
  51. package/dist/packages/actionsheet/actionsheet.scss +6 -6
  52. package/dist/packages/divider/divider.scss +8 -7
  53. package/dist/packages/formitem/formitem.scss +1 -13
  54. package/dist/packages/layout/layout.scss +0 -2
  55. package/dist/packages/pagination/pagination.scss +8 -30
  56. package/dist/style.css +1 -1
  57. package/dist/style.mjs +1 -1
  58. package/dist/types/packages/animate/animate.d.ts +3 -3
  59. package/dist/types/packages/audio/audio.d.ts +2 -2
  60. package/dist/types/packages/avatar/avatar.d.ts +5 -5
  61. package/dist/types/packages/avatargroup/avatargroup.d.ts +5 -5
  62. package/dist/types/packages/badge/badge.d.ts +1 -1
  63. package/dist/types/packages/button/button.d.ts +5 -4
  64. package/dist/types/packages/cascader/cascader.d.ts +4 -4
  65. package/dist/types/packages/checkboxgroup/checkboxgroup.d.ts +2 -2
  66. package/dist/types/packages/circleprogress/circleprogress.d.ts +2 -2
  67. package/dist/types/packages/divider/divider.d.ts +2 -2
  68. package/dist/types/packages/drag/drag.d.ts +1 -1
  69. package/dist/types/packages/elevator/elevator.d.ts +0 -1
  70. package/dist/types/packages/empty/empty.d.ts +3 -3
  71. package/dist/types/packages/fixednav/fixednav.d.ts +3 -3
  72. package/dist/types/packages/form/context.d.ts +4 -0
  73. package/dist/types/packages/form/form.d.ts +43 -4
  74. package/dist/types/packages/form/index.d.ts +1 -0
  75. package/dist/types/packages/form/types.d.ts +4 -52
  76. package/dist/types/packages/formitem/formitem.d.ts +45 -16
  77. package/dist/types/packages/formitem/index.d.ts +1 -0
  78. package/dist/types/packages/formitem/types.d.ts +1 -31
  79. package/dist/types/packages/grid/grid.d.ts +1 -1
  80. package/dist/types/packages/infiniteloading/infiniteloading.d.ts +1 -1
  81. package/dist/types/packages/inputnumber/inputnumber.d.ts +1 -1
  82. package/dist/types/packages/noticebar/noticebar.d.ts +3 -3
  83. package/dist/types/packages/overlay/overlay.d.ts +1 -1
  84. package/dist/types/packages/pagination/pagination.d.ts +1 -1
  85. package/dist/types/packages/picker/picker.d.ts +7 -2
  86. package/dist/types/packages/popover/popover.d.ts +5 -5
  87. package/dist/types/packages/popup/popup.d.ts +2 -2
  88. package/dist/types/packages/radio/radio.d.ts +2 -2
  89. package/dist/types/packages/searchbar/searchbar.d.ts +7 -7
  90. package/dist/types/packages/step/step.d.ts +3 -3
  91. package/dist/types/packages/steps/steps.d.ts +1 -1
  92. package/dist/types/packages/sticky/sticky.d.ts +1 -2
  93. package/dist/types/packages/swipe/swipe.d.ts +2 -6
  94. package/dist/types/packages/swiper/swiper.d.ts +1 -1
  95. package/dist/types/packages/tabs/tabs.d.ts +1 -1
  96. package/dist/types/packages/tag/tag.d.ts +1 -1
  97. package/dist/types/packages/timeselect/timeselect.d.ts +2 -2
  98. package/dist/types/packages/toast/toast.d.ts +50 -10
  99. package/dist/types/packages/uploader/uploader.d.ts +17 -17
  100. package/dist/types/utils/is-forward-ref-component.d.ts +1 -0
  101. package/package.json +1 -1
  102. package/dist/esm/types/src/packages/formitem/formitemcontext.d.ts +0 -6
  103. package/dist/types/packages/formitem/formitemcontext.d.ts +0 -6
  104. /package/dist/esm/types/src/packages/form/{useForm.d.ts → useform.d.ts} +0 -0
  105. /package/dist/esm/types/src/packages/form/{useForm.taro.d.ts → useform.taro.d.ts} +0 -0
  106. /package/dist/types/packages/form/{useForm.d.ts → useform.d.ts} +0 -0
package/CHANGELOG.md CHANGED
@@ -1,3 +1,15 @@
1
+ # v2.0.0-alpha.17
2
+ `2023-06-14`
3
+
4
+ * :bug: fix: searchbar shape=round 效果差的问题 (#1109) @xiaoyatong
5
+ * :bug: fix: swipe 类型和文档优化 (#1122) @oasis-cloud
6
+ * 🛠 refactor: form (#1118) @oasis-cloud
7
+ * 📖 docs: 修改布局文档相关 @hanyuxinting
8
+ * 📖 docs: 文档走查及问题修复 (#1123) @xiaoyatong
9
+ * 📖 docs: 文档走查及问题修复-基础&布局组件(#1117) @Eiinu
10
+ * 📖 docs: 文档走查及问题修复-导航组件 (#1119) @xiaoyatong
11
+
12
+
1
13
  # v2.0.0-alpha.16
2
14
  `2023-06-09`
3
15
 
@@ -1 +1 @@
1
- .nut-overlay{position:fixed;top:0;left:0;width:100%;height:100%;background:var(--nutui-overlay-bg-color, var(--nutui-gray-7, rgba(0, 0, 0, .7)))}.nut-overlay-fade-enter-active{animation:nut-fade-in}.nut-overlay-fade-enter-active .wrapper .content{background-color:var(--nutui-overlay-content-bg-color, var(--nutui-gray-6, #ffffff));color:var(--nutui-overlay-content-color, var(--nutui-gray-1, #1a1a1a))}.nut-overlay-fade-leave-active{animation:nut-fade-out}.nut-overlay-first-render,.nut-overlay-hidden-render{display:none}@keyframes nut-fade-in{0%{opacity:0}1%{opacity:0}to{opacity:1}}@keyframes nut-fade-out{0%{opacity:1}1%{opacity:1}to{opacity:0}}.nut-popup{position:fixed;max-height:100%;overflow-y:auto;background-color:var(--nutui-gray-6, #ffffff);color:var(--nutui-gray-1, #1a1a1a);-webkit-overflow-scrolling:touch}.nut-popup__close-icon{position:absolute!important;z-index:1;color:var(--nutui-popup-close-icon-color, #969799);cursor:pointer;width:30px;height:30px;display:flex;justify-content:center;align-items:center}.nut-popup__close-icon:active{opacity:.7}.nut-popup__close-icon--top-left{top:var(--nutui-popup-close-icon-margin, 16px);left:var(--nutui-popup-close-icon-margin, 16px)}.nut-popup__close-icon--top-right{top:var(--nutui-popup-close-icon-margin, 16px);right:var(--nutui-popup-close-icon-margin, 16px)}.nut-popup__close-icon--bottom-left{bottom:var(--nutui-popup-close-icon-margin, 16px);left:var(--nutui-popup-close-icon-margin, 16px)}.nut-popup__close-icon--bottom-right{right:var(--nutui-popup-close-icon-margin, 16px);bottom:var(--nutui-popup-close-icon-margin, 16px)}.nut-popup-center{top:50%;left:50%;transform:translate(-50%,-50%)}.nut-popup-center.round{border-radius:var(--nutui-popup-border-radius, 20px)}.nut-popup-bottom{bottom:0;left:0;width:100%}.nut-popup-bottom.round{border-radius:var(--nutui-popup-border-radius, 20px) var(--nutui-popup-border-radius, 20px) 0 0}.nut-popup-right{top:0;right:0}.nut-popup-right.round{border-radius:var(--nutui-popup-border-radius, 20px) 0 0 var(--nutui-popup-border-radius, 20px)}.nut-popup-left{top:0;left:0}.nut-popup-left.round{border-radius:0 var(--nutui-popup-border-radius, 20px) var(--nutui-popup-border-radius, 20px) 0}.nut-popup-top{top:0;left:0;width:100%}.nut-popup-top.round{border-radius:0 0 var(--nutui-popup-border-radius, 20px) var(--nutui-popup-border-radius, 20px)}@keyframes popup-scale-fade-in{0%{opacity:0;transform:scale(.8)}to{opacity:1;transform:scale(1)}}@keyframes popup-scale-fade-out{0%{opacity:1;transform:scale(1)}to{opacity:0;transform:scale(.8)}}.nut-popup-slide-default-enter-active{animation-fill-mode:both;animation-name:popup-scale-fade-in;animation-duration:.3s}.nut-popup-slide-default-exit-active{animation-fill-mode:both;animation-name:popup-scale-fade-out;animation-duration:.3s}@keyframes popup-fade-in{0%{opacity:0}to{opacity:1}}@keyframes popup-fade-out{0%{opacity:1}to{opacity:0}}.nut-popup-slide-center-enter-active{animation-fill-mode:both;animation-name:popup-fade-in;animation-duration:.3s}.nut-popup-slide-center-exit-active{animation-fill-mode:both;animation-name:popup-fade-out;animation-duration:.3s}@keyframes popup-slide-top-enter{0%{transform:translate3d(0,-100%,0)}}@keyframes popup-slide-top-exit{to{transform:translate3d(0,-100%,0)}}.nut-popup-slide-top-enter-active,.nut-popup-slide-top-appear-active{transform:translateZ(0);animation-fill-mode:both;animation-name:popup-slide-top-enter;animation-duration:.3s}.nut-popup-slide-top-exit-active{animation-fill-mode:both;animation-name:popup-slide-top-exit;animation-duration:.3s}@keyframes popup-slide-right-enter{0%{transform:translate3d(100%,0,0)}}@keyframes popup-slide-right-exit{to{transform:translate3d(100%,0,0)}}.nut-popup-slide-right-enter-active,.nut-popup-slide-right-appear-active{transform:translateZ(0);animation-fill-mode:both;animation-name:popup-slide-right-enter;animation-duration:.3s}.nut-popup-slide-right-exit{animation-fill-mode:both;animation-name:popup-slide-right-exit;animation-duration:.3s}@keyframes popup-slide-bottom-enter{0%{transform:translate3d(0,100%,0)}}@keyframes slide-bottom-exit{to{transform:translate3d(0,100%,0)}}.nut-popup-slide-bottom-enter-active,.nut-popup-slide-bottom-appear-active{transform:translate(0);animation-fill-mode:both;animation-name:popup-slide-bottom-enter;animation-duration:.3s}.nut-popup-slide-bottom-exit{animation-fill-mode:both;animation-name:slide-bottom-exit;animation-duration:.3s}@keyframes popup-slide-left-enter{0%{transform:translate3d(-100%,0,0)}}@keyframes popup-slide-left-exit{to{transform:translate3d(-100%,0,0)}}.nut-popup-slide-left-enter-active,.nut-popup-slide-left-appear-active{transform:translate(0);animation-fill-mode:both;animation-name:popup-slide-left-enter;animation-duration:.3s}.nut-popup-slide-left-exit-active,.nut-popup-slide-left-exit-done{animation-fill-mode:both;animation-name:popup-slide-left-exit;animation-duration:.3s}.nut-overflow-hidden{overflow:hidden!important}.nut-actionsheet{display:block;padding-bottom:constant(safe-area-inset-bottom);padding-bottom:env(safe-area-inset-bottom);text-align:center}.nut-actionsheet .nut-actionsheet__title{display:block;padding:10px;margin:0;background-color:var(--nutui-gray-6, #ffffff);border-bottom:1px solid var(--nutui-actionsheet-border-color, #f6f6f6);font-size:var(--nutui-font-size-3, 16px);color:var(--nutui-gray-1, #1a1a1a)}.nut-actionsheet .nut-actionsheet__description{padding:10px;display:block;font-size:var(--nutui-font-size-2, 14px);color:var(--nutui-gray-2, #757575);margin-inline-start:0px}.nut-actionsheet .nut-actionsheet__list{display:block;list-style:none;padding:0;margin:0}.nut-actionsheet .nut-actionsheet__cancel,.nut-actionsheet .nut-actionsheet__item{display:block;padding:10px;text-align:var(--nutui-actionsheet-item-text-align, center);line-height:var(--nutui-actionsheet-item-line-height, 24px);font-size:var(--nutui-font-size-2, 14px);color:var(--nutui-actionsheet-item-color, var(--nutui-gray-1, #1a1a1a));background-color:var(--nutui-gray-6, #ffffff);cursor:pointer}.nut-actionsheet .nut-actionsheet__cancel-description,.nut-actionsheet .nut-actionsheet__item-description{display:block;font-size:var(--nutui-font-size-1, 12px);color:var(--nutui-gray-2, #757575)}.nut-actionsheet .nut-actionsheet__cancel.danger,.nut-actionsheet .nut-actionsheet__item.danger{color:var(--nutui-actionsheet-item-danger, var(--nutui-brand-color, #fa2c19))}.nut-actionsheet .nut-actionsheet__cancel.disabled,.nut-actionsheet .nut-actionsheet__item.disabled{color:#e1e1e1!important;cursor:not-allowed}.nut-actionsheet .nut-actionsheet__cancel{margin-top:5px;border-top:1px solid var(--nutui-actionsheet-border-color, #f6f6f6)}
1
+ .nut-overlay{position:fixed;top:0;left:0;width:100%;height:100%;background:var(--nutui-overlay-bg-color, var(--nutui-gray-7, rgba(0, 0, 0, .7)))}.nut-overlay-fade-enter-active{animation:nut-fade-in}.nut-overlay-fade-enter-active .wrapper .content{background-color:var(--nutui-overlay-content-bg-color, var(--nutui-gray-6, #ffffff));color:var(--nutui-overlay-content-color, var(--nutui-gray-1, #1a1a1a))}.nut-overlay-fade-leave-active{animation:nut-fade-out}.nut-overlay-first-render,.nut-overlay-hidden-render{display:none}@keyframes nut-fade-in{0%{opacity:0}1%{opacity:0}to{opacity:1}}@keyframes nut-fade-out{0%{opacity:1}1%{opacity:1}to{opacity:0}}.nut-popup{position:fixed;max-height:100%;overflow-y:auto;background-color:var(--nutui-gray-6, #ffffff);color:var(--nutui-gray-1, #1a1a1a);-webkit-overflow-scrolling:touch}.nut-popup__close-icon{position:absolute!important;z-index:1;color:var(--nutui-popup-close-icon-color, #969799);cursor:pointer;width:30px;height:30px;display:flex;justify-content:center;align-items:center}.nut-popup__close-icon:active{opacity:.7}.nut-popup__close-icon--top-left{top:var(--nutui-popup-close-icon-margin, 16px);left:var(--nutui-popup-close-icon-margin, 16px)}.nut-popup__close-icon--top-right{top:var(--nutui-popup-close-icon-margin, 16px);right:var(--nutui-popup-close-icon-margin, 16px)}.nut-popup__close-icon--bottom-left{bottom:var(--nutui-popup-close-icon-margin, 16px);left:var(--nutui-popup-close-icon-margin, 16px)}.nut-popup__close-icon--bottom-right{right:var(--nutui-popup-close-icon-margin, 16px);bottom:var(--nutui-popup-close-icon-margin, 16px)}.nut-popup-center{top:50%;left:50%;transform:translate(-50%,-50%)}.nut-popup-center.round{border-radius:var(--nutui-popup-border-radius, 20px)}.nut-popup-bottom{bottom:0;left:0;width:100%}.nut-popup-bottom.round{border-radius:var(--nutui-popup-border-radius, 20px) var(--nutui-popup-border-radius, 20px) 0 0}.nut-popup-right{top:0;right:0}.nut-popup-right.round{border-radius:var(--nutui-popup-border-radius, 20px) 0 0 var(--nutui-popup-border-radius, 20px)}.nut-popup-left{top:0;left:0}.nut-popup-left.round{border-radius:0 var(--nutui-popup-border-radius, 20px) var(--nutui-popup-border-radius, 20px) 0}.nut-popup-top{top:0;left:0;width:100%}.nut-popup-top.round{border-radius:0 0 var(--nutui-popup-border-radius, 20px) var(--nutui-popup-border-radius, 20px)}@keyframes popup-scale-fade-in{0%{opacity:0;transform:scale(.8)}to{opacity:1;transform:scale(1)}}@keyframes popup-scale-fade-out{0%{opacity:1;transform:scale(1)}to{opacity:0;transform:scale(.8)}}.nut-popup-slide-default-enter-active{animation-fill-mode:both;animation-name:popup-scale-fade-in;animation-duration:.3s}.nut-popup-slide-default-exit-active{animation-fill-mode:both;animation-name:popup-scale-fade-out;animation-duration:.3s}@keyframes popup-fade-in{0%{opacity:0}to{opacity:1}}@keyframes popup-fade-out{0%{opacity:1}to{opacity:0}}.nut-popup-slide-center-enter-active{animation-fill-mode:both;animation-name:popup-fade-in;animation-duration:.3s}.nut-popup-slide-center-exit-active{animation-fill-mode:both;animation-name:popup-fade-out;animation-duration:.3s}@keyframes popup-slide-top-enter{0%{transform:translate3d(0,-100%,0)}}@keyframes popup-slide-top-exit{to{transform:translate3d(0,-100%,0)}}.nut-popup-slide-top-enter-active,.nut-popup-slide-top-appear-active{transform:translateZ(0);animation-fill-mode:both;animation-name:popup-slide-top-enter;animation-duration:.3s}.nut-popup-slide-top-exit-active{animation-fill-mode:both;animation-name:popup-slide-top-exit;animation-duration:.3s}@keyframes popup-slide-right-enter{0%{transform:translate3d(100%,0,0)}}@keyframes popup-slide-right-exit{to{transform:translate3d(100%,0,0)}}.nut-popup-slide-right-enter-active,.nut-popup-slide-right-appear-active{transform:translateZ(0);animation-fill-mode:both;animation-name:popup-slide-right-enter;animation-duration:.3s}.nut-popup-slide-right-exit{animation-fill-mode:both;animation-name:popup-slide-right-exit;animation-duration:.3s}@keyframes popup-slide-bottom-enter{0%{transform:translate3d(0,100%,0)}}@keyframes slide-bottom-exit{to{transform:translate3d(0,100%,0)}}.nut-popup-slide-bottom-enter-active,.nut-popup-slide-bottom-appear-active{transform:translate(0);animation-fill-mode:both;animation-name:popup-slide-bottom-enter;animation-duration:.3s}.nut-popup-slide-bottom-exit{animation-fill-mode:both;animation-name:slide-bottom-exit;animation-duration:.3s}@keyframes popup-slide-left-enter{0%{transform:translate3d(-100%,0,0)}}@keyframes popup-slide-left-exit{to{transform:translate3d(-100%,0,0)}}.nut-popup-slide-left-enter-active,.nut-popup-slide-left-appear-active{transform:translate(0);animation-fill-mode:both;animation-name:popup-slide-left-enter;animation-duration:.3s}.nut-popup-slide-left-exit-active,.nut-popup-slide-left-exit-done{animation-fill-mode:both;animation-name:popup-slide-left-exit;animation-duration:.3s}.nut-overflow-hidden{overflow:hidden!important}.nut-actionsheet{display:block;padding-bottom:constant(safe-area-inset-bottom);padding-bottom:env(safe-area-inset-bottom);text-align:center}.nut-actionsheet__title{display:block;padding:10px;margin:0;background-color:var(--nutui-gray-6, #ffffff);border-bottom:1px solid var(--nutui-actionsheet-border-color, #f6f6f6);font-size:var(--nutui-font-size-3, 16px);color:var(--nutui-gray-1, #1a1a1a)}.nut-actionsheet__description{padding:10px;display:block;font-size:var(--nutui-font-size-2, 14px);color:var(--nutui-gray-2, #757575);margin-inline-start:0px}.nut-actionsheet__list{display:block;list-style:none;padding:0;margin:0}.nut-actionsheet__cancel,.nut-actionsheet__item{display:block;padding:10px;text-align:var(--nutui-actionsheet-item-text-align, center);line-height:var(--nutui-actionsheet-item-line-height, 24px);font-size:var(--nutui-font-size-2, 14px);color:var(--nutui-actionsheet-item-color, var(--nutui-gray-1, #1a1a1a));background-color:var(--nutui-gray-6, #ffffff);cursor:pointer}.nut-actionsheet__cancel-description,.nut-actionsheet__item-description{display:block;font-size:var(--nutui-font-size-1, 12px);color:var(--nutui-gray-2, #757575)}.nut-actionsheet__cancel.danger,.nut-actionsheet__item.danger{color:var(--nutui-actionsheet-item-danger, var(--nutui-brand-color, #fa2c19))}.nut-actionsheet__cancel.disabled,.nut-actionsheet__item.disabled{color:#e1e1e1!important;cursor:not-allowed}.nut-actionsheet__cancel{margin-top:5px;border-top:1px solid var(--nutui-actionsheet-border-color, #f6f6f6)}
@@ -1,6 +1,6 @@
1
1
  import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
2
2
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
3
- var _excluded = ["color", "shape", "fill", "loading", "disabled", "type", "size", "block", "icon", "children", "onClick", "className", "style"];
3
+ var _excluded = ["color", "shape", "fill", "loading", "disabled", "type", "size", "block", "icon", "children", "onClick", "className", "style", "nativeType"];
4
4
  function ownKeys(object, enumerableOnly) {
5
5
  var keys = Object.keys(object);
6
6
  if (Object.getOwnPropertySymbols) {
@@ -37,12 +37,13 @@ var defaultProps = _objectSpread(_objectSpread({}, ComponentDefaults), {}, {
37
37
  disabled: false,
38
38
  block: false,
39
39
  icon: null,
40
+ nativeType: "button",
40
41
  onClick: function onClick(e) {
41
42
  }
42
43
  });
43
44
  var Button = React__default.forwardRef(function(props, ref) {
44
45
  var _classNames;
45
- var _defaultProps$props = _objectSpread(_objectSpread({}, defaultProps), props), color = _defaultProps$props.color, shape = _defaultProps$props.shape, fill = _defaultProps$props.fill, loading = _defaultProps$props.loading, disabled = _defaultProps$props.disabled, type = _defaultProps$props.type, size = _defaultProps$props.size, block = _defaultProps$props.block, icon = _defaultProps$props.icon, children = _defaultProps$props.children, onClick2 = _defaultProps$props.onClick, className = _defaultProps$props.className, style = _defaultProps$props.style, rest = _objectWithoutProperties(_defaultProps$props, _excluded);
46
+ var _defaultProps$props = _objectSpread(_objectSpread({}, defaultProps), props), color = _defaultProps$props.color, shape = _defaultProps$props.shape, fill = _defaultProps$props.fill, loading = _defaultProps$props.loading, disabled = _defaultProps$props.disabled, type = _defaultProps$props.type, size = _defaultProps$props.size, block = _defaultProps$props.block, icon = _defaultProps$props.icon, children = _defaultProps$props.children, onClick2 = _defaultProps$props.onClick, className = _defaultProps$props.className, style = _defaultProps$props.style, nativeType = _defaultProps$props.nativeType, rest = _objectWithoutProperties(_defaultProps$props, _excluded);
46
47
  var getStyle = useCallback(function() {
47
48
  var style2 = {};
48
49
  if (props.color) {
@@ -68,6 +69,7 @@ var Button = React__default.forwardRef(function(props, ref) {
68
69
  // eslint-disable-next-line react/button-has-type
69
70
  React__default.createElement("button", _objectSpread(_objectSpread({}, rest), {}, {
70
71
  ref,
72
+ type: nativeType,
71
73
  className: classNames(prefixCls, className, props.type ? "".concat(prefixCls, "--").concat(type) : null, props.fill ? "".concat(prefixCls, "--").concat(fill) : null, (_classNames = {}, _defineProperty(_classNames, "".concat(prefixCls, "--").concat(size), size), _defineProperty(_classNames, "".concat(prefixCls, "--").concat(shape), shape), _defineProperty(_classNames, "".concat(prefixCls, "--block"), block), _defineProperty(_classNames, "".concat(prefixCls, "--disabled"), disabled), _defineProperty(_classNames, "".concat(prefixCls, "--loading"), loading), _classNames)),
72
74
  style: _objectSpread(_objectSpread({}, getStyle()), style),
73
75
  onClick: function onClick3(e) {
@@ -1 +1 @@
1
- .nut-divider{display:flex;align-items:center;font-size:var(--nutui-divider-text-font-size, var(--nutui-font-size-2, 14px));color:var(--nutui-divider-text-color, var(--nutui-gray-1, #1a1a1a));margin:var(--nutui-divider-margin, 16px 0);border:0 solid currentColor;width:100%}.nut-divider:before,.nut-divider:after{content:"";border-style:inherit;border-color:inherit;border-width:var(--nutui-divider-line-height, 2px) 0 0;height:var(--nutui-divider-line-height, 2px);flex:1}.nut-divider.nut-divider__center:before,.nut-divider.nut-divider__left:before,.nut-divider.nut-divider__right:before{margin-right:var(--nutui-divider-before-margin-right, 16px)}.nut-divider.nut-divider__center:after,.nut-divider.nut-divider__left:after,.nut-divider.nut-divider__right:after{margin-left:var(--nutui-divider-after-margin-left, 16px)}.nut-divider.nut-divider__left:before{max-width:10%}.nut-divider.nut-divider__right:after{max-width:10%}.nut-divider.nut-divider__hairline:before,.nut-divider.nut-divider__hairline:after{transform:scaleY(.5)}.nut-divider.nut-divider__vertical{position:relative;top:var(--nutui-divider-vertical-top, 2px);display:inline-block;height:var(--nutui-divider-vertical-height, 12px);border-left:1px solid var(--nutui-divider-vertical-border-left, rgba(0, 0, 0, .06));margin:var(--nutui-divider-vertical-margin, 0 8px);width:auto}
1
+ .nut-divider{display:flex;align-items:center;font-size:var(--nutui-divider-text-font-size, var(--nutui-font-size-2, 14px));color:var(--nutui-divider-text-color, var(--nutui-gray-1, #1a1a1a));margin:var(--nutui-divider-margin, 16px 0);border:0 solid currentColor;width:100%}.nut-divider:before,.nut-divider:after{content:"";border-style:inherit;border-color:inherit;border-width:var(--nutui-divider-line-height, 2px) 0 0;height:var(--nutui-divider-line-height, 2px);flex:1}.nut-divider__center:before,.nut-divider__left:before,.nut-divider__right:before{margin-right:var(--nutui-divider-before-margin-right, 16px)}.nut-divider__center:after,.nut-divider__left:after,.nut-divider__right:after{margin-left:var(--nutui-divider-after-margin-left, 16px)}.nut-divider__left:before{max-width:10%}.nut-divider__right:after{max-width:10%}.nut-divider__hairline:before,.nut-divider__hairline:after{transform:scaleY(.5)}.nut-divider__vertical{position:relative;top:var(--nutui-divider-vertical-top, 2px);display:inline-block;height:var(--nutui-divider-vertical-height, 12px);border-left:1px solid var(--nutui-divider-vertical-border-left, rgba(0, 0, 0, .06));margin:var(--nutui-divider-vertical-margin, 0 8px);width:auto}
@@ -1,2 +1,4 @@
1
- import '../../CellGroup/style'
1
+ import '../../CellGroup/style'
2
+ import '../../Cell/style'
3
+ import '../../FormItem/style'
2
4
  import '../../../packages/form/form.scss'
@@ -1 +1 @@
1
- .nut-cell-group{display:block}.nut-cell-group__title{display:inherit;padding:var(--nutui-cell-group-title-padding, 0 10px);color:var(--nutui-cell-group-title-color, #909ca4);font-size:var(--nutui-cell-group-title-font-size, var(--nutui-font-size-2, 14px));line-height:var(--nutui-cell-group-title-line-height, 20px);margin-top:30px;margin-bottom:10px}.nut-cell-group__description{display:inherit;padding:var(--nutui-cell-group-description-padding, 0 10px);color:var(--nutui-cell-group-description-color, #909ca4);font-size:var(--nutui-cell-group-description-font-size, var(--nutui-font-size-1, 12px));line-height:var(--nutui-cell-group-description-line-height, 16px);margin-top:10px;margin-bottom:10px}.nut-cell-group__wrap{display:inherit;border-radius:var(--nutui-cell-border-radius, 6px);overflow:hidden;background-color:var(--nutui-cell-group-background-color, var(--nutui-gray-6, #ffffff));margin:10px 0}.nut-cell-group__wrap .nut-cell{margin:0;box-shadow:none;border-radius:0}.nut-cell-group__wrap--divider .nut-cell__divider{position:absolute;box-sizing:border-box;pointer-events:none;right:var(--nutui-cell-divider-right, 16px);bottom:0;left:var(--nutui-cell-divider-left, 16px);transform:scaleY(.5);border-top:var(--nutui-cell-divider-border-bottom, 2px solid #f5f6f7)}.nut-cell-group__wrap--divider .nut-cell:last-child .nut-cell__divider{border-top:0!important}.form-layout-right .nut-form-item__label{text-align:right;font-size:14px;padding-right:24px;white-space:nowrap}.form-layout-left .nut-form-item__label{text-align:left;font-size:14px;padding-right:24px;white-space:nowrap}.form-layout-top .nut-form-item{flex-direction:column;align-items:flex-start;white-space:nowrap}.form-layout-top .nut-form-item__label{padding-bottom:4px;display:block;font-size:14px;padding-right:24px}.form-layout-top .nut-form-item__body{margin-left:0}
1
+ .nut-cell-group{display:block}.nut-cell-group__title{display:inherit;padding:var(--nutui-cell-group-title-padding, 0 10px);color:var(--nutui-cell-group-title-color, #909ca4);font-size:var(--nutui-cell-group-title-font-size, var(--nutui-font-size-2, 14px));line-height:var(--nutui-cell-group-title-line-height, 20px);margin-top:30px;margin-bottom:10px}.nut-cell-group__description{display:inherit;padding:var(--nutui-cell-group-description-padding, 0 10px);color:var(--nutui-cell-group-description-color, #909ca4);font-size:var(--nutui-cell-group-description-font-size, var(--nutui-font-size-1, 12px));line-height:var(--nutui-cell-group-description-line-height, 16px);margin-top:10px;margin-bottom:10px}.nut-cell-group__wrap{display:inherit;border-radius:var(--nutui-cell-border-radius, 6px);overflow:hidden;background-color:var(--nutui-cell-group-background-color, var(--nutui-gray-6, #ffffff));margin:10px 0}.nut-cell-group__wrap .nut-cell{margin:0;box-shadow:none;border-radius:0}.nut-cell-group__wrap--divider .nut-cell__divider{position:absolute;box-sizing:border-box;pointer-events:none;right:var(--nutui-cell-divider-right, 16px);bottom:0;left:var(--nutui-cell-divider-left, 16px);transform:scaleY(.5);border-top:var(--nutui-cell-divider-border-bottom, 2px solid #f5f6f7)}.nut-cell-group__wrap--divider .nut-cell:last-child .nut-cell__divider{border-top:0!important}.nut-cell{position:relative;display:flex;width:100%;line-height:var(--nutui-cell-line-height, 20px);padding:var(--nutui-cell-padding, 13px 16px);background-color:var(--nutui-cell-background-color, var(--nutui-gray-6, #ffffff));border-radius:var(--nutui-cell-border-radius, 6px);box-shadow:var(--nutui-cell-box-shadow, 0px 1px 7px 0px rgb(237, 238, 241));font-size:var(--nutui-cell-title-font-size, var(--nutui-font-size-2, 14px));color:var(--nutui-cell-title-color, var(--nutui-gray-1, #1a1a1a));margin:10px 0;box-sizing:border-box}.nut-cell__left{display:flex;flex-direction:column;flex:1}.nut-cell__description{font-size:var(--nutui-cell-description-font-size, var(--nutui-font-size-1, 12px));color:var(--nutui-cell-description-color, var(--nutui-gray-2, #757575))}.nut-cell__extra{display:inline-flex;justify-content:flex-end;align-items:center;flex:1;min-width:0;word-break:break-all;font-size:var(--nutui-cell-extra-font-size, var(--nutui-font-size-2, 14px));color:var(--nutui-cell-extra-color, var(--nutui-gray-2, #757575))}.nut-form-item{display:flex}.nut-form-item:before{position:absolute;box-sizing:border-box;content:" ";pointer-events:none;right:16px;bottom:0;left:16px;transform:scaleX(0)}.nut-form-item.error.line:before{border-bottom:1px solid var(--nutui-form-item-error-line-color, var(--nutui-brand-color, #fa2c19));transform:scaleX(1);transition:transform .2s cubic-bezier(0,0,.2,1) 0ms}.nut-form-item__label{font-size:var(--nutui-form-item-label-font-size, 14px);font-weight:400;width:var(--nutui-form-item-label-width, 90px);margin-right:var(--nutui-form-item-label-margin-right, 10px);flex:none!important;display:inline-block!important;word-wrap:break-word;text-align:var(--nutui-form-item-label-text-align, left)}.nut-form-item__label .required:before{content:"*";color:var(--nutui-form-item-required-color, var(--nutui-brand-color, #fa2c19));margin-right:var(--nutui-form-item-required-margin-right, 4px)}.nut-form-item__body{flex:1;display:flex!important;flex-direction:column}.nut-form-item__body__slots{text-align:var(--nutui-form-item-body-slots-text-align, left)}.nut-form-item__body__slots .nut-input{padding:0;border:0}.nut-form-item__body__slots .nut-input-text{font-size:var(--nutui-form-item-body-font-size, 14px);text-align:var(--nutui-form-item-body-input-text-align, left);color:var(--nutui-gray-0, #000000);width:100%;outline:0 none;border:0;text-decoration:none;background:transparent}.nut-form-item__body__slots .nut-range-container{min-height:24px}.nut-form-item__body__slots .nut-textarea{padding:0!important}.nut-form-item__body__slots .nut-textarea .nut-textarea__textarea{font:inherit;text-align:var(--nutui-form-item-body-input-text-align, left)}.nut-form-item__body__tips{text-align:var(--nutui-form-item-tip-text-align, left);font-size:var(--nutui-form-item-tip-font-size, 10px);color:var(--nutui-form-item-error-message-color, var(--nutui-brand-color, #fa2c19))}.form-layout-right .nut-form-item__label{text-align:right;font-size:14px;padding-right:24px;white-space:nowrap}.form-layout-left .nut-form-item__label{text-align:left;font-size:14px;padding-right:24px;white-space:nowrap}.form-layout-top .nut-form-item{flex-direction:column;align-items:flex-start;white-space:nowrap}.form-layout-top .nut-form-item__label{padding-bottom:4px;display:block;font-size:14px;padding-right:24px}.form-layout-top .nut-form-item__body{margin-left:0}
package/dist/esm/Form.js CHANGED
@@ -1,11 +1,9 @@
1
1
  import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
2
- import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
3
2
  import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
4
3
  import _createClass from "@babel/runtime/helpers/createClass";
5
4
  import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
6
5
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
7
6
  import _typeof from "@babel/runtime/helpers/typeof";
8
- var _excluded = ["children", "onFinish", "onFinishFailed", "labelPosition", "starPositon", "form"];
9
7
  function ownKeys(object4, enumerableOnly) {
10
8
  var keys = Object.keys(object4);
11
9
  if (Object.getOwnPropertySymbols) {
@@ -28,11 +26,11 @@ function _objectSpread(target) {
28
26
  return target;
29
27
  }
30
28
  import React__default, { useRef } from "react";
29
+ import classNames from "classnames";
31
30
  import { C as CellGroup } from "./cellgroup2.js";
32
- import { F as FormItemContext, a as FormItem } from "./formitem2.js";
31
+ import { C as Context, F as FormItem } from "./formitem2.js";
33
32
  import { C as ComponentDefaults } from "./typings.js";
34
- import "classnames";
35
- import "./Cell.js";
33
+ import Cell from "./Cell.js";
36
34
  function _extends() {
37
35
  _extends = Object.assign ? Object.assign.bind() : function(target) {
38
36
  for (var i = 1; i < arguments.length; i++) {
@@ -1089,21 +1087,31 @@ Schema.validators = validators;
1089
1087
  var FormStore = /* @__PURE__ */ _createClass(function FormStore2() {
1090
1088
  var _this3 = this;
1091
1089
  _classCallCheck(this, FormStore2);
1090
+ _defineProperty(this, "initialValues", {});
1092
1091
  _defineProperty(this, "store", {});
1093
1092
  _defineProperty(this, "fieldEntities", []);
1094
1093
  _defineProperty(this, "callbacks", {});
1095
- _defineProperty(this, "errList", []);
1094
+ _defineProperty(this, "errors", []);
1096
1095
  _defineProperty(this, "registerField", function(field) {
1097
1096
  _this3.fieldEntities.push(field);
1098
1097
  return function() {
1099
1098
  _this3.fieldEntities = _this3.fieldEntities.filter(function(item) {
1100
1099
  return item != field;
1101
1100
  });
1102
- delete _this3.store[field.props.name];
1101
+ if (_this3.store) {
1102
+ delete _this3.store[field.props.name];
1103
+ }
1103
1104
  };
1104
1105
  });
1105
1106
  _defineProperty(this, "getFieldValue", function(name) {
1106
- return _this3.store[name];
1107
+ var _this3$store;
1108
+ return (_this3$store = _this3.store) === null || _this3$store === void 0 ? void 0 : _this3$store[name];
1109
+ });
1110
+ _defineProperty(this, "setInitialValues", function(values, init) {
1111
+ if (init) {
1112
+ _this3.initialValues = values;
1113
+ _this3.store = values;
1114
+ }
1107
1115
  });
1108
1116
  _defineProperty(this, "setFieldsValue", function(newStore) {
1109
1117
  _this3.store = _objectSpread(_objectSpread({}, _this3.store), newStore);
@@ -1111,21 +1119,25 @@ var FormStore = /* @__PURE__ */ _createClass(function FormStore2() {
1111
1119
  var name = enetity.props.name;
1112
1120
  Object.keys(newStore).forEach(function(key) {
1113
1121
  if (key === name) {
1114
- enetity.onStoreChange();
1122
+ enetity.onStoreChange("update");
1115
1123
  }
1116
1124
  });
1117
1125
  });
1118
1126
  });
1127
+ _defineProperty(this, "setCallback", function(callback) {
1128
+ _this3.callbacks = _objectSpread(_objectSpread({}, _this3.callbacks), callback);
1129
+ });
1119
1130
  _defineProperty(this, "validate", function() {
1120
1131
  var err = [];
1121
- _this3.errList.length = 0;
1132
+ _this3.errors.length = 0;
1122
1133
  _this3.fieldEntities.forEach(function(entity) {
1134
+ var _this3$store2;
1123
1135
  var _entity$props = entity.props, name = _entity$props.name, _entity$props$rules = _entity$props.rules, rules2 = _entity$props$rules === void 0 ? [] : _entity$props$rules;
1124
1136
  var descriptor = {};
1125
1137
  if (rules2.length) {
1126
1138
  if (rules2.length > 1) {
1127
1139
  descriptor[name] = [];
1128
- rules2.map(function(v) {
1140
+ rules2.forEach(function(v) {
1129
1141
  descriptor[name].push(v);
1130
1142
  });
1131
1143
  } else {
@@ -1133,38 +1145,38 @@ var FormStore = /* @__PURE__ */ _createClass(function FormStore2() {
1133
1145
  }
1134
1146
  }
1135
1147
  var validator = new Schema(descriptor);
1136
- validator.validate(_defineProperty({}, name, _this3.store[name]), function(errors) {
1148
+ validator.messages();
1149
+ validator.validate(_defineProperty({}, name, (_this3$store2 = _this3.store) === null || _this3$store2 === void 0 ? void 0 : _this3$store2[name]), function(errors) {
1137
1150
  if (errors) {
1138
- var _this3$errList;
1151
+ var _this3$errors;
1139
1152
  err.push.apply(err, _toConsumableArray(errors));
1140
- (_this3$errList = _this3.errList).push.apply(_this3$errList, _toConsumableArray(errors));
1153
+ (_this3$errors = _this3.errors).push.apply(_this3$errors, _toConsumableArray(errors));
1141
1154
  }
1142
- entity.onStoreChange();
1155
+ entity.onStoreChange("validate");
1143
1156
  });
1144
1157
  });
1145
1158
  return err;
1146
1159
  });
1147
- _defineProperty(this, "setCallback", function(callback) {
1148
- _this3.callbacks = _objectSpread(_objectSpread({}, _this3.callbacks), callback);
1149
- });
1150
1160
  _defineProperty(this, "submit", function() {
1151
- var err = _this3.validate();
1152
- if (err.length === 0) {
1161
+ var errors = _this3.validate();
1162
+ if (errors.length === 0) {
1153
1163
  var _this3$callbacks$onFi, _this3$callbacks;
1154
1164
  (_this3$callbacks$onFi = (_this3$callbacks = _this3.callbacks).onFinish) === null || _this3$callbacks$onFi === void 0 ? void 0 : _this3$callbacks$onFi.call(_this3$callbacks, _this3.store);
1155
- } else if (err.length > 0) {
1165
+ } else if (errors.length > 0) {
1156
1166
  var _this3$callbacks$onFi2, _this3$callbacks2;
1157
- (_this3$callbacks$onFi2 = (_this3$callbacks2 = _this3.callbacks).onFinishFailed) === null || _this3$callbacks$onFi2 === void 0 ? void 0 : _this3$callbacks$onFi2.call(_this3$callbacks2, err);
1167
+ (_this3$callbacks$onFi2 = (_this3$callbacks2 = _this3.callbacks).onFinishFailed) === null || _this3$callbacks$onFi2 === void 0 ? void 0 : _this3$callbacks$onFi2.call(_this3$callbacks2, _this3.store, errors);
1158
1168
  }
1159
1169
  });
1160
1170
  _defineProperty(this, "resetFields", function() {
1161
- _this3.errList.length = 0;
1162
- _this3.fieldEntities.forEach(function(enetity) {
1163
- enetity.onStoreChange();
1171
+ _this3.errors.length = 0;
1172
+ _this3.store = _this3.initialValues;
1173
+ _this3.fieldEntities.forEach(function(entity) {
1174
+ entity.onStoreChange("reset");
1164
1175
  });
1165
1176
  });
1166
1177
  _defineProperty(this, "getForm", function() {
1167
1178
  return {
1179
+ setInitialValues: _this3.setInitialValues,
1168
1180
  setCallback: _this3.setCallback,
1169
1181
  registerField: _this3.registerField,
1170
1182
  getFieldValue: _this3.getFieldValue,
@@ -1172,12 +1184,12 @@ var FormStore = /* @__PURE__ */ _createClass(function FormStore2() {
1172
1184
  resetFields: _this3.resetFields,
1173
1185
  submit: _this3.submit,
1174
1186
  store: _this3.store,
1175
- errList: _this3.errList,
1187
+ errors: _this3.errors,
1176
1188
  fieldEntities: _this3.fieldEntities
1177
1189
  };
1178
1190
  });
1179
1191
  this.callbacks = {
1180
- onFinish: function onFinish2(value) {
1192
+ onFinish: function onFinish2() {
1181
1193
  },
1182
1194
  onFinishFailed: function onFinishFailed2() {
1183
1195
  }
@@ -1196,52 +1208,56 @@ var useForm = function useForm2(form) {
1196
1208
  return [formRef.current];
1197
1209
  };
1198
1210
  var defaultProps = _objectSpread(_objectSpread({}, ComponentDefaults), {}, {
1199
- className: "",
1200
- style: void 0,
1201
- form: {},
1202
- labelPosition: "Right",
1203
- formGroupTitle: "",
1204
- onFinish: function onFinish(obj) {
1211
+ labelPosition: "right",
1212
+ starPosition: "left",
1213
+ onFinish: function onFinish(values) {
1205
1214
  },
1206
- onFinishFailed: function onFinishFailed(value) {
1207
- },
1208
- starPositon: "Left"
1215
+ onFinishFailed: function onFinishFailed(values, errorFields) {
1216
+ }
1209
1217
  });
1210
1218
  var PositionInfo = {
1211
- Top: "form-layout-top",
1212
- Left: "form-layout-left",
1213
- Right: "form-layout-right"
1219
+ top: "form-layout-top",
1220
+ left: "form-layout-left",
1221
+ right: "form-layout-right"
1214
1222
  };
1215
1223
  var Form = function Form2(props) {
1216
- var _defaultProps$props = _objectSpread(_objectSpread({}, defaultProps), props), children = _defaultProps$props.children, onFinish2 = _defaultProps$props.onFinish, onFinishFailed2 = _defaultProps$props.onFinishFailed, labelPosition = _defaultProps$props.labelPosition, starPositon = _defaultProps$props.starPositon, form = _defaultProps$props.form, rest = _objectWithoutProperties(_defaultProps$props, _excluded);
1217
- var formInstance = {};
1218
- if (Object.keys(form).length !== 0) {
1224
+ var classPrefix = "nut-form";
1225
+ var _defaultProps$props = _objectSpread(_objectSpread({}, defaultProps), props), className = _defaultProps$props.className, style = _defaultProps$props.style, footer = _defaultProps$props.footer, children = _defaultProps$props.children, initialValues = _defaultProps$props.initialValues, onFinish2 = _defaultProps$props.onFinish, onFinishFailed2 = _defaultProps$props.onFinishFailed, labelPosition = _defaultProps$props.labelPosition, starPosition = _defaultProps$props.starPosition, form = _defaultProps$props.form;
1226
+ var formInstance;
1227
+ if (form !== void 0) {
1219
1228
  formInstance = form;
1220
1229
  } else {
1221
1230
  var _useForm = useForm();
1222
1231
  var _useForm2 = _slicedToArray(_useForm, 1);
1223
1232
  formInstance = _useForm2[0];
1224
1233
  }
1225
- formInstance.starPositon = starPositon;
1226
- var _formInstance = formInstance, setCallback = _formInstance.setCallback, submit = _formInstance.submit, resetFields = _formInstance.resetFields;
1234
+ formInstance.starPosition = starPosition;
1235
+ var _formInstance = formInstance, setCallback = _formInstance.setCallback, submit = _formInstance.submit, resetFields = _formInstance.resetFields, setInitialValues = _formInstance.setInitialValues;
1227
1236
  setCallback({
1228
1237
  onFinish: onFinish2,
1229
1238
  onFinishFailed: onFinishFailed2
1230
1239
  });
1240
+ var mountRef = React__default.useRef(false);
1241
+ setInitialValues(initialValues, !mountRef.current);
1242
+ if (!mountRef.current) {
1243
+ mountRef.current = true;
1244
+ }
1231
1245
  return React__default.createElement("form", {
1232
- className: "nut-form ".concat(PositionInfo[labelPosition], " ").concat(props.className),
1233
- style: props.style,
1246
+ className: classNames(classPrefix, className, PositionInfo[labelPosition]),
1247
+ style,
1234
1248
  onSubmit: function onSubmit(e) {
1235
1249
  e.preventDefault();
1250
+ e.stopPropagation();
1236
1251
  submit();
1237
1252
  },
1238
1253
  onReset: function onReset(e) {
1239
1254
  e.preventDefault();
1255
+ e.stopPropagation();
1240
1256
  resetFields();
1241
1257
  }
1242
- }, React__default.createElement(CellGroup, null, React__default.createElement(FormItemContext.Provider, {
1258
+ }, React__default.createElement(CellGroup, null, React__default.createElement(Context.Provider, {
1243
1259
  value: formInstance
1244
- }, children)));
1260
+ }, children), footer ? React__default.createElement(Cell, null, footer) : null));
1245
1261
  };
1246
1262
  Form.defaultProps = defaultProps;
1247
1263
  Form.displayName = "NutForm";
@@ -1,2 +1,2 @@
1
- import '../../Cell/style'
1
+
2
2
  import '../../../packages/formitem/formitem.scss'
@@ -1 +1 @@
1
- .nut-cell{position:relative;display:flex;width:100%;line-height:var(--nutui-cell-line-height, 20px);padding:var(--nutui-cell-padding, 13px 16px);background-color:var(--nutui-cell-background-color, var(--nutui-gray-6, #ffffff));border-radius:var(--nutui-cell-border-radius, 6px);box-shadow:var(--nutui-cell-box-shadow, 0px 1px 7px 0px rgb(237, 238, 241));font-size:var(--nutui-cell-title-font-size, var(--nutui-font-size-2, 14px));color:var(--nutui-cell-title-color, var(--nutui-gray-1, #1a1a1a));margin:10px 0;box-sizing:border-box}.nut-cell__left{display:flex;flex-direction:column;flex:1}.nut-cell__description{font-size:var(--nutui-cell-description-font-size, var(--nutui-font-size-1, 12px));color:var(--nutui-cell-description-color, var(--nutui-gray-2, #757575))}.nut-cell__extra{display:inline-flex;justify-content:flex-end;align-items:center;flex:1;min-width:0;word-break:break-all;font-size:var(--nutui-cell-extra-font-size, var(--nutui-font-size-2, 14px));color:var(--nutui-cell-extra-color, var(--nutui-gray-2, #757575))}.nut-theme-dark .nut-form-item__body__slots .nut-input-text{color:#e6e6e6}.nut-form-item{display:flex}.nut-form-item:before{position:absolute;box-sizing:border-box;content:" ";pointer-events:none;right:16px;bottom:0;left:16px;transform:scaleX(0)}.nut-form-item.error.line:before{border-bottom:1px solid var(--nutui-form-item-error-line-color, var(--nutui-brand-color, #fa2c19));transform:scaleX(1);transition:transform .2s cubic-bezier(0,0,.2,1) 0ms}.nut-form-item__label{font-size:var(--nutui-form-item-label-font-size, 14px);font-weight:400;width:var(--nutui-form-item-label-width, 90px);margin-right:var(--nutui-form-item-label-margin-right, 10px);flex:none!important;display:inline-block!important;word-wrap:break-word;text-align:var(--nutui-form-item-label-text-align, left)}.nut-form-item__label .required:before{content:"*";color:var(--nutui-form-item-required-color, var(--nutui-brand-color, #fa2c19));margin-right:var(--nutui-form-item-required-margin-right, 4px)}.nut-form-item__body{flex:1;display:flex!important;flex-direction:column}.nut-form-item__body__slots{text-align:var(--nutui-form-item-body-slots-text-align, left)}.nut-form-item__body__slots .nut-input{padding:0;border:0}.nut-form-item__body__slots .nut-input-text{font-size:var(--nutui-form-item-body-font-size, 14px);text-align:var(--nutui-form-item-body-input-text-align, left);color:var(--nutui-gray-0, #000000);width:100%;outline:0 none;border:0;text-decoration:none;background:transparent}.nut-form-item__body__slots .nut-range-container{min-height:24px}.nut-form-item__body__slots .nut-textarea{padding:0!important}.nut-form-item__body__slots .nut-textarea .nut-textarea__textarea{text-align:var(--nutui-form-item-body-input-text-align, left)}.nut-form-item__body__tips{text-align:var(--nutui-form-item-tip-text-align, left);font-size:var(--nutui-form-item-tip-font-size, 10px);color:var(--nutui-form-item-error-message-color, var(--nutui-brand-color, #fa2c19))}
1
+ .nut-form-item{display:flex}.nut-form-item:before{position:absolute;box-sizing:border-box;content:" ";pointer-events:none;right:16px;bottom:0;left:16px;transform:scaleX(0)}.nut-form-item.error.line:before{border-bottom:1px solid var(--nutui-form-item-error-line-color, var(--nutui-brand-color, #fa2c19));transform:scaleX(1);transition:transform .2s cubic-bezier(0,0,.2,1) 0ms}.nut-form-item__label{font-size:var(--nutui-form-item-label-font-size, 14px);font-weight:400;width:var(--nutui-form-item-label-width, 90px);margin-right:var(--nutui-form-item-label-margin-right, 10px);flex:none!important;display:inline-block!important;word-wrap:break-word;text-align:var(--nutui-form-item-label-text-align, left)}.nut-form-item__label .required:before{content:"*";color:var(--nutui-form-item-required-color, var(--nutui-brand-color, #fa2c19));margin-right:var(--nutui-form-item-required-margin-right, 4px)}.nut-form-item__body{flex:1;display:flex!important;flex-direction:column}.nut-form-item__body__slots{text-align:var(--nutui-form-item-body-slots-text-align, left)}.nut-form-item__body__slots .nut-input{padding:0;border:0}.nut-form-item__body__slots .nut-input-text{font-size:var(--nutui-form-item-body-font-size, 14px);text-align:var(--nutui-form-item-body-input-text-align, left);color:var(--nutui-gray-0, #000000);width:100%;outline:0 none;border:0;text-decoration:none;background:transparent}.nut-form-item__body__slots .nut-range-container{min-height:24px}.nut-form-item__body__slots .nut-textarea{padding:0!important}.nut-form-item__body__slots .nut-textarea .nut-textarea__textarea{font:inherit;text-align:var(--nutui-form-item-body-input-text-align, left)}.nut-form-item__body__tips{text-align:var(--nutui-form-item-tip-text-align, left);font-size:var(--nutui-form-item-tip-font-size, 10px);color:var(--nutui-form-item-error-message-color, var(--nutui-brand-color, #fa2c19))}
@@ -1,4 +1,4 @@
1
- import { a as FormItem } from "./formitem2.js";
1
+ import { F as FormItem } from "./formitem2.js";
2
2
  import "react";
3
3
  import "./Cell.js";
4
4
  import "./typings.js";
@@ -1,7 +1,7 @@
1
1
  import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
2
2
  import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
3
3
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
4
- var _excluded = ["children", "disabled", "min", "max", "readonly", "value", "defaultValue", "allowEmpty", "digits", "step", "async", "className", "style", "formatter", "onPlus", "onMinus", "onOverlimit", "onBlur", "onFocus", "onChange"];
4
+ var _excluded = ["children", "disabled", "min", "max", "readOnly", "value", "defaultValue", "allowEmpty", "digits", "step", "async", "className", "style", "formatter", "onPlus", "onMinus", "onOverlimit", "onBlur", "onFocus", "onChange"];
5
5
  function ownKeys(object, enumerableOnly) {
6
6
  var keys = Object.keys(object);
7
7
  if (Object.getOwnPropertySymbols) {
@@ -32,7 +32,7 @@ var defaultProps = _objectSpread(_objectSpread({}, ComponentDefaults), {}, {
32
32
  disabled: false,
33
33
  min: 1,
34
34
  max: 9999,
35
- readonly: false,
35
+ readOnly: false,
36
36
  allowEmpty: false,
37
37
  defaultValue: 0,
38
38
  step: 1,
@@ -42,7 +42,7 @@ var defaultProps = _objectSpread(_objectSpread({}, ComponentDefaults), {}, {
42
42
  var classPrefix = "nut-inputnumber";
43
43
  var InputNumber = function InputNumber2(props) {
44
44
  var _classNames;
45
- var _defaultProps$props = _objectSpread(_objectSpread({}, defaultProps), props), children = _defaultProps$props.children, disabled = _defaultProps$props.disabled, min = _defaultProps$props.min, max = _defaultProps$props.max, readonly = _defaultProps$props.readonly, value = _defaultProps$props.value, defaultValue = _defaultProps$props.defaultValue, allowEmpty = _defaultProps$props.allowEmpty, digits = _defaultProps$props.digits, step = _defaultProps$props.step, async = _defaultProps$props.async, className = _defaultProps$props.className, style = _defaultProps$props.style, formatter = _defaultProps$props.formatter, onPlus = _defaultProps$props.onPlus, onMinus = _defaultProps$props.onMinus, onOverlimit = _defaultProps$props.onOverlimit, onBlur = _defaultProps$props.onBlur, onFocus = _defaultProps$props.onFocus, onChange = _defaultProps$props.onChange, restProps = _objectWithoutProperties(_defaultProps$props, _excluded);
45
+ var _defaultProps$props = _objectSpread(_objectSpread({}, defaultProps), props), children = _defaultProps$props.children, disabled = _defaultProps$props.disabled, min = _defaultProps$props.min, max = _defaultProps$props.max, readOnly = _defaultProps$props.readOnly, value = _defaultProps$props.value, defaultValue = _defaultProps$props.defaultValue, allowEmpty = _defaultProps$props.allowEmpty, digits = _defaultProps$props.digits, step = _defaultProps$props.step, async = _defaultProps$props.async, className = _defaultProps$props.className, style = _defaultProps$props.style, formatter = _defaultProps$props.formatter, onPlus = _defaultProps$props.onPlus, onMinus = _defaultProps$props.onMinus, onOverlimit = _defaultProps$props.onOverlimit, onBlur = _defaultProps$props.onBlur, onFocus = _defaultProps$props.onFocus, onChange = _defaultProps$props.onChange, restProps = _objectWithoutProperties(_defaultProps$props, _excluded);
46
46
  var inputRef = useRef("");
47
47
  var _usePropsValue = usePropsValue({
48
48
  value,
@@ -175,14 +175,14 @@ var InputNumber = function InputNumber2(props) {
175
175
  var focusValue = function focusValue2(e) {
176
176
  if (disabled)
177
177
  return;
178
- if (readonly)
178
+ if (readOnly)
179
179
  return;
180
180
  onFocus && onFocus(e);
181
181
  };
182
182
  var burValue = function burValue2(e) {
183
183
  if (disabled)
184
184
  return;
185
- if (readonly)
185
+ if (readOnly)
186
186
  return;
187
187
  var input = e.target;
188
188
  var value2 = input.valueAsNumber;
@@ -212,7 +212,7 @@ var InputNumber = function InputNumber2(props) {
212
212
  min,
213
213
  max,
214
214
  disabled,
215
- readOnly: readonly,
215
+ readOnly,
216
216
  value: _checked,
217
217
  onInput: changeFormatValue,
218
218
  onBlur: burFormatValue,
@@ -222,7 +222,7 @@ var InputNumber = function InputNumber2(props) {
222
222
  min,
223
223
  max,
224
224
  disabled,
225
- readOnly: readonly,
225
+ readOnly,
226
226
  value: _checked,
227
227
  onInput: changeValue,
228
228
  onBlur: burValue,
@@ -1 +1 @@
1
- .nut-theme-dark .nut-pagination__prev,.nut-theme-dark .nut-pagination__item,.nut-theme-dark .nut-pagination__next{background:#141414;border:1px solid #141414}.nut-theme-dark .nut-pagination-simple{background:#0a0a0a}.nut-theme-dark .nut-pagination .simple-border{border-color:#828282}.nut-theme-dark .nut-pagination .disabled{background-color:#828282;color:var(--nutui-gray-3, #bfbfbf);border:1px solid #828282}.nut-theme-dark .nut-pagination.active{background:var(--nutui-dark-pagination-active-background-color, #fa2c19)}.nut-theme-dark .nut-pagination__contain .nut-pagination__item{background-color:#141414;border:1px solid #0a0a0a}.nut-pagination{display:flex;font-size:var(--nutui-pagination-font-size, var(--nutui-font-size-2, 14px));color:var(--nutui-pagination-color, var(--nutui-brand-color, #fa2c19))}.nut-pagination__contain{display:flex}.nut-pagination__simple{height:39px;width:124px;line-height:39px;text-align:center}.nut-pagination__prev,.nut-pagination__item,.nut-pagination__next{height:39px;min-width:39px;flex-shrink:0;box-sizing:border-box;display:flex;align-items:center;justify-content:center;background:var(--nutui-gray-6, #ffffff);border-radius:var(--nutui-pagination-item-border-radius, 2px);border:var(--nutui-pagination-item-border-width, 1px) solid var(--nutui-pagination-item-border-color, #e4e7eb);cursor:pointer}.nut-pagination__prev,.nut-pagination__item{border-right:none}.nut-pagination__prev,.nut-pagination__next{padding:var(--nutui-pagination-prev-next-padding, 0 11px)}.nut-pagination .simple-border{border-right:var(--nutui-pagination-item-border-width, 1px) solid var(--nutui-pagination-item-border-color, #e4e7eb)}.nut-pagination .active{color:var(--nutui-gray-6, #ffffff);border:none;background:linear-gradient(135deg,var(--nutui-brand-color, #fa2c19) 0%,var(--nutui-brand-color-end, #fa2c19) 100%)}.nut-pagination .disabled{color:var(--nutui-pagination-disable-color, var(--nutui-gray-3, #bfbfbf));background-color:var(--nutui-pagination-disable-background-color, #f7f8fa);cursor:not-allowed}
1
+ .nut-pagination{display:flex;font-size:var(--nutui-pagination-font-size, var(--nutui-font-size-2, 14px));color:var(--nutui-pagination-color, var(--nutui-brand-color, #fa2c19))}.nut-pagination__contain{display:flex}.nut-pagination__simple{height:39px;width:124px;line-height:39px;text-align:center}.nut-pagination__prev,.nut-pagination__item,.nut-pagination__next{height:39px;min-width:39px;flex-shrink:0;box-sizing:border-box;display:flex;align-items:center;justify-content:center;background:var(--nutui-gray-6, #ffffff);border-radius:var(--nutui-pagination-item-border-radius, 2px);border:var(--nutui-pagination-item-border-width, 1px) solid var(--nutui-pagination-item-border-color, #e4e7eb);cursor:pointer}.nut-pagination__prev,.nut-pagination__item{border-right:none}.nut-pagination__prev,.nut-pagination__next{padding:var(--nutui-pagination-prev-next-padding, 0 11px)}.nut-pagination .simple-border{border-right:var(--nutui-pagination-item-border-width, 1px) solid var(--nutui-pagination-item-border-color, #e4e7eb)}.nut-pagination .active{color:var(--nutui-gray-6, #ffffff);border:none;background:linear-gradient(135deg,var(--nutui-brand-color, #fa2c19) 0%,var(--nutui-brand-color-end, #fa2c19) 100%)}.nut-pagination .disabled{color:var(--nutui-pagination-disable-color, var(--nutui-gray-3, #bfbfbf));background-color:var(--nutui-pagination-disable-background-color, #f7f8fa);cursor:not-allowed}
@@ -241,7 +241,6 @@ function useRefs() {
241
241
  return [refs.current, setRefs, reset];
242
242
  }
243
243
  var defaultProps = _objectSpread(_objectSpread({}, ComponentDefaults), {}, {
244
- visible: false,
245
244
  title: "",
246
245
  options: [],
247
246
  value: [],
@@ -263,12 +262,28 @@ var InternalPicker = function InternalPicker2(props, ref) {
263
262
  (_props$onConfirm = props.onConfirm) === null || _props$onConfirm === void 0 ? void 0 : _props$onConfirm.call(props, setSelectedOptions(), val);
264
263
  }
265
264
  }), _usePropsValue2 = _slicedToArray(_usePropsValue, 2), selectedValue = _usePropsValue2[0], setSelectedValue = _usePropsValue2[1];
265
+ var _usePropsValue3 = usePropsValue({
266
+ value: props.visible,
267
+ defaultValue: false,
268
+ finalValue: false
269
+ }), _usePropsValue4 = _slicedToArray(_usePropsValue3, 2), innerVisible = _usePropsValue4[0], setInnerVisible = _usePropsValue4[1];
266
270
  var _useState13 = useState(selectedValue), _useState14 = _slicedToArray(_useState13, 2), innerValue = _useState14[0], setInnerValue = _useState14[1];
267
271
  var _useState15 = useState(0), _useState16 = _slicedToArray(_useState15, 2), columnIndex = _useState16[0], setColumnIndex = _useState16[1];
268
272
  var pickerRef = useRef(null);
269
273
  var _useRefs = useRefs(), _useRefs2 = _slicedToArray(_useRefs, 2), refs = _useRefs2[0], setRefs = _useRefs2[1];
270
274
  var _useState17 = useState([]), _useState18 = _slicedToArray(_useState17, 2), columnsList = _useState18[0], setColumnsList = _useState18[1];
271
275
  var isConfirmEvent = useRef(false);
276
+ var actions = {
277
+ open: function open() {
278
+ setInnerVisible(true);
279
+ },
280
+ close: function close() {
281
+ setInnerVisible(false);
282
+ }
283
+ };
284
+ useImperativeHandle(ref, function() {
285
+ return actions;
286
+ });
272
287
  var formatCascade = function formatCascade2(columns, values) {
273
288
  var formatted = [];
274
289
  var columnOptions = {
@@ -331,12 +346,12 @@ var InternalPicker = function InternalPicker2(props, ref) {
331
346
  };
332
347
  useEffect(function() {
333
348
  setInnerValue(innerValue !== selectedValue ? selectedValue : innerValue);
334
- }, [visible]);
349
+ }, [innerVisible]);
335
350
  useEffect(function() {
336
- if (visible) {
351
+ if (innerVisible) {
337
352
  init();
338
353
  }
339
- }, [options, visible]);
354
+ }, [options, innerVisible]);
340
355
  useEffect(function() {
341
356
  onChange && onChange(setSelectedOptions(), innerValue, columnIndex);
342
357
  }, [innerValue, columnsList]);
@@ -404,6 +419,7 @@ var InternalPicker = function InternalPicker2(props, ref) {
404
419
  }, 0);
405
420
  };
406
421
  var closePicker = function closePicker2() {
422
+ setInnerVisible(false);
407
423
  onClose && onClose(setSelectedOptions(), innerValue);
408
424
  afterClose && afterClose(setSelectedOptions(), innerValue, pickerRef);
409
425
  };
@@ -412,18 +428,22 @@ var InternalPicker = function InternalPicker2(props, ref) {
412
428
  className: "".concat(classPrefix, "__control")
413
429
  }, React__default.createElement("span", {
414
430
  className: "".concat(classPrefix, "__cancel-btn"),
415
- onClick: function onClick() {
416
- return closePicker();
431
+ onClick: function onClick(e) {
432
+ e.stopPropagation();
433
+ closePicker();
417
434
  }
418
435
  }, locale.cancel), React__default.createElement("div", {
419
436
  className: "".concat(classPrefix, "__title")
420
437
  }, title || ""), React__default.createElement("span", {
421
438
  className: "".concat(classPrefix, "__confirm-btn"),
422
- onClick: confirm
439
+ onClick: function onClick(e) {
440
+ e.stopPropagation();
441
+ confirm();
442
+ }
423
443
  }, locale.confirm));
424
444
  };
425
- return React__default.createElement(Popup, {
426
- visible,
445
+ return React__default.createElement(React__default.Fragment, null, typeof children === "function" && children(selectedValue), React__default.createElement(Popup, {
446
+ visible: innerVisible,
427
447
  position: "bottom",
428
448
  afterClose: function afterClose2() {
429
449
  closePicker();
@@ -431,7 +451,7 @@ var InternalPicker = function InternalPicker2(props, ref) {
431
451
  }, React__default.createElement("div", _objectSpread({
432
452
  className: classes,
433
453
  style
434
- }, rest), renderTitleBar(), children, React__default.createElement("div", {
454
+ }, rest), renderTitleBar(), typeof children !== "function" && children, React__default.createElement("div", {
435
455
  className: "".concat(classPrefix, "__panel"),
436
456
  ref: pickerRef
437
457
  }, columnsList === null || columnsList === void 0 ? void 0 : columnsList.map(function(item, index) {
@@ -447,7 +467,7 @@ var InternalPicker = function InternalPicker2(props, ref) {
447
467
  key: index,
448
468
  keyIndex: index
449
469
  });
450
- }))));
470
+ })))));
451
471
  };
452
472
  var Picker = React__default.forwardRef(InternalPicker);
453
473
  var Picker$1 = Picker;
@@ -146,34 +146,34 @@ var Popover = function Popover2(props) {
146
146
  var skew = location.split("-")[1];
147
147
  var cross = 0;
148
148
  var parallel = 0;
149
- if (Array.isArray(offset) && offset.length == 2) {
149
+ if (Array.isArray(offset) && offset.length === 2) {
150
150
  cross += +offset[1];
151
151
  parallel += +offset[0];
152
152
  }
153
153
  if (width) {
154
154
  if (["bottom", "top"].includes(direction)) {
155
- var h = direction == "bottom" ? height + cross : -(contentHeight + cross);
155
+ var h = direction === "bottom" ? height + cross : -(contentHeight + cross);
156
156
  styles.top = "".concat(top + h, "px");
157
157
  if (!skew) {
158
158
  styles.left = "".concat(-(contentWidth - width) / 2 + left + parallel, "px");
159
159
  }
160
- if (skew == "start") {
160
+ if (skew === "start") {
161
161
  styles.left = "".concat(left + parallel, "px");
162
162
  }
163
- if (skew == "end") {
163
+ if (skew === "end") {
164
164
  styles.left = "".concat(right + parallel, "px");
165
165
  }
166
166
  }
167
167
  if (["left", "right"].includes(direction)) {
168
- var contentW = direction == "left" ? -(contentWidth + cross) : width + cross;
168
+ var contentW = direction === "left" ? -(contentWidth + cross) : width + cross;
169
169
  styles.left = "".concat(left + contentW, "px");
170
170
  if (!skew) {
171
171
  styles.top = "".concat(top - contentHeight / 2 + height / 2 - 4 + parallel, "px");
172
172
  }
173
- if (skew == "start") {
173
+ if (skew === "start") {
174
174
  styles.top = "".concat(top + parallel, "px");
175
175
  }
176
- if (skew == "end") {
176
+ if (skew === "end") {
177
177
  styles.top = "".concat(top + height + parallel, "px");
178
178
  }
179
179
  }
package/dist/esm/Popup.js CHANGED
@@ -93,6 +93,7 @@ var Popup = function Popup2(props) {
93
93
  }
94
94
  };
95
95
  var onHandleClickOverlay = function onHandleClickOverlay2(e) {
96
+ e.stopPropagation();
96
97
  if (closeOnOverlayClick) {
97
98
  var closed = onClickOverlay2 && onClickOverlay2(e);
98
99
  closed && close();
@@ -76,7 +76,7 @@ var SearchBar = function SearchBar2(props) {
76
76
  }, [autoFocus]);
77
77
  var renderField = function renderField2() {
78
78
  return React__default.createElement("input", {
79
- className: "".concat(classPrefix, "__input ").concat(shape === "round" ? "".concat(classPrefix, "__round") : "", " ").concat(clearable ? "".concat(classPrefix, "__input-clear") : ""),
79
+ className: "".concat(classPrefix, "__input ").concat(clearable ? "".concat(classPrefix, "__input-clear") : ""),
80
80
  ref: searchRef,
81
81
  style: _objectSpread({}, props.style),
82
82
  value: value || "",
@@ -163,7 +163,7 @@ var SearchBar = function SearchBar2(props) {
163
163
  className: "".concat(classPrefix, " ").concat(disabled ? "".concat(classPrefix, "__disabled") : "", " ").concat(className || ""),
164
164
  style: _objectSpread({}, props.style)
165
165
  }, renderLeft(), React__default.createElement("div", {
166
- className: "".concat(classPrefix, "__content")
166
+ className: "".concat(classPrefix, "__content ").concat(shape === "round" ? "".concat(classPrefix, "__round") : "")
167
167
  }, renderLeftIn(), renderField(), renderRightIn(), clearable && value && handleClear()), renderRight());
168
168
  };
169
169
  SearchBar.defaultProps = defaultProps;