@kdcloudjs/kdesign 1.7.59 → 1.7.61

package/lib/_utils/domUtil.d.ts

@@ -0,0 +1,2 @@
+import React from 'react';
+export declare const scrollToDirectory: (ref: React.MutableRefObject<any>) => void;

package/lib/_utils/domUtil.js

@@ -0,0 +1,23 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.scrollToDirectory = void 0;
+var _domScrollIntoView = _interopRequireDefault(require("dom-scroll-into-view"));
+var scrollToDirectory = function scrollToDirectory(ref) {
+  var directoryElement = ref.current;
+  if (directoryElement) {
+    var rect = ref.current.getBoundingClientRect();
+    var parent = ref.current.parentElement;
+    var parentRect = parent.getBoundingClientRect();
+    var relativeTop = rect.top - parentRect.top;
+    var relativeBottom = rect.bottom - parentRect.top;
+    var isHide = relativeTop < 0 || relativeBottom > parent.clientHeight;
+    if (isHide) {
+      (0, _domScrollIntoView.default)(ref.current, ref.current.parentElement);
+    }
+  }
+};
+exports.scrollToDirectory = scrollToDirectory;

package/lib/cascader/cascader.js

@@ -8,10 +8,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.CascaderPlacement = void 0;
-var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/toConsumableArray"));
 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 _getOwnPropertySymbols = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols"));
 var _includes = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/includes"));
 var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
@@ -24,6 +24,7 @@ var _type = require("../_utils/type");
 var _utils = require("../_utils");
 var _configProvider = require("../config-provider");
 var _usePopper = _interopRequireDefault(require("../_utils/usePopper"));
+var _domUtil = require("../_utils/domUtil");
 var _input = _interopRequireDefault(require("../input"));
 var _icon = _interopRequireDefault(require("../icon"));
 var _empty = _interopRequireDefault(require("../empty"));
@@ -42,6 +43,28 @@ var __rest = void 0 && (void 0).__rest || function (s, e) {
 };
 var CascaderPlacement = (0, _type.tuple)('topLeft', 'topRight', 'bottomLeft', 'bottomRight');
 exports.CascaderPlacement = CascaderPlacement;
+var CascaderMenuSubmenu = function CascaderMenuSubmenu(props) {
+  var optionProps = props.optionProps,
+    label = props.label,
+    children = props.children,
+    selected = props.selected,
+    isMultiple = props.isMultiple;
+  var ref = (0, _react.useRef)(null);
+  var isFirst = (0, _react.useRef)(!isMultiple);
+  (0, _react.useEffect)(function () {
+    if (typeof selected === 'boolean' && isFirst.current && ref.current) {
+      isFirst.current = false;
+      if (selected && !isMultiple) {
+        (0, _domUtil.scrollToDirectory)(ref);
+      }
+    }
+  }, [selected]);
+  return /*#__PURE__*/_react.default.createElement("li", (0, _extends2.default)({
+    ref: ref
+  }, optionProps, {
+    title: label
+  }), children);
+};
 var Cascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   var _React$useContext = _react.default.useContext(_configProvider.ConfigContext),
     getPrefixCls = _React$useContext.getPrefixCls,
@@ -85,13 +108,18 @@ var Cascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   var inputRef = (0, _react.useRef)();
   var suffixRef = (0, _react.useRef)(null);
   var wrapperRef = (0, _react.useRef)();
-  var _useState = (0, _react.useState)(!!props.popperVisible || !!props.popupVisible || defaultPopupVisible),
+  var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     visible = _useState2[0],
     setVisible = _useState2[1];
   _react.default.useEffect(function () {
     setVisible(!!props.popperVisible || !!props.popupVisible);
   }, [props.popperVisible, props.popupVisible]);
+  _react.default.useEffect(function () {
+    if (!!props.popperVisible || !!props.popupVisible || defaultPopupVisible) {
+      setVisible(true);
+    }
+  }, []);
   var _useState3 = (0, _react.useState)([options]),
     _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
     menus = _useState4[0],
@@ -412,11 +440,11 @@ var Cascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     }
     props.onChange && props.onChange(selectedValue, selectedOptions);
   };
