@kdcloudjs/kdesign 1.6.5 → 1.6.7

package/dist/kdesign.js

@@ -1,6 +1,6 @@
 /*!
  * 
- *   @kdcloudjs/kdesign v1.6.4
+ *   @kdcloudjs/kdesign v1.6.6
  * 
  *   Copyright 2020-present, Kingdee, Inc.
  *   All rights reserved.
@@ -1589,15 +1589,7 @@ function useResizeObserver(element, handler) {
 
       ['width', 'height', 'x', 'y', 'bottom', 'top', 'left', 'right'].forEach(function (prop) {
         rect[prop] = contentRect[prop];
-      }); // rect.width = contentRect.width
-      // rect.height = contentRect.height
-      // rect.x = contentRect.x
-      // rect.y = contentRect.y
-      // rect.bottom = contentRect.bottom
-      // rect.top = contentRect.top
-      // rect.left = contentRect.left
-      // rect.right = contentRect.right
-
+      });
       handler && handler(rect);
     };
 
@@ -8657,7 +8649,11 @@ var compDefaultProps = {
     borderType: 'underline',
     mode: 'single',
     defaultOpen: false,
-    showArrow: true
+    showArrow: true,
+    placeholder: '请输入需要搜索的内容',
+    filterOption: true,
+    optionLabelProp: 'children',
+    optionFilterProp: 'label'
   },
   Image: {
     preview: true
@@ -8815,6 +8811,7 @@ var compDefaultProps = {
     borderType: 'underline',
     disabled: false,
     count: true,
+    countPosition: 'outter',
     maxLength: 255
   },
   Timeline: {
@@ -9543,12 +9540,12 @@ function Panel(props) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @babel/runtime/helpers/extends */ "./node_modules/@babel/runtime/helpers/extends.js");
-/* harmony import */ var _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @babel/runtime/helpers/defineProperty */ "./node_modules/@babel/runtime/helpers/defineProperty.js");
-/* harmony import */ var _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @babel/runtime/helpers/slicedToArray */ "./node_modules/@babel/runtime/helpers/slicedToArray.js");
-/* harmony import */ var _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @babel/runtime/helpers/defineProperty */ "./node_modules/@babel/runtime/helpers/defineProperty.js");
+/* harmony import */ var _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @babel/runtime/helpers/slicedToArray */ "./node_modules/@babel/runtime/helpers/slicedToArray.js");
+/* harmony import */ var _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @babel/runtime/helpers/extends */ "./node_modules/@babel/runtime/helpers/extends.js");
+/* harmony import */ var _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_2__);
 /* harmony import */ var core_js_modules_es_array_find_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! core-js/modules/es.array.find.js */ "./node_modules/core-js/modules/es.array.find.js");
 /* harmony import */ var core_js_modules_es_array_find_js__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_find_js__WEBPACK_IMPORTED_MODULE_3__);
 /* 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");
@@ -9580,18 +9577,16 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _hooks_use_hover_value__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(/*! ./hooks/use-hover-value */ "./components/date-picker/hooks/use-hover-value.ts");
 /* harmony import */ var _utils_date_fns__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(/*! ./utils/date-fns */ "./components/date-picker/utils/date-fns.ts");
 /* harmony import */ var _hooks_use_text_value_mapping__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(/*! ./hooks/use-text-value-mapping */ "./components/date-picker/hooks/use-text-value-mapping.ts");
-/* harmony import */ var _locale__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(/*! ../locale */ "./components/locale/index.ts");
-/* harmony import */ var _utils_get_extra_footer__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(/*! ./utils/get-extra-footer */ "./components/date-picker/utils/get-extra-footer.tsx");
-/* harmony import */ var _utils_get_ranges__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(/*! ./utils/get-ranges */ "./components/date-picker/utils/get-ranges.tsx");
-/* harmony import */ var _utils_usePopper__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(/*! ../_utils/usePopper */ "./components/_utils/usePopper.tsx");
+/* harmony import */ var _utils_get_extra_footer__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(/*! ./utils/get-extra-footer */ "./components/date-picker/utils/get-extra-footer.tsx");
+/* harmony import */ var _utils_get_ranges__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(/*! ./utils/get-ranges */ "./components/date-picker/utils/get-ranges.tsx");
+/* harmony import */ var _utils_usePopper__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(/*! ../_utils/usePopper */ "./components/_utils/usePopper.tsx");
 
 
 
 
 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; }
 
-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; }
-
+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_0___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; }
 
 
 
@@ -9694,26 +9689,24 @@ function DatePicker(props) {
   // const seconds = generateUnits(0, 59, secondStep, disabledSeconds && disabledSeconds(originHour, minute))
 
   var needConfirmButton = picker === 'date' && !!showTime || picker === 'time';
-  var datePickerLang = locale ? Object(_locale__WEBPACK_IMPORTED_MODULE_24__["getCompLangMsg"])({
-    componentName: 'DatePicker'
-  }, function (_componentName, label) {
-    return locale[label];
-  }) : globalLocale.getCompLangMsg({
+
+  var datePickerLang = _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_2___default()({}, globalLocale.getCompLangMsg({
     componentName: 'DatePicker'
-  }); // console.log(_format)
+  }), locale || {}); // console.log(_format)
   // 原始数据
 
+
   var _useMergedState = Object(_utils_hooks__WEBPACK_IMPORTED_MODULE_14__["useMergedState"])(null, {
     value: value,
     defaultValue: defaultValue
   }),
-      _useMergedState2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_2___default()(_useMergedState, 2),
+      _useMergedState2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_1___default()(_useMergedState, 2),
       dateValue = _useMergedState2[0],
       setDateValue = _useMergedState2[1]; // 选中的数据
 
 
   var _React$useState = react__WEBPACK_IMPORTED_MODULE_11___default.a.useState(dateValue),
-      _React$useState2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_2___default()(_React$useState, 2),
+      _React$useState2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_1___default()(_React$useState, 2),
       selectedValue = _React$useState2[0],
       setSelectedValue = _React$useState2[1];
 
@@ -9754,7 +9747,7 @@ function DatePicker(props) {
       return date || Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_22__["newDate"])();
     }
   }),
-      _useMergedState4 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_2___default()(_useMergedState3, 2),
+      _useMergedState4 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_1___default()(_useMergedState3, 2),
       viewDate = _useMergedState4[0],
       setViewDate = _useMergedState4[1]; // text
 
@@ -9767,24 +9760,24 @@ function DatePicker(props) {
     valueText: valueText,
     onTextChange: function onTextChange(newText) {
       if (newText === '') {
-        setSelectedValue(null);
-        setDateValue(null);
+        triggerChange(null);
+        setViewDate(null);
       } else if (newText && newText.length === _format.length) {
         var inputTempDate = Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_22__["parseDate"])(newText, _format);
 
         if (inputTempDate && (!disabledDate || !disabledDate(inputTempDate))) {
           if (picker !== 'year') {
-            setSelectedValue(inputTempDate);
-            setDateValue(inputTempDate);
+            triggerChange(inputTempDate);
+            setViewDate(inputTempDate);
           } else if (Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_22__["isValid"])(inputTempDate)) {
-            setSelectedValue(inputTempDate);
-            setDateValue(inputTempDate);
+            triggerChange(inputTempDate);
+            setViewDate(inputTempDate);
           }
         }
       }
     }
   }),
-      _useTextValueMapping2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_2___default()(_useTextValueMapping, 3),
+      _useTextValueMapping2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_1___default()(_useTextValueMapping, 3),
       text = _useTextValueMapping2[0],
       triggerTextChange = _useTextValueMapping2[1],
       resetText = _useTextValueMapping2[2];
@@ -9792,7 +9785,7 @@ function DatePicker(props) {
   var _useHoverValue = Object(_hooks_use_hover_value__WEBPACK_IMPORTED_MODULE_21__["default"])(text, {
     format: _format
   }),
-      _useHoverValue2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_2___default()(_useHoverValue, 3),
+      _useHoverValue2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_1___default()(_useHoverValue, 3),
       hoverValue = _useHoverValue2[0],
       onEnter = _useHoverValue2[1],
       onLeave = _useHoverValue2[2];
@@ -9812,7 +9805,7 @@ function DatePicker(props) {
 
     }
   }),
-      _useMergedState6 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_2___default()(_useMergedState5, 2),
+      _useMergedState6 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_1___default()(_useMergedState5, 2),
       openValue = _useMergedState6[0],
       triggerInnerOpen = _useMergedState6[1]; // Save panel is changed from which panel
 
@@ -9826,7 +9819,7 @@ function DatePicker(props) {
   }, {
     value: mode
   }),
-      _useMergedState8 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_2___default()(_useMergedState7, 2),
+      _useMergedState8 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_1___default()(_useMergedState7, 2),
       mergedMode = _useMergedState8[0],
       setInnerMode = _useMergedState8[1];
 
@@ -9907,8 +9900,8 @@ function DatePicker(props) {
     onContextSelect(adjustedNow, 'submit');
   };
 
-  var extraFooter = Object(_utils_get_extra_footer__WEBPACK_IMPORTED_MODULE_25__["default"])(datePickerPrefixCls, mergedMode, renderExtraFooter);
-  var rangesNode = Object(_utils_get_ranges__WEBPACK_IMPORTED_MODULE_26__["default"])({
+  var extraFooter = Object(_utils_get_extra_footer__WEBPACK_IMPORTED_MODULE_24__["default"])(datePickerPrefixCls, mergedMode, renderExtraFooter);
+  var rangesNode = Object(_utils_get_ranges__WEBPACK_IMPORTED_MODULE_25__["default"])({
     prefixCls: datePickerPrefixCls,
     components: components,
     needConfirmButton: needConfirmButton,
@@ -10023,7 +10016,7 @@ function DatePicker(props) {
     triggerChange: triggerChange,
     resetText: resetText
   };
-  return Object(_utils_usePopper__WEBPACK_IMPORTED_MODULE_27__["default"])( /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11___default.a.createElement(_single_input_date__WEBPACK_IMPORTED_MODULE_18__["default"], _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_0___default()({
+  return Object(_utils_usePopper__WEBPACK_IMPORTED_MODULE_26__["default"])( /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11___default.a.createElement(_single_input_date__WEBPACK_IMPORTED_MODULE_18__["default"], _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_2___default()({
     ref: inputDivRef
   }, inputProps)), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11___default.a.createElement("div", {
     ref: popperRef,
@@ -10922,25 +10915,27 @@ function Header(props) {
 /*!******************************************************!*\
   !*** ./components/date-picker/panel/month/month.tsx ***!
   \******************************************************/
-/*! exports provided: monthsNumToText, default */
+/*! exports provided: default */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "monthsNumToText", function() { return monthsNumToText; });
 /* harmony import */ var _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @babel/runtime/helpers/extends */ "./node_modules/@babel/runtime/helpers/extends.js");
 /* harmony import */ var _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @babel/runtime/helpers/defineProperty */ "./node_modules/@babel/runtime/helpers/defineProperty.js");
 /* harmony import */ var _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var core_js_modules_es_array_map_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! core-js/modules/es.array.map.js */ "./node_modules/core-js/modules/es.array.map.js");
-/* harmony import */ var core_js_modules_es_array_map_js__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_map_js__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! react */ "react");
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! classnames */ "./node_modules/classnames/index.js");
-/* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(classnames__WEBPACK_IMPORTED_MODULE_4__);
-/* harmony import */ var _utils_date_fns__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../../utils/date-fns */ "./components/date-picker/utils/date-fns.ts");
-/* harmony import */ var _context__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../../context */ "./components/date-picker/context.tsx");
-/* harmony import */ var _hooks_use_range_cls__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../../hooks/use-range-cls */ "./components/date-picker/hooks/use-range-cls.ts");
+/* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! core-js/modules/es.array.concat.js */ "./node_modules/core-js/modules/es.array.concat.js");
+/* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var core_js_modules_es_array_map_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! core-js/modules/es.array.map.js */ "./node_modules/core-js/modules/es.array.map.js");
+/* harmony import */ var core_js_modules_es_array_map_js__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_map_js__WEBPACK_IMPORTED_MODULE_3__);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! react */ "react");
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_4__);
+/* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! classnames */ "./node_modules/classnames/index.js");
+/* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(classnames__WEBPACK_IMPORTED_MODULE_5__);
+/* harmony import */ var _utils_date_fns__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../../utils/date-fns */ "./components/date-picker/utils/date-fns.ts");
+/* harmony import */ var _context__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../../context */ "./components/date-picker/context.tsx");
+/* harmony import */ var _hooks_use_range_cls__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../../hooks/use-range-cls */ "./components/date-picker/hooks/use-range-cls.ts");
+
 
 
 
@@ -10949,11 +10944,10 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-var monthsNumToText = ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月', '13月'];
 var monthsThreeColumns = [[0, 1, 2], [3, 4, 5], [6, 7, 8], [9, 10, 11]];
 
 function Month(props) {
-  var context = Object(react__WEBPACK_IMPORTED_MODULE_3__["useContext"])(_context__WEBPACK_IMPORTED_MODULE_6__["default"]);
+  var context = Object(react__WEBPACK_IMPORTED_MODULE_4__["useContext"])(_context__WEBPACK_IMPORTED_MODULE_7__["default"]);
   var prefixCls = context.prefixCls,
       dateValue = context.dateValue,
       viewDate = context.viewDate,
@@ -10962,7 +10956,8 @@ function Month(props) {
       onDateMouseLeave = context.onDateMouseLeave,
       rangeValue = context.rangeValue,
       panelPosition = context.panelPosition,
-      hoverRangedValue = context.hoverRangedValue;
+      hoverRangedValue = context.hoverRangedValue,
+      locale = context.locale;
   var disabledDate = props.disabledDate;
 
   var _dateValue;
@@ -10980,9 +10975,9 @@ function Month(props) {
     if (hasFindSelected) return false;
 
     if (Array.isArray(_dateValue)) {
-      return _dateValue[0] && Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_5__["getMonth"])(_dateValue[0]) === month && Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_5__["getYear"])(_dateValue[0]) === Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_5__["getYear"])(viewDate) || _dateValue[1] && Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_5__["getMonth"])(_dateValue[1]) === month && Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_5__["getYear"])(_dateValue[1]) === Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_5__["getYear"])(viewDate);
+      return _dateValue[0] && Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_6__["getMonth"])(_dateValue[0]) === month && Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_6__["getYear"])(_dateValue[0]) === Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_6__["getYear"])(viewDate) || _dateValue[1] && Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_6__["getMonth"])(_dateValue[1]) === month && Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_6__["getYear"])(_dateValue[1]) === Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_6__["getYear"])(viewDate);
     } else {
-      if (_dateValue && Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_5__["getMonth"])(_dateValue) === month && Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_5__["getYear"])(_dateValue) === Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_5__["getYear"])(viewDate)) {
+      if (_dateValue && Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_6__["getMonth"])(_dateValue) === month && Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_6__["getYear"])(_dateValue) === Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_6__["getYear"])(viewDate)) {
         hasFindSelected = true;
         return true;
       }
@@ -10994,13 +10989,13 @@ function Month(props) {
   var getMonthToday = function getMonthToday(month) {
     if (hasFindToday) return false;
 
-    if (Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_5__["getYear"])(viewDate) === Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_5__["getYear"])(Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_5__["newDate"])()) && month === Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_5__["getMonth"])(Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_5__["newDate"])())) {
+    if (Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_6__["getYear"])(viewDate) === Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_6__["getYear"])(Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_6__["newDate"])()) && month === Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_6__["getMonth"])(Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_6__["newDate"])())) {
       hasFindToday = true;
 
       if (Array.isArray(_dateValue)) {
-        return _dateValue[0] ? Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_5__["getMonth"])(_dateValue[0]) !== month : _dateValue[1] ? Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_5__["getMonth"])(_dateValue[1]) !== month : true;
+        return _dateValue[0] ? Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_6__["getMonth"])(_dateValue[0]) !== month : _dateValue[1] ? Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_6__["getMonth"])(_dateValue[1]) !== month : true;
       } else {
-        return _dateValue ? Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_5__["getMonth"])(_dateValue) !== month : true;
+        return _dateValue ? Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_6__["getMonth"])(_dateValue) !== month : true;
       }
     }
   };
@@ -11008,25 +11003,25 @@ function Month(props) {
   var getMonthClassNames = function getMonthClassNames(i) {
     var _classnames;
 
-    return classnames__WEBPACK_IMPORTED_MODULE_4___default()("".concat(prefixCls, "-month-text"), (_classnames = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_classnames, "".concat(prefixCls, "-month-text-selected"), getMonthSelected(i)), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_classnames, "".concat(prefixCls, "-month-text-today"), getMonthToday(i)), _classnames));
+    return classnames__WEBPACK_IMPORTED_MODULE_5___default()("".concat(prefixCls, "-month-text"), (_classnames = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_classnames, "".concat(prefixCls, "-month-text-selected"), getMonthSelected(i)), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_classnames, "".concat(prefixCls, "-month-text-today"), getMonthToday(i)), _classnames));
   };
 
-  var getRangeCls = Object(_hooks_use_range_cls__WEBPACK_IMPORTED_MODULE_7__["default"])({
+  var getRangeCls = Object(_hooks_use_range_cls__WEBPACK_IMPORTED_MODULE_8__["default"])({
     prefixCls: prefixCls,
     rangeValue: rangeValue,
     hoverRangedValue: hoverRangedValue,
     isRange: !!panelPosition,
     isAfterStart: function isAfterStart(date, rangedValue) {
-      return rangedValue[0] ? Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_5__["isAfter"])(Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_5__["getStartOfMonth"])(date), Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_5__["getStartOfMonth"])(rangedValue[0])) : false;
+      return rangedValue[0] ? Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_6__["isAfter"])(Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_6__["getStartOfMonth"])(date), Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_6__["getStartOfMonth"])(rangedValue[0])) : false;
     },
     isBeforeEnd: function isBeforeEnd(date, rangedValue) {
-      return rangedValue[1] ? Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_5__["isBefore"])(Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_5__["getStartOfMonth"])(date), Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_5__["getStartOfMonth"])(rangedValue[1])) : false;
+      return rangedValue[1] ? Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_6__["isBefore"])(Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_6__["getStartOfMonth"])(date), Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_6__["getStartOfMonth"])(rangedValue[1])) : false;
     },
     isStart: function isStart(date, rangedValue) {
-      return rangedValue[0] ? Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_5__["isSameMonth"])(date, rangedValue[0]) : false;
+      return rangedValue[0] ? Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_6__["isSameMonth"])(date, rangedValue[0]) : false;
     },
     isEnd: function isEnd(date, rangedValue) {
-      return rangedValue[1] ? Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_5__["isSameMonth"])(date, rangedValue[1]) : false;
+      return rangedValue[1] ? Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_6__["isSameMonth"])(date, rangedValue[1]) : false;
     }
   });
 
@@ -11037,21 +11032,20 @@ function Month(props) {
   };
 
   var renderMonthItem = function renderMonthItem(i) {
-    var monthsText = monthsNumToText[i];
-    return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("span", {
+    return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("span", {
       className: getMonthClassNames(i)
-    }, monthsText);
+    }, "".concat(i + 1).concat(locale.month));
   };
 
   var renderMonth = function renderMonth() {
     var monthLayout = monthsThreeColumns;
-    var monthLineCls = classnames__WEBPACK_IMPORTED_MODULE_4___default()("".concat(prefixCls, "-month-line"));
+    var monthLineCls = classnames__WEBPACK_IMPORTED_MODULE_5___default()("".concat(prefixCls, "-month-line"));
     return monthLayout.map(function (month, i) {
-      return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("div", {
+      return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("div", {
         className: monthLineCls,
         key: i
       }, month.map(function (m, j) {
-        var month = Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_5__["setMonth"])(viewDate, m);
+        var month = Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_6__["setMonth"])(viewDate, m);
         var _props = {
           onClick: function onClick() {
             return handleClick(month);
@@ -11067,8 +11061,8 @@ function Month(props) {
             }
           }
         };
-        var monthItemCls = classnames__WEBPACK_IMPORTED_MODULE_4___default()("".concat(prefixCls, "-month-item"), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()({}, "".concat(prefixCls, "-month-item-disabled"), disabledDate && disabledDate(month)), getRangeCls(month));
-        return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("div", _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_0___default()({
+        var monthItemCls = classnames__WEBPACK_IMPORTED_MODULE_5___default()("".concat(prefixCls, "-month-item"), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()({}, "".concat(prefixCls, "-month-item-disabled"), disabledDate && disabledDate(month)), getRangeCls(month));
+        return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("div", _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_0___default()({
           className: monthItemCls,
           key: j
         }, _props), renderMonthItem(m));
@@ -11076,11 +11070,11 @@ function Month(props) {
     });
   };
 
-  var monthCls = classnames__WEBPACK_IMPORTED_MODULE_4___default()("".concat(prefixCls, "-month"));
-  var monthWarpperCls = classnames__WEBPACK_IMPORTED_MODULE_4___default()("".concat(prefixCls, "-month-warpper"));
-  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("div", {
+  var monthCls = classnames__WEBPACK_IMPORTED_MODULE_5___default()("".concat(prefixCls, "-month"));
+  var monthWarpperCls = classnames__WEBPACK_IMPORTED_MODULE_5___default()("".concat(prefixCls, "-month-warpper"));
+  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("div", {
     className: monthCls
-  }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("div", {
+  }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("div", {
     className: monthWarpperCls
   }, renderMonth()));
 }
@@ -12134,12 +12128,12 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var core_js_modules_es_object_get_own_property_descriptor_js__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_get_own_property_descriptor_js__WEBPACK_IMPORTED_MODULE_2__);
 /* harmony import */ var core_js_modules_es_object_get_own_property_descriptors_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! core-js/modules/es.object.get-own-property-descriptors.js */ "./node_modules/core-js/modules/es.object.get-own-property-descriptors.js");
 /* harmony import */ var core_js_modules_es_object_get_own_property_descriptors_js__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_get_own_property_descriptors_js__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! @babel/runtime/helpers/extends */ "./node_modules/@babel/runtime/helpers/extends.js");
-/* harmony import */ var _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_4__);
-/* harmony import */ var _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! @babel/runtime/helpers/defineProperty */ "./node_modules/@babel/runtime/helpers/defineProperty.js");
-/* harmony import */ var _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_5__);
-/* harmony import */ var _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! @babel/runtime/helpers/slicedToArray */ "./node_modules/@babel/runtime/helpers/slicedToArray.js");
-/* harmony import */ var _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_6__);
+/* harmony import */ var _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! @babel/runtime/helpers/defineProperty */ "./node_modules/@babel/runtime/helpers/defineProperty.js");
+/* harmony import */ var _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_4__);
+/* harmony import */ var _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! @babel/runtime/helpers/slicedToArray */ "./node_modules/@babel/runtime/helpers/slicedToArray.js");
+/* harmony import */ var _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_5__);
+/* harmony import */ var _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! @babel/runtime/helpers/extends */ "./node_modules/@babel/runtime/helpers/extends.js");
+/* harmony import */ var _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_6__);
 /* harmony import */ var core_js_modules_es_array_find_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! core-js/modules/es.array.find.js */ "./node_modules/core-js/modules/es.array.find.js");
 /* harmony import */ var core_js_modules_es_array_find_js__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_find_js__WEBPACK_IMPORTED_MODULE_7__);
 /* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! core-js/modules/es.object.to-string.js */ "./node_modules/core-js/modules/es.object.to-string.js");
