@kdcloudjs/kdesign 1.6.29 → 1.6.30

package/dist/kdesign.js

@@ -1,6 +1,6 @@
 /*!
  * 
- *   @kdcloudjs/kdesign v1.6.28
+ *   @kdcloudjs/kdesign v1.6.29
  * 
  *   Copyright 2020-present, Kingdee, Inc.
  *   All rights reserved.
@@ -2575,18 +2575,18 @@ function usePopper(locatorElement, popperElement, props) {
   Object(react__WEBPACK_IMPORTED_MODULE_19__["useEffect"])(function () {
     if (exist && visible) {
       var mouseleaveTimer;
+      var triggerNode = getTriggerElement(locatorRef.current);
 
       var handleHidePopper = function handleHidePopper(e) {
-        var triggerNode = getTriggerElement(locatorRef.current);
         var triggerRect = triggerNode.getBoundingClientRect();
         var popperRect = popperRef.current.getBoundingClientRect();
-        var left = /left/.test(nextPlacement) ? popperRect.right : triggerRect.left;
-        var right = /right/.test(nextPlacement) ? popperRect.left : triggerRect.right;
-        var top = /top/.test(nextPlacement) ? popperRect.bottom : triggerRect.top;
-        var bottom = /bottom/.test(nextPlacement) ? popperRect.top : triggerRect.bottom;
+        var left = triggerRect.left;
+        var right = triggerRect.right;
+        var top = triggerRect.top;
+        var bottom = triggerRect.bottom;
         var X = e.clientX,
             Y = e.clientY;
-        var inTriggerRect = X > left - 2 && X < right + 2 && Y > top - 2 && Y < bottom + 2;
+        var inTriggerRect = X > left + 2 && X < right - 2 && Y > top + 2 && Y < bottom - 2;
         var inPopperRect = X > popperRect.left && X < popperRect.right && Y > popperRect.top && Y < popperRect.bottom;
         var ableArea = matchTrigger('contextMenu') ? inPopperRect : inTriggerRect || inPopperRect;
 
@@ -2594,7 +2594,12 @@ function usePopper(locatorElement, popperElement, props) {
           mouseleaveTimer && clearTimeout(mouseleaveTimer);
           matchTrigger('focus') && triggerNode.focus();
         } else {
-          matchTrigger('hover') ? mouseleaveTimer = window.setTimeout(hidePopper, mouseLeaveDelay * 1000) : hidePopper();
+          if (matchTrigger('hover')) {
+            mouseleaveTimer && clearTimeout(mouseleaveTimer);
+            mouseleaveTimer = window.setTimeout(hidePopper, mouseLeaveDelay * 3000);
+          } else {
+            hidePopper();
+          }
         }
       };
 
@@ -2609,6 +2614,9 @@ function usePopper(locatorElement, popperElement, props) {
       };
 
       if (matchTrigger('hover')) {
+        triggerNode === null || triggerNode === void 0 ? void 0 : triggerNode.removeEventListener('mouseleave', debounceHidePopper);
+        popperNode === null || popperNode === void 0 ? void 0 : popperNode.removeEventListener('mouseleave', debounceHidePopper);
+        triggerNode === null || triggerNode === void 0 ? void 0 : triggerNode.addEventListener('mouseleave', debounceHidePopper);
         popperNode === null || popperNode === void 0 ? void 0 : popperNode.addEventListener('mouseleave', debounceHidePopper);
       }
 
@@ -2616,6 +2624,7 @@ function usePopper(locatorElement, popperElement, props) {
         return document.addEventListener(mapEvent[action], debounceHidePopper);
       }) : document.addEventListener(mapEvent[trigger], debounceHidePopper);
       return function () {
+        triggerNode === null || triggerNode === void 0 ? void 0 : triggerNode.removeEventListener('mouseleave', debounceHidePopper);
         popperNode === null || popperNode === void 0 ? void 0 : popperNode.removeEventListener('mouseleave', debounceHidePopper);
         Array.isArray(trigger) ? trigger.forEach(function (action) {
           return document.removeEventListener(mapEvent[action], debounceHidePopper);
@@ -10913,10 +10922,6 @@ function usePickerInput(_ref) {
         }, 0);
       } else if (open) {
         triggerOpen(false);
-
-        if (valueChangedRef.current) {
-          onSubmit();
-        }
       }
 
       setFocused(false);
@@ -20965,24 +20970,26 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_6__);
 /* harmony import */ var core_js_modules_es_string_split_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! core-js/modules/es.string.split.js */ "./node_modules/core-js/modules/es.string.split.js");
 /* harmony import */ var core_js_modules_es_string_split_js__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_split_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_object_to_string_js__WEBPACK_IMPORTED_MODULE_9__ = __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_9___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_9__);
