@kdcloudjs/kdesign 1.7.24 → 1.7.25

package/dist/kdesign.js

@@ -1,6 +1,6 @@
 /*!
  * 
- *   @kdcloudjs/kdesign v1.7.23
+ *   @kdcloudjs/kdesign v1.7.24
  * 
  *   Copyright 2020-present, Kingdee, Inc.
  *   All rights reserved.
@@ -2245,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, "'"));
@@ -2530,7 +2531,8 @@ 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 = getRealDom(locatorRef, locatorElement);
@@ -7511,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,
@@ -7569,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
@@ -7618,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);
@@ -7724,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);
     }
@@ -7734,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);
@@ -7763,19 +7767,20 @@ 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)) {
-      var curVal = tabsValue === 'domestic' ? data === null || data === void 0 ? void 0 : data.province : data === null || data === void 0 ? void 0 : data.country;
+      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, tabsValue]);
   var renderSingle = function renderSingle() {
@@ -7802,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", {
@@ -7874,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);
 };
@@ -7953,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)))));
 };
@@ -20399,6 +20409,7 @@ __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");
 
 
 
@@ -20420,7 +20431,9 @@ 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,
@@ -20513,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));
   };
@@ -20622,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);
@@ -20697,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,
@@ -20742,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":
@@ -22612,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': ['空格代表"或"，回车代表"且"'],
@@ -29098,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,
@@ -29143,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);