@kdcloudjs/kdesign 1.6.13 → 1.6.14

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 (39) hide show
  1. package/dist/kdesign-complete.less +21 -10
  2. package/dist/kdesign.css +16 -13
  3. package/dist/kdesign.css.map +1 -1
  4. package/dist/kdesign.js +201 -177
  5. package/dist/kdesign.js.map +1 -1
  6. package/dist/kdesign.min.css +3 -3
  7. package/dist/kdesign.min.js +8 -8
  8. package/dist/kdesign.min.js.map +1 -1
  9. package/es/config-provider/compDefaultProps.d.ts +1 -0
  10. package/es/config-provider/compDefaultProps.js +2 -1
  11. package/es/date-picker/range-picker.js +6 -17
  12. package/es/date-picker/style/index.css +9 -9
  13. package/es/date-picker/style/index.less +1 -1
  14. package/es/date-picker/style/token.less +1 -1
  15. package/es/form/Field.js +61 -33
  16. package/es/form/FieldContext.js +0 -1
  17. package/es/form/hooks/useForm.js +17 -24
  18. package/es/form/interface.d.ts +6 -3
  19. package/es/icon/icon.js +23 -4
  20. package/es/select/style/index.css +6 -3
  21. package/es/select/style/index.less +9 -3
  22. package/es/select/style/token.less +10 -5
  23. package/es/tooltip/tooltip.js +1 -2
  24. package/lib/config-provider/compDefaultProps.d.ts +1 -0
  25. package/lib/config-provider/compDefaultProps.js +2 -1
  26. package/lib/date-picker/range-picker.js +6 -17
  27. package/lib/date-picker/style/index.css +9 -9
  28. package/lib/date-picker/style/index.less +1 -1
  29. package/lib/date-picker/style/token.less +1 -1
  30. package/lib/form/Field.js +62 -33
  31. package/lib/form/FieldContext.js +0 -1
  32. package/lib/form/hooks/useForm.js +17 -24
  33. package/lib/form/interface.d.ts +6 -3
  34. package/lib/icon/icon.js +22 -4
  35. package/lib/select/style/index.css +6 -3
  36. package/lib/select/style/index.less +9 -3
  37. package/lib/select/style/token.less +10 -5
  38. package/lib/tooltip/tooltip.js +1 -2
  39. package/package.json +1 -1
package/dist/kdesign.js CHANGED
@@ -1,6 +1,6 @@
1
1
  /*!
2
2
  *
3
- * @kdcloudjs/kdesign v1.6.12
3
+ * @kdcloudjs/kdesign v1.6.13
4
4
  *
5
5
  * Copyright 2020-present, Kingdee, Inc.
6
6
  * All rights reserved.
@@ -8850,7 +8850,8 @@ var compDefaultProps = {
8850
8850
  TreeNode: {},
8851
8851
  ToolTip: {
8852
8852
  placement: 'top',
8853
- trigger: 'hover'
8853
+ trigger: 'hover',
8854
+ arrow: true
8854
8855
  },
8855
8856
  Tabs: {
8856
8857
  type: 'line',
@@ -12597,33 +12598,27 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
12597
12598
  var triggerChange = function triggerChange(newValue, sourceIndex) {
12598
12599
  var values = newValue;
12599
12600
  var startValue = Object(_utils__WEBPACK_IMPORTED_MODULE_20__["getValue"])(values, 0);
12600
- var endValue = Object(_utils__WEBPACK_IMPORTED_MODULE_20__["getValue"])(values, 1); // >>>>> Format start & end values
12601
+ var endValue = Object(_utils__WEBPACK_IMPORTED_MODULE_20__["getValue"])(values, 1);
12601
12602
 
12602
12603
  if (startValue && endValue && Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_23__["isAfter"])(startValue, endValue)) {
12603
- if ( // WeekPicker only compare week
12604
- picker === 'week' && !Object(date_fns_isSameWeek__WEBPACK_IMPORTED_MODULE_13__["default"])(startValue, endValue) || // QuotaPicker only compare week
12605
- picker === 'quarter' && !Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_23__["isSameQuarter"])(startValue, endValue) || // Other non-TimePicker compare date
12606
- picker !== 'week' && picker !== 'quarter' && picker !== 'time' && !Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_23__["isSameDay"])(startValue, endValue)) {
12607
- // Clean up end date when start date is after end date
12604
+ if (picker === 'week' && !Object(date_fns_isSameWeek__WEBPACK_IMPORTED_MODULE_13__["default"])(startValue, endValue) || picker === 'quarter' && !Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_23__["isSameQuarter"])(startValue, endValue) || picker !== 'week' && picker !== 'quarter' && picker !== 'time' && !Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_23__["isSameDay"])(startValue, endValue)) {
12608
12605
  if (sourceIndex === 0) {
12609
12606
  values = [startValue, null];
12610
12607
  endValue = null;
12611
12608
  } else {
12612
12609
  startValue = null;
12613
12610
  values = [null, endValue];
12614
- } // Clean up cache since invalidate
12615
-
12611
+ }
12616
12612
 
12617
12613
  openRecordsRef.current = _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_4___default()({}, sourceIndex, true);
12618
12614
  } else if (picker === 'time' && order === true) {
12619
- // Reorder when in same date
12620
12615
  values = reorderValues(values);
12621
12616
  }
12622
12617
  }
12623
12618
 
12624
12619
  setSelectedValue(values);
12625
12620
  var startStr = values && values[0] ? Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_23__["formatDate"])(values[0], _format) : '';
12626
- var endStr = values && values[1] ? Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_23__["formatDate"])(values[1], _format) : ''; // 外部回调
12621
+ var endStr = values && values[1] ? Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_23__["formatDate"])(values[1], _format) : '';
12627
12622
 
12628
12623
  if (onCalendarChange) {
12629
12624
  var _info = {
@@ -12637,15 +12632,12 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
12637
12632
  var canTrigger = values === null || canStartValueTrigger && canEndValueTrigger;
12638
12633
 
12639
12634
  if (canTrigger) {
12640
- // Trigger onChange only when value is validate
12641
12635
  setInnerValue(values);
12642
12636
 
12643
- if (onChange && (!Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_23__["isEqual"])(Object(_utils__WEBPACK_IMPORTED_MODULE_20__["getValue"])(selectedValue, 0), startValue) || !Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_23__["isEqual"])(Object(_utils__WEBPACK_IMPORTED_MODULE_20__["getValue"])(selectedValue, 1), endValue))) {
12637
+ if (onChange && (!Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_23__["isEqual"])(Object(_utils__WEBPACK_IMPORTED_MODULE_20__["getValue"])(dateValue, 0), startValue) || !Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_23__["isEqual"])(Object(_utils__WEBPACK_IMPORTED_MODULE_20__["getValue"])(dateValue, 1), endValue))) {
12644
12638
  onChange(values, [startStr, endStr]);
12645
12639
  }
12646
- } // >>>>> Open picker when
12647
- // Always open another picker if possible
12648
-
12640
+ }
12649
12641
 
12650
12642
  var nextOpenIndex = null;
12651
12643
 
@@ -12656,7 +12648,6 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
12656
12648
  }
12657
12649
 
12658
12650
  if (nextOpenIndex !== null && nextOpenIndex !== mergedActivePickerIndex && (!openRecordsRef.current[nextOpenIndex] || !Object(_utils__WEBPACK_IMPORTED_MODULE_20__["getValue"])(values, nextOpenIndex)) && Object(_utils__WEBPACK_IMPORTED_MODULE_20__["getValue"])(values, sourceIndex)) {
12659
- // Delay to focus to avoid input blur trigger expired selectedValues
12660
12651
  triggerOpenAndFocus(nextOpenIndex);
12661
12652
  } else {
12662
12653
  triggerOpen(false, sourceIndex);
@@ -12955,7 +12946,6 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
12955
12946
  trigger: 'click',
12956
12947
  prefixCls: "".concat(datePickerPrefixCls, "-panel"),
12957
12948
  arrow: false,
12958
- popperClassName: className,
12959
12949
  popperStyle: style,
12960
12950
  visible: mergedOpen,
12961
12951
  placement: 'bottomLeft',
@@ -16832,48 +16822,51 @@ __webpack_require__.r(__webpack_exports__);
16832
16822
  /* harmony import */ var _babel_runtime_helpers_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_0__);
