@kdcloudjs/kdesign 1.7.60 → 1.7.61

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

@@ -167,6 +167,13 @@
   z-index: 1;
   position: absolute;
   top: 0;
+  bottom: 0;
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-align: center;
+      -ms-flex-align: center;
+          align-items: center;
   background: #fff;
   -webkit-transition: opacity 0.15s ease;
   transition: opacity 0.15s ease;

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

@@ -59,6 +59,9 @@
       z-index: 1;
       position: absolute;
       top: 0;
+      bottom: 0;
+      display: flex;
+      align-items: center;
       background: #fff;
       transition: opacity 0.15s ease;
       font-size: @city-picker-clear-font-size;

package/es/date-picker/date-panel.js

@@ -140,7 +140,7 @@ function Panel(props) {
   };
   var renderDateHeader = function renderDateHeader() {
     var year = getYear(viewDate);
-    var month = getMonth(viewDate) + 1;
+    var month = getMonth(viewDate);
     var headerCls = classnames("".concat(prefixCls, "-header"), "".concat(prefixCls, "-header-date"));
     return {
       children: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
@@ -149,7 +149,7 @@ function Panel(props) {
       }, year + locale.year), /*#__PURE__*/React.createElement("span", {
         className: classnames("".concat(prefixCls, "-header-text-inner"), "".concat(prefixCls, "-header-text-inner-hover"), _defineProperty({}, "".concat(prefixCls, "-header-text-inner-active"), isInnerMonth)),
         onClick: onHeaderMonthClick
-      }, month + locale.month)),
+      }, locale.monthTitle[month])),
       className: headerCls
     };
   };

package/es/date-picker/date-picker.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { DateType } from './interface';
+import { DateType, InnerLocale } from './interface';
 import { PickerPanelBaseProps, PickerPanelDateProps, PickerPanelTimeProps } from './date-panel';
 import { BorderType, InputSiteType } from '../input/input';
 export declare type CellRenderSubType = 'hour' | 'minute' | 'second' | '12Hours';
@@ -59,5 +59,6 @@ export interface PickerTimeProps extends PickerSharedProps, Omit<OmitPanelProps<
 }
 export declare type PickerProps = PickerBaseProps | PickerDateProps | PickerTimeProps;
 export declare type IInnerPicker = undefined | 'year' | 'month';
+export declare const mergeDateLocale: (globalLocale: InnerLocale, locale?: {}) => InnerLocale;
 declare const DatePicker: React.ForwardRefExoticComponent<(Partial<PickerBaseProps> & React.RefAttributes<unknown>) | (Partial<PickerDateProps> & React.RefAttributes<unknown>) | (Partial<PickerTimeProps> & React.RefAttributes<unknown>)>;
 export default DatePicker;

package/es/date-picker/date-picker.js

@@ -1,5 +1,7 @@
 import _slicedToArray from "@babel/runtime-corejs3/helpers/slicedToArray";
 import _extends from "@babel/runtime-corejs3/helpers/extends";
+import _Array$from from "@babel/runtime-corejs3/core-js-stable/array/from";
+import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
 import _findInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/find";
 import React, { useContext, useEffect, useState } from 'react';
 import classnames from 'classnames';
@@ -17,6 +19,28 @@ import useTextValueMapping from './hooks/use-text-value-mapping';
 import getExtraFooter from './utils/get-extra-footer';
 import getRanges from './utils/get-ranges';
 import usePopper from '../_utils/usePopper';
