@kdcloudjs/kdesign 1.7.23 → 1.7.25

package/dist/kdesign.js

@@ -1,6 +1,6 @@
 /*!
  * 
- *   @kdcloudjs/kdesign v1.7.22
+ *   @kdcloudjs/kdesign v1.7.24
  * 
  *   Copyright 2020-present, Kingdee, Inc.
  *   All rights reserved.
@@ -2192,6 +2192,19 @@ var getScrollDist = function getScrollDist(el, container) {
   }
   return elScroll;
 };
+var getRealDom = function getRealDom(locatorRef, locatorElement) {
+  var _locatorElement$type;
+  if (!locatorRef.current) return locatorRef.current;
+  var REF_NAME_OBJ = {
+    Input: 'input',
+    InputNumber: 'input',
+    Select: 'select',
+    Upload: 'input'
+  };
+  if (locatorRef.current.tagName) return locatorRef.current;
+  var name = REF_NAME_OBJ[locatorElement === null || locatorElement === void 0 ? void 0 : (_locatorElement$type = locatorElement.type) === null || _locatorElement$type === void 0 ? void 0 : _locatorElement$type.displayName];
+  return locatorRef === null || locatorRef === void 0 ? void 0 : locatorRef.current[name];
+};
 function usePopper(locatorElement, popperElement, props) {
   var _arrowStyle;
   var prefixCls = props.prefixCls,
@@ -2232,7 +2245,8 @@ function usePopper(locatorElement, popperElement, props) {
     _props$getPopupContai = props.getPopupContainer,
     getPopupContainer = _props$getPopupContai === void 0 ? function () {
       return document.body;
-    } : _props$getPopupContai;
+    } : _props$getPopupContai,
+    onTransitionEnd = props.onTransitionEnd;
   var arrowWidth = Math.sqrt(2 * Math.pow(arrowSize, 2));
   var componentName = (prefixCls === null || prefixCls === void 0 ? void 0 : prefixCls.split('-')[1]) || '';
   Object(_utils_devwarning__WEBPACK_IMPORTED_MODULE_23__["default"])(Placements.indexOf(placement) === -1, componentName, "cannot found ".concat(componentName, " placement '").concat(placement, "'"));
@@ -2244,10 +2258,11 @@ function usePopper(locatorElement, popperElement, props) {
   var popperEl = Object(react__WEBPACK_IMPORTED_MODULE_18__["useRef"])();
   var locatorRef = locatorElement.ref || locatorEl;
   var popperRef = popperElement.ref || popperEl;
-  var container = getPopupContainer(locatorRef.current || document.body);
+  var container = getPopupContainer(getRealDom(locatorRef, locatorElement) || document.body);
   Promise.resolve().then(function () {
-    var triggerNode = getTriggerElement(locatorRef.current);
-    var container = getPopupContainer(locatorRef.current);
+    var realDom = getRealDom(locatorRef, locatorElement);
+    var triggerNode = getTriggerElement(realDom);
+    var container = getPopupContainer(realDom);
     Object(_utils_devwarning__WEBPACK_IMPORTED_MODULE_23__["default"])(!triggerNode, componentName, "getTriggerElement() must return a HTMLElement, but now it does not return anything");
     Object(_utils_devwarning__WEBPACK_IMPORTED_MODULE_23__["default"])(!container, componentName, "getPopupContainer() must return a HTMLElement, but now it does not return anything");
   });
@@ -2310,30 +2325,31 @@ function usePopper(locatorElement, popperElement, props) {
     nextPlacement = _useState18[0],
     setNextPlacement = _useState18[1];
   var alignPopper = Object(react__WEBPACK_IMPORTED_MODULE_18__["useCallback"])(function () {
-    if (locatorRef !== null && locatorRef !== void 0 && locatorRef.current && popperRef !== null && popperRef !== void 0 && popperRef.current) {
+    var realDom = getRealDom(locatorRef, locatorElement);
+    if (realDom && popperRef !== null && popperRef !== void 0 && popperRef.current) {
       var _popperRef$current$ge = popperRef.current.getBoundingClientRect(),
         popperWidth = _popperRef$current$ge.width,
         popperHeight = _popperRef$current$ge.height;
-      var _locatorRef$current$g = locatorRef.current.getBoundingClientRect(),
-        top = _locatorRef$current$g.top,
-        bottom = _locatorRef$current$g.bottom,
-        left = _locatorRef$current$g.left,
-        right = _locatorRef$current$g.right,
-        height = _locatorRef$current$g.height,
-        width = _locatorRef$current$g.width;
+      var _realDom$getBoundingC = realDom.getBoundingClientRect(),
+        top = _realDom$getBoundingC.top,
+        bottom = _realDom$getBoundingC.bottom,
+        left = _realDom$getBoundingC.left,
+        right = _realDom$getBoundingC.right,
+        height = _realDom$getBoundingC.height,
+        width = _realDom$getBoundingC.width;
       var _getOffsetPos = getOffsetPos(container),
         containerTop = _getOffsetPos.top,
         containerLeft = _getOffsetPos.left;
-      var _getOffsetPos2 = getOffsetPos(locatorRef.current),
+      var _getOffsetPos2 = getOffsetPos(realDom),
         locatorTop = _getOffsetPos2.top,
         locatorLeft = _getOffsetPos2.left;
-      var _getTranslatePos = getTranslatePos(locatorRef.current),
+      var _getTranslatePos = getTranslatePos(realDom),
         translateTop = _getTranslatePos.top,
         translateLeft = _getTranslatePos.left;
-      var _getBorderWidth = getBorderWidth(locatorRef.current),
+      var _getBorderWidth = getBorderWidth(realDom),
         borderTop = _getBorderWidth.top,
         borderLeft = _getBorderWidth.left;
-      var _getScrollDist = getScrollDist(locatorRef.current.parentElement, container),
+      var _getScrollDist = getScrollDist(realDom.parentElement, container),
         scrollTop = _getScrollDist.top,
         scrollLeft = _getScrollDist.left;
       var locatorPos = {
@@ -2515,10 +2531,11 @@ function usePopper(locatorElement, popperElement, props) {
     className: classnames__WEBPACK_IMPORTED_MODULE_22___default()(prefixCls, popperClassName, nextPlacement, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_5___default()({
       arrow: arrow,
       hidden: !visible
-    }, "".concat(nextPlacement, "-active"), active))
+    }, "".concat(nextPlacement, "-active"), active)),
+    onTransitionEnd: typeof onTransitionEnd === 'function' ? onTransitionEnd : undefined
   };
   var popperNode = popperRef.current;
-  var locatorNode = locatorRef.current;
+  var locatorNode = getRealDom(locatorRef, locatorElement);
   Object(_hooks__WEBPACK_IMPORTED_MODULE_24__["useResizeObserver"])(popperNode || document.body, alignPopper);
   Object(_hooks__WEBPACK_IMPORTED_MODULE_24__["useResizeObserver"])(locatorNode || document.body, alignPopper);
   var showPopper = Object(react__WEBPACK_IMPORTED_MODULE_18__["useCallback"])(function (evType) {
@@ -2549,7 +2566,8 @@ function usePopper(locatorElement, popperElement, props) {
   Object(react__WEBPACK_IMPORTED_MODULE_18__["useEffect"])(function () {
     if (exist && visible) {
       var mouseleaveTimer;
-      var triggerNode = getTriggerElement(locatorRef.current);
+      var realDom = getRealDom(locatorRef, locatorElement);
+      var triggerNode = getTriggerElement(realDom);
       var handleHidePopper = function handleHidePopper(e) {
         var triggerRect = triggerNode.getBoundingClientRect();
         var popperRect = popperRef.current.getBoundingClientRect();
@@ -2623,8 +2641,9 @@ function usePopper(locatorElement, popperElement, props) {
       };
     }
   }, [alignPopper, exist, onVisibleChange, popperNode, props.visible, scrollHidden, locatorNode, visible, popperRef]);
-  react__WEBPACK_IMPORTED_MODULE_18___default.a.useEffect(function () {
-    var triggerNode = getTriggerElement(locatorRef.current);
+  Object(react__WEBPACK_IMPORTED_MODULE_18__["useEffect"])(function () {
+    var realDom = getRealDom(locatorRef, locatorElement);
+    var triggerNode = getTriggerElement(realDom);
     if (triggerNode) {
       var mouseenterTimer;
       var clearMouseLeave = function clearMouseLeave() {
@@ -7494,20 +7513,17 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 
 
-var tabsData = [{
-  id: 'domestic',
-  name: '国内'
-}, {
-  id: 'foreign',
-  name: '国际/中国港澳台'
-}];
 var InternalSelect = function InternalSelect(props, ref) {
   var _classNames3, _classNames5;
   var _useContext = Object(react__WEBPACK_IMPORTED_MODULE_20__["useContext"])(_config_provider_ConfigContext__WEBPACK_IMPORTED_MODULE_23__["default"]),
     getPrefixCls = _useContext.getPrefixCls,
     prefixCls = _useContext.prefixCls,
-    userDefaultProps = _useContext.compDefaultProps;
+    userDefaultProps = _useContext.compDefaultProps,
+    locale = _useContext.locale;
   var selectProps = Object(_utils__WEBPACK_IMPORTED_MODULE_24__["getCompProps"])('CityPicker', userDefaultProps, props);
+  var cityPickerLangMsg = locale.getCompLangMsg({
+    componentName: 'CityPicker'
+  });
   var type = selectProps.type,
     size = selectProps.size,
     value = selectProps.value,
@@ -7543,7 +7559,8 @@ var InternalSelect = function InternalSelect(props, ref) {
     domesticList = _selectProps$domestic === void 0 ? [] : _selectProps$domestic,
     _selectProps$foreignL = selectProps.foreignList,
     foreignList = _selectProps$foreignL === void 0 ? [] : _selectProps$foreignL,
-    itemRender = selectProps.itemRender;
+    itemRender = selectProps.itemRender,
+    onTabPaneChange = selectProps.onTabPaneChange;
   var _useMergedState = Object(_utils_hooks__WEBPACK_IMPORTED_MODULE_21__["useMergedState"])(undefined, {
       value: value,
       defaultValue: defaultValue
@@ -7551,6 +7568,13 @@ var InternalSelect = function InternalSelect(props, ref) {
     _useMergedState2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_2___default()(_useMergedState, 2),
     initValue = _useMergedState2[0],
     setInitValue = _useMergedState2[1];
+  var tabsData = [{
+    id: 'domestic',
+    name: cityPickerLangMsg === null || cityPickerLangMsg === void 0 ? void 0 : cityPickerLangMsg.tabsDomestic
+  }, {
+    id: 'foreign',
+    name: cityPickerLangMsg === null || cityPickerLangMsg === void 0 ? void 0 : cityPickerLangMsg.tabsInternation
+  }];
   var innerRef = Object(react__WEBPACK_IMPORTED_MODULE_20__["useRef"])();
   var selectRef = ref || innerRef;
   var searchRef = Object(react__WEBPACK_IMPORTED_MODULE_20__["useRef"])(null); // 搜索框ref
@@ -7600,11 +7624,6 @@ var InternalSelect = function InternalSelect(props, ref) {
       setOptionShow(props.visible);
     }
   }, [props.visible]);
-  Object(react__WEBPACK_IMPORTED_MODULE_20__["useEffect"])(function () {
-    if (optionShow === false) {
-      handleClear();
-    }
-  }, [optionShow]);
   var handleFocus = Object(react__WEBPACK_IMPORTED_MODULE_20__["useCallback"])(function (e) {
     e.stopPropagation();
     setFocusd(true);
@@ -7706,6 +7725,7 @@ var InternalSelect = function InternalSelect(props, ref) {
     }
   };
   var renderNodeList = function renderNodeList(data, notContent) {
+    var isCommon = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
     if (!data.length) {
       return renderNotContent(notContent);
     }
@@ -7716,7 +7736,9 @@ var InternalSelect = function InternalSelect(props, ref) {
         key: item.id,
         value: initValue,
         city: item,
-        renderCityInfo: renderCityInfo,
+        renderCityInfo: function renderCityInfo(data, flag) {
+          return _renderCityInfo(data, isCommon, flag);
+        },
         onChangeSelect: handleOption,
         itemRender: itemRender
       }, searchValue ? getHighlightText(item === null || item === void 0 ? void 0 : item.name, (item === null || item === void 0 ? void 0 : item[optionHighlightProps]) || searchValue) : item === null || item === void 0 ? void 0 : item.name);
@@ -7731,6 +7753,7 @@ var InternalSelect = function InternalSelect(props, ref) {
   };
   var toggleTabPane = function toggleTabPane(type) {
     setTabsValue(type);
+    onTabPaneChange === null || onTabPaneChange === void 0 ? void 0 : onTabPaneChange(type);
   };
 
   // 渲染下拉列表框
@@ -7744,20 +7767,22 @@ var InternalSelect = function InternalSelect(props, ref) {
         key: item.id,
         tab: item.name
       }, item);
-    })), tabsValue === 'domestic' ? renderNodeList(domesticList, '暂无数据') : renderNodeList(foreignList, '暂无数据')) : /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_20___default.a.createElement(react__WEBPACK_IMPORTED_MODULE_20___default.a.Fragment, null, !!commonList.length && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_20___default.a.createElement("div", {
+    })), tabsValue === 'domestic' ? renderNodeList(domesticList, cityPickerLangMsg === null || cityPickerLangMsg === void 0 ? void 0 : cityPickerLangMsg.emptyText) : renderNodeList(foreignList, cityPickerLangMsg === null || cityPickerLangMsg === void 0 ? void 0 : cityPickerLangMsg.emptyText)) : /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_20___default.a.createElement(react__WEBPACK_IMPORTED_MODULE_20___default.a.Fragment, null, !!commonList.length && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_20___default.a.createElement("div", {
       className: "".concat(selectPrefixCls, "-dropdown-common")
-    }, "\u5E38\u7528"), renderNodeList(commonList, '无常用城市')));
+    }, cityPickerLangMsg === null || cityPickerLangMsg === void 0 ? void 0 : cityPickerLangMsg.common), renderNodeList(commonList, cityPickerLangMsg === null || cityPickerLangMsg === void 0 ? void 0 : cityPickerLangMsg.commonEmptyText, true)));
   };
-  var renderCityInfo = Object(react__WEBPACK_IMPORTED_MODULE_20__["useCallback"])(function (data) {
-    var flag = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-    var symbol = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : ', ';
+  var _renderCityInfo = Object(react__WEBPACK_IMPORTED_MODULE_20__["useCallback"])(function (data) {
+    var isCommon = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+    var flag = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+    var symbol = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : ', ';
     if (!data) return null;
     if (isDomestic(type)) {
-      return "".concat(flag && data !== null && data !== void 0 && data.province ? symbol : '').concat(data === null || data === void 0 ? void 0 : data.province);
+      var curVal = tabsValue === 'domestic' || isCommon ? data === null || data === void 0 ? void 0 : data.province : data === null || data === void 0 ? void 0 : data.country;
+      return "".concat(flag && curVal ? symbol : '').concat(curVal);
     } else {
-      return "".concat(flag && data !== null && data !== void 0 && data.province ? symbol : '').concat(data === null || data === void 0 ? void 0 : data.province).concat(data !== null && data !== void 0 && data.country ? symbol : '').concat(data === null || data === void 0 ? void 0 : data.country);
+      return "".concat(flag && data !== null && data !== void 0 && data.province ? symbol : '').concat(data === null || data === void 0 ? void 0 : data.province).concat(data !== null && data !== void 0 && data.country && data !== null && data !== void 0 && data.province ? symbol : '').concat(data === null || data === void 0 ? void 0 : data.country);
     }
-  }, [type]);
+  }, [type, tabsValue]);
   var renderSingle = function renderSingle() {
     var hiddenStyle = !!searchValue || (initValue !== null && initValue !== void 0 ? initValue : '') !== '' ? {
       visibility: 'hidden'
@@ -7782,7 +7807,7 @@ var InternalSelect = function InternalSelect(props, ref) {
       title: seletedCity === null || seletedCity === void 0 ? void 0 : seletedCity.name
     }, seletedCity === null || seletedCity === void 0 ? void 0 : seletedCity.name)), !searchValue && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_20___default.a.createElement("span", {
       className: "".concat(selectPrefixCls, "-content-info")
-    }, renderCityInfo(seletedCity))), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_20___default.a.createElement("span", {
+    }, _renderCityInfo(seletedCity))), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_20___default.a.createElement("span", {
       className: "".concat(selectPrefixCls, "-placeholder"),
       style: hiddenStyle
     }, placeholder), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_20___default.a.createElement("span", {
@@ -7854,7 +7879,12 @@ var InternalSelect = function InternalSelect(props, ref) {
     defaultVisible: optionShow,
     visible: optionShow,
     onVisibleChange: handleVisibleChange,
-    clickToClose: !searchValue
+    clickToClose: !searchValue,
+    onTransitionEnd: function onTransitionEnd() {
+      if (optionShow === false) {
+        handleClear();
+      }
+    }
   });
   return Object(_utils_usePopper__WEBPACK_IMPORTED_MODULE_26__["default"])(renderCityPicker(), renderContent(), popperProps);
 };
@@ -7933,9 +7963,9 @@ var InternalOption = function InternalOption(props, ref) {
     className: optionCls,
     title: name,
     onClick: handleClick
-  }, typeof itemRender === 'function' ? itemRender(city) : /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_2___default.a.createElement(react__WEBPACK_IMPORTED_MODULE_2___default.a.Fragment, null, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_2___default.a.createElement("div", {
+  }, typeof itemRender === 'function' ? itemRender(city) : /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_2___default.a.createElement(react__WEBPACK_IMPORTED_MODULE_2___default.a.Fragment, null, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_2___default.a.createElement("span", {
     className: "".concat(selectOptionPrefixCls, "-content")
-  }, children), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_2___default.a.createElement("div", {
+  }, children), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_2___default.a.createElement("span", {
     className: "".concat(selectOptionPrefixCls, "-info")
   }, renderCityInfo === null || renderCityInfo === void 0 ? void 0 : renderCityInfo(city, true)))));
 };
@@ -20379,10 +20409,12 @@ __webpack_require__.r(__webpack_exports__);
 /* 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 _useSelectionRange__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(/*! ./useSelectionRange */ "./components/input-number/useSelectionRange.ts");
 
 
 