16833
16823
  /* harmony import */ var _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @babel/runtime/helpers/defineProperty */ "./node_modules/@babel/runtime/helpers/defineProperty.js");
16834
16824
  /* harmony import */ var _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1__);
16835
- /* harmony import */ var _babel_runtime_helpers_typeof__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @babel/runtime/helpers/typeof */ "./node_modules/@babel/runtime/helpers/typeof.js");
16836
- /* harmony import */ var _babel_runtime_helpers_typeof__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_typeof__WEBPACK_IMPORTED_MODULE_2__);
16837
- /* harmony import */ var _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @babel/runtime/helpers/slicedToArray */ "./node_modules/@babel/runtime/helpers/slicedToArray.js");
16838
- /* harmony import */ var _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_3__);
16839
- /* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! core-js/modules/es.object.to-string.js */ "./node_modules/core-js/modules/es.object.to-string.js");
16840
- /* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_4__);
16841
- /* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! core-js/modules/web.dom-collections.for-each.js */ "./node_modules/core-js/modules/web.dom-collections.for-each.js");
16842
- /* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_5__);
16843
- /* harmony import */ var core_js_modules_es_function_name_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! core-js/modules/es.function.name.js */ "./node_modules/core-js/modules/es.function.name.js");
16844
- /* harmony import */ var core_js_modules_es_function_name_js__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_function_name_js__WEBPACK_IMPORTED_MODULE_6__);
16845
- /* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! core-js/modules/es.array.concat.js */ "./node_modules/core-js/modules/es.array.concat.js");
16846
- /* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_7__);
16847
- /* harmony import */ var core_js_modules_es_number_to_fixed_js__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! core-js/modules/es.number.to-fixed.js */ "./node_modules/core-js/modules/es.number.to-fixed.js");
16848
- /* harmony import */ var core_js_modules_es_number_to_fixed_js__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_number_to_fixed_js__WEBPACK_IMPORTED_MODULE_8__);
16849
- /* harmony import */ var core_js_modules_es_array_filter_js__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! core-js/modules/es.array.filter.js */ "./node_modules/core-js/modules/es.array.filter.js");
16850
- /* harmony import */ var core_js_modules_es_array_filter_js__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_filter_js__WEBPACK_IMPORTED_MODULE_9__);
16851
- /* harmony import */ var core_js_modules_es_array_map_js__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! core-js/modules/es.array.map.js */ "./node_modules/core-js/modules/es.array.map.js");
16852
- /* harmony import */ var core_js_modules_es_array_map_js__WEBPACK_IMPORTED_MODULE_10___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_map_js__WEBPACK_IMPORTED_MODULE_10__);
16853
- /* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! core-js/modules/es.array.includes.js */ "./node_modules/core-js/modules/es.array.includes.js");
16854
- /* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_11___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_11__);
16855
- /* harmony import */ var core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! core-js/modules/es.object.keys.js */ "./node_modules/core-js/modules/es.object.keys.js");
16856
- /* harmony import */ var core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_12___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_12__);
16857
- /* harmony import */ var core_js_modules_es_symbol_js__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! core-js/modules/es.symbol.js */ "./node_modules/core-js/modules/es.symbol.js");
16858
- /* harmony import */ var core_js_modules_es_symbol_js__WEBPACK_IMPORTED_MODULE_13___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_symbol_js__WEBPACK_IMPORTED_MODULE_13__);
16859
- /* harmony import */ var core_js_modules_es_object_get_own_property_descriptor_js__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! core-js/modules/es.object.get-own-property-descriptor.js */ "./node_modules/core-js/modules/es.object.get-own-property-descriptor.js");
16860
- /* harmony import */ var core_js_modules_es_object_get_own_property_descriptor_js__WEBPACK_IMPORTED_MODULE_14___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_get_own_property_descriptor_js__WEBPACK_IMPORTED_MODULE_14__);
16861
- /* harmony import */ var core_js_modules_es_object_get_own_property_descriptors_js__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! core-js/modules/es.object.get-own-property-descriptors.js */ "./node_modules/core-js/modules/es.object.get-own-property-descriptors.js");
16862
- /* harmony import */ var core_js_modules_es_object_get_own_property_descriptors_js__WEBPACK_IMPORTED_MODULE_15___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_get_own_property_descriptors_js__WEBPACK_IMPORTED_MODULE_15__);
16863
- /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! react */ "react");
16864
- /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_16___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_16__);
16865
- /* harmony import */ var lodash_get__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! lodash/get */ "./node_modules/lodash/get.js");
16866
- /* harmony import */ var lodash_get__WEBPACK_IMPORTED_MODULE_17___default = /*#__PURE__*/__webpack_require__.n(lodash_get__WEBPACK_IMPORTED_MODULE_17__);
16867
- /* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! classnames */ "./node_modules/classnames/index.js");
16868
- /* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_18___default = /*#__PURE__*/__webpack_require__.n(classnames__WEBPACK_IMPORTED_MODULE_18__);
16869
- /* harmony import */ var _config_provider__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(/*! ../config-provider */ "./components/config-provider/index.tsx");
16870
- /* harmony import */ var _FieldLabel__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(/*! ./FieldLabel */ "./components/form/FieldLabel.tsx");
16871
- /* harmony import */ var _FieldWrapper__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(/*! ./FieldWrapper */ "./components/form/FieldWrapper.tsx");
16872
- /* harmony import */ var _hooks_useForceUpdate__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(/*! ./hooks/useForceUpdate */ "./components/form/hooks/useForceUpdate.ts");
16873
- /* harmony import */ var _utils_devwarning__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(/*! ../_utils/devwarning */ "./components/_utils/devwarning.ts");
16874
- /* harmony import */ var _utils_react_children__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(/*! ../_utils/react-children */ "./components/_utils/react-children.ts");
16875
- /* harmony import */ var _FieldContext__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(/*! ./FieldContext */ "./components/form/FieldContext.tsx");
16876
- /* harmony import */ var _hooks_useForm__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(/*! ./hooks/useForm */ "./components/form/hooks/useForm.ts");
16825
+ /* harmony import */ var _babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @babel/runtime/helpers/toConsumableArray */ "./node_modules/@babel/runtime/helpers/toConsumableArray.js");
16826
+ /* harmony import */ var _babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_2__);
16827
+ /* harmony import */ var _babel_runtime_helpers_typeof__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @babel/runtime/helpers/typeof */ "./node_modules/@babel/runtime/helpers/typeof.js");
16828
+ /* harmony import */ var _babel_runtime_helpers_typeof__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_typeof__WEBPACK_IMPORTED_MODULE_3__);
16829
+ /* harmony import */ var _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! @babel/runtime/helpers/slicedToArray */ "./node_modules/@babel/runtime/helpers/slicedToArray.js");
16830
+ /* harmony import */ var _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_4__);
16831
+ /* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! core-js/modules/es.object.to-string.js */ "./node_modules/core-js/modules/es.object.to-string.js");
16832
+ /* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_5__);
16833
+ /* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! core-js/modules/web.dom-collections.for-each.js */ "./node_modules/core-js/modules/web.dom-collections.for-each.js");
16834
+ /* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_6__);
16835
+ /* harmony import */ var core_js_modules_es_function_name_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! core-js/modules/es.function.name.js */ "./node_modules/core-js/modules/es.function.name.js");
16836
+ /* harmony import */ var core_js_modules_es_function_name_js__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_function_name_js__WEBPACK_IMPORTED_MODULE_7__);
16837
+ /* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! core-js/modules/es.array.concat.js */ "./node_modules/core-js/modules/es.array.concat.js");
16838
+ /* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_8__);
16839
+ /* harmony import */ var core_js_modules_es_number_to_fixed_js__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! core-js/modules/es.number.to-fixed.js */ "./node_modules/core-js/modules/es.number.to-fixed.js");
16840
+ /* harmony import */ var core_js_modules_es_number_to_fixed_js__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_number_to_fixed_js__WEBPACK_IMPORTED_MODULE_9__);
16841
+ /* harmony import */ var core_js_modules_es_array_filter_js__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! core-js/modules/es.array.filter.js */ "./node_modules/core-js/modules/es.array.filter.js");
16842
+ /* harmony import */ var core_js_modules_es_array_filter_js__WEBPACK_IMPORTED_MODULE_10___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_filter_js__WEBPACK_IMPORTED_MODULE_10__);
16843
+ /* harmony import */ var core_js_modules_es_array_map_js__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! core-js/modules/es.array.map.js */ "./node_modules/core-js/modules/es.array.map.js");
16844
+ /* harmony import */ var core_js_modules_es_array_map_js__WEBPACK_IMPORTED_MODULE_11___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_map_js__WEBPACK_IMPORTED_MODULE_11__);
16845
+ /* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! core-js/modules/es.array.includes.js */ "./node_modules/core-js/modules/es.array.includes.js");
16846
+ /* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_12___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_12__);
16847
+ /* harmony import */ var core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! core-js/modules/es.object.keys.js */ "./node_modules/core-js/modules/es.object.keys.js");
16848
+ /* harmony import */ var core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_13___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_13__);
16849
+ /* harmony import */ var core_js_modules_es_symbol_js__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! core-js/modules/es.symbol.js */ "./node_modules/core-js/modules/es.symbol.js");
16850
+ /* harmony import */ var core_js_modules_es_symbol_js__WEBPACK_IMPORTED_MODULE_14___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_symbol_js__WEBPACK_IMPORTED_MODULE_14__);
16851
+ /* harmony import */ var core_js_modules_es_object_get_own_property_descriptor_js__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! core-js/modules/es.object.get-own-property-descriptor.js */ "./node_modules/core-js/modules/es.object.get-own-property-descriptor.js");
16852
+ /* harmony import */ var core_js_modules_es_object_get_own_property_descriptor_js__WEBPACK_IMPORTED_MODULE_15___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_get_own_property_descriptor_js__WEBPACK_IMPORTED_MODULE_15__);
16853
+ /* harmony import */ var core_js_modules_es_object_get_own_property_descriptors_js__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! core-js/modules/es.object.get-own-property-descriptors.js */ "./node_modules/core-js/modules/es.object.get-own-property-descriptors.js");
16854
+ /* harmony import */ var core_js_modules_es_object_get_own_property_descriptors_js__WEBPACK_IMPORTED_MODULE_16___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_get_own_property_descriptors_js__WEBPACK_IMPORTED_MODULE_16__);
16855
+ /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! react */ "react");
16856
+ /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_17___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_17__);
16857
+ /* harmony import */ var lodash_get__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! lodash/get */ "./node_modules/lodash/get.js");
16858
+ /* harmony import */ var lodash_get__WEBPACK_IMPORTED_MODULE_18___default = /*#__PURE__*/__webpack_require__.n(lodash_get__WEBPACK_IMPORTED_MODULE_18__);
16859
+ /* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(/*! classnames */ "./node_modules/classnames/index.js");
16860
+ /* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_19___default = /*#__PURE__*/__webpack_require__.n(classnames__WEBPACK_IMPORTED_MODULE_19__);
16861
+ /* harmony import */ var _config_provider__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(/*! ../config-provider */ "./components/config-provider/index.tsx");
16862
+ /* harmony import */ var _FieldLabel__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(/*! ./FieldLabel */ "./components/form/FieldLabel.tsx");
16863
+ /* harmony import */ var _FieldWrapper__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(/*! ./FieldWrapper */ "./components/form/FieldWrapper.tsx");
16864
+ /* harmony import */ var _hooks_useForceUpdate__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(/*! ./hooks/useForceUpdate */ "./components/form/hooks/useForceUpdate.ts");
16865
+ /* harmony import */ var _utils_devwarning__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(/*! ../_utils/devwarning */ "./components/_utils/devwarning.ts");
16866
+ /* harmony import */ var _utils_react_children__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(/*! ../_utils/react-children */ "./components/_utils/react-children.ts");
16867
+ /* harmony import */ var _FieldContext__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(/*! ./FieldContext */ "./components/form/FieldContext.tsx");
16868
+ /* harmony import */ var _hooks_useForm__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(/*! ./hooks/useForm */ "./components/form/hooks/useForm.ts");
16869
+
16877
16870
 