+var MONTH_DEFAULT_SUFFIX = '月';
+export var mergeDateLocale = function mergeDateLocale(globalLocale) {
+  var locale = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var mergeLocale = _extends({}, globalLocale, locale);
+  mergeLocale.weekTitle = _Array$from({
+    length: 7
+  }, function (_, index) {
+    return mergeLocale.weekTitle[index] || globalLocale.weekTitle[index];
+  });
+  mergeLocale.monthTitle = _Array$from({
+    length: 12
+  }, function (_, index) {
+    return mergeLocale.monthTitle[index] || globalLocale.monthTitle[index];
+  });
+  if ((mergeLocale === null || mergeLocale === void 0 ? void 0 : mergeLocale.month) && mergeLocale.month !== MONTH_DEFAULT_SUFFIX) {
+    var _context;
+    mergeLocale.monthTitle = _mapInstanceProperty(_context = mergeLocale.monthTitle).call(_context, function (d) {
+      return d.toString().replace(MONTH_DEFAULT_SUFFIX, mergeLocale.month);
+    });
+  }
+  return mergeLocale;
+};
 var InternalDatePicker = function InternalDatePicker(props, ref) {
   var customPrefixcls = props.prefixCls;
   var _useContext = useContext(ConfigContext),
@@ -92,7 +116,7 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
   var isMinuteStepValid = 60 % minuteStep === 0;
   var isSecondStepValid = 60 % secondStep === 0;
   var needConfirmButton = picker === 'date' && !!showTime || picker === 'time';
-  var datePickerLang = _extends({}, globalLocale.getCompLangMsg({
+  var datePickerLang = mergeDateLocale(globalLocale.getCompLangMsg({
     componentName: 'DatePicker'
   }), locale || {});
   var _useMergedState = useMergedState(null, {

package/es/date-picker/interface.d.ts

@@ -1,5 +1,7 @@
 /// <reference types="react" />
 import { BorderType, InputSiteType } from '../input/input';
+export declare type WeekTitleType = [string, string, string, string, string, string, string];
+export declare type MonthTitleType = [string, string, string, string, string, string, string, string, string, string, string, string];
 export interface Locale {
     'DatePicker.placeholder': string;
     'DatePicker.yearPlaceholder': string;
@@ -12,7 +14,8 @@ export interface Locale {
     'DatePicker.today': string;
     'DatePicker.year': string;
     'DatePicker.month': string;
-    'DatePicker.weekTitle': [string, string, string, string, string, string, string];
+    'DatePicker.weekTitle': WeekTitleType;
+    'DatePicker.monthTitle': MonthTitleType;
     'DatePicker.rangePlaceholder': [string, string];
     'DatePicker.rangeYearPlaceholder': [string, string];
     'DatePicker.rangeMonthPlaceholder': [string, string];
@@ -33,7 +36,8 @@ export interface InnerLocale {
     today: string;
     year: string;
     month: string;
-    weekTitle: [string, string, string, string, string, string, string];
+    weekTitle: WeekTitleType;
+    monthTitle: MonthTitleType;
     rangePlaceholder: [string, string];
     rangeYearPlaceholder: [string, string];
     rangeMonthPlaceholder: [string, string];

package/es/date-picker/locale/zh_CN.js

@@ -12,28 +12,7 @@ var locale = {
   'DatePicker.month': '月',
   'DatePicker.year': '年',
   'DatePicker.weekTitle': ['日', '一', '二', '三', '四', '五', '六'],
-  // 'DatePicker.backToToday': '返回今天',
-  // 'DatePicker.timeSelect': '选择时间',
-  // 'DatePicker.dateSelect': '选择日期',
-  // 'DatePicker.weekSelect': '选择周',
-  // 'DatePicker.clear': '清除',
-  // 'DatePicker.month': '月',
-  // 'DatePicker.year': '年',
-  // 'DatePicker.previousMonth': '上个月 (翻页上键)',
-  // 'DatePicker.nextMonth': '下个月 (翻页下键)',
-  // 'DatePicker.monthSelect': '选择月份',
-  // 'DatePicker.yearSelect': '选择年份',
-  // 'DatePicker.decadeSelect': '选择年代',
-  // 'DatePicker.yearFormat': 'YYYY年',
-  // 'DatePicker.dayFormat': 'D日',
-  // 'DatePicker.dateFormat': 'YYYY年M月D日',
-  // 'DatePicker.dateTimeFormat': 'YYYY年M月D日 HH时mm分ss秒',
-  // 'DatePicker.previousYear': '上一年 (Control键加左方向键)',
-  // 'DatePicker.nextYear': '下一年 (Control键加右方向键)',
-  // 'DatePicker.previousDecade': '上一年代',
-  // 'DatePicker.nextDecade': '下一年代',
-  // 'DatePicker.previousCentury': '上一世纪',
-  // 'DatePicker.nextCentury': '下一世纪',
+  'DatePicker.monthTitle': ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'],
   'DatePicker.rangePlaceholder': ['开始日期', '结束日期'],
   'DatePicker.rangeYearPlaceholder': ['开始年份', '结束年份'],
   'DatePicker.rangeMonthPlaceholder': ['开始月份', '结束月份'],

package/es/date-picker/panel/month/month.js

@@ -1,7 +1,6 @@
 import _extends from "@babel/runtime-corejs3/helpers/extends";
 import _defineProperty from "@babel/runtime-corejs3/helpers/defineProperty";
 import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
-import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
 import React, { useContext } from 'react';
 import classnames from 'classnames';
 import { getMonth, newDate, getYear, setMonth, isAfter, isBefore, isSameMonth, getStartOfMonth, setYearOrMonthOfDate } from '../../utils/date-fns';
@@ -98,7 +97,6 @@ function Month(props) {
         className: monthLineCls,
         key: i
       }, _mapInstanceProperty(month).call(month, function (m, j) {
-        var _context;
         var month = setMonth(viewDate, m);
         var _props = {
           onClick: function onClick() {
@@ -118,7 +116,7 @@ function Month(props) {
         var monthItemCls = classnames("".concat(prefixCls, "-month-item"), _defineProperty({}, "".concat(prefixCls, "-month-item-disabled"), disabledDate && disabledDate(month)), getRangeCls(month));
         var originNode = /*#__PURE__*/React.createElement("span", {
           className: getMonthClassNames(m)
-        }, _concatInstanceProperty(_context = "".concat(m + 1)).call(_context, locale.month));
+        }, "".concat(locale.monthTitle[m]));
         return /*#__PURE__*/React.createElement("div", _extends({
           className: monthItemCls,
           key: j

package/es/date-picker/range-picker.js

@@ -1,6 +1,6 @@
+import _extends from "@babel/runtime-corejs3/helpers/extends";
 import _defineProperty from "@babel/runtime-corejs3/helpers/defineProperty";
 import _slicedToArray from "@babel/runtime-corejs3/helpers/slicedToArray";
-import _extends from "@babel/runtime-corejs3/helpers/extends";
 import _findInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/find";
 import _Object$keys from "@babel/runtime-corejs3/core-js-stable/object/keys";
 import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
@@ -19,6 +19,7 @@ import { formatDate, isAfter, newDate, parseDate, isEqual, isSameQuarter, isSame
 import useTextValueMapping from './hooks/use-text-value-mapping';
 import useRangeViewDates from './hooks/use-range-view-dates';
 import useRangeDisabled from './hooks/use-range-disabled';
+import { mergeDateLocale } from './date-picker';
 import getExtraFooter from './utils/get-extra-footer';
 import getRanges from './utils/get-ranges';
 import classNames from 'classnames';
@@ -105,7 +106,7 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
     status = datePickerProps.status,
     cellRender = datePickerProps.cellRender;
   var needConfirmButton = picker === 'date' && !!showTime || picker === 'time';
-  var datePickerLang = _extends({}, globalLocale.getCompLangMsg({
+  var datePickerLang = mergeDateLocale(globalLocale.getCompLangMsg({
     componentName: 'DatePicker'
   }), locale || {});
   // ref

package/es/locale/locale.d.ts

@@ -116,7 +116,8 @@ declare class LocaleCache {
         'DatePicker.today': string;
         'DatePicker.year': string;
         'DatePicker.month': string;
-        'DatePicker.weekTitle': [string, string, string, string, string, string, string];
+        'DatePicker.weekTitle': import("../date-picker/interface").WeekTitleType;
+        'DatePicker.monthTitle': import("../date-picker/interface").MonthTitleType;
         'DatePicker.rangePlaceholder': [string, string];
         'DatePicker.rangeYearPlaceholder': [string, string];
         'DatePicker.rangeMonthPlaceholder': [string, string];

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

@@ -90,7 +90,8 @@ declare const locale: {
     'DatePicker.today': string;
     'DatePicker.year': string;
     'DatePicker.month': string;
-    'DatePicker.weekTitle': [string, string, string, string, string, string, string];
+    'DatePicker.weekTitle': import("../date-picker/interface").WeekTitleType;
+    'DatePicker.monthTitle': import("../date-picker/interface").MonthTitleType;
     'DatePicker.rangePlaceholder': [string, string];
     'DatePicker.rangeYearPlaceholder': [string, string];
     'DatePicker.rangeMonthPlaceholder': [string, string];

package/es/modal/modal.js

@@ -139,7 +139,9 @@ var InternalModal = function InternalModal(props, ref) {
   var escapeToCloseModal = useCallback(function (evt) {
     var _context;
     // In Internet Explorer 9 and Firefox 36 and earlier, the Esc key returns "Esc" instead of "Escape"
-    if (_includesInstanceProperty(_context = ['Escape', 'Esc']).call(_context, evt.key)) {
+    var isModalVisible = destroyOnClose || (isForceController ? visible : innerVisible);
+    if (_includesInstanceProperty(_context = ['Escape', 'Esc']).call(_context, evt.key) && isModalVisible) {
+      evt.preventDefault();
       proxyCloseModal(onCancel);
     }
   }, [proxyCloseModal, onCancel]);

package/es/popconfirm/popconfirm.js

@@ -39,7 +39,7 @@ var Popconfirm = function Popconfirm(props) {
   }, [props.visible]);
   var confirmLocator = React.Children.count(children) === 1 && children.type ? children : /*#__PURE__*/React.createElement("span", null, children);
   var confirmTitle = typeof title === 'function' ? title() : title;
-  var confirmMsg = typeof title === 'function' ? message() : message;
+  var confirmMsg = typeof message === 'function' ? message() : message;
   var handleCancel = function handleCancel(e) {
     props.visible === undefined && setVisible(false);
     onVisibleChange && onVisibleChange(false);

package/es/select/select.js

@@ -505,7 +505,7 @@ var InternalSelect = function InternalSelect(props, ref) {
       className: clearIconCls,
       ref: clearRef
     }, clearIcon || /*#__PURE__*/React.createElement(Icon, {
-      type: "close-solid"
+      type: "close"
     })) : null, showArrow ? /*#__PURE__*/React.createElement("span", {
       className: arrowIconCls
     }, suffixIcon || /*#__PURE__*/React.createElement(Icon, {

package/es/select/style/index.css

@@ -542,10 +542,10 @@
   opacity: 1;
 }
 .kd-select .kd-select-single .kd-select-icon-clear {
-  color: var(--kd-c-select-icon-clear-color-text, #d9d9d9);
+  color: var(--kd-c-select-icon-clear-color-text, #666);
 }
 .kd-select .kd-select-single .kd-select-icon-clear:hover {
-  color: var(--kd-c-select-icon-clear-color-text-hover, #999);
+  color: var(--kd-c-select-icon-clear-color-text-hover, var(--kd-g-color-theme, #5582f3));
 }
 .kd-select .kd-select-single-text {
   color: var(--kd-c-select-single-color-text, var(--kd-g-color-text-primary, #212121));
@@ -660,10 +660,10 @@
   opacity: 1;
 }
 .kd-select-multiple .kd-select-icon-clear {
-  color: var(--kd-c-select-icon-clear-color-text, #d9d9d9);
+  color: var(--kd-c-select-icon-clear-color-text, #666);
 }
 .kd-select-multiple .kd-select-icon-clear:hover {
-  color: var(--kd-c-select-icon-clear-color-text-hover, #999);
+  color: var(--kd-c-select-icon-clear-color-text-hover, var(--kd-g-color-theme, #5582f3));
 }
 .kd-select-multiple-selector {
   position: relative;

package/es/select/style/token.less

@@ -20,8 +20,8 @@
 @select-color-text-disabled: var(~'@{select-custom-prefix}-color-text-disabled', @color-disabled);
 @select-arrow-icon-color-text-disabled: var(~'@{select-custom-prefix}-arrow-icon-color-text-disabled', #b2b2b2);
 @select-single-color-text: var(~'@{select-custom-prefix}-single-color-text', @color-text-primary);
-@select-clear-color: var(~'@{select-custom-prefix}-icon-clear-color-text', #d9d9d9);
-@select-clear-color-hover: var(~'@{select-custom-prefix}-icon-clear-color-text-hover', #999);
+@select-clear-color: var(~'@{select-custom-prefix}-icon-clear-color-text', #666);
+@select-clear-color-hover: var(~'@{select-custom-prefix}-icon-clear-color-text-hover', @color-theme);
 @select-error-color: var(~'@{select-custom-prefix}-color-error', @color-error);
 
 // font

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

@@ -167,6 +167,13 @@
   z-index: 1;
   position: absolute;
   top: 0;
+  bottom: 0;
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-align: center;
+      -ms-flex-align: center;
+          align-items: center;
   background: #fff;
   -webkit-transition: opacity 0.15s ease;
   transition: opacity 0.15s ease;

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

@@ -59,6 +59,9 @@
       z-index: 1;
       position: absolute;
       top: 0;
+      bottom: 0;
+      display: flex;
+      align-items: center;
       background: #fff;
       transition: opacity 0.15s ease;
       font-size: @city-picker-clear-font-size;

package/lib/date-picker/date-panel.js

@@ -152,7 +152,7 @@ function Panel(props) {
   };
   var renderDateHeader = function renderDateHeader() {
     var year = (0, _dateFns.getYear)(viewDate);
-    var month = (0, _dateFns.getMonth)(viewDate) + 1;
+    var month = (0, _dateFns.getMonth)(viewDate);
     var headerCls = (0, _classnames4.default)("".concat(prefixCls, "-header"), "".concat(prefixCls, "-header-date"));
     return {
       children: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("span", {
@@ -161,7 +161,7 @@ function Panel(props) {
       }, year + locale.year), /*#__PURE__*/_react.default.createElement("span", {
         className: (0, _classnames4.default)("".concat(prefixCls, "-header-text-inner"), "".concat(prefixCls, "-header-text-inner-hover"), (0, _defineProperty2.default)({}, "".concat(prefixCls, "-header-text-inner-active"), isInnerMonth)),
         onClick: onHeaderMonthClick
-      }, month + locale.month)),
+      }, locale.monthTitle[month])),
       className: headerCls
     };
   };

package/lib/date-picker/date-picker.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { DateType } from './interface';
+import { DateType, InnerLocale } from './interface';
 import { PickerPanelBaseProps, PickerPanelDateProps, PickerPanelTimeProps } from './date-panel';
 import { BorderType, InputSiteType } from '../input/input';
 export declare type CellRenderSubType = 'hour' | 'minute' | 'second' | '12Hours';
@@ -59,5 +59,6 @@ export interface PickerTimeProps extends PickerSharedProps, Omit<OmitPanelProps<
 }
 export declare type PickerProps = PickerBaseProps | PickerDateProps | PickerTimeProps;
 export declare type IInnerPicker = undefined | 'year' | 'month';
+export declare const mergeDateLocale: (globalLocale: InnerLocale, locale?: {}) => InnerLocale;
 declare const DatePicker: React.ForwardRefExoticComponent<(Partial<PickerBaseProps> & React.RefAttributes<unknown>) | (Partial<PickerDateProps> & React.RefAttributes<unknown>) | (Partial<PickerTimeProps> & React.RefAttributes<unknown>)>;
 export default DatePicker;

package/lib/date-picker/date-picker.js

@@ -7,7 +7,9 @@ var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequ
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.mergeDateLocale = exports.default = void 0;
+var _from = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/array/from"));
+var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
 var _find = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/find"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/slicedToArray"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
@@ -16,7 +18,7 @@ var _classnames = _interopRequireDefault(require("classnames"));
 var _ConfigContext = _interopRequireDefault(require("../config-provider/ConfigContext"));
 var _hooks = require("../_utils/hooks");
 var _utils = require("../_utils");
-var _context = _interopRequireDefault(require("./context"));
+var _context2 = _interopRequireDefault(require("./context"));
 var _datePanel = _interopRequireDefault(require("./date-panel"));
 var _inputDate = _interopRequireDefault(require("./single/input-date"));
 var _utils2 = require("./utils");
@@ -29,6 +31,29 @@ var _getRanges = _interopRequireDefault(require("./utils/get-ranges"));
 var _usePopper = _interopRequireDefault(require("../_utils/usePopper"));
 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 MONTH_DEFAULT_SUFFIX = '月';
+var mergeDateLocale = function mergeDateLocale(globalLocale) {
+  var locale = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var mergeLocale = (0, _extends2.default)({}, globalLocale, locale);
+  mergeLocale.weekTitle = (0, _from.default)({
+    length: 7
+  }, function (_, index) {
+    return mergeLocale.weekTitle[index] || globalLocale.weekTitle[index];
+  });
+  mergeLocale.monthTitle = (0, _from.default)({
+    length: 12
+  }, function (_, index) {
+    return mergeLocale.monthTitle[index] || globalLocale.monthTitle[index];
+  });
+  if ((mergeLocale === null || mergeLocale === void 0 ? void 0 : mergeLocale.month) && mergeLocale.month !== MONTH_DEFAULT_SUFFIX) {
+    var _context;
+    mergeLocale.monthTitle = (0, _map.default)(_context = mergeLocale.monthTitle).call(_context, function (d) {
+      return d.toString().replace(MONTH_DEFAULT_SUFFIX, mergeLocale.month);
+    });
+  }
+  return mergeLocale;
+};
+exports.mergeDateLocale = mergeDateLocale;
 var InternalDatePicker = function InternalDatePicker(props, ref) {
   var customPrefixcls = props.prefixCls;
   var _useContext = (0, _react.useContext)(_ConfigContext.default),
@@ -104,7 +129,7 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
   var isMinuteStepValid = 60 % minuteStep === 0;
   var isSecondStepValid = 60 % secondStep === 0;
   var needConfirmButton = picker === 'date' && !!showTime || picker === 'time';
-  var datePickerLang = (0, _extends2.default)({}, globalLocale.getCompLangMsg({
+  var datePickerLang = mergeDateLocale(globalLocale.getCompLangMsg({
     componentName: 'DatePicker'
   }), locale || {});
   var _useMergedState = (0, _hooks.useMergedState)(null, {
@@ -337,7 +362,7 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
     if (panelRender) {
       panelNode = panelRender(panelNode);
     }
-    return /*#__PURE__*/_react.default.createElement(_context.default.Provider, {
+    return /*#__PURE__*/_react.default.createElement(_context2.default.Provider, {
       value: {
         hours: hours,
         minutes: minutes,

package/lib/date-picker/interface.d.ts

@@ -1,5 +1,7 @@
 /// <reference types="react" />
 import { BorderType, InputSiteType } from '../input/input';
+export declare type WeekTitleType = [string, string, string, string, string, string, string];
+export declare type MonthTitleType = [string, string, string, string, string, string, string, string, string, string, string, string];
 export interface Locale {
     'DatePicker.placeholder': string;
     'DatePicker.yearPlaceholder': string;
@@ -12,7 +14,8 @@ export interface Locale {
     'DatePicker.today': string;
     'DatePicker.year': string;
     'DatePicker.month': string;
-    'DatePicker.weekTitle': [string, string, string, string, string, string, string];
+    'DatePicker.weekTitle': WeekTitleType;
+    'DatePicker.monthTitle': MonthTitleType;
     'DatePicker.rangePlaceholder': [string, string];
     'DatePicker.rangeYearPlaceholder': [string, string];
     'DatePicker.rangeMonthPlaceholder': [string, string];
@@ -33,7 +36,8 @@ export interface InnerLocale {
     today: string;
     year: string;
     month: string;
-    weekTitle: [string, string, string, string, string, string, string];
+    weekTitle: WeekTitleType;
+    monthTitle: MonthTitleType;
     rangePlaceholder: [string, string];
     rangeYearPlaceholder: [string, string];
     rangeMonthPlaceholder: [string, string];

package/lib/date-picker/locale/zh_CN.js

@@ -18,28 +18,7 @@ var locale = {
   'DatePicker.month': '月',
   'DatePicker.year': '年',
   'DatePicker.weekTitle': ['日', '一', '二', '三', '四', '五', '六'],
-  // 'DatePicker.backToToday': '返回今天',
-  // 'DatePicker.timeSelect': '选择时间',
-  // 'DatePicker.dateSelect': '选择日期',
-  // 'DatePicker.weekSelect': '选择周',
-  // 'DatePicker.clear': '清除',
-  // 'DatePicker.month': '月',
-  // 'DatePicker.year': '年',
-  // 'DatePicker.previousMonth': '上个月 (翻页上键)',
-  // 'DatePicker.nextMonth': '下个月 (翻页下键)',
-  // 'DatePicker.monthSelect': '选择月份',
-  // 'DatePicker.yearSelect': '选择年份',
-  // 'DatePicker.decadeSelect': '选择年代',
-  // 'DatePicker.yearFormat': 'YYYY年',
-  // 'DatePicker.dayFormat': 'D日',
-  // 'DatePicker.dateFormat': 'YYYY年M月D日',
-  // 'DatePicker.dateTimeFormat': 'YYYY年M月D日 HH时mm分ss秒',
-  // 'DatePicker.previousYear': '上一年 (Control键加左方向键)',
-  // 'DatePicker.nextYear': '下一年 (Control键加右方向键)',
-  // 'DatePicker.previousDecade': '上一年代',
-  // 'DatePicker.nextDecade': '下一年代',
-  // 'DatePicker.previousCentury': '上一世纪',
-  // 'DatePicker.nextCentury': '下一世纪',
+  'DatePicker.monthTitle': ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'],
   'DatePicker.rangePlaceholder': ['开始日期', '结束日期'],
   'DatePicker.rangeYearPlaceholder': ['开始年份', '结束年份'],
   'DatePicker.rangeMonthPlaceholder': ['开始月份', '结束月份'],

package/lib/date-picker/panel/month/month.js

@@ -9,19 +9,18 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
-var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
 var _react = _interopRequireWildcard(require("react"));
 var _classnames3 = _interopRequireDefault(require("classnames"));
 var _dateFns = require("../../utils/date-fns");
-var _context2 = _interopRequireDefault(require("../../context"));
+var _context = _interopRequireDefault(require("../../context"));
 var _useRangeCls = _interopRequireDefault(require("../../hooks/use-range-cls"));
 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 monthsThreeColumns = [[0, 1, 2], [3, 4, 5], [6, 7, 8], [9, 10, 11]];
 function Month(props) {
-  var context = (0, _react.useContext)(_context2.default);
+  var context = (0, _react.useContext)(_context.default);
   var prefixCls = context.prefixCls,
     dateValue = context.dateValue,
     viewDate = context.viewDate,
@@ -110,7 +109,6 @@ function Month(props) {
         className: monthLineCls,
         key: i
       }, (0, _map.default)(month).call(month, function (m, j) {
-        var _context;
         var month = (0, _dateFns.setMonth)(viewDate, m);
         var _props = {
           onClick: function onClick() {
@@ -130,7 +128,7 @@ function Month(props) {
         var monthItemCls = (0, _classnames3.default)("".concat(prefixCls, "-month-item"), (0, _defineProperty2.default)({}, "".concat(prefixCls, "-month-item-disabled"), disabledDate && disabledDate(month)), getRangeCls(month));
         var originNode = /*#__PURE__*/_react.default.createElement("span", {
           className: getMonthClassNames(m)
-        }, (0, _concat.default)(_context = "".concat(m + 1)).call(_context, locale.month));
+        }, "".concat(locale.monthTitle[m]));
         return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({
           className: monthItemCls,
           key: j

package/lib/date-picker/range-picker.js

@@ -11,9 +11,9 @@ exports.default = void 0;
 var _find = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/find"));
 var _keys = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/keys"));
 var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
+var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/slicedToArray"));
-var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
 var _react = _interopRequireWildcard(require("react"));
 var _isSameWeek = _interopRequireDefault(require("date-fns/isSameWeek"));
 var _ConfigContext = _interopRequireDefault(require("../config-provider/ConfigContext"));
@@ -29,6 +29,7 @@ var _dateFns = require("./utils/date-fns");
 var _useTextValueMapping5 = _interopRequireDefault(require("./hooks/use-text-value-mapping"));
 var _useRangeViewDates3 = _interopRequireDefault(require("./hooks/use-range-view-dates"));
 var _useRangeDisabled3 = _interopRequireDefault(require("./hooks/use-range-disabled"));
+var _datePicker = require("./date-picker");
 var _getExtraFooter = _interopRequireDefault(require("./utils/get-extra-footer"));
 var _getRanges = _interopRequireDefault(require("./utils/get-ranges"));
 var _classnames = _interopRequireDefault(require("classnames"));
@@ -117,7 +118,7 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
     status = datePickerProps.status,
     cellRender = datePickerProps.cellRender;
   var needConfirmButton = picker === 'date' && !!showTime || picker === 'time';
-  var datePickerLang = (0, _extends2.default)({}, globalLocale.getCompLangMsg({
+  var datePickerLang = (0, _datePicker.mergeDateLocale)(globalLocale.getCompLangMsg({
     componentName: 'DatePicker'
   }), locale || {});
   // ref

package/lib/locale/locale.d.ts

@@ -116,7 +116,8 @@ declare class LocaleCache {
         'DatePicker.today': string;
         'DatePicker.year': string;
         'DatePicker.month': string;
-        'DatePicker.weekTitle': [string, string, string, string, string, string, string];
+        'DatePicker.weekTitle': import("../date-picker/interface").WeekTitleType;
+        'DatePicker.monthTitle': import("../date-picker/interface").MonthTitleType;
         'DatePicker.rangePlaceholder': [string, string];
         'DatePicker.rangeYearPlaceholder': [string, string];
         'DatePicker.rangeMonthPlaceholder': [string, string];

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

@@ -90,7 +90,8 @@ declare const locale: {
     'DatePicker.today': string;
     'DatePicker.year': string;
     'DatePicker.month': string;
-    'DatePicker.weekTitle': [string, string, string, string, string, string, string];
+    'DatePicker.weekTitle': import("../date-picker/interface").WeekTitleType;
+    'DatePicker.monthTitle': import("../date-picker/interface").MonthTitleType;
     'DatePicker.rangePlaceholder': [string, string];
     'DatePicker.rangeYearPlaceholder': [string, string];
     'DatePicker.rangeMonthPlaceholder': [string, string];

package/lib/modal/modal.js

@@ -153,7 +153,9 @@ var InternalModal = function InternalModal(props, ref) {
   var escapeToCloseModal = (0, _react.useCallback)(function (evt) {
     var _context;
     // In Internet Explorer 9 and Firefox 36 and earlier, the Esc key returns "Esc" instead of "Escape"
-    if ((0, _includes.default)(_context = ['Escape', 'Esc']).call(_context, evt.key)) {
+    var isModalVisible = destroyOnClose || (isForceController ? visible : innerVisible);
+    if ((0, _includes.default)(_context = ['Escape', 'Esc']).call(_context, evt.key) && isModalVisible) {
+      evt.preventDefault();
       proxyCloseModal(onCancel);
     }
   }, [proxyCloseModal, onCancel]);

package/lib/popconfirm/popconfirm.js

@@ -51,7 +51,7 @@ var Popconfirm = function Popconfirm(props) {
   }, [props.visible]);
   var confirmLocator = React.Children.count(children) === 1 && children.type ? children : /*#__PURE__*/React.createElement("span", null, children);
   var confirmTitle = typeof title === 'function' ? title() : title;
-  var confirmMsg = typeof title === 'function' ? message() : message;
+  var confirmMsg = typeof message === 'function' ? message() : message;
   var handleCancel = function handleCancel(e) {
     props.visible === undefined && setVisible(false);
     onVisibleChange && onVisibleChange(false);

package/lib/select/select.js

@@ -517,7 +517,7 @@ var InternalSelect = function InternalSelect(props, ref) {
       className: clearIconCls,
       ref: clearRef
     }, clearIcon || /*#__PURE__*/_react.default.createElement(_index.Icon, {
-      type: "close-solid"
+      type: "close"
     })) : null, showArrow ? /*#__PURE__*/_react.default.createElement("span", {
       className: arrowIconCls
     }, suffixIcon || /*#__PURE__*/_react.default.createElement(_index.Icon, {