@@ -12165,13 +12159,12 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _utils_date_fns__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(/*! ./utils/date-fns */ "./components/date-picker/utils/date-fns.ts");
 /* harmony import */ var _hooks_use_text_value_mapping__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(/*! ./hooks/use-text-value-mapping */ "./components/date-picker/hooks/use-text-value-mapping.ts");
 /* harmony import */ var _hooks_use_range_view_dates__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(/*! ./hooks/use-range-view-dates */ "./components/date-picker/hooks/use-range-view-dates.ts");
-/* harmony import */ var _locale__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(/*! ../locale */ "./components/locale/index.ts");
-/* harmony import */ var _hooks_use_range_disabled__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(/*! ./hooks/use-range-disabled */ "./components/date-picker/hooks/use-range-disabled.ts");
-/* harmony import */ var _utils_get_extra_footer__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(/*! ./utils/get-extra-footer */ "./components/date-picker/utils/get-extra-footer.tsx");
-/* harmony import */ var _utils_get_ranges__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(/*! ./utils/get-ranges */ "./components/date-picker/utils/get-ranges.tsx");
-/* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(/*! classnames */ "./node_modules/classnames/index.js");
-/* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_30___default = /*#__PURE__*/__webpack_require__.n(classnames__WEBPACK_IMPORTED_MODULE_30__);
-/* harmony import */ var _utils_usePopper__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(/*! ../_utils/usePopper */ "./components/_utils/usePopper.tsx");
+/* harmony import */ var _hooks_use_range_disabled__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(/*! ./hooks/use-range-disabled */ "./components/date-picker/hooks/use-range-disabled.ts");
+/* harmony import */ var _utils_get_extra_footer__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(/*! ./utils/get-extra-footer */ "./components/date-picker/utils/get-extra-footer.tsx");
+/* harmony import */ var _utils_get_ranges__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(/*! ./utils/get-ranges */ "./components/date-picker/utils/get-ranges.tsx");
+/* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(/*! classnames */ "./node_modules/classnames/index.js");
+/* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_29___default = /*#__PURE__*/__webpack_require__.n(classnames__WEBPACK_IMPORTED_MODULE_29__);
+/* harmony import */ var _utils_usePopper__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(/*! ../_utils/usePopper */ "./components/_utils/usePopper.tsx");
 
 
 
@@ -12182,8 +12175,7 @@ __webpack_require__.r(__webpack_exports__);
 
 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; }
 
-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_5___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; }
-
+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_4___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; }
 
 
 
@@ -12303,13 +12295,11 @@ function DatePicker(props) {
       onBlur = _ref.onBlur,
       _onOk = _ref.onOk;
   var needConfirmButton = picker === 'date' && !!showTime || picker === 'time';
-  var datePickerLang = locale ? Object(_locale__WEBPACK_IMPORTED_MODULE_26__["getCompLangMsg"])({
-    componentName: 'DatePicker'
-  }, function (_componentName, label) {
-    return locale[label];
-  }) : globalLocale.getCompLangMsg({
+
+  var datePickerLang = _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_6___default()({}, globalLocale.getCompLangMsg({
     componentName: 'DatePicker'
-  }); // ref
+  }), locale || {}); // ref
+
 
   var panelDivRef = react__WEBPACK_IMPORTED_MODULE_12___default.a.useRef(null);
   var inputDivRef = react__WEBPACK_IMPORTED_MODULE_12___default.a.useRef(null);
@@ -12333,7 +12323,7 @@ function DatePicker(props) {
 
   var _useMergedState = Object(_utils_hooks__WEBPACK_IMPORTED_MODULE_15__["useMergedState"])(0, {// value: activePickerIndex,
   }),
-      _useMergedState2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_6___default()(_useMergedState, 2),
+      _useMergedState2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_5___default()(_useMergedState, 2),
       mergedActivePickerIndex = _useMergedState2[0],
       setMergedActivePickerIndex = _useMergedState2[1]; // 原始数据
 
@@ -12353,7 +12343,7 @@ function DatePicker(props) {
       }
     }
   }),
-      _useMergedState4 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_6___default()(_useMergedState3, 2),
+      _useMergedState4 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_5___default()(_useMergedState3, 2),
       dateValue = _useMergedState4[0],
       setInnerValue = _useMergedState4[1]; // 选中的数据
 
@@ -12378,7 +12368,7 @@ function DatePicker(props) {
       return postValues;
     }
   }),
-      _useMergedState6 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_6___default()(_useMergedState5, 2),
+      _useMergedState6 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_5___default()(_useMergedState5, 2),
       selectedValue = _useMergedState6[0],
       setSelectedValue = _useMergedState6[1];
 
@@ -12422,7 +12412,7 @@ function DatePicker(props) {
     picker: picker,
     defaultDates: defaultPickerValue
   }),
-      _useRangeViewDates2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_6___default()(_useRangeViewDates, 2),
+      _useRangeViewDates2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_5___default()(_useRangeViewDates, 2),
       getViewDate = _useRangeViewDates2[0],
       setViewDate = _useRangeViewDates2[1]; // text
 
@@ -12445,7 +12435,7 @@ function DatePicker(props) {
       }
 
       if (inputTempDate) {
-        setSelectedValue(Object(_utils__WEBPACK_IMPORTED_MODULE_20__["updateValues"])(selectedValue, inputTempDate, index));
+        triggerChange(Object(_utils__WEBPACK_IMPORTED_MODULE_20__["updateValues"])(selectedValue, inputTempDate, index), index);
         setViewDate(inputTempDate, index);
       }
     } else if (newText && newText.length === _format.length) {
@@ -12454,10 +12444,10 @@ function DatePicker(props) {
 
       if (inputTempDate && (!disabledFunc || !disabledFunc(inputTempDate))) {
         if (picker !== 'year') {
-          setSelectedValue(Object(_utils__WEBPACK_IMPORTED_MODULE_20__["updateValues"])(selectedValue, inputTempDate, index));
+          triggerChange(Object(_utils__WEBPACK_IMPORTED_MODULE_20__["updateValues"])(selectedValue, inputTempDate, index), index);
           setViewDate(inputTempDate, index);
         } else if (Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_23__["isValid"])(inputTempDate)) {
-          setSelectedValue(Object(_utils__WEBPACK_IMPORTED_MODULE_20__["updateValues"])(selectedValue, inputTempDate, index));
+          triggerChange(Object(_utils__WEBPACK_IMPORTED_MODULE_20__["updateValues"])(selectedValue, inputTempDate, index), index);
           setViewDate(inputTempDate, index);
         }
       }
@@ -12471,7 +12461,7 @@ function DatePicker(props) {
       return _onTextChange(newText, 0);
     }
   }),
-      _useTextValueMapping2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_6___default()(_useTextValueMapping, 3),
+      _useTextValueMapping2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_5___default()(_useTextValueMapping, 3),
       startText = _useTextValueMapping2[0],
       triggerStartTextChange = _useTextValueMapping2[1],
       resetStartText = _useTextValueMapping2[2];
@@ -12482,20 +12472,20 @@ function DatePicker(props) {
       return _onTextChange(newText, 1);
     }
   }),
-      _useTextValueMapping4 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_6___default()(_useTextValueMapping3, 3),
+      _useTextValueMapping4 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_5___default()(_useTextValueMapping3, 3),
       endText = _useTextValueMapping4[0],
       triggerEndTextChange = _useTextValueMapping4[1],
       resetEndText = _useTextValueMapping4[2];
 
   var _React$useState = react__WEBPACK_IMPORTED_MODULE_12___default.a.useState([null, null]),
-      _React$useState2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_6___default()(_React$useState, 2),
+      _React$useState2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_5___default()(_React$useState, 2),
       hoverRangedValue = _React$useState2[0],
       setHoverRangedValue = _React$useState2[1];
 
   var _useHoverValue = Object(_hooks_use_hover_value__WEBPACK_IMPORTED_MODULE_22__["default"])(startText, {
     format: _format
   }),
-      _useHoverValue2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_6___default()(_useHoverValue, 3),
+      _useHoverValue2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_5___default()(_useHoverValue, 3),
       startHoverValue = _useHoverValue2[0],
       onStartEnter = _useHoverValue2[1],
       onStartLeave = _useHoverValue2[2];
@@ -12503,7 +12493,7 @@ function DatePicker(props) {
   var _useHoverValue3 = Object(_hooks_use_hover_value__WEBPACK_IMPORTED_MODULE_22__["default"])(endText, {
     format: _format
   }),
-      _useHoverValue4 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_6___default()(_useHoverValue3, 3),
+      _useHoverValue4 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_5___default()(_useHoverValue3, 3),
       endHoverValue = _useHoverValue4[0],
       onEndEnter = _useHoverValue4[1],
       onEndLeave = _useHoverValue4[2];
@@ -12520,7 +12510,7 @@ function DatePicker(props) {
       }
     }
   }),
-      _useMergedState8 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_6___default()(_useMergedState7, 2),
+      _useMergedState8 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_5___default()(_useMergedState7, 2),
       mergedOpen = _useMergedState8[0],
       triggerInnerOpen = _useMergedState8[1];
 
@@ -12530,7 +12520,7 @@ function DatePicker(props) {
   var _useMergedState9 = Object(_utils_hooks__WEBPACK_IMPORTED_MODULE_15__["useMergedState"])([picker, picker], {
     value: mode
   }),
-      _useMergedState10 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_6___default()(_useMergedState9, 2),
+      _useMergedState10 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_5___default()(_useMergedState9, 2),
       mergedModes = _useMergedState10[0],
       setInnerModes = _useMergedState10[1];
 
@@ -12544,13 +12534,13 @@ function DatePicker(props) {
   // }
   // ========================= Disable Date ==========================
 
-  var _useRangeDisabled = Object(_hooks_use_range_disabled__WEBPACK_IMPORTED_MODULE_27__["default"])({
+  var _useRangeDisabled = Object(_hooks_use_range_disabled__WEBPACK_IMPORTED_MODULE_26__["default"])({
     picker: picker,
     selectedValue: selectedValue,
     disabled: mergedDisabled,
     disabledDate: disabledDate
   }, openRecordsRef.current[1], openRecordsRef.current[0]),
-      _useRangeDisabled2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_6___default()(_useRangeDisabled, 2),
+      _useRangeDisabled2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_5___default()(_useRangeDisabled, 2),
       disabledStartDate = _useRangeDisabled2[0],
       disabledEndDate = _useRangeDisabled2[1]; // const onResetText = () => {
   //   resetEndText()
@@ -12613,7 +12603,7 @@ function DatePicker(props) {
         } // Clean up cache since invalidate
 
 
-        openRecordsRef.current = _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_5___default()({}, sourceIndex, true);
+        openRecordsRef.current = _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_4___default()({}, sourceIndex, true);
       } else if (picker === 'time' && order === true) {
         // Reorder when in same date
         values = reorderValues(values);
@@ -12735,8 +12725,8 @@ function DatePicker(props) {
     return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_12___default.a.createElement(_date_panel__WEBPACK_IMPORTED_MODULE_18__["default"], panelProps);
   };
 
-  var extraNode = Object(_utils_get_extra_footer__WEBPACK_IMPORTED_MODULE_28__["default"])(datePickerPrefixCls, mergedModes[mergedActivePickerIndex], renderExtraFooter);
-  var rangesNode = Object(_utils_get_ranges__WEBPACK_IMPORTED_MODULE_29__["default"])({
+  var extraNode = Object(_utils_get_extra_footer__WEBPACK_IMPORTED_MODULE_27__["default"])(datePickerPrefixCls, mergedModes[mergedActivePickerIndex], renderExtraFooter);
+  var rangesNode = Object(_utils_get_ranges__WEBPACK_IMPORTED_MODULE_28__["default"])({
     prefixCls: datePickerPrefixCls,
     components: components,
     needConfirmButton: needConfirmButton,
@@ -12792,7 +12782,7 @@ function DatePicker(props) {
         }
       }, renderPanel());
       panels = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_12___default.a.createElement("div", {
-        className: classnames__WEBPACK_IMPORTED_MODULE_30___default()("".concat(datePickerPrefixCls, "-container-date"))
+        className: classnames__WEBPACK_IMPORTED_MODULE_29___default()("".concat(datePickerPrefixCls, "-container-date"))
       }, leftPanel, rightPanel);
     } else {
       panels = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_12___default.a.createElement(_context__WEBPACK_IMPORTED_MODULE_17__["default"].Provider, {
@@ -12815,7 +12805,7 @@ function DatePicker(props) {
           onDateMouseEnter: onDateMouseEnter,
           onDateMouseLeave: onDateMouseLeave
         }
-      }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_12___default.a.createElement(_date_panel__WEBPACK_IMPORTED_MODULE_18__["default"], _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_4___default()({}, datePickerProps, {
+      }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_12___default.a.createElement(_date_panel__WEBPACK_IMPORTED_MODULE_18__["default"], _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_6___default()({}, datePickerProps, {
         disabledDate: mergedActivePickerIndex === 0 ? disabledStartDate : disabledEndDate
       })));
     }
@@ -12916,12 +12906,12 @@ function DatePicker(props) {
 
       if (rangeArray.length) {
         return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_12___default.a.createElement("div", {
-          className: classnames__WEBPACK_IMPORTED_MODULE_30___default()("".concat(datePickerPrefixCls, "-ranges"))
+          className: classnames__WEBPACK_IMPORTED_MODULE_29___default()("".concat(datePickerPrefixCls, "-ranges"))
         }, rangeArray.map(function (_ref2) {
           var key = _ref2.key,
               newValue = _ref2.newValue;
           return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_12___default.a.createElement("div", {
-            className: classnames__WEBPACK_IMPORTED_MODULE_30___default()("".concat(datePickerPrefixCls, "-ranges-item")),
+            className: classnames__WEBPACK_IMPORTED_MODULE_29___default()("".concat(datePickerPrefixCls, "-ranges-item")),
             key: key,
             onClick: function onClick() {
               triggerChange(newValue, 1);
@@ -12940,14 +12930,14 @@ function DatePicker(props) {
     return null;
   };
 
-  return Object(_utils_usePopper__WEBPACK_IMPORTED_MODULE_31__["default"])( /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_12___default.a.createElement(_range_input_range__WEBPACK_IMPORTED_MODULE_19__["default"], _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_4___default()({
+  return Object(_utils_usePopper__WEBPACK_IMPORTED_MODULE_30__["default"])( /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_12___default.a.createElement(_range_input_range__WEBPACK_IMPORTED_MODULE_19__["default"], _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_6___default()({
     ref: inputDivRef
   }, inputProps)), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_12___default.a.createElement("div", {
     ref: popperRef,
     onMouseDown: function onMouseDown(e) {
       e.preventDefault();
     },
-    className: classnames__WEBPACK_IMPORTED_MODULE_30___default()("".concat(datePickerPrefixCls, "-container"))
+    className: classnames__WEBPACK_IMPORTED_MODULE_29___default()("".concat(datePickerPrefixCls, "-container"))
   }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_12___default.a.createElement("div", null, renderPanels(), extraNode || rangesNode ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_12___default.a.createElement("div", {
     className: "".concat(datePickerPrefixCls, "-footer")
   }, extraNode, rangesNode) : null), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_12___default.a.createElement("div", null, renderConfig())), {
@@ -13084,6 +13074,12 @@ function InputDate(props, ref) {
       setMergedActivePickerIndex = props.setMergedActivePickerIndex,
       setHoverRangedValue = props.setHoverRangedValue;
   var preventBlurRef = Object(react__WEBPACK_IMPORTED_MODULE_11__["useRef"])(false);
+
+  var _useState = Object(react__WEBPACK_IMPORTED_MODULE_11__["useState"])(false),
+      _useState2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_9___default()(_useState, 2),
+      isMouseEnter = _useState2[0],
+      setIsMouseEnter = _useState2[1];
+
   var placeholder = Object(_utils__WEBPACK_IMPORTED_MODULE_15__["getRangePlaceholder"])(picker, locale, propsPlaceholder);
 
   var onInternalonClick = function onInternalonClick(e) {
@@ -13117,11 +13113,6 @@ function InputDate(props, ref) {
     }
   };
 
-  var suffixNode = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11___default.a.createElement("span", {
-    className: "".concat(prefixCls, "-suffix")
-  }, suffixIcon || /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11___default.a.createElement(_index__WEBPACK_IMPORTED_MODULE_13__["Icon"], {
-    type: picker === 'time' ? 'waiting' : 'date'
-  }));
   var clearNode;
 
   if (allowClear && (Object(_utils__WEBPACK_IMPORTED_MODULE_15__["getValue"])(dateValue, 0) && !mergedDisabled[0] || Object(_utils__WEBPACK_IMPORTED_MODULE_15__["getValue"])(dateValue, 1) && !mergedDisabled[1])) {
@@ -13149,12 +13140,24 @@ function InputDate(props, ref) {
 
         setHoverRangedValue([null, null]);
       },
-      className: "".concat(prefixCls, "-clear")
+      className: "".concat(prefixCls, "-range-clear")
     }, clearIcon || /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11___default.a.createElement(_index__WEBPACK_IMPORTED_MODULE_13__["Icon"], {
-      type: "close"
+      type: "close-solid"
     }));
   }
 
+  var getSuffixNode = function getSuffixNode() {
+    if (isMouseEnter && (startHoverValue || endHoverValue || startText || endText)) {
+      return clearNode;
+    }
+
+    return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11___default.a.createElement("span", {
+      className: "".concat(prefixCls, "-suffix")
+    }, suffixIcon || /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11___default.a.createElement(_index__WEBPACK_IMPORTED_MODULE_13__["Icon"], {
+      type: picker === 'time' ? 'waiting' : 'date'
+    }));
+  };
+
   var getSharedInputHookProps = function getSharedInputHookProps(index, resetText) {
     return {
       preventBlurRef: preventBlurRef,
@@ -13207,14 +13210,31 @@ function InputDate(props, ref) {
       endTyping = _usePickerInput4$.typing;
 
   var borderClass = classnames__WEBPACK_IMPORTED_MODULE_12___default()((_classnames = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(_classnames, "".concat(prefixCls, "-underline"), borderType === 'underline'), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(_classnames, "".concat(prefixCls, "-borderless"), borderType === 'none'), _classnames));
+
+  var mouseEnterHandle = function mouseEnterHandle(e) {
+    setIsMouseEnter(true);
+
+    if (typeof onMouseEnter === 'function') {
+      onMouseEnter(e);
+    }
+  };
+
+  var mouseLeaveHandle = function mouseLeaveHandle(e) {
+    setIsMouseEnter(false);
+
+    if (typeof onMouseLeave === 'function') {
+      onMouseLeave(e);
+    }
+  };
+
   return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11___default.a.createElement("div", _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_7___default()({
     ref: ref,
     className: classnames__WEBPACK_IMPORTED_MODULE_12___default()(prefixCls, "".concat(prefixCls, "-range"), className, borderClass, (_classnames2 = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(_classnames2, "".concat(prefixCls, "-").concat(size), size), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(_classnames2, "".concat(prefixCls, "-disabled"), mergedDisabled[0] && mergedDisabled[1]), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(_classnames2, "".concat(prefixCls, "-focused"), mergedActivePickerIndex === 0 ? startFocused : endFocused), _classnames2)),
     style: style,
     onMouseDown: onInternalonMouseDown,
     onMouseUp: onMouseUp,
-    onMouseEnter: onMouseEnter,
-    onMouseLeave: onMouseLeave,
+    onMouseEnter: mouseEnterHandle,
+    onMouseLeave: mouseLeaveHandle,
     onContextMenu: onContextMenu,
     onClick: onInternalonClick
   }, dataOrAriaProps), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11___default.a.createElement("div", {
@@ -13257,7 +13277,7 @@ function InputDate(props, ref) {
       width: activeBarWidth,
       position: 'absolute'
     })
-  }), suffixNode, clearNode);
+  }), getSuffixNode());
 }
 
 /* harmony default export */ __webpack_exports__["default"] = (/*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11___default.a.forwardRef(InputDate));
@@ -13341,12 +13361,42 @@ function InputDate(props, ref) {
       triggerOpen = props.triggerOpen,
       triggerChange = props.triggerChange;
   var preventBlurRef = Object(react__WEBPACK_IMPORTED_MODULE_4__["useRef"])(false);
+
+  var _useState = Object(react__WEBPACK_IMPORTED_MODULE_4__["useState"])(false),
+      _useState2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_2___default()(_useState, 2),
+      isMouseEnter = _useState2[0],
+      setIsMouseEnter = _useState2[1];
+
   var placeholder = Object(_utils__WEBPACK_IMPORTED_MODULE_8__["getPlaceholder"])(picker, locale, propsPlaceholder);
-  var suffixNode = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("span", {
-    className: "".concat(prefixCls, "-suffix")
-  }, suffixIcon || /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement(_index__WEBPACK_IMPORTED_MODULE_6__["Icon"], {
-    type: picker === 'time' ? 'waiting' : 'date'
-  }));
+
+  var getSuffixNode = function getSuffixNode() {
+    if (isMouseEnter && (hoverValue || text)) {
+      return null;
+    }
+
+    return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("span", {
+      className: "".concat(prefixCls, "-suffix")
+    }, suffixIcon || /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement(_index__WEBPACK_IMPORTED_MODULE_6__["Icon"], {
+      type: picker === 'time' ? 'waiting' : 'date'
+    }));
+  };
+
+  var mouseEnterHandle = function mouseEnterHandle(e) {
+    setIsMouseEnter(true);
+
+    if (typeof onMouseEnter === 'function') {
+      onMouseEnter(e);
+    }
+  };
+
+  var mouseLeaveHandle = function mouseLeaveHandle(e) {
+    setIsMouseEnter(false);
+
+    if (typeof onMouseLeave === 'function') {
+      onMouseLeave(e);
+    }
+  };
+
   var clearNode;
 
   if (allowClear && dateValue && !disabled) {
@@ -13363,7 +13413,7 @@ function InputDate(props, ref) {
       },
       className: "".concat(prefixCls, "-clear")
     }, clearIcon || /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement(_index__WEBPACK_IMPORTED_MODULE_6__["Icon"], {
-      type: "close"
+      type: "close-solid"
     }));
   }
 
@@ -13432,8 +13482,8 @@ function InputDate(props, ref) {
     style: style,
     onMouseDown: onInternalonMouseDown,
     onMouseUp: onInternalMouseUp,
-    onMouseEnter: onMouseEnter,
-    onMouseLeave: onMouseLeave,
+    onMouseEnter: mouseEnterHandle,
+    onMouseLeave: mouseLeaveHandle,
     onContextMenu: onContextMenu,
     onClick: onClick
   }, dataOrAriaProps), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("div", {
@@ -13457,7 +13507,7 @@ function InputDate(props, ref) {
     title: text
   }, inputProps, {
     size: Object(_utils__WEBPACK_IMPORTED_MODULE_8__["getInputSize"])(picker, format)
-  })), suffixNode, clearNode));
+  })), getSuffixNode(), clearNode));
 }
 
 /* harmony default export */ __webpack_exports__["default"] = (/*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_4___default.a.forwardRef(InputDate));
@@ -16778,36 +16828,38 @@ __webpack_require__.r(__webpack_exports__);
 /* 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__);
 /* 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");
 /* 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__);
-/* harmony import */ var core_js_modules_es_array_filter_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! core-js/modules/es.array.filter.js */ "./node_modules/core-js/modules/es.array.filter.js");
-/* harmony import */ var core_js_modules_es_array_filter_js__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_filter_js__WEBPACK_IMPORTED_MODULE_7__);
-/* 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");
-/* 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__);
-/* harmony import */ var core_js_modules_es_array_map_js__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! core-js/modules/es.array.map.js */ "./node_modules/core-js/modules/es.array.map.js");
-/* harmony import */ var core_js_modules_es_array_map_js__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_map_js__WEBPACK_IMPORTED_MODULE_9__);
-/* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! core-js/modules/es.array.includes.js */ "./node_modules/core-js/modules/es.array.includes.js");
-/* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_10___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_10__);
-/* harmony import */ var core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! core-js/modules/es.object.keys.js */ "./node_modules/core-js/modules/es.object.keys.js");
-/* harmony import */ var core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_11___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_11__);
-/* harmony import */ var core_js_modules_es_symbol_js__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! core-js/modules/es.symbol.js */ "./node_modules/core-js/modules/es.symbol.js");
-/* harmony import */ var core_js_modules_es_symbol_js__WEBPACK_IMPORTED_MODULE_12___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_symbol_js__WEBPACK_IMPORTED_MODULE_12__);
-/* harmony import */ var core_js_modules_es_object_get_own_property_descriptor_js__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! core-js/modules/es.object.get-own-property-descriptor.js */ "./node_modules/core-js/modules/es.object.get-own-property-descriptor.js");
-/* harmony import */ var core_js_modules_es_object_get_own_property_descriptor_js__WEBPACK_IMPORTED_MODULE_13___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_get_own_property_descriptor_js__WEBPACK_IMPORTED_MODULE_13__);
-/* harmony import */ var core_js_modules_es_object_get_own_property_descriptors_js__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! core-js/modules/es.object.get-own-property-descriptors.js */ "./node_modules/core-js/modules/es.object.get-own-property-descriptors.js");
-/* harmony import */ var core_js_modules_es_object_get_own_property_descriptors_js__WEBPACK_IMPORTED_MODULE_14___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_get_own_property_descriptors_js__WEBPACK_IMPORTED_MODULE_14__);
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! react */ "react");
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_15___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_15__);
-/* harmony import */ var lodash_get__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! lodash/get */ "./node_modules/lodash/get.js");
-/* harmony import */ var lodash_get__WEBPACK_IMPORTED_MODULE_16___default = /*#__PURE__*/__webpack_require__.n(lodash_get__WEBPACK_IMPORTED_MODULE_16__);
-/* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! classnames */ "./node_modules/classnames/index.js");
-/* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_17___default = /*#__PURE__*/__webpack_require__.n(classnames__WEBPACK_IMPORTED_MODULE_17__);
-/* harmony import */ var _config_provider__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! ../config-provider */ "./components/config-provider/index.tsx");
-/* harmony import */ var _FieldLabel__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(/*! ./FieldLabel */ "./components/form/FieldLabel.tsx");
-/* harmony import */ var _FieldWrapper__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(/*! ./FieldWrapper */ "./components/form/FieldWrapper.tsx");
-/* harmony import */ var _hooks_useForceUpdate__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(/*! ./hooks/useForceUpdate */ "./components/form/hooks/useForceUpdate.ts");
-/* harmony import */ var _utils_devwarning__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(/*! ../_utils/devwarning */ "./components/_utils/devwarning.ts");
-/* harmony import */ var _utils_react_children__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(/*! ../_utils/react-children */ "./components/_utils/react-children.ts");
-/* harmony import */ var _FieldContext__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(/*! ./FieldContext */ "./components/form/FieldContext.tsx");
-/* harmony import */ var _hooks_useForm__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(/*! ./hooks/useForm */ "./components/form/hooks/useForm.ts");
+/* 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");
+/* 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__);
+/* 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");
+/* 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__);
+/* 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");
+/* 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__);
+/* 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");
+/* 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__);
+/* 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");
+/* 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__);
+/* 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");
+/* 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__);
+/* 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");
+/* 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__);
+/* 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");
+/* 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__);
+/* 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");
+/* 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__);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! react */ "react");
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_16___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_16__);
+/* harmony import */ var lodash_get__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! lodash/get */ "./node_modules/lodash/get.js");
+/* harmony import */ var lodash_get__WEBPACK_IMPORTED_MODULE_17___default = /*#__PURE__*/__webpack_require__.n(lodash_get__WEBPACK_IMPORTED_MODULE_17__);
+/* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! classnames */ "./node_modules/classnames/index.js");
+/* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_18___default = /*#__PURE__*/__webpack_require__.n(classnames__WEBPACK_IMPORTED_MODULE_18__);
+/* harmony import */ var _config_provider__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(/*! ../config-provider */ "./components/config-provider/index.tsx");
+/* harmony import */ var _FieldLabel__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(/*! ./FieldLabel */ "./components/form/FieldLabel.tsx");
+/* harmony import */ var _FieldWrapper__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(/*! ./FieldWrapper */ "./components/form/FieldWrapper.tsx");
+/* harmony import */ var _hooks_useForceUpdate__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(/*! ./hooks/useForceUpdate */ "./components/form/hooks/useForceUpdate.ts");
+/* harmony import */ var _utils_devwarning__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(/*! ../_utils/devwarning */ "./components/_utils/devwarning.ts");
+/* harmony import */ var _utils_react_children__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(/*! ../_utils/react-children */ "./components/_utils/react-children.ts");
+/* harmony import */ var _FieldContext__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(/*! ./FieldContext */ "./components/form/FieldContext.tsx");
+/* harmony import */ var _hooks_useForm__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(/*! ./hooks/useForm */ "./components/form/hooks/useForm.ts");
 
 
 