-/* harmony import */ var core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! core-js/modules/es.regexp.to-string.js */ "./node_modules/core-js/modules/es.regexp.to-string.js");
-/* harmony import */ var core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_10___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_10__);
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! react */ "react");
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_11___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_11__);
-/* harmony import */ var _input__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ../input */ "./components/input/index.tsx");
-/* harmony import */ var _config_provider_ConfigContext__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ../config-provider/ConfigContext */ "./components/config-provider/ConfigContext.tsx");
-/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ../_utils */ "./components/_utils/index.ts");
-/* harmony import */ var _utils_numberUtil__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ../_utils/numberUtil */ "./components/_utils/numberUtil.ts");
-/* harmony import */ var _utils_formatUtil__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ../_utils/formatUtil */ "./components/_utils/formatUtil.ts");
-/* harmony import */ var _utils_devwarning__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! ../_utils/devwarning */ "./components/_utils/devwarning.ts");
-/* harmony import */ var big_js__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! big.js */ "./node_modules/big.js/big.js");
-/* harmony import */ var big_js__WEBPACK_IMPORTED_MODULE_18___default = /*#__PURE__*/__webpack_require__.n(big_js__WEBPACK_IMPORTED_MODULE_18__);
-/* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(/*! classnames */ "./node_modules/classnames/index.js");
-/* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_19___default = /*#__PURE__*/__webpack_require__.n(classnames__WEBPACK_IMPORTED_MODULE_19__);
+/* harmony import */ var core_js_modules_es_string_replace_js__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! core-js/modules/es.string.replace.js */ "./node_modules/core-js/modules/es.string.replace.js");
+/* harmony import */ var core_js_modules_es_string_replace_js__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_replace_js__WEBPACK_IMPORTED_MODULE_8__);
+/* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_9__ = __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_9___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_9__);
+/* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_10__ = __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_10___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_10__);
+/* harmony import */ var core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! core-js/modules/es.regexp.to-string.js */ "./node_modules/core-js/modules/es.regexp.to-string.js");
+/* harmony import */ var core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_11___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_11__);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! react */ "react");
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_12___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_12__);
+/* harmony import */ var _input__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ../input */ "./components/input/index.tsx");
+/* harmony import */ var _config_provider_ConfigContext__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ../config-provider/ConfigContext */ "./components/config-provider/ConfigContext.tsx");
+/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ../_utils */ "./components/_utils/index.ts");
+/* harmony import */ var _utils_numberUtil__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ../_utils/numberUtil */ "./components/_utils/numberUtil.ts");
+/* harmony import */ var _utils_formatUtil__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! ../_utils/formatUtil */ "./components/_utils/formatUtil.ts");
+/* harmony import */ var _utils_devwarning__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! ../_utils/devwarning */ "./components/_utils/devwarning.ts");
+/* harmony import */ var big_js__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(/*! big.js */ "./node_modules/big.js/big.js");
+/* harmony import */ var big_js__WEBPACK_IMPORTED_MODULE_19___default = /*#__PURE__*/__webpack_require__.n(big_js__WEBPACK_IMPORTED_MODULE_19__);
+/* 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__);
 
 
 
@@ -21005,13 +21012,14 @@ var _excluded = ["value", "defaultValue", "mustInScope", "decimalLength", "mustI
 
 
 
+
 var InternalInputNumber = function InternalInputNumber(props, ref) {
-  var _useContext = Object(react__WEBPACK_IMPORTED_MODULE_11__["useContext"])(_config_provider_ConfigContext__WEBPACK_IMPORTED_MODULE_13__["default"]),
+  var _useContext = Object(react__WEBPACK_IMPORTED_MODULE_12__["useContext"])(_config_provider_ConfigContext__WEBPACK_IMPORTED_MODULE_14__["default"]),
       userDefaultProps = _useContext.compDefaultProps,
       getPrefixCls = _useContext.getPrefixCls,
       prefixCls = _useContext.prefixCls;
 
-  var inputNumberProps = Object(_utils__WEBPACK_IMPORTED_MODULE_14__["getCompProps"])('InputNumber', userDefaultProps, props);
+  var inputNumberProps = Object(_utils__WEBPACK_IMPORTED_MODULE_15__["getCompProps"])('InputNumber', userDefaultProps, props);
 
   var value = inputNumberProps.value,
       defaultValue = inputNumberProps.defaultValue,
@@ -21040,20 +21048,20 @@ var InternalInputNumber = function InternalInputNumber(props, ref) {
 
   var initVal = value === undefined ? defaultValue : value;
 
-  var _useState = Object(react__WEBPACK_IMPORTED_MODULE_11__["useState"])(Object(_utils_numberUtil__WEBPACK_IMPORTED_MODULE_15__["serialization"])(initVal !== undefined ? initVal + '' : '')),
+  var _useState = Object(react__WEBPACK_IMPORTED_MODULE_12__["useState"])(Object(_utils_numberUtil__WEBPACK_IMPORTED_MODULE_16__["serialization"])(initVal !== undefined ? initVal + '' : '')),
       _useState2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_1___default()(_useState, 2),
       inputValue = _useState2[0],
       setInputValue = _useState2[1];
 
-  var inputStatus = Object(react__WEBPACK_IMPORTED_MODULE_11__["useRef"])({
+  var inputStatus = Object(react__WEBPACK_IMPORTED_MODULE_12__["useRef"])({
     isHandleChange: false,
     inputFocused: false
   });
   var inputPrefixCls = getPrefixCls(prefixCls, 'inputNumber', inputNumberProps.prefixCls);
-  var thisInputNumberRef = Object(react__WEBPACK_IMPORTED_MODULE_11__["useRef"])();
+  var thisInputNumberRef = Object(react__WEBPACK_IMPORTED_MODULE_12__["useRef"])();
   var inputNumberRef = ref || thisInputNumberRef;
-  var stepMouseDownDelayTimer = Object(react__WEBPACK_IMPORTED_MODULE_11__["useRef"])(null);
-  var stepMouseDownIntervalTimer = Object(react__WEBPACK_IMPORTED_MODULE_11__["useRef"])(null);
+  var stepMouseDownDelayTimer = Object(react__WEBPACK_IMPORTED_MODULE_12__["useRef"])(null);
+  var stepMouseDownIntervalTimer = Object(react__WEBPACK_IMPORTED_MODULE_12__["useRef"])(null);
 
   var isScopeValid = function isScopeValid(value) {
     if (value === '') return true;
@@ -21064,7 +21072,7 @@ var InternalInputNumber = function InternalInputNumber(props, ref) {
     return true;
   };
 
-  Object(react__WEBPACK_IMPORTED_MODULE_11__["useEffect"])(function () {
+  Object(react__WEBPACK_IMPORTED_MODULE_12__["useEffect"])(function () {
     setInputValue(value);
   }, [value]);
 
@@ -21078,7 +21086,7 @@ var InternalInputNumber = function InternalInputNumber(props, ref) {
 
   var verifiValue = function verifiValue(initValue) {
     // 将 value 进行数字序列化 剔除非数字输入-复制粘贴的情况
-    var value = Object(_utils_numberUtil__WEBPACK_IMPORTED_MODULE_15__["serialization"])(initValue); // 校验数字合法性
+    var value = Object(_utils_numberUtil__WEBPACK_IMPORTED_MODULE_16__["serialization"])(initValue); // 校验数字合法性
 
     if (!/^-?\d*\.?\d*$/.test(value)) return false; // 输入内容超出数字范围不允许输入
 
@@ -21114,7 +21122,7 @@ var InternalInputNumber = function InternalInputNumber(props, ref) {
   var handleFocus = function handleFocus(event) {
     inputStatus.current.inputFocused = true;
     var onFocus = inputNumberProps.onFocus;
-    var formatValue = Object(_utils_formatUtil__WEBPACK_IMPORTED_MODULE_16__["formatEditNumber"])(inputValue, {
+    var formatValue = Object(_utils_formatUtil__WEBPACK_IMPORTED_MODULE_17__["formatEditNumber"])(inputValue, {
       zeroShow: zeroShow,
       decimalLength: decimalLength,
       showDecimalTailZero: showDecimalTailZero,
@@ -21127,7 +21135,7 @@ var InternalInputNumber = function InternalInputNumber(props, ref) {
 
   var handleFormatValue = function handleFormatValue(value, param) {
     if (!value && value !== 0) return '';
-    return Object(_utils_formatUtil__WEBPACK_IMPORTED_MODULE_16__["formatNumber"])(value, param);
+    return Object(_utils_formatUtil__WEBPACK_IMPORTED_MODULE_17__["formatNumber"])(value, param);
   };
 
   var handleNumericalAccuracy = function handleNumericalAccuracy(numerical) {
@@ -21139,23 +21147,32 @@ var InternalInputNumber = function InternalInputNumber(props, ref) {
         _numerical$split2$ = _numerical$split2[1],
         decimalValue = _numerical$split2$ === void 0 ? '' : _numerical$split2$;
 
+    var sign = '';
+
+    if (integerValue.includes('-')) {
+      integerValue = integerValue.replace('-', '');
+      sign = '-';
+    }
+
     var integerValueLength = integerValue.length;
     var decimalValueLength = decimalValue.length;
 
     if (typeof decimalLength === 'number' && typeof digitLength === 'number') {
-      if (integerValueLength > digitLength - decimalLength) {
-        resultNumerical = integerValue.substr(0, digitLength - decimalLength);
+      if (decimalValueLength <= decimalLength && integerValueLength <= digitLength - decimalLength) {
+        resultNumerical = numerical;
+      } else if (integerValueLength > digitLength - decimalLength) {
+        resultNumerical = "".concat(sign).concat(integerValue.substr(0, digitLength - decimalLength));
       } else if (decimalValueLength > decimalLength) {
-        resultNumerical = "".concat(integerValue, ".").concat(decimalValue.substr(0, decimalLength));
+        resultNumerical = "".concat(sign).concat(integerValue, ".").concat(decimalValue.substr(0, decimalLength));
       }
     } else if (typeof decimalLength !== 'number' && typeof digitLength === 'number') {
       if (integerValueLength >= digitLength) {
-        resultNumerical = integerValue.substr(0, digitLength);
+        resultNumerical = "".concat(sign).concat(integerValue.substr(0, digitLength));
       } else {
-        resultNumerical = decimalValueLength ? "".concat(integerValue, ".").concat(decimalValue.substr(0, digitLength - integerValueLength)) : integerValue;
+        resultNumerical = decimalValueLength ? "".concat(sign).concat(integerValue, ".").concat(decimalValue.substr(0, digitLength - integerValueLength)) : "".concat(sign).concat(integerValue);
       }
     } else if (typeof decimalLength === 'number' && typeof digitLength !== 'number') {
-      resultNumerical = decimalValueLength ? "".concat(integerValue, ".").concat(decimalValue.substr(0, decimalLength)) : integerValue;
+      resultNumerical = decimalValueLength ? "".concat(sign).concat(integerValue, ".").concat(decimalValue.substr(0, decimalLength)) : "".concat(sign).concat(integerValue);
     } else {
       resultNumerical = numerical;
     }
@@ -21171,12 +21188,12 @@ var InternalInputNumber = function InternalInputNumber(props, ref) {
     var step = stepOption.step === undefined ? 1 : parseFloat(stepOption.step);
 
     if (typeof step !== 'number') {
-      Object(_utils_devwarning__WEBPACK_IMPORTED_MODULE_17__["default"])(true, 'inputNumber', "stepOption.step\u5FC5\u987B\u4E3A\u4E00\u4E2A\u6570\u503C");
+      Object(_utils_devwarning__WEBPACK_IMPORTED_MODULE_18__["default"])(true, 'inputNumber', "stepOption.step\u5FC5\u987B\u4E3A\u4E00\u4E2A\u6570\u503C");
       return false;
     }
 
     var startingNumber = parseFloat(inputNumberRef.current.value) || 0;
-    var calculationResults = new big_js__WEBPACK_IMPORTED_MODULE_18___default.a(startingNumber)[type](step).valueOf();
+    var calculationResults = new big_js__WEBPACK_IMPORTED_MODULE_19___default.a(startingNumber)[type](step).valueOf();
     var legalNumber = verifiValue(calculationResults);
 
     if (legalNumber === false) {
@@ -21204,7 +21221,7 @@ var InternalInputNumber = function InternalInputNumber(props, ref) {
     }
   };
 
-  var clearAllTimer = Object(react__WEBPACK_IMPORTED_MODULE_11__["useCallback"])(function () {
+  var clearAllTimer = Object(react__WEBPACK_IMPORTED_MODULE_12__["useCallback"])(function () {
     stepMouseDownDelayTimer.current && clearTimeout(stepMouseDownDelayTimer.current);
     stepMouseDownIntervalTimer.current && clearInterval(stepMouseDownIntervalTimer.current);
     document.removeEventListener('mouseup', clearAllTimer);
@@ -21223,7 +21240,7 @@ var InternalInputNumber = function InternalInputNumber(props, ref) {
       _inputValue = '';
     }
 
-    var bigValue = new big_js__WEBPACK_IMPORTED_MODULE_18___default.a(Number(_inputValue)); // 还原最小值
+    var bigValue = new big_js__WEBPACK_IMPORTED_MODULE_19___default.a(Number(_inputValue)); // 还原最小值
 
     if (typeof min === 'number' && bigValue.lt(min)) {
       _inputValue = min.toString();
@@ -21250,7 +21267,7 @@ var InternalInputNumber = function InternalInputNumber(props, ref) {
     inputStatus.current.inputFocused = false;
   };
 
-  Object(react__WEBPACK_IMPORTED_MODULE_11__["useEffect"])(function () {
+  Object(react__WEBPACK_IMPORTED_MODULE_12__["useEffect"])(function () {
     var _inputStatus$current = inputStatus.current,
         isHandleChange = _inputStatus$current.isHandleChange,
         inputFocused = _inputStatus$current.inputFocused;
@@ -21260,7 +21277,7 @@ var InternalInputNumber = function InternalInputNumber(props, ref) {
     }
 
     setInputValue(function (_inputValue) {
-      var isValueChange = value !== (inputFocused ? _inputValue : Object(_utils_formatUtil__WEBPACK_IMPORTED_MODULE_16__["formatEditNumber"])(_inputValue, {
+      var isValueChange = value !== (inputFocused ? _inputValue : Object(_utils_formatUtil__WEBPACK_IMPORTED_MODULE_17__["formatEditNumber"])(_inputValue, {
         zeroShow: zeroShow,
         decimalLength: decimalLength,
         showDecimalTailZero: showDecimalTailZero,
@@ -21272,7 +21289,7 @@ var InternalInputNumber = function InternalInputNumber(props, ref) {
         if (value === '' || value === null) {
           return '';
         } else {
-          var formatValue = inputFocused ? Object(_utils_formatUtil__WEBPACK_IMPORTED_MODULE_16__["formatEditNumber"])(value, {
+          var formatValue = inputFocused ? Object(_utils_formatUtil__WEBPACK_IMPORTED_MODULE_17__["formatEditNumber"])(value, {
             zeroShow: zeroShow,
             decimalLength: decimalLength,
             showDecimalTailZero: showDecimalTailZero
@@ -21291,12 +21308,12 @@ var InternalInputNumber = function InternalInputNumber(props, ref) {
       return _inputValue;
     });
   }, [value, zeroShow, decimalLength, showDecimalTailZero, symbol, code, roundMethod, mask]);
-  Object(react__WEBPACK_IMPORTED_MODULE_11__["useEffect"])(function () {
+  Object(react__WEBPACK_IMPORTED_MODULE_12__["useEffect"])(function () {
     return function () {
       clearAllTimer();
     };
   }, [clearAllTimer]);
-  Object(react__WEBPACK_IMPORTED_MODULE_11__["useImperativeHandle"])(props.stepperrref, function () {
+  Object(react__WEBPACK_IMPORTED_MODULE_12__["useImperativeHandle"])(props.stepperrref, function () {
     return {
       value: inputValue,
       handleNumericalAccuracy: handleNumericalAccuracy,
@@ -21306,7 +21323,7 @@ var InternalInputNumber = function InternalInputNumber(props, ref) {
       }
     };
   });
-  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11___default.a.createElement(_input__WEBPACK_IMPORTED_MODULE_12__["default"], _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_0___default()({}, others, {
+  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_12___default.a.createElement(_input__WEBPACK_IMPORTED_MODULE_13__["default"], _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_0___default()({}, others, {
     ref: inputNumberRef,
     value: inputValue ? (formatter === null || formatter === void 0 ? void 0 : formatter(inputValue)) || inputValue : inputValue,
     prefix: prefix,
@@ -21315,11 +21332,11 @@ var InternalInputNumber = function InternalInputNumber(props, ref) {
     onFocus: handleFocus,
     onBlur: handleBlur,
     onKeyDown: handleKeyDown,
-    className: classnames__WEBPACK_IMPORTED_MODULE_19___default()(inputPrefixCls, className)
+    className: classnames__WEBPACK_IMPORTED_MODULE_20___default()(inputPrefixCls, className)
   }));
 };
 
-var InputNumber = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11___default.a.forwardRef(InternalInputNumber);
+var InputNumber = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_12___default.a.forwardRef(InternalInputNumber);
 InputNumber.displayName = 'InputNumber';
 /* harmony default export */ __webpack_exports__["default"] = (InputNumber);
 
