@kdcloudjs/kdesign 1.7.24 → 1.7.25

package/lib/city-picker/style/index.css

@@ -264,6 +264,12 @@
   padding: 0 12px;
   font-size: 12px;
 }
+.kd-city-picker-dropdown .kd-tabs-tab-list .kd-tab-pane-type-line .kd-tab-pane-text {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  width: 100%;
+}
 .kd-city-picker-dropdown .kd-tabs-noContainer {
   height: unset;
 }
@@ -311,6 +317,9 @@
           box-sizing: content-box;
 }
 .kd-city-picker-list-item {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
   position: relative;
   display: block;
   font-weight: normal;
@@ -319,16 +328,8 @@
   padding: 5px 12px;
   color: var(--kd-c-city-picker-footer-color-text, var(--kd-g-color-text-primary, #212121));
   line-height: var(--kd-c-city-picker-dropdown-line-height, 22px);
-  display: -webkit-box;
-  display: -ms-flexbox;
-  display: flex;
   cursor: pointer;
 }
-.kd-city-picker-list-item-content {
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-}
 .kd-city-picker-list-item-info {
   color: var(--kd-c-city-picker-placeholder-color-text, #b2b2b2);
   white-space: nowrap;
@@ -337,7 +338,8 @@
   background-color: var(--kd-c-city-picker-color-background, #f5f5f5);
 }
 .kd-city-picker-list-item-selected:not(.kd-city-picker-list-item-disabled) {
-  background-color: var(--kd-c-city-picker-color-background-selected, #f2f6ff);
+  background-color: var(--kd-c-city-picker-color-background-selected, var(--kd-g-color-theme-3, #e3eeff));
+  color: var(--kd-c-city-picker-list-item-color-text-selected, var(--kd-g-color-theme, #5582f3));
 }
 .kd-city-picker-list-item-disabled {
   color: var(--kd-c-city-picker-item-color-text-disabled, var(--kd-g-color-disabled, #b2b2b2));
@@ -345,7 +347,7 @@
   background-color: var(--kd-c-city-picker-item-color-background-disabled, #fff);
 }
 .kd-city-picker-highlight {
-  color: #5582f3;
+  color: var(--kd-c-city-picker-highlight-color-text, var(--kd-g-color-theme, #5582f3));
 }
 .kd-city-picker-size-small {
   min-height: var(--kd-c-city-picker-sizing-height-small, 24px);

package/lib/city-picker/style/index.less

@@ -159,6 +159,11 @@
         &-type-line {
           padding: 0 12px;
           font-size: 12px;
+
+          .@{kd-prefix}-tab-pane-text {
+            .over();
+            width: 100%;
+          }
         }
       }
     }
@@ -204,14 +209,10 @@
 
     // 下拉列表选项
     &-item {
+      .over();
       .item();
-      display: flex;
       cursor: pointer;
 
-      &-content {
-        .over();
-      }
-
       &-info {
         color: @city-picker-placeholder-color;
         white-space: nowrap;
@@ -223,6 +224,7 @@
 
       &-selected:not(&-disabled) {
         background-color: @city-picker-item-selected-bg;
+        color: @city-picker-list-item-color-selected;
       }
 
       &-disabled {
@@ -234,7 +236,7 @@
   }
 
   &-highlight {
-    color: #5582f3;
+    color: @city-picker-highlight-color;
   }
 
   // 选择器框大小

package/lib/city-picker/style/token.less

@@ -6,7 +6,7 @@
 @city-picker-dropdown-bg: var(~'@{city-picker-custom-prefix}-dropdown-color-background', @color-background);
 @city-picker-disabled-option-bg: var(~'@{city-picker-custom-prefix}-item-color-background-disabled', #fff);
 @city-picker-item-active-bg: var(~'@{city-picker-custom-prefix}-color-background', #f5f5f5);
-@city-picker-item-selected-bg: var(~'@{city-picker-custom-prefix}-color-background-selected', #f2f6ff);
+@city-picker-item-selected-bg: var(~'@{city-picker-custom-prefix}-color-background-selected', @color-theme-3);
 @city-picker-g-color-border: var(~'@{city-picker-custom-prefix}-color-border', @color-input);
 @city-picker-g-color-border-foucs: var(~'@{city-picker-custom-prefix}-color-border-foucs', @color-theme);
 @city-picker-g-color-border-hover: var(~'@{city-picker-custom-prefix}-color-border-hover', @color-theme);
@@ -16,12 +16,11 @@
 @city-picker-g-item-text-color-disabled: var(~'@{city-picker-custom-prefix}-item-color-text-disabled', @color-disabled);
 @city-picker-color-background-disabled: var(~'@{city-picker-custom-prefix}-color-background-disabled', #fff);
 @city-picker-color-text-disabled: var(~'@{city-picker-custom-prefix}-color-text-disabled', @color-disabled);
-@city-picker-arrow-icon-color-text-disabled: var(
-  ~'@{city-picker-custom-prefix}-arrow-icon-color-text-disabled',
-  #b2b2b2
-);
+@city-picker-arrow-icon-color-text-disabled: var(~'@{city-picker-custom-prefix}-arrow-icon-color-text-disabled', #b2b2b2);
 @city-picker-clear-color: var(~'@{city-picker-custom-prefix}-icon-clear-color-text', #d9d9d9);
 @city-picker-clear-color-hover: var(~'@{city-picker-custom-prefix}-icon-clear-color-text-hover', #999);
+@city-picker-list-item-color-selected: var(~'@{city-picker-custom-prefix}-list-item-color-text-selected', @color-theme);
+@city-picker-highlight-color: var(~'@{city-picker-custom-prefix}-highlight-color-text', @color-theme);
 
 // font
 @city-picker-list-font-size: var(~'@{city-picker-custom-prefix}-dropdown-font-size', 12px); // 下拉列表文字大小

package/lib/input-number/inputNumber.js

@@ -22,6 +22,7 @@ var _formatUtil = require("../_utils/formatUtil");
 var _devwarning = _interopRequireDefault(require("../_utils/devwarning"));
 var _big = _interopRequireDefault(require("big.js"));
 var _classnames = _interopRequireDefault(require("classnames"));
+var _useSelectionRange = _interopRequireDefault(require("./useSelectionRange"));
 function _getRequireWildcardCache(nodeInterop) { if (typeof _WeakMap !== "function") return null; var cacheBabelInterop = new _WeakMap(); var cacheNodeInterop = new _WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && _Object$getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? _Object$getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 var __rest = void 0 && (void 0).__rest || function (s, e) {
@@ -33,6 +34,7 @@ var __rest = void 0 && (void 0).__rest || function (s, e) {
   return t;
 };
 var InternalInputNumber = function InternalInputNumber(props, ref) {
+  var _a;
   var _useContext = (0, _react.useContext)(_ConfigContext.default),
     userDefaultProps = _useContext.compDefaultProps,
     getPrefixCls = _useContext.getPrefixCls,
@@ -122,6 +124,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));
   };
@@ -237,10 +240,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);
@@ -312,9 +317,16 @@ var InternalInputNumber = function InternalInputNumber(props, ref) {
       }
     };
   });
+  var displayedInputValue = (0, _react.useMemo)(function () {
+    return formatter ? formatter(inputValue) : inputValue;
+  }, [inputValue, formatter]);
+  var updateSelectionRangePosition = (0, _useSelectionRange.default)({
+    inputElement: (_a = inputNumberRef.current) === null || _a === void 0 ? void 0 : _a.input,
+    inputValue: displayedInputValue
+  });
   return /*#__PURE__*/_react.default.createElement(_input.default, (0, _extends2.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,

package/lib/input-number/useSelectionRange.d.ts

@@ -0,0 +1,4 @@
+export default function useSelectionRange({ inputElement, inputValue, }: {
+    inputElement: HTMLInputElement;
+    inputValue: string;
+}): (event: any) => void;

package/lib/input-number/useSelectionRange.js

@@ -0,0 +1,29 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = useSelectionRange;
+var _react = require("react");
+var _isNumber = _interopRequireDefault(require("lodash/isNumber"));
+function useSelectionRange(_ref) {
+  var inputElement = _ref.inputElement,
+    inputValue = _ref.inputValue;
+  var refSelectionPosition = (0, _react.useRef)();
+  (0, _react.useLayoutEffect)(function () {
+    var position = refSelectionPosition.current;
+    if (inputElement && inputValue && (0, _isNumber.default)(position)) {
+      var start = Math.max(0, inputValue.length - position);
+      inputElement.setSelectionRange(start, start);
+    }
+  }, [inputValue]);
+  return function (event) {
+    var _event$target = event.target,
+      end = _event$target.selectionEnd,
+      value = _event$target.value;
+    if ((0, _isNumber.default)(end)) {
+      refSelectionPosition.current = value.length - end;
+    }
+  };
+}

package/lib/locale/locale.d.ts

@@ -61,11 +61,11 @@ declare class LocaleCache {
         'QuickSearch.emptyTip': string;
         'QuickSearch.or': string;
         'CityPicker.domestic': string;
-        'CityPicker.internation': string;
         'CityPicker.common': string;
-        'CityPicker.noData': string; /**
-         * 获取所有语言包数据
-         */
+        'CityPicker.emptyText': string;
+        'CityPicker.commonEmptyText': string;
+        'CityPicker.tabsDomestic': string;
+        'CityPicker.tabsInternation': string;
         'ColorPicker.followFunctionalColor': string;
         'Search.placeholder': string;
         'Search.desc': string[];

package/lib/locale/zh-CN.d.ts

@@ -35,9 +35,11 @@ declare const locale: {
     'QuickSearch.emptyTip': string;
     'QuickSearch.or': string;
     'CityPicker.domestic': string;
-    'CityPicker.internation': string;
     'CityPicker.common': string;
-    'CityPicker.noData': string;
+    'CityPicker.emptyText': string;
+    'CityPicker.commonEmptyText': string;
+    'CityPicker.tabsDomestic': string;
+    'CityPicker.tabsInternation': string;
     'ColorPicker.followFunctionalColor': string;
     'Search.placeholder': string;
     'Search.desc': string[];

package/lib/locale/zh-CN.js

@@ -46,9 +46,11 @@ var locale = (0, _extends2.default)((0, _extends2.default)({
   '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': ['空格代表"或"，回车代表"且"'],

package/lib/radio/style/index.css

@@ -169,6 +169,7 @@
 .kd-radio-input {
   position: absolute;
   opacity: 0;
+  left: 0;
 }
 .kd-radio > span {
   padding: 0 6px 0 var(--kd-c-radio-spacing-padding-left, 4px);

package/lib/radio/style/index.less

@@ -60,6 +60,7 @@
   &-input {
     position: absolute;
     opacity: 0;
+    left: 0;
   }
 
   &>span {

package/lib/select/select.js

@@ -778,7 +778,7 @@ var InternalSelect = function InternalSelect(props, ref) {
     // open
     if (which === _KeyCode.default.ENTER || which === _KeyCode.default.UP || which === _KeyCode.default.DOWN) {
       e.preventDefault();
-      setOptionShow(true);
+      handleVisibleChange(true);
     }
     // backspace
     var _multipleRef$current5 = multipleRef.current,
@@ -822,10 +822,10 @@ var InternalSelect = function InternalSelect(props, ref) {
           }));
         }
         if (!isMultiple) {
-          setOptionShow(false);
+          handleVisibleChange(false);
         }
       } else if (which === _KeyCode.default.ESC) {
-        setOptionShow(false);
+        handleVisibleChange(false);
       }
       if (offset !== 0) {
         var nextActiveIndex = getActiveIndex(activeIndex + offset, offset);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kdcloudjs/kdesign",
-  "version": "1.7.24",
+  "version": "1.7.25",
   "description": "KDesign 金蝶前端react 组件库",
   "title": "kdesign",
   "keywords": [