@@ -16838,6 +16890,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 
 
+
 
 
 var DEFAULT_TRIGGER = 'onChange';
@@ -16884,17 +16937,17 @@ var INNER_VALUE_PROPS_LIST = [{
 var Field = function Field(props) {
   var _childrenNode, _childrenNode$type, _classnames;
 
-  Object(_utils_devwarning__WEBPACK_IMPORTED_MODULE_22__["default"])(! /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_15___default.a.isValidElement(props.children), 'Form.Item', 'Children of Form.Item is not a valid element');
-  Object(_utils_devwarning__WEBPACK_IMPORTED_MODULE_22__["default"])(!props.name, 'Form.Item', 'Form.Item must have a name');
+  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');
+  Object(_utils_devwarning__WEBPACK_IMPORTED_MODULE_23__["default"])(!props.name, 'Form.Item', 'Form.Item must have a name');
 
-  var _useContext = Object(react__WEBPACK_IMPORTED_MODULE_15__["useContext"])(_config_provider__WEBPACK_IMPORTED_MODULE_18__["ConfigContext"]),
+  var _useContext = Object(react__WEBPACK_IMPORTED_MODULE_16__["useContext"])(_config_provider__WEBPACK_IMPORTED_MODULE_19__["ConfigContext"]),
       getPrefixCls = _useContext.getPrefixCls,
       prefixCls = _useContext.prefixCls;
 
-  var fieldContext = react__WEBPACK_IMPORTED_MODULE_15___default.a.useContext(_FieldContext__WEBPACK_IMPORTED_MODULE_24__["default"]);
-  var forceUpdate = Object(_hooks_useForceUpdate__WEBPACK_IMPORTED_MODULE_21__["default"])();
+  var fieldContext = react__WEBPACK_IMPORTED_MODULE_16___default.a.useContext(_FieldContext__WEBPACK_IMPORTED_MODULE_25__["default"]);
+  var forceUpdate = Object(_hooks_useForceUpdate__WEBPACK_IMPORTED_MODULE_22__["default"])();
 
-  var _useState = Object(react__WEBPACK_IMPORTED_MODULE_15__["useState"])(undefined),
+  var _useState = Object(react__WEBPACK_IMPORTED_MODULE_16__["useState"])(undefined),
       _useState2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_3___default()(_useState, 2),
       fieldValue = _useState2[0],
       setFieldValue = _useState2[1];
@@ -16907,12 +16960,13 @@ var Field = function Field(props) {
       local = fieldContext.local,
       formDisabled = fieldContext.disabled;
 
-  var _ref = getInternalHooks(_hooks_useForm__WEBPACK_IMPORTED_MODULE_25__["INTERNAL_HOOK_KEY"]),
+  var _ref = getInternalHooks(_hooks_useForm__WEBPACK_IMPORTED_MODULE_26__["INTERNAL_HOOK_KEY"]),
       registerField = _ref.registerField,
       dispatch = _ref.dispatch,
       setDefaultValues = _ref.setDefaultValues;
 
   var name = props.name,
+      customizeHtmlFor = props.htmlFor,
       children = props.children,
       className = props.className,
       disabled = props.disabled,
@@ -16928,12 +16982,13 @@ var Field = function Field(props) {
       validateTrigger = props.validateTrigger,
       defaultValue = props.defaultValue,
       valuePropName = props.valuePropName;
+  var htmlFor = customizeHtmlFor || (name ? "form_".concat(name, "_").concat((Math.random() * 100).toFixed(0)) : undefined);
   var childrenNode = null;
   var innerValuePropName = 'value';
-  var childrenArray = Object(_utils_react_children__WEBPACK_IMPORTED_MODULE_23__["toArray"])(children);
+  var childrenArray = Object(_utils_react_children__WEBPACK_IMPORTED_MODULE_24__["toArray"])(children);
 
   if (childrenArray.length) {
-    Object(_utils_devwarning__WEBPACK_IMPORTED_MODULE_22__["default"])(childrenArray.length > 1, 'Form.Item', 'Form.Item must have only child');
+    Object(_utils_devwarning__WEBPACK_IMPORTED_MODULE_23__["default"])(childrenArray.length > 1, 'Form.Item', 'Form.Item must have only child');
     childrenNode = childrenArray[0];
   }
 
@@ -16954,8 +17009,8 @@ var Field = function Field(props) {
   var onStoreChange = function onStoreChange(stores, _namePathList, source) {
     var prev = stores.prev,
         curr = stores.curr;
-    var prevValue = lodash_get__WEBPACK_IMPORTED_MODULE_16___default()(prev, name);
-    var currValue = lodash_get__WEBPACK_IMPORTED_MODULE_16___default()(curr, name);
+    var prevValue = lodash_get__WEBPACK_IMPORTED_MODULE_17___default()(prev, name);
+    var currValue = lodash_get__WEBPACK_IMPORTED_MODULE_17___default()(curr, name);
     var isValueUpdated = prevValue !== currValue && source === 'updateValue';
     var isExternalAction = source === 'externalUpdateValue';
     var isValidatedFinish = source === 'validateFinish';
@@ -17001,7 +17056,7 @@ var Field = function Field(props) {
     });
   }
 
-  var itemRef = react__WEBPACK_IMPORTED_MODULE_15___default.a.useRef({
+  var itemRef = react__WEBPACK_IMPORTED_MODULE_16___default.a.useRef({
     onStoreChange: onStoreChange,
     meta: {
       rules: mergeRules,
@@ -17009,7 +17064,7 @@ var Field = function Field(props) {
       trigger: validateTrigger
     }
   });
-  Object(react__WEBPACK_IMPORTED_MODULE_15__["useEffect"])(function () {
+  Object(react__WEBPACK_IMPORTED_MODULE_16__["useEffect"])(function () {
     registerField(name, itemRef.current);
 
     if (defaultValue !== undefined) {
@@ -17017,7 +17072,7 @@ var Field = function Field(props) {
     }
   }, [name, registerField]);
   var formPrefixCls = getPrefixCls === null || getPrefixCls === void 0 ? void 0 : getPrefixCls(prefixCls, 'form', customizePrefixcls);
-  var formItemClassName = classnames__WEBPACK_IMPORTED_MODULE_17___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);
+  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);
   var value = getFieldValue(name);
   var validateMessage = getFieldError(name);
 
@@ -17035,7 +17090,7 @@ var Field = function Field(props) {
     return inputValue;
   };
 
-  var handleValueChange = react__WEBPACK_IMPORTED_MODULE_15___default.a.useCallback(function (evt) {
+  var handleValueChange = react__WEBPACK_IMPORTED_MODULE_16___default.a.useCallback(function (evt) {
     var inputValue = getInputValueFormProp(evt);
     dispatch({
       type: 'updateValue',
@@ -17043,7 +17098,7 @@ var Field = function Field(props) {
       value: inputValue
     });
   }, [name]);
-  var handleValueValidate = react__WEBPACK_IMPORTED_MODULE_15___default.a.useCallback(function () {
+  var handleValueValidate = react__WEBPACK_IMPORTED_MODULE_16___default.a.useCallback(function () {
     dispatch({
       type: 'validateField',
       namePath: name
@@ -17100,23 +17155,25 @@ var Field = function Field(props) {
     }, _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));
   };
 
-  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_15___default.a.createElement("div", {
+  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_16___default.a.createElement("div", {
     className: formItemClassName
-  }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_15___default.a.createElement(_FieldLabel__WEBPACK_IMPORTED_MODULE_19__["default"], {
+  }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_16___default.a.createElement(_FieldLabel__WEBPACK_IMPORTED_MODULE_20__["default"], {
+    htmlFor: htmlFor,
     value: label,
     width: labelWidth,
     textAlign: labelAlign,
     requiredMark: mergedRequired
-  }), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_15___default.a.createElement(_FieldWrapper__WEBPACK_IMPORTED_MODULE_20__["default"], {
+  }), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_16___default.a.createElement(_FieldWrapper__WEBPACK_IMPORTED_MODULE_21__["default"], {
     width: wrapperWidth,
     validateMessage: validateMessage
   }, childrenArray.map(function (child, index) {
     var keys = mergeProps(_objectSpread(_objectSpread(_babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()({
       disabled: disabled
     }, innerValuePropName, value), trigger), {}, {
-      key: index
+      key: index,
+      id: customizeHtmlFor ? undefined : htmlFor
     }), child);
-    return child ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_15___default.a.cloneElement(child, keys) : child;
+    return child ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_16___default.a.cloneElement(child, keys) : child;
   })));
 };
 
@@ -17210,7 +17267,8 @@ var FieldLabel = function FieldLabel(props) {
       width = _getCompProps.width,
       textAlign = _getCompProps.textAlign,
       customizePrefixCls = _getCompProps.prefixCls,
-      requiredMark = _getCompProps.requiredMark;
+      requiredMark = _getCompProps.requiredMark,
+      htmlFor = _getCompProps.htmlFor;
 
   if (value === undefined) return null;
   var fieldLabelPrefixCls = getPrefixCls === null || getPrefixCls === void 0 ? void 0 : getPrefixCls(prefixCls, 'form-field-label', customizePrefixCls);
@@ -17226,7 +17284,8 @@ var FieldLabel = function FieldLabel(props) {
     style: style
   }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default.a.createElement("label", {
     className: labelClassName,
-    title: value
+    title: value,
+    htmlFor: htmlFor
   }, value));
 };
 
@@ -20469,21 +20528,24 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "hasPrefixSuffix", function() { return hasPrefixSuffix; });
 /* harmony import */ var _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @babel/runtime/helpers/defineProperty */ "./node_modules/@babel/runtime/helpers/defineProperty.js");
 /* harmony import */ var _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! core-js/modules/es.array.concat.js */ "./node_modules/core-js/modules/es.array.concat.js");
-/* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! react */ "react");
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var _index__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../index */ "./components/index.tsx");
-/* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! classnames */ "./node_modules/classnames/index.js");
-/* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(classnames__WEBPACK_IMPORTED_MODULE_4__);
-/* harmony import */ var _utils_type__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../_utils/type */ "./components/_utils/type.ts");
+/* harmony import */ var _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @babel/runtime/helpers/slicedToArray */ "./node_modules/@babel/runtime/helpers/slicedToArray.js");
+/* harmony import */ var _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! core-js/modules/es.array.concat.js */ "./node_modules/core-js/modules/es.array.concat.js");
+/* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! react */ "react");
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_3__);
+/* harmony import */ var _index__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../index */ "./components/index.tsx");
+/* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! classnames */ "./node_modules/classnames/index.js");
+/* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(classnames__WEBPACK_IMPORTED_MODULE_5__);
+/* harmony import */ var _utils_type__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../_utils/type */ "./components/_utils/type.ts");
 
 
 
 
 
 
-var ClearableInputType = Object(_utils_type__WEBPACK_IMPORTED_MODULE_5__["tuple"])('input', 'text');
+
+var ClearableInputType = Object(_utils_type__WEBPACK_IMPORTED_MODULE_6__["tuple"])('input', 'text');
 function hasPrefixSuffix(props) {
   return !!(props.prefix || props.suffix || props.allowClear);
 }
@@ -20507,6 +20569,19 @@ var ClearableInput = function ClearableInput(props) {
       focused = props.focused,
       numberMark = props.numberMark;
 
+  var _useState = Object(react__WEBPACK_IMPORTED_MODULE_3__["useState"])(false),
+      _useState2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_1___default()(_useState, 2),
+      isMouseEnter = _useState2[0],
+      setIsMouseEnter = _useState2[1];
+
+  var mouseEnterHandle = function mouseEnterHandle() {
+    setIsMouseEnter(true);
+  };
+
+  var mouseLeaveHandle = function mouseLeaveHandle() {
+    setIsMouseEnter(false);
+  };
+
   var renderClearIcon = function renderClearIcon() {
     var _classNames;
 
@@ -20514,19 +20589,19 @@ var ClearableInput = function ClearableInput(props) {
       return null;
     }
 
-    var needClear = !disabled && value;
-    var clearIconclasses = classnames__WEBPACK_IMPORTED_MODULE_4___default()((_classNames = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames, "".concat(prefixCls, "-textarea-clear-icon"), inputType === ClearableInputType[1]), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames, "".concat(prefixCls, "-clear-icon"), inputType === ClearableInputType[0]), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames, "".concat(prefixCls, "-clear-icon-hidden"), !needClear), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames, "".concat(prefixCls, "-clear-icon-rightSpace"), suffix), _classNames));
-    return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_2___default.a.createElement("span", {
+    var needClear = !disabled && value && isMouseEnter;
+    var clearIconclasses = classnames__WEBPACK_IMPORTED_MODULE_5___default()((_classNames = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames, "".concat(prefixCls, "-textarea-clear-icon"), inputType === ClearableInputType[1]), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames, "".concat(prefixCls, "-clear-icon"), inputType === ClearableInputType[0]), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames, "".concat(prefixCls, "-clear-icon-hidden"), !needClear), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames, "".concat(prefixCls, "-clear-icon-rightSpace"), suffix), _classNames));
+    return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("span", {
       onClick: handleReset,
       className: clearIconclasses
-    }, typeof allowClear === 'boolean' ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_2___default.a.createElement(_index__WEBPACK_IMPORTED_MODULE_3__["Icon"], {
-      type: "close"
+    }, typeof allowClear === 'boolean' ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement(_index__WEBPACK_IMPORTED_MODULE_4__["Icon"], {
+      type: "close-solid"
     }) : allowClear);
   };
 
   var renderSuffix = function renderSuffix() {
     if (suffix || !disabled && !!allowClear) {
-      return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_2___default.a.createElement("span", {
+      return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("span", {
         className: "".concat(prefixCls, "-suffix")
       }, renderClearIcon(), suffix);
     }
@@ -20542,14 +20617,16 @@ var ClearableInput = function ClearableInput(props) {
     }
 
     var suffixNode = renderSuffix();
-    var prefixNode = prefix ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_2___default.a.createElement("span", {
+    var prefixNode = prefix ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("span", {
       className: "".concat(prefixCls, "-prefix")
     }, prefix) : null;
-    var inputWrapperClasses = classnames__WEBPACK_IMPORTED_MODULE_4___default()((_classNames2 = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames2, "".concat(prefixCls, "-wrapper"), true), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames2, "".concat(prefixCls, "-wrapper-focused"), focused && !disabled), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames2, "".concat(prefixCls, "-wrapper-disabled"), disabled), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames2, "".concat(prefixCls, "-wrapper-size-").concat(size), size), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames2, "".concat(prefixCls, "-wrapper-borderless"), borderType === 'none'), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames2, "".concat(prefixCls, "-wrapper-underline"), borderType === 'underline'), _classNames2), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()({}, className, className && !addonBefore && !addonAfter));
-    return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_2___default.a.createElement("span", {
+    var inputWrapperClasses = classnames__WEBPACK_IMPORTED_MODULE_5___default()((_classNames2 = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames2, "".concat(prefixCls, "-wrapper"), true), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames2, "".concat(prefixCls, "-wrapper-focused"), focused && !disabled), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames2, "".concat(prefixCls, "-wrapper-disabled"), disabled), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames2, "".concat(prefixCls, "-wrapper-size-").concat(size), size), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames2, "".concat(prefixCls, "-wrapper-borderless"), borderType === 'none'), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames2, "".concat(prefixCls, "-wrapper-underline"), borderType === 'underline'), _classNames2), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()({}, className, className && !addonBefore && !addonAfter));
+    return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("span", {
       className: inputWrapperClasses,
-      style: style
-    }, prefixNode, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_2___default.a.cloneElement(originElement, {
+      style: style,
+      onMouseEnter: mouseEnterHandle,
+      onMouseLeave: mouseLeaveHandle
+    }, prefixNode, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default.a.cloneElement(originElement, {
       style: null
     }), suffixNode);
   };