16878
16871
 
16879
16872
 
@@ -16951,18 +16944,18 @@ var INNER_VALUE_PROPS_LIST = [{
16951
16944
  var Field = function Field(props) {
16952
16945
  var _childrenNode, _childrenNode$type, _classnames;
16953
16946
 
16954
- Object(_utils_devwarning__WEBPACK_IMPORTED_MODULE_23__["default"])(! /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_16___default.a.isValidElement(props.children), 'Form.Item', 'Children of Form.Item is not a valid element');
16955
- Object(_utils_devwarning__WEBPACK_IMPORTED_MODULE_23__["default"])(!props.name, 'Form.Item', 'Form.Item must have a name');
16947
+ Object(_utils_devwarning__WEBPACK_IMPORTED_MODULE_24__["default"])(! /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_17___default.a.isValidElement(props.children), 'Form.Item', 'Children of Form.Item is not a valid element');
16948
+ Object(_utils_devwarning__WEBPACK_IMPORTED_MODULE_24__["default"])(!props.name, 'Form.Item', 'Form.Item must have a name');
16956
16949
 
16957
- var _useContext = Object(react__WEBPACK_IMPORTED_MODULE_16__["useContext"])(_config_provider__WEBPACK_IMPORTED_MODULE_19__["ConfigContext"]),
16950
+ var _useContext = Object(react__WEBPACK_IMPORTED_MODULE_17__["useContext"])(_config_provider__WEBPACK_IMPORTED_MODULE_20__["ConfigContext"]),
16958
16951
  getPrefixCls = _useContext.getPrefixCls,
16959
16952
  prefixCls = _useContext.prefixCls;
16960
16953
 
16961
- var fieldContext = react__WEBPACK_IMPORTED_MODULE_16___default.a.useContext(_FieldContext__WEBPACK_IMPORTED_MODULE_25__["default"]);
16962
- var forceUpdate = Object(_hooks_useForceUpdate__WEBPACK_IMPORTED_MODULE_22__["default"])();
16954
+ var fieldContext = react__WEBPACK_IMPORTED_MODULE_17___default.a.useContext(_FieldContext__WEBPACK_IMPORTED_MODULE_26__["default"]);
16955
+ var forceUpdate = Object(_hooks_useForceUpdate__WEBPACK_IMPORTED_MODULE_23__["default"])();
16963
16956
 
16964
- var _useState = Object(react__WEBPACK_IMPORTED_MODULE_16__["useState"])(undefined),
16965
- _useState2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_3___default()(_useState, 2),
16957
+ var _useState = Object(react__WEBPACK_IMPORTED_MODULE_17__["useState"])(undefined),
16958
+ _useState2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_4___default()(_useState, 2),
16966
16959
  fieldValue = _useState2[0],
16967
16960
  setFieldValue = _useState2[1];
16968
16961
 
@@ -16972,10 +16965,9 @@ var Field = function Field(props) {
16972
16965
  vertical = fieldContext.vertical,
16973
16966
  getDefaultValue = fieldContext.getDefaultValue,
16974
16967
  local = fieldContext.local,
16975
- setRules = fieldContext.setRules,
16976
16968
  formDisabled = fieldContext.disabled;
16977
16969
 
16978
- var _ref = getInternalHooks(_hooks_useForm__WEBPACK_IMPORTED_MODULE_26__["INTERNAL_HOOK_KEY"]),
16970
+ var _ref = getInternalHooks(_hooks_useForm__WEBPACK_IMPORTED_MODULE_27__["INTERNAL_HOOK_KEY"]),
16979
16971
  registerField = _ref.registerField,
16980
16972
  dispatch = _ref.dispatch,
16981
16973
  setDefaultValues = _ref.setDefaultValues;
@@ -16991,8 +16983,7 @@ var Field = function Field(props) {
16991
16983
  labelWidth = props.labelWidth,
16992
16984
  labelAlign = props.labelAlign,
16993
16985
  required = props.required,
16994
- _props$rules = props.rules,
16995
- rules = _props$rules === void 0 ? [] : _props$rules,
16986
+ rules = props.rules,
16996
16987
  wrapperWidth = props.wrapperWidth,
16997
16988
  validateTrigger = props.validateTrigger,
16998
16989
  defaultValue = props.defaultValue,
@@ -17000,10 +16991,10 @@ var Field = function Field(props) {
17000
16991
  var htmlFor = customizeHtmlFor || (name ? "form_".concat(name, "_").concat((Math.random() * 100).toFixed(0)) : undefined);
17001
16992
  var childrenNode = null;
17002
16993
  var innerValuePropName = 'value';
17003
- var childrenArray = Object(_utils_react_children__WEBPACK_IMPORTED_MODULE_24__["toArray"])(children);
16994
+ var childrenArray = Object(_utils_react_children__WEBPACK_IMPORTED_MODULE_25__["toArray"])(children);
17004
16995
 
17005
16996
  if (childrenArray.length) {
17006
- Object(_utils_devwarning__WEBPACK_IMPORTED_MODULE_23__["default"])(childrenArray.length > 1, 'Form.Item', 'Form.Item must have only child');
16997
+ Object(_utils_devwarning__WEBPACK_IMPORTED_MODULE_24__["default"])(childrenArray.length > 1, 'Form.Item', 'Form.Item must have only child');
17007
16998
  childrenNode = childrenArray[0];
17008
16999
  }
17009
17000
 
@@ -17024,8 +17015,8 @@ var Field = function Field(props) {
17024
17015
  var onStoreChange = function onStoreChange(stores, _namePathList, source) {
17025
17016
  var prev = stores.prev,
17026
17017
  curr = stores.curr;
17027
- var prevValue = lodash_get__WEBPACK_IMPORTED_MODULE_17___default()(prev, name);
17028
- var currValue = lodash_get__WEBPACK_IMPORTED_MODULE_17___default()(curr, name);
17018
+ var prevValue = lodash_get__WEBPACK_IMPORTED_MODULE_18___default()(prev, name);
17019
+ var currValue = lodash_get__WEBPACK_IMPORTED_MODULE_18___default()(curr, name);
17029
17020
  var isValueUpdated = prevValue !== currValue && source === 'updateValue';
17030
17021
  var isExternalAction = source === 'externalUpdateValue';
17031
17022
  var isValidatedFinish = source === 'validateFinish';
@@ -17036,8 +17027,8 @@ var Field = function Field(props) {
17036
17027
  }
17037
17028
  };
17038
17029
 
17039
- var rulesRequired = rules.some(function (rule) {
17040
- if (rule && _babel_runtime_helpers_typeof__WEBPACK_IMPORTED_MODULE_2___default()(rule) === 'object' && rule.required) {
17030
+ var mergedRequired = required || (rules === null || rules === void 0 ? void 0 : rules.some(function (rule) {
17031
+ if (rule && _babel_runtime_helpers_typeof__WEBPACK_IMPORTED_MODULE_3___default()(rule) === 'object' && rule.required) {
17041
17032
  return true;
17042
17033
  }
17043
17034
 
@@ -17047,50 +17038,52 @@ var Field = function Field(props) {
17047
17038
  }
17048
17039
 
17049
17040
  return false;
17050
- });
17051
- var mergedRequired = required || rulesRequired;
17041
+ }));
17052
17042
 
17053
- if (Array.isArray(rules) && !rules.some(function (rule) {
17054
- return Object.prototype.hasOwnProperty.call(rule, 'required');
17055
- }) && required) {
17056
- rules.push({
17057
- required: true,
17058
- message: "".concat(local && local.requiredMessage).concat(label)
17059
- });
17060
- }
17043
+ var mergeRule = function mergeRule() {
17044
+ var mergeRules = Array.isArray(rules) ? _babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_2___default()(rules) : [];
17061
17045
 
17062
- var mergeRules = rules;
17046
+ if (!mergeRules.some(function (rule) {
17047
+ return Object.prototype.hasOwnProperty.call(rule, 'required');
17048
+ }) && required) {
17049
+ mergeRules.push({
17050
+ required: true,
17051
+ message: "".concat(local && local.requiredMessage).concat(label)
17052
+ });
17053
+ }
17063
17054
 
17064
- if (mergeRules.length) {
17065
- mergeRules = rules.map(function (r) {
17066
- if (typeof r === 'function') {
17067
- return r(fieldContext);
17068
- }
17055
+ if (mergeRules.length) {
17056
+ mergeRules = mergeRules.map(function (r) {
17057
+ if (typeof r === 'function') {
17058
+ return r(fieldContext);
17059
+ }
17069
17060
 
17070
- return r;
17071
- });
17072
- }
17061
+ return r;
17062
+ });
17063
+ }
17064
+
17065
+ return mergeRules;
17066
+ };
17073
17067
 
17074
- var itemRef = react__WEBPACK_IMPORTED_MODULE_16___default.a.useRef({
17068
+ var item = {
17075
17069
  onStoreChange: onStoreChange,
17076
17070
  meta: {
17077
- rules: mergeRules,
17071
+ rules: mergeRule(),
17078
17072
  name: name,
17079
17073
  trigger: validateTrigger
17080
17074
  }
17081
- });
17082
- Object(react__WEBPACK_IMPORTED_MODULE_16__["useEffect"])(function () {
17083
- registerField(name, itemRef.current);
17075
+ };
17076
+ var itemRef = react__WEBPACK_IMPORTED_MODULE_17___default.a.useRef(item);
17077
+ itemRef.current = item;
17078
+ Object(react__WEBPACK_IMPORTED_MODULE_17__["useEffect"])(function () {
17079
+ registerField(name, itemRef);
17084
17080
 
17085
17081
  if (defaultValue !== undefined) {
17086
17082
  setDefaultValues(_babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()({}, name, defaultValue));
17087
17083
  }
17088
17084
  }, [name, registerField]);
17089
- Object(react__WEBPACK_IMPORTED_MODULE_16__["useEffect"])(function () {
17090
- setRules(name, mergeRules);
17091
- }, [mergedRequired, name, mergeRules]);
17092
17085
  var formPrefixCls = getPrefixCls === null || getPrefixCls === void 0 ? void 0 : getPrefixCls(prefixCls, 'form', customizePrefixcls);
17093
- var formItemClassName = classnames__WEBPACK_IMPORTED_MODULE_18___default()((_classnames = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_classnames, "".concat(formPrefixCls), true), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_classnames, "".concat(formPrefixCls, "-field"), true), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_classnames, "".concat(formPrefixCls, "-field-hidden"), hidden), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_classnames, "".concat(formPrefixCls, "-field-vertical"), vertical), _classnames), className);
17086
+ var formItemClassName = classnames__WEBPACK_IMPORTED_MODULE_19___default()((_classnames = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_classnames, "".concat(formPrefixCls), true), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_classnames, "".concat(formPrefixCls, "-field"), true), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_classnames, "".concat(formPrefixCls, "-field-hidden"), hidden), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_classnames, "".concat(formPrefixCls, "-field-vertical"), vertical), _classnames), className);
17094
17087
  var value = getFieldValue(name);
17095
17088
  var validateMessage = getFieldError(name);
17096
17089
 
@@ -17108,7 +17101,7 @@ var Field = function Field(props) {
17108
17101
  return inputValue;
17109
17102
  };
17110
17103
 
17111
- var handleValueChange = react__WEBPACK_IMPORTED_MODULE_16___default.a.useCallback(function (evt) {
17104
+ var handleValueChange = react__WEBPACK_IMPORTED_MODULE_17___default.a.useCallback(function (evt) {
17112
17105
  var inputValue = getInputValueFormProp(evt);
17113
17106
  dispatch({
17114
17107
  type: 'updateValue',
@@ -17116,7 +17109,7 @@ var Field = function Field(props) {
17116
17109
  value: inputValue
17117
17110
  });
17118
17111
  }, [name]);
17119
- var handleValueValidate = react__WEBPACK_IMPORTED_MODULE_16___default.a.useCallback(function () {
17112
+ var handleValueValidate = react__WEBPACK_IMPORTED_MODULE_17___default.a.useCallback(function () {
17120
17113
  dispatch({
17121
17114
  type: 'validateField',
17122
17115
  namePath: name
@@ -17134,7 +17127,7 @@ var Field = function Field(props) {
17134
17127
 
17135
17128
  var faChange = fa.onChange,
17136
17129
  faDisabled = fa.disabled,
17137
- rest = _babel_runtime_helpers_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_0___default()(fa, _excluded);
17130
+ faRest = _babel_runtime_helpers_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_0___default()(fa, _excluded);
17138
17131
 
17139
17132
  var _ch$props = ch.props,
17140
17133
  chChange = _ch$props.onChange,
@@ -17167,21 +17160,48 @@ var Field = function Field(props) {
17167
17160
  forceUpdate();
17168
17161
  }
17169
17162
 
17170
- return _objectSpread(_objectSpread({}, rest), {}, (_objectSpread3 = {
17163
+ var mergeResult = _objectSpread(_objectSpread({}, faRest), {}, (_objectSpread3 = {
17171
17164
  onChange: onChange,
17172
17165
  defaultValue: defaultValue
17173
17166
  }, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_objectSpread3, innerValuePropName, fieldValue), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_objectSpread3, "disabled", chDisabled !== undefined ? chDisabled : faDisabled !== undefined ? faDisabled : formDisabled), _objectSpread3));
17167
+
17168
+ var mergeEventArray = [];
17169
+
17170
+ if (validateTrigger) {
17171
+ if (Array.isArray(validateTrigger)) {
17172
+ mergeEventArray.push.apply(mergeEventArray, _babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_2___default()(validateTrigger.filter(function (v) {
17173
+ return v !== DEFAULT_TRIGGER;
17174
+ })));
17175
+ } else if (validateTrigger !== DEFAULT_TRIGGER) {
17176
+ mergeEventArray.push(validateTrigger);
17177
+ }
17178
+ }
17179
+
17180
+ mergeEventArray.forEach(function (eventName) {
17181
+ mergeResult[eventName] = function () {
17182
+ var _ch$props2;
17183
+
17184
+ if (fa !== null && fa !== void 0 && fa[eventName] && typeof fa[eventName] === 'function') {
17185
+ fa[eventName]();
17186
+ }
17187
+
17188
+ if ((_ch$props2 = ch.props) !== null && _ch$props2 !== void 0 && _ch$props2[eventName] && typeof ch.props[eventName] === 'function') {
17189
+ ch.props[eventName]();
17190
+ }
17191
+ };
17192
+ });
17193
+ return mergeResult;
17174
17194
  };
17175
17195
 
17176
- return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_16___default.a.createElement("div", {
17196
+ return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_17___default.a.createElement("div", {
17177
17197
  className: formItemClassName
17178
- }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_16___default.a.createElement(_FieldLabel__WEBPACK_IMPORTED_MODULE_20__["default"], {
17198
+ }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_17___default.a.createElement(_FieldLabel__WEBPACK_IMPORTED_MODULE_21__["default"], {
17179
17199
  htmlFor: htmlFor,
17180
17200
  value: label,
17181
17201
  width: labelWidth,
17182
17202
  textAlign: labelAlign,
17183
17203
  requiredMark: mergedRequired
17184
- }), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_16___default.a.createElement(_FieldWrapper__WEBPACK_IMPORTED_MODULE_21__["default"], {
17204
+ }), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_17___default.a.createElement(_FieldWrapper__WEBPACK_IMPORTED_MODULE_22__["default"], {
17185
17205
  width: wrapperWidth,
17186
17206
  validateMessage: validateMessage
17187
17207
  }, childrenArray.map(function (child, index) {
@@ -17191,7 +17211,7 @@ var Field = function Field(props) {
17191
17211
  key: index,
17192
17212
  id: customizeHtmlFor ? undefined : htmlFor
17193
17213
  }), child);
17194
- return child ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_16___default.a.cloneElement(child, keys) : child;
17214
+ return child ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_17___default.a.cloneElement(child, keys) : child;
17195
17215
  })));
17196
17216
  };
17197
17217
 
@@ -17227,7 +17247,6 @@ var context = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createCo
17227
17247
  resetFields: warningFunc,
17228
17248
  setFieldsValue: warningFunc,
17229
17249
  setFieldValue: warningFunc,
17230
- setRules: warningFunc,
17231
17250
  submit: warningFunc,
17232
17251
  validateFields: warningFunc,
17233
17252
  getInternalHooks: function getInternalHooks() {
@@ -17730,8 +17749,6 @@ var FormStore = /*#__PURE__*/_babel_runtime_helpers_createClass__WEBPACK_IMPORTE
17730
17749
 
17731
17750
  _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_6___default()(this, "fields", {});
17732
17751
 
17733
- _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_6___default()(this, "rules", {});
17734
-
17735
17752
  _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_6___default()(this, "errorMessages", {});
17736
17753
 
17737
17754
  _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_6___default()(this, "callbacks", {});
@@ -17746,7 +17763,6 @@ var FormStore = /*#__PURE__*/_babel_runtime_helpers_createClass__WEBPACK_IMPORTE
17746
17763
  resetFields: _this.resetFields,
17747
17764
  setFieldValue: _this.setFieldValue,
17748
17765
  setFieldsValue: _this.setFieldsValue,
17749
- setRules: _this.setRules,
17750
17766
  validateFields: _this.validateFields,
17751
17767
  submit: _this.submit,
17752
17768
  getInternalHooks: _this.getInternalHooks
@@ -17868,25 +17884,27 @@ var FormStore = /*#__PURE__*/_babel_runtime_helpers_createClass__WEBPACK_IMPORTE
17868
17884
  _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_6___default()(this, "getRules", function (namePathList) {
17869
17885
  _this.warningUnhooked();
17870
17886
 
17871
- if (!namePathList) {
17872
- return _this.rules;
17887
+ var list = lodash_cloneDeep__WEBPACK_IMPORTED_MODULE_16___default()(namePathList);
17888
+
17889
+ if (!list) {
17890
+ list = Object.keys(_this.fields);
17873
17891
  }
17874
17892
 
17875
17893
  var rules = {};
17876
- namePathList.forEach(function (name) {
17877
- if (_this.rules[name]) {
17878
- rules[name] = lodash_cloneDeep__WEBPACK_IMPORTED_MODULE_16___default()(_this.rules[name]);
17894
+ list.forEach(function (name) {
17895
+ var _current$meta;
17896
+
17897
+ var current = _this.fields[name].current;
17898
+
17899
+ if (current !== null && current !== void 0 && (_current$meta = current.meta) !== null && _current$meta !== void 0 && _current$meta.rules) {
17900
+ var _current$meta2;
17901
+
17902
+ rules[name] = lodash_cloneDeep__WEBPACK_IMPORTED_MODULE_16___default()(current === null || current === void 0 ? void 0 : (_current$meta2 = current.meta) === null || _current$meta2 === void 0 ? void 0 : _current$meta2.rules);
17879
17903
  }
17880
17904
  });
17881
17905
  return Object.keys(rules).length === 0 ? null : rules;
17882
17906
  });
17883
17907
 
17884
- _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_6___default()(this, "setRules", function (name, rules) {
17885
- _this.warningUnhooked();
17886
-
17887
- lodash_set__WEBPACK_IMPORTED_MODULE_19___default()(_this.rules, name, rules);
17888
- });
17889
-
17890
17908
  _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_6___default()(this, "setCallbacks", function (callbacks) {
17891
17909
  _this.warningUnhooked();
17892
17910
 
@@ -17935,15 +17953,6 @@ var FormStore = /*#__PURE__*/_babel_runtime_helpers_createClass__WEBPACK_IMPORTE
17935
17953
  _this.warningUnhooked();
17936
17954
 
17937
17955
  _this.fields[name] = field;
17938
- var meta = field.meta;
17939
-
17940
- if (meta.rules !== undefined) {
17941
- _this.setRules(name, meta.rules); // TODO: 初始化的时候是否需要校验??
17942
- // this.validateFields([name]).catch(({ errorInfos }) => {
17943
- // this.validateFieldFaild(errorInfos, 'internal')
17944
- // })
17945
-
17946
- }
17947
17956
  });
17948
17957
 
17949
17958
  _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_6___default()(this, "validateFields", function (namePathList) {
@@ -17988,7 +17997,11 @@ var FormStore = /*#__PURE__*/_babel_runtime_helpers_createClass__WEBPACK_IMPORTE
17988
17997
  _this.notifyObservers(_this.store, namePathList || [], 'validateFinish');
17989
17998
  }).catch(function (_ref2) {
17990
17999
  var errorInfos = _ref2.errorInfos;
17991
- _this.errorMessages = {};
18000
+
18001
+ if (!namePathList) {
18002
+ _this.errorMessages = {};
18003
+ }
18004
+
17992
18005
  var _errorInfos$fields = errorInfos.fields,
17993
18006
  fields = _errorInfos$fields === void 0 ? {} : _errorInfos$fields;
17994
18007
  Object.keys(fields).forEach(function (name) {
@@ -18027,7 +18040,7 @@ var FormStore = /*#__PURE__*/_babel_runtime_helpers_createClass__WEBPACK_IMPORTE
18027
18040
  _this.warningUnhooked();
18028
18041
 
18029
18042
  Object.values(_this.fields).forEach(function (_ref4) {
18030
- var onStoreChange = _ref4.onStoreChange;
18043
+ var onStoreChange = _ref4.current.onStoreChange;
18031
18044
  var stores = {
18032
18045
  prev: prevStore,
18033
18046
  curr: _this.store
@@ -18527,42 +18540,49 @@ __webpack_require__.r(__webpack_exports__);
18527
18540
 
18528
18541
  "use strict";
18529
18542
  __webpack_require__.r(__webpack_exports__);
18530
- /* harmony import */ var core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! core-js/modules/es.object.keys.js */ "./node_modules/core-js/modules/es.object.keys.js");
18531
- /* harmony import */ var core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_0__);
18532
- /* harmony import */ var core_js_modules_es_symbol_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! core-js/modules/es.symbol.js */ "./node_modules/core-js/modules/es.symbol.js");
18533
- /* harmony import */ var core_js_modules_es_symbol_js__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_symbol_js__WEBPACK_IMPORTED_MODULE_1__);
18534
- /* harmony import */ var core_js_modules_es_array_filter_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! core-js/modules/es.array.filter.js */ "./node_modules/core-js/modules/es.array.filter.js");
18535
- /* harmony import */ var core_js_modules_es_array_filter_js__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_filter_js__WEBPACK_IMPORTED_MODULE_2__);
18536
- /* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! core-js/modules/es.object.to-string.js */ "./node_modules/core-js/modules/es.object.to-string.js");
18537
- /* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_3__);
18538
- /* harmony import */ var core_js_modules_es_object_get_own_property_descriptor_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! core-js/modules/es.object.get-own-property-descriptor.js */ "./node_modules/core-js/modules/es.object.get-own-property-descriptor.js");
18539
- /* harmony import */ var core_js_modules_es_object_get_own_property_descriptor_js__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_get_own_property_descriptor_js__WEBPACK_IMPORTED_MODULE_4__);
18540
- /* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! core-js/modules/web.dom-collections.for-each.js */ "./node_modules/core-js/modules/web.dom-collections.for-each.js");
18541
- /* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_5__);
18542
- /* harmony import */ var core_js_modules_es_object_get_own_property_descriptors_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! core-js/modules/es.object.get-own-property-descriptors.js */ "./node_modules/core-js/modules/es.object.get-own-property-descriptors.js");
18543
- /* harmony import */ var core_js_modules_es_object_get_own_property_descriptors_js__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_get_own_property_descriptors_js__WEBPACK_IMPORTED_MODULE_6__);
18544
- /* harmony import */ var _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! @babel/runtime/helpers/defineProperty */ "./node_modules/@babel/runtime/helpers/defineProperty.js");
18545
- /* harmony import */ var _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_7__);
18546
- /* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! core-js/modules/es.array.concat.js */ "./node_modules/core-js/modules/es.array.concat.js");
18547
- /* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_8__);
18548
- /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! react */ "react");
18549
- /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_9__);
18550
- /* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! classnames */ "./node_modules/classnames/index.js");
18551
- /* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_10___default = /*#__PURE__*/__webpack_require__.n(classnames__WEBPACK_IMPORTED_MODULE_10__);
18552
- /* harmony import */ var _config_provider_ConfigContext__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ../config-provider/ConfigContext */ "./components/config-provider/ConfigContext.tsx");
18553
- /* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ../_utils */ "./components/_utils/index.ts");
18543
+ /* harmony import */ var _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @babel/runtime/helpers/extends */ "./node_modules/@babel/runtime/helpers/extends.js");
18544
+ /* harmony import */ var _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_0__);
18545
+ /* harmony import */ var _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @babel/runtime/helpers/defineProperty */ "./node_modules/@babel/runtime/helpers/defineProperty.js");
18546
+ /* harmony import */ var _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1__);
18547
+ /* harmony import */ var _babel_runtime_helpers_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @babel/runtime/helpers/objectWithoutProperties */ "./node_modules/@babel/runtime/helpers/objectWithoutProperties.js");
18548
+ /* harmony import */ var _babel_runtime_helpers_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_2__);
18549
+ /* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! core-js/modules/es.array.concat.js */ "./node_modules/core-js/modules/es.array.concat.js");
18550
+ /* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_3__);
18551
+ /* harmony import */ var core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! core-js/modules/es.object.keys.js */ "./node_modules/core-js/modules/es.object.keys.js");
18552
+ /* harmony import */ var core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_4__);
18553
+ /* harmony import */ var core_js_modules_es_symbol_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! core-js/modules/es.symbol.js */ "./node_modules/core-js/modules/es.symbol.js");
18554
+ /* harmony import */ var core_js_modules_es_symbol_js__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_symbol_js__WEBPACK_IMPORTED_MODULE_5__);
18555
+ /* harmony import */ var core_js_modules_es_array_filter_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! core-js/modules/es.array.filter.js */ "./node_modules/core-js/modules/es.array.filter.js");
18556
+ /* harmony import */ var core_js_modules_es_array_filter_js__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_filter_js__WEBPACK_IMPORTED_MODULE_6__);
18557
+ /* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! core-js/modules/es.object.to-string.js */ "./node_modules/core-js/modules/es.object.to-string.js");
18558
+ /* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_7__);
18559
+ /* harmony import */ var core_js_modules_es_object_get_own_property_descriptor_js__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! core-js/modules/es.object.get-own-property-descriptor.js */ "./node_modules/core-js/modules/es.object.get-own-property-descriptor.js");
18560
+ /* harmony import */ var core_js_modules_es_object_get_own_property_descriptor_js__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_get_own_property_descriptor_js__WEBPACK_IMPORTED_MODULE_8__);
18561
+ /* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! core-js/modules/web.dom-collections.for-each.js */ "./node_modules/core-js/modules/web.dom-collections.for-each.js");
18562
+ /* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_9__);
18563
+ /* harmony import */ var core_js_modules_es_object_get_own_property_descriptors_js__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! core-js/modules/es.object.get-own-property-descriptors.js */ "./node_modules/core-js/modules/es.object.get-own-property-descriptors.js");
18564
+ /* harmony import */ var core_js_modules_es_object_get_own_property_descriptors_js__WEBPACK_IMPORTED_MODULE_10___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_get_own_property_descriptors_js__WEBPACK_IMPORTED_MODULE_10__);
18565
+ /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! react */ "react");
18566
+ /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_11___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_11__);
18567
+ /* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! classnames */ "./node_modules/classnames/index.js");
18568
+ /* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_12___default = /*#__PURE__*/__webpack_require__.n(classnames__WEBPACK_IMPORTED_MODULE_12__);
18569
+ /* harmony import */ var _config_provider_ConfigContext__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ../config-provider/ConfigContext */ "./components/config-provider/ConfigContext.tsx");
18570
+ /* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ../_utils */ "./components/_utils/index.ts");
18554
18571
 