@@ -21406,7 +21423,8 @@ var ClearableInput = function ClearableInput(props) {
       addonAfter = props.addonAfter,
       focused = props.focused,
       numberMark = props.numberMark,
-      inputCount = props.inputCount;
+      inputCount = props.inputCount,
+      count = props.count;
 
   var _useState = Object(react__WEBPACK_IMPORTED_MODULE_3__["useState"])(false),
       _useState2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_1___default()(_useState, 2),
@@ -21455,7 +21473,7 @@ var ClearableInput = function ClearableInput(props) {
   var renderInputWithFixNode = function renderInputWithFixNode(originElement) {
     var _classNames2;
 
-    if (!hasPrefixSuffix(props)) {
+    if (!hasPrefixSuffix(props) && !count) {
       return originElement;
     }
 
@@ -21477,7 +21495,7 @@ var ClearableInput = function ClearableInput(props) {
   var renderInputWithLabel = function renderInputWithLabel(originElement) {
     var _classNames4, _classNames5;
 
-    if (!addonBefore && !addonAfter) {
+    if (!addonBefore && !addonAfter && !count) {
       return originElement;
     }
 
@@ -22164,7 +22182,11 @@ var InternalInput = function InternalInput(props, ref) {
 
     if (count && showNumberMark && !disabled) {
       return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_12___default.a.createElement("div", {
-        className: classnames__WEBPACK_IMPORTED_MODULE_13___default()("".concat(inputPrefixCls, "-input-mark-inner"))
+        className: classnames__WEBPACK_IMPORTED_MODULE_13___default()("".concat(inputPrefixCls, "-input-mark-inner")),
+        onMouseDown: function onMouseDown(e) {
+          e.stopPropagation();
+          e.preventDefault();
+        }
       }, enteredLength, maxLength !== undefined ? "/".concat(maxLength) : null);
     }
 
@@ -22203,6 +22225,7 @@ var InternalInput = function InternalInput(props, ref) {
     prefixCls: inputPrefixCls,
     element: renderInput(),
     focused: focused,
+    count: count,
     inputCount: renderCount()
   }));
 };
@@ -36469,6 +36492,11 @@ var InternalTree = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_13___default.a.fo
   }, [loadData, setExpandedKeys]);
   var handleExpand = react__WEBPACK_IMPORTED_MODULE_13___default.a.useCallback(function (key, expanded, node) {
     var newExpandedKeys = expanded ? Object(_utils_treeUtils__WEBPACK_IMPORTED_MODULE_19__["addKeys"])(expandedKeys, [key]) : Object(_utils_treeUtils__WEBPACK_IMPORTED_MODULE_19__["delKey"])(expandedKeys, [key]);
+
+    if (expandedKeysProps === undefined) {
+      setExpandedKeys(newExpandedKeys);
+    }
+
     onExpand && onExpand(newExpandedKeys, {
       node: node,
       expanded: expanded
@@ -36639,8 +36667,6 @@ var InternalTree = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_13___default.a.fo
     if (scrollToKey) {
       setSelectedKeys([scrollToKey]);
       setScrollKey(scrollToKey);
-    } else {
-      setSelectedKeys([]);
     }
   }, [scrollToKey]);
   Object(react__WEBPACK_IMPORTED_MODULE_13__["useEffect"])(function () {
@@ -36674,7 +36700,7 @@ var InternalTree = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_13___default.a.fo
     item.onDrop = handleDrop;
     item.onSelect = handleSelect;
     item.checked = checked;
-    item.selected = Object(_utils_treeUtils__WEBPACK_IMPORTED_MODULE_19__["getSelected"])(selectedKeys, item.key);
+    item.selected = Object(_utils_treeUtils__WEBPACK_IMPORTED_MODULE_19__["getSelected"])(Array.isArray(selectedKeys) && selectedKeys[0] ? [selectedKeys[0]] : selectedKeys, item.key);
     item.indeterminate = indeterminate;
     item.disabled = getDisabled(disabled, item.disabled);
     item.showIcon = showIcon || false;
@@ -36806,11 +36832,8 @@ var useExpand = function useExpand(flattenAllData, expandedKeysProps, defaultExp
   }
 
   var initialExpandedKeys = react__WEBPACK_IMPORTED_MODULE_3___default.a.useMemo(function () {
-    return Object(_utils_treeUtils__WEBPACK_IMPORTED_MODULE_4__["getInitExpandedKeys"])(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, expandScrollkeys, filterTreeNode, isSearching, keysData, searchExpandedKeys);
-  }, [flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, filterTreeNode, isSearching, keysData, searchExpandedKeys]);
-  var newExpandedKeys = react__WEBPACK_IMPORTED_MODULE_3___default.a.useMemo(function () {
-    return Object(_utils_treeUtils__WEBPACK_IMPORTED_MODULE_4__["getExpandedKeys"])(expandedKeysProps, expandScrollkeys);
-  }, [expandedKeysProps]);
+    return Object(_utils_treeUtils__WEBPACK_IMPORTED_MODULE_4__["getInitExpandedKeys"])(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, expandScrollkeys, filterTreeNode, isSearching, keysData, searchExpandedKeys, isInit);
+  }, [flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, filterTreeNode, isSearching, keysData, searchExpandedKeys, isInit]);
 
   var _React$useState7 = react__WEBPACK_IMPORTED_MODULE_3___default.a.useState(initialExpandedKeys),
       _React$useState8 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_0___default()(_React$useState7, 2),
@@ -36818,9 +36841,8 @@ var useExpand = function useExpand(flattenAllData, expandedKeysProps, defaultExp
       setExpandedKeys = _React$useState8[1];
 
   react__WEBPACK_IMPORTED_MODULE_3___default.a.useEffect(function () {
-    var keys = isInit || isSearching ? initialExpandedKeys : newExpandedKeys;
-    setExpandedKeys(keys);
-  }, [newExpandedKeys, initialExpandedKeys, isSearching, isInit]);
+    setExpandedKeys(initialExpandedKeys);
+  }, [expandedKeysProps, searchExpandedKeys, defaultExpandAll, defaultExpandedKeys, defaultExpandRoot, defaultExpandParent]);
   return [expandedKeys, setExpandedKeys];
 };
 var useScrollToKey = function useScrollToKey(scrollKey, index, estimatedItemSize, scrollRef, viewportHeight, treeNodePrefixCls) {
@@ -38025,25 +38047,28 @@ var getInitExpandedKeys = function getInitExpandedKeys(data, expandedKeys, defau
   var isSearching = arguments.length > 8 ? arguments[8] : undefined;
   var keysData = arguments.length > 9 ? arguments[9] : undefined;
   var searchExpandedKeys = arguments.length > 10 ? arguments[10] : undefined;
+  var isInit = arguments.length > 11 ? arguments[11] : undefined;
   var keys = (expandedKeys === null || expandedKeys === void 0 ? void 0 : expandedKeys.concat(expandScrollkeys)) || (defaultExpandedKeys === null || defaultExpandedKeys === void 0 ? void 0 : defaultExpandedKeys.concat(expandScrollkeys)) || [];
 
-  if (defaultExpandAll) {
-    keys = getAllNodeKeys(data);
-  } else {
-    if (defaultExpandRoot) {
-      var rootKey = getRootKeys(data);
+  if (isInit) {
+    if (defaultExpandAll) {
+      keys = getAllNodeKeys(data);
+    } else {
+      if (defaultExpandRoot) {
+        var rootKey = getRootKeys(data);
 
-      if (rootKey) {
-        keys = keys.concat(rootKey);
+        if (rootKey) {
+          keys = keys.concat(rootKey);
+        }
       }
-    }
 
-    if (defaultExpandParent) {
-      var parentKeys = [];
-      keys.forEach(function (key) {
-        parentKeys.push.apply(parentKeys, _babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_5___default()(getAllParentKeys(data, key)));
-      });
-      keys = keys.concat(parentKeys);
+      if (defaultExpandParent) {
+        var parentKeys = [];
+        keys.forEach(function (key) {
+          parentKeys.push.apply(parentKeys, _babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_5___default()(getAllParentKeys(data, key)));
+        });
+        keys = keys.concat(parentKeys);
+      }
     }
   }