@@ -20561,20 +20638,20 @@ var ClearableInput = function ClearableInput(props) {
       return originElement;
     }
 
-    var addonClassName = classnames__WEBPACK_IMPORTED_MODULE_4___default()("".concat(prefixCls, "-group-addon"), (_classNames4 = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames4, "".concat(prefixCls, "-group-addon-borderless"), borderType === 'none'), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames4, "".concat(prefixCls, "-group-addon-underline"), borderType === 'underline'), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames4, "".concat(prefixCls, "-group-addon-disabled"), disabled), _classNames4));
-    var addonBeforeNode = addonBefore ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_2___default.a.createElement("span", {
+    var addonClassName = classnames__WEBPACK_IMPORTED_MODULE_5___default()("".concat(prefixCls, "-group-addon"), (_classNames4 = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames4, "".concat(prefixCls, "-group-addon-borderless"), borderType === 'none'), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames4, "".concat(prefixCls, "-group-addon-underline"), borderType === 'underline'), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames4, "".concat(prefixCls, "-group-addon-disabled"), disabled), _classNames4));
+    var addonBeforeNode = addonBefore ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("span", {
       className: addonClassName
     }, addonBefore) : null;
-    var addonAfterNode = addonAfter ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_2___default.a.createElement("span", {
+    var addonAfterNode = addonAfter ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("span", {
       className: addonClassName
     }, addonAfter) : null;
-    var inputGroupClasses = classnames__WEBPACK_IMPORTED_MODULE_4___default()(className, (_classNames5 = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames5, "".concat(prefixCls, "-group"), true), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames5, "".concat(prefixCls, "-group-size-").concat(size), size), _classNames5));
-    return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_2___default.a.createElement("span", {
+    var inputGroupClasses = classnames__WEBPACK_IMPORTED_MODULE_5___default()(className, (_classNames5 = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames5, "".concat(prefixCls, "-group"), true), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames5, "".concat(prefixCls, "-group-size-").concat(size), size), _classNames5));
+    return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("span", {
       className: "".concat(prefixCls, "-group-wrapper")
-    }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_2___default.a.createElement("span", {
+    }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("span", {
       className: inputGroupClasses,
       style: style
-    }, addonBeforeNode, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_2___default.a.cloneElement(originElement, {
+    }, addonBeforeNode, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default.a.cloneElement(originElement, {
       style: null
     }), addonAfterNode));
   };
@@ -20607,10 +20684,12 @@ var ClearableInput = function ClearableInput(props) {
       }
     }
 
-    var textAreaWrapperClasses = classnames__WEBPACK_IMPORTED_MODULE_4___default()(className, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()({}, "".concat(prefixCls, "-wrapper-textarea"), true));
-    return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_2___default.a.createElement("span", {
+    var textAreaWrapperClasses = classnames__WEBPACK_IMPORTED_MODULE_5___default()(className, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()({}, "".concat(prefixCls, "-wrapper-textarea"), true));
+    return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("span", {
       className: textAreaWrapperClasses,
-      style: wrapperStyle
+      style: wrapperStyle,
+      onMouseEnter: mouseEnterHandle,
+      onMouseLeave: mouseLeaveHandle
     }, originElement, renderClearIcon(), numberMark && numberMark);
   };
 
@@ -20634,10 +20713,10 @@ var ClearableInput = function ClearableInput(props) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @babel/runtime/helpers/defineProperty */ "./node_modules/@babel/runtime/helpers/defineProperty.js");
-/* harmony import */ var _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @babel/runtime/helpers/extends */ "./node_modules/@babel/runtime/helpers/extends.js");
-/* harmony import */ var _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @babel/runtime/helpers/extends */ "./node_modules/@babel/runtime/helpers/extends.js");
+/* harmony import */ var _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @babel/runtime/helpers/defineProperty */ "./node_modules/@babel/runtime/helpers/defineProperty.js");
+/* harmony import */ var _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1__);
 /* harmony import */ var _babel_runtime_helpers_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @babel/runtime/helpers/objectWithoutProperties */ "./node_modules/@babel/runtime/helpers/objectWithoutProperties.js");
 /* harmony import */ var _babel_runtime_helpers_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_2__);
 /* harmony import */ var _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @babel/runtime/helpers/slicedToArray */ "./node_modules/@babel/runtime/helpers/slicedToArray.js");
@@ -20663,7 +20742,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-var _excluded = ["value", "allowClear", "borderType", "defaultValue", "count", "autoSize", "className", "prefixCls", "canResize", "maxLength", "disabled", "onBlur", "onFocus", "onChange", "placeholder", "style", "size"],
+var _excluded = ["value", "allowClear", "borderType", "defaultValue", "count", "countPosition", "autoSize", "className", "prefixCls", "canResize", "maxLength", "disabled", "onBlur", "onFocus", "onChange", "placeholder", "style", "size"],
     _excluded2 = ["width", "margin", "marginLeft", "marginRight", "marginTop", "marginBottom"];
 
 
@@ -20699,6 +20778,7 @@ var InternalTextarea = function InternalTextarea(props, ref) {
       borderType = textAreaProps.borderType,
       defaultValue = textAreaProps.defaultValue,
       count = textAreaProps.count,
+      countPosition = textAreaProps.countPosition,
       autoSize = textAreaProps.autoSize,
       className = textAreaProps.className,
       customPrefixcls = textAreaProps.prefixCls,
@@ -20767,7 +20847,7 @@ var InternalTextarea = function InternalTextarea(props, ref) {
   };
 
   var handleBlur = function handleBlur(e) {
-    showNumberMark && setShowNumberMark(false);
+    // showNumberMark && setShowNumberMark(false)
     onBlur && onBlur(e);
   };
 
@@ -20796,8 +20876,9 @@ var InternalTextarea = function InternalTextarea(props, ref) {
     }
 
     if (count && showNumberMark && !disabled && maxLength !== '' && maxLength >= 0) {
+      var countClass = classnames__WEBPACK_IMPORTED_MODULE_8___default()("".concat(textAreaPrefixCls, "-textarea-mark"), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()({}, "".concat(textAreaPrefixCls, "-textarea-mark-inner"), countPosition === 'inner'));
       return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement("div", {
-        className: "".concat(textAreaPrefixCls, "-textarea-mark")
+        className: countClass
       }, enteredLength, "/", maxLength);
     }
 
@@ -20814,7 +20895,7 @@ var InternalTextarea = function InternalTextarea(props, ref) {
   }, [propsValue, setValue]);
 
   var renderTextArea = function renderTextArea(prefixCls) {
-    var _classNames;
+    var _classNames2;
 
     var hadCount = count && !disabled && !allowClear;
 
@@ -20842,11 +20923,11 @@ var InternalTextarea = function InternalTextarea(props, ref) {
       }
     }
 
-    var textarea = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement("textarea", _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_1___default()({
+    var textarea = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement("textarea", _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_0___default()({
       ref: textareaRef,
       disabled: disabled,
-      style: _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_1___default()({}, textareaStyles, hadCount || !!allowClear ? otherStyles : style),
-      className: classnames__WEBPACK_IMPORTED_MODULE_8___default()("".concat(prefixCls, "-textarea"), (_classNames = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames, "".concat(prefixCls, "-size-").concat(size), size), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames, "".concat(prefixCls, "-borderless"), borderType === 'none'), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames, "".concat(prefixCls, "-underline"), borderType === 'underline'), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames, "".concat(prefixCls, "-disabled"), disabled), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames, "".concat(prefixCls, "-no-resize"), canResize !== true), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames, "".concat(prefixCls, "-allowClear-spacing"), !!allowClear), _classNames), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()({}, className, className && !allowClear && !hadCount)),
+      style: _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_0___default()({}, textareaStyles, hadCount || !!allowClear ? otherStyles : style),
+      className: classnames__WEBPACK_IMPORTED_MODULE_8___default()("".concat(prefixCls, "-textarea"), (_classNames2 = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_classNames2, "".concat(prefixCls, "-size-").concat(size), size), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_classNames2, "".concat(prefixCls, "-borderless"), borderType === 'none'), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_classNames2, "".concat(prefixCls, "-underline"), borderType === 'underline'), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_classNames2, "".concat(prefixCls, "-disabled"), disabled), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_classNames2, "".concat(prefixCls, "-no-resize"), canResize !== true), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_classNames2, "".concat(prefixCls, "-allowClear-spacing"), !!allowClear), _classNames2), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()({}, className, className && !allowClear && !hadCount)),
       onChange: handleChange,
       onFocus: !disabled ? handleFocus : undefined,
       onBlur: !disabled ? handleBlur : undefined,
@@ -20860,7 +20941,7 @@ var InternalTextarea = function InternalTextarea(props, ref) {
     }, textarea, renderNumberMark()) : textarea;
   };
 
-  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement(_ClearableLabeledInput__WEBPACK_IMPORTED_MODULE_11__["default"], _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_1___default()({}, textAreaProps, {
+  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement(_ClearableLabeledInput__WEBPACK_IMPORTED_MODULE_11__["default"], _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_0___default()({}, textAreaProps, {
     handleReset: handleReset,
     value: value,
     inputType: "text",
@@ -28425,7 +28506,7 @@ var InternalOption = function InternalOption(props, ref) {
 
   var titleText = _babel_runtime_helpers_typeof__WEBPACK_IMPORTED_MODULE_0___default()(children) !== 'object' ? children : null;
   var checkStyle = {
-    height: '22px',
+    minHeight: '22px',
     background: 'none'
   };
   return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_12___default.a.createElement(react__WEBPACK_IMPORTED_MODULE_12___default.a.Fragment, null, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_12___default.a.createElement("div", {
@@ -28458,67 +28539,69 @@ Option.displayName = 'Option';
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* 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");
-/* 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__);
-/* 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");
-/* 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__);
-/* 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");
-/* 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__);
-/* harmony import */ var core_js_modules_es_object_get_own_property_descriptor_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! core-js/modules/es.object.get-own-property-descriptor.js */ "./node_modules/core-js/modules/es.object.get-own-property-descriptor.js");
-/* harmony import */ var core_js_modules_es_object_get_own_property_descriptor_js__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_get_own_property_descriptor_js__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! core-js/modules/web.dom-collections.for-each.js */ "./node_modules/core-js/modules/web.dom-collections.for-each.js");
-/* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_4__);
-/* harmony import */ var core_js_modules_es_object_get_own_property_descriptors_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! core-js/modules/es.object.get-own-property-descriptors.js */ "./node_modules/core-js/modules/es.object.get-own-property-descriptors.js");
-/* harmony import */ var core_js_modules_es_object_get_own_property_descriptors_js__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_get_own_property_descriptors_js__WEBPACK_IMPORTED_MODULE_5__);
-/* harmony import */ var _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! @babel/runtime/helpers/extends */ "./node_modules/@babel/runtime/helpers/extends.js");
-/* harmony import */ var _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_6__);
-/* harmony import */ var _babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! @babel/runtime/helpers/toConsumableArray */ "./node_modules/@babel/runtime/helpers/toConsumableArray.js");
-/* harmony import */ var _babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_7__);
-/* harmony import */ var _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! @babel/runtime/helpers/defineProperty */ "./node_modules/@babel/runtime/helpers/defineProperty.js");
-/* harmony import */ var _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8__);
-/* harmony import */ var _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! @babel/runtime/helpers/slicedToArray */ "./node_modules/@babel/runtime/helpers/slicedToArray.js");
-/* harmony import */ var _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_9__);
-/* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! core-js/modules/es.array.concat.js */ "./node_modules/core-js/modules/es.array.concat.js");
-/* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_10___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_10__);
-/* 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");
-/* 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__);
-/* harmony import */ var core_js_modules_es_array_find_js__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! core-js/modules/es.array.find.js */ "./node_modules/core-js/modules/es.array.find.js");
-/* harmony import */ var core_js_modules_es_array_find_js__WEBPACK_IMPORTED_MODULE_12___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_find_js__WEBPACK_IMPORTED_MODULE_12__);
-/* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! core-js/modules/es.object.to-string.js */ "./node_modules/core-js/modules/es.object.to-string.js");
-/* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_13___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_13__);
-/* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! core-js/modules/es.array.includes.js */ "./node_modules/core-js/modules/es.array.includes.js");
-/* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_14___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_14__);
-/* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! core-js/modules/es.string.includes.js */ "./node_modules/core-js/modules/es.string.includes.js");
-/* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_15___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_15__);
-/* harmony import */ var core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! core-js/modules/es.array.splice.js */ "./node_modules/core-js/modules/es.array.splice.js");
-/* harmony import */ var core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_16___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_16__);
-/* harmony import */ var core_js_modules_es_function_name_js__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! core-js/modules/es.function.name.js */ "./node_modules/core-js/modules/es.function.name.js");
-/* harmony import */ var core_js_modules_es_function_name_js__WEBPACK_IMPORTED_MODULE_17___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_function_name_js__WEBPACK_IMPORTED_MODULE_17__);
+/* harmony import */ var _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @babel/runtime/helpers/extends */ "./node_modules/@babel/runtime/helpers/extends.js");
+/* harmony import */ var _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var _babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @babel/runtime/helpers/toConsumableArray */ "./node_modules/@babel/runtime/helpers/toConsumableArray.js");
+/* harmony import */ var _babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @babel/runtime/helpers/defineProperty */ "./node_modules/@babel/runtime/helpers/defineProperty.js");
+/* harmony import */ var _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @babel/runtime/helpers/slicedToArray */ "./node_modules/@babel/runtime/helpers/slicedToArray.js");
+/* harmony import */ var _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_3__);
+/* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! core-js/modules/es.array.concat.js */ "./node_modules/core-js/modules/es.array.concat.js");
+/* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_4__);
+/* harmony import */ var core_js_modules_es_array_map_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! core-js/modules/es.array.map.js */ "./node_modules/core-js/modules/es.array.map.js");
+/* harmony import */ var core_js_modules_es_array_map_js__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_map_js__WEBPACK_IMPORTED_MODULE_5__);
+/* harmony import */ var core_js_modules_es_array_find_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! core-js/modules/es.array.find.js */ "./node_modules/core-js/modules/es.array.find.js");
+/* harmony import */ var core_js_modules_es_array_find_js__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_find_js__WEBPACK_IMPORTED_MODULE_6__);
+/* 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");
+/* 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__);
+/* harmony import */ var core_js_modules_es_function_name_js__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! core-js/modules/es.function.name.js */ "./node_modules/core-js/modules/es.function.name.js");
+/* harmony import */ var core_js_modules_es_function_name_js__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_function_name_js__WEBPACK_IMPORTED_MODULE_8__);
+/* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! core-js/modules/es.array.includes.js */ "./node_modules/core-js/modules/es.array.includes.js");
+/* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_9__);
+/* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! core-js/modules/es.string.includes.js */ "./node_modules/core-js/modules/es.string.includes.js");
+/* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_10___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_10__);
+/* harmony import */ var core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! core-js/modules/es.array.splice.js */ "./node_modules/core-js/modules/es.array.splice.js");
+/* harmony import */ var core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_11___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_11__);
+/* 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");
+/* 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__);
+/* 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");
+/* 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__);
+/* harmony import */ var core_js_modules_es_array_filter_js__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! core-js/modules/es.array.filter.js */ "./node_modules/core-js/modules/es.array.filter.js");
+/* harmony import */ var core_js_modules_es_array_filter_js__WEBPACK_IMPORTED_MODULE_14___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_filter_js__WEBPACK_IMPORTED_MODULE_14__);
+/* 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");
+/* 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__);
+/* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! core-js/modules/web.dom-collections.for-each.js */ "./node_modules/core-js/modules/web.dom-collections.for-each.js");
+/* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_16___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_16__);
+/* harmony import */ var core_js_modules_es_object_get_own_property_descriptors_js__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! core-js/modules/es.object.get-own-property-descriptors.js */ "./node_modules/core-js/modules/es.object.get-own-property-descriptors.js");
+/* harmony import */ var core_js_modules_es_object_get_own_property_descriptors_js__WEBPACK_IMPORTED_MODULE_17___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_get_own_property_descriptors_js__WEBPACK_IMPORTED_MODULE_17__);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! react */ "react");
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_18___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_18__);
 /* harmony import */ var _utils_hooks__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(/*! ../_utils/hooks */ "./components/_utils/hooks.tsx");
-/* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(/*! classnames */ "./node_modules/classnames/index.js");
-/* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_20___default = /*#__PURE__*/__webpack_require__.n(classnames__WEBPACK_IMPORTED_MODULE_20__);
-/* harmony import */ var _config_provider_ConfigContext__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(/*! ../config-provider/ConfigContext */ "./components/config-provider/ConfigContext.tsx");
-/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(/*! ../_utils */ "./components/_utils/index.ts");
-/* harmony import */ var _utils_react_children__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(/*! ../_utils/react-children */ "./components/_utils/react-children.ts");
-/* harmony import */ var _index__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(/*! ../index */ "./components/index.tsx");
-/* harmony import */ var _option__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(/*! ./option */ "./components/select/option.tsx");
-/* harmony import */ var _utils_usePopper__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(/*! ../_utils/usePopper */ "./components/_utils/usePopper.tsx");
+/* harmony import */ var lodash_isBoolean__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(/*! lodash/isBoolean */ "./node_modules/lodash/isBoolean.js");
+/* harmony import */ var lodash_isBoolean__WEBPACK_IMPORTED_MODULE_20___default = /*#__PURE__*/__webpack_require__.n(lodash_isBoolean__WEBPACK_IMPORTED_MODULE_20__);
+/* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(/*! classnames */ "./node_modules/classnames/index.js");
+/* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_21___default = /*#__PURE__*/__webpack_require__.n(classnames__WEBPACK_IMPORTED_MODULE_21__);
+/* harmony import */ var _config_provider_ConfigContext__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(/*! ../config-provider/ConfigContext */ "./components/config-provider/ConfigContext.tsx");
+/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(/*! ../_utils */ "./components/_utils/index.ts");
+/* harmony import */ var _utils_react_children__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(/*! ../_utils/react-children */ "./components/_utils/react-children.ts");
+/* harmony import */ var _index__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(/*! ../index */ "./components/index.tsx");
+/* harmony import */ var _option__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(/*! ./option */ "./components/select/option.tsx");
+/* harmony import */ var _utils_usePopper__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(/*! ../_utils/usePopper */ "./components/_utils/usePopper.tsx");
 
 
 
 
 
+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; }
 
+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_2___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; }
 
 
 
 
 
-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; }
 
-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_8___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; }
 
 
 
@@ -28537,16 +28620,18 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 
 
+
+var INPUT_MIN_WIDTH = 4; // 输入框最小宽度
 
 var InternalSelect = function InternalSelect(props, ref) {
-  var _classNames7, _searchRef$current2, _classNames13, _classNames14;
+  var _classNames6, _classNames12;
 
-  var _useContext = Object(react__WEBPACK_IMPORTED_MODULE_18__["useContext"])(_config_provider_ConfigContext__WEBPACK_IMPORTED_MODULE_21__["default"]),
+  var _useContext = Object(react__WEBPACK_IMPORTED_MODULE_18__["useContext"])(_config_provider_ConfigContext__WEBPACK_IMPORTED_MODULE_22__["default"]),
       getPrefixCls = _useContext.getPrefixCls,
       prefixCls = _useContext.prefixCls,
       userDefaultProps = _useContext.compDefaultProps;
 
-  var selectProps = Object(_utils__WEBPACK_IMPORTED_MODULE_22__["getCompProps"])('Select', userDefaultProps, props);
+  var selectProps = Object(_utils__WEBPACK_IMPORTED_MODULE_23__["getCompProps"])('Select', userDefaultProps, props);
   var size = selectProps.size,
       value = selectProps.value,
       autoFocus = selectProps.autoFocus,
@@ -28575,6 +28660,9 @@ var InternalSelect = function InternalSelect(props, ref) {
       dropdownStyle = selectProps.dropdownStyle,
       style = selectProps.style,
       clearIcon = selectProps.clearIcon,
+      filterOption = selectProps.filterOption,
+      optionFilterProp = selectProps.optionFilterProp,
+      optionLabelProp = selectProps.optionLabelProp,
       _selectProps$popperSt = selectProps.popperStyle,
       popperStyle = _selectProps$popperSt === void 0 ? {} : _selectProps$popperSt;
   var isMultiple = mode === 'multiple'; // 是否多选
@@ -28583,11 +28671,11 @@ var InternalSelect = function InternalSelect(props, ref) {
     value: value,
     defaultValue: defaultValue
   }),
-      _useMergedState2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_9___default()(_useMergedState, 2),
+      _useMergedState2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_3___default()(_useMergedState, 2),
       initValue = _useMergedState2[0],
       setInitValue = _useMergedState2[1];
 
-  var realChildren = Array.isArray(options) ? options : Object(_utils_react_children__WEBPACK_IMPORTED_MODULE_23__["toArray"])(children); // options配置项和默认children
+  var realChildren = Array.isArray(options) ? options : Object(_utils_react_children__WEBPACK_IMPORTED_MODULE_24__["toArray"])(children); // options配置项和默认children
 
   var innerRef = react__WEBPACK_IMPORTED_MODULE_18___default.a.useRef();
   var selectRef = ref || innerRef;
@@ -28600,48 +28688,49 @@ var InternalSelect = function InternalSelect(props, ref) {
     selectMulOpts: []
   }); // 多选ref已选中项
 
+  var measureRef = react__WEBPACK_IMPORTED_MODULE_18___default.a.useRef(null);
+
   var _useState = Object(react__WEBPACK_IMPORTED_MODULE_18__["useState"])([]),
-      _useState2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_9___default()(_useState, 2),
+      _useState2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_3___default()(_useState, 2),
       mulOptions = _useState2[0],
       setMulOptions = _useState2[1];
 
   var _useState3 = Object(react__WEBPACK_IMPORTED_MODULE_18__["useState"])(''),
-      _useState4 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_9___default()(_useState3, 2),
+      _useState4 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_3___default()(_useState3, 2),
       singleVal = _useState4[0],
       setSingleVal = _useState4[1];
 
   var _useState5 = Object(react__WEBPACK_IMPORTED_MODULE_18__["useState"])(!!props.visible || defaultOpen),
-      _useState6 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_9___default()(_useState5, 2),
+      _useState6 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_3___default()(_useState5, 2),
       optionShow = _useState6[0],
       setOptionShow = _useState6[1]; // 下拉列表是否展示
+  // const [searchInput, setSearchInput] = useState<string>('') // 搜索框值
 
 
   var _useState7 = Object(react__WEBPACK_IMPORTED_MODULE_18__["useState"])(''),