-var _excluded = ["value", "defaultValue", "mustInScope", "decimalLength", "mustInPrecisionScope", "digitLength", "onChange", "symbol", "zeroShow", "showDecimalTailZero", "code", "roundMethod", "mask", "stepOption", "min", "minMark", "max", "maxMark", "numberMode", "prefix", "suffix", "formatter", "className"];
+var _excluded = ["value", "defaultValue", "mustInScope", "decimalLength", "mustInPrecisionScope", "digitLength", "onChange", "symbol", "zeroShow", "showDecimalTailZero", "code", "roundMethod", "mask", "stepOption", "min", "minMark", "max", "maxMark", "numberMode", "prefix", "suffix", "formatter", "className", "onKeyDown"];
+
 
 
 
@@ -20401,6 +20433,7 @@ var _excluded = ["value", "defaultValue", "mustInScope", "decimalLength", "mustI
 
 
 var InternalInputNumber = function InternalInputNumber(props, ref) {
+  var _inputNumberRef$curre3;
   var _useContext = Object(react__WEBPACK_IMPORTED_MODULE_11__["useContext"])(_config_provider_ConfigContext__WEBPACK_IMPORTED_MODULE_13__["default"]),
     userDefaultProps = _useContext.compDefaultProps,
     getPrefixCls = _useContext.getPrefixCls,
@@ -20429,6 +20462,7 @@ var InternalInputNumber = function InternalInputNumber(props, ref) {
     suffix = inputNumberProps.suffix,
     formatter = inputNumberProps.formatter,
     className = inputNumberProps.className,
+    onKeyDown = inputNumberProps.onKeyDown,
     others = _babel_runtime_helpers_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_2___default()(inputNumberProps, _excluded);
   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 + '' : '')),
@@ -20492,6 +20526,7 @@ var InternalInputNumber = function InternalInputNumber(props, ref) {
     if (legalNumber === false) {
       return false;
     }
+    updateSelectionRangePosition(event);
     value === undefined && setInputValue(legalNumber);
     onChange && onChange(handleEventAttachValue(event, numberMode ? Number(legalNumber) : legalNumber));
   };
@@ -20551,12 +20586,13 @@ var InternalInputNumber = function InternalInputNumber(props, ref) {
     return resultNumerical;
   };
   var handleStepChang = function handleStepChang(type) {
+    var _inputNumberRef$curre, _inputNumberRef$curre2;
     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");
       return false;
     }
-    var startingNumber = parseFloat(inputNumberRef.current.value) || 0;
+    var startingNumber = parseFloat((_inputNumberRef$curre = inputNumberRef.current) === null || _inputNumberRef$curre === void 0 ? void 0 : (_inputNumberRef$curre2 = _inputNumberRef$curre.input) === null || _inputNumberRef$curre2 === void 0 ? void 0 : _inputNumberRef$curre2.value) || 0;
     var calculationResults = new big_js__WEBPACK_IMPORTED_MODULE_18___default.a(startingNumber)[type](step).valueOf();
     var legalNumber = verifiValue(calculationResults);
     if (legalNumber === false) {
@@ -20570,6 +20606,7 @@ var InternalInputNumber = function InternalInputNumber(props, ref) {
     });
   };
   var handleKeyDown = function handleKeyDown(event) {
+    onKeyDown === null || onKeyDown === void 0 ? void 0 : onKeyDown(event);
     if (!stepOption || props.disabled || props.readOnly) {
       return;
     }
@@ -20599,10 +20636,12 @@ var InternalInputNumber = function InternalInputNumber(props, ref) {
     // 还原最小值
     if (typeof min === 'number' && bigValue.lt(min)) {
       _inputValue = min.toString();
+      onChange === null || onChange === void 0 ? void 0 : onChange(handleEventAttachValue(event, numberMode ? Number(_inputValue) : _inputValue));
     }
     // 还原最大值
-    if (typeof min === 'number' && bigValue.gt(max)) {
+    if (typeof max === 'number' && bigValue.gt(max)) {
       _inputValue = max.toString();
+      onChange === null || onChange === void 0 ? void 0 : onChange(handleEventAttachValue(event, numberMode ? Number(_inputValue) : _inputValue));
     }
     // 超过精度位数直接截断
     _inputValue = handleNumericalAccuracy(_inputValue);
@@ -20674,9 +20713,16 @@ var InternalInputNumber = function InternalInputNumber(props, ref) {
       }
     };
   });