-  var onVisibleChange = function onVisibleChange(visible) {
-    setVisible(visible);
-    onPopupVisibleChange && onPopupVisibleChange(visible);
-    onPopperVisibleChange && onPopperVisibleChange(visible);
-    visible && setSelectedOptions((0, _slice.default)(currentOptions).call(currentOptions, 0));
+  var onVisibleChange = function onVisibleChange(v) {
+    setVisible(v);
+    onPopupVisibleChange && onPopupVisibleChange(v);
+    onPopperVisibleChange && onPopperVisibleChange(v);
+    v && setSelectedOptions((0, _slice.default)(currentOptions).call(currentOptions, 0));
   };
   var cascaderMenus = /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (options === null || options === void 0 ? void 0 : options.length) ? (menus === null || menus === void 0 ? void 0 : menus.length) && (0, _map.default)(menus).call(menus, function (opts, index) {
     return /*#__PURE__*/_react.default.createElement("ul", {
@@ -449,10 +477,13 @@ var Cascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       }) : ((children === null || children === void 0 ? void 0 : children.length) || isLeaf === false) && (props.expandIcon || /*#__PURE__*/_react.default.createElement(_icon.default, {
         type: "arrow-right"
       })));
-      return /*#__PURE__*/_react.default.createElement("li", (0, _extends2.default)({
+      return /*#__PURE__*/_react.default.createElement(CascaderMenuSubmenu, (0, _extends2.default)({
         key: value
-      }, optionProps, {
-        title: label
+      }, {
+        isMultiple: isMultiple,
+        optionProps: optionProps,
+        label: label,
+        selected: selected
       }), isMultiple ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_checkbox.default, {
         checked: (0, _util.getChecked)(checkedKeys, value),
         indeterminate: (0, _util.getHalfChecked)(halfCheckedKeys, value),

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/config-provider/compDefaultProps.d.ts

@@ -488,5 +488,12 @@ declare const compDefaultProps: {
         errorLevel: string;
         color: string;
     };
+    Signature: {
+        penColor: string;
+        backgroundColor: string;
+        containerWidth: number;
+        containerHeight: number;
+        canFullScreen: boolean;
+    };
 };
 export default compDefaultProps;

package/lib/config-provider/compDefaultProps.js

@@ -516,6 +516,13 @@ var compDefaultProps = {
     type: 'canvas',
     errorLevel: 'H',
     color: '#000000'
+  },
+  Signature: {
+    penColor: 'black',
+    backgroundColor: 'white',
+    containerWidth: 610,
+    containerHeight: 500,
+    canFullScreen: true
   }
 };
 var _default = compDefaultProps;

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, {
@@ -114,10 +139,15 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
     _useMergedState2 = (0, _slicedToArray2.default)(_useMergedState, 2),
     dateValue = _useMergedState2[0],
     setDateValue = _useMergedState2[1];
-  var _React$useState = _react.default.useState(dateValue),
-    _React$useState2 = (0, _slicedToArray2.default)(_React$useState, 2),
-    selectedValue = _React$useState2[0],
-    setSelectedValue = _React$useState2[1];
+  var _useMergedState3 = (0, _hooks.useMergedState)(null, {
+      value: dateValue,
+      postState: function postState(v) {
+        return v && !(0, _dateFns.isValid)(v) ? null : v;
+      }
+    }),
+    _useMergedState4 = (0, _slicedToArray2.default)(_useMergedState3, 2),
+    selectedValue = _useMergedState4[0],
+    setSelectedValue = _useMergedState4[1];
   var hours;
   var minutes;
   var seconds;
@@ -148,7 +178,7 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
     viewDate = _useState2[0],
     setInnerViewDate = _useState2[1];
   var setViewDate = function setViewDate(date) {
-    setInnerViewDate((0, _dateFns.isDate)(date) ? date : new Date());
+    setInnerViewDate((0, _dateFns.isValid)(date) ? date : new Date());
   };
   (0, _react.useEffect)(function () {
     setViewDate(dateValue);
@@ -187,7 +217,7 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
     hoverValue = _useHoverValue2[0],
     onEnter = _useHoverValue2[1],
     onLeave = _useHoverValue2[2];
-  var _useMergedState3 = (0, _hooks.useMergedState)(false, {
+  var _useMergedState5 = (0, _hooks.useMergedState)(false, {
       value: open,
       defaultValue: defaultOpen,
       postState: function postState(postOpen) {
@@ -202,10 +232,10 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
         // }
       }
     }),
-    _useMergedState4 = (0, _slicedToArray2.default)(_useMergedState3, 2),
-    openValue = _useMergedState4[0],
-    triggerInnerOpen = _useMergedState4[1];
-  var _useMergedState5 = (0, _hooks.useMergedState)(function () {
+    _useMergedState6 = (0, _slicedToArray2.default)(_useMergedState5, 2),
+    openValue = _useMergedState6[0],
+    triggerInnerOpen = _useMergedState6[1];
+  var _useMergedState7 = (0, _hooks.useMergedState)(function () {
       if (picker === 'time') {
         return 'time';
       }
@@ -213,9 +243,9 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
     }, {
       value: mode
     }),
-    _useMergedState6 = (0, _slicedToArray2.default)(_useMergedState5, 2),
-    mergedMode = _useMergedState6[0],
-    setInnerMode = _useMergedState6[1];
+    _useMergedState8 = (0, _slicedToArray2.default)(_useMergedState7, 2),
+    mergedMode = _useMergedState8[0],
+    setInnerMode = _useMergedState8[1];
   var _useState3 = (0, _react.useState)(undefined),
     _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
     innerPicker = _useState4[0],
@@ -243,9 +273,6 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [picker]);
-  (0, _react.useEffect)(function () {
-    setSelectedValue(dateValue);
-  }, [dateValue]);
   (0, _hooks.useOnClickOutside)([popperRef, inputDivRef], function () {
     setViewDate(selectedValue || (0, _dateFns.newDate)());
     triggerOpen(false);
@@ -335,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/hooks/use-range-view-dates.js

@@ -60,6 +60,12 @@ function getRangeViewDate(values, index, picker) {
   }
   return startDate;
 }
+function checkViewDate(value) {
+  if (value && !(0, _dateFns.isValid)(value)) {
+    return false;
+  }
+  return value;
+}
 function useRangeViewDates(_ref) {
   var values = (0, _values.default)(_ref),
     picker = _ref.picker,
@@ -80,7 +86,7 @@ function useRangeViewDates(_ref) {
     if (defaultViewDates[index]) {
       return defaultViewDates[index];
     }
-    return (0, _utils.getValue)(viewDates, index) || getRangeViewDate(values, index, picker) || startDate || endDate || (0, _dateFns.newDate)();
+    return checkViewDate((0, _utils.getValue)(viewDates, index)) || checkViewDate(getRangeViewDate(values, index, picker)) || checkViewDate(startDate) || checkViewDate(endDate) || (0, _dateFns.newDate)();
   }
   function setViewDate(viewDate, index) {
     if (viewDate) {

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
@@ -164,8 +165,11 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
         }
         // Fill disabled unit
         for (var i = 0; i < 2; i++) {
-          if (mergedDisabled[i] && !(0, _utils2.getValue)(postValues, i) && !(0, _utils2.getValue)(allowEmpty, i)) {
+          var v = (0, _utils2.getValue)(postValues, i);
+          if (mergedDisabled[i] && !v && !(0, _utils2.getValue)(allowEmpty, i)) {
             postValues = (0, _utils2.updateValues)(postValues, (0, _dateFns.newDate)(), i);
+          } else if (v && !(0, _dateFns.isValid)(v)) {
+            postValues = (0, _utils2.updateValues)(postValues, null, i);
           }
         }
         return postValues;

package/lib/index.d.ts

@@ -59,3 +59,4 @@ export { default as ColorPicker } from './color-picker';
 export { default as Clipboard } from './clipboard';
 export { default as QRCode } from './qr-code';
 export { default as Divider } from './divider';
+export { default as Signature } from './signature';

package/lib/index.js

@@ -277,6 +277,12 @@ Object.defineProperty(exports, "Select", {
     return _select.default;
   }
 });
+Object.defineProperty(exports, "Signature", {
+  enumerable: true,
+  get: function get() {
+    return _signature.default;
+  }
+});
 Object.defineProperty(exports, "Slider", {
   enumerable: true,
   get: function get() {
@@ -458,6 +464,7 @@ var _colorPicker = _interopRequireDefault(require("./color-picker"));
 var _clipboard = _interopRequireDefault(require("./clipboard"));
 var _qrCode = _interopRequireDefault(require("./qr-code"));
 var _divider = _interopRequireDefault(require("./divider"));
+var _signature = _interopRequireDefault(require("./signature"));
 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; }
 /* @remove-on-es-build-begin */

package/lib/locale/locale.d.ts

@@ -100,6 +100,11 @@ declare class LocaleCache {
         'Table.confirmFilter': string;
         'Select.selectAll': string;
         'Select.seleted': string;
+        'Signature.clickToSign': string;
+        'Signature.pleaseWriteHere': string;
+        'Signature.okText': string;
+        'Signature.cancelText': string;
+        'Signature.handwrittenSignature': string;
         'DatePicker.placeholder': string;
         'DatePicker.yearPlaceholder': string;
         'DatePicker.quarterPlaceholder': string;
@@ -111,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

@@ -74,6 +74,11 @@ declare const locale: {
     'Table.confirmFilter': string;
     'Select.selectAll': string;
     'Select.seleted': string;
+    'Signature.clickToSign': string;
+    'Signature.pleaseWriteHere': string;
+    'Signature.okText': string;
+    'Signature.cancelText': string;
+    'Signature.handwrittenSignature': string;
     'DatePicker.placeholder': string;
     'DatePicker.yearPlaceholder': string;
     'DatePicker.quarterPlaceholder': string;
@@ -85,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/locale/zh-CN.js

@@ -84,7 +84,12 @@ var locale = (0, _extends2.default)((0, _extends2.default)({
   'Table.resetFilter': '重置',
   'Table.confirmFilter': '确定',
   'Select.selectAll': '全选',
-  'Select.seleted': '已选{size}项'
+  'Select.seleted': '已选{size}项',
+  'Signature.clickToSign': '点击签名',
+  'Signature.pleaseWriteHere': '请在此处横向书写签名',
+  'Signature.okText': '确定',
+  'Signature.cancelText': '取消',
+  'Signature.handwrittenSignature': '手写签名'
 });
 var _default = locale;
 exports.default = _default;

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);