-      _useState8 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_9___default()(_useState7, 2),
-      searchInput = _useState8[0],
-      setSearchInput = _useState8[1]; // 搜索框值
+      _useState8 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_3___default()(_useState7, 2),
+      searchValue = _useState8[0],
+      setSearchValue = _useState8[1]; // 搜索框定时器
 
 
-  var _useState9 = Object(react__WEBPACK_IMPORTED_MODULE_18__["useState"])(null),
-      _useState10 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_9___default()(_useState9, 2),
-      timer = _useState10[0],
-      setTimer = _useState10[1]; // 搜索框定时器
+  var _useState9 = Object(react__WEBPACK_IMPORTED_MODULE_18__["useState"])(INPUT_MIN_WIDTH),
+      _useState10 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_3___default()(_useState9, 2),
+      inputWidth = _useState10[0],
+      setInputWidth = _useState10[1]; // 输入框宽度
 
 
   var selectPrefixCls = getPrefixCls(prefixCls, 'select', customPrefixcls); // 选择器样式
 
-  var selectCls = classnames__WEBPACK_IMPORTED_MODULE_20___default()(selectPrefixCls, className, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()({}, "".concat(selectPrefixCls, "-visible"), optionShow));
-  var selectionCls = classnames__WEBPACK_IMPORTED_MODULE_20___default()(_babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()({}, "".concat(selectPrefixCls, "-selector"), true)); // 下拉列表框样式
-
-  var dropDownCls = classnames__WEBPACK_IMPORTED_MODULE_20___default()(dropdownClassName, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()({}, "".concat(selectPrefixCls, "-dropdown"), true)); // 下拉搜索框样式
+  var selectCls = classnames__WEBPACK_IMPORTED_MODULE_21___default()(selectPrefixCls, className, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_2___default()({}, "".concat(selectPrefixCls, "-visible"), optionShow));
+  var selectionCls = classnames__WEBPACK_IMPORTED_MODULE_21___default()(_babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_2___default()({}, "".concat(selectPrefixCls, "-selector"), true)); // 下拉列表框样式
 
-  var searchCls = classnames__WEBPACK_IMPORTED_MODULE_20___default()(_babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()({}, "".concat(selectPrefixCls, "-dropdown-search"), true)); // 下拉子项列表样式
+  var dropDownCls = classnames__WEBPACK_IMPORTED_MODULE_21___default()(dropdownClassName, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_2___default()({}, "".concat(selectPrefixCls, "-dropdown"), true)); // 下拉子项列表样式
 
-  var dropContentCls = classnames__WEBPACK_IMPORTED_MODULE_20___default()(_babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()({}, "".concat(selectPrefixCls, "-dropdown-scroll"), (isMultiple ? (realChildren === null || realChildren === void 0 ? void 0 : realChildren.length) > 8 : (realChildren === null || realChildren === void 0 ? void 0 : realChildren.length) > 10) || selectProps.dropdownRender)); // 多选底部样式
+  var dropContentCls = classnames__WEBPACK_IMPORTED_MODULE_21___default()(_babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_2___default()({}, "".concat(selectPrefixCls, "-dropdown-scroll"), (isMultiple ? (realChildren === null || realChildren === void 0 ? void 0 : realChildren.length) > 8 : (realChildren === null || realChildren === void 0 ? void 0 : realChildren.length) > 10) || selectProps.dropdownRender)); // 多选底部样式
 
-  var multipleFooterCls = classnames__WEBPACK_IMPORTED_MODULE_20___default()(_babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()({}, "".concat(selectPrefixCls, "-multiple-footer"), true)); // 多选，单选公共样式
+  var multipleFooterCls = classnames__WEBPACK_IMPORTED_MODULE_21___default()(_babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_2___default()({}, "".concat(selectPrefixCls, "-multiple-footer"), true)); // 多选，单选公共样式
 
-  var commCls = classnames__WEBPACK_IMPORTED_MODULE_20___default()((_classNames7 = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(_classNames7, "".concat(selectPrefixCls, "-bordered"), borderType === 'bordered'), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(_classNames7, "".concat(selectPrefixCls, "-underline"), borderType === 'underline'), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(_classNames7, "".concat(selectPrefixCls, "-borderless"), borderType === 'none'), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(_classNames7, "".concat(selectPrefixCls, "-size-").concat(size), size), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(_classNames7, "".concat(selectPrefixCls, "-wrapper"), true), _classNames7));
+  var commCls = classnames__WEBPACK_IMPORTED_MODULE_21___default()((_classNames6 = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_2___default()(_classNames6, "".concat(selectPrefixCls, "-bordered"), borderType === 'bordered'), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_2___default()(_classNames6, "".concat(selectPrefixCls, "-underline"), borderType === 'underline'), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_2___default()(_classNames6, "".concat(selectPrefixCls, "-borderless"), borderType === 'none'), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_2___default()(_classNames6, "".concat(selectPrefixCls, "-size-").concat(size), size), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_2___default()(_classNames6, "".concat(selectPrefixCls, "-wrapper"), true), _classNames6));
   react__WEBPACK_IMPORTED_MODULE_18___default.a.useEffect(function () {
     setOptionShow(!!props.visible);
   }, [props.visible]); // realchildren更新时数据处理---待解决
@@ -28702,30 +28791,27 @@ var InternalSelect = function InternalSelect(props, ref) {
         })) || {};
 
         if (options && options.length) {
-          setSingleVal((obj === null || obj === void 0 ? void 0 : obj.label) || (obj === null || obj === void 0 ? void 0 : obj.value));
+          setSingleVal(getOptionLabel(obj) || (obj === null || obj === void 0 ? void 0 : obj.value));
         } else {
-          var _obj$props3;
-
-          setSingleVal((_obj$props3 = obj.props) === null || _obj$props3 === void 0 ? void 0 : _obj$props3.children);
+          // setSingleVal(obj.props?.children)
+          setSingleVal(getOptionLabel(obj));
         }
       } else {
         setSingleVal(undefined);
       }
     }
-  }, [initValue, realChildren]); // 更新搜索框的值，判断清除按钮显隐
-
+  }, [initValue, realChildren]);
   Object(react__WEBPACK_IMPORTED_MODULE_18__["useEffect"])(function () {
-    var _searchRef$current;
-
-    setSearchInput((_searchRef$current = searchRef.current) === null || _searchRef$current === void 0 ? void 0 : _searchRef$current.value);
-  }, [(_searchRef$current2 = searchRef.current) === null || _searchRef$current2 === void 0 ? void 0 : _searchRef$current2.value]);
-  Object(react__WEBPACK_IMPORTED_MODULE_18__["useEffect"])(function () {
-    handleClear();
-  }, [optionShow === false]);
+    if (optionShow === false) {
+      handleClear();
+    }
+  }, [optionShow]);
   var handleFocus = Object(react__WEBPACK_IMPORTED_MODULE_18__["useCallback"])(function (e) {
+    e.stopPropagation();
     onFocus && onFocus(e);
   }, [onFocus]);
   var handleBlur = Object(react__WEBPACK_IMPORTED_MODULE_18__["useCallback"])(function (e) {
+    e.stopPropagation();
     onBlur && onBlur(e);
   }, [onBlur]); // 点击组件
 
@@ -28735,8 +28821,7 @@ var InternalSelect = function InternalSelect(props, ref) {
     if (!optionShow) {
       var onDropdownVisibleChange = selectProps.onDropdownVisibleChange;
       onDropdownVisibleChange && onDropdownVisibleChange(!optionShow);
-    } // handleClear()
-
+    }
   };
 
   Object(react__WEBPACK_IMPORTED_MODULE_18__["useEffect"])(function () {
@@ -28749,7 +28834,60 @@ var InternalSelect = function InternalSelect(props, ref) {
         e.stopPropagation();
       }
     });