+  var displayedInputValue = Object(react__WEBPACK_IMPORTED_MODULE_11__["useMemo"])(function () {
+    return formatter ? formatter(inputValue) : inputValue;
+  }, [inputValue, formatter]);
+  var updateSelectionRangePosition = Object(_useSelectionRange__WEBPACK_IMPORTED_MODULE_20__["default"])({
+    inputElement: (_inputNumberRef$curre3 = inputNumberRef.current) === null || _inputNumberRef$curre3 === void 0 ? void 0 : _inputNumberRef$curre3.input,
+    inputValue: displayedInputValue
+  });
   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, {
     ref: inputNumberRef,
-    value: inputValue ? (formatter === null || formatter === void 0 ? void 0 : formatter(inputValue)) || inputValue : inputValue,
+    value: displayedInputValue,
     prefix: prefix,
     suffix: suffix,
     onChange: handleChange,
@@ -20719,6 +20765,45 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
+/***/ }),
+
+/***/ "./components/input-number/useSelectionRange.ts":
+/*!******************************************************!*\
+  !*** ./components/input-number/useSelectionRange.ts ***!
+  \******************************************************/
+/*! exports provided: default */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return useSelectionRange; });
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! react */ "react");
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var lodash_isNumber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! lodash/isNumber */ "./node_modules/lodash/isNumber.js");
+/* harmony import */ var lodash_isNumber__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(lodash_isNumber__WEBPACK_IMPORTED_MODULE_1__);
+
+
+function useSelectionRange(_ref) {
+  var inputElement = _ref.inputElement,
+    inputValue = _ref.inputValue;
+  var refSelectionPosition = Object(react__WEBPACK_IMPORTED_MODULE_0__["useRef"])();
+  Object(react__WEBPACK_IMPORTED_MODULE_0__["useLayoutEffect"])(function () {
+    var position = refSelectionPosition.current;
+    if (inputElement && inputValue && lodash_isNumber__WEBPACK_IMPORTED_MODULE_1___default()(position)) {
+      var start = Math.max(0, inputValue.length - position);
+      inputElement.setSelectionRange(start, start);
+    }
+  }, [inputValue]);
+  return function (event) {
+    var _ref2 = event.target,
+      end = _ref2.selectionEnd,
+      value = _ref2.value;
+    if (lodash_isNumber__WEBPACK_IMPORTED_MODULE_1___default()(end)) {
+      refSelectionPosition.current = value.length - end;
+    }
+  };
+}
+
 /***/ }),
 
 /***/ "./components/input/ClearableLabeledInput.tsx":
@@ -22589,9 +22674,11 @@ var locale = _objectSpread(_objectSpread({
   'QuickSearch.emptyTip': '暂无数据',
   'QuickSearch.or': '或',
   'CityPicker.domestic': '国内',
-  'CityPicker.internation': '国际',
   'CityPicker.common': '常用',
-  'CityPicker.noData': '暂无数据',
+  'CityPicker.emptyText': '暂无数据',
+  'CityPicker.commonEmptyText': '无常用城市',
+  'CityPicker.tabsDomestic': '国内',
+  'CityPicker.tabsInternation': '国际/中国港澳台',
   'ColorPicker.followFunctionalColor': '跟随功能色',
   'Search.placeholder': '请输入需要搜索的内容',
   'Search.desc': ['空格代表"或"，回车代表"且"'],
@@ -27964,7 +28051,8 @@ var InternalSearch = function InternalSearch(props, ref) {
     onSearch && (onSearch === null || onSearch === void 0 ? void 0 : onSearch(event));
   }, [onSearch]);
   var handlePressEnter = Object(react__WEBPACK_IMPORTED_MODULE_5__["useCallback"])(function (_, event) {
-    onPressEnter && (onPressEnter === null || onPressEnter === void 0 ? void 0 : onPressEnter(searchRef.current.value, event));
+    var _searchRef$current, _searchRef$current$in;
+    onPressEnter && (onPressEnter === null || onPressEnter === void 0 ? void 0 : onPressEnter((_searchRef$current = searchRef.current) === null || _searchRef$current === void 0 ? void 0 : (_searchRef$current$in = _searchRef$current.input) === null || _searchRef$current$in === void 0 ? void 0 : _searchRef$current$in.value, event));
   }, [onPressEnter, searchRef]);
   var handleFocus = Object(react__WEBPACK_IMPORTED_MODULE_5__["useCallback"])(function (event) {
     setFocused(true);
@@ -29074,7 +29162,7 @@ var InternalSelect = function InternalSelect(props, ref) {
     // open
     if (which === _utils_KeyCode__WEBPACK_IMPORTED_MODULE_30__["default"].ENTER || which === _utils_KeyCode__WEBPACK_IMPORTED_MODULE_30__["default"].UP || which === _utils_KeyCode__WEBPACK_IMPORTED_MODULE_30__["default"].DOWN) {
       e.preventDefault();
-      setOptionShow(true);
+      handleVisibleChange(true);
     }
     // backspace
     var _multipleRef$current5 = multipleRef.current,
@@ -29103,6 +29191,7 @@ var InternalSelect = function InternalSelect(props, ref) {
       } else if (which === _utils_KeyCode__WEBPACK_IMPORTED_MODULE_30__["default"].ENTER) {
         var _item$props, _item$props2;
         var item = filledOptions[activeIndex];
+        if (!item) return;
         var key = ((_item$props = item.props) === null || _item$props === void 0 ? void 0 : _item$props.value) || item.value;
         var label = ((_item$props2 = item.props) === null || _item$props2 === void 0 ? void 0 : _item$props2.children) || item.label;
         handleOption(key, label, true);
@@ -29118,10 +29207,10 @@ var InternalSelect = function InternalSelect(props, ref) {
           }));
         }
         if (!isMultiple) {
-          setOptionShow(false);
+          handleVisibleChange(false);
         }
       } else if (which === _utils_KeyCode__WEBPACK_IMPORTED_MODULE_30__["default"].ESC) {
-        setOptionShow(false);
+        handleVisibleChange(false);
       }
       if (offset !== 0) {
         var nextActiveIndex = getActiveIndex(activeIndex + offset, offset);
@@ -29178,7 +29267,7 @@ var InternalSelect = function InternalSelect(props, ref) {
     }
   };
   var popperProps = _objectSpread(_objectSpread({}, selectProps), {}, {
-    prefixCls: selectPrefixCls,
+    prefixCls: "".concat(selectPrefixCls, "-dropdown-panel").concat(isMultiple ? " ".concat(selectPrefixCls, "-multiple-dropdown-panel") : ''),
     placement: 'bottomLeft',
     popperStyle: catchStyle(),
     defaultVisible: optionShow,
@@ -31604,6 +31693,24 @@ function getApi(pipelineRef) {
     var colLeft = columnNodes.slice(0, index).reduce(function (acc, col) {
       return acc + col.width;
     }, 0);
+    var lockColumnLeft = 0;
+    var lockColumnRight = 0;
+    for (var i = 0; i < columnNodes.length; i++) {
+      var _columnNodes$i;
+      if ((_columnNodes$i = columnNodes[i]) !== null && _columnNodes$i !== void 0 && _columnNodes$i.lock) {
+        lockColumnLeft += columnNodes[i].width;
+      } else {
+        break;
+      }
+    }
+    for (var _i = columnNodes.length - 1; _i >= 0; _i--) {
+      var _columnNodes$_i;
+      if ((_columnNodes$_i = columnNodes[_i]) !== null && _columnNodes$_i !== void 0 && _columnNodes$_i.lock) {
+        lockColumnRight += columnNodes[_i].width;
+      } else {
+        break;
+      }
+    }
     var colLeftPixel = colLeft; // 目标列前面列宽总和
     var colRightPixel = colLeftPixel + column.width;
     var viewportWidth = tableBodyContainer.clientWidth; // 表体容器的宽度
@@ -31611,8 +31718,8 @@ function getApi(pipelineRef) {
 
     var vScrollLeft = scrollPosition;
     var vScrollRight = scrollPosition + viewportWidth;
-    var pxLeft = colLeftPixel;
-    var pxRight = colRightPixel - viewportWidth;
+    var pxLeft = colLeftPixel - lockColumnLeft;
+    var pxRight = colRightPixel - viewportWidth + lockColumnRight;
     var colBeforeViewport = vScrollLeft > colLeftPixel; // 滚动距离大于目标列前面列宽总和，说明目标列在视口之前
     var colPastViewport = vScrollRight < colRightPixel; // 目标列是视口之后
 
@@ -45465,13 +45572,13 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
           last: footerDataSource.length - 1,
           limit: Infinity
         }
-      }), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_16___default.a.createElement("div", {
+      }), footerDataSource.length > 0 ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_16___default.a.createElement("div", {
         className: _styles__WEBPACK_IMPORTED_MODULE_27__["Classes"].verticalScrollPlaceholder,
         style: this.hasScrollY ? {
           width: this.getScrollBarWidth(),
           visibility: 'initial'
         } : undefined
-      }));
+      }) : null);
     }
   }, {
     key: "renderLockShadows",
@@ -46494,10 +46601,13 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _babel_runtime_corejs3_core_js_stable_instance_splice__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_corejs3_core_js_stable_instance_splice__WEBPACK_IMPORTED_MODULE_4__);
 /* harmony import */ var _babel_runtime_corejs3_core_js_stable_map__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! @babel/runtime-corejs3/core-js-stable/map */ "./node_modules/@babel/runtime-corejs3/core-js-stable/map.js");
 /* harmony import */ var _babel_runtime_corejs3_core_js_stable_map__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_corejs3_core_js_stable_map__WEBPACK_IMPORTED_MODULE_5__);