18555
18572
 
18556
18573
 
18574
+ var _excluded = ["type", "spin", "style", "prefix", "className", "rotate", "onClick", "onMouseEnter", "onMouseLeave"];
18575
+
18576
+ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
18577
+
18578
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
18557
18579
 
18558
18580
 
18559
18581
 
18560
18582
 
18561
18583
 
18562
18584
 
18563
- function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
18564
18585
 
18565
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_7___default()(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
18566
18586
 
18567
18587
 
18568
18588
 
@@ -18573,10 +18593,11 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
18573
18593
  var InternalIcon = function InternalIcon(props, ref) {
18574
18594
  var _classNames;
18575
18595
 
18576
- var _useContext = Object(react__WEBPACK_IMPORTED_MODULE_9__["useContext"])(_config_provider_ConfigContext__WEBPACK_IMPORTED_MODULE_11__["default"]),
18596
+ var _useContext = Object(react__WEBPACK_IMPORTED_MODULE_11__["useContext"])(_config_provider_ConfigContext__WEBPACK_IMPORTED_MODULE_13__["default"]),
18577
18597
  userDefaultProps = _useContext.compDefaultProps;
18578
18598
 
18579
- var iconProps = Object(_utils__WEBPACK_IMPORTED_MODULE_12__["getCompProps"])('Icon', userDefaultProps, props);
18599
+ var iconProps = Object(_utils__WEBPACK_IMPORTED_MODULE_14__["getCompProps"])('Icon', userDefaultProps, props);
18600
+
18580
18601
  var type = iconProps.type,
18581
18602
  spin = iconProps.spin,
18582
18603
  style = iconProps.style,
@@ -18585,11 +18606,13 @@ var InternalIcon = function InternalIcon(props, ref) {
18585
18606
  rotate = iconProps.rotate,
18586
18607
  onClick = iconProps.onClick,
18587
18608
  onMouseEnter = iconProps.onMouseEnter,
18588
- onMouseLeave = iconProps.onMouseLeave;
18589
- var innerRef = react__WEBPACK_IMPORTED_MODULE_9___default.a.useRef();
18609
+ onMouseLeave = iconProps.onMouseLeave,
18610
+ others = _babel_runtime_helpers_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_2___default()(iconProps, _excluded);
18611
+
18612
+ var innerRef = react__WEBPACK_IMPORTED_MODULE_11___default.a.useRef();
18590
18613
  var iconRef = ref || innerRef;
18591
18614
  var iconPrefix = prefix || iconProps.iconPrefix;
18592
- var iconClass = classnames__WEBPACK_IMPORTED_MODULE_10___default()(iconPrefix, className, (_classNames = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_7___default()(_classNames, "".concat(iconPrefix, "-").concat(type), type), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_7___default()(_classNames, "icon-spin", spin), _classNames));
18615
+ var iconClass = classnames__WEBPACK_IMPORTED_MODULE_12___default()(iconPrefix, className, (_classNames = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_classNames, "".concat(iconPrefix, "-").concat(type), type), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_classNames, "icon-spin", spin), _classNames));
18593
18616
 
18594
18617
  var handleClick = function handleClick(e) {
18595
18618
  onClick && onClick(e);
@@ -18609,17 +18632,18 @@ var InternalIcon = function InternalIcon(props, ref) {
18609
18632
  iconStyle.transform = "rotate(".concat(rotate, "deg)");
18610
18633
  }
18611
18634
 
18612
- return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_9___default.a.createElement("i", {
18635
+ return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11___default.a.createElement("i", _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_0___default()({
18613
18636
  className: iconClass,
18614
18637
  onClick: handleClick,
18615
18638
  onMouseEnter: handleMouseEnter,
18616
18639
  onMouseLeave: handleMouseLeave,
18617
- style: iconStyle,
18640
+ style: iconStyle
18641
+ }, others, {
18618
18642
  ref: iconRef
18619
- });
18643
+ }));
18620
18644
  };
18621
18645
 
18622
- var Icon = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_9___default.a.forwardRef(InternalIcon);
18646
+ var Icon = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11___default.a.forwardRef(InternalIcon);
18623
18647
  Icon.displayName = 'Icon';
18624
18648
  /* harmony default export */ __webpack_exports__["default"] = (Icon);
18625
18649
 
@@ -34008,8 +34032,8 @@ var Tooltip = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_8__["forwardRef"](func
34008
34032
  });
34009
34033
 
34010
34034
  var popperProps = _objectSpread(_objectSpread({}, allProps), {}, {
34011
- prefixCls: prefixCls,
34012
- arrow: true
34035
+ prefixCls: prefixCls // arrow: true,
34036
+
34013
34037
  });
34014
34038
 
34015
34039
  var tipPopper = typeof tip === 'function' ? tip() : tip;