-  }, []); // 点击下拉列表中某项回调
+  }, []);
+  Object(react__WEBPACK_IMPORTED_MODULE_18__["useLayoutEffect"])(function () {
+    measureRef.current && setInputWidth(measureRef.current.scrollWidth);
+  }, [searchValue]);
+  var filledOptions = Object(react__WEBPACK_IMPORTED_MODULE_18__["useMemo"])(function () {
+    if (filterOption === false || !searchValue) {
+      return realChildren;
+    }
+
+    var childrenList = [];
+
+    var handleFilledOption = function handleFilledOption(option) {
+      if (filterOption === true) {
+        return String(option[optionFilterProp]).toLowerCase().indexOf(searchValue.toLowerCase()) !== -1;
+      } else if (typeof filterOption === 'function') {
+        return filterOption(searchValue, option);
+      }
+
+      return true;
+    };
+
+    realChildren.map(function (item) {
+      if (item === null || item === undefined) return;
+      var isValidOption = true;
+
+      if (item !== null && item !== void 0 && item.props && (item.type.displayName === 'Option' || item.type.name === 'Option')) {
+        isValidOption = handleFilledOption(item.props);
+      } else {
+        isValidOption = handleFilledOption(item);
+      }
+
+      if (isValidOption) {
+        childrenList.push(item);
+      }
+    });
+    return childrenList;
+  }, [searchValue, realChildren, filterOption, optionFilterProp]);
+  var getOptionLabel = Object(react__WEBPACK_IMPORTED_MODULE_18__["useCallback"])(function (obj) {
+    if (obj.props) {
+      var _obj$props3;
+
+      if (optionLabelProp) {
+        return obj === null || obj === void 0 ? void 0 : obj.props[optionLabelProp];
+      }
+
+      return (_obj$props3 = obj.props) === null || _obj$props3 === void 0 ? void 0 : _obj$props3.children;
+    } else {
+      if (optionLabelProp) {
+        return obj[optionLabelProp];
+      }
+    }
+
+    return obj === null || obj === void 0 ? void 0 : obj.label;
+  }, [optionLabelProp]); // 点击下拉列表中某项回调
 
   var handleOption = function handleOption(key, label, isSelected) {
     var onSelect = selectProps.onSelect,
@@ -28768,27 +28906,25 @@ var InternalSelect = function InternalSelect(props, ref) {
     var optionsObj = obj.props ? obj.props : obj || {};
 
     if (value !== undefined) {
-      // onChange && onChange(labelInValue ? { value: key, label } : key)
       if (isMultiple) {
         var _multipleRef$current = multipleRef.current,
             selectedVal = _multipleRef$current.selectedVal,
             selectMulOpts = _multipleRef$current.selectMulOpts;
 
-        var valArr = _babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_7___default()(selectedVal);
+        var valArr = _babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_1___default()(selectedVal);
 
-        var optsArr = _babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_7___default()(selectMulOpts);
+        var optsArr = _babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_1___default()(selectMulOpts);
 
         if (selectedVal.includes(key)) {
           var idx = selectedVal.indexOf(key);
           valArr.splice(idx, 1);
           optsArr.splice(idx, 1);
         } else {
-          var _obj$props4;
-
           valArr.push(key);
           optsArr.push(_objectSpread(_objectSpread({}, optionsObj), {}, {
             value: key,
-            label: obj.props ? (_obj$props4 = obj.props) === null || _obj$props4 === void 0 ? void 0 : _obj$props4.children : obj.label || key
+            // label: obj.props ? obj.props?.children : obj.label || key,
+            label: getOptionLabel(obj) || key
           }));
         }
 
@@ -28813,13 +28949,10 @@ var InternalSelect = function InternalSelect(props, ref) {
     }
 
     if (!isMultiple) {
-      var _obj$props5;
-
-      setSingleVal(obj.props ? (_obj$props5 = obj.props) === null || _obj$props5 === void 0 ? void 0 : _obj$props5.children : obj.label || key);
+      setSingleVal(getOptionLabel(obj) || key);
       multipleRef.current.selectedVal = key;
       setInitValue(key);
-      props.visible === undefined && setOptionShow(false); // handleClear()
-
+      props.visible === undefined && setOptionShow(false);
       onChange && onChange(labelInValue ? {
         value: key,
         label: label
@@ -28839,28 +28972,23 @@ var InternalSelect = function InternalSelect(props, ref) {
 
         _selectMulOpts.splice(_idx, 1);
       } else {
-        var _obj$props6;
-
         _selectedVal.push(key);
 
         _selectMulOpts.push(_objectSpread(_objectSpread({}, optionsObj), {}, {
           value: key,
-          label: obj.props ? (_obj$props6 = obj.props) === null || _obj$props6 === void 0 ? void 0 : _obj$props6.children : obj.label || key
+          label: getOptionLabel(obj) || key
         }));
-      } // setInitValue([...selectedVal])
-
+      }
 
-      setMulOptions(_babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_7___default()(_selectMulOpts));
+      setMulOptions(_babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_1___default()(_selectMulOpts));
       onChange && onChange(labelInValue ? _selectMulOpts : _selectedVal, _selectMulOpts);
 
       if (!isSelected) {
         onDeselect && onDeselect(key); // 下拉项取消选中时调用，参数为选中项的value,多选模式下生效
       }
-    } // if (isSelected) {
-    //   onSelect && onSelect(key) // 下拉项被选中时调用，参数为选中项value或key
-    // }
-
+    }
 
+    setSearchValue('');
     onSelect && onSelect(key); // 下拉项被选中时调用，参数为选中项value或key
   }; // 多选模式下选中所有 与清除所有 (可以优化)
 
@@ -28873,18 +29001,17 @@ var InternalSelect = function InternalSelect(props, ref) {
     if ((realChildren === null || realChildren === void 0 ? void 0 : realChildren.length) !== selectedVal.length) {
       realChildren.map(function (child) {
         var _ref = child.props || child,
-            value = _ref.value,
-            children = _ref.children;
+            value = _ref.value;
 
         if (!selectedVal.includes(value)) {
           selectedVal.push(value);
           selectMulOpts.push({
             value: value,
-            label: children
+            label: getOptionLabel(child)
           });
         }
       });
-      setMulOptions(_babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_7___default()(selectMulOpts));
+      setMulOptions(_babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_1___default()(selectMulOpts));
     } else {
       multipleRef.current.selectedVal = selectedVal = [];
       multipleRef.current.selectMulOpts = selectMulOpts = [];
@@ -28892,45 +29019,31 @@ var InternalSelect = function InternalSelect(props, ref) {
     }
 
     onChange && onChange(labelInValue ? selectMulOpts : selectedVal, selectMulOpts);
-  }; // 筛选内容 ---可以优化，抽成hook
-
-
-  var handleSearch = Object(react__WEBPACK_IMPORTED_MODULE_18__["useCallback"])(function (event) {
-    if (event.currentTarget.matches('i')) {
-      var _searchRef$current3;
+  }; // 输入框变化搜索内容
 
-      onSearch && onSearch((_searchRef$current3 = searchRef.current) === null || _searchRef$current3 === void 0 ? void 0 : _searchRef$current3.value);
-    }
-  }, [onSearch]); // 输入框变化搜索内容
 
   var handleSearchChange = Object(react__WEBPACK_IMPORTED_MODULE_18__["useCallback"])(function (event) {
     var val = event.currentTarget.value;
-    clearTimeout(timer);
-    setTimer(setTimeout(function () {
-      onSearch && onSearch(val);
-    }, 500));
-  }, [onSearch, timer]); // 清除搜索内容
+    setSearchValue(val);
+    onSearch === null || onSearch === void 0 ? void 0 : onSearch(val);
+  }, [onSearch]); // 清除搜索内容
 
   var handleClear = Object(react__WEBPACK_IMPORTED_MODULE_18__["useCallback"])(function () {
     if (searchRef.current) {
       searchRef.current.value = '';
-      onSearch && onSearch('');
-      setSearchInput('');
+      setSearchValue('');
     }
-  }, [onSearch, searchRef]); // 清空选择器内容
+  }, [searchRef]); // 清空选择器内容
 
   var handleReset = function handleReset(e) {
-    e.stopPropagation(); // setOptionShow(false)
-    // e.nativeEvent.stopImmediatePropagation()
+    e.stopPropagation();
 
     if (isMultiple) {
       multipleRef.current.selectedVal = [];
       multipleRef.current.selectMulOpts = [];
       setMulOptions([]);
     } else {
-      // setSingleVal('')
-      setInitValue(''); // selectionRef.current.value = ''
-      // multipleRef.current.selectedVal = ''
+      setInitValue('');
     }
 
     onClear && onClear('');
@@ -28940,44 +29053,43 @@ var InternalSelect = function InternalSelect(props, ref) {
 
   var handleRemove = function handleRemove(e) {
     if (disabled) return;
-    var tag = e.currentTarget.parentNode.getAttribute('data-tag'); // const { tag } = e.currentTarget.dataset
-
+    var tag = e.currentTarget.parentNode.getAttribute('data-tag');
     var _multipleRef$current4 = multipleRef.current,
         selectedVal = _multipleRef$current4.selectedVal,
         selectMulOpts = _multipleRef$current4.selectMulOpts;
     var idx = selectedVal.indexOf(tag);
     selectedVal.splice(idx, 1);
     selectMulOpts.splice(idx, 1);
-    setMulOptions(_babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_7___default()(selectMulOpts));
+    setMulOptions(_babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_1___default()(selectMulOpts));
     onChange && onChange(labelInValue ? selectMulOpts : selectedVal, selectMulOpts);
     e.stopPropagation();
   }; // 渲染后缀图标
 
 
   var renderSuffix = function renderSuffix() {
-    var _classNames8;
+    var _classNames7;
 
     var suffixIcon = selectProps.suffixIcon;
     var selectedVal = multipleRef.current.selectedVal; // 选择器下拉icon样式
 
-    var arrowIconCls = classnames__WEBPACK_IMPORTED_MODULE_20___default()((_classNames8 = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(_classNames8, "".concat(selectPrefixCls, "-icon-arrow"), true), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(_classNames8, "".concat(selectPrefixCls, "-icon-arrow-up"), optionShow), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(_classNames8, "".concat(selectPrefixCls, "-icon-arrow-down"), !optionShow), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(_classNames8, "".concat(selectPrefixCls, "-icon-arrow-focus"), optionShow), _classNames8));
+    var arrowIconCls = classnames__WEBPACK_IMPORTED_MODULE_21___default()((_classNames7 = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_2___default()(_classNames7, "".concat(selectPrefixCls, "-icon-arrow"), true), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_2___default()(_classNames7, "".concat(selectPrefixCls, "-icon-arrow-up"), optionShow), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_2___default()(_classNames7, "".concat(selectPrefixCls, "-icon-arrow-down"), !optionShow), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_2___default()(_classNames7, "".concat(selectPrefixCls, "-icon-arrow-focus"), optionShow), _classNames7));
     var iconShow = allowClear && !disabled && (isMultiple ? mulOptions.length > 0 : (selectedVal !== null && selectedVal !== void 0 ? selectedVal : '') !== '');
-    var clearIconCls = classnames__WEBPACK_IMPORTED_MODULE_20___default()(_babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()({}, "".concat(selectPrefixCls, "-icon-clear"), true));
+    var clearIconCls = classnames__WEBPACK_IMPORTED_MODULE_21___default()(_babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_2___default()({}, "".concat(selectPrefixCls, "-icon-clear"), true));
     return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_18___default.a.createElement(react__WEBPACK_IMPORTED_MODULE_18___default.a.Fragment, null, iconShow && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_18___default.a.createElement("span", {
       onClick: handleReset,
       className: clearIconCls
-    }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_18___default.a.createElement(_index__WEBPACK_IMPORTED_MODULE_24__["Icon"], {
-      type: "close"
+    }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_18___default.a.createElement(_index__WEBPACK_IMPORTED_MODULE_25__["Icon"], {
+      type: "close-solid"
     }) || clearIcon), showArrow && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_18___default.a.createElement("span", {
       className: arrowIconCls
-    }, suffixIcon || /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_18___default.a.createElement(_index__WEBPACK_IMPORTED_MODULE_24__["Icon"], {
+    }, suffixIcon || /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_18___default.a.createElement(_index__WEBPACK_IMPORTED_MODULE_25__["Icon"], {
       type: "arrow-down"
     })));
   };
 
   var renderOption = function renderOption(child, index) {
     if (child !== null && child !== void 0 && child.props && (child.type.displayName === 'Option' || child.type.name === 'Option')) {
-      return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_18___default.a.createElement(_option__WEBPACK_IMPORTED_MODULE_25__["default"], _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_6___default()({
+      return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_18___default.a.createElement(_option__WEBPACK_IMPORTED_MODULE_26__["default"], _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_0___default()({
         isMultiple: isMultiple
       }, child.props, {
         key: index,
@@ -28986,7 +29098,7 @@ var InternalSelect = function InternalSelect(props, ref) {
         values: multipleRef.current.selectedVal
       }));
     } else {
-      return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_18___default.a.createElement(_option__WEBPACK_IMPORTED_MODULE_25__["default"], _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_6___default()({
+      return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_18___default.a.createElement(_option__WEBPACK_IMPORTED_MODULE_26__["default"], _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_0___default()({
         isMultiple: isMultiple,
         value: child === null || child === void 0 ? void 0 : child.value,
         key: index,
@@ -29007,33 +29119,29 @@ var InternalSelect = function InternalSelect(props, ref) {
 
   var renderNotContent = function renderNotContent() {
     // 下拉列表为空
-    var emptyListCls = classnames__WEBPACK_IMPORTED_MODULE_20___default()(_babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()({}, "".concat(selectPrefixCls, "-dropdown-empty"), true));
+    var emptyListCls = classnames__WEBPACK_IMPORTED_MODULE_21___default()(_babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_2___default()({}, "".concat(selectPrefixCls, "-dropdown-empty"), true));
     var notFoundContent = selectProps.notFoundContent;
     var emptyContent = notFoundContent || '暂无数据';
-    return (realChildren === null || realChildren === void 0 ? void 0 : realChildren.length) === 0 && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_18___default.a.createElement("div", {
+    return (filledOptions === null || filledOptions === void 0 ? void 0 : filledOptions.length) === 0 && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_18___default.a.createElement("div", {
       className: emptyListCls
     }, emptyContent);
-  };
+  }; // const isShowSearch = useCallback(() => {
+  //   return !showSearch ? false : !!searchValue
+  // }, [showSearch, searchValue])
 
-  var isShowSearch = Object(react__WEBPACK_IMPORTED_MODULE_18__["useCallback"])(function () {
-    if (isMultiple) {
-      return showSearch !== null && showSearch !== void 0 ? showSearch : true;
-    }
 
-    return showSearch !== null && showSearch !== void 0 ? showSearch : false;
-  }, [showSearch, isMultiple]); // 渲染下拉列表框
+  var isShowSearch = Object(react__WEBPACK_IMPORTED_MODULE_18__["useMemo"])(function () {
+    return lodash_isBoolean__WEBPACK_IMPORTED_MODULE_20___default()(showSearch) ? showSearch : isMultiple;
+  }, [isMultiple, showSearch]); // 渲染下拉列表框
 
   var renderContent = function renderContent() {
-    var _searchRef$current4;
-
-    var searchIcon = selectProps.searchIcon,
-        dropdownRender = selectProps.dropdownRender,
+    var dropdownRender = selectProps.dropdownRender,
         listHeight = selectProps.listHeight;
     var selectedVal = multipleRef.current.selectedVal;
-    var childrenToRender = realChildren;
+    var childrenToRender = filledOptions;
 
-    if (Array.isArray(realChildren) && realChildren.length > 0) {
-      childrenToRender = realChildren.map(function (item, index) {
+    if (Array.isArray(childrenToRender) && childrenToRender.length > 0) {
+      childrenToRender = childrenToRender.map(function (item, index) {
         if (item === null || item === undefined) return;
         var temp = renderOption(item, index);
         return temp;
@@ -29044,7 +29152,7 @@ var InternalSelect = function InternalSelect(props, ref) {
       maxHeight: listHeight || '300px'
     }; // 下拉框style属性
 
-    var dropDownStyle = _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_6___default()({
+    var dropDownStyle = _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_0___default()({
       width: style === null || style === void 0 ? void 0 : style.width
     }, dropdownStyle);
 
@@ -29058,28 +29166,9 @@ var InternalSelect = function InternalSelect(props, ref) {
       className: dropDownCls,
       style: dropDownStyle,
       ref: dropDownRef
-    }, isShowSearch() && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_18___default.a.createElement("div", {
-      className: searchCls
-    }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_18___default.a.createElement(_index__WEBPACK_IMPORTED_MODULE_24__["Input"], {
-      ref: searchRef,
-      value: ((_searchRef$current4 = searchRef.current) === null || _searchRef$current4 === void 0 ? void 0 : _searchRef$current4.value) || '',
-      borderType: "bordered",
-      placeholder: "\u8BF7\u8F93\u5165\u9700\u8981\u641C\u7D22\u7684\u5185\u5BB9" // 搜索图标
-      ,
-      prefix: /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_18___default.a.createElement("span", {
-        onClick: handleSearch
-      }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_18___default.a.createElement(_index__WEBPACK_IMPORTED_MODULE_24__["Icon"], {
-        type: "search"
-      }) || searchIcon),
-      suffix: searchInput && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_18___default.a.createElement("span", {
-        onClick: handleClear
-      }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_18___default.a.createElement(_index__WEBPACK_IMPORTED_MODULE_24__["Icon"], {
-        type: "close"
-      })),
-      onChange: handleSearchChange
-    })), !dropdownRender && realChildren.length > 0 && dropRender(childrenToRender, heightStyle), renderNotContent(), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_18___default.a.createElement("div", null, dropdownRender && dropdownRender(dropRender(childrenToRender, heightStyle))), isMultiple && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_18___default.a.createElement("div", {
+    }, !dropdownRender && childrenToRender.length > 0 && dropRender(childrenToRender, heightStyle), renderNotContent(), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_18___default.a.createElement("div", null, dropdownRender && dropdownRender(dropRender(childrenToRender, heightStyle))), isMultiple && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_18___default.a.createElement("div", {
       className: multipleFooterCls
-    }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_18___default.a.createElement(_index__WEBPACK_IMPORTED_MODULE_24__["Checkbox"], {
+    }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_18___default.a.createElement(_index__WEBPACK_IMPORTED_MODULE_25__["Checkbox"], {
       style: checkboxStyle,
       checked: checked,
       indeterminate: indeterminate,
@@ -29097,29 +29186,57 @@ var InternalSelect = function InternalSelect(props, ref) {
     };
 
     if (typeof maxTagPlaceholder === 'function') {
-      return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_18___default.a.createElement(_index__WEBPACK_IMPORTED_MODULE_24__["Tag"], {
+      return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_18___default.a.createElement(_index__WEBPACK_IMPORTED_MODULE_25__["Tag"], {
         type: "edit",
         style: TagStyle,
         size: size,
         disabled: disabled
       }, maxTagPlaceholder(mulOptions));
     } else {
-      return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_18___default.a.createElement(_index__WEBPACK_IMPORTED_MODULE_24__["Tag"], {
+      return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_18___default.a.createElement(_index__WEBPACK_IMPORTED_MODULE_25__["Tag"], {
         type: "edit",
         style: TagStyle,
         size: size,
         disabled: disabled
       }, maxTagPlaceholder);
     }
-  }, [mulOptions]); // 渲染多选选择器 (待优化：多选框下拉按钮样式调整，限制tag数代码优化)
+  }, [mulOptions]);
+
+  var renderSingle = function renderSingle() {
+    var hiddenStyle = isShowSearch && !!searchValue || singleVal ? {
+      visibility: 'hidden'
+    } : undefined;
+    return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_18___default.a.createElement(react__WEBPACK_IMPORTED_MODULE_18___default.a.Fragment, null, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_18___default.a.createElement("div", {
+      className: singleCls,
+      ref: selectionRef
+    }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_18___default.a.createElement("span", {
+      className: "".concat(selectPrefixCls, "-selection-search")
+    }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_18___default.a.createElement("input", {
+      ref: searchRef,
+      value: searchValue,
+      className: "".concat(selectPrefixCls, "-selection-search-input"),
+      onChange: handleSearchChange,
+      onFocus: handleFocus,
+      onBlur: handleBlur,
+      readOnly: !isShowSearch || !!disabled
+    })), singleVal && !searchValue && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_18___default.a.createElement("span", {
+      className: "".concat(selectPrefixCls, "-selection-item")
+    }, singleVal), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_18___default.a.createElement("span", {
+      className: "".concat(selectPrefixCls, "-placeholder"),
+      style: hiddenStyle
+    }, placeholder), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_18___default.a.createElement("span", {
+      className: "".concat(selectPrefixCls, "-suffix")
+    }, renderSuffix())));
+  }; // 渲染多选选择器 (待优化：多选框下拉按钮样式调整，限制tag数代码优化)
+
 
   var renderMultiple = function renderMultiple() {
-    var _classNames11, _classNames12;
+    var _classNames10, _classNames11;
 
     var maxTagCount = selectProps.maxTagCount,
         maxTagPlaceholder = selectProps.maxTagPlaceholder;
-    var multipleCls = classnames__WEBPACK_IMPORTED_MODULE_20___default()(commCls, (_classNames11 = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(_classNames11, "".concat(selectPrefixCls, "-multiple-disabled"), disabled), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(_classNames11, "".concat(selectPrefixCls, "-").concat(mode), mode), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(_classNames11, "".concat(selectPrefixCls, "-focused"), autoFocus || optionShow), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(_classNames11, "".concat(selectPrefixCls, "-placeholder"), placeholder && !mulOptions.length), _classNames11));
-    var itemCls = classnames__WEBPACK_IMPORTED_MODULE_20___default()((_classNames12 = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(_classNames12, "".concat(selectPrefixCls, "-selection-item"), true), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(_classNames12, "".concat(selectPrefixCls, "-selection-item-").concat(size), size), _classNames12));
+    var multipleCls = classnames__WEBPACK_IMPORTED_MODULE_21___default()(commCls, (_classNames10 = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_2___default()(_classNames10, "".concat(selectPrefixCls, "-multiple-disabled"), disabled), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_2___default()(_classNames10, "".concat(selectPrefixCls, "-").concat(mode), mode), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_2___default()(_classNames10, "".concat(selectPrefixCls, "-focused"), autoFocus || optionShow), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_2___default()(_classNames10, "".concat(selectPrefixCls, "-placeholder"), placeholder && !mulOptions.length), _classNames10));
+    var itemCls = classnames__WEBPACK_IMPORTED_MODULE_21___default()((_classNames11 = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_2___default()(_classNames11, "".concat(selectPrefixCls, "-selection-item"), true), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_2___default()(_classNames11, "".concat(selectPrefixCls, "-selection-item-").concat(size), size), _classNames11));
     var TagStyle = {
       margin: '2px 8px 2px 0'
     };
@@ -29131,7 +29248,7 @@ var InternalSelect = function InternalSelect(props, ref) {
           value = item.value;
       return (!maxTagCount || index <= maxTagCount - 1) && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_18___default.a.createElement("span", {
         key: value
-      }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_18___default.a.createElement(_index__WEBPACK_IMPORTED_MODULE_24__["Tag"], {
+      }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_18___default.a.createElement(_index__WEBPACK_IMPORTED_MODULE_25__["Tag"], {
         type: "edit",
         style: TagStyle,
         size: size,
@@ -29145,14 +29262,29 @@ var InternalSelect = function InternalSelect(props, ref) {
     }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_18___default.a.createElement("span", {
       className: "".concat(selectPrefixCls, "-selection-item-content")
     }, "\u5171", mulOptions.length, "\u9879")) : null), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_18___default.a.createElement("span", {
+      className: "".concat(selectPrefixCls, "-selection-search"),
+      style: {
+        width: inputWidth
+      }
+    }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_18___default.a.createElement("input", {
+      ref: searchRef,
+      value: searchValue,
+      className: "".concat(selectPrefixCls, "-selection-search-input"),
+      onChange: handleSearchChange,
+      onFocus: handleFocus,
+      onBlur: handleBlur,
+      readOnly: !isShowSearch || !!disabled
+    }), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_18___default.a.createElement("span", {
+      ref: measureRef,
+      className: "".concat(selectPrefixCls, "-selection-search-mirror")
+    }, searchValue, "\xA0")), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_18___default.a.createElement("span", {
       className: "".concat(selectPrefixCls, "-placeholder")
-    }, !mulOptions.length && placeholder), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_18___default.a.createElement("span", {
+    }, !mulOptions.length && !searchValue && placeholder), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_18___default.a.createElement("span", {
       className: "".concat(selectPrefixCls, "-suffix")
     }, renderSuffix()));
   };
 
-  var singleCls = classnames__WEBPACK_IMPORTED_MODULE_20___default()(commCls, (_classNames13 = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(_classNames13, "".concat(selectPrefixCls, "-single"), true), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(_classNames13, "".concat(selectPrefixCls, "-single-disabled"), disabled), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(_classNames13, "".concat(selectPrefixCls, "-single-focused"), autoFocus && !disabled || optionShow), _classNames13));
-  var singleTextCls = classnames__WEBPACK_IMPORTED_MODULE_20___default()((_classNames14 = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(_classNames14, "".concat(selectPrefixCls, "-single-text"), true), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(_classNames14, "".concat(selectPrefixCls, "-single-disabled-text"), disabled), _classNames14));
+  var singleCls = classnames__WEBPACK_IMPORTED_MODULE_21___default()(commCls, (_classNames12 = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_2___default()(_classNames12, "".concat(selectPrefixCls, "-single"), true), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_2___default()(_classNames12, "".concat(selectPrefixCls, "-single-disabled"), disabled), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_2___default()(_classNames12, "".concat(selectPrefixCls, "-single-focused"), autoFocus && !disabled || optionShow), _classNames12));
 
   var renderSelect = function renderSelect() {
     return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_18___default.a.createElement("div", {
@@ -29162,18 +29294,18 @@ var InternalSelect = function InternalSelect(props, ref) {
     }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_18___default.a.createElement("span", {
       className: selectionCls,
       onClick: handleClick,
-      onFocus: handleFocus,
-      onBlur: handleBlur
-    }, !isMultiple ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_18___default.a.createElement("div", {
-      className: singleCls,
-      ref: selectionRef
-    }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_18___default.a.createElement("span", {
-      className: singleTextCls
-    }, singleVal || null), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_18___default.a.createElement("span", {
-      className: "".concat(selectPrefixCls, "-placeholder")
-    }, !singleVal && placeholder), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_18___default.a.createElement("span", {
-      className: "".concat(selectPrefixCls, "-suffix")
-    }, renderSuffix())) : renderMultiple()));
+      tabIndex: disabled ? -1 : 0,
+      onFocus: function onFocus() {
+        var _searchRef$current;
+
+        return (_searchRef$current = searchRef.current) === null || _searchRef$current === void 0 ? void 0 : _searchRef$current.focus();
+      },
+      onBlur: function onBlur() {
+        var _searchRef$current2;
+
+        return (_searchRef$current2 = searchRef.current) === null || _searchRef$current2 === void 0 ? void 0 : _searchRef$current2.blur();
+      }
+    }, !isMultiple ? renderSingle() : renderMultiple()));
   };
 
   var catchStyle = function catchStyle() {
@@ -29204,7 +29336,7 @@ var InternalSelect = function InternalSelect(props, ref) {
     onVisibleChange: handleVisibleChange
   });
 
-  return Object(_utils_usePopper__WEBPACK_IMPORTED_MODULE_26__["default"])(renderSelect(), renderContent(), popperProps);
+  return Object(_utils_usePopper__WEBPACK_IMPORTED_MODULE_27__["default"])(renderSelect(), renderContent(), popperProps);
 };
 
 var Select = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_18___default.a.forwardRef(InternalSelect);
@@ -31803,6 +31935,26 @@ function useFilter(pipeline, filter) {
 
 /***/ }),
 
+/***/ "./components/table/feature/mergeCellHover.ts":
+/*!****************************************************!*\
+  !*** ./components/table/feature/mergeCellHover.ts ***!
+  \****************************************************/
+/*! exports provided: default */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony import */ var _kdcloudjs_table__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @kdcloudjs/table */ "./node_modules/@kdcloudjs/table/es/index.js");
+
+
+function mergeCellHover(pipeline) {
+  pipeline.use(_kdcloudjs_table__WEBPACK_IMPORTED_MODULE_0__["features"].mergeCellHover());
+}
+
+/* harmony default export */ __webpack_exports__["default"] = (mergeCellHover);
+
+/***/ }),
+
 /***/ "./components/table/feature/rowDetail.ts":
 /*!***********************************************!*\
   !*** ./components/table/feature/rowDetail.ts ***!
@@ -32183,7 +32335,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _feature_columnDrag__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! ./feature/columnDrag */ "./components/table/feature/columnDrag.ts");
 /* harmony import */ var _feature_contextMenu__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(/*! ./feature/contextMenu */ "./components/table/feature/contextMenu.ts");
 /* harmony import */ var _feature_useRangeSelection__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(/*! ./feature/useRangeSelection */ "./components/table/feature/useRangeSelection.ts");
-/* harmony import */ var _utils_devwarning__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(/*! ../_utils/devwarning */ "./components/_utils/devwarning.ts");
+/* harmony import */ var _feature_mergeCellHover__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(/*! ./feature/mergeCellHover */ "./components/table/feature/mergeCellHover.ts");
+/* harmony import */ var _utils_devwarning__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(/*! ../_utils/devwarning */ "./components/_utils/devwarning.ts");
 
 
 
@@ -32207,7 +32360,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-function Table(props) {
+var Table = /*#__PURE__*/Object(react__WEBPACK_IMPORTED_MODULE_4__["forwardRef"])(function (props, ref) {
   var columns = props.columns,
       dataSource = props.dataSource,
       columnDrag = props.columnDrag,
@@ -32255,19 +32408,32 @@ function Table(props) {
     columns: columns,
     dataSource: dataSource
   });
+  var pipelineRef = Object(react__WEBPACK_IMPORTED_MODULE_4__["useRef"])(pipeline);
+  pipelineRef.current = pipeline;
 
   if (footerDataSource) {
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore
     pipeline.footerDataSource(footerDataSource);
   }
+
+  Object(react__WEBPACK_IMPORTED_MODULE_4__["useImperativeHandle"])(ref, function () {
+    var _pipelineRef$current$, _pipelineRef$current$2, _pipelineRef$current$3;
+
+    return {
+      api: {
+        getColumns: (_pipelineRef$current$ = pipelineRef.current.getColumns) === null || _pipelineRef$current$ === void 0 ? void 0 : _pipelineRef$current$.bind(pipelineRef.current),
+        getDataSource: (_pipelineRef$current$2 = pipelineRef.current.getDataSource) === null || _pipelineRef$current$2 === void 0 ? void 0 : _pipelineRef$current$2.bind(pipelineRef.current),
+        getFooterDataSource: (_pipelineRef$current$3 = pipelineRef.current.getFooterDataSource) === null || _pipelineRef$current$3 === void 0 ? void 0 : _pipelineRef$current$3.bind(pipelineRef.current)
+      }
+    };
+  });
   /* -------------------------------------------------------------------------- */
 
   /* features                                                                   */
 
   /* -------------------------------------------------------------------------- */
 
-
   Object(_feature_rowSelection__WEBPACK_IMPORTED_MODULE_10__["default"])(pipeline, rowSelection);
   Object(_feature_rowDetail__WEBPACK_IMPORTED_MODULE_11__["default"])(pipeline, rowDetail);
   Object(_feature_filter__WEBPACK_IMPORTED_MODULE_12__["default"])(pipeline, filter);
@@ -32278,6 +32444,7 @@ function Table(props) {
   Object(_feature_columnDrag__WEBPACK_IMPORTED_MODULE_18__["default"])(pipeline, columnDrag);
   Object(_feature_contextMenu__WEBPACK_IMPORTED_MODULE_19__["default"])(pipeline, contextMenu);
   Object(_feature_useRangeSelection__WEBPACK_IMPORTED_MODULE_20__["default"])(pipeline, rangeSelection);
+  Object(_feature_mergeCellHover__WEBPACK_IMPORTED_MODULE_21__["default"])(pipeline);
   /* -------------------------------------------------------------------------- */
 
   /* after useTablePipeline, merge pipeline.getProps result                     */
@@ -32287,14 +32454,14 @@ function Table(props) {
   if (typeof getRowProps === 'function') {
     pipeline.appendRowPropsGetter(getRowProps);
   } else {
-    Object(_utils_devwarning__WEBPACK_IMPORTED_MODULE_21__["default"])(true, 'table', "parameter 'getRowProps' should be a function but here it is ".concat(getRowProps));
+    Object(_utils_devwarning__WEBPACK_IMPORTED_MODULE_22__["default"])(true, 'table', "parameter 'getRowProps' should be a function but here it is ".concat(getRowProps));
   }
 
   if (typeof getTableProps === 'function') {
     var tableProps = getTableProps();
     pipeline.addTableProps(tableProps);
   } else {
-    Object(_utils_devwarning__WEBPACK_IMPORTED_MODULE_21__["default"])(true, 'table', "parameter 'getTableProps' should be a function but here it is ".concat(getTableProps));
+    Object(_utils_devwarning__WEBPACK_IMPORTED_MODULE_22__["default"])(true, 'table', "parameter 'getTableProps' should be a function but here it is ".concat(getTableProps));
   }
 
   return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement(_kdcloudjs_table__WEBPACK_IMPORTED_MODULE_5__["Table"], _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_0___default()({}, pipeline.getProps(), {
@@ -32322,8 +32489,8 @@ function Table(props) {
     scrollbarWidth: scrollbarWidth,
     scrollLoad: scrollLoad
   }));
-}
-
+});
+Table.displayName = 'Table';
 /* harmony default export */ __webpack_exports__["default"] = (Table);
 
 /***/ }),
@@ -41706,9 +41873,15 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _babel_runtime_corejs3_helpers_classCallCheck__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_corejs3_helpers_classCallCheck__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var _babel_runtime_corejs3_helpers_createClass__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @babel/runtime-corejs3/helpers/createClass */ "./node_modules/@babel/runtime-corejs3/helpers/createClass.js");
 /* harmony import */ var _babel_runtime_corejs3_helpers_createClass__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_corejs3_helpers_createClass__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var _babel_runtime_corejs3_core_js_stable_instance_concat__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @babel/runtime-corejs3/core-js-stable/instance/concat */ "./node_modules/@babel/runtime-corejs3/core-js-stable/instance/concat.js");
-/* harmony import */ var _babel_runtime_corejs3_core_js_stable_instance_concat__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_corejs3_core_js_stable_instance_concat__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var _styles__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../styles */ "./node_modules/@kdcloudjs/table/es/table/base/styles.js");
+/* harmony import */ var _babel_runtime_corejs3_core_js_stable_instance_slice__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @babel/runtime-corejs3/core-js-stable/instance/slice */ "./node_modules/@babel/runtime-corejs3/core-js-stable/instance/slice.js");
+/* harmony import */ var _babel_runtime_corejs3_core_js_stable_instance_slice__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_corejs3_core_js_stable_instance_slice__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var _babel_runtime_corejs3_core_js_stable_array_from__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @babel/runtime-corejs3/core-js-stable/array/from */ "./node_modules/@babel/runtime-corejs3/core-js-stable/array/from.js");
+/* harmony import */ var _babel_runtime_corejs3_core_js_stable_array_from__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_corejs3_core_js_stable_array_from__WEBPACK_IMPORTED_MODULE_3__);
+/* harmony import */ var _babel_runtime_corejs3_core_js_stable_instance_concat__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! @babel/runtime-corejs3/core-js-stable/instance/concat */ "./node_modules/@babel/runtime-corejs3/core-js-stable/instance/concat.js");
+/* harmony import */ var _babel_runtime_corejs3_core_js_stable_instance_concat__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_corejs3_core_js_stable_instance_concat__WEBPACK_IMPORTED_MODULE_4__);
+/* harmony import */ var _styles__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../styles */ "./node_modules/@kdcloudjs/table/es/table/base/styles.js");
+
+
 
 
 
@@ -41752,77 +41925,111 @@ __webpack_require__.r(__webpack_exports__);
 
 var TableDOMHelper = /*#__PURE__*/function () {
   function TableDOMHelper(artTableWrapper) {
-    var _context;
+    var _this = this,
+        _context2;
 
     _babel_runtime_corejs3_helpers_classCallCheck__WEBPACK_IMPORTED_MODULE_0___default()(this, TableDOMHelper);
 
+    this.getRowNodeListByEvent = function (e) {
+      var nodeList = null;
+      var rowIndex = e.currentTarget.dataset.rowindex;
+
+      if (rowIndex !== undefined) {
+        var targetParent = _this.tableBody.contains(e.currentTarget) ? _this.tableBody : _this.tableFooter;
+        nodeList = targetParent.querySelectorAll("tr[data-rowindex=\"".concat(rowIndex, "\"]"));
+      }
+
+      return nodeList;
+    };
+
+    this.getInRangeRowByCellEvent = function (e) {
+      var _context;
+
+      var _a;
+
+      var getParentNode = function getParentNode(ele, target) {
+        if (ele.parentNode.nodeName === target) {
+          return ele.parentNode;
+        }
+
+        return getParentNode(ele.parentNode, target);
+      };
+
+      e = e instanceof Array ? e[0] : e;
+      var curCell = e === null || e === void 0 ? void 0 : e.currentTarget;
+      var curRow = getParentNode(curCell, 'TR');
+      var curRowSpan = parseInt(e.currentTarget.getAttribute('rowspan')) || 1;
+      var rows = (_a = getParentNode(curCell, 'TABLE')) === null || _a === void 0 ? void 0 : _a.rows;
+      return _babel_runtime_corejs3_core_js_stable_instance_slice__WEBPACK_IMPORTED_MODULE_2___default()(_context = _babel_runtime_corejs3_core_js_stable_array_from__WEBPACK_IMPORTED_MODULE_3___default()(rows)).call(_context, curRow.rowIndex, curRow.rowIndex + curRowSpan);
+    };
+
     this.artTableWrapper = artTableWrapper;
-    this.artTable = artTableWrapper.querySelector(".".concat(_styles__WEBPACK_IMPORTED_MODULE_3__["Classes"].artTable));
-    this.tableHeader = this.artTable.querySelector(".".concat(_styles__WEBPACK_IMPORTED_MODULE_3__["Classes"].tableHeader));
-    this.tableHeaderMain = this.artTable.querySelector(".".concat(_styles__WEBPACK_IMPORTED_MODULE_3__["Classes"].tableHeaderMain));
-    this.tableBody = this.artTable.querySelector(".".concat(_styles__WEBPACK_IMPORTED_MODULE_3__["Classes"].tableBody));
-    this.virtual = this.artTable.querySelector(".".concat(_styles__WEBPACK_IMPORTED_MODULE_3__["Classes"].virtual));
-    this.tableElement = this.artTable.querySelector(".".concat(_styles__WEBPACK_IMPORTED_MODULE_3__["Classes"].tableBody, " table"));
-    this.tableFooter = this.artTable.querySelector(".".concat(_styles__WEBPACK_IMPORTED_MODULE_3__["Classes"].tableFooter));
-    this.tableFooterMain = this.artTable.querySelector(".".concat(_styles__WEBPACK_IMPORTED_MODULE_3__["Classes"].tableFooterMain));
+    this.artTable = artTableWrapper.querySelector(".".concat(_styles__WEBPACK_IMPORTED_MODULE_5__["Classes"].artTable));
+    this.tableHeader = this.artTable.querySelector(".".concat(_styles__WEBPACK_IMPORTED_MODULE_5__["Classes"].tableHeader));
+    this.tableHeaderMain = this.artTable.querySelector(".".concat(_styles__WEBPACK_IMPORTED_MODULE_5__["Classes"].tableHeaderMain));
+    this.tableBody = this.artTable.querySelector(".".concat(_styles__WEBPACK_IMPORTED_MODULE_5__["Classes"].tableBody));
+    this.virtual = this.artTable.querySelector(".".concat(_styles__WEBPACK_IMPORTED_MODULE_5__["Classes"].virtual));
+    this.tableElement = this.artTable.querySelector(".".concat(_styles__WEBPACK_IMPORTED_MODULE_5__["Classes"].tableBody, " table"));
+    this.tableFooter = this.artTable.querySelector(".".concat(_styles__WEBPACK_IMPORTED_MODULE_5__["Classes"].tableFooter));
+    this.tableFooterMain = this.artTable.querySelector(".".concat(_styles__WEBPACK_IMPORTED_MODULE_5__["Classes"].tableFooterMain));
 
-    var stickyScrollSelector = _babel_runtime_corejs3_core_js_stable_instance_concat__WEBPACK_IMPORTED_MODULE_2___default()(_context = ".".concat(_styles__WEBPACK_IMPORTED_MODULE_3__["Classes"].artTable, " + .")).call(_context, _styles__WEBPACK_IMPORTED_MODULE_3__["Classes"].stickyScroll);
+    var stickyScrollSelector = _babel_runtime_corejs3_core_js_stable_instance_concat__WEBPACK_IMPORTED_MODULE_4___default()(_context2 = ".".concat(_styles__WEBPACK_IMPORTED_MODULE_5__["Classes"].artTable, " + .")).call(_context2, _styles__WEBPACK_IMPORTED_MODULE_5__["Classes"].stickyScroll);
 
     this.stickyScroll = artTableWrapper.querySelector(stickyScrollSelector);
-    this.stickyScrollItem = this.stickyScroll.querySelector(".".concat(_styles__WEBPACK_IMPORTED_MODULE_3__["Classes"].stickyScrollItem));
+    this.stickyScrollItem = this.stickyScroll.querySelector(".".concat(_styles__WEBPACK_IMPORTED_MODULE_5__["Classes"].stickyScrollItem));
   }
 
   _babel_runtime_corejs3_helpers_createClass__WEBPACK_IMPORTED_MODULE_1___default()(TableDOMHelper, [{
     key: "getVirtualTop",
     value: function getVirtualTop() {
-      return this.tableBody.querySelector(".".concat(_styles__WEBPACK_IMPORTED_MODULE_3__["Classes"].virtualBlank, ".top"));
+      return this.tableBody.querySelector(".".concat(_styles__WEBPACK_IMPORTED_MODULE_5__["Classes"].virtualBlank, ".top"));
     }
   }, {
     key: "getTableRows",
     value: function getTableRows() {
-      var _context2;
+      var _context3;
 
-      var tbody = this.artTable.querySelector(_babel_runtime_corejs3_core_js_stable_instance_concat__WEBPACK_IMPORTED_MODULE_2___default()(_context2 = ".".concat(_styles__WEBPACK_IMPORTED_MODULE_3__["Classes"].tableBody, " .")).call(_context2, _styles__WEBPACK_IMPORTED_MODULE_3__["Classes"].virtual, " table tbody"));
+      var tbody = this.artTable.querySelector(_babel_runtime_corejs3_core_js_stable_instance_concat__WEBPACK_IMPORTED_MODULE_4___default()(_context3 = ".".concat(_styles__WEBPACK_IMPORTED_MODULE_5__["Classes"].tableBody, " .")).call(_context3, _styles__WEBPACK_IMPORTED_MODULE_5__["Classes"].virtual, " table tbody"));
       return tbody.childNodes;
     }
   }, {
     key: "getTableBodyHtmlTable",
     value: function getTableBodyHtmlTable() {
-      var _context3;
+      var _context4;
 
-      return this.artTable.querySelector(_babel_runtime_corejs3_core_js_stable_instance_concat__WEBPACK_IMPORTED_MODULE_2___default()(_context3 = ".".concat(_styles__WEBPACK_IMPORTED_MODULE_3__["Classes"].tableBody, " .")).call(_context3, _styles__WEBPACK_IMPORTED_MODULE_3__["Classes"].virtual, " table"));
+      return this.artTable.querySelector(_babel_runtime_corejs3_core_js_stable_instance_concat__WEBPACK_IMPORTED_MODULE_4___default()(_context4 = ".".concat(_styles__WEBPACK_IMPORTED_MODULE_5__["Classes"].tableBody, " .")).call(_context4, _styles__WEBPACK_IMPORTED_MODULE_5__["Classes"].virtual, " table"));
     }
   }, {
     key: "getLeftLockShadow",
     value: function getLeftLockShadow() {
-      var _context4;
+      var _context5;
 
-      var selector = _babel_runtime_corejs3_core_js_stable_instance_concat__WEBPACK_IMPORTED_MODULE_2___default()(_context4 = ".".concat(_styles__WEBPACK_IMPORTED_MODULE_3__["Classes"].lockShadowMask, " .")).call(_context4, _styles__WEBPACK_IMPORTED_MODULE_3__["Classes"].leftLockShadow);
+      var selector = _babel_runtime_corejs3_core_js_stable_instance_concat__WEBPACK_IMPORTED_MODULE_4___default()(_context5 = ".".concat(_styles__WEBPACK_IMPORTED_MODULE_5__["Classes"].lockShadowMask, " .")).call(_context5, _styles__WEBPACK_IMPORTED_MODULE_5__["Classes"].leftLockShadow);
 
       return this.artTable.querySelector(selector);
     }
   }, {
     key: "getRightLockShadow",
     value: function getRightLockShadow() {
-      var _context5;
+      var _context6;
 
-      var selector = _babel_runtime_corejs3_core_js_stable_instance_concat__WEBPACK_IMPORTED_MODULE_2___default()(_context5 = ".".concat(_styles__WEBPACK_IMPORTED_MODULE_3__["Classes"].lockShadowMask, " .")).call(_context5, _styles__WEBPACK_IMPORTED_MODULE_3__["Classes"].rightLockShadow);
+      var selector = _babel_runtime_corejs3_core_js_stable_instance_concat__WEBPACK_IMPORTED_MODULE_4___default()(_context6 = ".".concat(_styles__WEBPACK_IMPORTED_MODULE_5__["Classes"].lockShadowMask, " .")).call(_context6, _styles__WEBPACK_IMPORTED_MODULE_5__["Classes"].rightLockShadow);
 
       return this.artTable.querySelector(selector);
     }
   }, {
     key: "getLoadingIndicator",
     value: function getLoadingIndicator() {
-      return this.artTableWrapper.querySelector(".".concat(_styles__WEBPACK_IMPORTED_MODULE_3__["Classes"].loadingIndicator));
+      return this.artTableWrapper.querySelector(".".concat(_styles__WEBPACK_IMPORTED_MODULE_5__["Classes"].loadingIndicator));
     }
   }, {
     key: "getRowTop",
     value: function getRowTop(rowIndex) {
-      var _context6, _context7;
+      var _context7, _context8;
 
       if (rowIndex === 0) return 0;
 
-      var selector = _babel_runtime_corejs3_core_js_stable_instance_concat__WEBPACK_IMPORTED_MODULE_2___default()(_context6 = _babel_runtime_corejs3_core_js_stable_instance_concat__WEBPACK_IMPORTED_MODULE_2___default()(_context7 = ".".concat(_styles__WEBPACK_IMPORTED_MODULE_3__["Classes"].tableBody, " .")).call(_context7, _styles__WEBPACK_IMPORTED_MODULE_3__["Classes"].tableRow, "[data-rowindex=\"")).call(_context6, rowIndex, "\"]");
+      var selector = _babel_runtime_corejs3_core_js_stable_instance_concat__WEBPACK_IMPORTED_MODULE_4___default()(_context7 = _babel_runtime_corejs3_core_js_stable_instance_concat__WEBPACK_IMPORTED_MODULE_4___default()(_context8 = ".".concat(_styles__WEBPACK_IMPORTED_MODULE_5__["Classes"].tableBody, " .")).call(_context8, _styles__WEBPACK_IMPORTED_MODULE_5__["Classes"].tableRow, "[data-rowindex=\"")).call(_context7, rowIndex, "\"]");
 
       var row = this.artTable.querySelector(selector);
       var rowOffsetTop = row && row.offsetTop || 0;
@@ -43051,7 +43258,7 @@ var defaultCSSVariables = {
   '--header-cell-border-horizontal': '1px solid #dfe3e8'
 };
 var variableConst = getCssVariableText(defaultCSSVariables);
-var StyledArtTableWrapper = styled_components__WEBPACK_IMPORTED_MODULE_3__["default"].div(_templateObject2 || (_templateObject2 = _babel_runtime_corejs3_helpers_taggedTemplateLiteral__WEBPACK_IMPORTED_MODULE_0___default()(["\n  :root {\n    ", "\n  }\n  ", "\n\n  box-sizing: border-box;\n  * {\n    box-sizing: border-box;\n  }\n  cursor: default;\n  color: var(--color);\n  font-size: var(--font-size);\n  line-height: var(--line-height);\n  position: relative;\n\n  // \u8868\u683C\u5916\u8FB9\u6846\u7531 art-table-wrapper \u63D0\u4F9B\uFF0C\u800C\u4E0D\u662F\u7531\u5355\u5143\u683C\u63D0\u4F9B\n  &.use-outer-border {\n    ", ";\n  }\n\n  .no-scrollbar {\n    ::-webkit-scrollbar {\n      display: none;\n    }\n  }\n\n  .", " {\n    overflow: auto;\n    flex-shrink: 1;\n    flex-grow: 1;\n    display: flex;\n    flex-direction: column;\n    user-select:none;\n  }\n\n  .", " {\n    overflow: hidden;\n    background: var(--header-bgcolor);\n    display: flex;\n    flex-shrink: 0;\n    border-bottom: var(--header-cell-border-horizontal);\n  }\n\n  .", " {\n    display: flex;\n    // justify-content: flex-start;\n    align-items: center;\n    height: inherit;\n  }\n\n  .", " {\n     overflow-x:auto;\n     flex-shrink: 0;\n     flex-grow: 0;\n     scrollbar-width: none; // \u517C\u5BB9\u706B\u72D0\n     & {\n       ::-webkit-scrollbar {\n         display:none;\n       }\n     }\n   }\n\n  .", " {\n    display: flex;\n    flex: none;\n  }\n  .", ", .", " {\n    background: var(--bgcolor);\n    overflow: auto;\n    overflow-x: hidden;\n    overflow-anchor: none;\n    position:relative;\n    &.empty {\n      position: relative;\n    }\n  }\n\n  .", " {\n    position: relative;\n  }\n  .", " {\n    .", "{\n      background-color: #e6effb !important;\n    }\n    .", "{\n      border-top: 1px solid #0E5FD8 !important;\n    }\n    .", "{\n      border-left: 1px solid #0E5FD8 !important;\n    }\n    .", "{\n      border-bottom: 1px solid #0E5FD8 !important;\n    }\n    .", "{\n      border-right: 1px solid #0E5FD8 !important;\n    }\n  }\n  \n\n  &.sticky-header .", " {\n    position: sticky;\n    top: 0;\n    z-index: ", ";\n  }\n\n  &.sticky-footer .", " {\n    position: sticky;\n    bottom: 0;\n    z-index: ", ";\n  }\n\n  table {\n    width: 0;\n    table-layout: fixed;\n    border-collapse: separate;\n    border-spacing: 0;\n    display: table;\n    margin: 0;\n    padding: 0;\n    flex-shrink: 0;\n    flex-grow: 0;\n    position:relative;\n  }\n\n  // \u5728 tr \u4E0A\u8BBE\u7F6E .no-hover \u53EF\u4EE5\u7981\u7528\u9F20\u6807\u60AC\u505C\u6548\u679C\n  tr:not(.no-hover):hover > td {\n    background: var(--hover-bgcolor);\n  }\n  // \u5728 tr \u8BBE\u7F6E highlight \u53EF\u4EE5\u4E3A\u5E95\u4E0B\u7684 td \u8BBE\u7F6E\u4E3A\u9AD8\u4EAE\u8272\n  // \u800C\u8BBE\u7F6E .no-highlight \u7684\u8BDD\u5219\u53EF\u4EE5\u7981\u7528\u9AD8\u4EAE\u6548\u679C\uFF1B\n  tr:not(.no-highlight).highlight > td {\n    background: var(--highlight-bgcolor);\n  }\n\n  th {\n    font-weight: normal;\n    text-align: left;\n    padding: var(--cell-padding);\n    height: var(--header-row-height);\n    color: var(--header-color);\n    background: var(--header-bgcolor);\n    border:1px solid transparent;\n    border-right: var(--header-cell-border-vertical);\n    border-bottom: var(--header-cell-border-horizontal);\n    position: relative;\n  }\n\n  th.resizeable{\n    border-right:none\n  }\n\n  th.", " {\n    border-right: none;\n    border-bottom: none;\n  }\n\n  tr.", " th {\n    border-top: var(--header-cell-border-horizontal);\n  }\n  th.", " {\n    border-left: var(--header-cell-border-vertical);\n  }\n\n  td {\n    padding: var(--cell-padding);\n    background: var(--bgcolor);\n    height: var(--row-height);\n    border:1px solid transparent;\n    border-right: var(--cell-border-vertical);\n    border-bottom: var(--cell-border-horizontal);\n    word-break: break-all;\n  }\n  td.", " {\n    border-left: var(--cell-border-vertical);\n  }\n  tr.", " td {\n    border-top: var(--cell-border-horizontal);\n  }\n  &.has-header tbody tr.", " td {\n    border-top: none;\n  }\n  &.has-footer tbody tr.", " td {\n    border-bottom: none;\n  }\n\n  .", ",\n  .", " {\n    z-index: ", ";\n  }\n\n  //#region \u9501\u5217\u9634\u5F71\n  .", " {\n    position: absolute;\n    top: 0;\n    bottom: 0;\n    z-index: ", ";\n    pointer-events: none;\n    overflow: hidden;\n\n    .", " {\n      height: 100%;\n    }\n\n    .", " {\n      margin-right: ", "px;\n      box-shadow: none;\n\n      &.show-shadow {\n        box-shadow: var(--lock-shadow);\n        border-right: var(--cell-border-vertical);\n      }\n    }\n\n    .", " {\n      margin-left: ", "px;\n      box-shadow: none;\n\n      &.show-shadow {\n        box-shadow: var(--lock-shadow);\n        border-left: var(--cell-border-vertical);\n      }\n    }\n  }\n  //#endregion\n\n  //#region \u7A7A\u8868\u683C\u5C55\u73B0\n  .", " {\n    pointer-events: none;\n    color: #99a3b3;\n    font-size: 12px;\n    text-align: center;\n    position: absolute;\n    left: 50%;\n    top: 50%;\n    transform: translate(-50%, -50%);\n\n    .empty-image {\n      width: 50px;\n      height: 50px;\n    }\n\n    .empty-tips {\n      margin-top: 16px;\n      line-height: 1.5;\n    }\n  }\n  //#endregion\n\n  //#region IE\u517C\u5BB9\n  &.ie-polyfill-wrapper {\n    //\u9501\u5B9A\u5217\u517C\u5BB9 \u4EC5\u5728\u9501\u5B9A\u5217\u7684\u60C5\u51B5\u4E0B\u751F\u6548\n    .", " {\n      overflow-x: hidden;\n    }\n    .", ", .", " {\n      position:relative;\n    }\n    .", " {\n      overflow: hidden;\n    }\n    .", " {\n      position: relative;\n    }\n\n    .", " {\n      overflow: auto;\n      overflow-x: hidden;\n      overflow-anchor: none;\n    }\n\n    .", ", .", "{\n      position: absolute;\n      z-index: ", ";\n      top: 0;\n    }\n    .", "{\n      left:0;\n    }\n    .", "{\n      right:0;\n    }\n\n    .", "{\n      .", "{\n        position: absolute;\n        top: 0;\n        width: 100%;\n        z-index: ", ";\n      }\n    }\n\n    tr:not(.no-hover).row-hover > td {\n      background: var(--hover-bgcolor);\n    }\n  }\n  //#endregion\n\n  //#region \u7C98\u6027\u6EDA\u52A8\u6761\n  .", " {\n    overflow-y: hidden;\n    overflow-x: auto;\n    z-index: ", ";\n    flex-shrink: 0;\n    flex-grow: 0;\n    border-top: 1px solid var(--border-color);\n    background: var(--bgcolor);\n  }\n\n  .", " {\n    // \u5FC5\u987B\u6709\u9AD8\u5EA6\u624D\u80FD\u51FA\u73B0\u6EDA\u52A8\u6761\n    height: 1px;\n    visibility: hidden;\n  }\n  //#endregion\n\n  //#region \u52A0\u8F7D\u6837\u5F0F\n  .", " {\n    position: relative;\n    width: 100%;\n    height: 100%;\n    overflow: auto;\n\n    .", " {\n      filter: none;\n      width: 100%;\n      height: 100%;\n      overflow: auto;\n      display: flex;\n      position: relative;\n      flex-direction: column;\n    }\n\n    .", " {\n      position: absolute;\n      left: 0;\n      right: 0;\n      top: 0;\n      bottom: 0;\n      pointer-events: none;\n    }\n\n    .", " {\n      position: sticky;\n      z-index: ", ";\n      transform: translateY(-50%);\n    }\n  }\n  //#endregion\n  \n  //#region \u8868\u683C\u8FC7\u6EE4\n  .", " {\n    color:var(--icon-color);\n    &.active{\n      color:var(--primary-color);\n    }\n  }\n  //#endregion\n\n  //#region \u8868\u683C\u6392\u5E8F\n  .", " {\n    color:var(--icon-color);\n    &.active{\n      color:var(--primary-color);\n    }\n  }\n  //#endregion\n\n  //#region \u6EDA\u52A8\u6761\u5360\u4F4D\n  .", " {\n    visibility: hidden;\n    flex-shrink: 0;\n  }\n  .", " .", " {\n    border-top: var(--cell-border-horizontal);\n  }\n  //#endregion\n  "])), variableConst, variableConst, outerBorderStyleMixin, Classes.artTable, Classes.tableHeader, Classes.tableHeaderCellContent, Classes.virtual, Classes.tableFooter, Classes.tableBody, Classes.tableFooter, Classes.tableRow, Classes.tableBody, Classes.tableCellRangeSelected, Classes.tableCellRangeTop, Classes.tableCellRangeLeft, Classes.tableCellRangeBottom, Classes.tableCellRangeRight, Classes.tableHeader, Z.header, Classes.tableFooter, Z.footer, Classes.leaf, Classes.first, Classes.first, Classes.first, Classes.first, Classes.first, Classes.last, Classes.lockLeft, Classes.lockRight, Z.lock, Classes.lockShadowMask, Z.lockShadow, Classes.lockShadow, Classes.leftLockShadow, LOCK_SHADOW_PADDING, Classes.rightLockShadow, LOCK_SHADOW_PADDING, Classes.emptyWrapper, Classes.virtual, Classes.tableBody, Classes.tableFooter, Classes.tableHeaderMain, Classes.tableHeader, Classes.tableFooterMain, Classes.fixedLeft, Classes.fixedRight, Z.lock, Classes.fixedLeft, Classes.fixedRight, Classes.rowDetailContainer, Classes.rowDetailItem, Z.rowDetail, Classes.stickyScroll, Z.scrollItem, Classes.stickyScrollItem, Classes.loadingWrapper, Classes.loadingContentWrapper, Classes.loadingIndicatorWrapper, Classes.loadingIndicator, Z.loadingIndicator, Classes.tableFilterTrigger, Classes.tableSortIcon, Classes.verticalScrollPlaceholder, Classes.tableFooter, Classes.verticalScrollPlaceholder);
+var StyledArtTableWrapper = styled_components__WEBPACK_IMPORTED_MODULE_3__["default"].div(_templateObject2 || (_templateObject2 = _babel_runtime_corejs3_helpers_taggedTemplateLiteral__WEBPACK_IMPORTED_MODULE_0___default()(["\n  :root {\n    ", "\n  }\n  ", "\n\n  box-sizing: border-box;\n  * {\n    box-sizing: border-box;\n  }\n  cursor: default;\n  color: var(--color);\n  font-size: var(--font-size);\n  line-height: var(--line-height);\n  position: relative;\n\n  // \u8868\u683C\u5916\u8FB9\u6846\u7531 art-table-wrapper \u63D0\u4F9B\uFF0C\u800C\u4E0D\u662F\u7531\u5355\u5143\u683C\u63D0\u4F9B\n  &.use-outer-border {\n    ", ";\n  }\n\n  .no-scrollbar {\n    ::-webkit-scrollbar {\n      display: none;\n    }\n  }\n\n  .", " {\n    overflow: auto;\n    flex-shrink: 1;\n    flex-grow: 1;\n    display: flex;\n    flex-direction: column;\n    user-select:none;\n  }\n\n  .", " {\n    overflow: hidden;\n    background: var(--header-bgcolor);\n    display: flex;\n    flex-shrink: 0;\n    border-bottom: var(--header-cell-border-horizontal);\n  }\n\n  .", " {\n    display: flex;\n    // justify-content: flex-start;\n    align-items: center;\n    height: inherit;\n  }\n\n  .", " {\n     overflow-x:auto;\n     flex-shrink: 0;\n     flex-grow: 0;\n     scrollbar-width: none; // \u517C\u5BB9\u706B\u72D0\n     & {\n       ::-webkit-scrollbar {\n         display:none;\n       }\n     }\n   }\n\n  .", " {\n    display: flex;\n    flex: none;\n  }\n  .", ", .", " {\n    background: var(--bgcolor);\n    overflow: auto;\n    overflow-x: hidden;\n    overflow-anchor: none;\n    position:relative;\n    &.empty {\n      position: relative;\n    }\n  }\n\n  .", " {\n    position: relative;\n  }\n  .", " {\n    .", "{\n      background-color: #e6effb !important;\n    }\n    .", "{\n      border-top: 1px solid #0E5FD8 !important;\n    }\n    .", "{\n      border-left: 1px solid #0E5FD8 !important;\n    }\n    .", "{\n      border-bottom: 1px solid #0E5FD8 !important;\n    }\n    .", "{\n      border-right: 1px solid #0E5FD8 !important;\n    }\n  }\n\n\n  &.sticky-header .", " {\n    position: sticky;\n    top: 0;\n    z-index: ", ";\n  }\n\n  &.sticky-footer .", " {\n    position: sticky;\n    bottom: 0;\n    z-index: ", ";\n  }\n\n  table {\n    width: 0;\n    table-layout: fixed;\n    border-collapse: separate;\n    border-spacing: 0;\n    display: table;\n    margin: 0;\n    padding: 0;\n    flex-shrink: 0;\n    flex-grow: 0;\n    position:relative;\n  }\n\n  // \u5728 tr \u4E0A\u8BBE\u7F6E .no-hover \u53EF\u4EE5\u7981\u7528\u9F20\u6807\u60AC\u505C\u6548\u679C\n  tr:not(.no-hover):hover > td {\n    background: var(--hover-bgcolor);\n  }\n  // \u4F7F\u7528 js \u6DFB\u52A0\u60AC\u6D6E\u6548\u679C\n  tr:not(.no-hover).row-hover > td {\n    background: var(--hover-bgcolor);\n  }\n  // \u5728 tr \u8BBE\u7F6E highlight \u53EF\u4EE5\u4E3A\u5E95\u4E0B\u7684 td \u8BBE\u7F6E\u4E3A\u9AD8\u4EAE\u8272\n  // \u800C\u8BBE\u7F6E .no-highlight \u7684\u8BDD\u5219\u53EF\u4EE5\u7981\u7528\u9AD8\u4EAE\u6548\u679C\uFF1B\n  tr:not(.no-highlight).highlight > td {\n    background: var(--highlight-bgcolor);\n  }\n\n  th {\n    font-weight: normal;\n    text-align: left;\n    padding: var(--cell-padding);\n    height: var(--header-row-height);\n    color: var(--header-color);\n    background: var(--header-bgcolor);\n    border:1px solid transparent;\n    border-right: var(--header-cell-border-vertical);\n    border-bottom: var(--header-cell-border-horizontal);\n    position: relative;\n  }\n\n  th.resizeable{\n    border-right:none\n  }\n\n  th.", " {\n    border-right: none;\n    border-bottom: none;\n  }\n\n  tr.", " th {\n    border-top: var(--header-cell-border-horizontal);\n  }\n  th.", " {\n    border-left: var(--header-cell-border-vertical);\n  }\n\n  td {\n    padding: var(--cell-padding);\n    background: var(--bgcolor);\n    height: var(--row-height);\n    border:1px solid transparent;\n    border-right: var(--cell-border-vertical);\n    border-bottom: var(--cell-border-horizontal);\n    word-break: break-all;\n  }\n  td.", " {\n    border-left: var(--cell-border-vertical);\n  }\n  tr.", " td {\n    border-top: var(--cell-border-horizontal);\n  }\n  &.has-header tbody tr.", " td {\n    border-top: none;\n  }\n  &.has-footer tbody tr.", " td {\n    border-bottom: none;\n  }\n\n  .", ",\n  .", " {\n    z-index: ", ";\n  }\n\n  //#region \u9501\u5217\u9634\u5F71\n  .", " {\n    position: absolute;\n    top: 0;\n    bottom: 0;\n    z-index: ", ";\n    pointer-events: none;\n    overflow: hidden;\n\n    .", " {\n      height: 100%;\n    }\n\n    .", " {\n      margin-right: ", "px;\n      box-shadow: none;\n\n      &.show-shadow {\n        box-shadow: var(--lock-shadow);\n        border-right: var(--cell-border-vertical);\n      }\n    }\n\n    .", " {\n      margin-left: ", "px;\n      box-shadow: none;\n\n      &.show-shadow {\n        box-shadow: var(--lock-shadow);\n        border-left: var(--cell-border-vertical);\n      }\n    }\n  }\n  //#endregion\n\n  //#region \u7A7A\u8868\u683C\u5C55\u73B0\n  .", " {\n    pointer-events: none;\n    color: #99a3b3;\n    font-size: 12px;\n    text-align: center;\n    position: absolute;\n    left: 50%;\n    top: 50%;\n    transform: translate(-50%, -50%);\n\n    .empty-image {\n      width: 50px;\n      height: 50px;\n    }\n\n    .empty-tips {\n      margin-top: 16px;\n      line-height: 1.5;\n    }\n  }\n  //#endregion\n\n  //#region IE\u517C\u5BB9\n  &.ie-polyfill-wrapper {\n    //\u9501\u5B9A\u5217\u517C\u5BB9 \u4EC5\u5728\u9501\u5B9A\u5217\u7684\u60C5\u51B5\u4E0B\u751F\u6548\n    .", " {\n      overflow-x: hidden;\n    }\n    .", ", .", " {\n      position:relative;\n    }\n    .", " {\n      overflow: hidden;\n    }\n    .", " {\n      position: relative;\n    }\n\n    .", " {\n      overflow: auto;\n      overflow-x: hidden;\n      overflow-anchor: none;\n    }\n\n    .", ", .", "{\n      position: absolute;\n      z-index: ", ";\n      top: 0;\n    }\n    .", "{\n      left:0;\n    }\n    .", "{\n      right:0;\n    }\n\n    .", "{\n      .", "{\n        position: absolute;\n        top: 0;\n        width: 100%;\n        z-index: ", ";\n      }\n    }\n\n    tr:not(.no-hover).row-hover > td {\n      background: var(--hover-bgcolor);\n    }\n  }\n  //#endregion\n\n  //#region \u7C98\u6027\u6EDA\u52A8\u6761\n  .", " {\n    overflow-y: hidden;\n    overflow-x: auto;\n    z-index: ", ";\n    flex-shrink: 0;\n    flex-grow: 0;\n    border-top: 1px solid var(--border-color);\n    background: var(--bgcolor);\n  }\n\n  .", " {\n    // \u5FC5\u987B\u6709\u9AD8\u5EA6\u624D\u80FD\u51FA\u73B0\u6EDA\u52A8\u6761\n    height: 1px;\n    visibility: hidden;\n  }\n  //#endregion\n\n  //#region \u52A0\u8F7D\u6837\u5F0F\n  .", " {\n    position: relative;\n    width: 100%;\n    height: 100%;\n    overflow: auto;\n\n    .", " {\n      filter: none;\n      width: 100%;\n      height: 100%;\n      overflow: auto;\n      display: flex;\n      position: relative;\n      flex-direction: column;\n    }\n\n    .", " {\n      position: absolute;\n      left: 0;\n      right: 0;\n      top: 0;\n      bottom: 0;\n      pointer-events: none;\n    }\n\n    .", " {\n      position: sticky;\n      z-index: ", ";\n      transform: translateY(-50%);\n    }\n  }\n  //#endregion\n\n  //#region \u8868\u683C\u8FC7\u6EE4\n  .", " {\n    color:var(--icon-color);\n    &.active{\n      color:var(--primary-color);\n    }\n  }\n  //#endregion\n\n  //#region \u8868\u683C\u6392\u5E8F\n  .", " {\n    color:var(--icon-color);\n    &.active{\n      color:var(--primary-color);\n    }\n  }\n  //#endregion\n\n  //#region \u6EDA\u52A8\u6761\u5360\u4F4D\n  .", " {\n    visibility: hidden;\n    flex-shrink: 0;\n  }\n  .", " .", " {\n    border-top: var(--cell-border-horizontal);\n  }\n  //#endregion\n  "])), variableConst, variableConst, outerBorderStyleMixin, Classes.artTable, Classes.tableHeader, Classes.tableHeaderCellContent, Classes.virtual, Classes.tableFooter, Classes.tableBody, Classes.tableFooter, Classes.tableRow, Classes.tableBody, Classes.tableCellRangeSelected, Classes.tableCellRangeTop, Classes.tableCellRangeLeft, Classes.tableCellRangeBottom, Classes.tableCellRangeRight, Classes.tableHeader, Z.header, Classes.tableFooter, Z.footer, Classes.leaf, Classes.first, Classes.first, Classes.first, Classes.first, Classes.first, Classes.last, Classes.lockLeft, Classes.lockRight, Z.lock, Classes.lockShadowMask, Z.lockShadow, Classes.lockShadow, Classes.leftLockShadow, LOCK_SHADOW_PADDING, Classes.rightLockShadow, LOCK_SHADOW_PADDING, Classes.emptyWrapper, Classes.virtual, Classes.tableBody, Classes.tableFooter, Classes.tableHeaderMain, Classes.tableHeader, Classes.tableFooterMain, Classes.fixedLeft, Classes.fixedRight, Z.lock, Classes.fixedLeft, Classes.fixedRight, Classes.rowDetailContainer, Classes.rowDetailItem, Z.rowDetail, Classes.stickyScroll, Z.scrollItem, Classes.stickyScrollItem, Classes.loadingWrapper, Classes.loadingContentWrapper, Classes.loadingIndicatorWrapper, Classes.loadingIndicator, Z.loadingIndicator, Classes.tableFilterTrigger, Classes.tableSortIcon, Classes.verticalScrollPlaceholder, Classes.tableFooter, Classes.verticalScrollPlaceholder);
 var ButtonCSS = Object(styled_components__WEBPACK_IMPORTED_MODULE_3__["css"])(_templateObject3 || (_templateObject3 = _babel_runtime_corejs3_helpers_taggedTemplateLiteral__WEBPACK_IMPORTED_MODULE_0___default()(["\n  ", "\n  //#region \u6309\u94AE\n  .", "{\n    color: var(--color);\n    background:#ffffff;\n    border:1px solid var(--strong-border-color);\n    border-radius: 2px;\n    cursor: pointer;\n    &:hover{\n      color: var(--primary-color);\n      border:1px solid var(--primary-color);\n    }\n  }\n  .", " {\n    color:#ffffff;\n    background-color: var(--primary-color);\n    border:none;\n    &:hover{\n      color:#ffffff;\n      background-color: var(--primary-color-level2);\n      border:none;\n    }\n  }\n//#endregion\n"])), variableConst, Classes.button, Classes.buttonPrimary);
 
 function getCssVariableText(obj) {
@@ -43221,23 +43428,8 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
     _this.resizeSubject = new rxjs__WEBPACK_IMPORTED_MODULE_17__["Subject"]();
     _this.offsetY = 0;
 
-    _this.getRowNodeListByEvent = function (e) {
-      var nodeList = null;
-      var rowIndex = e.currentTarget.dataset.rowindex;
-
-      if (rowIndex !== undefined) {
-        var _this$domHelper = _this.domHelper,
-            tableBody = _this$domHelper.tableBody,
-            tableFooter = _this$domHelper.tableFooter;
-        var targetParent = tableBody.contains(e.currentTarget) ? tableBody : tableFooter;
-        nodeList = targetParent.querySelectorAll("tr[data-rowindex=\"".concat(rowIndex, "\"]"));
-      }
-
-      return nodeList;
-    };
-
     _this.handleRowMouseEnter = function (e) {
-      var nodeList = _this.getRowNodeListByEvent(e);
+      var nodeList = _this.domHelper.getRowNodeListByEvent(e);
 
       nodeList && nodeList.forEach(function (node) {
         node.classList.add('row-hover');
@@ -43245,7 +43437,7 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
     };
 
     _this.handleRowMouseLeave = function (e) {
-      var nodeList = _this.getRowNodeListByEvent(e);
+      var nodeList = _this.domHelper.getRowNodeListByEvent(e);
 
       nodeList && nodeList.forEach(function (node) {
         node.classList.remove('row-hover');
@@ -43377,10 +43569,10 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
     value: function updateStickyScroll() {
       var _a, _b;
 
-      var _this$domHelper2 = this.domHelper,
-          stickyScroll = _this$domHelper2.stickyScroll,
-          artTable = _this$domHelper2.artTable,
-          stickyScrollItem = _this$domHelper2.stickyScrollItem;
+      var _this$domHelper = this.domHelper,
+          stickyScroll = _this$domHelper.stickyScroll,
+          artTable = _this$domHelper.artTable,
+          stickyScrollItem = _this$domHelper.stickyScrollItem;
       var _lastHasScrollY = this.hasScrollY;
 
       if (!artTable) {
@@ -43721,9 +43913,9 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
     value: function initSubscriptions() {
       var _this2 = this;
 
-      var _this$domHelper3 = this.domHelper,
-          virtual = _this$domHelper3.virtual,
-          stickyScroll = _this$domHelper3.stickyScroll;
+      var _this$domHelper2 = this.domHelper,
+          virtual = _this$domHelper2.virtual,
+          stickyScroll = _this$domHelper2.stickyScroll;
       this.rootSubscription.add(_utils__WEBPACK_IMPORTED_MODULE_28__["throttledWindowResize$"].subscribe(function () {
         _this2.updateStickyScroll();
 
@@ -45300,7 +45492,7 @@ function filter() {
         return [item.key, _babel_runtime_corejs3_helpers_extends__WEBPACK_IMPORTED_MODULE_2___default()({}, item)];
       }));
 
-      function isMatchedFilterCondition(record) {
+      function isMatchedFilterCondition(record, rowIndex) {
         return !filtersKeys.some(function (key) {
           var _a, _b;
 
@@ -45315,14 +45507,15 @@ function filter() {
           } else {
             console.warn("\u5217[".concat(key, "]\u672A\u914D\u7F6E\u7B5B\u9009\u51FD\u6570\uFF0C\u8BF7\u8BBE\u7F6E column.features.filterable \u6765\u4F5C\u4E3A\u8BE5\u5217\u7684\u7B5B\u9009\u51FD\u6570, \u76EE\u524D\u4F7F\u7528\u9ED8\u8BA4\u5305\u542B\u7B5B\u9009\u51FD\u6570"));
             comparisonFn = _babel_runtime_corejs3_core_js_stable_instance_filter__WEBPACK_IMPORTED_MODULE_6___default()(defaultFilterOptionsMap.get('contain'));
-          }
+          } // 不符合过滤条件,退出循环
 
-          return !comparisonFn(_babel_runtime_corejs3_core_js_stable_instance_filter__WEBPACK_IMPORTED_MODULE_6___default()(filterItem))(record[key]); //不符合过滤条件,退出循环
+
+          return !comparisonFn(_babel_runtime_corejs3_core_js_stable_instance_filter__WEBPACK_IMPORTED_MODULE_6___default()(filterItem), filterItem)(_internals__WEBPACK_IMPORTED_MODULE_12__["internals"].safeGetValue(columnsMap.get(key), record, rowIndex), record);
         });
       }
 
-      return dataSource.reduce(function (pre, record) {
-        if (isMatchedFilterCondition(record)) {
+      return dataSource.reduce(function (pre, record, rowIndex) {
+        if (isMatchedFilterCondition(record, rowIndex)) {
           return _babel_runtime_corejs3_core_js_stable_instance_concat__WEBPACK_IMPORTED_MODULE_9___default()(pre).call(pre, [record]);
         }
 
@@ -46450,7 +46643,7 @@ function Filter(_ref2) {
     fill: "currentColor",
     "aria-hidden": "true"
   }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("path", {
-    d: "M349 838c0 17.7 14.2 32 31.8 32h262.4c17.6 0 31.8-14.3\n              31.8-32V642H349v196zm531.1-684H143.9c-24.5 0-39.8 26.7-27.5\n              48l221.3 376h348.8l221.3-376c12.1-21.3-3.2-48-27.7-48z"
+    d: "M349 838c0 17.7 14.2 32 31.8 32h262.4c17.6 0 31.8-14.3\r\n              31.8-32V642H349v196zm531.1-684H143.9c-24.5 0-39.8 26.7-27.5\r\n              48l221.3 376h348.8l221.3-376c12.1-21.3-3.2-48-27.7-48z"
   }))), showPanel && /*#__PURE__*/Object(react_dom__WEBPACK_IMPORTED_MODULE_4__["createPortal"])( /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement(Panel, {
     ele: iconRef.current,
     filterIcon: filterIcon,
@@ -46556,7 +46749,7 @@ function FilterPanel(_ref) {
     fill: "currentColor",
     "aria-hidden": "true"
   }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("path", {
-    d: "M349 838c0 17.7 14.2 32 31.8 32h262.4c17.6 0 31.8-14.3\n              31.8-32V642H349v196zm531.1-684H143.9c-24.5 0-39.8 26.7-27.5\n              48l221.3 376h348.8l221.3-376c12.1-21.3-3.2-48-27.7-48z"
+    d: "M349 838c0 17.7 14.2 32 31.8 32h262.4c17.6 0 31.8-14.3\r\n              31.8-32V642H349v196zm531.1-684H143.9c-24.5 0-39.8 26.7-27.5\r\n              48l221.3 376h348.8l221.3-376c12.1-21.3-3.2-48-27.7-48z"
   })))), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("div", {
     className: "popup-body"
   }, children));
@@ -46680,7 +46873,7 @@ var DEFAULT_FILTER_OPTIONS = [{
 /*!***************************************************************************!*\
   !*** ./node_modules/@kdcloudjs/table/es/table/pipeline/features/index.js ***!
   \***************************************************************************/
-/*! exports provided: autoRowSpan, buildTree, columnHover, columnRangeHover, multiSelect, rowDetail, rowGrouping, singleSelect, sort, tips, treeMode, treeMetaSymbol, treeSelect, columnDrag, columnResize, contextMenu, filter, rangeSelection */
+/*! exports provided: autoRowSpan, buildTree, columnHover, columnRangeHover, multiSelect, rowDetail, rowGrouping, singleSelect, sort, tips, treeMode, treeMetaSymbol, treeSelect, columnDrag, columnResize, contextMenu, filter, rangeSelection, mergeCellHover */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -46738,6 +46931,9 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _rangeSelection__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ./rangeSelection */ "./node_modules/@kdcloudjs/table/es/table/pipeline/features/rangeSelection.js");
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "rangeSelection", function() { return _rangeSelection__WEBPACK_IMPORTED_MODULE_16__["rangeSelection"]; });
 
+/* harmony import */ var _mergeCellHover__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! ./mergeCellHover */ "./node_modules/@kdcloudjs/table/es/table/pipeline/features/mergeCellHover.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mergeCellHover", function() { return _mergeCellHover__WEBPACK_IMPORTED_MODULE_17__["mergeCellHover"]; });
+
 
 
 
@@ -46756,6 +46952,55 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
+
+/***/ }),
+
+/***/ "./node_modules/@kdcloudjs/table/es/table/pipeline/features/mergeCellHover.js":
+/*!************************************************************************************!*\
+  !*** ./node_modules/@kdcloudjs/table/es/table/pipeline/features/mergeCellHover.js ***!
+  \************************************************************************************/
+/*! exports provided: mergeCellHover */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "mergeCellHover", function() { return mergeCellHover; });
+/* harmony import */ var _babel_runtime_corejs3_helpers_extends__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @babel/runtime-corejs3/helpers/extends */ "./node_modules/@babel/runtime-corejs3/helpers/extends.js");
+/* harmony import */ var _babel_runtime_corejs3_helpers_extends__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_corejs3_helpers_extends__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../utils */ "./node_modules/@kdcloudjs/table/es/table/utils/index.js");
+
+
+function mergeCellHover() {
+  return function (pipeline) {
+    return pipeline.mapColumns(Object(_utils__WEBPACK_IMPORTED_MODULE_1__["makeRecursiveMapper"])(function (col) {
+      if (!Object(_utils__WEBPACK_IMPORTED_MODULE_1__["isLeafNode"])(col)) {
+        return col;
+      }
+
+      var prevGetCellProps = col.getCellProps;
+      return _babel_runtime_corejs3_helpers_extends__WEBPACK_IMPORTED_MODULE_0___default()(_babel_runtime_corejs3_helpers_extends__WEBPACK_IMPORTED_MODULE_0___default()({}, col), {
+        getCellProps: function getCellProps(value, record, rowIndex) {
+          var prevCellProps = prevGetCellProps === null || prevGetCellProps === void 0 ? void 0 : prevGetCellProps(value, record, rowIndex);
+          return Object(_utils__WEBPACK_IMPORTED_MODULE_1__["mergeCellProps"])(prevCellProps, {
+            onMouseEnter: function onMouseEnter(e) {
+              var InRangeRow = pipeline.ref.current.domHelper.getInRangeRowByCellEvent(e);
+              InRangeRow.forEach(function (row) {
+                row.classList.add('row-hover');
+              });
+            },
+            onMouseLeave: function onMouseLeave(e) {
+              var InRangeRow = pipeline.ref.current.domHelper.getInRangeRowByCellEvent(e);
+              InRangeRow.forEach(function (row) {
+                row.classList.remove('row-hover');
+              });
+            }
+          });
+        }
+      });
+    }));
+  };
+}
+
 /***/ }),
 
 /***/ "./node_modules/@kdcloudjs/table/es/table/pipeline/features/multiSelect.js":