-/* harmony import */ var _base_calculations__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../../base/calculations */ "./node_modules/@kdcloudjs/table/es/table/base/calculations.js");
-/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../../utils */ "./node_modules/@kdcloudjs/table/es/table/utils/index.js");
-/* harmony import */ var _base_styles__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../../base/styles */ "./node_modules/@kdcloudjs/table/es/table/base/styles.js");
-/* harmony import */ var _columnResizeWidth__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./columnResizeWidth */ "./node_modules/@kdcloudjs/table/es/table/pipeline/features/columnResizeWidth.js");
+/* harmony import */ var _babel_runtime_corejs3_core_js_stable_instance_find_index__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! @babel/runtime-corejs3/core-js-stable/instance/find-index */ "./node_modules/@babel/runtime-corejs3/core-js-stable/instance/find-index.js");
+/* harmony import */ var _babel_runtime_corejs3_core_js_stable_instance_find_index__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_corejs3_core_js_stable_instance_find_index__WEBPACK_IMPORTED_MODULE_6__);
+/* harmony import */ var _base_calculations__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../../base/calculations */ "./node_modules/@kdcloudjs/table/es/table/base/calculations.js");
+/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../../utils */ "./node_modules/@kdcloudjs/table/es/table/utils/index.js");
+/* harmony import */ var _base_styles__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../../base/styles */ "./node_modules/@kdcloudjs/table/es/table/base/styles.js");
+/* harmony import */ var _columnResizeWidth__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./columnResizeWidth */ "./node_modules/@kdcloudjs/table/es/table/pipeline/features/columnResizeWidth.js");
+
 
 
 
@@ -46526,8 +46636,8 @@ var autoFillTableWidth = function autoFillTableWidth() {
         // 保存剩余的flex总和和剩余宽度总和宽度
         var residualFlexCount = flexCount;
         var residualFlexWidth = remainingWidth;
-        var columnSize = pipeline.getFeatureOptions(_columnResizeWidth__WEBPACK_IMPORTED_MODULE_9__["COLUMN_SIZE_KEY"]) || {};
-        pipeline.mapColumns(Object(_utils__WEBPACK_IMPORTED_MODULE_7__["makeRecursiveMapper"])(function (col, recursiveFlatMapInfo) {
+        var columnSize = pipeline.getFeatureOptions(_columnResizeWidth__WEBPACK_IMPORTED_MODULE_10__["COLUMN_SIZE_KEY"]) || {};
+        pipeline.mapColumns(Object(_utils__WEBPACK_IMPORTED_MODULE_8__["makeRecursiveMapper"])(function (col, recursiveFlatMapInfo) {
           var isLeaf = recursiveFlatMapInfo.isLeaf;
 
           if (isLeaf && isValidFlexColumn(col, pipeline)) {
@@ -46550,7 +46660,7 @@ var autoFillTableWidth = function autoFillTableWidth() {
 
           return col;
         }));
-        pipeline.setFeatureOptions(_columnResizeWidth__WEBPACK_IMPORTED_MODULE_9__["COLUMN_SIZE_KEY"], columnSize);
+        pipeline.setFeatureOptions(_columnResizeWidth__WEBPACK_IMPORTED_MODULE_10__["COLUMN_SIZE_KEY"], columnSize);
       }
     } else {
       // 未设置了flex宽度，创建占位列
@@ -46565,7 +46675,7 @@ var autoFillTableWidth = function autoFillTableWidth() {
       if (fillColumns) {
         fillColumns.width = width;
       } else {
-        var rightNestedLockCount = Object(_base_calculations__WEBPACK_IMPORTED_MODULE_6__["getLeftNestedLockCount"])(_babel_runtime_corejs3_core_js_stable_instance_slice__WEBPACK_IMPORTED_MODULE_3___default()(columns).call(columns).reverse());
+        var rightNestedLockCount = Object(_base_calculations__WEBPACK_IMPORTED_MODULE_7__["getLeftNestedLockCount"])(_babel_runtime_corejs3_core_js_stable_instance_slice__WEBPACK_IMPORTED_MODULE_3___default()(columns).call(columns).reverse());
         var spliceIndex = columns.length - rightNestedLockCount;
         var _fillColumns = {
           name: '',
@@ -46576,7 +46686,7 @@ var autoFillTableWidth = function autoFillTableWidth() {
           },
           getCellProps: function getCellProps(value, record, rowIndex) {
             return {
-              className: _base_styles__WEBPACK_IMPORTED_MODULE_8__["Classes"].emptyColCell
+              className: _base_styles__WEBPACK_IMPORTED_MODULE_9__["Classes"].emptyColCell
             };
           }
         };
@@ -46596,7 +46706,7 @@ var autoFillTableWidth = function autoFillTableWidth() {
 
       function dfs(columns, result) {
         columns.forEach(function (col) {
-          if (Object(_utils__WEBPACK_IMPORTED_MODULE_7__["isLeafNode"])(col)) {
+          if (Object(_utils__WEBPACK_IMPORTED_MODULE_8__["isLeafNode"])(col)) {
             if (isValidFlexColumn(col, pipeline)) {
               result.set(FLEX_COLUMN_COUNT, result.get(FLEX_COLUMN_COUNT) + col.features.flex);
             }
@@ -46617,8 +46727,8 @@ function getColumnWidthSum(pipeline) {
       var width = col.width,
           code = col.code;
 
-      if (Object(_utils__WEBPACK_IMPORTED_MODULE_7__["isLeafNode"])(col) && code !== FILL_COLUMN_CODE) {
-        var resizeColumn = pipeline.getFeatureOptions(_columnResizeWidth__WEBPACK_IMPORTED_MODULE_9__["COLUMN_SIZE_KEY"]);
+      if (Object(_utils__WEBPACK_IMPORTED_MODULE_8__["isLeafNode"])(col) && code !== FILL_COLUMN_CODE) {
+        var resizeColumn = pipeline.getFeatureOptions(_columnResizeWidth__WEBPACK_IMPORTED_MODULE_10__["COLUMN_SIZE_KEY"]);
         return acc + (resizeColumn && resizeColumn[code] || width);
       } else {
         return acc + dfs(col.children);
@@ -46634,17 +46744,34 @@ function getTableRemainingWidth(pipeline) {
   return remainingWidth > 0 ? remainingWidth : 0;
 }
 
+function isAfterLastResizeCol(column, pipeline) {
+  var _context, _context2;
+
+  var lastResizedColumnCode = pipeline.getFeatureOptions(_columnResizeWidth__WEBPACK_IMPORTED_MODULE_10__["LAST_RESIZED_COLUMN_KEY"]);
+  if (lastResizedColumnCode === undefined) return true;
+
+  var lastResizedColumnIndex = _babel_runtime_corejs3_core_js_stable_instance_find_index__WEBPACK_IMPORTED_MODULE_6___default()(_context = pipeline.getColumns()).call(_context, function (col) {
+    return col.code === lastResizedColumnCode;
+  });
+
+  var colIndex = _babel_runtime_corejs3_core_js_stable_instance_find_index__WEBPACK_IMPORTED_MODULE_6___default()(_context2 = pipeline.getColumns()).call(_context2, function (col) {
+    return col.code === column.code;
+  });
+
+  return colIndex > lastResizedColumnIndex;
+}
+
 function isValidFlexColumn(col, pipeline) {
   var _a;
 
-  var resizeColumn = pipeline.getFeatureOptions(_columnResizeWidth__WEBPACK_IMPORTED_MODULE_9__["RESIZED_COLUMN_KEY"]); // 拖拽列自动禁止flex
+  var resizeColumn = pipeline.getFeatureOptions(_columnResizeWidth__WEBPACK_IMPORTED_MODULE_10__["RESIZED_COLUMN_KEY"]); // 拖拽列自动禁止flex
 
   if (resizeColumn === null || resizeColumn === void 0 ? void 0 : resizeColumn.has(col.code)) {
     return false;
   }
 
   var flex = (_a = col.features) === null || _a === void 0 ? void 0 : _a.flex;
-  return typeof flex === 'number' && flex > 0;
+  return typeof flex === 'number' && flex > 0 && isAfterLastResizeCol(col, pipeline);
 }
 
 function clamp(min, x, max) {
@@ -47714,13 +47841,14 @@ function columnRangeHover() {
 /*!***************************************************************************************!*\
   !*** ./node_modules/@kdcloudjs/table/es/table/pipeline/features/columnResizeWidth.js ***!
   \***************************************************************************************/
-/*! exports provided: COLUMN_SIZE_KEY, RESIZED_COLUMN_KEY, columnResize */
+/*! exports provided: COLUMN_SIZE_KEY, RESIZED_COLUMN_KEY, LAST_RESIZED_COLUMN_KEY, columnResize */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "COLUMN_SIZE_KEY", function() { return COLUMN_SIZE_KEY; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "RESIZED_COLUMN_KEY", function() { return RESIZED_COLUMN_KEY; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "LAST_RESIZED_COLUMN_KEY", function() { return LAST_RESIZED_COLUMN_KEY; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "columnResize", function() { return columnResize; });
 /* 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__);
@@ -47769,6 +47897,7 @@ function disableSelect(event) {
 var stateKey = 'columnResize';
 var COLUMN_SIZE_KEY = 'columnResize';
 var RESIZED_COLUMN_KEY = 'resizedColumn';
+var LAST_RESIZED_COLUMN_KEY = 'lastResizedColumn';
 function columnResize() {
   var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
 
@@ -47876,6 +48005,7 @@ function columnResize() {
           });
 
           pipeline.setFeatureOptions(RESIZED_COLUMN_KEY, resizedColumnSet);
+          pipeline.setFeatureOptions(LAST_RESIZED_COLUMN_KEY, code);
         },
         complete: function complete() {
           var _context;
@@ -49441,7 +49571,7 @@ function multiSelect() {
 /*!************************************************************************************!*\
   !*** ./node_modules/@kdcloudjs/table/es/table/pipeline/features/rangeSelection.js ***!
   \************************************************************************************/
-/*! exports provided: rangeSelectionKey, lastClickCellKey, rangeSelection */
+/*! exports provided: rangeSelectionKey, lastClickCellKey, rangeSelection, getCellRangeId */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -49449,25 +49579,32 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "rangeSelectionKey", function() { return rangeSelectionKey; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "lastClickCellKey", function() { return lastClickCellKey; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "rangeSelection", function() { return rangeSelection; });
-/* harmony import */ var _babel_runtime_corejs3_helpers_typeof__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @babel/runtime-corejs3/helpers/typeof */ "./node_modules/@babel/runtime-corejs3/helpers/typeof.js");
-/* harmony import */ var _babel_runtime_corejs3_helpers_typeof__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_corejs3_helpers_typeof__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var _babel_runtime_corejs3_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @babel/runtime-corejs3/helpers/defineProperty */ "./node_modules/@babel/runtime-corejs3/helpers/defineProperty.js");
-/* harmony import */ var _babel_runtime_corejs3_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_corejs3_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getCellRangeId", function() { return getCellRangeId; });
+/* harmony import */ var _babel_runtime_corejs3_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @babel/runtime-corejs3/helpers/defineProperty */ "./node_modules/@babel/runtime-corejs3/helpers/defineProperty.js");
+/* harmony import */ var _babel_runtime_corejs3_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_corejs3_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var _babel_runtime_corejs3_helpers_typeof__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @babel/runtime-corejs3/helpers/typeof */ "./node_modules/@babel/runtime-corejs3/helpers/typeof.js");
+/* harmony import */ var _babel_runtime_corejs3_helpers_typeof__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_corejs3_helpers_typeof__WEBPACK_IMPORTED_MODULE_1__);
 /* harmony import */ var _babel_runtime_corejs3_helpers_extends__WEBPACK_IMPORTED_MODULE_2__ = __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_2___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_corejs3_helpers_extends__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var _babel_runtime_corejs3_core_js_stable_instance_find_index__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @babel/runtime-corejs3/core-js-stable/instance/find-index */ "./node_modules/@babel/runtime-corejs3/core-js-stable/instance/find-index.js");
-/* harmony import */ var _babel_runtime_corejs3_core_js_stable_instance_find_index__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_corejs3_core_js_stable_instance_find_index__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var _babel_runtime_corejs3_core_js_stable_instance_slice__WEBPACK_IMPORTED_MODULE_4__ = __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_4___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_corejs3_core_js_stable_instance_slice__WEBPACK_IMPORTED_MODULE_4__);
-/* harmony import */ var _babel_runtime_corejs3_core_js_stable_instance_includes__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! @babel/runtime-corejs3/core-js-stable/instance/includes */ "./node_modules/@babel/runtime-corejs3/core-js-stable/instance/includes.js");
-/* harmony import */ var _babel_runtime_corejs3_core_js_stable_instance_includes__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_corejs3_core_js_stable_instance_includes__WEBPACK_IMPORTED_MODULE_5__);
-/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../../utils */ "./node_modules/@kdcloudjs/table/es/table/utils/index.js");
-/* harmony import */ var _utils_others__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../../utils/others */ "./node_modules/@kdcloudjs/table/es/table/utils/others.js");
-/* harmony import */ var rxjs__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! rxjs */ "./node_modules/rxjs/_esm5/index.js");
-/* harmony import */ var rxjs_operators__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! rxjs/operators */ "./node_modules/rxjs/_esm5/operators/index.js");
-/* harmony import */ var _base_styles__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../../base/styles */ "./node_modules/@kdcloudjs/table/es/table/base/styles.js");
-/* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! classnames */ "./node_modules/classnames/index.js");
-/* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_11___default = /*#__PURE__*/__webpack_require__.n(classnames__WEBPACK_IMPORTED_MODULE_11__);
+/* harmony import */ var _babel_runtime_corejs3_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @babel/runtime-corejs3/helpers/toConsumableArray */ "./node_modules/@babel/runtime-corejs3/helpers/toConsumableArray.js");
+/* harmony import */ var _babel_runtime_corejs3_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_corejs3_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_3__);
+/* harmony import */ var _babel_runtime_corejs3_core_js_stable_instance_filter__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! @babel/runtime-corejs3/core-js-stable/instance/filter */ "./node_modules/@babel/runtime-corejs3/core-js-stable/instance/filter.js");
+/* harmony import */ var _babel_runtime_corejs3_core_js_stable_instance_filter__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_corejs3_core_js_stable_instance_filter__WEBPACK_IMPORTED_MODULE_4__);
+/* harmony import */ var _babel_runtime_corejs3_core_js_stable_instance_find_index__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! @babel/runtime-corejs3/core-js-stable/instance/find-index */ "./node_modules/@babel/runtime-corejs3/core-js-stable/instance/find-index.js");
+/* harmony import */ var _babel_runtime_corejs3_core_js_stable_instance_find_index__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_corejs3_core_js_stable_instance_find_index__WEBPACK_IMPORTED_MODULE_5__);
+/* harmony import */ var _babel_runtime_corejs3_core_js_stable_instance_slice__WEBPACK_IMPORTED_MODULE_6__ = __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_6___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_corejs3_core_js_stable_instance_slice__WEBPACK_IMPORTED_MODULE_6__);
+/* harmony import */ var _babel_runtime_corejs3_core_js_stable_instance_includes__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! @babel/runtime-corejs3/core-js-stable/instance/includes */ "./node_modules/@babel/runtime-corejs3/core-js-stable/instance/includes.js");
+/* harmony import */ var _babel_runtime_corejs3_core_js_stable_instance_includes__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_corejs3_core_js_stable_instance_includes__WEBPACK_IMPORTED_MODULE_7__);
+/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../../utils */ "./node_modules/@kdcloudjs/table/es/table/utils/index.js");
+/* harmony import */ var _utils_others__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../../utils/others */ "./node_modules/@kdcloudjs/table/es/table/utils/others.js");
+/* harmony import */ var rxjs__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! rxjs */ "./node_modules/rxjs/_esm5/index.js");
+/* harmony import */ var rxjs_operators__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! rxjs/operators */ "./node_modules/rxjs/_esm5/operators/index.js");
+/* harmony import */ var _base_styles__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ../../base/styles */ "./node_modules/@kdcloudjs/table/es/table/base/styles.js");
+/* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! classnames */ "./node_modules/classnames/index.js");
+/* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_13___default = /*#__PURE__*/__webpack_require__.n(classnames__WEBPACK_IMPORTED_MODULE_13__);
+
+
 
 
 
@@ -49482,9 +49619,10 @@ __webpack_require__.r(__webpack_exports__);
 
 var rangeSelectionKey = 'rangeSelection';
 var lastClickCellKey = 'lastClickCell';
+var startSelectedCellRangesKey = 'startSelectedCellRanges';
+var SCROLL_OFFSET = 30;
 function rangeSelection(opts) {
   return function step(pipeline) {
-    var SCROLL_SIZE = 30;
     var tableBody = pipeline.ref.current.domHelper && pipeline.ref.current.domHelper.tableBody;
     var tableFooter = pipeline.ref.current.domHelper && pipeline.ref.current.domHelper.tableFooter;
     var artTable = pipeline.ref.current.domHelper && pipeline.ref.current.domHelper.artTable;
@@ -49496,14 +49634,18 @@ function rangeSelection(opts) {
     var columns = pipeline.getColumns();
     var dataSource = pipeline.getDataSource();
 
-    var rangeSelectedChange = function rangeSelectedChange(rangeSelection) {
+    var rangeSelectedChange = function rangeSelectedChange(rangeSelection, isFinished) {
       var _a;
 
+      if (isFinished) {
+        pipeline.setFeatureOptions(startSelectedCellRangesKey, rangeSelection);
+      }
+
       pipeline.setStateAtKey(rangeSelectionKey, rangeSelection);
-      (_a = opts === null || opts === void 0 ? void 0 : opts.rangeSelectedChange) === null || _a === void 0 ? void 0 : _a.call(opts, rangeSelection);
+      (_a = opts === null || opts === void 0 ? void 0 : opts.rangeSelectedChange) === null || _a === void 0 ? void 0 : _a.call(opts, rangeSelection, isFinished);
     };
 
-    var setRangeSelection = function setRangeSelection(startDragCell, draggingCell) {
+    var setRangeSelection = function setRangeSelection(startDragCell, draggingCell, isFinished) {
       if (!startDragCell || !draggingCell) return;
       var rangeColumns = getRangeColumns(startDragCell, draggingCell, columns);
 
@@ -49512,21 +49654,31 @@ function rangeSelection(opts) {
           endRow = _getRangeSelectionRow.endRow,
           footerRowRange = _getRangeSelectionRow.footerRowRange;
 
-      var rangeSelection = {
+      var cellRange = {
         startRow: startRow,
         endRow: endRow,
         columns: rangeColumns,
         startColumn: startDragCell.column,
         footerRowRange: footerRowRange
       };
+      var cellRanges = pipeline.getFeatureOptions(startSelectedCellRangesKey) ? _babel_runtime_corejs3_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_3___default()(pipeline.getFeatureOptions(startSelectedCellRangesKey)) : [];
 
-      if (isCellRangeSingleCell(rangeSelection)) {
-        artTable.classList.remove(classnames__WEBPACK_IMPORTED_MODULE_11___default()(_base_styles__WEBPACK_IMPORTED_MODULE_10__["Classes"].rangeSelection));
+      if (isCellRangeSingleCell([cellRange])) {
+        var singleCellRangeId = getCellRangeId(cellRange);
+        cellRanges = _babel_runtime_corejs3_core_js_stable_instance_filter__WEBPACK_IMPORTED_MODULE_4___default()(cellRanges).call(cellRanges, function (item) {
+          return getCellRangeId(item) !== singleCellRangeId;
+        });
+      }
+
+      cellRanges.push(cellRange);
+
+      if (isCellRangeSingleCell(cellRanges)) {
+        artTable.classList.remove(classnames__WEBPACK_IMPORTED_MODULE_13___default()(_base_styles__WEBPACK_IMPORTED_MODULE_12__["Classes"].rangeSelection));
       } else {
-        artTable.classList.add(classnames__WEBPACK_IMPORTED_MODULE_11___default()(_base_styles__WEBPACK_IMPORTED_MODULE_10__["Classes"].rangeSelection));
+        artTable.classList.add(classnames__WEBPACK_IMPORTED_MODULE_13___default()(_base_styles__WEBPACK_IMPORTED_MODULE_12__["Classes"].rangeSelection));
       }
 
-      rangeSelectedChange(rangeSelection);
+      rangeSelectedChange(cellRanges, isFinished);
     };
 
     var shiftKeySelect = function shiftKeySelect(event) {
@@ -49534,81 +49686,115 @@ function rangeSelection(opts) {
       var clickCell = getTargetCell(target, columns);
 
       if (clickCell) {
-        if (event.shiftKey) {
-          var _lastClickCell = pipeline.getFeatureOptions(lastClickCellKey);
+        var _lastClickCell = pipeline.getFeatureOptions(lastClickCellKey);
 
-          if (_lastClickCell) {
-            setRangeSelection(_lastClickCell, clickCell);
-          } else {
-            // 第一次进来就按住shift键，这时候要记住点击的单元格
-            pipeline.setFeatureOptions(lastClickCellKey, clickCell);
-          }
+        if (_lastClickCell) {
+          setRangeSelection(_lastClickCell, clickCell, true);
         } else {
+          // 第一次进来就按住shift键，这时候要记住点击的单元格
           pipeline.setFeatureOptions(lastClickCellKey, clickCell);
-          setRangeSelection(clickCell, clickCell);
         }
       }
     };
 
-    var onMouseDown = function onMouseDown(mouseDownEvent) {
-      if (mouseDownEvent.button !== 0 || !(Object(_utils__WEBPACK_IMPORTED_MODULE_6__["isElementInEventPath"])(tableBody, mouseDownEvent.nativeEvent) || Object(_utils__WEBPACK_IMPORTED_MODULE_6__["isElementInEventPath"])(tableFooter, mouseDownEvent.nativeEvent))) return; // mouseDownEvent.preventDefault()
-      // shift + 点击选中
-
-      shiftKeySelect(mouseDownEvent);
-      if (mouseDownEvent.shiftKey) return;
-      var target = mouseDownEvent.target;
-      var startDragCell = getTargetCell(target, columns);
-      var mousemove$ = Object(rxjs__WEBPACK_IMPORTED_MODULE_8__["fromEvent"])(window, 'mousemove');
-      var mouseup$ = Object(rxjs__WEBPACK_IMPORTED_MODULE_8__["fromEvent"])(window, 'mouseup');
+    var updateScrollPosition = function updateScrollPosition(client) {
+      var clientX = client.clientX,
+          clientY = client.clientY;
       var tableBodyClientRect = tableBody.getBoundingClientRect();
+      var left = tableBodyClientRect.left,
+          top = tableBodyClientRect.top,
+          height = tableBodyClientRect.height,
+          width = tableBodyClientRect.width;
 
-      var updateScrollPosition = function updateScrollPosition(client) {
-        var clientX = client.clientX,
-            clientY = client.clientY;
-        var left = tableBodyClientRect.left,
-            top = tableBodyClientRect.top,
-            height = tableBodyClientRect.height,
-            width = tableBodyClientRect.width;
+      if (clientX + SCROLL_OFFSET >= left + width) {
+        pipeline.ref.current.domHelper.virtual.scrollLeft += SCROLL_OFFSET;
+      }
 
-        if (clientX + SCROLL_SIZE >= left + width) {
-          pipeline.ref.current.domHelper.virtual.scrollLeft += SCROLL_SIZE;
-        }
+      if (clientX - SCROLL_OFFSET <= left) {
+        pipeline.ref.current.domHelper.virtual.scrollLeft -= SCROLL_OFFSET;
+      }
 
-        if (clientX - SCROLL_SIZE <= left) {
-          pipeline.ref.current.domHelper.virtual.scrollLeft -= SCROLL_SIZE;
-        }
+      if (clientY + SCROLL_OFFSET >= top + height) {
+        pipeline.ref.current.domHelper.tableBody.scrollTop += SCROLL_OFFSET;
+      }
 
-        if (clientY + SCROLL_SIZE >= top + height) {
-          pipeline.ref.current.domHelper.tableBody.scrollTop += SCROLL_SIZE;
-        }
+      if (clientY + SCROLL_OFFSET <= top) {
+        pipeline.ref.current.domHelper.tableBody.scrollTop -= SCROLL_OFFSET;
+      }
+    };
 
-        if (clientY + SCROLL_SIZE <= top) {
-          pipeline.ref.current.domHelper.tableBody.scrollTop -= SCROLL_SIZE;
-        }
-      };
+    var setStartSelectedCellRanges = function setStartSelectedCellRanges(isCtrlKey, isShiftKey) {
+      if (opts === null || opts === void 0 ? void 0 : opts.suppressMultiRangeSelection) {
+        pipeline.setFeatureOptions(startSelectedCellRangesKey, []);
+        return;
+      } // ctrl 和shift 同时按时，优先生效shift
+      // 没有点击ctrl 或者shift时，每次点击开始时都清空选中范围
+
+
+      if (!isCtrlKey && !isShiftKey) {
+        pipeline.setFeatureOptions(startSelectedCellRangesKey, []);
+      } // shift 点击框选，要保留之前的选中结果。最新的框选范围覆盖最后一次的框选范围
 
-      var rangeSelected$ = mousemove$.pipe(Object(rxjs_operators__WEBPACK_IMPORTED_MODULE_9__["map"])(function (mouseMoveEvent) {
+
+      if (isShiftKey) {
+        var _startDragCellRanges = pipeline.getFeatureOptions(startSelectedCellRangesKey) ? _babel_runtime_corejs3_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_3___default()(pipeline.getFeatureOptions(startSelectedCellRangesKey)) : [];
+
+        _startDragCellRanges.pop();
+
+        pipeline.setFeatureOptions(startSelectedCellRangesKey, _startDragCellRanges);
+      }
+    };
+
+    var onMouseDown = function onMouseDown(mouseDownEvent) {
+      if (mouseDownEvent.button !== 0 || !(Object(_utils__WEBPACK_IMPORTED_MODULE_8__["isElementInEventPath"])(tableBody, mouseDownEvent.nativeEvent) || Object(_utils__WEBPACK_IMPORTED_MODULE_8__["isElementInEventPath"])(tableFooter, mouseDownEvent.nativeEvent))) return; // mouseDownEvent.preventDefault()
+
+      var isCtrlKey = mouseDownEvent.ctrlKey || mouseDownEvent.metaKey;
+      var isShiftKey = mouseDownEvent.shiftKey;
+      var target = mouseDownEvent.target; // 每次点击时先确认初始生效的框选范围
+
+      setStartSelectedCellRanges(isCtrlKey, isShiftKey);
+
+      if (isShiftKey) {
+        shiftKeySelect(mouseDownEvent);
+        return;
+      }
+
+      var startDragCell = getTargetCell(target, columns);
+      pipeline.setFeatureOptions(lastClickCellKey, startDragCell);
+      var draggingCell = startDragCell;
+      var mousemove$ = Object(rxjs__WEBPACK_IMPORTED_MODULE_10__["fromEvent"])(window, 'mousemove');
+      var mouseup$ = Object(rxjs__WEBPACK_IMPORTED_MODULE_10__["fromEvent"])(window, 'mouseup');
+      var rangeSelected$ = mousemove$.pipe(Object(rxjs_operators__WEBPACK_IMPORTED_MODULE_11__["map"])(function (mouseMoveEvent) {
         var target = mouseMoveEvent.target || mouseMoveEvent.srcElement;
-        var draggingCell = getTargetCell(target, columns);
+        draggingCell = getTargetCell(target, columns);
         var client = {
           clientX: mouseMoveEvent.clientX,
           clientY: mouseMoveEvent.clientY
         };
-        updateScrollPosition(client);
+
+        if (!(draggingCell === null || draggingCell === void 0 ? void 0 : draggingCell.isFooterCell)) {
+          updateScrollPosition(client);
+        }
+
         return {
           startDragCell: startDragCell,
           draggingCell: draggingCell
         };
-      }), Object(rxjs_operators__WEBPACK_IMPORTED_MODULE_9__["takeUntil"])(mouseup$));
-      rangeSelected$.subscribe(function (_ref) {
-        var startDragCell = _ref.startDragCell,
-            draggingCell = _ref.draggingCell;
-        setRangeSelection(startDragCell, draggingCell);
+      }), Object(rxjs_operators__WEBPACK_IMPORTED_MODULE_11__["takeUntil"])(mouseup$));
+      rangeSelected$.subscribe({
+        next: function next(_ref) {
+          var startDragCell = _ref.startDragCell,
+              draggingCell = _ref.draggingCell;
+          setRangeSelection(startDragCell, draggingCell, false);
+        },
+        complete: function complete() {
+          setRangeSelection(startDragCell, draggingCell, true);
+        }
       });
     };
 
     var onKeyDown = function onKeyDown(e) {
-      if (!(Object(_utils__WEBPACK_IMPORTED_MODULE_6__["isElementInEventPath"])(tableBody, e.nativeEvent) || Object(_utils__WEBPACK_IMPORTED_MODULE_6__["isElementInEventPath"])(tableFooter, e.nativeEvent))) return;
+      if (!(Object(_utils__WEBPACK_IMPORTED_MODULE_8__["isElementInEventPath"])(tableBody, e.nativeEvent) || Object(_utils__WEBPACK_IMPORTED_MODULE_8__["isElementInEventPath"])(tableFooter, e.nativeEvent))) return;
 
       if ((e.ctrlKey || e.metaKey) && e.key === 'a') {
         var rowLen = pipeline.getDataSource().length;
@@ -49616,17 +49802,17 @@ function rangeSelection(opts) {
 
         if (columns.length && rowLen && !getElementEditable(e.target)) {
           opts.preventkDefaultOfKeyDownEvent !== false && e.preventDefault();
-          artTable.classList.add(classnames__WEBPACK_IMPORTED_MODULE_11___default()(_base_styles__WEBPACK_IMPORTED_MODULE_10__["Classes"].rangeSelection));
-          rangeSelectedChange({
+          artTable.classList.add(classnames__WEBPACK_IMPORTED_MODULE_13___default()(_base_styles__WEBPACK_IMPORTED_MODULE_12__["Classes"].rangeSelection));
+          rangeSelectedChange([{
             startRow: 0,
             endRow: rowLen - 1,
-            columns: Object(_utils__WEBPACK_IMPORTED_MODULE_6__["collectNodes"])(columns, 'leaf-only'),
+            columns: Object(_utils__WEBPACK_IMPORTED_MODULE_8__["collectNodes"])(columns, 'leaf-only'),
             startColumn: columns[0],
             footerRowRange: footerDataSource.length > 0 ? {
               startRow: 0,
               endRow: footerDataSource.length - 1
             } : null
-          });
+          }], true);
         }
       }
     };
@@ -49635,46 +49821,26 @@ function rangeSelection(opts) {
       onMouseDown: onMouseDown,
       onKeyDown: onKeyDown,
       tabIndex: -1,
-      className: classnames__WEBPACK_IMPORTED_MODULE_11___default()([_base_styles__WEBPACK_IMPORTED_MODULE_10__["Classes"].rangeSelection])
+      className: classnames__WEBPACK_IMPORTED_MODULE_13___default()([_base_styles__WEBPACK_IMPORTED_MODULE_12__["Classes"].rangeSelection])
     }); // todo: 后面可以把mousedown放到一个流里面
 
-    return pipeline.mapColumns(Object(_utils__WEBPACK_IMPORTED_MODULE_6__["makeRecursiveMapper"])(function (col) {
-      var _context;
-
-      var rangeSelection = pipeline.getStateAtKey(rangeSelectionKey);
-      if (!rangeSelection || _babel_runtime_corejs3_core_js_stable_instance_find_index__WEBPACK_IMPORTED_MODULE_3___default()(_context = rangeSelection.columns).call(_context, function (selectedCol) {
-        return selectedCol.code === col.code;
-      }) === -1) return col;
+    return pipeline.mapColumns(Object(_utils__WEBPACK_IMPORTED_MODULE_8__["makeRecursiveMapper"])(function (col) {
+      var cellRanges = pipeline.getStateAtKey(rangeSelectionKey) || [];
       var prevGetCellProps = col.getCellProps;
       return _babel_runtime_corejs3_helpers_extends__WEBPACK_IMPORTED_MODULE_2___default()(_babel_runtime_corejs3_helpers_extends__WEBPACK_IMPORTED_MODULE_2___default()({}, col), {
         getCellProps: function getCellProps(value, record, rowIndex) {
-          var _cx;
-
           var prevCellProps = prevGetCellProps === null || prevGetCellProps === void 0 ? void 0 : prevGetCellProps(value, record, rowIndex);
-          var isInFooter = record[pipeline.getFeatureOptions('footerRowMetaKey')];
-          var startRow = rangeSelection.startRow,
-              endRow = rangeSelection.endRow,
-              columns = rangeSelection.columns,
-              footerRowRange = rangeSelection.footerRowRange;
-
-          var _getRowIndex = getRowIndex(startRow, endRow),
-              startRowIndex = _getRowIndex.startRowIndex,
-              endRowIndex = _getRowIndex.endRowIndex;
-
-          var _getFooterRowIndex = getFooterRowIndex(footerRowRange),
-              footerStartRowIndex = _getFooterRowIndex.startRowIndex,
-              footerEndRowIndex = _getFooterRowIndex.endRowIndex;
-
-          var startCol = columns[0];
-          var endCol = columns[columns.length - 1];
-          var bodyMatch = !isInFooter && rowIndex >= startRowIndex && rowIndex <= endRowIndex;
-          var footerMatch = isInFooter && footerRowRange && rowIndex >= footerStartRowIndex && rowIndex <= footerEndRowIndex;
-          var match = footerMatch || bodyMatch;
-          var matchSingleCell = match && isCellRangeSingleCell(rangeSelection); // 单个范围选中单元格不显示样式
-
-          var showCellRangeStyle = match && !matchSingleCell;
-          var className = classnames__WEBPACK_IMPORTED_MODULE_11___default()((_cx = {}, _babel_runtime_corejs3_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_cx, _base_styles__WEBPACK_IMPORTED_MODULE_10__["Classes"].tableCellRangeSingleCell, matchSingleCell), _babel_runtime_corejs3_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_cx, _base_styles__WEBPACK_IMPORTED_MODULE_10__["Classes"].tableCellRangeSelected, showCellRangeStyle), _babel_runtime_corejs3_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_cx, _base_styles__WEBPACK_IMPORTED_MODULE_10__["Classes"].tableCellRangeTop, showCellRangeStyle && (isInFooter ? startRowIndex !== -1 ? false : rowIndex === footerStartRowIndex : rowIndex === startRowIndex)), _babel_runtime_corejs3_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_cx, _base_styles__WEBPACK_IMPORTED_MODULE_10__["Classes"].tableCellRangeLeft, showCellRangeStyle && col.code === startCol.code), _babel_runtime_corejs3_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_cx, _base_styles__WEBPACK_IMPORTED_MODULE_10__["Classes"].tableCellRangeBottom, showCellRangeStyle && (isInFooter ? rowIndex === footerEndRowIndex : footerRowRange ? false : rowIndex === endRowIndex)), _babel_runtime_corejs3_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_cx, _base_styles__WEBPACK_IMPORTED_MODULE_10__["Classes"].tableCellRangeRight, showCellRangeStyle && col.code === endCol.code), _cx));
-          return Object(_utils__WEBPACK_IMPORTED_MODULE_6__["mergeCellProps"])(prevCellProps, {
+          var isFooterCell = record[pipeline.getFeatureOptions('footerRowMetaKey')];
+          if (!cellRanges.some(function (cellRange) {
+            return isCellInRange(cellRange, rowIndex, col, isFooterCell);
+          })) return prevCellProps;
+          var className = getCellRangesClassName(cellRanges, {
+            isFooterCell: isFooterCell,
+            rowIndex: rowIndex,
+            col: col,
+            record: record
+          });
+          return Object(_utils__WEBPACK_IMPORTED_MODULE_8__["mergeCellProps"])(prevCellProps, {
             className: className
           });
         }
@@ -49688,7 +49854,7 @@ function getTargetCell(target, columns) {
     if (target.getAttribute('data-role') === 'table-cell') {
       var _ret = function () {
         var columnCode = target.getAttribute('data-code');
-        var column = Object(_utils_others__WEBPACK_IMPORTED_MODULE_7__["findByTree"])(columns, function (item, index) {
+        var column = Object(_utils_others__WEBPACK_IMPORTED_MODULE_9__["findByTree"])(columns, function (item, index) {
           return item.code === columnCode;
         });
         if (!column) return {
@@ -49700,12 +49866,12 @@ function getTargetCell(target, columns) {
             rowSpan: parseInt(target.getAttribute('rowspan') || 1),
             code: columnCode,
             column: column,
-            isInFooter: isEleInFooter(target)
+            isFooterCell: isEleInFooter(target)
           }
         };
       }();
 
-      if (_babel_runtime_corejs3_helpers_typeof__WEBPACK_IMPORTED_MODULE_0___default()(_ret) === "object") return _ret.v;
+      if (_babel_runtime_corejs3_helpers_typeof__WEBPACK_IMPORTED_MODULE_1___default()(_ret) === "object") return _ret.v;
     }
 
     target = target.parentElement;
@@ -49715,12 +49881,12 @@ function getTargetCell(target, columns) {
 }
 
 function isSameCell(cell1, cell2) {
-  return cell1.rowIndex === cell2.rowIndex && cell1.code === cell2.code && cell1.isInFooter === cell2.isInFooter;
+  return cell1.rowIndex === cell2.rowIndex && cell1.code === cell2.code && cell1.isFooterCell === cell2.isFooterCell;
 }
 
 function isEleInFooter(target) {
-  while (target && !target.classList.contains(_base_styles__WEBPACK_IMPORTED_MODULE_10__["Classes"].artTable)) {
-    if (target.classList.contains(_base_styles__WEBPACK_IMPORTED_MODULE_10__["Classes"].tableFooter)) {
+  while (target && !target.classList.contains(_base_styles__WEBPACK_IMPORTED_MODULE_12__["Classes"].artTable)) {
+    if (target.classList.contains(_base_styles__WEBPACK_IMPORTED_MODULE_12__["Classes"].tableFooter)) {
       return true;
     }
 
@@ -49731,20 +49897,20 @@ function isEleInFooter(target) {
 }
 
 function getRangeColumns(startCell, endCell, columns) {
-  var flatColumns = Object(_utils__WEBPACK_IMPORTED_MODULE_6__["collectNodes"])(columns, 'leaf-only');
+  var flatColumns = Object(_utils__WEBPACK_IMPORTED_MODULE_8__["collectNodes"])(columns, 'leaf-only');
 
-  var startIndex = _babel_runtime_corejs3_core_js_stable_instance_find_index__WEBPACK_IMPORTED_MODULE_3___default()(flatColumns).call(flatColumns, function (col) {
+  var startIndex = _babel_runtime_corejs3_core_js_stable_instance_find_index__WEBPACK_IMPORTED_MODULE_5___default()(flatColumns).call(flatColumns, function (col) {
     return col.code === startCell.code;
   });
 
-  var endIndex = _babel_runtime_corejs3_core_js_stable_instance_find_index__WEBPACK_IMPORTED_MODULE_3___default()(flatColumns).call(flatColumns, function (col) {
+  var endIndex = _babel_runtime_corejs3_core_js_stable_instance_find_index__WEBPACK_IMPORTED_MODULE_5___default()(flatColumns).call(flatColumns, function (col) {
     return col.code === endCell.code;
   });
 
   if (startIndex < endIndex) {
-    return _babel_runtime_corejs3_core_js_stable_instance_slice__WEBPACK_IMPORTED_MODULE_4___default()(flatColumns).call(flatColumns, startIndex, endIndex + 1);
+    return _babel_runtime_corejs3_core_js_stable_instance_slice__WEBPACK_IMPORTED_MODULE_6___default()(flatColumns).call(flatColumns, startIndex, endIndex + 1);
   } else {
-    return _babel_runtime_corejs3_core_js_stable_instance_slice__WEBPACK_IMPORTED_MODULE_4___default()(flatColumns).call(flatColumns, endIndex, startIndex + 1);
+    return _babel_runtime_corejs3_core_js_stable_instance_slice__WEBPACK_IMPORTED_MODULE_6___default()(flatColumns).call(flatColumns, endIndex, startIndex + 1);
   }
 }
 
@@ -49758,10 +49924,10 @@ function getRangeSelectionRowInfo(startCell, endCell, dataSource) {
       _endRow = _getCellRangeRow.endRow; // 两个单元格都在表体
 
 
-  if (!startCell.isInFooter && !endCell.isInFooter) {
+  if (!startCell.isFooterCell && !endCell.isFooterCell) {
     startRow = _startRow;
     endRow = _endRow;
-  } else if (startCell.isInFooter && endCell.isInFooter) {
+  } else if (startCell.isFooterCell && endCell.isFooterCell) {
     // 两个单元格都在表底
     footerRowRange = {
       startRow: _startRow,
@@ -49769,7 +49935,7 @@ function getRangeSelectionRowInfo(startCell, endCell, dataSource) {
     };
   } else {
     // 一个单元格在表体，一个在表底
-    if (startCell.isInFooter) {
+    if (startCell.isFooterCell) {
       startRow = dataSource.length - 1;
       endRow = endCell.rowIndex;
       footerRowRange = {
@@ -49792,6 +49958,13 @@ function getRangeSelectionRowInfo(startCell, endCell, dataSource) {
     footerRowRange: footerRowRange
   };
 }
+/**
+ * 获取框选范围的起始结束行
+ * @param startCell 起始单元格
+ * @param endCell 结束单元格
+ * @returns
+ */
+
 
 function getCellRangeRow(startCell, endCell) {
   if (isSameCell(startCell, endCell)) {
@@ -49809,12 +49982,20 @@ function getCellRangeRow(startCell, endCell) {
     endRow: endRow
   };
 }
+/**
+ * 框选范围是否只包含单个单元格
+ * @param cellRanges
+ * @returns
+ */
+
 
-function isCellRangeSingleCell(rangeSelection) {
-  var startRow = rangeSelection.startRow,
-      endRow = rangeSelection.endRow,
-      columns = rangeSelection.columns,
-      footerRowRange = rangeSelection.footerRowRange;
+function isCellRangeSingleCell(cellRanges) {
+  if (cellRanges.length !== 1) return false;
+  var _cellRanges$ = cellRanges[0],
+      startRow = _cellRanges$.startRow,
+      endRow = _cellRanges$.endRow,
+      columns = _cellRanges$.columns,
+      footerRowRange = _cellRanges$.footerRowRange;
   var isBodySingleCell = !footerRowRange && startRow === endRow && columns.length === 1;
   var isFooterSingleCell = startRow === -1 && footerRowRange.startRow === footerRowRange.endRow && columns.length === 1;
   return isBodySingleCell || isFooterSingleCell;
@@ -49842,15 +50023,143 @@ function getFooterRowIndex(footerRowRange) {
 }
 
 function getElementEditable(target) {
-  var _context2;
+  var _context;
 
   if (!target) return;
 
-  if (_babel_runtime_corejs3_core_js_stable_instance_includes__WEBPACK_IMPORTED_MODULE_5___default()(_context2 = ['input', 'textarea']).call(_context2, target.tagName.toLowerCase())) {
+  if (_babel_runtime_corejs3_core_js_stable_instance_includes__WEBPACK_IMPORTED_MODULE_7___default()(_context = ['input', 'textarea']).call(_context, target.tagName.toLowerCase())) {
     if (target.type === 'checkbox') return;
     return !target.disabled && !target.readOnly;
   }
 }
+/**
+ * 判断单元格是否在框选范围内
+ * @param cellRange
+ * @param rowIndex
+ * @param col
+ * @param isFooterCell
+ * @returns
+ */
+
+
+function isCellInRange(cellRange, rowIndex, col, isFooterCell) {
+  var startRow = cellRange.startRow,
+      endRow = cellRange.endRow,
+      columns = cellRange.columns,
+      footerRowRange = cellRange.footerRowRange;
+  var isColInRanges = _babel_runtime_corejs3_core_js_stable_instance_find_index__WEBPACK_IMPORTED_MODULE_5___default()(columns).call(columns, function (item) {
+    return item.code === col.code;
+  }) !== -1;
+  if (!isColInRanges) return false;
+
+  var _getRowIndex = getRowIndex(startRow, endRow),
+      startRowIndex = _getRowIndex.startRowIndex,
+      endRowIndex = _getRowIndex.endRowIndex;
+
+  var _getFooterRowIndex = getFooterRowIndex(footerRowRange),
+      footerStartRowIndex = _getFooterRowIndex.startRowIndex,
+      footerEndRowIndex = _getFooterRowIndex.endRowIndex;
+
+  var bodyMatch = !isFooterCell && rowIndex >= startRowIndex && rowIndex <= endRowIndex;
+  var footerMatch = isFooterCell && footerRowRange && rowIndex >= footerStartRowIndex && rowIndex <= footerEndRowIndex;
+  var isRowInRange = footerMatch || bodyMatch;
+  return isRowInRange;
+}
+/**
+ * 获取框选范围唯一标识
+ * @param {*} cellRange
+ * @returns
+ */
+
+
+function getCellRangeId(cellRange) {
+  var startRow = cellRange.startRow,
+      endRow = cellRange.endRow,
+      footerRowRange = cellRange.footerRowRange,
+      columns = cellRange.columns;
+
+  var _getRowIndex2 = getRowIndex(startRow, endRow),
+      startRowIndex = _getRowIndex2.startRowIndex,
+      endRowIndex = _getRowIndex2.endRowIndex;
+
+  var _getFooterRowIndex2 = getFooterRowIndex(footerRowRange),
+      footerStartRowIndex = _getFooterRowIndex2.startRowIndex,
+      footerEndRowIndex = _getFooterRowIndex2.endRowIndex;
+
+  var firstColId = columns[0].code;
+  var endColId = columns[columns.length - 1].code;
+  return startRowIndex + '_' + endRowIndex + '_' + footerStartRowIndex + '_' + footerEndRowIndex + '_' + firstColId + '_' + endColId;
+}
+/**
+ * 获取框选范围中单元格的样式
+ * @param cellRanges
+ * @param param1
+ * @returns
+ */
+
+function getCellRangesClassName(cellRanges, _ref2) {
+  var _cx;
+
+  var isFooterCell = _ref2.isFooterCell,
+      rowIndex = _ref2.rowIndex,
+      col = _ref2.col,
+      record = _ref2.record;
+
+  var _getMatchBorderStyle = getMatchBorderStyle(cellRanges, {
+    isFooterCell: isFooterCell,
+    rowIndex: rowIndex,
+    col: col,
+    record: record
+  }),
+      matchCellRangeTop = _getMatchBorderStyle.matchCellRangeTop,
+      matchCellRangeLeft = _getMatchBorderStyle.matchCellRangeLeft,
+      matchCellRangeBottom = _getMatchBorderStyle.matchCellRangeBottom,
+      matchCellRangeRight = _getMatchBorderStyle.matchCellRangeRight;
+
+  var isSingleCell = isCellRangeSingleCell(cellRanges);
+  var className = classnames__WEBPACK_IMPORTED_MODULE_13___default()((_cx = {}, _babel_runtime_corejs3_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_cx, _base_styles__WEBPACK_IMPORTED_MODULE_12__["Classes"].tableCellRangeSingleCell, isSingleCell), _babel_runtime_corejs3_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_cx, _base_styles__WEBPACK_IMPORTED_MODULE_12__["Classes"].tableCellRangeSelected, !isSingleCell), _babel_runtime_corejs3_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_cx, _base_styles__WEBPACK_IMPORTED_MODULE_12__["Classes"].tableCellRangeTop, !isSingleCell && matchCellRangeTop), _babel_runtime_corejs3_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_cx, _base_styles__WEBPACK_IMPORTED_MODULE_12__["Classes"].tableCellRangeLeft, !isSingleCell && matchCellRangeLeft), _babel_runtime_corejs3_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_cx, _base_styles__WEBPACK_IMPORTED_MODULE_12__["Classes"].tableCellRangeBottom, !isSingleCell && matchCellRangeBottom), _babel_runtime_corejs3_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_cx, _base_styles__WEBPACK_IMPORTED_MODULE_12__["Classes"].tableCellRangeRight, !isSingleCell && matchCellRangeRight), _cx));
+  return className;
+}
+
+function getMatchBorderStyle(cellRanges, _ref3) {
+  var isFooterCell = _ref3.isFooterCell,
+      rowIndex = _ref3.rowIndex,
+      col = _ref3.col,
+      record = _ref3.record;
+  return cellRanges.reduce(function (obj, cellRange) {
+    if (!isCellInRange(cellRange, rowIndex, col, isFooterCell)) return obj;
+    var startRow = cellRange.startRow,
+        endRow = cellRange.endRow,
+        columns = cellRange.columns,
+        footerRowRange = cellRange.footerRowRange;
+
+    var _getRowIndex3 = getRowIndex(startRow, endRow),
+        startRowIndex = _getRowIndex3.startRowIndex,
+        endRowIndex = _getRowIndex3.endRowIndex;
+
+    var _getFooterRowIndex3 = getFooterRowIndex(footerRowRange),
+        footerStartRowIndex = _getFooterRowIndex3.startRowIndex,
+        footerEndRowIndex = _getFooterRowIndex3.endRowIndex;
+
+    var startCol = columns[0];
+    var endCol = columns[columns.length - 1];
+    var matchCellRangeTop = isFooterCell ? startRowIndex !== -1 ? false : rowIndex === footerStartRowIndex : rowIndex === startRowIndex;
+    var matchCellRangeLeft = col.code === startCol.code;
+    var matchCellRangeBottom = isFooterCell ? rowIndex === footerEndRowIndex : footerRowRange ? false : rowIndex === endRowIndex;
+    var matchCellRangeRight = col.code === endCol.code; // 如果样式已经匹配上了，就不需要再取计算的样式
+
+    obj.matchCellRangeTop = obj.matchCellRangeTop || matchCellRangeTop;
+    obj.matchCellRangeLeft = obj.matchCellRangeLeft || matchCellRangeLeft;
+    obj.matchCellRangeBottom = obj.matchCellRangeBottom || matchCellRangeBottom;
+    obj.matchCellRangeRight = obj.matchCellRangeRight || matchCellRangeRight;
+    return obj;
+  }, {
+    matchCellRangeTop: false,
+    matchCellRangeLeft: false,
+    matchCellRangeBottom: false,
+    matchCellRangeRight: false
+  });
+}
 
 /***/ }),